static control: Don't load OEM bitmaps.

97be4fa9 · Michael Kaufmann · Alexandre Julliard · 2ddbc7b6 · 97be4fa9
Commit 97be4fa9 authored Jan 17, 2006 by Michael Kaufmann Committed by Alexandre Julliard Jan 17, 2006
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 8 deletions

static.c dlls/user/static.c +4 -8

No files found.
--- a/dlls/user/static.c
+++ b/dlls/user/static.c
@@ -278,10 +278,8 @@ static HICON STATIC_LoadIconW( HWND hwnd, LPCWSTR name, DWORD style )
 static HBITMAP STATIC_LoadBitmapA( HWND hwnd, LPCSTR name )
 {
    HINSTANCE hInstance = (HINSTANCE)GetWindowLongPtrW( hwnd, GWLP_HINSTANCE );
-    HBITMAP hbitmap = LoadBitmapA( hInstance, name );
+    /* Windows doesn't try to load OEM Bitmaps (hInstance == NULL) */
-    if (!hbitmap)  /* Try OEM icon (FIXME: is this right?) */
+    return LoadBitmapA( hInstance, name );
-        hbitmap = LoadBitmapA( 0, name );
-    return hbitmap;
 }
 /***********************************************************************
@@ -292,10 +290,8 @@ static HBITMAP STATIC_LoadBitmapA( HWND hwnd, LPCSTR name )
 static HBITMAP STATIC_LoadBitmapW( HWND hwnd, LPCWSTR name )
 {
    HINSTANCE hInstance = (HINSTANCE)GetWindowLongPtrW( hwnd, GWLP_HINSTANCE );
-    HBITMAP hbitmap = LoadBitmapW( hInstance, name );
+    /* Windows doesn't try to load OEM Bitmaps (hInstance == NULL) */
-    if (!hbitmap)  /* Try OEM icon (FIXME: is this right?) */
+    return LoadBitmapW( hInstance, name );
-        hbitmap = LoadBitmapW( 0, name );
-    return hbitmap;
 }
 /***********************************************************************