diff --git a/patches/ddraw-IDirect3DTexture2_Load/0002-ddraw-tests-Add-more-tests-for-IDirect3DTexture2-Loa.patch b/patches/ddraw-IDirect3DTexture2_Load/0002-ddraw-tests-Add-more-tests-for-IDirect3DTexture2-Loa.patch index 37891308..a1b0c6dc 100644 --- a/patches/ddraw-IDirect3DTexture2_Load/0002-ddraw-tests-Add-more-tests-for-IDirect3DTexture2-Loa.patch +++ b/patches/ddraw-IDirect3DTexture2_Load/0002-ddraw-tests-Add-more-tests-for-IDirect3DTexture2-Loa.patch @@ -1,18 +1,18 @@ -From 4498bb259a9ab5e5bf6f8a55dc96b6ac24c82e09 Mon Sep 17 00:00:00 2001 +From 6b9e021961483c85bb4d343040d5e346ed578772 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Sat, 30 May 2015 02:56:19 +0200 -Subject: ddraw/tests: Add more tests for IDirect3DTexture2::Load. +Subject: [PATCH] ddraw/tests: Add more tests for IDirect3DTexture2::Load. --- - dlls/ddraw/tests/d3d.c | 373 ++++++++++++++++++++++++++++++++++++++++++++++ - dlls/ddraw/tests/ddraw2.c | 28 +++- + dlls/ddraw/tests/d3d.c | 373 ++++++++++++++++++++++++++++++++++++++ + dlls/ddraw/tests/ddraw2.c | 28 ++- 2 files changed, 400 insertions(+), 1 deletion(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c -index ec4197a..d35d0e0 100644 +index 87d0648b699..e88bbf59767 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c -@@ -1515,6 +1515,288 @@ static BOOL colortables_check_equality(PALETTEENTRY table1[256], PALETTEENTRY ta +@@ -1221,6 +1221,288 @@ static BOOL colortables_check_equality(PALETTEENTRY table1[256], PALETTEENTRY ta return TRUE; } @@ -301,9 +301,9 @@ index ec4197a..d35d0e0 100644 /* test palette handling in IDirect3DTexture_Load */ static void TextureLoadTest(void) { -@@ -1578,6 +1860,97 @@ static void TextureLoadTest(void) +@@ -1284,6 +1566,97 @@ static void TextureLoadTest(void) hr = IDirect3DTexture_Load(Texture2, Texture); - ok(hr == DD_OK, "IDirect3DTexture_Load returned %08x\n", hr); + ok(hr == DD_OK, "Got hr %#lx.\n", hr); + for (i = 0; i < sizeof(load_tests) / sizeof(load_tests[0]); i++) + { @@ -400,10 +400,10 @@ index ec4197a..d35d0e0 100644 table1[i].peRed = i; table1[i].peGreen = i; diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c -index 0cb1ca4..a2489e4 100644 +index 0696a623bb0..c49681730c9 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c -@@ -1121,8 +1121,10 @@ static void test_texture_load_ckey(void) +@@ -1499,8 +1499,10 @@ static void test_texture_load_ckey(void) IDirectDraw2 *ddraw = NULL; IDirectDrawSurface *src = NULL; IDirectDrawSurface *dst = NULL; @@ -414,7 +414,7 @@ index 0cb1ca4..a2489e4 100644 DDSURFACEDESC ddsd; HRESULT hr; DDCOLORKEY ckey; -@@ -1134,16 +1136,31 @@ static void test_texture_load_ckey(void) +@@ -1512,16 +1514,31 @@ static void test_texture_load_ckey(void) memset(&ddsd, 0, sizeof(ddsd)); ddsd.dwSize = sizeof(ddsd); @@ -447,7 +447,7 @@ index 0cb1ca4..a2489e4 100644 hr = IDirectDrawSurface_QueryInterface(src, &IID_IDirect3DTexture, (void **)&src_tex); ok(SUCCEEDED(hr) || hr == E_NOINTERFACE, "Failed to get Direct3DTexture interface, hr %#x.\n", hr); if (FAILED(hr)) -@@ -1154,6 +1171,8 @@ static void test_texture_load_ckey(void) +@@ -1532,6 +1549,8 @@ static void test_texture_load_ckey(void) } hr = IDirectDrawSurface_QueryInterface(dst, &IID_IDirect3DTexture, (void **)&dst_tex); ok(SUCCEEDED(hr), "Failed to get Direct3DTexture interface, hr %#x.\n", hr); @@ -456,7 +456,7 @@ index 0cb1ca4..a2489e4 100644 /* No surface has a color key */ hr = IDirect3DTexture_Load(dst_tex, src_tex); -@@ -1182,6 +1201,11 @@ static void test_texture_load_ckey(void) +@@ -1560,6 +1579,11 @@ static void test_texture_load_ckey(void) ok(ckey.dwColorSpaceLowValue == 0x0000ff00, "dwColorSpaceLowValue is %#x.\n", ckey.dwColorSpaceLowValue); ok(ckey.dwColorSpaceHighValue == 0x0000ff00, "dwColorSpaceHighValue is %#x.\n", ckey.dwColorSpaceHighValue); @@ -468,7 +468,7 @@ index 0cb1ca4..a2489e4 100644 /* Both surfaces have a color key: Dest ckey is overwritten */ ckey.dwColorSpaceLowValue = ckey.dwColorSpaceHighValue = 0x000000ff; hr = IDirectDrawSurface_SetColorKey(dst, DDCKEY_SRCBLT, &ckey); -@@ -1206,8 +1230,10 @@ static void test_texture_load_ckey(void) +@@ -1584,8 +1608,10 @@ static void test_texture_load_ckey(void) ok(ckey.dwColorSpaceHighValue == 0x0000ff00, "dwColorSpaceHighValue is %#x.\n", ckey.dwColorSpaceHighValue); done: @@ -480,5 +480,5 @@ index 0cb1ca4..a2489e4 100644 if (src) IDirectDrawSurface_Release(src); if (ddraw) IDirectDraw2_Release(ddraw); -- -2.4.2 +2.35.1 diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index daf46221..4677b875 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -51,7 +51,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "9af3a79b96318471818e0abacfc1a6f8ecc91463" + echo "7b79e3a87b1e1a9478e92d6ea3b5973da4388a82" } # Show version information diff --git a/staging/upstream-commit b/staging/upstream-commit index f410bc87..83f050d4 100644 --- a/staging/upstream-commit +++ b/staging/upstream-commit @@ -1 +1 @@ -9af3a79b96318471818e0abacfc1a6f8ecc91463 +7b79e3a87b1e1a9478e92d6ea3b5973da4388a82