Changeset 2309 for trunk/src/user32/new/loadres.cpp

Timestamp:

Jan 3, 2000, 9:53:50 PM (26 years ago)

Author:

cbratschi

Message:

ported all USER32 bitmaps, several bug fixes

File:

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

trunk/src/user32/new/loadres.cpp

@@ -1 @@
-/* $Id: loadres.cpp,v 1.13 2000-01-01 14:57:16 cbratschi Exp $ */
+/* $Id: loadres.cpp,v 1.14 2000-01-03 20:53:49 cbratschi Exp $ */
 
 /*
@@ -95 +95 @@
 #ifdef DEBUG_ENABLELOG_LEVEL2
     if(i) {
-        char *astring = (char *)HEAP_strdupWtoA(GetProcessHeap(), 0, lpBuffer);
-        dprintf(("LoadStringW from %X, id %d %s\n", hinst, wID, astring));
-        HEAP_free(astring);
+        char *astring = (char *)HEAP_strdupWtoA(GetProcessHeap(), 0, lpBuffer);
+        dprintf(("LoadStringW from %X, id %d %s\n", hinst, wID, astring));
+        HEAP_free(astring);
     }
 #else
@@ -232 +232 @@
 }
 //******************************************************************************
-//******************************************************************************
-BOOL IsSystemBitmap(ULONG *id)
-{
-   switch(*id)
-   {
-        case OBM_UPARROW_W:
-        case OBM_DNARROW_W:
-        case OBM_RGARROW_W:
-        case OBM_LFARROW_W:
-        case OBM_RESTORE_W:
-        case OBM_RESTORED_W:
-        case OBM_UPARROWD_W:
-        case OBM_DNARROWD_W:
-        case OBM_RGARROWD_W:
-        case OBM_LFARROWD_W:
-        case OBM_OLD_UPARROW_W:
-        case OBM_OLD_DNARROW_W:
-        case OBM_OLD_RGARROW_W:
-        case OBM_OLD_LFARROW_W:
-        case OBM_CHECK_W:
-        case OBM_CHECKBOXES_W:
-        case OBM_BTNCORNERS_W:
-        case OBM_COMBO_W:
-        case OBM_REDUCE_W:
-        case OBM_REDUCED_W:
-        case OBM_ZOOM_W:
-        case OBM_ZOOMD_W:
-        case OBM_SIZE_W:
-        case OBM_CLOSE_W:
-        case OBM_MNARROW_W:
-        case OBM_UPARROWI_W:
-        case OBM_DNARROWI_W:
-        case OBM_RGARROWI_W:
-        case OBM_LFARROWI_W:
-                return TRUE;
-
-        //TODO: Not supported by Open32. Replacement may not be accurate
-        case OBM_OLD_CLOSE_W:
-                *id = OBM_CLOSE_W;
-                return TRUE;
-
-        case OBM_BTSIZE_W:
-                *id = OBM_SIZE_W;
-                return TRUE;
-
-        case OBM_OLD_REDUCE_W:
-                *id = OBM_REDUCE_W;
-                return TRUE;
-
-        case OBM_OLD_ZOOM_W:
-                *id = OBM_ZOOM_W;
-                return TRUE;
-
-        case OBM_OLD_RESTORE_W:
-                *id = OBM_RESTORE_W;
-                return TRUE;
-
-        default:
-                return FALSE;
-   }
-}
-//******************************************************************************
 //NOTE: LR_CREATEDIBSECTION flag doesn't work (crash in GDI32)!
 //******************************************************************************
@@ -390 +328 @@
  HBITMAP hBitmap = 0;
 
-  if (!hinst)
-  {
-    if(IsSystemBitmap((ULONG *)&lpszBitmap))
-    {
-      hBitmap = O32_LoadBitmap(hInstanceUser32,lpszBitmap);
-      if (!hBitmap) hBitmap = O32_LoadBitmap(hinst,lpszBitmap);
-    } else hBitmap = 0;
-  } else hBitmap = LoadBitmapA(hinst, lpszBitmap, 0, 0, 0);
+  return LoadBitmapA((hinst == 0) ? hInstanceUser32:hinst,lpszBitmap,0,0,0);
   dprintf(("LoadBitmapA returned %08xh\n", hBitmap));
 
@@ -409 +340 @@
  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));
@@ -541 +462 @@
 //              return BITMAP_CopyBitmap(hnd);
         case IMAGE_ICON:
-                return CopyIcon(hnd);
+                return CopyIcon(hnd);
         case IMAGE_CURSOR:
-                return CopyCursor(hnd);
-//              return CopyCursorIcon(hnd,type, desiredx, desiredy, flags);
+                return CopyCursor(hnd);
+//              return CopyCursorIcon(hnd,type, desiredx, desiredy, flags);
         default:
                 dprintf(("CopyImage: Unsupported type"));