Changeset 1805 for trunk/src

Timestamp:

Nov 21, 1999, 7:46:36 PM (26 years ago)

Author:

cbratschi

Message:

don't send WM_SETTEXT before WM_NCCREATE

File:

• trunk/src/user32/win32wbase.cpp (modified) (3 diffs)

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.88 1999-11-21 17:34:11 achimha Exp $ */
+/* $Id: win32wbase.cpp,v 1.89 1999-11-21 18:46:36 cbratschi Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -147 +147 @@
   windowNameA      = NULL;
   windowNameW      = NULL;
-  wndNameLength    = 0;
+  wndNameLength    = 1; //CB: right?
 
   userWindowLong   = NULL;;
@@ -519 +519 @@
   if(HIWORD(cs->lpszName))
   {
-        if(isUnicode)
-                SetWindowTextW((LPWSTR)cs->lpszName);
-        else    SetWindowTextA((LPSTR)cs->lpszName);
+    if (isUnicode)
+    {
+      windowNameA = (LPSTR)_smalloc(strlen(cs->lpszName)+1);
+      strcpy(windowNameA,cs->lpszName);
+      windowNameW = (LPWSTR)_smalloc((strlen(cs->lpszName)+1)*sizeof(WCHAR));
+      lstrcpyAtoW(windowNameW,windowNameA);
+      wndNameLength = strlen(windowNameA)+1; //including 0 terminator
+    } else
+    {
+      windowNameA = (LPSTR)_smalloc(lstrlenW((LPWSTR)cs->lpszName)+1);
+      lstrcpyWtoA(windowNameA,(LPWSTR)cs->lpszName);
+      windowNameW = (LPWSTR)_smalloc((lstrlenW((LPWSTR)cs->lpszName)+1)*sizeof(WCHAR));
+      lstrcpyW(windowNameW,(LPWSTR)cs->lpszName);
+      wndNameLength = strlen(windowNameA)+1; //including 0 terminator
+    }
   }