September 2020 - Wine-commits

Nikolay Sivov : include: Add some missing types to msxml6 typelib.
by Alexandre Julliard 14 Sep '20

14 Sep '20

Module: wine Branch: master Commit: 56486a4bfc98da9a859682d2c262fc55aa19addb URL: https://source.winehq.org/git/wine.git/?a=commit;h=56486a4bfc98da9a859682d2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Sep 14 15:39:53 2020 +0300 include: Add some missing types to msxml6 typelib. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msxml6.idl | 221 ++++++++++++++++++++++++++++++++++------------------- 1 file changed, 141 insertions(+), 80 deletions(-) diff --git a/include/msxml6.idl b/include/msxml6.idl index 45cbdbb892..113704d5db 100644 --- a/include/msxml6.idl +++ b/include/msxml6.idl @@ -31,16 +31,6 @@ import "oaidl.idl"; #define vi_progid(str) #endif -[ - uuid(f5078f18-c551-11d3-89b9-0000f81fe221), - version(6.0), - helpstring("Microsoft XML, v6.0") -] -library MSXML2 -{ - -importlib("stdole2.tlb"); - interface IXMLDOMImplementation; interface IXMLDOMNode; interface IXMLDOMDocumentFragment; @@ -1264,6 +1254,17 @@ interface IXMLHTTPRequest : IDispatch HRESULT onreadystatechange([in] IDispatch *pReadyStateSink); } +typedef enum _SXH_SERVER_CERT_OPTION +{ + SXH_SERVER_CERT_IGNORE_UNKNOWN_CA = 0x00000100, + SXH_SERVER_CERT_IGNORE_WRONG_USAGE = 0x00000200, + SXH_SERVER_CERT_IGNORE_CERT_CN_INVALID = 0x00001000, + SXH_SERVER_CERT_IGNORE_CERT_DATE_INVALID = 0x00002000, + SXH_SERVER_CERT_IGNORE_ALL_SERVER_ERRORS = + (SXH_SERVER_CERT_IGNORE_UNKNOWN_CA | SXH_SERVER_CERT_IGNORE_WRONG_USAGE | + SXH_SERVER_CERT_IGNORE_CERT_CN_INVALID | SXH_SERVER_CERT_IGNORE_CERT_DATE_INVALID), +} SXH_SERVER_CERT_OPTION; + [ object, dual, @@ -1414,74 +1415,6 @@ interface IXMLDOMParseErrorCollection : IDispatch HRESULT _newEnum( [retval, out] IUnknown **ppunk); } -[ - helpstring("XML DOM Document 6.0"), - progid("Msxml2.DOMDocument.6.0"), - threading(both), - uuid(88d96a05-f192-11d4-a65f-0040963251e5) -] -coclass DOMDocument60 -{ - [default] interface IXMLDOMDocument3; - [default, source] dispinterface XMLDOMDocumentEvents; -} - -[ - helpstring("Free threaded XML DOM Document 6.0"), - progid("Msxml2.FreeThreadedDOMDocument.6.0"), - threading(both), - uuid(88d96a06-f192-11d4-a65f-0040963251e5), -] -coclass FreeThreadedDOMDocument60 -{ - [default] interface IXMLDOMDocument3; - [default, source] dispinterface XMLDOMDocumentEvents; -} - -[ - helpstring("XML HTTP 6.0"), - progid("Msxml2.XMLHTTP.6.0"), - threading(apartment), - uuid(88d96a0a-f192-11d4-a65f-0040963251e5) -] -coclass XMLHTTP60 -{ - [default] interface IXMLHTTPRequest; -} - -[ - helpstring("Server XML HTTP 6.0"), - progid("Msxml2.ServerXMLHTTP.6.0"), - threading(apartment), - uuid(88d96a0b-f192-11d4-a65f-0040963251e5) -] -coclass ServerXMLHTTP60 -{ - [default] interface IServerXMLHTTPRequest2; -} - -[ - helpstring("XML Schema Cache 6.0"), - progid("Msxml2.XMLSchemaCache.6.0"), - threading(both), - uuid(88d96a07-f192-11d4-a65f-0040963251e5) -] -coclass XMLSchemaCache60 -{ - [default] interface IXMLDOMSchemaCollection2; -} - -[ - helpstring("XSL Template 6.0"), - progid("Msxml2.XSLTemplate.6.0"), - threading(both), - uuid(88d96a08-f192-11d4-a65f-0040963251e5) -] -coclass XSLTemplate60 -{ - [default] interface IXSLTemplate; -} - /* * Sax Interfaces */ @@ -2937,6 +2870,90 @@ interface ISchemaNotation : ISchemaItem [out,retval] BSTR* uri); } +[ + uuid(f5078f18-c551-11d3-89b9-0000f81fe221), + version(6.0), + helpstring("Microsoft XML, v6.0") +] +library MSXML2 +{ + +importlib("stdole2.tlb"); + +interface IXMLDOMNotation; +interface IXMLDOMEntity; +interface IXMLDOMEntityReference; +interface IXMLDOMParseError2; +interface IXMLDOMParseErrorCollection; +interface IXMLDOMSelection; +interface IXTLRuntime; +dispinterface XMLDOMDocumentEvents; +interface ISAXXMLFilter; +interface IVBSAXXMLFilter; +interface IMXReaderControl; +interface IMXSchemaDeclHandler; +interface IMXXMLFilter; +interface ISchemaElement; +interface ISchemaParticle; +interface ISchemaType; +interface ISchemaComplexType; +interface ISchemaAny; +interface ISchemaModelGroup; +interface ISchemaAttribute; +interface ISchemaAttributeGroup; +interface ISchemaIdentityConstraint; +interface ISchemaNotation; + +[hidden] typedef struct __msxml6_ReferenceRemainingTypes__ +{ + enum tagDOMNodeType __tagDomNodeType__; + DOMNodeType __domNodeType__; + enum _SERVERXMLHTTP_OPTION __serverXmlHttpOptionEnum__; + SERVERXMLHTTP_OPTION __serverXmlHttpOption__; + enum _SXH_SERVER_CERT_OPTION __serverCertOptionEnum__; + SXH_SERVER_CERT_OPTION __serverCertOption__; + enum _SXH_PROXY_SETTING __proxySettingEnum__; + SXH_PROXY_SETTING __proxySetting__; + enum _SOMITEMTYPE __somItemTypeEnum__; + SOMITEMTYPE __somItemType__; + enum _SCHEMAUSE __schemaUseEnum__; + SCHEMAUSE __schemaUse__; + enum _SCHEMADERIVATIONMETHOD __schemaDerivationMethodEnum__; + SCHEMADERIVATIONMETHOD __schemaDerivationMethod__; + enum _SCHEMACONTENTTYPE __schemaContentTypeEnum__; + SCHEMACONTENTTYPE __schemaContentType__; + enum _SCHEMAPROCESSCONTENTS __schemaProcessContentsEnum__; + SCHEMAPROCESSCONTENTS __schemaProcessContents__; + enum _SCHEMAWHITESPACE __schemaWhitespaceEnum__; + SCHEMAWHITESPACE __schemaWhitespace__; + enum _SCHEMATYPEVARIETY __schemaTypeVarietyEnum__; + SCHEMATYPEVARIETY __schemaTypeVariety__; +} __msxml6_ReferenceRemainingTypes__; + +[ + helpstring("XML DOM Document 6.0"), + progid("Msxml2.DOMDocument.6.0"), + threading(both), + uuid(88d96a05-f192-11d4-a65f-0040963251e5) +] +coclass DOMDocument60 +{ + [default] interface IXMLDOMDocument3; + [default, source] dispinterface XMLDOMDocumentEvents; +} + +[ + helpstring("Free threaded XML DOM Document 6.0"), + progid("Msxml2.FreeThreadedDOMDocument.6.0"), + threading(both), + uuid(88d96a06-f192-11d4-a65f-0040963251e5), +] +coclass FreeThreadedDOMDocument60 +{ + [default] interface IXMLDOMDocument3; + [default, source] dispinterface XMLDOMDocumentEvents; +} + [ helpstring("SAX XML Reader 6.0"), progid("Msxml2.SAXXMLReader.6.0"), @@ -2949,6 +2966,17 @@ coclass SAXXMLReader60 interface ISAXXMLReader; } +[ + helpstring("XML Schema Cache 6.0"), + progid("Msxml2.XMLSchemaCache.6.0"), + threading(both), + uuid(88d96a07-f192-11d4-a65f-0040963251e5) +] +coclass XMLSchemaCache60 +{ + [default] interface IXMLDOMSchemaCollection2; +} + [ helpstring("MXHTMLWriter 6.0"), progid("Msxml2.MXHTMLWriter.6.0"), @@ -3020,6 +3048,41 @@ coclass SAXAttributes60 interface ISAXAttributes; } +[ + helpstring("XSL Template 6.0"), + progid("Msxml2.XSLTemplate.6.0"), + threading(both), + uuid(88d96a08-f192-11d4-a65f-0040963251e5) +] +coclass XSLTemplate60 +{ + [default] interface IXSLTemplate; +} + +[ + helpstring("XML HTTP 6.0"), + progid("Msxml2.XMLHTTP.6.0"), + threading(apartment), + uuid(88d96a0a-f192-11d4-a65f-0040963251e5) +] +coclass XMLHTTP60 +{ + [default] interface IXMLHTTPRequest; +} + +[ + helpstring("Server XML HTTP 6.0"), + progid("Msxml2.ServerXMLHTTP.6.0"), + threading(apartment), + uuid(88d96a0b-f192-11d4-a65f-0040963251e5) +] +coclass ServerXMLHTTP60 +{ + [default] interface IServerXMLHTTPRequest2; +} + +} /* Library MSXML */ + /* * Error Codes */ @@ -3027,5 +3090,3 @@ cpp_quote("#define E_XML_NOTWF 0xC00CE223") cpp_quote("#define E_XML_NODTD 0xC00CE224") cpp_quote("#define E_XML_INVALID 0xC00CE225") cpp_quote("#define E_XML_BUFFERTOOSMALL 0xC00CE226") - -} /* Library MSXML */

1 0

Nikolay Sivov : include: Handle same typelib name in msxml2.idl and msxml6.idl.
by Alexandre Julliard 14 Sep '20

14 Sep '20

Module: wine Branch: master Commit: 2444fea99bb177c52ed801b846606f30bc3b6c27 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2444fea99bb177c52ed801b8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Sep 14 15:39:54 2020 +0300 include: Handle same typelib name in msxml2.idl and msxml6.idl. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msxml2.idl | 4 ++++ include/msxml6.idl | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/include/msxml2.idl b/include/msxml2.idl index 452338bb01..916e0e8ab3 100644 --- a/include/msxml2.idl +++ b/include/msxml2.idl @@ -31,6 +31,10 @@ import "oaidl.idl"; #define vi_progid(str) #endif +cpp_quote("#ifdef __ISAXXMLReader_INTERFACE_DEFINED__") +cpp_quote("#undef __MSXML2_LIBRARY_DEFINED__") +cpp_quote("#endif") + [ uuid(f5078f18-c551-11d3-89b9-0000f81fe221), version(3.0), diff --git a/include/msxml6.idl b/include/msxml6.idl index 113704d5db..5bfb21d04a 100644 --- a/include/msxml6.idl +++ b/include/msxml6.idl @@ -99,6 +99,10 @@ interface ISchemaAny; interface ISchemaIdentityConstraint; interface ISchemaNotation; +cpp_quote("#ifdef __ISAXXMLReader_INTERFACE_DEFINED__") +cpp_quote("#undef __MSXML2_LIBRARY_DEFINED__") +cpp_quote("#endif") + cpp_quote("#ifndef __MSXML_DOMNODETYPE_DEFINED") cpp_quote("#define __MSXML_DOMNODETYPE_DEFINED") typedef enum tagDOMNodeType

1 0

Nikolay Sivov : widl: Emit a guard around library contents.
by Alexandre Julliard 14 Sep '20

14 Sep '20

Module: wine Branch: master Commit: 0dd6f1ef35efa811989716b3dbe52b988bf34ad4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0dd6f1ef35efa811989716b3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Sep 14 15:51:06 2020 +0300 widl: Emit a guard around library contents. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/header.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/widl/header.c b/tools/widl/header.c index c8a12556cc..743d86f0ee 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -1755,8 +1755,11 @@ static void write_header_stmts(FILE *header, const statement_list_t *stmts, cons break; } case STMT_LIBRARY: + fprintf(header, "#ifndef __%s_LIBRARY_DEFINED__\n", stmt->u.lib->name); + fprintf(header, "#define __%s_LIBRARY_DEFINED__\n", stmt->u.lib->name); write_library(header, stmt->u.lib); write_header_stmts(header, stmt->u.lib->stmts, NULL, FALSE); + fprintf(header, "#endif /* __%s_LIBRARY_DEFINED__ */\n", stmt->u.lib->name); break; case STMT_CPPQUOTE: fprintf(header, "%s\n", stmt->u.str);

1 0

Stefan Dösinger : ntdll: Use the MacOS file handle limit workaround from libs/wine/loader.c.
by Alexandre Julliard 14 Sep '20

14 Sep '20

Module: wine Branch: master Commit: 4d33a0410e40879ca405a1870cc53ff4da2cc7ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=4d33a0410e40879ca405a187… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Sep 14 15:59:02 2020 +0300 ntdll: Use the MacOS file handle limit workaround from libs/wine/loader.c. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49624 Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index bc5b627cbc..82fabc5cde 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -212,7 +212,18 @@ static void set_max_limit( int limit ) if (!getrlimit( limit, &rlimit )) { rlimit.rlim_cur = rlimit.rlim_max; - setrlimit( limit, &rlimit ); + if (setrlimit( limit, &rlimit ) != 0) + { +#if defined(__APPLE__) && defined(RLIMIT_NOFILE) && defined(OPEN_MAX) + /* On Leopard, setrlimit(RLIMIT_NOFILE, ...) fails on attempts to set + * rlim_cur above OPEN_MAX (even if rlim_max > OPEN_MAX). */ + if (limit == RLIMIT_NOFILE && rlimit.rlim_cur > OPEN_MAX) + { + rlimit.rlim_cur = OPEN_MAX; + setrlimit( limit, &rlimit ); + } +#endif + } } }

1 0

Jacek Caban : conhost: Introduce IOCTL_CONDRV_READ_CONSOLE ioctl.
by Alexandre Julliard 14 Sep '20

14 Sep '20

Module: wine Branch: master Commit: 01d203eebf60a4f07be658e6a66d50909c90cf75 URL: https://source.winehq.org/git/wine.git/?a=commit;h=01d203eebf60a4f07be658e6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 14 18:46:04 2020 +0200 conhost: Introduce IOCTL_CONDRV_READ_CONSOLE ioctl. Partially based on kernel32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/condrv.h | 17 ++-- programs/conhost/conhost.c | 211 +++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 203 insertions(+), 25 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=01d203eebf60a4f07be6…

1 0

Jacek Caban : conhost: Add support for ENABLE_ECHO_INPUT.
by Alexandre Julliard 14 Sep '20

14 Sep '20

Module: wine Branch: master Commit: 73f55e234101739a456774a334e1d732b57afd0b URL: https://source.winehq.org/git/wine.git/?a=commit;h=73f55e234101739a456774a3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 14 18:46:18 2020 +0200 conhost: Add support for ENABLE_ECHO_INPUT. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/conhost.c | 98 +++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 93 insertions(+), 5 deletions(-) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 32b2462786..d93bcbfa60 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -413,8 +413,8 @@ static void new_line( struct screen_buffer *screen_buffer, RECT *update_rect ) { unsigned int i; - assert( screen_buffer->cursor_y == screen_buffer->height ); - screen_buffer->cursor_y--; + assert( screen_buffer->cursor_y >= screen_buffer->height ); + screen_buffer->cursor_y = screen_buffer->height - 1; if (screen_buffer->console->tty_output) update_output( screen_buffer, update_rect ); @@ -434,7 +434,7 @@ static void new_line( struct screen_buffer *screen_buffer, RECT *update_rect ) } } -static void write_char( struct screen_buffer *screen_buffer, WCHAR ch, RECT *update_rect ) +static void write_char( struct screen_buffer *screen_buffer, WCHAR ch, RECT *update_rect, unsigned int *home_y ) { if (screen_buffer->cursor_x == screen_buffer->width) { @@ -443,6 +443,11 @@ static void write_char( struct screen_buffer *screen_buffer, WCHAR ch, RECT *upd } if (screen_buffer->cursor_y == screen_buffer->height) { + if (home_y) + { + if (!*home_y) return; + (*home_y)--; + } new_line( screen_buffer, update_rect ); } @@ -561,6 +566,88 @@ static void edit_line_insert( struct console *console, const WCHAR *str, unsigne ctx->cursor += len; } +static unsigned int edit_line_string_width( const WCHAR *str, unsigned int len) +{ + unsigned int i, offset = 0; + for (i = 0; i < len; i++) offset += str[i] < ' ' ? 2 : 1; + return offset; +} + +static void update_read_output( struct console *console ) +{ + struct screen_buffer *screen_buffer = console->active; + struct edit_line *ctx = &console->edit_line; + int offset = 0, j, end_offset; + RECT update_rect; + + empty_update_rect( screen_buffer, &update_rect ); + + if (ctx->update_end >= ctx->update_begin) + { + TRACE( "update %d-%d %s\n", ctx->update_begin, ctx->update_end, + debugstr_wn( ctx->buf + ctx->update_begin, ctx->update_end - ctx->update_begin + 1 )); + + hide_tty_cursor( screen_buffer->console ); + + offset = edit_line_string_width( ctx->buf, ctx->update_begin ); + screen_buffer->cursor_x = (ctx->home_x + offset) % screen_buffer->width; + screen_buffer->cursor_y = ctx->home_y + (ctx->home_x + offset) / screen_buffer->width; + for (j = ctx->update_begin; j <= ctx->update_end; j++) + { + if (screen_buffer->cursor_y >= screen_buffer->height && !ctx->home_y) break; + if (j >= ctx->len) break; + if (ctx->buf[j] < ' ') + { + write_char( screen_buffer, '^', &update_rect, &ctx->home_y ); + write_char( screen_buffer, '@' + ctx->buf[j], &update_rect, &ctx->home_y ); + offset += 2; + } + else + { + write_char( screen_buffer, ctx->buf[j], &update_rect, &ctx->home_y ); + offset++; + } + } + end_offset = ctx->end_offset; + ctx->end_offset = offset; + if (j >= ctx->len) + { + /* clear trailing characters if buffer was shortened */ + while (offset < end_offset && screen_buffer->cursor_y < screen_buffer->height) + { + write_char( screen_buffer, ' ', &update_rect, &ctx->home_y ); + offset++; + } + } + } + + if (!ctx->status) + { + offset = edit_line_string_width( ctx->buf, ctx->len ); + screen_buffer->cursor_x = 0; + screen_buffer->cursor_y = ctx->home_y + (ctx->home_x + offset) / screen_buffer->width; + if (++screen_buffer->cursor_y >= screen_buffer->height) + new_line( screen_buffer, &update_rect ); + } + else + { + offset = edit_line_string_width( ctx->buf, ctx->cursor ); + screen_buffer->cursor_y = ctx->home_y + (ctx->home_x + offset) / screen_buffer->width; + if (screen_buffer->cursor_y < screen_buffer->height) + { + screen_buffer->cursor_x = (ctx->home_x + offset) % screen_buffer->width; + } + else + { + screen_buffer->cursor_x = screen_buffer->width - 1; + screen_buffer->cursor_y = screen_buffer->height - 1; + } + } + + update_output( screen_buffer, &update_rect ); + tty_sync( screen_buffer->console ); +} + static NTSTATUS process_console_input( struct console *console ) { struct edit_line *ctx = &console->edit_line; @@ -605,6 +692,7 @@ static NTSTATUS process_console_input( struct console *console ) if (ctx->status == STATUS_PENDING && !(console->mode & ENABLE_LINE_INPUT) && ctx->len) ctx->status = STATUS_SUCCESS; + if (console->mode & ENABLE_ECHO_INPUT) update_read_output( console ); if (ctx->status == STATUS_PENDING) return STATUS_SUCCESS; console->read_buffer = ctx->buf; @@ -1169,7 +1257,7 @@ static NTSTATUS write_console( struct screen_buffer *screen_buffer, const WCHAR continue; case '\t': j = min( screen_buffer->width - screen_buffer->cursor_x, 8 - (screen_buffer->cursor_x % 8) ); - while (j--) write_char( screen_buffer, ' ', &update_rect ); + while (j--) write_char( screen_buffer, ' ', &update_rect, NULL ); continue; case '\n': screen_buffer->cursor_x = 0; @@ -1188,7 +1276,7 @@ static NTSTATUS write_console( struct screen_buffer *screen_buffer, const WCHAR } if (screen_buffer->cursor_x == screen_buffer->width && !(screen_buffer->mode & ENABLE_WRAP_AT_EOL_OUTPUT)) screen_buffer->cursor_x = update_rect.left; - write_char( screen_buffer, buffer[i], &update_rect ); + write_char( screen_buffer, buffer[i], &update_rect, NULL ); } if (screen_buffer->cursor_x == screen_buffer->width)

1 0

Jacek Caban : conhost: Add support for ENABLE_LINE_INPUT.
by Alexandre Julliard 14 Sep '20

14 Sep '20

Module: wine Branch: master Commit: 0cdb070b76fc90b61fe435594e524fb8f9123fff URL: https://source.winehq.org/git/wine.git/?a=commit;h=0cdb070b76fc90b61fe43559… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 14 18:46:34 2020 +0200 conhost: Add support for ENABLE_LINE_INPUT. Imported from kernel32/readline.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/conhost.c | 613 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 612 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0cdb070b76fc90b61fe4…

1 0

Jacek Caban : kernel32: Use IOCTL_CONDRV_READ_CONSOLE in ReadConsoleW when possible.
by Alexandre Julliard 14 Sep '20

14 Sep '20

Module: wine Branch: master Commit: 666c5b6e20e3b9e1e34d10b88372406f494699f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=666c5b6e20e3b9e1e34d10b8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 14 18:46:48 2020 +0200 kernel32: Use IOCTL_CONDRV_READ_CONSOLE in ReadConsoleW when possible. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/console.c | 7 +++++++ server/console.c | 10 +++++++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index afac9be760..47083b27af 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -541,6 +541,13 @@ BOOL WINAPI ReadConsoleW(HANDLE hConsoleInput, LPVOID lpBuffer, return FALSE; } + if (DeviceIoControl(hConsoleInput, IOCTL_CONDRV_READ_CONSOLE, NULL, 0, lpBuffer, + nNumberOfCharsToRead * sizeof(WCHAR), lpNumberOfCharsRead, NULL)) + { + *lpNumberOfCharsRead /= sizeof(WCHAR); + return TRUE; + } + if (!GetConsoleMode(hConsoleInput, &mode)) return FALSE; if ((fd = get_console_bare_fd(hConsoleInput)) != -1) diff --git a/server/console.c b/server/console.c index c9db27935e..c2328f9da9 100644 --- a/server/console.c +++ b/server/console.c @@ -1693,7 +1693,7 @@ static struct object *create_console_server( void ) static int is_blocking_read_ioctl( unsigned int code ) { - return code == IOCTL_CONDRV_READ_INPUT; + return code == IOCTL_CONDRV_READ_INPUT || code == IOCTL_CONDRV_READ_CONSOLE; } static int console_input_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) @@ -1898,8 +1898,12 @@ static int console_input_ioctl( struct fd *fd, ioctl_code_t code, struct async * } default: - set_error( STATUS_INVALID_HANDLE ); - return 0; + if (!console->server || code >> 16 != FILE_DEVICE_CONSOLE) + { + set_error( STATUS_INVALID_HANDLE ); + return 0; + } + return queue_host_ioctl( console->server, code, 0, async, &console->ioctl_q ); } }

1 0

Alexandre Julliard : makefiles: Regenerate po files with full path information.
by Alexandre Julliard 14 Sep '20

14 Sep '20

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

1 0

Alexandre Julliard : makefiles: Remove .. components from generated paths.
by Alexandre Julliard 14 Sep '20

14 Sep '20

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

1 0