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

Timestamp:

Mar 28, 2001, 6:20:32 PM (24 years ago)

Author:

sandervl

Message:

log msg updates

File:

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

trunk/src/user32/loadres.cpp

@@ -1 @@
-/* $Id: loadres.cpp,v 1.35 2001-03-27 16:17:51 sandervl Exp $ */
+/* $Id: loadres.cpp,v 1.36 2001-03-28 16:20:32 sandervl Exp $ */
 
 /*
@@ -94 +94 @@
     }
 
-#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);
-    }
-#else
-    dprintf(("LoadStringW from %X, id %d buffersize %d\n", hinst, wID, cchBuffer));
-#endif
+         dprintf(("LoadStringW from %X, id %d %ls buffersize %d", hinst, wID, lpBuffer, cchBuffer));
+    }
+    else dprintf(("LoadStringW from %X, id %d buffersize %d", hinst, wID, cchBuffer));
     return(i);
 }
@@ -119 +114 @@
 HICON WIN32API LoadIconW(HINSTANCE hinst, LPCWSTR lpszIcon)
 {
-    dprintf(("LoadIconA %x %x", hinst, lpszIcon));
+    if(HIWORD(lpszIcon)) {
+         dprintf(("LoadIconW %x %ls", hinst, lpszIcon));
+    }
+    else dprintf(("LoadIconW %x %x", hinst, lpszIcon));
     return LoadImageW(hinst, lpszIcon, IMAGE_ICON, 0, 0, LR_SHARED | LR_DEFAULTSIZE);
 }
@@ -344 +342 @@
 
   if(HIWORD(lpszBitmap)) {
-        dprintf(("LoadBitmapW %x %s returned %08xh\n", hinst, lpszBitmap, hBitmap));
+        dprintf(("LoadBitmapW %x %ls returned %08xh\n", hinst, lpszBitmap, hBitmap));
   }
   else  dprintf(("LoadBitmapW %x %x returned %08xh\n", hinst, lpszBitmap, hBitmap));
@@ -382 +380 @@
  HANDLE hRet = 0;
 
-  dprintf(("LoadImageW %x %x %d (%d,%d)\n", hinst, lpszName, uType, cxDesired, cyDesired));
+  if(HIWORD(lpszName)) {
+        dprintf(("LoadImageW %x %ls %d (%d,%d)\n", hinst, lpszName, uType, cxDesired, cyDesired));
+  }
+  else  dprintf(("LoadImageW %x %x %d (%d,%d)\n", hinst, lpszName, uType, cxDesired, cyDesired));
 
   if (fuLoad & LR_DEFAULTSIZE) {