Changeset 9370 for trunk/src/comctl32/propsheet.c

Timestamp:

Oct 29, 2002, 1:19:36 PM (23 years ago)

Author:

sandervl

Message:

Wine resync

File:

• trunk/src/comctl32/propsheet.c (modified) (63 diffs)

trunk/src/comctl32/propsheet.c

@@ -25 +25 @@
 
 #include <string.h>
+
 #include "winbase.h"
 #include "commctrl.h"
@@ -30 +31 @@
 #include "winnls.h"
 #include "comctl32.h"
+#include "heap.h"
+
 #include "wine/debug.h"
-#include "heap.h"
-
+#include "wine/unicode.h"
 
 /******************************************************************************
  * Data structures
  */
+#include "pshpack2.h"
+
 typedef struct
 {
@@ -45 +49 @@
   DWORD style;
 } MyDLGTEMPLATEEX;
+
+typedef struct
+{
+  DWORD helpid;
+  DWORD exStyle;
+  DWORD style;
+  short x;
+  short y;
+  short cy;
+  DWORD id;
+} MyDLGITEMTEMPLATEEX;
+#include "poppack.h"
 
 typedef struct tagPropPageInfo
@@ -89 +105 @@
  */
 
-const WCHAR PropSheetInfoStr[] = 
+const WCHAR PropSheetInfoStr[] =
     {'P','r','o','p','e','r','t','y','S','h','e','e','t','I','n','f','o',0 };
 
@@ -139 +155 @@
                                 int skipdir,
                                 HPROPSHEETPAGE hpage);
+static void PROPSHEET_SetCurSelId(HWND hwndDlg, int id);
 static LRESULT PROPSHEET_QuerySiblings(HWND hwndDlg,
                                        WPARAM wParam, LPARAM lParam);
@@ -210 +227 @@
 
 /******************************************************************************
+ *            PROPSHEET_GetPageRect
+ *
+ * Retrieve rect from tab control and map into the dialog for SetWindowPos
+ */
+static void PROPSHEET_GetPageRect(const PropSheetInfo * psInfo, HWND hwndDlg, RECT *rc)
+{
+    HWND hwndTabCtrl = GetDlgItem(hwndDlg, IDC_TABCONTROL);
+
+    GetClientRect(hwndTabCtrl, rc);
+    SendMessageW(hwndTabCtrl, TCM_ADJUSTRECT, FALSE, (LPARAM)rc);
+    MapWindowPoints(hwndTabCtrl, hwndDlg, (LPPOINT)rc, 2);
+}
+
+/******************************************************************************
  *            PROPSHEET_FindPageByResId
  *
@@ -262 +293 @@
 
   memcpy(&psInfo->ppshheader,lppsh,dwSize);
-  TRACE("\n** PROPSHEETHEADER **\ndwSize\t\t%ld\ndwFlags\t\t%08lx\nhwndParent\t%04x\nhInstance\t%08x\npszCaption\t'%s'\nnPages\t\t%d\npfnCallback\t%p\n",
+  TRACE("\n** PROPSHEETHEADER **\ndwSize\t\t%ld\ndwFlags\t\t%08lx\nhwndParent\t%p\nhInstance\t%p\npszCaption\t'%s'\nnPages\t\t%d\npfnCallback\t%p\n",
         lppsh->dwSize, lppsh->dwFlags, lppsh->hwndParent, lppsh->hInstance,
         debugstr_a(lppsh->pszCaption), lppsh->nPages, lppsh->pfnCallback);
@@ -313 +344 @@
 
   memcpy(&psInfo->ppshheader,lppsh,dwSize);
-  TRACE("\n** PROPSHEETHEADER **\ndwSize\t\t%ld\ndwFlags\t\t%08lx\nhwndParent\t%04x\nhInstance\t%08x\npszCaption\t'%s'\nnPages\t\t%d\npfnCallback\t%p\n",
+  TRACE("\n** PROPSHEETHEADER **\ndwSize\t\t%ld\ndwFlags\t\t%08lx\nhwndParent\t%p\nhInstance\t%p\npszCaption\t'%s'\nnPages\t\t%d\npfnCallback\t%p\n",
       lppsh->dwSize, lppsh->dwFlags, lppsh->hwndParent, lppsh->hInstance, debugstr_w(lppsh->pszCaption), lppsh->nPages, lppsh->pfnCallback);
 
@@ -443 +474 @@
       p += lstrlenW( (LPCWSTR)p ) + 1;
       break;
-  } 
+  }
 
   /* class */
@@ -492 +523 @@
    * Build the image list for icons
    */
-  if ((dwFlags & PSP_USEHICON) || (dwFlags & PSP_USEICONID)) 
+  if ((dwFlags & PSP_USEHICON) || (dwFlags & PSP_USEICONID))
   {
     HICON hIcon;
@@ -499 +530 @@
 
     if (dwFlags & PSP_USEICONID)
-      hIcon = LoadImageW(lppsp->hInstance, lppsp->u2.pszIcon, IMAGE_ICON, 
+      hIcon = LoadImageW(lppsp->hInstance, lppsp->u2.pszIcon, IMAGE_ICON,
                          icon_cx, icon_cy, LR_DEFAULTCOLOR);
     else
@@ -569 +600 @@
                                        psInfo->ppshheader.hwndParent,
                                        (DLGPROC) PROPSHEET_DialogProc,
-                                       (LPARAM)psInfo);
+                                       (LPARAM)psInfo) ? TRUE : FALSE;
 
   COMCTL32_Free(temp);
@@ -578 +609 @@
 /******************************************************************************
  *            PROPSHEET_SizeMismatch
- * 
+ *
  *     Verify that the tab control and the "largest" property sheet page dlg. template
  *     match in size.
@@ -702 +733 @@
       psInfo->height = MulDiv((rc.bottom - rc.top),8,units.top);
   }
-  
+
   if ((rc.right - rc.left) < (tabRect.right - tabRect.left))
   {
@@ -716 +747 @@
   rc.right -= rc.left;
   rc.bottom -= rc.top;
+  TRACE("setting tab %08lx, rc (0,0)-(%d,%d)\n",
+        (DWORD)hwndTabCtrl, rc.right, rc.bottom);
   SetWindowPos(hwndTabCtrl, 0, 0, 0, rc.right, rc.bottom,
                SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE);
@@ -730 +763 @@
    * Resize the property sheet.
    */
+  TRACE("setting dialog %08lx, rc (0,0)-(%d,%d)\n",
+        (DWORD)hwndDlg, rc.right, rc.bottom);
   SetWindowPos(hwndDlg, 0, 0, 0, rc.right, rc.bottom,
                SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE);
@@ -779 +814 @@
       psInfo->height = MulDiv((rc.bottom - rc.top), 8, units.top);
   }
-  
+
   if ((rc.right - rc.left) < (tabRect.right - tabRect.left))
   {
@@ -787 +822 @@
 
   TRACE("Biggest page %d %d %d %d\n", rc.left, rc.top, rc.right, rc.bottom);
+  TRACE("   constants padx=%d, pady=%d, butH=%d, lH=%d\n",
+        padding.x, padding.y, buttonHeight, lineHeight);
 
   /* Make room */
@@ -795 +832 @@
    * Resize the property sheet.
    */
+  TRACE("setting dialog %08lx, rc (0,0)-(%d,%d)\n",
+        (DWORD)hwndDlg, rc.right, rc.bottom);
   SetWindowPos(hwndDlg, 0, 0, 0, rc.right, rc.bottom,
                SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE);
@@ -829 +868 @@
   /*
    * Get the size of the property sheet.
-   */ 
+   */
   GetClientRect(hwndParent, &rcSheet);
 
-  /* 
+  /*
    * All buttons will be at this y coordinate.
    */
@@ -868 +907 @@
     else
       x = rcSheet.right - (padding.x + buttonWidth);
-  
+
     SetWindowPos(hwndButton, 0, x, y, 0, 0,
                  SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE);
@@ -885 +924 @@
   {
     x = rcSheet.right - (padding.x + buttonWidth);
-  
+
     SetWindowPos(hwndButton, 0, x, y, 0, 0,
                  SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE);
@@ -1064 +1103 @@
     }
   }
-  
+
   hwndControl = GetDlgItem(hwndDlg, idButton);
   GetWindowRect(hwndControl, &rc);
@@ -1136 +1175 @@
 
   return TRUE;
+}
+/*
+ * Get the size of an in-memory Template
+ *
+ *( Based on the code of PROPSHEET_CollectPageInfo)
+ */
+
+static UINT GetTemplateSize(DLGTEMPLATE* pTemplate)
+
+{
+  const WORD*  p = (const WORD *)pTemplate;
+  BOOL  istemplateex = (((MyDLGTEMPLATEEX*)pTemplate)->signature == 0xFFFF);
+  WORD nrofitems;
+
+  if (istemplateex)
+  {
+    /* DIALOGEX template */
+
+    p++;       /* dlgVer    */
+    p++;       /* signature */
+    p += 2;    /* help ID   */
+    p += 2;    /* ext style */
+    p += 2;    /* style     */
+  }
+  else
+  {
+    /* DIALOG template */
+
+    p += 2;    /* style     */
+    p += 2;    /* ext style */
+  }
+
+  nrofitems =   (WORD)*p; p++;    /* nb items */
+  p++;    /*   x      */
+  p++;    /*   y      */
+  p++;    /*   width  */
+  p++;    /*   height */
+
+  /* menu */
+  switch ((WORD)*p)
+  {
+    case 0x0000:
+      p++;
+      break;
+    case 0xffff:
+      p += 2;
+      break;
+    default:
+      TRACE("menu %s\n",debugstr_w((LPCWSTR)p));
+      p += lstrlenW( (LPCWSTR)p ) + 1;
+      break;
+  }
+
+  /* class */
+  switch ((WORD)*p)
+  {
+    case 0x0000:
+      p++;
+      break;
+    case 0xffff:
+      p += 2;
+      break;
+    default:
+      TRACE("class %s\n",debugstr_w((LPCWSTR)p));
+      p += lstrlenW( (LPCWSTR)p ) + 1;
+      break;
+  }
+
+  /*title */
+  TRACE("title %s\n",debugstr_w((LPCWSTR)p));
+  p += lstrlenW((LPCWSTR)p) + 1;
+
+  /* font, if DS_FONT set */
+  if ((DS_SETFONT & ((istemplateex)?  ((MyDLGTEMPLATEEX*)pTemplate)->style :
+                     pTemplate->style)))
+    {
+      p+=(istemplateex)?3:1;
+      TRACE("font %s\n",debugstr_w((LPCWSTR)p));
+      p += lstrlenW( (LPCWSTR)p ) + 1; /* the font name*/
+    }
+
+  TRACE("%d items\n",nrofitems);
+  while (nrofitems > 0)
+    {
+      p = (WORD*)(((DWORD)p + 3) & ~3); /* DWORD align */
+      
+      p += (istemplateex ? sizeof(MyDLGITEMTEMPLATEEX) : sizeof(DLGITEMTEMPLATE))/sizeof(WORD);
+      
+      switch ((WORD)*p)
+        {
+        case 0x0000:
+          p++;
+          break;
+        case 0xffff:
+          TRACE("class ordinal 0x%08lx\n",*(DWORD*)p);
+          p += 2;
+          break;
+        default:
+          TRACE("class %s\n",debugstr_w((LPCWSTR)p));
+          p += lstrlenW( (LPCWSTR)p ) + 1;
+          break;
+        }
+      switch ((WORD)*p)
+        {
+        case 0x0000:
+          p++;
+          break;
+        case 0xffff:
+          TRACE("text ordinal 0x%08lx\n",*(DWORD*)p);
+          p += 2;
+          break;
+        default:
+          TRACE("text %s\n",debugstr_w((LPCWSTR)p));
+          p += lstrlenW( (LPCWSTR)p ) + 1;
+          break;
+        }
+      p += *p + 1;    /* Skip extra data */
+      --nrofitems;
+    }
+  
+  TRACE("%p %p size 0x%08x\n",p, (WORD*)pTemplate,sizeof(WORD)*(p - (WORD*)pTemplate));
+  return (p - (WORD*)pTemplate)*sizeof(WORD);
+  
 }
 
@@ -1165 +1327 @@
 
   if (ppshpage->dwFlags & PSP_DLGINDIRECT)
-    pTemplate = (DLGTEMPLATE*)ppshpage->u.pResource;
+    {
+      pTemplate = (DLGTEMPLATE*)ppshpage->u.pResource;
+      resSize = GetTemplateSize(pTemplate);
+    }
   else
   {
@@ -1187 +1352 @@
      * Make a copy of the dialog template to make it writable
      */
-    temp = COMCTL32_Alloc(resSize);
-    if (!temp)
-      return FALSE;
-
-    memcpy(temp, pTemplate, resSize);
-    pTemplate = temp;
-  }
+  }
+  temp = COMCTL32_Alloc(resSize);
+  if (!temp)
+    return FALSE;
+  
+  memcpy(temp, pTemplate, resSize);
+  pTemplate = temp;
 
   if (((MyDLGTEMPLATEEX*)pTemplate)->signature == 0xFFFF)
@@ -1234 +1399 @@
   ppInfo[index].hwndPage = hwndPage;
 
-  rc.left = psInfo->x;
-  rc.top = psInfo->y;
-  rc.right = psInfo->width;
-  rc.bottom = psInfo->height;
-
-  MapDialogRect(hwndParent, &rc);
-
-  pageWidth = rc.right - rc.left;
-  pageHeight = rc.bottom - rc.top;
-
-  if (psInfo->ppshheader.dwFlags & INTRNL_ANY_WIZARD)
-    padding = PROPSHEET_GetPaddingInfoWizard(hwndParent, psInfo);
-  else
-  {
-    /*
-     * Ask the Tab control to fit this page in.
-     */
-
-    HWND hwndTabCtrl = GetDlgItem(hwndParent, IDC_TABCONTROL);
-    SendMessageW(hwndTabCtrl, TCM_ADJUSTRECT, FALSE, (LPARAM)&rc);
-    padding = PROPSHEET_GetPaddingInfo(hwndParent);
-  }
-
-  SetWindowPos(hwndPage, HWND_TOP,
-               rc.left + padding.x/2,
-               rc.top + padding.y/2,
-               pageWidth, pageHeight, 0);
+  if (psInfo->ppshheader.dwFlags & INTRNL_ANY_WIZARD) {
+      /* FIXME: This code may no longer be correct.
+       *        It was not for the non-wizard path.  (GLA 6/02)
+       */
+      rc.left = psInfo->x;
+      rc.top = psInfo->y;
+      rc.right = psInfo->width;
+      rc.bottom = psInfo->height;
+
+      MapDialogRect(hwndParent, &rc);
+
+      pageWidth = rc.right - rc.left;
+      pageHeight = rc.bottom - rc.top;
+
+      padding = PROPSHEET_GetPaddingInfoWizard(hwndParent, psInfo);
+      TRACE("setting page %08lx, rc (%d,%d)-(%d,%d) w=%d, h=%d, padx=%d, pady=%d\n",
+            (DWORD)hwndPage, rc.left, rc.top, rc.right, rc.bottom,
+            pageWidth, pageHeight, padding.x, padding.y);
+      SetWindowPos(hwndPage, HWND_TOP,
+                   rc.left + padding.x/2,
+                   rc.top + padding.y/2,
+                   pageWidth, pageHeight, 0);
+  }
+  else {
+      /*
+       * Ask the Tab control to reduce the client rectangle to that
+       * it has available.
+       */
+      PROPSHEET_GetPageRect(psInfo, hwndParent, &rc);
+      pageWidth = rc.right - rc.left;
+      pageHeight = rc.bottom - rc.top;
+      TRACE("setting page %08lx, rc (%d,%d)-(%d,%d) w=%d, h=%d\n",
+            (DWORD)hwndPage, rc.left, rc.top, rc.right, rc.bottom,
+            pageWidth, pageHeight);
+      SetWindowPos(hwndPage, HWND_TOP,
+                   rc.left, rc.top,
+                   pageWidth, pageHeight, 0);
+  }
 
   return TRUE;
@@ -1326 +1502 @@
   psn.hdr.idFrom   = 0;
   psn.lParam       = 0;
- 
+
   hwndPage = psInfo->proppage[psInfo->active_page].hwndPage;
 
@@ -1365 +1541 @@
   psn.hdr.idFrom   = 0;
   psn.lParam       = 0;
- 
+
   hwndPage = psInfo->proppage[psInfo->active_page].hwndPage;
 
@@ -1404 +1580 @@
   psn.hdr.idFrom   = 0;
   psn.lParam       = 0;
- 
+
   hwndPage = psInfo->proppage[psInfo->active_page].hwndPage;
 
@@ -1441 +1617 @@
   psn.hdr.idFrom   = 0;
   psn.lParam       = 0;
- 
+
 
   /*
@@ -1458 +1634 @@
   psn.hdr.code = PSN_APPLY;
   psn.lParam   = lParam;
- 
+
   for (i = 0; i < psInfo->nPages; i++)
   {
@@ -1505 +1681 @@
   psn.hdr.idFrom   = 0;
   psn.lParam       = 0;
- 
+
   if (SendMessageA(hwndPage, WM_NOTIFY, 0, (LPARAM) &psn))
     return;
@@ -1511 +1687 @@
   psn.hdr.code = PSN_RESET;
   psn.lParam   = lParam;
- 
+
   for (i = 0; i < psInfo->nPages; i++)
   {
@@ -1548 +1724 @@
   psn.hdr.idFrom   = 0;
   psn.lParam       = 0;
- 
+
   SendMessageA(hwndPage, WM_NOTIFY, 0, (LPARAM) &psn);
 }
@@ -1650 +1826 @@
 
 /*************************************************************************
- * BOOL PROPSHEET_CanSetCurSel [Internal] 
+ * BOOL PROPSHEET_CanSetCurSel [Internal]
  *
  * Test whether the current page can be changed by sending a PSN_KILLACTIVE
@@ -1710 +1886 @@
   PropSheetInfo* psInfo = (PropSheetInfo*) GetPropW(hwndDlg, PropSheetInfoStr);
   HWND hwndHelp  = GetDlgItem(hwndDlg, IDHELP);
+  HWND hwndTabControl = GetDlgItem(hwndDlg, IDC_TABCONTROL);
 
   TRACE("index %d, skipdir %d, hpage %p\n", index, skipdir, hpage);
@@ -1725 +1902 @@
     int result;
     PSHNOTIFY psn;
+
+    if (hwndTabControl)
+        SendMessageW(hwndTabControl, TCM_SETCURSEL, index, 0);
 
     psn.hdr.code     = PSN_SETACTIVE;
@@ -1772 +1952 @@
 
 /******************************************************************************
+ *            PROPSHEET_SetCurSelId
+ *
+ * Selects the page, specified by resource id.
+ */
+static void PROPSHEET_SetCurSelId(HWND hwndDlg, int id)
+{
+      int idx;
+      PropSheetInfo* psInfo =
+          (PropSheetInfo*) GetPropW(hwndDlg, PropSheetInfoStr);
+
+      idx = PROPSHEET_FindPageByResId(psInfo, id);
+      if (idx < psInfo->nPages )
+      {
+          if (PROPSHEET_CanSetCurSel(hwndDlg) != FALSE)
+              PROPSHEET_SetCurSel(hwndDlg, idx, 1, 0);
+      }
+}
+
+/******************************************************************************
  *            PROPSHEET_SetTitleA
  */
@@ -1779 +1978 @@
   {
      WCHAR szTitle[256];
-     MultiByteToWideChar(CP_ACP, 0, lpszText, -1, 
+     MultiByteToWideChar(CP_ACP, 0, lpszText, -1,
                              szTitle, sizeof szTitle);
      PROPSHEET_SetTitleW(hwndDlg, dwStyle, szTitle);
@@ -1799 +1998 @@
   TRACE("'%s' (style %08lx)\n", debugstr_w(lpszText), dwStyle);
   if (HIWORD(lpszText) == 0) {
-    if (!LoadStringW(psInfo->ppshheader.hInstance, 
+    if (!LoadStringW(psInfo->ppshheader.hInstance,
                      LOWORD(lpszText), szTitle, sizeof(szTitle)-sizeof(WCHAR)))
       return;
@@ -1930 +2129 @@
   item.pszText = (LPWSTR) psInfo->proppage[psInfo->nPages].pszText;
   item.cchTextMax = MAX_TABTEXT_LENGTH;
+
+  if (psInfo->hImageList)
+  {
+    SendMessageW(hwndTabControl, TCM_SETIMAGELIST, 0, (LPARAM)psInfo->hImageList);
+  }
+
+  if ( psInfo->proppage[psInfo->nPages].hasIcon )
+  {
+    item.mask |= TCIF_IMAGE;
+    item.iImage = psInfo->nPages;
+  }
 
   SendMessageW(hwndTabControl, TCM_INSERTITEMW, psInfo->nPages + 1,
@@ -2021 +2231 @@
      DestroyPropertySheetPage(psInfo->proppage[index].hpage);
   }
- 
+
   /* Remove the tab */
   SendMessageW(hwndTabControl, TCM_DELETEITEM, index, 0);
@@ -2028 +2238 @@
   psInfo->proppage = COMCTL32_Alloc(sizeof(PropPageInfo) * psInfo->nPages);
 
-  if (index > 0)  
+  if (index > 0)
     memcpy(&psInfo->proppage[0], &oldPages[0], index * sizeof(PropPageInfo));
 
@@ -2156 +2366 @@
 
 /******************************************************************************
- *            PropertySheet    (COMCTL32.87)
- *            PropertySheetA   (COMCTL32.88)
+ *            PropertySheet    (COMCTL32.@)
+ *            PropertySheetA   (COMCTL32.@)
  */
 INT WINAPI PropertySheetA(LPCPROPSHEETHEADERA lppsh)
@@ -2201 +2411 @@
 
 /******************************************************************************
- *            PropertySheetW   (COMCTL32.89)
+ *            PropertySheetW   (COMCTL32.@)
  */
 INT WINAPI PropertySheetW(LPCPROPSHEETHEADERW lppsh)
@@ -2245 +2455 @@
 
 /******************************************************************************
- *            CreatePropertySheetPage    (COMCTL32.18)
- *            CreatePropertySheetPageA   (COMCTL32.19)
+ *            CreatePropertySheetPage    (COMCTL32.@)
+ *            CreatePropertySheetPageA   (COMCTL32.@)
  */
 HPROPSHEETPAGE WINAPI CreatePropertySheetPageA(
@@ -2257 +2467 @@
   if ( !(ppsp->dwFlags & PSP_DLGINDIRECT) && HIWORD( ppsp->u.pszTemplate ) )
   {
-      PROPSHEET_AtoW(&ppsp->u.pszTemplate, lpPropSheetPage->u.pszTemplate); 
+      PROPSHEET_AtoW(&ppsp->u.pszTemplate, lpPropSheetPage->u.pszTemplate);
   }
   if ( (ppsp->dwFlags & PSP_USEICONID) && HIWORD( ppsp->u2.pszIcon ) )
   {
-      PROPSHEET_AtoW(&ppsp->u2.pszIcon, lpPropSheetPage->u2.pszIcon); 
+      PROPSHEET_AtoW(&ppsp->u2.pszIcon, lpPropSheetPage->u2.pszIcon);
   }
 
   if ((ppsp->dwFlags & PSP_USETITLE) && HIWORD( ppsp->pszTitle ))
   {
-      PROPSHEET_AtoW(&ppsp->pszTitle, lpPropSheetPage->pszTitle); 
+      PROPSHEET_AtoW(&ppsp->pszTitle, lpPropSheetPage->pszTitle);
   }
   else if ( !(ppsp->dwFlags & PSP_USETITLE) )
@@ -2275 +2485 @@
 
 /******************************************************************************
- *            CreatePropertySheetPageW   (COMCTL32.20)
+ *            CreatePropertySheetPageW   (COMCTL32.@)
  */
 HPROPSHEETPAGE WINAPI CreatePropertySheetPageW(LPCPROPSHEETPAGEW lpPropSheetPage)
@@ -2310 +2520 @@
 
 /******************************************************************************
- *            DestroyPropertySheetPage   (COMCTL32.24)
+ *            DestroyPropertySheetPage   (COMCTL32.@)
  */
 BOOL WINAPI DestroyPropertySheetPage(HPROPSHEETPAGE hPropPage)
@@ -2456 +2666 @@
 PROPSHEET_DialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
-  TRACE("hwnd=%x msg=%x wparam=%x lparam=%lx\n", 
+  TRACE("hwnd=%p msg=%x wparam=%x lparam=%lx\n",
         hwnd, uMsg, wParam, lParam);
 
@@ -2472 +2682 @@
 
       /*
-       * psInfo->hwnd is not being used by WINE code - it exists 
-       * for compatibility with "real" Windoze. The same about 
+       * psInfo->hwnd is not being used by WINE code - it exists
+       * for compatibility with "real" Windoze. The same about
        * SetWindowLong - WINE is only using the PropSheetInfoStr
        * property.
@@ -2499 +2709 @@
           hIcon = psInfo->ppshheader.u.hIcon;
 
-        SendMessageW(hwnd, WM_SETICON, 0, hIcon);
+        SendMessageW(hwnd, WM_SETICON, 0, (LPARAM)hIcon);
       }
-      
+
       if (psInfo->ppshheader.dwFlags & PSH_USEHICON)
-        SendMessageW(hwnd, WM_SETICON, 0, psInfo->ppshheader.u.hIcon);
+        SendMessageW(hwnd, WM_SETICON, 0, (LPARAM)psInfo->ppshheader.u.hIcon);
 
       psInfo->strPropertiesFor = strCaption;
@@ -2528 +2738 @@
       }
 
-      if (psInfo->useCallback) 
-             (*(psInfo->ppshheader.pfnCallback))(hwnd, 
-                                              PSCB_INITIALIZED, (LPARAM)0); 
+      if (psInfo->useCallback)
+             (*(psInfo->ppshheader.pfnCallback))(hwnd,
+                                              PSCB_INITIALIZED, (LPARAM)0);
 
       idx = psInfo->active_page;
       ppshpage = (LPCPROPSHEETPAGEW)psInfo->proppage[idx].hpage;
       psInfo->active_page = -1;
- 
+
       PROPSHEET_SetCurSel(hwnd, idx, 1, psInfo->proppage[idx].hpage);
 
@@ -2548 +2758 @@
          WCHAR szText[256];
 
-         if (LoadStringW(psInfo->ppshheader.hInstance, 
+         if (LoadStringW(psInfo->ppshheader.hInstance,
                  (UINT)psInfo->ppshheader.pszCaption, szText, 255))
             PROPSHEET_SetTitleW(hwnd, psInfo->ppshheader.dwFlags, szText);
@@ -2601 +2811 @@
         hwndPage = psInfo->proppage[psInfo->active_page].hwndPage;
 
-      SetWindowLongW(hwnd, DWL_MSGRESULT, hwndPage);
+      SetWindowLongW(hwnd, DWL_MSGRESULT, (LONG)hwndPage);
 
       return TRUE;
@@ -2618 +2828 @@
       HWND hwndTabCtrl = GetDlgItem(hwnd, IDC_TABCONTROL);
 
-      SetWindowLongW(hwnd, DWL_MSGRESULT, hwndTabCtrl);
+      SetWindowLongW(hwnd, DWL_MSGRESULT, (LONG)hwndTabCtrl);
 
       return TRUE;
@@ -2650 +2860 @@
       if (LoadStringW(COMCTL32_hModule, IDS_CLOSE, buf, sizeof(buf)))
          SetWindowTextW(hwndOK, buf);
- 
+
       return FALSE;
     }
@@ -2665 +2875 @@
     case PSM_REBOOTSYSTEM:
     {
-      PropSheetInfo* psInfo = (PropSheetInfo*) GetPropW(hwnd, 
+      PropSheetInfo* psInfo = (PropSheetInfo*) GetPropW(hwnd,
                                                         PropSheetInfoStr);
 
@@ -2675 +2885 @@
       PROPSHEET_SetTitleA(hwnd, (DWORD) wParam, (LPCSTR) lParam);
       return TRUE;
-   
+
     case PSM_SETTITLEW:
       PROPSHEET_SetTitleW(hwnd, (DWORD) wParam, (LPCWSTR) lParam);
@@ -2731 +2941 @@
 
     case PSM_SETFINISHTEXTA:
-      PROPSHEET_SetFinishTextA(hwnd, (LPCSTR) lParam);        
+      PROPSHEET_SetFinishTextA(hwnd, (LPCSTR) lParam);
       return TRUE;
 
@@ -2739 +2949 @@
 
     case PSM_SETCURSELID:
-        FIXME("Unimplemented msg PSM_SETCURSELID\n");
-        return FALSE;
+        PROPSHEET_SetCurSelId(hwnd, (int)lParam);
+        return TRUE;
 
     case PSM_SETFINISHTEXTW:
-        PROPSHEET_SetFinishTextW(hwnd, (LPCWSTR) lParam);        
+        PROPSHEET_SetFinishTextW(hwnd, (LPCWSTR) lParam);
         return FALSE;
 
@@ -2749 +2959 @@
       return FALSE;
   }
-  
+
   return FALSE;
 }
-