Rebase against 0925a730272ed0c97f64c3365ebe542401f60d7c.

patches/Compiler_Warnings/0035-d3d10-Avoid-implicit-cast-of-interface-pointer.patch

@@ -1,4 +1,4 @@
-From 281b0621aa872330ab61f927750deb0753417ec8 Mon Sep 17 00:00:00 2001
+From 34109c1adac6293a87db004d60d342faeb33fcfe Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Tue, 8 Jun 2021 09:34:28 +1000
 Subject: [PATCH] d3d10: Avoid implicit cast of interface pointer.
@@ -8,10 +8,10 @@ Subject: [PATCH] d3d10: Avoid implicit cast of interface pointer.
  1 file changed, 5 insertions(+), 5 deletions(-)
 
 diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c
-index 5a5f9f37e6d..c127cb2bd2d 100644
+index 3b4050460a0..b03ed2d6c89 100644
 --- a/dlls/d3d10/effect.c
 +++ b/dlls/d3d10/effect.c
-@@ -131,7 +131,7 @@ static inline struct d3d10_effect_variable *impl_from_ID3D10EffectVariable(ID3D1
+@@ -147,7 +147,7 @@ static inline struct d3d10_effect_variable *impl_from_ID3D10EffectVariable(ID3D1
  
  static inline struct d3d10_effect_variable *impl_from_ID3D10EffectShaderVariable(ID3D10EffectShaderVariable *iface)
  {
@@ -19,8 +19,8 @@ index 5a5f9f37e6d..c127cb2bd2d 100644
 +    return CONTAINING_RECORD((ID3D10EffectVariable*)iface, struct d3d10_effect_variable, ID3D10EffectVariable_iface);
  }
  
- enum d3d10_effect_container_type
-@@ -4969,7 +4969,7 @@ static void read_variable_array_from_buffer(struct d3d10_effect_variable *variab
+ static struct d3d10_effect_variable * d3d10_array_get_element(struct d3d10_effect_variable *v,
+@@ -4876,7 +4876,7 @@ static void read_variable_array_from_buffer(struct d3d10_effect_variable *variab
  
  static inline struct d3d10_effect_variable *impl_from_ID3D10EffectScalarVariable(ID3D10EffectScalarVariable *iface)
  {
@@ -29,7 +29,7 @@ index 5a5f9f37e6d..c127cb2bd2d 100644
  }
  
  static BOOL STDMETHODCALLTYPE d3d10_effect_scalar_variable_IsValid(ID3D10EffectScalarVariable *iface)
-@@ -5305,7 +5305,7 @@ static const struct ID3D10EffectScalarVariableVtbl d3d10_effect_scalar_variable_
+@@ -5212,7 +5212,7 @@ static const struct ID3D10EffectScalarVariableVtbl d3d10_effect_scalar_variable_
  
  static inline struct d3d10_effect_variable *impl_from_ID3D10EffectVectorVariable(ID3D10EffectVectorVariable *iface)
  {
@@ -38,7 +38,7 @@ index 5a5f9f37e6d..c127cb2bd2d 100644
  }
  
  static BOOL STDMETHODCALLTYPE d3d10_effect_vector_variable_IsValid(ID3D10EffectVectorVariable *iface)
-@@ -5792,7 +5792,7 @@ static void read_matrix_variable_array_from_buffer(struct d3d10_effect_variable
+@@ -5699,7 +5699,7 @@ static void read_matrix_variable_array_from_buffer(struct d3d10_effect_variable
  
  static inline struct d3d10_effect_variable *impl_from_ID3D10EffectMatrixVariable(ID3D10EffectMatrixVariable *iface)
  {
@@ -47,7 +47,7 @@ index 5a5f9f37e6d..c127cb2bd2d 100644
  }
  
  static BOOL STDMETHODCALLTYPE d3d10_effect_matrix_variable_IsValid(ID3D10EffectMatrixVariable *iface)
-@@ -6315,7 +6315,7 @@ static void set_shader_resource_variable(ID3D10ShaderResourceView **src, ID3D10S
+@@ -6222,7 +6222,7 @@ static void set_shader_resource_variable(ID3D10ShaderResourceView **src, ID3D10S
  static inline struct d3d10_effect_variable *impl_from_ID3D10EffectShaderResourceVariable(
          ID3D10EffectShaderResourceVariable *iface)
  {

patches/imm32-com-initialization/definition

@@ -1,9 +0,0 @@
-# Path Of Exile has been patched to correct this issue, the underlying issue still exists in wine.
-
-# Mailing list patch, and comments about it's issues. 
-# https://www.winehq.org/pipermail/wine-devel/2019-January/138404.html
-# https://www.winehq.org/pipermail/wine-devel/2019-February/date.html
-Fixes: [42695] Path of Exile fails - CoCreateInstance() called in uninitialized apartment
-Fixes: [47387] Victor Vran has no sound
-
-Depends: winex11-_NET_ACTIVE_WINDOW

patches/imm32-message_on_focus/0001-imm32-Only-generate-WM_IME_SETCONTEXT-message-if-win.patch

@@ -1,34 +0,0 @@
-From 117673ffe8bd5a8aae060307bcf6af83b4da011e Mon Sep 17 00:00:00 2001
-From: Gijs Vermeulen <gijsvrm@gmail.com>
-Date: Mon, 17 Dec 2018 11:49:26 +1100
-Subject: [PATCH] imm32: Only generate 'WM_IME_SETCONTEXT' message if window
- has focus
-
-Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=31157
----
- dlls/imm32/imm.c | 9 ++++++---
- 1 file changed, 6 insertions(+), 3 deletions(-)
-
-diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c
-index 28eb00f..4255e98 100644
---- a/dlls/imm32/imm.c
-+++ b/dlls/imm32/imm.c
-@@ -608,9 +608,12 @@ HIMC WINAPI ImmAssociateContext(HWND hWnd, HIMC hIMC)
-     if (!hIMC)
-         return old;
- 
--    SendMessageW(data->IMC.hWnd, WM_IME_SETCONTEXT, FALSE, ISC_SHOWUIALL);
--    data->IMC.hWnd = hWnd;
--    SendMessageW(data->IMC.hWnd, WM_IME_SETCONTEXT, TRUE, ISC_SHOWUIALL);
-+    if(GetActiveWindow() == data->IMC.hWnd)
-+    {
-+        SendMessageW(data->IMC.hWnd, WM_IME_SETCONTEXT, FALSE, ISC_SHOWUIALL);
-+        data->IMC.hWnd = hWnd;
-+        SendMessageW(data->IMC.hWnd, WM_IME_SETCONTEXT, TRUE, ISC_SHOWUIALL);
-+    }
- 
-     return old;
- }
--- 
-1.9.1
-

patches/imm32-message_on_focus/definition

@@ -1,5 +0,0 @@
-# I suspect that bug #28861,#46263 are related to this issue as well.
-# Both of these hint that the szwWineIMCProperty doesn't the correct value
-# and thus goes down invalid path leading to a crash.
-#
-Fixes: [31157] imm32: Only generate 'WM_IME_SETCONTEXT' message if window has focus.

patches/patchinstall.sh

@@ -51,7 +51,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "6d307e2a647e71c21106feb0d62e371b3e55ab38"
+	echo "0925a730272ed0c97f64c3365ebe542401f60d7c"
 }
 
 # Show version information
@@ -118,8 +118,6 @@ patch_enable_all ()
 	enable_fonts_Missing_Fonts="$1"
 	enable_gdi32_rotation="$1"
 	enable_gdiplus_Performance_Improvements="$1"
-	enable_imm32_com_initialization="$1"
-	enable_imm32_message_on_focus="$1"
 	enable_include_winsock="$1"
 	enable_inseng_Implementation="$1"
 	enable_kernel32_CopyFileEx="$1"
@@ -386,12 +384,6 @@ patch_enable ()
 		gdiplus-Performance-Improvements)
 			enable_gdiplus_Performance_Improvements="$2"
 			;;
-		imm32-com-initialization)
-			enable_imm32_com_initialization="$2"
-			;;
-		imm32-message_on_focus)
-			enable_imm32_message_on_focus="$2"
-			;;
 		include-winsock)
 			enable_include_winsock="$2"
 			;;
@@ -1322,13 +1314,6 @@ if test "$enable_mfplat_streaming_support" -eq 1; then
 	enable_mfplat_reverts=1
 fi
 
-if test "$enable_imm32_com_initialization" -eq 1; then
-	if test "$enable_winex11__NET_ACTIVE_WINDOW" -gt 1; then
-		abort "Patchset winex11-_NET_ACTIVE_WINDOW disabled, but imm32-com-initialization depends on that."
-	fi
-	enable_winex11__NET_ACTIVE_WINDOW=1
-fi
-
 if test "$enable_fltmgr_sys_FltBuildDefaultSecurityDescriptor" -eq 1; then
 	if test "$enable_winedevice_Default_Drivers" -gt 1; then
 		abort "Patchset winedevice-Default_Drivers disabled, but fltmgr.sys-FltBuildDefaultSecurityDescriptor depends on that."
@@ -2142,49 +2127,6 @@ if test "$enable_gdiplus_Performance_Improvements" -eq 1; then
 	patch_apply gdiplus-Performance-Improvements/0004-gdiplus-Prefer-using-pre-multiplied-ARGB-data-in-the.patch
 fi
 
-# Patchset winex11-_NET_ACTIVE_WINDOW
-# |
-# | This patchset fixes the following Wine bugs:
-# |   *	[#2155] Forward activate window requests to WM using _NET_ACTIVE_WINDOW
-# |
-# | Modified files:
-# |   *	dlls/user32/driver.c, dlls/user32/focus.c, dlls/user32/user_private.h, dlls/winex11.drv/event.c,
-# | 	dlls/winex11.drv/window.c, dlls/winex11.drv/winex11.drv.spec, dlls/winex11.drv/x11drv.h, dlls/winex11.drv/x11drv_main.c
-# |
-if test "$enable_winex11__NET_ACTIVE_WINDOW" -eq 1; then
-	patch_apply winex11-_NET_ACTIVE_WINDOW/0001-winex11.drv-Add-support-for-_NET_ACTIVE_WINDOW.patch
-	patch_apply winex11-_NET_ACTIVE_WINDOW/0002-user32-Before-asking-a-WM-to-activate-a-window-make-.patch
-fi
-
-# Patchset imm32-com-initialization
-# |
-# | This patchset has the following (direct or indirect) dependencies:
-# |   *	winex11-_NET_ACTIVE_WINDOW
-# |
-# | This patchset fixes the following Wine bugs:
-# |   *	[#42695] Path of Exile fails - CoCreateInstance() called in uninitialized apartment
-# |   *	[#47387] Victor Vran has no sound
-# |
-# | Modified files:
-# |   *	dlls/imm32/Makefile.in, dlls/imm32/imm.c, dlls/imm32/imm32.spec, dlls/imm32/tests/imm32.c, dlls/user32/focus.c,
-# | 	dlls/user32/misc.c, dlls/user32/user_private.h
-# |
-if test "$enable_imm32_com_initialization" -eq 1; then
-	patch_apply imm32-com-initialization/0001-imm32-Automatically-initialize-COM-on-window-activat.patch
-fi
-
-# Patchset imm32-message_on_focus
-# |
-# | This patchset fixes the following Wine bugs:
-# |   *	[#31157] imm32: Only generate 'WM_IME_SETCONTEXT' message if window has focus.
-# |
-# | Modified files:
-# |   *	dlls/imm32/imm.c
-# |
-if test "$enable_imm32_message_on_focus" -eq 1; then
-	patch_apply imm32-message_on_focus/0001-imm32-Only-generate-WM_IME_SETCONTEXT-message-if-win.patch
-fi
-
 # Patchset include-winsock
 # |
 # | Modified files:
@@ -3954,6 +3896,20 @@ if test "$enable_winex11_Vulkan_support" -eq 1; then
 	patch_apply winex11-Vulkan_support/0001-winex11-Specify-a-default-vulkan-driver-if-one-not-f.patch
 fi
 
+# Patchset winex11-_NET_ACTIVE_WINDOW
+# |
+# | This patchset fixes the following Wine bugs:
+# |   *	[#2155] Forward activate window requests to WM using _NET_ACTIVE_WINDOW
+# |
+# | Modified files:
+# |   *	dlls/user32/driver.c, dlls/user32/focus.c, dlls/user32/user_private.h, dlls/winex11.drv/event.c,
+# | 	dlls/winex11.drv/window.c, dlls/winex11.drv/winex11.drv.spec, dlls/winex11.drv/x11drv.h, dlls/winex11.drv/x11drv_main.c
+# |
+if test "$enable_winex11__NET_ACTIVE_WINDOW" -eq 1; then
+	patch_apply winex11-_NET_ACTIVE_WINDOW/0001-winex11.drv-Add-support-for-_NET_ACTIVE_WINDOW.patch
+	patch_apply winex11-_NET_ACTIVE_WINDOW/0002-user32-Before-asking-a-WM-to-activate-a-window-make-.patch
+fi
+
 # Patchset winex11-WM_WINDOWPOSCHANGING
 # |
 # | This patchset has the following (direct or indirect) dependencies:

staging/upstream-commit

@@ -1 +1 @@
-6d307e2a647e71c21106feb0d62e371b3e55ab38
+0925a730272ed0c97f64c3365ebe542401f60d7c