diff --git a/patches/d3drm-Specfile/0001-d3drm-Mark-DllCanUnloadNow-and-DllGetClassObject-as-.patch b/patches/d3drm-Specfile/0001-d3drm-Mark-DllCanUnloadNow-and-DllGetClassObject-as-.patch deleted file mode 100644 index 0cbae7c3..00000000 --- a/patches/d3drm-Specfile/0001-d3drm-Mark-DllCanUnloadNow-and-DllGetClassObject-as-.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 348d1eafe2d80017509ebfb79832a7465fd1693b Mon Sep 17 00:00:00 2001 -From: Amine Khaldi -Date: Sun, 22 Feb 2015 22:39:25 +0100 -Subject: d3drm: Mark DllCanUnloadNow and DllGetClassObject as private. - ---- - dlls/d3drm/d3drm.spec | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/dlls/d3drm/d3drm.spec b/dlls/d3drm/d3drm.spec -index 4108a72..e83fb0b 100644 ---- a/dlls/d3drm/d3drm.spec -+++ b/dlls/d3drm/d3drm.spec -@@ -19,5 +19,5 @@ - @ stdcall D3DRMVectorScale(ptr ptr float) - @ stdcall D3DRMVectorSubtract(ptr ptr ptr) - @ stdcall Direct3DRMCreate(ptr) --@ stub DllCanUnloadNow --@ stub DllGetClassObject -+@ stub -private DllCanUnloadNow -+@ stub -private DllGetClassObject --- -2.3.0 - diff --git a/patches/d3drm-Specfile/definition b/patches/d3drm-Specfile/definition deleted file mode 100644 index 5d05f260..00000000 --- a/patches/d3drm-Specfile/definition +++ /dev/null @@ -1 +0,0 @@ -Category: stable diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index e3a4f3ec..1abe40e8 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -55,7 +55,7 @@ version() echo "Copyright (C) 2014-2015 the Wine Staging project authors." echo "" echo "Patchset to be applied on upstream Wine:" - echo " commit f6653a93eb6796b733c6b0e9e289746692ab0a69" + echo " commit 71e5fdf478dbfb1821d4c39a55c3555cc8188741" echo "" } @@ -91,7 +91,6 @@ patch_enable_all () enable_d3d9_DesktopWindow="$1" enable_d3d9_Skip_Tests="$1" enable_d3d9_Surface_Refcount="$1" - enable_d3drm_Specfile="$1" enable_d3dx9_24_ID3DXEffect="$1" enable_d3dx9_25_ID3DXEffect="$1" enable_d3dx9_26_ID3DXEffect="$1" @@ -346,9 +345,6 @@ patch_enable () d3d9-Surface_Refcount) enable_d3d9_Surface_Refcount="$2" ;; - d3drm-Specfile) - enable_d3drm_Specfile="$2" - ;; d3dx9_24-ID3DXEffect) enable_d3dx9_24_ID3DXEffect="$2" ;; @@ -1294,9 +1290,6 @@ if test "$enable_category_stable" -eq 1; then if test "$enable_d3d9_Surface_Refcount" -gt 1; then abort "Patchset d3d9-Surface_Refcount disabled, but category-stable depends on that." fi - if test "$enable_d3drm_Specfile" -gt 1; then - abort "Patchset d3drm-Specfile disabled, but category-stable depends on that." - fi if test "$enable_d3dx9_24_ID3DXEffect" -gt 1; then abort "Patchset d3dx9_24-ID3DXEffect disabled, but category-stable depends on that." fi @@ -1523,7 +1516,6 @@ if test "$enable_category_stable" -eq 1; then enable_d3d11_D3D11CreateDeviceAndSwapChain=1 enable_d3d9_Skip_Tests=1 enable_d3d9_Surface_Refcount=1 - enable_d3drm_Specfile=1 enable_d3dx9_24_ID3DXEffect=1 enable_d3dx9_25_ID3DXEffect=1 enable_d3dx9_26_ID3DXEffect=1 @@ -2194,18 +2186,6 @@ if test "$enable_d3d9_Surface_Refcount" -eq 1; then ) >> "$patchlist" fi -# Patchset d3drm-Specfile -# | -# | Modified files: -# | * dlls/d3drm/d3drm.spec -# | -if test "$enable_d3drm_Specfile" -eq 1; then - patch_apply d3drm-Specfile/0001-d3drm-Mark-DllCanUnloadNow-and-DllGetClassObject-as-.patch - ( - echo '+ { "Amine Khaldi", "d3drm: Mark DllCanUnloadNow and DllGetClassObject as private.", 1 },'; - ) >> "$patchlist" -fi - # Patchset d3dx9_25-ID3DXEffect # | # | This patchset fixes the following Wine bugs: diff --git a/patches/wined3d-CSMT_Main/9999-IfDefined.patch b/patches/wined3d-CSMT_Main/9999-IfDefined.patch index 4c107493..0a7c6e25 100644 --- a/patches/wined3d-CSMT_Main/9999-IfDefined.patch +++ b/patches/wined3d-CSMT_Main/9999-IfDefined.patch @@ -1099,7 +1099,7 @@ diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c -@@ -3518,7 +3518,11 @@ +@@ -3523,7 +3523,11 @@ float y_offset = context->render_offscreen ? (center_offset - (2.0f * y) - h) / h : (center_offset - (2.0f * y) - h) / -h; @@ -1111,7 +1111,7 @@ diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c state->render_states[WINED3D_RS_ZENABLE] : WINED3D_ZB_FALSE; float z_scale = zenable ? 2.0f : 0.0f; float z_offset = zenable ? -1.0f : 0.0f; -@@ -3641,6 +3645,7 @@ +@@ -3646,6 +3650,7 @@ /* case WINED3D_TTFF_COUNT1: Won't ever get here. */ case WINED3D_TTFF_COUNT2: mat._13 = mat._23 = mat._33 = mat._43 = 0.0f; @@ -1119,7 +1119,7 @@ diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c /* OpenGL divides the first 3 vertex coord by the 4th by default, * which is essentially the same as D3DTTFF_PROJECTED. Make sure that * the 4th coord evaluates to 1.0 to eliminate that. -@@ -3653,6 +3658,20 @@ +@@ -3658,6 +3663,20 @@ * A more serious problem occurs if the app passes 4 coordinates in, and the * 4th is != 1.0(opengl default). This would have to be fixed in draw_strided_slow * or a replacement shader. */ @@ -1140,7 +1140,7 @@ diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c default: mat._14 = mat._24 = mat._34 = 0.0f; mat._44 = 1.0f; } -@@ -4108,7 +4127,11 @@ +@@ -4113,7 +4132,11 @@ unsigned int i; DWORD ttff; DWORD cop, aop, carg0, carg1, carg2, aarg0, aarg1, aarg2; @@ -9614,7 +9614,7 @@ diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c -@@ -5343,9 +5343,15 @@ +@@ -5353,9 +5353,15 @@ DebugBreak(); }