diff --git a/patches/d3dx9_36-FindNextValidTechnique/0001-d3dx9_36-Implement-ID3DXEffect_FindNextValidTechniqu.patch b/patches/d3dx9_36-FindNextValidTechnique/0001-d3dx9_36-Implement-ID3DXEffect_FindNextValidTechniqu.patch index 52fe7474..ea1179dd 100644 --- a/patches/d3dx9_36-FindNextValidTechnique/0001-d3dx9_36-Implement-ID3DXEffect_FindNextValidTechniqu.patch +++ b/patches/d3dx9_36-FindNextValidTechnique/0001-d3dx9_36-Implement-ID3DXEffect_FindNextValidTechniqu.patch @@ -1,4 +1,4 @@ -From 000f06385dc49a3f2ddc1d866013e7632a6e0370 Mon Sep 17 00:00:00 2001 +From 66ea1296b0b3493271a7611bfa56b0d74b34b16c Mon Sep 17 00:00:00 2001 From: Christian Costa Date: Fri, 19 Dec 2014 22:31:46 +0100 Subject: d3dx9_36: Implement ID3DXEffect_FindNextValidTechnique + add tests. @@ -9,10 +9,10 @@ Subject: d3dx9_36: Implement ID3DXEffect_FindNextValidTechnique + add tests. 2 files changed, 91 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c -index 4be6e4b..ecd1b74 100644 +index a210bb3..2fbc1cb 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c -@@ -3471,13 +3471,41 @@ static HRESULT WINAPI ID3DXEffectImpl_ValidateTechnique(ID3DXEffect* iface, D3DX +@@ -3483,13 +3483,41 @@ static HRESULT WINAPI ID3DXEffectImpl_ValidateTechnique(ID3DXEffect* iface, D3DX return D3D_OK; } @@ -58,11 +58,11 @@ index 4be6e4b..ecd1b74 100644 static BOOL WINAPI ID3DXEffectImpl_IsParameterUsed(ID3DXEffect* iface, D3DXHANDLE parameter, D3DXHANDLE technique) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c -index de7d1e9..f34b1f8 100644 +index c388e7d..8653e0e 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c -@@ -2972,6 +2972,65 @@ static void test_effect_states(IDirect3DDevice9 *device) - ok(value == 3, "Got result %u, expected %u.\n", value, 1); +@@ -3886,6 +3886,65 @@ static void test_effect_preshader(IDirect3DDevice9 *device) + effect->lpVtbl->Release(effect); } +/* @@ -127,10 +127,10 @@ index de7d1e9..f34b1f8 100644 START_TEST(effect) { HWND wnd; -@@ -3011,6 +3070,7 @@ START_TEST(effect) - test_effect_variable_names(device); +@@ -3927,6 +3986,7 @@ START_TEST(effect) test_effect_compilation_errors(device); test_effect_states(device); + test_effect_preshader(device); + test_effect_technique_validation(device); count = IDirect3DDevice9_Release(device); diff --git a/patches/ddraw-Device_Caps/0003-ddraw-Set-ddsOldCaps-correctly-in-ddraw7_GetCaps.patch b/patches/ddraw-Device_Caps/0003-ddraw-Set-ddsOldCaps-correctly-in-ddraw7_GetCaps.patch index 23d587c7..ca457a61 100644 --- a/patches/ddraw-Device_Caps/0003-ddraw-Set-ddsOldCaps-correctly-in-ddraw7_GetCaps.patch +++ b/patches/ddraw-Device_Caps/0003-ddraw-Set-ddsOldCaps-correctly-in-ddraw7_GetCaps.patch @@ -1,4 +1,4 @@ -From 481804163415517f2dd6f8e7f8d739791b17aba5 Mon Sep 17 00:00:00 2001 +From 86b9dd3e7fc3ac50ce08779978c2b0958fb3f751 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Fri, 4 Mar 2016 22:22:42 +0100 Subject: ddraw: Set ddsOldCaps correctly in ddraw7_GetCaps. @@ -25,10 +25,10 @@ index f9231d8..eeb941c 100644 if(DriverCaps) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c -index 1e1a2ff..c2f0b78 100644 +index 02eb9c9..e48307b 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c -@@ -8497,6 +8497,31 @@ done: +@@ -8573,6 +8573,31 @@ static void test_blt(void) DestroyWindow(window); } @@ -60,17 +60,17 @@ index 1e1a2ff..c2f0b78 100644 START_TEST(ddraw1) { IDirectDraw *ddraw; -@@ -8573,4 +8598,5 @@ START_TEST(ddraw1) - test_yv12_overlay(); +@@ -8650,4 +8675,5 @@ START_TEST(ddraw1) test_offscreen_overlay(); test_overlay_rect(); + test_blt(); + test_caps(); } diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c -index 75bdc84..03ca99c 100644 +index ee3508f..719b8ef 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c -@@ -9604,6 +9604,31 @@ done: +@@ -9680,6 +9680,31 @@ static void test_blt(void) DestroyWindow(window); } @@ -102,17 +102,17 @@ index 75bdc84..03ca99c 100644 START_TEST(ddraw2) { IDirectDraw2 *ddraw; -@@ -9687,4 +9712,5 @@ START_TEST(ddraw2) - test_yv12_overlay(); +@@ -9764,4 +9789,5 @@ START_TEST(ddraw2) test_offscreen_overlay(); test_overlay_rect(); + test_blt(); + test_caps(); } diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c -index a092787..2e6564a 100644 +index 6f863b1..a48e3b7 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c -@@ -10775,6 +10775,31 @@ done: +@@ -10858,6 +10858,31 @@ static void test_blt(void) DestroyWindow(window); } @@ -144,17 +144,17 @@ index a092787..2e6564a 100644 START_TEST(ddraw4) { IDirectDraw4 *ddraw; -@@ -10865,4 +10890,5 @@ START_TEST(ddraw4) - test_yv12_overlay(); +@@ -10949,4 +10974,5 @@ START_TEST(ddraw4) test_offscreen_overlay(); test_overlay_rect(); + test_blt(); + test_caps(); } diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c -index 1509be7..46330e5 100644 +index 72ec446..68115b7 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c -@@ -11066,6 +11066,31 @@ done: +@@ -11149,6 +11149,31 @@ static void test_blt(void) DestroyWindow(window); } @@ -186,10 +186,10 @@ index 1509be7..46330e5 100644 START_TEST(ddraw7) { HMODULE module = GetModuleHandleA("ddraw.dll"); -@@ -11167,4 +11192,5 @@ START_TEST(ddraw7) - test_yv12_overlay(); +@@ -11251,4 +11276,5 @@ START_TEST(ddraw7) test_offscreen_overlay(); test_overlay_rect(); + test_blt(); + test_caps(); } -- diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index fa864e5b..75593b3c 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -51,7 +51,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "329dfee70c35184329d0820a5e9edbbed8b49b37" + echo "510c8e39838e4ceef1a66b42e7e58484bf4ac143" } # Show version information