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

[Alexandre Julliard]

Module: wine
Branch: refs/heads/master
Commit: 37c68b47f4ee8da0e98e44103455fd17f9462401
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=37c68b47f4ee8da0e98e4410...

Author: Michael Kaufmann <hallo(a)michael-kaufmann.ch>
Date:   Tue Jan 10 12:07:32 2006 +0100

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

---

 dlls/user/cursoricon.c     |    1 -
 dlls/user/tests/resource.c |   13 +++++++++++++
 2 files changed, 13 insertions(+), 1 deletions(-)

diff --git a/dlls/user/cursoricon.c b/dlls/user/cursoricon.c
index 038f457..c093051 100644
--- a/dlls/user/cursoricon.c
+++ b/dlls/user/cursoricon.c
@@ -2114,7 +2114,6 @@ static HBITMAP BITMAP_Load( HINSTANCE in
         if (!instance)
         {
             /* OEM bitmap: try to load the resource from user32.dll */
-            if (HIWORD(name)) return 0;
             instance = user32_module;
         }
 
diff --git a/dlls/user/tests/resource.c b/dlls/user/tests/resource.c
index 893d52e..c910253 100644
--- a/dlls/user/tests/resource.c
+++ b/dlls/user/tests/resource.c
@@ -283,6 +283,18 @@ static void test_PrivateExtractIcons(voi
     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)
 {
     init_function_pointers();
@@ -290,4 +302,5 @@ START_TEST(resource)
     test_accel1();
     test_accel2();
     test_PrivateExtractIcons();
+    test_LoadImage();
 }