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

Paul Gofman : winhttp: Use completion port for async send.
by Alexandre Julliard June 9, 2022

June 9, 2022

Module: wine Branch: master Commit: 4f8fe3b1846943dbadb9725368c481b4a2ba5b96 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f8fe3b1846943dbadb97253… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Jun 8 11:57:54 2022 -0500 winhttp: Use completion port for async send. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/winhttp/net.c | 23 +++++++++++++++++++++-- dlls/winhttp/winhttp_private.h | 1 + 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index a17582c90a6..40c9f3c8534 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -53,9 +53,20 @@ static int sock_send(int fd, const void *msg, size_t len, WSAOVERLAPPED *ovr) BOOL netconn_wait_overlapped_result( struct netconn *conn, WSAOVERLAPPED *ovr, DWORD *len ) { - DWORD retflags; + OVERLAPPED *completion_ovr; + ULONG_PTR key; - return WSAGetOverlappedResult( conn->socket, ovr, len, TRUE, &retflags ); + if (!GetQueuedCompletionStatus( conn->port, len, &key, &completion_ovr, INFINITE )) + { + WARN( "GetQueuedCompletionStatus failed, err %lu.\n", GetLastError() ); + return FALSE; + } + if ((key != conn->socket && conn->socket != -1) || completion_ovr != (OVERLAPPED *)ovr) + { + ERR( "Unexpected completion key %Ix, overlapped %p.\n", key, completion_ovr ); + return FALSE; + } + return TRUE; } static int sock_recv(int fd, void *msg, size_t len, int flags) @@ -279,6 +290,8 @@ void netconn_close( struct netconn *conn ) if (conn->socket != -1) closesocket( conn->socket ); release_host( conn->host ); + if (conn->port) + CloseHandle( conn->port ); free(conn); } @@ -452,6 +465,12 @@ DWORD netconn_send( struct netconn *conn, const void *msg, size_t len, int *sent { DWORD err; + if (ovr && !conn->port) + { + if (!(conn->port = CreateIoCompletionPort( (HANDLE)(SOCKET)conn->socket, NULL, (ULONG_PTR)conn->socket, 0 ))) + ERR( "Failed to create port.\n" ); + } + if (conn->secure) { const BYTE *ptr = msg; diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 6c381af627f..79941dee31a 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -117,6 +117,7 @@ struct netconn char *peek_msg; char *peek_msg_mem; size_t peek_len; + HANDLE port; }; struct header

1 0

Alexandre Julliard : ntdll: Move the user locale initialization to the Unix side.
by Alexandre Julliard June 9, 2022

June 9, 2022

Module: wine Branch: master Commit: 21a1c3097236e7de6451ce13958a6dc7edf27285 URL: https://source.winehq.org/git/wine.git/?a=commit;h=21a1c3097236e7de6451ce13… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 9 12:41:29 2022 +0200 ntdll: Move the user locale initialization to the Unix side. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/locale.c | 16 +--------------- dlls/ntdll/unix/env.c | 51 ++++++++++++++++++++++++++++++++++++--------------- 2 files changed, 37 insertions(+), 30 deletions(-) diff --git a/dlls/ntdll/locale.c b/dlls/ntdll/locale.c index b5a11c41516..b4bfdf48f0c 100644 --- a/dlls/ntdll/locale.c +++ b/dlls/ntdll/locale.c @@ -92,10 +92,9 @@ void locale_init(void) { USHORT utf8[2] = { 0, CP_UTF8 }; WCHAR locale[LOCALE_NAME_MAX_LENGTH]; - UNICODE_STRING name, value; LARGE_INTEGER unused; SIZE_T size; - LCID system_lcid, user_lcid = 0; + LCID system_lcid; UINT ansi_cp = 1252, oem_cp = 437; void *ansi_ptr = utf8, *oem_ptr = utf8, *case_ptr; NTSTATUS status; @@ -109,21 +108,8 @@ void locale_init(void) } locale_table = (const NLS_LOCALE_HEADER *)((char *)header + header->locales); - value.Buffer = locale; - value.MaximumLength = sizeof(locale); - RtlInitUnicodeString( &name, L"WINEUSERLOCALE" ); - if (!RtlQueryEnvironmentVariable_U( NULL, &name, &value )) - { - const NLS_LOCALE_LCNAME_INDEX *entry = find_lcname_entry( locale_table, locale ); - if (entry) user_lcid = get_locale_data( locale_table, entry->idx )->idefaultlanguage; - } - if (!user_lcid) user_lcid = system_lcid; - NtSetDefaultUILanguage( user_lcid ); - NtSetDefaultLocale( TRUE, user_lcid ); - if (system_lcid == LOCALE_CUSTOM_UNSPECIFIED) { - system_lcid = MAKELANGID( LANG_ENGLISH, SUBLANG_DEFAULT ); ansi_cp = oem_cp = CP_UTF8; } else diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index 6f67ed40245..a71df03966f 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -113,13 +113,17 @@ static char *get_nls_file_path( ULONG type, ULONG id ) return path; } -static void *read_nls_file( ULONG type, ULONG id ) +static void *read_nls_file( const char *name ) { - char *path = get_nls_file_path( type, id ); + const char *dir = build_dir ? build_dir : data_dir; + char *path; struct stat st; void *data, *ret = NULL; int fd; + if (!(path = malloc( strlen(dir) + strlen(name) + 10 ))) return NULL; + sprintf( path, "%s/nls/%s", dir, name ); + if ((fd = open( path, O_RDONLY )) != -1) { fstat( fd, &st ); @@ -135,7 +139,7 @@ static void *read_nls_file( ULONG type, ULONG id ) } close( fd ); } - else ERR( "failed to load %u/%u\n", type, id ); + else ERR( "failed to load %s\n", path ); free( path ); return ret; } @@ -201,7 +205,7 @@ static struct norm_table *nfc_table; static void init_unix_codepage(void) { - nfc_table = read_nls_file( NLS_SECTION_NORMALIZE, NormalizationC ); + nfc_table = read_nls_file( "normnfc.nls" ); } #elif defined(__ANDROID__) /* Android always uses UTF-8 */ @@ -297,8 +301,11 @@ static void init_unix_codepage(void) { if (charset_names[pos].cp != CP_UTF8) { - void *data = read_nls_file( NLS_SECTION_CODEPAGE, charset_names[pos].cp ); - if (data) init_codepage_table( data, &unix_cp ); + char buffer[16]; + void *data; + + sprintf( buffer, "c_%03u.nls", charset_names[pos].cp ); + if ((data = read_nls_file( buffer ))) init_codepage_table( data, &unix_cp ); } return; } @@ -761,17 +768,14 @@ static BOOL unix_to_win_locale( const char *unix_name, char *win_name ) } -static LCID init_system_lcid( const struct locale_nls_header *header ) +static const NLS_LOCALE_DATA *get_win_locale( const NLS_LOCALE_HEADER *header, const char *win_name ) { WCHAR name[LOCALE_NAME_MAX_LENGTH]; - const NLS_LOCALE_HEADER *locale_table = (const NLS_LOCALE_HEADER *)((char *)header + header->locales); const NLS_LOCALE_LCNAME_INDEX *entry; - ascii_to_unicode( name, system_locale, strlen(system_locale) + 1 ); - if ((entry = find_lcname_entry( locale_table, name ))) - return get_locale_data( locale_table, entry->idx )->idefaultlanguage; - - return MAKELANGID( LANG_ENGLISH, SUBLANG_DEFAULT ); + ascii_to_unicode( name, win_name, strlen(win_name) + 1 ); + if (!(entry = find_lcname_entry( header, name ))) return NULL; + return get_locale_data( header, entry->idx ); } @@ -780,6 +784,10 @@ static LCID init_system_lcid( const struct locale_nls_header *header ) */ static void init_locale(void) { + struct locale_nls_header *header; + const NLS_LOCALE_HEADER *locale_table; + const NLS_LOCALE_DATA *locale; + setlocale( LC_ALL, "" ); if (!unix_to_win_locale( setlocale( LC_CTYPE, NULL ), system_locale )) system_locale[0] = 0; if (!unix_to_win_locale( setlocale( LC_MESSAGES, NULL ), user_locale )) user_locale[0] = 0; @@ -834,6 +842,20 @@ static void init_locale(void) if (preferred_langs) CFRelease( preferred_langs ); } #endif + + if ((header = read_nls_file( "locale.nls" ))) + { + locale_table = (const NLS_LOCALE_HEADER *)((char *)header + header->locales); + if ((locale = get_win_locale( locale_table, system_locale ))) + system_lcid = locale->idefaultlanguage; + if ((locale = get_win_locale( locale_table, user_locale ))) + user_lcid = locale->idefaultlanguage; + free( header ); + } + if (!system_lcid) system_lcid = MAKELANGID( LANG_ENGLISH, SUBLANG_DEFAULT ); + if (!user_lcid) user_lcid = system_lcid; + user_ui_language = user_lcid; + setlocale( LC_NUMERIC, "C" ); /* FIXME: oleaut32 depends on this */ } @@ -848,7 +870,7 @@ void init_environment( int argc, char *argv[], char *envp[] ) init_unix_codepage(); init_locale(); - if ((case_table = read_nls_file( NLS_SECTION_CASEMAP, 0 ))) + if ((case_table = read_nls_file( "l_intl.nls" ))) { uctable = case_table + 2; lctable = case_table + case_table[1] + 2; @@ -2190,7 +2212,6 @@ NTSTATUS WINAPI NtInitializeNlsFiles( void **ptr, LCID *lcid, LARGE_INTEGER *siz status = map_section( handle, ptr, &mapsize, PAGE_READONLY ); NtClose( handle ); } - if (!status && !system_lcid) system_lcid = init_system_lcid( *ptr ); *lcid = system_lcid; return status; }

1 0

Alexandre Julliard : ntdll: Share a few more locale functions with the Unix side.
by Alexandre Julliard June 9, 2022

June 9, 2022

Module: wine Branch: master Commit: c5eb9cb25e2262fc27479bd9143c5751a34775e0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c5eb9cb25e2262fc27479bd9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 9 12:06:47 2022 +0200 ntdll: Share a few more locale functions with the Unix side. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/locale.c | 113 ++++++++------------------------------------ dlls/ntdll/locale_private.h | 78 ++++++++++++++++++++++++++++++ dlls/ntdll/unix/env.c | 41 +++------------- 3 files changed, 105 insertions(+), 127 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c5eb9cb25e2262fc2747…

1 0

Rémi Bernon : winegstreamer: Introduce a new custom memory allocator.
by Alexandre Julliard June 9, 2022

June 9, 2022

Module: wine Branch: master Commit: b38935f1cf701b019d1699197004c348e91963ad URL: https://source.winehq.org/git/wine.git/?a=commit;h=b38935f1cf701b019d169919… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 13 13:17:13 2022 +0200 winegstreamer: Introduce a new custom memory allocator. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winegstreamer/Makefile.in | 1 + dlls/winegstreamer/unix_private.h | 3 + dlls/winegstreamer/wg_allocator.c | 162 ++++++++++++++++++++++++++++++++++++++ dlls/winegstreamer/wg_transform.c | 12 ++- 4 files changed, 176 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/Makefile.in b/dlls/winegstreamer/Makefile.in index e4c2636d02d..50f4dc861d4 100644 --- a/dlls/winegstreamer/Makefile.in +++ b/dlls/winegstreamer/Makefile.in @@ -14,6 +14,7 @@ C_SRCS = \ mfplat.c \ quartz_parser.c \ quartz_transform.c \ + wg_allocator.c \ wg_format.c \ wg_parser.c \ wg_transform.c \ diff --git a/dlls/winegstreamer/unix_private.h b/dlls/winegstreamer/unix_private.h index 7bce8263aaf..16615ef0833 100644 --- a/dlls/winegstreamer/unix_private.h +++ b/dlls/winegstreamer/unix_private.h @@ -37,4 +37,7 @@ extern NTSTATUS wg_transform_destroy(void *args) DECLSPEC_HIDDEN; extern NTSTATUS wg_transform_push_data(void *args) DECLSPEC_HIDDEN; extern NTSTATUS wg_transform_read_data(void *args) DECLSPEC_HIDDEN; +extern GstAllocator *wg_allocator_create(void) DECLSPEC_HIDDEN; +extern void wg_allocator_destroy(GstAllocator *allocator) DECLSPEC_HIDDEN; + #endif /* __WINE_WINEGSTREAMER_UNIX_PRIVATE_H */ diff --git a/dlls/winegstreamer/wg_allocator.c b/dlls/winegstreamer/wg_allocator.c new file mode 100644 index 00000000000..90dada288ae --- /dev/null +++ b/dlls/winegstreamer/wg_allocator.c @@ -0,0 +1,162 @@ +/* + * GStreamer memory allocator + * + * Copyright 2022 Rémi Bernon for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#if 0 +#pragma makedep unix +#endif + +#include "config.h" + +#include <assert.h> +#include <stdarg.h> + +#include <gst/gst.h> +#include <gst/video/video.h> +#include <gst/audio/audio.h> + +#include "unix_private.h" + +GST_DEBUG_CATEGORY_EXTERN(wine); +#define GST_CAT_DEFAULT wine + +typedef struct +{ + GstMemory parent; + + GstMemory *unix_memory; + GstMapInfo unix_map_info; +} WgMemory; + +typedef struct +{ + GstAllocator parent; +} WgAllocator; + +typedef struct +{ + GstAllocatorClass parent_class; +} WgAllocatorClass; + +G_DEFINE_TYPE(WgAllocator, wg_allocator, GST_TYPE_ALLOCATOR); + +static gpointer wg_allocator_map(GstMemory *gst_memory, GstMapInfo *info, gsize maxsize) +{ + WgMemory *memory = (WgMemory *)gst_memory; + + if (gst_memory->parent) + return wg_allocator_map(gst_memory->parent, info, maxsize); + + GST_LOG("memory %p, info %p, maxsize %#zx", memory, info, maxsize); + + info->data = memory->unix_map_info.data; + + GST_INFO("Mapped memory %p to %p", memory, info->data); + return info->data; +} + +static void wg_allocator_unmap(GstMemory *gst_memory, GstMapInfo *info) +{ + WgMemory *memory = (WgMemory *)gst_memory; + + if (gst_memory->parent) + return wg_allocator_unmap(gst_memory->parent, info); + + GST_LOG("memory %p, info %p", memory, info); +} + +static void wg_allocator_init(WgAllocator *allocator) +{ + GST_LOG("allocator %p", allocator); + + allocator->parent.mem_type = "Wine"; + + allocator->parent.mem_map_full = wg_allocator_map; + allocator->parent.mem_unmap_full = wg_allocator_unmap; + + GST_OBJECT_FLAG_SET(allocator, GST_ALLOCATOR_FLAG_CUSTOM_ALLOC); +} + +static void wg_allocator_finalize(GObject *object) +{ + WgAllocator *allocator = (WgAllocator *)object; + + GST_LOG("allocator %p", allocator); + + G_OBJECT_CLASS(wg_allocator_parent_class)->finalize(object); +} + +static GstMemory *wg_allocator_alloc(GstAllocator *gst_allocator, gsize size, + GstAllocationParams *params) +{ + WgAllocator *allocator = (WgAllocator *)gst_allocator; + WgMemory *memory; + + GST_LOG("allocator %p, size %#zx, params %p", allocator, size, params); + + memory = g_slice_new0(WgMemory); + gst_memory_init(GST_MEMORY_CAST(memory), 0, GST_ALLOCATOR_CAST(allocator), + NULL, size, 0, 0, size); + memory->unix_memory = gst_allocator_alloc(NULL, size, params); + gst_memory_map(memory->unix_memory, &memory->unix_map_info, GST_MAP_WRITE); + + GST_INFO("Allocated memory %p, unix_memory %p, data %p", memory, memory->unix_memory, + memory->unix_map_info.data); + return (GstMemory *)memory; +} + +static void wg_allocator_free(GstAllocator *gst_allocator, GstMemory *gst_memory) +{ + WgAllocator *allocator = (WgAllocator *)gst_allocator; + WgMemory *memory = (WgMemory *)gst_memory; + + GST_LOG("allocator %p, memory %p", allocator, memory); + + gst_memory_unmap(memory->unix_memory, &memory->unix_map_info); + gst_memory_unref(memory->unix_memory); + g_slice_free(WgMemory, memory); +} + +static void wg_allocator_class_init(WgAllocatorClass *klass) +{ + GstAllocatorClass *parent_class = (GstAllocatorClass *)klass; + GObjectClass *root_class = (GObjectClass *)klass; + + GST_LOG("klass %p", klass); + + parent_class->alloc = wg_allocator_alloc; + parent_class->free = wg_allocator_free; + root_class->finalize = wg_allocator_finalize; +} + +GstAllocator *wg_allocator_create(void) +{ + return g_object_new(wg_allocator_get_type(), NULL); +} + +void wg_allocator_destroy(GstAllocator *gst_allocator) +{ + WgAllocator *allocator = (WgAllocator *)gst_allocator; + + GST_LOG("allocator %p", allocator); + + g_object_unref(allocator); + + GST_INFO("Destroyed buffer allocator %p", allocator); +} diff --git a/dlls/winegstreamer/wg_transform.c b/dlls/winegstreamer/wg_transform.c index 9a5c16afe74..16c73bcbcd6 100644 --- a/dlls/winegstreamer/wg_transform.c +++ b/dlls/winegstreamer/wg_transform.c @@ -47,6 +47,7 @@ GST_DEBUG_CATEGORY_EXTERN(wine); struct wg_transform { GstElement *container; + GstAllocator *allocator; GstPad *my_src, *my_sink; GstPad *their_sink, *their_src; GstSegment segment; @@ -153,6 +154,7 @@ static gboolean transform_sink_query_cb(GstPad *pad, GstObject *parent, GstQuery gst_buffer_pool_config_set_params(config, caps, info.size, 0, 0); + gst_buffer_pool_config_set_allocator(config, transform->allocator, NULL); if (!gst_buffer_pool_set_config(pool, config)) GST_ERROR("Failed to set pool %p config.", pool); } @@ -162,9 +164,10 @@ static gboolean transform_sink_query_cb(GstPad *pad, GstObject *parent, GstQuery GST_ERROR("Pool %p failed to activate.", pool); gst_query_add_allocation_pool(query, pool, info.size, 0, 0); + gst_query_add_allocation_param(query, transform->allocator, NULL); - GST_INFO("Proposing pool %p, buffer size %#zx, for query %p.", - pool, info.size, query); + GST_INFO("Proposing pool %p, buffer size %#zx, allocator %p, for query %p.", + pool, info.size, transform->allocator, query); g_object_unref(pool); return true; @@ -222,6 +225,7 @@ NTSTATUS wg_transform_destroy(void *args) while ((sample = gst_atomic_queue_pop(transform->output_queue))) gst_sample_unref(sample); + wg_allocator_destroy(transform->allocator); g_object_unref(transform->their_sink); g_object_unref(transform->their_src); g_object_unref(transform->container); @@ -326,6 +330,8 @@ NTSTATUS wg_transform_create(void *args) goto out; if (!(transform->output_queue = gst_atomic_queue_new(8))) goto out; + if (!(transform->allocator = wg_allocator_create())) + goto out; transform->input_max_length = 1; transform->output_plane_align = 0; @@ -482,6 +488,8 @@ out: gst_object_unref(transform->my_src); if (src_caps) gst_caps_unref(src_caps); + if (transform->allocator) + wg_allocator_destroy(transform->allocator); if (transform->output_queue) gst_atomic_queue_unref(transform->output_queue); if (transform->input)

1 0

Paul Gofman : ws2_32/tests: Add tests for terminated thread asyncs completion.
by Alexandre Julliard June 9, 2022

June 9, 2022

Module: wine Branch: master Commit: ab88f34de6a947b6e1e7d1b4045de1c5b582e433 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab88f34de6a947b6e1e7d1b4… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu May 26 14:48:17 2022 -0500 ws2_32/tests: Add tests for terminated thread asyncs completion. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ws2_32/tests/afd.c | 212 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 212 insertions(+) diff --git a/dlls/ws2_32/tests/afd.c b/dlls/ws2_32/tests/afd.c index 5b64ccd7715..fe3c2ef2ff6 100644 --- a/dlls/ws2_32/tests/afd.c +++ b/dlls/ws2_32/tests/afd.c @@ -2355,6 +2355,217 @@ static void test_getsockname(void) CloseHandle(event); } +struct ioctl_params +{ + HANDLE handle, event; + PIO_APC_ROUTINE apc; + void *apc_context; + IO_STATUS_BLOCK *io; + ULONG code; + void *in_buffer; + ULONG in_size; + void *out_buffer; + ULONG out_size; + NTSTATUS ret; + HANDLE complete_event; + BOOL kill_thread; +}; + +static DWORD WINAPI async_ioctl_thread(void *params) +{ + struct ioctl_params *io = params; + + io->ret = NtDeviceIoControlFile(io->handle, io->event, io->apc, io->apc_context, io->io, + io->code, io->in_buffer, io->in_size, io->out_buffer, io->out_size); + SetEvent(io->complete_event); + if (io->kill_thread) + Sleep(3000); + return io->ret; +} + +static NTSTATUS WINAPI thread_NtDeviceIoControlFile(BOOL kill_thread, HANDLE handle, HANDLE event, + PIO_APC_ROUTINE apc, void *apc_context, IO_STATUS_BLOCK *io, ULONG code, void *in_buffer, ULONG in_size, + void *out_buffer, ULONG out_size) +{ + struct ioctl_params p; + HANDLE thread; + DWORD ret; + + p.handle = handle; + p.event = event; + p.apc = apc; + p.apc_context = apc_context; + p.io = io; + p.code = code; + p.in_buffer = in_buffer; + p.in_size = in_size; + p.out_buffer = out_buffer; + p.out_size = out_size; + p.complete_event = CreateEventW(NULL, FALSE, FALSE, NULL); + p.kill_thread = kill_thread; + + thread = CreateThread(NULL, 0, async_ioctl_thread, &p, 0, NULL); + ok(!!thread, "got NULL.\n"); + ret = WaitForSingleObject(p.complete_event, INFINITE); + ok(ret == WAIT_OBJECT_0, "got ret %#lx.\n", ret); + if (kill_thread) + TerminateThread(thread, -1); + CloseHandle(p.complete_event); + ret = WaitForSingleObject(thread, INFINITE); + ok(ret == WAIT_OBJECT_0, "got ret %#lx.\n", ret); + CloseHandle(thread); + SleepEx(0, TRUE); + return p.ret; +} + +static unsigned int test_async_thread_termination_apc_count; + +static void WINAPI test_async_thread_termination_apc( void *arg, IO_STATUS_BLOCK *iosb, ULONG reserved ) +{ + ++test_async_thread_termination_apc_count; +} + +static void test_async_thread_termination(void) +{ + static const struct + { + BOOL kill_thread; + BOOL event; + PIO_APC_ROUTINE apc; + void *apc_context; + } + tests[] = + { + {FALSE, TRUE, NULL, NULL}, + {TRUE, TRUE, NULL, NULL}, + {FALSE, FALSE, NULL, NULL}, + {TRUE, FALSE, NULL, NULL}, + {FALSE, TRUE, test_async_thread_termination_apc, NULL}, + {TRUE, TRUE, test_async_thread_termination_apc, NULL}, + {FALSE, FALSE, test_async_thread_termination_apc, NULL}, + {TRUE, FALSE, test_async_thread_termination_apc, NULL}, + {FALSE, TRUE, NULL, (void *)0xdeadbeef}, + {TRUE, TRUE, NULL, (void *)0xdeadbeef}, + {FALSE, FALSE, NULL, (void *)0xdeadbeef}, + {TRUE, FALSE, NULL, (void *)0xdeadbeef}, + {FALSE, TRUE, test_async_thread_termination_apc, (void *)0xdeadbeef}, + {TRUE, TRUE, test_async_thread_termination_apc, (void *)0xdeadbeef}, + {FALSE, FALSE, test_async_thread_termination_apc, (void *)0xdeadbeef}, + {TRUE, FALSE, test_async_thread_termination_apc, (void *)0xdeadbeef}, + }; + + const struct sockaddr_in bind_addr = {.sin_family = AF_INET, .sin_addr.s_addr = htonl(INADDR_LOOPBACK)}; + char in_buffer[offsetof(struct afd_poll_params, sockets[3])]; + char out_buffer[offsetof(struct afd_poll_params, sockets[3])]; + struct afd_poll_params *in_params = (struct afd_poll_params *)in_buffer; + struct afd_poll_params *out_params = (struct afd_poll_params *)out_buffer; + LARGE_INTEGER zero = {{0}}; + ULONG_PTR key, value; + IO_STATUS_BLOCK io; + HANDLE event, port; + ULONG params_size; + SOCKET listener; + unsigned int i; + int ret; + + event = CreateEventW(NULL, FALSE, FALSE, NULL); + + listener = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + ret = bind(listener, (const struct sockaddr *)&bind_addr, sizeof(bind_addr)); + ok(!ret, "got error %u\n", WSAGetLastError()); + ret = listen(listener, 1); + ok(!ret, "got error %u\n", WSAGetLastError()); + + in_params->count = 1; + in_params->exclusive = FALSE; + in_params->sockets[0].socket = listener; + in_params->sockets[0].flags = ~0; + in_params->sockets[0].status = 0xdeadbeef; + params_size = offsetof(struct afd_poll_params, sockets[1]); + in_params->timeout = -10 * 1000 * 1000 * 5; + + /* asyncs without completion port are always cancelled on thread exit. */ + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + winetest_push_context("test %u", i); + memset(&io, 0xcc, sizeof(io)); + ResetEvent(event); + ret = thread_NtDeviceIoControlFile(tests[i].kill_thread, (HANDLE)listener, tests[i].event ? event : NULL, + tests[i].apc, tests[i].apc_context, &io, IOCTL_AFD_POLL, in_params, params_size, + out_params, params_size); + ok(ret == STATUS_PENDING, "got %#x\n", ret); + ok(io.Status == STATUS_CANCELLED, "got %#lx\n", io.Status); + if (tests[i].event) + { + ret = WaitForSingleObject(event, 1000); + ok(!ret, "got %#x\n", ret); + } + winetest_pop_context(); + } + + SleepEx(0, TRUE); + ok(!test_async_thread_termination_apc_count, "got APC.\n"); + + port = CreateIoCompletionPort((HANDLE)listener, NULL, 0, 0); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + winetest_push_context("test %u", i); + memset(&io, 0xcc, sizeof(io)); + ResetEvent(event); + ret = thread_NtDeviceIoControlFile(tests[i].kill_thread, (HANDLE)listener, tests[i].event ? event : NULL, + tests[i].apc, tests[i].apc_context, &io, IOCTL_AFD_POLL, in_params, params_size, + out_params, params_size); + if (tests[i].apc) + { + ok(ret == STATUS_INVALID_PARAMETER, "got %#x\n", ret); + winetest_pop_context(); + continue; + } + ok(ret == STATUS_PENDING, "got %#x\n", ret); + if (!tests[i].apc_context || tests[i].event) + { + ok(io.Status == STATUS_CANCELLED, "got %#lx\n", io.Status); + memset(&io, 0xcc, sizeof(io)); + key = 0xcc; + value = 0; + ret = NtRemoveIoCompletion(port, &key, &value, &io, &zero); + if (tests[i].apc_context) + { + ok(!ret, "got %#x\n", ret); + ok(!key, "got key %#Ix\n", key); + ok(value == 0xdeadbeef, "got value %#Ix\n", value); + ok(io.Status == STATUS_CANCELLED, "got %#lx\n", io.Status); + } + else + { + ok(ret == WAIT_TIMEOUT, "got %#x\n", ret); + } + winetest_pop_context(); + continue; + } + + /* async is not cancelled if there is a completion port, completion key and no event. */ + ok(io.Status == 0xcccccccc, "got %#lx\n", io.Status); + memset(&io, 0xcc, sizeof(io)); + key = 0xcc; + value = 0; + ret = NtRemoveIoCompletion(port, &key, &value, &io, &zero); + ok(ret == WAIT_TIMEOUT, "got %#x\n", ret); + CancelIoEx((HANDLE)listener, NULL); + ret = NtRemoveIoCompletion(port, &key, &value, &io, &zero); + ok(!ret, "got %#x\n", ret); + ok(!key, "got key %#Ix\n", key); + ok(value == 0xdeadbeef, "got value %#Ix\n", value); + ok(io.Status == STATUS_CANCELLED, "got %#lx\n", io.Status); + winetest_pop_context(); + } + + CloseHandle(port); + CloseHandle(event); + closesocket(listener); +} + START_TEST(afd) { WSADATA data; @@ -2372,6 +2583,7 @@ START_TEST(afd) test_get_events_reset(); test_bind(); test_getsockname(); + test_async_thread_termination(); WSACleanup(); }

1 0

Derek Lesho : mfreadwrite/tests: Test timestamp-based MF_SOURCE_READER_ANY_STREAM behavior.
by Alexandre Julliard June 9, 2022

June 9, 2022

Module: wine Branch: master Commit: 35f9b6f0b166300041fbc3cde09dbef44b855916 URL: https://source.winehq.org/git/wine.git/?a=commit;h=35f9b6f0b166300041fbc3cd… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Wed Jun 8 13:13:16 2022 +0200 mfreadwrite/tests: Test timestamp-based MF_SOURCE_READER_ANY_STREAM behavior. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> --- dlls/mfreadwrite/tests/mfplat.c | 71 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 69 insertions(+), 2 deletions(-) diff --git a/dlls/mfreadwrite/tests/mfplat.c b/dlls/mfreadwrite/tests/mfplat.c index fcf642859d5..2762e88281a 100644 --- a/dlls/mfreadwrite/tests/mfplat.c +++ b/dlls/mfreadwrite/tests/mfplat.c @@ -105,6 +105,7 @@ struct test_media_stream IMFStreamDescriptor *sd; IMFMediaEventQueue *event_queue; BOOL is_new; + LONGLONG sample_duration, sample_time; }; static struct test_media_stream *impl_from_IMFMediaStream(IMFMediaStream *iface) @@ -211,8 +212,25 @@ static HRESULT WINAPI test_media_stream_RequestSample(IMFMediaStream *iface, IUn hr = MFCreateSample(&sample); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - hr = IMFSample_SetSampleTime(sample, 123); - ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + if (stream->sample_duration) + { + hr = IMFSample_SetSampleDuration(sample, stream->sample_duration); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + hr = IMFSample_SetSampleTime(sample, stream->sample_time); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + stream->sample_time += stream->sample_duration; + } + else + { + hr = IMFSample_SetSampleTime(sample, 123); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + hr = IMFSample_SetSampleDuration(sample, 1); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + } + if (token) IMFSample_SetUnknown(sample, &MFSampleExtension_Token, token); @@ -888,9 +906,12 @@ skip_read_sample: static void test_source_reader_from_media_source(void) { + static const DWORD expected_sample_order[10] = {0, 0, 1, 1, 0, 0, 0, 0, 1, 0}; + struct async_callback *callback; IMFSourceReader *reader; IMFMediaSource *source; + struct test_source *test_source; IMFMediaType *media_type; HRESULT hr; DWORD actual_index, stream_flags; @@ -964,6 +985,19 @@ static void test_source_reader_from_media_source(void) IMFSample_Release(sample); } + hr = IMFSourceReader_ReadSample(reader, MF_SOURCE_READER_ANY_STREAM, 0, &actual_index, &stream_flags, + &timestamp, &sample); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(!stream_flags, "Unexpected stream flags %#lx.\n", stream_flags); + ok(timestamp == 123, "Unexpected timestamp.\n"); + ok(!!sample, "Expected sample object.\n"); + + /* Once the last read sample of all streams has the same timestamp value, the reader will + continue reading from the first stream until its timestamp increases. */ + todo_wine ok(!actual_index, "%d: Unexpected stream index %lu.\n", TEST_SOURCE_NUM_STREAMS + 1, actual_index); + + IMFSample_Release(sample); + IMFSourceReader_Release(reader); IMFMediaSource_Release(source); @@ -1172,6 +1206,39 @@ static void test_source_reader_from_media_source(void) IMFMediaSource_Release(source); fail_request_sample = FALSE; + + /* MF_SOURCE_READER_ANY_STREAM with streams of different sample sizes */ + source = create_test_source(2); + ok(!!source, "Failed to create test source.\n"); + + test_source = impl_from_IMFMediaSource(source); + test_source->streams[0]->sample_duration = 100000; + test_source->streams[1]->sample_duration = 400000; + + hr = MFCreateSourceReaderFromMediaSource(source, NULL, &reader); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + hr = IMFSourceReader_SetStreamSelection(reader, 0, TRUE); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + hr = IMFSourceReader_SetStreamSelection(reader, 1, TRUE); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + /* The source reader picks the stream whose last sample had the lower timestamp */ + for (i = 0; i < ARRAY_SIZE(expected_sample_order); i++) + { + hr = IMFSourceReader_ReadSample(reader, MF_SOURCE_READER_ANY_STREAM, 0, &actual_index, &stream_flags, &timestamp, &sample); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(!stream_flags, "Unexpected stream flags %#lx.\n", stream_flags); + ok(!!sample, "Expected sample object.\n"); + todo_wine_if (actual_index != expected_sample_order[i]) + ok (actual_index == expected_sample_order[i], "Got sample %u from unexpected stream %lu, expected %lu.\n", + i, actual_index, expected_sample_order[i]); + IMFSample_Release(sample); + } + + IMFSourceReader_Release(reader); + IMFMediaSource_Release(source); } static void test_reader_d3d9(void)

1 0

Martin Storsjö : ntdll/tests: Test returning an exception handler on arm/arm64.
by Alexandre Julliard June 9, 2022

June 9, 2022

Module: wine Branch: master Commit: 94dc5714ac19ab5d3347c55b8698823c5d62625b URL: https://source.winehq.org/git/wine.git/?a=commit;h=94dc5714ac19ab5d3347c55b… Author: Martin Storsjö <martin(a)martin.st> Date: Thu Jun 9 11:03:42 2022 +0300 ntdll/tests: Test returning an exception handler on arm/arm64. Signed-off-by: Martin Storsjö <martin(a)martin.st> --- dlls/ntdll/tests/exception.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 2089f3ed3d8..820e435bc1b 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -5140,7 +5140,6 @@ static void call_virtual_unwind( int testnum, const struct unwind_test *test ) &runtime_func, &context, &data, &frame, &ctx_ptr ); if (test->results[i].handler > 0) { - /* Yet untested */ ok( (char *)handler == (char *)code_mem + 0x200, "%u/%u: wrong handler %p/%p\n", testnum, i, handler, (char *)code_mem + 0x200 ); if (handler) ok( *(DWORD *)data == 0x08070605, @@ -5278,7 +5277,7 @@ static void test_virtual_unwind(void) static const DWORD unwind_info_0_header = (sizeof(function_0)/2) | /* function length */ - (0 << 20) | /* X */ + (1 << 20) | /* X */ (0 << 21) | /* E */ (0 << 22) | /* F */ (1 << 23) | /* epilog */ @@ -5309,6 +5308,10 @@ static void test_virtual_unwind(void) UWOP_ALLOC_SMALL(32), /* add sp, sp, #32 */ UWOP_SAVE_RANGE_4_7_LR(6, 1), /* pop {r4-r6,pc} */ UWOP_END, + + 0, 0, /* align */ + 0x00, 0x02, 0x00, 0x00, /* handler */ + 0x05, 0x06, 0x07, 0x08, /* data */ }; static const struct results results_0[] = @@ -5323,7 +5326,7 @@ static void test_virtual_unwind(void) { 0x12, 0x10, 0, 0x5c, 0x060, TRUE, { {r4,0x50}, {r5,0x54}, {r6,0x58}, {lr,0x5c}, {d8, 0x1c00000018}, {d9, 0x2400000020}, {d10, 0x2c00000028}, {d3, 0x400000000}, {d4, 0xc00000008}, {d5, 0x1400000010}, {-1,-1} }}, { 0x16, 0x10, 0, 0x74, 0x078, TRUE, { {r4,0x68}, {r5,0x6c}, {r6,0x70}, {lr,0x74}, {d8, 0x3400000030}, {d9, 0x3c00000038}, {d10, 0x4400000040}, {d3, 0x1c00000018}, {d4, 0x2400000020}, {d5, 0x2c00000028}, {d17, 0x400000000}, {d18, 0xc00000008}, {d19, 0x1400000010}, {-1,-1} }}, { 0x1a, 0x10, 0, 0x80, 0x084, TRUE, { {r4,0x74}, {r5,0x78}, {r6,0x7c}, {lr,0x80}, {d8, 0x400000003c}, {d9, 0x4800000044}, {d10, 0x500000004c}, {d3, 0x2800000024}, {d4, 0x300000002c}, {d5, 0x3800000034}, {d17, 0x100000000c}, {d18, 0x1800000014}, {d19, 0x200000001c}, {r8,0x00}, {r10,0x04}, {r12,0x08}, {-1,-1} }}, - { 0x1c, 0x10, 0, 0x90, 0x094, TRUE, { {r4,0x84}, {r5,0x88}, {r6,0x8c}, {lr,0x90}, {d8, 0x500000004c}, {d9, 0x5800000054}, {d10, 0x600000005c}, {d3, 0x3800000034}, {d4, 0x400000003c}, {d5, 0x4800000044}, {d17, 0x200000001c}, {d18, 0x2800000024}, {d19, 0x300000002c}, {r8,0x10}, {r10,0x14}, {r12,0x18}, {-1,-1} }}, + { 0x1c, 0x10, 1, 0x90, 0x094, TRUE, { {r4,0x84}, {r5,0x88}, {r6,0x8c}, {lr,0x90}, {d8, 0x500000004c}, {d9, 0x5800000054}, {d10, 0x600000005c}, {d3, 0x3800000034}, {d4, 0x400000003c}, {d5, 0x4800000044}, {d17, 0x200000001c}, {d18, 0x2800000024}, {d19, 0x300000002c}, {r8,0x10}, {r10,0x14}, {r12,0x18}, {-1,-1} }}, { 0x1e, 0x10, 0, 0x3c, 0x040, TRUE, { {r4,0x30}, {r5,0x34}, {r6,0x38}, {lr,0x3c}, {d8, 0x400000000}, {d9, 0xc00000008}, {d10, 0x1400000010}, {-1,-1} }}, { 0x22, 0x10, 0, 0x3c, 0x040, TRUE, { {r4,0x30}, {r5,0x34}, {r6,0x38}, {lr,0x3c}, {-1,-1} }}, { 0x24, 0x10, 0, 0x2c, 0x030, TRUE, { {r4,0x20}, {r5,0x24}, {r6,0x28}, {lr,0x2c}, {-1,-1} }}, @@ -6818,7 +6821,6 @@ static void call_virtual_unwind( int testnum, const struct unwind_test *test ) &runtime_func, &context, &data, &frame, &ctx_ptr ); if (test->results[i].handler > 0) { - /* Yet untested */ ok( (char *)handler == (char *)code_mem + 0x200, "%u/%u: wrong handler %p/%p\n", testnum, i, handler, (char *)code_mem + 0x200 ); if (handler) ok( *(DWORD *)data == 0x08070605, @@ -6934,7 +6936,7 @@ static void test_virtual_unwind(void) static const DWORD unwind_info_0_header = (sizeof(function_0)/4) | /* function length */ - (0 << 20) | /* X */ + (1 << 20) | /* X */ (0 << 21) | /* E */ (1 << 22) | /* epilog */ (2 << 27); /* codes */ @@ -6954,6 +6956,9 @@ static void test_virtual_unwind(void) UWOP_SAVE_REGP(19, 16), /* stp x19, x20, [sp, #16] */ UWOP_ALLOC_SMALL(32), /* sub sp, sp, #32 */ UWOP_END, + + 0x00, 0x02, 0x00, 0x00, /* handler */ + 0x05, 0x06, 0x07, 0x08, /* data */ }; static const struct results results_0[] = @@ -6961,7 +6966,7 @@ static void test_virtual_unwind(void) /* offset fp handler pc frame offset registers */ { 0x00, 0x00, 0, ORIG_LR, 0x000, TRUE, { {-1,-1} }}, { 0x04, 0x00, 0, ORIG_LR, 0x020, TRUE, { {-1,-1} }}, - { 0x08, 0x00, 0, ORIG_LR, 0x020, TRUE, { {x19,0x10}, {x20,0x18}, {-1,-1} }}, + { 0x08, 0x00, 1, ORIG_LR, 0x020, TRUE, { {x19,0x10}, {x20,0x18}, {-1,-1} }}, { 0x0c, 0x00, 0, ORIG_LR, 0x020, TRUE, { {x19,0x10}, {x20,0x18}, {-1,-1} }}, { 0x10, 0x00, 0, ORIG_LR, 0x020, TRUE, { {-1,-1} }}, { 0x14, 0x00, 0, ORIG_LR, 0x000, TRUE, { {-1,-1} }},

1 0

Rémi Bernon : winegstreamer: Support zero-copy in wg_transform_push_data.
by Alexandre Julliard June 9, 2022

June 9, 2022

Module: wine Branch: master Commit: c40ab0f9a62f02b80fe7604d698db4aa3a8b7713 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c40ab0f9a62f02b80fe7604d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jun 6 17:52:12 2022 +0200 winegstreamer: Support zero-copy in wg_transform_push_data. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/mf/tests/mf.c | 1 - dlls/winegstreamer/gst_private.h | 9 +++- dlls/winegstreamer/h264_decoder.c | 17 +++++-- dlls/winegstreamer/mfplat.c | 87 +++++++++++++++++++++++++++++++++-- dlls/winegstreamer/quartz_transform.c | 9 ++++ dlls/winegstreamer/unixlib.h | 2 + dlls/winegstreamer/wg_transform.c | 28 +++++++++-- dlls/winegstreamer/wma_decoder.c | 15 ++++-- 8 files changed, 153 insertions(+), 15 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c40ab0f9a62f02b80fe7…

1 0

Rémi Bernon : winegstreamer: Support zero-copy output using the allocator.
by Alexandre Julliard June 9, 2022

June 9, 2022

Module: wine Branch: master Commit: f17b80105681c2c025d61fe98175c4b83da2d5d2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f17b80105681c2c025d61fe9… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jun 6 17:09:18 2022 +0200 winegstreamer: Support zero-copy output using the allocator. Through a custom allocator, by borrowing memory from the reading thread and mapping it instead of the allocated memory. We cannot use the buffer pool to share wrapped buffers, because some decoder will hold on the acquired buffers longer than they should and we cannot remove our memory from them as long as they keep a reference. Swapping the memory on map should be safe. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winegstreamer/mfplat.c | 6 ++ dlls/winegstreamer/unix_private.h | 7 +- dlls/winegstreamer/unixlib.h | 1 + dlls/winegstreamer/wg_allocator.c | 135 ++++++++++++++++++++++++++++++++++++-- dlls/winegstreamer/wg_transform.c | 98 +++++++++++++++++++++++---- 5 files changed, 230 insertions(+), 17 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f17b80105681c2c025d6…

1 0

Martin Storsjö : ntdll/tests: Fix printing of incorrect exception handler data.
by Alexandre Julliard June 9, 2022

June 9, 2022

Module: wine Branch: master Commit: f1f7e096db99bcb280683767b5b5966ff1a85605 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f1f7e096db99bcb280683767… Author: Martin Storsjö <martin(a)martin.st> Date: Thu Jun 9 10:57:22 2022 +0300 ntdll/tests: Fix printing of incorrect exception handler data. *(DWORD *)data is the value being compared; printing the 'data' pointer itself provides little value here. Signed-off-by: Martin Storsjö <martin(a)martin.st> --- dlls/ntdll/tests/exception.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 3e76b001147..2089f3ed3d8 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -2123,7 +2123,7 @@ static void call_virtual_unwind( int testnum, const struct unwind_test *test ) ok( handler == expected_handler || broken( test->broken_results && handler == broken_handler ), "%u/%u: wrong handler %p/%p\n", testnum, i, handler, expected_handler ); if (handler) - ok( *(DWORD *)data == 0x08070605, "%u/%u: wrong handler data %p\n", testnum, i, data ); + ok( *(DWORD *)data == 0x08070605, "%u/%u: wrong handler data %lx\n", testnum, i, *(DWORD *)data ); else ok( data == (void *)0xdeadbeef, "%u/%u: handler data set to %p\n", testnum, i, data ); @@ -5144,7 +5144,7 @@ static void call_virtual_unwind( int testnum, const struct unwind_test *test ) ok( (char *)handler == (char *)code_mem + 0x200, "%u/%u: wrong handler %p/%p\n", testnum, i, handler, (char *)code_mem + 0x200 ); if (handler) ok( *(DWORD *)data == 0x08070605, - "%u/%u: wrong handler data %p\n", testnum, i, data ); + "%u/%u: wrong handler data %lx\n", testnum, i, *(DWORD *)data ); } else { @@ -6822,7 +6822,7 @@ static void call_virtual_unwind( int testnum, const struct unwind_test *test ) ok( (char *)handler == (char *)code_mem + 0x200, "%u/%u: wrong handler %p/%p\n", testnum, i, handler, (char *)code_mem + 0x200 ); if (handler) ok( *(DWORD *)data == 0x08070605, - "%u/%u: wrong handler data %p\n", testnum, i, data ); + "%u/%u: wrong handler data %lx\n", testnum, i, *(DWORD *)data ); } else {

1 0