September 2020 - Wine-Commits

Alexandre Julliard : makefiles: Remove .. components from generated paths.
by Alexandre Julliard Sept. 14, 2020

Sept. 14, 2020

Module: wine Branch: master Commit: feb5229091df97a66c41faad04160d0741ae299d URL: https://source.winehq.org/git/wine.git/?a=commit;h=feb5229091df97a66c41faad… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 14 11:26:35 2020 +0200 makefiles: Remove .. components from generated paths. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index fcb8c8adf3..cc09a0e1ce 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -711,10 +711,34 @@ static char *get_relative_path( const char *from, const char *dest ) */ static char *concat_paths( const char *base, const char *path ) { + int i, len; + char *ret; + if (!base || !base[0]) return xstrdup( path && path[0] ? path : "." ); if (!path || !path[0]) return xstrdup( base ); if (path[0] == '/') return xstrdup( path ); - return strmake( "%s/%s", base, path ); + + len = strlen( base ); + while (len && base[len - 1] == '/') len--; + while (len && !strncmp( path, "..", 2 ) && (!path[2] || path[2] == '/')) + { + for (i = len; i > 0; i--) if (base[i - 1] == '/') break; + if (i == len - 2 && !memcmp( base + i, "..", 2 )) break; /* we can't go up if we already have ".." */ + if (i != len - 1 || base[i] != '.') + { + path += 2; + while (*path == '/') path++; + } + /* else ignore "." element */ + while (i > 0 && base[i - 1] == '/') i--; + len = i; + } + if (!len && base[0] != '/') return xstrdup( path[0] ? path : "." ); + ret = xmalloc( len + strlen( path ) + 2 ); + memcpy( ret, base, len ); + ret[len++] = '/'; + strcpy( ret + len, path ); + return ret; } @@ -2775,7 +2799,7 @@ static void output_source_rc( struct makefile *make, struct incl_file *source, c if (source->file->flags & FLAG_GENERATED) strarray_add( &make->clean_files, source->name ); if (linguas.count && (source->file->flags & FLAG_RC_PO)) po_dir = top_obj_dir_path( make, "po" ); strarray_add( &make->res_files, strmake( "%s.res", obj )); - if (source->file->flags & FLAG_RC_PO && !(source->file->flags & FLAG_PARENTDIR)) + if (source->file->flags & FLAG_RC_PO) { strarray_add( &make->pot_files, strmake( "%s.pot", obj )); output( "%s.pot ", obj_dir_path( make, obj ) );

1 0

Alexandre Julliard : makefiles: Remove directory variables that are redundant with non-recursive make.
by Alexandre Julliard Sept. 14, 2020

Sept. 14, 2020

Module: wine Branch: master Commit: 468af5bbb47b70630c2ecfefedce581558287ecf URL: https://source.winehq.org/git/wine.git/?a=commit;h=468af5bbb47b70630c2ecfef… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 14 12:48:06 2020 +0200 makefiles: Remove directory variables that are redundant with non-recursive make. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.in | 8 +- aclocal.m4 | 2 - configure | 70 +----------- configure.ac | 7 +- tools/makedep.c | 340 +++++++++++++++++++++++--------------------------------- 5 files changed, 144 insertions(+), 283 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=468af5bbb47b70630c2e…

1 0

Alistair Leslie-Hughes : ws2_32: Map AI ALL_option in getaddrinfo().
by Alexandre Julliard Sept. 14, 2020

Sept. 14, 2020

Module: wine Branch: master Commit: 0f515c8ebe990d34da74d3c2c760ba21d57cfaa9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0f515c8ebe990d34da74d3c2… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Sep 14 20:23:04 2020 +1000 ws2_32: Map AI ALL_option in getaddrinfo(). Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 1 + include/ws2tcpip.h | 2 ++ 2 files changed, 3 insertions(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 246a0e2819..0ed1af3092 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -826,6 +826,7 @@ static const int ws_aiflag_map[][2] = #ifdef AI_V4MAPPED MAP_OPTION( AI_V4MAPPED ), #endif + MAP_OPTION( AI_ALL ), MAP_OPTION( AI_ADDRCONFIG ), }; diff --git a/include/ws2tcpip.h b/include/ws2tcpip.h index 5a444dcb5f..5ba891185b 100644 --- a/include/ws2tcpip.h +++ b/include/ws2tcpip.h @@ -72,6 +72,7 @@ typedef ADDRINFOA ADDRINFO, *LPADDRINFO; # define AI_CANONNAME 0x00000002 # define AI_NUMERICHOST 0x00000004 # define AI_NUMERICSERV 0x00000008 +# define AI_ALL 0x00000100 # define AI_ADDRCONFIG 0x00000400 # define AI_V4MAPPED 0x00000800 # define AI_NON_AUTHORITATIVE 0x00004000 @@ -93,6 +94,7 @@ typedef ADDRINFOA ADDRINFO, *LPADDRINFO; # define WS_AI_CANONNAME 0x00000002 # define WS_AI_NUMERICHOST 0x00000004 # define WS_AI_NUMERICSERV 0x00000008 +# define WS_AI_ALL 0x00000100 # define WS_AI_ADDRCONFIG 0x00000400 # define WS_AI_V4MAPPED 0x00000800 # define WS_AI_NON_AUTHORITATIVE 0x00004000

1 0

Alexandre Julliard : makefiles: Regenerate po files with full path information.
by Alexandre Julliard Sept. 14, 2020

Sept. 14, 2020

Module: wine Branch: master Commit: ff34a8ecf827934080ac896bf86f8ac118fc2ce8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff34a8ecf827934080ac896b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Sep 12 11:42:08 2020 +0200 makefiles: Regenerate po files with full path information. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ar.po | 8096 ++++++++++++++++++++++++++------------------------ po/ast.po | 8096 ++++++++++++++++++++++++++------------------------ po/bg.po | 8096 ++++++++++++++++++++++++++------------------------ po/ca.po | 8096 ++++++++++++++++++++++++++------------------------ po/cs.po | 8096 ++++++++++++++++++++++++++------------------------ po/da.po | 8096 ++++++++++++++++++++++++++------------------------ po/de.po | 8096 ++++++++++++++++++++++++++------------------------ po/el.po | 8096 ++++++++++++++++++++++++++------------------------ po/en.po | 8096 ++++++++++++++++++++++++++------------------------ po/en_US.po | 8096 ++++++++++++++++++++++++++------------------------ po/eo.po | 8096 ++++++++++++++++++++++++++------------------------ po/es.po | 8096 ++++++++++++++++++++++++++------------------------ po/fa.po | 8096 ++++++++++++++++++++++++++------------------------ po/fi.po | 8096 ++++++++++++++++++++++++++------------------------ po/fr.po | 8096 ++++++++++++++++++++++++++------------------------ po/he.po | 8096 ++++++++++++++++++++++++++------------------------ po/hi.po | 8096 ++++++++++++++++++++++++++------------------------ po/hr.po | 8096 ++++++++++++++++++++++++++------------------------ po/hu.po | 8096 ++++++++++++++++++++++++++------------------------ po/it.po | 8096 ++++++++++++++++++++++++++------------------------ po/ja.po | 8096 ++++++++++++++++++++++++++------------------------ po/ko.po | 8096 ++++++++++++++++++++++++++------------------------ po/lt.po | 8096 ++++++++++++++++++++++++++------------------------ po/ml.po | 8096 ++++++++++++++++++++++++++------------------------ po/nb_NO.po | 8096 ++++++++++++++++++++++++++------------------------ po/nl.po | 8096 ++++++++++++++++++++++++++------------------------ po/or.po | 8096 ++++++++++++++++++++++++++------------------------ po/pa.po | 8096 ++++++++++++++++++++++++++------------------------ po/pl.po | 8096 ++++++++++++++++++++++++++------------------------ po/pt_BR.po | 8096 ++++++++++++++++++++++++++------------------------ po/pt_PT.po | 8096 ++++++++++++++++++++++++++------------------------ po/rm.po | 8096 ++++++++++++++++++++++++++------------------------ po/ro.po | 8096 ++++++++++++++++++++++++++------------------------ po/ru.po | 8096 ++++++++++++++++++++++++++------------------------ po/si.po | 8096 ++++++++++++++++++++++++++------------------------ po/sk.po | 8096 ++++++++++++++++++++++++++------------------------ po/sl.po | 8096 ++++++++++++++++++++++++++------------------------ po/sr_RS(a)cyrillic.po | 8096 ++++++++++++++++++++++++++------------------------ po/sr_RS(a)latin.po | 8096 ++++++++++++++++++++++++++------------------------ po/sv.po | 8096 ++++++++++++++++++++++++++------------------------ po/ta.po | 8096 ++++++++++++++++++++++++++------------------------ po/te.po | 8096 ++++++++++++++++++++++++++------------------------ po/th.po | 8096 ++++++++++++++++++++++++++------------------------ po/tr.po | 8096 ++++++++++++++++++++++++++------------------------ po/uk.po | 8096 ++++++++++++++++++++++++++------------------------ po/wa.po | 8096 ++++++++++++++++++++++++++------------------------ po/wine.pot | 8096 ++++++++++++++++++++++++++------------------------ po/zh_CN.po | 8096 ++++++++++++++++++++++++++------------------------ po/zh_TW.po | 8096 ++++++++++++++++++++++++++------------------------ 49 files changed, 203350 insertions(+), 193354 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ff34a8ecf827934080ac…

1 0

Gijs Vermeulen : msvcr120: Add [_]strtoimax[_l] and [_]strtoumax[_l].
by Alexandre Julliard Sept. 14, 2020

Sept. 14, 2020

Module: wine Branch: master Commit: db1403c5dedfdce2b697b7ead751075df281fab6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=db1403c5dedfdce2b697b7ea… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Sun Sep 13 16:00:57 2020 +0200 msvcr120: Add [_]strtoimax[_l] and [_]strtoumax[_l]. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49738 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr120/msvcr120.spec | 8 ++++---- dlls/msvcr120_app/msvcr120_app.spec | 8 ++++---- include/msvcrt/stdlib.h | 4 ++++ 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 1773976481..1d23526d80 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1734,7 +1734,7 @@ @ cdecl _strtof_l(str ptr ptr) MSVCRT__strtof_l @ cdecl -ret64 _strtoi64(str ptr long) MSVCRT_strtoi64 @ cdecl -ret64 _strtoi64_l(str ptr long ptr) MSVCRT_strtoi64_l -@ stub _strtoimax_l +@ cdecl -ret64 _strtoimax_l(str ptr long ptr) MSVCRT_strtoi64_l @ cdecl _strtol_l(str ptr long ptr) MSVCRT__strtol_l @ stub _strtold_l @ cdecl -ret64 _strtoll_l(str ptr long ptr) MSVCRT_strtoi64_l @@ -1742,7 +1742,7 @@ @ cdecl -ret64 _strtoui64_l(str ptr long ptr) MSVCRT_strtoui64_l @ cdecl _strtoul_l(str ptr long ptr) MSVCRT_strtoul_l @ cdecl -ret64 _strtoull_l(str ptr long ptr) MSVCRT_strtoui64_l -@ stub _strtoumax_l +@ cdecl -ret64 _strtoumax_l(str ptr long ptr) MSVCRT_strtoui64_l @ cdecl _strupr(str) MSVCRT__strupr @ cdecl _strupr_l(str ptr) MSVCRT__strupr_l @ cdecl _strupr_s(str long) MSVCRT__strupr_s @@ -2387,7 +2387,7 @@ @ cdecl strstr(str str) MSVCRT_strstr @ cdecl strtod(str ptr) MSVCRT_strtod @ cdecl strtof(str ptr) MSVCRT_strtof -@ stub strtoimax +@ cdecl -ret64 strtoimax(str ptr long) MSVCRT_strtoi64 @ cdecl strtok(str str) MSVCRT_strtok @ cdecl strtok_s(ptr str ptr) MSVCRT_strtok_s @ cdecl strtol(str ptr long) MSVCRT_strtol @@ -2395,7 +2395,7 @@ @ cdecl -ret64 strtoll(str ptr long) MSVCRT_strtoi64 @ cdecl strtoul(str ptr long) MSVCRT_strtoul @ cdecl -ret64 strtoull(str ptr long) MSVCRT_strtoui64 -@ stub strtoumax +@ cdecl -ret64 strtoumax(str ptr long) MSVCRT_strtoui64 @ cdecl strxfrm(ptr str long) MSVCRT_strxfrm @ varargs swprintf_s(ptr long wstr) MSVCRT_swprintf_s @ varargs swscanf(wstr wstr) MSVCRT_swscanf diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 8072349d8d..d9e998c985 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1445,7 +1445,7 @@ @ cdecl _strtof_l(str ptr ptr) msvcr120._strtof_l @ cdecl -ret64 _strtoi64(str ptr long) msvcr120._strtoi64 @ cdecl -ret64 _strtoi64_l(str ptr long ptr) msvcr120._strtoi64_l -@ stub _strtoimax_l +@ cdecl -ret64 _strtoimax_l(str ptr long ptr) msvcr120._strtoimax_l @ cdecl _strtol_l(str ptr long ptr) msvcr120._strtol_l @ stub _strtold_l @ cdecl -ret64 _strtoll_l(str ptr long ptr) msvcr120._strtoll_l @@ -1453,7 +1453,7 @@ @ cdecl -ret64 _strtoui64_l(str ptr long ptr) msvcr120._strtoui64_l @ cdecl _strtoul_l(str ptr long ptr) msvcr120._strtoul_l @ cdecl -ret64 _strtoull_l(str ptr long ptr) msvcr120._strtoull_l -@ stub _strtoumax_l +@ cdecl -ret64 _strtoumax_l(str ptr long ptr) msvcr120._strtoumax_l @ cdecl _strupr(str) msvcr120._strupr @ cdecl _strupr_l(str ptr) msvcr120._strupr_l @ cdecl _strupr_s(str long) msvcr120._strupr_s @@ -2050,7 +2050,7 @@ @ cdecl strstr(str str) msvcr120.strstr @ cdecl strtod(str ptr) msvcr120.strtod @ cdecl strtof(str ptr) msvcr120.strtof -@ stub strtoimax +@ cdecl -ret64 strtoimax(str ptr long) msvcr120.strtoimax @ cdecl strtok(str str) msvcr120.strtok @ cdecl strtok_s(ptr str ptr) msvcr120.strtok_s @ cdecl strtol(str ptr long) msvcr120.strtol @@ -2058,7 +2058,7 @@ @ cdecl -ret64 strtoll(str ptr long) msvcr120.strtoll @ cdecl strtoul(str ptr long) msvcr120.strtoul @ cdecl -ret64 strtoull(str ptr long) msvcr120.strtoull -@ stub strtoumax +@ cdecl -ret64 strtoumax(str ptr long) msvcr120.strtoumax @ cdecl strxfrm(ptr str long) msvcr120.strxfrm @ varargs swprintf_s(ptr long wstr) msvcr120.swprintf_s @ varargs swscanf(wstr wstr) msvcr120.swscanf diff --git a/include/msvcrt/stdlib.h b/include/msvcrt/stdlib.h index f14256c18f..00acd37434 100644 --- a/include/msvcrt/stdlib.h +++ b/include/msvcrt/stdlib.h @@ -215,6 +215,10 @@ __msvcrt_long __cdecl strtol(const char*,char**,int); __msvcrt_ulong __cdecl strtoul(const char*,char**,int); __int64 __cdecl strtoll_l(const char*,char**,int,_locale_t); unsigned __int64 __cdecl strtoull_l(const char*,char**,int,_locale_t); +__int64 __cdecl strtoimax(const char*,char**,int); +__int64 __cdecl strtoimax_l(const char*,char**,int,_locale_t); +unsigned __int64 __cdecl strtoumax(const char*,char**,int); +unsigned __int64 __cdecl strtoumax_l(const char*,char**,int,_locale_t); __int64 __cdecl _strtoi64(const char*,char**,int); __int64 __cdecl _strtoi64_l(const char*,char**,int,_locale_t); unsigned __int64 __cdecl _strtoui64(const char*,char**,int);

1 0

Alexandre Julliard : ntdll: Update argc when changing process name.
by Alexandre Julliard Sept. 14, 2020

Sept. 14, 2020

Module: wine Branch: master Commit: 3cd3b775224a9b58cd803348402aa757660ae856 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3cd3b775224a9b58cd803348… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 14 15:30:48 2020 +0200 ntdll: Update argc when changing process name. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49834 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/env.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index e1a3d33957..350fe6e8e0 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -736,7 +736,7 @@ char **build_envp( const WCHAR *envW ) * * Change the process name in the ps output. */ -static void set_process_name( int argc, char *argv[] ) +static int set_process_name( int argc, char *argv[] ) { BOOL shift_strings; char *p, *name; @@ -790,6 +790,7 @@ static void set_process_name( int argc, char *argv[] ) #endif prctl( PR_SET_NAME, name ); #endif /* HAVE_PRCTL */ + return argc - 1; } @@ -954,14 +955,14 @@ void init_environment( int argc, char *argv[], char *envp[] ) init_unix_codepage(); init_locale(); - set_process_name( argc, argv ); if ((case_table = read_nls_file( "l_intl" ))) { uctable = case_table + 2; lctable = case_table + case_table[1] + 2; } - main_argc = argc; + + main_argc = set_process_name( argc, argv ); main_argv = argv; main_wargv = build_wargv( argv ); main_envp = envp;

1 0

Alistair Leslie-Hughes : include: Remove coclasses that don't belong to msxml6.idl.
by Alexandre Julliard Sept. 14, 2020

Sept. 14, 2020

Module: wine Branch: master Commit: ca937890a52dafeea24e975660f4b4f289445cfa URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca937890a52dafeea24e9756… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Sep 14 15:39:52 2020 +0300 include: Remove coclasses that don't belong to msxml6.idl. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/main.c | 24 +++ dlls/msxml3/msxml_private.h | 27 +-- include/msxml6.idl | 394 -------------------------------------------- 3 files changed, 27 insertions(+), 418 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ca937890a52dafeea24e…

1 0

Yongjie Yao : msxml3: Fix a memory leak (Valgrind).
by Alexandre Julliard Sept. 14, 2020

Sept. 14, 2020

Module: wine Branch: master Commit: 9336ec8faf2e2f2420698f40c02988877781bfef URL: https://source.winehq.org/git/wine.git/?a=commit;h=9336ec8faf2e2f2420698f40… Author: Yongjie Yao <yaoyongjie(a)uniontech.com> Date: Fri Sep 11 15:41:58 2020 +0000 msxml3: Fix a memory leak (Valgrind). Signed-off-by: Yongjie Yao <yaoyongjie(a)uniontech.com> Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/domdoc.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 8d45c546fb..d447bd2b1d 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -797,13 +797,17 @@ static HRESULT domdoc_load_from_stream(domdoc *doc, ISequentialStream *stream) hr = GetHGlobalFromStream(hstream, &hglobal); if (FAILED(hr)) + { + IStream_Release(hstream); return hr; + } len = GlobalSize(hglobal); ptr = GlobalLock(hglobal); if (len) xmldoc = doparse(doc, ptr, len, XML_CHAR_ENCODING_NONE); GlobalUnlock(hglobal); + IStream_Release(hstream); if (!xmldoc) {

1 0

Alexandre Julliard : vbscript: Add support for translating messages.
by Alexandre Julliard Sept. 14, 2020

Sept. 14, 2020

Module: wine Branch: master Commit: ad22785cb3b495b07150732de98337b6fbcbb3bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=ad22785cb3b495b07150732d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Sep 12 11:24:09 2020 +0200 vbscript: Add support for translating messages. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/vbscript.rc | 2 + po/ar.po | 158 ++++++++++++++++++++++++++++++++++++++++++-- po/ast.po | 144 +++++++++++++++++++++++++++++++++++++++-- po/bg.po | 132 +++++++++++++++++++++++++++++++++++-- po/ca.po | 158 ++++++++++++++++++++++++++++++++++++++++++-- po/cs.po | 154 +++++++++++++++++++++++++++++++++++++++++-- po/da.po | 158 ++++++++++++++++++++++++++++++++++++++++++-- po/de.po | 162 ++++++++++++++++++++++++++++++++++++++++++++-- po/el.po | 132 +++++++++++++++++++++++++++++++++++-- po/en.po | 124 +++++++++++++++++++++++++++++++++-- po/en_US.po | 124 +++++++++++++++++++++++++++++++++-- po/eo.po | 140 +++++++++++++++++++++++++++++++++++++-- po/es.po | 158 ++++++++++++++++++++++++++++++++++++++++++-- po/fa.po | 127 ++++++++++++++++++++++++++++++++++-- po/fi.po | 162 ++++++++++++++++++++++++++++++++++++++++++++-- po/fr.po | 158 ++++++++++++++++++++++++++++++++++++++++++-- po/he.po | 136 ++++++++++++++++++++++++++++++++++++-- po/hi.po | 124 +++++++++++++++++++++++++++++++++-- po/hr.po | 158 ++++++++++++++++++++++++++++++++++++++++++-- po/hu.po | 158 ++++++++++++++++++++++++++++++++++++++++++-- po/it.po | 158 ++++++++++++++++++++++++++++++++++++++++++-- po/ja.po | 162 ++++++++++++++++++++++++++++++++++++++++++++-- po/ko.po | 158 ++++++++++++++++++++++++++++++++++++++++++-- po/lt.po | 162 ++++++++++++++++++++++++++++++++++++++++++++-- po/ml.po | 124 +++++++++++++++++++++++++++++++++-- po/nb_NO.po | 158 ++++++++++++++++++++++++++++++++++++++++++-- po/nl.po | 158 ++++++++++++++++++++++++++++++++++++++++++-- po/or.po | 124 +++++++++++++++++++++++++++++++++-- po/pa.po | 124 +++++++++++++++++++++++++++++++++-- po/pl.po | 158 ++++++++++++++++++++++++++++++++++++++++++-- po/pt_BR.po | 162 ++++++++++++++++++++++++++++++++++++++++++++-- po/pt_PT.po | 158 ++++++++++++++++++++++++++++++++++++++++++-- po/rm.po | 125 +++++++++++++++++++++++++++++++++-- po/ro.po | 157 ++++++++++++++++++++++++++++++++++++++++++-- po/ru.po | 158 ++++++++++++++++++++++++++++++++++++++++++-- po/si.po | 144 +++++++++++++++++++++++++++++++++++++++-- po/sk.po | 137 +++++++++++++++++++++++++++++++++++++-- po/sl.po | 158 ++++++++++++++++++++++++++++++++++++++++++-- po/sr_RS(a)cyrillic.po | 143 ++++++++++++++++++++++++++++++++++++++-- po/sr_RS(a)latin.po | 143 ++++++++++++++++++++++++++++++++++++++-- po/sv.po | 156 ++++++++++++++++++++++++++++++++++++++++++-- po/ta.po | 124 +++++++++++++++++++++++++++++++++-- po/te.po | 124 +++++++++++++++++++++++++++++++++-- po/th.po | 131 +++++++++++++++++++++++++++++++++++-- po/tr.po | 158 ++++++++++++++++++++++++++++++++++++++++++-- po/uk.po | 156 ++++++++++++++++++++++++++++++++++++++++++-- po/wa.po | 127 ++++++++++++++++++++++++++++++++++-- po/wine.pot | 124 +++++++++++++++++++++++++++++++++-- po/zh_CN.po | 162 ++++++++++++++++++++++++++++++++++++++++++++-- po/zh_TW.po | 158 ++++++++++++++++++++++++++++++++++++++++++-- 50 files changed, 6866 insertions(+), 294 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ad22785cb3b495b07150…

1 0

Alexandre Julliard : kernel32/tests: Avoid assumptions about the current working directory.
by Alexandre Julliard Sept. 14, 2020

Sept. 14, 2020

Module: wine Branch: master Commit: 8a5e603000c1337657b1e3256284c1f9b4e84581 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a5e603000c1337657b1e325… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 14 19:07:27 2020 +0200 kernel32/tests: Avoid assumptions about the current working directory. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/actctx.c | 21 ++++++--------------- dlls/kernel32/tests/path.c | 3 ++- dlls/kernel32/tests/process.c | 9 ++++++--- 3 files changed, 14 insertions(+), 19 deletions(-) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index 2093959d98..1bcb25a53f 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -36,16 +36,6 @@ static NTSTATUS(NTAPI *pRtlFindActivationContextSectionString)(DWORD,const GUID static BOOLEAN (NTAPI *pRtlCreateUnicodeStringFromAsciiz)(PUNICODE_STRING, PCSZ); static VOID (NTAPI *pRtlFreeUnicodeString)(PUNICODE_STRING); -static const char* strw(LPCWSTR x) -{ - static char buffer[1024]; - char* p = buffer; - - if (!x) return "(nil)"; - else while ((*p++ = *x++)); - return buffer; -} - #ifdef __i386__ #define ARCH "x86" #elif defined __x86_64__ @@ -622,7 +612,7 @@ static const detailed_info_t detailed_info0 = { static const detailed_info_t detailed_info1 = { 1, 1, 1, ACTIVATION_CONTEXT_PATH_TYPE_WIN32_FILE, manifest_path, ACTIVATION_CONTEXT_PATH_TYPE_NONE, ACTIVATION_CONTEXT_PATH_TYPE_WIN32_FILE, - work_dir, + app_dir, }; static const detailed_info_t detailed_info1_child = { @@ -635,7 +625,7 @@ static const detailed_info_t detailed_info1_child = { static const detailed_info_t detailed_info2 = { 1, 2, 3, ACTIVATION_CONTEXT_PATH_TYPE_WIN32_FILE, manifest_path, ACTIVATION_CONTEXT_PATH_TYPE_NONE, ACTIVATION_CONTEXT_PATH_TYPE_WIN32_FILE, - work_dir, + app_dir, }; static void test_detailed_info(HANDLE handle, const detailed_info_t *exinfo, int line) @@ -706,7 +696,8 @@ static void test_detailed_info(HANDLE handle, const detailed_info_t *exinfo, int ok_(__FILE__, line)(detailed_info->lpAppDirPath != NULL, "detailed_info->lpAppDirPath == NULL\n"); if(detailed_info->lpAppDirPath) ok_(__FILE__, line)(!lstrcmpiW(exinfo->app_dir, detailed_info->lpAppDirPath), - "unexpected detailed_info->lpAppDirPath\n%s\n",strw(detailed_info->lpAppDirPath)); + "unexpected detailed_info->lpAppDirPath %s / %s\n", + wine_dbgstr_w(detailed_info->lpAppDirPath), wine_dbgstr_w( exinfo->app_dir )); }else { ok_(__FILE__, line)(detailed_info->lpAppDirPath == NULL, "detailed_info->lpAppDirPath != NULL\n"); } @@ -864,7 +855,7 @@ static void test_info_in_assembly(HANDLE handle, DWORD id, const info_in_assembl if(info->lpAssemblyEncodedAssemblyIdentity && exinfo->encoded_assembly_id) { ok_(__FILE__, line)(!lstrcmpW(info->lpAssemblyEncodedAssemblyIdentity, exinfo->encoded_assembly_id), "unexpected info->lpAssemblyEncodedAssemblyIdentity %s / %s\n", - strw(info->lpAssemblyEncodedAssemblyIdentity), wine_dbgstr_w(exinfo->encoded_assembly_id)); + wine_dbgstr_w(info->lpAssemblyEncodedAssemblyIdentity), wine_dbgstr_w(exinfo->encoded_assembly_id)); } if(exinfo->manifest_path) { ok_(__FILE__, line)(info->lpAssemblyManifestPath != NULL, "info->lpAssemblyManifestPath == NULL\n"); @@ -882,7 +873,7 @@ static void test_info_in_assembly(HANDLE handle, DWORD id, const info_in_assembl ok_(__FILE__, line)(info->lpAssemblyDirectoryName != NULL, "info->lpAssemblyDirectoryName == NULL\n"); else ok_(__FILE__, line)(info->lpAssemblyDirectoryName == NULL, "info->lpAssemblyDirectoryName = %s\n", - strw(info->lpAssemblyDirectoryName)); + wine_dbgstr_w(info->lpAssemblyDirectoryName)); HeapFree(GetProcessHeap(), 0, info); } diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index 0e45ad44ff..f49af6d5bf 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -1877,7 +1877,8 @@ static void test_SearchPathA(void) ok(ret && ret == strlen(path2A), "got %d\n", ret); bret = CopyFileA(path2A, pathA, FALSE); ok(bret != 0, "failed to copy test executable to temp directory, %u\n", GetLastError()); - sprintf(path3A, "%s%s%s", curdirA, curdirA[strlen(curdirA)-1] != '\\' ? "\\" : "", kernel32A); + GetModuleFileNameA( GetModuleHandleA(0), path3A, sizeof(path3A) ); + strcpy( strrchr( path3A, '\\' ) + 1, kernel32A ); bret = CopyFileA(path2A, path3A, FALSE); ok(bret != 0, "failed to copy test executable to launch directory, %u\n", GetLastError()); bret = SetCurrentDirectoryA(tmpdirA); diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index ca991ea170..b0371c615e 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -935,6 +935,11 @@ static void test_CommandLine(void) release_memory(); DeleteFileA(resfile); + GetFullPathNameA(selfname, MAX_PATH, fullpath, &lpFilePart); + assert ( lpFilePart != 0); + *(lpFilePart -1 ) = 0; + SetCurrentDirectoryA( fullpath ); + /* Test for Bug1330 to show that XP doesn't change '/' to '\\' in argv[0] * and " escaping. */ @@ -970,9 +975,6 @@ static void test_CommandLine(void) DeleteFileA(resfile); get_file_name(resfile); - GetFullPathNameA(selfname, MAX_PATH, fullpath, &lpFilePart); - assert ( lpFilePart != 0); - *(lpFilePart -1 ) = 0; p = strrchr(fullpath, '\\'); /* Use exename to avoid buffer containing things like 'C:' */ if (p) sprintf(buffer, "..%s/%s process dump \"%s\"", p, exename, resfile); @@ -1010,6 +1012,7 @@ static void test_CommandLine(void) okChildStringWA("Arguments", "CommandLineW", buffer2); release_memory(); DeleteFileA(resfile); + SetCurrentDirectoryA( base ); if (0) /* Test crashes on NT-based Windows. */ {

1 0