Commit d112d746 authored by Ziqing Hui's avatar Ziqing Hui Committed by Alexandre Julliard

user32: Pass correct flags in CreateIconFromResource().

parent 3b26e293
...@@ -1592,7 +1592,7 @@ HICON WINAPI CreateIconFromResourceEx( LPBYTE bits, UINT cbSize, ...@@ -1592,7 +1592,7 @@ HICON WINAPI CreateIconFromResourceEx( LPBYTE bits, UINT cbSize,
HICON WINAPI CreateIconFromResource( LPBYTE bits, UINT cbSize, HICON WINAPI CreateIconFromResource( LPBYTE bits, UINT cbSize,
BOOL bIcon, DWORD dwVersion) BOOL bIcon, DWORD dwVersion)
{ {
return CreateIconFromResourceEx( bits, cbSize, bIcon, dwVersion, 0,0,0); return CreateIconFromResourceEx( bits, cbSize, bIcon, dwVersion, 0, 0, LR_DEFAULTSIZE | LR_SHARED );
} }
......
...@@ -1595,10 +1595,8 @@ static void test_CreateIconFromResource(void) ...@@ -1595,10 +1595,8 @@ static void test_CreateIconFromResource(void)
/* Test the icon information. */ /* Test the icon information. */
SetLastError(0xdeadbeef); SetLastError(0xdeadbeef);
ret = GetIconInfo(handle, &icon_info); ret = GetIconInfo(handle, &icon_info);
todo_wine
ok(ret, "GetIconInfo() failed.\n"); ok(ret, "GetIconInfo() failed.\n");
error = GetLastError(); error = GetLastError();
todo_wine
ok(error == 0xdeadbeef, "Last error: %u\n", error); ok(error == 0xdeadbeef, "Last error: %u\n", error);
if (ret) if (ret)
...@@ -1616,14 +1614,10 @@ static void test_CreateIconFromResource(void) ...@@ -1616,14 +1614,10 @@ static void test_CreateIconFromResource(void)
ICONINFOEXA infoex; ICONINFOEXA infoex;
infoex.cbSize = sizeof(infoex); infoex.cbSize = sizeof(infoex);
ret = pGetIconInfoExA( handle, &infoex ); ret = pGetIconInfoExA( handle, &infoex );
todo_wine
ok( ret, "GetIconInfoEx failed err %d\n", GetLastError() ); ok( ret, "GetIconInfoEx failed err %d\n", GetLastError() );
if (ret)
{
ok( infoex.wResID == 0, "GetIconInfoEx wrong resid %x\n", infoex.wResID ); ok( infoex.wResID == 0, "GetIconInfoEx wrong resid %x\n", infoex.wResID );
ok( infoex.szModName[0] == 0, "GetIconInfoEx wrong module %s\n", infoex.szModName ); ok( infoex.szModName[0] == 0, "GetIconInfoEx wrong module %s\n", infoex.szModName );
ok( infoex.szResName[0] == 0, "GetIconInfoEx wrong name %s\n", infoex.szResName ); ok( infoex.szResName[0] == 0, "GetIconInfoEx wrong name %s\n", infoex.szResName );
}
} }
/* Test creating an icon. */ /* Test creating an icon. */
...@@ -1637,10 +1631,8 @@ static void test_CreateIconFromResource(void) ...@@ -1637,10 +1631,8 @@ static void test_CreateIconFromResource(void)
/* Test the icon information. */ /* Test the icon information. */
SetLastError(0xdeadbeef); SetLastError(0xdeadbeef);
ret = GetIconInfo(handle, &icon_info); ret = GetIconInfo(handle, &icon_info);
todo_wine
ok(ret, "GetIconInfo() failed.\n"); ok(ret, "GetIconInfo() failed.\n");
error = GetLastError(); error = GetLastError();
todo_wine
ok(error == 0xdeadbeef, "Last error: %u\n", error); ok(error == 0xdeadbeef, "Last error: %u\n", error);
if (ret) if (ret)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment