mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2024-11-21 16:46:54 -08:00
Remove two more obsolete patches.
d3dx9 tests have all been fixed, and Wine no longer supports DOS executables.
This commit is contained in:
Zebediah Figura
parent
6a0ff5b96e
commit
11d0c892e2
@ -1,43 +0,0 @@
|
||||
From 227e86c26da931222508fab0b175db09ce1b4ce2 Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Lackner <sebastian@fds-team.de>
|
||||
Date: Sat, 6 May 2017 01:32:51 +0200
|
||||
Subject: d3dx9_36/tests: Fix some test failures.
|
||||
|
||||
---
|
||||
dlls/d3dx9_36/tests/math.c | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c
|
||||
index 0e9853abe38..8bc462c48a4 100644
|
||||
--- a/dlls/d3dx9_36/tests/math.c
|
||||
+++ b/dlls/d3dx9_36/tests/math.c
|
||||
@@ -244,7 +244,7 @@ static void D3DXColorTest(void)
|
||||
/*_______________D3DXColorLerp________________*/
|
||||
expected.r = 0.32f; expected.g = 0.69f; expected.b = 0.356f; expected.a = 0.897f;
|
||||
D3DXColorLerp(&got,&color,&color1,scale);
|
||||
- expect_color(&expected, &got, 0);
|
||||
+ expect_color(&expected, &got, 2);
|
||||
/* Test the NULL case */
|
||||
funcpointer = D3DXColorLerp(&got,NULL,&color1,scale);
|
||||
ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer);
|
||||
@@ -2994,7 +2994,7 @@ static void test_D3DXSHEvalDirectionalLight(void)
|
||||
expected = j + test[l].boffset;
|
||||
else
|
||||
expected = test[l].blue_out[startindex + j];
|
||||
- equal = compare_float(expected, blue_out[j], 4);
|
||||
+ equal = compare_float(expected, blue_out[j], 8);
|
||||
ok(equal, "Blue: case %u, order %u: expected[%u] = %.8e, received %.8e.\n",
|
||||
l, order, j, expected, blue_out[j]);
|
||||
}
|
||||
@@ -3339,7 +3339,7 @@ static void test_D3DXSHMultiply3(void)
|
||||
D3DXSHMultiply3(c, c, b);
|
||||
for (i = 0; i < ARRAY_SIZE(expected_aliased); ++i)
|
||||
{
|
||||
- equal = compare_float(c[i], expected_aliased[i], 32);
|
||||
+ equal = compare_float(c[i], expected_aliased[i], 64);
|
||||
ok(equal, "Expected[%u] = %.8e, received = %.8e.\n", i, expected_aliased[i], c[i]);
|
||||
}
|
||||
}
|
||||
--
|
||||
2.14.2
|
||||
|
||||
@ -1,25 +0,0 @@
|
||||
From 9b5bb1a278bbdf33a1402603bae315fabfa1d411 Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Lackner <sebastian@fds-team.de>
|
||||
Date: Mon, 9 Oct 2017 21:54:22 +0200
|
||||
Subject: ntdll: Fix code to make DOS area accessible.
|
||||
|
||||
---
|
||||
dlls/ntdll/virtual.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c
|
||||
index d28b138e575..3ae72af8cd9 100644
|
||||
--- a/dlls/ntdll/virtual.c
|
||||
+++ b/dlls/ntdll/virtual.c
|
||||
@@ -1622,7 +1622,7 @@ void virtual_init(void)
|
||||
|
||||
/* make the DOS area accessible (except the low 64K) to hide bugs in broken apps like Excel 2003 */
|
||||
size = (char *)address_space_start - (char *)0x10000;
|
||||
- if (size && wine_mmap_is_in_reserved_area( (void*)0x10000, size ) == 1)
|
||||
+ if (address_space_start > (void *)0x10000 && wine_mmap_is_in_reserved_area( (void *)0x10000, size ) == 1)
|
||||
wine_anon_mmap( (void *)0x10000, size, PROT_READ | PROT_WRITE, MAP_FIXED );
|
||||
}
|
||||
|
||||
--
|
||||
2.14.1
|
||||
|
||||
@ -134,7 +134,6 @@ patch_enable_all ()
|
||||
enable_d3dx9_36_Filter_Warnings="$1"
|
||||
enable_d3dx9_36_FindNextValidTechnique="$1"
|
||||
enable_d3dx9_36_Optimize_Inplace="$1"
|
||||
enable_d3dx9_36_Tests="$1"
|
||||
enable_d3dx9_36_Texture_Align="$1"
|
||||
enable_d3dx9_36_UpdateSkinnedMesh="$1"
|
||||
enable_dbghelp_Debug_Symbols="$1"
|
||||
@ -226,7 +225,6 @@ patch_enable_all ()
|
||||
enable_ntdll_ApiSetQueryApiSetPresence="$1"
|
||||
enable_ntdll_Builtin_Prot="$1"
|
||||
enable_ntdll_CriticalSection="$1"
|
||||
enable_ntdll_DOS_Area="$1"
|
||||
enable_ntdll_DOS_Attributes="$1"
|
||||
enable_ntdll_Dealloc_Thread_Stack="$1"
|
||||
enable_ntdll_DeviceType_Systemroot="$1"
|
||||
@ -645,9 +643,6 @@ patch_enable ()
|
||||
d3dx9_36-Optimize_Inplace)
|
||||
enable_d3dx9_36_Optimize_Inplace="$2"
|
||||
;;
|
||||
d3dx9_36-Tests)
|
||||
enable_d3dx9_36_Tests="$2"
|
||||
;;
|
||||
d3dx9_36-Texture_Align)
|
||||
enable_d3dx9_36_Texture_Align="$2"
|
||||
;;
|
||||
@ -921,9 +916,6 @@ patch_enable ()
|
||||
ntdll-CriticalSection)
|
||||
enable_ntdll_CriticalSection="$2"
|
||||
;;
|
||||
ntdll-DOS_Area)
|
||||
enable_ntdll_DOS_Area="$2"
|
||||
;;
|
||||
ntdll-DOS_Attributes)
|
||||
enable_ntdll_DOS_Attributes="$2"
|
||||
;;
|
||||
@ -4009,18 +4001,6 @@ if test "$enable_d3dx9_36_Optimize_Inplace" -eq 1; then
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset d3dx9_36-Tests
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/d3dx9_36/tests/math.c
|
||||
# |
|
||||
if test "$enable_d3dx9_36_Tests" -eq 1; then
|
||||
patch_apply d3dx9_36-Tests/0001-d3dx9_36-tests-Fix-some-test-failures.patch
|
||||
(
|
||||
printf '%s\n' '+ { "Sebastian Lackner", "d3dx9_36/tests: Fix some test failures.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset d3dx9_36-Texture_Align
|
||||
# |
|
||||
# | Modified files:
|
||||
@ -5618,18 +5598,6 @@ if test "$enable_ntdll_CriticalSection" -eq 1; then
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset ntdll-DOS_Area
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/ntdll/virtual.c
|
||||
# |
|
||||
if test "$enable_ntdll_DOS_Area" -eq 1; then
|
||||
patch_apply ntdll-DOS_Area/0001-ntdll-Fix-code-to-make-DOS-area-accessible.patch
|
||||
(
|
||||
printf '%s\n' '+ { "Sebastian Lackner", "ntdll: Fix code to make DOS area accessible.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset ntdll-DOS_Attributes
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user