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

Tag wine-5.15 : Alexandre Julliard : Release 5.15
by Alexandre Julliard Aug. 14, 2020

Aug. 14, 2020

Module: wine Branch: refs/tags/wine-5.15 Tag: e53968a3c2fdf64ca67f3328197df97836ab3c99 URL: https://source.winehq.org/git/wine.git/?a=tag;h=e53968a3c2fdf64ca67f3328197… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 14 23:37:58 2020 +0200 Release 5.15

1 0

Martin Storsjo : configure, msvcrt: Check for the finite() function just like finitef().
by Alexandre Julliard Aug. 14, 2020

Aug. 14, 2020

Module: wine Branch: master Commit: 342c5da7c1332cbaa47b5eb056caa46937e9fc59 URL: https://source.winehq.org/git/wine.git/?a=commit;h=342c5da7c1332cbaa47b5eb0… Author: Martin Storsjo <martin(a)martin.st> Date: Fri Aug 14 14:33:24 2020 +0300 configure, msvcrt: Check for the finite() function just like finitef(). If missing, fall back on the C99 isfinite() macro, just like the existing finitef() fallback. The finite() function is deprecated in macOS 10.9 and is removed (from the SDK) since macOS 11.0. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/msvcrt/math.c | 3 +++ include/config.h.in | 3 +++ 4 files changed, 8 insertions(+) diff --git a/configure b/configure index ffe5ecca89..88b27ce62f 100755 --- a/configure +++ b/configure @@ -18037,6 +18037,7 @@ for ac_func in \ _spawnvp \ epoll_create \ ffs \ + finite \ finitef \ fnmatch \ fork \ diff --git a/configure.ac b/configure.ac index 67729e0c0a..13adf2da7e 100644 --- a/configure.ac +++ b/configure.ac @@ -2189,6 +2189,7 @@ AC_CHECK_FUNCS(\ _spawnvp \ epoll_create \ ffs \ + finite \ finitef \ fnmatch \ fork \ diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 6898b38641..abb9ef0a9c 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -47,6 +47,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); +#ifndef HAVE_FINITE +#define finite(x) isfinite(x) +#endif #ifndef HAVE_FINITEF #define finitef(x) isfinite(x) #endif diff --git a/include/config.h.in b/include/config.h.in index 1748a8b8d8..5a21875f66 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -168,6 +168,9 @@ /* Define to 1 if you have the `ffs' function. */ #undef HAVE_FFS +/* Define to 1 if you have the `finite' function. */ +#undef HAVE_FINITE + /* Define to 1 if you have the `finitef' function. */ #undef HAVE_FINITEF

1 0

Julian Rüger : po: Update German translation.
by Alexandre Julliard Aug. 14, 2020

Aug. 14, 2020

Module: wine Branch: master Commit: 4b12dbe5cdfc745d5837b265496f585e06f8bb03 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4b12dbe5cdfc745d5837b265… Author: Julian Rüger <jr98(a)gmx.net> Date: Fri Aug 14 13:26:49 2020 +0200 po: Update German translation. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/de.po | 142 ++++++++++++++++++++++----------------------------------------- 1 file changed, 50 insertions(+), 92 deletions(-) diff --git a/po/de.po b/po/de.po index 345b1d31da..0099da09a1 100644 --- a/po/de.po +++ b/po/de.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2020-02-10 17:39+0100\n" +"PO-Revision-Date: 2020-08-14 13:26+0200\n" "Last-Translator: Julian Rüger <jr98(a)gmx.net>\n" "Language-Team: German\n" "Language: de\n" @@ -3622,7 +3622,7 @@ msgstr "Gamecontroller" #: joy.rc:32 msgid "Test and configure game controllers." -msgstr "" +msgstr "Gamecontroller testen und konfigurieren." #: jscript.rc:28 msgid "Error converting object to primitive type" @@ -3637,10 +3637,8 @@ msgid "Subscript out of range" msgstr "Index außerhalb des Bereichs" #: jscript.rc:31 -#, fuzzy -#| msgid "Out of paper; " msgid "Out of stack space" -msgstr "Papierfach leer; " +msgstr "Stackspeicher voll" #: jscript.rc:32 msgid "Object required" @@ -3779,16 +3777,12 @@ msgid "JScript object expected" msgstr "JScript-Objekt erwartet" #: jscript.rc:63 -#, fuzzy -#| msgid "Array object expected" msgid "Enumerator object expected" -msgstr "Array-Objekt erwartet" +msgstr "Enumerator-Objekt erwartet" #: jscript.rc:64 -#, fuzzy -#| msgid "Boolean object expected" msgid "Regular Expression object expected" -msgstr "Boolesches Objekt erwartet" +msgstr "Regulärer-Ausdruck-Objekt erwartet" #: jscript.rc:65 msgid "Syntax error in regular expression" @@ -6877,10 +6871,8 @@ msgid "Sink has not been finalized.\n" msgstr "Ausgang wurde nicht finalisiert.\n" #: mferror.mc:732 -#, fuzzy -#| msgid "Sink was already stopped.\n" msgid "Clock was stopped\n" -msgstr "Ausgang wurde bereits gestoppt.\n" +msgstr "Zeitgeber wurde gestoppt\n" #: mferror.mc:32 msgid "Media Foundation platform is not initialized.\n" @@ -7260,10 +7252,8 @@ msgid "Clock state was already set.\n" msgstr "Zeitgeberstatus wurde bereits gesetzt.\n" #: mferror.mc:725 -#, fuzzy -#| msgid "Clock is not available.\n" msgid "Clock is not simple\n" -msgstr "Zeitgeber nicht verfügbar.\n" +msgstr "Zeitgeber ist nicht einfach\n" #: mpr.rc:35 wininet.rc:37 msgid "Enter Network Password" @@ -8363,7 +8353,8 @@ msgstr "Anbieter" #: version.rc:59 msgid "Select the data you want to connect to:" -msgstr "Wählen Sie die zu verbindenden Daten aus:" +msgstr "" +"Wählen Sie aus, zu welchen Daten Sie eine Verbindung herstellen möchten:" #: version.rc:66 msgid "Connection" @@ -8411,7 +8402,7 @@ msgstr "Kennwort &speichern" #: version.rc:85 msgid "3. Enter the &initial catalog to use:" -msgstr "3. Folgenden Initialkatalog verwenden:" +msgstr "3. Folgenden &Initialkatalog verwenden:" #: version.rc:87 msgid "&Test Connection" @@ -8422,116 +8413,97 @@ msgid "Advanced" msgstr "Fortgeschrittene" #: version.rc:95 -#, fuzzy -#| msgid "Network share" msgid "Network settings" -msgstr "Netzwerkfreigabe" +msgstr "Netzwerkeinstellungen" #: version.rc:96 -#, fuzzy -#| msgid "Bad impersonation level.\n" msgid "&Impersonation level:" -msgstr "Fehlerhafte Imitationsstufe.\n" +msgstr "&Imitationsstufe:" #: version.rc:98 msgid "P&rotection level:" -msgstr "" +msgstr "&Schutzlevel:" #: version.rc:101 -#, fuzzy -#| msgid "Connected" msgid "Connect:" -msgstr "Verbunden" +msgstr "Verbinden:" #: version.rc:103 -#, fuzzy -#| msgid "seconds" msgid "seconds." -msgstr "Sekunden" +msgstr "Sekunden." #: version.rc:104 -#, fuzzy -#| msgid "Success" msgid "A&ccess:" -msgstr "Erfolgreich" +msgstr "Zugriff:" #: version.rc:110 -#, fuzzy -#| msgid "&All" msgid "All" -msgstr "&Alles" +msgstr "Alle" #: version.rc:114 msgid "" "These are the initialization properties for this type of data. To edit a " "value, select a property, then choose Edit Value below." msgstr "" +"Dies sind die Initialisierungs-Eigenschaften für diese Art von Daten. Um " +"einen Wert zu bearbeiten, markieren Sie die entsprechende Eigenschaft und " +"klicken Sie auf \"Wert bearbeiten\"." #: version.rc:115 -#, fuzzy -#| msgid "&Edit..." msgid "&Edit Value..." -msgstr "&Bearbeiten..." +msgstr "&Wert bearbeiten..." #: version.rc:49 -#, fuzzy -#| msgid "Data Link Properties" msgid "Data Link Error" -msgstr "Eigenschaften der Datenverbindung" +msgstr "Datenverbindungsfehler" #: version.rc:50 -#, fuzzy -#| msgid "Please select a file." msgid "Please select a provider." -msgstr "Bitte wählen Sie eine Datei." +msgstr "Bitte wählen Sie einen Anbieter." #: version.rc:51 msgid "" "Provider is no longer available. Ensure that the provider is installed " "properly." msgstr "" +"Der Anbieter ist nicht länger verfügbar. Bitte stellen Sie sicher, dass der " +"Anbieter korrekt installiert wurde." #: version.rc:36 msgid "Data Link Properties" -msgstr "Eigenschaften der Datenverbindung" +msgstr "Datenverbindungseigenschaften" #: version.rc:37 msgid "OLE DB Provider(s)" msgstr "OLE DB-Anbieter" #: version.rc:41 -#, fuzzy -#| msgid "Ready" msgid "Read" -msgstr "Bereit" +msgstr "Read" #: version.rc:42 -#, fuzzy -#| msgid "Readme:" msgid "ReadWrite" -msgstr "Liesmich:" +msgstr "ReadWrite" #: version.rc:43 msgid "Share Deny None" -msgstr "" +msgstr "Share Deny None" #: version.rc:44 msgid "Share Deny Read" -msgstr "" +msgstr "Share Deny Read" #: version.rc:45 msgid "Share Deny Write" -msgstr "" +msgstr "Share Deny Write" #: version.rc:46 msgid "Share Exclusive" -msgstr "" +msgstr "Share Exclusive" #: version.rc:47 -#, fuzzy -#| msgid "I/O Writes" msgid "Write" -msgstr "E/A (Schreiben)" +msgstr "Write" #: oledlg.rc:55 msgid "Insert Object" @@ -9736,16 +9708,12 @@ msgid "Cape Verde Daylight Time" msgstr "Kap Verde Sommerzeit" #: tzres.rc:120 -#, fuzzy -#| msgid "Hawaiian Standard Time" msgid "Haiti Standard Time" -msgstr "Hawaii Normalzeit" +msgstr "Haiti Normalzeit" #: tzres.rc:121 -#, fuzzy -#| msgid "Hawaiian Daylight Time" msgid "Haiti Daylight Time" -msgstr "Hawaii Sommerzeit" +msgstr "Haiti Sommerzeit" #: tzres.rc:78 msgid "Central European Standard Time" @@ -9956,16 +9924,12 @@ msgid "Argentina Daylight Time" msgstr "Argentinien Sommerzeit" #: tzres.rc:142 -#, fuzzy -#| msgid "Mauritius Standard Time" msgid "Marquesas Standard Time" -msgstr "Mauritius Normalzeit" +msgstr "Marquesas Normalzeit" #: tzres.rc:143 -#, fuzzy -#| msgid "Mauritius Daylight Time" msgid "Marquesas Daylight Time" -msgstr "Mauritius Sommerzeit" +msgstr "Marquesas Sommerzeit" #: tzres.rc:156 msgid "Myanmar Standard Time" @@ -10340,16 +10304,12 @@ msgid "Venezuela Daylight Time" msgstr "Venezuela Sommerzeit" #: tzres.rc:60 -#, fuzzy -#| msgid "Mountain Standard Time" msgid "Bougainville Standard Time" -msgstr "Mountain Normalzeit" +msgstr "Bougainville Normalzeit" #: tzres.rc:61 -#, fuzzy -#| msgid "Mountain Daylight Time" msgid "Bougainville Daylight Time" -msgstr "Mountain Sommerzeit" +msgstr "Bougainville Sommerzeit" #: tzres.rc:122 msgid "Hawaiian Standard Time" @@ -10376,16 +10336,12 @@ msgid "New Zealand Daylight Time" msgstr "Neuseeland Sommerzeit" #: tzres.rc:34 -#, fuzzy -#| msgid "Argentina Standard Time" msgid "Aleutian Standard Time" -msgstr "Argentinien Normalzeit" +msgstr "Aleutische Normalzeit" #: tzres.rc:35 -#, fuzzy -#| msgid "Argentina Daylight Time" msgid "Aleutian Daylight Time" -msgstr "Argentinien Sommerzeit" +msgstr "Aleutische Sommerzeit" #: tzres.rc:74 msgid "Central Brazilian Standard Time" @@ -10468,16 +10424,12 @@ msgid "Korea Daylight Time" msgstr "Koreanische Sommerzeit" #: tzres.rc:86 -#, fuzzy -#| msgid "Easter Island Standard Time" msgid "Chatham Islands Standard Time" -msgstr "Osterinsel Normalzeit" +msgstr "Chathaminseln Normalzeit" #: tzres.rc:87 -#, fuzzy -#| msgid "Easter Island Daylight Time" msgid "Chatham Islands Daylight Time" -msgstr "Osterinsel Sommerzeit" +msgstr "Chathaminseln Sommerzeit" #: tzres.rc:92 msgid "E. Africa Standard Time" @@ -12633,6 +12585,9 @@ msgid "" "\n" "hardlink hardlink management\n" msgstr "" +"- Unterstützte Befehle -\n" +"\n" +"hardlink Verwaltung von Hardlinks\n" #: fsutil.mc:35 msgid "" @@ -12640,10 +12595,13 @@ msgid "" "\n" "create create a hardlink\n" msgstr "" +"- Hardlink - Unterstützte Befehle -\n" +"\n" +"create Einen Hardlink anlegen\n" #: fsutil.mc:40 msgid "Syntax: fsutil hardlink create <new> <existing>\n" -msgstr "" +msgstr "Syntax: fsutil hardlink create <neu> <bestehend>\n" #: hostname.rc:30 msgid "Usage: hostname\n"

1 0

Jacek Caban : kernel32: Use IOCTL_CONDRV_GET_INPUT_INFO in CONSOLE_GetNumHistoryEntries.
by Alexandre Julliard Aug. 14, 2020

Aug. 14, 2020

Module: wine Branch: master Commit: f54c7205b6ac387ee394c8877245f0d0f3a3cc7a URL: https://source.winehq.org/git/wine.git/?a=commit;h=f54c7205b6ac387ee394c887… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 14 13:27:31 2020 +0200 kernel32: Use IOCTL_CONDRV_GET_INPUT_INFO in CONSOLE_GetNumHistoryEntries. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/console.c | 13 ++++--------- dlls/kernel32/console_private.h | 2 +- dlls/kernel32/editline.c | 2 +- include/wine/condrv.h | 1 + server/console.c | 1 + 5 files changed, 8 insertions(+), 11 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index 032f938a12..44df9463da 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -1009,16 +1009,11 @@ BOOL CONSOLE_AppendHistory(const WCHAR* ptr) * * */ -unsigned CONSOLE_GetNumHistoryEntries(void) +unsigned CONSOLE_GetNumHistoryEntries(HANDLE console) { - unsigned ret = -1; - SERVER_START_REQ(get_console_input_info) - { - req->handle = 0; - if (!wine_server_call_err( req )) ret = reply->history_index; - } - SERVER_END_REQ; - return ret; + struct condrv_input_info info; + BOOL ret = DeviceIoControl( console, IOCTL_CONDRV_GET_INPUT_INFO, NULL, 0, &info, sizeof(info), NULL, NULL ); + return ret ? info.history_index : ~0; } /****************************************************************** diff --git a/dlls/kernel32/console_private.h b/dlls/kernel32/console_private.h index 0b033b3550..b0fd2acd92 100644 --- a/dlls/kernel32/console_private.h +++ b/dlls/kernel32/console_private.h @@ -24,7 +24,7 @@ /* console.c */ extern int CONSOLE_GetHistory(int idx, WCHAR* buf, int buf_len) DECLSPEC_HIDDEN; extern BOOL CONSOLE_AppendHistory(const WCHAR *p) DECLSPEC_HIDDEN; -extern unsigned CONSOLE_GetNumHistoryEntries(void) DECLSPEC_HIDDEN; +extern unsigned CONSOLE_GetNumHistoryEntries(HANDLE) DECLSPEC_HIDDEN; extern void CONSOLE_FillLineUniform(HANDLE hConsoleOutput, int i, int j, int len, LPCHAR_INFO lpFill) DECLSPEC_HIDDEN; extern BOOL CONSOLE_GetEditionMode(HANDLE, int*) DECLSPEC_HIDDEN; diff --git a/dlls/kernel32/editline.c b/dlls/kernel32/editline.c index 489960aba6..38bc475754 100644 --- a/dlls/kernel32/editline.c +++ b/dlls/kernel32/editline.c @@ -408,7 +408,7 @@ static WCHAR* WCEL_GetHistory(WCEL_Context* ctx, int idx) static void WCEL_HistoryInit(WCEL_Context* ctx) { - ctx->histPos = CONSOLE_GetNumHistoryEntries(); + ctx->histPos = CONSOLE_GetNumHistoryEntries(ctx->hConIn); ctx->histSize = ctx->histPos + 1; ctx->histCurr = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(WCHAR)); } diff --git a/include/wine/condrv.h b/include/wine/condrv.h index d42128f810..c898b094cf 100644 --- a/include/wine/condrv.h +++ b/include/wine/condrv.h @@ -74,6 +74,7 @@ struct condrv_input_info unsigned int output_cp; /* console output codepage */ unsigned int history_mode; /* whether we duplicate lines in history */ unsigned int history_size; /* number of lines in history */ + unsigned int history_index; /* number of used lines in history */ unsigned int edition_mode; /* index to the edition mode flavors */ unsigned int input_count; /* number of available input records */ condrv_handle_t win; /* renderer window handle */ diff --git a/server/console.c b/server/console.c index 890ea609c2..5a71bece9d 100644 --- a/server/console.c +++ b/server/console.c @@ -1595,6 +1595,7 @@ static int console_input_ioctl( struct fd *fd, ioctl_code_t code, struct async * info.output_cp = console->output_cp; info.history_mode = console->history_mode; info.history_size = console->history_size; + info.history_index = console->history_index; info.edition_mode = console->edition_mode; info.input_count = console->recnum; info.win = console->win;

1 0

Martin Storsjo : tools: Upgrade the config.guess/config.sub scripts.
by Alexandre Julliard Aug. 14, 2020

Aug. 14, 2020

Module: wine Branch: master Commit: 11bb6deb08d8004c2a889c74693c295afdf16ceb URL: https://source.winehq.org/git/wine.git/?a=commit;h=11bb6deb08d8004c2a889c74… Author: Martin Storsjo <martin(a)martin.st> Date: Fri Aug 14 14:56:58 2020 +0300 tools: Upgrade the config.guess/config.sub scripts. The updated version recognizes arm64 macos. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/config.guess | 385 ++++++-- tools/config.sub | 2560 ++++++++++++++++++++++++++-------------------------- 2 files changed, 1601 insertions(+), 1344 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=11bb6deb08d8004c2a88…

1 0

Jacek Caban : kernelbase: Use IOCTL_CONDRV_GET_TITLE in GetConsoleTitleW.
by Alexandre Julliard Aug. 14, 2020

Aug. 14, 2020

Module: wine Branch: master Commit: 7444aa42306cd0e091dd46efc2e0be3c7c61b2fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=7444aa42306cd0e091dd46ef… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 14 13:27:10 2020 +0200 kernelbase: Use IOCTL_CONDRV_GET_TITLE in GetConsoleTitleW. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 9 +++++++++ dlls/kernelbase/console.c | 21 ++++++++------------- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index ee050e887a..1fc23992ba 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -3589,7 +3589,9 @@ static void test_GetConsoleScreenBufferInfoEx(HANDLE std_output) static void test_FreeConsole(void) { + WCHAR title[16]; HANDLE handle; + DWORD size; UINT cp; BOOL ret; @@ -3637,6 +3639,13 @@ static void test_FreeConsole(void) ok(!cp, "cp = %x\n", cp); ok(GetLastError() == ERROR_INVALID_HANDLE, "last error %u\n", GetLastError()); + SetLastError(0xdeadbeef); + memset( title, 0xc0, sizeof(title) ); + size = GetConsoleTitleW( title, ARRAY_SIZE(title) ); + ok(!size, "GetConsoleTitleW returned %u\n", size); + ok(title[0] == 0xc0c0, "title byffer changed\n"); + ok(GetLastError() == ERROR_INVALID_HANDLE, "last error %u\n", GetLastError()); + if (!skip_nt) { SetStdHandle( STD_INPUT_HANDLE, (HANDLE)0xdeadbeef ); diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index 8f4bde8d05..a3271712d9 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -739,20 +739,15 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetConsoleScreenBufferInfoEx( HANDLE handle, */ DWORD WINAPI DECLSPEC_HOTPATCH GetConsoleTitleW( LPWSTR title, DWORD size ) { - DWORD ret = 0; + if (!size) return 0; - SERVER_START_REQ( get_console_input_info ) - { - req->handle = 0; - wine_server_set_reply( req, title, (size - 1) * sizeof(WCHAR) ); - if (!wine_server_call_err( req )) - { - ret = wine_server_reply_size(reply) / sizeof(WCHAR); - title[ret] = 0; - } - } - SERVER_END_REQ; - return ret; + if (!console_ioctl( RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle, IOCTL_CONDRV_GET_TITLE, + NULL, 0, title, (size - 1) * sizeof(WCHAR), &size )) + return 0; + + size /= sizeof(WCHAR); + title[size] = 0; + return size + 1; }

1 0

Jacek Caban : kernelbase: Use IOCTL_CONDRV_GET_INPUT_INFO in GetConsoleCP.
by Alexandre Julliard Aug. 14, 2020

Aug. 14, 2020

Module: wine Branch: master Commit: 4faed406d428a2cec752c2aa1bda8449a1342057 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4faed406d428a2cec752c2aa… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 14 13:26:53 2020 +0200 kernelbase: Use IOCTL_CONDRV_GET_INPUT_INFO in GetConsoleCP. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 6 ++++++ dlls/kernelbase/console.c | 16 +++++----------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 2b70c2ffc4..d3ce6fb21c 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -3590,6 +3590,7 @@ static void test_GetConsoleScreenBufferInfoEx(HANDLE std_output) static void test_FreeConsole(void) { HANDLE handle; + UINT cp; BOOL ret; ok(RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle != NULL, "ConsoleHandle is NULL\n"); @@ -3626,6 +3627,11 @@ static void test_FreeConsole(void) ok(handle == INVALID_HANDLE_VALUE && GetLastError() == ERROR_INVALID_HANDLE, "CreateConsoleScreenBuffer returned: %p (%u)\n", handle, GetLastError()); + SetLastError(0xdeadbeef); + cp = GetConsoleCP(); + ok(!cp, "cp = %x\n", cp); + ok(GetLastError() == ERROR_INVALID_HANDLE, "last error %u\n", GetLastError()); + if (!skip_nt) { SetStdHandle( STD_INPUT_HANDLE, (HANDLE)0xdeadbeef ); diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index 484072e252..94577a5806 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -585,18 +585,12 @@ BOOL WINAPI DECLSPEC_HOTPATCH GenerateConsoleCtrlEvent( DWORD event, DWORD group */ UINT WINAPI DECLSPEC_HOTPATCH GetConsoleCP(void) { - UINT codepage = GetOEMCP(); /* default value */ + struct condrv_input_info info; - SERVER_START_REQ( get_console_input_info ) - { - req->handle = 0; - if (!wine_server_call_err( req )) - { - if (reply->input_cp) codepage = reply->input_cp; - } - } - SERVER_END_REQ; - return codepage; + if (!console_ioctl( RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle, + IOCTL_CONDRV_GET_INPUT_INFO, NULL, 0, &info, sizeof(info), NULL )) + return 0; + return info.input_cp ? info.input_cp : GetOEMCP(); }

1 0

Paul Gofman : ntdll: Don't mind epilog in RtlVirtualUnwind() in case of zero op count on x64.
by Alexandre Julliard Aug. 14, 2020

Aug. 14, 2020

Module: wine Branch: master Commit: 71090bdc2f5051f181c193ea410e6438b92c9c37 URL: https://source.winehq.org/git/wine.git/?a=commit;h=71090bdc2f5051f181c193ea… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Aug 14 13:10:44 2020 +0300 ntdll: Don't mind epilog in RtlVirtualUnwind() in case of zero op count on x64. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_x86_64.c | 5 ++- dlls/ntdll/tests/exception.c | 105 ++++++++++++++++++++++++++++++++++--------- 2 files changed, 88 insertions(+), 22 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 0cbcc177b2..faf24b93b5 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -815,13 +815,16 @@ PVOID WINAPI RtlVirtualUnwind( ULONG type, ULONG64 base, ULONG64 pc, /* check if in prolog */ if (pc >= base + function->BeginAddress && pc < base + function->BeginAddress + info->prolog) { + TRACE("inside prolog.\n"); prolog_offset = pc - base - function->BeginAddress; } else { prolog_offset = ~0; - if (is_inside_epilog( (BYTE *)pc, base, function )) + /* Since Win10 1809 epilogue does not have a special treatment in case of zero opcode count. */ + if (info->count && is_inside_epilog( (BYTE *)pc, base, function )) { + TRACE("inside epilog.\n"); interpret_epilog( (BYTE *)pc, context, ctx_ptr ); *frame_ret = frame; return NULL; diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index b6307264bc..9e33417c7f 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -1935,6 +1935,7 @@ struct unwind_test const BYTE *unwind_info; const struct results *results; unsigned int nb_results; + const struct results *broken_results; }; enum regs @@ -1959,10 +1960,11 @@ static void call_virtual_unwind( int testnum, const struct unwind_test *test ) CONTEXT context; RUNTIME_FUNCTION runtime_func; KNONVOLATILE_CONTEXT_POINTERS ctx_ptr; - UINT i, j, k; + UINT i, j, k, broken_k; ULONG64 fake_stack[256]; ULONG64 frame, orig_rip, orig_rbp, unset_reg; UINT unwind_size = 4 + 2 * test->unwind_info[2] + 8; + void *expected_handler, *broken_handler; memcpy( (char *)code_mem + code_offset, test->function, test->function_size ); memcpy( (char *)code_mem + unwind_offset, test->unwind_info, unwind_size ); @@ -1991,23 +1993,24 @@ static void call_virtual_unwind( int testnum, const struct unwind_test *test ) data = (void *)0xdeadbeef; handler = RtlVirtualUnwind( UNW_FLAG_EHANDLER, (ULONG64)code_mem, orig_rip, &runtime_func, &context, &data, &frame, &ctx_ptr ); - if (test->results[i].handler) - { - ok( (char *)handler == (char *)code_mem + 0x200, - "%u/%u: wrong handler %p/%p\n", testnum, i, handler, (char *)code_mem + 0x200 ); - if (handler) ok( *(DWORD *)data == 0x08070605, - "%u/%u: wrong handler data %p\n", testnum, i, data ); - } + + expected_handler = test->results[i].handler ? (char *)code_mem + 0x200 : NULL; + broken_handler = test->broken_results && test->broken_results[i].handler ? (char *)code_mem + 0x200 : NULL; + + ok( handler == expected_handler || broken( test->broken_results && handler == broken_handler ), + "%u/%u: wrong handler %p/%p\n", testnum, i, handler, expected_handler ); + if (handler) + ok( *(DWORD *)data == 0x08070605, "%u/%u: wrong handler data %p\n", testnum, i, data ); else - { - ok( handler == NULL, "%u/%u: handler %p instead of NULL\n", testnum, i, handler ); ok( data == (void *)0xdeadbeef, "%u/%u: handler data set to %p\n", testnum, i, data ); - } - ok( context.Rip == test->results[i].rip, "%u/%u: wrong rip %p/%x\n", - testnum, i, (void *)context.Rip, test->results[i].rip ); - ok( frame == (ULONG64)fake_stack + test->results[i].frame, "%u/%u: wrong frame %p/%p\n", - testnum, i, (void *)frame, (char *)fake_stack + test->results[i].frame ); + ok( context.Rip == test->results[i].rip + || broken( test->broken_results && context.Rip == test->broken_results[i].rip ), + "%u/%u: wrong rip %p/%x\n", testnum, i, (void *)context.Rip, test->results[i].rip ); + ok( frame == (ULONG64)fake_stack + test->results[i].frame + || broken( test->broken_results && frame == (ULONG64)fake_stack + test->broken_results[i].frame ), + "%u/%u: wrong frame %p/%p\n", + testnum, i, (void *)frame, (char *)fake_stack + test->results[i].frame ); for (j = 0; j < 16; j++) { @@ -2023,15 +2026,40 @@ static void call_virtual_unwind( int testnum, const struct unwind_test *test ) if (test->results[i].regs[k][0] == j) break; } + if (test->broken_results) + { + for (broken_k = 0; broken_k < nb_regs; broken_k++) + { + if (test->broken_results[i].regs[broken_k][0] == -1) + { + broken_k = nb_regs; + break; + } + if (test->broken_results[i].regs[broken_k][0] == j) + break; + } + } + else + { + broken_k = k; + } + if (j == rsp) /* rsp is special */ { - ULONG64 expected_rsp; + ULONG64 expected_rsp, broken_rsp; ok( !ctx_ptr.IntegerContext[j], "%u/%u: rsp should not be set in ctx_ptr\n", testnum, i ); expected_rsp = test->results[i].regs[k][1] < 0 ? -test->results[i].regs[k][1] : (ULONG64)fake_stack + test->results[i].regs[k][1]; - ok( context.Rsp == expected_rsp, + if (test->broken_results) + broken_rsp = test->broken_results[i].regs[k][1] < 0 + ? -test->broken_results[i].regs[k][1] + : (ULONG64)fake_stack + test->broken_results[i].regs[k][1]; + else + broken_rsp = expected_rsp; + + ok( context.Rsp == expected_rsp || broken( context.Rsp == broken_rsp ), "%u/%u: register rsp wrong %p/%p\n", testnum, i, (void *)context.Rsp, (void *)expected_rsp ); continue; @@ -2039,16 +2067,18 @@ static void call_virtual_unwind( int testnum, const struct unwind_test *test ) if (ctx_ptr.IntegerContext[j]) { - ok( k < nb_regs, "%u/%u: register %s should not be set to %lx\n", + ok( k < nb_regs || broken( broken_k < nb_regs ), "%u/%u: register %s should not be set to %lx\n", testnum, i, reg_names[j], *(&context.Rax + j) ); - if (k < nb_regs) - ok( *(&context.Rax + j) == test->results[i].regs[k][1], + ok( k == nb_regs || *(&context.Rax + j) == test->results[i].regs[k][1] + || broken( broken_k == nb_regs || *(&context.Rax + j) + == test->broken_results[i].regs[broken_k][1] ), "%u/%u: register %s wrong %p/%x\n", testnum, i, reg_names[j], (void *)*(&context.Rax + j), test->results[i].regs[k][1] ); } else { - ok( k == nb_regs, "%u/%u: register %s should be set\n", testnum, i, reg_names[j] ); + ok( k == nb_regs || broken( broken_k == nb_regs ), "%u/%u: register %s should be set\n", + testnum, i, reg_names[j] ); if (j == rbp) ok( context.Rbp == orig_rbp, "%u/%u: register rbp wrong %p/unset\n", testnum, i, (void *)context.Rbp ); @@ -2215,12 +2245,45 @@ static void test_virtual_unwind(void) { 0x01, 0x50, TRUE, 0x010, 0x000, { {rsp,-0x028}, {rbp,0x000}, {-1,-1} }}, }; + static const BYTE function_4[] = + { + 0x55, /* 00: push %rbp */ + 0x5d, /* 01: pop %rbp */ + 0xc3 /* 02: ret */ + }; + + static const BYTE unwind_info_4[] = + { + 1 | (UNW_FLAG_EHANDLER << 3), /* version + flags */ + 0x0, /* prolog size */ + 0, /* opcode count */ + 0, /* frame reg */ + + 0x00, 0x02, 0x00, 0x00, /* handler */ + 0x05, 0x06, 0x07, 0x08, /* data */ + }; + + static const struct results results_4[] = + { + /* offset rbp handler rip frame registers */ + { 0x01, 0x50, TRUE, 0x000, 0x000, { {rsp,0x008}, {-1,-1} }}, + }; + + static const struct results broken_results_4[] = + { + /* offset rbp handler rip frame registers */ + { 0x01, 0x50, FALSE, 0x008, 0x000, { {rsp,0x010}, {rbp,0x000}, {-1,-1} }}, + }; + static const struct unwind_test tests[] = { { function_0, sizeof(function_0), unwind_info_0, results_0, ARRAY_SIZE(results_0) }, { function_1, sizeof(function_1), unwind_info_1, results_1, ARRAY_SIZE(results_1) }, { function_2, sizeof(function_2), unwind_info_2, results_2, ARRAY_SIZE(results_2) }, { function_2, sizeof(function_2), unwind_info_3, results_3, ARRAY_SIZE(results_3) }, + + /* Broken before Win10 1809. */ + { function_4, sizeof(function_4), unwind_info_4, results_4, ARRAY_SIZE(results_4), broken_results_4 }, }; unsigned int i;

1 0

Nikolay Sivov : combase: Move CoMarshalInterface().
by Alexandre Julliard Aug. 14, 2020

Aug. 14, 2020

Module: wine Branch: master Commit: bca780c020ba8e2ae21f6e876e78160029a46385 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bca780c020ba8e2ae21f6e87… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 14 09:16:28 2020 +0300 combase: Move CoMarshalInterface(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/combase.spec | 2 +- dlls/combase/marshal.c | 95 +++++++++++++++++++++++++++++ dlls/ole32/marshal.c | 149 ---------------------------------------------- dlls/ole32/ole32.spec | 2 +- 4 files changed, 97 insertions(+), 151 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bca780c020ba8e2ae21f…

1 0

Nikolay Sivov : include: Move fundamental ORPC types to separate private header.
by Alexandre Julliard Aug. 14, 2020

Aug. 14, 2020

Module: wine Branch: master Commit: aaef46ea480cdbad08971f7f683cdbf37882f518 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aaef46ea480cdbad08971f7f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 14 09:16:26 2020 +0300 include: Move fundamental ORPC types to separate private header. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/dcom.idl | 151 +-------------------------------------- include/Makefile.in | 1 + include/wine/orpc.idl | 191 ++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 193 insertions(+), 150 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=aaef46ea480cdbad0897…

1 0