wine-commits June 2019

wine-commits@winehq.org

1 participants
865 discussions

Józef Kucia : vkd3d: Fix unbinding depth-stencil views.
by Alexandre Julliard 11 Jun '19

11 Jun '19

Module: vkd3d Branch: master Commit: bc8c07ffcc83881cd49e88bbb4d9bf76c85f6c84 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=bc8c07ffcc83881cd49e88b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jun 11 10:13:27 2019 +0200 vkd3d: Fix unbinding depth-stencil views. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/command.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index f66bbe9..0cbf0fb 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -4373,6 +4373,8 @@ static void STDMETHODCALLTYPE d3d12_command_list_OMSetRenderTargets(ID3D12Graphi list->fb_layer_count = max(list->fb_layer_count, rtv_desc->layer_count); } + list->dsv = VK_NULL_HANDLE; + list->dsv_format = VK_FORMAT_UNDEFINED; if (depth_stencil_descriptor) { if ((dsv_desc = d3d12_dsv_desc_from_cpu_handle(*depth_stencil_descriptor)) @@ -4397,8 +4399,6 @@ static void STDMETHODCALLTYPE d3d12_command_list_OMSetRenderTargets(ID3D12Graphi else { WARN("DSV descriptor is not initialized.\n"); - list->dsv = VK_NULL_HANDLE; - list->dsv_format = VK_FORMAT_UNDEFINED; } }

1 0

Alexandre Julliard : Wine release 4.10
by Alexandre Julliard 10 Jun '19

10 Jun '19

Module: website Branch: master Commit: f991d05514fa31644533165b8e3935cf182e3891 URL: https://source.winehq.org/git/website.git/?a=commit;h=f991d05514fa316445331… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 10 20:44:13 2019 +0200 Wine release 4.10 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2019061001.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2019061001.xml b/news/en/2019061001.xml new file mode 100644 index 0000000..0cbbbe7 --- /dev/null +++ b/news/en/2019061001.xml @@ -0,0 +1,16 @@ +<news> +<date>June 10, 2019</date> +<title>Wine 4.10 Released</title> +<body> + The Wine development release 4.10 is now available. + <a href="{$root}/announce/4.10">What's new</a> in this release: +<ul> + <li>Many DLLs are built as PE files by default.</li> + <li>More support for installing Plug and Play drivers.</li> + <li>Clock synchronization in Media Foundation.</li> + <li>Volume adjustment in audio drivers.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/4.x/wine-4.10.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-4.10 : Alexandre Julliard : Release 4.10
by Alexandre Julliard 10 Jun '19

10 Jun '19

Module: wine Branch: refs/tags/wine-4.10 Tag: a1261d3dbf6eeca9a1bc2194e315bacf02b23b79 URL: https://source.winehq.org/git/wine.git/?a=tag;h=a1261d3dbf6eeca9a1bc2194e31… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 10 20:42:11 2019 +0200 Release 4.10

1 0

Alexandre Julliard : Release 4.10.
by Alexandre Julliard 10 Jun '19

10 Jun '19

Module: wine Branch: master Commit: 78f74446b9806f63a27c2d643b8e29156b5bdcbe URL: https://source.winehq.org/git/wine.git/?a=commit;h=78f74446b9806f63a27c2d64… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 10 20:42:11 2019 +0200 Release 4.10. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 1030 +++++++++++++++++++++++++++++++++---------------------------- AUTHORS | 5 + VERSION | 2 +- configure | 18 +- 4 files changed, 577 insertions(+), 478 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=78f74446b9806f63a27c…

1 0

Alexey Prokhin : dinput/tests: Check path format of DIPROP_GUIDANDPATH property.
by Alexandre Julliard 10 Jun '19

10 Jun '19

Module: wine Branch: master Commit: 1235ad1932e717486e1af3e360d0f12043ebf860 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1235ad1932e717486e1af3e3… Author: Alexey Prokhin <alexey(a)prokhin.ru> Date: Wed Jun 5 00:53:48 2019 +0300 dinput/tests: Check path format of DIPROP_GUIDANDPATH property. Signed-off-by: Alexey Prokhin <alexey(a)prokhin.ru> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/joystick.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dlls/dinput/tests/joystick.c b/dlls/dinput/tests/joystick.c index f35b07e..f009ef3 100644 --- a/dlls/dinput/tests/joystick.c +++ b/dlls/dinput/tests/joystick.c @@ -404,6 +404,22 @@ static BOOL CALLBACK EnumJoysticks(const DIDEVICEINSTANCEA *lpddi, void *pvRef) hr = IDirectInputDevice_GetProperty(pJoystick, DIPROP_GUIDANDPATH, &dpg.diph); ok(SUCCEEDED(hr), "IDirectInput_GetProperty() for DIPROP_GUIDANDPATH failed: %08x\n", hr); + { + static const WCHAR formatW[] = {'\\','\\','?','\\','%','*','[','^','#',']','#','v','i','d','_', + '%','0','4','x','&','p','i','d','_','%','0','4','x',0}; + static const WCHAR miW[] = {'m','i','_',0}; + static const WCHAR igW[] = {'i','g','_',0}; + int vid, pid; + + _wcslwr(dpg.wszPath); + count = swscanf(dpg.wszPath, formatW, &vid, &pid); + ok(count == 2, "DIPROP_GUIDANDPATH path has wrong format. Expected count: 2 Got: %i Path: %s\n", + count, wine_dbgstr_w(dpg.wszPath)); + ok(wcsstr(dpg.wszPath, miW) != 0 || wcsstr(dpg.wszPath, igW) != 0, + "DIPROP_GUIDANDPATH path should contain either 'ig_' or 'mi_' substring. Path: %s\n", + wine_dbgstr_w(dpg.wszPath)); + } + hr = IDirectInputDevice_SetDataFormat(pJoystick, NULL); ok(hr==E_POINTER,"IDirectInputDevice_SetDataFormat() should have returned " "E_POINTER, returned: %08x\n", hr);

1 0

Alexey Prokhin : dinput/tests: Remove todo from DIPROP_GUIDANDPATH test.
by Alexandre Julliard 10 Jun '19

10 Jun '19

Module: wine Branch: master Commit: e2465fdb0a3385f7d47ace75d3c8480b4fb533a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e2465fdb0a3385f7d47ace75… Author: Alexey Prokhin <alexey(a)prokhin.ru> Date: Wed Jun 5 00:53:47 2019 +0300 dinput/tests: Remove todo from DIPROP_GUIDANDPATH test. Signed-off-by: Alexey Prokhin <alexey(a)prokhin.ru> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/joystick.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dinput/tests/joystick.c b/dlls/dinput/tests/joystick.c index c07e821..f35b07e 100644 --- a/dlls/dinput/tests/joystick.c +++ b/dlls/dinput/tests/joystick.c @@ -402,7 +402,7 @@ static BOOL CALLBACK EnumJoysticks(const DIDEVICEINSTANCEA *lpddi, void *pvRef) dpg.diph.dwHow = DIPH_DEVICE; hr = IDirectInputDevice_GetProperty(pJoystick, DIPROP_GUIDANDPATH, &dpg.diph); - todo_wine ok(SUCCEEDED(hr), "IDirectInput_GetProperty() for DIPROP_GUIDANDPATH failed: %08x\n", hr); + ok(SUCCEEDED(hr), "IDirectInput_GetProperty() for DIPROP_GUIDANDPATH failed: %08x\n", hr); hr = IDirectInputDevice_SetDataFormat(pJoystick, NULL); ok(hr==E_POINTER,"IDirectInputDevice_SetDataFormat() should have returned "

1 0

Alexey Prokhin : dinput: Return fake DIPROP_GUIDANDPATH property for OSX joysticks.
by Alexandre Julliard 10 Jun '19

10 Jun '19

Module: wine Branch: master Commit: f55ce610b214603807008d7314a5fe723c8f1934 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f55ce610b214603807008d73… Author: Alexey Prokhin <alexey(a)prokhin.ru> Date: Wed Jun 5 00:53:46 2019 +0300 dinput: Return fake DIPROP_GUIDANDPATH property for OSX joysticks. Signed-off-by: Alexey Prokhin <alexey(a)prokhin.ru> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_osx.c | 57 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 55 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/joystick_osx.c b/dlls/dinput/joystick_osx.c index ba3d56d..884dd7f 100644 --- a/dlls/dinput/joystick_osx.c +++ b/dlls/dinput/joystick_osx.c @@ -85,6 +85,7 @@ #include "winbase.h" #include "winerror.h" #include "winreg.h" +#include "devguid.h" #include "dinput.h" #include "dinput_private.h" @@ -124,6 +125,11 @@ static inline JoystickImpl *impl_from_IDirectInputDevice8W(IDirectInputDevice8W JoystickGenericImpl, base), JoystickImpl, generic); } +static inline IDirectInputDevice8W *IDirectInputDevice8W_from_impl(JoystickImpl *This) +{ + return &This->generic.base.IDirectInputDevice8W_iface; +} + typedef struct _EffectImpl { IDirectInputEffect IDirectInputEffect_iface; LONG ref; @@ -1348,6 +1354,53 @@ static HRESULT joydev_create_device(IDirectInputImpl *dinput, REFGUID rguid, REF return DIERR_DEVICENOTREG; } +static HRESULT WINAPI JoystickWImpl_GetProperty(LPDIRECTINPUTDEVICE8W iface, REFGUID rguid, LPDIPROPHEADER pdiph) +{ + JoystickImpl *This = impl_from_IDirectInputDevice8W(iface); + + TRACE("(%p)->(%s,%p)\n", This, debugstr_guid(rguid), pdiph); + _dump_DIPROPHEADER(pdiph); + + if (!IS_DIPROP(rguid)) return DI_OK; + + switch (LOWORD(rguid)) { + case (DWORD_PTR) DIPROP_GUIDANDPATH: + { + static const WCHAR formatW[] = {'\\','\\','?','\\','h','i','d','#','v','i','d','_','%','0','4','x','&', + 'p','i','d','_','%','0','4','x','&','%','s','_','%','i',0}; + static const WCHAR miW[] = {'m','i',0}; + static const WCHAR igW[] = {'i','g',0}; + + BOOL is_gamepad; + IOHIDDeviceRef device = get_device_ref(This->id); + LPDIPROPGUIDANDPATH pd = (LPDIPROPGUIDANDPATH)pdiph; + WORD vid = get_device_property_long(device, CFSTR(kIOHIDVendorIDKey)); + WORD pid = get_device_property_long(device, CFSTR(kIOHIDProductIDKey)); + + if (!pid || !vid) + return DIERR_UNSUPPORTED; + + is_gamepad = is_xinput_device(&This->generic.devcaps, vid, pid); + pd->guidClass = GUID_DEVCLASS_HIDCLASS; + sprintfW(pd->wszPath, formatW, vid, pid, is_gamepad ? igW : miW, This->id); + + TRACE("DIPROP_GUIDANDPATH(%s, %s): returning fake path\n", debugstr_guid(&pd->guidClass), debugstr_w(pd->wszPath)); + break; + } + + default: + return JoystickWGenericImpl_GetProperty(iface, rguid, pdiph); + } + + return DI_OK; +} + +static HRESULT WINAPI JoystickAImpl_GetProperty(LPDIRECTINPUTDEVICE8A iface, REFGUID rguid, LPDIPROPHEADER pdiph) +{ + JoystickImpl *This = impl_from_IDirectInputDevice8A(iface); + return JoystickWImpl_GetProperty(IDirectInputDevice8W_from_impl(This), rguid, pdiph); +} + static HRESULT osx_set_autocenter(JoystickImpl *This, const DIPROPDWORD *header) { @@ -1530,7 +1583,7 @@ static const IDirectInputDevice8AVtbl JoystickAvt = IDirectInputDevice2AImpl_Release, JoystickAGenericImpl_GetCapabilities, IDirectInputDevice2AImpl_EnumObjects, - JoystickAGenericImpl_GetProperty, + JoystickAImpl_GetProperty, JoystickAImpl_SetProperty, IDirectInputDevice2AImpl_Acquire, IDirectInputDevice2AImpl_Unacquire, @@ -1566,7 +1619,7 @@ static const IDirectInputDevice8WVtbl JoystickWvt = IDirectInputDevice2WImpl_Release, JoystickWGenericImpl_GetCapabilities, IDirectInputDevice2WImpl_EnumObjects, - JoystickWGenericImpl_GetProperty, + JoystickWImpl_GetProperty, JoystickWImpl_SetProperty, IDirectInputDevice2WImpl_Acquire, IDirectInputDevice2WImpl_Unacquire,

1 0

Alexey Prokhin : dinput: Return fake DIPROP_GUIDANDPATH property for linux input joysticks.
by Alexandre Julliard 10 Jun '19

10 Jun '19

Module: wine Branch: master Commit: 2bcdf8b73b9a4a37251fb34484202459ccfe4ff2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2bcdf8b73b9a4a37251fb344… Author: Alexey Prokhin <alexey(a)prokhin.ru> Date: Wed Jun 5 00:53:45 2019 +0300 dinput: Return fake DIPROP_GUIDANDPATH property for linux input joysticks. Signed-off-by: Alexey Prokhin <alexey(a)prokhin.ru> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_linuxinput.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index fdfbc7f..e3371b9 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -57,6 +57,7 @@ #include "winbase.h" #include "winerror.h" #include "winreg.h" +#include "devguid.h" #include "dinput.h" #include "dinput_private.h" @@ -1034,6 +1035,29 @@ static HRESULT WINAPI JoystickWImpl_GetProperty(LPDIRECTINPUTDEVICE8W iface, REF break; } + case (DWORD_PTR) DIPROP_GUIDANDPATH: + { + static const WCHAR formatW[] = {'\\','\\','?','\\','h','i','d','#','v','i','d','_','%','0','4','x','&', + 'p','i','d','_','%','0','4','x','&','%','s','_','%','h','u',0}; + static const WCHAR miW[] = {'m','i',0}; + static const WCHAR igW[] = {'i','g',0}; + + BOOL is_gamepad; + LPDIPROPGUIDANDPATH pd = (LPDIPROPGUIDANDPATH)pdiph; + WORD vid = This->joydev->vendor_id; + WORD pid = This->joydev->product_id; + + if (!pid || !vid) + return DIERR_UNSUPPORTED; + + is_gamepad = is_xinput_device(&This->generic.devcaps, vid, pid); + pd->guidClass = GUID_DEVCLASS_HIDCLASS; + sprintfW(pd->wszPath, formatW, vid, pid, is_gamepad ? igW : miW, get_joystick_index(&This->generic.base.guid)); + + TRACE("DIPROP_GUIDANDPATH(%s, %s): returning fake path\n", debugstr_guid(&pd->guidClass), debugstr_w(pd->wszPath)); + break; + } + default: return JoystickWGenericImpl_GetProperty(iface, rguid, pdiph); }

1 0

Alexey Prokhin : dinput: Return fake DIPROP_GUIDANDPATH property for linux joysticks.
by Alexandre Julliard 10 Jun '19

10 Jun '19

Module: wine Branch: master Commit: 16a11d0c90237e8d7a2e2c8eb93f36f03926b8e0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=16a11d0c90237e8d7a2e2c8e… Author: Alexey Prokhin <alexey(a)prokhin.ru> Date: Wed Jun 5 00:53:44 2019 +0300 dinput: Return fake DIPROP_GUIDANDPATH property for linux joysticks. Some Ubisoft titles use the property to check if a dinput gamepad is also an xinput device. Signed-off-by: Alexey Prokhin <alexey(a)prokhin.ru> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/dinput_main.c | 1 + dlls/dinput/joystick.c | 31 +++++++++++++++++++++++++++++++ dlls/dinput/joystick_linux.c | 24 ++++++++++++++++++++++++ dlls/dinput/joystick_private.h | 1 + 4 files changed, 57 insertions(+) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index a690505..0855cb4 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -48,6 +48,7 @@ #include "objbase.h" #include "rpcproxy.h" #include "initguid.h" +#include "devguid.h" #include "dinput_private.h" #include "device_private.h" #include "dinputd.h" diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c index f758092..433348c 100644 --- a/dlls/dinput/joystick.c +++ b/dlls/dinput/joystick.c @@ -34,6 +34,24 @@ WINE_DEFAULT_DEBUG_CHANNEL(dinput); +#define VID_MICROSOFT 0x045e + +static const WORD PID_XBOX_CONTROLLERS[] = { + 0x0202, /* Xbox Controller */ + 0x0285, /* Xbox Controller S */ + 0x0289, /* Xbox Controller S */ + 0x028e, /* Xbox360 Controller */ + 0x028f, /* Xbox360 Wireless Controller */ + 0x02d1, /* Xbox One Controller */ + 0x02dd, /* Xbox One Controller (Covert Forces/Firmware 2015) */ + 0x02e0, /* Xbox One X Controller */ + 0x02e3, /* Xbox One Elite Controller */ + 0x02e6, /* Wireless XBox Controller Dongle */ + 0x02ea, /* Xbox One S Controller */ + 0x02fd, /* Xbox One S Controller (Firmware 2017) */ + 0x0719, /* Xbox 360 Wireless Adapter */ +}; + static inline JoystickGenericImpl *impl_from_IDirectInputDevice8A(IDirectInputDevice8A *iface) { return CONTAINING_RECORD(CONTAINING_RECORD(iface, IDirectInputDeviceImpl, IDirectInputDevice8A_iface), JoystickGenericImpl, base); @@ -281,6 +299,19 @@ BOOL device_disabled_registry(const char* name) return do_disable; } +BOOL is_xinput_device(const DIDEVCAPS *devcaps, WORD vid, WORD pid) +{ + int i; + + if (vid == VID_MICROSOFT) + { + for (i = 0; i < ARRAY_SIZE(PID_XBOX_CONTROLLERS); i++) + if (pid == PID_XBOX_CONTROLLERS[i]) return TRUE; + } + + return (devcaps->dwAxes == 6 && devcaps->dwButtons >= 14); +} + /****************************************************************************** * SetProperty : change input device properties */ diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index 2480bc2..7e01f90 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -59,6 +59,7 @@ #include "windef.h" #include "winbase.h" #include "winerror.h" +#include "devguid.h" #include "dinput.h" #include "dinput_private.h" @@ -742,6 +743,29 @@ static HRESULT WINAPI JoystickLinuxWImpl_GetProperty(LPDIRECTINPUTDEVICE8W iface break; } + case (DWORD_PTR) DIPROP_GUIDANDPATH: + { + static const WCHAR formatW[] = {'\\','\\','?','\\','h','i','d','#','v','i','d','_','%','0','4','x','&', + 'p','i','d','_','%','0','4','x','&','%','s','_','%','h','u',0}; + static const WCHAR miW[] = {'m','i',0}; + static const WCHAR igW[] = {'i','g',0}; + + BOOL is_gamepad; + LPDIPROPGUIDANDPATH pd = (LPDIPROPGUIDANDPATH)pdiph; + WORD vid = This->joydev->vendor_id; + WORD pid = This->joydev->product_id; + + if (!pid || !vid) + return DIERR_UNSUPPORTED; + + is_gamepad = is_xinput_device(&This->generic.devcaps, vid, pid); + pd->guidClass = GUID_DEVCLASS_HIDCLASS; + sprintfW(pd->wszPath, formatW, vid, pid, is_gamepad ? igW : miW, get_joystick_index(&This->generic.base.guid)); + + TRACE("DIPROP_GUIDANDPATH(%s, %s): returning fake path\n", debugstr_guid(&pd->guidClass), debugstr_w(pd->wszPath)); + break; + } + default: return JoystickWGenericImpl_GetProperty(iface, rguid, pdiph); } diff --git a/dlls/dinput/joystick_private.h b/dlls/dinput/joystick_private.h index e758cac..b786c84 100644 --- a/dlls/dinput/joystick_private.h +++ b/dlls/dinput/joystick_private.h @@ -96,5 +96,6 @@ HRESULT WINAPI JoystickWGenericImpl_SetActionMap(LPDIRECTINPUTDEVICE8W iface, LP DWORD typeFromGUID(REFGUID guid) DECLSPEC_HIDDEN; void dump_DIEFFECT(LPCDIEFFECT eff, REFGUID guid, DWORD dwFlags) DECLSPEC_HIDDEN; +BOOL is_xinput_device(const DIDEVCAPS *devcaps, WORD vid, WORD pid) DECLSPEC_HIDDEN; #endif /* __WINE_DLLS_DINPUT_JOYSTICK_PRIVATE_H */

1 0

Paul Gofman : ddraw/tests: Fix test failures in test_lighting() on some of WARP drivers for ddraw7.
by Alexandre Julliard 10 Jun '19

10 Jun '19

Module: wine Branch: master Commit: 89ded2a95645149d801a0904417b4a59c87c1884 URL: https://source.winehq.org/git/wine.git/?a=commit;h=89ded2a95645149d801a0904… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Mon Jun 10 13:40:12 2019 +0300 ddraw/tests: Fix test failures in test_lighting() on some of WARP drivers for ddraw7. Currently fails on w1064v1507 test machine. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw7.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index e1e3330..e8c36dc 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -3842,6 +3842,7 @@ static void test_lighting(void) ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DVertexBuffer7_ProcessVertices(dst_vb, D3DVOP_TRANSFORM, 2, 1, src_vb2, 0, device, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice7_DrawIndexedPrimitive(device, D3DPT_TRIANGLELIST, nfvf, unlitnquad, 4, indices, 6, 0); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); @@ -3850,6 +3851,7 @@ static void test_lighting(void) ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DVertexBuffer7_ProcessVertices(dst_vb, D3DVOP_TRANSFORM | D3DVOP_LIGHT, 3, 1, src_vb2, 1, device, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice7_DrawIndexedPrimitive(device, D3DPT_TRIANGLELIST, nfvf, litnquad, 4, indices, 6, 0); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); @@ -3868,7 +3870,7 @@ static void test_lighting(void) "Unexpected specular color 0x%08x.\n", dst_data[0].specular); color = get_surface_color(rt, 160, 120); /* Broken on some of WARP drivers. */ - ok(color == 0x00000000 || broken(is_warp && color == 0x000000ff), + ok(color == 0x00000000 || broken(is_warp && (color == 0x000000ff || color == 0x00ff00ff)), "Lit quad without normals has color 0x%08x, expected 0x00000000.\n", color); ok(dst_data[1].diffuse == 0xff000000, "Lit quad without normals has color 0x%08x, expected 0xff000000.\n", dst_data[1].diffuse); @@ -3881,7 +3883,7 @@ static void test_lighting(void) ok(!dst_data[2].specular, "Unexpected specular color 0x%08x.\n", dst_data[2].specular); color = get_surface_color(rt, 480, 120); - ok(color == 0x00000000 || broken(is_warp && color == 0x000000ff), + ok(color == 0x00000000 || broken(is_warp && (color == 0x000000ff || color == 0x00ff00ff)), "Lit quad with normals has color 0x%08x, expected 0x00000000.\n", color); ok(dst_data[3].diffuse == 0xff000000, "Lit quad with normals has color 0x%08x, expected 0xff000000.\n", dst_data[3].diffuse); @@ -3926,7 +3928,7 @@ static void test_lighting(void) ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); color = get_surface_color(rt, 320, 240); - ok(color == tests[i].expected || broken(is_warp && color == 0x000000ff), + ok(color == tests[i].expected || broken(is_warp && (color == 0x000000ff || color == 0x00ff00ff)), "%s has color 0x%08x.\n", tests[i].message, color); todo_wine_if(tests[i].process_vertices_todo) ok(dst_data[0].diffuse == tests[i].expected_process_vertices,

1 0

← Newer
1
...
60
61
62
63
64
65
66
...
87
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2019