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

Michael Stefaniuc : Release 5.0.5.
by Alexandre Julliard 16 Apr '21

16 Apr '21

Module: wine Branch: oldstable Commit: 001c94a4423d6fa9aef5f8160baa537b4e118398 URL: https://source.winehq.org/git/wine.git/?a=commit;h=001c94a4423d6fa9aef5f816… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Mar 30 21:43:20 2021 +0200 Release 5.0.5. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 255 ++------------------------------------------------------------ VERSION | 2 +- configure | 18 ++--- 3 files changed, 16 insertions(+), 259 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=001c94a4423d6fa9aef5…

1 0

Tag wine-5.0.5 : Alexandre Julliard : Release 5.0.5
by Alexandre Julliard 16 Apr '21

16 Apr '21

Module: wine Branch: refs/tags/wine-5.0.5 Tag: c209a76b2a422c0b8e9cce12d90e1f29dff4bb99 URL: https://source.winehq.org/git/wine.git/?a=tag;h=c209a76b2a422c0b8e9cce12d90… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 16 16:34:12 2021 +0200 Release 5.0.5

1 0

Piotr Caban : crypt32/tests: Fix tests on systems where google chain root is not trusted.
by Alexandre Julliard 15 Apr '21

15 Apr '21

Module: wine Branch: master Commit: a0dc2adf73b1d9aa967025490e0145b1c798effe URL: https://source.winehq.org/git/wine.git/?a=commit;h=a0dc2adf73b1d9aa96702549… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 15 17:25:06 2021 +0200 crypt32/tests: Fix tests on systems where google chain root is not trusted. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/tests/chain.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index 18f7eca6829..26a1a16dc82 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -5091,7 +5091,8 @@ static void check_base_policy(void) CERT_CHAIN_POLICY_IGNORE_NOT_TIME_VALID_FLAG; CHECK_CHAIN_POLICY_STATUS(CERT_CHAIN_POLICY_BASE, NULL, ignoredBadDateNestingBasePolicyCheck, &oct2007, &policyPara); - policyPara.dwFlags = CERT_CHAIN_POLICY_IGNORE_NOT_TIME_VALID_FLAG; + policyPara.dwFlags = CERT_CHAIN_POLICY_ALLOW_UNKNOWN_CA_FLAG | + CERT_CHAIN_POLICY_IGNORE_NOT_TIME_VALID_FLAG; CHECK_CHAIN_POLICY_STATUS(CERT_CHAIN_POLICY_BASE, NULL, ignoredInvalidDateBasePolicyCheck, &oct2007, &policyPara); policyPara.dwFlags = CERT_CHAIN_POLICY_ALLOW_UNKNOWN_CA_FLAG | @@ -5134,7 +5135,7 @@ static void check_authenticode_policy(void) epochStart.wYear = 1601; CHECK_CHAIN_POLICY_STATUS(CERT_CHAIN_POLICY_AUTHENTICODE, NULL, ignoredUnknownCAPolicyCheck, &epochStart, &policyPara); - policyPara.dwFlags = CERT_CHAIN_POLICY_IGNORE_NOT_TIME_VALID_FLAG; + policyPara.dwFlags |= CERT_CHAIN_POLICY_IGNORE_NOT_TIME_VALID_FLAG; CHECK_CHAIN_POLICY_STATUS(CERT_CHAIN_POLICY_AUTHENTICODE, NULL, ignoredInvalidDateBasePolicyCheck, &oct2007, &policyPara); } @@ -5228,22 +5229,24 @@ static void check_ssl_policy(void) policyPara.dwFlags = CERT_CHAIN_POLICY_ALLOW_UNKNOWN_CA_FLAG; CHECK_CHAIN_POLICY_STATUS(CERT_CHAIN_POLICY_SSL, NULL, ignoredUnknownCAPolicyCheck, &oct2007, &policyPara); - policyPara.dwFlags = 0; /* And again, but checking the Google chain at a bad date */ sslPolicyPara.pwszServerName = google_dot_com; CHECK_CHAIN_POLICY_STATUS(CERT_CHAIN_POLICY_SSL, NULL, googlePolicyCheckWithMatchingNameExpired, &oct2007, &policyPara); + policyPara.dwFlags = 0; /* Again checking the Google chain at a bad date, but ignoring date * errors. */ - sslPolicyPara.fdwChecks = SECURITY_FLAG_IGNORE_CERT_DATE_INVALID; + sslPolicyPara.fdwChecks = SECURITY_FLAG_IGNORE_UNKNOWN_CA | + SECURITY_FLAG_IGNORE_CERT_DATE_INVALID; CHECK_CHAIN_POLICY_STATUS(CERT_CHAIN_POLICY_SSL, NULL, googlePolicyCheckWithMatchingName, &oct2007, &policyPara); - sslPolicyPara.fdwChecks = 0; /* And again, but checking the Google chain at a good date */ + sslPolicyPara.fdwChecks = SECURITY_FLAG_IGNORE_UNKNOWN_CA; sslPolicyPara.pwszServerName = google_dot_com; CHECK_CHAIN_POLICY_STATUS(CERT_CHAIN_POLICY_SSL, NULL, googlePolicyCheckWithMatchingName, &nov2016, &policyPara); + sslPolicyPara.fdwChecks = 0; /* Check again with the openssl cert, which has a wildcard in its name, * with various combinations of matching and non-matching names.

1 0

Piotr Caban : crypt32/tests: Fix tests skipped on all test bot machines.
by Alexandre Julliard 15 Apr '21

15 Apr '21

Module: wine Branch: master Commit: be3f6c87a0bb99649e1d036c82fa6ca3d3559d3a URL: https://source.winehq.org/git/wine.git/?a=commit;h=be3f6c87a0bb99649e1d036c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 15 17:25:10 2021 +0200 crypt32/tests: Fix tests skipped on all test bot machines. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/tests/chain.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index 26a1a16dc82..e8c8843a321 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -4741,17 +4741,17 @@ static const CERT_CHAIN_POLICY_STATUS badDateNestingStatus = static const ChainPolicyCheck ignoredBadDateNestingBasePolicyCheck = { { ARRAY_SIZE(chain2), chain2 }, - { 0, CERT_E_EXPIRED, 0, 1, NULL}, &badDateNestingStatus, TODO_ELEMENTS + { 0, 0, -1, -1, NULL}, NULL, TODO_ERROR }; static const ChainPolicyCheck ignoredInvalidDateBasePolicyCheck = { { ARRAY_SIZE(googleChain), googleChain }, - { 0, CERT_E_EXPIRED, 0, 1, NULL}, &badDateNestingStatus, TODO_ELEMENTS + { 0, 0, -1, -1, NULL}, NULL, TODO_ERROR }; static const ChainPolicyCheck ignoredInvalidUsageBasePolicyCheck = { { ARRAY_SIZE(chain15), chain15 }, - { 0, CERT_E_EXPIRED, 0, 1, NULL}, NULL, TODO_ERROR + { 0, 0, -1, -1, NULL}, NULL, 0 }; static const ChainPolicyCheck invalidUsageBasePolicyCheck = { @@ -4812,13 +4812,9 @@ static const ChainPolicyCheck googlePolicyCheckWithMatchingNameExpired = { { 0, CERT_E_EXPIRED, 0, 0, NULL}, NULL, 0 }; -/* Win98 sees the chain as expired, even though it isn't for the date tested */ -static const CERT_CHAIN_POLICY_STATUS expiredStatus = - { 0, CERT_E_EXPIRED, 0, 0, NULL }; - static const ChainPolicyCheck googlePolicyCheckWithMatchingName = { { ARRAY_SIZE(googleChain), googleChain }, - { 0, 0, -1, -1, NULL}, &expiredStatus, 0 + { 0, 0, -1, -1, NULL}, NULL, 0 }; /* Win98 does not trust the root of the OpenSSL chain or the Stanford chain */

1 0

Piotr Caban : crypt32: Handle CERT_CHAIN_POLICY_IGNORE_NOT_TIME_VALID_FLAG when verifying chain policy.
by Alexandre Julliard 15 Apr '21

15 Apr '21

Module: wine Branch: master Commit: 6ac02c0cacb036059bbd6089e3d96fdc435ba67a URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ac02c0cacb036059bbd6089… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 15 17:25:13 2021 +0200 crypt32: Handle CERT_CHAIN_POLICY_IGNORE_NOT_TIME_VALID_FLAG when verifying chain policy. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/chain.c | 6 ++++-- dlls/crypt32/tests/chain.c | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index c7d387ebc59..63bcfebec38 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -3027,7 +3027,8 @@ static BOOL WINAPI verify_base_policy(LPCSTR szPolicyOID, &pPolicyStatus->lElementIndex); } if (!pPolicyStatus->dwError && - pChainContext->TrustStatus.dwErrorStatus & CERT_TRUST_IS_NOT_TIME_VALID) + pChainContext->TrustStatus.dwErrorStatus & CERT_TRUST_IS_NOT_TIME_VALID && + !(checks & CERT_CHAIN_POLICY_IGNORE_NOT_TIME_VALID_FLAG)) { pPolicyStatus->dwError = CERT_E_EXPIRED; find_element_with_error(pChainContext, @@ -3492,7 +3493,8 @@ static BOOL WINAPI verify_ssl_policy(LPCSTR szPolicyOID, } else if (pChainContext->TrustStatus.dwErrorStatus & CERT_TRUST_IS_NOT_TIME_VALID && - !(checks & SECURITY_FLAG_IGNORE_CERT_DATE_INVALID)) + !(checks & SECURITY_FLAG_IGNORE_CERT_DATE_INVALID) && + !(baseChecks & CERT_CHAIN_POLICY_IGNORE_NOT_TIME_VALID_FLAG)) { pPolicyStatus->dwError = CERT_E_EXPIRED; find_element_with_error(pChainContext, diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index e8c8843a321..68817b98dda 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -4741,12 +4741,12 @@ static const CERT_CHAIN_POLICY_STATUS badDateNestingStatus = static const ChainPolicyCheck ignoredBadDateNestingBasePolicyCheck = { { ARRAY_SIZE(chain2), chain2 }, - { 0, 0, -1, -1, NULL}, NULL, TODO_ERROR + { 0, 0, -1, -1, NULL}, NULL, 0 }; static const ChainPolicyCheck ignoredInvalidDateBasePolicyCheck = { { ARRAY_SIZE(googleChain), googleChain }, - { 0, 0, -1, -1, NULL}, NULL, TODO_ERROR + { 0, 0, -1, -1, NULL}, NULL, 0 }; static const ChainPolicyCheck ignoredInvalidUsageBasePolicyCheck = {

1 0

Henri Verbeet : wined3d: Make some functions static.
by Alexandre Julliard 15 Apr '21

15 Apr '21

Module: wine Branch: master Commit: 39263558a2088940aaacd6eda19ca23d40b63495 URL: https://source.winehq.org/git/wine.git/?a=commit;h=39263558a2088940aaacd6ed… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 15 17:52:35 2021 +0200 wined3d: Make some functions static. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 4 ++-- dlls/wined3d/adapter_vk.c | 4 ++-- dlls/wined3d/directx.c | 6 +++--- dlls/wined3d/glsl_shader.c | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index c3ce959a14f..990991e2e3d 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -4279,13 +4279,13 @@ static void adapter_gl_destroy_device(struct wined3d_device *device) heap_free(device_gl); } -struct wined3d_context *adapter_gl_acquire_context(struct wined3d_device *device, +static struct wined3d_context *adapter_gl_acquire_context(struct wined3d_device *device, struct wined3d_texture *texture, unsigned int sub_resource_idx) { return wined3d_context_gl_acquire(device, texture, sub_resource_idx); } -void adapter_gl_release_context(struct wined3d_context *context) +static void adapter_gl_release_context(struct wined3d_context *context) { return wined3d_context_gl_release(wined3d_context_gl(context)); } diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 7303c994eb4..0abae24fd1f 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -536,7 +536,7 @@ static void adapter_vk_destroy_device(struct wined3d_device *device) heap_free(device_vk); } -struct wined3d_context *adapter_vk_acquire_context(struct wined3d_device *device, +static struct wined3d_context *adapter_vk_acquire_context(struct wined3d_device *device, struct wined3d_texture *texture, unsigned int sub_resource_idx) { TRACE("device %p, texture %p, sub_resource_idx %u.\n", device, texture, sub_resource_idx); @@ -549,7 +549,7 @@ struct wined3d_context *adapter_vk_acquire_context(struct wined3d_device *device return &wined3d_device_vk(device)->context_vk.c; } -void adapter_vk_release_context(struct wined3d_context *context) +static void adapter_vk_release_context(struct wined3d_context *context) { TRACE("context %p.\n", context); } diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 0a3c547e7a9..9883017f932 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2687,7 +2687,7 @@ static void adapter_no3d_destroy_device(struct wined3d_device *device) heap_free(device); } -struct wined3d_context *adapter_no3d_acquire_context(struct wined3d_device *device, +static struct wined3d_context *adapter_no3d_acquire_context(struct wined3d_device *device, struct wined3d_texture *texture, unsigned int sub_resource_idx) { TRACE("device %p, texture %p, sub_resource_idx %u.\n", device, texture, sub_resource_idx); @@ -2700,7 +2700,7 @@ struct wined3d_context *adapter_no3d_acquire_context(struct wined3d_device *devi return &wined3d_device_no3d(device)->context_no3d; } -void adapter_no3d_release_context(struct wined3d_context *context) +static void adapter_no3d_release_context(struct wined3d_context *context) { TRACE("context %p.\n", context); } @@ -3044,7 +3044,7 @@ static void adapter_no3d_dispatch_compute(struct wined3d_device *device, ERR("device %p, state %p, parameters %p.\n", device, state, parameters); } -void adapter_no3d_clear_uav(struct wined3d_context *context, +static void adapter_no3d_clear_uav(struct wined3d_context *context, struct wined3d_unordered_access_view *view, const struct wined3d_uvec4 *clear_value) { ERR("context %p, view %p, clear_value %s.\n", context, view, debug_uvec4(clear_value)); diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 8ca7afb2ec7..45e7ecd4850 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -419,7 +419,7 @@ static void shader_glsl_add_version_declaration(struct wined3d_string_buffer *bu shader_addline(buffer, "#version %u\n", shader_glsl_get_version(gl_info)); } -unsigned int shader_glsl_full_ffp_varyings(const struct wined3d_gl_info *gl_info) +static unsigned int shader_glsl_full_ffp_varyings(const struct wined3d_gl_info *gl_info) { /* On core profile we have to also count diffuse and specular colours and * the fog coordinate. */

1 0

Alexandre Julliard : wine.inf: Fix the Tcpip database path.
by Alexandre Julliard 15 Apr '21

15 Apr '21

Module: wine Branch: master Commit: a7a1e2643afd93de4fc123a9113834da59aed43d URL: https://source.winehq.org/git/wine.git/?a=commit;h=a7a1e2643afd93de4fc123a9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 15 17:28:13 2021 +0200 wine.inf: Fix the Tcpip database path. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50318 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 4d16fe78dac..50156644d5f 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -3922,7 +3922,7 @@ ErrorControl=1 HKLM,%CurrentVersion%\RunServices,"winemenubuilder",2,"%11%\winemenubuilder.exe -a -r" HKLM,"System\CurrentControlSet\Services\Eventlog\Application",,16 HKLM,"System\CurrentControlSet\Services\Eventlog\System","Sources",0x10000,"" -HKLM,"System\CurrentControlSet\Services\Tcpip\Parameters","DataBasePath",2,"%11%\drivers" +HKLM,"System\CurrentControlSet\Services\Tcpip\Parameters","DataBasePath",,"%12%\etc" HKLM,"System\CurrentControlSet\Services\VxD\MSTCP",,16 HKLM,"System\CurrentControlSet\Services\Winsock\Parameters",,16 HKLM,"System\CurrentControlSet\Services\Winsock2\Parameters\Protocol_Catalog9\Catalog_Entries",,16

1 0

Alexandre Julliard : ntdll: Move create_startup_info() to env.c.
by Alexandre Julliard 15 Apr '21

15 Apr '21

Module: wine Branch: master Commit: 8e7c6422e5a196b0e9acfaa4ca05b73468ec5a9f URL: https://source.winehq.org/git/wine.git/?a=commit;h=8e7c6422e5a196b0e9acfaa4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 15 14:44:50 2021 +0200 ntdll: Move create_startup_info() to env.c. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/env.c | 69 ++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/unix/process.c | 68 ----------------------------------------- dlls/ntdll/unix/unix_private.h | 1 + 3 files changed, 70 insertions(+), 68 deletions(-) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index 01d4f3ea418..33f96c65a7c 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -1897,6 +1897,23 @@ static inline WCHAR *get_dos_path( WCHAR *nt_path ) return nt_path; } +static inline const WCHAR *get_params_string( const RTL_USER_PROCESS_PARAMETERS *params, + const UNICODE_STRING *str ) +{ + if (params->Flags & PROCESS_PARAMS_FLAG_NORMALIZED) return str->Buffer; + return (const WCHAR *)((const char *)params + (UINT_PTR)str->Buffer); +} + +static inline DWORD append_string( void **ptr, const RTL_USER_PROCESS_PARAMETERS *params, + const UNICODE_STRING *str ) +{ + const WCHAR *buffer = get_params_string( params, str ); + memcpy( *ptr, buffer, str->Length ); + *ptr = (WCHAR *)*ptr + str->Length / sizeof(WCHAR); + return str->Length; +} + + /************************************************************************* * build_initial_params * @@ -2113,6 +2130,58 @@ void init_startup_info(void) } +/*********************************************************************** + * create_startup_info + */ +void *create_startup_info( const RTL_USER_PROCESS_PARAMETERS *params, DWORD *info_size ) +{ + startup_info_t *info; + DWORD size; + void *ptr; + + size = sizeof(*info); + size += params->CurrentDirectory.DosPath.Length; + size += params->DllPath.Length; + size += params->ImagePathName.Length; + size += params->CommandLine.Length; + size += params->WindowTitle.Length; + size += params->Desktop.Length; + size += params->ShellInfo.Length; + size += params->RuntimeInfo.Length; + size = (size + 1) & ~1; + *info_size = size; + + if (!(info = calloc( size, 1 ))) return NULL; + + info->debug_flags = params->DebugFlags; + info->console_flags = params->ConsoleFlags; + info->console = wine_server_obj_handle( params->ConsoleHandle ); + info->hstdin = wine_server_obj_handle( params->hStdInput ); + info->hstdout = wine_server_obj_handle( params->hStdOutput ); + info->hstderr = wine_server_obj_handle( params->hStdError ); + info->x = params->dwX; + info->y = params->dwY; + info->xsize = params->dwXSize; + info->ysize = params->dwYSize; + info->xchars = params->dwXCountChars; + info->ychars = params->dwYCountChars; + info->attribute = params->dwFillAttribute; + info->flags = params->dwFlags; + info->show = params->wShowWindow; + + ptr = info + 1; + info->curdir_len = append_string( &ptr, params, &params->CurrentDirectory.DosPath ); + info->dllpath_len = append_string( &ptr, params, &params->DllPath ); + info->imagepath_len = append_string( &ptr, params, &params->ImagePathName ); + info->cmdline_len = append_string( &ptr, params, &params->CommandLine ); + info->title_len = append_string( &ptr, params, &params->WindowTitle ); + info->desktop_len = append_string( &ptr, params, &params->Desktop ); + info->shellinfo_len = append_string( &ptr, params, &params->ShellInfo ); + info->runtime_len = append_string( &ptr, params, &params->RuntimeInfo ); + return info; +} + + /************************************************************************** * NtGetNlsSectionPtr (NTDLL.@) */ diff --git a/dlls/ntdll/unix/process.c b/dlls/ntdll/unix/process.c index 8d50f5a006d..bd3bba7ca8f 100644 --- a/dlls/ntdll/unix/process.c +++ b/dlls/ntdll/unix/process.c @@ -156,74 +156,6 @@ static char **build_argv( const UNICODE_STRING *cmdline, int reserved ) } -static inline const WCHAR *get_params_string( const RTL_USER_PROCESS_PARAMETERS *params, - const UNICODE_STRING *str ) -{ - if (params->Flags & PROCESS_PARAMS_FLAG_NORMALIZED) return str->Buffer; - return (const WCHAR *)((const char *)params + (UINT_PTR)str->Buffer); -} - -static inline DWORD append_string( void **ptr, const RTL_USER_PROCESS_PARAMETERS *params, - const UNICODE_STRING *str ) -{ - const WCHAR *buffer = get_params_string( params, str ); - memcpy( *ptr, buffer, str->Length ); - *ptr = (WCHAR *)*ptr + str->Length / sizeof(WCHAR); - return str->Length; -} - -/*********************************************************************** - * create_startup_info - */ -static startup_info_t *create_startup_info( const RTL_USER_PROCESS_PARAMETERS *params, DWORD *info_size ) -{ - startup_info_t *info; - DWORD size; - void *ptr; - - size = sizeof(*info); - size += params->CurrentDirectory.DosPath.Length; - size += params->DllPath.Length; - size += params->ImagePathName.Length; - size += params->CommandLine.Length; - size += params->WindowTitle.Length; - size += params->Desktop.Length; - size += params->ShellInfo.Length; - size += params->RuntimeInfo.Length; - size = (size + 1) & ~1; - *info_size = size; - - if (!(info = calloc( size, 1 ))) return NULL; - - info->debug_flags = params->DebugFlags; - info->console_flags = params->ConsoleFlags; - info->console = wine_server_obj_handle( params->ConsoleHandle ); - info->hstdin = wine_server_obj_handle( params->hStdInput ); - info->hstdout = wine_server_obj_handle( params->hStdOutput ); - info->hstderr = wine_server_obj_handle( params->hStdError ); - info->x = params->dwX; - info->y = params->dwY; - info->xsize = params->dwXSize; - info->ysize = params->dwYSize; - info->xchars = params->dwXCountChars; - info->ychars = params->dwYCountChars; - info->attribute = params->dwFillAttribute; - info->flags = params->dwFlags; - info->show = params->wShowWindow; - - ptr = info + 1; - info->curdir_len = append_string( &ptr, params, &params->CurrentDirectory.DosPath ); - info->dllpath_len = append_string( &ptr, params, &params->DllPath ); - info->imagepath_len = append_string( &ptr, params, &params->ImagePathName ); - info->cmdline_len = append_string( &ptr, params, &params->CommandLine ); - info->title_len = append_string( &ptr, params, &params->WindowTitle ); - info->desktop_len = append_string( &ptr, params, &params->Desktop ); - info->shellinfo_len = append_string( &ptr, params, &params->ShellInfo ); - info->runtime_len = append_string( &ptr, params, &params->RuntimeInfo ); - return info; -} - - /*********************************************************************** * get_so_file_info */ diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 4c50307fc6b..e1732b0017a 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -141,6 +141,7 @@ extern struct ldt_copy __wine_ldt_copy DECLSPEC_HIDDEN; extern void init_environment( int argc, char *argv[], char *envp[] ) DECLSPEC_HIDDEN; extern void init_startup_info(void) DECLSPEC_HIDDEN; +extern void *create_startup_info( const RTL_USER_PROCESS_PARAMETERS *params, DWORD *info_size ) DECLSPEC_HIDDEN; extern DWORD ntdll_umbstowcs( const char *src, DWORD srclen, WCHAR *dst, DWORD dstlen ) DECLSPEC_HIDDEN; extern int ntdll_wcstoumbs( const WCHAR *src, DWORD srclen, char *dst, DWORD dstlen, BOOL strict ) DECLSPEC_HIDDEN; extern char **build_envp( const WCHAR *envW ) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : ntdll: Reimplement file system redirection using NT pathname comparisons.
by Alexandre Julliard 15 Apr '21

15 Apr '21

Module: wine Branch: master Commit: 7ef35b33936682c01f1c825b7d1b07567a691c12 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ef35b33936682c01f1c825b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 15 12:58:22 2021 +0200 ntdll: Reimplement file system redirection using NT pathname comparisons. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/env.c | 11 +- dlls/ntdll/unix/file.c | 362 ++++++++++++++++++++++------------------- dlls/ntdll/unix/loader.c | 19 ++- dlls/ntdll/unix/process.c | 22 ++- dlls/ntdll/unix/unix_private.h | 7 +- 5 files changed, 239 insertions(+), 182 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7ef35b33936682c01f1c…

1 0

Alexandre Julliard : ntdll: Get rid of the rebuild_nt_name() helper.
by Alexandre Julliard 15 Apr '21

15 Apr '21

Module: wine Branch: master Commit: 4e6da5942eef617e576df0f74a3617e1bc1aca27 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e6da5942eef617e576df0f7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 15 15:02:19 2021 +0200 ntdll: Get rid of the rebuild_nt_name() helper. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/file.c | 33 +++++++++------------------------ 1 file changed, 9 insertions(+), 24 deletions(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 5c68218f09d..b4d834b7855 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -2963,29 +2963,6 @@ static NTSTATUS find_drive_rootA( LPCSTR *ppath, unsigned int len, int *drive_re } -/****************************************************************************** - * rebuild_nt_name - */ -static void rebuild_nt_name( const UNICODE_STRING *nameW, DWORD prefix_len, - const char *unix_name, UNICODE_STRING *nt_name ) -{ - WCHAR *buf; - DWORD len; - - while (*unix_name == '/') unix_name++; - nt_name->MaximumLength = (prefix_len + strlen(unix_name) + 2) * sizeof(WCHAR); - if (!(buf = malloc( nt_name->MaximumLength ))) return; - nt_name->Buffer = buf; - memcpy( buf, nameW->Buffer, prefix_len * sizeof(WCHAR) ); - if (prefix_len && buf[prefix_len - 1] != '\\') buf[prefix_len++] = '\\'; - buf += prefix_len; - len = ntdll_umbstowcs( unix_name, strlen(unix_name), buf, strlen(unix_name) ); - for (; len; len--, buf++) if (*buf == '/') *buf = '\\'; - *buf = 0; - nt_name->Length = (buf - nt_name->Buffer) * sizeof(WCHAR); -} - - /****************************************************************************** * find_file_id * @@ -3110,7 +3087,15 @@ done: { TRACE( "%s -> %s\n", wine_dbgstr_longlong(file_id), debugstr_a(unix_name) ); *unix_name_ret = unix_name; - if (nt_name) rebuild_nt_name( attr->ObjectName, 0, unix_name, nt_name ); + + nt_name->MaximumLength = (strlen(unix_name) + 1) * sizeof(WCHAR); + if ((nt_name->Buffer = malloc( nt_name->MaximumLength ))) + { + DWORD i, len = ntdll_umbstowcs( unix_name, strlen(unix_name), nt_name->Buffer, strlen(unix_name) ); + nt_name->Buffer[len] = 0; + nt_name->Length = len * sizeof(WCHAR); + for (i = 0; i < len; i++) if (nt_name->Buffer[i] == '/') nt_name->Buffer[i] = '\\'; + } } else {

1 0