July 2020 - Wine-Commits - list.winehq.org

Henri Verbeet : vkd3d-compiler: Print a slightly more elaborate usage message.
by Alexandre Julliard July 2, 2020

July 2, 2020

Module: vkd3d Branch: master Commit: e3e76867ca671ffa3bc43b4ed8fb3d9e28faa83f URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=e3e76867ca671ffa3bc43b4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 2 18:31:12 2020 +0430 vkd3d-compiler: Print a slightly more elaborate usage message. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/vkd3d-compiler/main.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index 48ca42a..03dc322 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -98,12 +98,13 @@ compiler_options[] = static void print_usage(const char *program_name) { - unsigned int i; + static const char usage[] = + "[options...] file\n" + "Options:\n" + " -o <file> Write the output to <file>.\n" + " --strip-debug Strip debug information from the output.\n"; - fprintf(stderr, "usage: %s", program_name); - for (i = 0; i < ARRAY_SIZE(compiler_options); ++i) - fprintf(stderr, " [%s]", compiler_options[i].name); - fprintf(stderr, " [-o <out_spirv_filename>] <dxbc_filename>\n"); + fprintf(stderr, "Usage: %s %s", program_name, usage); } struct options

1 0

Henri Verbeet : vkd3d-compiler: Add a long option to specify the output file.
by Alexandre Julliard July 2, 2020

July 2, 2020

Module: vkd3d Branch: master Commit: 7bcddce05c13396de1251ce2fa5f9ce19cf61368 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=7bcddce05c13396de1251ce… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 2 18:31:16 2020 +0430 vkd3d-compiler: Add a long option to specify the output file. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/vkd3d-compiler/main.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index 1586b45..da03df2 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -32,6 +32,7 @@ enum { OPTION_HELP = CHAR_MAX + 1, + OPTION_OUTPUT, OPTION_STRIP_DEBUG, OPTION_VERSION, }; @@ -100,7 +101,7 @@ static void print_usage(const char *program_name) "[options...] file\n" "Options:\n" " -h, --help Display this information and exit.\n" - " -o <file> Write the output to <file>.\n" + " -o, --output=<file> Write the output to <file>.\n" " --strip-debug Strip debug information from the output.\n" " -V, --version Display version information and exit.\n" " -- Stop option processing. Any subsequent argument is\n" @@ -153,10 +154,11 @@ static bool parse_command_line(int argc, char **argv, struct options *options) static struct option long_options[] = { - {"help", no_argument, NULL, OPTION_HELP}, - {"strip-debug", no_argument, NULL, OPTION_STRIP_DEBUG}, - {"version", no_argument, NULL, OPTION_VERSION}, - {NULL, 0, NULL, 0}, + {"help", no_argument, NULL, OPTION_HELP}, + {"output", required_argument, NULL, OPTION_OUTPUT}, + {"strip-debug", no_argument, NULL, OPTION_STRIP_DEBUG}, + {"version", no_argument, NULL, OPTION_VERSION}, + {NULL, 0, NULL, 0}, }; memset(options, 0, sizeof(*options)); @@ -168,6 +170,7 @@ static bool parse_command_line(int argc, char **argv, struct options *options) switch (option) { + case OPTION_OUTPUT: case 'o': options->output_filename = optarg; break;

1 0

Henri Verbeet : vkd3d-compiler: Use getopt to parse command-line options.
by Alexandre Julliard July 2, 2020

July 2, 2020

Module: vkd3d Branch: master Commit: f658190794f02ce035ce12481c1c4135c9ac33d6 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=f658190794f02ce035ce124… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 2 18:31:13 2020 +0430 vkd3d-compiler: Use getopt to parse command-line options. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/vkd3d-compiler/main.c | 61 ++++++++++++++++++++++-------------------- 1 file changed, 32 insertions(+), 29 deletions(-) diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index 03dc322..8fa4d4f 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -22,12 +22,18 @@ #include <stdlib.h> #include <sys/stat.h> #include <unistd.h> +#include <getopt.h> #include "vkd3d_common.h" #include "vkd3d_shader.h" #define MAX_COMPILE_OPTIONS 1 +enum +{ + OPTION_STRIP_DEBUG = CHAR_MAX + 1, +}; + static bool read_shader(struct vkd3d_shader_code *shader, const char *filename) { struct stat st; @@ -86,23 +92,15 @@ static bool write_shader(const struct vkd3d_shader_code *shader, const char *fil return true; } -static const struct -{ - const char *name; - enum vkd3d_shader_compile_option_name compile_option; -} -compiler_options[] = -{ - {"--strip-debug", VKD3D_SHADER_COMPILE_OPTION_STRIP_DEBUG}, -}; - static void print_usage(const char *program_name) { static const char usage[] = "[options...] file\n" "Options:\n" " -o <file> Write the output to <file>.\n" - " --strip-debug Strip debug information from the output.\n"; + " --strip-debug Strip debug information from the output.\n" + " -- Stop option processing. Any subsequent argument is\n" + " interpreted as a filename.\n"; fprintf(stderr, "Usage: %s %s", program_name, usage); } @@ -145,36 +143,41 @@ static void add_compile_option(struct options *options, static bool parse_command_line(int argc, char **argv, struct options *options) { - unsigned int i, j; + int option; - if (argc < 2) - return false; + static struct option long_options[] = + { + {"strip-debug", no_argument, NULL, OPTION_STRIP_DEBUG}, + {NULL, 0, NULL, 0}, + }; memset(options, 0, sizeof(*options)); - for (i = 1; i < argc - 1; ++i) + for (;;) { - if (!strcmp(argv[i], "-o")) - { - if (i + 1 >= argc - 1) - return false; - options->output_filename = argv[++i]; - continue; - } + if ((option = getopt_long(argc, argv, "o:", long_options, NULL)) == -1) + break; - for (j = 0; j < ARRAY_SIZE(compiler_options); ++j) + switch (option) { - if (!strcmp(argv[i], compiler_options[j].name)) - { - add_compile_option(options, compiler_options[j].compile_option, 1); + case 'o': + options->output_filename = optarg; + break; + + case OPTION_STRIP_DEBUG: + add_compile_option(options, VKD3D_SHADER_COMPILE_OPTION_STRIP_DEBUG, 1); break; - } + + default: + return false; } - if (j == ARRAY_SIZE(compiler_options)) - return false; } + if (optind >= argc) + return false; + options->filename = argv[argc - 1]; + return true; }

1 0

Henri Verbeet : vkd3d-compiler: Add a --version option.
by Alexandre Julliard July 2, 2020

July 2, 2020

Module: vkd3d Branch: master Commit: 4a094f5cba8e8c533ba822a71d8c617141da744d URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=4a094f5cba8e8c533ba822a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 2 18:31:15 2020 +0430 vkd3d-compiler: Add a --version option. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/vkd3d-compiler/main.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index e975572..1586b45 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -33,6 +33,7 @@ enum { OPTION_HELP = CHAR_MAX + 1, OPTION_STRIP_DEBUG, + OPTION_VERSION, }; static bool read_shader(struct vkd3d_shader_code *shader, const char *filename) @@ -101,6 +102,7 @@ static void print_usage(const char *program_name) " -h, --help Display this information and exit.\n" " -o <file> Write the output to <file>.\n" " --strip-debug Strip debug information from the output.\n" + " -V, --version Display version information and exit.\n" " -- Stop option processing. Any subsequent argument is\n" " interpreted as a filename.\n"; @@ -111,6 +113,7 @@ struct options { const char *filename; const char *output_filename; + bool print_version; struct vkd3d_shader_compile_option compile_options[MAX_COMPILE_OPTIONS]; unsigned int compile_option_count; @@ -152,6 +155,7 @@ static bool parse_command_line(int argc, char **argv, struct options *options) { {"help", no_argument, NULL, OPTION_HELP}, {"strip-debug", no_argument, NULL, OPTION_STRIP_DEBUG}, + {"version", no_argument, NULL, OPTION_VERSION}, {NULL, 0, NULL, 0}, }; @@ -159,7 +163,7 @@ static bool parse_command_line(int argc, char **argv, struct options *options) for (;;) { - if ((option = getopt_long(argc, argv, "ho:", long_options, NULL)) == -1) + if ((option = getopt_long(argc, argv, "ho:V", long_options, NULL)) == -1) break; switch (option) @@ -172,6 +176,11 @@ static bool parse_command_line(int argc, char **argv, struct options *options) add_compile_option(options, VKD3D_SHADER_COMPILE_OPTION_STRIP_DEBUG, 1); break; + case OPTION_VERSION: + case 'V': + options->print_version = true; + return true; + default: return false; } @@ -198,6 +207,12 @@ int main(int argc, char **argv) return 1; } + if (options.print_version) + { + fprintf(stdout, "vkd3d shader compiler version " PACKAGE_VERSION "\n"); + return 0; + } + info.type = VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_INFO; info.next = NULL; info.source_type = VKD3D_SHADER_SOURCE_DXBC_TPF;

1 0

Owen Rudge : winetest: Add a script to test HTTP redirection limits.
by Alexandre Julliard July 2, 2020

July 2, 2020

Module: tools Branch: master Commit: 9d2c746f26516640189d68e3a59b70f44842364b URL: https://source.winehq.org/git/tools.git/?a=commit;h=9d2c746f26516640189d68e… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Mon Jun 29 22:44:04 2020 +0100 winetest: Add a script to test HTTP redirection limits. I've written patches to implement support for WINHTTP_OPTION_MAX_HTTP_AUTOMATIC_REDIRECTS in winhttp; this script will be required for the tests. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/tests/redirecttest.php | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/winetest/tests/redirecttest.php b/winetest/tests/redirecttest.php new file mode 100644 index 0000000..e9f8995 --- /dev/null +++ b/winetest/tests/redirecttest.php @@ -0,0 +1,17 @@ +<?php + +$id = (int)$_GET['id']; +$max = max(0, min(15, (int)$_GET['max'])); + +if ($id < 0) + $id = 0; + +if ($id < $max) +{ + $new_url = sprintf("%s://%s%s?id=%d&max=%d", $_SERVER['REQUEST_SCHEME'], $_SERVER['HTTP_HOST'], $_SERVER['SCRIPT_NAME'], $id + 1, $max); + Header("Location: " . $new_url); +} + +Header("Content-Type: text/plain"); +echo($id); +?>

1 0

Louis Lenders : where.exe: Add stub program.
by Alexandre Julliard July 1, 2020

July 1, 2020

Module: wine Branch: master Commit: 10b17932fa829fac10a5e6717d96ed5d56de80fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=10b17932fa829fac10a5e671… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Wed Jul 1 13:58:01 2020 +0200 where.exe: Add stub program. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49460 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + programs/where/Makefile.in | 6 ++++++ programs/where/main.c | 33 +++++++++++++++++++++++++++++++++ 4 files changed, 42 insertions(+) diff --git a/configure b/configure index 85b7a186a3..0cff0025aa 100755 --- a/configure +++ b/configure @@ -1807,6 +1807,7 @@ enable_uninstaller enable_unlodctr enable_view enable_wevtutil +enable_where enable_whoami enable_wineboot enable_winebrowser @@ -21426,6 +21427,7 @@ wine_fn_config_makefile programs/uninstaller enable_uninstaller wine_fn_config_makefile programs/unlodctr enable_unlodctr wine_fn_config_makefile programs/view enable_view wine_fn_config_makefile programs/wevtutil enable_wevtutil +wine_fn_config_makefile programs/where enable_where wine_fn_config_makefile programs/whoami enable_whoami wine_fn_config_makefile programs/wineboot enable_wineboot wine_fn_config_makefile programs/winebrowser enable_winebrowser diff --git a/configure.ac b/configure.ac index 046af0fe81..d596422320 100644 --- a/configure.ac +++ b/configure.ac @@ -4011,6 +4011,7 @@ WINE_CONFIG_MAKEFILE(programs/uninstaller) WINE_CONFIG_MAKEFILE(programs/unlodctr) WINE_CONFIG_MAKEFILE(programs/view) WINE_CONFIG_MAKEFILE(programs/wevtutil) +WINE_CONFIG_MAKEFILE(programs/where) WINE_CONFIG_MAKEFILE(programs/whoami) WINE_CONFIG_MAKEFILE(programs/wineboot) WINE_CONFIG_MAKEFILE(programs/winebrowser) diff --git a/programs/where/Makefile.in b/programs/where/Makefile.in new file mode 100644 index 0000000000..109261c379 --- /dev/null +++ b/programs/where/Makefile.in @@ -0,0 +1,6 @@ +MODULE = where.exe + +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin + +C_SRCS = \ + main.c diff --git a/programs/where/main.c b/programs/where/main.c new file mode 100644 index 0000000000..6f90a222dc --- /dev/null +++ b/programs/where/main.c @@ -0,0 +1,33 @@ +/* + * Copyright 2020 Louis Lenders + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(where); + +int __cdecl wmain(int argc, WCHAR *argv[]) +{ + int i; + + WINE_FIXME("stub:"); + for (i = 0; i < argc; i++) + WINE_FIXME(" %s", wine_dbgstr_w(argv[i])); + WINE_FIXME("\n"); + + return 0; +}

1 0

Paul Gofman : configure: Increase Wine loader address.
by Alexandre Julliard July 1, 2020

July 1, 2020

Module: wine Branch: master Commit: cbd2af9213fb76e2ed2e7d7a9151100f45f0679c URL: https://source.winehq.org/git/wine.git/?a=commit;h=cbd2af9213fb76e2ed2e7d7a… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Jul 1 15:16:57 2020 +0300 configure: Increase Wine loader address. PE ntdll.dll does not fit in 0x7bc00000-0x7c000000 range with certain builds with debug info. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 28 ++++++++++++++-------------- configure.ac | 12 ++++++------ 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/configure b/configure index ee0439425a..85b7a186a3 100755 --- a/configure +++ b/configure @@ -8713,7 +8713,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu WINELOADER_LDFLAGS="-Wl,-pie,-pagezero_size,0x1000,-sectcreate,__TEXT,__info_plist,wine_info.plist" wine_can_build_preloader=yes - WINEPRELOADER_LDFLAGS="-nostartfiles -nodefaultlibs -e _start -ldylib1.o -Wl,-image_base,0x7c400000,-pagezero_size,0x1000,-sectcreate,__TEXT,__info_plist,wine_info.plist" + WINEPRELOADER_LDFLAGS="-nostartfiles -nodefaultlibs -e _start -ldylib1.o -Wl,-image_base,0x7d400000,-pagezero_size,0x1000,-sectcreate,__TEXT,__info_plist,wine_info.plist" { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wl,-no_new_main -e _main" >&5 $as_echo_n "checking whether the compiler supports -Wl,-no_new_main -e _main... " >&6; } if ${ac_cv_cflags__Wl__no_new_main__e__main+:} false; then : @@ -9141,7 +9141,7 @@ $as_echo "$ac_cv_cflags__fPIC__Wl___export_dynamic" >&6; } if test "x$ac_cv_cflags__fPIC__Wl___export_dynamic" = xyes; then : WINELOADER_LDFLAGS="-Wl,--export-dynamic" fi - WINEPRELOADER_LDFLAGS="-static -nostartfiles -nodefaultlibs -Wl,-Ttext=0x7c400000" + WINEPRELOADER_LDFLAGS="-static -nostartfiles -nodefaultlibs -Wl,-Ttext=0x7d400000" as_ac_var=`$as_echo "ac_cv_cflags_-fPIC -Wl,--rpath,\\$ORIGIN/../lib" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fPIC -Wl,--rpath,\$ORIGIN/../lib" >&5 $as_echo_n "checking whether the compiler supports -fPIC -Wl,--rpath,\$ORIGIN/../lib... " >&6; } @@ -9497,7 +9497,7 @@ $as_echo "$ac_cv_cflags__Wl___export_dynamic" >&6; } if test "x$ac_cv_cflags__Wl___export_dynamic" = xyes; then : WINELOADER_LDFLAGS="-Wl,--export-dynamic" fi - WINEPRELOADER_LDFLAGS="-static -nostartfiles -nodefaultlibs -Wl,-Ttext=0x7c400000" + WINEPRELOADER_LDFLAGS="-static -nostartfiles -nodefaultlibs -Wl,-Ttext=0x7d400000" as_ac_var=`$as_echo "ac_cv_cflags_-Wl,--rpath,\\$ORIGIN/../lib" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wl,--rpath,\$ORIGIN/../lib" >&5 @@ -9610,35 +9610,35 @@ $as_echo "$ac_cv_cflags__Wl__Ttext_segment_0x7bc00000" >&6; } if test "x$ac_cv_cflags__Wl__Ttext_segment_0x7bc00000" = xyes; then : case $host_os in freebsd* | kfreebsd*-gnu) WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -Wl,-Ttext-segment=0x60000000" ;; - *) WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -Wl,-Ttext-segment=0x7c000000" ;; + *) WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -Wl,-Ttext-segment=0x7d000000" ;; esac else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wl,--section-start,.interp=0x7c000400" >&5 -$as_echo_n "checking whether the compiler supports -Wl,--section-start,.interp=0x7c000400... " >&6; } -if ${ac_cv_cflags__Wl___section_start__interp_0x7c000400+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wl,--section-start,.interp=0x7d000400" >&5 +$as_echo_n "checking whether the compiler supports -Wl,--section-start,.interp=0x7d000400... " >&6; } +if ${ac_cv_cflags__Wl___section_start__interp_0x7d000400+:} false; then : $as_echo_n "(cached) " >&6 else ac_wine_try_cflags_saved=$CFLAGS -CFLAGS="$CFLAGS -Wl,--section-start,.interp=0x7c000400" +CFLAGS="$CFLAGS -Wl,--section-start,.interp=0x7d000400" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int main(int argc, char **argv) { return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - ac_cv_cflags__Wl___section_start__interp_0x7c000400=yes + ac_cv_cflags__Wl___section_start__interp_0x7d000400=yes else - ac_cv_cflags__Wl___section_start__interp_0x7c000400=no + ac_cv_cflags__Wl___section_start__interp_0x7d000400=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext CFLAGS=$ac_wine_try_cflags_saved fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Wl___section_start__interp_0x7c000400" >&5 -$as_echo "$ac_cv_cflags__Wl___section_start__interp_0x7c000400" >&6; } -if test "x$ac_cv_cflags__Wl___section_start__interp_0x7c000400" = xyes; then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Wl___section_start__interp_0x7d000400" >&5 +$as_echo "$ac_cv_cflags__Wl___section_start__interp_0x7d000400" >&6; } +if test "x$ac_cv_cflags__Wl___section_start__interp_0x7d000400" = xyes; then : case $host_os in freebsd* | kfreebsd*-gnu) WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -Wl,--section-start,.interp=0x60000400" ;; - *) WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -Wl,--section-start,.interp=0x7c000400" ;; + *) WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -Wl,--section-start,.interp=0x7d000400" ;; esac fi # Extract the first word of "prelink", so it can be a program name with args. diff --git a/configure.ac b/configure.ac index 3c03bad292..046af0fe81 100644 --- a/configure.ac +++ b/configure.ac @@ -761,7 +761,7 @@ case $host_os in WINELOADER_LDFLAGS="-Wl,-pie,-pagezero_size,0x1000,-sectcreate,__TEXT,__info_plist,wine_info.plist" wine_can_build_preloader=yes - WINEPRELOADER_LDFLAGS="-nostartfiles -nodefaultlibs -e _start -ldylib1.o -Wl,-image_base,0x7c400000,-pagezero_size,0x1000,-sectcreate,__TEXT,__info_plist,wine_info.plist" + WINEPRELOADER_LDFLAGS="-nostartfiles -nodefaultlibs -e _start -ldylib1.o -Wl,-image_base,0x7d400000,-pagezero_size,0x1000,-sectcreate,__TEXT,__info_plist,wine_info.plist" WINE_TRY_CFLAGS([-Wl,-no_new_main -e _main], [WINEPRELOADER_LDFLAGS="-Wl,-no_new_main $WINEPRELOADER_LDFLAGS" WINE_TRY_CFLAGS([-Wl,-no_new_main -e _main -nostartfiles -nodefaultlibs],, @@ -910,7 +910,7 @@ case $host_os in enable_wineandroid_drv=${enable_wineandroid_drv:-yes} WINE_TRY_CFLAGS([-fPIC -Wl,--export-dynamic], [WINELOADER_LDFLAGS="-Wl,--export-dynamic"]) - WINEPRELOADER_LDFLAGS="-static -nostartfiles -nodefaultlibs -Wl,-Ttext=0x7c400000" + WINEPRELOADER_LDFLAGS="-static -nostartfiles -nodefaultlibs -Wl,-Ttext=0x7d400000" WINE_TRY_CFLAGS([-fPIC -Wl,--rpath,\$ORIGIN/../lib], [LDRPATH_INSTALL="-Wl,--rpath,\\\$\$ORIGIN/\`\$(MAKEDEP) -R \${bindir} \${libdir}\`" LDRPATH_LOCAL="-Wl,--rpath,\\\$\$ORIGIN/\$(top_builddir)/libs/wine"], @@ -965,7 +965,7 @@ case $host_os in WINE_TRY_CFLAGS([-Wl,--export-dynamic], [WINELOADER_LDFLAGS="-Wl,--export-dynamic"]) - WINEPRELOADER_LDFLAGS="-static -nostartfiles -nodefaultlibs -Wl,-Ttext=0x7c400000" + WINEPRELOADER_LDFLAGS="-static -nostartfiles -nodefaultlibs -Wl,-Ttext=0x7d400000" WINE_TRY_CFLAGS([-Wl,--rpath,\$ORIGIN/../lib], [LDRPATH_INSTALL="-Wl,--rpath,\\\$\$ORIGIN/\`\$(MAKEDEP) -R \${bindir} \${libdir}\`" @@ -982,12 +982,12 @@ case $host_os in WINE_TRY_CFLAGS([-Wl,-Ttext-segment=0x7bc00000], [case $host_os in freebsd* | kfreebsd*-gnu) WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -Wl,-Ttext-segment=0x60000000" ;; - *) WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -Wl,-Ttext-segment=0x7c000000" ;; + *) WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -Wl,-Ttext-segment=0x7d000000" ;; esac], - [WINE_TRY_CFLAGS([-Wl,--section-start,.interp=0x7c000400], + [WINE_TRY_CFLAGS([-Wl,--section-start,.interp=0x7d000400], [case $host_os in freebsd* | kfreebsd*-gnu) WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -Wl,--section-start,.interp=0x60000400" ;; - *) WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -Wl,--section-start,.interp=0x7c000400" ;; + *) WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -Wl,--section-start,.interp=0x7d000400" ;; esac]) AC_PATH_PROG(PRELINK, prelink, false, [/sbin /usr/sbin $PATH]) if test "x$PRELINK" = xfalse

1 0

Jacek Caban : kernel32: Move AllocConsole to kernelbase.
by Alexandre Julliard July 1, 2020

July 1, 2020

Module: wine Branch: master Commit: 2175c7c25e3ae3c270a165e608e292333ee8b81a URL: https://source.winehq.org/git/wine.git/?a=commit;h=2175c7c25e3ae3c270a165e6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 1 16:27:56 2020 +0200 kernel32: Move AllocConsole to kernelbase. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/console.c | 170 ---------------------------------------- dlls/kernel32/kernel32.spec | 2 +- dlls/kernelbase/console.c | 106 +++++++++++++++++++++++++ dlls/kernelbase/kernelbase.spec | 2 +- 4 files changed, 108 insertions(+), 172 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2175c7c25e3ae3c270a1…

1 0

Jacek Caban : kernel32: Return standard input handle in GetConsoleInputWaitHandle.
by Alexandre Julliard July 1, 2020

July 1, 2020

Module: wine Branch: master Commit: e43f51640a49683098de02bac0e31e10cb23b555 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e43f51640a49683098de02ba… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 1 16:27:22 2020 +0200 kernel32: Return standard input handle in GetConsoleInputWaitHandle. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/console.c | 17 +---------------- dlls/kernel32/tests/console.c | 13 ++++++++++++- 2 files changed, 13 insertions(+), 17 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index ba3e4b0dd8..9414e6e2a3 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -76,9 +76,6 @@ static CRITICAL_SECTION CONSOLE_CritSect = { &critsect_debug, -1, 0, 0, 0, 0 }; static const WCHAR coninW[] = {'C','O','N','I','N','$',0}; static const WCHAR conoutW[] = {'C','O','N','O','U','T','$',0}; -/* FIXME: this is not thread safe */ -static HANDLE console_wait_event; - /* map input records to ASCII */ static void input_records_WtoA( INPUT_RECORD *buffer, int count ) { @@ -302,16 +299,7 @@ BOOL WINAPI CloseConsoleHandle(HANDLE handle) */ HANDLE WINAPI GetConsoleInputWaitHandle(void) { - if (!console_wait_event) - { - SERVER_START_REQ(get_console_wait_event) - { - if (!wine_server_call_err( req )) - console_wait_event = wine_server_ptr_handle( reply->event ); - } - SERVER_END_REQ; - } - return console_wait_event; + return GetStdHandle( STD_INPUT_HANDLE ); } @@ -630,9 +618,6 @@ BOOL WINAPI AllocConsole(void) return FALSE; } - /* invalidate local copy of input event handle */ - console_wait_event = 0; - GetStartupInfoA(&siCurrent); memset(&siConsole, 0, sizeof(siConsole)); diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 50f80314f0..45951afef8 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -30,6 +30,8 @@ static HANDLE (WINAPI *pOpenConsoleW)(LPCWSTR,DWORD,BOOL,DWORD); static BOOL (WINAPI *pSetConsoleInputExeNameA)(LPCSTR); static BOOL (WINAPI *pVerifyConsoleIoHandle)(HANDLE handle); +static BOOL skip_nt; + /* DEFAULT_ATTRIB is used for all initial filling of the console. * all modifications are made with TEST_ATTRIB so that we could check * what has to be modified or not @@ -1267,7 +1269,6 @@ static void test_CreateFileW(void) UNICODE_STRING string; IO_STATUS_BLOCK iosb; NTSTATUS status; - BOOL skip_nt = FALSE; for (index = 0; index < ARRAY_SIZE(cf_table); index++) { @@ -3225,6 +3226,16 @@ static void test_FreeConsole(void) ok(handle == INVALID_HANDLE_VALUE && (GetLastError() == ERROR_INVALID_HANDLE || broken(GetLastError() == ERROR_FILE_NOT_FOUND /* winxp */)), "CreateFileA failed: %u\n", GetLastError()); + + if (!skip_nt) + { + SetStdHandle( STD_INPUT_HANDLE, (HANDLE)0xdeadbeef ); + handle = GetConsoleInputWaitHandle(); + ok(handle == (HANDLE)0xdeadbeef, "GetConsoleInputWaitHandle returned %p\n", handle); + SetStdHandle( STD_INPUT_HANDLE, NULL ); + handle = GetConsoleInputWaitHandle(); + ok(!handle, "GetConsoleInputWaitHandle returned %p\n", handle); + } } static void test_SetConsoleScreenBufferInfoEx(HANDLE std_output)

1 0

Jacek Caban : kernel32: Import FreeConsole from kernelbase.
by Alexandre Julliard July 1, 2020

July 1, 2020

Module: wine Branch: master Commit: 99e6bab3ed43498e71695e9f2885ae7de6209431 URL: https://source.winehq.org/git/wine.git/?a=commit;h=99e6bab3ed43498e71695e9f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 1 16:27:14 2020 +0200 kernel32: Import FreeConsole from kernelbase. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/console.c | 22 ++-------------------- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/sync.c | 23 +---------------------- 3 files changed, 4 insertions(+), 43 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index 04b89f8f55..ba3e4b0dd8 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -425,7 +425,7 @@ static enum read_console_input_return read_console_input(HANDLE handle, PINPUT_R if ((fd = get_console_bare_fd(handle)) != -1) { put_console_into_raw_mode(fd); - if (WaitForSingleObject(GetConsoleInputWaitHandle(), 0) != WAIT_OBJECT_0) + if (WaitForSingleObject(handle, 0) != WAIT_OBJECT_0) { ret = bare_console_fetch_input(handle, fd, timeout); } @@ -437,7 +437,7 @@ static enum read_console_input_return read_console_input(HANDLE handle, PINPUT_R { if (!VerifyConsoleIoHandle(handle)) return rci_error; - if (WaitForSingleObject(GetConsoleInputWaitHandle(), timeout) != WAIT_OBJECT_0) + if (WaitForSingleObject(handle, timeout) != WAIT_OBJECT_0) return rci_timeout; } @@ -531,24 +531,6 @@ DWORD WINAPI GetConsoleTitleA(LPSTR title, DWORD size) static WCHAR* S_EditString /* = NULL */; static unsigned S_EditStrPos /* = 0 */; -/*********************************************************************** - * FreeConsole (KERNEL32.@) - */ -BOOL WINAPI FreeConsole(VOID) -{ - BOOL ret; - - /* invalidate local copy of input event handle */ - console_wait_event = 0; - - SERVER_START_REQ(free_console) - { - ret = !wine_server_call_err( req ); - } - SERVER_END_REQ; - return ret; -} - /****************************************************************** * start_console_renderer * diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index e7a7f162b7..c2ca098d5f 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -524,7 +524,7 @@ @ stdcall -import FoldStringW(long wstr long ptr long) @ stdcall -import FormatMessageA(long ptr long long ptr long ptr) @ stdcall -import FormatMessageW(long ptr long long ptr long ptr) -@ stdcall FreeConsole() +@ stdcall -import FreeConsole() @ stdcall -import FreeEnvironmentStringsA(ptr) @ stdcall -import FreeEnvironmentStringsW(ptr) @ stub -i386 FreeLSCallback diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index 4032315750..b3a59a4df9 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -85,24 +85,6 @@ static BOOL get_open_object_attributes( OBJECT_ATTRIBUTES *attr, UNICODE_STRING return TRUE; } -static HANDLE normalize_handle_if_console(HANDLE handle) -{ - if ((handle == (HANDLE)STD_INPUT_HANDLE) || - (handle == (HANDLE)STD_OUTPUT_HANDLE) || - (handle == (HANDLE)STD_ERROR_HANDLE)) - handle = GetStdHandle( HandleToULong(handle) ); - - /* yes, even screen buffer console handles are waitable, and are - * handled as a handle to the console itself !! - */ - if (is_console_handle(handle)) - { - if (VerifyConsoleIoHandle(handle)) - handle = GetConsoleInputWaitHandle(); - } - return handle; -} - /****************************************************************************** * GetTickCount64 (KERNEL32.@) */ @@ -135,10 +117,7 @@ DWORD WINAPI DECLSPEC_HOTPATCH GetTickCount(void) BOOL WINAPI RegisterWaitForSingleObject( HANDLE *wait, HANDLE object, WAITORTIMERCALLBACK callback, void *context, ULONG timeout, ULONG flags ) { - TRACE( "%p %p %p %p %d %d\n", wait, object, callback, context, timeout, flags ); - - object = normalize_handle_if_console( object ); - return set_ntstatus( RtlRegisterWait( wait, object, callback, context, timeout, flags )); + return (*wait = RegisterWaitForSingleObjectEx( object, callback, context, timeout, flags)) != NULL; } /***********************************************************************

1 0