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

Timestamp:

Nov 2, 1999, 10:44:04 PM (26 years ago)

Author:

achimha

Message:

comctl32 merged with WINE 991031

File:

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

trunk/src/comctl32/propsheet.c

@@ -1 @@
-/* $Id: propsheet.c,v 1.10 1999-10-22 18:04:11 sandervl Exp $ */
+/* $Id: propsheet.c,v 1.11 1999-11-02 21:44:02 achimha Exp $ */
 /*
  * Property Sheets
@@ -13 +13 @@
  */
 
-/* WINE 990923 level */
+/* WINE 991031 level */
 
 /* CB: Odin problems:
@@ -117 +117 @@
 static void PROPSHEET_SetFinishTextA(HWND hwndDlg, LPCSTR lpszText);
 static void PROPSHEET_SetTitleA(HWND hwndDlg, DWORD dwStyle, LPCSTR lpszText);
+static BOOL PROPSHEET_CanSetCurSel(HWND hwndDlg);
 static BOOL PROPSHEET_SetCurSel(HWND hwndDlg,
                                 int index,
@@ -214 +215 @@
     HGLOBAL hTemplate = LoadResource(lppsp->hInstance,
                                      hResource);
-     pTemplate = (LPDLGTEMPLATEA)LockResource(hTemplate);
+    pTemplate = (LPDLGTEMPLATEA)LockResource(hTemplate);
   }
 
@@ -265 +266 @@
       p += lstrlenW( (LPCWSTR)p ) + 1;
       break;
-  }
+  } 
 
   /* class */
@@ -283 +284 @@
   /* Extract the caption */
   psInfo->proppage[index].pszText = (LPCWSTR)p;
-//  TRACE(propsheet, "Tab %d %s\n",index,debugstr_w((LPCWSTR)p));
+//  TRACE("Tab %d %s\n",index,debugstr_w((LPCWSTR)p));
   p += lstrlenW((LPCWSTR)p) + 1;
 
   if (dwFlags & PSP_USETITLE)
   {
-//AH: todo
-//    psInfo->proppage[index].pszText = HEAP_strdupAtoW(GetProcessHeap(),
-//                                                      0,
-//                                                      lppsp->pszTitle);
+    if ( !HIWORD( lppsp->pszTitle ) )
+    {
+      char szTitle[256];
+      
+      if ( !LoadStringA( lppsp->hInstance, (UINT) lppsp->pszTitle, szTitle, 256 ) )
+        return FALSE;
+
+//AH: TODO      
+//      psInfo->proppage[index].pszText = HEAP_strdupAtoW( GetProcessHeap(),
+//                                                       0, szTitle );
+    }
+//AH: TODO
+//    else
+//      psInfo->proppage[index].pszText = HEAP_strdupAtoW(GetProcessHeap(),
+//                                                      0,
+//                                                      lppsp->pszTitle);
   }
 
@@ -297 +310 @@
    * Build the image list for icons
    */
-  if ((dwFlags & PSP_USEHICON) || (dwFlags & PSP_USEICONID))
+  if ((dwFlags & PSP_USEHICON) || (dwFlags & PSP_USEICONID)) 
   {
     HICON hIcon;
@@ -876 +889 @@
   PropPageInfo* ppInfo = psInfo->proppage;
   PADDING_INFO padding;
-  HWND hwndAfter;
-
-//  TRACE(propsheet, "index %d\n", index);
+
+  TRACE("index %d\n", index);
 
   if (ppshpage->dwFlags & PSP_DLGINDIRECT)
@@ -908 +920 @@
     pTemplate->style &= ~WS_POPUP;
     pTemplate->style &= ~WS_DISABLED;
-
   }
 
@@ -917 +928 @@
 
   hwndPage = CreateDialogIndirectParamA(ppshpage->hInstance,
-                                        pTemplate,
-                                        hwndParent,
-                                        ppshpage->pfnDlgProc,
-                                        (LPARAM)ppshpage);
+                                        pTemplate,
+                                        hwndParent,
+                                        ppshpage->pfnDlgProc,
+                                        (LPARAM)ppshpage);
 
   ppInfo[index].hwndPage = hwndPage;
@@ -932 +943 @@
 
   if (psInfo->ppshheader->dwFlags & PSH_WIZARD)
-  {
-    GetWindowRect(hwndParent, &rc);
     padding = PROPSHEET_GetPaddingInfoWizard(hwndParent);
-    hwndAfter = hwndParent;
-  }
   else
   {
@@ -946 +953 @@
     SendMessageA(hwndTabCtrl, TCM_ADJUSTRECT, FALSE, (LPARAM)&rc);
     padding = PROPSHEET_GetPaddingInfo(hwndParent);
-    hwndAfter = HWND_TOP;
-  }
-
-  SetWindowPos(hwndPage, hwndAfter,
+  }
+
+  SetWindowPos(hwndPage, HWND_TOP,
                rc.left + padding.x,
                rc.top + padding.y,
@@ -1038 +1044 @@
                                                     PropSheetInfoStr);
 
+  hdr.hwndFrom = hwndDlg;
   hdr.code = PSN_WIZNEXT;
 
@@ -1044 +1051 @@
   msgResult = SendMessageA(hwndPage, WM_NOTIFY, 0, (LPARAM) &hdr);
 
-//  TRACE("msg result %ld\n", msgResult);
+  TRACE("msg result %ld\n", msgResult);
 
   if (msgResult == -1)
     return FALSE;
 
-  PROPSHEET_SetCurSel(hwndDlg, psInfo->active_page + 1, 0);
+  if(PROPSHEET_CanSetCurSel(hwndDlg) != FALSE)
+  {
+    PROPSHEET_SetCurSel(hwndDlg, psInfo->active_page + 1, 0);
+  }
 
   return TRUE;
@@ -1065 +1075 @@
                                                     PropSheetInfoStr);
 
+  hdr.hwndFrom = hwndDlg;
   hdr.code = PSN_WIZFINISH;
 
@@ -1071 +1082 @@
   msgResult = SendMessageA(hwndPage, WM_NOTIFY, 0, (LPARAM) &hdr);
 
-//  TRACE("msg result %ld\n", msgResult);
+  TRACE("msg result %ld\n", msgResult);
 
   if (msgResult != 0)
@@ -1206 +1217 @@
   PropSheetInfo* psInfo = (PropSheetInfo*) GetPropA(hwndDlg,
                                                     PropSheetInfoStr);
-
+  if ( !psInfo ) return;
   for (i = 0; i < psInfo->nPages; i++)
   {
@@ -1259 +1270 @@
 }
 
+/*************************************************************************
+ * BOOL PROPSHEET_CanSetCurSel [Internal] 
+ *
+ * Test weither the current page can be changed by sending a PSN_KILLACTIVE
+ *
+ * PARAMS
+ *     hwndDlg        [I] handle to a Dialog hWnd
+ *
+ * RETURNS
+ *     TRUE if Current Selection can change
+ *
+ * NOTES
+ */
+static BOOL PROPSHEET_CanSetCurSel(HWND hwndDlg)
+{
+  PropSheetInfo* psInfo = (PropSheetInfo*) GetPropA(hwndDlg,
+                                                    PropSheetInfoStr);
+  HWND hwndPage;
+  NMHDR hdr;
+
+  if (!psInfo)
+    return FALSE;
+
+  /*
+   * Notify the current page.
+   */
+  hwndPage = psInfo->proppage[psInfo->active_page].hwndPage;
+
+  hdr.hwndFrom = hwndDlg;
+  hdr.code = PSN_KILLACTIVE;
+
+  return !SendMessageA(hwndPage, WM_NOTIFY, 0, (LPARAM) &hdr);
+}
+
 /******************************************************************************
  *            PROPSHEET_SetCurSel
@@ -1272 +1317 @@
   NMHDR hdr;
 
-  /*
-   * Notify the current page.
-   */
   hwndPage = psInfo->proppage[psInfo->active_page].hwndPage;
 
   hdr.hwndFrom = hwndDlg;
-  hdr.code = PSN_KILLACTIVE;
-
-  if (SendMessageA(hwndPage, WM_NOTIFY, 0, (LPARAM) &hdr))
-    return FALSE;
-
   /*
    * hpage takes precedence over index.
@@ -1292 +1329 @@
     if (index == -1)
     {
-      //TRACE("Could not find page to remove!\n");
+      TRACE("Could not find page to remove!\n");
       return FALSE;
     }
@@ -1310 +1347 @@
     result = SendMessageA(hwndPage, WM_NOTIFY, 0, (LPARAM) &hdr);
     /*
-     * TODO: check return value.
+     * TODO: check return value. 
      */
   }
@@ -1469 +1506 @@
   psInfo->nPages++;
 
-  return FALSE;
+  return TRUE;
 }
 
@@ -1482 +1519 @@
                                                      PropSheetInfoStr);
   HWND hwndTabControl = GetDlgItem(hwndDlg, IDC_TABCONTROL);
-  PropPageInfo* oldPages = psInfo->proppage;
-
+  PropPageInfo* oldPages;
+
+  if (!psInfo) {
+    FIXME("No psInfo for propertysheet at windows 0x%04x, returning FALSE...\n", hwndDlg);
+    return FALSE;
+  }
+  oldPages = psInfo->proppage;
   /*
    * hpage takes precedence over index.
@@ -1490 +1532 @@
   {
     index = PROPSHEET_GetPageIndex(hpage, psInfo);
-
-    if (index == -1)
+  }
+
+  /* Make shure that index is within range */
+  if (index < 0 || index >= psInfo->nPages)
     {
-//      TRACE(propsheet, "Could not find page to remove!\n");
+      TRACE("Could not find page to remove!\n");
       return FALSE;
     }
-  }
-
-//  TRACE(propsheet, "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.
@@ -1520 +1563 @@
     else
     {
-//      TRACE(propsheet, "Removing the only page, close the dialog!\n");
+      TRACE("Removing the only page, close the dialog!\n");
 
       if (psInfo->isModeless)
@@ -1534 +1577 @@
     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);
+  
   /* Remove the tab */
   SendMessageA(hwndTabControl, TCM_DELETEITEM, index, 0);
@@ -1540 +1589 @@
   psInfo->proppage = COMCTL32_Alloc(sizeof(PropPageInfo) * psInfo->nPages);
 
-  if (index > 0)
+  if (index > 0)  
     memcpy(&psInfo->proppage[0], &oldPages[0], index * sizeof(PropPageInfo));
 
@@ -1764 +1813 @@
       GetWindowTextA(hwnd, psInfo->strPropertiesFor, MAX_CAPTION_LENGTH);
 
+      PROPSHEET_CreateTabControl(hwnd, psInfo);
+
       if (psInfo->ppshheader->dwFlags & PSH_WIZARD)
       {
@@ -1780 +1831 @@
       else
       {
-        PROPSHEET_CreateTabControl(hwnd, psInfo);
-
         if (PROPSHEET_IsTooSmall(hwnd, psInfo))
         {
@@ -1789 +1838 @@
       }
 
+      if (psInfo->useCallback) 
+             (*(psInfo->ppshheader->pfnCallback))(hwnd, 
+                                              PSCB_INITIALIZED, (LPARAM)0); 
+
       ppshpage = PROPSHEET_GetPSPPage(psInfo, psInfo->active_page);      
       PROPSHEET_CreatePage(hwnd, psInfo->active_page, psInfo, ppshpage, TRUE);
@@ -1797 +1850 @@
       SetPropA(hwnd, PropSheetInfoStr, (HANDLE)psInfo);
 
-      PROPSHEET_SetTitleA(hwnd,
-                          psInfo->ppshheader->dwFlags,
-                          psInfo->ppshheader->pszCaption);
+
+      if (!HIWORD(psInfo->ppshheader->pszCaption) &&
+              psInfo->ppshheader->hInstance)
+      {
+         char szText[256];
+
+         if (LoadStringA(psInfo->ppshheader->hInstance, 
+                 (UINT)psInfo->ppshheader->pszCaption, szText, 255))
+            PROPSHEET_SetTitleA(hwnd, psInfo->ppshheader->dwFlags, szText);
+      }
+      else
+      {
+         PROPSHEET_SetTitleA(hwnd, psInfo->ppshheader->dwFlags,
+                         psInfo->ppshheader->pszCaption);
+      }
 
       return TRUE;
@@ -1884 +1949 @@
       }
 
+      if(pnmh->code == TCN_SELCHANGING)
+      {
+        BOOL bRet = PROPSHEET_CanSetCurSel(hwnd);
+        SetWindowLongA(hwnd, DWL_MSGRESULT, !bRet);
+        return TRUE;
+      }
+
+
       return 0;
     }
@@ -1922 +1995 @@
       BOOL msgResult;
 
-      msgResult = PROPSHEET_SetCurSel(hwnd,
-                                      (int)wParam,
-                                      (HPROPSHEETPAGE)lParam);
+      msgResult = PROPSHEET_CanSetCurSel(hwnd);
+      if(msgResult != FALSE)
+      {
+        msgResult = PROPSHEET_SetCurSel(hwnd,
+                                       (int)wParam,
+                                       (HPROPSHEETPAGE)lParam);
+      }
 
       SetWindowLongA(hwnd, DWL_MSGRESULT, msgResult);
@@ -1983 +2060 @@
 
     case PSM_ADDPAGE:
-      PROPSHEET_AddPage(hwnd, (HPROPSHEETPAGE)lParam);
+    {
+      /*
+       * Note: MSVC++ 6.0 documentation says that PSM_ADDPAGE does not have
+       *       a return value. This is not true. PSM_ADDPAGE returns TRUE
+       *       on success or FALSE otherwise, as specified on MSDN Online.
+       *       Also see the MFC code for
+       *       CPropertySheet::AddPage(CPropertyPage* pPage).
+       */
+
+      BOOL msgResult = PROPSHEET_AddPage(hwnd, (HPROPSHEETPAGE)lParam);
+
+      SetWindowLongA(hwnd, DWL_MSGRESULT, msgResult);
+
       return TRUE;
+    }
 
     case PSM_REMOVEPAGE:
@@ -1992 +2082 @@
     case PSM_ISDIALOGMESSAGE:
     {
-//      FIXME("Unimplemented msg PSM_ISDIALOGMESSAGE\n");
+      FIXME("Unimplemented msg PSM_ISDIALOGMESSAGE\n");
       return 0;
     }
@@ -2009 +2099 @@
 
     case PSM_SETTITLEW:
-//        FIXME("Unimplemented msg PSM_SETTITLE32W\n");
+        FIXME("Unimplemented msg PSM_SETTITLE32W\n");
         return 0;
     case PSM_SETCURSELID:
-//        FIXME("Unimplemented msg PSM_SETCURSELID\n");
+        FIXME("Unimplemented msg PSM_SETCURSELID\n");
         return 0;
     case PSM_SETFINISHTEXTW:
-//        FIXME("Unimplemented msg PSM_SETFINISHTEXT32W\n");
+        FIXME("Unimplemented msg PSM_SETFINISHTEXT32W\n");
         return 0;