October 2018 - Wine-commits

Alexandre Julliard : ntdll: Store a copy of the environment in RtlCreateProcessParametersEx().
by Alexandre Julliard 16 Oct '18

16 Oct '18

Module: wine Branch: master Commit: fce198cc5e797679f904c0ec58ed715fd0e8c481 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fce198cc5e797679f904c0ec… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 16 15:15:27 2018 +0200 ntdll: Store a copy of the environment in RtlCreateProcessParametersEx(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/env.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/env.c b/dlls/ntdll/env.c index 9288713..fdd5d4f 100644 --- a/dlls/ntdll/env.c +++ b/dlls/ntdll/env.c @@ -453,8 +453,9 @@ NTSTATUS WINAPI RtlCreateProcessParametersEx( RTL_USER_PROCESS_PARAMETERS **resu static const UNICODE_STRING null_str = { 0, 0, NULL }; const RTL_USER_PROCESS_PARAMETERS *cur_params; - SIZE_T size, total_size; + SIZE_T size, env_size, total_size; void *ptr; + const WCHAR *env; NTSTATUS status; RtlAcquirePebLock(); @@ -474,6 +475,11 @@ NTSTATUS WINAPI RtlCreateProcessParametersEx( RTL_USER_PROCESS_PARAMETERS **resu if (!ShellInfo) ShellInfo = &empty_str; if (!RuntimeInfo) RuntimeInfo = &null_str; + env = Environment; + while (*env) env += strlenW(env) + 1; + env++; + env_size = (env - Environment) * sizeof(WCHAR); + size = (sizeof(RTL_USER_PROCESS_PARAMETERS) + ImagePathName->MaximumLength + DllPath->MaximumLength @@ -484,7 +490,7 @@ NTSTATUS WINAPI RtlCreateProcessParametersEx( RTL_USER_PROCESS_PARAMETERS **resu + ShellInfo->MaximumLength + RuntimeInfo->MaximumLength); - total_size = size; + total_size = size + env_size; ptr = NULL; if ((status = NtAllocateVirtualMemory( NtCurrentProcess(), &ptr, 0, &total_size, MEM_COMMIT, PAGE_READWRITE )) == STATUS_SUCCESS) @@ -494,7 +500,6 @@ NTSTATUS WINAPI RtlCreateProcessParametersEx( RTL_USER_PROCESS_PARAMETERS **resu params->Size = size; params->Flags = PROCESS_PARAMS_FLAG_NORMALIZED; params->ConsoleFlags = cur_params->ConsoleFlags; - params->Environment = Environment; /* all other fields are zero */ ptr = params + 1; @@ -506,6 +511,8 @@ NTSTATUS WINAPI RtlCreateProcessParametersEx( RTL_USER_PROCESS_PARAMETERS **resu append_unicode_string( &ptr, Desktop, &params->Desktop ); append_unicode_string( &ptr, ShellInfo, &params->ShellInfo ); append_unicode_string( &ptr, RuntimeInfo, &params->RuntimeInfo ); + params->Environment = ptr; + memcpy( ptr, Environment, (env - Environment) * sizeof(WCHAR) ); *result = params; if (!(flags & PROCESS_PARAMS_FLAG_NORMALIZED)) RtlDeNormalizeProcessParams( params ); }

1 0

Alexandre Julliard : ntdll: Fixup size of the current directory in RtlCreateProcessParametersEx().
by Alexandre Julliard 16 Oct '18

16 Oct '18

Module: wine Branch: master Commit: ae7ccbba48b99ca6e7f9ee4564082c2d331fa205 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae7ccbba48b99ca6e7f9ee45… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 16 20:43:42 2018 +0200 ntdll: Fixup size of the current directory in RtlCreateProcessParametersEx(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/env.c | 10 +++++++--- dlls/ntdll/thread.c | 8 ++++---- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/env.c b/dlls/ntdll/env.c index fdd5d4f..417efb6 100644 --- a/dlls/ntdll/env.c +++ b/dlls/ntdll/env.c @@ -452,6 +452,7 @@ NTSTATUS WINAPI RtlCreateProcessParametersEx( RTL_USER_PROCESS_PARAMETERS **resu static const UNICODE_STRING empty_str = { 0, sizeof(empty), empty }; static const UNICODE_STRING null_str = { 0, 0, NULL }; + UNICODE_STRING curdir; const RTL_USER_PROCESS_PARAMETERS *cur_params; SIZE_T size, env_size, total_size; void *ptr; @@ -464,10 +465,13 @@ NTSTATUS WINAPI RtlCreateProcessParametersEx( RTL_USER_PROCESS_PARAMETERS **resu if (!CurrentDirectoryName) { if (NtCurrentTeb()->Tib.SubSystemTib) /* FIXME: hack */ - CurrentDirectoryName = &((WIN16_SUBSYSTEM_TIB *)NtCurrentTeb()->Tib.SubSystemTib)->curdir.DosPath; + curdir = ((WIN16_SUBSYSTEM_TIB *)NtCurrentTeb()->Tib.SubSystemTib)->curdir.DosPath; else - CurrentDirectoryName = &cur_params->CurrentDirectory.DosPath; + curdir = cur_params->CurrentDirectory.DosPath; } + else curdir = *CurrentDirectoryName; + curdir.MaximumLength = MAX_PATH * sizeof(WCHAR); + if (!CommandLine) CommandLine = ImagePathName; if (!Environment) Environment = cur_params->Environment; if (!WindowTitle) WindowTitle = &empty_str; @@ -503,7 +507,7 @@ NTSTATUS WINAPI RtlCreateProcessParametersEx( RTL_USER_PROCESS_PARAMETERS **resu /* all other fields are zero */ ptr = params + 1; - append_unicode_string( &ptr, CurrentDirectoryName, &params->CurrentDirectory.DosPath ); + append_unicode_string( &ptr, &curdir, &params->CurrentDirectory.DosPath ); append_unicode_string( &ptr, DllPath, &params->DllPath ); append_unicode_string( &ptr, ImagePathName, &params->ImagePathName ); append_unicode_string( &ptr, CommandLine, &params->CommandLine ); diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 9b23fbf..c4e02da 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -68,7 +68,7 @@ struct startup_info static PEB *peb; static PEB_LDR_DATA ldr; static RTL_USER_PROCESS_PARAMETERS params; /* default parameters if no parent */ -static WCHAR current_dir[MAX_NT_PATH_LENGTH]; +static WCHAR current_dir[MAX_PATH]; static RTL_BITMAP tls_bitmap; static RTL_BITMAP tls_expansion_bitmap; static RTL_BITMAP fls_bitmap; @@ -130,7 +130,7 @@ static NTSTATUS init_user_process_params( SIZE_T data_size ) if (status != STATUS_SUCCESS) goto done; size = sizeof(*params); - size += MAX_NT_PATH_LENGTH * sizeof(WCHAR); + size += sizeof(current_dir); size += info->dllpath_len + sizeof(WCHAR); size += info->imagepath_len + sizeof(WCHAR); size += info->cmdline_len + sizeof(WCHAR); @@ -169,8 +169,8 @@ static NTSTATUS init_user_process_params( SIZE_T data_size ) /* current directory needs more space */ get_unicode_string( &params->CurrentDirectory.DosPath, &src, &dst, info->curdir_len ); - params->CurrentDirectory.DosPath.MaximumLength = MAX_NT_PATH_LENGTH * sizeof(WCHAR); - dst = (WCHAR *)(params + 1) + MAX_NT_PATH_LENGTH; + params->CurrentDirectory.DosPath.MaximumLength = sizeof(current_dir); + dst = (WCHAR *)(params + 1) + ARRAY_SIZE(current_dir); get_unicode_string( &params->DllPath, &src, &dst, info->dllpath_len ); get_unicode_string( &params->ImagePathName, &src, &dst, info->imagepath_len );

1 0

Alexandre Julliard : ntdll: Align string data in RtlCreateProcessParametersEx().
by Alexandre Julliard 16 Oct '18

16 Oct '18

Module: wine Branch: master Commit: 179c0ee6fb2a25736e0bf74613415ebce54c875f URL: https://source.winehq.org/git/wine.git/?a=commit;h=179c0ee6fb2a25736e0bf746… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 16 20:45:10 2018 +0200 ntdll: Align string data in RtlCreateProcessParametersEx(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/env.c | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/dlls/ntdll/env.c b/dlls/ntdll/env.c index 417efb6..1d34e62 100644 --- a/dlls/ntdll/env.c +++ b/dlls/ntdll/env.c @@ -421,15 +421,21 @@ PRTL_USER_PROCESS_PARAMETERS WINAPI RtlDeNormalizeProcessParams( RTL_USER_PROCES } +#define ROUND_SIZE(size) (((size) + sizeof(void *) - 1) & ~(sizeof(void *) - 1)) + /* append a unicode string to the process params data; helper for RtlCreateProcessParameters */ static void append_unicode_string( void **data, const UNICODE_STRING *src, UNICODE_STRING *dst ) { dst->Length = src->Length; dst->MaximumLength = src->MaximumLength; - dst->Buffer = *data; - memcpy( dst->Buffer, src->Buffer, dst->MaximumLength ); - *data = (char *)dst->Buffer + dst->MaximumLength; + if (dst->MaximumLength) + { + dst->Buffer = *data; + memcpy( dst->Buffer, src->Buffer, dst->Length ); + *data = (char *)dst->Buffer + ROUND_SIZE( dst->MaximumLength ); + } + else dst->Buffer = NULL; } @@ -482,17 +488,17 @@ NTSTATUS WINAPI RtlCreateProcessParametersEx( RTL_USER_PROCESS_PARAMETERS **resu env = Environment; while (*env) env += strlenW(env) + 1; env++; - env_size = (env - Environment) * sizeof(WCHAR); + env_size = ROUND_SIZE( (env - Environment) * sizeof(WCHAR) ); size = (sizeof(RTL_USER_PROCESS_PARAMETERS) - + ImagePathName->MaximumLength - + DllPath->MaximumLength - + CurrentDirectoryName->MaximumLength - + CommandLine->MaximumLength - + WindowTitle->MaximumLength - + Desktop->MaximumLength - + ShellInfo->MaximumLength - + RuntimeInfo->MaximumLength); + + ROUND_SIZE( ImagePathName->MaximumLength ) + + ROUND_SIZE( DllPath->MaximumLength ) + + ROUND_SIZE( curdir.MaximumLength ) + + ROUND_SIZE( CommandLine->MaximumLength ) + + ROUND_SIZE( WindowTitle->MaximumLength ) + + ROUND_SIZE( Desktop->MaximumLength ) + + ROUND_SIZE( ShellInfo->MaximumLength ) + + ROUND_SIZE( RuntimeInfo->MaximumLength )); total_size = size + env_size; ptr = NULL;

1 0

Alexandre Julliard : ntdll: Allocate process parameters on the heap in RtlCreateProcessParametersEx() .
by Alexandre Julliard 16 Oct '18

16 Oct '18

Module: wine Branch: master Commit: b5d4484cd2993e0b7d9ecb15ca756d4b2ce983c0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b5d4484cd2993e0b7d9ecb15… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 16 20:45:31 2018 +0200 ntdll: Allocate process parameters on the heap in RtlCreateProcessParametersEx(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/env.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/dlls/ntdll/env.c b/dlls/ntdll/env.c index 1d34e62..37224a4 100644 --- a/dlls/ntdll/env.c +++ b/dlls/ntdll/env.c @@ -460,10 +460,10 @@ NTSTATUS WINAPI RtlCreateProcessParametersEx( RTL_USER_PROCESS_PARAMETERS **resu UNICODE_STRING curdir; const RTL_USER_PROCESS_PARAMETERS *cur_params; - SIZE_T size, env_size, total_size; + SIZE_T size, env_size; void *ptr; const WCHAR *env; - NTSTATUS status; + NTSTATUS status = STATUS_SUCCESS; RtlAcquirePebLock(); cur_params = NtCurrentTeb()->Peb->ProcessParameters; @@ -500,13 +500,10 @@ NTSTATUS WINAPI RtlCreateProcessParametersEx( RTL_USER_PROCESS_PARAMETERS **resu + ROUND_SIZE( ShellInfo->MaximumLength ) + ROUND_SIZE( RuntimeInfo->MaximumLength )); - total_size = size + env_size; - ptr = NULL; - if ((status = NtAllocateVirtualMemory( NtCurrentProcess(), &ptr, 0, &total_size, - MEM_COMMIT, PAGE_READWRITE )) == STATUS_SUCCESS) + if ((ptr = RtlAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, size + env_size ))) { RTL_USER_PROCESS_PARAMETERS *params = ptr; - params->AllocationSize = total_size; + params->AllocationSize = size; params->Size = size; params->Flags = PROCESS_PARAMS_FLAG_NORMALIZED; params->ConsoleFlags = cur_params->ConsoleFlags; @@ -526,6 +523,8 @@ NTSTATUS WINAPI RtlCreateProcessParametersEx( RTL_USER_PROCESS_PARAMETERS **resu *result = params; if (!(flags & PROCESS_PARAMS_FLAG_NORMALIZED)) RtlDeNormalizeProcessParams( params ); } + else status = STATUS_NO_MEMORY; + RtlReleasePebLock(); return status; } @@ -555,7 +554,5 @@ NTSTATUS WINAPI RtlCreateProcessParameters( RTL_USER_PROCESS_PARAMETERS **result */ void WINAPI RtlDestroyProcessParameters( RTL_USER_PROCESS_PARAMETERS *params ) { - void *ptr = params; - SIZE_T size = 0; - NtFreeVirtualMemory( NtCurrentProcess(), &ptr, &size, MEM_RELEASE ); + RtlFreeHeap( GetProcessHeap(), 0, params ); }

1 0

Alexandre Julliard : ntdll/tests: Add tests for RtlCreateProcessParameters ().
by Alexandre Julliard 16 Oct '18

16 Oct '18

Module: wine Branch: master Commit: 76cbf12894b9ee83ea8dd6fb5b9443720a90fe19 URL: https://source.winehq.org/git/wine.git/?a=commit;h=76cbf12894b9ee83ea8dd6fb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 16 20:25:02 2018 +0200 ntdll/tests: Add tests for RtlCreateProcessParameters(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/env.c | 198 ++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 187 insertions(+), 11 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=76cbf12894b9ee83ea8d…

1 0

Alexandre Julliard : kernel32: Move environment Unicode conversion into create_process_params().
by Alexandre Julliard 16 Oct '18

16 Oct '18

Module: wine Branch: master Commit: ec0c5a11fd4532a707489359cd2e62bac2a4f018 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec0c5a11fd4532a707489359… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 16 15:25:57 2018 +0200 kernel32: Move environment Unicode conversion into create_process_params(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 53 ++++++++++++++++++++----------------------------- 1 file changed, 22 insertions(+), 31 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index f56bb09..6e3b51e 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -1843,18 +1843,31 @@ static startup_info_t *create_startup_info( const RTL_USER_PROCESS_PARAMETERS *p * create_process_params */ static RTL_USER_PROCESS_PARAMETERS *create_process_params( LPCWSTR filename, LPCWSTR cmdline, - LPCWSTR cur_dir, LPWSTR env, DWORD flags, + LPCWSTR cur_dir, void *env, DWORD flags, const STARTUPINFOW *startup ) { RTL_USER_PROCESS_PARAMETERS *params; UNICODE_STRING imageW, curdirW, cmdlineW, titleW, desktopW, runtimeW, newdirW; WCHAR imagepath[MAX_PATH]; + WCHAR *envW = env; if(!GetLongPathNameW( filename, imagepath, MAX_PATH )) lstrcpynW( imagepath, filename, MAX_PATH ); if(!GetFullPathNameW( imagepath, MAX_PATH, imagepath, NULL )) lstrcpynW( imagepath, filename, MAX_PATH ); + if (env && !(flags & CREATE_UNICODE_ENVIRONMENT)) /* convert environment to unicode */ + { + char *e = env; + DWORD lenW; + + while (*e) e += strlen(e) + 1; + e++; /* final null */ + lenW = MultiByteToWideChar( CP_ACP, 0, env, e - (char *)env, NULL, 0 ); + if ((envW = HeapAlloc( GetProcessHeap(), 0, lenW * sizeof(WCHAR) ))) + MultiByteToWideChar( CP_ACP, 0, env, e - (char *)env, envW, lenW ); + } + newdirW.Buffer = NULL; if (cur_dir) { @@ -1870,9 +1883,12 @@ static RTL_USER_PROCESS_PARAMETERS *create_process_params( LPCWSTR filename, LPC RtlInitUnicodeString( &desktopW, startup->lpDesktop ); runtimeW.Buffer = (WCHAR *)startup->lpReserved2; runtimeW.Length = runtimeW.MaximumLength = startup->cbReserved2; - if (RtlCreateProcessParametersEx( &params, &imageW, NULL, &curdirW, &cmdlineW, env, &titleW, + if (RtlCreateProcessParametersEx( &params, &imageW, NULL, &curdirW, &cmdlineW, envW, &titleW, &desktopW, NULL, &runtimeW, PROCESS_PARAMS_FLAG_NORMALIZED )) + { + if (envW != env) HeapFree( GetProcessHeap(), 0, envW ); return NULL; + } if (flags & CREATE_NEW_PROCESS_GROUP) params->ConsoleFlags = 1; if (flags & CREATE_NEW_CONSOLE) params->ConsoleHandle = KERNEL32_CONSOLE_ALLOC; @@ -1920,6 +1936,7 @@ static RTL_USER_PROCESS_PARAMETERS *create_process_params( LPCWSTR filename, LPC params->dwFlags = startup->dwFlags; params->wShowWindow = startup->wShowWindow; + if (envW != env) HeapFree( GetProcessHeap(), 0, envW ); return params; } @@ -2482,7 +2499,7 @@ static BOOL create_cmd_process( LPCWSTR cur_dir, LPSECURITY_ATTRIBUTES psa, LPSE strcatW( newcmdline, params->CommandLine.Buffer ); strcatW( newcmdline, quotW ); ret = CreateProcessW( comspec, newcmdline, psa, tsa, inherit, - flags, params->Environment, cur_dir, + flags | CREATE_UNICODE_ENVIRONMENT, params->Environment, cur_dir, startup, info ); HeapFree( GetProcessHeap(), 0, newcmdline ); return ret; @@ -2585,7 +2602,7 @@ static BOOL create_process_impl( LPCWSTR app_name, LPWSTR cmd_line, LPSECURITY_A HANDLE hFile = 0; char *unixdir = NULL; WCHAR name[MAX_PATH]; - WCHAR *tidy_cmdline, *p, *envW = env; + WCHAR *tidy_cmdline, *p; RTL_USER_PROCESS_PARAMETERS *params = NULL; pe_image_info_t pe_info; enum binary_type type; @@ -2621,35 +2638,10 @@ static BOOL create_process_impl( LPCWSTR app_name, LPWSTR cmd_line, LPSECURITY_A if (GetCurrentDirectoryW(MAX_PATH, buf)) unixdir = wine_get_unix_file_name( buf ); } - if (!env) - { - WCHAR *e; - - RtlAcquirePebLock(); - e = env = NtCurrentTeb()->Peb->ProcessParameters->Environment; - while (*e) e += strlenW(e) + 1; - e++; /* final null */ - envW = HeapAlloc( GetProcessHeap(), 0, (e - (WCHAR *)env) * sizeof(WCHAR) ); - memcpy( envW, env, (e - (WCHAR *)env) * sizeof(WCHAR) ); - RtlReleasePebLock(); - } - else if (!(flags & CREATE_UNICODE_ENVIRONMENT)) /* convert environment to unicode */ - { - char *e = env; - DWORD lenW; - - while (*e) e += strlen(e) + 1; - e++; /* final null */ - lenW = MultiByteToWideChar( CP_ACP, 0, env, e - (char*)env, NULL, 0 ); - envW = HeapAlloc( GetProcessHeap(), 0, lenW * sizeof(WCHAR) ); - MultiByteToWideChar( CP_ACP, 0, env, e - (char*)env, envW, lenW ); - } - flags |= CREATE_UNICODE_ENVIRONMENT; - info->hThread = info->hProcess = 0; info->dwProcessId = info->dwThreadId = 0; - if (!(params = create_process_params( name, tidy_cmdline, cur_dir, envW, flags, startup_info ))) + if (!(params = create_process_params( name, tidy_cmdline, cur_dir, env, flags, startup_info ))) { SetLastError( ERROR_NOT_ENOUGH_MEMORY ); goto done; @@ -2730,7 +2722,6 @@ static BOOL create_process_impl( LPCWSTR app_name, LPWSTR cmd_line, LPSECURITY_A done: RtlDestroyProcessParameters( params ); if (tidy_cmdline != cmd_line) HeapFree( GetProcessHeap(), 0, tidy_cmdline ); - if (envW != env) HeapFree( GetProcessHeap(), 0, envW ); HeapFree( GetProcessHeap(), 0, unixdir ); if (retv) TRACE( "started process pid %04x tid %04x\n", info->dwProcessId, info->dwThreadId );

1 0

Alexandre Julliard : kernel32: Get the current directory from the process parameters in create_cmd_process ().
by Alexandre Julliard 16 Oct '18

16 Oct '18

Module: wine Branch: master Commit: c4d85843c08d72c4c15529a3a4c63a9611bf9bb1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c4d85843c08d72c4c15529a3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 16 21:50:58 2018 +0200 kernel32: Get the current directory from the process parameters in create_cmd_process(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 6e3b51e..f9456ae 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -2469,7 +2469,7 @@ static BOOL create_vdm_process( LPSECURITY_ATTRIBUTES psa, LPSECURITY_ATTRIBUTES * * Create a new cmd shell process for a .BAT file. */ -static BOOL create_cmd_process( LPCWSTR cur_dir, LPSECURITY_ATTRIBUTES psa, LPSECURITY_ATTRIBUTES tsa, +static BOOL create_cmd_process( LPSECURITY_ATTRIBUTES psa, LPSECURITY_ATTRIBUTES tsa, BOOL inherit, DWORD flags, LPSTARTUPINFOW startup, const RTL_USER_PROCESS_PARAMETERS *params, LPPROCESS_INFORMATION info ) @@ -2480,7 +2480,7 @@ static BOOL create_cmd_process( LPCWSTR cur_dir, LPSECURITY_ATTRIBUTES psa, LPSE static const WCHAR slashscW[] = {' ','/','s','/','c',' ',0}; static const WCHAR quotW[] = {'"',0}; WCHAR comspec[MAX_PATH]; - WCHAR *newcmdline; + WCHAR *newcmdline, *cur_dir = NULL; BOOL ret; if (!GetEnvironmentVariableW( comspecW, comspec, ARRAY_SIZE( comspec ))) @@ -2498,6 +2498,7 @@ static BOOL create_cmd_process( LPCWSTR cur_dir, LPSECURITY_ATTRIBUTES psa, LPSE strcatW( newcmdline, quotW ); strcatW( newcmdline, params->CommandLine.Buffer ); strcatW( newcmdline, quotW ); + if (params->CurrentDirectory.DosPath.Length) cur_dir = params->CurrentDirectory.DosPath.Buffer; ret = CreateProcessW( comspec, newcmdline, psa, tsa, inherit, flags | CREATE_UNICODE_ENVIRONMENT, params->Environment, cur_dir, startup, info ); @@ -2705,7 +2706,7 @@ static BOOL create_process_impl( LPCWSTR app_name, LPWSTR cmd_line, LPSECURITY_A if (!strcmpiW( p, batW ) || !strcmpiW( p, cmdW ) ) { TRACE( "starting %s as batch binary\n", debugstr_w(name) ); - retv = create_cmd_process( cur_dir, process_attr, thread_attr, + retv = create_cmd_process( process_attr, thread_attr, inherit, flags, startup_info, params, info ); break; }

1 0

Jacek Caban : rpcrt4: Reset assoc_group_id on associations with no active connection.
by Alexandre Julliard 16 Oct '18

16 Oct '18

Module: wine Branch: master Commit: 3b4f3ff397c7a50deec0d94c58654bc576254478 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b4f3ff397c7a50deec0d94c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 16 14:38:35 2018 +0200 rpcrt4: Reset assoc_group_id on associations with no active connection. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/rpc_assoc.c | 11 +++++++++++ dlls/rpcrt4/rpc_assoc.h | 2 ++ dlls/rpcrt4/rpc_transport.c | 1 + 3 files changed, 14 insertions(+) diff --git a/dlls/rpcrt4/rpc_assoc.c b/dlls/rpcrt4/rpc_assoc.c index 339ac12..8a823f4 100644 --- a/dlls/rpcrt4/rpc_assoc.c +++ b/dlls/rpcrt4/rpc_assoc.c @@ -80,6 +80,7 @@ static RPC_STATUS RpcAssoc_Alloc(LPCSTR Protseq, LPCSTR NetworkAddr, assoc->Endpoint = RPCRT4_strdupA(Endpoint); assoc->NetworkOptions = NetworkOptions ? RPCRT4_strdupW(NetworkOptions) : NULL; assoc->assoc_group_id = 0; + assoc->connection_cnt = 0; UuidCreate(&assoc->http_uuid); list_init(&assoc->entry); *assoc_out = assoc; @@ -422,6 +423,7 @@ RPC_STATUS RpcAssoc_GetClientConnection(RpcAssoc *assoc, return status; } + InterlockedIncrement(&assoc->connection_cnt); *Connection = NewConnection; return RPC_S_OK; @@ -437,6 +439,15 @@ void RpcAssoc_ReleaseIdleConnection(RpcAssoc *assoc, RpcConnection *Connection) LeaveCriticalSection(&assoc->cs); } +void RpcAssoc_ConnectionReleased(RpcAssoc *assoc) +{ + if (InterlockedDecrement(&assoc->connection_cnt)) + return; + + TRACE("Last %p connection released\n", assoc); + assoc->assoc_group_id = 0; +} + RPC_STATUS RpcServerAssoc_AllocateContextHandle(RpcAssoc *assoc, void *CtxGuard, NDR_SCONTEXT *SContext) { diff --git a/dlls/rpcrt4/rpc_assoc.h b/dlls/rpcrt4/rpc_assoc.h index 3d9b612..f4c5f3a 100644 --- a/dlls/rpcrt4/rpc_assoc.h +++ b/dlls/rpcrt4/rpc_assoc.h @@ -41,6 +41,7 @@ typedef struct _RpcAssoc /* client-only */ /* connections available to be used (protected by cs) */ struct list free_connection_pool; + LONG connection_cnt; /* server-only */ struct list context_handle_list; /* protected by cs */ @@ -59,3 +60,4 @@ RPC_STATUS RpcServerAssoc_UpdateContextHandle(RpcAssoc *assoc, NDR_SCONTEXT SCon unsigned int RpcServerAssoc_ReleaseContextHandle(RpcAssoc *assoc, NDR_SCONTEXT SContext, BOOL release_lock) DECLSPEC_HIDDEN; void RpcContextHandle_GetUuid(NDR_SCONTEXT SContext, UUID *uuid) DECLSPEC_HIDDEN; BOOL RpcContextHandle_IsGuardCorrect(NDR_SCONTEXT SContext, void *CtxGuard) DECLSPEC_HIDDEN; +void RpcAssoc_ConnectionReleased(RpcAssoc *assoc) DECLSPEC_HIDDEN; diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index c374ba1..4fd091c 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -3419,6 +3419,7 @@ void RPCRT4_ReleaseConnection(RpcConnection *connection) /* server-only */ if (connection->server_binding) RPCRT4_ReleaseBinding(connection->server_binding); + else if (connection->assoc) RpcAssoc_ConnectionReleased(connection->assoc); if (connection->wait_release) SetEvent(connection->wait_release);

1 0

Jacek Caban : rpcrt4: Try reconnecting when to server in IRpcSend on broken connection.
by Alexandre Julliard 16 Oct '18

16 Oct '18

Module: wine Branch: master Commit: 3099fda2547096c3d4b258ec1cc010dabffe0b8f URL: https://source.winehq.org/git/wine.git/?a=commit;h=3099fda2547096c3d4b258ec… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 16 14:38:49 2018 +0200 rpcrt4: Try reconnecting when to server in IRpcSend on broken connection. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/rpc_assoc.c | 12 +++++++++--- dlls/rpcrt4/rpc_assoc.h | 2 +- dlls/rpcrt4/rpc_binding.c | 4 ++-- dlls/rpcrt4/rpc_binding.h | 3 ++- dlls/rpcrt4/rpc_message.c | 42 ++++++++++++++++++++++++++++-------------- 5 files changed, 42 insertions(+), 21 deletions(-) diff --git a/dlls/rpcrt4/rpc_assoc.c b/dlls/rpcrt4/rpc_assoc.c index 8a823f4..044ef09 100644 --- a/dlls/rpcrt4/rpc_assoc.c +++ b/dlls/rpcrt4/rpc_assoc.c @@ -391,14 +391,18 @@ static RpcConnection *RpcAssoc_GetIdleConnection(RpcAssoc *assoc, RPC_STATUS RpcAssoc_GetClientConnection(RpcAssoc *assoc, const RPC_SYNTAX_IDENTIFIER *InterfaceId, const RPC_SYNTAX_IDENTIFIER *TransferSyntax, RpcAuthInfo *AuthInfo, - RpcQualityOfService *QOS, LPCWSTR CookieAuth, RpcConnection **Connection) + RpcQualityOfService *QOS, LPCWSTR CookieAuth, + RpcConnection **Connection, BOOL *from_cache) { RpcConnection *NewConnection; RPC_STATUS status; *Connection = RpcAssoc_GetIdleConnection(assoc, InterfaceId, TransferSyntax, AuthInfo, QOS); - if (*Connection) + if (*Connection) { + TRACE("return idle connection %p for association %p\n", *Connection, assoc); + if (from_cache) *from_cache = TRUE; return RPC_S_OK; + } /* create a new connection */ status = RPCRT4_CreateConnection(&NewConnection, FALSE /* is this a server connection? */, @@ -424,8 +428,10 @@ RPC_STATUS RpcAssoc_GetClientConnection(RpcAssoc *assoc, } InterlockedIncrement(&assoc->connection_cnt); - *Connection = NewConnection; + TRACE("return new connection %p for association %p\n", *Connection, assoc); + *Connection = NewConnection; + if (from_cache) *from_cache = FALSE; return RPC_S_OK; } diff --git a/dlls/rpcrt4/rpc_assoc.h b/dlls/rpcrt4/rpc_assoc.h index f4c5f3a..c8c8772 100644 --- a/dlls/rpcrt4/rpc_assoc.h +++ b/dlls/rpcrt4/rpc_assoc.h @@ -50,7 +50,7 @@ typedef struct _RpcAssoc RPC_STATUS RPCRT4_GetAssociation(LPCSTR Protseq, LPCSTR NetworkAddr, LPCSTR Endpoint, LPCWSTR NetworkOptions, RpcAssoc **assoc) DECLSPEC_HIDDEN; RPC_STATUS RpcAssoc_GetClientConnection(RpcAssoc *assoc, const RPC_SYNTAX_IDENTIFIER *InterfaceId, const RPC_SYNTAX_IDENTIFIER *TransferSyntax, RpcAuthInfo *AuthInfo, RpcQualityOfService *QOS, - LPCWSTR CookieAuth, RpcConnection **Connection) DECLSPEC_HIDDEN; + LPCWSTR CookieAuth, RpcConnection **Connection, BOOL *from_cache) DECLSPEC_HIDDEN; void RpcAssoc_ReleaseIdleConnection(RpcAssoc *assoc, RpcConnection *Connection) DECLSPEC_HIDDEN; ULONG RpcAssoc_Release(RpcAssoc *assoc) DECLSPEC_HIDDEN; RPC_STATUS RpcServerAssoc_GetAssociation(LPCSTR Protseq, LPCSTR NetworkAddr, LPCSTR Endpoint, LPCWSTR NetworkOptions, ULONG assoc_gid, RpcAssoc **assoc_out) DECLSPEC_HIDDEN; diff --git a/dlls/rpcrt4/rpc_binding.c b/dlls/rpcrt4/rpc_binding.c index ec38b86..ae63abd 100644 --- a/dlls/rpcrt4/rpc_binding.c +++ b/dlls/rpcrt4/rpc_binding.c @@ -272,13 +272,13 @@ RPC_STATUS RPCRT4_ReleaseBinding(RpcBinding* Binding) RPC_STATUS RPCRT4_OpenBinding(RpcBinding* Binding, RpcConnection** Connection, const RPC_SYNTAX_IDENTIFIER *TransferSyntax, - const RPC_SYNTAX_IDENTIFIER *InterfaceId) + const RPC_SYNTAX_IDENTIFIER *InterfaceId, BOOL *from_cache) { TRACE("(Binding == ^%p)\n", Binding); if (!Binding->server) { return RpcAssoc_GetClientConnection(Binding->Assoc, InterfaceId, - TransferSyntax, Binding->AuthInfo, Binding->QOS, Binding->CookieAuth, Connection); + TransferSyntax, Binding->AuthInfo, Binding->QOS, Binding->CookieAuth, Connection, from_cache); } else { /* we already have a connection with acceptable binding, so use it */ if (Binding->FromConn) { diff --git a/dlls/rpcrt4/rpc_binding.h b/dlls/rpcrt4/rpc_binding.h index ca53887..8faacbd 100644 --- a/dlls/rpcrt4/rpc_binding.h +++ b/dlls/rpcrt4/rpc_binding.h @@ -174,7 +174,8 @@ RPC_STATUS RPCRT4_MakeBinding(RpcBinding** Binding, RpcConnection* Connection) D void RPCRT4_AddRefBinding(RpcBinding* Binding) DECLSPEC_HIDDEN; RPC_STATUS RPCRT4_ReleaseBinding(RpcBinding* Binding) DECLSPEC_HIDDEN; RPC_STATUS RPCRT4_OpenBinding(RpcBinding* Binding, RpcConnection** Connection, - const RPC_SYNTAX_IDENTIFIER *TransferSyntax, const RPC_SYNTAX_IDENTIFIER *InterfaceId) DECLSPEC_HIDDEN; + const RPC_SYNTAX_IDENTIFIER *TransferSyntax, const RPC_SYNTAX_IDENTIFIER *InterfaceId, + BOOL *from_cache) DECLSPEC_HIDDEN; RPC_STATUS RPCRT4_CloseBinding(RpcBinding* Binding, RpcConnection* Connection) DECLSPEC_HIDDEN; void rpcrt4_conn_release_and_wait(RpcConnection *connection) DECLSPEC_HIDDEN; diff --git a/dlls/rpcrt4/rpc_message.c b/dlls/rpcrt4/rpc_message.c index 9642213..3eea88a 100644 --- a/dlls/rpcrt4/rpc_message.c +++ b/dlls/rpcrt4/rpc_message.c @@ -38,6 +38,7 @@ #include "rpc_binding.h" #include "rpc_defs.h" #include "rpc_message.h" +#include "rpc_assoc.h" #include "ncastatus.h" WINE_DEFAULT_DEBUG_CHANNEL(rpc); @@ -1598,7 +1599,7 @@ RPC_STATUS WINAPI I_RpcNegotiateTransferSyntax(PRPC_MESSAGE pMsg) } status = RPCRT4_OpenBinding(bind, &conn, &cif->TransferSyntax, - &cif->InterfaceId); + &cif->InterfaceId, NULL); if (status == RPC_S_OK) { @@ -1789,26 +1790,39 @@ static DWORD WINAPI async_notifier_proc(LPVOID p) RPC_STATUS WINAPI I_RpcSend(PRPC_MESSAGE pMsg) { RpcBinding* bind = pMsg->Handle; + RPC_CLIENT_INTERFACE *cif; RpcConnection* conn; RPC_STATUS status; RpcPktHdr *hdr; + BOOL from_cache = TRUE; TRACE("(%p)\n", pMsg); if (!bind || bind->server || !pMsg->ReservedForRuntime) return RPC_S_INVALID_BINDING; - conn = pMsg->ReservedForRuntime; - - hdr = RPCRT4_BuildRequestHeader(pMsg->DataRepresentation, - pMsg->BufferLength, - pMsg->ProcNum & ~RPC_FLAGS_VALID_BIT, - &bind->ObjectUuid); - if (!hdr) - return ERROR_OUTOFMEMORY; - hdr->common.call_id = conn->NextCallId++; - - status = RPCRT4_Send(conn, hdr, pMsg->Buffer, pMsg->BufferLength); - - RPCRT4_FreeHeader(hdr); + for (;;) + { + conn = pMsg->ReservedForRuntime; + hdr = RPCRT4_BuildRequestHeader(pMsg->DataRepresentation, + pMsg->BufferLength, + pMsg->ProcNum & ~RPC_FLAGS_VALID_BIT, + &bind->ObjectUuid); + if (!hdr) + return ERROR_OUTOFMEMORY; + + hdr->common.call_id = conn->NextCallId++; + status = RPCRT4_Send(conn, hdr, pMsg->Buffer, pMsg->BufferLength); + RPCRT4_FreeHeader(hdr); + if (status == RPC_S_OK || conn->server || !from_cache) + break; + + WARN("Send failed, trying to reconnect\n"); + cif = pMsg->RpcInterfaceInformation; + RPCRT4_ReleaseConnection(conn); + pMsg->ReservedForRuntime = NULL; + status = RPCRT4_OpenBinding(bind, &conn, &cif->TransferSyntax, &cif->InterfaceId, &from_cache); + if (status != RPC_S_OK) break; + pMsg->ReservedForRuntime = conn; + } if (status == RPC_S_OK && pMsg->RpcFlags & RPC_BUFFER_ASYNC) {

1 0

Jacek Caban : mshtml: Try to avoid use_event_quirks in call_event_handlers if possible.
by Alexandre Julliard 16 Oct '18

16 Oct '18

Module: wine Branch: master Commit: adcb2162089ce1dd98bf793410abac44a923bf24 URL: https://source.winehq.org/git/wine.git/?a=commit;h=adcb2162089ce1dd98bf7934… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 16 17:21:47 2018 +0200 mshtml: Try to avoid use_event_quirks in call_event_handlers if possible. It may cause an unintended lock on document mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 1a93ae2..f2c24a4 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -2301,25 +2301,27 @@ static BOOL is_cp_event(cp_static_data_t *data, DISPID dispid) static void call_event_handlers(EventTarget *event_target, DOMEvent *event, dispatch_mode_t dispatch_mode) { const listener_container_t *container = get_listener_container(event_target, event->type, FALSE); - const BOOL use_quirks = use_event_quirks(event_target); event_listener_t *listener, listeners_buf[8], *listeners = listeners_buf; unsigned listeners_cnt, listeners_size; ConnectionPointContainer *cp_container = NULL; const event_target_vtbl_t *vtbl = NULL; + BOOL skip_onevent_listener = FALSE; VARIANT v; HRESULT hres; assert(!event->current_target); event->current_target = event_target; - if(use_quirks && container && !list_empty(&container->listeners) - && event->phase != DEP_CAPTURING_PHASE) { + if(container && !list_empty(&container->listeners) && event->phase != DEP_CAPTURING_PHASE) { listener = LIST_ENTRY(list_tail(&container->listeners), event_listener_t, entry); - if(listener && listener->function && listener->type == LISTENER_TYPE_ONEVENT) { + if(listener && listener->function && listener->type == LISTENER_TYPE_ONEVENT + && use_event_quirks(event_target)) { DISPID named_arg = DISPID_THIS; VARIANTARG arg; DISPPARAMS dp = {&arg, &named_arg, 1, 1}; + skip_onevent_listener = TRUE; + V_VT(&arg) = VT_DISPATCH; V_DISPATCH(&arg) = (IDispatch*)&event_target->dispex.IDispatchEx_iface; V_VT(&v) = VT_EMPTY; @@ -2353,7 +2355,7 @@ static void call_event_handlers(EventTarget *event_target, DOMEvent *event, disp continue; switch(listener->type) { case LISTENER_TYPE_ONEVENT: - if(use_quirks || event->phase == DEP_CAPTURING_PHASE) + if(skip_onevent_listener || event->phase == DEP_CAPTURING_PHASE) continue; break; case LISTENER_TYPE_CAPTURE:

1 0