Changeset 1733 for trunk/src

Timestamp:

Nov 14, 1999, 2:07:03 PM (26 years ago)

Author:

sandervl

Message:

SetParent bugfix

Location:

trunk/src/user32

Files:

• win32wbase.cpp (modified) (3 diffs)
• windowclass.cpp (modified) (3 diffs)

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.82 1999-11-13 16:42:43 cbratschi Exp $ */
+/* $Id: win32wbase.cpp,v 1.83 1999-11-14 13:07:02 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -2274 +2274 @@
         setParent(newparent);
         getParent()->AddChild(this);
-        OSLibWinSetParent(getOS2WindowHandle(), getParent()->getOS2WindowHandle());
+        OSLibWinSetParent(getOS2FrameWindowHandle(), getParent()->getOS2WindowHandle());
         return oldhwnd;
    }
@@ -2758 +2758 @@
 ULONG Win32BaseWindow::GetWindowLongA(int index)
 {
-    dprintf2(("GetWindowLongA %x %d", getWindowHandle(), index));
+ ULONG value;
+
     switch(index) {
         case GWL_EXSTYLE:
-                return dwExStyle;
+                value = dwExStyle;
+                break;
         case GWL_STYLE:
-                return dwStyle;
+                value = dwStyle;
+                break;
         case GWL_WNDPROC:
-                return (ULONG)getWindowProc();
+                value = (ULONG)getWindowProc();
+                break;
         case GWL_HINSTANCE:
-                return hInstance;
+                value = hInstance;
+                break;
         case GWL_HWNDPARENT:
                 if(getParent()) {
-                        return getParent()->getWindowHandle();
+                        value = getParent()->getWindowHandle();
                 }
-                else    return 0;
+                else    value = 0;
+                break;
         case GWL_ID:
-                return getWindowId();
+                value = getWindowId();
+                break;
         case GWL_USERDATA:
-                return userData;
+                value = userData;
+                break;
         default:
                 if(index >= 0 && index/4 < nrUserWindowLong)
                 {
-                        return userWindowLong[index/4];
+                        value = userWindowLong[index/4];
+                        break;
                 }
                 SetLastError(ERROR_INVALID_PARAMETER);
                 return 0;
     }
+    dprintf2(("GetWindowLongA %x %d %x", getWindowHandle(), index, value));
+    return value;
 }
 //******************************************************************************

trunk/src/user32/windowclass.cpp

@@ -1 @@
-/* $Id: windowclass.cpp,v 1.4 1999-11-01 19:11:46 sandervl Exp $ */
+/* $Id: windowclass.cpp,v 1.5 1999-11-14 13:07:03 sandervl Exp $ */
 /*
  * Win32 Window Class Code for OS/2
@@ -266 +266 @@
 {
  Win32BaseWindow *wnd;
-
-    dprintf(("USER32: GetClassNameA\n"));
+ int rc;
+
     wnd = Win32BaseWindow::GetWindowFromHandle(hwnd);
     if(!wnd) {
@@ -273 +273 @@
         return(0);
     }
+    *lpszClassName = 0;
+    rc = (wnd->getClass())->getClassName(lpszClassName, cchClassName);
+    dprintf(("USER32: GetClassNameA %x %s (%d)", hwnd, lpszClassName, rc));
+    return rc;
+}
+//******************************************************************************
+//******************************************************************************
+int WIN32API GetClassNameW(HWND hwnd, LPWSTR lpszClassName, int cchClassName)
+{
+ Win32BaseWindow *wnd;
+
+    dprintf(("USER32: GetClassNameW\n"));
+    wnd = Win32BaseWindow::GetWindowFromHandle(hwnd);
+    if(!wnd) {
+        dprintf(("GetClassNameA wnd == NULL"));
+        return(0);
+    }
     return (wnd->getClass())->getClassName(lpszClassName, cchClassName);
 }
 //******************************************************************************
 //******************************************************************************
-int WIN32API GetClassNameW(HWND hwnd, LPWSTR lpszClassName, int cchClassName)
-{
- Win32BaseWindow *wnd;
-
-    dprintf(("USER32: GetClassNameW\n"));
-    wnd = Win32BaseWindow::GetWindowFromHandle(hwnd);
-    if(!wnd) {
-        dprintf(("GetClassNameA wnd == NULL"));
-        return(0);
-    }
-    return (wnd->getClass())->getClassName(lpszClassName, cchClassName);
-}
-//******************************************************************************
-//******************************************************************************
 LONG WIN32API SetClassLongA(HWND hwnd, int nIndex, LONG lNewVal)
 {