diff --git a/ApplewinExpress10.00.vcxproj b/ApplewinExpress10.00.vcxproj index 48c2bca6..eb54c1df 100644 --- a/ApplewinExpress10.00.vcxproj +++ b/ApplewinExpress10.00.vcxproj @@ -462,6 +462,7 @@ + diff --git a/resource/Applewin.rc b/resource/Applewin.rc index 52038c89..34ada1c9 100644 --- a/resource/Applewin.rc +++ b/resource/Applewin.rc @@ -73,7 +73,7 @@ CHARSET8M BITMAP "CHARSET8C.BMP" CHARSET8C BITMAP "CHARSET8C.BMP" HELP_BUTTON BITMAP "HELP.BMP" DRIVESWAP_BUTTON BITMAP "DRIVESWAP.BMP" -IDB_APPLEWIN BITMAP "Applewin.bmp" +IDB_APPLEWIN BITMAP "ApplewinLogo.bmp" IDB_DEBUG_FONT_7X8 BITMAP "Debug_Font.bmp" ///////////////////////////////////////////////////////////////////////////// diff --git a/resource/ApplewinLogo.bmp b/resource/ApplewinLogo.bmp new file mode 100644 index 00000000..e81f68a2 Binary files /dev/null and b/resource/ApplewinLogo.bmp differ diff --git a/source/Video.cpp b/source/Video.cpp index 590f6ac5..19e278e1 100644 --- a/source/Video.cpp +++ b/source/Video.cpp @@ -333,7 +333,8 @@ void VideoInitialize () ZeroMemory(vidlastmem,0x10000); // LOAD THE LOGO - g_hLogoBitmap = (HBITMAP)LoadImage(g_hInstance, MAKEINTRESOURCE(IDB_APPLEWIN), IMAGE_BITMAP, 0, 0, LR_CREATEDIBSECTION); +// g_hLogoBitmap = (HBITMAP)LoadImage(g_hInstance, MAKEINTRESOURCE(IDB_APPLEWIN), IMAGE_BITMAP, 560, 384, LR_CREATEDIBSECTION); + g_hLogoBitmap = LoadBitmap( g_hInstance, MAKEINTRESOURCE(IDB_APPLEWIN) ); // CREATE A BITMAPINFO STRUCTURE FOR THE FRAME BUFFER g_pFramebufferinfo = (LPBITMAPINFO)VirtualAlloc( @@ -975,9 +976,9 @@ void VideoDisplayLogo () HDC hFrameDC = FrameGetDC(); // DRAW THE LOGO - HBRUSH brush = CreateSolidBrush(PALETTERGB(0x70,0x30,0xE0)); - - SelectObject(hFrameDC, brush); +// HBRUSH brush = CreateSolidBrush(PALETTERGB(0x70,0x30,0xE0)); +// SelectObject(hFrameDC, brush); + SelectObject(hFrameDC, GetStockObject(NULL_PEN)); int nViewportCX, nViewportCY; @@ -1000,6 +1001,11 @@ void VideoDisplayLogo () if (nViewportCY > bm.bmHeight) yoff = (nViewportCY - (scale * bm.bmHeight)) / 2; + if( g_bIsFullScreen ) + { + yoff = 0; + } + VideoDrawLogoBitmap( hFrameDC, xoff, yoff, bm.bmWidth, bm.bmHeight, scale ); } } @@ -1078,7 +1084,7 @@ void VideoDisplayLogo () #undef DRAWVERSION FrameReleaseDC(); - DeleteObject(brush); +// DeleteObject(brush); DeleteObject(font); }