Changeset 11953

Timestamp:

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

Author:

sandervl

Message:

Combobox + getWindowTextA/W fixes

Location:

tags/trunk/src/user32

Files:

• Makefile (modified) (2 diffs)
• combo.cpp (modified) (4 diffs)
• controls.cpp (modified) (5 diffs)
• win32wbase.cpp (modified) (4 diffs)

tags/trunk/src/user32/Makefile ¶

@@ -1 @@
-# $Id: Makefile,v 1.31 1999-10-13 14:24:24 sandervl Exp $
+# $Id: Makefile,v 1.32 1999-10-19 19:26:07 sandervl Exp $
 
 #
@@ -124 +124 @@
 win32wbasepos.obj: win32wbasepos.cpp win32class.h win32wbase.h win32dlg.h gen_object.h heapshared.h oslibwin.h win32wndchild.h  $(PDWIN32_INCLUDE)\winres.h oslibres.h win32wndhandle.h oslibdos.h dc.h pmframe.h win32wdesktop.h
 win32wnd.obj:   win32wnd.cpp win32class.h win32wbase.h win32wnd.h win32dlg.h gen_object.h heapshared.h oslibwin.h win32wndchild.h  $(PDWIN32_INCLUDE)\winres.h oslibres.h win32wndhandle.h oslibdos.h oslibmenu.h
-win32dlg.obj:   win32dlg.cpp win32class.h win32wbase.h win32dlg.h gen_object.h heapshared.h oslibwin.h win32wndchild.h oslibmsg.h
+win32dlg.obj:   win32dlg.cpp win32class.h win32wbase.h win32dlg.h gen_object.h heapshared.h oslibwin.h win32wndchild.h oslibmsg.h $(PDWIN32_INCLUDE)\win\controls.h
 win32wndchild.obj: win32wndchild.cpp win32wndchild.h gen_object.h
 win32wmdiclient.obj: win32wmdiclient.cpp win32wbase.h win32wmdiclient.h win32wmdichild.h gen_object.h

tags/trunk/src/user32/combo.cpp ¶

@@ -1 @@
-/* $Id: combo.cpp,v 1.4 1999-10-08 21:23:37 cbratschi Exp $ */
+/* $Id: combo.cpp,v 1.5 1999-10-19 19:26:07 sandervl Exp $ */
 /*
  * Combo controls
@@ -25 +25 @@
  */
 
-#define CB_GETPTR( hwnd )      (*(LPHEADCOMBO*)(GetInfoPtr(hwnd)))
+#define CB_GETPTR( hwnd )      ((LPHEADCOMBO)(GetInfoPtr(hwnd)))
 #define CB_NOTIFY( lphc, code ) \
         (SendMessageA( (lphc)->owner, WM_COMMAND, \
@@ -1238 +1238 @@
   if(ptr)
   {
-    lphc =  (*(LPHEADCOMBO*)(ptr));
+    lphc =  (LPHEADCOMBO )ptr;
     if( lphc ) return lphc->hWndLBox;
   }
@@ -1775 +1775 @@
 
       if(ptr)
-        lphc = (*(LPHEADCOMBO*)(ptr));
+        lphc = (LPHEADCOMBO)ptr;
 
       //TRACE("[%04x]: msg %s wp %08x lp %08lx\n",

tags/trunk/src/user32/controls.cpp ¶

@@ -1 @@
-/* $Id: controls.cpp,v 1.3 1999-09-23 10:33:59 sandervl Exp $ */
+/* $Id: controls.cpp,v 1.4 1999-10-19 19:26:07 sandervl Exp $ */
 /* File: controls.cpp -- Win32 common controls
  *
@@ -10 +10 @@
 #include "misc.h"
 
-#include "controls.h"
 #include "button.h"
 #include "static.h"
@@ -18 +17 @@
 #include "win32dlg.h"
 #include "win32wdesktop.h"
+#include "controls.h"
+
+ATOM controlAtoms[MAX_CONTROLS] = {0};
 
 /* registration */
@@ -46 +48 @@
 
   dprintf(("Register BUTTON class"));
-  if (!BUTTON_Register()) dprintf(("failed!!!"));
+  controlAtoms[BUTTON_CONTROL] = BUTTON_Register();
+  if (!controlAtoms[BUTTON_CONTROL]) dprintf(("failed!!!"));
 
   dprintf(("Register STATIC class"));
-  if (!STATIC_Register()) dprintf(("failed!!!"));
+  controlAtoms[STATIC_CONTROL] = STATIC_Register();
+  if (!controlAtoms[STATIC_CONTROL]) dprintf(("failed!!!"));
 
   dprintf(("Register SCROLLBAR class"));
-  if (!SCROLLBAR_Register()) dprintf(("failed!!!"));
+  controlAtoms[SCROLLBAR_CONTROL] = SCROLLBAR_Register();
+  if (!controlAtoms[SCROLLBAR_CONTROL]) dprintf(("failed!!!"));
 
   dprintf(("Register LISTBOX class"));
-  if (!LISTBOX_Register()) dprintf(("failed!!!"));
+  controlAtoms[LISTBOX_CONTROL] = LISTBOX_Register();
+  if (!controlAtoms[LISTBOX_CONTROL]) dprintf(("failed!!!"));
 
   dprintf(("Register COMBOLBOX class"));
-  if (!COMBOLBOX_Register()) dprintf(("failed!!!"));
+  controlAtoms[COMBOLBOX_CONTROL] = COMBOLBOX_Register();
+  if (!controlAtoms[COMBOLBOX_CONTROL]) dprintf(("failed!!!"));
 
   dprintf(("Register COMBOBOX class"));
-  if (!COMBOBOX_Register()) dprintf(("failed!!!"));
+  controlAtoms[COMBOBOX_CONTROL] = COMBOBOX_Register();
+  if (!controlAtoms[COMBOBOX_CONTROL]) dprintf(("failed!!!"));
 
   dprintf(("Register EDIT class"));
-  if (!EDIT_Register()) dprintf(("failed!!!"));
+  controlAtoms[EDIT_CONTROL] = EDIT_Register();
+  if (!controlAtoms[EDIT_CONTROL]) dprintf(("failed!!!"));
 
   dprintf(("Register MDICLIENT class"));
-  if (!MDICLIENT_Register()) dprintf(("failed!!!"));
+  controlAtoms[MDICLIENT_CONTROL] = MDICLIENT_Register();
+  if (!controlAtoms[MDICLIENT_CONTROL]) dprintf(("failed!!!"));
 
   dprintf(("Register DIALOG class"));
-  if (!DIALOG_Register()) dprintf(("failed!!!"));
+  controlAtoms[DIALOG_CONTROL] = DIALOG_Register();
+  if (!controlAtoms[DIALOG_CONTROL]) dprintf(("failed!!!"));
 
   dprintf(("Register DESKTOP class"));
-  if (!DESKTOP_Register()) dprintf(("failed!!!")); 
+  controlAtoms[DESKTOP_CONTROL] = DESKTOP_Register();
+  if (!controlAtoms[DESKTOP_CONTROL]) dprintf(("failed!!!")); 
 }
 
@@ -110 +122 @@
 
 
+BOOL WIDGETS_IsControl(Win32BaseWindow *window, int control)
+{
+  if(control >= MAX_CONTROLS || window == NULL || window->getClass() == NULL)
+        return FALSE;
+
+  return controlAtoms[control] == window->getClass()->getAtom();
+}
+

tags/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;