September 2018 - Wine-commits

Henri Verbeet : ddraw: Ignore the colour model in d3d3_FindDevice().
by Alexandre Julliard 11 Sep '18

11 Sep '18

Module: wine Branch: master Commit: 29b794dcca5ac0fe6391588dafee46b6e0a4f45a URL: https://source.winehq.org/git/wine.git/?a=commit;h=29b794dcca5ac0fe6391588d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 11 18:57:26 2018 +0430 ddraw: Ignore the colour model in d3d3_FindDevice(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw.c | 8 ++------ dlls/ddraw/tests/ddraw1.c | 2 +- dlls/ddraw/tests/ddraw2.c | 2 +- dlls/ddraw/tests/ddraw4.c | 2 +- 4 files changed, 5 insertions(+), 9 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index e60c5f3..e5f1e4f 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -4049,12 +4049,8 @@ static HRESULT WINAPI d3d3_FindDevice(IDirect3D3 *iface, D3DFINDDEVICESEARCH *fd || fdr->dwSize != sizeof(D3DFINDDEVICERESULT)) return DDERR_INVALIDPARAMS; - if ((fds->dwFlags & D3DFDS_COLORMODEL) - && fds->dcmColorModel != D3DCOLOR_RGB) - { - WARN("Trying to request a non-RGB D3D color model. Not supported.\n"); - return DDERR_INVALIDPARAMS; /* No real idea what to return here :-) */ - } + if (fds->dwFlags & D3DFDS_COLORMODEL) + WARN("Ignoring colour model %#x.\n", fds->dcmColorModel); if (fds->dwFlags & D3DFDS_GUID) { diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 641847a..b8dafdb 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -11812,7 +11812,7 @@ static void test_find_device(void) search.dcmColorModel = 0xdeadbeef; result.dwSize = sizeof(result); hr = IDirect3D_FindDevice(d3d, &search, &result); - todo_wine ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); IDirect3D_Release(d3d); IDirectDraw_Release(ddraw); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 02f430a..762b4d9 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -13094,7 +13094,7 @@ static void test_find_device(void) search.dcmColorModel = 0xdeadbeef; result.dwSize = sizeof(result); hr = IDirect3D2_FindDevice(d3d, &search, &result); - todo_wine ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); IDirect3D2_Release(d3d); IDirectDraw2_Release(ddraw); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 942d025..337ccb0 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -15186,7 +15186,7 @@ static void test_find_device(void) search.dcmColorModel = 0xdeadbeef; result.dwSize = sizeof(result); hr = IDirect3D3_FindDevice(d3d, &search, &result); - todo_wine ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); IDirect3D3_Release(d3d); IDirectDraw4_Release(ddraw);

1 0

Henri Verbeet : ddraw: Find the correct GUIDs for each D3D version in FindDevice().
by Alexandre Julliard 11 Sep '18

11 Sep '18

Module: wine Branch: master Commit: 8577ff54adeb510209242e4092c5394acaf0051c URL: https://source.winehq.org/git/wine.git/?a=commit;h=8577ff54adeb510209242e40… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 11 18:57:27 2018 +0430 ddraw: Find the correct GUIDs for each D3D version in FindDevice(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw.c | 83 ++++++++++++++++++++++++++++++----------------- dlls/ddraw/tests/ddraw1.c | 6 ++-- dlls/ddraw/tests/ddraw2.c | 8 ++--- 3 files changed, 59 insertions(+), 38 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index e5f1e4f..170a549 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -4018,35 +4018,20 @@ static HRESULT WINAPI d3d1_CreateViewport(IDirect3D *iface, IDirect3DViewport ** outer_unknown); } -/***************************************************************************** - * IDirect3D3::FindDevice - * - * This method finds a device with the requested properties and returns a - * device description - * - * Versions 1, 2 and 3 - * Params: - * fds: Describes the requested device characteristics - * fdr: Returns the device description - * - * Returns: - * D3D_OK on success - * DDERR_INVALIDPARAMS if no device was found - * - *****************************************************************************/ -static HRESULT WINAPI d3d3_FindDevice(IDirect3D3 *iface, D3DFINDDEVICESEARCH *fds, D3DFINDDEVICERESULT *fdr) +static HRESULT ddraw_find_device(struct ddraw *ddraw, const D3DFINDDEVICESEARCH *fds, D3DFINDDEVICERESULT *fdr, + unsigned int guid_count, const GUID * const *guids) { - struct ddraw *ddraw = impl_from_IDirect3D3(iface); D3DDEVICEDESC7 desc7; D3DDEVICEDESC desc1; + unsigned int i; HRESULT hr; - TRACE("iface %p, fds %p, fdr %p.\n", iface, fds, fdr); + TRACE("ddraw %p, fds %p, fdr %p, guid_count %u, guids %p.\n", ddraw, fds, fdr, guid_count, guids); - if (!fds || !fdr) return DDERR_INVALIDPARAMS; + if (!fds || !fdr) + return DDERR_INVALIDPARAMS; - if (fds->dwSize != sizeof(D3DFINDDEVICESEARCH) - || fdr->dwSize != sizeof(D3DFINDDEVICERESULT)) + if (fds->dwSize != sizeof(*fds) || fdr->dwSize != sizeof(*fdr)) return DDERR_INVALIDPARAMS; if (fds->dwFlags & D3DFDS_COLORMODEL) @@ -4054,12 +4039,22 @@ static HRESULT WINAPI d3d3_FindDevice(IDirect3D3 *iface, D3DFINDDEVICESEARCH *fd if (fds->dwFlags & D3DFDS_GUID) { - TRACE("Trying to match guid %s.\n", debugstr_guid(&(fds->guid))); - if (!IsEqualGUID(&IID_D3DDEVICE_WineD3D, &fds->guid) - && !IsEqualGUID(&IID_IDirect3DHALDevice, &fds->guid) - && !IsEqualGUID(&IID_IDirect3DRGBDevice, &fds->guid)) + BOOL found = FALSE; + + TRACE("Trying to match GUID %s.\n", debugstr_guid(&fds->guid)); + + for (i = 0; i < guid_count; ++i) + { + if (IsEqualGUID(guids[i], &fds->guid)) + { + found = TRUE; + break; + } + } + + if (!found) { - WARN("No match for this GUID.\n"); + WARN("Failed to match GUID %s.\n", debugstr_guid(&fds->guid)); return DDERR_NOTFOUND; } } @@ -4079,22 +4074,52 @@ static HRESULT WINAPI d3d3_FindDevice(IDirect3D3 *iface, D3DFINDDEVICESEARCH *fd return D3D_OK; } +static HRESULT WINAPI d3d3_FindDevice(IDirect3D3 *iface, D3DFINDDEVICESEARCH *fds, D3DFINDDEVICERESULT *fdr) +{ + struct ddraw *ddraw = impl_from_IDirect3D3(iface); + static const GUID * const guids[] = + { + &IID_D3DDEVICE_WineD3D, + &IID_IDirect3DHALDevice, + &IID_IDirect3DRGBDevice, + }; + + TRACE("iface %p, fds %p, fdr %p.\n", iface, fds, fdr); + + return ddraw_find_device(ddraw, fds, fdr, ARRAY_SIZE(guids), guids); +} + static HRESULT WINAPI d3d2_FindDevice(IDirect3D2 *iface, D3DFINDDEVICESEARCH *fds, D3DFINDDEVICERESULT *fdr) { struct ddraw *ddraw = impl_from_IDirect3D2(iface); + static const GUID * const guids[] = + { + &IID_D3DDEVICE_WineD3D, + &IID_IDirect3DHALDevice, + &IID_IDirect3DMMXDevice, + &IID_IDirect3DRGBDevice, + &IID_IDirect3DRampDevice, + }; TRACE("iface %p, fds %p, fdr %p.\n", iface, fds, fdr); - return d3d3_FindDevice(&ddraw->IDirect3D3_iface, fds, fdr); + return ddraw_find_device(ddraw, fds, fdr, ARRAY_SIZE(guids), guids); } static HRESULT WINAPI d3d1_FindDevice(IDirect3D *iface, D3DFINDDEVICESEARCH *fds, D3DFINDDEVICERESULT *fdr) { struct ddraw *ddraw = impl_from_IDirect3D(iface); + static const GUID * const guids[] = + { + &IID_D3DDEVICE_WineD3D, + &IID_IDirect3DHALDevice, + &IID_IDirect3DRGBDevice, + &IID_IDirect3DRampDevice, + }; TRACE("iface %p, fds %p, fdr %p.\n", iface, fds, fdr); - return d3d3_FindDevice(&ddraw->IDirect3D3_iface, fds, fdr); + return ddraw_find_device(ddraw, fds, fdr, ARRAY_SIZE(guids), guids); } /***************************************************************************** diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index b8dafdb..ba9f128 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -11728,12 +11728,11 @@ static void test_find_device(void) { const GUID *guid; HRESULT hr; - BOOL todo; } tests[] = { {&IID_IDirect3D, DDERR_NOTFOUND}, - {&IID_IDirect3DRampDevice, D3D_OK, TRUE}, + {&IID_IDirect3DRampDevice, D3D_OK}, {&IID_IDirect3DRGBDevice, D3D_OK}, {&IID_IDirect3DMMXDevice, DDERR_NOTFOUND}, {&IID_IDirect3DRefDevice, DDERR_NOTFOUND}, @@ -11784,8 +11783,7 @@ static void test_find_device(void) result.dwSize = sizeof(result); hr = IDirect3D_FindDevice(d3d, &search, &result); - todo_wine_if(tests[i].todo) - ok(hr == tests[i].hr, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == tests[i].hr, "Test %u: Got unexpected hr %#x.\n", i, hr); ok(result.dwSize == sizeof(result), "Test %u: Got unexpected result size %u.\n", i, result.dwSize); } diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 762b4d9..b5739c3 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -13010,14 +13010,13 @@ static void test_find_device(void) { const GUID *guid; HRESULT hr; - BOOL todo; } tests[] = { {&IID_IDirect3D, DDERR_NOTFOUND}, - {&IID_IDirect3DRampDevice, D3D_OK, TRUE}, + {&IID_IDirect3DRampDevice, D3D_OK}, {&IID_IDirect3DRGBDevice, D3D_OK}, - {&IID_IDirect3DMMXDevice, D3D_OK, TRUE}, + {&IID_IDirect3DMMXDevice, D3D_OK}, {&IID_IDirect3DRefDevice, DDERR_NOTFOUND}, {&IID_IDirect3DTnLHalDevice, DDERR_NOTFOUND}, {&IID_IDirect3DNullDevice, DDERR_NOTFOUND}, @@ -13066,8 +13065,7 @@ static void test_find_device(void) result.dwSize = sizeof(result); hr = IDirect3D2_FindDevice(d3d, &search, &result); - todo_wine_if(tests[i].todo) - ok(hr == tests[i].hr, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == tests[i].hr, "Test %u: Got unexpected hr %#x.\n", i, hr); ok(result.dwSize == sizeof(result), "Test %u: Got unexpected result size %u.\n", i, result.dwSize); }

1 0

Alistair Leslie-Hughes : ddraw: Accept the d3d1 and d3d2 versions of D3DFINDDEVICERESULT in ddraw_find_device ().
by Alexandre Julliard 11 Sep '18

11 Sep '18

Module: wine Branch: master Commit: 96ba1bc478ef15a5a6d1fcc35468da1682afb5ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=96ba1bc478ef15a5a6d1fcc3… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Sep 11 18:57:28 2018 +0430 ddraw: Accept the d3d1 and d3d2 versions of D3DFINDDEVICERESULT in ddraw_find_device(). Based off a patch by Michael Müller. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw.c | 69 ++++++++++++++++++++++++++++++++++++++++------- dlls/ddraw/tests/ddraw1.c | 57 ++++++++++++++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw2.c | 57 ++++++++++++++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw4.c | 57 ++++++++++++++++++++++++++++++++++++++- include/d3dhal.h | 69 +++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 297 insertions(+), 12 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=96ba1bc478ef15a5a6d1…

1 0

Alistair Leslie-Hughes : mfplat: Correct spec for MFTRegisterLocal.
by Alexandre Julliard 11 Sep '18

11 Sep '18

Module: wine Branch: master Commit: 24279f1cf26832dad45d5bc850b5a193f408f521 URL: https://source.winehq.org/git/wine.git/?a=commit;h=24279f1cf26832dad45d5bc8… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Sep 10 22:11:59 2018 +0000 mfplat: Correct spec for MFTRegisterLocal. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/mfplat.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index 42b0b86..f606447 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -138,7 +138,7 @@ @ stdcall MFTEnumEx(int128 long ptr ptr ptr ptr) @ stub MFTGetInfo @ stdcall MFTRegister(int128 int128 wstr long long ptr long ptr ptr) -@ stub MFTRegisterLocal(ptr ptr wstr long long ptr long ptr) +@ stdcall MFTRegisterLocal(ptr ptr wstr long long ptr long ptr) @ stub MFTRegisterLocalByCLSID @ stdcall MFTUnregister(int128) @ stdcall MFTUnregisterLocal(ptr)

1 0

Hans Leidekker : winhttp: Implement WINHTTP_OPTION_RECEIVE_RESPONSE_TIMEOUT.
by Alexandre Julliard 11 Sep '18

11 Sep '18

Module: wine Branch: master Commit: af3920dc1863d9d8a49ddf54aef7d97a7b38c5ad URL: https://source.winehq.org/git/wine.git/?a=commit;h=af3920dc1863d9d8a49ddf54… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Sep 10 13:24:34 2018 +0200 winhttp: Implement WINHTTP_OPTION_RECEIVE_RESPONSE_TIMEOUT. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/request.c | 6 +- dlls/winhttp/session.c | 138 ++++++++++++++++++++++++++++------------- dlls/winhttp/tests/winhttp.c | 68 +++++++++++++++++++- dlls/winhttp/winhttp_private.h | 6 +- 4 files changed, 169 insertions(+), 49 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=af3920dc1863d9d8a49d…

1 0

Michael Stefaniuc : dplayx: Use the ARRAY_SIZE() macro.
by Alexandre Julliard 11 Sep '18

11 Sep '18

Module: wine Branch: master Commit: 3d67641d5d9c98db01eb21d6e632a294def04129 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d67641d5d9c98db01eb21d6… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Sep 10 22:49:38 2018 +0200 dplayx: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com><mailto:leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dplayx/dplay.c | 12 ++++++------ dlls/dplayx/dplobby.c | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index fde0681..65c7e4d 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -4335,7 +4335,7 @@ static HRESULT WINAPI IDirectPlay4AImpl_EnumConnections( IDirectPlay4A *iface, RegCloseKey(hkServiceProvider); /* FIXME: Check return types to ensure we're interpreting data right */ - MultiByteToWideChar( CP_ACP, 0, returnBuffer, -1, buff, sizeof(buff)/sizeof(WCHAR) ); + MultiByteToWideChar( CP_ACP, 0, returnBuffer, -1, buff, ARRAY_SIZE( buff )); CLSIDFromString( buff, &serviceProviderGUID ); /* FIXME: Have I got a memory leak on the serviceProviderGUID? */ @@ -4433,7 +4433,7 @@ static HRESULT WINAPI IDirectPlay4AImpl_EnumConnections( IDirectPlay4A *iface, RegCloseKey(hkServiceProvider); /* FIXME: Check return types to ensure we're interpreting data right */ - MultiByteToWideChar( CP_ACP, 0, returnBuffer, -1, buff, sizeof(buff)/sizeof(WCHAR) ); + MultiByteToWideChar( CP_ACP, 0, returnBuffer, -1, buff, ARRAY_SIZE( buff )); CLSIDFromString( buff, &serviceProviderGUID ); /* FIXME: Have I got a memory leak on the serviceProviderGUID? */ @@ -4682,7 +4682,7 @@ static HMODULE DP_LoadSP( LPCGUID lpcGuid, LPSPINITDATA lpSpData, LPBOOL lpbIsDp } /* FIXME: Check return types to ensure we're interpreting data right */ - MultiByteToWideChar( CP_ACP, 0, returnBuffer, -1, buff, sizeof(buff)/sizeof(WCHAR) ); + MultiByteToWideChar( CP_ACP, 0, returnBuffer, -1, buff, ARRAY_SIZE( buff )); CLSIDFromString( buff, &serviceProviderGUID ); /* FIXME: Have I got a memory leak on the serviceProviderGUID? */ @@ -5811,7 +5811,7 @@ static HRESULT DirectPlayEnumerateAW(LPDPENUMDPCALLBACKA lpEnumCallbackA, dwIndex = 0; do { - sizeOfSubKeyName = sizeof(subKeyName) / sizeof(WCHAR); + sizeOfSubKeyName = ARRAY_SIZE(subKeyName); ret_value = RegEnumKeyW(hkResult, dwIndex, subKeyName, sizeOfSubKeyName); dwIndex++; } @@ -5836,8 +5836,8 @@ static HRESULT DirectPlayEnumerateAW(LPDPENUMDPCALLBACKA lpEnumCallbackA, HKEY hkServiceProvider; WCHAR guidKeyContent[(2 * 16) + 1 + 6 /* This corresponds to '{....-..-..-..-......}' */ ]; DWORD sizeOfGuidKeyContent = sizeof(guidKeyContent); - - sizeOfSubKeyName = sizeof(subKeyName) / sizeof(WCHAR); + + sizeOfSubKeyName = ARRAY_SIZE(subKeyName); ret_value = RegEnumKeyExW(hkResult, dwIndex, subKeyName, &sizeOfSubKeyName, NULL, NULL, NULL, &filetime); if (ret_value == ERROR_NO_MORE_ITEMS) diff --git a/dlls/dplayx/dplobby.c b/dlls/dplayx/dplobby.c index 944fea9..30d76aa 100644 --- a/dlls/dplayx/dplobby.c +++ b/dlls/dplayx/dplobby.c @@ -782,7 +782,7 @@ static HRESULT WINAPI IDirectPlayLobby3AImpl_EnumAddressTypes( IDirectPlayLobby3 } /* FIXME: Check return types to ensure we're interpreting data right */ - MultiByteToWideChar( CP_ACP, 0, returnBuffer, -1, buff, sizeof(buff)/sizeof(WCHAR) ); + MultiByteToWideChar( CP_ACP, 0, returnBuffer, -1, buff, ARRAY_SIZE( buff )); CLSIDFromString( buff, &serviceProviderGUID ); /* FIXME: Have I got a memory leak on the serviceProviderGUID? */ @@ -809,7 +809,7 @@ static HRESULT WINAPI IDirectPlayLobby3AImpl_EnumAddressTypes( IDirectPlayLobby3 TRACE( "Found Address Type GUID %s\n", atSubKey ); /* FIXME: Check return types to ensure we're interpreting data right */ - MultiByteToWideChar( CP_ACP, 0, atSubKey, -1, buff, sizeof(buff)/sizeof(WCHAR) ); + MultiByteToWideChar( CP_ACP, 0, atSubKey, -1, buff, ARRAY_SIZE( buff )); CLSIDFromString( buff, &serviceProviderGUID ); /* FIXME: Have I got a memory leak on the serviceProviderGUID? */ @@ -950,7 +950,7 @@ static HRESULT WINAPI IDirectPlayLobby3AImpl_EnumLocalApplications( IDirectPlayL } /* FIXME: Check return types to ensure we're interpreting data right */ - MultiByteToWideChar( CP_ACP, 0, returnBuffer, -1, buff, sizeof(buff)/sizeof(WCHAR) ); + MultiByteToWideChar( CP_ACP, 0, returnBuffer, -1, buff, ARRAY_SIZE( buff )); CLSIDFromString( buff, &serviceProviderGUID ); /* FIXME: Have I got a memory leak on the serviceProviderGUID? */

1 0

Józef Kucia : vulkan-1/tests: Add test for unsupported device extensions.
by Alexandre Julliard 10 Sep '18

10 Sep '18

Module: wine Branch: master Commit: 3d3c92ed5fef283dd4fd3f5dd4e241ebc4d7685d URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d3c92ed5fef283dd4fd3f5d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Sep 10 13:07:01 2018 +0200 vulkan-1/tests: Add test for unsupported device extensions. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vulkan-1/tests/vulkan.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/dlls/vulkan-1/tests/vulkan.c b/dlls/vulkan-1/tests/vulkan.c index 55efa23..4143af7 100644 --- a/dlls/vulkan-1/tests/vulkan.c +++ b/dlls/vulkan-1/tests/vulkan.c @@ -300,6 +300,27 @@ static void test_unsupported_instance_extensions(void) } } +static void test_unsupported_device_extensions(VkPhysicalDevice vk_physical_device) +{ + VkDevice vk_device; + unsigned int i; + VkResult vr; + + static const char *extensions[] = + { + "VK_KHR_external_fence_fd", + "VK_KHR_external_memory_fd", + "VK_KHR_external_semaphore_fd", + }; + + for (i = 0; i < ARRAY_SIZE(extensions); ++i) + { + vr = create_device(vk_physical_device, 1, &extensions[i], NULL, &vk_device); + ok(vr == VK_ERROR_EXTENSION_NOT_PRESENT, + "Got VkResult %d for extension %s.\n", vr, extensions[i]); + } +} + static void for_each_device(void (*test_func)(VkPhysicalDevice)) { VkPhysicalDevice *vk_physical_devices; @@ -342,4 +363,5 @@ START_TEST(vulkan) test_physical_device_groups(); for_each_device(test_destroy_command_pool); test_unsupported_instance_extensions(); + for_each_device(test_unsupported_device_extensions); }

1 0

Józef Kucia : winevulkan: Trace VkApplicationInfo in wine_vkCreateInstance().
by Alexandre Julliard 10 Sep '18

10 Sep '18

Module: wine Branch: master Commit: 3cad90e3341de6102284a39f449e13b77be2f280 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3cad90e3341de6102284a39f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Sep 10 15:42:45 2018 +0200 winevulkan: Trace VkApplicationInfo in wine_vkCreateInstance(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/vulkan.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 83041a5..c30f666 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -362,16 +362,6 @@ static VkResult wine_vk_instance_convert_create_info(const VkInstanceCreateInfo *dst = *src; - if (dst->pApplicationInfo) - { - const VkApplicationInfo *app_info = dst->pApplicationInfo; - TRACE("Application name %s, application version %#x\n", - debugstr_a(app_info->pApplicationName), app_info->applicationVersion); - TRACE("Engine name %s, engine version %#x\n", debugstr_a(app_info->pEngineName), - app_info->engineVersion); - TRACE("API version %#x\n", app_info->apiVersion); - } - /* Application and loader can pass in a chain of extensions through pNext. * We can't blindly pass these through as often these contain callbacks or * they can even be pass structures for loader / ICD internal use. For now @@ -762,10 +752,17 @@ VkResult WINAPI wine_vkCreateInstance(const VkInstanceCreateInfo *create_info, return res; } - if ((app_info = create_info->pApplicationInfo) && app_info->pApplicationName) + if ((app_info = create_info->pApplicationInfo)) { - if (!strcmp(app_info->pApplicationName, "DOOM") - || !strcmp(app_info->pApplicationName, "Wolfenstein II The New Colossus")) + TRACE("Application name %s, application version %#x.\n", + debugstr_a(app_info->pApplicationName), app_info->applicationVersion); + TRACE("Engine name %s, engine version %#x.\n", debugstr_a(app_info->pEngineName), + app_info->engineVersion); + TRACE("API version %#x.\n", app_info->apiVersion); + + if (app_info->pApplicationName + && (!strcmp(app_info->pApplicationName, "DOOM") + || !strcmp(app_info->pApplicationName, "Wolfenstein II The New Colossus"))) object->quirks |= WINEVULKAN_QUIRK_GET_DEVICE_PROC_ADDR; }

1 0

Józef Kucia : winevulkan: Enable vkGetDeviceProcAddr( ) quirk for idTech engine.
by Alexandre Julliard 10 Sep '18

10 Sep '18

Module: wine Branch: master Commit: fcc10f301234d8e14a34bc529778d04b3e0cd7cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=fcc10f301234d8e14a34bc52… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Sep 10 15:42:46 2018 +0200 winevulkan: Enable vkGetDeviceProcAddr() quirk for idTech engine. For DOOM VFR. Based on a patch by Andrew Eikum. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/vulkan.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index c30f666..1c72103 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -760,9 +760,7 @@ VkResult WINAPI wine_vkCreateInstance(const VkInstanceCreateInfo *create_info, app_info->engineVersion); TRACE("API version %#x.\n", app_info->apiVersion); - if (app_info->pApplicationName - && (!strcmp(app_info->pApplicationName, "DOOM") - || !strcmp(app_info->pApplicationName, "Wolfenstein II The New Colossus"))) + if (app_info->pEngineName && !strcmp(app_info->pEngineName, "idTech")) object->quirks |= WINEVULKAN_QUIRK_GET_DEVICE_PROC_ADDR; }

1 0

Michael Stefaniuc : winspool.drv: Use the ARRAY_SIZE() macro.
by Alexandre Julliard 10 Sep '18

10 Sep '18

Module: wine Branch: master Commit: 18e2df401eb545f0ce490daaaf12a6c1c248119f URL: https://source.winehq.org/git/wine.git/?a=commit;h=18e2df401eb545f0ce490daa… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Aug 21 23:10:18 2018 +0200 winspool.drv: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winspool.drv/info.c | 50 +++++++++++++++++++++++------------------------- 1 file changed, 24 insertions(+), 26 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index f63f3f6..7c4ee9a 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -332,7 +332,7 @@ static const printenv_t * validate_envW(LPCWSTR env) TRACE("testing %s\n", debugstr_w(env)); if (env && env[0]) { - for (i = 0; i < sizeof(all_printenv)/sizeof(all_printenv[0]); i++) + for (i = 0; i < ARRAY_SIZE(all_printenv); i++) { if (lstrcmpiW(env, all_printenv[i]->envname) == 0) { @@ -594,7 +594,7 @@ static BOOL add_printer_driver(const WCHAR *name, WCHAR *ppd) di3.pConfigFile = driver_nt; di3.pDefaultDataType = rawW; - for (i = 0; i < sizeof(all_printenv)/sizeof(all_printenv[0]); i++) + for (i = 0; i < ARRAY_SIZE(all_printenv); i++) { di3.pEnvironment = (WCHAR *) all_printenv[i]->envname; if (all_printenv[i]->envname == envname_win40W) @@ -752,7 +752,7 @@ static WCHAR *get_ppd_dir( void ) WCHAR *dir, tmp_path[MAX_PATH]; BOOL res; - len = GetTempPathW( sizeof(tmp_path) / sizeof(tmp_path[0]), tmp_path ); + len = GetTempPathW( ARRAY_SIZE( tmp_path ), tmp_path ); if (!len) return NULL; dir = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) + sizeof(wine_ppds) ) ; if (!dir) return NULL; @@ -927,7 +927,7 @@ static BOOL CUPS_LoadPrinters(void) nrofdests = pcupsGetDests(&dests); TRACE("Found %d CUPS %s:\n", nrofdests, (nrofdests == 1) ? "printer" : "printers"); for (i=0;i<nrofdests;i++) { - MultiByteToWideChar(CP_UNIXCP, 0, dests[i].name, -1, nameW, sizeof(nameW) / sizeof(WCHAR)); + MultiByteToWideChar(CP_UNIXCP, 0, dests[i].name, -1, nameW, ARRAY_SIZE(nameW)); printer_type = get_cups_printer_type( dests + i ); TRACE( "Printer %d: %s. printer_type %x\n", i, debugstr_w(nameW), printer_type ); @@ -1010,7 +1010,7 @@ static BOOL CUPS_LoadPrinters(void) } if (hadprinter && !haddefault) { - MultiByteToWideChar(CP_UNIXCP, 0, dests[0].name, -1, nameW, sizeof(nameW) / sizeof(WCHAR)); + MultiByteToWideChar(CP_UNIXCP, 0, dests[0].name, -1, nameW, ARRAY_SIZE(nameW)); SetDefaultPrinterW(nameW); } pcupsFreeDests(nrofdests, dests); @@ -1037,13 +1037,13 @@ static char *get_queue_name( HANDLE printer, BOOL *cups ) if (!port) goto end; RegQueryValueExW( key, PortW, 0, &type, (BYTE*)port, &needed ); - if (!strncmpW( port, CUPS_Port, sizeof(CUPS_Port) / sizeof(WCHAR) -1 )) + if (!strncmpW( port, CUPS_Port, ARRAY_SIZE( CUPS_Port ) -1 )) { - name = port + sizeof(CUPS_Port) / sizeof(WCHAR) - 1; + name = port + ARRAY_SIZE( CUPS_Port ) - 1; *cups = TRUE; } - else if (!strncmpW( port, LPR_Port, sizeof(LPR_Port) / sizeof(WCHAR) -1 )) - name = port + sizeof(LPR_Port) / sizeof(WCHAR) - 1; + else if (!strncmpW( port, LPR_Port, ARRAY_SIZE( LPR_Port ) -1 )) + name = port + ARRAY_SIZE( LPR_Port ) - 1; if (name) { needed = WideCharToMultiByte( CP_UNIXCP, 0, name, -1, NULL, 0, NULL, NULL ); @@ -1222,7 +1222,7 @@ static BOOL PRINTCAP_ParseEntry( const char *pent, BOOL isfirst ) goto end; } - MultiByteToWideChar(CP_ACP, 0, devname, -1, devnameW, sizeof(devnameW) / sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, devname, -1, devnameW, ARRAY_SIZE(devnameW)); if(RegOpenKeyA(hkeyPrinters, devname, &hkeyPrinter) == ERROR_SUCCESS) { DWORD status = get_dword_from_reg( hkeyPrinter, StatusW ); @@ -1391,7 +1391,7 @@ static LPWSTR get_servername_from_name(LPCWSTR name) TRACE("found %s\n", debugstr_w(server)); - len = sizeof(buffer)/sizeof(buffer[0]); + len = ARRAY_SIZE(buffer); if (GetComputerNameW(buffer, &len)) { if (lstrcmpW(buffer, server) == 0) { /* The requested Servername is our computername */ @@ -1641,7 +1641,7 @@ void WINSPOOL_LoadSystemPrinters(void) if(RegQueryInfoKeyW(hkeyPrinters, NULL, NULL, NULL, &num, NULL, NULL, NULL, NULL, NULL, NULL, NULL) == ERROR_SUCCESS) { for(i = 0; i < num; i++) { - if(RegEnumKeyW(hkeyPrinters, i, PrinterName, sizeof(PrinterName)/sizeof(PrinterName[0])) == ERROR_SUCCESS) { + if(RegEnumKeyW(hkeyPrinters, i, PrinterName, ARRAY_SIZE(PrinterName)) == ERROR_SUCCESS) { if(RegOpenKeyW(hkeyPrinters, PrinterName, &hkey) == ERROR_SUCCESS) { if(RegQueryValueExW(hkey, NameW, 0, 0, 0, &needed) == ERROR_FILE_NOT_FOUND) { set_reg_szW(hkey, NameW, PrinterName); @@ -2941,7 +2941,7 @@ BOOL WINAPI AddJobW(HANDLE hPrinter, DWORD Level, LPBYTE pData, DWORD cbBuf, LPD job->job_id = InterlockedIncrement(&next_job_id); - len = GetSystemDirectoryW(path, sizeof(path) / sizeof(WCHAR)); + len = GetSystemDirectoryW(path, ARRAY_SIZE(path)); if(path[len - 1] != '\\') path[len++] = '\\'; memcpy(path + len, spool_path, sizeof(spool_path)); @@ -3384,7 +3384,7 @@ BOOL WINAPI DeletePrinter(HANDLE hPrinter) LPCWSTR lpNameW = get_opened_printer_name(hPrinter); HKEY hkeyPrinters, hkey; WCHAR def[MAX_PATH]; - DWORD size = sizeof( def ) / sizeof( def[0] ); + DWORD size = ARRAY_SIZE(def); if(!lpNameW) { SetLastError(ERROR_INVALID_HANDLE); @@ -4667,8 +4667,7 @@ static BOOL WINSPOOL_EnumPrintersW(DWORD dwType, LPWSTR lpszName, pi = (used <= cbBuf) ? lpbPrinters : NULL; for(i = 0; i < number; i++) { - if(RegEnumKeyW(hkeyPrinters, i, PrinterName, sizeof(PrinterName)/sizeof(PrinterName[0])) != - ERROR_SUCCESS) { + if(RegEnumKeyW(hkeyPrinters, i, PrinterName, ARRAY_SIZE(PrinterName)) != ERROR_SUCCESS) { ERR("Can't enum key number %d\n", i); RegCloseKey(hkeyPrinters); return FALSE; @@ -5508,8 +5507,7 @@ static BOOL WINSPOOL_EnumPrinterDrivers(LPWSTR pName, LPCWSTR pEnvironment, PBYTE data_ptr = NULL; DWORD needed = 0; - if(RegEnumKeyW(hkeyDrivers, i, DriverNameW, sizeof(DriverNameW)/sizeof(DriverNameW[0])) - != ERROR_SUCCESS) { + if(RegEnumKeyW(hkeyDrivers, i, DriverNameW, ARRAY_SIZE(DriverNameW)) != ERROR_SUCCESS) { ERR("Can't enum key number %d\n", i); RegCloseKey(hkeyDrivers); return FALSE; @@ -5585,7 +5583,7 @@ BOOL WINAPI EnumPrinterDriversW(LPWSTR pName, LPWSTR pEnvironment, DWORD Level, /* Precompute the overall total; we need this to know where pointers end and data begins (i.e. data_offset) */ - for (i = 0; i < sizeof(all_printenv)/sizeof(all_printenv[0]); i++) + for (i = 0; i < ARRAY_SIZE(all_printenv); i++) { needed = found = 0; ret = WINSPOOL_EnumPrinterDrivers(pName, all_printenv[i]->envname, Level, @@ -5599,7 +5597,7 @@ BOOL WINAPI EnumPrinterDriversW(LPWSTR pName, LPWSTR pEnvironment, DWORD Level, *pcReturned = 0; *pcbNeeded = 0; total_found = 0; - for (i = 0; i < sizeof(all_printenv)/sizeof(all_printenv[0]); i++) + for (i = 0; i < ARRAY_SIZE(all_printenv); i++) { needed = found = 0; ret = WINSPOOL_EnumPrinterDrivers(pName, all_printenv[i]->envname, Level, @@ -5963,7 +5961,7 @@ BOOL WINAPI SetDefaultPrinterW(LPCWSTR pszPrinter) if ((pszPrinter == NULL) || (pszPrinter[0] == '\0')) { default_printer[0] = '\0'; - size = sizeof(default_printer)/sizeof(WCHAR); + size = ARRAY_SIZE(default_printer); /* if we have a default Printer, do nothing. */ if (GetDefaultPrinterW(default_printer, &size)) @@ -5974,7 +5972,7 @@ BOOL WINAPI SetDefaultPrinterW(LPCWSTR pszPrinter) if (!RegOpenKeyExW(HKEY_LOCAL_MACHINE, PrintersW, 0, KEY_READ, &hreg)) { default_printer[0] = '\0'; - size = sizeof(default_printer)/sizeof(WCHAR); + size = ARRAY_SIZE(default_printer); if (!RegEnumKeyExW(hreg, 0, default_printer, &size, NULL, NULL, NULL, NULL)) { pszPrinter = default_printer; @@ -8350,8 +8348,8 @@ static INT_PTR CALLBACK file_dlg_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM WCHAR caption[200], message[200]; int mb_ret; - LoadStringW(WINSPOOL_hInstance, IDS_CAPTION, caption, sizeof(caption) / sizeof(WCHAR)); - LoadStringW(WINSPOOL_hInstance, IDS_FILE_EXISTS, message, sizeof(message) / sizeof(WCHAR)); + LoadStringW(WINSPOOL_hInstance, IDS_CAPTION, caption, ARRAY_SIZE(caption)); + LoadStringW(WINSPOOL_hInstance, IDS_FILE_EXISTS, message, ARRAY_SIZE(message)); mb_ret = MessageBoxW(hwnd, message, caption, MB_OKCANCEL | MB_ICONEXCLAMATION); if(mb_ret == IDCANCEL) { @@ -8364,8 +8362,8 @@ static INT_PTR CALLBACK file_dlg_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM { WCHAR caption[200], message[200]; - LoadStringW(WINSPOOL_hInstance, IDS_CAPTION, caption, sizeof(caption) / sizeof(WCHAR)); - LoadStringW(WINSPOOL_hInstance, IDS_CANNOT_OPEN, message, sizeof(message) / sizeof(WCHAR)); + LoadStringW(WINSPOOL_hInstance, IDS_CAPTION, caption, ARRAY_SIZE(caption)); + LoadStringW(WINSPOOL_hInstance, IDS_CANNOT_OPEN, message, ARRAY_SIZE(message)); MessageBoxW(hwnd, message, caption, MB_OK | MB_ICONEXCLAMATION); HeapFree(GetProcessHeap(), 0, filename); return TRUE;

1 0