January 2018 - Wine-Commits

Hans Leidekker : iphlpapi: Implement if_indextoname.
by Alexandre Julliard Jan. 23, 2018

Jan. 23, 2018

Module: wine Branch: master Commit: e3fe10719e111c1c8f1a3e12df8bf35c37376736 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e3fe10719e111c1c8f1a3e12… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jan 23 09:43:50 2018 +0100 iphlpapi: Implement if_indextoname. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/iphlpapi.spec | 2 +- dlls/iphlpapi/iphlpapi_main.c | 10 ++++++++++ dlls/iphlpapi/tests/iphlpapi.c | 45 +++++++++++++++++++++++++++++------------- include/netioapi.h | 2 ++ 4 files changed, 44 insertions(+), 15 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi.spec b/dlls/iphlpapi/iphlpapi.spec index fee9960..b6c9aef 100644 --- a/dlls/iphlpapi/iphlpapi.spec +++ b/dlls/iphlpapi/iphlpapi.spec @@ -159,7 +159,7 @@ @ stdcall IcmpSendEcho2Ex(ptr ptr ptr ptr long long ptr long ptr ptr long long) @ stdcall IcmpSendEcho2(ptr ptr ptr ptr long ptr long ptr ptr long long) @ stdcall IcmpSendEcho(ptr long ptr long ptr ptr long long) -#@ stub if_indextoname +@ stdcall if_indextoname(long ptr) IPHLP_if_indextoname @ stdcall if_nametoindex(str) IPHLP_if_nametoindex #@ stub InitializeIpForwardEntry #@ stub InitializeIpInterfaceEntry diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 94bf825..48a8387 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -3235,3 +3235,13 @@ IF_INDEX WINAPI IPHLP_if_nametoindex(const char *name) return 0; } + +/****************************************************************** + * if_indextoname (IPHLPAPI.@) + */ +PCHAR WINAPI IPHLP_if_indextoname(NET_IFINDEX index, PCHAR name) +{ + TRACE("(%u, %p)\n", index, name); + + return getInterfaceNameByIndex(index, name); +} diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index dd0cb90..6397742 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -97,6 +97,7 @@ static DWORD (WINAPI *pConvertInterfaceLuidToNameA)(const NET_LUID*,char*,SIZE_T static DWORD (WINAPI *pConvertInterfaceNameToLuidA)(const char*,NET_LUID*); static DWORD (WINAPI *pConvertInterfaceNameToLuidW)(const WCHAR*,NET_LUID*); +static PCHAR (WINAPI *pif_indextoname)(NET_IFINDEX,PCHAR); static NET_IFINDEX (WINAPI *pif_nametoindex)(const char*); static void loadIPHlpApi(void) @@ -148,6 +149,7 @@ static void loadIPHlpApi(void) pConvertInterfaceLuidToNameW = (void *)GetProcAddress(hLibrary, "ConvertInterfaceLuidToNameW"); pConvertInterfaceNameToLuidA = (void *)GetProcAddress(hLibrary, "ConvertInterfaceNameToLuidA"); pConvertInterfaceNameToLuidW = (void *)GetProcAddress(hLibrary, "ConvertInterfaceNameToLuidW"); + pif_indextoname = (void *)GetProcAddress(hLibrary, "if_indextoname"); pif_nametoindex = (void *)GetProcAddress(hLibrary, "if_nametoindex"); } } @@ -1786,7 +1788,7 @@ static void test_interface_identifier_conversion(void) GUID guid; SIZE_T len; WCHAR nameW[IF_MAX_STRING_SIZE + 1]; - char nameA[IF_MAX_STRING_SIZE + 1]; + char nameA[IF_MAX_STRING_SIZE + 1], *name; NET_IFINDEX index, index2; if (!pConvertInterfaceIndexToLuid) @@ -1947,22 +1949,37 @@ static void test_interface_identifier_conversion(void) ok( luid.Info.NetLuidIndex != 0xdead, "index not set\n" ); ok( luid.Info.IfType == IF_TYPE_ETHERNET_CSMACD, "got %u\n", luid.Info.IfType ); - /* if_nametoindex */ - if (pif_nametoindex) + if (!pif_nametoindex || !pif_indextoname) { - index2 = pif_nametoindex( NULL ); - ok( !index2, "Got unexpected index %u\n", index2 ); - index2 = pif_nametoindex( nameA ); - ok( index2 == index, "Got index %u for %s, expected %u\n", index2, nameA, index ); - /* Wargaming.net Game Center passes a GUID-like string. */ - index2 = pif_nametoindex( "{00000001-0000-0000-0000-000000000000}" ); - ok( !index2, "Got unexpected index %u\n", index2 ); - index2 = pif_nametoindex( wine_dbgstr_guid( &guid ) ); - ok( !index2, "Got unexpected index %u for input %s\n", index2, wine_dbgstr_guid( &guid ) ); + skip("if_nametoindex/if_indextoname not supported\n"); + return; } - else + + index2 = pif_nametoindex( NULL ); + ok( !index2, "Got unexpected index %u\n", index2 ); + index2 = pif_nametoindex( nameA ); + ok( index2 == index, "Got index %u for %s, expected %u\n", index2, nameA, index ); + /* Wargaming.net Game Center passes a GUID-like string. */ + index2 = pif_nametoindex( "{00000001-0000-0000-0000-000000000000}" ); + ok( !index2, "Got unexpected index %u\n", index2 ); + index2 = pif_nametoindex( wine_dbgstr_guid( &guid ) ); + ok( !index2, "Got unexpected index %u for input %s\n", index2, wine_dbgstr_guid( &guid ) ); + + name = pif_indextoname( 0, NULL ); + ok( name == NULL, "got %s\n", name ); + + name = pif_indextoname( 0, nameA ); + ok( name == NULL, "got %p\n", name ); + + name = pif_indextoname( ~0u, nameA ); + ok( name == NULL, "got %p\n", name ); + + nameA[0] = 0; + name = pif_indextoname( 1, nameA ); + if (name != NULL) { - skip("if_nametoindex not supported\n"); + ok( name[0], "empty name\n" ); + ok( name == nameA, "got %p\n", name ); } } diff --git a/include/netioapi.h b/include/netioapi.h index 4f5f671..1095888 100644 --- a/include/netioapi.h +++ b/include/netioapi.h @@ -174,5 +174,7 @@ void WINAPI FreeMibTable(void*); DWORD WINAPI GetIfEntry2(MIB_IF_ROW2*); DWORD WINAPI GetIfTable2(MIB_IF_TABLE2**); DWORD WINAPI GetUnicastIpAddressEntry(MIB_UNICASTIPADDRESS_ROW*); +PCHAR WINAPI if_indextoname(NET_IFINDEX,PCHAR); +NET_IFINDEX WINAPI if_nametoindex(PCSTR); #endif /* __WINE_NETIOAPI_H */

1 0

Hans Leidekker : crypt32: Add a stub implementation of CertUnregisterPhysicalStore.
by Alexandre Julliard Jan. 23, 2018

Jan. 23, 2018

Module: wine Branch: master Commit: 9bafbe10861149b117104f748c329b21eee97bac URL: https://source.winehq.org/git/wine.git/?a=commit;h=9bafbe10861149b117104f74… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jan 23 09:43:49 2018 +0100 crypt32: Add a stub implementation of CertUnregisterPhysicalStore. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/crypt32.spec | 1 + dlls/crypt32/store.c | 7 +++++++ include/wincrypt.h | 3 +++ 3 files changed, 11 insertions(+) diff --git a/dlls/crypt32/crypt32.spec b/dlls/crypt32/crypt32.spec index 00a2d62..fc0955e 100644 --- a/dlls/crypt32/crypt32.spec +++ b/dlls/crypt32/crypt32.spec @@ -92,6 +92,7 @@ @ stdcall CertSetStoreProperty(ptr long long ptr) @ stdcall CertStrToNameA(long str long ptr ptr ptr ptr) @ stdcall CertStrToNameW(long wstr long ptr ptr ptr ptr) +@ stdcall CertUnregisterPhysicalStore(ptr long wstr) @ stdcall CertUnregisterSystemStore(ptr long) @ stdcall CertVerifyCRLRevocation(long ptr long ptr) @ stdcall CertVerifyCRLTimeValidity(ptr ptr) diff --git a/dlls/crypt32/store.c b/dlls/crypt32/store.c index 19eca22..91a3cbc 100644 --- a/dlls/crypt32/store.c +++ b/dlls/crypt32/store.c @@ -1384,6 +1384,13 @@ BOOL WINAPI CertRegisterPhysicalStore(const void *pvSystemStore, DWORD dwFlags, return FALSE; } +BOOL WINAPI CertUnregisterPhysicalStore(const void *pvSystemStore, DWORD dwFlags, + LPCWSTR pwszStoreName) +{ + FIXME("(%p, %08x, %s): stub\n", pvSystemStore, dwFlags, debugstr_w(pwszStoreName)); + return TRUE; +} + BOOL WINAPI CertRegisterSystemStore(const void *pvSystemStore, DWORD dwFlags, PCERT_SYSTEM_STORE_INFO pStoreInfo, void *pvReserved) { diff --git a/include/wincrypt.h b/include/wincrypt.h index 83db673..6986bd8 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -4090,6 +4090,9 @@ BOOL WINAPI CertEnumPhysicalStore(const void *pvSystemStore, DWORD dwFlags, BOOL WINAPI CertRegisterPhysicalStore(const void *pvSystemStore, DWORD dwFlags, LPCWSTR pwszStoreName, PCERT_PHYSICAL_STORE_INFO pStoreInfo, void *pvReserved); +BOOL WINAPI CertUnregisterPhysicalStore(const void *pvSystemStore, DWORD dwFlags, + LPCWSTR pwszStoreName); + BOOL WINAPI CertSaveStore(HCERTSTORE hCertStore, DWORD dwMsgAndCertEncodingType, DWORD dwSaveAs, DWORD dwSaveTo, void* pvSaveToPara, DWORD dwFlags);

1 0

Jacek Caban : ole32: Post quit message after leaving wait loop in CoWaitForMultipleHandles.
by Alexandre Julliard Jan. 23, 2018

Jan. 23, 2018

Module: wine Branch: master Commit: f4b1454f335de46b20812cf06b46270930947c5f URL: https://source.winehq.org/git/wine.git/?a=commit;h=f4b1454f335de46b20812cf0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 22 17:05:34 2018 +0100 ole32: Post quit message after leaving wait loop in CoWaitForMultipleHandles. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/compobj.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 3da3c2f..08455bf 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -4467,6 +4467,8 @@ HRESULT WINAPI CoWaitForMultipleHandles(DWORD dwFlags, DWORD dwTimeout, APARTMENT *apt = COM_CurrentApt(); BOOL message_loop = apt && !apt->multi_threaded; BOOL check_apc = (dwFlags & COWAIT_ALERTABLE) != 0; + BOOL post_quit = FALSE; + UINT exit_code; TRACE("(0x%08x, 0x%08x, %d, %p, %p)\n", dwFlags, dwTimeout, cHandles, pHandles, lpdwindex); @@ -4563,7 +4565,8 @@ HRESULT WINAPI CoWaitForMultipleHandles(DWORD dwFlags, DWORD dwTimeout, if (msg.message == WM_QUIT) { TRACE("resending WM_QUIT to outer message loop\n"); - PostQuitMessage(msg.wParam); + post_quit = TRUE; + exit_code = msg.wParam; /* no longer need to process messages */ message_loop = FALSE; break; @@ -4595,6 +4598,7 @@ HRESULT WINAPI CoWaitForMultipleHandles(DWORD dwFlags, DWORD dwTimeout, } break; } + if (post_quit) PostQuitMessage(exit_code); TRACE("-- 0x%08x\n", hr); return hr; }

1 0

Józef Kucia : libs/vkd3d: Allow library user to enable additional instance extensions.
by Alexandre Julliard Jan. 23, 2018

Jan. 23, 2018

Module: vkd3d Branch: master Commit: c9c6caae9869bac80a4312c6d2b6334e905f6614 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=c9c6caae9869bac80a4312c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jan 23 13:30:15 2018 +0100 libs/vkd3d: Allow library user to enable additional instance extensions. 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> --- include/vkd3d.h | 3 ++ libs/vkd3d-utils/vkd3d_utils_main.c | 7 +-- libs/vkd3d/device.c | 92 ++++++++++++++++++++++++++++--------- 3 files changed, 76 insertions(+), 26 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=c9c6caae9869bac80a4…

1 0

Józef Kucia : libs/vkd3d: Implement d3d12_device_GetAdapterLuid().
by Alexandre Julliard Jan. 23, 2018

Jan. 23, 2018

Module: vkd3d Branch: master Commit: 4cd36fc5539f686c07f89dcd7aca25e4de955c6c URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=4cd36fc5539f686c07f89dc… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jan 23 13:30:16 2018 +0100 libs/vkd3d: Implement d3d12_device_GetAdapterLuid(). 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> --- include/vkd3d.h | 2 ++ libs/vkd3d/device.c | 16 +++++++++++----- libs/vkd3d/vkd3d_main.c | 8 ++++---- libs/vkd3d/vkd3d_private.h | 4 +++- tests/vkd3d_api.c | 23 +++++++++++++++++++++++ 5 files changed, 43 insertions(+), 10 deletions(-) diff --git a/include/vkd3d.h b/include/vkd3d.h index 0eb85ea..033017e 100644 --- a/include/vkd3d.h +++ b/include/vkd3d.h @@ -65,6 +65,8 @@ struct vkd3d_device_create_info const struct vkd3d_instance_create_info *instance_create_info; VkPhysicalDevice vk_physical_device; + + LUID adapter_luid; }; /* resource flags */ diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 21e09f1..e6210fc 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -2052,7 +2052,11 @@ static void STDMETHODCALLTYPE d3d12_device_GetResourceTiling(ID3D12Device *iface static LUID * STDMETHODCALLTYPE d3d12_device_GetAdapterLuid(ID3D12Device *iface, LUID *luid) { - FIXME("iface %p, luid %p stub!\n", iface, luid); + struct d3d12_device *device = impl_from_ID3D12Device(iface); + + TRACE("iface %p, luid %p.\n", iface, luid); + + *luid = device->adapter_luid; return luid; } @@ -2117,7 +2121,7 @@ struct d3d12_device *unsafe_impl_from_ID3D12Device(ID3D12Device *iface) } static HRESULT d3d12_device_init(struct d3d12_device *device, - struct vkd3d_instance *instance, VkPhysicalDevice vk_physical_device) + struct vkd3d_instance *instance, const struct vkd3d_device_create_info *create_info) { HRESULT hr; @@ -2131,7 +2135,9 @@ static HRESULT d3d12_device_init(struct d3d12_device *device, device->join_thread = instance->join_thread; device->wchar_size = instance->wchar_size; - if (FAILED(hr = vkd3d_create_vk_device(device, vk_physical_device))) + device->adapter_luid = create_info->adapter_luid; + + if (FAILED(hr = vkd3d_create_vk_device(device, create_info->vk_physical_device))) { vkd3d_instance_decref(device->vkd3d_instance); return hr; @@ -2163,7 +2169,7 @@ static HRESULT d3d12_device_init(struct d3d12_device *device, } HRESULT d3d12_device_create(struct vkd3d_instance *instance, - VkPhysicalDevice vk_physical_device, struct d3d12_device **device) + const struct vkd3d_device_create_info *create_info, struct d3d12_device **device) { struct d3d12_device *object; HRESULT hr; @@ -2171,7 +2177,7 @@ HRESULT d3d12_device_create(struct vkd3d_instance *instance, if (!(object = vkd3d_malloc(sizeof(*object)))) return E_OUTOFMEMORY; - if (FAILED(hr = d3d12_device_init(object, instance, vk_physical_device))) + if (FAILED(hr = d3d12_device_init(object, instance, create_info))) { vkd3d_free(object); return hr; diff --git a/libs/vkd3d/vkd3d_main.c b/libs/vkd3d/vkd3d_main.c index d3b0bf4..7dd7a1d 100644 --- a/libs/vkd3d/vkd3d_main.c +++ b/libs/vkd3d/vkd3d_main.c @@ -20,13 +20,13 @@ #include "vkd3d_private.h" HRESULT vkd3d_create_device(const struct vkd3d_device_create_info *create_info, - REFIID riid, void **device) + REFIID iid, void **device) { struct vkd3d_instance *instance; struct d3d12_device *object; HRESULT hr; - TRACE("create_info %p, riid %s, device %p.\n", create_info, debugstr_guid(riid), device); + TRACE("create_info %p, iid %s, device %p.\n", create_info, debugstr_guid(iid), device); if (!create_info || !device) return E_INVALIDARG; @@ -64,13 +64,13 @@ HRESULT vkd3d_create_device(const struct vkd3d_device_create_info *create_info, return E_FAIL; } - hr = d3d12_device_create(instance, create_info->vk_physical_device, &object); + hr = d3d12_device_create(instance, create_info, &object); vkd3d_instance_decref(instance); if (FAILED(hr)) return hr; return return_interface((IUnknown *)&object->ID3D12Device_iface, &IID_ID3D12Device, - riid, device); + iid, device); } /* ID3D12RootSignatureDeserializer */ diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index f4bae9d..b360785 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -665,10 +665,12 @@ struct d3d12_device vkd3d_create_thread_pfn create_thread; vkd3d_join_thread_pfn join_thread; + + LUID adapter_luid; }; HRESULT d3d12_device_create(struct vkd3d_instance *instance, - VkPhysicalDevice vk_physical_device, struct d3d12_device **device) DECLSPEC_HIDDEN; + const struct vkd3d_device_create_info *create_info, struct d3d12_device **device) DECLSPEC_HIDDEN; struct d3d12_device *unsafe_impl_from_ID3D12Device(ID3D12Device *iface) DECLSPEC_HIDDEN; HRESULT vkd3d_create_buffer(struct d3d12_device *device, diff --git a/tests/vkd3d_api.c b/tests/vkd3d_api.c index 8dd7c78..375bd6d 100644 --- a/tests/vkd3d_api.c +++ b/tests/vkd3d_api.c @@ -299,6 +299,28 @@ static void test_physical_device(void) ok(!refcount, "Instance has %u references left.\n", refcount); } +static void test_adapter_luid(void) +{ + struct vkd3d_device_create_info create_info; + ID3D12Device *device; + ULONG refcount; + HRESULT hr; + LUID luid; + + create_info = device_default_create_info; + create_info.adapter_luid.HighPart = 0xdeadc0de; + create_info.adapter_luid.LowPart = 0xdeadbeef; + hr = vkd3d_create_device(&create_info, &IID_ID3D12Device, (void **)&device); + ok(hr == S_OK, "Failed to create device, hr %#x.\n", hr); + + luid = ID3D12Device_GetAdapterLuid(device); + ok(luid.HighPart == 0xdeadc0de && luid.LowPart == 0xdeadbeef, + "Got unexpected LUID %08x:%08x.\n", luid.HighPart, luid.LowPart); + + refcount = ID3D12Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + static void test_vkd3d_queue(void) { ID3D12CommandQueue *direct_queue, *compute_queue, *copy_queue; @@ -362,5 +384,6 @@ START_TEST(vkd3d_api) run_test(test_create_device); run_test(test_required_device_extensions); run_test(test_physical_device); + run_test(test_adapter_luid); run_test(test_vkd3d_queue); }

1 0

Józef Kucia : tests: Add test for additional instance extensions.
by Alexandre Julliard Jan. 23, 2018

Jan. 23, 2018

Module: vkd3d Branch: master Commit: 12aa2cb74c216eaad23d43dbdbe7c1c97c654e06 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=12aa2cb74c216eaad23d43d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jan 23 13:30:17 2018 +0100 tests: Add test for additional instance extensions. 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> --- tests/vkd3d_api.c | 99 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 99 insertions(+) diff --git a/tests/vkd3d_api.c b/tests/vkd3d_api.c index 375bd6d..9efc02a 100644 --- a/tests/vkd3d_api.c +++ b/tests/vkd3d_api.c @@ -19,6 +19,8 @@ #define COBJMACROS #define INITGUID #define WIDL_C_INLINE_WRAPPERS +#define VK_USE_PLATFORM_XCB_KHR +#define VK_USE_PLATFORM_XLIB_KHR #include "vkd3d_test.h" #include <vkd3d.h> @@ -101,6 +103,102 @@ static void test_create_instance(void) ok(!refcount, "Instance has %u references left.\n", refcount); } +struct vulkan_extension +{ + const char *name; + bool is_supported; +}; + +static uint32_t check_instance_extensions(const char **enabled_extensions, + struct vulkan_extension *extensions, unsigned int extension_count) +{ + VkExtensionProperties *properties; + uint32_t enabled_extension_count; + unsigned int i, j; + uint32_t count; + VkResult vr; + + vr = vkEnumerateInstanceExtensionProperties(NULL, &count, NULL); + ok(vr == VK_SUCCESS, "Got unexpected VkResult %d.\n", vr); + if (!count) + return 0; + + properties = calloc(count, sizeof(*properties)); + ok(properties, "Failed to allocate memory.\n"); + vr = vkEnumerateInstanceExtensionProperties(NULL, &count, properties); + ok(vr == VK_SUCCESS, "Got unexpected VkResult %d.\n", vr); + + enabled_extension_count = 0; + for (i = 0; i < count; ++i) + { + for (j = 0; j < extension_count; ++j) + { + if (!strcmp(properties[i].extensionName, extensions[j].name)) + { + extensions[j].is_supported = true; + enabled_extensions[enabled_extension_count++] = extensions[j].name; + } + } + } + free(properties); + return enabled_extension_count; +} + +static void test_additional_instance_extensions(void) +{ + struct vkd3d_instance_create_info create_info; + const char *enabled_extensions[3]; + struct vkd3d_instance *instance; + uint32_t extension_count; + PFN_vkVoidFunction pfn; + VkInstance vk_instance; + unsigned int i; + ULONG refcount; + HRESULT hr; + + struct vulkan_extension extensions[] = + { + {VK_KHR_SURFACE_EXTENSION_NAME}, + {VK_KHR_XCB_SURFACE_EXTENSION_NAME}, + {VK_KHR_XLIB_SURFACE_EXTENSION_NAME}, + }; + + if (!(extension_count = check_instance_extensions(enabled_extensions, + extensions, ARRAY_SIZE(extensions)))) + { + skip("Found 0 extensions.\n"); + return; + } + + create_info = instance_default_create_info; + create_info.instance_extensions = enabled_extensions; + create_info.instance_extension_count = extension_count; + hr = vkd3d_create_instance(&create_info, &instance); + ok(hr == S_OK, "Failed to create instance, hr %#x.\n", hr); + vk_instance = vkd3d_instance_get_vk_instance(instance); + ok(vk_instance != VK_NULL_HANDLE, "Failed to get Vulkan instance.\n"); + + for (i = 0; i < ARRAY_SIZE(extensions); ++i) + { + if (!extensions[i].is_supported) + continue; + + if (!strcmp(extensions[i].name, VK_KHR_XCB_SURFACE_EXTENSION_NAME)) + { + pfn = vkGetInstanceProcAddr(vk_instance, "vkCreateXcbSurfaceKHR"); + ok(pfn, "Failed to get proc addr for vkCreateXcbSurfaceKHR.\n"); + } + else if (!strcmp(extensions[i].name, VK_KHR_XLIB_SURFACE_EXTENSION_NAME)) + { + pfn = vkGetInstanceProcAddr(vk_instance, "vkCreateXlibSurfaceKHR"); + ok(pfn, "Failed to get proc addr for vkCreateXlibSurfaceKHR.\n"); + } + } + + refcount = vkd3d_instance_decref(instance); + ok(!refcount, "Instance has %u references left.\n", refcount); +} + static void test_create_device(void) { struct vkd3d_instance *instance, *tmp_instance; @@ -381,6 +479,7 @@ START_TEST(vkd3d_api) } run_test(test_create_instance); + run_test(test_additional_instance_extensions); run_test(test_create_device); run_test(test_required_device_extensions); run_test(test_physical_device);

1 0

Francois Gouget : testbot/web: Default to reporting on the activity of the past 24 hours.
by Alexandre Julliard Jan. 23, 2018

Jan. 23, 2018

Module: tools Branch: master Commit: 2dacba044866c50da175722e135848568d90e9fc URL: https://source.winehq.org/git/tools.git/?a=commit;h=2dacba044866c50da175722… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jan 23 05:34:34 2018 +0100 testbot/web: Default to reporting on the activity of the past 24 hours. This limits the time it takes to generate the activity page. One can still review the full activity log by specifying 0 as the time period to analyze. Also the page no longer self-refreshes for periods longer than the default. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/Activity.pl | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/testbot/web/Activity.pl b/testbot/web/Activity.pl index f8b7b5a..0b92299 100644 --- a/testbot/web/Activity.pl +++ b/testbot/web/Activity.pl @@ -24,27 +24,37 @@ package ActivityPage; use POSIX qw(strftime); use URI::Escape; -use ObjectModel::CGI::Page; +use ObjectModel::CGI::FreeFormPage; use WineTestBot::Config; use WineTestBot::Activity; use WineTestBot::Log; use WineTestBot::VMs; -(a)ActivityPage::ISA = qw(ObjectModel::CGI::Page); +(a)ActivityPage::ISA = qw(ObjectModel::CGI::FreeFormPage); + +my $HOURS_DEFAULT = 24; sub _initialize($$$) { my ($self, $Request, $RequiredRole) = @_; $self->{start} = Time(); + $self->{hours} = $self->GetParam("Hours"); + if (!defined $self->{hours} or $self->{hours} !~ /^\d{1,3}$/) + { + $self->{hours} = $HOURS_DEFAULT; + } + $self->SUPER::_initialize($Request, $RequiredRole); } sub GeneratePage($) { my ($self) = @_; - - $self->{Request}->headers_out->add("Refresh", "60"); + if ($self->{hours} and $self->{hours} <= $HOURS_DEFAULT) + { + $self->{Request}->headers_out->add("Refresh", "60"); + } $self->SUPER::GeneratePage(); } @@ -88,6 +98,11 @@ sub GenerateBody($) { my ($self) = @_; + # Generate a custom form to let the user specify the Hours field. + $self->GenerateFormStart(); + print "<div class='ItemProperty'><label>Analyze the activity of the past <div class='ItemValue'><input type='text' name='Hours' maxlength='3' size='3' value='$self->{hours}'/></div> hours.</div>\n"; + $self->GenerateFormEnd(); + print "<h1>${ProjectName} Test Bot activity</h1>\n"; print "<div class='Content'>\n"; @@ -132,7 +147,7 @@ EOF ### Generate the HTML table with the newest record first print "<tbody>\n"; - my ($Activity, $_Counters) = GetActivity($VMs); + my ($Activity, $_Counters) = GetActivity($VMs, $self->{hours} * 3600); for (my $Index = @$Activity; $Index--; ) { my $Group = $Activity->[$Index];

1 0

Francois Gouget : testbot: Allow restricting the activity analysis to the recent past.
by Alexandre Julliard Jan. 23, 2018

Jan. 23, 2018

Module: tools Branch: master Commit: afd2f80cbdc03e331c1ed64305edc2d719ee3689 URL: https://source.winehq.org/git/tools.git/?a=commit;h=afd2f80cbdc03e331c1ed64… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jan 23 05:33:59 2018 +0100 testbot: Allow restricting the activity analysis to the recent past. GetActivity() now takes the number of seconds of recent activity to analyze and uses it to limit the number of records and record groups that are retrieved from the database. This can greatly speed up the analysis. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Activity.pm | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/testbot/lib/WineTestBot/Activity.pm b/testbot/lib/WineTestBot/Activity.pm index 58169ae..fb2cee5 100644 --- a/testbot/lib/WineTestBot/Activity.pm +++ b/testbot/lib/WineTestBot/Activity.pm @@ -43,8 +43,8 @@ require Exporter; =item C<GetActivity()> -Loads the records for the specified VMs and processes them to build a structure -describing the TestBot activity. +Loads the records for the specified VMs going back the specified number of +seconds and processes them to build a structure describing the TestBot activity. Returns a list of the activity records, sorted from the oldest to the newest. Each entry contains a structure grouping all the state and event information @@ -90,19 +90,31 @@ that were processed. =back =cut -sub GetActivity($) +sub GetActivity($;$) { - my ($VMs) = @_; + my ($VMs, $Seconds) = @_; my ($ActivityHash, $Activity, $Counters) = ({}, [], {}); ### First load all the RecordGroups my $RecordGroups = CreateRecordGroups(); + if ($Seconds) + { + $RecordGroups->AddFilter("Timestamp", [time() - $Seconds], ">="); + } + my $MinId; $Counters->{recordgroups} = $RecordGroups->GetItemsCount(); foreach my $RecordGroup (sort CompareRecordGroups @{$RecordGroups->GetItems()}) { my $Group = { start => $RecordGroup->Timestamp }; $ActivityHash->{$RecordGroup->Id} = $Group; push @$Activity, $Group; + $MinId = $RecordGroup->Id if (!defined $MinId or $RecordGroup->Id < $MinId); + } + if (!defined $MinId) + { + # No activity was found in the specified period + $Counters->{records} = 0; + return ($Activity, $Counters); } ### And then load all the Records in one go @@ -111,6 +123,7 @@ sub GetActivity($) my $Jobs = CreateJobs(); my $Records = CreateRecords(); + $Records->AddFilter("RecordGroupId", [$MinId], ">="); $Counters->{records} = $Records->GetItemsCount(); foreach my $Record (@{$Records->GetItems()}) {

1 0

Francois Gouget : testbot: Add support for more collection filter types.
by Alexandre Julliard Jan. 23, 2018

Jan. 23, 2018

Module: tools Branch: master Commit: 114d3483d2bf714d7f4696466d5164666a99efb4 URL: https://source.winehq.org/git/tools.git/?a=commit;h=114d3483d2bf714d7f46964… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jan 23 05:32:30 2018 +0100 testbot: Add support for more collection filter types. By default filters still return the rows where the specified field is equal to one of the specified values. But now they can also be set to return rows where the field is smaller, greater, different or like one of the specified values. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/Collection.pm | 6 +++--- testbot/lib/ObjectModel/DBIBackEnd.pm | 23 +++++++++++++++++++++-- 2 files changed, 24 insertions(+), 5 deletions(-) diff --git a/testbot/lib/ObjectModel/Collection.pm b/testbot/lib/ObjectModel/Collection.pm index a9ec995..86dee05 100644 --- a/testbot/lib/ObjectModel/Collection.pm +++ b/testbot/lib/ObjectModel/Collection.pm @@ -656,11 +656,11 @@ sub DeleteAll($) return undef; } -sub AddFilter($$$) +sub AddFilter($$$;$) { - my ($self, $PropertyName, $Value) = @_; + my ($self, $PropertyName, $Values, $Type) = @_; - $self->{Filters}{$PropertyName} = $Value; + $self->{Filters}{$PropertyName} = [($Type || "="), $Values]; } sub GetFilters($) diff --git a/testbot/lib/ObjectModel/DBIBackEnd.pm b/testbot/lib/ObjectModel/DBIBackEnd.pm index 0594951..565d4a8 100644 --- a/testbot/lib/ObjectModel/DBIBackEnd.pm +++ b/testbot/lib/ObjectModel/DBIBackEnd.pm @@ -179,6 +179,16 @@ sub BuildFieldList($$) return $Fields; } +my %_AllowedFilterTypes = ( + "=" => 1, + "<>" => 1, + "<" => 1, + "<=" => 1, + ">" => 1, + ">=" => 1, + "LIKE" => 1, +); + sub LoadCollection($$) { my ($self, $Collection) = @_; @@ -202,7 +212,16 @@ sub LoadCollection($$) $Where .= " AND "; } my $PropertyDescriptor = $Collection->GetPropertyDescriptorByName($FilterProperty); - my $FilterValues = $Filters->{$FilterProperty}; + my ($FilterType, $FilterValues) = @{$Filters->{$FilterProperty}}; + if (!$_AllowedFilterTypes{$FilterType}) + { + die "unknown '$FilterType' filter type"; + } + if (!@$FilterValues) + { + die "no values for the '$FilterType' filter"; + } + if (@$FilterValues != 1) { $Where .= "("; @@ -220,7 +239,7 @@ sub LoadCollection($$) } foreach my $ColName (@{$PropertyDescriptor->GetColNames()}) { - $Where .= "$ColName = ?"; + $Where .= "$ColName $FilterType ?"; $Data[@Data] = $self->ToDb($ColValue, $PropertyDescriptor); } }

1 0

Józef Kucia : tests: Add test for required device extensions.
by Alexandre Julliard Jan. 23, 2018

Jan. 23, 2018

Module: vkd3d Branch: master Commit: 16723f9d718db63300629f48253c196b1a9ef0b9 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=16723f9d718db63300629f4… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jan 19 17:17:25 2018 +0100 tests: Add test for required device extensions. 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> --- tests/vkd3d_api.c | 97 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 97 insertions(+) diff --git a/tests/vkd3d_api.c b/tests/vkd3d_api.c index 8923d8e..8dd7c78 100644 --- a/tests/vkd3d_api.c +++ b/tests/vkd3d_api.c @@ -148,6 +148,102 @@ static void test_create_device(void) ok(!refcount, "Instance has %u references left.\n", refcount); } +static VkResult VKAPI_CALL fake_vkEnumerateDeviceExtensionProperties( + VkPhysicalDevice physical_device, const char *layer_name, + uint32_t *out_count, VkExtensionProperties *out_properties) +{ + VkExtensionProperties *properties; + uint32_t count, i, j; + VkResult vr; + + vr = vkEnumerateDeviceExtensionProperties(physical_device, layer_name, &count, NULL); + ok(vr == VK_SUCCESS, "Got unexpected VkResult %d.\n", vr); + if (!count) + { + *out_count = count; + return vr; + } + + properties = calloc(count, sizeof(*properties)); + ok(properties, "Failed to allocate memory.\n"); + + vr = vkEnumerateDeviceExtensionProperties(physical_device, layer_name, &count, properties); + ok(vr == VK_SUCCESS, "Got unexpected VkResult %d.\n", vr); + + vr = VK_SUCCESS; + for (i = 0, j = 0; i < count; ++i) + { + /* Filter out VK_KHR_maintenance1. */ + if (!strcmp(properties[i].extensionName, VK_KHR_MAINTENANCE1_EXTENSION_NAME)) + continue; + + if (out_properties) + { + if (j < *out_count) + out_properties[j] = properties[i]; + else + vr = VK_INCOMPLETE; + } + + ++j; + } + + free(properties); + + *out_count = j; + return vr; +} + +static VkResult VKAPI_CALL fake_vkCreateDevice(VkPhysicalDevice physical_device, + const VkDeviceCreateInfo *create_info, const VkAllocationCallbacks *allocator, + VkDevice *device) +{ + uint32_t i; + + for (i = 0; i < create_info->enabledExtensionCount; ++i) + { + if (!strcmp(create_info->ppEnabledExtensionNames[i], VK_KHR_MAINTENANCE1_EXTENSION_NAME)) + return VK_ERROR_EXTENSION_NOT_PRESENT; + } + + return vkCreateDevice(physical_device, create_info, allocator, device); +} + +static PFN_vkVoidFunction VKAPI_CALL fake_vkGetInstanceProcAddr(VkInstance instance, + const char *name) +{ + if (!strcmp(name, "vkCreateDevice")) + return (PFN_vkVoidFunction)fake_vkCreateDevice; + if (!strcmp(name, "vkEnumerateDeviceExtensionProperties")) + return (PFN_vkVoidFunction)fake_vkEnumerateDeviceExtensionProperties; + + return vkGetInstanceProcAddr(instance, name); +} + +static void test_required_device_extensions(void) +{ + struct vkd3d_instance_create_info instance_create_info; + struct vkd3d_device_create_info device_create_info; + struct vkd3d_instance *instance; + ID3D12Device *device; + ULONG refcount; + HRESULT hr; + + instance_create_info = instance_default_create_info; + instance_create_info.vkGetInstanceProcAddr_pfn = fake_vkGetInstanceProcAddr; + hr = vkd3d_create_instance(&instance_create_info, &instance); + ok(hr == S_OK, "Failed to create instance, hr %#x.\n", hr); + + device_create_info = device_default_create_info; + device_create_info.instance = instance; + device_create_info.instance_create_info = NULL; + hr = vkd3d_create_device(&device_create_info, &IID_ID3D12Device, (void **)&device); + ok(hr == E_FAIL, "Failed to create device, hr %#x.\n", hr); + + refcount = vkd3d_instance_decref(instance); + ok(!refcount, "Instance has %u references left.\n", refcount); +} + static void test_physical_device(void) { struct vkd3d_device_create_info create_info; @@ -264,6 +360,7 @@ START_TEST(vkd3d_api) run_test(test_create_instance); run_test(test_create_device); + run_test(test_required_device_extensions); run_test(test_physical_device); run_test(test_vkd3d_queue); }

1 0