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

Jacek Caban : kernelbase: Use IOCTL_CONDRV_SET_TITLE in SetConsoleTitleW.
by Alexandre Julliard Aug. 18, 2020

Aug. 18, 2020

Module: wine Branch: master Commit: 6cff65900dd299f596636ca5449b0f99e825cf97 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6cff65900dd299f596636ca5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 17 15:07:39 2020 +0200 kernelbase: Use IOCTL_CONDRV_SET_TITLE in SetConsoleTitleW. 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 | 14 +++----------- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 1adf4af064..3a374c7797 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -3655,6 +3655,10 @@ 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); + ret = SetConsoleTitleW( L"test" ); + ok(!ret && GetLastError() == ERROR_INVALID_HANDLE, "SetConsoleTitleW returned %x(%u)\n", ret, GetLastError()); + SetLastError(0xdeadbeef); hwnd = GetConsoleWindow(); ok(!hwnd, "hwnd = %p\n", hwnd); diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index 2611fd5864..e5a9fbd501 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -1305,18 +1305,10 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetConsoleTextAttribute( HANDLE handle, WORD attr */ BOOL WINAPI DECLSPEC_HOTPATCH SetConsoleTitleW( LPCWSTR title ) { - BOOL ret; - TRACE( "%s\n", debugstr_w( title )); - SERVER_START_REQ( set_console_input_info ) - { - req->handle = 0; - req->mask = SET_CONSOLE_INPUT_INFO_TITLE; - wine_server_add_data( req, title, lstrlenW(title) * sizeof(WCHAR) ); - ret = !wine_server_call_err( req ); - } - SERVER_END_REQ; - return ret; + + return console_ioctl( RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle, IOCTL_CONDRV_SET_TITLE, + (void *)title, lstrlenW(title) * sizeof(WCHAR), NULL, 0, NULL ); }

1 0

Martin Storsjo : ntdll: Fix arm64 sigcontext access for darwin.
by Alexandre Julliard Aug. 18, 2020

Aug. 18, 2020

Module: wine Branch: master Commit: 8f3bd63b52f03ff05e9d2a00a2e129a0b0092969 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8f3bd63b52f03ff05e9d2a00… Author: Martin Storsjo <martin(a)martin.st> Date: Fri Aug 14 21:56:45 2020 +0300 ntdll: Fix arm64 sigcontext access for darwin. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_arm64.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index cbb6a019e5..7fe40d4ea1 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -110,6 +110,24 @@ static DWORD64 get_fault_esr( ucontext_t *sigcontext ) return 0; } +#elif defined(__APPLE__) + +/* All Registers access - only for local access */ +# define REG_sig(reg_name, context) ((context)->uc_mcontext->__ss.__ ## reg_name) +# define REGn_sig(reg_num, context) ((context)->uc_mcontext->__ss.__x[reg_num]) + +/* Special Registers access */ +# define SP_sig(context) REG_sig(sp, context) /* Stack pointer */ +# define PC_sig(context) REG_sig(pc, context) /* Program counter */ +# define PSTATE_sig(context) REG_sig(cpsr, context) /* Current State Register */ +# define FP_sig(context) REG_sig(fp, context) /* Frame pointer */ +# define LR_sig(context) REG_sig(lr, context) /* Link Register */ + +static DWORD64 get_fault_esr( ucontext_t *sigcontext ) +{ + return sigcontext->uc_mcontext->__es.__esr; +} + #endif /* linux */ static pthread_key_t teb_key; @@ -328,6 +346,7 @@ static void restore_context( const CONTEXT *context, ucontext_t *sigcontext ) */ static void save_fpu( CONTEXT *context, ucontext_t *sigcontext ) { +#ifdef linux struct fpsimd_context *fp = get_fpsimd_context( sigcontext ); if (!fp) return; @@ -335,6 +354,12 @@ static void save_fpu( CONTEXT *context, ucontext_t *sigcontext ) context->Fpcr = fp->fpcr; context->Fpsr = fp->fpsr; memcpy( context->V, fp->vregs, sizeof(context->V) ); +#elif defined(__APPLE__) + context->ContextFlags |= CONTEXT_FLOATING_POINT; + context->Fpcr = sigcontext->uc_mcontext->__ns.__fpcr; + context->Fpsr = sigcontext->uc_mcontext->__ns.__fpsr; + memcpy( context->V, sigcontext->uc_mcontext->__ns.__v, sizeof(context->V) ); +#endif } @@ -345,12 +370,18 @@ static void save_fpu( CONTEXT *context, ucontext_t *sigcontext ) */ static void restore_fpu( CONTEXT *context, ucontext_t *sigcontext ) { +#ifdef linux struct fpsimd_context *fp = get_fpsimd_context( sigcontext ); if (!fp) return; fp->fpcr = context->Fpcr; fp->fpsr = context->Fpsr; memcpy( fp->vregs, context->V, sizeof(fp->vregs) ); +#elif defined(__APPLE__) + sigcontext->uc_mcontext->__ns.__fpcr = context->Fpcr; + sigcontext->uc_mcontext->__ns.__fpsr = context->Fpsr; + memcpy( sigcontext->uc_mcontext->__ns.__v, context->V, sizeof(context->V) ); +#endif }

1 0

Martin Storsjo : ntdll: Fix the arm64 use of libunwind for macOS.
by Alexandre Julliard Aug. 18, 2020

Aug. 18, 2020

Module: wine Branch: master Commit: 7f8224411c39242fe751524816b1349002066c72 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f8224411c39242fe7515248… Author: Martin Storsjo <martin(a)martin.st> Date: Fri Aug 14 14:54:16 2020 +0300 ntdll: Fix the arm64 use of libunwind for macOS. MacOS uses the LLVM libunwind, which doesn't expose quite as much internals of the cursor as GNU libunwind, and uses slightly different names for the arch specific register enums (for get/set registers). Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_arm64.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index b4fe46f25a..cbb6a019e5 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -156,11 +156,27 @@ NTSTATUS CDECL unwind_builtin_dll( ULONG type, DISPATCHER_CONTEXT *dispatch, CON unw_proc_info_t info; int rc; +#ifdef __APPLE__ + rc = unw_getcontext( &unw_context ); + if (rc == UNW_ESUCCESS) + rc = unw_init_local( &cursor, &unw_context ); + if (rc == UNW_ESUCCESS) + { + int i; + for (i = 0; i <= 28; i++) + unw_set_reg( &cursor, UNW_ARM64_X0 + i, context->u.X[i] ); + unw_set_reg( &cursor, UNW_ARM64_FP, context->u.s.Fp ); + unw_set_reg( &cursor, UNW_ARM64_LR, context->u.s.Lr ); + unw_set_reg( &cursor, UNW_ARM64_SP, context->Sp ); + unw_set_reg( &cursor, UNW_REG_IP, context->Pc ); + } +#else memcpy( unw_context.uc_mcontext.regs, context->u.X, sizeof(context->u.X) ); unw_context.uc_mcontext.sp = context->Sp; unw_context.uc_mcontext.pc = context->Pc; rc = unw_init_local( &cursor, &unw_context ); +#endif if (rc != UNW_ESUCCESS) { WARN( "setup failed: %d\n", rc ); @@ -198,6 +214,16 @@ NTSTATUS CDECL unwind_builtin_dll( ULONG type, DISPATCHER_CONTEXT *dispatch, CON dispatch->LanguageHandler = (void *)info.handler; dispatch->HandlerData = (void *)info.lsda; dispatch->EstablisherFrame = context->Sp; +#ifdef __APPLE__ + { + int i; + for (i = 0; i <= 28; i++) + unw_get_reg( &cursor, UNW_ARM64_X0 + i, (unw_word_t *)&context->u.X[i] ); + } + unw_get_reg( &cursor, UNW_ARM64_FP, (unw_word_t *)&context->u.s.Fp ); + unw_get_reg( &cursor, UNW_ARM64_X30, (unw_word_t *)&context->u.s.Lr ); + unw_get_reg( &cursor, UNW_ARM64_SP, (unw_word_t *)&context->Sp ); +#else unw_get_reg( &cursor, UNW_AARCH64_X0, (unw_word_t *)&context->u.s.X0 ); unw_get_reg( &cursor, UNW_AARCH64_X1, (unw_word_t *)&context->u.s.X1 ); unw_get_reg( &cursor, UNW_AARCH64_X2, (unw_word_t *)&context->u.s.X2 ); @@ -230,6 +256,7 @@ NTSTATUS CDECL unwind_builtin_dll( ULONG type, DISPATCHER_CONTEXT *dispatch, CON unw_get_reg( &cursor, UNW_AARCH64_X29, (unw_word_t *)&context->u.s.Fp ); unw_get_reg( &cursor, UNW_AARCH64_X30, (unw_word_t *)&context->u.s.Lr ); unw_get_reg( &cursor, UNW_AARCH64_SP, (unw_word_t *)&context->Sp ); +#endif unw_get_reg( &cursor, UNW_REG_IP, (unw_word_t *)&context->Pc ); context->ContextFlags |= CONTEXT_UNWOUND_TO_CALL;

1 0

Piotr Caban : msvcrt: Fix acosf implementation when returning Pi or Pi/2.
by Alexandre Julliard Aug. 18, 2020

Aug. 18, 2020

Module: wine Branch: master Commit: cb7b23a3f06824c43dd492f41abab78b96a53b88 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cb7b23a3f06824c43dd492f4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Aug 18 18:19:50 2020 +0200 msvcrt: Fix acosf implementation when returning Pi or Pi/2. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49718 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index abb9ef0a9c..a75b551210 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -259,7 +259,7 @@ float CDECL MSVCRT_acosf( float x ) if (ix >= 0x3f800000) { if (ix == 0x3f800000) { if (hx >> 31) - return 2 * pio2_hi + 7.5231638453e-37; + return 2 * pio2_lo + 2 * pio2_hi + 7.5231638453e-37; return 0; } if (MSVCRT__isnanf(x)) return x; @@ -268,7 +268,7 @@ float CDECL MSVCRT_acosf( float x ) /* |x| < 0.5 */ if (ix < 0x3f000000) { if (ix <= 0x32800000) /* |x| < 2**-26 */ - return pio2_hi + 7.5231638453e-37; + return pio2_lo + pio2_hi + 7.5231638453e-37; return pio2_hi - (x - (pio2_lo - x * acosf_R(x * x))); } /* x < -0.5 */

1 0

Martin Storsjo : ntdll: Trust libunwind's returned pc value on arm64.
by Alexandre Julliard Aug. 18, 2020

Aug. 18, 2020

Module: wine Branch: master Commit: cffd06ea67f34a8f6379c78330c40d55ba83223f URL: https://source.winehq.org/git/wine.git/?a=commit;h=cffd06ea67f34a8f6379c783… Author: Martin Storsjo <martin(a)martin.st> Date: Fri Aug 14 14:54:15 2020 +0300 ntdll: Trust libunwind's returned pc value on arm64. Use this instead of manually copying LR to PC. With GNU libunwind, both registers are equal after unw_step. With the LLVM libunwind (which Apple uses), the return address isn't reflected at all in LR, only in UNW_REG_IP. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_arm64.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index d5ced2172a..b4fe46f25a 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -230,7 +230,7 @@ NTSTATUS CDECL unwind_builtin_dll( ULONG type, DISPATCHER_CONTEXT *dispatch, CON unw_get_reg( &cursor, UNW_AARCH64_X29, (unw_word_t *)&context->u.s.Fp ); unw_get_reg( &cursor, UNW_AARCH64_X30, (unw_word_t *)&context->u.s.Lr ); unw_get_reg( &cursor, UNW_AARCH64_SP, (unw_word_t *)&context->Sp ); - context->Pc = context->u.s.Lr; + unw_get_reg( &cursor, UNW_REG_IP, (unw_word_t *)&context->Pc ); context->ContextFlags |= CONTEXT_UNWOUND_TO_CALL; TRACE( "next function pc=%016lx%s\n", context->Pc, rc ? "" : " (last frame)" );

1 0

Jacek Caban : conhost: Build with -mwindows.
by Alexandre Julliard Aug. 18, 2020

Aug. 18, 2020

Module: wine Branch: master Commit: cd9f30f35bd4ef815f37a3eefb723b6e1b2dc3cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd9f30f35bd4ef815f37a3ee… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 18 16:21:19 2020 +0200 conhost: Build with -mwindows. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/conhost/Makefile.in b/programs/conhost/Makefile.in index 75ec7dfc41..b88a5cc45e 100644 --- a/programs/conhost/Makefile.in +++ b/programs/conhost/Makefile.in @@ -1,6 +1,6 @@ MODULE = conhost.exe -EXTRADLLFLAGS = -mconsole -municode -mno-cygwin +EXTRADLLFLAGS = -mwindows -municode -mno-cygwin C_SRCS = conhost.c

1 0

Francois Gouget : winapi: Remove obsolete entries from win32.api.
by Alexandre Julliard Aug. 18, 2020

Aug. 18, 2020

Module: wine Branch: master Commit: f57c5dde00f158a96b184c28fea56ea9588961f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f57c5dde00f158a96b184c28… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Aug 18 12:22:30 2020 +0200 winapi: Remove obsolete entries from win32.api. Wine no longer has d3dx8.dll, d3dxof.dll, glut32.dll, msacmmap.dll, winedos.dll, wineesd.drv, winenas.drv and winetty.drv dlls. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winapi/win32.api | 189 ------------------------------------------------- 1 file changed, 189 deletions(-) diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api index ed14ecc034..d9b77dbce3 100644 --- a/tools/winapi/win32.api +++ b/tools/winapi/win32.api @@ -924,48 +924,6 @@ LPCWSTR void -%%d3dx8.dll - -%long - -DWORD -HFONT -HRESULT -UINT - -%float - -FLOAT - -%ptr - -D3DXCOLOR * -D3DXMATRIX * -D3DXPLANE * -D3DXQUATERNION * -D3DXVECTOR2 * -D3DXVECTOR3 * -D3DXVECTOR4 * -D3DVIEWPORT8 * -FLOAT * -LPCVOID -LPD3DXBUFFER * -LPD3DXFONT * -LPD3DXMATRIXSTACK * -LPDIRECT3DDEVICE8 - -%str - -LPCSTR - -%wstr - -LPCWSTR - -%void - -void - %%d3dxof.dll %long @@ -1761,31 +1719,6 @@ char * void -%%glut32.dll - -%double - -double - -%float - -float - -%long - -int -unsigned int - -%ptr - -void (*)(int) -void * -void ** - -%void - -void - %%gphoto2.ds %long @@ -2671,16 +2604,6 @@ PHACMSTREAM PWAVEFILTER PWAVEFORMATEX -%%msacmmap.dll - -%long - -DWORD -HDRVR -LONG -UINT -WORD - %%mscms.dll %long @@ -5692,61 +5615,6 @@ IUnknown * IWineD3D * IWineD3DClipper * -%%winedos.dll - -%long - -BOOL -BYTE -DWORD -UINT -WORD -int - -%ptr - -LPVOID -UINT16 * -void * - -%str - -LPCSTR - -%void - -void - -%%wineesd.drv - -%long - -DWORD -HDRVR -LPARAM -LRESULT -UINT -WORD - -%long --pointer - -DWORD_PTR - -%%winejack.drv - -%long - -DWORD -HDRVR -LPARAM -LRESULT -UINT -WORD - -%long --pointer - -DWORD_PTR - %%winejoystick.drv %long @@ -5773,21 +5641,6 @@ UINT DWORD_PTR -%%winenas.drv - -%long - -DWORD -HDRVR -LPARAM -LRESULT -UINT -WORD - -%long --pointer - -DWORD_PTR - %%wineoss.drv %long @@ -5857,48 +5710,6 @@ void LPCWSTR -%%winetty.drv - -%long - -BOOL -COLORREF -DWORD -HANDLE -HBITMAP -HDC -HFONT -HRGN -HWND -INT -LONG -UINT - -%ptr - -BITMAPINFO * -CREATESTRUCTA * -DEVMODEW * -DWORD * -INT * -LPCVOID -LPINT -LPPALETTEENTRY -LPPOINT -LPSIZE -LPTEXTMETRICW -LPVOID -POINT * -RECT * -TTYDRV_PDEVICE * -TTYDRV_PDEVICE ** -WINDOWPOS * -void * - -%wstr - -LPCWSTR - %%winex11.drv %long

1 0

Jacek Caban : kernelbase: Use IOCTL_CONDRV_SET_INPUT_INFO in SetConsoleOutputCP.
by Alexandre Julliard Aug. 18, 2020

Aug. 18, 2020

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

Jacek Caban : kernelbase: Use IOCTL_CONDRV_SET_INPUT_INFO in SetConsoleCP.
by Alexandre Julliard Aug. 18, 2020

Aug. 18, 2020

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

Nikolay Sivov : combase: Add CoSetErrorInfo() as an alias for SetErrorInfo().
by Alexandre Julliard Aug. 18, 2020

Aug. 18, 2020

Module: wine Branch: master Commit: 41acd014d8617f4eab54da3e584caacbe0b511ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=41acd014d8617f4eab54da3e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 17 10:20:53 2020 +0300 combase: Add CoSetErrorInfo() as an alias for 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 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index 608fe84af8..8a91088ca4 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -155,7 +155,7 @@ @ stdcall CoRevokeInitializeSpy(int64) ole32.CoRevokeInitializeSpy @ stdcall CoRevokeMallocSpy() @ stub CoSetCancelObject -@ stub CoSetErrorInfo +@ stdcall CoSetErrorInfo(long ptr) SetErrorInfo @ stdcall CoSetProxyBlanket(ptr long long ptr long long ptr long) @ stdcall CoSuspendClassObjects() ole32.CoSuspendClassObjects @ stdcall CoSwitchCallContext(ptr ptr) ole32.CoSwitchCallContext

1 0