November 2020 - Wine-commits

Alexandre Julliard : libport: Move the case mapping table back to libwine and stop updating it.
by Alexandre Julliard 30 Nov '20

30 Nov '20

Module: wine Branch: master Commit: c7196dc945879e24e0f255c9e108fe116b3b11f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c7196dc945879e24e0f255c9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Nov 29 21:35:16 2020 +0100 libport: Move the case mapping table back to libwine and stop updating it. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/window.c | 2 ++ include/wine/unicode.h | 7 +++---- libs/port/Makefile.in | 1 - libs/wine/Makefile.in | 1 + libs/{port => wine}/casemap.c | 6 ++++++ libs/wine/wine.map | 4 ++-- tools/make_unicode | 47 ------------------------------------------- 7 files changed, 14 insertions(+), 54 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 457173964eb..ba722721ad2 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -37,6 +37,8 @@ #include <X11/extensions/shape.h> #endif /* HAVE_LIBXSHAPE */ +/* avoid conflict with field names in included win32 headers */ +#undef Status #include "windef.h" #include "winbase.h" #include "wingdi.h" diff --git a/include/wine/unicode.h b/include/wine/unicode.h index a346f4cbecd..011aacf7386 100644 --- a/include/wine/unicode.h +++ b/include/wine/unicode.h @@ -26,6 +26,7 @@ #include <windef.h> #include <winbase.h> #include <winnls.h> +#include <winternl.h> #ifdef __WINE_WINE_TEST_H #error This file should not be used in Wine tests @@ -45,14 +46,12 @@ extern "C" { WINE_UNICODE_INLINE WCHAR tolowerW( WCHAR ch ) { - extern const WCHAR wine_casemap_lower[]; - return ch + wine_casemap_lower[wine_casemap_lower[ch >> 8] + (ch & 0xff)]; + return RtlDowncaseUnicodeChar( ch ); } WINE_UNICODE_INLINE WCHAR toupperW( WCHAR ch ) { - extern const WCHAR wine_casemap_upper[]; - return ch + wine_casemap_upper[wine_casemap_upper[ch >> 8] + (ch & 0xff)]; + return RtlUpcaseUnicodeChar( ch ); } /* the character type contains the C1_* flags in the low 12 bits */ diff --git a/libs/port/Makefile.in b/libs/port/Makefile.in index aabcc833ec6..5d1019aa801 100644 --- a/libs/port/Makefile.in +++ b/libs/port/Makefile.in @@ -1,7 +1,6 @@ STATICLIB = libwine_port.a C_SRCS = \ - casemap.c \ ffs.c \ fstatvfs.c \ getopt.c \ diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in index 74ffc0d5f83..f4086b1a763 100644 --- a/libs/wine/Makefile.in +++ b/libs/wine/Makefile.in @@ -66,6 +66,7 @@ C_SRCS = \ c_936.c \ c_949.c \ c_950.c \ + casemap.c \ collation.c \ compose.c \ config.c \ diff --git a/libs/port/casemap.c b/libs/wine/casemap.c similarity index 99% rename from libs/port/casemap.c rename to libs/wine/casemap.c index 540f5ad653c..518575faad5 100644 --- a/libs/port/casemap.c +++ b/libs/wine/casemap.c @@ -2,6 +2,10 @@ /* generated from https://www.unicode.org/Public/13.0.0/ucd/UCD.zip:UnicodeData.txt */ /* DO NOT EDIT!! */ +#include "wine/asm.h" + +#ifdef __ASM_OBSOLETE + #include "windef.h" const WCHAR wine_casemap_lower[4122] = @@ -1101,3 +1105,5 @@ const WCHAR wine_casemap_upper[4557] = 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 }; + +#endif /* __ASM_OBSOLETE */ diff --git a/libs/wine/wine.map b/libs/wine/wine.map index 192bf4bd46f..6147dccc77e 100644 --- a/libs/wine/wine.map +++ b/libs/wine/wine.map @@ -7,8 +7,6 @@ WINE_1.0 __wine_main_environ; __wine_main_wargv; wine_anon_mmap; - wine_casemap_lower; - wine_casemap_upper; wine_dll_set_callback; wine_init; wine_init_argv0_path; @@ -64,6 +62,8 @@ WINE_1.0 vsnprintfW; vsprintfW; wine_call_on_stack; + wine_casemap_lower; + wine_casemap_upper; wine_compare_string; wine_cp_enum_table; wine_cp_get_table; diff --git a/tools/make_unicode b/tools/make_unicode index 8d5747ce253..c454c74440f 100755 --- a/tools/make_unicode +++ b/tools/make_unicode @@ -1716,52 +1716,6 @@ sub dump_digit_folding($) } -################################################################ -# dump the case mapping tables -sub dump_case_mappings($) -{ - my $filename = shift; - open OUTPUT,">$filename.new" or die "Cannot create $filename"; - print "Building $filename\n"; - print OUTPUT "/* Unicode case mappings */\n"; - print OUTPUT "/* generated from $UNIDATA:UnicodeData.txt */\n"; - print OUTPUT "/* DO NOT EDIT!! */\n\n"; - print OUTPUT "#include \"windef.h\"\n\n"; - - my @upper = @toupper_table; - my @lower = @tolower_table; - remove_linguistic_mappings( \@upper, \@lower ); - - dump_case_table( "wine_casemap_lower", @lower ); - print OUTPUT "\n"; - dump_case_table( "wine_casemap_upper", @upper ); - close OUTPUT; - save_file($filename); -} - - -################################################################ -# dump a case mapping table -sub dump_case_table($@) -{ - my ($name,@table) = @_; - - for (my $i = 0; $i < 65536; $i++) - { - next unless defined $table[$i]; - $table[$i] = ($table[$i] - $i) & 0xffff; - } - - my @array = compress_array( 256, 0, @table[0..65535] ); - - printf OUTPUT "const WCHAR %s[%d] =\n", $name, scalar @array; - printf OUTPUT "{\n /* index */\n"; - printf OUTPUT "%s,\n", dump_array( 16, 0, @array[0..255] ); - printf OUTPUT " /* data */\n"; - printf OUTPUT "%s", dump_array( 16, 0, @array[256..$#array] ); - printf OUTPUT "\n};\n"; -} - ################################################################ # compress a mapping table by removing identical rows sub compress_array($$@) @@ -2784,7 +2738,6 @@ sub save_file($) chdir ".." if -f "./make_unicode"; load_data(); -dump_case_mappings( "libs/port/casemap.c" ); dump_sortkeys( "dlls/kernelbase/collation.c" ); dump_ctype_tables( "libs/port/wctype.c" ); dump_bidi_dir_table( "dlls/gdi32/uniscribe/direction.c" );

1 0

Alexandre Julliard : libport: Move the char type table back to libwine and stop updating it.
by Alexandre Julliard 30 Nov '20

30 Nov '20

Module: wine Branch: master Commit: 875f506b33ad11f563de4ed710b7a174b0e9fcfc URL: https://source.winehq.org/git/wine.git/?a=commit;h=875f506b33ad11f563de4ed7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Nov 29 21:38:12 2020 +0100 libport: Move the char type table back to libwine and stop updating it. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/unicode.h | 5 +++-- libs/port/Makefile.in | 3 +-- libs/wine/Makefile.in | 3 ++- libs/{port => wine}/wctype.c | 6 ++++++ libs/wine/wine.map | 2 +- tools/make_unicode | 40 ---------------------------------------- 6 files changed, 13 insertions(+), 46 deletions(-) diff --git a/include/wine/unicode.h b/include/wine/unicode.h index 011aacf7386..7a9e07fa1bc 100644 --- a/include/wine/unicode.h +++ b/include/wine/unicode.h @@ -58,8 +58,9 @@ WINE_UNICODE_INLINE WCHAR toupperW( WCHAR ch ) /* and the C2_* type in the high 4 bits */ WINE_UNICODE_INLINE unsigned short get_char_typeW( WCHAR ch ) { - extern const unsigned short wine_wctype_table[]; - return wine_wctype_table[wine_wctype_table[ch >> 8] + (ch & 0xff)]; + unsigned short type; + GetStringTypeW( CT_CTYPE1, &ch, 1, &type ); + return type; } WINE_UNICODE_INLINE int iscntrlW( WCHAR wc ) diff --git a/libs/port/Makefile.in b/libs/port/Makefile.in index 5d1019aa801..51cfdb4df54 100644 --- a/libs/port/Makefile.in +++ b/libs/port/Makefile.in @@ -18,5 +18,4 @@ C_SRCS = \ statvfs.c \ strnlen.c \ symlink.c \ - usleep.c \ - wctype.c + usleep.c diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in index f4086b1a763..885a7326568 100644 --- a/libs/wine/Makefile.in +++ b/libs/wine/Makefile.in @@ -84,7 +84,8 @@ C_SRCS = \ sortkey.c \ string.c \ utf8.c \ - wctomb.c + wctomb.c \ + wctype.c config_EXTRADEFS = \ -DBINDIR='"${bindir}"' \ diff --git a/libs/port/wctype.c b/libs/wine/wctype.c similarity index 99% rename from libs/port/wctype.c rename to libs/wine/wctype.c index 9b38bd0a0e2..e384e573f64 100644 --- a/libs/port/wctype.c +++ b/libs/wine/wctype.c @@ -1,6 +1,10 @@ /* Unicode ctype tables */ /* Automatically generated; DO NOT EDIT!! */ +#include "wine/asm.h" + +#ifdef __ASM_OBSOLETE + #include "windef.h" const unsigned short wine_wctype_table[16242] = @@ -2039,3 +2043,5 @@ const unsigned short wine_wctype_table[16242] = 0x0000, 0x0000, 0x0000, 0xb220, 0xb220, 0xb220, 0xb200, 0xb200, 0x0000, 0x0000 }; + +#endif /* __ASM_OBSOLETE */ diff --git a/libs/wine/wine.map b/libs/wine/wine.map index 6147dccc77e..1b0df15eef5 100644 --- a/libs/wine/wine.map +++ b/libs/wine/wine.map @@ -14,7 +14,6 @@ WINE_1.0 wine_mmap_enum_reserved_areas; wine_mmap_is_in_reserved_area; wine_mmap_remove_reserved_area; - wine_wctype_table; /* the following functions are obsolete and only exported for backwards compatibility */ @@ -120,6 +119,7 @@ WINE_1.0 wine_switch_to_stack; wine_utf8_mbstowcs; wine_utf8_wcstombs; + wine_wctype_table; local: *; }; diff --git a/tools/make_unicode b/tools/make_unicode index c454c74440f..02bb0afdb66 100755 --- a/tools/make_unicode +++ b/tools/make_unicode @@ -1753,19 +1753,6 @@ sub compress_array($$@) return @array, unpack "U*", $data; } -################################################################ -# dump a simple char -> 16-bit value mapping table -sub dump_simple_mapping($$@) -{ - my $name = shift; - my $def = shift; - my @array = compress_array( 256, $def, @_[0..65535] ); - - printf OUTPUT "const unsigned short %s[%d] =\n{\n", $name, $#array+1; - printf OUTPUT " /* offsets */\n%s,\n", dump_array( 16, 0, @array[0..255] ); - printf OUTPUT " /* values */\n%s\n};\n", dump_array( 16, 0, @array[256..$#array] ); -} - ################################################################ # dump a char -> 16-bit value mapping table using two-level tables sub dump_two_level_mapping($$@) @@ -1882,32 +1869,6 @@ sub dump_bidi_dir_table($) } -################################################################ -# dump the ctype tables -sub dump_ctype_tables($) -{ - my $filename = shift; - open OUTPUT,">$filename.new" or die "Cannot create $filename"; - printf "Building $filename\n"; - printf OUTPUT "/* Unicode ctype tables */\n"; - printf OUTPUT "/* Automatically generated; DO NOT EDIT!! */\n\n"; - printf OUTPUT "#include \"windef.h\"\n\n"; - - my @table = map { ($_ || 0) & 0xffff; } @category_table; - - # add the direction in the high 4 bits of the category - for (my $i = 0; $i < 65536; $i++) - { - $table[$i] |= $directions{$direction_table[$i]} << 12 if defined $direction_table[$i]; - } - - dump_simple_mapping( "wine_wctype_table", 0, @table ); - - close OUTPUT; - save_file($filename); -} - - sub rol($$) { my ($byte, $count) = @_; @@ -2739,7 +2700,6 @@ sub save_file($) chdir ".." if -f "./make_unicode"; load_data(); dump_sortkeys( "dlls/kernelbase/collation.c" ); -dump_ctype_tables( "libs/port/wctype.c" ); dump_bidi_dir_table( "dlls/gdi32/uniscribe/direction.c" ); dump_bidi_dir_table( "dlls/dwrite/direction.c" ); dump_digit_folding( "dlls/kernelbase/digitmap.c" );

1 0

Michael Stefaniuc : rpcrt4: Use wide-char string literals.
by Alexandre Julliard 30 Nov '20

30 Nov '20

Module: wine Branch: master Commit: d452c7574ffc9fef983980f09fd57c5ad04910a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d452c7574ffc9fef983980f0… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sat Nov 28 23:07:22 2020 +0100 rpcrt4: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/cpsf.c | 38 +++++++++-------------------- dlls/rpcrt4/rpc_binding.c | 3 +-- dlls/rpcrt4/rpc_epmap.c | 3 +-- dlls/rpcrt4/rpc_transport.c | 59 ++++++++++++++++----------------------------- dlls/rpcrt4/tests/rpc.c | 3 +-- dlls/rpcrt4/tests/server.c | 20 ++++++--------- 6 files changed, 44 insertions(+), 82 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d452c7574ffc9fef9839…

1 0

Michael Stefaniuc : oleaut32: Use more wide-char string literals.
by Alexandre Julliard 30 Nov '20

30 Nov '20

Module: wine Branch: master Commit: 3093ac8b097c9af0e3dbc8ecc3925c221e1a0598 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3093ac8b097c9af0e3dbc8ec… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sat Nov 28 23:07:23 2020 +0100 oleaut32: Use more wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/oleaut.c | 81 ++++++++++++-------------------------- dlls/oleaut32/olefont.c | 2 +- dlls/oleaut32/usrmarshal.c | 3 +- dlls/oleaut32/varformat.c | 98 ++++++++++++++++++---------------------------- 4 files changed, 66 insertions(+), 118 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3093ac8b097c9af0e3db…

1 0

Michael Stefaniuc : wbemdisp: Use wide-char string literals.
by Alexandre Julliard 30 Nov '20

30 Nov '20

Module: wine Branch: master Commit: 2863952c1d1dda532482d4da1caa23c17224343f URL: https://source.winehq.org/git/wine.git/?a=commit;h=2863952c1d1dda532482d4da… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Nov 29 23:30:32 2020 +0100 wbemdisp: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemdisp/locator.c | 16 +++++------- dlls/wbemdisp/main.c | 5 ++-- dlls/wbemdisp/tests/wbemdisp.c | 58 +++++++++++++----------------------------- 3 files changed, 25 insertions(+), 54 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2863952c1d1dda532482…

1 0

Jacek Caban : server: Use separated fd ops for unbound console output.
by Alexandre Julliard 27 Nov '20

27 Nov '20

Module: wine Branch: master Commit: 2a132a18390e848b90c0273e891cbeb6d140bc70 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a132a18390e848b90c0273e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 27 18:14:12 2020 +0100 server: Use separated fd ops for unbound console output. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 7 ++++ server/console.c | 82 +++++++++++++++++++++++++++++++++++++------ 2 files changed, 79 insertions(+), 10 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 5e604e949f6..ea6af85c15a 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -3878,6 +3878,13 @@ static void test_FreeConsole(void) ok(!ret && GetLastError() == ERROR_INVALID_HANDLE, "ReadFile returned %x %u\n", ret, GetLastError()); + ret = WriteFile(unbound_input, "test", 4, &size, NULL); + ok(!ret && GetLastError() == ERROR_INVALID_HANDLE, + "ReadFile returned %x %u\n", ret, GetLastError()); + + ret = GetConsoleMode(unbound_input, &mode); + ok(!ret && GetLastError() == ERROR_INVALID_HANDLE, + "GetConsoleMode returned %x %u\n", ret, GetLastError()); ret = GetConsoleMode(unbound_output, &mode); ok(!ret && GetLastError() == ERROR_INVALID_HANDLE, "GetConsoleMode returned %x %u\n", ret, GetLastError()); diff --git a/server/console.c b/server/console.c index 7cffa512f0e..295db7767b2 100644 --- a/server/console.c +++ b/server/console.c @@ -346,15 +346,22 @@ static const struct fd_ops console_input_fd_ops = default_fd_reselect_async /* reselect_async */ }; +struct console_output +{ + struct object obj; /* object header */ + struct fd *fd; /* pseudo-fd */ +}; + static void console_output_dump( struct object *obj, int verbose ); static int console_output_add_queue( struct object *obj, struct wait_queue_entry *entry ); static struct fd *console_output_get_fd( struct object *obj ); static struct object *console_output_open_file( struct object *obj, unsigned int access, unsigned int sharing, unsigned int options ); +static void console_output_destroy( struct object *obj ); static const struct object_ops console_output_ops = { - sizeof(struct object), /* size */ + sizeof(struct console_output), /* size */ console_output_dump, /* dump */ console_device_get_type, /* get_type */ console_output_add_queue, /* add_queue */ @@ -373,7 +380,25 @@ static const struct object_ops console_output_ops = console_output_open_file, /* open_file */ no_kernel_obj_list, /* get_kernel_obj_list */ no_close_handle, /* close_handle */ - no_destroy /* destroy */ + console_output_destroy /* destroy */ +}; + +static int console_output_write( struct fd *fd, struct async *async, file_pos_t pos ); +static int console_output_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ); + +static const struct fd_ops console_output_fd_ops = +{ + default_fd_get_poll_events, /* get_poll_events */ + default_poll_event, /* poll_event */ + console_get_fd_type, /* get_fd_type */ + no_fd_read, /* read */ + console_output_write, /* write */ + no_fd_flush, /* flush */ + console_get_file_info, /* get_file_info */ + console_get_volume_info, /* get_volume_info */ + console_output_ioctl, /* ioctl */ + default_fd_queue_async, /* queue_async */ + default_fd_reselect_async /* reselect_async */ }; struct console_connection @@ -1254,8 +1279,17 @@ static struct object *console_device_lookup_name( struct object *obj, struct uni if (name->len == sizeof(outputW) && !memcmp( name->str, outputW, name->len )) { + struct console_output *console_output; name->len = 0; - return alloc_object( &console_output_ops ); + if (!(console_output = alloc_object( &console_output_ops ))) return NULL; + console_output->fd = alloc_pseudo_fd( &console_output_fd_ops, &console_output->obj, + FILE_SYNCHRONOUS_IO_NONALERT ); + if (!console_output->fd) + { + release_object( console_output ); + return NULL; + } + return &console_output->obj; } if (name->len == sizeof(screen_bufferW) && !memcmp( name->str, screen_bufferW, name->len )) @@ -1392,13 +1426,9 @@ static int console_output_add_queue( struct object *obj, struct wait_queue_entry static struct fd *console_output_get_fd( struct object *obj ) { - if (!current->process->console || !current->process->console->active) - { - set_error( STATUS_ACCESS_DENIED ); - return NULL; - } - - return get_obj_fd( &current->process->console->active->obj ); + struct console_output *console_output = (struct console_output *)obj; + assert( obj->ops == &console_output_ops ); + return (struct fd *)grab_object( console_output->fd ); } static struct object *console_output_open_file( struct object *obj, unsigned int access, @@ -1407,6 +1437,38 @@ static struct object *console_output_open_file( struct object *obj, unsigned int return grab_object( obj ); } +static void console_output_destroy( struct object *obj ) +{ + struct console_output *console_output = (struct console_output *)obj; + + assert( obj->ops == &console_output_ops ); + if (console_output->fd) release_object( console_output->fd ); +} + +static int console_output_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) +{ + struct console *console = current->process->console; + + if (!console || !console->active) + { + set_error( STATUS_INVALID_HANDLE ); + return 0; + } + return screen_buffer_ioctl( console->active->fd, code, async ); +} + +static int console_output_write( struct fd *fd, struct async *async, file_pos_t pos ) +{ + struct console *console = current->process->console; + + if (!console || !console->active) + { + set_error( STATUS_INVALID_HANDLE ); + return 0; + } + return screen_buffer_write( console->active->fd, async, pos ); +} + struct object *create_console_device( struct object *root, const struct unicode_str *name, unsigned int attr, const struct security_descriptor *sd ) {

1 0

Jacek Caban : kernelbase: Use FileFsDeviceInformation for console handles in GetFileType.
by Alexandre Julliard 27 Nov '20

27 Nov '20

Module: wine Branch: master Commit: cbca9f847f60773b4e7e5408f6a079f4896c5c1e URL: https://source.winehq.org/git/wine.git/?a=commit;h=cbca9f847f60773b4e7e5408… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 27 18:14:22 2020 +0100 kernelbase: Use FileFsDeviceInformation for console handles in GetFileType. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 7 ++++++- dlls/kernelbase/file.c | 3 +-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index ea6af85c15a..cab036243dc 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -3777,7 +3777,7 @@ static void test_GetConsoleScreenBufferInfoEx(HANDLE std_output) static void test_FreeConsole(void) { HANDLE handle, unbound_output = NULL, unbound_input = NULL; - DWORD size, mode; + DWORD size, mode, type; WCHAR title[16]; char buf[32]; HWND hwnd; @@ -3889,6 +3889,11 @@ static void test_FreeConsole(void) ok(!ret && GetLastError() == ERROR_INVALID_HANDLE, "GetConsoleMode returned %x %u\n", ret, GetLastError()); + type = GetFileType(unbound_input); + ok(type == FILE_TYPE_CHAR, "GetFileType returned %u\n", type); + type = GetFileType(unbound_output); + ok(type == FILE_TYPE_CHAR, "GetFileType returned %u\n", type); + CloseHandle(unbound_input); CloseHandle(unbound_output); } diff --git a/dlls/kernelbase/file.c b/dlls/kernelbase/file.c index bfa44b4da50..7d0c4d63aa8 100644 --- a/dlls/kernelbase/file.c +++ b/dlls/kernelbase/file.c @@ -3099,8 +3099,6 @@ DWORD WINAPI DECLSPEC_HOTPATCH GetFileType( HANDLE file ) file == (HANDLE)STD_ERROR_HANDLE) file = GetStdHandle( (DWORD_PTR)file ); - if (is_console_handle( file )) return FILE_TYPE_CHAR; - if (!set_ntstatus( NtQueryVolumeInformationFile( file, &io, &info, sizeof(info), FileFsDeviceInformation ))) return FILE_TYPE_UNKNOWN; @@ -3108,6 +3106,7 @@ DWORD WINAPI DECLSPEC_HOTPATCH GetFileType( HANDLE file ) switch (info.DeviceType) { case FILE_DEVICE_NULL: + case FILE_DEVICE_CONSOLE: case FILE_DEVICE_SERIAL_PORT: case FILE_DEVICE_PARALLEL_PORT: case FILE_DEVICE_TAPE:

1 0

Piotr Caban : msvcp90: Remove MSVCP_size_t type.
by Alexandre Julliard 27 Nov '20

27 Nov '20

Module: wine Branch: master Commit: 0237785d9d777f49ed44623b814044d602d09bb1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0237785d9d777f49ed44623b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Nov 27 16:44:47 2020 +0100 msvcp90: Remove MSVCP_size_t type. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/ios.c | 71 ++--- dlls/msvcp90/locale.c | 506 +++++++++++++++++----------------- dlls/msvcp90/memory.c | 26 +- dlls/msvcp90/misc.c | 158 +++++------ dlls/msvcp90/msvcp90.h | 41 ++- dlls/msvcp90/msvcp_main.c | 8 +- dlls/msvcp90/string.c | 686 +++++++++++++++++++++++----------------------- 7 files changed, 748 insertions(+), 748 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0237785d9d777f49ed44…

1 0

Piotr Caban : msvcp90: Use wide-char string literals.
by Alexandre Julliard 27 Nov '20

27 Nov '20

Module: wine Branch: master Commit: 4deb599d5a300240b96ac63c84a5b422dd9633a8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4deb599d5a300240b96ac63c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Nov 27 16:44:51 2020 +0100 msvcp90: Use wide-char string literals. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/ios.c | 34 ++++++++++++++-------------------- dlls/msvcp90/string.c | 4 +--- 2 files changed, 15 insertions(+), 23 deletions(-) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index a532bde91b3..09591cc0f1d 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -3198,21 +3198,20 @@ MSVCP_bool __thiscall basic_filebuf_char_is_open(const basic_filebuf_char *this) /* ?_Fiopen(a)std@@YAPEAU_iobuf@@PEB_WHH(a)Z */ FILE* __cdecl _Fiopen_wchar(const wchar_t *name, int mode, int prot) { - static const wchar_t rW[] = {'r',0}; static const struct { int mode; const wchar_t str[4]; const wchar_t str_bin[4]; } str_mode[] = { - {OPENMODE_out, {'w',0}, {'w','b',0}}, - {OPENMODE_out|OPENMODE_app, {'a',0}, {'a','b',0}}, - {OPENMODE_app, {'a',0}, {'a','b',0}}, - {OPENMODE_out|OPENMODE_trunc, {'w',0}, {'w','b',0}}, - {OPENMODE_in, {'r',0}, {'r','b',0}}, - {OPENMODE_in|OPENMODE_out, {'r','+',0}, {'r','+','b',0}}, - {OPENMODE_in|OPENMODE_out|OPENMODE_trunc, {'w','+',0}, {'w','+','b',0}}, - {OPENMODE_in|OPENMODE_out|OPENMODE_app, {'a','+',0}, {'a','+','b',0}}, - {OPENMODE_in|OPENMODE_app, {'a','+',0}, {'a','+','b',0}} + {OPENMODE_out, L"w", L"wb"}, + {OPENMODE_out|OPENMODE_app, L"a", L"ab"}, + {OPENMODE_app, L"a", L"ab"}, + {OPENMODE_out|OPENMODE_trunc, L"w", L"wb"}, + {OPENMODE_in, L"r", L"rb"}, + {OPENMODE_in|OPENMODE_out, L"r+", L"r+b"}, + {OPENMODE_in|OPENMODE_out|OPENMODE_trunc, L"w+", L"w+b"}, + {OPENMODE_in|OPENMODE_out|OPENMODE_app, L"a+", L"a+b"}, + {OPENMODE_in|OPENMODE_app, L"a+", L"a+b"} }; int real_mode = mode & ~(OPENMODE_ate|OPENMODE__Nocreate|OPENMODE__Noreplace|OPENMODE_binary); @@ -3227,13 +3226,13 @@ FILE* __cdecl _Fiopen_wchar(const wchar_t *name, int mode, int prot) if(mode_idx == ARRAY_SIZE(str_mode)) return NULL; - if((mode & OPENMODE__Nocreate) && !(f = _wfopen(name, rW))) + if((mode & OPENMODE__Nocreate) && !(f = _wfopen(name, L"r"))) return NULL; else if(f) fclose(f); if((mode & OPENMODE__Noreplace) && (mode & (OPENMODE_out|OPENMODE_app)) - && (f = _wfopen(name, rW))) { + && (f = _wfopen(name, L"r"))) { fclose(f); return NULL; } @@ -14959,9 +14958,6 @@ void* __cdecl tr2_sys__Open_dir_wchar(wchar_t* target, wchar_t const* dest, int* HANDLE handle; WIN32_FIND_DATAW data; wchar_t temppath[MAX_PATH]; - static const wchar_t dot[] = {'.', 0}; - static const wchar_t dotdot[] = {'.', '.', 0}; - static const wchar_t asterisk[] = {'\\', '*', 0}; TRACE("(%p %s %p %p)\n", target, debugstr_w(dest), err_code, type); if(wcslen(dest) > MAX_PATH - 3) { @@ -14970,7 +14966,7 @@ void* __cdecl tr2_sys__Open_dir_wchar(wchar_t* target, wchar_t const* dest, int* return NULL; } wcscpy(temppath, dest); - wcscat(temppath, asterisk); + wcscat(temppath, L"\\*"); handle = FindFirstFileW(temppath, &data); if(handle == INVALID_HANDLE_VALUE) { @@ -14978,7 +14974,7 @@ void* __cdecl tr2_sys__Open_dir_wchar(wchar_t* target, wchar_t const* dest, int* *target = '\0'; return NULL; } - while(!wcscmp(data.cFileName, dot) || !wcscmp(data.cFileName, dotdot)) { + while(!wcscmp(data.cFileName, L".") || !wcscmp(data.cFileName, L"..")) { if(!FindNextFileW(handle, &data)) { *err_code = ERROR_SUCCESS; *type = status_unknown; @@ -15026,8 +15022,6 @@ void* __cdecl tr2_sys__Open_dir(char* target, char const* dest, int* err_code, e wchar_t* __cdecl tr2_sys__Read_dir_wchar(wchar_t* target, void* handle, enum file_type* type) { WIN32_FIND_DATAW data; - static const wchar_t dot[] = {'.', 0}; - static const wchar_t dotdot[] = {'.', '.', 0}; TRACE("(%p %p %p)\n", target, handle, type); @@ -15037,7 +15031,7 @@ wchar_t* __cdecl tr2_sys__Read_dir_wchar(wchar_t* target, void* handle, enum fil *target = '\0'; return target; } - } while(!wcscmp(data.cFileName, dot) || !wcscmp(data.cFileName, dotdot)); + } while(!wcscmp(data.cFileName, L".") || !wcscmp(data.cFileName, L"..")); wcscpy(target, data.cFileName); if(data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index bf2933914ef..894883ade05 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -2287,10 +2287,8 @@ const wchar_t* __thiscall basic_string_wchar_const_ptr(const basic_string_wchar DEFINE_THISCALL_WRAPPER(basic_string_wchar_eos, 8) void __thiscall basic_string_wchar_eos(basic_string_wchar *this, size_t len) { - static const wchar_t nullbyte_w = '\0'; - this->size = len; - MSVCP_char_traits_wchar_assign(basic_string_wchar_ptr(this)+len, &nullbyte_w); + MSVCP_char_traits_wchar_assign(basic_string_wchar_ptr(this)+len, L""); } /* ?_Inside@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@IAE_NPB_W(a)Z */

1 0

Piotr Caban : msvcp90/tests: Use wide-char string literals.
by Alexandre Julliard 27 Nov '20

27 Nov '20

Module: wine Branch: master Commit: 1990a5e0bc7fe00b392d66fa87ad19f89259c48f URL: https://source.winehq.org/git/wine.git/?a=commit;h=1990a5e0bc7fe00b392d66fa… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Nov 27 16:44:53 2020 +0100 msvcp90/tests: Use wide-char string literals. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/tests/ios.c | 16 ++++------------ dlls/msvcp90/tests/string.c | 24 ++++++++++-------------- 2 files changed, 14 insertions(+), 26 deletions(-) diff --git a/dlls/msvcp90/tests/ios.c b/dlls/msvcp90/tests/ios.c index 6957f4ccba9..994420dd229 100644 --- a/dlls/msvcp90/tests/ios.c +++ b/dlls/msvcp90/tests/ios.c @@ -2111,8 +2111,6 @@ static void test_istream_getline(void) static void test_ostream_print_ushort(void) { - static const wchar_t str65[] = { '6','5',0 }; - basic_stringstream_wchar wss; basic_string_wchar pwstr; const wchar_t *wstr; @@ -2122,7 +2120,7 @@ static void test_ostream_print_ushort(void) call_func2(p_basic_stringstream_wchar_str_get, &wss, &pwstr); wstr = call_func1(p_basic_string_wchar_cstr, &pwstr); - ok(!lstrcmpW(str65, wstr), "wstr = %s\n", wine_dbgstr_w(wstr)); + ok(!lstrcmpW(L"65", wstr), "wstr = %s\n", wine_dbgstr_w(wstr)); call_func1(p_basic_string_wchar_dtor, &pwstr); call_func1(p_basic_stringstream_wchar_vbase_dtor, &wss); @@ -2130,8 +2128,6 @@ static void test_ostream_print_ushort(void) static void test_ostream_print_float(void) { - static const char float_str[] = "3.14159"; - basic_stringstream_char ss; basic_string_char pstr; const char *str; @@ -2142,7 +2138,7 @@ static void test_ostream_print_float(void) call_func2_ptr_flt(p_basic_ostream_char_print_float, &ss.base.base2, val); call_func2(p_basic_stringstream_char_str_get, &ss, &pstr); str = call_func1(p_basic_string_char_cstr, &pstr); - ok(!strcmp(float_str, str), "str = %s\n", str); + ok(!strcmp("3.14159", str), "str = %s\n", str); call_func1(p_basic_string_char_dtor, &pstr); call_func1(p_basic_stringstream_char_vbase_dtor, &ss); @@ -2150,8 +2146,6 @@ static void test_ostream_print_float(void) static void test_ostream_print_double(void) { - static const char double_str[] = "3.14159"; - basic_stringstream_char ss; basic_string_char pstr; const char *str; @@ -2162,7 +2156,7 @@ static void test_ostream_print_double(void) call_func2_ptr_dbl(p_basic_ostream_char_print_double, &ss.base.base2, val); call_func2(p_basic_stringstream_char_str_get, &ss, &pstr); str = call_func1(p_basic_string_char_cstr, &pstr); - ok(!strcmp(double_str, str), "str = %s\n", str); + ok(!strcmp("3.14159", str), "str = %s\n", str); call_func1(p_basic_string_char_dtor, &pstr); call_func1(p_basic_stringstream_char_vbase_dtor, &ss); @@ -2170,8 +2164,6 @@ static void test_ostream_print_double(void) static void test_ostream_wchar_print_double(void) { - static const wchar_t double_str[] = { '3', '.', '1', '4', '1', '5', '9', 0 }; - basic_stringstream_wchar wss; basic_string_wchar pwstr; const wchar_t *wstr; @@ -2184,7 +2176,7 @@ static void test_ostream_wchar_print_double(void) call_func2(p_basic_stringstream_wchar_str_get, &wss, &pwstr); wstr = call_func1(p_basic_string_wchar_cstr, &pwstr); - ok(!lstrcmpW(double_str, wstr), "wstr = %s\n", wine_dbgstr_w(wstr)); + ok(!lstrcmpW(L"3.14159", wstr), "wstr = %s\n", wine_dbgstr_w(wstr)); call_func1(p_basic_string_wchar_dtor, &pwstr); call_func1(p_basic_stringstream_wchar_vbase_dtor, &wss); } diff --git a/dlls/msvcp90/tests/string.c b/dlls/msvcp90/tests/string.c index a0f16a9908d..6c919f84d95 100644 --- a/dlls/msvcp90/tests/string.c +++ b/dlls/msvcp90/tests/string.c @@ -517,12 +517,11 @@ static void test_basic_string_char_concatenate(void) { } static void test_basic_string_char_find(void) { - static const char tmp[] = {'a','a','a','\0','b','b','b',0}; basic_string_char str; size_t ret; call_func1(p_basic_string_char_ctor, &str); - call_func3(p_basic_string_char_assign_cstr_len, &str, tmp, 7); + call_func3(p_basic_string_char_assign_cstr_len, &str, "aaa\0bbb", 7); ret = (size_t)call_func4(p_basic_string_char_find_cstr_substr, &str, "aaa", 0, 3); ok(ret == 0, "ret = %lu\n", (unsigned long)ret); ret = (size_t)call_func4(p_basic_string_char_find_cstr_substr, &str, "aaa", 1, 3); @@ -615,8 +614,6 @@ static void test_basic_string_char_replace(void) { } static void test_basic_string_wchar(void) { - static const wchar_t test[] = { 't','e','s','t',0 }; - basic_string_wchar str1, str2, *pstr; const wchar_t *str; size_t size, capacity; @@ -631,12 +628,12 @@ static void test_basic_string_wchar(void) { ok(*str == '\0', "*str = %c\n", *str); call_func1(p_basic_string_wchar_dtor, &str1); - pstr = call_func2(p_basic_string_wchar_ctor_cstr, &str1, test); + pstr = call_func2(p_basic_string_wchar_ctor_cstr, &str1, L"test"); ok(pstr == &str1, "pstr != &str1\n"); str = call_func1(p_basic_string_wchar_cstr, &str1); - ok(!memcmp(str, test, 5*sizeof(wchar_t)), "str = %s\n", wine_dbgstr_w(str)); + ok(!memcmp(str, L"test", 5*sizeof(wchar_t)), "str = %s\n", wine_dbgstr_w(str)); str = call_func1(p_basic_string_wchar_data, &str1); - ok(!memcmp(str, test, 5*sizeof(wchar_t)), "str = %s\n", wine_dbgstr_w(str)); + ok(!memcmp(str, L"test", 5*sizeof(wchar_t)), "str = %s\n", wine_dbgstr_w(str)); size = (size_t)call_func1(p_basic_string_wchar_size, &str1); ok(size == 4, "size = %lu\n", (unsigned long)size); capacity = (size_t)call_func1(p_basic_string_wchar_capacity, &str1); @@ -646,9 +643,9 @@ static void test_basic_string_wchar(void) { pstr = call_func2(p_basic_string_wchar_copy_ctor, &str2, &str1); ok(pstr == &str2, "pstr != &str2\n"); str = call_func1(p_basic_string_wchar_cstr, &str2); - ok(!memcmp(str, test, 5*sizeof(wchar_t)), "str = %s\n", wine_dbgstr_w(str)); + ok(!memcmp(str, L"test", 5*sizeof(wchar_t)), "str = %s\n", wine_dbgstr_w(str)); str = call_func1(p_basic_string_wchar_data, &str2); - ok(!memcmp(str, test, 5*sizeof(wchar_t)), "str = %s\n", wine_dbgstr_w(str)); + ok(!memcmp(str, L"test", 5*sizeof(wchar_t)), "str = %s\n", wine_dbgstr_w(str)); call_func3(p_basic_string_wchar_erase, &str2, 1, 2); str = call_func1(p_basic_string_wchar_cstr, &str2); @@ -670,11 +667,11 @@ static void test_basic_string_wchar(void) { capacity = (size_t)call_func1(p_basic_string_wchar_capacity, &str1); ok(capacity >= size, "capacity = %lu < size = %lu\n", (unsigned long)capacity, (unsigned long)size); - call_func3(p_basic_string_wchar_assign_cstr_len, &str2, test, 4); + call_func3(p_basic_string_wchar_assign_cstr_len, &str2, L"test", 4); str = call_func1(p_basic_string_wchar_cstr, &str2); - ok(!memcmp(str, test, 5*sizeof(wchar_t)), "str = %s\n", wine_dbgstr_w(str)); + ok(!memcmp(str, L"test", 5*sizeof(wchar_t)), "str = %s\n", wine_dbgstr_w(str)); str = call_func1(p_basic_string_wchar_data, &str2); - ok(!memcmp(str, test, 5*sizeof(wchar_t)), "str = %s\n", wine_dbgstr_w(str)); + ok(!memcmp(str, L"test", 5*sizeof(wchar_t)), "str = %s\n", wine_dbgstr_w(str)); call_func3(p_basic_string_wchar_assign_cstr_len, &str2, (str+1), 2); str = call_func1(p_basic_string_wchar_cstr, &str2); @@ -769,7 +766,6 @@ static void test_basic_string_char_find_last_not_of(void) { static void test_basic_string_dtor(void) { #ifdef __i386__ - static const wchar_t qwerty[] = { 'q','w','e','r','t','y',0 }; basic_string_wchar str1; basic_string_char str2; void *ret; @@ -777,7 +773,7 @@ static void test_basic_string_dtor(void) { /* FEAR 1 installer expects that string destructors set EAX to * zero on return (see bug 37358). */ - call_func2(p_basic_string_wchar_ctor_cstr, &str1, qwerty); + call_func2(p_basic_string_wchar_ctor_cstr, &str1, L"qwerty"); ret = call_func1(p_basic_string_wchar_dtor, &str1); ok(ret == NULL, "expected NULL, got %p\n", ret);

1 0