From: Elizabeth Figura zfigura@codeweavers.com
Based on a patch by Andrew D'Addesio.
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=19153 --- dlls/ddraw/ddraw.c | 4 ++-- dlls/ddraw/tests/ddraw1.c | 2 +- dlls/ddraw/tests/ddraw2.c | 2 +- dlls/ddraw/tests/ddraw4.c | 2 +- dlls/ddraw/tests/ddraw7.c | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index e1ef853f19f..5d0a582c8e3 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -54,7 +54,7 @@ static struct enum_device_entry { { "WINE Direct3D7 RGB Software Emulation using WineD3D", - "Wine D3D7 RGB", + "RGB Emulation", &IID_IDirect3DRGBDevice, D3DDEVCAPS_HWTRANSFORMANDLIGHT | D3DDEVCAPS_DRAWPRIMITIVES2EX | D3DDEVCAPS_HWRASTERIZATION, }, @@ -3882,7 +3882,7 @@ static HRESULT WINAPI d3d3_EnumDevices(IDirect3D3 *iface, LPD3DENUMDEVICESCALLBA * name string. Let's put the string in a sufficiently sized array in * writable memory. */ char device_name[50]; - strcpy(device_name,"Direct3D HEL"); + strcpy(device_name, "RGB Emulation");
TRACE("iface %p, callback %p, context %p.\n", iface, callback, context);
diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index b8716a1b956..a4a7ad2c423 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -15531,7 +15531,7 @@ static HRESULT WINAPI test_enum_devices_caps_callback(GUID *guid, char *device_d | D3DDEVCAPS_DRAWPRIMTLVERTEX;
todo_wine ok(enum_devices_index == 1, "Expected index %u.\n", enum_devices_index); - todo_wine ok(!strcmp(device_name, "RGB Emulation"), "Got name %s.\n", debugstr_a(device_name)); + ok(!strcmp(device_name, "RGB Emulation"), "Got name %s.\n", debugstr_a(device_name));
todo_wine ok(hel->dwFlags == hel_flags, "Got HEL flags %#lx.\n", hel->dwFlags); ok(hel->dcmColorModel == D3DCOLOR_RGB, "Got color model %#lx.\n", hel->dcmColorModel); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index f8dbc387475..045314b78ac 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -16534,7 +16534,7 @@ static HRESULT WINAPI test_enum_devices_caps_callback(GUID *guid, char *device_d | D3DDEVCAPS_DRAWPRIMTLVERTEX;
todo_wine ok(enum_devices_index == 1, "Expected index %u.\n", enum_devices_index); - todo_wine ok(!strcmp(device_name, "RGB Emulation"), "Got name %s.\n", debugstr_a(device_name)); + ok(!strcmp(device_name, "RGB Emulation"), "Got name %s.\n", debugstr_a(device_name));
todo_wine ok(hel->dwFlags == hel_flags, "Got HEL flags %#lx.\n", hel->dwFlags); ok(hel->dcmColorModel == D3DCOLOR_RGB, "Got color model %#lx.\n", hel->dcmColorModel); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index a6ea3231725..663dbeeb20c 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -19639,7 +19639,7 @@ static HRESULT WINAPI test_enum_devices_caps_callback(GUID *guid, char *device_d | D3DDEVCAPS_DRAWPRIMTLVERTEX;
ok(enum_devices_index == 0, "Expected index %u.\n", enum_devices_index); - todo_wine ok(!strcmp(device_name, "RGB Emulation"), "Got name %s.\n", debugstr_a(device_name)); + ok(!strcmp(device_name, "RGB Emulation"), "Got name %s.\n", debugstr_a(device_name));
ok(hel->dwFlags == hel_flags, "Got HEL flags %#lx.\n", hel->dwFlags); ok(hel->dcmColorModel == D3DCOLOR_RGB, "Got color model %#lx.\n", hel->dcmColorModel); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 1c84ce9333a..387db042766 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -19919,7 +19919,7 @@ static HRESULT WINAPI test_enum_devices_caps_callback(char *device_desc, char *d else if (IsEqualGUID(&device_desc7->deviceGUID, &IID_IDirect3DRGBDevice)) { ok(enum_devices_index == 0, "Expected index %u.\n", enum_devices_index); - todo_wine ok(!strcmp(device_name, "RGB Emulation"), "Got name %s.\n", debugstr_a(device_name)); + ok(!strcmp(device_name, "RGB Emulation"), "Got name %s.\n", debugstr_a(device_name));
ok((device_desc7->dwDevCaps & D3DDEVCAPS_HWTRANSFORMANDLIGHT) == 0, "RGB Device device caps has D3DDEVCAPS_HWTRANSFORMANDLIGHT set\n");