Merge pull request #992 from cracyc/swp

force wm_nccalcsize in movewindow for <=win30
otya128 · Jun 1, 2021 · eeb29ba · eeb29ba
2 parents 9e0ca73 + 9f0a12e
commit eeb29ba
Showing 1 changed file with 15 additions and 10 deletions.
diff --git a/user/window.c b/user/window.c
@@ -2083,19 +2083,24 @@ BOOL16 WINAPI SetWindowPos16( HWND16 hwnd, HWND16 hwndInsertAfter,
     {
         hwnd32 = HWND_NOTOPMOST;
     }
-    if ((flags & SWP_NOREDRAW) && (GetExpWinVer16(GetExePtr(GetCurrentTask())) < 0x30a))
+    if (GetExpWinVer16(GetExePtr(GetCurrentTask())) < 0x30a)
     {
-        RECT rect;
-        GetWindowRect(hwnd32, &rect);
-        /* top-level window */
-        if (GetAncestor(hwnd32, GA_PARENT) == GetDesktopWindow())
-        {
-            flags &= ~SWP_NOREDRAW;
-        }
-        if (rect.left == rect.right || rect.bottom == rect.top)
+	    if (flags & SWP_NOREDRAW)
         {
-            flags &= ~SWP_NOREDRAW;
+            RECT rect;
+            GetWindowRect(hwnd32, &rect);
+            /* top-level window */
+            if (GetAncestor(hwnd32, GA_PARENT) == GetDesktopWindow())
+            {
+                flags &= ~SWP_NOREDRAW;
+            }
+            if (rect.left == rect.right || rect.bottom == rect.top)
+            {
+                flags &= ~SWP_NOREDRAW;
+            }
         }
+        if (!(flags & SWP_NOMOVE))
+    	    flags |= SWP_FRAMECHANGED; // force WM_NCCALCSIZE
     }
     DWORD count;
     ReleaseThunkLock(&count);