I updated the patch a little more to handle WM_QUERYDRAGICON as well 
(something else that was complained about with GeoShell), since it's dealt 
with similarly to WM_GETICON (lparam is unused and an HICON is returned in 
the result). An odd effect now is that apps are showing one of GeoShell's 
arrows for program icons in the taskbar, whereas before it was the Wine 
glass. I didn't change anything directly relating to WM_GETICON, so I have no 
idea what could have caused it to change like that.
Index: dlls/user/message.c
===================================================================
RCS file: /home/wine/wine/dlls/user/message.c,v
retrieving revision 1.111
diff -u -r1.111 message.c
--- dlls/user/message.c	23 May 2006 12:48:46 -0000	1.111
+++ dlls/user/message.c	11 Jun 2006 05:46:23 -0000
@@ -625,6 +625,11 @@
         FIXME( "WM_NCPAINT hdc packing not supported yet\n" );
         data->count = -1;
         return 0;
+    case WM_GETICON:
+    case WM_QUERYDRAGICON:
+        /* WM_GETICON and WM_QUERYDRAGICON doesn't give or return any data. The
+           result of the reply is the value we care about */
+        return 0;
     case WM_PAINT:
         if (!wparam) return 0;
         /* fall through */
@@ -648,9 +653,7 @@
     case WM_PAINTCLIPBOARD:
     case WM_SIZECLIPBOARD:
     /* these contain HICON */
-    case WM_GETICON:
     case WM_SETICON:
-    case WM_QUERYDRAGICON:
     case WM_QUERYPARKICON:
     /* these contain pointers */
     case WM_DROPOBJECT:
@@ -911,9 +914,7 @@
     case WM_PAINTCLIPBOARD:
     case WM_SIZECLIPBOARD:
     /* these contain HICON */
-    case WM_GETICON:
     case WM_SETICON:
-    case WM_QUERYDRAGICON:
     case WM_QUERYPARKICON:
     /* these contain pointers */
     case WM_DROPOBJECT:


Reply via email to