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

Timestamp:

Oct 24, 1999, 1:05:05 AM (26 years ago)

Author:

sandervl

Message:

Combobox + windowpos changes + fixes

Location:

trunk/src/user32

Files:

• . (modified) (1 prop)
• loadres.cpp (modified) (6 diffs)

trunk/src/user32/loadres.cpp

@@ -1 @@
-/* $Id: loadres.cpp,v 1.9 1999-10-14 19:31:29 sandervl Exp $ */
+/* $Id: loadres.cpp,v 1.10 1999-10-23 23:04:35 sandervl Exp $ */
 
 /*
@@ -34 +34 @@
     if(winres == NULL) {
         dprintf(("LoadStringA NOT FOUND from %X, id %d buffersize %d\n", hinst, wID, cchBuffer));
+        *lpBuffer = 0;
         return 0;
     }
@@ -61 +62 @@
     if(winres == NULL) {
         dprintf(("LoadStringW NOT FOUND from %X, id %d buffersize %d\n", hinst, wID, cchBuffer));
+        *lpBuffer = 0;
         return 0;
     }
@@ -328 +330 @@
         hBitmap = O32_LoadBitmap(hinst, lpszBitmap);
   }
-  else {
+  if(!hBitmap) {
         hBitmap = LoadBitmapA(hinst, lpszBitmap, 0, 0, 0);
   }
@@ -345 +347 @@
         hBitmap = O32_LoadBitmap(hinst, (LPCSTR)lpszBitmap);
   }
-  else {
+  if(!hBitmap) {
         if(HIWORD(lpszBitmap) != 0) {
                  lpszBitmap = (LPWSTR)UnicodeToAsciiString((LPWSTR)lpszBitmap);
@@ -368 +370 @@
  HANDLE hRet = 0;
 
-  dprintf(("LoadImageA NOT COMPLETE (%d,%d)\n", cxDesired, cyDesired));
+  if(HIWORD(lpszName)) {
+        dprintf(("LoadImageA NOT COMPLETE %x %s %d (%d,%d)\n", hinst, lpszName, uType, cxDesired, cyDesired));
+  }
+  else  dprintf(("LoadImageA NOT COMPLETE %x %x %d (%d,%d)\n", hinst, lpszName, uType, cxDesired, cyDesired));
 
   if (fuLoad & LR_DEFAULTSIZE) {