Changeset 5977 for trunk/src

Timestamp:

Jun 12, 2001, 8:25:11 PM (24 years ago)

Author:

sandervl

Message:

logging fix for CreateWindowExW + fix for dialog template parsing

Location:

trunk/src/user32

Files:

• win32dlg.cpp (modified) (2 diffs)
• window.cpp (modified) (2 diffs)

trunk/src/user32/win32dlg.cpp

@@ -1 @@
-/* $Id: win32dlg.cpp,v 1.67 2001-06-10 09:19:58 sandervl Exp $ */
+/* $Id: win32dlg.cpp,v 1.68 2001-06-12 18:25:11 sandervl Exp $ */
 /*
  * Win32 Dialog Code for OS/2
@@ -646 +646 @@
     {
         info->windowName = (LPCSTR)(UINT)GET_WORD(p + 1);
-        p += 2;
+        p = (WORD *)((char *)p+3);
     }
     else

trunk/src/user32/window.cpp

@@ -1 @@
-/* $Id: window.cpp,v 1.99 2001-06-09 14:50:25 sandervl Exp $ */
+/* $Id: window.cpp,v 1.100 2001-06-12 18:25:11 sandervl Exp $ */
 /*
  * Win32 window apis for OS/2
@@ -164 +164 @@
        return 0;
     }
-
+#ifdef DEBUG
     if(HIWORD(className)) {
-         dprintf(("CreateWindowExW: class %ls name %x parent %x (%d,%d) (%d,%d), %x %x", className, windowName, parent, x, y, width, height, style, exStyle));
-    }
-    else dprintf(("CreateWindowExW: class %d name %x parent %x (%d,%d) (%d,%d), %x %x", className, windowName, parent, x, y, width, height, style, exStyle));
-
+         dprintf(("CreateWindowExW: class %ls name %ls parent %x (%d,%d) (%d,%d), %x %x", className, HIWORD(windowName) ? windowName : NULL, parent, x, y, width, height, style, exStyle));
+    }
+    else dprintf(("CreateWindowExW: class %d name %ls parent %x (%d,%d) (%d,%d), %x %x", className, HIWORD(windowName) ? windowName : NULL, parent, x, y, width, height, style, exStyle));
+#endif
     if (!HIWORD(className))
     {