diff --git a/patches/api-ms-win-Stub_DLLs/0027-uiautomationcore-Add-dll-and-stub-some-functions.patch b/patches/api-ms-win-Stub_DLLs/0027-uiautomationcore-Add-dll-and-stub-some-functions.patch index ad7555fe..9d42d729 100644 --- a/patches/api-ms-win-Stub_DLLs/0027-uiautomationcore-Add-dll-and-stub-some-functions.patch +++ b/patches/api-ms-win-Stub_DLLs/0027-uiautomationcore-Add-dll-and-stub-some-functions.patch @@ -1,15 +1,15 @@ -From 9a67b4c62e5a575a38081114d4434f274355020e Mon Sep 17 00:00:00 2001 +From 21b4b65eadc9e39008ccadc48307fcfea05a24fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Tue, 12 Apr 2016 01:02:34 +0200 Subject: [PATCH] uiautomationcore: Add dll and stub some functions. --- dlls/uiautomationcore/Makefile.in | 1 + - dlls/uiautomationcore/uia_main.c | 53 ++++++++++++++++++++++++++++++++++----- + dlls/uiautomationcore/uia_main.c | 53 +++++++++++++++++++++++++++---- 2 files changed, 48 insertions(+), 6 deletions(-) diff --git a/dlls/uiautomationcore/Makefile.in b/dlls/uiautomationcore/Makefile.in -index 5221450..5173f23 100644 +index b6edec5f6a9..bf2204d5ab4 100644 --- a/dlls/uiautomationcore/Makefile.in +++ b/dlls/uiautomationcore/Makefile.in @@ -1,5 +1,6 @@ @@ -17,10 +17,10 @@ index 5221450..5173f23 100644 IMPORTLIB = uiautomationcore +IMPORTS = uuid - C_SRCS = \ - uia_main.c + EXTRADLLFLAGS = -mno-cygwin + diff --git a/dlls/uiautomationcore/uia_main.c b/dlls/uiautomationcore/uia_main.c -index f0d8247..b9c24b4 100644 +index f0d8247724d..b9c24b4b963 100644 --- a/dlls/uiautomationcore/uia_main.c +++ b/dlls/uiautomationcore/uia_main.c @@ -1,4 +1,5 @@ @@ -122,5 +122,5 @@ index f0d8247..b9c24b4 100644 } -- -1.9.1 +2.17.1 diff --git a/patches/ddraw-Texture_Wrong_Caps/0001-ddraw-Allow-setting-texture-without-DDSCAPS_TEXTURE-.patch b/patches/ddraw-Texture_Wrong_Caps/0001-ddraw-Allow-setting-texture-without-DDSCAPS_TEXTURE-.patch index 7c5de342..0d6e937b 100644 --- a/patches/ddraw-Texture_Wrong_Caps/0001-ddraw-Allow-setting-texture-without-DDSCAPS_TEXTURE-.patch +++ b/patches/ddraw-Texture_Wrong_Caps/0001-ddraw-Allow-setting-texture-without-DDSCAPS_TEXTURE-.patch @@ -1,4 +1,4 @@ -From 221f88c7bb5155b55428319fff84cfbc275667ed Mon Sep 17 00:00:00 2001 +From e06507db3cb448f938b04bc7f7587151a3f1de10 Mon Sep 17 00:00:00 2001 From: Paul Gofman Date: Thu, 4 Apr 2019 02:25:00 +0300 Subject: [PATCH] ddraw: Allow setting texture without DDSCAPS_TEXTURE for @@ -11,10 +11,10 @@ Signed-off-by: Paul Gofman 2 files changed, 141 insertions(+), 9 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c -index ab222e30eb2..4613c2cd357 100644 +index 1d176970c6a..9b6c9af5701 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c -@@ -2902,10 +2902,8 @@ static HRESULT WINAPI d3d_device3_SetLightState(IDirect3DDevice3 *iface, +@@ -2910,10 +2910,8 @@ static HRESULT WINAPI d3d_device3_SetLightState(IDirect3DDevice3 *iface, wined3d_mutex_unlock(); return DDERR_INVALIDPARAMS; } @@ -25,7 +25,7 @@ index ab222e30eb2..4613c2cd357 100644 device->material = value; } else if (state == D3DLIGHTSTATE_COLORMODEL) -@@ -4786,7 +4784,8 @@ static HRESULT d3d_device7_SetTexture(IDirect3DDevice7 *iface, +@@ -4794,7 +4792,8 @@ static HRESULT d3d_device7_SetTexture(IDirect3DDevice7 *iface, struct ddraw_surface *surf = unsafe_impl_from_IDirectDrawSurface7(texture); struct wined3d_texture *wined3d_texture = NULL; @@ -35,7 +35,7 @@ index ab222e30eb2..4613c2cd357 100644 if (surf && (surf->surface_desc.ddsCaps.dwCaps & DDSCAPS_TEXTURE)) wined3d_texture = surf->wined3d_texture; -@@ -4822,13 +4821,24 @@ static HRESULT WINAPI d3d_device3_SetTexture(IDirect3DDevice3 *iface, +@@ -4830,19 +4829,30 @@ static HRESULT WINAPI d3d_device3_SetTexture(IDirect3DDevice3 *iface, { struct d3d_device *device = impl_from_IDirect3DDevice3(iface); struct ddraw_surface *tex = unsafe_impl_from_IDirect3DTexture2(texture); @@ -60,9 +60,7 @@ index ab222e30eb2..4613c2cd357 100644 + + wined3d_device_set_texture(device->wined3d_device, stage, wined3d_texture); - if (device->legacyTextureBlending && device->texture_map_blend == D3DTBLEND_MODULATE) - { -@@ -4860,7 +4870,7 @@ static HRESULT WINAPI d3d_device3_SetTexture(IDirect3DDevice3 *iface, + fixup_texture_alpha_op(device); wined3d_mutex_unlock(); @@ -72,7 +70,7 @@ index ab222e30eb2..4613c2cd357 100644 static const struct tss_lookup diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c -index 6a8ecde93ad..2188e4eb03f 100644 +index 013d49c3658..a3ad1112c82 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -330,7 +330,7 @@ static IDirectDraw4 *create_ddraw(void) @@ -134,7 +132,7 @@ index 6a8ecde93ad..2188e4eb03f 100644 static IDirect3DViewport3 *create_viewport(IDirect3DDevice3 *device, UINT x, UINT y, UINT w, UINT h) { IDirect3DViewport3 *viewport; -@@ -16308,6 +16319,116 @@ static void test_caps(void) +@@ -16335,6 +16346,116 @@ static void test_caps(void) IDirectDraw4_Release(ddraw); } @@ -251,12 +249,12 @@ index 6a8ecde93ad..2188e4eb03f 100644 START_TEST(ddraw4) { DDDEVICEIDENTIFIER identifier; -@@ -16441,4 +16562,5 @@ START_TEST(ddraw4) +@@ -16468,4 +16589,5 @@ START_TEST(ddraw4) test_alphatest(); test_clipper_refcount(); test_caps(); + test_texture_wrong_caps(); } -- -2.20.1 +2.17.1 diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index e8cc97d9..70f9c705 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -52,7 +52,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "07afb240a87d097c83ca5263c61145a170894a22" + echo "d83b71ebfdfe83704c313d7c11e8c87c9a8b0419" } # Show version information diff --git a/patches/uianimation-stubs/0002-uianimation-Add-stub-dll.patch b/patches/uianimation-stubs/0002-uianimation-Add-stub-dll.patch index 4a412da8..9f70d673 100644 --- a/patches/uianimation-stubs/0002-uianimation-Add-stub-dll.patch +++ b/patches/uianimation-stubs/0002-uianimation-Add-stub-dll.patch @@ -1,4 +1,4 @@ -From e8dc870c41c85729d2ccf24738f63fd9c8c22d68 Mon Sep 17 00:00:00 2001 +From 27139df539e603ba9db27a49a37cba789b33a108 Mon Sep 17 00:00:00 2001 From: Louis Lenders Date: Thu, 7 Jun 2018 11:51:01 +0200 Subject: [PATCH] uianimation: Add stub dll @@ -16,13 +16,15 @@ Signed-off-by: Louis Lenders create mode 100644 dlls/uianimation/uianimation_typelib.idl diff --git a/dlls/uianimation/Makefile.in b/dlls/uianimation/Makefile.in -index b504181b9a2..3663c23d68e 100644 +index 85bf1675db0..c0cab1d0fd4 100644 --- a/dlls/uianimation/Makefile.in +++ b/dlls/uianimation/Makefile.in -@@ -1,4 +1,9 @@ +@@ -1,6 +1,11 @@ MODULE = uianimation.dll +IMPORTS = uuid ole32 + EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ main.c + @@ -30,11 +32,11 @@ index b504181b9a2..3663c23d68e 100644 + uianimation_typelib.idl + diff --git a/dlls/uianimation/main.c b/dlls/uianimation/main.c -index 92d594ff5d7..1d2d86b3551 100644 +index ea35a30f51d..c20cfde47df 100644 --- a/dlls/uianimation/main.c +++ b/dlls/uianimation/main.c -@@ -21,19 +21,906 @@ - #include "config.h" +@@ -20,19 +20,906 @@ + #include +#define COBJMACROS @@ -940,7 +942,7 @@ index 92d594ff5d7..1d2d86b3551 100644 BOOL WINAPI DllMain( HINSTANCE dll, DWORD reason, LPVOID reserved ) { TRACE("(%p %d %p)\n", dll, reason, reserved); -@@ -50,16 +937,6 @@ BOOL WINAPI DllMain( HINSTANCE dll, DWORD reason, LPVOID reserved ) +@@ -49,16 +936,6 @@ BOOL WINAPI DllMain( HINSTANCE dll, DWORD reason, LPVOID reserved ) return TRUE; } @@ -987,5 +989,5 @@ index 00000000000..9066c09a021 + +#include "uianimation.idl" -- -2.20.1 +2.17.1