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

Michael Stefaniuc : Release 5.0.5.
by Alexandre Julliard April 16, 2021

April 16, 2021

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

Michael Stefaniuc : Revert "qcap: Avoid unused variable warning if v4l is absent."
by Alexandre Julliard April 16, 2021

April 16, 2021

Module: wine Branch: oldstable Commit: a6557f640a806096c618c84b80400120e6c419df URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6557f640a806096c618c84b… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Mar 30 20:26:19 2021 +0200 Revert "qcap: Avoid unused variable warning if v4l is absent." This reverts commit cb8e15a64307e580123b459e4c5964dc7b0d73d9. Reported by Gerald Pfeifer to break the build when v4l is not available. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/qcap/v4l.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index e548000187f..0d7e176d3da 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -63,9 +63,10 @@ #include "qcap_main.h" #include "capture.h" +WINE_DEFAULT_DEBUG_CHANNEL(qcap); + #ifdef HAVE_LINUX_VIDEODEV2_H -WINE_DEFAULT_DEBUG_CHANNEL(qcap); WINE_DECLARE_DEBUG_CHANNEL(winediag); static typeof(open) *video_open = open;

1 0

Piotr Caban : crypt32: Handle CERT_CHAIN_POLICY_IGNORE_NOT_TIME_VALID_FLAG when verifying chain policy.
by Alexandre Julliard April 15, 2021

April 15, 2021

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

Piotr Caban : crypt32/tests: Fix tests skipped on all test bot machines.
by Alexandre Julliard April 15, 2021

April 15, 2021

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/tests: Fix tests on systems where google chain root is not trusted.
by Alexandre Julliard April 15, 2021

April 15, 2021

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

Henri Verbeet : wined3d: Make some functions static.
by Alexandre Julliard April 15, 2021

April 15, 2021

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

Zebediah Figura : combase/tests: Link directly to combase.
by Alexandre Julliard April 15, 2021

April 15, 2021

Module: wine Branch: master Commit: 141c182e4b34c95161c628a18c75153ab371e901 URL: https://source.winehq.org/git/wine.git/?a=commit;h=141c182e4b34c95161c628a1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 14 22:19:09 2021 -0500 combase/tests: Link directly to combase. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/tests/Makefile.in | 1 + dlls/combase/tests/roapi.c | 59 +----- dlls/combase/tests/string.c | 443 ++++++++++++++++++----------------------- include/roapi.h | 2 + 4 files changed, 208 insertions(+), 297 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=141c182e4b34c95161c6…

1 0

Hans Leidekker : wldap32: Move support for extended functions to the Unix library.
by Alexandre Julliard April 15, 2021

April 15, 2021

Module: wine Branch: master Commit: b0f347b4fccb8437e3aa7f1a4b6ffc3abe9b9cfe URL: https://source.winehq.org/git/wine.git/?a=commit;h=b0f347b4fccb8437e3aa7f1a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Apr 15 12:20:07 2021 +0200 wldap32: Move support for extended functions to the Unix library. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wldap32/extended.c | 175 ++++++++++++++++-------------------------------- dlls/wldap32/libldap.c | 17 +++++ dlls/wldap32/libldap.h | 8 +++ 3 files changed, 84 insertions(+), 116 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b0f347b4fccb8437e3aa…

1 0

Paul Gofman : xmllite: Avoid out of bounds access in readerinput_get_utf8_convlen().
by Alexandre Julliard April 15, 2021

April 15, 2021

Module: wine Branch: master Commit: 82d69d8ba92243242171e6be30c4d18543fe2c0b URL: https://source.winehq.org/git/wine.git/?a=commit;h=82d69d8ba92243242171e6be… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Apr 15 12:50:10 2021 +0300 xmllite: Avoid out of bounds access in readerinput_get_utf8_convlen(). And consequently in readerinput_shrinkraw(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 13d841eb94d..a5a75c29887 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -844,6 +844,8 @@ static HRESULT readerinput_growraw(xmlreaderinput *readerinput) readerinput->pending = hr == E_PENDING; if (FAILED(hr)) return hr; buffer->written += read; + if (!buffer->written) + return MX_E_INPUTEND; return hr; } @@ -929,6 +931,8 @@ static int readerinput_get_utf8_convlen(xmlreaderinput *readerinput) encoded_buffer *buffer = &readerinput->buffer->encoded; int len = buffer->written; + assert(len); + /* complete single byte char */ if (!(buffer->data[len-1] & 0x80)) return len; @@ -966,6 +970,7 @@ static void readerinput_shrinkraw(xmlreaderinput *readerinput, int len) if (len == -1) len = readerinput_get_convlen(readerinput); + assert(len >= 0); memmove(buffer->data, buffer->data + buffer->cur + (buffer->written - len), len); /* everything below cur is lost too */ buffer->written -= len + buffer->cur; @@ -1068,7 +1073,9 @@ static HRESULT reader_more(xmlreader *reader) WCHAR *ptr; /* get some raw data from stream first */ - hr = readerinput_growraw(readerinput); + if (FAILED(hr = readerinput_growraw(readerinput))) + return hr; + len = readerinput_get_convlen(readerinput); prev_len = dest->written / sizeof(WCHAR);

1 0

Alexandre Julliard : ntdll/tests: Add some file system redirection tests.
by Alexandre Julliard April 15, 2021

April 15, 2021

Module: wine Branch: master Commit: a0b77d71513dd0bb007545d517d874654b57e54b URL: https://source.winehq.org/git/wine.git/?a=commit;h=a0b77d71513dd0bb007545d5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 15 12:58:48 2021 +0200 ntdll/tests: Add some file system redirection tests. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/directory.c | 105 ++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 100 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/tests/directory.c b/dlls/ntdll/tests/directory.c index d21a2e64f8e..6a423174664 100644 --- a/dlls/ntdll/tests/directory.c +++ b/dlls/ntdll/tests/directory.c @@ -841,6 +841,40 @@ done: pRtlFreeUnicodeString(&ntdirname); } +static NTSTATUS get_file_id( FILE_INTERNAL_INFORMATION *info, const WCHAR *root, const WCHAR *name ) +{ + OBJECT_ATTRIBUTES attr; + UNICODE_STRING nameW; + IO_STATUS_BLOCK io; + NTSTATUS status; + HANDLE handle; + + InitializeObjectAttributes( &attr, &nameW, OBJ_CASE_INSENSITIVE, 0, NULL ); + if (root) + { + RtlInitUnicodeString( &nameW, root ); + status = pNtOpenFile( &attr.RootDirectory, SYNCHRONIZE | FILE_LIST_DIRECTORY, &attr, &io, + FILE_SHARE_READ, FILE_SYNCHRONOUS_IO_NONALERT | + FILE_OPEN_FOR_BACKUP_INTENT | FILE_DIRECTORY_FILE ); + if (status) return status; + } + if (name) + { + RtlInitUnicodeString( &nameW, name ); + status = pNtOpenFile( &handle, FILE_GENERIC_READ, &attr, &io, FILE_SHARE_READ, + FILE_SYNCHRONOUS_IO_NONALERT | FILE_NON_DIRECTORY_FILE ); + if (attr.RootDirectory) NtClose( attr.RootDirectory ); + } + else handle = attr.RootDirectory; + + if (!status) + { + status = pNtQueryInformationFile( handle, &io, info, sizeof(*info), FileInternalInformation ); + NtClose( handle ); + } + return status; +} + static void test_redirection(void) { ULONG old, cur; @@ -908,6 +942,72 @@ static void test_redirection(void) ok( cur == 1, "RtlWow64EnableFsRedirectionEx got %u\n", cur ); if (tls64) ok( *tls64 == FALSE, "wrong tls %s\n", wine_dbgstr_longlong(*tls64) ); + if (tls64) + { + static const struct + { + const WCHAR *root, *name; + NTSTATUS expect; + BOOL redirected; + NTSTATUS alt; + } tests[] = + { + { NULL, L"\\??\\C:\\windows\\system32\\kernel32.dll", STATUS_SUCCESS, TRUE }, + { NULL, L"\\??\\C:\\\\windows\\system32\\kernel32.dll", STATUS_SUCCESS, FALSE, STATUS_OBJECT_NAME_INVALID }, + { L"\\??\\C:\\", L"windows\\system32\\kernel32.dll", STATUS_SUCCESS, FALSE }, + { L"\\??\\C:\\windows", L"system32\\kernel32.dll", STATUS_SUCCESS, TRUE }, + { L"\\??\\C:\\\\windows", L"system32\\kernel32.dll", STATUS_SUCCESS, TRUE, STATUS_OBJECT_NAME_INVALID }, + { L"\\??\\C:\\windows\\system32", L"kernel32.dll", STATUS_SUCCESS, TRUE }, + { L"\\??\\C:\\windows\\system32", NULL, STATUS_SUCCESS, TRUE }, + { L"\\??\\C:\\windows\\system32", L"drivers\\ndis.sys", STATUS_OBJECT_NAME_NOT_FOUND, FALSE, STATUS_OBJECT_PATH_NOT_FOUND }, + { L"\\??\\C:\\windows\\system32", L"drivers\\etc\\hosts", STATUS_OBJECT_PATH_NOT_FOUND }, + { L"\\??\\C:\\windows\\system32\\drivers", NULL, STATUS_SUCCESS, TRUE, STATUS_OBJECT_NAME_NOT_FOUND }, + { L"\\??\\C:\\windows\\system32\\drivers\\etc", L"hosts", STATUS_SUCCESS, FALSE }, + { NULL, L"\\DosDevices\\C:\\windows\\system32\\kernel32.dll", STATUS_SUCCESS, FALSE }, + { L"\\DosDevices\\C:\\", L"windows\\system32\\kernel32.dll", STATUS_SUCCESS, FALSE }, + { L"\\DosDevices\\C:\\windows", L"system32\\kernel32.dll", STATUS_SUCCESS, TRUE }, + { L"\\DosDevices\\C:\\windows\\system32", L"kernel32.dll", STATUS_SUCCESS, TRUE }, + { L"\\DosDevices\\C:\\windows\\system32", NULL, STATUS_SUCCESS, FALSE }, + { L"\\DosDevices\\C:\\windows\\system32", L"drivers\\ndis.sys", STATUS_OBJECT_NAME_NOT_FOUND, FALSE, STATUS_OBJECT_PATH_NOT_FOUND }, + { L"\\DosDevices\\C:\\windows\\system32", L"drivers\\etc\\hosts", STATUS_SUCCESS, FALSE }, + { L"\\DosDevices\\C:\\windows\\system32\\drivers", NULL, STATUS_SUCCESS, FALSE }, + { L"\\DosDevices\\C:\\windows\\system32\\drivers\\etc", NULL, STATUS_SUCCESS, FALSE }, + { NULL, L"\\??\\C:\\windows\\sysnative\\kernel32.dll", STATUS_SUCCESS, FALSE }, + { L"\\??\\C:\\", L"windows\\sysnative\\kernel32.dll", STATUS_OBJECT_PATH_NOT_FOUND }, + { L"\\??\\C:\\windows", L"sysnative\\kernel32.dll", STATUS_SUCCESS, FALSE }, + { L"\\??\\C:\\windows\\sysnative", L"kernel32.dll" , STATUS_SUCCESS, TRUE }, + { L"\\??\\C:\\windows\\sysnative", NULL, STATUS_SUCCESS, FALSE }, + { NULL, L"\\DosDevices\\C:\\windows\\sysnative\\kernel32.dll", STATUS_OBJECT_PATH_NOT_FOUND }, + { L"\\DosDevices\\C:\\", L"windows\\sysnative\\kernel32.dll", STATUS_OBJECT_PATH_NOT_FOUND }, + { L"\\DosDevices\\C:\\windows", L"sysnative\\kernel32.dll", STATUS_SUCCESS, FALSE }, + { L"\\DosDevices\\C:\\windows\\sysnative", L"kernel32.dll" , STATUS_OBJECT_NAME_NOT_FOUND }, + { L"\\DosDevices\\C:\\windows\\sysnative", NULL, STATUS_OBJECT_NAME_NOT_FOUND }, + }; + FILE_INTERNAL_INFORMATION info, info_redir; + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(tests); i++) + { + pRtlWow64EnableFsRedirection( FALSE ); + status = get_file_id( &info, tests[i].root, tests[i].name ); + ok( !status || status == tests[i].expect || (tests[i].alt && status == tests[i].alt), + "%u: got %x / %x for %s + %s without redirect\n", i, status, tests[i].expect, + debugstr_w( tests[i].root ), debugstr_w( tests[i].name )); + if (status) memset( &info, 0xcc, sizeof(info) ); + pRtlWow64EnableFsRedirection( TRUE ); + status = get_file_id( &info_redir, tests[i].root, tests[i].name ); + ok( status == tests[i].expect || (tests[i].alt && status == tests[i].alt), + "%u: got %x / %x for %s + %s\n", i, status, tests[i].expect, + debugstr_w( tests[i].root ), debugstr_w( tests[i].name )); + if (!status) + { + BOOL redirected = memcmp( &info_redir, &info, sizeof(info) ); + ok( !redirected == !tests[i].redirected, + "%u: was %sredirected for %s + %s\n", i, redirected ? "" : "not ", + debugstr_w( tests[i].root ), debugstr_w( tests[i].name )); + } + } + } pRtlWow64EnableFsRedirectionEx( old, &cur ); } @@ -915,11 +1015,6 @@ START_TEST(directory) { WCHAR sysdir[MAX_PATH]; HMODULE hntdll = GetModuleHandleA("ntdll.dll"); - if (!hntdll) - { - skip("not running on NT, skipping test\n"); - return; - } pNtClose = (void *)GetProcAddress(hntdll, "NtClose"); pNtOpenFile = (void *)GetProcAddress(hntdll, "NtOpenFile");

1 0