November 2020 - Wine-Commits

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

Nov. 30, 2020

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 Nov. 30, 2020

Nov. 30, 2020

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

Alexandre Julliard : server: Release the l_intl fd once the mapping is created.
by Alexandre Julliard Nov. 30, 2020

Nov. 30, 2020

Module: wine Branch: master Commit: 9494fa6986e40fdd563436df3e705feb44f747ad URL: https://source.winehq.org/git/wine.git/?a=commit;h=9494fa6986e40fdd563436df… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Nov 28 14:59:19 2020 +0100 server: Release the l_intl fd once the mapping is created. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50204 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/directory.c | 1 + 1 file changed, 1 insertion(+) diff --git a/server/directory.c b/server/directory.c index 81d02d6f64e..ca9f978ff7f 100644 --- a/server/directory.c +++ b/server/directory.c @@ -444,6 +444,7 @@ void init_directories( struct fd *intl_fd ) /* mappings */ release_object( create_fd_mapping( &dir_nls->obj, &intl_str, intl_fd, OBJ_PERMANENT, NULL )); release_object( create_user_data_mapping( &dir_kernel->obj, &user_data_str, OBJ_PERMANENT, NULL )); + release_object( intl_fd ); release_object( named_pipe_device ); release_object( mailslot_device );

1 0

Alexandre Julliard : libport: Add both inline and non-inline versions for every Unicode function.
by Alexandre Julliard Nov. 30, 2020

Nov. 30, 2020

Module: wine Branch: master Commit: 0e03ad249c2ae7d53671bc75b0c57e2fb1665113 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e03ad249c2ae7d53671bc75… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Nov 28 21:49:20 2020 +0100 libport: Add both inline and non-inline versions for every Unicode function. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/unicode.h | 138 ++++++++++++++++++++++++++++++++++-- libs/port/string.c | 185 ++++++++++++++++++++++++++++++++++++++++++++++++- libs/wine/port.c | 1 - 3 files changed, 316 insertions(+), 8 deletions(-) diff --git a/include/wine/unicode.h b/include/wine/unicode.h index 8d30e9f4477..f42a94c7e0d 100644 --- a/include/wine/unicode.h +++ b/include/wine/unicode.h @@ -79,12 +79,6 @@ union cptable struct dbcs_table dbcs; }; -extern int strcmpiW( const WCHAR *str1, const WCHAR *str2 ); -extern int strncmpiW( const WCHAR *str1, const WCHAR *str2, int n ); -extern int memicmpW( const WCHAR *str1, const WCHAR *str2, int n ); -extern WCHAR *strstrW( const WCHAR *str, const WCHAR *sub ); -extern long int strtolW( const WCHAR *nptr, WCHAR **endptr, int base ); -extern unsigned long int strtoulW( const WCHAR *nptr, WCHAR **endptr, int base ); extern int sprintfW( WCHAR *str, const WCHAR *format, ... ); extern int snprintfW( WCHAR *str, size_t len, const WCHAR *format, ... ); extern int vsprintfW( WCHAR *str, const WCHAR *format, va_list valist ); @@ -265,6 +259,138 @@ WINE_UNICODE_INLINE WCHAR *memrchrW( const WCHAR *ptr, WCHAR ch, size_t n ) return ret; } +WINE_UNICODE_INLINE int strcmpiW( const WCHAR *str1, const WCHAR *str2 ) +{ + for (;;) + { + int ret = tolowerW(*str1) - tolowerW(*str2); + if (ret || !*str1) return ret; + str1++; + str2++; + } +} + +WINE_UNICODE_INLINE int strncmpiW( const WCHAR *str1, const WCHAR *str2, int n ) +{ + int ret = 0; + for ( ; n > 0; n--, str1++, str2++) + if ((ret = tolowerW(*str1) - tolowerW(*str2)) || !*str1) break; + return ret; +} + +WINE_UNICODE_INLINE int memicmpW( const WCHAR *str1, const WCHAR *str2, int n ) +{ + int ret = 0; + for ( ; n > 0; n--, str1++, str2++) + if ((ret = tolowerW(*str1) - tolowerW(*str2))) break; + return ret; +} + +WINE_UNICODE_INLINE WCHAR *strstrW( const WCHAR *str, const WCHAR *sub ) +{ + while (*str) + { + const WCHAR *p1 = str, *p2 = sub; + while (*p1 && *p2 && *p1 == *p2) { p1++; p2++; } + if (!*p2) return (WCHAR *)str; + str++; + } + return NULL; +} + +WINE_UNICODE_INLINE LONG strtolW( LPCWSTR s, LPWSTR *end, INT base ) +{ + BOOL negative = FALSE, empty = TRUE; + LONG ret = 0; + + if (base < 0 || base == 1 || base > 36) return 0; + if (end) *end = (WCHAR *)s; + while (isspaceW(*s)) s++; + + if (*s == '-') + { + negative = TRUE; + s++; + } + else if (*s == '+') s++; + + if ((base == 0 || base == 16) && s[0] == '0' && (s[1] == 'x' || s[1] == 'X')) + { + base = 16; + s += 2; + } + if (base == 0) base = s[0] != '0' ? 10 : 8; + + while (*s) + { + int v; + + if ('0' <= *s && *s <= '9') v = *s - '0'; + else if ('A' <= *s && *s <= 'Z') v = *s - 'A' + 10; + else if ('a' <= *s && *s <= 'z') v = *s - 'a' + 10; + else break; + if (v >= base) break; + if (negative) v = -v; + s++; + empty = FALSE; + + if (!negative && (ret > MAXLONG / base || ret * base > MAXLONG - v)) + ret = MAXLONG; + else if (negative && (ret < (LONG)MINLONG / base || ret * base < (LONG)(MINLONG - v))) + ret = MINLONG; + else + ret = ret * base + v; + } + + if (end && !empty) *end = (WCHAR *)s; + return ret; +} + +WINE_UNICODE_INLINE ULONG strtoulW( LPCWSTR s, LPWSTR *end, INT base ) +{ + BOOL negative = FALSE, empty = TRUE; + ULONG ret = 0; + + if (base < 0 || base == 1 || base > 36) return 0; + if (end) *end = (WCHAR *)s; + while (isspaceW(*s)) s++; + + if (*s == '-') + { + negative = TRUE; + s++; + } + else if (*s == '+') s++; + + if ((base == 0 || base == 16) && s[0] == '0' && (s[1] == 'x' || s[1] == 'X')) + { + base = 16; + s += 2; + } + if (base == 0) base = s[0] != '0' ? 10 : 8; + + while (*s) + { + int v; + + if ('0' <= *s && *s <= '9') v = *s - '0'; + else if ('A' <= *s && *s <= 'Z') v = *s - 'A' + 10; + else if ('a' <= *s && *s <= 'z') v = *s - 'a' + 10; + else break; + if (v >= base) break; + s++; + empty = FALSE; + + if (ret > MAXDWORD / base || ret * base > MAXDWORD - v) + ret = MAXDWORD; + else + ret = ret * base + v; + } + + if (end && !empty) *end = (WCHAR *)s; + return negative ? -ret : ret; +} + WINE_UNICODE_INLINE long int atolW( const WCHAR *str ) { return strtolW( str, (WCHAR **)0, 10 ); diff --git a/libs/port/string.c b/libs/port/string.c index c3388bcc7da..62b972399bf 100644 --- a/libs/port/string.c +++ b/libs/port/string.c @@ -22,8 +22,181 @@ #include <errno.h> #include <limits.h> #include <stdio.h> +#include <stdarg.h> -#include "wine/unicode.h" +#include <windef.h> +#include <winbase.h> +#include <winnls.h> + +WCHAR tolowerW( WCHAR ch ) +{ + extern const WCHAR wine_casemap_lower[]; + return ch + wine_casemap_lower[wine_casemap_lower[ch >> 8] + (ch & 0xff)]; +} + +WCHAR toupperW( WCHAR ch ) +{ + extern const WCHAR wine_casemap_upper[]; + return ch + wine_casemap_upper[wine_casemap_upper[ch >> 8] + (ch & 0xff)]; +} + +/* the character type contains the C1_* flags in the low 12 bits */ +/* and the C2_* type in the high 4 bits */ +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)]; +} + +int iscntrlW( WCHAR wc ) +{ + return get_char_typeW(wc) & C1_CNTRL; +} + +int ispunctW( WCHAR wc ) +{ + return get_char_typeW(wc) & C1_PUNCT; +} + +int isspaceW( WCHAR wc ) +{ + return get_char_typeW(wc) & C1_SPACE; +} + +int isdigitW( WCHAR wc ) +{ + return get_char_typeW(wc) & C1_DIGIT; +} + +int isxdigitW( WCHAR wc ) +{ + return get_char_typeW(wc) & C1_XDIGIT; +} + +int islowerW( WCHAR wc ) +{ + return get_char_typeW(wc) & C1_LOWER; +} + +int isupperW( WCHAR wc ) +{ + return get_char_typeW(wc) & C1_UPPER; +} + +int isalnumW( WCHAR wc ) +{ + return get_char_typeW(wc) & (C1_ALPHA|C1_DIGIT|C1_LOWER|C1_UPPER); +} + +int isalphaW( WCHAR wc ) +{ + return get_char_typeW(wc) & (C1_ALPHA|C1_LOWER|C1_UPPER); +} + +int isgraphW( WCHAR wc ) +{ + return get_char_typeW(wc) & (C1_ALPHA|C1_PUNCT|C1_DIGIT|C1_LOWER|C1_UPPER); +} + +int isprintW( WCHAR wc ) +{ + return get_char_typeW(wc) & (C1_ALPHA|C1_BLANK|C1_PUNCT|C1_DIGIT|C1_LOWER|C1_UPPER); +} + +unsigned int strlenW( const WCHAR *str ) +{ + const WCHAR *s = str; + while (*s) s++; + return s - str; +} + +WCHAR *strcpyW( WCHAR *dst, const WCHAR *src ) +{ + WCHAR *p = dst; + while ((*p++ = *src++)); + return dst; +} + +int strcmpW( const WCHAR *str1, const WCHAR *str2 ) +{ + while (*str1 && (*str1 == *str2)) { str1++; str2++; } + return *str1 - *str2; +} + +int strncmpW( const WCHAR *str1, const WCHAR *str2, int n ) +{ + if (n <= 0) return 0; + while ((--n > 0) && *str1 && (*str1 == *str2)) { str1++; str2++; } + return *str1 - *str2; +} + +WCHAR *strcatW( WCHAR *dst, const WCHAR *src ) +{ + strcpyW( dst + strlenW(dst), src ); + return dst; +} + +WCHAR *strchrW( const WCHAR *str, WCHAR ch ) +{ + do { if (*str == ch) return (WCHAR *)(ULONG_PTR)str; } while (*str++); + return NULL; +} + +WCHAR *strrchrW( const WCHAR *str, WCHAR ch ) +{ + WCHAR *ret = NULL; + do { if (*str == ch) ret = (WCHAR *)(ULONG_PTR)str; } while (*str++); + return ret; +} + +WCHAR *strpbrkW( const WCHAR *str, const WCHAR *accept ) +{ + for ( ; *str; str++) if (strchrW( accept, *str )) return (WCHAR *)(ULONG_PTR)str; + return NULL; +} + +size_t strspnW( const WCHAR *str, const WCHAR *accept ) +{ + const WCHAR *ptr; + for (ptr = str; *ptr; ptr++) if (!strchrW( accept, *ptr )) break; + return ptr - str; +} + +size_t strcspnW( const WCHAR *str, const WCHAR *reject ) +{ + const WCHAR *ptr; + for (ptr = str; *ptr; ptr++) if (strchrW( reject, *ptr )) break; + return ptr - str; +} + +WCHAR *strlwrW( WCHAR *str ) +{ + WCHAR *ret; + for (ret = str; *str; str++) *str = tolowerW(*str); + return ret; +} + +WCHAR *struprW( WCHAR *str ) +{ + WCHAR *ret; + for (ret = str; *str; str++) *str = toupperW(*str); + return ret; +} + +WCHAR *memchrW( const WCHAR *ptr, WCHAR ch, size_t n ) +{ + const WCHAR *end; + for (end = ptr + n; ptr < end; ptr++) if (*ptr == ch) return (WCHAR *)(ULONG_PTR)ptr; + return NULL; +} + +WCHAR *memrchrW( const WCHAR *ptr, WCHAR ch, size_t n ) +{ + const WCHAR *end; + WCHAR *ret = NULL; + for (end = ptr + n; ptr < end; ptr++) if (*ptr == ch) ret = (WCHAR *)(ULONG_PTR)ptr; + return ret; +} int strcmpiW( const WCHAR *str1, const WCHAR *str2 ) { @@ -300,6 +473,16 @@ noconv: return 0L; } +long int atolW( const WCHAR *str ) +{ + return strtolW( str, (WCHAR **)0, 10 ); +} + +int atoiW( const WCHAR *str ) +{ + return (int)atolW( str ); +} + /* format a WCHAR string according to a printf format; helper for vsnprintfW */ static size_t format_string( WCHAR *buffer, size_t len, const char *format, const WCHAR *str, int str_len ) diff --git a/libs/wine/port.c b/libs/wine/port.c index 259ff084e88..62d5c2abcdb 100644 --- a/libs/wine/port.c +++ b/libs/wine/port.c @@ -28,7 +28,6 @@ #include <string.h> #include <sys/types.h> -#define WINE_UNICODE_INLINE /* nothing */ #include "wine/unicode.h" /* functions from libwine_port that are also exported from libwine for backwards compatibility,

1 0

Alexandre Julliard : libport: Move the non-inline version of the string functions to libwine.
by Alexandre Julliard Nov. 30, 2020

Nov. 30, 2020

Module: wine Branch: master Commit: 1fdbf850eeef751bbde914f177bf659e402344d6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1fdbf850eeef751bbde914f1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Nov 29 21:21:49 2020 +0100 libport: Move the non-inline version of the string functions to libwine. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/unicode.h | 29 +++++++++++++++++++++++------ libs/port/Makefile.in | 1 - libs/wine/Makefile.in | 1 + libs/wine/port.c | 12 ++---------- libs/{port => wine}/string.c | 6 ++++++ 5 files changed, 32 insertions(+), 17 deletions(-) diff --git a/include/wine/unicode.h b/include/wine/unicode.h index f42a94c7e0d..069b5ce2624 100644 --- a/include/wine/unicode.h +++ b/include/wine/unicode.h @@ -40,7 +40,7 @@ extern "C" { #endif #ifndef WINE_UNICODE_INLINE -#define WINE_UNICODE_INLINE static inline +#define WINE_UNICODE_INLINE static FORCEINLINE #endif /* code page info common to SBCS and DBCS */ @@ -79,11 +79,6 @@ union cptable struct dbcs_table dbcs; }; -extern int sprintfW( WCHAR *str, const WCHAR *format, ... ); -extern int snprintfW( WCHAR *str, size_t len, const WCHAR *format, ... ); -extern int vsprintfW( WCHAR *str, const WCHAR *format, va_list valist ); -extern int vsnprintfW( WCHAR *str, size_t len, const WCHAR *format, va_list valist ); - WINE_UNICODE_INLINE WCHAR tolowerW( WCHAR ch ) { extern const WCHAR wine_casemap_lower[]; @@ -401,6 +396,28 @@ WINE_UNICODE_INLINE int atoiW( const WCHAR *str ) return (int)atolW( str ); } +NTSYSAPI int __cdecl _vsnwprintf(WCHAR*,size_t,const WCHAR*,__ms_va_list); + +static inline int WINAPIV snprintfW( WCHAR *str, size_t len, const WCHAR *format, ...) +{ + int retval; + __ms_va_list valist; + __ms_va_start(valist, format); + retval = _vsnwprintf(str, len, format, valist); + __ms_va_end(valist); + return retval; +} + +static inline int WINAPIV sprintfW( WCHAR *str, const WCHAR *format, ...) +{ + int retval; + __ms_va_list valist; + __ms_va_start(valist, format); + retval = _vsnwprintf(str, MAXLONG, format, valist); + __ms_va_end(valist); + return retval; +} + #undef WINE_UNICODE_INLINE #ifdef __cplusplus diff --git a/libs/port/Makefile.in b/libs/port/Makefile.in index 7bc67fa3fee..aabcc833ec6 100644 --- a/libs/port/Makefile.in +++ b/libs/port/Makefile.in @@ -17,7 +17,6 @@ C_SRCS = \ rint.c \ spawn.c \ statvfs.c \ - string.c \ strnlen.c \ symlink.c \ usleep.c \ diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in index 65a07895027..74ffc0d5f83 100644 --- a/libs/wine/Makefile.in +++ b/libs/wine/Makefile.in @@ -81,6 +81,7 @@ C_SRCS = \ mmap.c \ port.c \ sortkey.c \ + string.c \ utf8.c \ wctomb.c diff --git a/libs/wine/port.c b/libs/wine/port.c index 62d5c2abcdb..8e56ada52aa 100644 --- a/libs/wine/port.c +++ b/libs/wine/port.c @@ -27,16 +27,8 @@ #include <stdlib.h> #include <string.h> #include <sys/types.h> - -#include "wine/unicode.h" - -/* functions from libwine_port that are also exported from libwine for backwards compatibility, - * on platforms that require it */ -const void *libwine_port_functions[] = -{ - strtolW, - vsnprintfW, -}; +#include <stdarg.h> +#include <windef.h> /* no longer used, for backwards compatibility only */ struct wine_pthread_functions; diff --git a/libs/port/string.c b/libs/wine/string.c similarity index 99% rename from libs/port/string.c rename to libs/wine/string.c index 62b972399bf..d6fb88f8eca 100644 --- a/libs/port/string.c +++ b/libs/wine/string.c @@ -18,6 +18,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "wine/asm.h" + +#ifdef __ASM_OBSOLETE + #include <assert.h> #include <errno.h> #include <limits.h> @@ -711,3 +715,5 @@ int sprintfW( WCHAR *str, const WCHAR *format, ...) va_end(valist); return retval; } + +#endif /* __ASM_OBSOLETE */

1 0

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

Nov. 27, 2020

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 Nov. 27, 2020

Nov. 27, 2020

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

Jacek Caban : server: Rename create_console_output to create_screen_buffer.
by Alexandre Julliard Nov. 27, 2020

Nov. 27, 2020

Module: wine Branch: master Commit: b2e1c37381f04964d43c68a99b49cffbe0e1968c URL: https://source.winehq.org/git/wine.git/?a=commit;h=b2e1c37381f04964d43c68a9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 27 18:13:37 2020 +0100 server: Rename create_console_output to create_screen_buffer. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/console.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/server/console.c b/server/console.c index 0d2c768f8e5..f1ce9b27dbd 100644 --- a/server/console.c +++ b/server/console.c @@ -551,7 +551,7 @@ static void set_active_screen_buffer( struct console *console, struct screen_buf screen_buffer->id, NULL, NULL ); } -static struct object *create_console_output( struct console *console ) +static struct object *create_screen_buffer( struct console *console ) { struct screen_buffer *screen_buffer; @@ -814,7 +814,7 @@ static struct object *console_server_lookup_name( struct object *obj, struct uni return 0; } if (!(server->console = (struct console *)create_console())) return NULL; - if (!(screen_buffer = (struct screen_buffer *)create_console_output( server->console ))) + if (!(screen_buffer = (struct screen_buffer *)create_screen_buffer( server->console ))) { release_object( server->console ); server->console = NULL; @@ -1231,7 +1231,7 @@ static struct object *console_device_lookup_name( struct object *obj, struct uni return NULL; } name->len = 0; - return create_console_output( current->process->console ); + return create_screen_buffer( current->process->console ); } if (name->len == sizeof(serverW) && !memcmp( name->str, serverW, name->len ))

1 0

Jacek Caban : server: Rename console_input to console.
by Alexandre Julliard Nov. 27, 2020

Nov. 27, 2020

Module: wine Branch: master Commit: 6f3cf86a56f176b12d9b37c94389201399ecc294 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f3cf86a56f176b12d9b37c9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 27 18:13:30 2020 +0100 server: Rename console_input to console. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/console.c | 201 +++++++++++++++++++++++++++---------------------------- server/process.h | 4 +- 2 files changed, 102 insertions(+), 103 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6f3cf86a56f176b12d9b…

1 0

Robert Wilhelm : vbscript: Remove overzealous check in parse_hex_literal.
by Alexandre Julliard Nov. 27, 2020

Nov. 27, 2020

Module: wine Branch: master Commit: 9821da55469bed316dbe2e6b54273da742ad3450 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9821da55469bed316dbe2e6b… Author: Robert Wilhelm <robert.wilhelm(a)gmx.net> Date: Fri Nov 27 17:33:21 2020 +0100 vbscript: Remove overzealous check in parse_hex_literal. is_identifier_char also triggers on logical operators like "or". Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50179 Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/lex.c | 2 +- dlls/vbscript/tests/lang.vbs | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/vbscript/lex.c b/dlls/vbscript/lex.c index e98ed98e194..357cad7158c 100644 --- a/dlls/vbscript/lex.c +++ b/dlls/vbscript/lex.c @@ -315,7 +315,7 @@ static int parse_hex_literal(parser_ctx_t *ctx, LONG *ret) while((d = hex_to_int(*++ctx->ptr)) != -1) l = l*16 + d; - if(begin + 9 /* max digits+1 */ < ctx->ptr || (*ctx->ptr != '&' && is_identifier_char(*ctx->ptr))) { + if(begin + 9 /* max digits+1 */ < ctx->ptr) { FIXME("invalid literal\n"); return 0; } diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 419a4349896..a716cdbc65f 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -60,6 +60,7 @@ Call ok(&hfffe = -2, "&hfffe <> -2") Call ok(&hffff& = 65535, "&hffff& <> -1") Call ok(&hfffe& = 65534, "&hfffe& <> -2") Call ok(&hffffffff& = -1, "&hffffffff& <> -1") +Call ok((&h01or&h02)=3,"&h01or&h02 <> 3") W = 5 Call ok(W = 5, "W = " & W & " expected " & 5)

1 0