From 3d396bbbcdf3dcc94603161926443433ccded41c Mon Sep 17 00:00:00 2001 From: gloriouseggroll Date: Mon, 19 Feb 2018 18:05:44 -0500 Subject: [PATCH 1/4] d3dx9_36-DXTn: update to 1d08851c3564fc8c6ea59d1524f5b1ac1b46f3fe, somehow was reverted to very old version --- .../0001-d3dx9_36-Add-dxtn-support.patch | 150 ++++++++++-------- 1 file changed, 84 insertions(+), 66 deletions(-) diff --git a/patches/d3dx9_36-DXTn/0001-d3dx9_36-Add-dxtn-support.patch b/patches/d3dx9_36-DXTn/0001-d3dx9_36-Add-dxtn-support.patch index 0bef1269..ed474cf0 100644 --- a/patches/d3dx9_36-DXTn/0001-d3dx9_36-Add-dxtn-support.patch +++ b/patches/d3dx9_36-DXTn/0001-d3dx9_36-Add-dxtn-support.patch @@ -1,7 +1,7 @@ -From bc50ed481ea6cfa40ac3925abe6121a91e6fa1c2 Mon Sep 17 00:00:00 2001 +From 33854851913e9046eb6ea4cd765a2f0026729f07 Mon Sep 17 00:00:00 2001 From: Christian Costa Date: Sat, 1 Nov 2014 13:08:05 +0100 -Subject: [PATCH] d3dx9_36: Add dxtn support. +Subject: d3dx9_36: Add dxtn support. --- dlls/d3dx9_24/Makefile.in | 2 +- @@ -23,14 +23,16 @@ Subject: [PATCH] d3dx9_36: Add dxtn support. dlls/d3dx9_38/Makefile.in | 2 +- dlls/d3dx9_39/Makefile.in | 2 +- dlls/d3dx9_40/Makefile.in | 2 +- - 19 files changed, 117 insertions(+), 28 deletions(-) + dlls/d3dx9_41/Makefile.in | 2 +- + dlls/d3dx9_42/Makefile.in | 2 +- + dlls/d3dx9_43/Makefile.in | 2 +- + 22 files changed, 120 insertions(+), 31 deletions(-) diff --git a/dlls/d3dx9_24/Makefile.in b/dlls/d3dx9_24/Makefile.in -index 6810b79..6a9e51e 100644 +index 7464bd1f18f..bca7d826db0 100644 --- a/dlls/d3dx9_24/Makefile.in +++ b/dlls/d3dx9_24/Makefile.in -@@ -1,6 +1,6 @@ - EXTRADEFS = -DD3DX_SDK_VERSION=24 +@@ -1,5 +1,5 @@ MODULE = d3dx9_24.dll -IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 +IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d @@ -38,11 +40,10 @@ index 6810b79..6a9e51e 100644 PARENTSRC = ../d3dx9_36 diff --git a/dlls/d3dx9_25/Makefile.in b/dlls/d3dx9_25/Makefile.in -index ba16d3d..bdaf982 100644 +index 1531e66c1e6..5d847a2828b 100644 --- a/dlls/d3dx9_25/Makefile.in +++ b/dlls/d3dx9_25/Makefile.in -@@ -1,6 +1,6 @@ - EXTRADEFS = -DD3DX_SDK_VERSION=25 +@@ -1,5 +1,5 @@ MODULE = d3dx9_25.dll -IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 +IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d @@ -50,11 +51,10 @@ index ba16d3d..bdaf982 100644 PARENTSRC = ../d3dx9_36 diff --git a/dlls/d3dx9_26/Makefile.in b/dlls/d3dx9_26/Makefile.in -index dffc238..f62fda5 100644 +index 2a58c58b8a1..cf0c1509693 100644 --- a/dlls/d3dx9_26/Makefile.in +++ b/dlls/d3dx9_26/Makefile.in -@@ -1,6 +1,6 @@ - EXTRADEFS = -DD3DX_SDK_VERSION=26 +@@ -1,5 +1,5 @@ MODULE = d3dx9_26.dll -IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 +IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d @@ -62,11 +62,10 @@ index dffc238..f62fda5 100644 PARENTSRC = ../d3dx9_36 diff --git a/dlls/d3dx9_27/Makefile.in b/dlls/d3dx9_27/Makefile.in -index a422308..dc6a8e3 100644 +index 9ba1e2ac5bd..7cc647c1647 100644 --- a/dlls/d3dx9_27/Makefile.in +++ b/dlls/d3dx9_27/Makefile.in -@@ -1,6 +1,6 @@ - EXTRADEFS = -DD3DX_SDK_VERSION=27 +@@ -1,5 +1,5 @@ MODULE = d3dx9_27.dll -IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 +IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d @@ -74,11 +73,10 @@ index a422308..dc6a8e3 100644 PARENTSRC = ../d3dx9_36 diff --git a/dlls/d3dx9_28/Makefile.in b/dlls/d3dx9_28/Makefile.in -index 73e486f..f331b3a 100644 +index 15dec71f2d7..bbf4140e723 100644 --- a/dlls/d3dx9_28/Makefile.in +++ b/dlls/d3dx9_28/Makefile.in -@@ -1,6 +1,6 @@ - EXTRADEFS = -DD3DX_SDK_VERSION=28 +@@ -1,5 +1,5 @@ MODULE = d3dx9_28.dll -IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 +IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d @@ -86,11 +84,10 @@ index 73e486f..f331b3a 100644 PARENTSRC = ../d3dx9_36 diff --git a/dlls/d3dx9_29/Makefile.in b/dlls/d3dx9_29/Makefile.in -index 5c3cf37..98038a1 100644 +index 5a5a8fcad97..1aa1663ea06 100644 --- a/dlls/d3dx9_29/Makefile.in +++ b/dlls/d3dx9_29/Makefile.in -@@ -1,6 +1,6 @@ - EXTRADEFS = -DD3DX_SDK_VERSION=29 +@@ -1,5 +1,5 @@ MODULE = d3dx9_29.dll -IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 +IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d @@ -98,11 +95,10 @@ index 5c3cf37..98038a1 100644 PARENTSRC = ../d3dx9_36 diff --git a/dlls/d3dx9_30/Makefile.in b/dlls/d3dx9_30/Makefile.in -index 285ae2c..8d04f99 100644 +index bafcdb49312..df8f87bfedf 100644 --- a/dlls/d3dx9_30/Makefile.in +++ b/dlls/d3dx9_30/Makefile.in -@@ -1,6 +1,6 @@ - EXTRADEFS = -DD3DX_SDK_VERSION=30 +@@ -1,5 +1,5 @@ MODULE = d3dx9_30.dll -IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 +IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d @@ -110,11 +106,10 @@ index 285ae2c..8d04f99 100644 PARENTSRC = ../d3dx9_36 diff --git a/dlls/d3dx9_31/Makefile.in b/dlls/d3dx9_31/Makefile.in -index bc66d2f..4142f42 100644 +index f5df4d88ae0..6ea8d15b411 100644 --- a/dlls/d3dx9_31/Makefile.in +++ b/dlls/d3dx9_31/Makefile.in -@@ -1,6 +1,6 @@ - EXTRADEFS = -DD3DX_SDK_VERSION=31 +@@ -1,5 +1,5 @@ MODULE = d3dx9_31.dll -IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 +IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d @@ -122,11 +117,10 @@ index bc66d2f..4142f42 100644 PARENTSRC = ../d3dx9_36 diff --git a/dlls/d3dx9_32/Makefile.in b/dlls/d3dx9_32/Makefile.in -index a4a9ecb..75a7b18 100644 +index cce9293063c..df0759fedfc 100644 --- a/dlls/d3dx9_32/Makefile.in +++ b/dlls/d3dx9_32/Makefile.in -@@ -1,6 +1,6 @@ - EXTRADEFS = -DD3DX_SDK_VERSION=32 +@@ -1,5 +1,5 @@ MODULE = d3dx9_32.dll -IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 +IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d @@ -134,11 +128,10 @@ index a4a9ecb..75a7b18 100644 PARENTSRC = ../d3dx9_36 diff --git a/dlls/d3dx9_33/Makefile.in b/dlls/d3dx9_33/Makefile.in -index 32a78c3..ffe9bdb 100644 +index c9b6587e77b..ecf1b1598c9 100644 --- a/dlls/d3dx9_33/Makefile.in +++ b/dlls/d3dx9_33/Makefile.in -@@ -1,6 +1,6 @@ - EXTRADEFS = -DD3DX_SDK_VERSION=33 +@@ -1,5 +1,5 @@ MODULE = d3dx9_33.dll -IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 +IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d @@ -146,11 +139,10 @@ index 32a78c3..ffe9bdb 100644 PARENTSRC = ../d3dx9_36 diff --git a/dlls/d3dx9_34/Makefile.in b/dlls/d3dx9_34/Makefile.in -index 714518e..74eea4a 100644 +index 822f621008d..2dcd721c0a9 100644 --- a/dlls/d3dx9_34/Makefile.in +++ b/dlls/d3dx9_34/Makefile.in -@@ -1,6 +1,6 @@ - EXTRADEFS = -DD3DX_SDK_VERSION=34 +@@ -1,5 +1,5 @@ MODULE = d3dx9_34.dll -IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 +IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d @@ -158,11 +150,10 @@ index 714518e..74eea4a 100644 PARENTSRC = ../d3dx9_36 diff --git a/dlls/d3dx9_35/Makefile.in b/dlls/d3dx9_35/Makefile.in -index 0a1b681..be66d97 100644 +index 3c8df661029..8c90f16b24f 100644 --- a/dlls/d3dx9_35/Makefile.in +++ b/dlls/d3dx9_35/Makefile.in -@@ -1,6 +1,6 @@ - EXTRADEFS = -DD3DX_SDK_VERSION=35 +@@ -1,5 +1,5 @@ MODULE = d3dx9_35.dll -IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 +IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d @@ -170,11 +161,10 @@ index 0a1b681..be66d97 100644 PARENTSRC = ../d3dx9_36 diff --git a/dlls/d3dx9_36/Makefile.in b/dlls/d3dx9_36/Makefile.in -index 6bb605d..74c8cae 100644 +index 24ce09daefa..6b78518dc71 100644 --- a/dlls/d3dx9_36/Makefile.in +++ b/dlls/d3dx9_36/Makefile.in -@@ -1,7 +1,7 @@ - EXTRADEFS = -DD3DX_SDK_VERSION=36 +@@ -1,6 +1,6 @@ MODULE = d3dx9_36.dll IMPORTLIB = d3dx9 -IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 @@ -183,7 +173,7 @@ index 6bb605d..74c8cae 100644 C_SRCS = \ diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c -index 89a2e3d..87a4125 100644 +index fc747799d6d..f851e74ee76 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -27,6 +27,8 @@ @@ -195,7 +185,7 @@ index 89a2e3d..87a4125 100644 WINE_DEFAULT_DEBUG_CHANNEL(d3dx); -@@ -1817,6 +1819,27 @@ void point_filter_argb_pixels(const BYTE *src, UINT src_row_pitch, UINT src_slic +@@ -1715,6 +1717,27 @@ void point_filter_argb_pixels(const BYTE *src, UINT src_row_pitch, UINT src_slic } } @@ -223,7 +213,7 @@ index 89a2e3d..87a4125 100644 /************************************************************ * D3DXLoadSurfaceFromMemory * -@@ -1858,6 +1881,7 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface, +@@ -1756,6 +1779,7 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface, D3DSURFACE_DESC surfdesc; D3DLOCKED_RECT lockrect; struct volume src_size, dst_size; @@ -231,7 +221,7 @@ index 89a2e3d..87a4125 100644 TRACE("(%p, %p, %s, %p, %#x, %u, %p, %s, %#x, 0x%08x)\n", dst_surface, dst_palette, wine_dbgstr_rect(dst_rect), src_memory, src_format, -@@ -1939,8 +1963,15 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface, +@@ -1837,8 +1861,15 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface, } else /* Stretching or format conversion. */ { @@ -249,7 +239,7 @@ index 89a2e3d..87a4125 100644 { FIXME("Unsupported format conversion %#x -> %#x.\n", src_format, surfdesc.Format); return E_NOTIMPL; -@@ -1949,10 +1980,52 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface, +@@ -1847,10 +1878,52 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface, if (FAILED(IDirect3DSurface9_LockRect(dst_surface, &lockrect, dst_rect, 0))) return D3DXERR_INVALIDDATA; @@ -304,7 +294,7 @@ index 89a2e3d..87a4125 100644 } else /* if ((filter & 0xf) == D3DX_FILTER_POINT) */ { -@@ -1961,14 +2034,30 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface, +@@ -1859,14 +1932,30 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface, /* Always apply a point filter until D3DX_FILTER_LINEAR, * D3DX_FILTER_TRIANGLE and D3DX_FILTER_BOX are implemented. */ @@ -339,10 +329,10 @@ index 89a2e3d..87a4125 100644 /************************************************************ diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c -index 26adc73..e45ee36 100644 +index f2855e8ddb8..2be48dfddab 100644 --- a/dlls/d3dx9_36/tests/surface.c +++ b/dlls/d3dx9_36/tests/surface.c -@@ -1200,7 +1200,7 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device) +@@ -1174,7 +1174,7 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device) hr = IDirect3DTexture9_GetSurfaceLevel(tex, 0, &newsurf); ok(SUCCEEDED(hr), "Failed to get the surface, hr %#x.\n", hr); hr = D3DXLoadSurfaceFromSurface(newsurf, NULL, NULL, surf, NULL, NULL, D3DX_FILTER_NONE, 0); @@ -351,7 +341,7 @@ index 26adc73..e45ee36 100644 check_release((IUnknown*)newsurf, 1); check_release((IUnknown*)tex, 0); } -@@ -1226,7 +1226,7 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device) +@@ -1200,7 +1200,7 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device) hr = IDirect3DTexture9_GetSurfaceLevel(tex, 0, &newsurf); ok(SUCCEEDED(hr), "Failed to get the surface, hr %#x.\n", hr); hr = D3DXLoadSurfaceFromSurface(newsurf, NULL, NULL, surf, NULL, NULL, D3DX_FILTER_NONE, 0); @@ -360,7 +350,7 @@ index 26adc73..e45ee36 100644 check_release((IUnknown*)newsurf, 1); check_release((IUnknown*)tex, 0); } -@@ -1239,10 +1239,10 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device) +@@ -1213,10 +1213,10 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device) hr = IDirect3DTexture9_GetSurfaceLevel(tex, 0, &newsurf); ok(SUCCEEDED(hr), "Failed to get the surface, hr %#x.\n", hr); hr = D3DXLoadSurfaceFromSurface(newsurf, NULL, NULL, surf, NULL, NULL, D3DX_FILTER_NONE, 0); @@ -374,11 +364,10 @@ index 26adc73..e45ee36 100644 check_release((IUnknown*)newsurf, 1); check_release((IUnknown*)tex, 0); diff --git a/dlls/d3dx9_37/Makefile.in b/dlls/d3dx9_37/Makefile.in -index 01df6b4..9aaf338 100644 +index 672878ff7e4..9eecd32899d 100644 --- a/dlls/d3dx9_37/Makefile.in +++ b/dlls/d3dx9_37/Makefile.in -@@ -1,6 +1,6 @@ - EXTRADEFS = -DD3DX_SDK_VERSION=37 +@@ -1,5 +1,5 @@ MODULE = d3dx9_37.dll -IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 +IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d @@ -386,11 +375,10 @@ index 01df6b4..9aaf338 100644 PARENTSRC = ../d3dx9_36 diff --git a/dlls/d3dx9_38/Makefile.in b/dlls/d3dx9_38/Makefile.in -index 089abd5..86d9846 100644 +index 0b537c66b68..6bb7bac0513 100644 --- a/dlls/d3dx9_38/Makefile.in +++ b/dlls/d3dx9_38/Makefile.in -@@ -1,6 +1,6 @@ - EXTRADEFS = -DD3DX_SDK_VERSION=38 +@@ -1,5 +1,5 @@ MODULE = d3dx9_38.dll -IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 +IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d @@ -398,11 +386,10 @@ index 089abd5..86d9846 100644 PARENTSRC = ../d3dx9_36 diff --git a/dlls/d3dx9_39/Makefile.in b/dlls/d3dx9_39/Makefile.in -index 21071cc..0431693 100644 +index 58d88f78abc..5d03e18feb3 100644 --- a/dlls/d3dx9_39/Makefile.in +++ b/dlls/d3dx9_39/Makefile.in -@@ -1,6 +1,6 @@ - EXTRADEFS = -DD3DX_SDK_VERSION=39 +@@ -1,5 +1,5 @@ MODULE = d3dx9_39.dll -IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 +IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d @@ -410,17 +397,48 @@ index 21071cc..0431693 100644 PARENTSRC = ../d3dx9_36 diff --git a/dlls/d3dx9_40/Makefile.in b/dlls/d3dx9_40/Makefile.in -index 6f08759..ecb4af5 100644 +index a4417b5aa13..8982d4ec5e4 100644 --- a/dlls/d3dx9_40/Makefile.in +++ b/dlls/d3dx9_40/Makefile.in -@@ -1,6 +1,6 @@ - EXTRADEFS = -DD3DX_SDK_VERSION=40 +@@ -1,5 +1,5 @@ MODULE = d3dx9_40.dll -IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 +IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d EXTRADEFS = -D_D3DX9_VER=40 PARENTSRC = ../d3dx9_36 +diff --git a/dlls/d3dx9_41/Makefile.in b/dlls/d3dx9_41/Makefile.in +index 0463175210a..e9f3d657e6c 100644 +--- a/dlls/d3dx9_41/Makefile.in ++++ b/dlls/d3dx9_41/Makefile.in +@@ -1,5 +1,5 @@ + MODULE = d3dx9_41.dll +-IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 ++IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d + EXTRADEFS = -D_D3DX9_VER=41 + PARENTSRC = ../d3dx9_36 + +diff --git a/dlls/d3dx9_42/Makefile.in b/dlls/d3dx9_42/Makefile.in +index 309324f4307..a55736d756f 100644 +--- a/dlls/d3dx9_42/Makefile.in ++++ b/dlls/d3dx9_42/Makefile.in +@@ -1,5 +1,5 @@ + MODULE = d3dx9_42.dll +-IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 ++IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d + EXTRADEFS = -D_D3DX9_VER=42 + PARENTSRC = ../d3dx9_36 + +diff --git a/dlls/d3dx9_43/Makefile.in b/dlls/d3dx9_43/Makefile.in +index 9c1a87da600..c2e787c5836 100644 +--- a/dlls/d3dx9_43/Makefile.in ++++ b/dlls/d3dx9_43/Makefile.in +@@ -1,5 +1,5 @@ + MODULE = d3dx9_43.dll +-IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 ++IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d + EXTRADEFS = -D_D3DX9_VER=43 + PARENTSRC = ../d3dx9_36 + -- -1.9.1 - +2.11.0 From f035f180616ed7baf27b69394233841b52ffd241 Mon Sep 17 00:00:00 2001 From: gloriouseggroll Date: Mon, 19 Feb 2018 18:16:15 -0500 Subject: [PATCH 2/4] d3dx9_36-DXTn: fix makefile entries from previous working patch --- .../0001-d3dx9_36-Add-dxtn-support.patch | 85 +++++++++++-------- 1 file changed, 51 insertions(+), 34 deletions(-) diff --git a/patches/d3dx9_36-DXTn/0001-d3dx9_36-Add-dxtn-support.patch b/patches/d3dx9_36-DXTn/0001-d3dx9_36-Add-dxtn-support.patch index ed474cf0..47cfd009 100644 --- a/patches/d3dx9_36-DXTn/0001-d3dx9_36-Add-dxtn-support.patch +++ b/patches/d3dx9_36-DXTn/0001-d3dx9_36-Add-dxtn-support.patch @@ -29,10 +29,11 @@ Subject: d3dx9_36: Add dxtn support. 22 files changed, 120 insertions(+), 31 deletions(-) diff --git a/dlls/d3dx9_24/Makefile.in b/dlls/d3dx9_24/Makefile.in -index 7464bd1f18f..bca7d826db0 100644 +index 6810b79..6a9e51e 100644 --- a/dlls/d3dx9_24/Makefile.in +++ b/dlls/d3dx9_24/Makefile.in -@@ -1,5 +1,5 @@ +@@ -1,6 +1,6 @@ + EXTRADEFS = -DD3DX_SDK_VERSION=24 MODULE = d3dx9_24.dll -IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 +IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d @@ -40,10 +41,11 @@ index 7464bd1f18f..bca7d826db0 100644 PARENTSRC = ../d3dx9_36 diff --git a/dlls/d3dx9_25/Makefile.in b/dlls/d3dx9_25/Makefile.in -index 1531e66c1e6..5d847a2828b 100644 +index ba16d3d..bdaf982 100644 --- a/dlls/d3dx9_25/Makefile.in +++ b/dlls/d3dx9_25/Makefile.in -@@ -1,5 +1,5 @@ +@@ -1,6 +1,6 @@ + EXTRADEFS = -DD3DX_SDK_VERSION=25 MODULE = d3dx9_25.dll -IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 +IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d @@ -51,10 +53,11 @@ index 1531e66c1e6..5d847a2828b 100644 PARENTSRC = ../d3dx9_36 diff --git a/dlls/d3dx9_26/Makefile.in b/dlls/d3dx9_26/Makefile.in -index 2a58c58b8a1..cf0c1509693 100644 +index dffc238..f62fda5 100644 --- a/dlls/d3dx9_26/Makefile.in +++ b/dlls/d3dx9_26/Makefile.in -@@ -1,5 +1,5 @@ +@@ -1,6 +1,6 @@ + EXTRADEFS = -DD3DX_SDK_VERSION=26 MODULE = d3dx9_26.dll -IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 +IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d @@ -62,10 +65,11 @@ index 2a58c58b8a1..cf0c1509693 100644 PARENTSRC = ../d3dx9_36 diff --git a/dlls/d3dx9_27/Makefile.in b/dlls/d3dx9_27/Makefile.in -index 9ba1e2ac5bd..7cc647c1647 100644 +index a422308..dc6a8e3 100644 --- a/dlls/d3dx9_27/Makefile.in +++ b/dlls/d3dx9_27/Makefile.in -@@ -1,5 +1,5 @@ +@@ -1,6 +1,6 @@ + EXTRADEFS = -DD3DX_SDK_VERSION=27 MODULE = d3dx9_27.dll -IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 +IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d @@ -73,10 +77,11 @@ index 9ba1e2ac5bd..7cc647c1647 100644 PARENTSRC = ../d3dx9_36 diff --git a/dlls/d3dx9_28/Makefile.in b/dlls/d3dx9_28/Makefile.in -index 15dec71f2d7..bbf4140e723 100644 +index 73e486f..f331b3a 100644 --- a/dlls/d3dx9_28/Makefile.in +++ b/dlls/d3dx9_28/Makefile.in -@@ -1,5 +1,5 @@ +@@ -1,6 +1,6 @@ + EXTRADEFS = -DD3DX_SDK_VERSION=28 MODULE = d3dx9_28.dll -IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 +IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d @@ -84,10 +89,11 @@ index 15dec71f2d7..bbf4140e723 100644 PARENTSRC = ../d3dx9_36 diff --git a/dlls/d3dx9_29/Makefile.in b/dlls/d3dx9_29/Makefile.in -index 5a5a8fcad97..1aa1663ea06 100644 +index 5c3cf37..98038a1 100644 --- a/dlls/d3dx9_29/Makefile.in +++ b/dlls/d3dx9_29/Makefile.in -@@ -1,5 +1,5 @@ +@@ -1,6 +1,6 @@ + EXTRADEFS = -DD3DX_SDK_VERSION=29 MODULE = d3dx9_29.dll -IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 +IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d @@ -95,10 +101,11 @@ index 5a5a8fcad97..1aa1663ea06 100644 PARENTSRC = ../d3dx9_36 diff --git a/dlls/d3dx9_30/Makefile.in b/dlls/d3dx9_30/Makefile.in -index bafcdb49312..df8f87bfedf 100644 +index 285ae2c..8d04f99 100644 --- a/dlls/d3dx9_30/Makefile.in +++ b/dlls/d3dx9_30/Makefile.in -@@ -1,5 +1,5 @@ +@@ -1,6 +1,6 @@ + EXTRADEFS = -DD3DX_SDK_VERSION=30 MODULE = d3dx9_30.dll -IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 +IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d @@ -106,10 +113,11 @@ index bafcdb49312..df8f87bfedf 100644 PARENTSRC = ../d3dx9_36 diff --git a/dlls/d3dx9_31/Makefile.in b/dlls/d3dx9_31/Makefile.in -index f5df4d88ae0..6ea8d15b411 100644 +index bc66d2f..4142f42 100644 --- a/dlls/d3dx9_31/Makefile.in +++ b/dlls/d3dx9_31/Makefile.in -@@ -1,5 +1,5 @@ +@@ -1,6 +1,6 @@ + EXTRADEFS = -DD3DX_SDK_VERSION=31 MODULE = d3dx9_31.dll -IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 +IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d @@ -117,10 +125,11 @@ index f5df4d88ae0..6ea8d15b411 100644 PARENTSRC = ../d3dx9_36 diff --git a/dlls/d3dx9_32/Makefile.in b/dlls/d3dx9_32/Makefile.in -index cce9293063c..df0759fedfc 100644 +index a4a9ecb..75a7b18 100644 --- a/dlls/d3dx9_32/Makefile.in +++ b/dlls/d3dx9_32/Makefile.in -@@ -1,5 +1,5 @@ +@@ -1,6 +1,6 @@ + EXTRADEFS = -DD3DX_SDK_VERSION=32 MODULE = d3dx9_32.dll -IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 +IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d @@ -128,10 +137,11 @@ index cce9293063c..df0759fedfc 100644 PARENTSRC = ../d3dx9_36 diff --git a/dlls/d3dx9_33/Makefile.in b/dlls/d3dx9_33/Makefile.in -index c9b6587e77b..ecf1b1598c9 100644 +index 32a78c3..ffe9bdb 100644 --- a/dlls/d3dx9_33/Makefile.in +++ b/dlls/d3dx9_33/Makefile.in -@@ -1,5 +1,5 @@ +@@ -1,6 +1,6 @@ + EXTRADEFS = -DD3DX_SDK_VERSION=33 MODULE = d3dx9_33.dll -IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 +IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d @@ -139,10 +149,11 @@ index c9b6587e77b..ecf1b1598c9 100644 PARENTSRC = ../d3dx9_36 diff --git a/dlls/d3dx9_34/Makefile.in b/dlls/d3dx9_34/Makefile.in -index 822f621008d..2dcd721c0a9 100644 +index 714518e..74eea4a 100644 --- a/dlls/d3dx9_34/Makefile.in +++ b/dlls/d3dx9_34/Makefile.in -@@ -1,5 +1,5 @@ +@@ -1,6 +1,6 @@ + EXTRADEFS = -DD3DX_SDK_VERSION=34 MODULE = d3dx9_34.dll -IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 +IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d @@ -150,10 +161,11 @@ index 822f621008d..2dcd721c0a9 100644 PARENTSRC = ../d3dx9_36 diff --git a/dlls/d3dx9_35/Makefile.in b/dlls/d3dx9_35/Makefile.in -index 3c8df661029..8c90f16b24f 100644 +index 0a1b681..be66d97 100644 --- a/dlls/d3dx9_35/Makefile.in +++ b/dlls/d3dx9_35/Makefile.in -@@ -1,5 +1,5 @@ +@@ -1,6 +1,6 @@ + EXTRADEFS = -DD3DX_SDK_VERSION=35 MODULE = d3dx9_35.dll -IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 +IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d @@ -161,10 +173,11 @@ index 3c8df661029..8c90f16b24f 100644 PARENTSRC = ../d3dx9_36 diff --git a/dlls/d3dx9_36/Makefile.in b/dlls/d3dx9_36/Makefile.in -index 24ce09daefa..6b78518dc71 100644 +index 6bb605d..74c8cae 100644 --- a/dlls/d3dx9_36/Makefile.in +++ b/dlls/d3dx9_36/Makefile.in -@@ -1,6 +1,6 @@ +@@ -1,7 +1,7 @@ + EXTRADEFS = -DD3DX_SDK_VERSION=36 MODULE = d3dx9_36.dll IMPORTLIB = d3dx9 -IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 @@ -364,10 +377,11 @@ index f2855e8ddb8..2be48dfddab 100644 check_release((IUnknown*)newsurf, 1); check_release((IUnknown*)tex, 0); diff --git a/dlls/d3dx9_37/Makefile.in b/dlls/d3dx9_37/Makefile.in -index 672878ff7e4..9eecd32899d 100644 +index 01df6b4..9aaf338 100644 --- a/dlls/d3dx9_37/Makefile.in +++ b/dlls/d3dx9_37/Makefile.in -@@ -1,5 +1,5 @@ +@@ -1,6 +1,6 @@ + EXTRADEFS = -DD3DX_SDK_VERSION=37 MODULE = d3dx9_37.dll -IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 +IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d @@ -375,10 +389,11 @@ index 672878ff7e4..9eecd32899d 100644 PARENTSRC = ../d3dx9_36 diff --git a/dlls/d3dx9_38/Makefile.in b/dlls/d3dx9_38/Makefile.in -index 0b537c66b68..6bb7bac0513 100644 +index 089abd5..86d9846 100644 --- a/dlls/d3dx9_38/Makefile.in +++ b/dlls/d3dx9_38/Makefile.in -@@ -1,5 +1,5 @@ +@@ -1,6 +1,6 @@ + EXTRADEFS = -DD3DX_SDK_VERSION=38 MODULE = d3dx9_38.dll -IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 +IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d @@ -386,10 +401,11 @@ index 0b537c66b68..6bb7bac0513 100644 PARENTSRC = ../d3dx9_36 diff --git a/dlls/d3dx9_39/Makefile.in b/dlls/d3dx9_39/Makefile.in -index 58d88f78abc..5d03e18feb3 100644 +index 21071cc..0431693 100644 --- a/dlls/d3dx9_39/Makefile.in +++ b/dlls/d3dx9_39/Makefile.in -@@ -1,5 +1,5 @@ +@@ -1,6 +1,6 @@ + EXTRADEFS = -DD3DX_SDK_VERSION=39 MODULE = d3dx9_39.dll -IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 +IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d @@ -397,10 +413,11 @@ index 58d88f78abc..5d03e18feb3 100644 PARENTSRC = ../d3dx9_36 diff --git a/dlls/d3dx9_40/Makefile.in b/dlls/d3dx9_40/Makefile.in -index a4417b5aa13..8982d4ec5e4 100644 +index 6f08759..ecb4af5 100644 --- a/dlls/d3dx9_40/Makefile.in +++ b/dlls/d3dx9_40/Makefile.in -@@ -1,5 +1,5 @@ +@@ -1,6 +1,6 @@ + EXTRADEFS = -DD3DX_SDK_VERSION=40 MODULE = d3dx9_40.dll -IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 +IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d From 8d07a09d37174b6c8f4f978cf73cad5849e2b4b2 Mon Sep 17 00:00:00 2001 From: gloriouseggroll Date: Mon, 19 Feb 2018 18:20:05 -0500 Subject: [PATCH 3/4] d3dx9_36-DXTn: fix makefile entries for missing d3dx9_41 42 43 --- .../0001-d3dx9_36-Add-dxtn-support.patch | 24 ++++++++++++------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/patches/d3dx9_36-DXTn/0001-d3dx9_36-Add-dxtn-support.patch b/patches/d3dx9_36-DXTn/0001-d3dx9_36-Add-dxtn-support.patch index 47cfd009..1549f38c 100644 --- a/patches/d3dx9_36-DXTn/0001-d3dx9_36-Add-dxtn-support.patch +++ b/patches/d3dx9_36-DXTn/0001-d3dx9_36-Add-dxtn-support.patch @@ -425,37 +425,43 @@ index 6f08759..ecb4af5 100644 PARENTSRC = ../d3dx9_36 diff --git a/dlls/d3dx9_41/Makefile.in b/dlls/d3dx9_41/Makefile.in -index 0463175210a..e9f3d657e6c 100644 +index d4552cf608..077dd8d378 100644 --- a/dlls/d3dx9_41/Makefile.in +++ b/dlls/d3dx9_41/Makefile.in -@@ -1,5 +1,5 @@ +@@ -1,6 +1,7 @@ + EXTRADEFS = -DD3DX_SDK_VERSION=41 MODULE = d3dx9_41.dll -IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 +IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d - EXTRADEFS = -D_D3DX9_VER=41 ++EXTRADEFS = -D_D3DX9_VER=41 PARENTSRC = ../d3dx9_36 + C_SRCS = \ diff --git a/dlls/d3dx9_42/Makefile.in b/dlls/d3dx9_42/Makefile.in -index 309324f4307..a55736d756f 100644 +index 5806fce66c..f8ab072d34 100644 --- a/dlls/d3dx9_42/Makefile.in +++ b/dlls/d3dx9_42/Makefile.in -@@ -1,5 +1,5 @@ +@@ -1,6 +1,7 @@ + EXTRADEFS = -DD3DX_SDK_VERSION=42 MODULE = d3dx9_42.dll -IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 +IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d - EXTRADEFS = -D_D3DX9_VER=42 ++EXTRADEFS = -D_D3DX9_VER=42 PARENTSRC = ../d3dx9_36 + C_SRCS = \ diff --git a/dlls/d3dx9_43/Makefile.in b/dlls/d3dx9_43/Makefile.in -index 9c1a87da600..c2e787c5836 100644 +index 72ba8b4c1e..b1c7c77740 100644 --- a/dlls/d3dx9_43/Makefile.in +++ b/dlls/d3dx9_43/Makefile.in -@@ -1,5 +1,5 @@ +@@ -1,6 +1,7 @@ + EXTRADEFS = -DD3DX_SDK_VERSION=43 MODULE = d3dx9_43.dll -IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 +IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d - EXTRADEFS = -D_D3DX9_VER=43 ++EXTRADEFS = -D_D3DX9_VER=43 PARENTSRC = ../d3dx9_36 + C_SRCS = \ -- 2.11.0 From 3954c8b1fa8f40498c4af4e36f2180866f558b5d Mon Sep 17 00:00:00 2001 From: gloriouseggroll Date: Mon, 19 Feb 2018 18:24:44 -0500 Subject: [PATCH 4/4] d3dx9_36-DXTn: fix makefile entries for missing d3dx9_41 42 43 - again --- .../0001-d3dx9_36-Add-dxtn-support.patch | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/patches/d3dx9_36-DXTn/0001-d3dx9_36-Add-dxtn-support.patch b/patches/d3dx9_36-DXTn/0001-d3dx9_36-Add-dxtn-support.patch index 1549f38c..ac0c035e 100644 --- a/patches/d3dx9_36-DXTn/0001-d3dx9_36-Add-dxtn-support.patch +++ b/patches/d3dx9_36-DXTn/0001-d3dx9_36-Add-dxtn-support.patch @@ -428,40 +428,37 @@ diff --git a/dlls/d3dx9_41/Makefile.in b/dlls/d3dx9_41/Makefile.in index d4552cf608..077dd8d378 100644 --- a/dlls/d3dx9_41/Makefile.in +++ b/dlls/d3dx9_41/Makefile.in -@@ -1,6 +1,7 @@ +@@ -1,6 +1,6 @@ EXTRADEFS = -DD3DX_SDK_VERSION=41 MODULE = d3dx9_41.dll -IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 +IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d -+EXTRADEFS = -D_D3DX9_VER=41 + EXTRADEFS = -D_D3DX9_VER=41 PARENTSRC = ../d3dx9_36 - C_SRCS = \ diff --git a/dlls/d3dx9_42/Makefile.in b/dlls/d3dx9_42/Makefile.in index 5806fce66c..f8ab072d34 100644 --- a/dlls/d3dx9_42/Makefile.in +++ b/dlls/d3dx9_42/Makefile.in -@@ -1,6 +1,7 @@ +@@ -1,6 +1,6 @@ EXTRADEFS = -DD3DX_SDK_VERSION=42 MODULE = d3dx9_42.dll -IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 +IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d -+EXTRADEFS = -D_D3DX9_VER=42 + EXTRADEFS = -D_D3DX9_VER=42 PARENTSRC = ../d3dx9_36 - C_SRCS = \ diff --git a/dlls/d3dx9_43/Makefile.in b/dlls/d3dx9_43/Makefile.in index 72ba8b4c1e..b1c7c77740 100644 --- a/dlls/d3dx9_43/Makefile.in +++ b/dlls/d3dx9_43/Makefile.in -@@ -1,6 +1,7 @@ +@@ -1,6 +1,6 @@ EXTRADEFS = -DD3DX_SDK_VERSION=43 MODULE = d3dx9_43.dll -IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 +IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d -+EXTRADEFS = -D_D3DX9_VER=43 + EXTRADEFS = -D_D3DX9_VER=43 PARENTSRC = ../d3dx9_36 - C_SRCS = \ -- 2.11.0