--- ./programs/Xserver/hw/xwin/save_winwin32rootlesswindow.c	2005-08-07 14:05:20.000000000 +0100
+++ ./programs/Xserver/hw/xwin/winwin32rootlesswindow.c	2005-08-07 14:05:50.000000000 +0100
@@ -164,7 +164,7 @@
   WindowPtr		pWin;
   HICON			hIcon, hiconOld;
 
-  pWin = LookupIDByType (id, RT_WINDOW);
+  pWin = (WindowPtr) LookupIDByType (id, RT_WINDOW);
   hIcon = (HICON)winOverrideIcon ((unsigned long)pWin);
 
   if (!hIcon)
--- ./programs/Xserver/hw/xwin/save_winmultiwindowicons.c	2005-11-21 12:32:23.000000000 +0000
+++ ./programs/Xserver/hw/xwin/winmultiwindowicons.c	2005-11-21 12:39:44.000000000 +0000
@@ -282,7 +282,7 @@
   winMultiWindowGetWMHints (pWin, &hints);
   if (!hints.icon_pixmap) return NULL;
 
-  iconPtr = LookupIDByType (hints.icon_pixmap, RT_PIXMAP);
+  iconPtr = (PixmapPtr) LookupIDByType (hints.icon_pixmap, RT_PIXMAP);
   
   if (!iconPtr) return NULL;
   
@@ -311,7 +311,7 @@
   memset (mask, 0, maskStride * iconSize);
   
   winScaleXBitmapToWindows (iconSize, effBPP, iconPtr, image);
-  maskPtr = LookupIDByType (hints.icon_mask, RT_PIXMAP);
+  maskPtr = (PixmapPtr) LookupIDByType (hints.icon_mask, RT_PIXMAP);
 
   if (maskPtr) 
     {
@@ -369,7 +369,8 @@
   WindowPtr		pWin;
   HICON			hIcon, hiconOld;
 
-  pWin = LookupIDByType (id, RT_WINDOW);
+  pWin = (WindowPtr) LookupIDByType (id, RT_WINDOW);
+  if (!pWin) return;
   hIcon = (HICON)winOverrideIcon ((unsigned long)pWin);
 
   if (!hIcon)