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

Timestamp:

Jun 9, 2002, 9:53:32 PM (23 years ago)

Author:

sandervl

Message:

WS_CHILD style change in SetWindowLong (GWL_STYLE) *is* allowed

File:

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

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.327 2002-06-02 19:34:31 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.328 2002-06-09 19:53:32 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -82 +82 @@
 static int iMenuSysKey = 0;
 
-
-
-/***
- * Performance Optimization:
- * we're directly inlining this micro function from win32wndhandle.cpp.
- * Changes there must be reflected here.
- ***/
-extern ULONG WindowHandleTable[MAX_WINDOW_HANDLES];
-
-BOOL INLINE i_HwGetWindowHandleData(HWND hwnd, DWORD *pdwUserData)
-{
-  if((hwnd & 0xFFFF0000) != WNDHANDLE_MAGIC_HIGHWORD) {
-        return FALSE; //unknown window (PM?)
-  }
-  hwnd &= WNDHANDLE_MAGIC_MASK;
-  if(hwnd < MAX_WINDOW_HANDLES) {
-        *pdwUserData = WindowHandleTable[hwnd];
-        return TRUE;
-  }
-  *pdwUserData = 0;
-  return FALSE;
-}
-#define HwGetWindowHandleData(a,b) i_HwGetWindowHandleData(a,b)
-
-
 //******************************************************************************
 //******************************************************************************
@@ -508 +483 @@
     {
         SetParent(cs->hwndParent);
-//        owner = GetWindowFromHandle(cs->hwndParent);
         owner = 0;
-/*        if(owner == NULL)
-        {
-            dprintf(("HwGetWindowHandleData couldn't find owner window %x!!!", cs->hwndParent));
-            SetLastError(ERROR_INVALID_WINDOW_HANDLE);
-            return FALSE;
-        }*/
         //SvL: Shell positioning shouldn't be done for child windows! (breaks Notes)
         fXDefault = fCXDefault = FALSE;
@@ -2314 +2282 @@
         swp |= SWP_NOACTIVATE | SWP_NOZORDER;
 
-    dprintf(("ShowWindow : SetWindowPos now"));   
     if (!(getStyle() & WS_MINIMIZE)) {
          SetWindowPos(HWND_TOP, newPos.left, newPos.top, newPos.right, newPos.bottom, LOWORD(swp));
@@ -2796 +2763 @@
         getParent()->addChild(this);
         fParentChange = TRUE;
-
         OSLibWinSetParent(getOS2FrameWindowHandle(), getParent()->getOS2WindowHandle());
         if(!(getStyle() & WS_CHILD))
@@ -3546 +3512 @@
         case GWL_STYLE:
         {
-           STYLESTRUCT ss;
+                STYLESTRUCT ss;
 
                 //SvL: TODO: Can you change minimize or maximize status here too?
@@ -3555 +3521 @@
                 }
                 dprintf(("SetWindowLong GWL_STYLE %x old %x new style %x (%x)", getWindowHandle(), dwStyle, value));
-#ifdef DEBUG
-//                if((value & WS_CHILD) != (dwStyle & WS_CHILD)) {
-//                    DebugInt3(); //is this allowed?
-//                }
-#endif
-                value &= ~(WS_CHILD);
+                
+                //Changing WS_CHILD style is allowed
                 ss.styleOld = getStyle();
-                ss.styleNew = value | (ss.styleOld & WS_CHILD);
+                ss.styleNew = value;
                 SendMessageA(getWindowHandle(),WM_STYLECHANGING,GWL_STYLE,(LPARAM)&ss);
                 setStyle(ss.styleNew);