wine-commits July 2023

wine-commits@winehq.org

1 participants
865 discussions

Alexandre Julliard : kernel32/tests: Use nameless unions/structs.
by Alexandre Julliard 20 Jul '23

20 Jul '23

Module: wine Branch: master Commit: 708d13b0358ca85f278e82aee7b1f790e126fafe URL: https://gitlab.winehq.org/wine/wine/-/commit/708d13b0358ca85f278e82aee7b1f7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 20 11:36:19 2023 +0200 kernel32/tests: Use nameless unions/structs. --- dlls/kernel32/tests/change.c | 8 +++---- dlls/kernel32/tests/comm.c | 56 +++++++++++++++++++++---------------------- dlls/kernel32/tests/file.c | 38 ++++++++++++++--------------- dlls/kernel32/tests/loader.c | 54 ++++++++++++++++++++--------------------- dlls/kernel32/tests/pipe.c | 4 ++-- dlls/kernel32/tests/process.c | 10 ++++---- 6 files changed, 85 insertions(+), 85 deletions(-)

1 0

Alexandre Julliard : iphlpapi/tests: Use nameless unions/structs.
by Alexandre Julliard 20 Jul '23

20 Jul '23

Module: wine Branch: master Commit: 3069b98b10ea6349801983483e6afeb783133664 URL: https://gitlab.winehq.org/wine/wine/-/commit/3069b98b10ea6349801983483e6afe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 20 11:35:42 2023 +0200 iphlpapi/tests: Use nameless unions/structs. --- dlls/iphlpapi/tests/iphlpapi.c | 48 +++++++++++++++++++++--------------------- 1 file changed, 24 insertions(+), 24 deletions(-)

1 0

Alexandre Julliard : inetcomm/tests: Use nameless unions/structs.
by Alexandre Julliard 20 Jul '23

20 Jul '23

Module: wine Branch: master Commit: d578e7981a6ca998b68f4c133e34fc91849d1248 URL: https://gitlab.winehq.org/wine/wine/-/commit/d578e7981a6ca998b68f4c133e34fc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 20 11:35:24 2023 +0200 inetcomm/tests: Use nameless unions/structs. --- dlls/inetcomm/tests/mimeintl.c | 2 -- dlls/inetcomm/tests/mimeole.c | 8 +++----- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/dlls/inetcomm/tests/mimeintl.c b/dlls/inetcomm/tests/mimeintl.c index 3eaa86fe7e3..85799670264 100644 --- a/dlls/inetcomm/tests/mimeintl.c +++ b/dlls/inetcomm/tests/mimeintl.c @@ -19,8 +19,6 @@ */ #define COBJMACROS -#define NONAMELESSUNION - #include "windows.h" #include "ole2.h" #include "ocidl.h" diff --git a/dlls/inetcomm/tests/mimeole.c b/dlls/inetcomm/tests/mimeole.c index 1168341610f..eef81fed44c 100644 --- a/dlls/inetcomm/tests/mimeole.c +++ b/dlls/inetcomm/tests/mimeole.c @@ -19,8 +19,6 @@ */ #define COBJMACROS -#define NONAMELESSUNION - #include "initguid.h" #include "windows.h" #include "ole2.h" @@ -204,7 +202,7 @@ static void test_CreateBody(void) ok(hr == S_OK, "ret %08lx\n", hr); off.QuadPart = 0; IStream_Seek(in, off, STREAM_SEEK_CUR, &pos); - ok(pos.u.LowPart == 359, "pos %lu\n", pos.u.LowPart); + ok(pos.LowPart == 359, "pos %lu\n", pos.LowPart); hr = IMimeBody_IsContentType(body, "multipart", "mixed"); ok(hr == S_OK, "ret %08lx\n", hr); @@ -347,7 +345,7 @@ static HRESULT WINAPI Stream_Seek(IStream *iface, LARGE_INTEGER dlibMove, DWORD if(dwOrigin == STREAM_SEEK_END) { CHECK_EXPECT(Stream_Seek_END); - ok(dlibMove.QuadPart == expect_seek_pos, "unexpected seek pos %lu\n", dlibMove.u.LowPart); + ok(dlibMove.QuadPart == expect_seek_pos, "unexpected seek pos %lu\n", dlibMove.LowPart); if(plibNewPosition) plibNewPosition->QuadPart = 10; return S_OK; @@ -355,7 +353,7 @@ static HRESULT WINAPI Stream_Seek(IStream *iface, LARGE_INTEGER dlibMove, DWORD CHECK_EXPECT(Stream_Seek); - ok(dlibMove.QuadPart == expect_seek_pos, "unexpected seek pos %lu\n", dlibMove.u.LowPart); + ok(dlibMove.QuadPart == expect_seek_pos, "unexpected seek pos %lu\n", dlibMove.LowPart); ok(dwOrigin == STREAM_SEEK_SET, "dwOrigin = %ld\n", dwOrigin); This->pos = dlibMove.QuadPart; if(plibNewPosition)

1 0

Alexandre Julliard : imagehlp/tests: Use nameless unions/structs.
by Alexandre Julliard 20 Jul '23

20 Jul '23

Module: wine Branch: master Commit: 17bccc860a96ae1c8c34beef885a3ef142888935 URL: https://gitlab.winehq.org/wine/wine/-/commit/17bccc860a96ae1c8c34beef885a3e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 20 11:35:08 2023 +0200 imagehlp/tests: Use nameless unions/structs. --- dlls/imagehlp/tests/image.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/imagehlp/tests/image.c b/dlls/imagehlp/tests/image.c index 0d9019fe938..a2fc306428f 100644 --- a/dlls/imagehlp/tests/image.c +++ b/dlls/imagehlp/tests/image.c @@ -19,7 +19,6 @@ #include <stdio.h> #include <stdarg.h> -#define NONAMELESSUNION #include <windef.h> #include <winbase.h> #include <winver.h> @@ -234,8 +233,8 @@ static const struct expected_blob b1[] = { {sizeof(bin.nt_headers), &bin.nt_headers}, {sizeof(bin.sections), &bin.sections}, {FILE_IDATA-FILE_TEXT, &bin.text_section}, - {sizeof(bin.idata_section.descriptors[0].u.OriginalFirstThunk), - &bin.idata_section.descriptors[0].u.OriginalFirstThunk}, + {sizeof(bin.idata_section.descriptors[0].OriginalFirstThunk), + &bin.idata_section.descriptors[0].OriginalFirstThunk}, {FIELD_OFFSET(struct Imports, thunks)- (FIELD_OFFSET(struct Imports, descriptors)+FIELD_OFFSET(IMAGE_IMPORT_DESCRIPTOR, Name)), &bin.idata_section.descriptors[0].Name},

1 0

Alexandre Julliard : ieframe/tests: Use nameless unions/structs.
by Alexandre Julliard 20 Jul '23

20 Jul '23

Module: wine Branch: master Commit: 8fe23255a57b2ee14c0e75735aa8e7de58728d00 URL: https://gitlab.winehq.org/wine/wine/-/commit/8fe23255a57b2ee14c0e75735aa8e7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 20 11:34:53 2023 +0200 ieframe/tests: Use nameless unions/structs. --- dlls/ieframe/tests/intshcut.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/ieframe/tests/intshcut.c b/dlls/ieframe/tests/intshcut.c index b5487491414..cac0e301dd2 100644 --- a/dlls/ieframe/tests/intshcut.c +++ b/dlls/ieframe/tests/intshcut.c @@ -176,14 +176,14 @@ static void test_ReadAndWriteProperties(void) PROPVARIANT pv[2], pvread[2]; ps[0].ulKind = PRSPEC_PROPID; - U(ps[0]).propid = PID_IS_ICONFILE; + ps[0].propid = PID_IS_ICONFILE; ps[1].ulKind = PRSPEC_PROPID; - U(ps[1]).propid = PID_IS_ICONINDEX; + ps[1].propid = PID_IS_ICONINDEX; pv[0].vt = VT_LPWSTR; - U(pv[0]).pwszVal = iconPath; + pv[0].pwszVal = iconPath; pv[1].vt = VT_I4; - U(pv[1]).lVal = iconIndex; + pv[1].lVal = iconIndex; /* Make sure we have a valid temporary directory */ GetTempPathW(MAX_PATH, fileNameW); @@ -223,9 +223,9 @@ static void test_ReadAndWriteProperties(void) hr = IPropertyStorage_ReadMultiple(pPropStgWrite, 2, ps, pvread); ok(hr == S_OK, "Unable to read properties, hr=0x%lx\n", hr); ok(pvread[1].vt == VT_I4, "got %d\n", pvread[1].vt); - ok(U(pvread[1]).lVal == iconIndex, "Read wrong icon index: %d\n", U(pvread[1]).iVal); + ok(pvread[1].lVal == iconIndex, "Read wrong icon index: %d\n", pvread[1].iVal); ok(pvread[0].vt == VT_LPWSTR, "got %d\n", pvread[0].vt); - ok(lstrcmpW(U(pvread[0]).pwszVal, iconPath) == 0, "Wrong icon path read: %s\n", wine_dbgstr_w(U(pvread[0]).pwszVal)); + ok(lstrcmpW(pvread[0].pwszVal, iconPath) == 0, "Wrong icon path read: %s\n", wine_dbgstr_w(pvread[0].pwszVal)); PropVariantClear(&pvread[0]); PropVariantClear(&pvread[1]); @@ -244,9 +244,9 @@ static void test_ReadAndWriteProperties(void) hr = IPropertyStorage_ReadMultiple(pPropStgWrite, 2, ps, pvread); ok(hr == S_OK, "Unable to read properties, hr=0x%lx\n", hr); ok(pvread[1].vt == VT_I4, "got %d\n", pvread[1].vt); - ok(U(pvread[1]).lVal == iconIndex, "Read wrong icon index: %d\n", U(pvread[1]).iVal); + ok(pvread[1].lVal == iconIndex, "Read wrong icon index: %d\n", pvread[1].iVal); ok(pvread[0].vt == VT_LPWSTR, "got %d\n", pvread[0].vt); - ok(lstrcmpW(U(pvread[0]).pwszVal, iconPath) == 0, "Wrong icon path read: %s\n", wine_dbgstr_w(U(pvread[0]).pwszVal)); + ok(lstrcmpW(pvread[0].pwszVal, iconPath) == 0, "Wrong icon path read: %s\n", wine_dbgstr_w(pvread[0].pwszVal)); PropVariantClear(&pvread[0]); PropVariantClear(&pvread[1]); @@ -292,9 +292,9 @@ static void test_ReadAndWriteProperties(void) { ok(hr == S_OK, "Unable to read properties, hr=0x%lx\n", hr); ok(pvread[1].vt == VT_I4, "got %d\n", pvread[1].vt); - ok(U(pvread[1]).lVal == iconIndex, "Read wrong icon index: %d\n", U(pvread[1]).iVal); + ok(pvread[1].lVal == iconIndex, "Read wrong icon index: %d\n", pvread[1].iVal); ok(pvread[0].vt == VT_LPWSTR, "got %d\n", pvread[0].vt); - ok(lstrcmpW(U(pvread[0]).pwszVal, iconPath) == 0, "Wrong icon path read: %s\n", wine_dbgstr_w(U(pvread[0]).pwszVal)); + ok(lstrcmpW(pvread[0].pwszVal, iconPath) == 0, "Wrong icon path read: %s\n", wine_dbgstr_w(pvread[0].pwszVal)); } PropVariantClear(&pvread[0]); PropVariantClear(&pvread[1]); @@ -390,14 +390,14 @@ static void test_Load(void) ok(hres == S_OK, "Unable to get an IPropertyStorage for reading, hr=0x%lx\n", hres); ps.ulKind = PRSPEC_PROPID; - U(ps).propid = PID_IS_ICONFILE; + ps.propid = PID_IS_ICONFILE; v.vt = VT_NULL; hres = IPropertyStorage_ReadMultiple(propstorage, 1, &ps, &v); ok(hres == S_FALSE, "got 0x%08lx\n", hres); ok(v.vt == VT_EMPTY, "got %d\n", v.vt); ps.ulKind = PRSPEC_PROPID; - U(ps).propid = PID_IS_ICONINDEX; + ps.propid = PID_IS_ICONINDEX; v.vt = VT_EMPTY; hres = IPropertyStorage_ReadMultiple(propstorage, 1, &ps, &v); ok(hres == S_FALSE, "got 0x%08lx\n", hres);

1 0

Alexandre Julliard : gdiplus/tests: Use nameless unions/structs.
by Alexandre Julliard 20 Jul '23

20 Jul '23

Module: wine Branch: master Commit: 6077ea694681f9df58bd25680678b3c465261187 URL: https://gitlab.winehq.org/wine/wine/-/commit/6077ea694681f9df58bd25680678b3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 20 11:34:30 2023 +0200 gdiplus/tests: Use nameless unions/structs. --- dlls/gdiplus/tests/image.c | 4 +- dlls/gdiplus/tests/metafile.c | 144 +++++++++++++++++++++--------------------- 2 files changed, 74 insertions(+), 74 deletions(-)

1 0

Alexandre Julliard : gdi32/tests: Use nameless unions/structs.
by Alexandre Julliard 20 Jul '23

20 Jul '23

Module: wine Branch: master Commit: 207bdd01ca48742805033149030974bf70bb3a74 URL: https://gitlab.winehq.org/wine/wine/-/commit/207bdd01ca48742805033149030974… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 20 11:34:02 2023 +0200 gdi32/tests: Use nameless unions/structs. --- dlls/gdi32/tests/dc.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index 8ccadbd6ff6..e3d29ae9ca9 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -19,9 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define NONAMELESSSTRUCT -#define NONAMELESSUNION - #include <assert.h> #include <stdio.h> @@ -616,7 +613,7 @@ static void test_CreateCompatibleDC(void) dm.dmSize = sizeof(dm); bRet = EnumDisplaySettingsA(NULL, ENUM_CURRENT_SETTINGS, &dm); ok(bRet, "EnumDisplaySettingsEx failed\n"); - dm.u1.s1.dmScale = 200; + dm.dmScale = 200; dm.dmFields |= DM_SCALE; hdc = CreateDCA( "DISPLAY", NULL, NULL, &dm ); @@ -1353,7 +1350,7 @@ static HDC create_printer_dc(int scale, BOOL reset) dbuf = HeapAlloc( GetProcessHeap(), 0, len ); if (!pGetPrinterDriverA( hprn, NULL, 3, (LPBYTE)dbuf, len, &len )) goto done; - pbuf->pDevMode->u1.s1.dmScale = scale; + pbuf->pDevMode->dmScale = scale; pbuf->pDevMode->dmFields |= DM_SCALE; hdc = CreateDCA( dbuf->pDriverPath, pbuf->pPrinterName, pbuf->pPortName, pbuf->pDevMode ); @@ -1600,7 +1597,7 @@ static void test_clip_box(void) EnumDisplaySettingsA(NULL, ENUM_CURRENT_SETTINGS, &scale_mode); scale_mode.dmFields |= DM_SCALE; - scale_mode.u1.s1.dmScale = 200; + scale_mode.dmScale = 200; SetRect(&screen_rect, GetSystemMetrics(SM_XVIRTUALSCREEN), GetSystemMetrics(SM_YVIRTUALSCREEN), GetSystemMetrics(SM_XVIRTUALSCREEN) + GetSystemMetrics(SM_CXVIRTUALSCREEN),

1 0

Paul Gofman : server: Cancel pipe asyncs when the last handle in process is closed.
by Alexandre Julliard 20 Jul '23

20 Jul '23

Module: wine Branch: master Commit: 03c1930b74e9a41da84fd712a3ebdbb4f7fcbcb5 URL: https://gitlab.winehq.org/wine/wine/-/commit/03c1930b74e9a41da84fd712a3ebdb… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Jul 14 20:21:50 2023 -0600 server: Cancel pipe asyncs when the last handle in process is closed. --- dlls/ntdll/tests/pipe.c | 5 ++++- server/named_pipe.c | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/tests/pipe.c b/dlls/ntdll/tests/pipe.c index c9cfdb03826..a1115bf47b9 100644 --- a/dlls/ntdll/tests/pipe.c +++ b/dlls/ntdll/tests/pipe.c @@ -3067,9 +3067,12 @@ static void test_async_cancel_on_handle_close(void) ok(bret, "failed, error %lu.\n", GetLastError()); CloseHandle(read); + /* Canceled asyncs with completion port and no event do not update IOSB before removing completion. */ + todo_wine_if(other_process && tests[i].apc_context && !tests[i].event) ok(io.Status == 0xcccccccc, "got %#lx.\n", io.Status); + if (other_process && tests[i].apc_context && !tests[i].event) - todo_wine test_queued_completion(port, &io, STATUS_CANCELLED, 0); + test_queued_completion(port, &io, STATUS_CANCELLED, 0); else test_no_queued_completion(port); diff --git a/server/named_pipe.c b/server/named_pipe.c index 9a10c2bf041..3adc79068ab 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -179,7 +179,7 @@ static const struct object_ops pipe_server_ops = NULL, /* unlink_name */ pipe_server_open_file, /* open_file */ no_kernel_obj_list, /* get_kernel_obj_list */ - no_close_handle, /* close_handle */ + async_close_obj_handle, /* close_handle */ pipe_server_destroy /* destroy */ }; @@ -223,7 +223,7 @@ static const struct object_ops pipe_client_ops = NULL, /* unlink_name */ no_open_file, /* open_file */ no_kernel_obj_list, /* get_kernel_obj_list */ - no_close_handle, /* close_handle */ + async_close_obj_handle, /* close_handle */ pipe_end_destroy /* destroy */ };

1 0

Paul Gofman : server: Cancel socket asyncs when the last handle in process is closed.
by Alexandre Julliard 20 Jul '23

20 Jul '23

Module: wine Branch: master Commit: 57095a91b053a5570bd797782b51b84fdd42173c URL: https://gitlab.winehq.org/wine/wine/-/commit/57095a91b053a5570bd797782b51b8… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Jul 19 10:02:06 2023 -0600 server: Cancel socket asyncs when the last handle in process is closed. --- dlls/ws2_32/tests/afd.c | 11 +++++++---- server/async.c | 22 ++++++++++++++++++++++ server/file.h | 1 + server/handle.c | 15 +++++++++++++++ server/handle.h | 1 + server/sock.c | 3 +-- 6 files changed, 47 insertions(+), 6 deletions(-) diff --git a/dlls/ws2_32/tests/afd.c b/dlls/ws2_32/tests/afd.c index ef3e6385c7f..97139605bf1 100644 --- a/dlls/ws2_32/tests/afd.c +++ b/dlls/ws2_32/tests/afd.c @@ -2858,17 +2858,20 @@ static void test_async_cancel_on_handle_close(void) closesocket(listener); + /* Canceled asyncs with completion port and no event do not update IOSB before removing completion. */ + todo_wine_if(other_process && tests[i].apc_context && !tests[i].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); if (other_process && tests[i].apc_context && !tests[i].event) { - todo_wine ok(!ret, "got %#lx\n", ret); - todo_wine ok(!key, "got key %#Ix\n", key); - todo_wine ok(value == 0xdeadbeef, "got value %#Ix\n", value); - todo_wine ok(io.Status == STATUS_CANCELLED, "got %#lx\n", io.Status); + ok(!ret, "got %#lx\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 { diff --git a/server/async.c b/server/async.c index 26946b5f5ce..9cb251df5ce 100644 --- a/server/async.c +++ b/server/async.c @@ -614,6 +614,28 @@ void cancel_process_asyncs( struct process *process ) cancel_async( process, NULL, NULL, 0 ); } +int async_close_obj_handle( struct object *obj, struct process *process, obj_handle_t handle ) +{ + /* Handle a special case when the last object handle in the given process is closed. + * If this is the last object handle overall that is handled in object's close_handle and + * destruction. */ + struct async *async; + + if (obj->handle_count == 1 || get_obj_handle_count( process, obj ) != 1) return 1; + +restart: + LIST_FOR_EACH_ENTRY( async, &process->asyncs, struct async, process_entry ) + { + if (async->terminated || async->canceled || get_fd_user( async->fd ) != obj) continue; + if (!async->completion || !async->data.apc_context || async->event) continue; + + async->canceled = 1; + fd_cancel_async( async->fd, async ); + goto restart; + } + return 1; +} + void cancel_terminating_thread_asyncs( struct thread *thread ) { struct async *async; diff --git a/server/file.h b/server/file.h index 210fcec5e78..a43b4afad08 100644 --- a/server/file.h +++ b/server/file.h @@ -246,6 +246,7 @@ extern struct thread *async_get_thread( struct async *async ); extern struct async *find_pending_async( struct async_queue *queue ); extern void cancel_process_asyncs( struct process *process ); extern void cancel_terminating_thread_asyncs( struct thread *thread ); +extern int async_close_obj_handle( struct object *obj, struct process *process, obj_handle_t handle ); static inline void init_async_queue( struct async_queue *queue ) { diff --git a/server/handle.c b/server/handle.c index 38ad80da267..0595fdb403b 100644 --- a/server/handle.c +++ b/server/handle.c @@ -520,6 +520,21 @@ obj_handle_t find_inherited_handle( struct process *process, const struct object return 0; } +/* return number of open handles to the object in the process */ +unsigned int get_obj_handle_count( struct process *process, const struct object *obj ) +{ + struct handle_table *table = process->handles; + struct handle_entry *ptr; + unsigned int count = 0; + int i; + + if (!table) return 0; + + for (i = 0, ptr = table->entries; i <= table->last; i++, ptr++) + if (ptr->ptr == obj) ++count; + return count; +} + /* get/set the handle reserved flags */ /* return the old flags (or -1 on error) */ static int set_handle_flags( struct process *process, obj_handle_t handle, int mask, int flags ) diff --git a/server/handle.h b/server/handle.h index ac3104dc003..1d02e040258 100644 --- a/server/handle.h +++ b/server/handle.h @@ -48,6 +48,7 @@ extern obj_handle_t open_object( struct process *process, obj_handle_t parent, u const struct object_ops *ops, const struct unicode_str *name, unsigned int attr ); extern obj_handle_t find_inherited_handle( struct process *process, const struct object_ops *ops ); +extern unsigned int get_obj_handle_count( struct process *process, const struct object *obj ); extern void close_process_handles( struct process *process ); extern struct handle_table *alloc_handle_table( struct process *process, int count ); extern struct handle_table *copy_handle_table( struct process *process, struct process *parent, diff --git a/server/sock.c b/server/sock.c index 34be6ea22ef..2aae9aefbf0 100644 --- a/server/sock.c +++ b/server/sock.c @@ -1655,8 +1655,7 @@ static int sock_close_handle( struct object *obj, struct process *process, obj_h if (signaled) complete_async_poll( poll_req, STATUS_SUCCESS ); } } - - return 1; + return async_close_obj_handle( obj, process, handle ); } static void sock_destroy( struct object *obj )

1 0

Paul Gofman : ws2_32/tests: Add test for async cancel on socket's last process handle close.
by Alexandre Julliard 20 Jul '23

20 Jul '23

Module: wine Branch: master Commit: 6360f56931bad30dd6381d317570ccee98393e66 URL: https://gitlab.winehq.org/wine/wine/-/commit/6360f56931bad30dd6381d317570cc… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Jul 14 19:57:51 2023 -0600 ws2_32/tests: Add test for async cancel on socket's last process handle close. --- dlls/ws2_32/tests/afd.c | 184 ++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 172 insertions(+), 12 deletions(-) diff --git a/dlls/ws2_32/tests/afd.c b/dlls/ws2_32/tests/afd.c index 1644a9dc4ff..ef3e6385c7f 100644 --- a/dlls/ws2_32/tests/afd.c +++ b/dlls/ws2_32/tests/afd.c @@ -33,6 +33,24 @@ #define TIMEOUT_INFINITE _I64_MAX +static HANDLE create_process(const char *arg) +{ + STARTUPINFOA si = { 0 }; + PROCESS_INFORMATION pi; + char cmdline[MAX_PATH]; + char **argv; + BOOL ret; + + si.cb = sizeof(si); + winetest_get_mainargs(&argv); + sprintf(cmdline, "%s %s %s", argv[0], argv[1], arg); + ret = CreateProcessA(NULL, cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); + ok(ret, "got %lu.\n", GetLastError()); + ret = CloseHandle(pi.hThread); + ok(ret, "got %lu.\n", GetLastError()); + return pi.hProcess; +} + static void tcp_socketpair_flags(SOCKET *src, SOCKET *dst, DWORD flags) { SOCKET server = INVALID_SOCKET; @@ -2464,11 +2482,11 @@ static NTSTATUS WINAPI thread_NtDeviceIoControlFile(BOOL kill_thread, HANDLE han return p.ret; } -static unsigned int test_async_thread_termination_apc_count; +static unsigned int test_apc_count; -static void WINAPI test_async_thread_termination_apc( void *arg, IO_STATUS_BLOCK *iosb, ULONG reserved ) +static void WINAPI test_apc_proc( void *arg, IO_STATUS_BLOCK *iosb, ULONG reserved ) { - ++test_async_thread_termination_apc_count; + ++test_apc_count; } static void test_async_thread_termination(void) @@ -2486,18 +2504,18 @@ static void test_async_thread_termination(void) {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, test_apc_proc, NULL}, + {TRUE, TRUE, test_apc_proc, NULL}, + {FALSE, FALSE, test_apc_proc, NULL}, + {TRUE, FALSE, test_apc_proc, 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}, + {FALSE, TRUE, test_apc_proc, (void *)0xdeadbeef}, + {TRUE, TRUE, test_apc_proc, (void *)0xdeadbeef}, + {FALSE, FALSE, test_apc_proc, (void *)0xdeadbeef}, + {TRUE, FALSE, test_apc_proc, (void *)0xdeadbeef}, }; const struct sockaddr_in bind_addr = {.sin_family = AF_INET, .sin_addr.s_addr = htonl(INADDR_LOOPBACK)}; @@ -2550,7 +2568,7 @@ static void test_async_thread_termination(void) } SleepEx(0, TRUE); - ok(!test_async_thread_termination_apc_count, "got APC.\n"); + ok(!test_apc_count, "got APC.\n"); port = CreateIoCompletionPort((HANDLE)listener, NULL, 0, 0); @@ -2754,12 +2772,153 @@ static void test_read_write(void) CloseHandle(event); } +static void test_async_cancel_on_handle_close(void) +{ + static const struct + { + BOOL event; + PIO_APC_ROUTINE apc; + void *apc_context; + } + tests[] = + { + {TRUE, NULL, NULL}, + {FALSE, NULL, NULL}, + {TRUE, test_apc_proc, NULL}, + {FALSE, test_apc_proc, NULL}, + {TRUE, NULL, (void *)0xdeadbeef}, + {FALSE, NULL, (void *)0xdeadbeef}, + {TRUE, test_apc_proc, (void *)0xdeadbeef}, + {FALSE, test_apc_proc, (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; + unsigned int i, other_process; + LARGE_INTEGER zero = {{0}}; + HANDLE process_handle; + ULONG_PTR key, value; + IO_STATUS_BLOCK io; + HANDLE event, port; + ULONG params_size; + SOCKET listener; + HANDLE handle2; + DWORD ret; + BOOL bret; + + process_handle = create_process("sleep"); + + event = CreateEventW(NULL, FALSE, FALSE, NULL); + + in_params->count = 1; + in_params->exclusive = FALSE; + 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; + + for (other_process = 0; other_process < 2; ++other_process) + { + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + winetest_push_context("other_process %u, i %u", other_process, i); + + 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()); + + port = CreateIoCompletionPort((HANDLE)listener, NULL, 0, 0); + ok(!!port, "got %p.\n", port); + + in_params->sockets[0].socket = listener; + + memset(&io, 0xcc, sizeof(io)); + ResetEvent(event); + ret = NtDeviceIoControlFile((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 %#lx\n", ret); + winetest_pop_context(); + continue; + } + ok(ret == STATUS_PENDING, "got %#lx.\n", ret); + ok(io.Status == 0xcccccccc, "got %#lx.\n", io.Status); + + bret = DuplicateHandle(GetCurrentProcess(), (HANDLE)listener, + other_process ? process_handle : GetCurrentProcess(), + &handle2, 0, FALSE, DUPLICATE_SAME_ACCESS); + ok(bret, "failed, error %lu.\n", GetLastError()); + + closesocket(listener); + + 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); + if (other_process && tests[i].apc_context && !tests[i].event) + { + todo_wine ok(!ret, "got %#lx\n", ret); + todo_wine ok(!key, "got key %#Ix\n", key); + todo_wine ok(value == 0xdeadbeef, "got value %#Ix\n", value); + todo_wine ok(io.Status == STATUS_CANCELLED, "got %#lx\n", io.Status); + } + else + { + ok(ret == WAIT_TIMEOUT, "got %#lx\n", ret); + } + + ret = WaitForSingleObject(event, 0); + ok(ret == WAIT_TIMEOUT, "got %#lx.\n", ret); + + if (other_process) + { + bret = DuplicateHandle(process_handle, handle2, GetCurrentProcess(), (HANDLE *)&listener, 0, FALSE, + DUPLICATE_SAME_ACCESS | DUPLICATE_CLOSE_SOURCE); + ok(bret, "failed, error %lu.\n", GetLastError()); + } + else + { + listener = (SOCKET)handle2; + } + + CloseHandle((HANDLE)listener); + CloseHandle(port); + winetest_pop_context(); + } + } + CloseHandle(event); + TerminateProcess(process_handle, 0); + WaitForSingleObject(process_handle, INFINITE); + CloseHandle(process_handle); +} + START_TEST(afd) { WSADATA data; + char **argv; + int argc; WSAStartup(MAKEWORD(2, 2), &data); + argc = winetest_get_mainargs(&argv); + if (argc >= 3) + { + if (!strcmp(argv[2], "sleep")) + { + Sleep(5000); + return; + } + return; + } + test_open_device(); test_poll(); test_poll_exclusive(); @@ -2773,6 +2932,7 @@ START_TEST(afd) test_getsockname(); test_async_thread_termination(); test_read_write(); + test_async_cancel_on_handle_close(); WSACleanup(); }

1 0

← Newer
1
...
20
21
22
23
24
25
26
...
87
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2023