From a500c9ce4211a188500166ef229b8e73cb2fceaf Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Wed, 13 Jul 2022 11:00:29 +1000 Subject: [PATCH] Rebase against b9a61cde89e5dc6264b4c152f4dc24ecf064f8f6. --- ...more-tests-for-IDirect3DTexture2-Loa.patch | 30 +++++++++---------- patches/patchinstall.sh | 2 +- staging/upstream-commit | 2 +- 3 files changed, 17 insertions(+), 17 deletions(-) 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 a1b0c6dc..f161fc2b 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,4 +1,4 @@ -From 6b9e021961483c85bb4d343040d5e346ed578772 Mon Sep 17 00:00:00 2001 +From 9028351204472aafe5d7731c8737a6cfdb09e659 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: [PATCH] ddraw/tests: Add more tests for IDirect3DTexture2::Load. @@ -400,10 +400,10 @@ index 87d0648b699..e88bbf59767 100644 table1[i].peRed = i; table1[i].peGreen = i; diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c -index 0696a623bb0..c49681730c9 100644 +index 2d08718d131..0a2d575e8cc 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c -@@ -1499,8 +1499,10 @@ static void test_texture_load_ckey(void) +@@ -1495,8 +1495,10 @@ static void test_texture_load_ckey(void) IDirectDraw2 *ddraw = NULL; IDirectDrawSurface *src = NULL; IDirectDrawSurface *dst = NULL; @@ -414,7 +414,7 @@ index 0696a623bb0..c49681730c9 100644 DDSURFACEDESC ddsd; HRESULT hr; DDCOLORKEY ckey; -@@ -1512,16 +1514,31 @@ static void test_texture_load_ckey(void) +@@ -1508,16 +1510,31 @@ static void test_texture_load_ckey(void) memset(&ddsd, 0, sizeof(ddsd)); ddsd.dwSize = sizeof(ddsd); @@ -431,10 +431,10 @@ index 0696a623bb0..c49681730c9 100644 + U4(ddsd.ddpfPixelFormat).dwBBitMask = 0x000000FF; + hr = IDirectDraw2_CreateSurface(ddraw, &ddsd, &src, NULL); - ok(SUCCEEDED(hr), "Failed to create source texture, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "Failed to create source texture, hr %#lx.\n", hr); ddsd.ddsCaps.dwCaps = DDSCAPS_TEXTURE; hr = IDirectDraw2_CreateSurface(ddraw, &ddsd, &dst, NULL); - ok(SUCCEEDED(hr), "Failed to create destination texture, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "Failed to create destination texture, hr %#lx.\n", hr); + U1(ddsd.ddpfPixelFormat).dwRGBBitCount = 16; + U2(ddsd.ddpfPixelFormat).dwRBitMask = 0xf800; @@ -445,20 +445,20 @@ index 0696a623bb0..c49681730c9 100644 + ok(SUCCEEDED(hr), "Failed to create destination texture, hr %#x.\n", hr); + hr = IDirectDrawSurface_QueryInterface(src, &IID_IDirect3DTexture, (void **)&src_tex); - ok(SUCCEEDED(hr) || hr == E_NOINTERFACE, "Failed to get Direct3DTexture interface, hr %#x.\n", hr); + ok(SUCCEEDED(hr) || hr == E_NOINTERFACE, "Failed to get Direct3DTexture interface, hr %#lx.\n", hr); if (FAILED(hr)) -@@ -1532,6 +1549,8 @@ static void test_texture_load_ckey(void) +@@ -1528,6 +1545,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); + ok(SUCCEEDED(hr), "Failed to get Direct3DTexture interface, hr %#lx.\n", hr); + hr = IDirectDrawSurface_QueryInterface(dst2, &IID_IDirect3DTexture, (void **)&dst2_tex); -+ ok(SUCCEEDED(hr), "Failed to get Direct3DTexture interface, hr %#x.\n", hr); ++ ok(SUCCEEDED(hr), "Failed to get Direct3DTexture interface, hr %#lx.\n", hr); /* No surface has a color key */ hr = IDirect3DTexture_Load(dst_tex, src_tex); -@@ -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); +@@ -1556,6 +1575,11 @@ static void test_texture_load_ckey(void) + ok(ckey.dwColorSpaceLowValue == 0x0000ff00, "Got unexpected value 0x%08lx.\n", ckey.dwColorSpaceLowValue); + ok(ckey.dwColorSpaceHighValue == 0x0000ff00, "Got unexpected value 0x%08lx.\n", ckey.dwColorSpaceHighValue); + /* Source surface has a color key but destination differs in format */ + ckey.dwColorSpaceLowValue = ckey.dwColorSpaceHighValue = 0x0; @@ -468,8 +468,8 @@ index 0696a623bb0..c49681730c9 100644 /* Both surfaces have a color key: Dest ckey is overwritten */ ckey.dwColorSpaceLowValue = ckey.dwColorSpaceHighValue = 0x000000ff; hr = IDirectDrawSurface_SetColorKey(dst, DDCKEY_SRCBLT, &ckey); -@@ -1584,8 +1608,10 @@ static void test_texture_load_ckey(void) - ok(ckey.dwColorSpaceHighValue == 0x0000ff00, "dwColorSpaceHighValue is %#x.\n", ckey.dwColorSpaceHighValue); +@@ -1580,8 +1604,10 @@ static void test_texture_load_ckey(void) + ok(ckey.dwColorSpaceHighValue == 0x0000ff00, "Got unexpected value 0x%08lx.\n", ckey.dwColorSpaceHighValue); done: + if (dst2_tex) IDirect3DTexture_Release(dst2_tex); diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 541724f7..d2788d99 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -51,7 +51,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "6e32c011a2b977246f9ab2282d30b69cff90142b" + echo "b9a61cde89e5dc6264b4c152f4dc24ecf064f8f6" } # Show version information diff --git a/staging/upstream-commit b/staging/upstream-commit index 3994bbfd..1bcb6902 100644 --- a/staging/upstream-commit +++ b/staging/upstream-commit @@ -1 +1 @@ -6e32c011a2b977246f9ab2282d30b69cff90142b +b9a61cde89e5dc6264b4c152f4dc24ecf064f8f6