wine-commits November 2019

wine-commits@winehq.org

1 participants
895 discussions

Alexandre Julliard : widl: Add --sysroot and --nostdinc options.
by Alexandre Julliard 04 Nov '19

04 Nov '19

Module: wine Branch: master Commit: 5f39d36a6c134bab77cea8f2e91c313e066eeffe URL: https://source.winehq.org/git/wine.git/?a=commit;h=5f39d36a6c134bab77cea8f2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Nov 2 13:34:27 2019 +0100 widl: Add --sysroot and --nostdinc options. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/Makefile.in | 2 +- tools/widl/widl.c | 34 ++++++++++++++++++++++++++++------ tools/widl/widl.man.in | 5 +++++ 3 files changed, 34 insertions(+), 7 deletions(-) diff --git a/tools/widl/Makefile.in b/tools/widl/Makefile.in index e06d6cc5b3..80a12601de 100644 --- a/tools/widl/Makefile.in +++ b/tools/widl/Makefile.in @@ -19,7 +19,7 @@ C_SRCS = \ LEX_SRCS = parser.l BISON_SRCS = parser.y -widl_EXTRADEFS = -DDEFAULT_INCLUDE_DIR=\"${includedir}/wine/windows/\" +widl_EXTRADEFS = -DINCLUDEDIR=\"${includedir}\" EXTRALIBS = -lwpp diff --git a/tools/widl/widl.c b/tools/widl/widl.c index f5fa20c884..aa6697135b 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -60,6 +60,8 @@ static const char usage[] = " --local-stubs=file Write empty stubs for call_as/local methods to file\n" " -m32, -m64 Set the target architecture (Win32 or Win64)\n" " -N Do not preprocess input\n" +" --nostdinc Do not search the standard include path\n" +" --ns_prefix Prefix namespaces with ABI namespace\n" " --oldnames Use old naming conventions\n" " -o, --output=NAME Set the output file name\n" " -Otype Type of stubs to generate (-Os, -Oi, -Oif)\n" @@ -69,8 +71,7 @@ static const char usage[] = " --prefix-server=p Prefix names of server functions with 'p'\n" " -r Generate registration script\n" " -robust Ignored, present for midl compatibility\n" -" --winrt Enable Windows Runtime mode\n" -" --ns_prefix Prefix namespaces with ABI namespace\n" +" --sysroot=DIR Prefix include paths with DIR\n" " -s Generate server stub\n" " -t Generate typelib\n" " -u Generate interface identifiers file\n" @@ -79,6 +80,7 @@ static const char usage[] = " --win32, --win64 Set the target architecture (Win32 or Win64)\n" " --win32-align n Set win32 structure alignment to 'n'\n" " --win64-align n Set win64 structure alignment to 'n'\n" +" --winrt Enable Windows Runtime mode\n" "Debug level 'n' is a bitmask with following meaning:\n" " * 0x01 Tell which resource is parsed (verbose mode)\n" " * 0x02 Dump internal structures\n" @@ -125,6 +127,7 @@ int win32_packing = 8; int win64_packing = 8; int winrt_mode = 0; int use_abi_namespace = 0; +static int stdinc = 1; static enum stub_mode stub_mode = MODE_Os; char *input_name; @@ -163,6 +166,7 @@ enum { DLLDATA_OPTION, DLLDATA_ONLY_OPTION, LOCAL_STUBS_OPTION, + NOSTDINC_OPTION, PREFIX_ALL_OPTION, PREFIX_CLIENT_OPTION, PREFIX_SERVER_OPTION, @@ -170,6 +174,7 @@ enum { RT_NS_PREFIX, RT_OPTION, ROBUST_OPTION, + SYSROOT_OPTION, WIN32_OPTION, WIN64_OPTION, WIN32_ALIGN_OPTION, @@ -185,6 +190,7 @@ static const struct option long_options[] = { { "dlldata-only", 0, NULL, DLLDATA_ONLY_OPTION }, { "help", 0, NULL, PRINT_HELP }, { "local-stubs", 1, NULL, LOCAL_STUBS_OPTION }, + { "nostdinc", 0, NULL, NOSTDINC_OPTION }, { "ns_prefix", 0, NULL, RT_NS_PREFIX }, { "oldnames", 0, NULL, OLDNAMES_OPTION }, { "output", 0, NULL, 'o' }, @@ -192,6 +198,7 @@ static const struct option long_options[] = { { "prefix-client", 1, NULL, PREFIX_CLIENT_OPTION }, { "prefix-server", 1, NULL, PREFIX_SERVER_OPTION }, { "robust", 0, NULL, ROBUST_OPTION }, + { "sysroot", 1, NULL, SYSROOT_OPTION }, { "target", 0, NULL, 'b' }, { "winrt", 0, NULL, RT_OPTION }, { "win32", 0, NULL, WIN32_OPTION }, @@ -567,10 +574,11 @@ void write_id_data(const statement_list_t *stmts) int main(int argc,char *argv[]) { - int optc; + int i, optc; int ret = 0; int opti = 0; char *output_name = NULL; + const char *sysroot = ""; signal( SIGTERM, exit_on_signal ); signal( SIGINT, exit_on_signal ); @@ -593,6 +601,9 @@ int main(int argc,char *argv[]) do_everything = 0; local_stubs_name = xstrdup(optarg); break; + case NOSTDINC_OPTION: + stdinc = 0; + break; case OLDNAMES_OPTION: old_names = 1; break; @@ -615,6 +626,9 @@ int main(int argc,char *argv[]) case RT_NS_PREFIX: use_abi_namespace = 1; break; + case SYSROOT_OPTION: + sysroot = xstrdup(optarg); + break; case WIN32_OPTION: pointer_size = 4; break; @@ -733,9 +747,17 @@ int main(int argc,char *argv[]) } } -#ifdef DEFAULT_INCLUDE_DIR - wpp_add_include_path(DEFAULT_INCLUDE_DIR); -#endif + if (stdinc) + { + static const char *incl_dirs[] = { INCLUDEDIR, "/usr/include", "/usr/local/include" }; + + for (i = 0; i < ARRAY_SIZE(incl_dirs); i++) + { + if (i && !strcmp( incl_dirs[i], incl_dirs[0] )) continue; + wpp_add_include_path( strmake( "%s%s/wine/msvcrt", sysroot, incl_dirs[i] )); + wpp_add_include_path( strmake( "%s%s/wine/windows", sysroot, incl_dirs[i] )); + } + } switch (target_cpu) { diff --git a/tools/widl/widl.man.in b/tools/widl/widl.man.in index ec81488a0e..010b7f04e2 100644 --- a/tools/widl/widl.man.in +++ b/tools/widl/widl.man.in @@ -41,6 +41,11 @@ specification is in the standard autoconf format as returned by \fBconfig.sub\fR. .IP "\fB-m32, -m64, --win32, --win64\fR" Force the target architecture to 32-bit or 64-bit. +.IP \fB\-\-sysroot=\fIdir\fR +Prefix the standard include paths with \fIdir\fR. +.IP \fB\-\-nostdinc\fR +Do not search standard include paths like /usr/include and +/usr/local/include. .PP .B Header options: .IP "\fB-h\fR"

1 0

Alexandre Julliard : widl: Add strmake() helper.
by Alexandre Julliard 04 Nov '19

04 Nov '19

Module: wine Branch: master Commit: 264d8884d5d3c6ee4cfd5df5650293d841364166 URL: https://source.winehq.org/git/wine.git/?a=commit;h=264d8884d5d3c6ee4cfd5df5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Nov 2 13:34:01 2019 +0100 widl: Add strmake() helper. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/parser.y | 24 ++++-------------------- tools/widl/register.c | 3 +-- tools/widl/utils.c | 19 +++++++++++++++++++ tools/widl/utils.h | 1 + 4 files changed, 25 insertions(+), 22 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 59875a5b16..5f6eb50878 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -2038,11 +2038,8 @@ var_t *find_const(const char *name, int f) char *gen_name(void) { - static const char format[] = "__WIDL_%s_generated_name_%08lX"; static unsigned long n = 0; static const char *file_id; - static size_t size; - char *name; if (! file_id) { @@ -2052,13 +2049,8 @@ char *gen_name(void) for (; *dst; ++dst) if (! isalnum((unsigned char) *dst)) *dst = '_'; - - size = sizeof format - 7 + strlen(file_id) + 8; } - - name = xmalloc(size); - sprintf(name, format, file_id, n++); - return name; + return strmake("__WIDL_%s_generated_name_%08lX", file_id, n++); } struct allowed_attr @@ -2727,14 +2719,6 @@ static void check_functions(const type_t *iface, int is_inside_library) } } -static char *concat_str(const char *prefix, const char *str) -{ - char *ret = xmalloc(strlen(prefix) + strlen(str) + 1); - strcpy(ret, prefix); - strcat(ret, str); - return ret; -} - static int async_iface_attrs(attr_list_t *attrs, const attr_t *attr) { switch(attr->type) @@ -2774,7 +2758,7 @@ static void check_async_uuid(type_t *iface) if (!inherit) error_loc("async_uuid applied to an interface with incompatible parent\n"); - async_iface = get_type(TYPE_INTERFACE, concat_str("Async", iface->name), iface->namespace, 0); + async_iface = get_type(TYPE_INTERFACE, strmake("Async%s", iface->name), iface->namespace, 0); async_iface->attrs = map_attrs(iface->attrs, async_iface_attrs); STATEMENTS_FOR_EACH_FUNC( stmt, type_iface_get_stmts(iface) ) @@ -2791,13 +2775,13 @@ static void check_async_uuid(type_t *iface) finish_args = append_var(finish_args, copy_var(arg, strdup(arg->name), arg_out_attrs)); } - begin_func = copy_var(func, concat_str("Begin_", func->name), NULL); + begin_func = copy_var(func, strmake("Begin_%s", func->name), NULL); begin_func->declspec.type = type_new_function(begin_args); begin_func->declspec.type->attrs = func->attrs; begin_func->declspec.type->details.function->retval = func->declspec.type->details.function->retval; stmts = append_statement(stmts, make_statement_declaration(begin_func)); - finish_func = copy_var(func, concat_str("Finish_", func->name), NULL); + finish_func = copy_var(func, strmake("Finish_%s", func->name), NULL); finish_func->declspec.type = type_new_function(finish_args); finish_func->declspec.type->attrs = func->attrs; finish_func->declspec.type->details.function->retval = func->declspec.type->details.function->retval; diff --git a/tools/widl/register.c b/tools/widl/register.c index 1c369e7c5e..f65cbddf53 100644 --- a/tools/widl/register.c +++ b/tools/widl/register.c @@ -321,8 +321,7 @@ void output_typelib_regscript( const typelib_t *typelib ) if (expr) { sprintf(id_part, "\\%d", expr->cval); - resname = xmalloc( strlen(typelib_name) + 20 ); - sprintf(resname, "%s\\%d", typelib_name, expr->cval); + resname = strmake("%s\\%d", typelib_name, expr->cval); } put_str( indent, "'%x' { %s = s '%%MODULE%%%s' }\n", lcid_expr ? lcid_expr->cval : 0, pointer_size == 8 ? "win64" : "win32", id_part ); diff --git a/tools/widl/utils.c b/tools/widl/utils.c index 20c63064c7..ea92372c8c 100644 --- a/tools/widl/utils.c +++ b/tools/widl/utils.c @@ -226,6 +226,25 @@ void *xrealloc(void *p, size_t size) return res; } +char *strmake( const char* fmt, ... ) +{ + int n; + size_t size = 100; + va_list ap; + + for (;;) + { + char *p = xmalloc( size ); + va_start( ap, fmt ); + n = vsnprintf( p, size, fmt, ap ); + va_end( ap ); + if (n == -1) size *= 2; + else if ((size_t)n >= size) size = n + 1; + else return p; + free( p ); + } +} + char *xstrdup(const char *str) { char *s; diff --git a/tools/widl/utils.h b/tools/widl/utils.h index 74dba11d3c..3740665650 100644 --- a/tools/widl/utils.h +++ b/tools/widl/utils.h @@ -44,6 +44,7 @@ void error_loc_info(const loc_info_t *, const char *s, ...) __attribute__((forma void warning(const char *s, ...) __attribute__((format (printf, 1, 2))); void warning_loc_info(const loc_info_t *, const char *s, ...) __attribute__((format (printf, 2, 3))); void chat(const char *s, ...) __attribute__((format (printf, 1, 2))); +char *strmake(const char* fmt, ...) __attribute__((__format__ (__printf__, 1, 2 ))); char *dup_basename(const char *name, const char *ext); size_t widl_getline(char **linep, size_t *lenp, FILE *fp);

1 0

Alexandre Julliard : wrc: Add --sysroot option.
by Alexandre Julliard 04 Nov '19

04 Nov '19

Module: wine Branch: master Commit: 9240ffbb293a0ca998368f082dbda15767e8fa5f URL: https://source.winehq.org/git/wine.git/?a=commit;h=9240ffbb293a0ca998368f08… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Nov 2 13:33:36 2019 +0100 wrc: Add --sysroot option. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/wrc/Makefile.in | 2 +- tools/wrc/wrc.c | 17 +++++++++++++++-- tools/wrc/wrc.man.in | 3 +++ 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/tools/wrc/Makefile.in b/tools/wrc/Makefile.in index 500d5c1278..d502e4b7da 100644 --- a/tools/wrc/Makefile.in +++ b/tools/wrc/Makefile.in @@ -15,7 +15,7 @@ C_SRCS = \ LEX_SRCS = parser.l BISON_SRCS = parser.y -wrc_EXTRADEFS = -DINCLUDEDIR="\"${includedir}/wine\"" +wrc_EXTRADEFS = -DINCLUDEDIR="\"${includedir}\"" EXTRALIBS = $(GETTEXTPO_LIBS) -lwpp diff --git a/tools/wrc/wrc.c b/tools/wrc/wrc.c index ea8bfe07a7..014b177291 100644 --- a/tools/wrc/wrc.c +++ b/tools/wrc/wrc.c @@ -74,6 +74,7 @@ static const char usage[] = " --po-dir=DIR Directory containing po files for translations\n" " --preprocessor Specifies the preprocessor to use, including arguments\n" " -r Ignored for compatibility with rc\n" + " --sysroot=DIR Prefix include paths with DIR\n" " -U, --undefine id Undefine preprocessor identifier id\n" " --use-temp-file Ignored for compatibility with windres\n" " -v, --verbose Enable verbose mode\n" @@ -172,6 +173,7 @@ enum long_options_values LONG_OPT_NOTMPFILE, LONG_OPT_PO_DIR, LONG_OPT_PREPROCESSOR, + LONG_OPT_SYSROOT, LONG_OPT_VERSION, LONG_OPT_DEBUG, LONG_OPT_ENDIANNESS, @@ -197,6 +199,7 @@ static const struct option long_options[] = { { "pedantic", 0, NULL, LONG_OPT_PEDANTIC }, { "po-dir", 1, NULL, LONG_OPT_PO_DIR }, { "preprocessor", 1, NULL, LONG_OPT_PREPROCESSOR }, + { "sysroot", 1, NULL, LONG_OPT_SYSROOT }, { "target", 1, NULL, 'F' }, { "undefine", 1, NULL, 'U' }, { "use-temp-file", 0, NULL, LONG_OPT_TMPFILE }, @@ -335,6 +338,7 @@ int main(int argc,char *argv[]) int cmdlen; int po_mode = 0; char *po_dir = NULL; + const char *sysroot = ""; char **files = xmalloc( argc * sizeof(*files) ); signal(SIGSEGV, segvhandler); @@ -384,6 +388,9 @@ int main(int argc,char *argv[]) if (strcmp(optarg, "cat") == 0) no_preprocess = 1; else fprintf(stderr, "-P option not yet supported, ignored.\n"); break; + case LONG_OPT_SYSROOT: + sysroot = xstrdup( optarg ); + break; case LONG_OPT_VERSION: printf(version_string); exit(0); @@ -499,8 +506,14 @@ int main(int argc,char *argv[]) /* If we do need to search standard includes, add them to the path */ if (stdinc) { - wpp_add_include_path(INCLUDEDIR"/msvcrt"); - wpp_add_include_path(INCLUDEDIR"/windows"); + static const char *incl_dirs[] = { INCLUDEDIR, "/usr/include", "/usr/local/include" }; + + for (i = 0; i < ARRAY_SIZE(incl_dirs); i++) + { + if (i && !strcmp( incl_dirs[i], incl_dirs[0] )) continue; + wpp_add_include_path( strmake( "%s%s/wine/msvcrt", sysroot, incl_dirs[i] )); + wpp_add_include_path( strmake( "%s%s/wine/windows", sysroot, incl_dirs[i] )); + } } /* Kill io buffering when some kind of debuglevel is enabled */ diff --git a/tools/wrc/wrc.man.in b/tools/wrc/wrc.man.in index c671ad7382..80fcd04c5b 100644 --- a/tools/wrc/wrc.man.in +++ b/tools/wrc/wrc.man.in @@ -121,6 +121,9 @@ This option may be used to specify the preprocessor to use, including any leading arguments. If not specified, \fBwrc\fR uses its builtin processor. To disable preprocessing, use \fB--preprocessor=cat\fR. .TP +.I \fB\-\-sysroot=\fIdir\fR +Prefix the standard include paths with \fIdir\fR. +.TP .I \fB\-U\fR, \fB\-\-undefine\fR=\fIid\fR Undefine preprocessor identifier \fIid\fR. Please note that only macros defined up to this point are undefined by this command. However, these

1 0

Alexandre Julliard : ucrtbase/tests: Avoid C99 for loop.
by Alexandre Julliard 04 Nov '19

04 Nov '19

Module: wine Branch: master Commit: f282b4980210b1125e2af58b91752055edc59798 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f282b4980210b1125e2af58b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Nov 2 09:22:49 2019 +0100 ucrtbase/tests: Avoid C99 for loop. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ucrtbase/tests/printf.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ucrtbase/tests/printf.c b/dlls/ucrtbase/tests/printf.c index 2af29322bf..9c6ece9808 100644 --- a/dlls/ucrtbase/tests/printf.c +++ b/dlls/ucrtbase/tests/printf.c @@ -639,10 +639,11 @@ static void test_printf_legacy_three_digit_exp(void) static void test_printf_c99(void) { char buf[30]; + int i; /* The msvcrt compatibility flag doesn't affect whether 'z' is interpreted * as size_t size for integers. */ - for (int i = 0; i < 2; i++) { + for (i = 0; i < 2; i++) { unsigned __int64 options = (i == 0) ? 0 : UCRTBASE_PRINTF_LEGACY_MSVCRT_COMPATIBILITY;

1 0

Francois Gouget : winetest: Disable indexing of the WineTest website.
by Alexandre Julliard 04 Nov '19

04 Nov '19

Module: tools Branch: master Commit: 847a480e9d9597407ac33c27cf65505a8d688163 URL: https://source.winehq.org/git/tools.git/?a=commit;h=847a480e9d9597407ac33c2… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Nov 3 00:44:22 2019 +0100 winetest: Disable indexing of the WineTest website. All the data on the website is transient in nature and not worth indexing. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/robots.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/winetest/robots.txt b/winetest/robots.txt new file mode 100644 index 0000000..1f53798 --- /dev/null +++ b/winetest/robots.txt @@ -0,0 +1,2 @@ +User-agent: * +Disallow: /

1 0

Francois Gouget : testbot/web: Disable indexing of the TestBot site.
by Alexandre Julliard 04 Nov '19

04 Nov '19

Module: tools Branch: master Commit: dd327eaf94647fc7e3fab28061c42d691e91a298 URL: https://source.winehq.org/git/tools.git/?a=commit;h=dd327eaf94647fc7e3fab28… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Nov 3 00:40:57 2019 +0100 testbot/web: Disable indexing of the TestBot site. All the data on the website is transient in nature and not worth indexing. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/robots.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/testbot/web/robots.txt b/testbot/web/robots.txt new file mode 100644 index 0000000..1f53798 --- /dev/null +++ b/testbot/web/robots.txt @@ -0,0 +1,2 @@ +User-agent: * +Disallow: /

1 0

Alexandre Julliard : Wine release 4.19
by Alexandre Julliard 01 Nov '19

01 Nov '19

Module: website Branch: master Commit: 925f6be9da4197aad5822c9a73a6e70bbe9c704c URL: https://source.winehq.org/git/website.git/?a=commit;h=925f6be9da4197aad5822… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 1 21:38:05 2019 +0100 Wine release 4.19 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2019110101.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/en/2019110101.xml b/news/en/2019110101.xml new file mode 100644 index 00000000..99e92e0f --- /dev/null +++ b/news/en/2019110101.xml @@ -0,0 +1,15 @@ +<news> +<date>November 1, 2019</date> +<title>Wine 4.19 Released</title> +<body> + The Wine development release 4.19 is now available. + <a href="{$root}/announce/4.19">What's new</a> in this release: +<ul> + <li>A number of additional VBScript features.</li> + <li>More stateblock support in WineD3D.</li> + <li>Some fixes for ARM64 support.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/4.x/wine-4.19.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-4.19 : Alexandre Julliard : Release 4.19
by Alexandre Julliard 01 Nov '19

01 Nov '19

Module: wine Branch: refs/tags/wine-4.19 Tag: 773efb2376b4b65fa9c1978c9dfa930fdce32d78 URL: https://source.winehq.org/git/wine.git/?a=tag;h=773efb2376b4b65fa9c1978c9df… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 1 21:35:58 2019 +0100 Release 4.19

1 0

Alexandre Julliard : Release 4.19.
by Alexandre Julliard 01 Nov '19

01 Nov '19

Module: wine Branch: master Commit: 6f2ef158b78f7d0a950c9398c26278d6523c112e URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f2ef158b78f7d0a950c9398… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 1 21:35:58 2019 +0100 Release 4.19. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 843 +++++++++++++++++++++++++++++++------------------------------- AUTHORS | 1 + VERSION | 2 +- configure | 18 +- 4 files changed, 434 insertions(+), 430 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6f2ef158b78f7d0a950c…

1 0

Gijs Vermeulen : faultrep/tests: Fix some memory leaks (Valgrind).
by Alexandre Julliard 01 Nov '19

01 Nov '19

Module: wine Branch: master Commit: d2e176f3a95f7eb906df623c01abfb8fca119dea URL: https://source.winehq.org/git/wine.git/?a=commit;h=d2e176f3a95f7eb906df623c… Author: Gijs Vermeulen <gijsvrm(a)codeweavers.com> Date: Fri Nov 1 17:16:53 2019 +0100 faultrep/tests: Fix some memory leaks (Valgrind). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=36404 Signed-off-by: Gijs Vermeulen <gijsvrm(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/faultrep/tests/faultrep.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/faultrep/tests/faultrep.c b/dlls/faultrep/tests/faultrep.c index d45c606f1e..d0b30f70cf 100644 --- a/dlls/faultrep/tests/faultrep.c +++ b/dlls/faultrep/tests/faultrep.c @@ -64,6 +64,7 @@ static BOOL is_process_limited(void) trace("Could not check if the current user is an administrator\n"); return FALSE; } + FreeSid(Group); if (!IsInGroup) { if (!AllocateAndInitializeSid(&NtAuthority, 2, @@ -75,6 +76,7 @@ static BOOL is_process_limited(void) trace("Could not check if the current user is a power user\n"); return FALSE; } + FreeSid(Group); if (!IsInGroup) { /* Only administrators and power users can be powerful */

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2019