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

Alexandre Julliard : ntdll: Call NtContinue() from LdrInitializeThunk() instead of returning.
by Alexandre Julliard Aug. 20, 2020

Aug. 20, 2020

Module: wine Branch: master Commit: 4a7cd0f492affbc0eb347b97426b8c23f9a4f976 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4a7cd0f492affbc0eb347b97… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 20 15:27:30 2020 +0200 ntdll: Call NtContinue() from LdrInitializeThunk() instead of returning. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 3 ++- dlls/ntdll/ntdll_misc.h | 1 + dlls/ntdll/signal_arm.c | 11 +++++++++++ dlls/ntdll/signal_arm64.c | 11 +++++++++++ dlls/ntdll/signal_i386.c | 16 ++++++++++++++++ dlls/ntdll/signal_x86_64.c | 14 ++++++++++++++ dlls/ntdll/virtual.c | 16 ++++++++++++++++ 7 files changed, 71 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 6290cbcb4e..54d56f4e14 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -3416,7 +3416,7 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, void **entry, ULONG_PTR unknow WINE_MODREF *wm; LPCWSTR load_path = NtCurrentTeb()->Peb->ProcessParameters->DllPath.Buffer; - if (process_detaching) return; + if (process_detaching) NtTerminateThread( GetCurrentThread(), 0 ); RtlEnterCriticalSection( &loader_section ); @@ -3486,6 +3486,7 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, void **entry, ULONG_PTR unknow } RtlLeaveCriticalSection( &loader_section ); + signal_start_thread( context ); } diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index a97dadb2a5..63ceac42e9 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -65,6 +65,7 @@ extern void init_unix_codepage(void) DECLSPEC_HIDDEN; extern void init_locale( HMODULE module ) DECLSPEC_HIDDEN; extern void init_user_process_params(void) DECLSPEC_HIDDEN; extern NTSTATUS restart_process( RTL_USER_PROCESS_PARAMETERS *params, NTSTATUS status ) DECLSPEC_HIDDEN; +extern void CDECL DECLSPEC_NORETURN signal_start_thread( CONTEXT *ctx ) DECLSPEC_HIDDEN; /* server support */ extern BOOL is_wow64 DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index ba455ea71e..1041dadf86 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -263,6 +263,17 @@ USHORT WINAPI RtlCaptureStackBackTrace( ULONG skip, ULONG count, PVOID *buffer, return 0; } +/*********************************************************************** + * signal_start_thread + */ +__ASM_GLOBAL_FUNC( signal_start_thread, + "mov sp, r0\n\t" /* context */ + "and r0, #~0xff0\n\t" /* round down to page size */ + "bl " __ASM_NAME("virtual_clear_thread_stack") "\n\t" + "mov r1, #1\n\t" + "mov r0, sp\n\t" + "b " __ASM_NAME("NtContinue") ) + /********************************************************************** * DbgBreakPoint (NTDLL.@) */ diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index a35e48c1d6..e3102f7bdf 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -1188,6 +1188,17 @@ USHORT WINAPI RtlCaptureStackBackTrace( ULONG skip, ULONG count, PVOID *buffer, return 0; } +/*********************************************************************** + * signal_start_thread + */ +__ASM_GLOBAL_FUNC( signal_start_thread, + "mov sp, x0\n\t" /* context */ + "and x0, x0, #~0xfff\n\t" /* round down to page size */ + "bl " __ASM_NAME("virtual_clear_thread_stack") "\n\t" + "mov x0, sp\n\t" + "mov x1, #1\n\t" + "b " __ASM_NAME("NtContinue") ) + /********************************************************************** * DbgBreakPoint (NTDLL.@) */ diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index b65beb7215..8cdce3384a 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -498,6 +498,22 @@ USHORT WINAPI RtlCaptureStackBackTrace( ULONG skip, ULONG count, PVOID *buffer, } +/*********************************************************************** + * signal_start_thread + */ +__ASM_GLOBAL_FUNC( signal_start_thread, + "movl 4(%esp),%esi\n\t" /* context */ + "leal -12(%esi),%eax\n\t" + "movl %eax,%esp\n\t" + /* clear the stack */ + "andl $~0xfff,%eax\n\t" /* round down to page size */ + "movl %eax,(%esp)\n\t" + "call " __ASM_NAME("virtual_clear_thread_stack") "\n\t" + /* switch to the initial context */ + "movl $1,4(%esp)\n\t" + "movl %esi,(%esp)\n\t" + "call " __ASM_STDCALL("NtContinue", 8) ) + /********************************************************************** * DbgBreakPoint (NTDLL.@) */ diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 40ed53c10d..e1cf7f3e01 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -1477,6 +1477,20 @@ USHORT WINAPI RtlCaptureStackBackTrace( ULONG skip, ULONG count, PVOID *buffer, } +/*********************************************************************** + * signal_start_thread + */ +__ASM_GLOBAL_FUNC( signal_start_thread, + "movq %rcx,%rbx\n\t" /* context */ + "leaq -32(%rcx),%rcx\n\t" + "movq %rcx,%rsp\n\t" + "andq $~0xfff,%rcx\n\t" /* round down to page size */ + "call " __ASM_NAME("virtual_clear_thread_stack") "\n\t" + "movl $1,%edx\n\t" + "movq %rbx,%rcx\n\t" + "call " __ASM_NAME("NtContinue") ) + + /********************************************************************** * DbgBreakPoint (NTDLL.@) */ diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 3ba4b8afbc..64eef6aa84 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -106,6 +106,22 @@ void WINAPI RtlFreeUserStack( void *stack ) NtFreeVirtualMemory( NtCurrentProcess(), &stack, &size, MEM_RELEASE ); } + +/*********************************************************************** + * virtual_clear_thread_stack + * + * Clear the stack contents before calling the main entry point, some broken apps need that. + */ +void CDECL virtual_clear_thread_stack( void *stack_end ) +{ + void *stack = NtCurrentTeb()->Tib.StackLimit; + SIZE_T size = (char *)stack_end - (char *)stack; + + NtFreeVirtualMemory( GetCurrentProcess(), &stack, &size, MEM_DECOMMIT ); + NtAllocateVirtualMemory( GetCurrentProcess(), &stack, 0, &size, MEM_COMMIT, PAGE_READWRITE ); +} + + /*********************************************************************** * __wine_locked_recvmsg */

1 0

Nikolay Sivov : kernelbase: Pass inherited handles list when creating new process.
by Alexandre Julliard Aug. 20, 2020

Aug. 20, 2020

Module: wine Branch: master Commit: 1721f0ff2759a0dfce166f20653058248f188521 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1721f0ff2759a0dfce166f20… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Aug 19 15:55:06 2020 +0300 kernelbase: Pass inherited handles list when creating new process. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/process.c | 103 ++++++++++++++++++++++++++++++++++------------ 1 file changed, 77 insertions(+), 26 deletions(-) diff --git a/dlls/kernelbase/process.c b/dlls/kernelbase/process.c index 2b9b1c019e..0081b6bf9c 100644 --- a/dlls/kernelbase/process.c +++ b/dlls/kernelbase/process.c @@ -242,26 +242,89 @@ static RTL_USER_PROCESS_PARAMETERS *create_process_params( const WCHAR *filename return params; } +struct proc_thread_attr +{ + DWORD_PTR attr; + SIZE_T size; + void *value; +}; + +struct _PROC_THREAD_ATTRIBUTE_LIST +{ + DWORD mask; /* bitmask of items in list */ + DWORD size; /* max number of items in list */ + DWORD count; /* number of items in list */ + DWORD pad; + DWORD_PTR unk; + struct proc_thread_attr attrs[1]; +}; /*********************************************************************** * create_nt_process */ static NTSTATUS create_nt_process( SECURITY_ATTRIBUTES *psa, SECURITY_ATTRIBUTES *tsa, BOOL inherit, DWORD flags, RTL_USER_PROCESS_PARAMETERS *params, - RTL_USER_PROCESS_INFORMATION *info, HANDLE parent ) + RTL_USER_PROCESS_INFORMATION *info, HANDLE parent, + const struct proc_thread_attr *handle_list ) { - NTSTATUS status; + OBJECT_ATTRIBUTES process_attr, thread_attr; + PS_CREATE_INFO create_info; + ULONG_PTR buffer[offsetof( PS_ATTRIBUTE_LIST, Attributes[5] ) / sizeof(ULONG_PTR)]; + PS_ATTRIBUTE_LIST *attr = (PS_ATTRIBUTE_LIST *)buffer; UNICODE_STRING nameW; + NTSTATUS status; + UINT pos = 0; if (!params->ImagePathName.Buffer[0]) return STATUS_OBJECT_PATH_NOT_FOUND; status = RtlDosPathNameToNtPathName_U_WithStatus( params->ImagePathName.Buffer, &nameW, NULL, NULL ); if (!status) { params->DebugFlags = flags; /* hack, cf. RtlCreateUserProcess implementation */ - status = RtlCreateUserProcess( &nameW, OBJ_CASE_INSENSITIVE, params, - psa ? psa->lpSecurityDescriptor : NULL, - tsa ? tsa->lpSecurityDescriptor : NULL, - parent, inherit, 0, 0, info ); + + RtlNormalizeProcessParams( params ); + + attr->Attributes[pos].Attribute = PS_ATTRIBUTE_IMAGE_NAME; + attr->Attributes[pos].Size = nameW.Length; + attr->Attributes[pos].ValuePtr = nameW.Buffer; + attr->Attributes[pos].ReturnLength = NULL; + pos++; + attr->Attributes[pos].Attribute = PS_ATTRIBUTE_CLIENT_ID; + attr->Attributes[pos].Size = sizeof(info->ClientId); + attr->Attributes[pos].ValuePtr = &info->ClientId; + attr->Attributes[pos].ReturnLength = NULL; + pos++; + attr->Attributes[pos].Attribute = PS_ATTRIBUTE_IMAGE_INFO; + attr->Attributes[pos].Size = sizeof(info->ImageInformation); + attr->Attributes[pos].ValuePtr = &info->ImageInformation; + attr->Attributes[pos].ReturnLength = NULL; + pos++; + if (parent) + { + attr->Attributes[pos].Attribute = PS_ATTRIBUTE_PARENT_PROCESS; + attr->Attributes[pos].Size = sizeof(parent); + attr->Attributes[pos].ValuePtr = parent; + attr->Attributes[pos].ReturnLength = NULL; + pos++; + } + if (inherit && handle_list) + { + attr->Attributes[pos].Attribute = PS_ATTRIBUTE_HANDLE_LIST; + attr->Attributes[pos].Size = handle_list->size; + attr->Attributes[pos].ValuePtr = handle_list->value; + attr->Attributes[pos].ReturnLength = NULL; + pos++; + } + attr->TotalLength = offsetof( PS_ATTRIBUTE_LIST, Attributes[pos] ); + + InitializeObjectAttributes( &process_attr, NULL, 0, NULL, psa ? psa->lpSecurityDescriptor : NULL ); + InitializeObjectAttributes( &thread_attr, NULL, 0, NULL, tsa ? tsa->lpSecurityDescriptor : NULL ); + + status = NtCreateUserProcess( &info->Process, &info->Thread, PROCESS_ALL_ACCESS, THREAD_ALL_ACCESS, + &process_attr, &thread_attr, + inherit ? PROCESS_CREATE_FLAGS_INHERIT_HANDLES : 0, + THREAD_CREATE_FLAGS_CREATE_SUSPENDED, params, + &create_info, attr ); + RtlFreeUnicodeString( &nameW ); } return status; @@ -292,7 +355,7 @@ static NTSTATUS create_vdm_process( SECURITY_ATTRIBUTES *psa, SECURITY_ATTRIBUTE winevdm, params->ImagePathName.Buffer, params->CommandLine.Buffer ); RtlInitUnicodeString( &params->ImagePathName, winevdm ); RtlInitUnicodeString( &params->CommandLine, newcmdline ); - status = create_nt_process( psa, tsa, inherit, flags, params, info, NULL ); + status = create_nt_process( psa, tsa, inherit, flags, params, info, NULL, NULL ); HeapFree( GetProcessHeap(), 0, newcmdline ); return status; } @@ -320,7 +383,7 @@ static NTSTATUS create_cmd_process( SECURITY_ATTRIBUTES *psa, SECURITY_ATTRIBUTE swprintf( newcmdline, len, L"%s /s/c \"%s\"", comspec, params->CommandLine.Buffer ); RtlInitUnicodeString( &params->ImagePathName, comspec ); RtlInitUnicodeString( &params->CommandLine, newcmdline ); - status = create_nt_process( psa, tsa, inherit, flags, params, info, NULL ); + status = create_nt_process( psa, tsa, inherit, flags, params, info, NULL, NULL ); RtlFreeHeap( GetProcessHeap(), 0, newcmdline ); return status; } @@ -414,23 +477,6 @@ done: return ret; } -struct proc_thread_attr -{ - DWORD_PTR attr; - SIZE_T size; - void *value; -}; - -struct _PROC_THREAD_ATTRIBUTE_LIST -{ - DWORD mask; /* bitmask of items in list */ - DWORD size; /* max number of items in list */ - DWORD count; /* number of items in list */ - DWORD pad; - DWORD_PTR unk; - struct proc_thread_attr attrs[1]; -}; - /********************************************************************** * CreateProcessInternalW (kernelbase.@) */ @@ -441,6 +487,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH CreateProcessInternalW( HANDLE token, const WCHAR const WCHAR *cur_dir, STARTUPINFOW *startup_info, PROCESS_INFORMATION *info, HANDLE *new_token ) { + const struct proc_thread_attr *handle_list = NULL; WCHAR name[MAX_PATH]; WCHAR *p, *tidy_cmdline = cmd_line; RTL_USER_PROCESS_PARAMETERS *params = NULL; @@ -517,6 +564,10 @@ BOOL WINAPI DECLSPEC_HOTPATCH CreateProcessInternalW( HANDLE token, const WCHAR goto done; } break; + case PROC_THREAD_ATTRIBUTE_HANDLE_LIST: + handle_list = &attrs->attrs[i]; + TRACE("PROC_THREAD_ATTRIBUTE_HANDLE_LIST handle count %Iu.\n", attrs->attrs[i].size / sizeof(HANDLE)); + break; default: FIXME("Unsupported attribute %#Ix.\n", attrs->attrs[i].attr); break; @@ -525,7 +576,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH CreateProcessInternalW( HANDLE token, const WCHAR } } - status = create_nt_process( process_attr, thread_attr, inherit, flags, params, &rtl_info, parent ); + status = create_nt_process( process_attr, thread_attr, inherit, flags, params, &rtl_info, parent, handle_list ); switch (status) { case STATUS_SUCCESS:

1 0

Gabriel Ivăncescu : msscript.ocx: Implement the ScriptProcedure enumerator.
by Alexandre Julliard Aug. 20, 2020

Aug. 20, 2020

Module: wine Branch: master Commit: 3a9c50e3ff0d2db1db6eaec19856f3c0eab6fb51 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3a9c50e3ff0d2db1db6eaec1… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Aug 17 18:33:51 2020 +0300 msscript.ocx: Implement the ScriptProcedure enumerator. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msscript.ocx/msscript.c | 194 ++++++++++++++++++++++++++++++++++++- dlls/msscript.ocx/tests/msscript.c | 80 +++++++++++++++ 2 files changed, 272 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3a9c50e3ff0d2db1db6e…

1 0

Nikolay Sivov : combase: Move CoGetCurrentLogicalThreadId().
by Alexandre Julliard Aug. 20, 2020

Aug. 20, 2020

Module: wine Branch: master Commit: 6e0e890fba94946bc0f8925be900338028bd9606 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6e0e890fba94946bc0f8925b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 20 10:34:42 2020 +0300 combase: Move CoGetCurrentLogicalThreadId(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/combase.c | 22 ++++++++++++++++++++++ dlls/combase/combase.spec | 2 +- dlls/ole32/compobj.c | 14 -------------- dlls/ole32/compobj_private.h | 10 ---------- dlls/ole32/ole32.spec | 2 +- dlls/ole32/rpc.c | 2 +- 6 files changed, 25 insertions(+), 27 deletions(-) diff --git a/dlls/combase/combase.c b/dlls/combase/combase.c index a2e5ac93a5..8ad95329d0 100644 --- a/dlls/combase/combase.c +++ b/dlls/combase/combase.c @@ -2211,3 +2211,25 @@ HRESULT WINAPI CoGetContextToken(ULONG_PTR *token) return S_OK; } + +/*********************************************************************** + * CoGetCurrentLogicalThreadId (combase.@) + */ +HRESULT WINAPI CoGetCurrentLogicalThreadId(GUID *id) +{ + struct tlsdata *tlsdata; + HRESULT hr; + + if (!id) + return E_INVALIDARG; + + if (FAILED(hr = com_get_tlsdata(&tlsdata))) + return hr; + + if (IsEqualGUID(&tlsdata->causality_id, &GUID_NULL)) + CoCreateGuid(&tlsdata->causality_id); + + *id = tlsdata->causality_id; + + return S_OK; +} diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index 806ee01537..af83e89d17 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -104,7 +104,7 @@ @ stdcall CoGetClassObject(ptr long ptr ptr ptr) ole32.CoGetClassObject @ stub CoGetClassVersion @ stdcall CoGetContextToken(ptr) -@ stdcall CoGetCurrentLogicalThreadId(ptr) ole32.CoGetCurrentLogicalThreadId +@ stdcall CoGetCurrentLogicalThreadId(ptr) @ stdcall CoGetCurrentProcess() ole32.CoGetCurrentProcess @ stdcall CoGetDefaultContext(long ptr ptr) @ stdcall CoGetErrorInfo(long ptr) GetErrorInfo diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 8364478258..671f60e231 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -2914,20 +2914,6 @@ DWORD WINAPI CoGetCurrentProcess(void) return info->thread_seqid; } -/*********************************************************************** - * CoGetCurrentLogicalThreadId [OLE32.@] - */ -HRESULT WINAPI CoGetCurrentLogicalThreadId(GUID *id) -{ - TRACE("(%p)\n", id); - - if (!id) - return E_INVALIDARG; - - *id = COM_CurrentCausalityId(); - return S_OK; -} - /*********************************************************************** * CoIsOle1Class [OLE32.@] * diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index 5d7bf50b73..8419fd04ff 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -287,16 +287,6 @@ static inline APARTMENT* COM_CurrentApt(void) return COM_CurrentInfo()->apt; } -static inline GUID COM_CurrentCausalityId(void) -{ - struct oletls *info = COM_CurrentInfo(); - if (!info) - return GUID_NULL; - if (IsEqualGUID(&info->causality_id, &GUID_NULL)) - CoCreateGuid(&info->causality_id); - return info->causality_id; -} - /* helpers for debugging */ # define DEBUG_SET_CRITSEC_NAME(cs, name) (cs)->DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": " name) # define DEBUG_CLEAR_CRITSEC_NAME(cs) (cs)->DebugInfo->Spare[0] = 0 diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index 9c66369248..543126e02b 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -32,7 +32,7 @@ @ stdcall CoGetCallerTID(ptr) @ stdcall CoGetClassObject(ptr long ptr ptr ptr) @ stdcall CoGetContextToken(ptr) combase.CoGetContextToken -@ stdcall CoGetCurrentLogicalThreadId(ptr) +@ stdcall CoGetCurrentLogicalThreadId(ptr) combase.CoGetCurrentLogicalThreadId @ stdcall CoGetCurrentProcess() @ stdcall CoGetDefaultContext(long ptr ptr) combase.CoGetDefaultContext @ stdcall CoGetInstanceFromFile(ptr ptr ptr long long wstr long ptr) combase.CoGetInstanceFromFile diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c index 895aa4010c..bd825fd6c1 100644 --- a/dlls/ole32/rpc.c +++ b/dlls/ole32/rpc.c @@ -659,7 +659,7 @@ static HRESULT WINAPI ClientRpcChannelBuffer_GetBuffer(LPRPCCHANNELBUFFER iface, message_state->channel_hook_info.iid = *riid; message_state->channel_hook_info.cbSize = sizeof(message_state->channel_hook_info); - message_state->channel_hook_info.uCausality = COM_CurrentCausalityId(); + CoGetCurrentLogicalThreadId(&message_state->channel_hook_info.uCausality); message_state->channel_hook_info.dwServerPid = This->server_pid; message_state->channel_hook_info.iMethod = msg->ProcNum & ~RPC_FLAGS_VALID_BIT; message_state->channel_hook_info.pObject = NULL; /* only present on server-side */

1 0

Nikolay Sivov : combase: Move CoGetContextToken().
by Alexandre Julliard Aug. 20, 2020

Aug. 20, 2020

Module: wine Branch: master Commit: 90c0e3a4dda1287c14bd5ad6e9c3296864b94368 URL: https://source.winehq.org/git/wine.git/?a=commit;h=90c0e3a4dda1287c14bd5ad6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 20 10:34:41 2020 +0300 combase: Move CoGetContextToken(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/combase.c | 313 ++++++++++++++++++++++++++++++++++++++++++ dlls/combase/combase.spec | 2 +- dlls/ole32/compobj.c | 336 ---------------------------------------------- dlls/ole32/ole32.spec | 2 +- 4 files changed, 315 insertions(+), 338 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=90c0e3a4dda1287c14bd…

1 0

Alexandre Julliard : ntdll: Unwind the syscall frame when calling KiUserApcDispatcher().
by Alexandre Julliard Aug. 20, 2020

Aug. 20, 2020

Module: wine Branch: master Commit: a686759f1d7aee67b5786b72e81a4e4fcf3f3c02 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a686759f1d7aee67b5786b72… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 20 08:24:00 2020 +0200 ntdll: Unwind the syscall frame when calling KiUserApcDispatcher(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/server.c | 10 ++++---- dlls/ntdll/unix/signal_arm.c | 56 +++++++++++++++++++++++++++++------------ dlls/ntdll/unix/signal_arm64.c | 55 +++++++++++++++++++++++++++++----------- dlls/ntdll/unix/signal_i386.c | 53 +++++++++++++++++++++++++++----------- dlls/ntdll/unix/signal_x86_64.c | 50 ++++++++++++++++++++++++------------ dlls/ntdll/unix/unix_private.h | 6 +++-- 6 files changed, 161 insertions(+), 69 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a686759f1d7aee67b578…

1 0

Alexandre Julliard : ntdll: Unwind the syscall frame in NtSetContextThread().
by Alexandre Julliard Aug. 20, 2020

Aug. 20, 2020

Module: wine Branch: master Commit: 77fbf3a9fde517ecb4d23e0bc121668206fec2f3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=77fbf3a9fde517ecb4d23e0b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 20 18:23:24 2020 +0200 ntdll: Unwind the syscall frame in NtSetContextThread(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_arm.c | 7 ++++++- dlls/ntdll/unix/signal_arm64.c | 2 ++ dlls/ntdll/unix/signal_i386.c | 3 +++ dlls/ntdll/unix/signal_x86_64.c | 4 ++++ 4 files changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/signal_arm.c b/dlls/ntdll/unix/signal_arm.c index 270a23ad71..175e86168a 100644 --- a/dlls/ntdll/unix/signal_arm.c +++ b/dlls/ntdll/unix/signal_arm.c @@ -461,7 +461,12 @@ NTSTATUS WINAPI NtSetContextThread( HANDLE handle, const CONTEXT *context ) context_to_server( &server_context, context ); ret = set_thread_context( handle, &server_context, &self ); - if (self && ret == STATUS_SUCCESS) set_cpu_context( context ); + if (self && ret == STATUS_SUCCESS) + { + struct syscall_frame *frame = arm_thread_data()->syscall_frame; + arm_thread_data()->syscall_frame = frame->prev_frame; + set_cpu_context( context ); + } return ret; } diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index 8c03357b76..52f00323a0 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -520,6 +520,8 @@ NTSTATUS WINAPI NtSetContextThread( HANDLE handle, const CONTEXT *context ) } if (self && ret == STATUS_SUCCESS) { + struct syscall_frame *frame = arm64_thread_data()->syscall_frame; + arm64_thread_data()->syscall_frame = frame->prev_frame; InterlockedExchangePointer( (void **)&arm64_thread_data()->context, (void *)context ); raise( SIGUSR2 ); } diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index c70b381547..b9cc3ee46e 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -870,6 +870,9 @@ static inline void restore_context( const CONTEXT *context, ucontext_t *sigconte */ extern void set_full_cpu_context( const CONTEXT *context ); __ASM_GLOBAL_FUNC( set_full_cpu_context, + "movl %fs:0x1f8,%eax\n\t" /* x86_thread_data()->syscall_frame */ + "movl (%eax),%eax\n\t" /* frame->prev_frame */ + "movl %eax,%fs:0x1f8\n\t" "movl 4(%esp),%ecx\n\t" "movw 0x8c(%ecx),%gs\n\t" /* SegGs */ "movw 0x90(%ecx),%fs\n\t" /* SegFs */ diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 734c6b92a5..79b69cccc5 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -1708,7 +1708,11 @@ NTSTATUS WINAPI NtSetContextThread( HANDLE handle, const CONTEXT *context ) if (!(flags & CONTEXT_CONTROL)) FIXME( "setting partial context (%x) not supported\n", flags ); else + { + struct syscall_frame *frame = amd64_thread_data()->syscall_frame; + amd64_thread_data()->syscall_frame = frame->prev_frame; set_full_cpu_context( context ); + } } return ret; }

1 0

Gijs Vermeulen : amstream: Return VFW_E_CANNOT_CONNECT in IAMMultiMediaStream::OpenFile() when no renderers are present and AMMSF_NORENDER is not specified.
by Alexandre Julliard Aug. 20, 2020

Aug. 20, 2020

Module: wine Branch: master Commit: bdf860033860973bf2b516a1083d5bea86ad8c14 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bdf860033860973bf2b516a1… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Thu Aug 6 20:32:30 2020 +0200 amstream: Return VFW_E_CANNOT_CONNECT in IAMMultiMediaStream::OpenFile() when no renderers are present and AMMSF_NORENDER is not specified. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/multimedia.c | 17 ++++++++++++++++- dlls/amstream/tests/amstream.c | 38 ++++++++++++++++++++++++++++++++++++-- 2 files changed, 52 insertions(+), 3 deletions(-) diff --git a/dlls/amstream/multimedia.c b/dlls/amstream/multimedia.c index 414a903cf2..5425ef42a3 100644 --- a/dlls/amstream/multimedia.c +++ b/dlls/amstream/multimedia.c @@ -447,7 +447,22 @@ static HRESULT WINAPI multimedia_stream_OpenFile(IAMMultiMediaStream *iface, } if (SUCCEEDED(ret) && !(flags & AMMSF_NORENDER)) - ret = IGraphBuilder_Render(This->graph, This->ipin); + { + IFilterGraph2 *graph; + + if (SUCCEEDED(ret = IGraphBuilder_QueryInterface(This->graph, &IID_IFilterGraph2, (void **)&graph))) + { + ret = IFilterGraph2_RenderEx(graph, This->ipin, AM_RENDEREX_RENDERTOEXISTINGRENDERERS, NULL); + if (ret == VFW_E_CANNOT_RENDER) ret = VFW_E_CANNOT_CONNECT; + else if (ret == VFW_S_PARTIAL_RENDER) ret = S_OK; + IFilterGraph2_Release(graph); + } + else + { + FIXME("Failed to get IFilterGraph2 interface, hr %#x.\n", ret); + ret = IGraphBuilder_Render(This->graph, This->ipin); + } + } IMediaStreamFilter_SupportSeeking(This->filter, This->type == STREAMTYPE_READ); diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 910ab11f52..6a72f3ed89 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -283,13 +283,47 @@ static void test_openfile(const WCHAR *test_avi_path) ok(hr == S_OK, "Got hr %#x.\n", hr); ok(!graph, "Expected NULL graph.\n"); + hr = IAMMultiMediaStream_GetFilter(mmstream, &filter); + ok(!!filter, "Expected non-NULL filter.\n"); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + check_interface(filter, &IID_IMediaSeeking, FALSE); + hr = IAMMultiMediaStream_OpenFile(mmstream, test_avi_path, AMMSF_NORENDER); ok(hr == S_OK, "Got hr %#x.\n", hr); + check_interface(filter, &IID_IMediaSeeking, FALSE); + + hr = IAMMultiMediaStream_GetFilterGraph(mmstream, &graph); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!!graph, "Expected non-NULL graph.\n"); + IGraphBuilder_Release(graph); + IMediaStreamFilter_Release(filter); + + ref = IAMMultiMediaStream_Release(mmstream); + ok(!ref, "Got outstanding refcount %d.\n", ref); + + mmstream = create_ammultimediastream(); + hr = IAMMultiMediaStream_GetFilterGraph(mmstream, &graph); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!graph, "Expected NULL graph.\n"); + + hr = IAMMultiMediaStream_GetFilter(mmstream, &filter); + ok(!!filter, "Expected non-NULL filter.\n"); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + check_interface(filter, &IID_IMediaSeeking, FALSE); + + hr = IAMMultiMediaStream_OpenFile(mmstream, test_avi_path, 0); + ok(hr == VFW_E_CANNOT_CONNECT, "Got hr %#x.\n", hr); + + check_interface(filter, &IID_IMediaSeeking, FALSE); + hr = IAMMultiMediaStream_GetFilterGraph(mmstream, &graph); ok(hr == S_OK, "Got hr %#x.\n", hr); ok(!!graph, "Expected non-NULL graph.\n"); IGraphBuilder_Release(graph); + IMediaStreamFilter_Release(filter); ref = IAMMultiMediaStream_Release(mmstream); ok(!ref, "Got outstanding refcount %d.\n", ref); @@ -389,12 +423,12 @@ static void test_mmstream_get_duration(const WCHAR *test_avi_path) mmstream = create_ammultimediastream(); hr = IAMMultiMediaStream_OpenFile(mmstream, test_avi_path, 0); - todo_wine ok(hr == VFW_E_CANNOT_CONNECT, "Got hr %#x.\n", hr); + ok(hr == VFW_E_CANNOT_CONNECT, "Got hr %#x.\n", hr); duration = 0xdeadbeefdeadbeefULL; hr = IAMMultiMediaStream_GetDuration(mmstream, &duration); todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); - todo_wine ok(duration == 0, "Got duration %s.\n", wine_dbgstr_longlong(duration)); + ok(duration == 0, "Got duration %s.\n", wine_dbgstr_longlong(duration)); ref = IAMMultiMediaStream_Release(mmstream); ok(!ref, "Got outstanding refcount %d.\n", ref);

1 0

Gijs Vermeulen : amstream: Return S_FALSE when IMediaSeeking::GetDuration() fails in IAMMultiMediaStream::GetDuration().
by Alexandre Julliard Aug. 20, 2020

Aug. 20, 2020

Module: wine Branch: master Commit: 0a2bf907337bf787feac68b0da8345149a734c6a URL: https://source.winehq.org/git/wine.git/?a=commit;h=0a2bf907337bf787feac68b0… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Thu Aug 6 20:32:31 2020 +0200 amstream: Return S_FALSE when IMediaSeeking::GetDuration() fails in IAMMultiMediaStream::GetDuration(). Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/multimedia.c | 6 +++++- dlls/amstream/tests/amstream.c | 6 +++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/amstream/multimedia.c b/dlls/amstream/multimedia.c index 5425ef42a3..82ef482234 100644 --- a/dlls/amstream/multimedia.c +++ b/dlls/amstream/multimedia.c @@ -181,7 +181,11 @@ static HRESULT WINAPI multimedia_stream_GetDuration(IAMMultiMediaStream *iface, if (!mmstream->media_seeking) return E_NOINTERFACE; - return IMediaSeeking_GetDuration(mmstream->media_seeking, duration); + + if (IMediaSeeking_GetDuration(mmstream->media_seeking, duration) != S_OK) + return S_FALSE; + + return S_OK; } static HRESULT WINAPI multimedia_stream_Seek(IAMMultiMediaStream *iface, STREAM_TIME seek_time) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 6a72f3ed89..a25ae42a31 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -414,7 +414,7 @@ static void test_mmstream_get_duration(const WCHAR *test_avi_path) duration = 0xdeadbeefdeadbeefULL; hr = IAMMultiMediaStream_GetDuration(mmstream, &duration); - todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); ok(duration == 0, "Got duration %s.\n", wine_dbgstr_longlong(duration)); ref = IAMMultiMediaStream_Release(mmstream); @@ -427,7 +427,7 @@ static void test_mmstream_get_duration(const WCHAR *test_avi_path) duration = 0xdeadbeefdeadbeefULL; hr = IAMMultiMediaStream_GetDuration(mmstream, &duration); - todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); ok(duration == 0, "Got duration %s.\n", wine_dbgstr_longlong(duration)); ref = IAMMultiMediaStream_Release(mmstream); @@ -442,7 +442,7 @@ static void test_mmstream_get_duration(const WCHAR *test_avi_path) duration = 0xdeadbeefdeadbeefULL; hr = IAMMultiMediaStream_GetDuration(mmstream, &duration); - todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); ok(duration == 0, "Got duration %s.\n", wine_dbgstr_longlong(duration)); ref = IAMMultiMediaStream_Release(mmstream);

1 0

Paul Gofman : ntdll: Remove redundant ldmxcsr in set_full_cpu_context() on x86_64.
by Alexandre Julliard Aug. 20, 2020

Aug. 20, 2020

Module: wine Branch: master Commit: 25d4c50db3b2cd5113709b98adfd3de86b6e19ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=25d4c50db3b2cd5113709b98… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Aug 20 00:22:55 2020 +0300 ntdll: Remove redundant ldmxcsr in set_full_cpu_context() on x86_64. Mxcsr will be overwritten anyway by consequent fxrstor. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_x86_64.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 79b69cccc5..ef3fe86498 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -1483,7 +1483,6 @@ __ASM_GLOBAL_FUNC( set_full_cpu_context, __ASM_SEH(".seh_stackalloc 0x40\n\t") __ASM_SEH(".seh_endprologue\n\t") __ASM_CFI(".cfi_adjust_cfa_offset 40\n\t") - "ldmxcsr 0x34(%rdi)\n\t" /* context->MxCsr */ "movw 0x38(%rdi),%ax\n\t" /* context->SegCs */ "movq %rax,8(%rsp)\n\t" "movw 0x42(%rdi),%ax\n\t" /* context->SegSs */

1 0