Changeset 647 for trunk/src

Timestamp:

Aug 23, 1999, 3:58:19 PM (26 years ago)

Author:

sandervl

Message:

Icon load bugfix + dummy functions for comdlg32

Location:

trunk/src/user32/new

Files:

• USER32EXP.DEF (modified) (2 diffs)
• dummy.cpp (added)
• makefile (modified) (3 diffs)
• oslibres.cpp (modified) (5 diffs)
• user32.def (modified) (2 diffs)

trunk/src/user32/new/USER32EXP.DEF

@@ -1 @@
-; $Id: USER32EXP.DEF,v 1.2 1999-07-18 20:41:12 cbratschi Exp $
+; $Id: USER32EXP.DEF,v 1.3 1999-08-23 13:56:48 sandervl Exp $
 
 ;Created by BLAST for IBM's compiler
@@ -595 +595 @@
 
 
+    CreateWindowProc                    @2000
+    GetOS2Callback__15Win32WindowProcFv @2001
 
 _GetSysColorPen@4                       @2002

trunk/src/user32/new/makefile

@@ -1 @@
-# $Id: makefile,v 1.30 1999-08-23 10:49:23 phaller Exp $
+# $Id: makefile,v 1.31 1999-08-23 13:58:19 sandervl Exp $
 
 #
@@ -33 +33 @@
         oslibutil.obj oslibmsg.obj dib.obj \
         winprop.obj wingdi.obj oslibgdi.obj winaccel.obj winscrollbar.obj \
-        nativerc.obj oslibres.obj
+        nativerc.obj oslibres.obj dummy.obj
 
 
@@ -56 +56 @@
 user32.obj: user32.cpp $(PDWIN32_INCLUDE)\wndproc.h \
             $(PDWIN32_INCLUDE)\winicon.h syscolor.h
+dummy.obj: dummy.cpp
 char.obj: char.cpp user32.h
 loadres.obj: loadres.cpp user32.h dib.h

trunk/src/user32/new/oslibres.cpp

@@ -1 @@
-/* $Id: oslibres.cpp,v 1.5 1999-08-20 20:09:51 sandervl Exp $ */
+/* $Id: oslibres.cpp,v 1.6 1999-08-23 13:56:35 sandervl Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -58 +58 @@
  HBITMAP     hbmColor, hbmMask;
  BITMAPARRAYFILEHEADER2 *bafh = (BITMAPARRAYFILEHEADER2 *)iconbitmap;
- BITMAPFILEHEADER2 *bfh;
+ BITMAPFILEHEADER2 *bfhBW;
+ BITMAPFILEHEADER2 *bfhColor;
  HPS         hps;
  HANDLE      hIcon;
@@ -66 +67 @@
         return 0;
     }
-    //skip xor/and mask
-    bfh = (BITMAPFILEHEADER2 *)((char *)&bafh->bfh2 + sizeof(RGB2)*2 + sizeof(BITMAPFILEHEADER2));
+    if(bafh->usType == BFT_BITMAPARRAY && bafh->cbSize == sizeof(BITMAPARRAYFILEHEADER2)) {
+        bfhBW    = &bafh->bfh2;
+        bfhColor = (BITMAPFILEHEADER2 *)((char *)&bafh->bfh2 + sizeof(RGB2)*2 + sizeof(BITMAPFILEHEADER2));
+    }
+    else {//single icon
+        bfhBW    = (BITMAPFILEHEADER2 *)iconbitmap;
+        bfhColor = (BITMAPFILEHEADER2 *)((char *)bfhBW + sizeof(RGB2)*2 + sizeof(BITMAPFILEHEADER2));
+        bafh     = (BITMAPARRAYFILEHEADER2 *)bfhBW; //for calculation bitmap offset
+    }
     hps = WinGetPS(HWND_DESKTOP);
-    hbmColor = GpiCreateBitmap(hps, &bfh->bmp2, CBM_INIT, 
-                               (char *)bafh + bfh->offBits,
-                               (BITMAPINFO2 *)&bfh->bmp2);
+    hbmColor = GpiCreateBitmap(hps, &bfhColor->bmp2, CBM_INIT, 
+                               (char *)bafh + bfhColor->offBits,
+                               (BITMAPINFO2 *)&bfhColor->bmp2);
     if(hbmColor == GPI_ERROR) {
         dprintf(("OSLibWinCreateIcon: GpiCreateBitmap failed!"));
@@ -77 +85 @@
         return 0;
     }
-    hbmMask = GpiCreateBitmap(hps, &bafh->bfh2.bmp2, CBM_INIT, 
-                              (char *)bafh + bafh->bfh2.offBits,
-                              (BITMAPINFO2 *)&bafh->bfh2.bmp2);
+    hbmMask = GpiCreateBitmap(hps, &bfhBW->bmp2, CBM_INIT, 
+                              (char *)bafh + bfhBW->offBits,
+                              (BITMAPINFO2 *)&bfhBW->bmp2);
     if(hbmMask == GPI_ERROR) {
         dprintf(("OSLibWinCreateIcon: GpiCreateBitmap hbmMask failed!"));
@@ -88 +96 @@
 
     pointerInfo.fPointer   = FALSE; //icon
-    pointerInfo.xHotspot   = bfh->xHotspot;
-    pointerInfo.yHotspot   = bfh->yHotspot;
+    pointerInfo.xHotspot   = bfhBW->xHotspot;
+    pointerInfo.yHotspot   = bfhBW->yHotspot;
     pointerInfo.hbmColor   = hbmColor;
     pointerInfo.hbmPointer = hbmMask;

trunk/src/user32/new/user32.def

@@ -1 @@
-; $Id: user32.def,v 1.4 1999-08-05 23:40:16 phaller Exp $
+; $Id: user32.def,v 1.5 1999-08-23 13:56:47 sandervl Exp $
 
 ;Created by BLAST for IBM's compiler
@@ -599 +599 @@
     EnumDisplayMonitors        = _EnumDisplayMonitors@16        @1005
 
+    CreateWindowProc                    @2000
+    GetOS2Callback__15Win32WindowProcFv = GetOS2Callback__Fv @2001
+
 ; Wine helper function
     GetSysColorPen              = _GetSysColorPen@4              @2002