Changeset 5429 for trunk/src

Timestamp:

Apr 2, 2001, 12:13:28 AM (24 years ago)

Author:

sandervl

Message:

create dialog controls with CreateWindowExW; use correct SendMessage during CreateWindow

Location:

trunk/src/user32

Files:

• win32dlg.cpp (modified) (3 diffs)
• win32wbase.cpp (modified) (7 diffs)
• windowclass.cpp (modified) (7 diffs)

trunk/src/user32/win32dlg.cpp

@@ -1 @@
-/* $Id: win32dlg.cpp,v 1.58 2001-03-25 08:50:42 sandervl Exp $ */
+/* $Id: win32dlg.cpp,v 1.59 2001-04-01 22:13:27 sandervl Exp $ */
 /*
  * Win32 Dialog Code for OS/2
@@ -663 +663 @@
         dprintf(("Create CONTROL %d", info.id));
 
-        char *classNameA = NULL;
-        char *windowNameA = NULL;
-
-        if(HIWORD(info.className)) {
-             classNameA = UnicodeToAsciiString((LPWSTR)info.className);
-        }
-        else classNameA = (char *)info.className;
-
-        if(HIWORD(info.windowName)) {
-             windowNameA = UnicodeToAsciiString((LPWSTR)info.windowName);
-        }
-        else windowNameA = (char *)info.windowName;
-
-        hwndCtrl = ::CreateWindowExA( info.exStyle | WS_EX_NOPARENTNOTIFY,
-                                      classNameA,
-                                      windowNameA,
+        hwndCtrl = ::CreateWindowExW( info.exStyle | WS_EX_NOPARENTNOTIFY,
+                                      (LPWSTR)info.className,
+                                      (LPWSTR)info.windowName,
                                       info.style | WS_CHILD,
                                       MulDiv(info.x, xUnit, 4),
@@ -686 +673 @@
                                       getWindowHandle(), (HMENU)info.id,
                                       hInst, info.data );
-        if(HIWORD(classNameA)) {
-            FreeAsciiString(classNameA);
-        }
-        if(HIWORD(windowNameA)) {
-            FreeAsciiString(windowNameA);
-        }
 
         if (!hwndCtrl) return FALSE;

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.247 2001-03-30 11:14:36 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.248 2001-04-01 22:13:27 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -300 +300 @@
     else
     if ((cs->style & WS_CHILD) && !(cs->style & WS_POPUP)) {
-            dprintf(("No parent for child window\n" ));
+            dprintf(("No parent for child window" ));
             SetLastError(ERROR_INVALID_PARAMETER);
             return FALSE;  /* WS_CHILD needs a parent, but WS_POPUP doesn't */
@@ -310 +310 @@
     {
         GlobalGetAtomNameA( classAtom, buffer, sizeof(buffer) );
-        dprintf(("Bad class '%s'\n", buffer ));
+        dprintf(("Bad class '%s'", buffer ));
         SetLastError(ERROR_INVALID_PARAMETER);
         return 0;
@@ -320 +320 @@
     if(HIWORD(cs->lpszClass))
     {
-        char *astring;
-
-        if(isUnicode) astring = UnicodeToAsciiString((LPWSTR)cs->lpszClass);
-        else          astring = (char *)cs->lpszClass;
-
-        dprintf(("Window class %s", astring));
-        if(isUnicode) FreeAsciiString(astring);
+         if(isUnicode) dprintf(("Window class %ls", cs->lpszClass));
+         else          dprintf(("Window class %s", cs->lpszClass));
     }
     else dprintf(("Window class %x", cs->lpszClass));
@@ -490 +485 @@
  POINT          maxSize, maxPos, minTrack, maxTrack;
  HWND           hwnd = getWindowHandle();
+ LRESULT (* CALLBACK localSend32)(HWND, UINT, WPARAM, LPARAM);
 
     OS2Hwnd      = hwndOS2;
@@ -685 +681 @@
     }
 
-    //cs is ascii version of create structure. so use SendInternalMessageA
-    if(SendInternalMessageA(WM_NCCREATE,0,(LPARAM)cs))
+    localSend32 = (isUnicode) ? ::SendMessageW : ::SendMessageA;
+
+    if(localSend32(getWindowHandle(), WM_NCCREATE,0,(LPARAM)cs))
     {
         RECT tmpRect;
@@ -710 +707 @@
         fNoSizeMsg = FALSE;
         if (cs->style & WS_VISIBLE) dwStyle |= WS_VISIBLE; //program could change position in WM_CREATE
-        if( (SendInternalMessageA(WM_CREATE, 0, (LPARAM)cs )) != -1 )
+        if( (localSend32(getWindowHandle(), WM_CREATE, 0, (LPARAM)cs )) != -1 )
         {
             if(!(flags & WIN_NEED_SIZE))

trunk/src/user32/windowclass.cpp

@@ -1 @@
-/* $Id: windowclass.cpp,v 1.18 2001-04-01 19:38:51 sandervl Exp $ */
+/* $Id: windowclass.cpp,v 1.19 2001-04-01 22:13:28 sandervl Exp $ */
 /*
  * Win32 Window Class Code for OS/2
@@ -46 +46 @@
  Win32WndClass *wclass;
 
-    dprintf(("RegisterClassA\n"));
     //CB: size new in ex structure
     wc.cbSize = sizeof(wc);
@@ -62 +61 @@
 
     //TODO: not destroyed when class is unregistered (neither does Wine, but that might be a bug)
+    dprintf(("RegisterClassA"));
     int iSmIconWidth  = GetSystemMetrics(SM_CXSMICON);
     int iSmIconHeight = GetSystemMetrics(SM_CYSMICON);
@@ -92 +92 @@
     }
 
-    dprintf(("RegisterClassExA\n"));
+    dprintf(("RegisterClassExA"));
     wclass = new Win32WndClass((WNDCLASSEXA *)lpWndClass,FALSE);
     if(wclass == NULL) {
@@ -130 +130 @@
                            LR_COPYFROMRESOURCE);
 
+    dprintf(("RegisterClassW"));
     winclass = new Win32WndClass((WNDCLASSEXA *)&wc, TRUE);
     if(winclass == NULL) {
@@ -149 +150 @@
  Win32WndClass *winclass;
 
-    dprintf(("RegisterClassExW\n"));
     memcpy(&wc, lpwc, sizeof(WNDCLASSEXA));
 
@@ -161 +161 @@
     }
 
+    dprintf(("RegisterClassExW"));
     winclass = new Win32WndClass((WNDCLASSEXA *)&wc, TRUE);
     if(winclass == NULL) {