Changeset 1926 for trunk/src

Timestamp:

Dec 1, 1999, 7:43:08 PM (26 years ago)

Author:

sandervl

Message:

* empty log message *

Location:

trunk/src

Files:

• NTDLL/ntdll.def (modified) (2 diffs)
• user32/win32wbase.cpp (modified) (3 diffs)

trunk/src/NTDLL/ntdll.def

@@ -1 @@
-; $Id: ntdll.def,v 1.27 1999-12-01 10:52:13 sandervl Exp $
+; $Id: ntdll.def,v 1.28 1999-12-01 18:39:49 sandervl Exp $
 
 ;Created by BLAST for IBM's compiler
@@ -21 +21 @@
     _allmul                          = _OS2_allmul
 
-    RtlLargeIntegerToChar            = _RtlLargeIntegerToChar@12     @425
+    RtlLargeIntegerToChar            = _RtlLargeIntegerToChar@16     @425
 
 ; real functions

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.100 1999-12-01 18:23:29 cbratschi Exp $ */
+/* $Id: win32wbase.cpp,v 1.101 1999-12-01 18:43:08 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -520 +520 @@
     if (!isUnicode)
     {
-      wndNameLength = strlen(cs->lpszName);
-      windowNameA = (LPSTR)_smalloc(wndNameLength+1);
-      strcpy(windowNameA,cs->lpszName);
-      windowNameW = (LPWSTR)_smalloc((wndNameLength+1)*sizeof(WCHAR));
-      lstrcpyAtoW(windowNameW,windowNameA);
-    } else
-    {
-      wndNameLength = lstrlenW((LPWSTR)cs->lpszName);
-      windowNameA = (LPSTR)_smalloc(wndNameLength+1);
-      lstrcpyWtoA(windowNameA,(LPWSTR)cs->lpszName);
-      windowNameW = (LPWSTR)_smalloc((wndNameLength+1)*sizeof(WCHAR));
-      lstrcpyW(windowNameW,(LPWSTR)cs->lpszName);
+        wndNameLength = strlen(cs->lpszName);
+        windowNameA = (LPSTR)_smalloc(wndNameLength+1);
+        strcpy(windowNameA,cs->lpszName);
+        windowNameW = (LPWSTR)_smalloc((wndNameLength+1)*sizeof(WCHAR));
+        lstrcpyAtoW(windowNameW,windowNameA);
+        windowNameA[wndNameLength] = 0;
+        windowNameW[wndNameLength] = 0;
+    }
+    else
+    {
+        wndNameLength = lstrlenW((LPWSTR)cs->lpszName);
+        windowNameA = (LPSTR)_smalloc(wndNameLength+1);
+        lstrcpyWtoA(windowNameA,(LPWSTR)cs->lpszName);
+        windowNameW = (LPWSTR)_smalloc((wndNameLength+1)*sizeof(WCHAR));
+        lstrcpyW(windowNameW,(LPWSTR)cs->lpszName);
+        windowNameA[wndNameLength] = 0;
+        windowNameW[wndNameLength] = 0;
     }
   }
@@ -2351 +2356 @@
        if (isChild())
        {
-                Win32BaseWindow *windowParent = getParent();
-                if(windowParent) {
-                        hParent = getParent()->getOS2WindowHandle();
-                }
-                else    dprintf(("WARNING: Win32BaseWindow::SetWindowPos window %x is child but has no parent!!", getWindowHandle()));
+            Win32BaseWindow *windowParent = getParent();
+            if(windowParent) {
+                hParent = getParent()->getOS2WindowHandle();
+        }
+        else    dprintf(("WARNING: Win32BaseWindow::SetWindowPos window %x is child but has no parent!!", getWindowHandle()));
        }
        OSLibWinQueryWindowPos(OS2HwndFrame, &swpOld);