Rebase against 370254cbe93beae6a9ff693d98c638db5bfb1134.

README.md

@@ -143,7 +143,7 @@ for more details.*
 * Fix condition mask handling in RtlVerifyVersionInfo ([Wine Bug #36143](https://bugs.winehq.org/show_bug.cgi?id=36143))
 * Fix crash in Space Rangers2 caused by missing DXTn support ([Wine Bug #24983](https://bugs.winehq.org/show_bug.cgi?id=24983))
 * Fix crash of winedevice when relocation entry crosses page boundary ([Wine Bug #28254](https://bugs.winehq.org/show_bug.cgi?id=28254))
-* Fix cursor clip regression / broken raw input in multiple games ([Wine Bug #33479](https://bugs.winehq.org/show_bug.cgi?id=33479))
+* ~~Fix cursor clip regression / broken raw input in multiple games~~ ([Wine Bug #33479](https://bugs.winehq.org/show_bug.cgi?id=33479))
 * Fix detection of case-insensitive systems in MSYS2
 * Fix device paths in HKLM\SYSTEM\MountedDevices ([Wine Bug #38235](https://bugs.winehq.org/show_bug.cgi?id=38235))
 * Fix endless loop in regedit when importing files with very long lines

debian/changelog

@@ -22,6 +22,8 @@ wine-staging (1.7.55) UNRELEASED; urgency=low
     upstream).
   * Removed patch to fix handling of opening read-only files for
     FILE_DELETE_ON_CLOSE (accepted upstream).
+  * Removed patch to fix cursor clip regression / broken raw input in multiple
+    games (accepted upstream).
  -- Sebastian Lackner <sebastian@fds-team.de>  Sun, 01 Nov 2015 01:06:20 +0100
 
 wine-staging (1.7.54) unstable; urgency=low

patches/ntoskrnl-DriverTest/0001-ntoskrnl.exe-tests-Add-initial-driver-testing-framew.patch

@@ -1,4 +1,4 @@
-From ff63d064b47c582a0b31a0120d9555af5f041b7d Mon Sep 17 00:00:00 2001
+From 5733c4ddb3e5a2ff310fed2a585da13538345b97 Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Sun, 18 Jan 2015 05:42:10 +0100
 Subject: ntoskrnl.exe/tests: Add initial driver testing framework and
@@ -73,10 +73,10 @@ index 774377d..bf91b70 100644
  dnl
  dnl Usage: WINE_CONFIG_LIB(name,flags)
 diff --git a/configure.ac b/configure.ac
-index 84420a9..fe4b94e 100644
+index 48268b0..782d1d7 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -3203,6 +3203,8 @@ WINE_CONFIG_TEST(dlls/ntdll/tests)
+@@ -3142,6 +3142,8 @@ WINE_CONFIG_TEST(dlls/ntdll/tests)
  WINE_CONFIG_DLL(ntdsapi,,[implib])
  WINE_CONFIG_TEST(dlls/ntdsapi/tests)
  WINE_CONFIG_DLL(ntoskrnl.exe,,[implib])
@@ -557,16 +557,16 @@ index b7f8b63..8143c4f 100755
          {
              die "MODULE should not be defined as static lib in $file" unless $file =~ /^dlls\//;
 diff --git a/tools/makedep.c b/tools/makedep.c
-index d8cf2f5..6094148 100644
+index 023c0ec..a4884cf 100644
 --- a/tools/makedep.c
 +++ b/tools/makedep.c
-@@ -170,4 +170,5 @@ struct makefile
+@@ -171,4 +171,5 @@ struct makefile
      const char     *module;
      const char     *testdll;
 +    const char     *resource;
+     const char     *sharedlib;
      const char     *staticlib;
-     const char     *importlib;
-@@ -472,6 +473,30 @@ static char *get_extension( char *filename )
+@@ -474,6 +475,30 @@ static char *get_extension( char *filename )
  
  
  /*******************************************************************
@@ -597,7 +597,7 @@ index d8cf2f5..6094148 100644
   *         replace_extension
   */
  static char *replace_extension( const char *name, const char *old_ext, const char *new_ext )
-@@ -1958,6 +1983,7 @@ static struct strarray output_sources( const struct makefile *make, struct strar
+@@ -2025,6 +2050,7 @@ static struct strarray output_sources( const struct makefile *make, struct strar
      struct strarray subdirs = empty_strarray;
      struct strarray phony_targets = empty_strarray;
      struct strarray all_targets = empty_strarray;
@@ -605,7 +605,7 @@ index d8cf2f5..6094148 100644
      struct strarray install_rules[NB_INSTALL_RULES];
      char *ldrpath_local   = get_expanded_make_variable( make, "LDRPATH_LOCAL" );
      char *ldrpath_install = get_expanded_make_variable( make, "LDRPATH_INSTALL" );
-@@ -2229,7 +2255,7 @@ static struct strarray output_sources( const struct makefile *make, struct strar
+@@ -2297,7 +2323,7 @@ static struct strarray output_sources( const struct makefile *make, struct strar
          }
          else
          {
@@ -614,7 +614,7 @@ index d8cf2f5..6094148 100644
                  (source->file->flags & FLAG_C_IMPLIB) ||
                  (make->module && make->staticlib);
  
-@@ -2243,7 +2269,7 @@ static struct strarray output_sources( const struct makefile *make, struct strar
+@@ -2311,7 +2337,7 @@ static struct strarray output_sources( const struct makefile *make, struct strar
              output_filenames( includes );
              output_filenames( make->define_args );
              output_filenames( extradefs );
@@ -623,7 +623,7 @@ index d8cf2f5..6094148 100644
              {
                  output_filenames( dll_flags );
                  if (make->use_msvcrt) output_filenames( msvcrt_flags );
-@@ -2322,6 +2348,72 @@ static struct strarray output_sources( const struct makefile *make, struct strar
+@@ -2390,6 +2416,72 @@ static struct strarray output_sources( const struct makefile *make, struct strar
          output( "\n" );
      }
  
@@ -696,7 +696,7 @@ index d8cf2f5..6094148 100644
      if (make->module && !make->staticlib)
      {
          struct strarray all_libs = empty_strarray;
-@@ -2666,6 +2758,83 @@ static struct strarray output_sources( const struct makefile *make, struct strar
+@@ -2780,6 +2872,83 @@ static struct strarray output_sources( const struct makefile *make, struct strar
          add_install_rule( make, install_rules, make->scripts.str[i], make->scripts.str[i],
                            strmake( "S$(bindir)/%s", make->scripts.str[i] ));
  
@@ -780,12 +780,12 @@ index d8cf2f5..6094148 100644
      if (all_targets.count)
      {
          output( "all:" );
-@@ -2951,4 +3120,5 @@ static void update_makefile( const char *path )
+@@ -3075,4 +3244,5 @@ static void update_makefile( const char *path )
      make->module        = get_expanded_make_variable( make, "MODULE" );
      make->testdll       = get_expanded_make_variable( make, "TESTDLL" );
 +    make->resource      = get_expanded_make_variable( make, "RESOURCE" );
+     make->sharedlib     = get_expanded_make_variable( make, "SHAREDLIB" );
      make->staticlib     = get_expanded_make_variable( make, "STATICLIB" );
-     make->importlib     = get_expanded_make_variable( make, "IMPORTLIB" );
 -- 
 2.6.2
 

patches/patchinstall.sh

@@ -52,7 +52,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "5cf95396503d49f0249c473c1ed51e51213124c0"
+	echo "370254cbe93beae6a9ff693d98c638db5bfb1134"
 }
 
 # Show version information
@@ -4691,17 +4691,14 @@ fi
 # Patchset server-ClipCursor
 # |
 # | This patchset fixes the following Wine bugs:
-# |   *	[#33479] Fix cursor clip regression / broken raw input in multiple games
 # |   *	[#38087] Fix multithreading issues with fullscreen clipping
 # |
 # | Modified files:
-# |   *	dlls/user32/message.c, dlls/winex11.drv/mouse.c, server/queue.c
+# |   *	dlls/winex11.drv/mouse.c
 # |
 if test "$enable_server_ClipCursor" -eq 1; then
-	patch_apply server-ClipCursor/0001-server-Only-send-WM_WINE_CLIPCURSOR-for-forced-clip-.patch
-	patch_apply server-ClipCursor/0002-winex11-Forward-all-clipping-requests-to-the-right-t.patch
+	patch_apply server-ClipCursor/0001-winex11-Forward-all-clipping-requests-to-the-right-t.patch
 	(
-		echo '+    { "Sebastian Lackner", "server: Only send WM_WINE_CLIPCURSOR for forced clip resets.", 1 },';
 		echo '+    { "Sebastian Lackner", "winex11: Forward all clipping requests to the right thread (including fullscreen clipping).", 1 },';
 	) >> "$patchlist"
 fi

patches/server-ClipCursor/0001-server-Only-send-WM_WINE_CLIPCURSOR-for-forced-clip-.patch

@@ -1,70 +0,0 @@
-From d4e11dc9293e9faea3edb4c0d7c3defbb621ca97 Mon Sep 17 00:00:00 2001
-From: Sebastian Lackner <sebastian@fds-team.de>
-Date: Thu, 22 Jan 2015 16:34:58 +0100
-Subject: server: Only send WM_WINE_CLIPCURSOR for forced clip resets.
-
----
- dlls/user32/message.c | 6 ++++++
- server/queue.c        | 8 ++++----
- 2 files changed, 10 insertions(+), 4 deletions(-)
-
-diff --git a/dlls/user32/message.c b/dlls/user32/message.c
-index eac4e4d..67e1cf4 100644
---- a/dlls/user32/message.c
-+++ b/dlls/user32/message.c
-@@ -1881,6 +1881,12 @@ static LRESULT handle_internal_message( HWND hwnd, UINT msg, WPARAM wparam, LPAR
-         return call_current_hook( h_extra->handle, HC_ACTION, wparam, h_extra->lparam );
-     }
-     case WM_WINE_CLIPCURSOR:
-+        if (!lparam)
-+        {
-+            /* This is just a notification, nothing to do. Clipping will be
-+             * done by the process that issues the set_cursor wineserver call. */
-+            return 0;
-+        }
-         if (wparam)
-         {
-             RECT rect;
-diff --git a/server/queue.c b/server/queue.c
-index 3a321cd..19acbd3 100644
---- a/server/queue.c
-+++ b/server/queue.c
-@@ -362,7 +362,7 @@ static void set_cursor_pos( struct desktop *desktop, int x, int y )
- }
- 
- /* set the cursor clip rectangle */
--static void set_clip_rectangle( struct desktop *desktop, const rectangle_t *rect )
-+static void set_clip_rectangle( struct desktop *desktop, const rectangle_t *rect, int do_clip )
- {
-     rectangle_t top_rect;
-     int x, y;
-@@ -381,7 +381,7 @@ static void set_clip_rectangle( struct desktop *desktop, const rectangle_t *rect
-     else desktop->cursor.clip = top_rect;
- 
-     if (desktop->cursor.clip_msg)
--        post_desktop_message( desktop, desktop->cursor.clip_msg, rect != NULL, 0 );
-+        post_desktop_message( desktop, desktop->cursor.clip_msg, rect != NULL, do_clip );
- 
-     /* warp the mouse to be inside the clip rect */
-     x = min( max( desktop->cursor.x, desktop->cursor.clip.left ), desktop->cursor.clip.right-1 );
-@@ -393,7 +393,7 @@ static void set_clip_rectangle( struct desktop *desktop, const rectangle_t *rect
- static void set_foreground_input( struct desktop *desktop, struct thread_input *input )
- {
-     if (desktop->foreground_input == input) return;
--    set_clip_rectangle( desktop, NULL );
-+    set_clip_rectangle( desktop, NULL, 1 );
-     desktop->foreground_input = input;
- }
- 
-@@ -3023,7 +3023,7 @@ DECL_HANDLER(set_cursor)
-         if (req->clip_msg && get_top_window_owner(desktop) == current->process)
-             desktop->cursor.clip_msg = req->clip_msg;
- 
--        set_clip_rectangle( desktop, (req->flags & SET_CURSOR_NOCLIP) ? NULL : &req->clip );
-+        set_clip_rectangle( desktop, (req->flags & SET_CURSOR_NOCLIP) ? NULL : &req->clip, 0 );
-     }
- 
-     reply->new_x       = input->desktop->cursor.x;
--- 
-2.3.1
-

patches/server-ClipCursor/definition

@@ -1,3 +1,2 @@
-Fixes: [33479] Fix cursor clip regression / broken raw input in multiple games
 Fixes: [38087] Fix multithreading issues with fullscreen clipping
 Category: stable