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

Timestamp:

Nov 15, 1999, 12:29:25 AM (26 years ago)

Author:

sandervl

Message:

GetIconInfo hack

File:

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

trunk/src/user32/loadres.cpp

@@ -1 @@
-/* $Id: loadres.cpp,v 1.15 1999-11-09 17:07:21 cbratschi Exp $ */
+/* $Id: loadres.cpp,v 1.16 1999-11-14 23:29:25 sandervl Exp $ */
 
 /*
@@ -6 +6 @@
  * Copyright 1998 Sander van Leeuwen
  *
- * Parts based on Wine code (objects\bitmap.c, loader\resource.c):
+ * Parts based on Wine code (objects\bitmap.c, loader\resource.c, objects\cursoricon.c):
  *
  * Copyright 1993 Alexandre Julliard
+ *           1993 Robert J. Amstadt
+ *           1996 Martin Von Loewis
+ *           1997 Alex Korobka
+ *           1998 Turchanov Sergey
  *           1998 Huw D M Davies
- *           1993 Robert J. Amstadt
  *
  * Project Odin Software License can be found in LICENSE.TXT
@@ -24 +27 @@
 #include "dib.h"
 #include "initterm.h"
+#include <win\cursoricon.h>
 
 //******************************************************************************
@@ -89 +93 @@
     delete winres;
 
+#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
     return(i);
 }
@@ -529 +541 @@
 //              return BITMAP_CopyBitmap(hnd);
         case IMAGE_ICON:
-                return CopyIcon(hnd);
+                return CopyIcon(hnd);
         case IMAGE_CURSOR:
-                return CopyCursor(hnd);
+                return CopyCursor(hnd);
+//              return CopyCursorIcon(hnd,type, desiredx, desiredy, flags);
         default:
                 dprintf(("CopyImage: Unsupported type"));