system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-07-21 06:04:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

shell: Convert the about icon to 32-bit explicitly instead of casting the handle.

Browse source
This commit is contained in:
Alexandre Julliard 2010-01-04 20:20:15 +01:00
parent 8108549804
commit 67e1ac9a93
1 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
dlls/shell.dll16/shell.c
View file

@ -42,6 +42,7 @@
#include "shlwapi.h"
#include "wine/winbase16.h"
#include "wine/winuser16.h"
#include "wine/debug.h"
@ -52,7 +53,6 @@ extern HINSTANCE WINAPI WOWShellExecute(HWND hWnd, LPCSTR lpOperation,LPCSTR lpF
INT iShowCmd, void *callback);
#define HICON_16(h32) (LOWORD(h32))
#define HICON_32(h16) ((HICON)(ULONG_PTR)(h16))
#define HINSTANCE_32(h16) ((HINSTANCE)(ULONG_PTR)(h16))
#define HINSTANCE_16(h32) (LOWORD(h32))
@ -73,6 +73,17 @@ static UINT uMsgWndCreated = 0;
static UINT uMsgWndDestroyed = 0;
static UINT uMsgShellActivate = 0;
static HICON convert_icon_to_32( HICON16 icon16 )
{
CURSORICONINFO *info = GlobalLock16( icon16 );
void *and_bits = info + 1;
void *xor_bits = (BYTE *)and_bits + info->nHeight * 2 * ((info->nWidth + 15) / 16);
HICON ret = CreateIcon( 0, info->nWidth, info->nHeight, info->bPlanes, info->bBitsPerPixel,
and_bits, xor_bits );
GlobalUnlock16( icon16 );
return ret;
}
/***********************************************************************
* DllEntryPoint [SHELL.101]
*
@ -183,9 +194,12 @@ BOOL16 WINAPI AboutDlgProc16( HWND16 hWnd, UINT16 msg, WPARAM16 wParam,
/*************************************************************************
* ShellAbout (SHELL.22)
*/
BOOL16 WINAPI ShellAbout16( HWND16 hWnd, LPCSTR szApp, LPCSTR szOtherStuff,
HICON16 hIcon )
{ return ShellAboutA( HWND_32(hWnd), szApp, szOtherStuff, HICON_32(hIcon) );
BOOL16 WINAPI ShellAbout16( HWND16 hWnd, LPCSTR szApp, LPCSTR szOtherStuff, HICON16 icon16 )
{
HICON icon = convert_icon_to_32( icon16 );
BOOL ret = ShellAboutA( HWND_32(hWnd), szApp, szOtherStuff, icon );
DestroyIcon( icon );
return ret;
}
/*************************************************************************