commit b4bb1f7dce3995d5ebef38a534cd262dc2f63492
author Alexandre Julliard <julliard@winehq.org> Thu Nov 30 18:54:34 2000 +0000
committer Alexandre Julliard <julliard@winehq.org> Thu Nov 30 18:54:34 2000 +0000
tree e3f7362aedd988a691d9370667ca10e9d4094421
parent 80338d4afd05c2dce5c55d51bc179422a93c53b4

Fixed progman internal dependencies and build it like the other
programs.

programs/progman/grpfile.c

diff --git a/programs/progman/grpfile.c b/programs/progman/grpfile.c
index 61d74b4..dbcbecb 100644
--- a/programs/progman/grpfile.c
+++ b/programs/progman/grpfile.c
@@ -271,9 +271,9 @@
   if (iconANDbits_ptr + iconANDsize > buffer + size ||
       iconXORbits_ptr + iconXORsize > buffer + size) return(0);
 
-  hIcon = CreateCursorIconIndirect16(Globals.hInstance, &iconinfo,
-				   (LPSTR)iconANDbits_ptr,
-				   (LPSTR)iconXORbits_ptr);
+  hIcon = CreateIcon( Globals.hInstance, iconinfo.nWidth, iconinfo.nHeight,
+                      iconinfo.bPlanes, iconinfo.bBitsPerPixel,
+                      iconANDbits_ptr, iconXORbits_ptr );
 
   lpszName        = buffer + GET_USHORT(program_ptr, 18);
   lpszCmdLine     = buffer + GET_USHORT(program_ptr, 20);
@@ -635,7 +635,8 @@
       LPVOID XorBits, AndBits;
       INT sizeXor = iconinfo->nHeight * iconinfo->nWidthBytes;
       INT sizeAnd = iconinfo->nHeight * ((iconinfo->nWidth + 15) / 16 * 2);
-      DumpIcon16(LocalLock(program->hIcon), 0, &XorBits, &AndBits);
+      /* FIXME: this is broken anyway */
+      /* DumpIcon16(LocalLock(program->hIcon), 0, &XorBits, &AndBits);*/
 
       PUT_SHORT(buffer, 0, iconinfo->ptHotSpot.x);
       PUT_SHORT(buffer, 2, iconinfo->ptHotSpot.y);