wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 5ec6b8f807f61ee77b9a96d94798c8e3f3db7af4

Browse Source
This commit is contained in:
Zebediah Figura
2018-02-21 21:27:12 -06:00
parent 7332557b2a
commit cf19a5d6d6
11 changed files with 107 additions and 451 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
patches/ddraw-Device_Caps/0001-ddraw-Don-t-set-HWTRANSFORMANDLIGHT-flag-on-d3d7-RGB.patch
View File

@@ -1,7 +1,8 @@
From 63d0af4a9607ae31514604032a5504457ad84097 Mon Sep 17 00:00:00 2001
From 980d867a89c72225b595b6e2a7313c1ddd42c9ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Sat, 6 Feb 2016 01:15:07 +0100
Subject: ddraw: Don't set HWTRANSFORMANDLIGHT flag on d3d7 RGB device.
Subject: [PATCH 1/3] ddraw: Don't set HWTRANSFORMANDLIGHT flag on d3d7 RGB
device.
---
dlls/ddraw/ddraw.c | 9 +++++++++
@@ -9,10 +10,10 @@ Subject: ddraw: Don't set HWTRANSFORMANDLIGHT flag on d3d7 RGB device.
2 files changed, 27 insertions(+)
diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c
index 89ce07a..64548a0 100644
index 97a11ef..9a19536 100644
--- a/dlls/ddraw/ddraw.c
+++ b/dlls/ddraw/ddraw.c
@@ -48,6 +48,7 @@ static struct enum_device_entry
@@ -50,6 +50,7 @@ static struct enum_device_entry
char interface_name[100];
char device_name[100];
const GUID *device_guid;
@@ -20,7 +21,7 @@ index 89ce07a..64548a0 100644
} device_list7[] =
{
/* T&L HAL device */
@@ -55,6 +56,7 @@ static struct enum_device_entry
@@ -57,6 +58,7 @@ static struct enum_device_entry
"WINE Direct3D7 Hardware Transform and Lighting acceleration using WineD3D",
"Wine D3D7 T&L HAL",
&IID_IDirect3DTnLHalDevice,
@@ -28,7 +29,7 @@ index 89ce07a..64548a0 100644
},
/* HAL device */
@@ -62,6 +64,7 @@ static struct enum_device_entry
@@ -64,6 +66,7 @@ static struct enum_device_entry
"WINE Direct3D7 Hardware acceleration using WineD3D",
"Direct3D HAL",
&IID_IDirect3DHALDevice,
@@ -36,7 +37,7 @@ index 89ce07a..64548a0 100644
},
/* RGB device */
@@ -69,6 +72,7 @@ static struct enum_device_entry
@@ -71,6 +74,7 @@ static struct enum_device_entry
"WINE Direct3D7 RGB Software Emulation using WineD3D",
"Wine D3D7 RGB",
&IID_IDirect3DRGBDevice,
@@ -44,7 +45,7 @@ index 89ce07a..64548a0 100644
},
};
@@ -3565,6 +3569,7 @@ static HRESULT WINAPI d3d7_EnumDevices(IDirect3D7 *iface, LPD3DENUMDEVICESCALLBA
@@ -3627,6 +3631,7 @@ static HRESULT WINAPI d3d7_EnumDevices(IDirect3D7 *iface, LPD3DENUMDEVICESCALLBA
{
struct ddraw *ddraw = impl_from_IDirect3D7(iface);
D3DDEVICEDESC7 device_desc7;
@@ -52,13 +53,13 @@ index 89ce07a..64548a0 100644
HRESULT hr;
size_t i;
@@ -3581,11 +3586,15 @@ static HRESULT WINAPI d3d7_EnumDevices(IDirect3D7 *iface, LPD3DENUMDEVICESCALLBA
@@ -3643,11 +3648,15 @@ static HRESULT WINAPI d3d7_EnumDevices(IDirect3D7 *iface, LPD3DENUMDEVICESCALLBA
return hr;
}
+ dev_caps = device_desc7.dwDevCaps;
+
for (i = 0; i < sizeof(device_list7)/sizeof(device_list7[0]); i++)
for (i = 0; i < ARRAY_SIZE(device_list7); i++)
{
HRESULT ret;
@@ -69,10 +70,10 @@ index 89ce07a..64548a0 100644
if (ret != DDENUMRET_OK)
{
diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c
index 34167c1..76dabee 100644
index 3f433a6..aa7214a 100644
--- a/dlls/ddraw/tests/ddraw7.c
+++ b/dlls/ddraw/tests/ddraw7.c
@@ -230,6 +230,19 @@ static HRESULT WINAPI enum_devtype_cb(char *desc_str, char *name, D3DDEVICEDESC7
@@ -311,6 +311,19 @@ static HRESULT WINAPI enum_devtype_cb(char *desc_str, char *name, D3DDEVICEDESC7
return DDENUMRET_OK;
}
@@ -92,7 +93,7 @@ index 34167c1..76dabee 100644
static IDirect3DDevice7 *create_device(HWND window, DWORD coop_level)
{
IDirectDrawSurface7 *surface, *ds;
@@ -240,6 +253,7 @@ static IDirect3DDevice7 *create_device(HWND window, DWORD coop_level)
@@ -321,6 +334,7 @@ static IDirect3DDevice7 *create_device(HWND window, DWORD coop_level)
IDirect3D7 *d3d7;
HRESULT hr;
BOOL hal_ok = FALSE;
@@ -100,7 +101,7 @@ index 34167c1..76dabee 100644
const GUID *devtype = &IID_IDirect3DHALDevice;
if (!(ddraw = create_ddraw()))
@@ -283,6 +297,10 @@ static IDirect3DDevice7 *create_device(HWND window, DWORD coop_level)
@@ -364,6 +378,10 @@ static IDirect3DDevice7 *create_device(HWND window, DWORD coop_level)
ok(SUCCEEDED(hr), "Failed to enumerate devices, hr %#x.\n", hr);
if (hal_ok) devtype = &IID_IDirect3DTnLHalDevice;
@@ -112,5 +113,5 @@ index 34167c1..76dabee 100644
hr = IDirect3D7_EnumZBufferFormats(d3d7, devtype, enum_z_fmt, &z_fmt);
if (FAILED(hr) || !z_fmt.dwSize)
--
2.7.0
2.7.4