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

Timestamp:

Sep 5, 2000, 9:20:38 PM (25 years ago)

Author:

sandervl

Message:

WM_FOCUSCHANGE fixes + misc fixes

File:

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

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.210 2000-09-04 18:23:56 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.211 2000-09-05 19:20:36 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -666 +666 @@
   }
 
-  if (SendInternalMessageA(WM_NCCREATE,0,(LPARAM)cs))
+  //cs is ascii version of create structure. so use SendInternalMessageA
+  if(SendInternalMessageA(WM_NCCREATE,0,(LPARAM)cs))
   {
         RECT tmpRect;
@@ -705 +706 @@
                 SendInternalMessageA(WM_MOVE,0,MAKELONG(rectClient.left,rectClient.top));
             }
-
             if( (getStyle() & WS_CHILD) && !(getExStyle() & WS_EX_NOPARENTNOTIFY) )
             {
                 /* Notify the parent window only */
-                SendInternalMessageA(WM_PARENTNOTIFY, MAKEWPARAM(WM_CREATE, getWindowId()), (LPARAM)getWindowHandle());
+                if(getParent() && getParent()->IsWindowDestroyed() == FALSE)
+                {
+                        getParent()->SendInternalMessageA(WM_PARENTNOTIFY, MAKEWPARAM(WM_CREATE, getWindowId()), (LPARAM)getWindowHandle());
+                }
                 if(!::IsWindow(getWindowHandle()))
                 {
@@ -3013 +3016 @@
  LONG oldval;
 
-    dprintf2(("SetWindowLong%c %x %d %x", (fUnicode) ? 'W' : 'A', getWindowHandle(), index, value));
     switch(index) {
         case GWL_EXSTYLE:
@@ -3019 +3021 @@
            STYLESTRUCT ss;
 
-                if(dwExStyle == value)
-                    return value;
-
+                if(dwExStyle == value) {
+                        oldval = value;
+                        break;
+                }
                 ss.styleOld = dwExStyle;
                 ss.styleNew = value;
@@ -3028 +3031 @@
                 setExStyle(ss.styleNew);
                 SendInternalMessageA(WM_STYLECHANGED,GWL_EXSTYLE,(LPARAM)&ss);
-                return ss.styleOld;
+                oldval = ss.styleOld;
+                break;
         }
         case GWL_STYLE:
@@ -3036 +3040 @@
                 //SvL: TODO: Can you change minimize or maximize status here too?
 
-                if(dwStyle == value)
-                    return value;
-
+                if(dwStyle == value) {
+                        oldval = value;
+                        break;
+                }
                 value &= ~(WS_CHILD|WS_VISIBLE);      /* Some bits can't be changed this way (WINE) */
                 ss.styleOld = getStyle();
@@ -3051 +3056 @@
                 PrintWindowStyle(ss.styleNew, 0);
 #endif
-                return ss.styleOld;
+                oldval = ss.styleOld;
+                break;
         }
         case GWL_WNDPROC:
@@ -3065 +3071 @@
                 oldval = (LONG)WINPROC_GetProc(win32wndproc, (fUnicode) ? WIN_PROC_32W : WIN_PROC_32A);
                 WINPROC_SetProc((HWINDOWPROC *)&win32wndproc, (WNDPROC)value, type, WIN_PROC_WINDOW);
-                return oldval;
+                break;
         }
         case GWL_HINSTANCE:
                 oldval = hInstance;
                 hInstance = value;
-                return oldval;
+                break;
 
         case GWL_HWNDPARENT:
-                return SetParent((HWND)value);
+                oldval = SetParent((HWND)value);
+                break;
 
         case GWL_ID:
                 oldval = getWindowId();
                 setWindowId(value);
-                return oldval;
+                break;
 
         case GWL_USERDATA:
                 oldval = userData;
                 userData = value;
-                return oldval;
+                break;
 
         default:
@@ -3090 +3097 @@
                         oldval = userWindowLong[index/4];
                         userWindowLong[index/4] = value;
-                        return oldval;
+                        break;
                 }
+                dprintf(("WARNING: SetWindowLong%c %x %d %x returned %x INVALID index!", (fUnicode) ? 'W' : 'A', getWindowHandle(), index, value));
                 SetLastError(ERROR_INVALID_PARAMETER);
                 return 0;
     }
+    SetLastError(ERROR_SUCCESS);
+    dprintf2(("SetWindowLong%c %x %d %x returned %x", (fUnicode) ? 'W' : 'A', getWindowHandle(), index, value, oldval));
+    return oldval;
 }
 //******************************************************************************