Changeset 1365 for trunk/src/user32/win32wbase.cpp

Timestamp:

Oct 19, 1999, 9:26:08 PM (26 years ago)

Author:

sandervl

Message:

Combobox + getWindowTextA/W fixes

File:

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

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.55 1999-10-19 12:52:30 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.56 1999-10-19 19:26:08 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -641 +641 @@
   else
   {
+        dprintf(("Set window ID to %x", cs->hMenu));
         setWindowId((DWORD)cs->hMenu);
   }
@@ -2453 +2454 @@
 int Win32BaseWindow::GetWindowTextA(LPSTR lpsz, int cch)
 {
+    if(windowNameA == NULL) {
+        *lpsz = 0;
+        return 0;
+    }
     strncpy(lpsz, windowNameA, cch);
     return wndNameLength;
@@ -2460 +2465 @@
 int Win32BaseWindow::GetWindowTextW(LPWSTR lpsz, int cch)
 {
+    if(windowNameW == NULL) {
+        *lpsz = 0;
+        return 0;
+    }
     lstrcpynW((LPWSTR)lpsz, windowNameW, cch);
     return wndNameLength;