Changeset 2383 for trunk/src/user32/loadres.cpp

Timestamp:

Jan 9, 2000, 3:38:30 PM (26 years ago)

Author:

sandervl

Message:

Several updates/bug fixes

File:

• trunk/src/user32/loadres.cpp (modified) (4 diffs)

trunk/src/user32/loadres.cpp

@@ -1 @@
-/* $Id: loadres.cpp,v 1.17 1999-12-30 11:20:34 sandervl Exp $ */
+/* $Id: loadres.cpp,v 1.18 2000-01-09 14:37:09 sandervl Exp $ */
 
 /*
@@ -390 +390 @@
  HBITMAP hBitmap = 0;
 
+  return LoadBitmapA((hinst == 0) ? hInstanceUser32:hinst,lpszBitmap,0,0,0);
+#if 0
   if (!hinst)
   {
@@ -399 +401 @@
   } else hBitmap = LoadBitmapA(hinst, lpszBitmap, 0, 0, 0);
   dprintf(("LoadBitmapA returned %08xh\n", hBitmap));
-
+#endif
   return(hBitmap);
 }
@@ -409 +411 @@
  HBITMAP hBitmap = 0;
 
-  if (!hinst)
-  {
-    if(IsSystemBitmap((ULONG *)&lpszBitmap))
-    {
-      hBitmap = O32_LoadBitmap(hInstanceUser32,(LPCSTR)lpszBitmap);
-      if (!hBitmap) hBitmap = O32_LoadBitmap(hinst,(LPCSTR)lpszBitmap);
-    } else hBitmap = 0;
-  } else
-  {
-    if(HIWORD(lpszBitmap) != 0)
-      lpszBitmap = (LPWSTR)UnicodeToAsciiString((LPWSTR)lpszBitmap);
-
-    hBitmap = LoadBitmapA(hinst, (LPSTR)lpszBitmap, 0, 0, 0);
-
-    if(HIWORD(lpszBitmap) != 0)
-      FreeAsciiString((LPSTR)lpszBitmap);
-  }
+  if(HIWORD(lpszBitmap) != 0)
+    lpszBitmap = (LPWSTR)UnicodeToAsciiString((LPWSTR)lpszBitmap);
+
+  hBitmap = LoadBitmapA((hinst == 0) ? hInstanceUser32:hinst, (LPSTR)lpszBitmap, 0, 0, 0);
+
+  if(HIWORD(lpszBitmap) != 0)
+    FreeAsciiString((LPSTR)lpszBitmap);
 
   dprintf(("LoadBitmapW returned %08xh\n", hBitmap));