March 2022 - Wine-Commits - list.winehq.org

Eric Pouech : include: Fix prototype of NtQueryInformationFile.
by Alexandre Julliard March 10, 2022

March 10, 2022

Module: wine Branch: master Commit: bd3c533f2938cfdb25969bbfa4e2bbb1d141848e URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd3c533f2938cfdb25969bbf… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Mar 8 17:43:56 2022 +0100 include: Fix prototype of NtQueryInformationFile. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/file.c | 2 +- include/winternl.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index a29b5cbb980..cc8bf0c6e82 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -4021,7 +4021,7 @@ NTSTATUS WINAPI NtQueryAttributesFile( const OBJECT_ATTRIBUTES *attr, FILE_BASIC * NtQueryInformationFile (NTDLL.@) */ NTSTATUS WINAPI NtQueryInformationFile( HANDLE handle, IO_STATUS_BLOCK *io, - void *ptr, LONG len, FILE_INFORMATION_CLASS class ) + void *ptr, ULONG len, FILE_INFORMATION_CLASS class ) { static const size_t info_sizes[] = { diff --git a/include/winternl.h b/include/winternl.h index 6a95c4e0fdc..4c49f5eae47 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -4048,7 +4048,7 @@ NTSYSAPI NTSTATUS WINAPI NtQueryEaFile(HANDLE,PIO_STATUS_BLOCK,PVOID,ULONG,BOOL NTSYSAPI NTSTATUS WINAPI NtQueryEvent(HANDLE,EVENT_INFORMATION_CLASS,PVOID,ULONG,PULONG); NTSYSAPI NTSTATUS WINAPI NtQueryFullAttributesFile(const OBJECT_ATTRIBUTES*,FILE_NETWORK_OPEN_INFORMATION*); NTSYSAPI NTSTATUS WINAPI NtQueryInformationAtom(RTL_ATOM,ATOM_INFORMATION_CLASS,PVOID,ULONG,ULONG*); -NTSYSAPI NTSTATUS WINAPI NtQueryInformationFile(HANDLE,PIO_STATUS_BLOCK,PVOID,LONG,FILE_INFORMATION_CLASS); +NTSYSAPI NTSTATUS WINAPI NtQueryInformationFile(HANDLE,PIO_STATUS_BLOCK,PVOID,ULONG,FILE_INFORMATION_CLASS); NTSYSAPI NTSTATUS WINAPI NtQueryInformationJobObject(HANDLE,JOBOBJECTINFOCLASS,PVOID,ULONG,PULONG); NTSYSAPI NTSTATUS WINAPI NtQueryInformationPort(HANDLE,PORT_INFORMATION_CLASS,PVOID,ULONG,PULONG); NTSYSAPI NTSTATUS WINAPI NtQueryInformationProcess(HANDLE,PROCESSINFOCLASS,PVOID,ULONG,PULONG);

1 0

Eric Pouech : ws2_32/tests: Use correct integral type.
by Alexandre Julliard March 10, 2022

March 10, 2022

Module: wine Branch: master Commit: 2c0b24b6705c4c48167886fe5b9bb6db3a370220 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2c0b24b6705c4c48167886fe… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Mar 10 08:47:52 2022 +0100 ws2_32/tests: Use correct integral type. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index a0bbde875d3..38c8b65ccdb 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2633,7 +2633,7 @@ static void test_WSASocket(void) int wsaproviders[] = {IPPROTO_TCP, IPPROTO_IP}; int autoprotocols[] = {IPPROTO_TCP, IPPROTO_UDP}; int items, err, size, socktype, i, j; - UINT pi_size; + DWORD pi_size; static const struct {

1 0

Eric Pouech : ws2_32/tests: Enable compilation with long types.
by Alexandre Julliard March 10, 2022

March 10, 2022

Module: wine Branch: master Commit: 027d7db8159e6d104730f66406a54907c95bc823 URL: https://source.winehq.org/git/wine.git/?a=commit;h=027d7db8159e6d104730f664… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Mar 10 08:47:59 2022 +0100 ws2_32/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/Makefile.in | 1 - dlls/ws2_32/tests/afd.c | 160 ++--- dlls/ws2_32/tests/protocol.c | 135 ++-- dlls/ws2_32/tests/sock.c | 1524 ++++++++++++++++++++--------------------- 4 files changed, 912 insertions(+), 908 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=027d7db8159e6d104730…

1 0

Eric Pouech : user32/tests: Wrap helper macro inside function.
by Alexandre Julliard March 10, 2022

March 10, 2022

Module: wine Branch: master Commit: c34f23813f0ccb3affa0f668149491ca2d19939c URL: https://source.winehq.org/git/wine.git/?a=commit;h=c34f23813f0ccb3affa0f668… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Mar 10 08:46:41 2022 +0100 user32/tests: Wrap helper macro inside function. this lets the compiler do the int => long conversions Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/edit.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index 6edec12e03b..777c50be337 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -2018,8 +2018,11 @@ static void test_margins_font_change(void) } -#define edit_pos_ok(exp, got, txt) \ - ok(exp == got, "wrong " #txt " expected %d got %d\n", exp, got); +#define edit_pos_ok(exp, got, txt) edit_pos_ok_(__LINE__, exp, got, #txt) +static inline void edit_pos_ok_(unsigned line, DWORD exp, DWORD got, const char* txt) +{ + ok_(__FILE__, line)(exp == got, "wrong %s expected %ld got %ld\n", txt, exp, got); +} #define check_pos(hwEdit, set_height, test_top, test_height, test_left) \ do { \

1 0

Eric Pouech : wpc/tests: Enable compilation with long types.
by Alexandre Julliard March 10, 2022

March 10, 2022

Module: wine Branch: master Commit: 8d6358d59ae00ae0c386df3a4982d356aae9ac44 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d6358d59ae00ae0c386df3a… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Mar 10 08:47:35 2022 +0100 wpc/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wpc/tests/Makefile.in | 1 - dlls/wpc/tests/wpc.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/wpc/tests/Makefile.in b/dlls/wpc/tests/Makefile.in index 45098b8fbf9..72f550d576f 100644 --- a/dlls/wpc/tests/Makefile.in +++ b/dlls/wpc/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = wpc.dll IMPORTS = ole32 diff --git a/dlls/wpc/tests/wpc.c b/dlls/wpc/tests/wpc.c index 2cf35ccf6ec..3dbf595a9a7 100644 --- a/dlls/wpc/tests/wpc.c +++ b/dlls/wpc/tests/wpc.c @@ -32,7 +32,7 @@ static void test_wpc(void) if(hres == REGDB_E_CLASSNOTREG) win_skip("CLSID_WindowsParentalControls not registered\n"); else - ok(hres == S_OK, "Could not create CLSID_WindowsParentalControls instance: %08x\n", hres); + ok(hres == S_OK, "Could not create CLSID_WindowsParentalControls instance: %08lx\n", hres); if(FAILED(hres)) return;

1 0

Zebediah Figura : winegstreamer: Deliver samples in PTS order instead of alternating.
by Alexandre Julliard March 10, 2022

March 10, 2022

Module: wine Branch: master Commit: 446bb1ebf6618383a4f81864a17bbaf2d6abe2b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=446bb1ebf6618383a4f81864… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Mar 9 18:56:15 2022 -0600 winegstreamer: Deliver samples in PTS order instead of alternating. For the async reader, and when requesting stream 0. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gst_private.h | 4 +- dlls/winegstreamer/wm_asyncreader.c | 93 ++++++++++++++++------------------- dlls/winegstreamer/wm_reader.c | 97 +++++++++++++++++++++++++++++++------ dlls/winegstreamer/wm_syncreader.c | 57 +++------------------- 4 files changed, 135 insertions(+), 116 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=446bb1ebf6618383a4f8…

1 0

Georg Lehmann : winevulkan: Avoid zero-sized allocations.
by Alexandre Julliard March 10, 2022

March 10, 2022

Module: wine Branch: master Commit: be8b50b82d4d71975a7a49a9b0e9685b27de8e68 URL: https://source.winehq.org/git/wine.git/?a=commit;h=be8b50b82d4d71975a7a49a9… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Wed Mar 9 22:11:48 2022 +0100 winevulkan: Avoid zero-sized allocations. Fixes some -Wmaybe-uninitialized warnings in the next patch. Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 2 +- dlls/winevulkan/vulkan_thunks.c | 84 ++++++++++++++++++++--------------------- 2 files changed, 43 insertions(+), 43 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=be8b50b82d4d71975a7a…

1 0

Georg Lehmann : winevulkan: Enable VK_EXT_pipeline_creation_feedback.
by Alexandre Julliard March 10, 2022

March 10, 2022

Module: wine Branch: master Commit: d08d3c184e088972f0d29ea77456409bbce5d5ef URL: https://source.winehq.org/git/wine.git/?a=commit;h=d08d3c184e088972f0d29ea7… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Wed Mar 9 22:11:50 2022 +0100 winevulkan: Enable VK_EXT_pipeline_creation_feedback. We did previously not support this extension because it runs into 32bit alignment issues but those are now fixed. Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 1 - dlls/winevulkan/vulkan_thunks.c | 1 + include/wine/vulkan.h | 3 +++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 3f2f3371cfa..583388ecaf7 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -96,7 +96,6 @@ UNSUPPORTED_EXTENSIONS = [ "VK_AMD_display_native_hdr", "VK_EXT_full_screen_exclusive", "VK_EXT_hdr_metadata", # Needs WSI work. - "VK_EXT_pipeline_creation_feedback", "VK_GOOGLE_display_timing", "VK_KHR_external_fence_win32", "VK_KHR_external_semaphore_win32", diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index 7533f9248b8..54a658c0629 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -9609,6 +9609,7 @@ static const char * const vk_device_extensions[] = "VK_EXT_pageable_device_local_memory", "VK_EXT_pci_bus_info", "VK_EXT_pipeline_creation_cache_control", + "VK_EXT_pipeline_creation_feedback", "VK_EXT_post_depth_coverage", "VK_EXT_primitive_topology_list_restart", "VK_EXT_private_data", diff --git a/include/wine/vulkan.h b/include/wine/vulkan.h index a89e8ebf9fb..250a03634c4 100644 --- a/include/wine/vulkan.h +++ b/include/wine/vulkan.h @@ -293,6 +293,8 @@ #define VK_AMD_MEMORY_OVERALLOCATION_BEHAVIOR_EXTENSION_NAME "VK_AMD_memory_overallocation_behavior" #define VK_EXT_VERTEX_ATTRIBUTE_DIVISOR_SPEC_VERSION 3 #define VK_EXT_VERTEX_ATTRIBUTE_DIVISOR_EXTENSION_NAME "VK_EXT_vertex_attribute_divisor" +#define VK_EXT_PIPELINE_CREATION_FEEDBACK_SPEC_VERSION 1 +#define VK_EXT_PIPELINE_CREATION_FEEDBACK_EXTENSION_NAME "VK_EXT_pipeline_creation_feedback" #define VK_KHR_DRIVER_PROPERTIES_SPEC_VERSION 1 #define VK_KHR_DRIVER_PROPERTIES_EXTENSION_NAME "VK_KHR_driver_properties" #define VK_KHR_SHADER_FLOAT_CONTROLS_SPEC_VERSION 4 @@ -3842,6 +3844,7 @@ typedef enum VkStructureType VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_SUBGROUP_EXTENDED_TYPES_FEATURES_KHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_SUBGROUP_EXTENDED_TYPES_FEATURES, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_8BIT_STORAGE_FEATURES_KHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_8BIT_STORAGE_FEATURES, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_ATOMIC_INT64_FEATURES_KHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_ATOMIC_INT64_FEATURES, + VK_STRUCTURE_TYPE_PIPELINE_CREATION_FEEDBACK_CREATE_INFO_EXT = VK_STRUCTURE_TYPE_PIPELINE_CREATION_FEEDBACK_CREATE_INFO, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DRIVER_PROPERTIES_KHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DRIVER_PROPERTIES, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FLOAT_CONTROLS_PROPERTIES_KHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FLOAT_CONTROLS_PROPERTIES, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEPTH_STENCIL_RESOLVE_PROPERTIES_KHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEPTH_STENCIL_RESOLVE_PROPERTIES,

1 0

Georg Lehmann : winevulkan: Update to VK spec version 1.3.207.
by Alexandre Julliard March 10, 2022

March 10, 2022

Module: wine Branch: master Commit: ddd9a4239a5fdfa77bbcf1c826041910e2c4952f URL: https://source.winehq.org/git/wine.git/?a=commit;h=ddd9a4239a5fdfa77bbcf1c8… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Tue Mar 8 14:44:51 2022 +0100 winevulkan: Update to VK spec version 1.3.207. Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/loader_thunks.c | 20 +++++++++++++++ dlls/winevulkan/loader_thunks.h | 16 ++++++++++++ dlls/winevulkan/make_vulkan | 2 +- dlls/winevulkan/vulkan_thunks.c | 57 +++++++++++++++++++++++++++++++++++++++++ dlls/winevulkan/vulkan_thunks.h | 16 ++++++++++++ dlls/winevulkan/winevulkan.json | 2 +- include/wine/vulkan.h | 48 +++++++++++++++++++++++++++------- 7 files changed, 150 insertions(+), 11 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ddd9a4239a5fdfa77bbc…

1 0

Eric Pouech : wlanapi/tests: Enable compilation with long types.
by Alexandre Julliard March 10, 2022

March 10, 2022

Module: wine Branch: master Commit: 63cf3447f01cfeac0f732ba4c2ff1e81cdfb7cf9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=63cf3447f01cfeac0f732ba4… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Mar 10 08:47:20 2022 +0100 wlanapi/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wlanapi/tests/Makefile.in | 1 - dlls/wlanapi/tests/wlanapi.c | 60 +++++++++++++++++++++--------------------- 2 files changed, 30 insertions(+), 31 deletions(-) diff --git a/dlls/wlanapi/tests/Makefile.in b/dlls/wlanapi/tests/Makefile.in index 6fede3572c8..a08db320f1f 100644 --- a/dlls/wlanapi/tests/Makefile.in +++ b/dlls/wlanapi/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = wlanapi.dll IMPORTS = wlanapi diff --git a/dlls/wlanapi/tests/wlanapi.c b/dlls/wlanapi/tests/wlanapi.c index 55ac21eee04..5c26e6d8ba0 100644 --- a/dlls/wlanapi/tests/wlanapi.c +++ b/dlls/wlanapi/tests/wlanapi.c @@ -35,73 +35,73 @@ static void test_WlanOpenHandle(void) is_xp = ret == ERROR_SUCCESS; if (!is_xp) /* the results in XP differ completely from all other versions */ { - ok(ret == ERROR_NOT_SUPPORTED, "Expected 50, got %d\n", ret); + ok(ret == ERROR_NOT_SUPPORTED, "Expected 50, got %ld\n", ret); ok(neg_version == 0xdeadbeef, "neg_version changed\n"); ok(handle == bad_handle, "handle changed\n"); ret = WlanOpenHandle(10, NULL, &neg_version, &handle); - ok(ret == ERROR_NOT_SUPPORTED, "Expected 50, got %d\n", ret); + ok(ret == ERROR_NOT_SUPPORTED, "Expected 50, got %ld\n", ret); ok(neg_version == 0xdeadbeef, "neg_version changed\n"); ok(handle == bad_handle, "handle changed\n"); /* reserved parameter must not be used */ ret = WlanOpenHandle(1, &reserved, &neg_version, &handle); - ok(ret == ERROR_INVALID_PARAMETER, "Expected 87, got %d\n", ret); + ok(ret == ERROR_INVALID_PARAMETER, "Expected 87, got %ld\n", ret); ok(neg_version == 0xdeadbeef, "neg_version changed\n"); ok(handle == bad_handle, "handle changed\n"); /* invalid parameters */ ret = WlanOpenHandle(1, NULL, NULL, &handle); - ok(ret == ERROR_INVALID_PARAMETER, "Expected 87, got %d\n", ret); + ok(ret == ERROR_INVALID_PARAMETER, "Expected 87, got %ld\n", ret); ok(handle == bad_handle, "bad handle\n"); ret = WlanOpenHandle(1, NULL, &neg_version, NULL); - ok(ret == ERROR_INVALID_PARAMETER, "Expected 87, got %d\n", ret); + ok(ret == ERROR_INVALID_PARAMETER, "Expected 87, got %ld\n", ret); ok(neg_version == 0xdeadbeef, "neg_version changed\n"); } else { - ok(neg_version == 1, "Expected 1, got %d\n", neg_version); + ok(neg_version == 1, "Expected 1, got %ld\n", neg_version); ok(handle != bad_handle && handle, "handle changed\n"); ret = WlanCloseHandle(handle, NULL); - ok(ret == 0, "Expected 0, got %d\n", ret); + ok(ret == 0, "Expected 0, got %ld\n", ret); } /* good tests */ ret = WlanOpenHandle(1, NULL, &neg_version, &handle); - ok(ret == ERROR_SUCCESS, "Expected 0, got %d\n", ret); - ok(neg_version == 1, "Expected 1, got %d\n", neg_version); + ok(ret == ERROR_SUCCESS, "Expected 0, got %ld\n", ret); + ok(neg_version == 1, "Expected 1, got %ld\n", neg_version); ok(handle != bad_handle && handle, "handle changed\n"); ret = WlanCloseHandle(handle, NULL); - ok(ret == 0, "Expected 0, got %d\n", ret); + ok(ret == 0, "Expected 0, got %ld\n", ret); ret = WlanOpenHandle(2, NULL, &neg_version, &handle); - ok(ret == ERROR_SUCCESS, "Expected 0, got %d\n", ret); + ok(ret == ERROR_SUCCESS, "Expected 0, got %ld\n", ret); if (!is_xp) /* XP does not support client version 2 */ - ok(neg_version == 2, "Expected 2, got %d\n", neg_version); + ok(neg_version == 2, "Expected 2, got %ld\n", neg_version); else - ok(neg_version == 1, "Expected 1, got %d\n", neg_version); + ok(neg_version == 1, "Expected 1, got %ld\n", neg_version); ok(handle != bad_handle && handle, "bad handle\n"); ret = WlanCloseHandle(handle, NULL); - ok(ret == 0, "Expected 0, got %d\n", ret); + ok(ret == 0, "Expected 0, got %ld\n", ret); /* open twice */ ret = WlanOpenHandle(1, NULL, &neg_version, &handle); - ok(ret == ERROR_SUCCESS, "Expected 0, got %d\n", ret); + ok(ret == ERROR_SUCCESS, "Expected 0, got %ld\n", ret); ret = WlanOpenHandle(1, NULL, &neg_version, &handle2); - ok(ret == ERROR_SUCCESS, "Expected 0, got %d\n", ret); + ok(ret == ERROR_SUCCESS, "Expected 0, got %ld\n", ret); ret = WlanCloseHandle(handle, &reserved); - ok(ret == ERROR_INVALID_PARAMETER, "Expected 87, got %d\n", ret); + ok(ret == ERROR_INVALID_PARAMETER, "Expected 87, got %ld\n", ret); ret = WlanCloseHandle(handle, NULL); - ok(ret == ERROR_SUCCESS, "Expected 0, got %d\n", ret); + ok(ret == ERROR_SUCCESS, "Expected 0, got %ld\n", ret); ret = WlanCloseHandle(handle2, NULL); - ok(ret == ERROR_SUCCESS, "Expected 0, got %d\n", ret); + ok(ret == ERROR_SUCCESS, "Expected 0, got %ld\n", ret); ret = WlanCloseHandle(bad_handle, NULL); - ok(ret == ERROR_INVALID_HANDLE, "Expected 6, got %d\n", ret); + ok(ret == ERROR_INVALID_HANDLE, "Expected 6, got %ld\n", ret); ret = WlanCloseHandle(NULL, NULL); - ok(ret == ERROR_INVALID_PARAMETER, "Expected 87, got %d\n", ret); + ok(ret == ERROR_INVALID_PARAMETER, "Expected 87, got %ld\n", ret); } static void test_WlanAllocateFreeMemory(void) @@ -111,7 +111,7 @@ static void test_WlanAllocateFreeMemory(void) SetLastError(0xdeadbeef); ptr = WlanAllocateMemory(0); ok(ptr == NULL, "Expected NULL, got %p\n", ptr); - ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected 87, got %d\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected 87, got %ld\n", GetLastError()); ptr = WlanAllocateMemory(1024); ok(ptr != NULL, "Expected non-NULL\n"); @@ -130,23 +130,23 @@ static void test_WlanEnumInterfaces(void) WLAN_INTERFACE_INFO *info; ret = WlanOpenHandle(1, NULL, &neg_version, &handle); - ok(ret == 0, "Expected 0, got %d\n", ret); + ok(ret == 0, "Expected 0, got %ld\n", ret); /* invalid parameters */ ret = WlanEnumInterfaces(NULL, NULL, &list); - ok(ret == ERROR_INVALID_PARAMETER, "Expected 87, got %d\n", ret); + ok(ret == ERROR_INVALID_PARAMETER, "Expected 87, got %ld\n", ret); ok(list == bad_list, "list changed\n"); ret = WlanEnumInterfaces(handle, &reserved, &list); - ok(ret == ERROR_INVALID_PARAMETER, "Expected 87, got %d\n", ret); + ok(ret == ERROR_INVALID_PARAMETER, "Expected 87, got %ld\n", ret); ok(list == bad_list, "list changed\n"); ret = WlanEnumInterfaces(handle, NULL, NULL); - ok(ret == ERROR_INVALID_PARAMETER, "Expected 87, got %d\n", ret); + ok(ret == ERROR_INVALID_PARAMETER, "Expected 87, got %ld\n", ret); ok(list == bad_list, "list changed\n"); /* good tests */ list = NULL; ret = WlanEnumInterfaces(handle, NULL, &list); - ok(ret == ERROR_SUCCESS, "Expected 0, got %d\n", ret); + ok(ret == ERROR_SUCCESS, "Expected 0, got %ld\n", ret); ok(list != NULL, "bad interface list\n"); if (!list || !list->dwNumberOfItems) { @@ -156,11 +156,11 @@ static void test_WlanEnumInterfaces(void) return; } - trace("Wireless interfaces: %d\n", list->dwNumberOfItems); + trace("Wireless interfaces: %ld\n", list->dwNumberOfItems); for (i = 0; i < list->dwNumberOfItems;i ++) { info = &list->InterfaceInfo[i]; - trace(" Index[%d] GUID: %s\n", i, wine_dbgstr_guid(&info->InterfaceGuid)); + trace(" Index[%ld] GUID: %s\n", i, wine_dbgstr_guid(&info->InterfaceGuid)); switch (info->isState) { case wlan_interface_state_disconnected: @@ -179,7 +179,7 @@ static void test_WlanEnumInterfaces(void) WlanFreeMemory(list); ret = WlanCloseHandle(handle, NULL); - ok(ret == 0, "Expected 0, got %d\n", ret); + ok(ret == 0, "Expected 0, got %ld\n", ret); } START_TEST(wlanapi)

1 0