From 5f4b99aa18dfe4ba016c914ffb6100bab1f073a2 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Fri, 13 Jan 2017 01:08:54 +0100 Subject: [PATCH] Rebase against 083b35e7c77c32f2f011a7e4188edaf605e0848c. --- ...sOldCaps-correctly-in-ddraw7_GetCaps.patch | 38 +++++++++---------- patches/patchinstall.sh | 2 +- 2 files changed, 20 insertions(+), 20 deletions(-) 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 659e32e5..703ada0f 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 445d3b9a3148598de7ff907429076d1551c419ec Mon Sep 17 00:00:00 2001 +From 746aa2c81af98e890e4db720783de7fce4bc84d3 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. @@ -12,7 +12,7 @@ Subject: ddraw: Set ddsOldCaps correctly in ddraw7_GetCaps. 5 files changed, 106 insertions(+) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c -index e50edb4..bac9b8a 100644 +index 1fa88751efe..5c138a5d726 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -1533,6 +1533,8 @@ static HRESULT WINAPI ddraw7_GetCaps(IDirectDraw7 *iface, DDCAPS *DriverCaps, DD @@ -25,10 +25,10 @@ index e50edb4..bac9b8a 100644 if(DriverCaps) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c -index 1271022..de6697e 100644 +index 5b153a62a21..762c1074e79 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c -@@ -9612,6 +9612,31 @@ static void test_transform_vertices(void) +@@ -9793,6 +9793,31 @@ static void test_display_mode_surface_pixel_format(void) DestroyWindow(window); } @@ -60,17 +60,17 @@ index 1271022..de6697e 100644 START_TEST(ddraw1) { IDirectDraw *ddraw; -@@ -9695,4 +9720,5 @@ START_TEST(ddraw1) - test_blt(); +@@ -9877,4 +9902,5 @@ START_TEST(ddraw1) test_getdc(); test_transform_vertices(); + test_display_mode_surface_pixel_format(); + test_caps(); } diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c -index bf012e4..b55eed8 100644 +index 422960012af..714d3f0e1a8 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c -@@ -10949,6 +10949,31 @@ static void test_transform_vertices(void) +@@ -11247,6 +11247,31 @@ static void test_display_mode_surface_pixel_format(void) DestroyWindow(window); } @@ -102,17 +102,17 @@ index bf012e4..b55eed8 100644 START_TEST(ddraw2) { IDirectDraw2 *ddraw; -@@ -11041,4 +11066,5 @@ START_TEST(ddraw2) - test_draw_primitive(); +@@ -11340,4 +11365,5 @@ START_TEST(ddraw2) test_edge_antialiasing_blending(); test_transform_vertices(); + test_display_mode_surface_pixel_format(); + test_caps(); } diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c -index 9ac7a63..7b4bd3c 100644 +index e091a6dac5d..70dd79d7a13 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c -@@ -12246,6 +12246,31 @@ static void test_transform_vertices(void) +@@ -12532,6 +12532,31 @@ static void test_display_mode_surface_pixel_format(void) DestroyWindow(window); } @@ -144,17 +144,17 @@ index 9ac7a63..7b4bd3c 100644 START_TEST(ddraw4) { IDirectDraw4 *ddraw; -@@ -12346,4 +12371,5 @@ START_TEST(ddraw4) - test_draw_primitive(); +@@ -12633,4 +12658,5 @@ START_TEST(ddraw4) test_edge_antialiasing_blending(); test_transform_vertices(); + test_display_mode_surface_pixel_format(); + test_caps(); } diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c -index d6dffc8..eafa93b 100644 +index 0b1bdaef6d2..536163e9a5e 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c -@@ -12104,6 +12104,31 @@ static void test_edge_antialiasing_blending(void) +@@ -12211,6 +12211,31 @@ static void test_display_mode_surface_pixel_format(void) DestroyWindow(window); } @@ -186,12 +186,12 @@ index d6dffc8..eafa93b 100644 START_TEST(ddraw7) { HMODULE module = GetModuleHandleA("ddraw.dll"); -@@ -12214,4 +12239,5 @@ START_TEST(ddraw7) - test_getdc(); +@@ -12322,4 +12347,5 @@ START_TEST(ddraw7) test_draw_primitive(); test_edge_antialiasing_blending(); + test_display_mode_surface_pixel_format(); + test_caps(); } -- -2.9.0 +2.11.0 diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index bab95886..3c1c6d3d 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -52,7 +52,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "8df9a11adebf72f3f1046a2efad6e8c85fc44c40" + echo "083b35e7c77c32f2f011a7e4188edaf605e0848c" } # Show version information