Rebase against 8d0d1e563ca7697902df9c285ff13ce648697537.

patches/d3dx9_25-ID3DXEffect/0001-d3dx9_25-Add-an-interface-wrapper-for-different-vers.patch

@@ -1,4 +1,4 @@
-From f6cede1ccb8f108b155b52211f1f1555f0c6935a Mon Sep 17 00:00:00 2001
+From 4a59723740ee7f599520d75ce8a019504629091d Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Sat, 14 Mar 2015 04:48:38 +0100
 Subject: d3dx9_25: Add an interface wrapper for different version of
@@ -8,8 +8,7 @@ Subject: d3dx9_25: Add an interface wrapper for different version of
  dlls/d3dx9_25/Makefile.in   |    5 +-
  dlls/d3dx9_25/d3dx9_25.spec |   22 +-
  dlls/d3dx9_25/effect.c      | 1282 +++++++++++++++++++++++++++++++++++++++++++
- include/d3dx9effect.h       |    2 +
- 4 files changed, 1298 insertions(+), 13 deletions(-)
+ 3 files changed, 1296 insertions(+), 13 deletions(-)
  create mode 100644 dlls/d3dx9_25/effect.c
 
 diff --git a/dlls/d3dx9_25/Makefile.in b/dlls/d3dx9_25/Makefile.in
@@ -28,7 +27,7 @@ index a41cbc2..79e1c6b 100644
  
  RC_SRCS = version.rc
 diff --git a/dlls/d3dx9_25/d3dx9_25.spec b/dlls/d3dx9_25/d3dx9_25.spec
-index c328108..515be27 100644
+index 7f18290..d342265 100644
 --- a/dlls/d3dx9_25/d3dx9_25.spec
 +++ b/dlls/d3dx9_25/d3dx9_25.spec
 @@ -43,21 +43,21 @@
@@ -1360,19 +1359,6 @@ index 0000000..8867bb3
 +
 +    return D3DXDisassembleEffect(object->effect, enable_color_code, disassembly);
 +}
-diff --git a/include/d3dx9effect.h b/include/d3dx9effect.h
-index 25d1fd2..3f527ed 100644
---- a/include/d3dx9effect.h
-+++ b/include/d3dx9effect.h
-@@ -425,6 +425,8 @@ HRESULT WINAPI D3DXCreateEffectCompilerFromResourceW(HMODULE srcmodule, const WC
-         ID3DXEffectCompiler **effectcompiler, ID3DXBuffer **parseerrors);
- #define D3DXCreateEffectCompilerFromResource WINELIB_NAME_AW(D3DXCreateEffectCompilerFromResource)
- 
-+HRESULT WINAPI D3DXDisassembleEffect(ID3DXEffect *effect, BOOL enable_color_code, ID3DXBuffer **disassembly);
-+
- #ifdef __cplusplus
- }
- #endif
 -- 
-2.3.2
+2.6.4
 

patches/patchinstall.sh

@@ -51,7 +51,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "14529012da91580119c1712cd24fcf67c780789b"
+	echo "8d0d1e563ca7697902df9c285ff13ce648697537"
 }
 
 # Show version information
@@ -285,7 +285,6 @@ patch_enable_all ()
 	enable_shlwapi_AssocGetPerceivedType="$1"
 	enable_shlwapi_SHMapHandle="$1"
 	enable_shlwapi_UrlCombine="$1"
-	enable_user32_Dead_Code="$1"
 	enable_user32_DeferWindowPos="$1"
 	enable_user32_Dialog_Paint_Event="$1"
 	enable_user32_DrawTextExW="$1"
@@ -983,9 +982,6 @@ patch_enable ()
 		shlwapi-UrlCombine)
 			enable_shlwapi_UrlCombine="$2"
 			;;
-		user32-Dead_Code)
-			enable_user32_Dead_Code="$2"
-			;;
 		user32-DeferWindowPos)
 			enable_user32_DeferWindowPos="$2"
 			;;
@@ -2637,7 +2633,7 @@ fi
 # |   *	[#25138] Fix wrong version of ID3DXEffect interface for d3dx9_25
 # |
 # | Modified files:
-# |   *	dlls/d3dx9_25/Makefile.in, dlls/d3dx9_25/d3dx9_25.spec, dlls/d3dx9_25/effect.c, include/d3dx9effect.h
+# |   *	dlls/d3dx9_25/Makefile.in, dlls/d3dx9_25/d3dx9_25.spec, dlls/d3dx9_25/effect.c
 # |
 if test "$enable_d3dx9_25_ID3DXEffect" -eq 1; then
 	patch_apply d3dx9_25-ID3DXEffect/0001-d3dx9_25-Add-an-interface-wrapper-for-different-vers.patch
@@ -5678,21 +5674,6 @@ if test "$enable_shlwapi_UrlCombine" -eq 1; then
 	) >> "$patchlist"
 fi
 
-# Patchset user32-Dead_Code
-# |
-# | This patchset fixes the following Wine bugs:
-# |   *	[#39558] Remove dead code from SCROLL_TrackScrollBar
-# |
-# | Modified files:
-# |   *	dlls/user32/scroll.c
-# |
-if test "$enable_user32_Dead_Code" -eq 1; then
-	patch_apply user32-Dead_Code/0001-user32-Remove-dead-code-from-SCROLL_TrackScrollBar.patch
-	(
-		echo '+    { "Jarkko Korpi", "user32: Remove dead code from SCROLL_TrackScrollBar.", 1 },';
-	) >> "$patchlist"
-fi
-
 # Patchset user32-DeferWindowPos
 # |
 # | This patchset fixes the following Wine bugs:

patches/user32-Dead_Code/0001-user32-Remove-dead-code-from-SCROLL_TrackScrollBar.patch

@@ -1,35 +0,0 @@
-From 7fa97568c8aadc5b2d27dace09946efe403f0367 Mon Sep 17 00:00:00 2001
-From: Jarkko Korpi <jarkko_korpi@hotmail.com>
-Date: Mon, 14 Dec 2015 10:49:25 +0200
-Subject: user32: Remove dead code from SCROLL_TrackScrollBar.
-
----
- dlls/user32/scroll.c | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/dlls/user32/scroll.c b/dlls/user32/scroll.c
-index be205ef..b28ee44 100644
---- a/dlls/user32/scroll.c
-+++ b/dlls/user32/scroll.c
-@@ -1096,7 +1096,6 @@ static void SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt)
- void SCROLL_TrackScrollBar( HWND hwnd, INT scrollbar, POINT pt )
- {
-     MSG msg;
--    INT xoffset = 0, yoffset = 0;
- 
-     if (scrollbar != SB_CTL)
-     {
-@@ -1117,8 +1116,8 @@ void SCROLL_TrackScrollBar( HWND hwnd, INT scrollbar, POINT pt )
-             msg.message == WM_MOUSEMOVE ||
-             (msg.message == WM_SYSTIMER && msg.wParam == SCROLL_TIMER))
-         {
--            pt.x = (short)LOWORD(msg.lParam) + xoffset;
--            pt.y = (short)HIWORD(msg.lParam) + yoffset;
-+            pt.x = (short)LOWORD(msg.lParam);
-+            pt.y = (short)HIWORD(msg.lParam);
-             SCROLL_HandleScrollEvent( hwnd, scrollbar, msg.message, pt );
-         }
-         else
--- 
-2.6.4
-

patches/user32-Dead_Code/definition

@@ -1 +0,0 @@
-Fixes: [39558] Remove dead code from SCROLL_TrackScrollBar