From 81571a4cb5a6d9ae45a159035de28b5691bba7ab Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Fri, 19 May 2017 22:31:19 +0200 Subject: [PATCH] Rebase against 53bf72e266532f2f0533a0dfd7e90a25d7b6d901. --- ...turn-dummy-skininfo-interface-in-D3DXLoad.patch | 14 +++++++------- patches/patchinstall.sh | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/patches/d3dx9_36-Dummy_Skininfo/0001-d3dx9_36-Return-dummy-skininfo-interface-in-D3DXLoad.patch b/patches/d3dx9_36-Dummy_Skininfo/0001-d3dx9_36-Return-dummy-skininfo-interface-in-D3DXLoad.patch index e8f230b0..380f7495 100644 --- a/patches/d3dx9_36-Dummy_Skininfo/0001-d3dx9_36-Return-dummy-skininfo-interface-in-D3DXLoad.patch +++ b/patches/d3dx9_36-Dummy_Skininfo/0001-d3dx9_36-Return-dummy-skininfo-interface-in-D3DXLoad.patch @@ -1,4 +1,4 @@ -From 4ce7612fe0c6fd65f89403c8703e5395fbb4a85d Mon Sep 17 00:00:00 2001 +From e9bbd2e5104f672874687a0d9fa7edffaf110cbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Tue, 28 Jul 2015 17:26:09 +0200 Subject: d3dx9_36: Return dummy skininfo interface in D3DXLoadSkinMeshFromXof @@ -11,18 +11,18 @@ Subject: d3dx9_36: Return dummy skininfo interface in D3DXLoadSkinMeshFromXof 3 files changed, 30 insertions(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/d3dx9_private.h b/dlls/d3dx9_36/d3dx9_private.h -index abb3114e89..4c6d642b7e 100644 +index 62213acba51..6329ba64273 100644 --- a/dlls/d3dx9_36/d3dx9_private.h +++ b/dlls/d3dx9_36/d3dx9_private.h -@@ -241,4 +241,6 @@ HRESULT d3dx_param_eval_set_shader_constants(struct IDirect3DDevice9 *device, +@@ -273,4 +273,6 @@ HRESULT d3dx_param_eval_set_shader_constants(ID3DXEffectStateManager *manager, s struct d3dx_param_eval *peval, BOOL update_all) DECLSPEC_HIDDEN; - BOOL is_param_eval_input_dirty(struct d3dx_param_eval *peval) DECLSPEC_HIDDEN; + BOOL is_param_eval_input_dirty(struct d3dx_param_eval *peval, ULONG64 update_version) DECLSPEC_HIDDEN; +HRESULT create_dummy_skin(ID3DXSkinInfo **iface) DECLSPEC_HIDDEN; + #endif /* __WINE_D3DX9_PRIVATE_H */ diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c -index c26aa7271f..b70f4dcaa4 100644 +index c26aa7271f0..b70f4dcaa44 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -3332,6 +3332,13 @@ static HRESULT parse_mesh(ID3DXFileData *filedata, struct mesh_data *mesh_data, @@ -40,7 +40,7 @@ index c26aa7271f..b70f4dcaa4 100644 end: diff --git a/dlls/d3dx9_36/skin.c b/dlls/d3dx9_36/skin.c -index f197d33582..bed4b9f49d 100644 +index f197d33582a..bed4b9f49d2 100644 --- a/dlls/d3dx9_36/skin.c +++ b/dlls/d3dx9_36/skin.c @@ -94,7 +94,7 @@ static ULONG WINAPI d3dx9_skin_info_Release(ID3DXSkinInfo *iface) @@ -77,5 +77,5 @@ index f197d33582..bed4b9f49d 100644 + return D3D_OK; +} -- -2.11.0 +2.12.2 diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index fc5b92cb..145f4e30 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -52,7 +52,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "9baceabb88e2aeb90a32bb5f6923107904ed58ea" + echo "53bf72e266532f2f0533a0dfd7e90a25d7b6d901" } # Show version information