May 2021 - Wine-commits - list.winehq.org

Francois Gouget : advapi32/tests: Trace failures to open the event log.
by Alexandre Julliard 17 May '21

17 May '21

Module: wine Branch: master Commit: 832b7f1e8666dac7054b61f47ae685edbae07981 URL: https://source.winehq.org/git/wine.git/?a=commit;h=832b7f1e8666dac7054b61f4… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sat May 15 17:39:19 2021 +0200 advapi32/tests: Trace failures to open the event log. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/eventlog.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/tests/eventlog.c b/dlls/advapi32/tests/eventlog.c index 72bcb4d1788..0c5d1e2523f 100644 --- a/dlls/advapi32/tests/eventlog.c +++ b/dlls/advapi32/tests/eventlog.c @@ -64,8 +64,10 @@ static BOOL create_backup(const char *filename) HANDLE handle; DWORD rc, attribs; - DeleteFileA(filename); handle = OpenEventLogA(NULL, "Application"); + ok(handle != NULL, "OpenEventLogA(Application) failed : %d\n", GetLastError()); + + DeleteFileA(filename); rc = BackupEventLogA(handle, filename); if (!rc && GetLastError() == ERROR_PRIVILEGE_NOT_HELD) { @@ -160,6 +162,7 @@ static void test_info(void) ok(GetLastError() == ERROR_INVALID_HANDLE, "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); handle = OpenEventLogA(NULL, "Application"); + ok(handle != NULL, "OpenEventLogA(Application) failed : %d\n", GetLastError()); SetLastError(0xdeadbeef); ret = pGetEventLogInformation(handle, EVENTLOG_FULL_INFO, NULL, 0, NULL); @@ -216,6 +219,7 @@ static void test_count(void) ok(count == 0xdeadbeef, "Expected count to stay unchanged\n"); handle = OpenEventLogA(NULL, "Application"); + ok(handle != NULL, "OpenEventLogA(Application) failed : %d\n", GetLastError()); SetLastError(0xdeadbeef); ret = GetNumberOfEventLogRecords(handle, NULL); @@ -270,6 +274,7 @@ static void test_oldest(void) ok(oldest == 0xdeadbeef, "Expected oldest to stay unchanged\n"); handle = OpenEventLogA(NULL, "Application"); + ok(handle != NULL, "OpenEventLogA(Application) failed : %d\n", GetLastError()); SetLastError(0xdeadbeef); ret = GetOldestEventLogRecord(handle, NULL); @@ -322,6 +327,7 @@ static void test_backup(void) ok(GetFileAttributesA(backup) == INVALID_FILE_ATTRIBUTES, "Expected no backup file\n"); handle = OpenEventLogA(NULL, "Application"); + ok(handle != NULL, "OpenEventLogA(Application) failed : %d\n", GetLastError()); SetLastError(0xdeadbeef); ret = BackupEventLogA(handle, NULL); @@ -433,6 +439,7 @@ static void test_read(void) HeapFree(GetProcessHeap(), 0, buf); handle = OpenEventLogA(NULL, "Application"); + ok(handle != NULL, "OpenEventLogA(Application) failed : %d\n", GetLastError()); /* Show that we need the proper dwFlags with a (for the rest) proper call */ buf = HeapAlloc(GetProcessHeap(), 0, sizeof(EVENTLOGRECORD));

1 0

Francois Gouget : mshtml/tests: Fix the spelling of an ok() message.
by Alexandre Julliard 17 May '21

17 May '21

Module: wine Branch: master Commit: 53cba4f066a022e9be0d84a2d36c6b1c2694992c URL: https://source.winehq.org/git/wine.git/?a=commit;h=53cba4f066a022e9be0d84a2… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat May 15 17:41:03 2021 +0200 mshtml/tests: Fix the spelling of an ok() message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/dom.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/tests/dom.js b/dlls/mshtml/tests/dom.js index d171b516cfd..a2c70540eba 100644 --- a/dlls/mshtml/tests/dom.js +++ b/dlls/mshtml/tests/dom.js @@ -453,7 +453,7 @@ async_test("animation_frame", function() { var id = requestAnimationFrame(function(x) { ok(this === window, "this != window"); ok(typeof(x) === "number", "x = " + x); - ok(arguments.length === 1, "arguments.lenght = " + arguments.length); + ok(arguments.length === 1, "arguments.length = " + arguments.length); next_test(); }); ok(typeof(id) === "number", "id = " + id);

1 0

Martin Storsjo : widl: Allow switching between 32 and 64 bit ARM with the -m32/64 option.
by Alexandre Julliard 17 May '21

17 May '21

Module: wine Branch: master Commit: 4766a018184d2ffa95657dbc926dd0cfe81158c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4766a018184d2ffa95657dbc… Author: Martin Storsjo <martin(a)martin.st> Date: Sun May 16 23:57:57 2021 +0300 widl: Allow switching between 32 and 64 bit ARM with the -m32/64 option. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/widl.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tools/widl/widl.c b/tools/widl/widl.c index 8da887ea636..992eef73e82 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -796,8 +796,12 @@ int main(int argc,char *argv[]) if (pointer_size == 4) target_cpu = CPU_x86; else pointer_size = 8; break; + case CPU_ARM: + if (pointer_size == 8) target_cpu = CPU_ARM64; + else pointer_size = 4; + break; case CPU_ARM64: - if (pointer_size == 4) error( "Cannot build 32-bit code for this CPU\n" ); + if (pointer_size == 4) target_cpu = CPU_ARM; pointer_size = 8; break; case CPU_POWERPC64:

1 0

Martin Storsjo : widl: Pick up the target arch from a prefix on argv[0].
by Alexandre Julliard 17 May '21

17 May '21

Module: wine Branch: master Commit: 57433856b46c96227552dfc577a6139f7a173bb8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=57433856b46c96227552dfc5… Author: Martin Storsjo <martin(a)martin.st> Date: Mon May 17 00:22:42 2021 +0300 widl: Pick up the target arch from a prefix on argv[0]. If the executable is named <target>-widl, try to pick up the target arch implicitly from there. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/widl.c | 99 +++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 64 insertions(+), 35 deletions(-) diff --git a/tools/widl/widl.c b/tools/widl/widl.c index 992eef73e82..b40745a49f8 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -211,6 +211,31 @@ static const struct option long_options[] = { { NULL, 0, NULL, 0 } }; +static const struct +{ + const char *name; + enum target_cpu cpu; +} cpu_names[] = +{ + { "i386", CPU_x86 }, + { "i486", CPU_x86 }, + { "i586", CPU_x86 }, + { "i686", CPU_x86 }, + { "i786", CPU_x86 }, + { "amd64", CPU_x86_64 }, + { "x86_64", CPU_x86_64 }, + { "powerpc", CPU_POWERPC }, + { "powerpc64", CPU_POWERPC64 }, + { "powerpc64le", CPU_POWERPC64 }, + { "arm", CPU_ARM }, + { "armv5", CPU_ARM }, + { "armv6", CPU_ARM }, + { "armv7", CPU_ARM }, + { "armv7a", CPU_ARM }, + { "arm64", CPU_ARM64 }, + { "aarch64", CPU_ARM64 }, +}; + static void rm_tempfile(void); enum stub_mode get_stub_mode(void) @@ -274,51 +299,54 @@ static void add_widl_version_define(void) wpp_add_cmdline_define(version_str); } -/* set the target platform */ -static void set_target( const char *target ) +static void set_cpu( const char *cpu, int error_out ) { - static const struct + unsigned int i; + for (i = 0; i < ARRAY_SIZE( cpu_names ); i++) { - const char *name; - enum target_cpu cpu; - } cpu_names[] = + if (!strcmp( cpu_names[i].name, cpu )) + { + target_cpu = cpu_names[i].cpu; + return; + } + } + if (error_out) + error( "Unrecognized CPU '%s'\n", cpu ); +} + +/* Set the target platform based on a potential prefix of the executable name. + * If not found, or not matching a known CPU name, just proceed silently. */ +static void init_argv0_target( const char *argv0 ) +{ + char *p, *name; + + if ((p = strrchr(argv0, '/')) != NULL) + argv0 = p + 1; + if ((p = strrchr(argv0, '\\')) != NULL) + argv0 = p + 1; + + name = xstrdup( argv0 ); + if (!(p = strchr(name, '-'))) { - { "i386", CPU_x86 }, - { "i486", CPU_x86 }, - { "i586", CPU_x86 }, - { "i686", CPU_x86 }, - { "i786", CPU_x86 }, - { "amd64", CPU_x86_64 }, - { "x86_64", CPU_x86_64 }, - { "powerpc", CPU_POWERPC }, - { "powerpc64", CPU_POWERPC64 }, - { "powerpc64le", CPU_POWERPC64 }, - { "arm", CPU_ARM }, - { "armv5", CPU_ARM }, - { "armv6", CPU_ARM }, - { "armv7", CPU_ARM }, - { "armv7a", CPU_ARM }, - { "arm64", CPU_ARM64 }, - { "aarch64", CPU_ARM64 }, - }; + free( name ); + return; + } + *p = 0; + set_cpu( name, 0 ); + free( name ); +} - unsigned int i; +/* set the target platform */ +static void set_target( const char *target ) +{ char *p, *spec = xstrdup( target ); /* target specification is in the form CPU-MANUFACTURER-OS or CPU-MANUFACTURER-KERNEL-OS */ if (!(p = strchr( spec, '-' ))) error( "Invalid target specification '%s'\n", target ); *p++ = 0; - for (i = 0; i < ARRAY_SIZE( cpu_names ); i++) - { - if (!strcmp( cpu_names[i].name, spec )) - { - target_cpu = cpu_names[i].cpu; - free( spec ); - return; - } - } - error( "Unrecognized CPU '%s'\n", spec ); + set_cpu( spec, 1 ); + free( spec ); } /* clean things up when aborting on a signal */ @@ -607,6 +635,7 @@ int main(int argc,char *argv[]) signal( SIGHUP, exit_on_signal ); #endif init_argv0_dir( argv[0] ); + init_argv0_target( argv[0] ); now = time(NULL);

1 0

Zebediah Figura : quartz/tests: Remove the no longer used TestFilterImpl structure.
by Alexandre Julliard 17 May '21

17 May '21

Module: wine Branch: master Commit: 11c336b4a97e7520df3c100b9a95e1a15262194e URL: https://source.winehq.org/git/wine.git/?a=commit;h=11c336b4a97e7520df3c100b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun May 16 16:37:26 2021 -0500 quartz/tests: Remove the no longer used TestFilterImpl structure. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filtergraph.c | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 4822b65a7a6..b2d5b4e26e8 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -28,19 +28,6 @@ static const GUID testguid = {0xabbccdde}; -typedef struct TestFilterImpl -{ - IBaseFilter IBaseFilter_iface; - - LONG refCount; - CRITICAL_SECTION csFilter; - FILTER_STATE state; - FILTER_INFO filterInfo; - CLSID clsid; - IPin **ppPins; - UINT nPins; -} TestFilterImpl; - static BOOL compare_time(ULONGLONG x, ULONGLONG y, unsigned int max_diff) { ULONGLONG diff = x > y ? x - y : y - x;

1 0

Zebediah Figura : quartz/tests: Use CRT memory allocators.
by Alexandre Julliard 17 May '21

17 May '21

Module: wine Branch: master Commit: 226897bec73768f78c9ea2137c34d0df87c54fe2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=226897bec73768f78c9ea213… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun May 16 16:37:27 2021 -0500 quartz/tests: Use CRT memory allocators. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filtergraph.c | 11 ++--------- dlls/quartz/tests/videorenderer.c | 5 ++--- dlls/quartz/tests/vmr7.c | 5 ++--- dlls/quartz/tests/vmr9.c | 5 ++--- 4 files changed, 8 insertions(+), 18 deletions(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index b2d5b4e26e8..c663b5d8a99 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -23,7 +23,6 @@ #define CONST_VTABLE #include "dshow.h" -#include "wine/heap.h" #include "wine/test.h" static const GUID testguid = {0xabbccdde}; @@ -1486,14 +1485,8 @@ static HRESULT WINAPI testfilter_JoinFilterGraph(IBaseFilter *iface, IFilterGrap if (winetest_debug > 1) trace("%p->JoinFilterGraph(%p, %s)\n", filter, graph, wine_dbgstr_w(name)); filter->graph = graph; - heap_free(filter->name); - if (name) - { - filter->name = heap_alloc((wcslen(name) + 1) * sizeof(WCHAR)); - wcscpy(filter->name, name); - } - else - filter->name = NULL; + free(filter->name); + filter->name = name ? wcsdup(name) : NULL; return S_OK; } diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index ffe370acf43..f4d9660316c 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -20,7 +20,6 @@ #define COBJMACROS #include "dshow.h" -#include "wine/heap.h" #include "wine/strmbase.h" #include "wine/test.h" @@ -765,13 +764,13 @@ static DWORD WINAPI frame_thread(void *arg) hr = IMemInputPin_Receive(params->sink, params->sample); if (winetest_debug > 1) trace("%04x: Returned %#x.\n", GetCurrentThreadId(), hr); IMediaSample_Release(params->sample); - heap_free(params); + free(params); return hr; } static HANDLE send_frame_time(IMemInputPin *sink, REFERENCE_TIME start_time, unsigned char color) { - struct frame_thread_params *params = heap_alloc(sizeof(*params)); + struct frame_thread_params *params = malloc(sizeof(*params)); IMemAllocator *allocator; REFERENCE_TIME end_time; IMediaSample *sample; diff --git a/dlls/quartz/tests/vmr7.c b/dlls/quartz/tests/vmr7.c index ba2a98cb69d..212ce213e89 100644 --- a/dlls/quartz/tests/vmr7.c +++ b/dlls/quartz/tests/vmr7.c @@ -23,7 +23,6 @@ #include "dshow.h" #include "d3d9.h" #include "vmr9.h" -#include "wine/heap.h" #include "wine/strmbase.h" #include "wine/test.h" @@ -969,13 +968,13 @@ static DWORD WINAPI frame_thread(void *arg) hr = IMemInputPin_Receive(params->sink, params->sample); if (winetest_debug > 1) trace("%04x: Returned %#x.\n", GetCurrentThreadId(), hr); IMediaSample_Release(params->sample); - heap_free(params); + free(params); return hr; } static HANDLE send_frame(IMemInputPin *sink) { - struct frame_thread_params *params = heap_alloc(sizeof(*params)); + struct frame_thread_params *params = malloc(sizeof(*params)); REFERENCE_TIME start_time, end_time; IMemAllocator *allocator; IMediaSample *sample; diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index 8b46e4706a5..44b9a453305 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -28,7 +28,6 @@ #include "d3d9.h" #include "vmr9.h" #include "wmcodecdsp.h" -#include "wine/heap.h" #include "wine/strmbase.h" #include "wine/test.h" @@ -976,13 +975,13 @@ static DWORD WINAPI frame_thread(void *arg) hr = IMemInputPin_Receive(params->sink, params->sample); if (winetest_debug > 1) trace("%04x: Returned %#x.\n", GetCurrentThreadId(), hr); IMediaSample_Release(params->sample); - heap_free(params); + free(params); return hr; } static HANDLE send_frame_time(IMemInputPin *sink, REFERENCE_TIME start_time, DWORD color) { - struct frame_thread_params *params = heap_alloc(sizeof(*params)); + struct frame_thread_params *params = malloc(sizeof(*params)); IMemAllocator *allocator; REFERENCE_TIME end_time; IMediaSample *sample;

1 0

Zebediah Figura : server: Also clear pending events in set_socket_event.
by Alexandre Julliard 17 May '21

17 May '21

Module: wine Branch: master Commit: 609dfea1fde4deaefc5c67b2544c4a5cab987dd3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=609dfea1fde4deaefc5c67b2… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun May 16 21:45:50 2021 -0500 server: Also clear pending events in set_socket_event. In particular, prevent FD_CONNECT from being reported when not selected for. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/sock.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/server/sock.c b/server/sock.c index 945895b51a4..565fb4c5a2c 100644 --- a/server/sock.c +++ b/server/sock.c @@ -1809,7 +1809,10 @@ DECL_HANDLER(set_socket_event) old_event = sock->event; sock->mask = req->mask; if (req->window) - sock->reported_events &= ~req->mask; /* re-enable held events */ + { + sock->pending_events &= ~req->mask; + sock->reported_events &= ~req->mask; + } sock->event = NULL; sock->window = req->window; sock->message = req->msg;

1 0

Zebediah Figura : winegstreamer: Use a static buffer to enumerate stream types in media_stream_init_desc().
by Alexandre Julliard 17 May '21

17 May '21

Module: wine Branch: master Commit: cf02b0bdfafddff74cfbaca88ba70c6bd59ca0b0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf02b0bdfafddff74cfbaca8… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun May 16 22:35:30 2021 -0500 winegstreamer: Use a static buffer to enumerate stream types in media_stream_init_desc(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/media_source.c | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index 7f308973270..8a87992d450 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -757,8 +757,7 @@ fail: static HRESULT media_stream_init_desc(struct media_stream *stream) { IMFMediaTypeHandler *type_handler = NULL; - IMFMediaType **stream_types = NULL; - IMFMediaType *stream_type = NULL; + IMFMediaType *stream_types[6]; struct wg_format format; DWORD type_count = 0; unsigned int i; @@ -784,8 +783,6 @@ static HRESULT media_stream_init_desc(struct media_stream *stream) IMFMediaType_GetGUID(base_type, &MF_MT_SUBTYPE, &base_subtype); - stream_types = malloc(sizeof(IMFMediaType *) * (ARRAY_SIZE(video_types) + 1)); - stream_types[0] = base_type; type_count = 1; @@ -816,8 +813,6 @@ static HRESULT media_stream_init_desc(struct media_stream *stream) WG_AUDIO_FORMAT_F32LE, }; - stream_types = malloc( sizeof(IMFMediaType *) * (ARRAY_SIZE(audio_types) + 1) ); - stream_types[0] = mf_media_type_from_wg_format(&format); type_count = 1; @@ -833,14 +828,12 @@ static HRESULT media_stream_init_desc(struct media_stream *stream) } else { - stream_type = mf_media_type_from_wg_format(&format); - if (stream_type) - { - stream_types = &stream_type; + if ((stream_types[0] = mf_media_type_from_wg_format(&format))) type_count = 1; - } } + assert(type_count < ARRAY_SIZE(stream_types)); + if (!type_count) { ERR("Failed to establish an IMFMediaType from any of the possible stream caps!\n"); @@ -861,8 +854,6 @@ done: IMFMediaTypeHandler_Release(type_handler); for (i = 0; i < type_count; i++) IMFMediaType_Release(stream_types[i]); - if (stream_types != &stream_type) - free(stream_types); return hr; }

1 0

Alexandre Julliard : ntdll: Add a helper function to set the thread id.
by Alexandre Julliard 17 May '21

17 May '21

Module: wine Branch: master Commit: 711bde7cd11bfbb691e0e9b5fa2efae82a4f541c URL: https://source.winehq.org/git/wine.git/?a=commit;h=711bde7cd11bfbb691e0e9b5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 17 09:39:34 2021 +0200 ntdll: Add a helper function to set the thread id. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/server.c | 38 ++++++++++---------------------------- dlls/ntdll/unix/thread.c | 30 +++++++++++++++++++++++++----- dlls/ntdll/unix/unix_private.h | 1 + 3 files changed, 36 insertions(+), 33 deletions(-) diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index 9f10bb135bd..33a49adb8e8 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -1446,22 +1446,6 @@ static int init_thread_pipe(void) } -/*********************************************************************** - * init_teb64 - * - * Initialize the 64-bit part of the TEB for WoW64 threads. - */ -static void init_teb64( TEB *teb ) -{ -#ifndef _WIN64 - TEB64 *teb64 = (TEB64 *)((char *)teb - teb_offset); - - if (!is_wow64) return; - teb64->ClientId.UniqueProcess = PtrToUlong( teb->ClientId.UniqueProcess ); - teb64->ClientId.UniqueThread = PtrToUlong( teb->ClientId.UniqueThread ); -#endif -} - /*********************************************************************** * process_exit_wrapper * @@ -1488,6 +1472,7 @@ size_t server_init_process(void) int ret, reply_pipe; struct sigaction sig_act; size_t info_size; + DWORD pid, tid; server_pid = -1; if (env_socket) @@ -1558,8 +1543,8 @@ size_t server_init_process(void) req->debug_level = (TRACE_ON(server) != 0); wine_server_set_reply( req, supported_machines, sizeof(supported_machines) ); ret = wine_server_call( req ); - NtCurrentTeb()->ClientId.UniqueProcess = ULongToHandle(reply->pid); - NtCurrentTeb()->ClientId.UniqueThread = ULongToHandle(reply->tid); + pid = reply->pid; + tid = reply->tid; info_size = reply->info_size; server_start_time = reply->server_start; supported_machines_count = wine_server_reply_size( reply ) / sizeof(*supported_machines); @@ -1578,13 +1563,11 @@ size_t server_init_process(void) { if (arch && !strcmp( arch, "win32" )) fatal_error( "WINEARCH set to win32 but '%s' is a 64-bit installation.\n", config_dir ); - if (!is_win64) - { - is_wow64 = TRUE; - NtCurrentTeb()->GdiBatchCount = PtrToUlong( (char *)NtCurrentTeb() - teb_offset ); - NtCurrentTeb()->WowTebOffset = -teb_offset; - init_teb64( NtCurrentTeb() ); - } +#ifndef _WIN64 + is_wow64 = TRUE; + NtCurrentTeb()->GdiBatchCount = PtrToUlong( (char *)NtCurrentTeb() - teb_offset ); + NtCurrentTeb()->WowTebOffset = -teb_offset; +#endif } else { @@ -1594,6 +1577,8 @@ size_t server_init_process(void) fatal_error( "WINEARCH set to win64 but '%s' is a 32-bit installation.\n", config_dir ); } + set_thread_id( NtCurrentTeb(), pid, tid ); + for (i = 0; i < supported_machines_count; i++) if (supported_machines[i] == current_machine) return info_size; @@ -1675,12 +1660,9 @@ void server_init_thread( void *entry_point, BOOL *suspend ) req->wait_fd = ntdll_get_thread_data()->wait_fd[1]; wine_server_call( req ); *suspend = reply->suspend; - NtCurrentTeb()->ClientId.UniqueProcess = ULongToHandle(reply->pid); - NtCurrentTeb()->ClientId.UniqueThread = ULongToHandle(reply->tid); } SERVER_END_REQ; close( reply_pipe ); - init_teb64( NtCurrentTeb() ); } diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index 01eeb666a44..079ac16952d 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -119,6 +119,28 @@ static void start_thread( TEB *teb ) } +/*********************************************************************** + * set_thread_id + */ +void set_thread_id( TEB *teb, DWORD pid, DWORD tid ) +{ + teb->ClientId.UniqueProcess = ULongToHandle( pid ); + teb->ClientId.UniqueThread = ULongToHandle( tid ); + if (teb->WowTebOffset) + { +#ifdef _WIN64 + TEB32 *teb32 = (TEB32 *)((char *)teb + teb->WowTebOffset); + teb32->ClientId.UniqueProcess = pid; + teb32->ClientId.UniqueThread = tid; +#else + TEB64 *teb64 = (TEB64 *)((char *)teb + teb->WowTebOffset); + teb64->ClientId.UniqueProcess = pid; + teb64->ClientId.UniqueThread = tid; +#endif + } +} + + /*********************************************************************** * update_attr_list * @@ -173,7 +195,6 @@ NTSTATUS WINAPI NtCreateThreadEx( HANDLE *handle, ACCESS_MASK access, OBJECT_ATT DWORD tid = 0; int request_pipe[2]; SIZE_T extra_stack = PTHREAD_STACK_MIN; - CLIENT_ID client_id; TEB *teb; INITIAL_TEB stack; NTSTATUS status; @@ -200,6 +221,7 @@ NTSTATUS WINAPI NtCreateThreadEx( HANDLE *handle, ACCESS_MASK access, OBJECT_ATT if (result.create_thread.status == STATUS_SUCCESS) { + CLIENT_ID client_id; TEB *teb = wine_server_get_ptr( result.create_thread.teb ); *handle = wine_server_ptr_handle( result.create_thread.handle ); client_id.UniqueProcess = ULongToHandle( result.create_thread.pid ); @@ -253,9 +275,7 @@ NTSTATUS WINAPI NtCreateThreadEx( HANDLE *handle, ACCESS_MASK access, OBJECT_ATT goto done; } - client_id.UniqueProcess = ULongToHandle( GetCurrentProcessId() ); - client_id.UniqueThread = ULongToHandle( tid ); - teb->ClientId = client_id; + set_thread_id( teb, GetCurrentProcessId(), tid ); teb->Tib.StackBase = stack.StackBase; teb->Tib.StackLimit = stack.StackLimit; @@ -289,7 +309,7 @@ done: close( request_pipe[1] ); return status; } - if (attr_list) update_attr_list( attr_list, &client_id, teb ); + if (attr_list) update_attr_list( attr_list, &teb->ClientId, teb ); return STATUS_SUCCESS; } diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index ce34cea7fcf..5c340107964 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -172,6 +172,7 @@ extern void server_init_process_done(void) DECLSPEC_HIDDEN; extern void server_init_thread( void *entry_point, BOOL *suspend ) DECLSPEC_HIDDEN; extern int server_pipe( int fd[2] ) DECLSPEC_HIDDEN; +extern void set_thread_id( TEB *teb, DWORD pid, DWORD tid ) DECLSPEC_HIDDEN; extern NTSTATUS context_to_server( context_t *to, const CONTEXT *from ) DECLSPEC_HIDDEN; extern NTSTATUS context_from_server( CONTEXT *to, const context_t *from ) DECLSPEC_HIDDEN; extern void DECLSPEC_NORETURN abort_thread( int status ) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : ntdll: Allocate a separate 64-bit stack for Wow64 threads.
by Alexandre Julliard 17 May '21

17 May '21

Module: wine Branch: master Commit: a8ff0c12f4ce60315156b9cbfd13291ad6cd4452 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a8ff0c12f4ce60315156b9cb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 17 09:58:46 2021 +0200 ntdll: Allocate a separate 64-bit stack for Wow64 threads. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/exception.c | 25 +++++++++++++++++++++++-- dlls/ntdll/unix/loader.c | 6 +----- dlls/ntdll/unix/thread.c | 41 +++++++++++++++++++++++++++++++++++------ dlls/ntdll/unix/unix_private.h | 2 ++ dlls/ntdll/unix/virtual.c | 15 +++++++++++++++ 5 files changed, 76 insertions(+), 13 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index d6565c12fce..d784074394a 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -3745,18 +3745,20 @@ static void test_thread_context(void) static void test_wow64_context(void) { - char cmdline[] = "C:\\windows\\syswow64\\notepad.exe"; + THREAD_BASIC_INFORMATION info; PROCESS_INFORMATION pi; STARTUPINFOA si = {0}; WOW64_CONTEXT ctx; NTSTATUS ret; + SIZE_T res; + TEB teb; memset(&ctx, 0x55, sizeof(ctx)); ctx.ContextFlags = WOW64_CONTEXT_ALL; ret = pRtlWow64GetThreadContext( GetCurrentThread(), &ctx ); ok(ret == STATUS_INVALID_PARAMETER || broken(ret == STATUS_PARTIAL_COPY), "got %#x\n", ret); - CreateProcessA(NULL, cmdline, NULL, NULL, FALSE, CREATE_SUSPENDED, NULL, NULL, &si, &pi); + CreateProcessA("C:\\windows\\syswow64\\notepad.exe", NULL, NULL, NULL, FALSE, CREATE_SUSPENDED, NULL, NULL, &si, &pi); ret = pRtlWow64GetThreadContext( pi.hThread, &ctx ); ok(ret == STATUS_SUCCESS, "got %#x\n", ret); @@ -3775,6 +3777,25 @@ static void test_wow64_context(void) ret = pRtlWow64SetThreadContext( pi.hThread, &ctx ); ok(ret == STATUS_SUCCESS, "got %#x\n", ret); + pNtQueryInformationThread( pi.hThread, ThreadBasicInformation, &info, sizeof(info), NULL ); + if (!ReadProcessMemory( pi.hProcess, info.TebBaseAddress, &teb, sizeof(teb), &res )) res = 0; + ok( res == sizeof(teb), "wrong len %lx\n", res ); + + if (teb.WowTebOffset > 1) + { + TEB32 teb32; + if (!ReadProcessMemory( pi.hProcess, (char *)info.TebBaseAddress + teb.WowTebOffset, + &teb32, sizeof(teb32), &res )) res = 0; + ok( res == sizeof(teb32), "wrong len %lx\n", res ); + + ok( ((ctx.Esp + 0xfff) & ~0xfff) == teb32.Tib.StackBase, + "esp is not at top of stack: %08x / %08x\n", ctx.Esp, teb32.Tib.StackBase ); + ok( ULongToPtr( teb32.Tib.StackBase ) <= teb.DeallocationStack || + ULongToPtr( teb32.DeallocationStack ) >= teb.Tib.StackBase, + "stacks overlap %08x-%08x / %p-%p\n", teb32.DeallocationStack, teb32.Tib.StackBase, + teb.DeallocationStack, teb.Tib.StackBase ); + } + pNtTerminateProcess(pi.hProcess, 0); } diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 1f1e6bc2796..1b79b71b252 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1853,7 +1853,6 @@ static struct unix_funcs unix_funcs = static void start_main_thread(void) { NTSTATUS status; - INITIAL_TEB stack; TEB *teb = virtual_alloc_first_teb(); signal_init_threading(); @@ -1871,10 +1870,7 @@ static void start_main_thread(void) if (p___wine_main_argv) *p___wine_main_argv = main_argv; if (p___wine_main_wargv) *p___wine_main_wargv = main_wargv; set_load_order_app_name( main_wargv[0] ); - virtual_alloc_thread_stack( &stack, is_win64 ? 0x7fffffff : 0, 0, 0, NULL ); - teb->Tib.StackBase = stack.StackBase; - teb->Tib.StackLimit = stack.StackLimit; - teb->DeallocationStack = stack.DeallocationStack; + init_thread_stack( teb, is_win64 ? 0x7fffffff : 0, 0, 0, NULL ); NtCreateKeyedEvent( &keyed_event, GENERIC_READ | GENERIC_WRITE, NULL, 0 ); load_ntdll(); status = p__wine_set_unix_funcs( NTDLL_UNIXLIB_VERSION, &unix_funcs ); diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index 079ac16952d..d2c14ae33c1 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -141,6 +141,40 @@ void set_thread_id( TEB *teb, DWORD pid, DWORD tid ) } +/*********************************************************************** + * init_thread_stack + */ +NTSTATUS init_thread_stack( TEB *teb, ULONG_PTR zero_bits, SIZE_T reserve_size, + SIZE_T commit_size, SIZE_T *pthread_size ) +{ + INITIAL_TEB stack, stack64; + NTSTATUS status; + + if ((status = virtual_alloc_thread_stack( &stack, zero_bits, reserve_size, commit_size, pthread_size ))) + return status; + + if (teb->WowTebOffset && !(status = virtual_alloc_thread_stack( &stack64, 0, 0x40000, 0x40000, NULL ))) + { +#ifdef _WIN64 + TEB32 *teb32 = (TEB32 *)((char *)teb + teb->WowTebOffset); + teb32->Tib.StackBase = PtrToUlong( stack.StackBase ); + teb32->Tib.StackLimit = PtrToUlong( stack.StackLimit ); + teb32->DeallocationStack = PtrToUlong( stack.DeallocationStack ); + stack = stack64; +#else + TEB64 *teb64 = (TEB64 *)((char *)teb + teb->WowTebOffset); + teb64->Tib.StackBase = PtrToUlong( stack64.StackBase ); + teb64->Tib.StackLimit = PtrToUlong( stack64.StackLimit ); + teb64->DeallocationStack = PtrToUlong( stack64.DeallocationStack ); +#endif + } + teb->Tib.StackBase = stack.StackBase; + teb->Tib.StackLimit = stack.StackLimit; + teb->DeallocationStack = stack.DeallocationStack; + return status; +} + + /*********************************************************************** * update_attr_list * @@ -196,7 +230,6 @@ NTSTATUS WINAPI NtCreateThreadEx( HANDLE *handle, ACCESS_MASK access, OBJECT_ATT int request_pipe[2]; SIZE_T extra_stack = PTHREAD_STACK_MIN; TEB *teb; - INITIAL_TEB stack; NTSTATUS status; if (zero_bits > 21 && zero_bits < 32) return STATUS_INVALID_PARAMETER_3; @@ -269,7 +302,7 @@ NTSTATUS WINAPI NtCreateThreadEx( HANDLE *handle, ACCESS_MASK access, OBJECT_ATT if ((status = virtual_alloc_teb( &teb ))) goto done; - if ((status = virtual_alloc_thread_stack( &stack, zero_bits, stack_reserve, stack_commit, &extra_stack ))) + if ((status = init_thread_stack( teb, zero_bits, stack_reserve, stack_commit, &extra_stack ))) { virtual_free_teb( teb ); goto done; @@ -277,10 +310,6 @@ NTSTATUS WINAPI NtCreateThreadEx( HANDLE *handle, ACCESS_MASK access, OBJECT_ATT set_thread_id( teb, GetCurrentProcessId(), tid ); - teb->Tib.StackBase = stack.StackBase; - teb->Tib.StackLimit = stack.StackLimit; - teb->DeallocationStack = stack.DeallocationStack; - thread_data = (struct ntdll_thread_data *)&teb->GdiTebBatch; thread_data->request_fd = request_pipe[1]; thread_data->start_stack = (char *)teb->Tib.StackBase; diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 5c340107964..cdb36584326 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -173,6 +173,8 @@ extern void server_init_thread( void *entry_point, BOOL *suspend ) DECLSPEC_HIDD extern int server_pipe( int fd[2] ) DECLSPEC_HIDDEN; extern void set_thread_id( TEB *teb, DWORD pid, DWORD tid ) DECLSPEC_HIDDEN; +extern NTSTATUS init_thread_stack( TEB *teb, ULONG_PTR zero_bits, SIZE_T reserve_size, + SIZE_T commit_size, SIZE_T *pthread_size ) DECLSPEC_HIDDEN; extern NTSTATUS context_to_server( context_t *to, const CONTEXT *from ) DECLSPEC_HIDDEN; extern NTSTATUS context_from_server( CONTEXT *to, const context_t *from ) DECLSPEC_HIDDEN; extern void DECLSPEC_NORETURN abort_thread( int status ) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index bcecc21989a..572ce960b77 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -2997,6 +2997,21 @@ void virtual_free_teb( TEB *teb ) size = 0; NtFreeVirtualMemory( GetCurrentProcess(), &thread_data->start_stack, &size, MEM_RELEASE ); } + if (teb->WowTebOffset) + { +#ifdef _WIN64 + TEB32 *teb32 = (TEB32 *)((char *)teb + teb->WowTebOffset); + void *addr = ULongToPtr( teb32->DeallocationStack ); +#else + TEB64 *teb64 = (TEB64 *)((char *)teb + teb->WowTebOffset); + void *addr = ULongToPtr( teb64->DeallocationStack ); +#endif + if (addr) + { + size = 0; + NtFreeVirtualMemory( GetCurrentProcess(), &addr, &size, MEM_RELEASE ); + } + } server_enter_uninterrupted_section( &virtual_mutex, &sigset ); list_remove( &thread_data->entry );

1 0