Rebase against 647004cd5d7ee93ad8b53abb8939da87be3e25a0.

patches/user32-Implement-CascadeWindows/0001-user32-Implement-CascadeWindows.patch

@@ -1,4 +1,4 @@
-From d5389dd8bb868076b75675719d529d0507a90815 Mon Sep 17 00:00:00 2001
+From af732e026343d613cccbab91f7cae3787191ebef Mon Sep 17 00:00:00 2001
 From: katahiromz <katayama.hirofumi.mz@gmail.com>
 Date: Thu, 11 Oct 2018 13:47:02 +0900
 Subject: [PATCH] user32: Implement CascadeWindows.
@@ -11,11 +11,11 @@ Use stanard heap_ functions.
 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45968
 Signed-off-by: Hirofumi Katayama <katayama.hirofumi.mz@gmail.com>
 ---
- dlls/user32/mdi.c | 216 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
+ dlls/user32/mdi.c | 216 +++++++++++++++++++++++++++++++++++++++++++++-
  1 file changed, 214 insertions(+), 2 deletions(-)
 
 diff --git a/dlls/user32/mdi.c b/dlls/user32/mdi.c
-index 10a3882..2e93056 100644
+index 05725a29914..e9ec37b0063 100644
 --- a/dlls/user32/mdi.c
 +++ b/dlls/user32/mdi.c
 @@ -2,6 +2,7 @@
@@ -26,7 +26,7 @@ index 10a3882..2e93056 100644
   *
   * This file contains routines to support MDI (Multiple Document
   * Interface) features .
-@@ -1846,12 +1847,223 @@ done:
+@@ -1795,12 +1796,223 @@ done:
   *    Success: Number of cascaded windows.
   *    Failure: 0
   */
@@ -174,7 +174,7 @@ index 10a3882..2e93056 100644
 +        work_rect = mi.rcWork;
 +    }
 +
-+    hDWP = BeginDeferWindowPos(info.wnd_count);
++    hDWP = NtUserBeginDeferWindowPos( info.wnd_count );
 +    if (hDWP == NULL)
 +        goto cleanup;
 +
@@ -243,7 +243,7 @@ index 10a3882..2e93056 100644
 +    EndDeferWindowPos(hDWP);
 +
 +    if (prev)
-+        SetForegroundWindow(prev);
++        NtUserSetForegroundWindow( prev );
 +
 +cleanup:
 +    heap_free(info.wnd_array);
@@ -253,5 +253,5 @@ index 10a3882..2e93056 100644
  
  
 -- 
-1.9.1
+2.47.2
 

patches/user32-Implement-CascadeWindows/0002-user32-Implement-TileWindows.patch

@@ -1,4 +1,4 @@
-From 3f238e248fc4fc4415b3ce5e420c798d516d24ee Mon Sep 17 00:00:00 2001
+From 4469bff76a8408ca91dbdd1ebeba5f37f146f854 Mon Sep 17 00:00:00 2001
 From: Hirofumi Katayama <katayama.hirofumi.mz@gmail.com>
 Date: Mon, 26 Nov 2018 09:09:52 +0900
 Subject: [PATCH] user32: Implement TileWindows
@@ -13,10 +13,10 @@ Signed-off-by: Hirofumi Katayama <katayama.hirofumi.mz@gmail.com>
  1 file changed, 175 insertions(+), 4 deletions(-)
 
 diff --git a/dlls/user32/mdi.c b/dlls/user32/mdi.c
-index 9679be895ed..c752f967b4d 100644
+index e9ec37b0063..3bf0f28a04f 100644
 --- a/dlls/user32/mdi.c
 +++ b/dlls/user32/mdi.c
-@@ -144,6 +144,10 @@ typedef struct
+@@ -132,6 +132,10 @@ typedef struct
  
  static HBITMAP hBmpClose   = 0;
  
@@ -27,7 +27,7 @@ index 9679be895ed..c752f967b4d 100644
  /* ----------------- declarations ----------------- */
  static void MDI_UpdateFrameText( HWND, HWND, BOOL, LPCWSTR);
  static BOOL MDI_AugmentFrameMenu( HWND, HWND );
-@@ -1929,8 +1933,6 @@ WORD WINAPI
+@@ -1881,8 +1885,6 @@ WORD WINAPI
  CascadeWindows (HWND hwndParent, UINT wFlags, const RECT *lpRect,
  		UINT cKids, const HWND *lpKids)
  {
@@ -36,7 +36,7 @@ index 9679be895ed..c752f967b4d 100644
      CASCADE_INFO info;
      HWND hwnd, top, prev;
      HMONITOR monitor;
-@@ -2084,8 +2086,177 @@ WORD WINAPI
+@@ -2036,8 +2038,177 @@ WORD WINAPI
  TileWindows (HWND hwndParent, UINT wFlags, const RECT *lpRect,
  	     UINT cKids, const HWND *lpKids)
  {
@@ -135,7 +135,7 @@ index 9679be895ed..c752f967b4d 100644
 +        }
 +    }
 +
-+    hDWP = BeginDeferWindowPos(info.wnd_count);
++    hDWP = NtUserBeginDeferWindowPos( info.wnd_count );
 +    if (hDWP == NULL)
 +        goto cleanup;
 +
@@ -206,7 +206,7 @@ index 9679be895ed..c752f967b4d 100644
 +    EndDeferWindowPos(hDWP);
 +
 +    if (hwndPrev)
-+        SetForegroundWindow(hwndPrev);
++        NtUserSetForegroundWindow( hwndPrev );
 +
 +cleanup:
 +    if (cKids == 0 || lpKids == NULL)
@@ -217,5 +217,5 @@ index 9679be895ed..c752f967b4d 100644
  
  
 -- 
-2.24.1
+2.47.2