August 2021 - Wine-Commits - list.winehq.org

Zebediah Figura : devenum: Always return S_FALSE from DllCanUnloadNow().
by Alexandre Julliard Aug. 26, 2021

Aug. 26, 2021

Module: wine Branch: master Commit: 65e6165ce8a7a51babffaa0a163d330a4d6a99c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=65e6165ce8a7a51babffaa0a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Aug 25 17:10:39 2021 -0500 devenum: Always return S_FALSE from DllCanUnloadNow(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/devenum/createdevenum.c | 4 ---- dlls/devenum/devenum_main.c | 17 +---------------- dlls/devenum/devenum_private.h | 7 ------- dlls/devenum/mediacatenum.c | 10 ---------- dlls/devenum/parsedisplayname.c | 4 ---- 5 files changed, 1 insertion(+), 41 deletions(-) diff --git a/dlls/devenum/createdevenum.c b/dlls/devenum/createdevenum.c index 8e9cf56eb09..bec462e0f5a 100644 --- a/dlls/devenum/createdevenum.c +++ b/dlls/devenum/createdevenum.c @@ -64,8 +64,6 @@ static ULONG WINAPI devenum_factory_AddRef(ICreateDevEnum *iface) { TRACE("\n"); - DEVENUM_LockModule(); - return 2; /* non-heap based object */ } @@ -73,8 +71,6 @@ static ULONG WINAPI devenum_factory_Release(ICreateDevEnum *iface) { TRACE("\n"); - DEVENUM_UnlockModule(); - return 1; /* non-heap based object */ } diff --git a/dlls/devenum/devenum_main.c b/dlls/devenum/devenum_main.c index cbeacbb5b27..87939749121 100644 --- a/dlls/devenum/devenum_main.c +++ b/dlls/devenum/devenum_main.c @@ -25,8 +25,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(devenum); -DECLSPEC_HIDDEN LONG dll_refs; - struct class_factory { IClassFactory IClassFactory_iface; @@ -56,13 +54,11 @@ static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID i static ULONG WINAPI ClassFactory_AddRef(IClassFactory *iface) { - DEVENUM_LockModule(); return 2; } static ULONG WINAPI ClassFactory_Release(IClassFactory *iface) { - DEVENUM_UnlockModule(); return 1; } @@ -82,10 +78,7 @@ static HRESULT WINAPI ClassFactory_CreateInstance(IClassFactory *iface, static HRESULT WINAPI ClassFactory_LockServer(IClassFactory *iface, BOOL lock) { - if (lock) - DEVENUM_LockModule(); - else - DEVENUM_UnlockModule(); + TRACE("iface %p, lock %d.\n", iface, lock); return S_OK; } @@ -118,14 +111,6 @@ HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID iid, void **obj) return CLASS_E_CLASSNOTAVAILABLE; } -/*********************************************************************** - * DllCanUnloadNow (DEVENUM.@) - */ -HRESULT WINAPI DllCanUnloadNow(void) -{ - return dll_refs != 0 ? S_FALSE : S_OK; -} - /*********************************************************************** * DllRegisterServer (DEVENUM.@) */ diff --git a/dlls/devenum/devenum_private.h b/dlls/devenum/devenum_private.h index 15c41afd570..adc9b377d09 100644 --- a/dlls/devenum/devenum_private.h +++ b/dlls/devenum/devenum_private.h @@ -27,13 +27,6 @@ #include "dmo.h" #include "dmodshow.h" -/********************************************************************** - * Dll lifetime tracking declaration for devenum.dll - */ -extern LONG dll_refs DECLSPEC_HIDDEN; -static inline void DEVENUM_LockModule(void) { InterlockedIncrement(&dll_refs); } -static inline void DEVENUM_UnlockModule(void) { InterlockedDecrement(&dll_refs); } - enum device_type { DEVICE_FILTER, diff --git a/dlls/devenum/mediacatenum.c b/dlls/devenum/mediacatenum.c index b24e24f7f31..9d8069a3aa2 100644 --- a/dlls/devenum/mediacatenum.c +++ b/dlls/devenum/mediacatenum.c @@ -414,7 +414,6 @@ static ULONG WINAPI moniker_Release(IMoniker *iface) if (ref == 0) { free(This->name); free(This); - DEVENUM_UnlockModule(); } return ref; } @@ -783,8 +782,6 @@ struct moniker *filter_moniker_create(const GUID *class, const WCHAR *name) object->has_class = !!class; object->name = wcsdup(name); - DEVENUM_LockModule(); - return object; } @@ -804,8 +801,6 @@ struct moniker *codec_moniker_create(const GUID *class, const WCHAR *name) object->has_class = !!class; object->name = wcsdup(name); - DEVENUM_LockModule(); - return object; } @@ -823,8 +818,6 @@ struct moniker *dmo_moniker_create(const GUID class, const GUID clsid) object->class = class; object->clsid = clsid; - DEVENUM_LockModule(); - return object; } @@ -879,7 +872,6 @@ static ULONG WINAPI enum_moniker_Release(IEnumMoniker *iface) RegCloseKey(This->sw_key); RegCloseKey(This->cm_key); free(This); - DEVENUM_UnlockModule(); return 0; } return ref; @@ -1070,7 +1062,5 @@ HRESULT enum_moniker_create(REFCLSID class, IEnumMoniker **out) *out = &object->IEnumMoniker_iface; - DEVENUM_LockModule(); - return S_OK; } diff --git a/dlls/devenum/parsedisplayname.c b/dlls/devenum/parsedisplayname.c index f24b4329c80..477f2f3d11e 100644 --- a/dlls/devenum/parsedisplayname.c +++ b/dlls/devenum/parsedisplayname.c @@ -51,8 +51,6 @@ static ULONG WINAPI devenum_parser_AddRef(IParseDisplayName *iface) { TRACE("\n"); - DEVENUM_LockModule(); - return 2; /* non-heap based object */ } @@ -60,8 +58,6 @@ static ULONG WINAPI devenum_parser_Release(IParseDisplayName *iface) { TRACE("\n"); - DEVENUM_UnlockModule(); - return 1; /* non-heap based object */ }

1 0

Alexandre Julliard : ntdll: Store the syscall flags in the syscall frame on all platforms.
by Alexandre Julliard Aug. 26, 2021

Aug. 26, 2021

Module: wine Branch: master Commit: 77f5e2963f769bbebd9f95fcb743af290a40ff06 URL: https://source.winehq.org/git/wine.git/?a=commit;h=77f5e2963f769bbebd9f95fc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 25 13:31:49 2021 +0200 ntdll: Store the syscall flags in the syscall frame on all platforms. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_i386.c | 12 +++++++----- dlls/ntdll/unix/signal_x86_64.c | 15 ++++++++++----- dlls/ntdll/unix/unix_private.h | 1 - tools/winebuild/import.c | 7 ++----- 4 files changed, 19 insertions(+), 16 deletions(-) diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index 1cd6ef7bb39..04645a9c4a6 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -519,6 +519,8 @@ C_ASSERT( offsetof( TEB, GdiTebBatch ) + offsetof( struct x86_thread_data, sysca #define SYSCALL_HAVE_XSAVEC 2 #define SYSCALL_HAVE_FXSAVE 4 +static unsigned int syscall_flags; + static inline struct x86_thread_data *x86_thread_data(void) { return (struct x86_thread_data *)ntdll_get_thread_data()->cpu_data; @@ -1614,7 +1616,7 @@ NTSTATUS WINAPI KeUserModeCallback( ULONG id, const void *args, ULONG len, void callback_frame.frame.esp = (ULONG_PTR)stack; callback_frame.frame.eip = (ULONG_PTR)pKiUserCallbackDispatcher; callback_frame.frame.eflags = 0x202; - callback_frame.frame.syscall_flags = __wine_syscall_flags; + callback_frame.frame.syscall_flags = frame->syscall_flags; callback_frame.frame.prev_frame = frame; x86_thread_data()->syscall_frame = &callback_frame.frame; @@ -2340,9 +2342,9 @@ void signal_init_process(void) x86_thread_data()->syscall_frame = (struct syscall_frame *)kernel_stack - 1; - if (cpu_info.ProcessorFeatureBits & CPU_FEATURE_FXSR) __wine_syscall_flags |= SYSCALL_HAVE_FXSAVE; - if (cpu_info.ProcessorFeatureBits & CPU_FEATURE_XSAVE) __wine_syscall_flags |= SYSCALL_HAVE_XSAVE; - if (xstate_compaction_enabled) __wine_syscall_flags |= SYSCALL_HAVE_XSAVEC; + if (cpu_info.ProcessorFeatureBits & CPU_FEATURE_FXSR) syscall_flags |= SYSCALL_HAVE_FXSAVE; + if (cpu_info.ProcessorFeatureBits & CPU_FEATURE_XSAVE) syscall_flags |= SYSCALL_HAVE_XSAVE; + if (xstate_compaction_enabled) syscall_flags |= SYSCALL_HAVE_XSAVEC; sig_act.sa_mask = server_block_set; sig_act.sa_flags = SA_SIGINFO | SA_RESTART | SA_ONSTACK; @@ -2417,7 +2419,7 @@ void DECLSPEC_HIDDEN call_init_thunk( LPTHREAD_START_ROUTINE entry, void *arg, B frame->esp = (DWORD)stack; frame->eip = (DWORD)pLdrInitializeThunk; frame->prev_frame = NULL; - frame->syscall_flags = __wine_syscall_flags; + frame->syscall_flags = syscall_flags; frame->restore_flags |= CONTEXT_INTEGER; pthread_sigmask( SIG_UNBLOCK, &server_block_set, NULL ); diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index e6971b4629a..cc2238f62c4 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -285,6 +285,8 @@ C_ASSERT( sizeof(struct stack_layout) == 0x590 ); /* Should match the size in ca #define SYSCALL_HAVE_PTHREAD_TEB 4 #define SYSCALL_HAVE_WRFSGSBASE 8 +static unsigned int syscall_flags; + /* stack layout when calling an user apc function. * FIXME: match Windows ABI. */ struct apc_stack_layout @@ -325,7 +327,8 @@ struct syscall_frame DWORD restore_flags; /* 0094 */ ULONG64 rbp; /* 0098 */ struct syscall_frame *prev_frame; /* 00a0 */ - ULONG64 align[3]; /* 00a8 */ + DWORD syscall_flags; /* 00a8 */ + DWORD align[5]; /* 00ac */ XMM_SAVE_AREA32 xsave; /* 00c0 */ DECLSPEC_ALIGN(64) XSTATE xstate; /* 02c0 */ }; @@ -2314,6 +2317,7 @@ NTSTATUS WINAPI KeUserModeCallback( ULONG id, const void *args, ULONG len, void callback_frame.frame.eflags = 0x200; callback_frame.frame.restore_flags = CONTEXT_CONTROL | CONTEXT_INTEGER; callback_frame.frame.prev_frame = frame; + callback_frame.frame.syscall_flags = frame->syscall_flags; amd64_thread_data()->syscall_frame = &callback_frame.frame; __wine_syscall_dispatcher_return( &callback_frame.frame, 0 ); @@ -2935,8 +2939,8 @@ void signal_init_process(void) anon_mmap_fixed( ptr, page_size, PROT_READ | PROT_WRITE, 0 ); *(void **)ptr = __wine_syscall_dispatcher; - if (cpu_info.ProcessorFeatureBits & CPU_FEATURE_XSAVE) __wine_syscall_flags |= SYSCALL_HAVE_XSAVE; - if (xstate_compaction_enabled) __wine_syscall_flags |= SYSCALL_HAVE_XSAVEC; + if (cpu_info.ProcessorFeatureBits & CPU_FEATURE_XSAVE) syscall_flags |= SYSCALL_HAVE_XSAVE; + if (xstate_compaction_enabled) syscall_flags |= SYSCALL_HAVE_XSAVEC; #ifdef __linux__ if (NtCurrentTeb()->WowTebOffset) @@ -2948,8 +2952,8 @@ void signal_init_process(void) if ((sel = alloc_fs_sel( -1, teb32 )) != -1) { fs32_sel = (sel << 3) | 3; - __wine_syscall_flags |= SYSCALL_HAVE_PTHREAD_TEB; - if (getauxval( AT_HWCAP2 ) & 2) __wine_syscall_flags |= SYSCALL_HAVE_WRFSGSBASE; + syscall_flags |= SYSCALL_HAVE_PTHREAD_TEB; + if (getauxval( AT_HWCAP2 ) & 2) syscall_flags |= SYSCALL_HAVE_WRFSGSBASE; } else ERR_(seh)( "failed to allocate %%fs selector\n" ); } @@ -3038,6 +3042,7 @@ void DECLSPEC_HIDDEN call_init_thunk( LPTHREAD_START_ROUTINE entry, void *arg, B frame->rcx = (ULONG64)ctx; frame->prev_frame = NULL; frame->restore_flags |= CONTEXT_INTEGER; + frame->syscall_flags = syscall_flags; pthread_sigmask( SIG_UNBLOCK, &server_block_set, NULL ); __wine_syscall_dispatcher_return( frame, 0 ); diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 961ba42b232..731b12d332c 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -252,7 +252,6 @@ extern void DECLSPEC_NORETURN signal_start_thread( PRTL_THREAD_START_ROUTINE ent extern void DECLSPEC_NORETURN signal_exit_thread( int status, void (*func)(int), TEB *teb ) DECLSPEC_HIDDEN; extern void __wine_syscall_dispatcher(void) DECLSPEC_HIDDEN; extern void WINAPI DECLSPEC_NORETURN __wine_syscall_dispatcher_return( void *frame, ULONG_PTR retval ) DECLSPEC_HIDDEN; -extern unsigned int __wine_syscall_flags DECLSPEC_HIDDEN; extern NTSTATUS signal_set_full_context( CONTEXT *context ) DECLSPEC_HIDDEN; extern NTSTATUS get_thread_wow64_context( HANDLE handle, void *ctx, ULONG size ) DECLSPEC_HIDDEN; extern NTSTATUS set_thread_wow64_context( HANDLE handle, const void *ctx, ULONG size ) DECLSPEC_HIDDEN; diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 5f1946e0c4f..4b1e0b18b46 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1576,7 +1576,7 @@ static void output_syscall_dispatcher(void) /* Legends of Runeterra hooks the first system call return instruction, and * depends on us returning to it. Adjust the return address accordingly. */ output( "\tsubq $0xb,0x70(%%rcx)\n" ); - output( "\tmovl %s(%%rip),%%r14d\n", asm_name("__wine_syscall_flags") ); + output( "\tmovl 0xa8(%%rcx),%%r14d\n" ); /* frame->syscall_flags */ output( "\ttestl $3,%%r14d\n" ); /* SYSCALL_HAVE_XSAVE | SYSCALL_HAVE_XSAVEC */ output( "\tjz 2f\n" ); output( "\tmovl $7,%%eax\n" ); @@ -1685,7 +1685,7 @@ static void output_syscall_dispatcher(void) output( "5:\tmovl $0x%x,%%edx\n", invalid_param ); output( "\tmovq %%rsp,%%rcx\n" ); output( "%s\n", asm_globl("__wine_syscall_dispatcher_return") ); - output( "\tmovl %s(%%rip),%%r14d\n", asm_name("__wine_syscall_flags") ); + output( "\tmovl 0xa8(%%rcx),%%r14d\n" ); /* frame->syscall_flags */ output( "\tmovq %%rdx,%%rax\n" ); output( "\tjmp 2b\n" ); break; @@ -1932,9 +1932,6 @@ void output_syscalls( DLLSPEC *spec ) output( ".Lsyscall_args:\n" ); for (i = 0; i < count; i++) output( "\t.byte %u\n", get_args_size( syscalls[i] )); - output( "\t.align %d\n", get_alignment(4) ); - output( "%s\n", asm_globl("__wine_syscall_flags") ); - output( "\t.long 0\n" ); return; }

1 0

Alexandre Julliard : ntdll: Store the syscall table in the syscall frame on all platforms.
by Alexandre Julliard Aug. 26, 2021

Aug. 26, 2021

Module: wine Branch: master Commit: 847db3c1d3f5444808814cbea8f2920b16a96fcb URL: https://source.winehq.org/git/wine.git/?a=commit;h=847db3c1d3f5444808814cbe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 25 15:15:01 2021 +0200 ntdll: Store the syscall table in the syscall frame on all platforms. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 6 ++ dlls/ntdll/unix/signal_arm.c | 10 ++- dlls/ntdll/unix/signal_arm64.c | 14 +++-- dlls/ntdll/unix/signal_i386.c | 51 ++++++++-------- dlls/ntdll/unix/signal_x86_64.c | 7 ++- include/wine/unixlib.h | 2 + include/winternl.h | 8 +++ tools/winebuild/import.c | 131 ++++++++++++++++++---------------------- 8 files changed, 122 insertions(+), 107 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=847db3c1d3f544480881…

1 0

Alexandre Julliard : ntdll: Move the syscall dispatcher implementation to the platform-specific files.
by Alexandre Julliard Aug. 26, 2021

Aug. 26, 2021

Module: wine Branch: master Commit: ff04d8a4c2fda2a61bc5bdbd8ef52027826abd05 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff04d8a4c2fda2a61bc5bdbd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 25 18:25:15 2021 +0200 ntdll: Move the syscall dispatcher implementation to the platform-specific files. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_arm.c | 73 +++++++ dlls/ntdll/unix/signal_arm64.c | 127 +++++++++++ dlls/ntdll/unix/signal_i386.c | 131 ++++++++++- dlls/ntdll/unix/signal_x86_64.c | 142 ++++++++++++ tools/winebuild/import.c | 466 ---------------------------------------- 5 files changed, 472 insertions(+), 467 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ff04d8a4c2fda2a61bc5…

1 0

Paul Gofman : winhttp: Factor out query_data_ready() function.
by Alexandre Julliard Aug. 26, 2021

Aug. 26, 2021

Module: wine Branch: master Commit: bc5305e5991632445309a374b40efa582362fdc4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bc5305e5991632445309a374… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Aug 25 12:57:52 2021 +0300 winhttp: Factor out query_data_ready() function. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/request.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index a6c16d7b653..b8f5817737e 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2815,19 +2815,26 @@ BOOL WINAPI WinHttpReceiveResponse( HINTERNET hrequest, LPVOID reserved ) return !ret; } +static DWORD query_data_ready( struct request *request ) +{ + DWORD count; + + count = get_available_data( request ); + if (!request->read_chunked && request->netconn) count += netconn_query_data_available( request->netconn ); + + return count; +} + static DWORD query_data_available( struct request *request, DWORD *available, BOOL async ) { DWORD ret = ERROR_SUCCESS, count = 0; if (end_of_read_data( request )) goto done; - count = get_available_data( request ); - if (!request->read_chunked && request->netconn) count += netconn_query_data_available( request->netconn ); - if (!count) + if (!(count = query_data_ready( request ))) { if ((ret = refill_buffer( request, async ))) goto done; - count = get_available_data( request ); - if (!request->read_chunked && request->netconn) count += netconn_query_data_available( request->netconn ); + count = query_data_ready( request ); } done:

1 0

Paul Gofman : winhttp: Execute WinHttpQueryDataAvailable() synchronously if the data is available.
by Alexandre Julliard Aug. 26, 2021

Aug. 26, 2021

Module: wine Branch: master Commit: 1c659954df22593771c455a731b1bee761fb8742 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1c659954df22593771c455a7… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Aug 25 12:57:53 2021 +0300 winhttp: Execute WinHttpQueryDataAvailable() synchronously if the data is available. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/request.c | 9 ++++++--- dlls/winhttp/tests/notification.c | 11 +++++++++++ 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index b8f5817737e..03f895a7fdb 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2873,6 +2873,7 @@ BOOL WINAPI WinHttpQueryDataAvailable( HINTERNET hrequest, LPDWORD available ) { DWORD ret; struct request *request; + BOOL async; TRACE("%p, %p\n", hrequest, available); @@ -2888,7 +2889,8 @@ BOOL WINAPI WinHttpQueryDataAvailable( HINTERNET hrequest, LPDWORD available ) return FALSE; } - if (request->connect->hdr.flags & WINHTTP_FLAG_ASYNC) + if ((async = request->connect->hdr.flags & WINHTTP_FLAG_ASYNC) && !end_of_read_data( request ) + && !query_data_ready( request )) { struct query_data *q; @@ -2902,12 +2904,13 @@ BOOL WINAPI WinHttpQueryDataAvailable( HINTERNET hrequest, LPDWORD available ) release_object( &request->hdr ); free( q ); } + else ret = ERROR_IO_PENDING; } - else ret = query_data_available( request, available, FALSE ); + else ret = query_data_available( request, available, async ); release_object( &request->hdr ); SetLastError( ret ); - return !ret; + return !ret || ret == ERROR_IO_PENDING; } static void CALLBACK task_read_data( TP_CALLBACK_INSTANCE *instance, void *ctx, TP_WORK *work ) diff --git a/dlls/winhttp/tests/notification.c b/dlls/winhttp/tests/notification.c index 98e4024867f..7d1bfa78a49 100644 --- a/dlls/winhttp/tests/notification.c +++ b/dlls/winhttp/tests/notification.c @@ -71,6 +71,8 @@ struct info unsigned int index; HANDLE wait; unsigned int line; + DWORD last_thread_id; + DWORD last_status; }; struct test_request @@ -85,6 +87,9 @@ static void CALLBACK check_notification( HINTERNET handle, DWORD_PTR context, DW BOOL status_ok, function_ok; struct info *info = (struct info *)context; + info->last_status = status; + info->last_thread_id = GetCurrentThreadId(); + if (status == WINHTTP_CALLBACK_STATUS_HANDLE_CREATED) { DWORD size = sizeof(struct info *); @@ -177,6 +182,8 @@ static void setup_test( struct info *info, enum api function, unsigned int line ok_(__FILE__,line)(info->test[info->index].function == function, "unexpected function %u, expected %u. probably some notifications were missing\n", info->test[info->index].function, function); + info->last_thread_id = 0xdeadbeef; + info->last_status = 0xdeadbeef; } static void end_test( struct info *info, unsigned int line ) @@ -597,6 +604,10 @@ static void test_async( void ) ok(err == ERROR_SUCCESS || err == ERROR_IO_PENDING || broken(err == 0xdeadbeef) /* < win7 */, "got %u\n", err); WaitForSingleObject( info.wait, INFINITE ); + ok(info.last_status == WINHTTP_CALLBACK_STATUS_DATA_AVAILABLE, "got status %#x.\n", status); + ok((err == ERROR_SUCCESS && info.last_thread_id == GetCurrentThreadId()) + || (err == ERROR_IO_PENDING && info.last_thread_id != GetCurrentThreadId()), + "Got unexpected thread %#x, err %#x.\n", info.last_thread_id, err); setup_test( &info, winhttp_read_data, __LINE__ ); ret = WinHttpReadData( req, buffer, sizeof(buffer), NULL );

1 0

Michael Stefaniuc : msdaps: Avoid casts from COM object to interface.
by Alexandre Julliard Aug. 26, 2021

Aug. 26, 2021

Module: wine Branch: master Commit: e219f5cda7e39ce61d102f992d53b76a2f611ec8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e219f5cda7e39ce61d102f99… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Aug 26 09:45:21 2021 +0200 msdaps: Avoid casts from COM object to interface. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdaps/row_server.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msdaps/row_server.c b/dlls/msdaps/row_server.c index 2b496bece20..9cc64cd0218 100644 --- a/dlls/msdaps/row_server.c +++ b/dlls/msdaps/row_server.c @@ -589,9 +589,9 @@ static HRESULT create_server(IUnknown *outer, const CLSID *class, void **obj) server->class = *class; server->inner_unk = NULL; if(IsEqualGUID(class, &CLSID_wine_row_server)) - create_row_marshal((IUnknown*)server, (void**)&server->marshal); + create_row_marshal((IUnknown*)&server->IWineRowServer_iface, (void**)&server->marshal); else if(IsEqualGUID(class, &CLSID_wine_rowset_server)) - create_rowset_marshal((IUnknown*)server, (void**)&server->marshal); + create_rowset_marshal((IUnknown*)&server->IWineRowServer_iface, (void**)&server->marshal); else ERR("create_server called with class %s\n", debugstr_guid(class));

1 0

Paul Gofman : winhttp: Execute WinHttpReadData() synchronously if the data is available.
by Alexandre Julliard Aug. 26, 2021

Aug. 26, 2021

Module: wine Branch: master Commit: be5acd1c07e093c3b4fe079bff3db74f300ea83b URL: https://source.winehq.org/git/wine.git/?a=commit;h=be5acd1c07e093c3b4fe079b… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Aug 25 12:57:54 2021 +0300 winhttp: Execute WinHttpReadData() synchronously if the data is available. Fixes eFootball PES 2021 in game contents download. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/request.c | 9 ++++++--- dlls/winhttp/tests/notification.c | 5 +++++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 03f895a7fdb..001fff74a87 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2931,6 +2931,7 @@ BOOL WINAPI WinHttpReadData( HINTERNET hrequest, LPVOID buffer, DWORD to_read, L { DWORD ret; struct request *request; + BOOL async; TRACE("%p, %p, %d, %p\n", hrequest, buffer, to_read, read); @@ -2946,7 +2947,8 @@ BOOL WINAPI WinHttpReadData( HINTERNET hrequest, LPVOID buffer, DWORD to_read, L return FALSE; } - if (request->connect->hdr.flags & WINHTTP_FLAG_ASYNC) + if ((async = request->connect->hdr.flags & WINHTTP_FLAG_ASYNC) && !end_of_read_data( request ) + && !query_data_ready( request )) { struct read_data *r; @@ -2962,12 +2964,13 @@ BOOL WINAPI WinHttpReadData( HINTERNET hrequest, LPVOID buffer, DWORD to_read, L release_object( &request->hdr ); free( r ); } + else ret = ERROR_IO_PENDING; } - else ret = read_data( request, buffer, to_read, read, FALSE ); + else ret = read_data( request, buffer, to_read, read, async ); release_object( &request->hdr ); SetLastError( ret ); - return !ret; + return !ret || ret == ERROR_IO_PENDING; } static DWORD write_data( struct request *request, const void *buffer, DWORD to_write, DWORD *written, BOOL async ) diff --git a/dlls/winhttp/tests/notification.c b/dlls/winhttp/tests/notification.c index 7d1bfa78a49..4cfffe6687e 100644 --- a/dlls/winhttp/tests/notification.c +++ b/dlls/winhttp/tests/notification.c @@ -615,6 +615,11 @@ static void test_async( void ) WaitForSingleObject( info.wait, INFINITE ); + ok(info.last_status == WINHTTP_CALLBACK_STATUS_READ_COMPLETE, "got status %#x.\n", status); + ok((err == ERROR_SUCCESS && info.last_thread_id == GetCurrentThreadId()) + || (err == ERROR_IO_PENDING && info.last_thread_id != GetCurrentThreadId()), + "Got unexpected thread %#x, err %#x.\n", info.last_thread_id, err); + setup_test( &info, winhttp_close_handle, __LINE__ ); WinHttpCloseHandle( req ); WinHttpCloseHandle( con );

1 0

Francois Gouget : wsock32: Fix ASCII / ANSI mixups in comments.
by Alexandre Julliard Aug. 26, 2021

Aug. 26, 2021

Module: wine Branch: master Commit: ece94cd412493cc50dae2701697f9d5667817c9b URL: https://source.winehq.org/git/wine.git/?a=commit;h=ece94cd412493cc50dae2701… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Aug 26 13:12:46 2021 +0200 wsock32: Fix ASCII / ANSI mixups in comments. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsock32/service.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wsock32/service.c b/dlls/wsock32/service.c index 2b6e4e7b58d..f2a45c983b5 100644 --- a/dlls/wsock32/service.c +++ b/dlls/wsock32/service.c @@ -65,7 +65,7 @@ INT WINAPI GetAddressByNameW(DWORD dwNameSpace, LPGUID lpServiceType, LPWSTR lpS * Retrieve a service type GUID for a network service specified by name. * * PARAMETERS - * lpServiceName [I] NUL-terminated ASCII string that uniquely represents the name of the service + * lpServiceName [I] NUL-terminated ANSI string that uniquely represents the name of the service * lpServiceType [O] Destination for the service type GUID * * RETURNS @@ -114,7 +114,7 @@ INT WINAPI GetTypeByNameW(LPWSTR lpServiceName, LPGUID lpServiceType) * dwNameSpace [I] Name space or set of name spaces within which the function will operate * dwOperation [I] Operation to perform * dwFlags [I] Flags to modify the function's operation - * lpServiceInfo [I] Pointer to a ASCII SERVICE_INFO structure + * lpServiceInfo [I] Pointer to an ANSI SERVICE_INFO structure * lpServiceAsyncInfo [I] Reserved for future use. Must be NULL. * lpdwStatusFlags [O] Destination for function status information * @@ -167,7 +167,7 @@ INT WINAPI SetServiceW(DWORD dwNameSpace, DWORD dwOperation, DWORD dwFlags, LPSE * dwNameSpace [I] Name space or set of name spaces within which the function * will operate. * lpGuid [I] Pointer to GUID of network service type. - * lpServiceName [I] NUL-terminated ASCII string that uniquely represents the name + * lpServiceName [I] NUL-terminated ANSI string that uniquely represents the name * of the service. * dwProperties [I] Flags specifying which information to return in lpBuffer. * lpBuffer [O] Pointer to buffer where the function returns an array

1 0

Alexandre Julliard : dpnet: Fix short buffer check also for the A case.
by Alexandre Julliard Aug. 26, 2021

Aug. 26, 2021

Module: wine Branch: master Commit: b95cc688944fc9eacf5bd3a0ef30e78c2d0188b5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b95cc688944fc9eacf5bd3a0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 26 12:46:18 2021 +0200 dpnet: Fix short buffer check also for the A case. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dpnet/address.c | 3 --- dlls/dpnet/tests/address.c | 3 ++- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/dpnet/address.c b/dlls/dpnet/address.c index 7216576dbf1..d7e802f8106 100644 --- a/dlls/dpnet/address.c +++ b/dlls/dpnet/address.c @@ -326,10 +326,7 @@ static HRESULT WINAPI IDirectPlay8AddressImpl_GetURLA(IDirectPlay8Address *iface return DPNERR_INVALIDPOINTER; if(url && *length) - { - url[0] = '\0'; buffer = heap_alloc(*length * sizeof(WCHAR)); - } hr = IDirectPlay8Address_GetURLW(iface, buffer, length); if(hr == DPN_OK) diff --git a/dlls/dpnet/tests/address.c b/dlls/dpnet/tests/address.c index b3ab80f2b3c..fe17cfde52d 100644 --- a/dlls/dpnet/tests/address.c +++ b/dlls/dpnet/tests/address.c @@ -400,9 +400,10 @@ static void address_urlA(void) ok(hr == DPNERR_BUFFERTOOSMALL, "got 0x%08x\n", hr); bufflen2 = bufflen/2; + memset( buffer, 0x55, sizeof(buffer) ); hr = IDirectPlay8Address_GetURLA(localaddr, buffer, &bufflen2); ok(hr == DPNERR_BUFFERTOOSMALL, "got 0x%08x\n", hr); - ok(!strlen(buffer), "wrong length\n"); + ok(buffer[0] == 0x55, "buffer modified\n"); hr = IDirectPlay8Address_GetURLA(localaddr, buffer, &bufflen); ok(hr == S_OK, "got 0x%08x\n", hr);

1 0