From 4bc20dfb8ee08fdbc7330d91212d273eed9dc4e5 Mon Sep 17 00:00:00 2001 From: "Erich E. Hoover" Date: Mon, 11 Aug 2014 16:23:25 -0600 Subject: [PATCH] Removed patch to return empty D3D hardware flags for RGB device enumeration (accepted upstream). --- README.md | 1 - debian/changelog | 3 +- patches/Makefile | 20 ------ ...ve-broken-tests-of-D3DTRANSFORM_UNCL.patch | 29 -------- ...ty-D3D-hardware-flags-for-RGB-device.patch | 69 ------------------- patches/ddraw-Empty_Hardware_Flags/definition | 4 -- 6 files changed, 2 insertions(+), 124 deletions(-) delete mode 100644 patches/ddraw-Empty_Hardware_Flags/0001-ddraw-tests-Remove-broken-tests-of-D3DTRANSFORM_UNCL.patch delete mode 100644 patches/ddraw-Empty_Hardware_Flags/0002-ddraw-Return-empty-D3D-hardware-flags-for-RGB-device.patch delete mode 100644 patches/ddraw-Empty_Hardware_Flags/definition diff --git a/README.md b/README.md index a95ab36e..6b414aac 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,6 @@ Wine-Compholio contains fixes for the following Wine bugs: * Implement an Arial replacement font ([Wine Bug #32323](http://bugs.winehq.org/show_bug.cgi?id=32323 "Netflix (Silverlight 4.x) and several .NET Framework 3.x/4.0 WPF apps require either Arial or Verdana to be installed")) * Make it possible to change media center / tablet pc status ([Wine Bug #18732](http://bugs.winehq.org/show_bug.cgi?id=18732 "Microsoft Experience Pack for Tablet PC 1 refuses to install")) * Need for Speed 3 installer requires devices in HKEY_DYN_DATA ([Wine Bug #7115](http://bugs.winehq.org/show_bug.cgi?id=7115 "Need for Speed III installer fails in Win9X mode, reporting \"Could not get 'HardWareKey' value\" (active PnP device keys in 'HKEY_DYN_DATA\\\\Config Manager\\\\Enum' missing)")) -* Old games cannot locate software-only renderer ([Wine Bug #32581](http://bugs.winehq.org/show_bug.cgi?id=32581 "Invalid dwFlags of reference rasterizer's HAL D3DDEVICEDESC")) * Return correct IMediaSeeking stream positions in quartz ([Wine Bug #23174](http://bugs.winehq.org/show_bug.cgi?id=23174 "Fallout 3: Diologue and Video/sound issues")) * Set ldr.EntryPoint for main executable ([Wine Bug #33034](http://bugs.winehq.org/show_bug.cgi?id=33034 "Many GFWL (Games For Windows Live) 1.x/2.x/3.x games crash or exit silently on startup (DiRT 2/3, GTA IV Steam)")) * Support for AllocateAndGetTcpExTableFromStack ([Wine Bug #34372](http://bugs.winehq.org/show_bug.cgi?id=34372 "Add missing function AllocateAndGetTcpExTableFromStack() to iphlpapi.dll")) diff --git a/debian/changelog b/debian/changelog index a6a43bd0..1cbc81b9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,7 +2,8 @@ wine-compholio (1.7.25) UNRELEASED; urgency=low * Added patch with stub for DwmInvalidateIconicBitmaps. * Added Courier Prime (OFLv1.1) as a Courier New replacement. * Added patch to better detect broken nVidia RandR 1.2 support. - -- Erich E. Hoover Sat, 09 Aug 2014 16:35:03 -0600 + * Removed patch to return empty D3D hardware flags for RGB device enumeration (accepted upstream). + -- Erich E. Hoover Mon, 11 Aug 2014 16:21:22 -0600 wine-compholio (1.7.24) unstable; urgency=low * Various further improvements to the patch system. diff --git a/patches/Makefile b/patches/Makefile index 3f3dd14a..e64d8686 100644 --- a/patches/Makefile +++ b/patches/Makefile @@ -12,7 +12,6 @@ PATCHLIST := \ Pipelight.ok \ atl-IOCS_Property.ok \ comctl32-LoadIconMetric.ok \ - ddraw-Empty_Hardware_Flags.ok \ dsound-Fast_Mixer.ok \ dwmapi-Invalidate_Thumbnail.ok \ fonts-Missing_Fonts.ok \ @@ -155,25 +154,6 @@ comctl32-LoadIconMetric.ok: echo '+ { "comctl32-LoadIconMetric", "Michael Müller", "Implement LoadIconMetric function." },'; \ ) > comctl32-LoadIconMetric.ok -# Patchset ddraw-Empty_Hardware_Flags -# | -# | Included patches: -# | * Return empty D3D hardware flags for HEL device enumeration. [by Erich E. Hoover] -# | -# | This patchset fixes the following Wine bugs: -# | * [#32581] Invalid dwFlags of reference rasterizer's HAL D3DDEVICEDESC -# | -# | Modified files: -# | * dlls/ddraw/ddraw.c, dlls/ddraw/tests/d3d.c -# | -.INTERMEDIATE: ddraw-Empty_Hardware_Flags.ok -ddraw-Empty_Hardware_Flags.ok: - $(call APPLY_FILE,ddraw-Empty_Hardware_Flags/0001-ddraw-tests-Remove-broken-tests-of-D3DTRANSFORM_UNCL.patch) - $(call APPLY_FILE,ddraw-Empty_Hardware_Flags/0002-ddraw-Return-empty-D3D-hardware-flags-for-RGB-device.patch) - @( \ - echo '+ { "ddraw-Empty_Hardware_Flags", "Erich E. Hoover", "Return empty D3D hardware flags for HEL device enumeration." },'; \ - ) > ddraw-Empty_Hardware_Flags.ok - # Patchset dsound-Fast_Mixer # | # | Included patches: diff --git a/patches/ddraw-Empty_Hardware_Flags/0001-ddraw-tests-Remove-broken-tests-of-D3DTRANSFORM_UNCL.patch b/patches/ddraw-Empty_Hardware_Flags/0001-ddraw-tests-Remove-broken-tests-of-D3DTRANSFORM_UNCL.patch deleted file mode 100644 index 1f13b071..00000000 --- a/patches/ddraw-Empty_Hardware_Flags/0001-ddraw-tests-Remove-broken-tests-of-D3DTRANSFORM_UNCL.patch +++ /dev/null @@ -1,29 +0,0 @@ -From a88740c95d8250e95bf215169896c0eb54a7eb6c Mon Sep 17 00:00:00 2001 -From: "Erich E. Hoover" -Date: Sun, 16 Feb 2014 14:14:13 -0700 -Subject: ddraw/tests: Remove broken tests of D3DTRANSFORM_UNCLIPPED. - ---- - dlls/ddraw/tests/d3d.c | 6 ------ - 1 file changed, 6 deletions(-) - -diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c -index 209555a..35987cb 100644 ---- a/dlls/ddraw/tests/d3d.c -+++ b/dlls/ddraw/tests/d3d.c -@@ -1256,12 +1256,6 @@ static void Direct3D1Test(void) - out[i].x, out[i].y, out[i].z, out[i].rhw, - cmp[i].x, cmp[i].y, cmp[i].z, cmp[i].rhw); - } -- for(i = 0; i < sizeof(outH); i++) { -- if(((unsigned char *) outH)[i] != 0xcc) { -- ok(FALSE, "Homogeneous output was generated despite UNCLIPPED flag\n"); -- break; -- } -- } - - SET_VP_DATA(vp_data); - hr = IDirect3DViewport_SetViewport(Viewport, &vp_data); --- -1.7.9.5 - diff --git a/patches/ddraw-Empty_Hardware_Flags/0002-ddraw-Return-empty-D3D-hardware-flags-for-RGB-device.patch b/patches/ddraw-Empty_Hardware_Flags/0002-ddraw-Return-empty-D3D-hardware-flags-for-RGB-device.patch deleted file mode 100644 index e6424c68..00000000 --- a/patches/ddraw-Empty_Hardware_Flags/0002-ddraw-Return-empty-D3D-hardware-flags-for-RGB-device.patch +++ /dev/null @@ -1,69 +0,0 @@ -From 512926550611374900b9117f1c8c0da493b5a031 Mon Sep 17 00:00:00 2001 -From: "Erich E. Hoover" -Date: Sun, 16 Feb 2014 14:14:42 -0700 -Subject: ddraw: Return empty D3D hardware flags for RGB device enumeration. - ---- - dlls/ddraw/ddraw.c | 2 ++ - dlls/ddraw/tests/d3d.c | 12 ++++++++++++ - 2 files changed, 14 insertions(+) - -diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c -index 011c115..df74122 100644 ---- a/dlls/ddraw/ddraw.c -+++ b/dlls/ddraw/ddraw.c -@@ -3683,6 +3683,8 @@ static HRESULT WINAPI d3d3_EnumDevices(IDirect3D3 *iface, LPD3DENUMDEVICESCALLBA - | D3DPTEXTURECAPS_NONPOW2CONDITIONAL | D3DPTEXTURECAPS_PERSPECTIVE); - /* RGB, RAMP and MMX devices have a HAL dcmColorModel of 0 */ - hal_desc.dcmColorModel = 0; -+ /* RGB, RAMP and MMX devices cannot report HAL hardware flags */ -+ hal_desc.dwFlags = 0; - - hr = callback((GUID *)&IID_IDirect3DRGBDevice, reference_description, - device_name, &hal_desc, &hel_desc, context); -diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c -index 35987cb..64bd0b9 100644 ---- a/dlls/ddraw/tests/d3d.c -+++ b/dlls/ddraw/tests/d3d.c -@@ -537,12 +537,18 @@ static HRESULT WINAPI enumDevicesCallback(GUID *Guid, char *DeviceDescription, - - ok(hal->dcmColorModel == 0, "RGB Device %u hal caps has colormodel %u\n", ver, hal->dcmColorModel); - ok(hel->dcmColorModel == D3DCOLOR_RGB, "RGB Device %u hel caps has colormodel %u\n", ver, hel->dcmColorModel); -+ -+ ok(hal->dwFlags == 0, "RGB Device %u hal caps has hardware flags %x\n", ver, hal->dwFlags); -+ ok(hel->dwFlags != 0, "RGB Device %u hel caps has hardware flags %x\n", ver, hel->dwFlags); - } - else if(IsEqualGUID(&IID_IDirect3DHALDevice, Guid)) - { - trace("HAL Device %d\n", ver); - ok(hal->dcmColorModel == D3DCOLOR_RGB, "HAL Device %u hal caps has colormodel %u\n", ver, hel->dcmColorModel); - ok(hel->dcmColorModel == 0, "HAL Device %u hel caps has colormodel %u\n", ver, hel->dcmColorModel); -+ -+ ok(hal->dwFlags != 0, "HAL Device %u hal caps has hardware flags %x\n", ver, hal->dwFlags); -+ ok(hel->dwFlags != 0, "HAL Device %u hel caps has hardware flags %x\n", ver, hel->dwFlags); - } - else if(IsEqualGUID(&IID_IDirect3DRefDevice, Guid)) - { -@@ -587,6 +593,9 @@ static HRESULT WINAPI enumDevicesCallback(GUID *Guid, char *DeviceDescription, - ok(hal->dcmColorModel == 0, "Ramp Device %u hal caps has colormodel %u\n", ver, hal->dcmColorModel); - ok(hel->dcmColorModel == D3DCOLOR_MONO, "Ramp Device %u hel caps has colormodel %u\n", - ver, hel->dcmColorModel); -+ -+ ok(hal->dwFlags == 0, "Ramp Device %u hal caps has hardware flags %x\n", ver, hal->dwFlags); -+ ok(hel->dwFlags != 0, "Ramp Device %u hel caps has hardware flags %x\n", ver, hel->dwFlags); - } - else if(IsEqualGUID(&IID_IDirect3DMMXDevice, Guid)) - { -@@ -610,6 +619,9 @@ static HRESULT WINAPI enumDevicesCallback(GUID *Guid, char *DeviceDescription, - - ok(hal->dcmColorModel == 0, "MMX Device %u hal caps has colormodel %u\n", ver, hal->dcmColorModel); - ok(hel->dcmColorModel == D3DCOLOR_RGB, "MMX Device %u hel caps has colormodel %u\n", ver, hel->dcmColorModel); -+ -+ ok(hal->dwFlags == 0, "MMX Device %u hal caps has hardware flags %x\n", ver, hal->dwFlags); -+ ok(hel->dwFlags != 0, "MMX Device %u hel caps has hardware flags %x\n", ver, hel->dwFlags); - } - else - { --- -1.7.9.5 - diff --git a/patches/ddraw-Empty_Hardware_Flags/definition b/patches/ddraw-Empty_Hardware_Flags/definition deleted file mode 100644 index 5b6461e5..00000000 --- a/patches/ddraw-Empty_Hardware_Flags/definition +++ /dev/null @@ -1,4 +0,0 @@ -Author: Erich E. Hoover -Subject: Return empty D3D hardware flags for HEL device enumeration. -Revision: 1 -Fixes: [32581] Old games cannot locate software-only renderer