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

Timestamp:

Jul 4, 1999, 11:06:00 PM (26 years ago)

Author:

cbratschi

Message:

Unicode and other extensions

File:

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

trunk/src/comctl32/propsheet.c

@@ -1 @@
-/* $Id: propsheet.c,v 1.4 1999-06-24 16:37:44 cbratschi Exp $ */
+/* $Id: propsheet.c,v 1.5 1999-07-04 21:05:59 cbratschi Exp $ */
 /*
  * Property Sheets
@@ -13 +13 @@
  *   - Unicode property sheets
  */
+
+/* CB: Odin problems:
+ - trap in PROPSHEET_DialogProc (tab control creation)
+ - LockResource traps
+*/
 
 #include <string.h>
@@ -201 +206 @@
     HGLOBAL hTemplate = LoadResource(lppsp->hInstance,
                                      hResource);
-    pTemplate = (LPDLGTEMPLATEA)LockResource(hTemplate);
+    //pTemplate = (LPDLGTEMPLATEA)LockResource(hTemplate); //CB: trap, fix it
   }
 
@@ -287 +292 @@
   HRSRC hRes;
 
+  if (psInfo->useCallback)
+    (*(psInfo->ppshheader->pfnCallback))(0, PSCB_PRECREATE, (LPARAM)template);
+
+  //load OS/2 dialog
+
+  if (psInfo->ppshheader->dwFlags & PSH_MODELESS)
+    ret = NativeCreateDlgIP(COMCTL32_hModule,
+                         psInfo->ppshheader->hInstance,
+                         MAKEINTRESOURCEA(IDD_PROPSHEET),
+                         psInfo->ppshheader->hwndParent,
+                         (DLGPROC)PROPSHEET_DialogProc,
+                         (LPARAM)psInfo);
+  else
+    ret = NativeDlgBoxIP(COMCTL32_hModule,
+                         psInfo->ppshheader->hInstance,
+                         MAKEINTRESOURCEA(IDD_PROPSHEET),
+                         psInfo->ppshheader->hwndParent,
+                         (DLGPROC)PROPSHEET_DialogProc,
+                         (LPARAM)psInfo);
+
+  if (ret == (INT)-1) return FALSE;
+
+/* //CB: original WINE code
   if (!(hRes = FindResourceA(COMCTL32_hModule,
                             MAKEINTRESOURCEA(IDD_PROPSHEET),
@@ -310 +338 @@
                                   (DLGPROC) PROPSHEET_DialogProc,
                                   (LPARAM)psInfo);
+*/
 
   return ret;