marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

user.exe: Always pass a resource size to CreateIconFromResourceEx16.

oldstable
Alexandre Julliard 2013-06-17 11:14:20 +02:00
parent 7ca08fee55
commit 4894711768
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dlls/user.exe16/user.c
View File

@ -2094,6 +2094,7 @@ HANDLE16 WINAPI LoadImage16(HINSTANCE16 hinst, LPCSTR name, UINT16 type, INT16 c
{
HGLOBAL16 handle;
HRSRC16 hRsrc, hGroupRsrc;
DWORD size;
if (!hinst || (flags & LR_LOADFROMFILE))
{
@ -2129,7 +2130,6 @@ HANDLE16 WINAPI LoadImage16(HINSTANCE16 hinst, LPCSTR name, UINT16 type, INT16 c
BITMAPFILEHEADER header;
WCHAR path[MAX_PATH], filename[MAX_PATH];
HANDLE file;
DWORD size;
filename[0] = 0;
if (!(hRsrc = FindResource16( hinst, name, (LPCSTR)RT_BITMAP ))) return 0;
@ -2186,7 +2186,8 @@ HANDLE16 WINAPI LoadImage16(HINSTANCE16 hinst, LPCSTR name, UINT16 type, INT16 c
if (!(handle = LoadResource16( hinst, hRsrc ))) return 0;
bits = LockResource16( handle );
hIcon = CreateIconFromResourceEx16( bits, 0, type == IMAGE_ICON, 0x00030000, cx, cy, flags );
size = SizeofResource16( hinst, hRsrc );
hIcon = CreateIconFromResourceEx16( bits, size, type == IMAGE_ICON, 0x00030000, cx, cy, flags );
FreeResource16( handle );
if (hIcon && (flags & LR_SHARED)) add_shared_icon( hinst, hRsrc, hGroupRsrc, hIcon );
@ -2734,7 +2735,7 @@ WORD WINAPI GetIconID16( HGLOBAL16 hResource, DWORD resType )
*/
HICON16 WINAPI LoadIconHandler16( HGLOBAL16 hResource, BOOL16 bNew )
{
return CreateIconFromResourceEx16( LockResource16( hResource ), 0, TRUE,
return CreateIconFromResourceEx16( LockResource16( hResource ), 0xffff, TRUE,
bNew ? 0x00030000 : 0x00020000, 0, 0, LR_DEFAULTCOLOR );
}