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

Timestamp:

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

Author:

achimha

Message:

WINE 991212 updates - treeview missing

File:

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

trunk/src/comctl32/propsheet.c

@@ -1 @@
-/* $Id: propsheet.c,v 1.16 1999-11-27 18:14:37 achimha Exp $ */
+/* $Id: propsheet.c,v 1.17 1999-12-18 20:56:59 achimha Exp $ */
 /*
  * Property Sheets
@@ -13 +13 @@
  */
 
-/* WINE 991114 level */
+/* WINE 991212 level */
 
 /* CB: Odin problems:
@@ -23 +23 @@
 #include "commctrl.h"
 #include "prsht.h"
+#include "dialog.h"
+#include "win.h"
 #include "winnls.h"
 #include "comctl32.h"
-
+#include "heap.h"
 
 /******************************************************************************
@@ -41 +43 @@
 typedef struct tagPropPageInfo
 {
-  int index; /* corresponds to the index in ppshheader->ppsp */
   HPROPSHEETPAGE hpage; /* to keep track of pages not passed to PropertySheet */
   HWND hwndPage;
@@ -48 +49 @@
   BOOL hasHelp;
   BOOL useCallback;
+  BOOL hasIcon;
 } PropPageInfo;
 
@@ -55 +57 @@
   int nPages;
   int active_page;
-  LPCPROPSHEETHEADERA ppshheader;
+  LPPROPSHEETHEADERA ppshheader;
   BOOL isModeless;
   BOOL hasHelp;
@@ -62 +64 @@
   BOOL restartWindows;
   BOOL rebootSystem;
+  BOOL activeValid;
   PropPageInfo* proppage;
   int x;
@@ -84 +87 @@
 #define MAX_CAPTION_LENGTH 255
 #define MAX_TABTEXT_LENGTH 255
-
+#define MAX_BUTTONTEXT_LENGTH 64
 
 /******************************************************************************
@@ -102 +105 @@
 static int PROPSHEET_CreatePage(HWND hwndParent, int index,
                                 const PropSheetInfo * psInfo,
-                                LPCPROPSHEETPAGEA ppshpage,
-                                BOOL showPage);
+                                LPPROPSHEETPAGEA ppshpage);
 static BOOL PROPSHEET_ShowPage(HWND hwndDlg, int index, PropSheetInfo * psInfo);
 static PADDING_INFO PROPSHEET_GetPaddingInfo(HWND hwndDlg);
@@ -109 +111 @@
 static BOOL PROPSHEET_Next(HWND hwndDlg);
 static BOOL PROPSHEET_Finish(HWND hwndDlg);
-static BOOL PROPSHEET_Apply(HWND hwndDlg);
-static void PROPSHEET_Cancel(HWND hwndDlg);
+static BOOL PROPSHEET_Apply(HWND hwndDlg, LPARAM lParam);
+static void PROPSHEET_Cancel(HWND hwndDlg, LPARAM lParam);
 static void PROPSHEET_Help(HWND hwndDlg);
 static void PROPSHEET_Changed(HWND hwndDlg, HWND hwndDirtyPage);
@@ -123 +125 @@
 static LRESULT PROPSHEET_QuerySiblings(HWND hwndDlg,
                                        WPARAM wParam, LPARAM lParam);
-static LPCPROPSHEETPAGEA PROPSHEET_GetPSPPage(const PropSheetInfo * psInfo,
-                                              int index);
 static BOOL PROPSHEET_AddPage(HWND hwndDlg,
                               HPROPSHEETPAGE hpage);
@@ -135 +135 @@
 static void PROPSHEET_SetWizButtons(HWND hwndDlg, DWORD dwFlags);
 static PADDING_INFO PROPSHEET_GetPaddingInfoWizard(HWND hwndDlg);
+static BOOL PROPSHEET_IsDialogMessage(HWND hwnd, LPMSG lpMsg);
+static INT PROPSHEET_DoDialogBox( HWND hwnd, HWND owner);
 
 BOOL WINAPI
@@ -155 +157 @@
   psInfo->isModeless = dwFlags & PSH_MODELESS;
   psInfo->ppshheader = lppsh;
+  psInfo->ppshheader = COMCTL32_Alloc(sizeof(PROPSHEETHEADERA));
+  *psInfo->ppshheader = *lppsh;
+
+  if (HIWORD(lppsh->pszCaption))
+     psInfo->ppshheader->pszCaption = HEAP_strdupA( GetProcessHeap(),
+                                               0, lppsh->pszCaption );
+
   psInfo->nPages = lppsh->nPages;
 
@@ -164 +173 @@
   else
     psInfo->active_page = lppsh->u2.nStartPage;
+
+  if (psInfo->active_page < 0 || psInfo->active_page >= psInfo->nPages)
+     psInfo->active_page = 0;
 
   psInfo->restartWindows = FALSE;
   psInfo->rebootSystem = FALSE;
   psInfo->hImageList = 0;
+  psInfo->activeValid = FALSE;
 
   return TRUE;
@@ -187 +200 @@
   int width, height;
 
-  if (psInfo->ppshheader->dwFlags & PSH_PROPSHEETPAGE)
-    psInfo->proppage[index].hpage = 0;
+  psInfo->proppage[index].hpage = (HPROPSHEETPAGE)lppsp;
   psInfo->proppage[index].hwndPage = 0;
   psInfo->proppage[index].isDirty = FALSE;
@@ -198 +210 @@
   psInfo->proppage[index].useCallback = dwFlags & PSP_USECALLBACK;
   psInfo->proppage[index].hasHelp = dwFlags & PSP_HASHELP;
+  psInfo->proppage[index].hasIcon = dwFlags & (PSP_USEHICON | PSP_USEICONID);
 
   /* as soon as we have a page with the help flag, set the sheet flag on */
@@ -320 +333 @@
       hIcon = lppsp->u2.hIcon;
 
-    if (psInfo->hImageList == 0)
-      psInfo->hImageList = ImageList_Create(icon_cx, icon_cy, ILC_COLOR, 1, 1);
-
-    ImageList_AddIcon(psInfo->hImageList, hIcon);
+  if ( hIcon )
+    {
+      if (psInfo->hImageList == 0 )
+        psInfo->hImageList = ImageList_Create(icon_cx, icon_cy, ILC_COLOR, 1, 1);
+
+      ImageList_AddIcon(psInfo->hImageList, hIcon);
+    }
+
   }
 
   return TRUE;
+}
+
+/******************************************************************************
+ *            PROPSHEET_DoDialogBox
+ *
+ * Copied from windows/dialog.c:DIALOG_DoDialogBox
+ */
+static INT PROPSHEET_DoDialogBox( HWND hwnd, HWND owner)
+{
+   WND * wndPtr;
+   DIALOGINFO * dlgInfo;
+   MSG msg;
+   INT retval;
+
+//AH: that WINE internal - design violation!!1
+#if 0
+     /* Owner must be a top-level window */
+   owner = WIN_GetTopParent( owner );
+   if (!(wndPtr = WIN_FindWndPtr( hwnd ))) return -1;
+   dlgInfo = (DIALOGINFO *)wndPtr->wExtra;
+
+   if (!dlgInfo->flags & DF_END) /* was EndDialog called in WM_INITDIALOG ? */
+   {
+       EnableWindow( owner, FALSE );
+       ShowWindow( hwnd, SW_SHOW );
+       while (GetMessageA(&msg, 0, 0, 0))
+       {
+           if (!PROPSHEET_IsDialogMessage( hwnd, &msg))
+           {
+               TranslateMessage( &msg );
+               DispatchMessageA( &msg );
+           }
+           if (dlgInfo->flags & DF_END) break;
+       }
+       EnableWindow( owner, TRUE );
+   }
+   retval = dlgInfo->idResult; 
+
+   WIN_ReleaseWndPtr(wndPtr);
+#endif
+   DestroyWindow( hwnd );
+   return retval;
 }
 
@@ -335 +394 @@
  */
 
-//AH: WINE 990923 not merged due to changes from CB
+//AH: WINE 9912123 not merged due to design violation (internal WINE structures used)
 
 BOOL PROPSHEET_CreateDialog(PropSheetInfo* psInfo)
 {
+#if 0
   LRESULT ret;
   LPCVOID template;
+  LPVOID temp = 0;
   HRSRC hRes;
-
-  if (psInfo->useCallback)
-    (*(psInfo->ppshheader->pfnCallback))(0, PSCB_PRECREATE, (LPARAM)template);
-
-  if (!(hRes = FindResourceA(COMCTL32_hModule,
-                            MAKEINTRESOURCEA(IDD_PROPSHEET),
+  DWORD resSize;
+  WORD resID = IDD_PROPSHEET;
+
+  if (psInfo->ppshheader->dwFlags & PSH_WIZARD)
+    resID = IDD_WIZARD;
+
+  if(!(hRes = FindResourceA(COMCTL32_hModule,
+                            MAKEINTRESOURCEA(resID),
                             RT_DIALOGA)))
     return FALSE;
 
-  if (!(template = (LPVOID)LoadResource(COMCTL32_hModule, hRes)))
+  if(!(template = (LPVOID)LoadResource(COMCTL32_hModule, hRes)))
     return FALSE;
 
+  /*
+   * Make a copy of the dialog template.
+   */
+  resSize = SizeofResource(COMCTL32_hModule, hRes);
+
+  temp = COMCTL32_Alloc(resSize);
+
+  if (!temp)
+    return FALSE;
+
+  memcpy(temp, template, resSize);
+
   if (psInfo->useCallback)
-    (*(psInfo->ppshheader->pfnCallback))(0, PSCB_PRECREATE, (LPARAM)template);
+    (*(psInfo->ppshheader->pfnCallback))(0, PSCB_PRECREATE, (LPARAM)temp);
+
+  ret = CreateDialogIndirectParamA(psInfo->ppshheader->hInstance,
+                                     (LPDLGTEMPLATEA) temp,
+                                     psInfo->ppshheader->hwndParent,
+                                     (DLGPROC) PROPSHEET_DialogProc,
+                                     (LPARAM)psInfo);
+
+  if (!(psInfo->ppshheader->dwFlags & PSH_MODELESS))
+     ret = PROPSHEET_DoDialogBox((HWND)ret, psInfo->ppshheader->hwndParent);
+ 
+  COMCTL32_Free(temp);
+
+  return ret;
+#endif
+  LRESULT ret;
+  LPCVOID template;
+  LPVOID temp = 0;
+  HRSRC hRes;
+  DWORD resSize;
+  WORD resID = IDD_PROPSHEET;
+
+  if (psInfo->ppshheader->dwFlags & PSH_WIZARD)
+    resID = IDD_WIZARD;
+
+  if(!(hRes = FindResourceA(COMCTL32_hModule,
+                            MAKEINTRESOURCEA(resID),
+                            RT_DIALOGA)))
+    return FALSE;
+
+  if(!(template = (LPVOID)LoadResource(COMCTL32_hModule, hRes)))
+    return FALSE;
+
+  /*
+   * Make a copy of the dialog template.
+   */
+  resSize = SizeofResource(COMCTL32_hModule, hRes);
+
+  temp = COMCTL32_Alloc(resSize);
+
+  if (!temp)
+    return FALSE;
+
+  memcpy(temp, template, resSize);
+
+  if (psInfo->useCallback)
+    (*(psInfo->ppshheader->pfnCallback))(0, PSCB_PRECREATE, (LPARAM)temp);
 
   if (psInfo->ppshheader->dwFlags & PSH_MODELESS)
     ret = CreateDialogIndirectParamA(psInfo->ppshheader->hInstance,
-                                     (LPDLGTEMPLATEA) template,
+                                     (LPDLGTEMPLATEA) temp,
                                      psInfo->ppshheader->hwndParent,
                                      (DLGPROC) PROPSHEET_DialogProc,
@@ -365 +486 @@
   else
     ret = DialogBoxIndirectParamA(psInfo->ppshheader->hInstance,
-                                  (LPDLGTEMPLATEA) template,
+                                  (LPDLGTEMPLATEA) temp,
                                   psInfo->ppshheader->hwndParent,
                                   (DLGPROC) PROPSHEET_DialogProc,
                                   (LPARAM)psInfo);
+
+  COMCTL32_Free(temp);
 
   return ret;
@@ -840 +963 @@
   TCITEMA item;
   int i, nTabs;
+  int iImage = 0;
   char tabtext[MAX_TABTEXT_LENGTH] = "Tab text";
 
@@ -853 +977 @@
   if (psInfo->hImageList)
   {
-    item.mask |= TCIF_IMAGE;
     SendMessageA(hwndTabCtrl, TCM_SETIMAGELIST, 0, (LPARAM)psInfo->hImageList);
   }
@@ -859 +982 @@
   for (i = 0; i < nTabs; i++)
   {
-    item.iImage = i;
+    if ( psInfo->proppage[i].hasIcon )
+    {
+      item.mask |= TCIF_IMAGE;
+      item.iImage = iImage++;
+    }
+    else
+    {
+      item.mask &= ~TCIF_IMAGE;
+    }
 
     WideCharToMultiByte(CP_ACP, 0,
@@ -879 +1010 @@
                                 int index,
                                 const PropSheetInfo * psInfo,
-                                LPCPROPSHEETPAGEA ppshpage,
-                                BOOL showPage)
+                                LPPROPSHEETPAGEA ppshpage)
 {
   DLGTEMPLATE* pTemplate;
@@ -915 +1045 @@
   }
 
-  if (((MyDLGTEMPLATEEX*)pTemplate)->signature == 0xFFFF)
-  {
-    ((MyDLGTEMPLATEEX*)pTemplate)->style |= WS_CHILD;
+ if (((MyDLGTEMPLATEEX*)pTemplate)->signature == 0xFFFF)
+  {
+    ((MyDLGTEMPLATEEX*)pTemplate)->style |= WS_CHILD | DS_CONTROL;
     ((MyDLGTEMPLATEEX*)pTemplate)->style &= ~DS_MODALFRAME;
     ((MyDLGTEMPLATEEX*)pTemplate)->style &= ~WS_CAPTION;
@@ -923 +1053 @@
     ((MyDLGTEMPLATEEX*)pTemplate)->style &= ~WS_POPUP;
     ((MyDLGTEMPLATEEX*)pTemplate)->style &= ~WS_DISABLED;
+    ((MyDLGTEMPLATEEX*)pTemplate)->style &= ~WS_VISIBLE;
   }
   else
   {
-    pTemplate->style |= WS_CHILD;
+    pTemplate->style |= WS_CHILD | DS_CONTROL;
     pTemplate->style &= ~DS_MODALFRAME;
     pTemplate->style &= ~WS_CAPTION;
@@ -932 +1063 @@
     pTemplate->style &= ~WS_POPUP;
     pTemplate->style &= ~WS_DISABLED;
+    pTemplate->style &= ~WS_VISIBLE;
   }
 
@@ -972 +1104 @@
                0, 0, SWP_NOSIZE);
 
-  if (showPage)
-  {
-    NMHDR hdr;
-
-    hdr.hwndFrom = hwndParent;
-    hdr.idFrom = GetWindowLongA(hwndParent,GWL_ID);
-    hdr.code = PSN_SETACTIVE;
-
-    /*
-     * Send the notification before showing the page.
-     */
-    SendMessageA(hwndPage, WM_NOTIFY, 0, (LPARAM) &hdr);
-
-    ShowWindow(hwndPage, SW_SHOW);
-  }
-  else
-    ShowWindow(hwndPage, SW_HIDE);
-
   return TRUE;
 }
@@ -1001 +1115 @@
 {
   if (index == psInfo->active_page)
+    {
+      if (GetTopWindow(hwndDlg) != psInfo->proppage[index].hwndPage)
+          SetWindowPos(psInfo->proppage[index].hwndPage, HWND_TOP, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE);
     return TRUE;
-
-  ShowWindow(psInfo->proppage[psInfo->active_page].hwndPage, SW_HIDE);
-
-  if (psInfo->proppage[index].hwndPage != 0)
-    ShowWindow(psInfo->proppage[index].hwndPage, SW_SHOW);
-  else
-  {
-    LPCPROPSHEETPAGEA ppshpage = PROPSHEET_GetPSPPage(psInfo, index);
-    PROPSHEET_CreatePage(hwndDlg, index, psInfo, ppshpage, TRUE);
+    }
+
+  if (psInfo->active_page != -1)
+     ShowWindow(psInfo->proppage[psInfo->active_page].hwndPage, SW_HIDE);
+
+  if (psInfo->proppage[index].hwndPage == 0)
+  {
+     LPCPROPSHEETPAGEA ppshpage;
+     PSHNOTIFY psn;
+
+     ppshpage = (LPCPROPSHEETPAGEA)psInfo->proppage[index].hpage;
+     PROPSHEET_CreatePage(hwndDlg, index, psInfo, ppshpage);
+
+     psn.hdr.hwndFrom = hwndDlg;
+     psn.hdr.code     = PSN_SETACTIVE;
+     psn.hdr.idFrom   = 0;
+     psn.lParam       = 0;
+
+     /* Send the notification before showing the page. */
+     SendMessageA(psInfo->proppage[index].hwndPage,
+                  WM_NOTIFY, 0, (LPARAM) &psn);
+
+     /*
+      * TODO: check return value. 
+      */
+  }
+
+  ShowWindow(psInfo->proppage[index].hwndPage, SW_SHOW);
+
+  if (!(psInfo->ppshheader->dwFlags & PSH_WIZARD))
+  {
+     HWND hwndTabCtrl;
+
+     /* Synchronize current selection with tab control */
+     hwndTabCtrl = GetDlgItem(hwndDlg, IDC_TABCONTROL);
+     SendMessageA(hwndTabCtrl, TCM_SETCURSEL, index, 0);
   }
 
   psInfo->active_page = index;
+  psInfo->activeValid = TRUE;
 
   return TRUE;
@@ -1024 +1169 @@
 {
   BOOL res;
-  NMHDR hdr;
+  PSHNOTIFY psn;
   HWND hwndPage;
-  HWND hwndBack = GetDlgItem(hwndDlg, IDC_BACK_BUTTON);
   PropSheetInfo* psInfo = (PropSheetInfo*) GetPropA(hwndDlg,
                                                     PropSheetInfoStr);
 
-  if (psInfo->active_page <= 0)
+  if (psInfo->active_page < 0)
      return FALSE;
 
-  hdr.hwndFrom = hwndDlg;
-  hdr.idFrom = GetWindowLongA(hwndDlg,GWL_ID);
-  hdr.code = PSN_WIZBACK;
-
+  psn.hdr.code     = PSN_WIZBACK;
+  psn.hdr.hwndFrom = hwndDlg;
+  psn.hdr.idFrom   = 0;
+  psn.lParam       = 0;
+ 
   hwndPage = psInfo->proppage[psInfo->active_page].hwndPage;
 
-  if (SendMessageA(hwndPage, WM_NOTIFY, 0, (LPARAM) &hdr) == -1)
+  if (SendMessageA(hwndPage, WM_NOTIFY, 0, (LPARAM) &psn) == -1)
     return FALSE;
 
-  res = PROPSHEET_CanSetCurSel(hwndDlg);
-  if(res != FALSE)
-  {
-    res = PROPSHEET_SetCurSel(hwndDlg, psInfo->active_page - 1, 0);
-  }
-
-  /* if we went to page 0, disable Back button */
-  if (res && (psInfo->active_page == 0))
-    EnableWindow(hwndBack, FALSE);
+  if (psInfo->active_page > 0)
+  {
+     res = PROPSHEET_CanSetCurSel(hwndDlg);
+     if(res != FALSE)
+     {
+       res = PROPSHEET_SetCurSel(hwndDlg, psInfo->active_page - 1, 0);
+     }
+  }
 
   return TRUE;
@@ -1060 +1204 @@
 static BOOL PROPSHEET_Next(HWND hwndDlg)
 {
-  NMHDR hdr;
+  PSHNOTIFY psn;
   HWND hwndPage;
   LRESULT msgResult = 0;
@@ -1066 +1210 @@
                                                     PropSheetInfoStr);
 
-  if (psInfo->active_page < 0 || psInfo->active_page == psInfo->nPages - 1)
+  if (psInfo->active_page < 0)
      return FALSE;
 
-  hdr.hwndFrom = hwndDlg;
-  hdr.idFrom = GetWindowLongA(hwndDlg,GWL_ID);
-  hdr.code = PSN_WIZNEXT;
-
+  psn.hdr.code     = PSN_WIZNEXT;
+  psn.hdr.hwndFrom = hwndDlg;
+  psn.hdr.idFrom   = 0;
+  psn.lParam       = 0;
+ 
   hwndPage = psInfo->proppage[psInfo->active_page].hwndPage;
 
-  msgResult = SendMessageA(hwndPage, WM_NOTIFY, 0, (LPARAM) &hdr);
-
-//  TRACE("msg result %ld\n", msgResult);
+  msgResult = SendMessageA(hwndPage, WM_NOTIFY, 0, (LPARAM) &psn);
+
+  TRACE("msg result %ld\n", msgResult);
 
   if (msgResult == -1)
@@ -1095 +1240 @@
 static BOOL PROPSHEET_Finish(HWND hwndDlg)
 {
-  NMHDR hdr;
+  PSHNOTIFY psn;
   HWND hwndPage;
   LRESULT msgResult = 0;
@@ -1104 +1249 @@
      return FALSE;
 
-  hdr.hwndFrom = hwndDlg;
-  hdr.idFrom = GetWindowLongA(hwndDlg,GWL_ID);
-  hdr.code = PSN_WIZFINISH;
-
+  psn.hdr.code     = PSN_WIZFINISH;
+  psn.hdr.hwndFrom = hwndDlg;
+  psn.hdr.idFrom   = 0;
+  psn.lParam       = 0;
+ 
   hwndPage = psInfo->proppage[psInfo->active_page].hwndPage;
 
-  msgResult = SendMessageA(hwndPage, WM_NOTIFY, 0, (LPARAM) &hdr);
-
-//  TRACE("msg result %ld\n", msgResult);
+  msgResult = SendMessageA(hwndPage, WM_NOTIFY, 0, (LPARAM) &psn);
+
+  TRACE("msg result %ld\n", msgResult);
 
   if (msgResult != 0)
@@ -1118 +1264 @@
 
   if (psInfo->isModeless)
-    psInfo->active_page = -1;
+    psInfo->activeValid = FALSE;
   else
     EndDialog(hwndDlg, TRUE);
@@ -1128 +1274 @@
  *            PROPSHEET_Apply
  */
-static BOOL PROPSHEET_Apply(HWND hwndDlg)
+static BOOL PROPSHEET_Apply(HWND hwndDlg, LPARAM lParam)
 {
   int i;
-  NMHDR hdr;
   HWND hwndPage;
+  PSHNOTIFY psn;
   LRESULT msgResult;
   PropSheetInfo* psInfo = (PropSheetInfo*) GetPropA(hwndDlg,
@@ -1140 +1286 @@
      return FALSE;
 
-  hdr.hwndFrom = hwndDlg;
-  hdr.idFrom = GetWindowLongA(hwndDlg,GWL_ID);
+  psn.hdr.hwndFrom = hwndDlg;
+  psn.hdr.idFrom   = 0;
+  psn.lParam       = 0;
+ 
 
   /*
    * Send PSN_KILLACTIVE to the current page.
    */
-  hdr.code = PSN_KILLACTIVE;
+  psn.hdr.code = PSN_KILLACTIVE;
 
   hwndPage = psInfo->proppage[psInfo->active_page].hwndPage;
 
-  if (SendMessageA(hwndPage, WM_NOTIFY, 0, (LPARAM) &hdr) != FALSE)
+  if (SendMessageA(hwndPage, WM_NOTIFY, 0, (LPARAM) &psn) != FALSE)
     return FALSE;
 
@@ -1156 +1304 @@
    * Send PSN_APPLY to all pages.
    */
-  hdr.code = PSN_APPLY;
-
+  psn.hdr.code = PSN_APPLY;
+  psn.lParam   = lParam;
+ 
   for (i = 0; i < psInfo->nPages; i++)
   {
     hwndPage = psInfo->proppage[i].hwndPage;
-    msgResult = SendMessageA(hwndPage, WM_NOTIFY, 0, (LPARAM) &hdr);
-
-    if (msgResult == PSNRET_INVALID_NOCHANGEPAGE)
-      return FALSE;
+    if (hwndPage)
+    {
+       msgResult = SendMessageA(hwndPage, WM_NOTIFY, 0, (LPARAM) &psn);
+       if (msgResult == PSNRET_INVALID_NOCHANGEPAGE)
+          return FALSE;
+    }
+  }
+
+  if(lParam)
+  {
+     psInfo->activeValid = FALSE;
+  }
+  else if(psInfo->active_page >= 0)
+  {
+     psn.hdr.code = PSN_SETACTIVE;
+     psn.lParam   = 0;
+     hwndPage = psInfo->proppage[psInfo->active_page].hwndPage;
+     SendMessageA(hwndPage, WM_NOTIFY, 0, (LPARAM) &psn);
   }
 
@@ -1173 +1336 @@
  *            PROPSHEET_Cancel
  */
-static void PROPSHEET_Cancel(HWND hwndDlg)
+static void PROPSHEET_Cancel(HWND hwndDlg, LPARAM lParam)
 {
   PropSheetInfo* psInfo = (PropSheetInfo*) GetPropA(hwndDlg,
                                                     PropSheetInfoStr);
   HWND hwndPage;
-  NMHDR hdr;
+  PSHNOTIFY psn;
+  int i;
 
   if (psInfo->active_page < 0)
@@ -1184 +1348 @@
 
   hwndPage = psInfo->proppage[psInfo->active_page].hwndPage;
-  hdr.hwndFrom = hwndDlg;
-  hdr.idFrom = GetWindowLongA(hwndDlg,GWL_ID);
-  hdr.code = PSN_QUERYCANCEL;
-
-  if (SendMessageA(hwndPage, WM_NOTIFY, 0, (LPARAM) &hdr))
+  psn.hdr.code     = PSN_QUERYCANCEL;
+  psn.hdr.hwndFrom = hwndDlg;
+  psn.hdr.idFrom   = 0;
+  psn.lParam       = 0;
+ 
+  if (SendMessageA(hwndPage, WM_NOTIFY, 0, (LPARAM) &psn))
     return;
 
-  hdr.code = PSN_RESET;
-
-  SendMessageA(hwndPage, WM_NOTIFY, 0, (LPARAM) &hdr);
+  psn.hdr.code = PSN_RESET;
+  psn.lParam   = lParam;
+ 
+  for (i = 0; i < psInfo->nPages; i++)
+  {
+    hwndPage = psInfo->proppage[i].hwndPage;
+
+    if (hwndPage)
+       SendMessageA(hwndPage, WM_NOTIFY, 0, (LPARAM) &psn);
+  }
 
   if (psInfo->isModeless)
-    psInfo->active_page = -1; /* makes PSM_GETCURRENTPAGEHWND return NULL */
+  {
+     /* makes PSM_GETCURRENTPAGEHWND return NULL */
+     psInfo->activeValid = FALSE;
+  }
   else
     EndDialog(hwndDlg, FALSE);
@@ -1209 +1384 @@
                                                     PropSheetInfoStr);
   HWND hwndPage;
-  NMHDR hdr;
+  PSHNOTIFY psn;
 
   if (psInfo->active_page < 0)
@@ -1215 +1390 @@
 
   hwndPage = psInfo->proppage[psInfo->active_page].hwndPage;
-  hdr.hwndFrom = hwndDlg;
-  hdr.idFrom = GetWindowLongA(hwndDlg,GWL_ID);
-  hdr.code = PSN_HELP;
-
-  SendMessageA(hwndPage, WM_NOTIFY, 0, (LPARAM) &hdr);
+  psn.hdr.code     = PSN_HELP;
+  psn.hdr.hwndFrom = hwndDlg;
+  psn.hdr.idFrom   = 0;
+  psn.lParam       = 0;
+ 
+  SendMessageA(hwndPage, WM_NOTIFY, 0, (LPARAM) &psn);
 }
 
@@ -1332 +1508 @@
                                                     PropSheetInfoStr);
   HWND hwndPage;
-  NMHDR hdr;
-
-  if (!psInfo || psInfo->active_page < 0)
+  PSHNOTIFY psn;
+
+  if (!psInfo)
      return FALSE;
+
+  if (psInfo->active_page < 0)
+     return TRUE;
+
   /*
    * Notify the current page.
    */
   hwndPage = psInfo->proppage[psInfo->active_page].hwndPage;
-
-  hdr.hwndFrom = hwndDlg;
-  hdr.idFrom = GetWindowLongA(hwndDlg,GWL_ID);
-  hdr.code = PSN_KILLACTIVE;
-
-  return !SendMessageA(hwndPage, WM_NOTIFY, 0, (LPARAM) &hdr);
+  psn.hdr.code     = PSN_KILLACTIVE;
+  psn.hdr.hwndFrom = hwndDlg;
+  psn.hdr.idFrom   = 0;
+  psn.lParam       = 0;
+
+  return !SendMessageA(hwndPage, WM_NOTIFY, 0, (LPARAM) &psn);
 }
 
@@ -1359 +1539 @@
   HWND hwndPage;
   HWND hwndHelp  = GetDlgItem(hwndDlg, IDHELP);
-  NMHDR hdr;
-
-  if (psInfo->active_page < 0)
-     return FALSE;
-
-  hwndPage = psInfo->proppage[psInfo->active_page].hwndPage;
-
-  hdr.hwndFrom = hwndDlg;
-  hdr.idFrom = GetWindowLongA(hwndDlg,GWL_ID);
-  /*
-   * hpage takes precedence over index.
-   */
+
+  /* hpage takes precedence over index */
   if (hpage != NULL)
     index = PROPSHEET_GetPageIndex(hpage, psInfo);
@@ -1389 +1559 @@
   {
     int result;
-    hdr.code = PSN_SETACTIVE;
-
-    result = SendMessageA(hwndPage, WM_NOTIFY, 0, (LPARAM) &hdr);
+    PSHNOTIFY psn;
+
+    psn.hdr.code     = PSN_SETACTIVE;
+    psn.hdr.hwndFrom = hwndDlg;
+    psn.hdr.idFrom   = 0;
+    psn.lParam       = 0;
+
+    result = SendMessageA(hwndPage, WM_NOTIFY, 0, (LPARAM) &psn);
+
     /*
-     * TODO: check return value.
+     * TODO: check return value. 
      */
   }
@@ -1487 +1663 @@
 }
 
-/******************************************************************************
- *            PROPSHEET_GetPSPPage
- */
-static LPCPROPSHEETPAGEA PROPSHEET_GetPSPPage(const PropSheetInfo * psInfo,
-                                              int index)
-{
-  BOOL usePSP = psInfo->ppshheader->dwFlags & PSH_PROPSHEETPAGE;
-  LPCPROPSHEETPAGEA lppsp;
-  int realIndex = psInfo->proppage[index].index;
-
-  if (usePSP)
-  {
-    BYTE* pByte;
-
-    lppsp = psInfo->ppshheader->u3.ppsp;
-
-    pByte = (BYTE*) lppsp;
-
-    pByte += (lppsp->dwSize * realIndex);
-    lppsp = (LPCPROPSHEETPAGEA)pByte;
-  }
-  else
-    lppsp = (LPCPROPSHEETPAGEA) psInfo->ppshheader->u3.phpage[realIndex];
-
-  return lppsp;
-}
 
 /******************************************************************************
@@ -1535 +1685 @@
 
   PROPSHEET_CollectPageInfo(ppsp, psInfo, psInfo->nPages);
-  psInfo->proppage[psInfo->nPages].index = -1;
   psInfo->proppage[psInfo->nPages].hpage = hpage;
 
-  /*
-   * Create the page but don't show it.
-   */
-  PROPSHEET_CreatePage(hwndDlg, psInfo->nPages, psInfo, ppsp, FALSE);
+  if (ppsp->dwFlags & PSP_PREMATURE)
+  {
+     /* Create the page but don't show it */
+     PROPSHEET_CreatePage(hwndDlg, psInfo->nPages, psInfo, ppsp);
+  }
 
   /*
@@ -1558 +1708 @@
 
   psInfo->nPages++;
+
+  /* If it is the only page - show it */
+  if(psInfo->nPages == 1)
+     PROPSHEET_ShowPage(hwndDlg, 0, psInfo);
 
   return TRUE;
@@ -1575 +1729 @@
 
   if (!psInfo) {
-//    FIXME("No psInfo for propertysheet at windows 0x%04x, returning FALSE...\n", hwndDlg);
     return FALSE;
   }
@@ -1589 +1742 @@
   /* Make shure that index is within range */
   if (index < 0 || index >= psInfo->nPages)
-    {
-//      TRACE("Could not find page to remove!\n");
+  {
+      TRACE("Could not find page to remove!\n");
       return FALSE;
-    }
-
-//  TRACE("total pages %d removing page %d active page %d\n",
-//        psInfo->nPages, index, psInfo->active_page);
+  }
+
+  TRACE("total pages %d removing page %d active page %d\n",
+        psInfo->nPages, index, psInfo->active_page);
   /*
    * Check if we're removing the active page.
@@ -1616 +1769 @@
     else
     {
-//      TRACE("Removing the only page, close the dialog!\n");
-
-      if (psInfo->isModeless)
-        psInfo->active_page = -1;
-      else
-        EndDialog(hwndDlg, FALSE);
-
-      return TRUE;
+      psInfo->active_page = -1;
+      if (!psInfo->isModeless)
+      {
+         EndDialog(hwndDlg, FALSE);
+         return TRUE;
+      }
     }
   }
-
-  if (index < psInfo->active_page)
+  else if (index < psInfo->active_page)
     psInfo->active_page--;
 
-  /* Destroy page dialog window.
-   * If it's last page in modal dialog, it has been destroyed by EndDialog
-   */
-  if (psInfo->isModeless || psInfo->nPages > 1)
-     DestroyWindow(psInfo->proppage[index].hwndPage);
-
+  /* Destroy page dialog window */
+  DestroyWindow(psInfo->proppage[index].hwndPage);
+
+  /* Free page resources */
+  if(psInfo->proppage[index].hpage)
+  {
+     PROPSHEETPAGEA* psp = (PROPSHEETPAGEA*)psInfo->proppage[index].hpage;
+
+     if ((psp->dwFlags & PSP_USETITLE) && psInfo->proppage[index].pszText)
+        HeapFree(GetProcessHeap(), 0, (LPVOID)psInfo->proppage[index].pszText);
+
+     DestroyPropertySheetPage(psInfo->proppage[index].hpage);
+  }
+ 
   /* Remove the tab */
   SendMessageA(hwndTabControl, TCM_DELETEITEM, index, 0);
@@ -1642 +1800 @@
   psInfo->proppage = COMCTL32_Alloc(sizeof(PropPageInfo) * psInfo->nPages);
 
-  if (index > 0)
+  if (index > 0)  
     memcpy(&psInfo->proppage[0], &oldPages[0], index * sizeof(PropPageInfo));
 
@@ -1664 +1822 @@
 static void PROPSHEET_SetWizButtons(HWND hwndDlg, DWORD dwFlags)
 {
-  HWND hwndButton;
-
-//  TRACE("%ld\n", dwFlags);
+  HWND hwndBack   = GetDlgItem(hwndDlg, IDC_BACK_BUTTON);
+  HWND hwndNext   = GetDlgItem(hwndDlg, IDC_NEXT_BUTTON);
+  HWND hwndFinish = GetDlgItem(hwndDlg, IDC_FINISH_BUTTON);
+
+  TRACE("%ld\n", dwFlags);
+
+  EnableWindow(hwndBack, FALSE);
+  EnableWindow(hwndNext, FALSE);
+  EnableWindow(hwndFinish, FALSE);
 
   if (dwFlags & PSWIZB_BACK)
-  {
-    hwndButton = GetDlgItem(hwndDlg, IDC_BACK_BUTTON);
-    EnableWindow(hwndButton, TRUE);
-  }
+    EnableWindow(hwndBack, TRUE);
 
   if (dwFlags & PSWIZB_NEXT)
   {
     /* Hide the Finish button */
-    hwndButton = GetDlgItem(hwndDlg, IDC_FINISH_BUTTON);
-    ShowWindow(hwndButton, SW_HIDE);
+    ShowWindow(hwndFinish, SW_HIDE);
 
     /* Show and enable the Next button */
-    hwndButton = GetDlgItem(hwndDlg, IDC_NEXT_BUTTON);
-
-    ShowWindow(hwndButton, SW_SHOW);
-    EnableWindow(hwndButton, TRUE);
+    ShowWindow(hwndNext, SW_SHOW);
+    EnableWindow(hwndNext, TRUE);
 
     /* Set the Next button as the default pushbutton  */
@@ -1693 +1851 @@
   {
     /* Hide the Next button */
-    hwndButton = GetDlgItem(hwndDlg, IDC_NEXT_BUTTON);
-    ShowWindow(hwndButton, SW_HIDE);
+    ShowWindow(hwndNext, SW_HIDE);
 
     /* Show the Finish button */
-    hwndButton = GetDlgItem(hwndDlg, IDC_FINISH_BUTTON);
-    ShowWindow(hwndButton, SW_SHOW);
+    ShowWindow(hwndFinish, SW_SHOW);
 
     if (dwFlags & PSWIZB_FINISH)
-      EnableWindow(hwndButton, TRUE);
-    else
-      EnableWindow(hwndButton, FALSE);
+      EnableWindow(hwndFinish, TRUE);
 
     /* Set the Finish button as the default pushbutton  */
@@ -1740 +1894 @@
 static void PROPSHEET_CleanUp(HWND hwndDlg)
 {
+  int i;
   PropSheetInfo* psInfo = (PropSheetInfo*) RemovePropA(hwndDlg,
                                                        PropSheetInfoStr);
+
+  TRACE("\n");
+  if (HIWORD(psInfo->ppshheader->pszCaption))
+      HeapFree(GetProcessHeap(), 0, (LPVOID)psInfo->ppshheader->pszCaption);
+
+  COMCTL32_Free((LPVOID)psInfo->ppshheader);
+
+  for (i = 0; i < psInfo->nPages; i++)
+  {
+     PROPSHEETPAGEA* psp = (PROPSHEETPAGEA*)psInfo->proppage[i].hpage;
+
+     if(psInfo->proppage[i].hwndPage)
+        DestroyWindow(psInfo->proppage[i].hwndPage);
+
+     if(psp)
+     {
+        if ((psp->dwFlags & PSP_USETITLE) && psInfo->proppage[i].pszText)
+           HeapFree(GetProcessHeap(), 0, (LPVOID)psInfo->proppage[i].pszText);
+
+        DestroyPropertySheetPage(psInfo->proppage[i].hpage);
+     }
+  }
+
   COMCTL32_Free(psInfo->proppage);
   COMCTL32_Free(psInfo->strPropertiesFor);
@@ -1757 +1935 @@
   PropSheetInfo* psInfo = (PropSheetInfo*) GlobalAlloc(GPTR,
                                                        sizeof(PropSheetInfo));
-  LPCPROPSHEETPAGEA lppsp;
   int i;
+  BYTE* pByte;
 
   PROPSHEET_CollectSheetInfo(lppsh, psInfo);
@@ -1764 +1942 @@
   psInfo->proppage = (PropPageInfo*) COMCTL32_Alloc(sizeof(PropPageInfo) *
                                                     lppsh->nPages);
+  pByte = (BYTE*) psInfo->ppshheader->u3.ppsp;
 
   for (i = 0; i < lppsh->nPages; i++)
   {
-    psInfo->proppage[i].index = i;
     if (!(lppsh->dwFlags & PSH_PROPSHEETPAGE))
       psInfo->proppage[i].hpage = psInfo->ppshheader->u3.phpage[i];
-    lppsp = PROPSHEET_GetPSPPage(psInfo, i);
-    PROPSHEET_CollectPageInfo(lppsp, psInfo, i);
+    else
+    {
+       psInfo->proppage[i].hpage = CreatePropertySheetPageA((LPCPROPSHEETPAGEA)pByte);
+       pByte += ((LPPROPSHEETPAGEA)pByte)->dwSize;
+    }
+
+    PROPSHEET_CollectPageInfo((LPCPROPSHEETPAGEA)psInfo->proppage[i].hpage,
+                               psInfo, i);
   }
 
@@ -1799 +1983 @@
   *ppsp = *lpPropSheetPage;
 
+  if ( !(ppsp->dwFlags & PSP_DLGINDIRECT) && HIWORD( ppsp->u1.pszTemplate ) )
+    ppsp->u1.pszTemplate = HEAP_strdupA( GetProcessHeap(), 0, lpPropSheetPage->u1.pszTemplate );
+
+  if ( (ppsp->dwFlags & PSP_USEICONID) && HIWORD( ppsp->u2.pszIcon ) )
+      ppsp->u2.pszIcon = HEAP_strdupA( GetProcessHeap(), 0, lpPropSheetPage->u2.pszIcon );
+       
+
+  if ((ppsp->dwFlags & PSP_USETITLE) && HIWORD( ppsp->pszTitle ))
+      ppsp->pszTitle = HEAP_strdupA( GetProcessHeap(), 0, lpPropSheetPage->pszTitle );
+  else if ( !(ppsp->dwFlags & PSP_USETITLE) )
+      ppsp->pszTitle = NULL;
+
   return (HPROPSHEETPAGE)ppsp;
 }
@@ -1817 +2013 @@
 BOOL WINAPI DestroyPropertySheetPage(HPROPSHEETPAGE hPropPage)
 {
+  PROPSHEETPAGEA *psp = (PROPSHEETPAGEA *)hPropPage;
+
+  if (!psp)
+     return FALSE;
+
+  if ( !(psp->dwFlags & PSP_DLGINDIRECT) && HIWORD( psp->u1.pszTemplate ) )
+     HeapFree(GetProcessHeap(), 0, (LPVOID)psp->u1.pszTemplate);
+
+  if ( (psp->dwFlags & PSP_USEICONID) && HIWORD( psp->u2.pszIcon ) )
+     HeapFree(GetProcessHeap(), 0, (LPVOID)psp->u2.pszIcon);
+
+  if ((psp->dwFlags & PSP_USETITLE) && HIWORD( psp->pszTitle ))
+      HeapFree(GetProcessHeap(), 0, (LPVOID)psp->pszTitle);
+
   COMCTL32_Free(hPropPage);
 
   return TRUE;
+}
+
+/******************************************************************************
+ *            PROPSHEET_IsDialogMessage
+ */
+static BOOL PROPSHEET_IsDialogMessage(HWND hwnd, LPMSG lpMsg)
+{
+   PropSheetInfo* psInfo = (PropSheetInfo*) GetPropA(hwnd, PropSheetInfoStr);
+
+   if (!psInfo || (hwnd != lpMsg->hwnd && !IsChild(hwnd, lpMsg->hwnd)))
+      return FALSE;
+
+   if (lpMsg->message == WM_KEYDOWN && (GetKeyState(VK_CONTROL) & 0x8000))
+   {
+      int new_page = 0;
+      INT dlgCode = SendMessageA(lpMsg->hwnd, WM_GETDLGCODE, 0, (LPARAM)lpMsg);
+
+      if (!(dlgCode & DLGC_WANTMESSAGE))
+      {
+         switch (lpMsg->wParam)
+         {
+            case VK_TAB:
+               if (GetKeyState(VK_SHIFT) & 0x8000)
+                   new_page = -1;
+                else
+                   new_page = 1;
+               break;
+
+            case VK_NEXT:   new_page = 1;  break;
+            case VK_PRIOR:  new_page = -1; break;
+         }
+      }
+
+      if (new_page)
+      {
+         if (PROPSHEET_CanSetCurSel(hwnd) != FALSE)
+         {
+            new_page += psInfo->active_page;
+
+            if (new_page < 0)
+               new_page = psInfo->nPages - 1;
+            else if (new_page >= psInfo->nPages)
+               new_page = 0;
+
+            PROPSHEET_SetCurSel(hwnd, new_page, 0);
+         }
+
+         return TRUE;
+      }
+   }
+
+   return IsDialogMessageA(hwnd, lpMsg);
 }
 
@@ -1836 +2098 @@
       HWND hwndTabCtrl = GetDlgItem(hwnd, IDC_TABCONTROL);
       LPCPROPSHEETPAGEA ppshpage;
+      int idx;
 
       SetPropA(hwnd, PropSheetInfoStr, (HANDLE)psInfo);
@@ -1872 +2135 @@
       if (psInfo->ppshheader->dwFlags & PSH_WIZARD)
       {
-        HWND hwndBack = GetDlgItem(hwnd, IDC_BACK_BUTTON);
-
         if (PROPSHEET_IsTooSmallWizard(hwnd, psInfo))
         {
@@ -1879 +2140 @@
           PROPSHEET_AdjustButtonsWizard(hwnd, psInfo);
         }
-
-        /* Disable Back button if we start at page 0 */
-        if (psInfo->active_page == 0)
-          EnableWindow(hwndBack, FALSE);
       }
       else
@@ -1897 +2154 @@
                                               PSCB_INITIALIZED, (LPARAM)0);
 
-      ppshpage = PROPSHEET_GetPSPPage(psInfo, psInfo->active_page);
-      PROPSHEET_CreatePage(hwnd, psInfo->active_page, psInfo, ppshpage, TRUE);
+      idx = psInfo->active_page;
+      ppshpage = (LPCPROPSHEETPAGEA)psInfo->proppage[idx].hpage;
+      psInfo->active_page = -1;
+ 
+      PROPSHEET_SetCurSel(hwnd, idx, psInfo->proppage[idx].hpage);
 
       if (!(psInfo->ppshheader->dwFlags & PSH_WIZARD))
@@ -1926 +2186 @@
 
     case WM_CLOSE:
-      PROPSHEET_Cancel(hwnd);
+      PROPSHEET_Cancel(hwnd, 1);
       return TRUE;
 
@@ -1940 +2200 @@
           HWND hwndApplyBtn = GetDlgItem(hwnd, IDC_APPLY_BUTTON);
 
-          if (PROPSHEET_Apply(hwnd) == FALSE)
+          if (PROPSHEET_Apply(hwnd, wID == IDOK ? 1: 0) == FALSE)
             break;
-
-          EnableWindow(hwndApplyBtn, FALSE);
 
           if (wID == IDOK)
@@ -1959 +2217 @@
 
             if (psInfo->isModeless)
-              psInfo->active_page = -1;
+              psInfo->activeValid = FALSE;
             else
               EndDialog(hwnd, result);
           }
+          else
+             EnableWindow(hwndApplyBtn, FALSE);
 
           break;
@@ -1980 +2240 @@
 
         case IDCANCEL:
-          PROPSHEET_Cancel(hwnd);
+          PROPSHEET_Cancel(hwnd, 0);
           break;
 
@@ -2018 +2278 @@
       HWND hwndPage = 0;
 
-      if (psInfo->active_page != -1)
+      if (psInfo->activeValid && psInfo->active_page != -1)
         hwndPage = psInfo->proppage[psInfo->active_page].hwndPage;
 
@@ -2062 +2322 @@
     case PSM_CANCELTOCLOSE:
     {
+      char buf[MAX_BUTTONTEXT_LENGTH];
       HWND hwndOK = GetDlgItem(hwnd, IDOK);
       HWND hwndCancel = GetDlgItem(hwnd, IDCANCEL);
 
       EnableWindow(hwndCancel, FALSE);
-      SetWindowTextA(hwndOK, "Close"); /* FIXME: hardcoded string */
-
-      return TRUE;
+      if (LoadStringA(COMCTL32_hModule, IDS_CLOSE, buf, sizeof(buf)))
+         SetWindowTextA(hwndOK, buf);
+ 
+      return FALSE;
     }
 
@@ -2095 +2357 @@
     case PSM_APPLY:
     {
-      BOOL msgResult = PROPSHEET_Apply(hwnd);
+      BOOL msgResult = PROPSHEET_Apply(hwnd, 0);
 
       SetWindowLongA(hwnd, DWL_MSGRESULT, msgResult);
@@ -2134 +2396 @@
     case PSM_ISDIALOGMESSAGE:
     {
-      FIXME("Unimplemented msg PSM_ISDIALOGMESSAGE\n");
-      return 0;
+       BOOL msgResult = PROPSHEET_IsDialogMessage(hwnd, (LPMSG)lParam);
+       SetWindowLongA(hwnd, DWL_MSGRESULT, msgResult);
+       return TRUE;
     }