Wine Staging f8b6fde, wine-tkg-git bae6dd9.

openglfreak · Mar 21, 2021 · 2805efc · 2805efc
1 parent 52ba819
commit 2805efc
Show file tree

Hide file tree

Showing 99 changed files with 4,002 additions and 4,078 deletions.
diff --git a/ps0001-p0001-server-Do-not-allow-selecting-on-the-ifchange-object.mypatch b/ps0001-p0001-server-Do-not-allow-selecting-on-the-ifchange-object.mypatch
diff --git a/ps0001-p0002-server-Make-pulse_event-static.mypatch b/ps0001-p0002-server-Make-pulse_event-static.mypatch
diff --git a/ps0001-p0003-server-Use-default_fd_signaled-for-sockets.mypatch b/ps0001-p0003-server-Use-default_fd_signaled-for-sockets.mypatch
diff --git a/ps0001-p0004-server-Fix-a-copy-paste-error-in-a-comment.mypatch b/ps0001-p0004-server-Fix-a-copy-paste-error-in-a-comment.mypatch
diff --git a/ps0001-p0005-server-Remove-a-no-longer-relevant-see-below-from-a-comment.mypatch b/ps0001-p0005-server-Remove-a-no-longer-relevant-see-below-from-a-comment.mypatch
diff --git a/ps0001-p0036-make_req.mypatch b/ps0001-p0036-make_req.mypatch
@@ -168,8 +168,8 @@ index 18551a2d448..90afd91e7ba 100644
 
  /* ### protocol_version begin ### */
 
--#define SERVER_PROTOCOL_VERSION 685
-+#define SERVER_PROTOCOL_VERSION 686
+-#define SERVER_PROTOCOL_VERSION 687
++#define SERVER_PROTOCOL_VERSION 688
 
  /* ### protocol_version end ### */
 

diff --git a/ps0110-p0002-server-Added-get_console_process_list-to-the-protocol.mypatch b/ps0110-p0002-server-Added-get_console_process_list-to-the-protocol.mypatch
@@ -67,8 +67,8 @@ index a0acbf9deb7..de9fdcf0347 100644
 
  /* ### protocol_version begin ### */
 
--#define SERVER_PROTOCOL_VERSION 686
-+#define SERVER_PROTOCOL_VERSION 687
+-#define SERVER_PROTOCOL_VERSION 688
++#define SERVER_PROTOCOL_VERSION 689
 
  /* ### protocol_version end ### */
 

diff --git a/...ncy-tests-for-SetForegroundWindow.mypatch → ...ncy-tests-for-SetForegroundWindow.mypatch b/...ncy-tests-for-SetForegroundWindow.mypatch → ...ncy-tests-for-SetForegroundWindow.mypatch
@@ -1,7 +1,8 @@
-From: "Rémi Bernon" <rbernon@codeweavers.com>
-Subject: [PATCH v2 1/8] user32/tests: Add concurrency tests for SetForegroundWindow.
-Message-Id: <20201001102004.149704-1-rbernon@codeweavers.com>
-Date: Thu,  1 Oct 2020 12:19:57 +0200
+From e90b85a91c974b57efe127682e56a8d440c3e8c0 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
+Date: Wed, 22 Jan 2020 15:48:23 +0100
+Subject: [PATCH 13/37] user32/tests: Add concurrency tests for
+ SetForegroundWindow.
 
 When calling SetForegroundWindow for a window in another thread, an
 internal message is posted to the thread's message queue.
@@ -33,43 +34,15 @@ to window B0:
 
 In addition, we also do tests with additional SetActiveWindow / SetFocus
 calls to check their influence.
-
-Signed-off-by: Rémi Bernon <rbernon@codeweavers.com>
 ---
-
-Another try at this. Back to message filtering, as it's a more generic
-solution than last time counter.
-
-It still needs to be able to filter these internal messages so we have
-to change get_message request handler a bit. We don't provide any way
-to specifically remove messages though.
-
-v2: * Remove cross-process test and the related debugger patch, the
-      results are the same as cross-thread.
-
-    * Trace counted messages in the test so we can compare traces, add
-      more test traces too.
-
-    * Send a WM_USER message too, to validate that we shouldn't process
-      sent messages while filtering internal messages.
-
-    * Filter internal WM_WINE_SETACTIVEWINDOW messages using a thread
-      local flag and a call to peek_message.
-
-    * Add a fix for the additional focus messages received when calling
-      SetFocus, even if the window already has focus, fixing the last
-      remaining todo in the test.
-
-Supersedes: 191845-191849
-
- dlls/user32/tests/win.c | 290 +++++++++++++++++++++++++++++++++++++++---------
+ dlls/user32/tests/win.c | 290 +++++++++++++++++++++++++++++++++-------
  1 file changed, 238 insertions(+), 52 deletions(-)
 
 diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c
-index bdc50996200..19545062a0e 100644
+index dbb5f4ce5b5..89c387375b0 100644
 --- a/dlls/user32/tests/win.c
 +++ b/dlls/user32/tests/win.c
-@@ -3305,40 +3305,180 @@ static void test_SetActiveWindow(HWND hwnd)
+@@ -3193,40 +3193,180 @@ static void test_SetActiveWindow(HWND hwnd)
      DestroyWindow(hwnd2);
  }
 
@@ -265,7 +238,7 @@ index bdc50996200..19545062a0e 100644
 
      flush_events( TRUE );
      ShowWindow(hwnd, SW_HIDE);
-@@ -3412,50 +3552,96 @@ static void test_SetForegroundWindow(HWND hwnd)
+@@ -3300,50 +3440,96 @@ static void test_SetForegroundWindow(HWND hwnd)
      DestroyWindow(hwnd2);
      check_wnd_state(hwnd, hwnd, hwnd, 0);
 
@@ -398,7 +371,7 @@ index bdc50996200..19545062a0e 100644
  }
 
  static WNDPROC old_button_proc;
-@@ -12211,7 +12397,7 @@ START_TEST(win)
+@@ -12089,7 +12275,7 @@ START_TEST(win)
      test_Expose();
      test_layered_window();
 
@@ -407,3 +380,6 @@ index bdc50996200..19545062a0e 100644
      test_handles( hwndMain );
      test_winregion();
      test_map_points();
+-- 
+2.31.0
+
diff --git a/...eactivate-if-thread-is-foreground.mypatch → ...eactivate-if-thread-is-foreground.mypatch b/...eactivate-if-thread-is-foreground.mypatch → ...eactivate-if-thread-is-foreground.mypatch
@@ -1,23 +1,19 @@
-From: "Rémi Bernon" <rbernon@codeweavers.com>
-Subject: [PATCH v2 2/8] user32: Do not deactivate if thread is foreground.
-Message-Id: <20201001102004.149704-2-rbernon@codeweavers.com>
-Date: Thu,  1 Oct 2020 12:19:58 +0200
-In-Reply-To: <20201001102004.149704-1-rbernon@codeweavers.com>
-References: <20201001102004.149704-1-rbernon@codeweavers.com>
+From 3467b988c37a423dd0f4c5925ca307a81033be3b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
+Date: Sun, 26 Apr 2020 14:21:17 +0200
+Subject: [PATCH 14/37] user32: Do not deactivate if thread is foreground.
 
 Instead of only checking that the window is foreground.
-
-Signed-off-by: Rémi Bernon <rbernon@codeweavers.com>
 ---
  dlls/user32/message.c   |  3 ++-
  dlls/user32/tests/win.c | 10 +++++-----
  2 files changed, 7 insertions(+), 6 deletions(-)
 
 diff --git a/dlls/user32/message.c b/dlls/user32/message.c
-index 42e6d23fc41..578ac5e9ba6 100644
+index a54ecccc7cd..e1f5956dd46 100644
 --- a/dlls/user32/message.c
 +++ b/dlls/user32/message.c
-@@ -1867,7 +1867,8 @@ static LRESULT handle_internal_message( HWND hwnd, UINT msg, WPARAM wparam, LPAR
+@@ -1875,7 +1875,8 @@ static LRESULT handle_internal_message( HWND hwnd, UINT msg, WPARAM wparam, LPAR
          if (is_desktop_window( hwnd )) return 0;
          return WIN_SetStyle(hwnd, wparam, lparam);
      case WM_WINE_SETACTIVEWINDOW:
@@ -28,10 +24,10 @@ index 42e6d23fc41..578ac5e9ba6 100644
      case WM_WINE_KEYBOARD_LL_HOOK:
      case WM_WINE_MOUSE_LL_HOOK:
 diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c
-index 19545062a0e..eec584fee99 100644
+index 89c387375b0..5b0812b28c7 100644
 --- a/dlls/user32/tests/win.c
 +++ b/dlls/user32/tests/win.c
-@@ -3340,18 +3340,18 @@ struct test_sfw_test_desc
+@@ -3228,18 +3228,18 @@ struct test_sfw_test_desc
 
  static struct test_sfw_test_desc test_sfw_tests[] = {
      {1, FALSE, FALSE, FALSE,  FALSE, 0, FALSE, 0, FALSE, 7, FALSE, 0},
@@ -55,3 +51,6 @@ index 19545062a0e..eec584fee99 100644
 
      {0, FALSE, FALSE, FALSE,  FALSE, 0, FALSE, 6, FALSE, 1, FALSE, 1},
      {0, TRUE, FALSE, FALSE,   FALSE, 0, FALSE, 6,  TRUE, 1,  TRUE, 1},
+-- 
+2.31.0
+