Changeset 2126 for trunk/src/comctl32/imagelist.c

Timestamp:

Dec 18, 1999, 9:57:01 PM (26 years ago)

Author:

achimha

Message:

WINE 991212 updates - treeview missing

File:

• trunk/src/comctl32/imagelist.c (modified) (8 diffs)

trunk/src/comctl32/imagelist.c

@@ -1 @@
-/* $Id: imagelist.c,v 1.9 1999-11-21 11:04:36 achimha Exp $ */
+/* $Id: imagelist.c,v 1.10 1999-12-18 20:56:58 achimha Exp $ */
 /*
  *  ImageList implementation
@@ -30 +30 @@
 */
 
-/* WINE 990923 level */
+/* WINE 991212 level */
 
 /* This must be defined because the HIMAGELIST type is just a pointer
@@ -42 +42 @@
 #include "commctrl.h"
 #include "comctl32.h"
+#include "winerror.h"
 
 #define _MAX(a,b) (((a)>(b))?(a):(b))
@@ -1910 +1911 @@
 HIMAGELIST WINAPI ImageList_Read (PVOID pstm)
 {
+//    HRESULT errCode;
+//    ULONG ulRead;
+//    ILHEAD ilHead;
+//    HIMAGELIST himl;
+
+
     dprintf(("ImageList_Read empty stub!\n"));
 
-    return NULL;
+//    errCode = IStream_Read (pstm, &ilHead, sizeof(ILHEAD), &ulRead);
+//    if (errCode != S_OK)
+//    return NULL;
+
+    FIXME("Magic: 0x%x\n", ilHead.usMagic);
+
+//    himl = ImageList_Create (32, 32, ILD_NORMAL, 2, 2);
+
+//    return himl;
+  return 0;
 }
 
@@ -2395 +2411 @@
         BitBlt (hdcBitmap, 0, 0, nCopyCount * himl->cx, himl->cy,
                   hdcImageList, 0, 0, SRCCOPY);
-
+#if 0
         /* delete 'empty' image space */
         SetBkColor (hdcBitmap, RGB(255, 255, 255));
@@ -2401 +2417 @@
         PatBlt (hdcBitmap,  nCopyCount * himl->cx, 0,
                   (nNewCount - nCopyCount) * himl->cx, himl->cy, BLACKNESS);
-
+#endif
         DeleteObject (himl->hbmImage);
         himl->hbmImage = hbmNewBitmap;
@@ -2420 +2436 @@
             BitBlt (hdcBitmap, 0, 0, nCopyCount * himl->cx, himl->cy,
                       hdcImageList, 0, 0, SRCCOPY);
-
+#if 0
             /* delete 'empty' image space */
             SetBkColor (hdcBitmap, RGB(255, 255, 255));
@@ -2426 +2442 @@
             PatBlt (hdcBitmap,  nCopyCount * himl->cx, 0,
                       (nNewCount - nCopyCount) * himl->cx, himl->cy, BLACKNESS);
-
+#endif
             DeleteObject (himl->hbmMask);
             himl->hbmMask = hbmNewBitmap;