October 2019 - Wine-Commits

Alexandre Julliard : kernel32: Move registry environment initialization to ntdll.
by Alexandre Julliard Oct. 22, 2019

Oct. 22, 2019

Module: wine Branch: master Commit: 628ca4aafe2c918744cbbf3079830379f3b936dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=628ca4aafe2c918744cbbf30… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 22 10:05:24 2019 +0200 kernel32: Move registry environment initialization to ntdll. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 34 ++++++++++--- dlls/ntdll/env.c | 124 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 152 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index d03d147d95..1d6f6b4737 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -507,6 +507,31 @@ static void set_registry_variables( HANDLE hkey, ULONG type ) } +/*********************************************************************** + * has_registry_environment + */ +static BOOL has_registry_environment(void) +{ + static const WCHAR env_keyW[] = {'\\','R','e','g','i','s','t','r','y','\\', + 'M','a','c','h','i','n','e','\\', + 'S','y','s','t','e','m','\\', + 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', + 'C','o','n','t','r','o','l','\\', + 'S','e','s','s','i','o','n',' ','M','a','n','a','g','e','r','\\', + 'E','n','v','i','r','o','n','m','e','n','t',0}; + OBJECT_ATTRIBUTES attr; + UNICODE_STRING nameW; + HANDLE hkey; + BOOL ret; + + InitializeObjectAttributes( &attr, &nameW, 0, 0, NULL ); + RtlInitUnicodeString( &nameW, env_keyW ); + ret = !NtOpenKey( &hkey, KEY_READ, &attr ); + if (ret) NtClose( hkey ); + return ret; +} + + /*********************************************************************** * set_registry_environment * @@ -519,7 +544,7 @@ static void set_registry_variables( HANDLE hkey, ULONG type ) * %SystemRoot% which are predefined. But Wine defines these in the * registry, so we need two passes. */ -static BOOL set_registry_environment( BOOL volatile_only ) +static void set_registry_environment( BOOL volatile_only ) { static const WCHAR env_keyW[] = {'\\','R','e','g','i','s','t','r','y','\\', 'M','a','c','h','i','n','e','\\', @@ -534,7 +559,6 @@ static BOOL set_registry_environment( BOOL volatile_only ) OBJECT_ATTRIBUTES attr; UNICODE_STRING nameW; HANDLE hkey; - BOOL ret = FALSE; attr.Length = sizeof(attr); attr.RootDirectory = 0; @@ -550,11 +574,10 @@ static BOOL set_registry_environment( BOOL volatile_only ) set_registry_variables( hkey, REG_SZ ); set_registry_variables( hkey, REG_EXPAND_SZ ); NtClose( hkey ); - ret = TRUE; } /* then the ones for the current user */ - if (RtlOpenCurrentUser( KEY_READ, &attr.RootDirectory ) != STATUS_SUCCESS) return ret; + if (RtlOpenCurrentUser( KEY_READ, &attr.RootDirectory ) != STATUS_SUCCESS) return; RtlInitUnicodeString( &nameW, envW ); if (!volatile_only && NtOpenKey( &hkey, KEY_READ, &attr ) == STATUS_SUCCESS) { @@ -572,7 +595,6 @@ static BOOL set_registry_environment( BOOL volatile_only ) } NtClose( attr.RootDirectory ); - return ret; } @@ -1207,7 +1229,7 @@ void * CDECL __wine_kernel_init(void) /* convert old configuration to new format */ convert_old_config(); - got_environment = set_registry_environment( FALSE ); + got_environment = has_registry_environment(); set_additional_environment(); } diff --git a/dlls/ntdll/env.c b/dlls/ntdll/env.c index 64bd9b15a3..1499879271 100644 --- a/dlls/ntdll/env.c +++ b/dlls/ntdll/env.c @@ -82,6 +82,129 @@ static inline BOOL is_special_env_var( const char *var ) } +/*********************************************************************** + * set_registry_variables + * + * Set environment variables by enumerating the values of a key; + * helper for set_registry_environment(). + * Note that Windows happily truncates the value if it's too big. + */ +static void set_registry_variables( WCHAR **env, HANDLE hkey, ULONG type ) +{ + static const WCHAR pathW[] = {'P','A','T','H'}; + static const WCHAR sep[] = {';',0}; + UNICODE_STRING env_name, env_value; + NTSTATUS status; + DWORD size; + int index; + char buffer[1024*sizeof(WCHAR) + sizeof(KEY_VALUE_FULL_INFORMATION)]; + WCHAR tmpbuf[1024]; + UNICODE_STRING tmp; + KEY_VALUE_FULL_INFORMATION *info = (KEY_VALUE_FULL_INFORMATION *)buffer; + + tmp.Buffer = tmpbuf; + tmp.MaximumLength = sizeof(tmpbuf); + + for (index = 0; ; index++) + { + status = NtEnumerateValueKey( hkey, index, KeyValueFullInformation, + buffer, sizeof(buffer), &size ); + if (status != STATUS_SUCCESS && status != STATUS_BUFFER_OVERFLOW) break; + if (info->Type != type) continue; + env_name.Buffer = info->Name; + env_name.Length = env_name.MaximumLength = info->NameLength; + env_value.Buffer = (WCHAR *)(buffer + info->DataOffset); + env_value.Length = info->DataLength; + env_value.MaximumLength = sizeof(buffer) - info->DataOffset; + if (env_value.Length && !env_value.Buffer[env_value.Length/sizeof(WCHAR)-1]) + env_value.Length -= sizeof(WCHAR); /* don't count terminating null if any */ + if (!env_value.Length) continue; + if (info->Type == REG_EXPAND_SZ) + { + status = RtlExpandEnvironmentStrings_U( *env, &env_value, &tmp, NULL ); + if (status != STATUS_SUCCESS && status != STATUS_BUFFER_OVERFLOW) continue; + RtlCopyUnicodeString( &env_value, &tmp ); + } + /* PATH is magic */ + if (env_name.Length == sizeof(pathW) && + !strncmpiW( env_name.Buffer, pathW, ARRAY_SIZE( pathW )) && + !RtlQueryEnvironmentVariable_U( *env, &env_name, &tmp )) + { + RtlAppendUnicodeToString( &tmp, sep ); + if (RtlAppendUnicodeStringToString( &tmp, &env_value )) continue; + RtlCopyUnicodeString( &env_value, &tmp ); + } + RtlSetEnvironmentVariable( env, &env_name, &env_value ); + } +} + + +/*********************************************************************** + * set_registry_environment + * + * Set the environment variables specified in the registry. + * + * Note: Windows handles REG_SZ and REG_EXPAND_SZ in one pass with the + * consequence that REG_EXPAND_SZ cannot be used reliably as it depends + * on the order in which the variables are processed. But on Windows it + * does not really matter since they only use %SystemDrive% and + * %SystemRoot% which are predefined. But Wine defines these in the + * registry, so we need two passes. + */ +static void set_registry_environment( WCHAR **env ) +{ + static const WCHAR env_keyW[] = {'\\','R','e','g','i','s','t','r','y','\\', + 'M','a','c','h','i','n','e','\\', + 'S','y','s','t','e','m','\\', + 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', + 'C','o','n','t','r','o','l','\\', + 'S','e','s','s','i','o','n',' ','M','a','n','a','g','e','r','\\', + 'E','n','v','i','r','o','n','m','e','n','t',0}; + static const WCHAR envW[] = {'E','n','v','i','r','o','n','m','e','n','t',0}; + static const WCHAR volatile_envW[] = {'V','o','l','a','t','i','l','e',' ','E','n','v','i','r','o','n','m','e','n','t',0}; + + OBJECT_ATTRIBUTES attr; + UNICODE_STRING nameW; + HANDLE hkey; + + attr.Length = sizeof(attr); + attr.RootDirectory = 0; + attr.ObjectName = &nameW; + attr.Attributes = 0; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + + /* first the system environment variables */ + RtlInitUnicodeString( &nameW, env_keyW ); + if (!NtOpenKey( &hkey, KEY_READ, &attr )) + { + set_registry_variables( env, hkey, REG_SZ ); + set_registry_variables( env, hkey, REG_EXPAND_SZ ); + NtClose( hkey ); + } + + /* then the ones for the current user */ + if (RtlOpenCurrentUser( KEY_READ, &attr.RootDirectory ) != STATUS_SUCCESS) return; + RtlInitUnicodeString( &nameW, envW ); + if (!NtOpenKey( &hkey, KEY_READ, &attr )) + { + set_registry_variables( env, hkey, REG_SZ ); + set_registry_variables( env, hkey, REG_EXPAND_SZ ); + NtClose( hkey ); + } + + RtlInitUnicodeString( &nameW, volatile_envW ); + if (!NtOpenKey( &hkey, KEY_READ, &attr )) + { + set_registry_variables( env, hkey, REG_SZ ); + set_registry_variables( env, hkey, REG_EXPAND_SZ ); + NtClose( hkey ); + } + + NtClose( attr.RootDirectory ); +} + + /*********************************************************************** * build_initial_environment * @@ -122,6 +245,7 @@ static WCHAR *build_initial_environment( char **env ) p += strlenW(p) + 1; } *p = 0; + set_registry_environment( &ptr ); return ptr; }

1 0

Philip Rebohle : vkd3d-shader: Don't shift output array component write mask.
by Alexandre Julliard Oct. 22, 2019

Oct. 22, 2019

Module: vkd3d Branch: master Commit: 907d733ffe18635e17338a89edbc3b4947188de6 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=907d733ffe18635e17338a8… Author: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> Date: Wed Oct 16 21:55:35 2019 +0200 vkd3d-shader: Don't shift output array component write mask. Fixes an assertion when compiling shaders with more than four clip or cull distances. Output arrays are arrays of scalars, so shifting the write mask is not very meaningful. Signed-off-by: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 75a3a4f..4b93e01 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -4536,7 +4536,7 @@ static void vkd3d_dxbc_compiler_emit_store_shader_output(struct vkd3d_dxbc_compi ptr_type_id, output_id, vkd3d_dxbc_compiler_get_constant_uint(compiler, index)); object_id = vkd3d_dxbc_compiler_emit_swizzle(compiler, val_id, write_mask, output_info->component_type, VKD3D_NO_SWIZZLE, VKD3DSP_WRITEMASK_0 << i); - vkd3d_dxbc_compiler_emit_store(compiler, chain_id, VKD3DSP_WRITEMASK_0 << index, + vkd3d_dxbc_compiler_emit_store(compiler, chain_id, VKD3DSP_WRITEMASK_0, output_info->component_type, SpvStorageClassOutput, VKD3DSP_WRITEMASK_0 << i, object_id); ++index; }

1 0

Hans-Kristian Arntzen : vkd3d: Bump RootSignature version to 1.1.
by Alexandre Julliard Oct. 22, 2019

Oct. 22, 2019

Module: vkd3d Branch: master Commit: c002aee119b638d30eeb7cdc91099449ccafeafc URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=c002aee119b638d30eeb7cd… Author: Hans-Kristian Arntzen <post(a)arntzen-software.no> Date: Wed Oct 16 13:05:42 2019 +0200 vkd3d: Bump RootSignature version to 1.1. There appears to be a complete implementation of RS 1.1 already, so enable this feature. Signed-off-by: Hans-Kristian Arntzen <post(a)arntzen-software.no> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/device.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 3da4273..d30c447 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -2512,8 +2512,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device * return E_INVALIDARG; } - FIXME("Root signature version 1_1 not supported yet.\n"); - data->HighestVersion = D3D_ROOT_SIGNATURE_VERSION_1_0; + data->HighestVersion = D3D_ROOT_SIGNATURE_VERSION_1_1; TRACE("Root signature version %#x.\n", data->HighestVersion); return S_OK;

1 0

Francois Gouget : testbot/web: Use double quotes for the content-disposition filename.
by Alexandre Julliard Oct. 22, 2019

Oct. 22, 2019

Module: tools Branch: master Commit: 0b94f8cc624e46e0696232ea1cee0c07edc9aac9 URL: https://source.winehq.org/git/tools.git/?a=commit;h=0b94f8cc624e46e0696232e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Oct 22 11:14:23 2019 +0200 testbot/web: Use double quotes for the content-disposition filename. It does not support single quotes which end up being included in the suggested filename. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/GetTaskFile.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/web/GetTaskFile.pl b/testbot/web/GetTaskFile.pl index 83e723e..35f2433 100644 --- a/testbot/web/GetTaskFile.pl +++ b/testbot/web/GetTaskFile.pl @@ -49,7 +49,7 @@ sub SendTaskFile($$$$$) $Request->content_type("text/plain"); $Request->headers_out->add("Content-length", $FileSize); $Request->headers_out->add("Content-Disposition", - "attachment; filename='$File'"); + "attachment; filename=\"$File\""); $BlkSize ||= 16384; print $_ while (sysread($fh, $_, $BlkSize));

1 0

Francois Gouget : testbot/web: Include the task key in GetTaskFile's suggested filename.
by Alexandre Julliard Oct. 22, 2019

Oct. 22, 2019

Module: tools Branch: master Commit: 636d727f509c88d8caa722021ee0734cae53c8d3 URL: https://source.winehq.org/git/tools.git/?a=commit;h=636d727f509c88d8caa7220… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Oct 22 11:14:26 2019 +0200 testbot/web: Include the task key in GetTaskFile's suggested filename. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/GetTaskFile.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/web/GetTaskFile.pl b/testbot/web/GetTaskFile.pl index 35f2433..6353219 100644 --- a/testbot/web/GetTaskFile.pl +++ b/testbot/web/GetTaskFile.pl @@ -49,7 +49,7 @@ sub SendTaskFile($$$$$) $Request->content_type("text/plain"); $Request->headers_out->add("Content-length", $FileSize); $Request->headers_out->add("Content-Disposition", - "attachment; filename=\"$File\""); + "attachment; filename=\"job${JobId}_${StepNo}_${TaskNo}_$File\""); $BlkSize ||= 16384; print $_ while (sysread($fh, $_, $BlkSize));

1 0

Francois Gouget : testbot: Allow hyphens in test filenames.
by Alexandre Julliard Oct. 22, 2019

Oct. 22, 2019

Module: tools Branch: master Commit: 6ad03750bac7cc8baba51d134be96e83e48729b1 URL: https://source.winehq.org/git/tools.git/?a=commit;h=6ad03750bac7cc8baba51d1… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Oct 22 11:13:49 2019 +0200 testbot: Allow hyphens in test filenames. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LogUtils.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 1946482..a6a10a5 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -341,7 +341,7 @@ sub ParseWineTestReport($$$) foreach my $Line (<$LogFile>) { $Cur->{UnitSize} += length($Line); - if ($Line =~ m%^([_.a-z0-9-]+):([_a-z0-9]*) (start|skipped) (?:-|[/_.a-z0-9]+) (?:-|[.0-9a-f]+)\r?$%) + if ($Line =~ m%^([_.a-z0-9-]+):([_a-z0-9]*) (start|skipped) (?:-|[/_.a-z0-9-]+) (?:-|[.0-9a-f]+)\r?$%) { my ($Dll, $Unit, $Type) = ($1, $2, $3);

1 0

Sven Baars : msvcp140: Add an _Equivalent implementation that allows for directories.
by Alexandre Julliard Oct. 21, 2019

Oct. 21, 2019

Module: wine Branch: master Commit: aeeb299f9840c15044d4a6810ed9c975952c789f URL: https://source.winehq.org/git/wine.git/?a=commit;h=aeeb299f9840c15044d4a681… Author: Sven Baars <sven.wine(a)gmail.com> Date: Mon Oct 21 20:01:54 2019 +0200 msvcp140: Add an _Equivalent implementation that allows for directories. Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp140/msvcp140.spec | 2 +- dlls/msvcp140/tests/msvcp140.c | 6 +++++- dlls/msvcp90/ios.c | 18 ++++++++++++++++++ 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index a5b2bd40b2..70caad8dba 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -3638,7 +3638,7 @@ @ cdecl _Current_set(wstr) tr2_sys__Current_set_wchar @ extern _Denorm _Denorm @ cdecl _Dtest(ptr) _Dtest -@ cdecl _Equivalent(wstr wstr) tr2_sys__Equivalent_wchar +@ cdecl _Equivalent(wstr wstr) _Equivalent @ cdecl _Exp(ptr double long) _Exp @ stub _FCosh @ extern _FDenorm _FDenorm diff --git a/dlls/msvcp140/tests/msvcp140.c b/dlls/msvcp140/tests/msvcp140.c index 04406240e0..8ad172495d 100644 --- a/dlls/msvcp140/tests/msvcp140.c +++ b/dlls/msvcp140/tests/msvcp140.c @@ -1400,7 +1400,6 @@ static void test_Equivalent(void) { f1W, NULL, 0 }, { f1W, wine_test_dirW, 0 }, { wine_test_dirW, f1W, 0 }, - { wine_test_dirW, wine_test_dirW, -1 }, { f1W_subdir, f2W, 0 }, { f1W, f1W, 1 }, { not_existW, f1W, 0 }, @@ -1429,6 +1428,11 @@ static void test_Equivalent(void) ok(errno == 0xdeadbeef, "errno = %d\n", errno); } + errno = 0xdeadbeef; + val = p_Equivalent(wine_test_dirW, wine_test_dirW); + ok(val == 1 || broken(val == -1), "_Equivalent() returned %d, expected %d\n", val, 1); + ok(errno == 0xdeadbeef, "errno = %d\n", errno); + ok(DeleteFileW(f1W), "expect wine_test_dir/f1 to exist\n"); ok(DeleteFileW(f2W), "expect wine_test_dir/f2 to exist\n"); ok(p_Remove_dir(wine_test_dirW), "expect wine_test_dir to exist\n"); diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 8f0e5cfd7b..a632659f9a 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -15632,6 +15632,24 @@ int __cdecl tr2_sys__Equivalent_wchar(WCHAR const* path1, WCHAR const* path2) return ret; } +/* _Equivalent, msvcp140 version */ +int __cdecl _Equivalent(WCHAR const* path1, WCHAR const* path2) +{ + HANDLE h1, h2; + int ret; + + TRACE("(%s %s)\n", debugstr_w(path1), debugstr_w(path2)); + + h1 = CreateFileW(path1, 0, FILE_SHARE_DELETE | FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0); + h2 = CreateFileW(path2, 0, FILE_SHARE_DELETE | FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0); + ret = equivalent_handles(h1, h2); + CloseHandle(h1); + CloseHandle(h2); + return ret; +} + /* ?_Current_get(a)sys@tr2(a)std@@YAPA_WAAY0BAE(a)_W@Z */ /* ?_Current_get(a)sys@tr2(a)std@@YAPEA_WAEAY0BAE(a)_W@Z */ WCHAR* __cdecl tr2_sys__Current_get_wchar(WCHAR *current_path)

1 0

Vincent Povirk : windowscodecs: Implement IWICStream_Commit.
by Alexandre Julliard Oct. 21, 2019

Oct. 21, 2019

Module: wine Branch: master Commit: 98c2c9a9c98d174851fa7a87db79599dd7d8af89 URL: https://source.winehq.org/git/wine.git/?a=commit;h=98c2c9a9c98d174851fa7a87… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Oct 21 13:43:50 2019 -0500 windowscodecs: Implement IWICStream_Commit. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/stream.c | 10 +++++----- dlls/windowscodecs/tests/stream.c | 30 +++++++++++++++--------------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/windowscodecs/stream.c b/dlls/windowscodecs/stream.c index 366d11b111..68b9148bd5 100644 --- a/dlls/windowscodecs/stream.c +++ b/dlls/windowscodecs/stream.c @@ -189,12 +189,11 @@ static HRESULT WINAPI StreamOnMemory_CopyTo(IStream *iface, return E_NOTIMPL; } -/* Commit isn't implemented in the native windowscodecs DLL either */ static HRESULT WINAPI StreamOnMemory_Commit(IStream *iface, DWORD grfCommitFlags) { TRACE("(%p, %#x)\n", iface, grfCommitFlags); - return E_NOTIMPL; + return S_OK; } /* Revert isn't implemented in the native windowscodecs DLL either */ @@ -375,7 +374,7 @@ static HRESULT WINAPI StreamOnFileHandle_Commit(IStream *iface, DWORD grfCommitFlags) { TRACE("(%p, %#x)\n", iface, grfCommitFlags); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI StreamOnFileHandle_Revert(IStream *iface) @@ -655,8 +654,9 @@ static HRESULT WINAPI StreamOnStreamRange_CopyTo(IStream *iface, static HRESULT WINAPI StreamOnStreamRange_Commit(IStream *iface, DWORD grfCommitFlags) { - TRACE("(%p, %#x)\n", iface, grfCommitFlags); - return E_NOTIMPL; + StreamOnStreamRange *This = StreamOnStreamRange_from_IStream(iface); + TRACE("(%p, %#x)\n", This, grfCommitFlags); + return IStream_Commit(This->stream, grfCommitFlags); } /* Revert isn't implemented in the native windowscodecs DLL either */ diff --git a/dlls/windowscodecs/tests/stream.c b/dlls/windowscodecs/tests/stream.c index ef0d630c8e..d3f712c38b 100644 --- a/dlls/windowscodecs/tests/stream.c +++ b/dlls/windowscodecs/tests/stream.c @@ -326,19 +326,19 @@ static void test_StreamOnMemory(void) /* Commit */ hr = IWICStream_Commit(pStream, STGC_DEFAULT); - todo_wine ok(broken(hr == E_NOTIMPL) || hr == S_OK, "Commit returned %#x\n", hr); + ok(broken(hr == E_NOTIMPL) || hr == S_OK, "Commit returned %#x\n", hr); hr = IWICStream_Commit(pStream, STGC_OVERWRITE); - todo_wine ok(broken(hr == E_NOTIMPL) || hr == S_OK, "Commit returned %#x\n", hr); + ok(broken(hr == E_NOTIMPL) || hr == S_OK, "Commit returned %#x\n", hr); hr = IWICStream_Commit(pStream, STGC_ONLYIFCURRENT); - todo_wine ok(broken(hr == E_NOTIMPL) || hr == S_OK, "Commit returned %#x\n", hr); + ok(broken(hr == E_NOTIMPL) || hr == S_OK, "Commit returned %#x\n", hr); hr = IWICStream_Commit(pStream, STGC_DANGEROUSLYCOMMITMERELYTODISKCACHE); - todo_wine ok(broken(hr == E_NOTIMPL) || hr == S_OK, "Commit returned %#x\n", hr); + ok(broken(hr == E_NOTIMPL) || hr == S_OK, "Commit returned %#x\n", hr); hr = IWICStream_Commit(pStream, STGC_CONSOLIDATE); - todo_wine ok(broken(hr == E_NOTIMPL) || hr == S_OK, "Commit returned %#x\n", hr); + ok(broken(hr == E_NOTIMPL) || hr == S_OK, "Commit returned %#x\n", hr); /* Revert */ @@ -643,19 +643,19 @@ static void test_StreamOnStreamRange(void) /* Commit */ hr = IWICStream_Commit(pSubStream, STGC_DEFAULT); - todo_wine ok(broken(hr == E_NOTIMPL) || hr == S_OK, "Commit returned %#x\n", hr); + ok(broken(hr == E_NOTIMPL) || hr == S_OK, "Commit returned %#x\n", hr); hr = IWICStream_Commit(pSubStream, STGC_OVERWRITE); - todo_wine ok(broken(hr == E_NOTIMPL) || hr == S_OK, "Commit returned %#x\n", hr); + ok(broken(hr == E_NOTIMPL) || hr == S_OK, "Commit returned %#x\n", hr); hr = IWICStream_Commit(pSubStream, STGC_ONLYIFCURRENT); - todo_wine ok(broken(hr == E_NOTIMPL) || hr == S_OK, "Commit returned %#x\n", hr); + ok(broken(hr == E_NOTIMPL) || hr == S_OK, "Commit returned %#x\n", hr); hr = IWICStream_Commit(pSubStream, STGC_DANGEROUSLYCOMMITMERELYTODISKCACHE); - todo_wine ok(broken(hr == E_NOTIMPL) || hr == S_OK, "Commit returned %#x\n", hr); + ok(broken(hr == E_NOTIMPL) || hr == S_OK, "Commit returned %#x\n", hr); hr = IWICStream_Commit(pSubStream, STGC_CONSOLIDATE); - todo_wine ok(broken(hr == E_NOTIMPL) || hr == S_OK, "Commit returned %#x\n", hr); + ok(broken(hr == E_NOTIMPL) || hr == S_OK, "Commit returned %#x\n", hr); /* Revert */ @@ -953,19 +953,19 @@ static void test_StreamOnIStream(void) /* Commit */ hr = IWICStream_Commit(substream, STGC_DEFAULT); - todo_wine ok(broken(hr == E_NOTIMPL) || hr == S_OK, "Commit returned %#x\n", hr); + ok(broken(hr == E_NOTIMPL) || hr == S_OK, "Commit returned %#x\n", hr); hr = IWICStream_Commit(substream, STGC_OVERWRITE); - todo_wine ok(broken(hr == E_NOTIMPL) || hr == S_OK, "Commit returned %#x\n", hr); + ok(broken(hr == E_NOTIMPL) || hr == S_OK, "Commit returned %#x\n", hr); hr = IWICStream_Commit(substream, STGC_ONLYIFCURRENT); - todo_wine ok(broken(hr == E_NOTIMPL) || hr == S_OK, "Commit returned %#x\n", hr); + ok(broken(hr == E_NOTIMPL) || hr == S_OK, "Commit returned %#x\n", hr); hr = IWICStream_Commit(substream, STGC_DANGEROUSLYCOMMITMERELYTODISKCACHE); - todo_wine ok(broken(hr == E_NOTIMPL) || hr == S_OK, "Commit returned %#x\n", hr); + ok(broken(hr == E_NOTIMPL) || hr == S_OK, "Commit returned %#x\n", hr); hr = IWICStream_Commit(substream, STGC_CONSOLIDATE); - todo_wine ok(broken(hr == E_NOTIMPL) || hr == S_OK, "Commit returned %#x\n", hr); + ok(broken(hr == E_NOTIMPL) || hr == S_OK, "Commit returned %#x\n", hr); /* Revert */ IWICStream_Write(substream, buff + 5, 6, NULL);

1 0

Brendan Shanks : kernel32/tests: Test loading system DLLs with WoW64 redirection disabled.
by Alexandre Julliard Oct. 21, 2019

Oct. 21, 2019

Module: wine Branch: master Commit: de9406bccd100b9c09afb3cd84173f956e0aa52d URL: https://source.winehq.org/git/wine.git/?a=commit;h=de9406bccd100b9c09afb3cd… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Thu Oct 17 13:23:50 2019 -0700 kernel32/tests: Test loading system DLLs with WoW64 redirection disabled. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47912 Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/loader.c | 49 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 65184887b8..e5b8c3b28e 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -84,6 +84,8 @@ static BOOL (WINAPI *pFlsSetValue)(DWORD, PVOID); static PVOID (WINAPI *pFlsGetValue)(DWORD); static BOOL (WINAPI *pFlsFree)(DWORD); static BOOL (WINAPI *pIsWow64Process)(HANDLE,PBOOL); +static BOOL (WINAPI *pWow64DisableWow64FsRedirection)(void **); +static BOOL (WINAPI *pWow64RevertWow64FsRedirection)(void *); static PVOID RVAToAddr(DWORD_PTR rva, HMODULE module) { @@ -3812,6 +3814,50 @@ static void test_InMemoryOrderModuleList(void) ok(entry2 == mark2, "expected entry2 == mark2, got %p and %p\n", entry2, mark2); } +static void test_wow64_redirection_for_dll(const char *libname) +{ + HMODULE lib; + char buf[256]; + + if (!GetModuleHandleA(libname)) + { + lib = LoadLibraryExA(libname, NULL, 0); + todo_wine ok (broken(lib == NULL) /* Vista/2008 */ || + lib != NULL, "Loading %s should succeed with WOW64 redirection disabled\n", libname); + if (lib) + { + /* Win 7/2008R2 return the un-redirected path (i.e. c:\windows\system32\dwrite.dll), test loading it. */ + GetModuleFileNameA(lib, buf, sizeof(buf)); + FreeLibrary(lib); + lib = LoadLibraryExA(buf, NULL, 0); + ok(lib != NULL, "Loading %s from full path should succeed with WOW64 redirection disabled\n", libname); + if (lib) + FreeLibrary(lib); + } + } + else + { + skip("%s was already loaded in the process\n", libname); + } +} + +static void test_wow64_redirection(void) +{ + void *OldValue; + + if (!is_wow64) + return; + + /* Disable FS redirection, then test loading system libraries (pick ones that shouldn't + * already be loaded in this process). + */ + ok(pWow64DisableWow64FsRedirection(&OldValue), "Disabling FS redirection failed\n"); + test_wow64_redirection_for_dll("wlanapi.dll"); + test_wow64_redirection_for_dll("dxgi.dll"); + test_wow64_redirection_for_dll("dwrite.dll"); + ok(pWow64RevertWow64FsRedirection(OldValue), "Re-enabling FS redirection failed\n"); +} + static void test_dll_file( const char *name ) { HMODULE module = GetModuleHandleA( name ); @@ -3897,6 +3943,8 @@ START_TEST(loader) pFlsGetValue = (void *)GetProcAddress(kernel32, "FlsGetValue"); pFlsFree = (void *)GetProcAddress(kernel32, "FlsFree"); pIsWow64Process = (void *)GetProcAddress(kernel32, "IsWow64Process"); + pWow64DisableWow64FsRedirection = (void *)GetProcAddress(kernel32, "Wow64DisableWow64FsRedirection"); + pWow64RevertWow64FsRedirection = (void *)GetProcAddress(kernel32, "Wow64RevertWow64FsRedirection"); pResolveDelayLoadedAPI = (void *)GetProcAddress(kernel32, "ResolveDelayLoadedAPI"); if (pIsWow64Process) pIsWow64Process( GetCurrentProcess(), &is_wow64 ); @@ -3930,6 +3978,7 @@ START_TEST(loader) test_import_resolution(); test_ExitProcess(); test_InMemoryOrderModuleList(); + test_wow64_redirection(); test_dll_file( "ntdll.dll" ); test_dll_file( "kernel32.dll" ); test_dll_file( "advapi32.dll" );

1 0

Vincent Povirk : windowscodecs/tests: Expect success from IWICStream_Commit.
by Alexandre Julliard Oct. 21, 2019

Oct. 21, 2019

Module: wine Branch: master Commit: f704c36568fff2b925960034522c208353031986 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f704c36568fff2b925960034… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Oct 21 13:43:49 2019 -0500 windowscodecs/tests: Expect success from IWICStream_Commit. Windows 10 implemented this. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tests/stream.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/windowscodecs/tests/stream.c b/dlls/windowscodecs/tests/stream.c index 048f1326be..ef0d630c8e 100644 --- a/dlls/windowscodecs/tests/stream.c +++ b/dlls/windowscodecs/tests/stream.c @@ -326,19 +326,19 @@ static void test_StreamOnMemory(void) /* Commit */ hr = IWICStream_Commit(pStream, STGC_DEFAULT); - ok(hr == E_NOTIMPL, "Commit returned %#x, expected %#x\n", hr, E_NOTIMPL); + todo_wine ok(broken(hr == E_NOTIMPL) || hr == S_OK, "Commit returned %#x\n", hr); hr = IWICStream_Commit(pStream, STGC_OVERWRITE); - ok(hr == E_NOTIMPL, "Commit returned %#x, expected %#x\n", hr, E_NOTIMPL); + todo_wine ok(broken(hr == E_NOTIMPL) || hr == S_OK, "Commit returned %#x\n", hr); hr = IWICStream_Commit(pStream, STGC_ONLYIFCURRENT); - ok(hr == E_NOTIMPL, "Commit returned %#x, expected %#x\n", hr, E_NOTIMPL); + todo_wine ok(broken(hr == E_NOTIMPL) || hr == S_OK, "Commit returned %#x\n", hr); hr = IWICStream_Commit(pStream, STGC_DANGEROUSLYCOMMITMERELYTODISKCACHE); - ok(hr == E_NOTIMPL, "Commit returned %#x, expected %#x\n", hr, E_NOTIMPL); + todo_wine ok(broken(hr == E_NOTIMPL) || hr == S_OK, "Commit returned %#x\n", hr); hr = IWICStream_Commit(pStream, STGC_CONSOLIDATE); - ok(hr == E_NOTIMPL, "Commit returned %#x, expected %#x\n", hr, E_NOTIMPL); + todo_wine ok(broken(hr == E_NOTIMPL) || hr == S_OK, "Commit returned %#x\n", hr); /* Revert */ @@ -643,19 +643,19 @@ static void test_StreamOnStreamRange(void) /* Commit */ hr = IWICStream_Commit(pSubStream, STGC_DEFAULT); - ok(hr == E_NOTIMPL, "Commit returned %#x, expected %#x\n", hr, E_NOTIMPL); + todo_wine ok(broken(hr == E_NOTIMPL) || hr == S_OK, "Commit returned %#x\n", hr); hr = IWICStream_Commit(pSubStream, STGC_OVERWRITE); - ok(hr == E_NOTIMPL, "Commit returned %#x, expected %#x\n", hr, E_NOTIMPL); + todo_wine ok(broken(hr == E_NOTIMPL) || hr == S_OK, "Commit returned %#x\n", hr); hr = IWICStream_Commit(pSubStream, STGC_ONLYIFCURRENT); - ok(hr == E_NOTIMPL, "Commit returned %#x, expected %#x\n", hr, E_NOTIMPL); + todo_wine ok(broken(hr == E_NOTIMPL) || hr == S_OK, "Commit returned %#x\n", hr); hr = IWICStream_Commit(pSubStream, STGC_DANGEROUSLYCOMMITMERELYTODISKCACHE); - ok(hr == E_NOTIMPL, "Commit returned %#x, expected %#x\n", hr, E_NOTIMPL); + todo_wine ok(broken(hr == E_NOTIMPL) || hr == S_OK, "Commit returned %#x\n", hr); hr = IWICStream_Commit(pSubStream, STGC_CONSOLIDATE); - ok(hr == E_NOTIMPL, "Commit returned %#x, expected %#x\n", hr, E_NOTIMPL); + todo_wine ok(broken(hr == E_NOTIMPL) || hr == S_OK, "Commit returned %#x\n", hr); /* Revert */ @@ -953,19 +953,19 @@ static void test_StreamOnIStream(void) /* Commit */ hr = IWICStream_Commit(substream, STGC_DEFAULT); - ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); + todo_wine ok(broken(hr == E_NOTIMPL) || hr == S_OK, "Commit returned %#x\n", hr); hr = IWICStream_Commit(substream, STGC_OVERWRITE); - ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); + todo_wine ok(broken(hr == E_NOTIMPL) || hr == S_OK, "Commit returned %#x\n", hr); hr = IWICStream_Commit(substream, STGC_ONLYIFCURRENT); - ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); + todo_wine ok(broken(hr == E_NOTIMPL) || hr == S_OK, "Commit returned %#x\n", hr); hr = IWICStream_Commit(substream, STGC_DANGEROUSLYCOMMITMERELYTODISKCACHE); - ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); + todo_wine ok(broken(hr == E_NOTIMPL) || hr == S_OK, "Commit returned %#x\n", hr); hr = IWICStream_Commit(substream, STGC_CONSOLIDATE); - ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); + todo_wine ok(broken(hr == E_NOTIMPL) || hr == S_OK, "Commit returned %#x\n", hr); /* Revert */ IWICStream_Write(substream, buff + 5, 6, NULL);

1 0