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

Zhiyi Zhang : winex11.drv: Initialize new display device registry display settings.
by Alexandre Julliard 18 Aug '20

18 Aug '20

Module: wine Branch: master Commit: 2b484b1ac7a5510be54cb5341143d89dc1924b37 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2b484b1ac7a5510be54cb534… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Aug 17 16:36:33 2020 +0800 winex11.drv: Initialize new display device registry display settings. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/settings.c | 32 ++++++++++++++++++++++++++++++++ dlls/winex11.drv/x11drv.h | 1 + dlls/winex11.drv/xrandr.c | 2 ++ 3 files changed, 35 insertions(+) diff --git a/dlls/winex11.drv/settings.c b/dlls/winex11.drv/settings.c index 2d1fc7220d..c4929e9b58 100644 --- a/dlls/winex11.drv/settings.c +++ b/dlls/winex11.drv/settings.c @@ -177,6 +177,38 @@ void X11DRV_Settings_Init(void) X11DRV_Settings_SetHandler(&nores_handler); } +/* Initialize registry display settings when new display devices are added */ +void init_registry_display_settings(void) +{ + DEVMODEW dm = {.dmSize = sizeof(dm)}; + DISPLAY_DEVICEW dd = {sizeof(dd)}; + DWORD i = 0; + LONG ret; + + while (EnumDisplayDevicesW(NULL, i++, &dd, 0)) + { + /* Skip if the device already has registry display settings */ + if (EnumDisplaySettingsExW(dd.DeviceName, ENUM_REGISTRY_SETTINGS, &dm, 0)) + continue; + + if (!EnumDisplaySettingsExW(dd.DeviceName, ENUM_CURRENT_SETTINGS, &dm, 0)) + { + ERR("Failed to query current display settings for %s.\n", wine_dbgstr_w(dd.DeviceName)); + continue; + } + + TRACE("Device %s current display mode %ux%u %ubits %uHz at %d,%d.\n", + wine_dbgstr_w(dd.DeviceName), dm.dmPelsWidth, dm.dmPelsHeight, dm.dmBitsPerPel, + dm.dmDisplayFrequency, dm.u1.s2.dmPosition.x, dm.u1.s2.dmPosition.y); + + ret = ChangeDisplaySettingsExW(dd.DeviceName, &dm, NULL, + CDS_GLOBAL | CDS_NORESET | CDS_UPDATEREGISTRY, NULL); + if (ret != DISP_CHANGE_SUCCESSFUL) + ERR("Failed to save registry display settings for %s, returned %d.\n", + wine_dbgstr_w(dd.DeviceName), ret); + } +} + static BOOL get_display_device_reg_key(const WCHAR *device_name, WCHAR *key, unsigned len) { static const WCHAR display[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y'}; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 4a7a0e12d4..233891f7b0 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -701,6 +701,7 @@ extern void X11DRV_Settings_SetHandler(const struct x11drv_settings_handler *han extern void X11DRV_init_desktop( Window win, unsigned int width, unsigned int height ) DECLSPEC_HIDDEN; extern void X11DRV_resize_desktop(BOOL) DECLSPEC_HIDDEN; +extern void init_registry_display_settings(void) DECLSPEC_HIDDEN; extern BOOL is_virtual_desktop(void) DECLSPEC_HIDDEN; extern BOOL is_desktop_fullscreen(void) DECLSPEC_HIDDEN; extern BOOL is_detached_mode(const DEVMODEW *) DECLSPEC_HIDDEN; diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index 155bd85d81..faeb4d98d9 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -1072,6 +1072,8 @@ static BOOL xrandr14_device_change_handler( HWND hwnd, XEvent *event ) * ChangeDisplaySettings(). Otherwise, ChangeDisplaySettings() would send multiple * WM_DISPLAYCHANGE messages instead of just one */ X11DRV_DisplayDevices_Update( FALSE ); + + init_registry_display_settings(); } return FALSE; }

1 0

Zhiyi Zhang : winemac.drv: Initialize new display device registry display settings.
by Alexandre Julliard 18 Aug '20

18 Aug '20

Module: wine Branch: master Commit: 580024c68474521ca624265dda4581ee0096075e URL: https://source.winehq.org/git/wine.git/?a=commit;h=580024c68474521ca624265d… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Aug 17 16:36:41 2020 +0800 winemac.drv: Initialize new display device registry display settings. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/display.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index 9a80308e89..a96a7b2c5f 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -1362,6 +1362,41 @@ done: return (err == kCGErrorSuccess); } +/*********************************************************************** + * init_registry_display_settings + * + * Initialize registry display settings when new display devices are added. + */ +static void init_registry_display_settings(void) +{ + DEVMODEW dm = {.dmSize = sizeof(dm)}; + DISPLAY_DEVICEW dd = {sizeof(dd)}; + DWORD i = 0; + LONG ret; + + while (EnumDisplayDevicesW(NULL, i++, &dd, 0)) + { + /* Skip if the device already has registry display settings */ + if (EnumDisplaySettingsExW(dd.DeviceName, ENUM_REGISTRY_SETTINGS, &dm, 0)) + continue; + + if (!EnumDisplaySettingsExW(dd.DeviceName, ENUM_CURRENT_SETTINGS, &dm, 0)) + { + ERR("Failed to query current display settings for %s.\n", wine_dbgstr_w(dd.DeviceName)); + continue; + } + + TRACE("Device %s current display mode %ux%u %ubits %uHz at %d,%d.\n", + wine_dbgstr_w(dd.DeviceName), dm.dmPelsWidth, dm.dmPelsHeight, dm.dmBitsPerPel, + dm.dmDisplayFrequency, dm.dmPosition.x, dm.dmPosition.y); + + ret = ChangeDisplaySettingsExW(dd.DeviceName, &dm, NULL, + CDS_GLOBAL | CDS_NORESET | CDS_UPDATEREGISTRY, NULL); + if (ret != DISP_CHANGE_SUCCESSFUL) + ERR("Failed to save registry display settings for %s, returned %d.\n", + wine_dbgstr_w(dd.DeviceName), ret); + } +} /*********************************************************************** * macdrv_displays_changed @@ -1392,6 +1427,7 @@ void macdrv_displays_changed(const macdrv_event *event) CGDisplayModeRelease(mode); macdrv_init_display_devices(TRUE); + init_registry_display_settings(); if (is_original && retina_enabled) {

1 0

Jacek Caban : kernelbase: Use IOCTL_CONDRV_SET_INPUT_INFO in SetConsoleCP.
by Alexandre Julliard 18 Aug '20

18 Aug '20

Module: wine Branch: master Commit: c6e0cb6c720c56541ebb45a6b4821d46f0300f36 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c6e0cb6c720c56541ebb45a6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 17 15:07:21 2020 +0200 kernelbase: Use IOCTL_CONDRV_SET_INPUT_INFO in SetConsoleCP. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 4 ++++ dlls/kernelbase/console.c | 15 +++++---------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 1702369d7a..38ec621da6 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -3640,6 +3640,10 @@ static void test_FreeConsole(void) ok(!cp, "cp = %x\n", cp); ok(GetLastError() == ERROR_INVALID_HANDLE, "last error %u\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = SetConsoleCP(GetOEMCP()); + ok(!ret && GetLastError() == ERROR_INVALID_HANDLE, "SetConsoleCP returned %x(%u)\n", ret, GetLastError()); + SetLastError(0xdeadbeef); memset( title, 0xc0, sizeof(title) ); size = GetConsoleTitleW( title, ARRAY_SIZE(title) ); diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index a3271712d9..536f1912e9 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -1043,22 +1043,17 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetConsoleActiveScreenBuffer( HANDLE handle ) */ BOOL WINAPI DECLSPEC_HOTPATCH SetConsoleCP( UINT cp ) { - BOOL ret; + struct condrv_input_info_params params = { SET_CONSOLE_INPUT_INFO_INPUT_CODEPAGE }; if (!IsValidCodePage( cp )) { SetLastError( ERROR_INVALID_PARAMETER ); return FALSE; } - SERVER_START_REQ( set_console_input_info ) - { - req->handle = 0; - req->mask = SET_CONSOLE_INPUT_INFO_INPUT_CODEPAGE; - req->input_cp = cp; - ret = !wine_server_call_err( req ); - } - SERVER_END_REQ; - return ret; + + params.info.input_cp = cp; + return console_ioctl( RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle, + IOCTL_CONDRV_SET_INPUT_INFO, &params, sizeof(params), NULL, 0, NULL ); }

1 0

Jacek Caban : kernelbase: Use IOCTL_CONDRV_SET_INPUT_INFO in SetConsoleOutputCP.
by Alexandre Julliard 18 Aug '20

18 Aug '20

Module: wine Branch: master Commit: 32eb41de8caaa9462406c859c8242df5a6ebf343 URL: https://source.winehq.org/git/wine.git/?a=commit;h=32eb41de8caaa9462406c859… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 17 15:07:30 2020 +0200 kernelbase: Use IOCTL_CONDRV_SET_INPUT_INFO in SetConsoleOutputCP. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 4 ++++ dlls/kernelbase/console.c | 15 +++++---------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 38ec621da6..1adf4af064 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -3644,6 +3644,10 @@ static void test_FreeConsole(void) ret = SetConsoleCP(GetOEMCP()); ok(!ret && GetLastError() == ERROR_INVALID_HANDLE, "SetConsoleCP returned %x(%u)\n", ret, GetLastError()); + SetLastError(0xdeadbeef); + ret = SetConsoleOutputCP(GetOEMCP()); + ok(!ret && GetLastError() == ERROR_INVALID_HANDLE, "SetConsoleCP returned %x(%u)\n", ret, GetLastError()); + SetLastError(0xdeadbeef); memset( title, 0xc0, sizeof(title) ); size = GetConsoleTitleW( title, ARRAY_SIZE(title) ); diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index 536f1912e9..2611fd5864 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -1222,22 +1222,17 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetConsoleMode( HANDLE handle, DWORD mode ) */ BOOL WINAPI DECLSPEC_HOTPATCH SetConsoleOutputCP( UINT cp ) { - BOOL ret; + struct condrv_input_info_params params = { SET_CONSOLE_INPUT_INFO_OUTPUT_CODEPAGE }; if (!IsValidCodePage( cp )) { SetLastError( ERROR_INVALID_PARAMETER ); return FALSE; } - SERVER_START_REQ( set_console_input_info ) - { - req->handle = 0; - req->mask = SET_CONSOLE_INPUT_INFO_OUTPUT_CODEPAGE; - req->output_cp = cp; - ret = !wine_server_call_err( req ); - } - SERVER_END_REQ; - return ret; + + params.info.output_cp = cp; + return console_ioctl( RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle, + IOCTL_CONDRV_SET_INPUT_INFO, &params, sizeof(params), NULL, 0, NULL ); }

1 0

Alexandre Julliard : Wine release 5.15
by Alexandre Julliard 14 Aug '20

14 Aug '20

Module: website Branch: master Commit: d6144af8271235ff6ef997cbb98c19c83f1ac3ea URL: https://source.winehq.org/git/website.git/?a=commit;h=d6144af8271235ff6ef99… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 14 23:39:46 2020 +0200 Wine release 5.15 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2020081401.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/en/2020081401.xml b/news/en/2020081401.xml new file mode 100644 index 00000000..2f9951dd --- /dev/null +++ b/news/en/2020081401.xml @@ -0,0 +1,17 @@ +<news> +<date>August 14, 2020</date> +<title>Wine 5.15 Released</title> +<body> + The Wine development release 5.15 is now available. + <a href="{$root}/announce/5.15">What's new</a> in this release: +<ul> + <li>Initial implementation of the XACT Engine libraries.</li> + <li>Beginnings of a math library in MSVCRT based on Musl.</li> + <li>Still more restructuration of the console support.</li> + <li>Direct Input performance improvements.</li> + <li>Exception handling fixes on x86-64.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/5.x/wine-5.15.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Jacek Caban : kernel32: Use IOCTL_CONDRV_GET_INPUT_INFO in GetConsoleWindow.
by Alexandre Julliard 14 Aug '20

14 Aug '20

Module: wine Branch: master Commit: 36fc962f5c0f2fd33cfd09c816017655104c4201 URL: https://source.winehq.org/git/wine.git/?a=commit;h=36fc962f5c0f2fd33cfd09c8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 14 13:27:20 2020 +0200 kernel32: Use IOCTL_CONDRV_GET_INPUT_INFO in GetConsoleWindow. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/console.c | 16 ++++++---------- dlls/kernel32/tests/console.c | 6 ++++++ 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index c38fa5d0c2..032f938a12 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -187,18 +187,14 @@ static BOOL restore_console_mode(HANDLE hin) * Success: hwnd of the console window. * Failure: NULL */ -HWND WINAPI GetConsoleWindow(VOID) +HWND WINAPI GetConsoleWindow(void) { - HWND hWnd = NULL; - - SERVER_START_REQ(get_console_input_info) - { - req->handle = 0; - if (!wine_server_call_err(req)) hWnd = wine_server_ptr_handle( reply->win ); - } - SERVER_END_REQ; + struct condrv_input_info info; + BOOL ret; - return hWnd; + ret = DeviceIoControl( RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle, + IOCTL_CONDRV_GET_INPUT_INFO, NULL, 0, &info, sizeof(info), NULL, NULL ); + return ret ? (HWND)info.win : NULL; } diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 1fc23992ba..1702369d7a 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -3592,6 +3592,7 @@ static void test_FreeConsole(void) WCHAR title[16]; HANDLE handle; DWORD size; + HWND hwnd; UINT cp; BOOL ret; @@ -3646,6 +3647,11 @@ static void test_FreeConsole(void) ok(title[0] == 0xc0c0, "title byffer changed\n"); ok(GetLastError() == ERROR_INVALID_HANDLE, "last error %u\n", GetLastError()); + SetLastError(0xdeadbeef); + hwnd = GetConsoleWindow(); + ok(!hwnd, "hwnd = %p\n", hwnd); + ok(GetLastError() == ERROR_INVALID_HANDLE, "last error %u\n", GetLastError()); + if (!skip_nt) { SetStdHandle( STD_INPUT_HANDLE, (HANDLE)0xdeadbeef );

1 0

Jacek Caban : kernel32: Use IOCTL_CONDRV_GET_INPUT_INFO in CONSOLE_GetNumHistoryEntries.
by Alexandre Julliard 14 Aug '20

14 Aug '20

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

Jacek Caban : server: Remove no longer used get_console_input_info.
by Alexandre Julliard 14 Aug '20

14 Aug '20

Module: wine Branch: master Commit: 2306efc3fae152586348a618fce3d8398a883924 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2306efc3fae152586348a618… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 14 13:27:42 2020 +0200 server: Remove no longer used get_console_input_info. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/server_protocol.h | 26 +------------------------- server/console.c | 18 ------------------ server/protocol.def | 15 --------------- server/request.h | 12 ------------ server/trace.c | 20 -------------------- 5 files changed, 1 insertion(+), 90 deletions(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index ddf6373dec..472ed6ab93 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -1904,27 +1904,6 @@ struct set_console_input_info_reply -struct get_console_input_info_request -{ - struct request_header __header; - obj_handle_t handle; -}; -struct get_console_input_info_reply -{ - struct reply_header __header; - int history_mode; - int history_size; - int history_index; - int edition_mode; - int input_cp; - int output_cp; - user_handle_t win; - /* VARARG(title,unicode_str); */ - char __pad_36[4]; -}; - - - struct append_console_input_history_request { struct request_header __header; @@ -5566,7 +5545,6 @@ enum request REQ_attach_console, REQ_get_console_wait_event, REQ_set_console_input_info, - REQ_get_console_input_info, REQ_append_console_input_history, REQ_get_console_input_history, REQ_create_console_output, @@ -5857,7 +5835,6 @@ union generic_request struct attach_console_request attach_console_request; struct get_console_wait_event_request get_console_wait_event_request; struct set_console_input_info_request set_console_input_info_request; - struct get_console_input_info_request get_console_input_info_request; struct append_console_input_history_request append_console_input_history_request; struct get_console_input_history_request get_console_input_history_request; struct create_console_output_request create_console_output_request; @@ -6146,7 +6123,6 @@ union generic_reply struct attach_console_reply attach_console_reply; struct get_console_wait_event_reply get_console_wait_event_reply; struct set_console_input_info_reply set_console_input_info_reply; - struct get_console_input_info_reply get_console_input_info_reply; struct append_console_input_history_reply append_console_input_history_reply; struct get_console_input_history_reply get_console_input_history_reply; struct create_console_output_reply create_console_output_reply; @@ -6367,7 +6343,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 635 +#define SERVER_PROTOCOL_VERSION 636 /* ### protocol_version end ### */ diff --git a/server/console.c b/server/console.c index 5a71bece9d..59a2794e01 100644 --- a/server/console.c +++ b/server/console.c @@ -2131,24 +2131,6 @@ DECL_HANDLER(set_console_input_info) set_console_input_info( req, get_req_data(), get_req_data_size() ); } -/* get info about a console (output only) */ -DECL_HANDLER(get_console_input_info) -{ - struct console_input *console; - - if (!(console = console_input_get( req->handle, FILE_READ_PROPERTIES ))) return; - if (console->title) set_reply_data( console->title, min( console->title_len, get_reply_max_size() )); - reply->history_mode = console->history_mode; - reply->history_size = console->history_size; - reply->history_index = console->history_index; - reply->edition_mode = console->edition_mode; - reply->input_cp = console->input_cp; - reply->output_cp = console->output_cp; - reply->win = console->win; - - release_object( console ); -} - /* appends a string to console's history */ DECL_HANDLER(append_console_input_history) { diff --git a/server/protocol.def b/server/protocol.def index 9693228eaa..123f629a48 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1508,21 +1508,6 @@ enum server_fd_type #define SET_CONSOLE_INPUT_INFO_WIN 0x80 -/* Get info about a console (input only) */ -(a)REQ(get_console_input_info) - obj_handle_t handle; /* handle to console input, or 0 for process' console */ -(a)REPLY - int history_mode; /* whether we duplicate lines in history */ - int history_size; /* number of lines in history */ - int history_index; /* number of used lines in history */ - int edition_mode; /* index to the edition mode flavors */ - int input_cp; /* console input codepage */ - int output_cp; /* console output codepage */ - user_handle_t win; /* console window if backend supports it */ - VARARG(title,unicode_str); /* console title */ -(a)END - - /* appends a string to console's history */ @REQ(append_console_input_history) obj_handle_t handle; /* handle to console input, or 0 for process' console */ diff --git a/server/request.h b/server/request.h index 1d5fe8942a..4dff87e8b9 100644 --- a/server/request.h +++ b/server/request.h @@ -186,7 +186,6 @@ DECL_HANDLER(free_console); DECL_HANDLER(attach_console); DECL_HANDLER(get_console_wait_event); DECL_HANDLER(set_console_input_info); -DECL_HANDLER(get_console_input_info); DECL_HANDLER(append_console_input_history); DECL_HANDLER(get_console_input_history); DECL_HANDLER(create_console_output); @@ -476,7 +475,6 @@ static const req_handler req_handlers[REQ_NB_REQUESTS] = (req_handler)req_attach_console, (req_handler)req_get_console_wait_event, (req_handler)req_set_console_input_info, - (req_handler)req_get_console_input_info, (req_handler)req_append_console_input_history, (req_handler)req_get_console_input_history, (req_handler)req_create_console_output, @@ -1128,16 +1126,6 @@ C_ASSERT( FIELD_OFFSET(struct set_console_input_info_request, input_cp) == 36 ); C_ASSERT( FIELD_OFFSET(struct set_console_input_info_request, output_cp) == 40 ); C_ASSERT( FIELD_OFFSET(struct set_console_input_info_request, win) == 44 ); C_ASSERT( sizeof(struct set_console_input_info_request) == 48 ); -C_ASSERT( FIELD_OFFSET(struct get_console_input_info_request, handle) == 12 ); -C_ASSERT( sizeof(struct get_console_input_info_request) == 16 ); -C_ASSERT( FIELD_OFFSET(struct get_console_input_info_reply, history_mode) == 8 ); -C_ASSERT( FIELD_OFFSET(struct get_console_input_info_reply, history_size) == 12 ); -C_ASSERT( FIELD_OFFSET(struct get_console_input_info_reply, history_index) == 16 ); -C_ASSERT( FIELD_OFFSET(struct get_console_input_info_reply, edition_mode) == 20 ); -C_ASSERT( FIELD_OFFSET(struct get_console_input_info_reply, input_cp) == 24 ); -C_ASSERT( FIELD_OFFSET(struct get_console_input_info_reply, output_cp) == 28 ); -C_ASSERT( FIELD_OFFSET(struct get_console_input_info_reply, win) == 32 ); -C_ASSERT( sizeof(struct get_console_input_info_reply) == 40 ); C_ASSERT( FIELD_OFFSET(struct append_console_input_history_request, handle) == 12 ); C_ASSERT( sizeof(struct append_console_input_history_request) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_console_input_history_request, handle) == 12 ); diff --git a/server/trace.c b/server/trace.c index b04d9cc36e..a276f54212 100644 --- a/server/trace.c +++ b/server/trace.c @@ -2070,23 +2070,6 @@ static void dump_set_console_input_info_request( const struct set_console_input_ dump_varargs_unicode_str( ", title=", cur_size ); } -static void dump_get_console_input_info_request( const struct get_console_input_info_request *req ) -{ - fprintf( stderr, " handle=%04x", req->handle ); -} - -static void dump_get_console_input_info_reply( const struct get_console_input_info_reply *req ) -{ - fprintf( stderr, " history_mode=%d", req->history_mode ); - fprintf( stderr, ", history_size=%d", req->history_size ); - fprintf( stderr, ", history_index=%d", req->history_index ); - fprintf( stderr, ", edition_mode=%d", req->edition_mode ); - fprintf( stderr, ", input_cp=%d", req->input_cp ); - fprintf( stderr, ", output_cp=%d", req->output_cp ); - fprintf( stderr, ", win=%08x", req->win ); - dump_varargs_unicode_str( ", title=", cur_size ); -} - static void dump_append_console_input_history_request( const struct append_console_input_history_request *req ) { fprintf( stderr, " handle=%04x", req->handle ); @@ -4513,7 +4496,6 @@ static const dump_func req_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_attach_console_request, (dump_func)dump_get_console_wait_event_request, (dump_func)dump_set_console_input_info_request, - (dump_func)dump_get_console_input_info_request, (dump_func)dump_append_console_input_history_request, (dump_func)dump_get_console_input_history_request, (dump_func)dump_create_console_output_request, @@ -4800,7 +4782,6 @@ static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { NULL, (dump_func)dump_get_console_wait_event_reply, NULL, - (dump_func)dump_get_console_input_info_reply, NULL, (dump_func)dump_get_console_input_history_reply, (dump_func)dump_create_console_output_reply, @@ -5087,7 +5068,6 @@ static const char * const req_names[REQ_NB_REQUESTS] = { "attach_console", "get_console_wait_event", "set_console_input_info", - "get_console_input_info", "append_console_input_history", "get_console_input_history", "create_console_output",

1 0

Martin Storsjo : ntdll: Only call putenv() if we are going to call exec().
by Alexandre Julliard 14 Aug '20

14 Aug '20

Module: wine Branch: master Commit: e8f2c2464a3ce47e84be7786691ba35d25c7e6a8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e8f2c2464a3ce47e84be7786… Author: Martin Storsjo <martin(a)martin.st> Date: Fri Aug 14 14:34:51 2020 +0300 ntdll: Only call putenv() if we are going to call exec(). If we aren't going to exec (if pre_exec() returns zero), we will continue using the envp pointer we got from the caller. However, the putenv() call does update the environment, and this can in some cases overwrite the array that the old (stale, potentially dangling) envp pointer points to. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index d621d4ef8e..e7cc050ba9 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1685,14 +1685,14 @@ void __wine_main( int argc, char *argv[], char *envp[] ) if (!getenv( "WINELOADERNOEXEC" )) /* first time around */ { - static char noexec[] = "WINELOADERNOEXEC=1"; - - putenv( noexec ); check_command_line( argc, argv ); if (pre_exec()) { + static char noexec[] = "WINELOADERNOEXEC=1"; char **new_argv = malloc( (argc + 2) * sizeof(*argv) ); + memcpy( new_argv + 1, argv, (argc + 1) * sizeof(*argv) ); + putenv( noexec ); loader_exec( argv0, new_argv, client_cpu ); fatal_error( "could not exec the wine loader\n" ); }

1 0

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

14 Aug '20

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