Changeset 9425 for trunk/src

Timestamp:

Nov 25, 2002, 5:49:48 PM (23 years ago)

Author:

sandervl

Message:

Wine resync

File:

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

trunk/src/comctl32/propsheet.c

@@ -57 +57 @@
   short x;
   short y;
+  short cx;
   short cy;
   DWORD id;
@@ -433 +434 @@
   if (((MyDLGTEMPLATEEX*)pTemplate)->signature == 0xFFFF)
   {
-    /* DIALOGEX template */
+    /* DLGTEMPLATEEX (not defined in any std. header file) */
 
     p++;       /* dlgVer    */
@@ -443 +444 @@
   else
   {
-    /* DIALOG template */
+    /* DLGTEMPLATE */
 
     p += 2;    /* style     */
@@ -1180 +1181 @@
  *
  *( Based on the code of PROPSHEET_CollectPageInfo)
+ * See also dialog.c/DIALOG_ParseTemplate32().
  */
 
@@ -1191 +1193 @@
   if (istemplateex)
   {
-    /* DIALOGEX template */
-
+    /* DLGTEMPLATEEX (not defined in any std. header file) */
+
+    TRACE("is DLGTEMPLATEEX\n");
     p++;       /* dlgVer    */
     p++;       /* signature */
@@ -1201 +1204 @@
   else
   {
-    /* DIALOG template */
-
+    /* DLGTEMPLATE */
+
+    TRACE("is DLGTEMPLATE\n");
     p += 2;    /* style     */
     p += 2;    /* ext style */
@@ -1235 +1239 @@
       break;
     case 0xffff:
-      p += 2;
+      p += 2; /* 0xffff plus predefined window class ordinal value */
       break;
     default:
@@ -1243 +1247 @@
   }
 
-  /*title */
+  /* title */
   TRACE("title %s\n",debugstr_w((LPCWSTR)p));
   p += lstrlenW((LPCWSTR)p) + 1;
 
-  /* font, if DS_FONT set */
+  /* font, if DS_SETFONT set */
   if ((DS_SETFONT & ((istemplateex)?  ((MyDLGTEMPLATEEX*)pTemplate)->style :
                      pTemplate->style)))
@@ -1253 +1257 @@
       p+=(istemplateex)?3:1;
       TRACE("font %s\n",debugstr_w((LPCWSTR)p));
-      p += lstrlenW( (LPCWSTR)p ) + 1; /* the font name*/
-    }
-
+      p += lstrlenW( (LPCWSTR)p ) + 1; /* the font name */
+    }
+
+  /* now process the DLGITEMTEMPLATE(EX) structs (plus custom data)
+   * that are following the DLGTEMPLATE(EX) data */
   TRACE("%d items\n",nrofitems);
   while (nrofitems > 0)
@@ -1261 +1267 @@
       p = (WORD*)(((DWORD)p + 3) & ~3); /* DWORD align */
       
+      /* skip header */
       p += (istemplateex ? sizeof(MyDLGITEMTEMPLATEEX) : sizeof(DLGITEMTEMPLATE))/sizeof(WORD);
       
+      /* check class */
       switch ((WORD)*p)
         {
@@ -1277 +1285 @@
           break;
         }
+
+      /* check title text */
       switch ((WORD)*p)
         {
@@ -1357 +1367 @@
     return FALSE;
   
+  TRACE("copying pTemplate %p into temp %p (%ld)\n", pTemplate, temp, resSize);
   memcpy(temp, pTemplate, resSize);
   pTemplate = temp;
@@ -2666 +2677 @@
 PROPSHEET_DialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
-  TRACE("hwnd=%p msg=%x wparam=%x lparam=%lx\n",
+  TRACE("hwnd=%p msg=0x%04x wparam=%x lparam=%lx\n",
         hwnd, uMsg, wParam, lParam);