Changeset 9394 for trunk/src

Timestamp:

Nov 12, 2002, 4:11:30 PM (23 years ago)

Author:

sandervl

Message:

Wine updates

Location:

trunk/src/comctl32

Files:

• comboex.c (modified) (4 diffs)
• imagelist.c (modified) (2 diffs)
• propsheet.c (modified) (4 diffs)
• toolbar.c (modified) (3 diffs)

trunk/src/comctl32/comboex.c

@@ -298 +298 @@
     ZeroMemory(&nmce, sizeof(nmce));
     nmce.ceItem.mask = CBEIF_TEXT;
+    nmce.ceItem.lParam = item->lParam;
     COMBOEX_NotifyItem(infoPtr, CBEN_GETDISPINFOW, &nmce);
 
@@ -1392 +1393 @@
             ZeroMemory(&nmce, sizeof(nmce));
             nmce.ceItem.mask = CBEIF_INDENT;
+            nmce.ceItem.lParam = item->lParam;
             COMBOEX_NotifyItem(infoPtr, CBEN_GETDISPINFOW, &nmce);
             if (nmce.ceItem.mask & CBEIF_DI_SETITEM)
@@ -1455 +1457 @@
             ZeroMemory(&nmce, sizeof(nmce));
             nmce.ceItem.mask = (drawstate == ILD_NORMAL) ? CBEIF_IMAGE : CBEIF_SELECTEDIMAGE;
+            nmce.ceItem.lParam = item->lParam;
             COMBOEX_NotifyItem(infoPtr, CBEN_GETDISPINFOW, &nmce);
             if (drawstate == ILD_NORMAL) {
@@ -1469 +1472 @@
             ZeroMemory(&nmce, sizeof(nmce));
             nmce.ceItem.mask = CBEIF_OVERLAY;
+            nmce.ceItem.lParam = item->lParam;
             COMBOEX_NotifyItem(infoPtr, CBEN_GETDISPINFOW, &nmce);
             if (nmce.ceItem.mask & CBEIF_DI_SETITEM)

trunk/src/comctl32/imagelist.c

@@ -1075 +1075 @@
 ImageList_DrawIndirect (IMAGELISTDRAWPARAMS *pimldp)
 {
-    INT cx, cy, nOvlIdx;
+    INT cx, cy, lx, ly, nOvlIdx;
     DWORD fState, dwRop;
     UINT fStyle;
@@ -1082 +1082 @@
     HBITMAP hImageBmp, hOldImageBmp, hOldImageListBmp, hOldMaskListBmp, hBlendMaskBmp;
     BOOL bIsTransparent, bBlend, bResult = FALSE;
-    const HIMAGELIST himl = pimldp->himl;
-    const INT lx = himl->cx * pimldp->i + pimldp->xBitmap;
-    const INT ly = pimldp->yBitmap;
-   
-    if (!pimldp || !himl) return FALSE;
+    HIMAGELIST himl;
+
+    if (!pimldp || !(himl = pimldp->himl)) return FALSE;
     if ((pimldp->i < 0) || (pimldp->i >= himl->cCurImage)) return FALSE;
-   
+
+    lx = himl->cx * pimldp->i + pimldp->xBitmap;
+    ly = pimldp->yBitmap;
+
     fState = pimldp->cbSize < sizeof(IMAGELISTDRAWPARAMS) ? ILS_NORMAL : pimldp->fState;
     fStyle = pimldp->fStyle & ~ILD_OVERLAYMASK;

trunk/src/comctl32/propsheet.c

@@ -171 +171 @@
 static BOOL PROPSHEET_DoCommand(HWND hwnd, WORD wID);
 
-BOOL WINAPI
+INT_PTR CALLBACK
 PROPSHEET_DialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
 
@@ -593 +593 @@
                                     (LPDLGTEMPLATEW) temp,
                                     psInfo->ppshheader.hwndParent,
-                                    (DLGPROC) PROPSHEET_DialogProc,
+                                    PROPSHEET_DialogProc,
                                     (LPARAM)psInfo);
   else
@@ -599 +599 @@
                                        (LPDLGTEMPLATEW) temp,
                                        psInfo->ppshheader.hwndParent,
-                                       (DLGPROC) PROPSHEET_DialogProc,
+                                       PROPSHEET_DialogProc,
                                        (LPARAM)psInfo) ? TRUE : FALSE;
 
@@ -2663 +2663 @@
  *            PROPSHEET_DialogProc
  */
-BOOL WINAPI
+INT_PTR CALLBACK
 PROPSHEET_DialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {

trunk/src/comctl32/toolbar.c

@@ -1630 +1630 @@
  * This function implements the toolbar customization dialog.
  */
-static BOOL WINAPI
+static INT_PTR CALLBACK
 TOOLBAR_CustomizeDialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
@@ -2371 +2371 @@
             ti.hinst    = 0;
             ti.lpszText = LPSTR_TEXTCALLBACKW;
+            ti.lParam   = lParam;
 
             SendMessageW (infoPtr->hwndToolTip, TTM_ADDTOOLW,
@@ -2769 +2770 @@
                                    (LPDLGTEMPLATEA)template,
                                    hwnd,
-                                   (DLGPROC)TOOLBAR_CustomizeDialogProc,
+                                   TOOLBAR_CustomizeDialogProc,
                                    (LPARAM)&custInfo);