September 2020 - Wine-Commits

Paul Gofman : wmc: Add Dxgi facility.
by Alexandre Julliard Sept. 21, 2020

Sept. 21, 2020

Module: wine Branch: master Commit: b936df428dc3f30f03c854abac8860888a983d67 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b936df428dc3f30f03c854ab… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Sep 21 14:20:02 2020 +0300 wmc: Add Dxgi facility. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/wmc/mcl.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/wmc/mcl.c b/tools/wmc/mcl.c index 579d4b8788..93e666fed7 100644 --- a/tools/wmc/mcl.c +++ b/tools/wmc/mcl.c @@ -85,6 +85,7 @@ static const WCHAR ustr_language[] = { 'L', 'a', 'n', 'g', 'u', 'a', 'g', 'e', 0 static const WCHAR ustr_languagenames[] = { 'L', 'a', 'n', 'g', 'u', 'a', 'g', 'e', 'N', 'a', 'm', 'e', 's', 0}; static const WCHAR ustr_messageid[] = { 'M', 'e', 's', 's', 'a', 'g', 'e', 'I', 'd', 0 }; static const WCHAR ustr_messageidtypedef[] = { 'M', 'e', 's', 's', 'a', 'g', 'e', 'I', 'd', 'T', 'y', 'p', 'e', 'd', 'e', 'f', 0 }; +static const WCHAR ustr_dxgi[] = { 'D', 'x', 'g', 'i', 0 }; static const WCHAR ustr_null[] = { 'N', 'u', 'l', 'l', 0 }; static const WCHAR ustr_outputbase[] = { 'O', 'u', 't', 'p', 'u', 't', 'B', 'a', 's', 'e', 0 }; static const WCHAR ustr_severity[] = { 'S', 'e', 'v', 'e', 'r', 'i', 't', 'y', 0 }; @@ -552,6 +553,7 @@ int mcy_lex(void) add_token(tok_severity, ustr_success, 0x00, 0, NULL, 0); add_token(tok_facility, ustr_application, 0xFFF, 0, NULL, 0); add_token(tok_facility, ustr_system, 0x0FF, 0, NULL, 0); + add_token(tok_facility, ustr_dxgi, 0x87a, 0, NULL, 0); add_token(tok_facility, ustr_null, 0x000, 0, NULL, 0); add_token(tok_language, ustr_english, 0x409, 437, ustr_msg00001, 0); }

1 0

Jacek Caban : kernel32: Remove no longer used bare console support.
by Alexandre Julliard Sept. 21, 2020

Sept. 21, 2020

Module: wine Branch: master Commit: 43f822bca27b983e6ecca11f4204348a38ba7147 URL: https://source.winehq.org/git/wine.git/?a=commit;h=43f822bca27b983e6ecca11f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 21 17:07:42 2020 +0200 kernel32: Remove no longer used bare console support. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/Makefile.in | 2 - dlls/kernel32/console.c | 317 +-------------------------- dlls/kernel32/console_private.h | 6 - dlls/kernel32/kernel_main.c | 1 - dlls/kernel32/kernel_private.h | 4 - dlls/kernel32/term.c | 471 ---------------------------------------- 6 files changed, 2 insertions(+), 799 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=43f822bca27b983e6ecc…

1 0

Dmitry Timoshkov : sxs: Return correct path from IAssemblyCache::QueryAssemblyInfo().
by Alexandre Julliard Sept. 21, 2020

Sept. 21, 2020

Module: wine Branch: master Commit: c460d4ff35e69052a917a8d75f97f39d36747e52 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c460d4ff35e69052a917a8d7… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Sep 18 12:58:33 2020 +0300 sxs: Return correct path from IAssemblyCache::QueryAssemblyInfo(). Some applications call IAssemblyCache::QueryAssemblyInfo(), then append DLL name to the returned path, and call GetFileAttributes() to check DLL existence. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sxs/cache.c | 18 ++++++++---------- dlls/sxs/tests/cache.c | 2 ++ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/sxs/cache.c b/dlls/sxs/cache.c index 1b0e1e8908..bb203f50c0 100644 --- a/dlls/sxs/cache.c +++ b/dlls/sxs/cache.c @@ -122,23 +122,22 @@ static WCHAR *build_assembly_name( const WCHAR *arch, const WCHAR *name, const W return wcslwr( ret ); } -static WCHAR *build_manifest_path( const WCHAR *arch, const WCHAR *name, const WCHAR *token, - const WCHAR *version ) +static WCHAR *build_dll_path( const WCHAR *arch, const WCHAR *name, const WCHAR *token, + const WCHAR *version ) { - static const WCHAR fmtW[] = - {'%','s','m','a','n','i','f','e','s','t','s','\\','%','s','.','m','a','n','i','f','e','s','t',0}; WCHAR *path = NULL, *ret, sxsdir[MAX_PATH]; unsigned int len; if (!(path = build_assembly_name( arch, name, token, version, &len ))) return NULL; - len += ARRAY_SIZE(fmtW); - len += build_sxs_path( sxsdir ); + len += build_sxs_path( sxsdir ) + 1; if (!(ret = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) { HeapFree( GetProcessHeap(), 0, path ); return NULL; } - swprintf( ret, len, fmtW, sxsdir, path ); + lstrcpyW( ret, sxsdir ); + lstrcatW( ret, path ); + lstrcatW( ret, L"\\" ); HeapFree( GetProcessHeap(), 0, path ); return ret; } @@ -202,7 +201,7 @@ static HRESULT WINAPI cache_QueryAssemblyInfo( struct cache *cache = impl_from_IAssemblyCache( iface ); IAssemblyName *name_obj; const WCHAR *arch, *name, *token, *type, *version; - WCHAR *p, *path = NULL; + WCHAR *path = NULL; unsigned int len; HRESULT hr; @@ -232,7 +231,7 @@ static HRESULT WINAPI cache_QueryAssemblyInfo( } cache_lock( cache ); - if (!wcscmp( type, win32W )) path = build_manifest_path( arch, name, token, version ); + if (!wcscmp( type, win32W )) path = build_dll_path( arch, name, token, version ); else if (!wcscmp( type, win32_policyW )) path = build_policy_path( arch, name, token, version ); else { @@ -250,7 +249,6 @@ static HRESULT WINAPI cache_QueryAssemblyInfo( info->dwAssemblyFlags = ASSEMBLYINFO_FLAG_INSTALLED; TRACE("assembly is installed\n"); } - if ((p = wcsrchr( path, '\\' ))) *p = 0; len = lstrlenW( path ) + 1; if (info->pszCurrentAssemblyPathBuf) { diff --git a/dlls/sxs/tests/cache.c b/dlls/sxs/tests/cache.c index 19dd4b865e..59c51ad886 100644 --- a/dlls/sxs/tests/cache.c +++ b/dlls/sxs/tests/cache.c @@ -162,6 +162,8 @@ static void test_QueryAssemblyInfo( void ) ok( !info.uliAssemblySizeInKB.u.LowPart, "got %u\n", info.uliAssemblySizeInKB.u.LowPart ); ok( info.cchBuf == ARRAY_SIZE( path ), "got %u\n", info.cchBuf ); ok( path[0], "empty path\n" ); + lstrcatW( path, L"comctl32.dll" ); + ok( GetFileAttributesW( path ) != INVALID_FILE_ATTRIBUTES, "%s should exist\n", wine_dbgstr_w( path )); memset( &info, 0, sizeof(info) ); info.cbAssemblyInfo = sizeof(info);

1 0

Piotr Caban : server: Don't create wait object if infinite timeout is passed to NtSetTimer.
by Alexandre Julliard Sept. 21, 2020

Sept. 21, 2020

Module: wine Branch: master Commit: b67bbb732be82dedee93c88cf92c92c0540f3514 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b67bbb732be82dedee93c88c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sun Sep 20 15:58:54 2020 +0200 server: Don't create wait object if infinite timeout is passed to NtSetTimer. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49847 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/timer.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/server/timer.c b/server/timer.c index 6460acbf51..469f9d5a90 100644 --- a/server/timer.c +++ b/server/timer.c @@ -177,7 +177,8 @@ static int set_timer( struct timer *timer, timeout_t expire, unsigned int period timer->callback = callback; timer->arg = arg; if (callback) timer->thread = (struct thread *)grab_object( current ); - timer->timeout = add_timeout_user( expire, timer_callback, timer ); + if (expire != TIMEOUT_INFINITE) + timer->timeout = add_timeout_user( expire, timer_callback, timer ); return signaled; }

1 0

Sven Baars : ntdll: Fix some memory leaks (Valgrind).
by Alexandre Julliard Sept. 21, 2020

Sept. 21, 2020

Module: wine Branch: master Commit: 123a4a884f343f76d40b843740c3c4290d5eca71 URL: https://source.winehq.org/git/wine.git/?a=commit;h=123a4a884f343f76d40b8437… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Sun Sep 20 18:25:27 2020 +0200 ntdll: Fix some memory leaks (Valgrind). Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/security.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/security.c b/dlls/ntdll/unix/security.c index daecc5e059..09a1d787c0 100644 --- a/dlls/ntdll/unix/security.c +++ b/dlls/ntdll/unix/security.c @@ -779,8 +779,16 @@ NTSTATUS WINAPI NtSetSecurityObject( HANDLE handle, SECURITY_INFORMATION info, P InitializeObjectAttributes( &attr, NULL, 0, 0, descr ); if ((status = alloc_object_attributes( &attr, &objattr, &len ))) return status; sd = (struct security_descriptor *)(objattr + 1); - if (info & OWNER_SECURITY_INFORMATION && !sd->owner_len) return STATUS_INVALID_SECURITY_DESCR; - if (info & GROUP_SECURITY_INFORMATION && !sd->group_len) return STATUS_INVALID_SECURITY_DESCR; + if (info & OWNER_SECURITY_INFORMATION && !sd->owner_len) + { + free( objattr ); + return STATUS_INVALID_SECURITY_DESCR; + } + if (info & GROUP_SECURITY_INFORMATION && !sd->group_len) + { + free( objattr ); + return STATUS_INVALID_SECURITY_DESCR; + } if (info & (SACL_SECURITY_INFORMATION | LABEL_SECURITY_INFORMATION)) sd->control |= SE_SACL_PRESENT; if (info & DACL_SECURITY_INFORMATION) sd->control |= SE_DACL_PRESENT;

1 0

Rémi Bernon : gdi32/tests: Add test fonts with names in several languages.
by Alexandre Julliard Sept. 21, 2020

Sept. 21, 2020

Module: wine Branch: master Commit: d3ba3ca2d088660ec4f1fb592448d3b27f5d386e URL: https://source.winehq.org/git/wine.git/?a=commit;h=d3ba3ca2d088660ec4f1fb59… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Sep 17 19:30:42 2020 +0200 gdi32/tests: Add test fonts with names in several languages. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/Makefile.in | 3 + dlls/gdi32/tests/font.c | 265 +++++++++++++++++++++++++++++++++++ dlls/gdi32/tests/resource.rc | 9 ++ dlls/gdi32/tests/wine_langnames.sfd | 138 ++++++++++++++++++ dlls/gdi32/tests/wine_langnames.ttf | Bin 0 -> 2792 bytes dlls/gdi32/tests/wine_langnames2.sfd | 80 +++++++++++ dlls/gdi32/tests/wine_langnames2.ttf | Bin 0 -> 2016 bytes dlls/gdi32/tests/wine_langnames3.sfd | 78 +++++++++++ dlls/gdi32/tests/wine_langnames3.ttf | Bin 0 -> 2048 bytes 9 files changed, 573 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d3ba3ca2d088660ec4f1…

1 0

Francois Gouget : conhost/tests: Fix the spelling of a comment message.
by Alexandre Julliard Sept. 21, 2020

Sept. 21, 2020

Module: wine Branch: master Commit: c21a7500aecd3920db516efaecc051e2b34196dc URL: https://source.winehq.org/git/wine.git/?a=commit;h=c21a7500aecd3920db516efa… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Sep 21 18:37:16 2020 +0200 conhost/tests: Fix the spelling of a comment message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/tests/tty.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/conhost/tests/tty.c b/programs/conhost/tests/tty.c index 369199a127..27912aa188 100644 --- a/programs/conhost/tests/tty.c +++ b/programs/conhost/tests/tty.c @@ -923,7 +923,7 @@ static void test_tty_output(void) expect_output_sequence("\x1b[32m"); /* foreground black */ expect_output_sequence("\x1b[1;8H"); /* set cursor */ expect_output_sequence("0"); - expect_output_sequence("\x1b[41m"); /* backgorund red */ + expect_output_sequence("\x1b[41m"); /* background red */ expect_output_sequence("1"); expect_output_sequence("\x1b[30m"); /* foreground black */ expect_output_sequence("2");

1 0

Francois Gouget : ntdll: Fix the spelling of the arch_context_parameters variable.
by Alexandre Julliard Sept. 21, 2020

Sept. 21, 2020

Module: wine Branch: master Commit: a9722145a86ce3392630d469308a9dd731e62e79 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a9722145a86ce3392630d469… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Sep 21 18:37:02 2020 +0200 ntdll: Fix the spelling of the arch_context_parameters variable. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/exception.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c index 17bbb26f9e..a6b4b6a7ba 100644 --- a/dlls/ntdll/exception.c +++ b/dlls/ntdll/exception.c @@ -696,7 +696,7 @@ static const struct context_parameters ULONG flags_offset; const struct context_copy_range *copy_ranges; } -arch_context_paramaters[] = +arch_context_parameters[] = { {0x00100000, 0xd810005f, 0x4d0, 0x4d0, 0x20, 7, 0xf, 0x30, copy_ranges_amd64}, {0x00010000, 0xd801007f, 0x2cc, 0xcc, 0x18, 3, 0x3, 0, copy_ranges_x86}, @@ -706,10 +706,10 @@ static const struct context_parameters *context_get_parameters( ULONG context_fl { unsigned int i; - for (i = 0; i < ARRAY_SIZE(arch_context_paramaters); ++i) + for (i = 0; i < ARRAY_SIZE(arch_context_parameters); ++i) { - if (context_flags & arch_context_paramaters[i].arch_flag) - return context_flags & ~arch_context_paramaters[i].supported_flags ? NULL : &arch_context_paramaters[i]; + if (context_flags & arch_context_parameters[i].arch_flag) + return context_flags & ~arch_context_parameters[i].supported_flags ? NULL : &arch_context_parameters[i]; } return NULL; }

1 0

Alexandre Julliard : user32: Use wide character string literals for system parameter entries.
by Alexandre Julliard Sept. 21, 2020

Sept. 21, 2020

Module: wine Branch: master Commit: 6456973f0a64d326bb54da4675310caffc2588f1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6456973f0a64d326bb54da46… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 21 19:09:43 2020 +0200 user32: Use wide character string literals for system parameter entries. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 432 ++++++++++++++++++------------------------------ 1 file changed, 160 insertions(+), 272 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6456973f0a64d326bb54…

1 0

Alexandre Julliard : crypt32: Move GnuTLS-specific helpers into the #ifdef.
by Alexandre Julliard Sept. 21, 2020

Sept. 21, 2020

Module: wine Branch: master Commit: 6d7037c9ff1219ae959e365d8a95a3fceb57ca87 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d7037c9ff1219ae959e365d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 21 13:21:07 2020 +0200 crypt32: Move GnuTLS-specific helpers into the #ifdef. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/pfx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/pfx.c b/dlls/crypt32/pfx.c index 475ec0369e..3f38ae5056 100644 --- a/dlls/crypt32/pfx.c +++ b/dlls/crypt32/pfx.c @@ -254,8 +254,6 @@ static char *password_to_ascii( const WCHAR *str ) return ret; } -#endif - static BOOL set_key_context( const void *ctx, HCRYPTPROV prov ) { CERT_KEY_CONTEXT key_ctx; @@ -327,6 +325,8 @@ static BOOL set_key_prov_info( const void *ctx, HCRYPTPROV prov ) return ret; } +#endif + HCERTSTORE WINAPI PFXImportCertStore( CRYPT_DATA_BLOB *pfx, const WCHAR *password, DWORD flags ) { #ifdef SONAME_LIBGNUTLS

1 0