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

Nikolay Sivov : combase: Move SetErrorInfo().
by Alexandre Julliard Aug. 18, 2020

Aug. 18, 2020

Module: wine Branch: master Commit: f26b1f0392714891bbd8c603de072818cc65e45f URL: https://source.winehq.org/git/wine.git/?a=commit;h=f26b1f0392714891bbd8c603… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 17 10:20:52 2020 +0300 combase: Move SetErrorInfo(). 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/errorinfo.c | 26 ++++++++++++++++ dlls/ole32/Makefile.in | 1 - dlls/ole32/errorinfo.c | 77 ----------------------------------------------- dlls/ole32/ole32.spec | 2 +- 5 files changed, 28 insertions(+), 80 deletions(-) diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index cd8ed1c635..608fe84af8 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -317,7 +317,7 @@ @ stdcall RoUninitialize() @ stub RoUnregisterForApartmentShutdown @ stub SetCleanupFlag -@ stdcall SetErrorInfo(long ptr) ole32.SetErrorInfo +@ stdcall SetErrorInfo(long ptr) @ stub SetRestrictedErrorInfo @ stdcall StringFromCLSID(ptr ptr) @ stdcall StringFromGUID2(ptr ptr long) diff --git a/dlls/combase/errorinfo.c b/dlls/combase/errorinfo.c index aac00fd4eb..83e2f0b710 100644 --- a/dlls/combase/errorinfo.c +++ b/dlls/combase/errorinfo.c @@ -384,3 +384,29 @@ HRESULT WINAPI GetErrorInfo(ULONG reserved, IErrorInfo **error_info) return S_OK; } + +/*********************************************************************** + * SetErrorInfo (combase.@) + */ +HRESULT WINAPI SetErrorInfo(ULONG reserved, IErrorInfo *error_info) +{ + struct tlsdata *tlsdata; + HRESULT hr; + + TRACE("%u, %p\n", reserved, error_info); + + if (reserved) + return E_INVALIDARG; + + if (FAILED(hr = com_get_tlsdata(&tlsdata))) + return hr; + + if (tlsdata->errorinfo) + IErrorInfo_Release(tlsdata->errorinfo); + + tlsdata->errorinfo = error_info; + if (error_info) + IErrorInfo_AddRef(error_info); + + return S_OK; +} diff --git a/dlls/ole32/Makefile.in b/dlls/ole32/Makefile.in index 86f13e188c..a113c7622b 100644 --- a/dlls/ole32/Makefile.in +++ b/dlls/ole32/Makefile.in @@ -17,7 +17,6 @@ C_SRCS = \ datacache.c \ defaulthandler.c \ dictionary.c \ - errorinfo.c \ filelockbytes.c \ filemoniker.c \ ftmarshal.c \ diff --git a/dlls/ole32/errorinfo.c b/dlls/ole32/errorinfo.c deleted file mode 100644 index d36c6c8c0f..0000000000 --- a/dlls/ole32/errorinfo.c +++ /dev/null @@ -1,77 +0,0 @@ -/* - * ErrorInfo API - * - * Copyright 2000 Patrik Stridvall, Juergen Schmied - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - * - * NOTES: - * - * The errorinfo is a per-thread object. The reference is stored in the - * TEB at offset 0xf80. - */ - -#include <stdarg.h> -#include <string.h> - -#define COBJMACROS - -#include "windef.h" -#include "winbase.h" -#include "objbase.h" -#include "oleauto.h" -#include "winerror.h" - -#include "compobj_private.h" - -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(ole); - -/*********************************************************************** - * SetErrorInfo (OLE32.@) - * - * Sets the error information object for the current thread. - * - * PARAMS - * dwReserved [I] Reserved. Must be zero. - * perrinfo [I] Error info object. - * - * RETURNS - * Success: S_OK. - * Failure: E_INVALIDARG if dwReserved is not zero. - */ -HRESULT WINAPI SetErrorInfo(ULONG dwReserved, IErrorInfo *perrinfo) -{ - IErrorInfo * pei; - - TRACE("(%d, %p)\n", dwReserved, perrinfo); - - if (dwReserved) - { - ERR("dwReserved (0x%x) != 0\n", dwReserved); - return E_INVALIDARG; - } - - /* release old errorinfo */ - pei = COM_CurrentInfo()->errorinfo; - if (pei) IErrorInfo_Release(pei); - - /* set to new value */ - COM_CurrentInfo()->errorinfo = perrinfo; - if (perrinfo) IErrorInfo_AddRef(perrinfo); - - return S_OK; -} diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index fb78ab8b6f..f21f6429ca 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -262,7 +262,7 @@ @ stdcall STGMEDIUM_UserUnmarshal(ptr ptr ptr) @ stdcall SetConvertStg(ptr long) @ stub SetDocumentBitStg -@ stdcall SetErrorInfo(long ptr) +@ stdcall SetErrorInfo(long ptr) combase.SetErrorInfo @ stdcall StgConvertPropertyToVariant(ptr long ptr ptr) @ stdcall StgConvertVariantToProperty(ptr long ptr ptr long long ptr) @ stdcall StgCreateDocfile(wstr long long ptr)

1 0

Zhiyi Zhang : winex11.drv: Report a GPU same as the host primary GPU in virtual desktop mode.
by Alexandre Julliard Aug. 18, 2020

Aug. 18, 2020

Module: wine Branch: master Commit: aadae4d1ea173dfa30e09d6cc816bb174e35f90d URL: https://source.winehq.org/git/wine.git/?a=commit;h=aadae4d1ea173dfa30e09d6c… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Aug 17 16:36:23 2020 +0800 winex11.drv: Report a GPU same as the host primary GPU in virtual desktop mode. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49631 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/desktop.c | 7 ++++++- dlls/winex11.drv/display.c | 15 +++++++++++++++ dlls/winex11.drv/x11drv.h | 1 + 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index 64f61d21e4..b517e44e15 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -212,7 +212,12 @@ static BOOL X11DRV_desktop_get_gpus( struct x11drv_gpu **new_gpus, int *count ) gpu = heap_calloc( 1, sizeof(*gpu) ); if (!gpu) return FALSE; - lstrcpyW( gpu->name, wine_adapterW ); + if (!get_host_primary_gpu( gpu )) + { + WARN( "Failed to get host primary gpu.\n" ); + lstrcpyW( gpu->name, wine_adapterW ); + } + *new_gpus = gpu; *count = 1; return TRUE; diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index 27876e02df..3e9e4474d4 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -259,6 +259,21 @@ RECT get_host_primary_monitor_rect(void) return rect; } +BOOL get_host_primary_gpu(struct x11drv_gpu *gpu) +{ + struct x11drv_gpu *gpus; + INT gpu_count; + + if (host_handler.get_gpus(&gpus, &gpu_count) && gpu_count) + { + *gpu = gpus[0]; + host_handler.free_gpus(gpus); + return TRUE; + } + + return FALSE; +} + RECT get_work_area(const RECT *monitor_rect) { Atom type; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 375fd1465f..4a7a0e12d4 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -792,6 +792,7 @@ struct x11drv_display_device_handler }; extern HANDLE get_display_device_init_mutex(void) DECLSPEC_HIDDEN; +extern BOOL get_host_primary_gpu(struct x11drv_gpu *gpu) DECLSPEC_HIDDEN; extern void release_display_device_init_mutex(HANDLE) DECLSPEC_HIDDEN; extern void X11DRV_DisplayDevices_SetHandler(const struct x11drv_display_device_handler *handler) DECLSPEC_HIDDEN; extern void X11DRV_DisplayDevices_Init(BOOL force) DECLSPEC_HIDDEN;

1 0

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

Aug. 18, 2020

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

Daniel Lehman : ucrtbase/tests: Add tests for SpecialCasing.
by Alexandre Julliard Aug. 18, 2020

Aug. 18, 2020

Module: wine Branch: master Commit: 4fd4533319fd30ebdb108e78378029d4047754a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4fd4533319fd30ebdb108e78… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Thu Aug 6 18:44:59 2020 -0700 ucrtbase/tests: Add tests for SpecialCasing. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ucrtbase/tests/string.c | 80 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 80 insertions(+) diff --git a/dlls/ucrtbase/tests/string.c b/dlls/ucrtbase/tests/string.c index 3a4b8b9f04..beeebc5c3c 100644 --- a/dlls/ucrtbase/tests/string.c +++ b/dlls/ucrtbase/tests/string.c @@ -437,6 +437,85 @@ static void test__strnicmp(void) ok(!ret, "got %d.\n", ret); } +static void test_SpecialCasing(void) +{ + int i; + wint_t ret, exp; + _locale_t locale; + struct test { + const char *lang; + wint_t ch; + wint_t exp; + }; + + struct test ucases[] = { + {"English", 'I', 'i'}, /* LATIN CAPITAL LETTER I */ + {"English", 0x0130}, /* LATIN CAPITAL LETTER I WITH DOT ABOVE */ + + {"Turkish", 'I', 'i'}, /* LATIN CAPITAL LETTER I */ + {"Turkish", 0x0130}, /* LATIN CAPITAL LETTER I WITH DOT ABOVE */ + }; + struct test lcases[] = { + {"English", 'i', 'I'}, /* LATIN SMALL LETTER I */ + {"English", 0x0131}, /* LATIN SMALL LETTER DOTLESS I */ + + {"Turkish", 'i', 'I'}, /* LATIN SMALL LETTER I */ + {"Turkish", 0x0131}, /* LATIN SMALL LETTER DOTLESS I */ + }; + + for (i = 0; i < ARRAY_SIZE(ucases); i++) { + if (!setlocale(LC_ALL, ucases[i].lang)) { + win_skip("skipping special case tests for %s\n", ucases[i].lang); + continue; + } + + ret = towlower(ucases[i].ch); + exp = ucases[i].exp ? ucases[i].exp : ucases[i].ch; + ok(ret == exp, "expected lowercase %x, got %x for locale %s\n", exp, ret, ucases[i].lang); + } + + for (i = 0; i < ARRAY_SIZE(lcases); i++) { + if (!setlocale(LC_ALL, lcases[i].lang)) { + win_skip("skipping special case tests for %s\n", lcases[i].lang); + continue; + } + + ret = towupper(lcases[i].ch); + exp = lcases[i].exp ? lcases[i].exp : lcases[i].ch; + ok(ret == exp, "expected uppercase %x, got %x for locale %s\n", exp, ret, lcases[i].lang); + } + + setlocale(LC_ALL, "C"); + + /* test _towlower_l creating locale */ + for (i = 0; i < ARRAY_SIZE(ucases); i++) { + if (!(locale = _create_locale(LC_ALL, ucases[i].lang))) { + win_skip("locale %s not available. skipping\n", ucases[i].lang); + continue; + } + + ret = _towlower_l(ucases[i].ch, locale); + exp = ucases[i].exp ? ucases[i].exp : ucases[i].ch; + ok(ret == exp, "expected lowercase %x, got %x for locale %s\n", exp, ret, ucases[i].lang); + + _free_locale(locale); + } + + /* test _towupper_l creating locale */ + for (i = 0; i < ARRAY_SIZE(lcases); i++) { + if (!(locale = _create_locale(LC_ALL, lcases[i].lang))) { + win_skip("locale %s not available. skipping\n", lcases[i].lang); + continue; + } + + ret = _towupper_l(lcases[i].ch, locale); + exp = lcases[i].exp ? lcases[i].exp : lcases[i].ch; + ok(ret == exp, "expected uppercase %x, got %x for locale %s\n", exp, ret, lcases[i].lang); + + _free_locale(locale); + } +} + START_TEST(string) { ok(_set_invalid_parameter_handler(test_invalid_parameter_handler) == NULL, @@ -450,4 +529,5 @@ START_TEST(string) test_mbsspn(); test_wcstok(); test__strnicmp(); + test_SpecialCasing(); }

1 0

Alexandre Julliard : Wine release 5.15
by Alexandre Julliard Aug. 14, 2020

Aug. 14, 2020

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 Aug. 14, 2020

Aug. 14, 2020

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

Serge Gautherie : winapi_test: Update generated.c files.
by Alexandre Julliard Aug. 14, 2020

Aug. 14, 2020

Module: wine Branch: master Commit: 743ed29af51f2dfa3afbe97e94b95fe71cea0de5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=743ed29af51f2dfa3afbe97e… Author: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Date: Fri Aug 14 01:22:56 2020 +0200 winapi_test: Update generated.c files. Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/generated.c | 10 ++++++ dlls/ntdll/tests/generated.c | 16 +++++++++ dlls/rpcrt4/tests/generated.c | 2 ++ dlls/shell32/tests/generated.c | 6 ++++ dlls/winmm/tests/generated.c | 76 ++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 110 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=743ed29af51f2dfa3afb…

1 0

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

Aug. 14, 2020

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

Jacek Caban : server: Remove no longer used get_console_input_info.
by Alexandre Julliard Aug. 14, 2020

Aug. 14, 2020

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

Alexandre Julliard : Release 5.15.
by Alexandre Julliard Aug. 14, 2020

Aug. 14, 2020

Module: wine Branch: master Commit: 019fcaa36410f5b52e9c3fb90a621b56a4f10f35 URL: https://source.winehq.org/git/wine.git/?a=commit;h=019fcaa36410f5b52e9c3fb9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 14 23:37:58 2020 +0200 Release 5.15. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 794 +++++++++++++++++++++++++++++++------------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 403 insertions(+), 411 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=019fcaa36410f5b52e9c…

1 0