September 2020 - Wine-commits

Jacek Caban : kernel32: Remove no longer used bare console support.
by Alexandre Julliard 21 Sep '20

21 Sep '20

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 21 Sep '20

21 Sep '20

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

Paul Gofman : wmc: Add Dxgi facility.
by Alexandre Julliard 21 Sep '20

21 Sep '20

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

Alexandre Julliard : user32: Use wide character string literals.
by Alexandre Julliard 21 Sep '20

21 Sep '20

Module: wine Branch: master Commit: 5ad25c293b6a7b5cd5dea43f29f6fa94d8302722 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5ad25c293b6a7b5cd5dea43f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 21 16:31:11 2020 +0200 user32: Use wide character string literals. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/button.c | 3 +- dlls/user32/class.c | 55 ++++++------ dlls/user32/combo.c | 25 ++---- dlls/user32/dde_client.c | 2 +- dlls/user32/dde_misc.c | 5 +- dlls/user32/dde_server.c | 10 +-- dlls/user32/defwnd.c | 3 +- dlls/user32/desktop.c | 12 +-- dlls/user32/dialog.c | 18 ++-- dlls/user32/driver.c | 26 ++---- dlls/user32/edit.c | 9 +- dlls/user32/icontitle.c | 3 +- dlls/user32/listbox.c | 19 ++-- dlls/user32/mdi.c | 10 +-- dlls/user32/menu.c | 8 +- dlls/user32/message.c | 4 +- dlls/user32/misc.c | 6 +- dlls/user32/msgbox.c | 6 +- dlls/user32/painting.c | 4 +- dlls/user32/rawinput.c | 10 +-- dlls/user32/scroll.c | 3 +- dlls/user32/spy.c | 5 +- dlls/user32/static.c | 3 +- dlls/user32/sysparams.c | 221 ++++++++++++++--------------------------------- dlls/user32/text.c | 2 +- dlls/user32/uitools.c | 3 +- dlls/user32/user_main.c | 83 ++++++------------ dlls/user32/win.c | 24 ++--- dlls/user32/winstation.c | 14 +-- dlls/user32/wsprintf.c | 7 +- 30 files changed, 198 insertions(+), 405 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5ad25c293b6a7b5cd5de…

1 0

Alexandre Julliard : user32: Use wide character string literals for system parameter entries.
by Alexandre Julliard 21 Sep '20

21 Sep '20

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

Francois Gouget : vbscript: Fix the spelling of the delimiter* variables.
by Alexandre Julliard 21 Sep '20

21 Sep '20

Module: wine Branch: master Commit: 38c91043f626bd6755185bc62ae85251c9e88207 URL: https://source.winehq.org/git/wine.git/?a=commit;h=38c91043f626bd6755185bc6… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Sep 21 18:36:11 2020 +0200 vbscript: Fix the spelling of the delimiter* variables. 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> --- dlls/vbscript/global.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 92288fcd88..1231beee8e 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -2316,8 +2316,8 @@ static HRESULT Global_Join(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, V static HRESULT Global_Split(BuiltinDisp *This, VARIANT *args, unsigned args_cnt, VARIANT *res) { - BSTR str, string, delimeter = NULL; - int count, max, mode, len, start, end, ret, delimeterlen = 1; + BSTR str, string, delimiter = NULL; + int count, max, mode, len, start, end, ret, delimiterlen = 1; int i,*indices = NULL, indices_max = 8; SAFEARRAYBOUND bounds; SAFEARRAY *sa = NULL; @@ -2342,13 +2342,13 @@ static HRESULT Global_Split(BuiltinDisp *This, VARIANT *args, unsigned args_cnt, if(args_cnt > 1) { if(V_VT(args+1) != VT_BSTR) { - hres = to_string(args+1, &delimeter); + hres = to_string(args+1, &delimiter); if(FAILED(hres)) goto error; }else { - delimeter = V_BSTR(args+1); + delimiter = V_BSTR(args+1); } - delimeterlen = SysStringLen(delimeter); + delimiterlen = SysStringLen(delimiter); } if(args_cnt > 2) { @@ -2388,9 +2388,9 @@ static HRESULT Global_Split(BuiltinDisp *This, VARIANT *args, unsigned args_cnt, while(1) { ret = -1; - if (delimeterlen) { + if (delimiterlen) { ret = FindStringOrdinal(FIND_FROMSTART, string + start, len - start, - delimeter ? delimeter : L" ", delimeterlen, mode); + delimiter ? delimiter : L" ", delimiterlen, mode); } if (ret == -1) { @@ -2410,7 +2410,7 @@ static HRESULT Global_Split(BuiltinDisp *This, VARIANT *args, unsigned args_cnt, indices[count++] = end; if (ret == -1 || count == max) break; - start = start + ret + delimeterlen; + start = start + ret + delimiterlen; if (start > len) break; } @@ -2443,7 +2443,7 @@ static HRESULT Global_Split(BuiltinDisp *This, VARIANT *args, unsigned args_cnt, SafeArrayDestroy(sa); goto error; } - start = indices[i]+delimeterlen; + start = indices[i]+delimiterlen; } SafeArrayUnaccessData(sa); @@ -2459,7 +2459,7 @@ error: if(V_VT(args) != VT_BSTR) SysFreeString(string); if(V_VT(args+1) != VT_BSTR) - SysFreeString(delimeter); + SysFreeString(delimiter); return hres; }

1 0

Francois Gouget : ntdll: Fix the spelling of the arch_context_parameters variable.
by Alexandre Julliard 21 Sep '20

21 Sep '20

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

Francois Gouget : ntdll/tests: Fix the spelling of a couple of ok_() messages.
by Alexandre Julliard 21 Sep '20

21 Sep '20

Module: wine Branch: master Commit: cdfec11e42e59c497e9b1760f73b68283d568225 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cdfec11e42e59c497e9b1760… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Sep 21 18:37:11 2020 +0200 ntdll/tests: Fix the spelling of a couple of ok_() messages. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/exception.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index c26cfb4a11..66dbe8089c 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -7437,12 +7437,12 @@ static void check_changes_in_range_(const char *file, unsigned int line, const B if (flag & flags && p[i] != 0xcc) { - ok_(file, line)(0, "Got unexected byte %#x at %#x, flags %#x.\n", p[i], i, flags); + ok_(file, line)(0, "Got unexpected byte %#x at %#x, flags %#x.\n", p[i], i, flags); return; } else if (!(flag & flags) && p[i] != 0xdd) { - ok_(file, line)(0, "Got unexected byte %#x at %#x, flags %#x.\n", p[i], i, flags); + ok_(file, line)(0, "Got unexpected byte %#x at %#x, flags %#x.\n", p[i], i, flags); return; } }

1 0

Francois Gouget : conhost/tests: Fix the spelling of a comment message.
by Alexandre Julliard 21 Sep '20

21 Sep '20

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

Kevin Puetz : widl: Remove duplicate '\n\n' in midl_info_guid.
by Alexandre Julliard 21 Sep '20

21 Sep '20

Module: wine Branch: master Commit: 7955b2e5265742dcfb32d0032be5e0fd1696a209 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7955b2e5265742dcfb32d003… Author: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Date: Fri Sep 18 16:10:30 2020 -0500 widl: Remove duplicate '\n\n' in midl_info_guid. Per standard, ctime already ends with '\n\0', so this doubled it. Signed-off-by: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/write_msft.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index 23d1dd8652..aa05dcfe56 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -2750,7 +2750,7 @@ int create_msft_typelib(typelib_t *typelib) and midl's version number */ time_override = getenv( "WIDL_TIME_OVERRIDE"); cur_time = time_override ? atol( time_override) : time(NULL); - sprintf(info_string, "Created by WIDL version %s at %s\n", PACKAGE_VERSION, ctime(&cur_time)); + sprintf(info_string, "Created by WIDL version %s at %s", PACKAGE_VERSION, ctime(&cur_time)); set_custdata(msft, &midl_info_guid, VT_BSTR, info_string, &msft->typelib_header.CustomDataOffset); set_custdata(msft, &midl_time_guid, VT_UI4, &cur_time, &msft->typelib_header.CustomDataOffset); set_custdata(msft, &midl_version_guid, VT_UI4, &version, &msft->typelib_header.CustomDataOffset);

1 0