Commit 37c68b47 authored by Michael Kaufmann's avatar Michael Kaufmann Committed by Alexandre Julliard

user: The LoadImage resource string may be a numeric string.

parent ee9b656e
...@@ -2114,7 +2114,6 @@ static HBITMAP BITMAP_Load( HINSTANCE instance, LPCWSTR name, ...@@ -2114,7 +2114,6 @@ static HBITMAP BITMAP_Load( HINSTANCE instance, LPCWSTR name,
if (!instance) if (!instance)
{ {
/* OEM bitmap: try to load the resource from user32.dll */ /* OEM bitmap: try to load the resource from user32.dll */
if (HIWORD(name)) return 0;
instance = user32_module; instance = user32_module;
} }
......
...@@ -283,6 +283,18 @@ static void test_PrivateExtractIcons(void) { ...@@ -283,6 +283,18 @@ static void test_PrivateExtractIcons(void) {
ok(cIcons == 4, "Three icons requested, four expected, got cIcons=%d\n", cIcons); ok(cIcons == 4, "Three icons requested, four expected, got cIcons=%d\n", cIcons);
} }
static void test_LoadImage(void) {
HBITMAP bmp;
bmp = LoadBitmapA(NULL, MAKEINTRESOURCE(OBM_CHECK));
ok(bmp != NULL, "Could not load the OBM_CHECK bitmap");
if (bmp) DeleteObject(bmp);
bmp = LoadBitmapA(NULL, "#32760"); /* Value of OBM_CHECK */
ok(bmp != NULL, "Could not load the OBM_CHECK bitmap");
if (bmp) DeleteObject(bmp);
}
START_TEST(resource) START_TEST(resource)
{ {
init_function_pointers(); init_function_pointers();
...@@ -290,4 +302,5 @@ START_TEST(resource) ...@@ -290,4 +302,5 @@ START_TEST(resource)
test_accel1(); test_accel1();
test_accel2(); test_accel2();
test_PrivateExtractIcons(); test_PrivateExtractIcons();
test_LoadImage();
} }
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