Changeset 1802 for trunk/src

Timestamp:

Nov 21, 1999, 6:34:11 PM (26 years ago)

Author:

achimha

Message:

fixed combo box behavior, added NULL check in Combo_HandleText

Location:

trunk/src/user32

Files:

• combo.cpp (modified) (2 diffs)
• win32wbase.cpp (modified) (2 diffs)

trunk/src/user32/combo.cpp

@@ -1 @@
-/* $Id: combo.cpp,v 1.17 1999-11-21 14:04:10 achimha Exp $ */
+/* $Id: combo.cpp,v 1.18 1999-11-21 17:34:10 achimha Exp $ */
 /*
  * Combo controls
@@ -1494 +1494 @@
   LPHEADCOMBO lphc = (LPHEADCOMBO)GetInfoPtr(hwnd);
 
+  if (lphc == NULL)
+  {
+    dprintf(("COMBO_HandleText Info Pointer NULL!\n"));
+    return CB_ERR;
+  }
+
   if ((message == WM_GETTEXTLENGTH) && !(lphc->wState & CBF_EDIT))
   {

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.87 1999-11-21 17:07:51 cbratschi Exp $ */
+/* $Id: win32wbase.cpp,v 1.88 1999-11-21 17:34:11 achimha Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -1517 +1517 @@
           lstrcpyAtoW(windowNameW, windowNameA);
           wndNameLength = strlen(windowNameA)+1; //including 0 terminator
+          dprintf(("WM_SETTEXT of %d to %s\n", Win32Hwnd, lParam));
         } else
         {