October 2020 - Wine-commits

Hans Leidekker : dssenh: Implement CPGenRandom.
by Alexandre Julliard 12 Oct '20

12 Oct '20

Module: wine Branch: master Commit: c822cb995e0b362460c09d1d1297aef93840ba83 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c822cb995e0b362460c09d1d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Oct 12 16:11:11 2020 +0200 dssenh: Implement CPGenRandom. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dssenh/dssenh.spec | 2 +- dlls/dssenh/main.c | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/dssenh/dssenh.spec b/dlls/dssenh/dssenh.spec index e74650c9bb..eb9ef06337 100644 --- a/dlls/dssenh/dssenh.spec +++ b/dlls/dssenh/dssenh.spec @@ -9,7 +9,7 @@ @ stub CPEncrypt @ stdcall CPExportKey(ptr ptr ptr long long ptr ptr) @ stdcall CPGenKey(ptr long long ptr) -@ stub CPGenRandom +@ stdcall CPGenRandom(ptr long ptr) @ stdcall CPGetHashParam(ptr ptr long ptr ptr long) @ stub CPGetKeyParam @ stdcall CPGetProvParam(ptr long ptr ptr long) diff --git a/dlls/dssenh/main.c b/dlls/dssenh/main.c index 38ee325b8e..ce7b15f7a6 100644 --- a/dlls/dssenh/main.c +++ b/dlls/dssenh/main.c @@ -27,6 +27,7 @@ #include "bcrypt.h" #include "objbase.h" #include "rpcproxy.h" +#include "ntsecapi.h" #include "wine/debug.h" #include "wine/heap.h" @@ -498,6 +499,17 @@ BOOL WINAPI CPDuplicateKey( HCRYPTPROV hprov, HCRYPTKEY hkey, DWORD *reserved, D return TRUE; } +BOOL WINAPI CPGenRandom( HCRYPTPROV hprov, DWORD len, BYTE *buffer ) +{ + struct container *container = (struct container *)hprov; + + TRACE( "%p, %u, %p\n", (void *)hprov, len, buffer ); + + if (container->magic != MAGIC_CONTAINER) return FALSE; + + return RtlGenRandom( buffer, len ); +} + static struct hash *create_hash( ALG_ID algid ) { struct hash *ret;

1 0

Hans Leidekker : dssenh: Set last error in CPHashData.
by Alexandre Julliard 12 Oct '20

12 Oct '20

Module: wine Branch: master Commit: 603cb31633e4707aa7652f27f82756e6aa3a58fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=603cb31633e4707aa7652f27… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Oct 12 16:11:12 2020 +0200 dssenh: Set last error in CPHashData. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dssenh/main.c | 8 ++++++-- dlls/dssenh/tests/dssenh.c | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/dssenh/main.c b/dlls/dssenh/main.c index ce7b15f7a6..38f249ef04 100644 --- a/dlls/dssenh/main.c +++ b/dlls/dssenh/main.c @@ -641,8 +641,12 @@ BOOL WINAPI CPHashData( HCRYPTPROV hprov, HCRYPTHASH hhash, const BYTE *data, DW if (hash->magic != MAGIC_HASH) return FALSE; - if (hash->finished || BCryptHashData( hash->handle, (UCHAR *)data, len, 0 )) return FALSE; - return TRUE; + if (hash->finished) + { + SetLastError( NTE_BAD_HASH_STATE ); + return FALSE; + } + return !BCryptHashData( hash->handle, (UCHAR *)data, len, 0 ); } BOOL WINAPI CPGetHashParam( HCRYPTPROV hprov, HCRYPTHASH hhash, DWORD param, BYTE *data, DWORD *len, DWORD flags ) diff --git a/dlls/dssenh/tests/dssenh.c b/dlls/dssenh/tests/dssenh.c index 704b3685c3..6ad1522592 100644 --- a/dlls/dssenh/tests/dssenh.c +++ b/dlls/dssenh/tests/dssenh.c @@ -1440,7 +1440,7 @@ static void test_duplicate_hash(void) SetLastError(0xdeadbeef); result = CryptHashData(hhash, (const BYTE *)"winetest", sizeof("winetest"), 0); ok(!result, "success\n"); - todo_wine ok(GetLastError() == NTE_BAD_HASH_STATE, "got %08x\n", GetLastError()); + ok(GetLastError() == NTE_BAD_HASH_STATE, "got %08x\n", GetLastError()); result = CryptDuplicateHash(hhash, NULL, 0, &hhash2); ok(result, "got %08x\n", GetLastError()); @@ -1448,7 +1448,7 @@ static void test_duplicate_hash(void) SetLastError(0xdeadbeef); result = CryptHashData(hhash2, (const BYTE *)"winetest", sizeof("winetest"), 0); ok(!result, "success\n"); - todo_wine ok(GetLastError() == NTE_BAD_HASH_STATE, "got %08x\n", GetLastError()); + ok(GetLastError() == NTE_BAD_HASH_STATE, "got %08x\n", GetLastError()); len = sizeof(buf); result = CryptGetHashParam(hhash2, HP_HASHVAL, buf, &len, 0);

1 0

Jacek Caban : conhost: Support window resizing.
by Alexandre Julliard 12 Oct '20

12 Oct '20

Module: wine Branch: master Commit: a3583f05055b5093a3a8822b73fb24281ae62d27 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a3583f05055b5093a3a8822b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 12 18:26:23 2020 +0200 conhost: Support window resizing. Based on wineconsole. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/window.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/programs/conhost/window.c b/programs/conhost/window.c index 8ab639f329..4b3751e7b5 100644 --- a/programs/conhost/window.c +++ b/programs/conhost/window.c @@ -2062,6 +2062,29 @@ static BOOL config_dialog( struct console *console, BOOL current ) return TRUE; } +static void resize_window( struct console *console, int width, int height ) +{ + struct console_config config; + + current_config( console, &config ); + config.win_width = width; + config.win_height = height; + + /* auto size screen-buffer if it's now smaller than window */ + if (config.sb_width < config.win_width) + config.sb_width = config.win_width; + if (config.sb_height < config.win_height) + config.sb_height = config.win_height; + + /* and reset window pos so that we don't display outside of the screen-buffer */ + if (config.win_pos.X + config.win_width > config.sb_width) + config.win_pos.X = config.sb_width - config.win_width; + if (config.win_pos.Y + config.win_height > config.sb_height) + config.win_pos.Y = config.sb_height - config.win_height; + + apply_config( console, &config ); +} + /* grays / ungrays the menu items according to their state */ static void set_menu_details( struct console *console, HMENU menu ) { @@ -2280,6 +2303,13 @@ static LRESULT WINAPI window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lp DestroyCaret(); break; + case WM_SIZE: + if (console->window->update_state != UPDATE_BUSY) + resize_window( console, + max( LOWORD(lparam) / console->active->font.width, 20 ), + max( HIWORD(lparam) / console->active->font.height, 20 )); + break; + case WM_SYSCOMMAND: switch (wparam) {

1 0

Jacek Caban : conhost: Import scrolling support from wineconsole.
by Alexandre Julliard 12 Oct '20

12 Oct '20

Module: wine Branch: master Commit: 1333aebe0b3d7a8654a9c573b3dc24d7aa31c1c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1333aebe0b3d7a8654a9c573… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 12 18:26:34 2020 +0200 conhost: Import scrolling support from wineconsole. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/window.c | 66 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/programs/conhost/window.c b/programs/conhost/window.c index 4b3751e7b5..5ec435a33e 100644 --- a/programs/conhost/window.c +++ b/programs/conhost/window.c @@ -2310,6 +2310,72 @@ static LRESULT WINAPI window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lp max( HIWORD(lparam) / console->active->font.height, 20 )); break; + case WM_HSCROLL: + { + int win_width = console->active->win.right - console->active->win.left + 1; + int x = console->active->win.left; + + switch (LOWORD(wparam)) + { + case SB_PAGEUP: x -= 8; break; + case SB_PAGEDOWN: x += 8; break; + case SB_LINEUP: x--; break; + case SB_LINEDOWN: x++; break; + case SB_THUMBTRACK: x = HIWORD(wparam); break; + default: break; + } + x = min( max( x, 0 ), console->active->width - win_width ); + if (x != console->active->win.left) + { + console->active->win.left = x; + console->active->win.right = x + win_width - 1; + update_window( console ); + } + break; + } + + case WM_MOUSEWHEEL: + if (console->active->height <= console->active->win.bottom - console->active->win.top + 1) + { + record_mouse_input(console, get_cell(console, lparam), wparam, MOUSE_WHEELED); + break; + } + /* else fallthrough */ + case WM_VSCROLL: + { + int win_height = console->active->win.bottom - console->active->win.top + 1; + int y = console->active->win.top; + + if (msg == WM_MOUSEWHEEL) + { + UINT scroll_lines = 3; + SystemParametersInfoW( SPI_GETWHEELSCROLLLINES, 0, &scroll_lines, 0 ); + scroll_lines *= -GET_WHEEL_DELTA_WPARAM(wparam) / WHEEL_DELTA; + y += scroll_lines; + } + else + { + switch (LOWORD(wparam)) + { + case SB_PAGEUP: y -= 8; break; + case SB_PAGEDOWN: y += 8; break; + case SB_LINEUP: y--; break; + case SB_LINEDOWN: y++; break; + case SB_THUMBTRACK: y = HIWORD(wparam); break; + default: break; + } + } + + y = min( max( y, 0 ), console->active->height - win_height ); + if (y != console->active->win.top) + { + console->active->win.top = y; + console->active->win.bottom = y + win_height - 1; + update_window( console ); + } + break; + } + case WM_SYSCOMMAND: switch (wparam) {

1 0

Jacek Caban : conhost: Store title as zero terminated string.
by Alexandre Julliard 12 Oct '20

12 Oct '20

Module: wine Branch: master Commit: b2487c17eb60424e1cb4a74e4763f057ebbf7f39 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b2487c17eb60424e1cb4a74e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 12 18:26:43 2020 +0200 conhost: Store title as zero terminated string. To make it usable for Windows functions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/conhost.c | 19 ++++++++++--------- programs/conhost/conhost.h | 1 - 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 934b0a4ce1..c917b08dc0 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -2271,12 +2271,12 @@ static NTSTATUS set_console_title( struct console *console, const WCHAR *in_titl if (size) { - if (!(title = malloc( size ))) return STATUS_NO_MEMORY; + if (!(title = malloc( size + sizeof(WCHAR) ))) return STATUS_NO_MEMORY; memcpy( title, in_title, size ); + title[size / sizeof(WCHAR)] = 0; } free( console->title ); - console->title = title; - console->title_len = size; + console->title = title; if (console->tty_output) { @@ -2284,9 +2284,11 @@ static NTSTATUS set_console_title( struct console *console, const WCHAR *in_titl char *vt; tty_write( console, "\x1b]0;", 4 ); - len = WideCharToMultiByte( get_tty_cp( console ), 0, console->title, size / sizeof(WCHAR), NULL, 0, NULL, NULL); + len = WideCharToMultiByte( get_tty_cp( console ), 0, console->title, size / sizeof(WCHAR), + NULL, 0, NULL, NULL); if ((vt = tty_alloc_buffer( console, len ))) - WideCharToMultiByte( get_tty_cp( console ), 0, console->title, size / sizeof(WCHAR), vt, len, NULL, NULL ); + WideCharToMultiByte( get_tty_cp( console ), 0, console->title, size / sizeof(WCHAR), + vt, len, NULL, NULL ); tty_write( console, "\x07", 1 ); tty_sync( console ); } @@ -2503,10 +2505,9 @@ static NTSTATUS console_input_ioctl( struct console *console, unsigned int code, { WCHAR *result; if (in_size) return STATUS_INVALID_PARAMETER; - TRACE( "returning title %s\n", debugstr_wn(console->title, - console->title_len / sizeof(WCHAR)) ); - if (!(result = alloc_ioctl_buffer( *out_size = min( *out_size, console->title_len )))) - return STATUS_NO_MEMORY; + TRACE( "returning title %s\n", debugstr_w(console->title) ); + *out_size = min( *out_size, console->title ? wcslen( console->title ) * sizeof(WCHAR) : 0 ); + if (!(result = alloc_ioctl_buffer( *out_size ))) return STATUS_NO_MEMORY; if (*out_size) memcpy( result, console->title, *out_size ); return STATUS_SUCCESS; } diff --git a/programs/conhost/conhost.h b/programs/conhost/conhost.h index 322c677b91..7bc102b0df 100644 --- a/programs/conhost/conhost.h +++ b/programs/conhost/conhost.h @@ -88,7 +88,6 @@ struct console struct edit_line edit_line; /* edit line context */ struct console_window *window; WCHAR *title; /* console title */ - size_t title_len; /* length of console title */ struct history_line **history; /* lines history */ unsigned int history_size; /* number of entries in history array */ unsigned int history_index; /* number of used entries in history array */

1 0

Jacek Caban : conhost: Set console window title.
by Alexandre Julliard 12 Oct '20

12 Oct '20

Module: wine Branch: master Commit: 12cc863a4a5e31a01bf4f683d94a7e155feb23ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=12cc863a4a5e31a01bf4f683… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 12 18:26:56 2020 +0200 conhost: Set console window title. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/conhost.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index c917b08dc0..3ed21f5fa7 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -2292,6 +2292,8 @@ static NTSTATUS set_console_title( struct console *console, const WCHAR *in_titl tty_write( console, "\x07", 1 ); tty_sync( console ); } + if (console->win) + SetWindowTextW( console->win, console->title ); return STATUS_SUCCESS; } @@ -2755,7 +2757,10 @@ int __cdecl wmain(int argc, WCHAR *argv[]) } else { + STARTUPINFOW si; if (!init_window( &console )) return 1; + GetStartupInfoW( &si ); + set_console_title( &console, si.lpTitle, wcslen( si.lpTitle ) * sizeof(WCHAR) ); ShowWindow( console.win, SW_SHOW ); }

1 0

Jacek Caban : kernelbase: Use conhost in AllocConsole.
by Alexandre Julliard 12 Oct '20

12 Oct '20

Module: wine Branch: master Commit: 859b526c81a2af841b5b7b28d06f3d782bccdab5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=859b526c81a2af841b5b7b28… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 12 18:27:18 2020 +0200 kernelbase: Use conhost in AllocConsole. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/console.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index 502fbcddaf..0fd832d378 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -326,9 +326,10 @@ BOOL WINAPI AllocConsole(void) { SECURITY_ATTRIBUTES inheritable_attr = { sizeof(inheritable_attr), NULL, TRUE }; STARTUPINFOW app_si, console_si; - WCHAR buffer[1024], cmd[256]; + HANDLE server, console = NULL; + WCHAR buffer[1024], cmd[256], conhost_path[MAX_PATH]; PROCESS_INFORMATION pi; - HANDLE event, console; + void *redir; BOOL ret; TRACE("()\n"); @@ -343,6 +344,8 @@ BOOL WINAPI AllocConsole(void) return FALSE; } + if (!(server = create_console_server()) || !(console = create_console_reference( server ))) goto error; + GetStartupInfoW(&app_si); memset(&console_si, 0, sizeof(console_si)); @@ -372,30 +375,27 @@ BOOL WINAPI AllocConsole(void) console_si.lpTitle = buffer; } - if (!(event = CreateEventW( &inheritable_attr, TRUE, FALSE, NULL ))) goto error; + swprintf( conhost_path, ARRAY_SIZE(conhost_path), L"%s\\conhost.exe", system_dir ); + swprintf( cmd, ARRAY_SIZE(cmd), L"\"%s\" --server 0x%x", conhost_path, condrv_handle( server )); + Wow64DisableWow64FsRedirection( &redir ); + ret = CreateProcessW( conhost_path, cmd, NULL, NULL, TRUE, DETACHED_PROCESS, NULL, NULL, &console_si, &pi ); + Wow64RevertWow64FsRedirection( redir ); + + if (!ret || !create_console_connection( console)) goto error; + if (!init_console_std_handles( !(app_si.dwFlags & STARTF_USESTDHANDLES) )) goto error; - swprintf( cmd, ARRAY_SIZE(cmd), L"wineconsole --use-event=%ld", (DWORD_PTR)event ); - if ((ret = CreateProcessW( NULL, cmd, NULL, NULL, TRUE, DETACHED_PROCESS, NULL, NULL, &console_si, &pi ))) - { - HANDLE wait_handles[2] = { event, pi.hProcess }; - ret = WaitForMultipleObjects( ARRAY_SIZE(wait_handles), wait_handles, FALSE, INFINITE ) == WAIT_OBJECT_0; - CloseHandle( pi.hThread ); - CloseHandle( pi.hProcess ); - } - CloseHandle( event ); - if (!ret || !init_console_std_handles( !(app_si.dwFlags & STARTF_USESTDHANDLES) )) goto error; - console = CreateFileW( L"CONIN$", GENERIC_READ | GENERIC_WRITE | SYNCHRONIZE, 0, NULL, OPEN_EXISTING, 0, 0 ); - if (console == INVALID_HANDLE_VALUE) goto error; RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle = console; - TRACE( "Started wineconsole pid=%08x tid=%08x\n", pi.dwProcessId, pi.dwThreadId ); + CloseHandle( server ); RtlLeaveCriticalSection( &console_section ); SetLastError( ERROR_SUCCESS ); return TRUE; error: ERR("Can't allocate console\n"); + NtClose( console ); + NtClose( server ); FreeConsole(); RtlLeaveCriticalSection( &console_section ); return FALSE;

1 0

Michael Stefaniuc : presentationfontcache: Use wide-char string literals.
by Alexandre Julliard 12 Oct '20

12 Oct '20

Module: wine Branch: master Commit: f95a4de5d5579af877d8cdb90626bb7f41d82e79 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f95a4de5d5579af877d8cdb9… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Oct 12 00:02:50 2020 +0200 presentationfontcache: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/presentationfontcache/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/presentationfontcache/main.c b/programs/presentationfontcache/main.c index 694ad792db..ab2d0e2106 100644 --- a/programs/presentationfontcache/main.c +++ b/programs/presentationfontcache/main.c @@ -24,7 +24,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(fontcache); -static WCHAR fontcacheW[] = {'F','o','n','t','C','a','c','h','e','3','.','0','.','0','.','0',0}; +static WCHAR fontcacheW[] = L"FontCache3.0.0.0"; static SERVICE_STATUS_HANDLE service_handle; static HANDLE stop_event;

1 0

Michael Stefaniuc : winmgmt: Use wide-char string literals.
by Alexandre Julliard 12 Oct '20

12 Oct '20

Module: wine Branch: master Commit: 82a7936c02768781aa80035bc44e5b36ad387c22 URL: https://source.winehq.org/git/wine.git/?a=commit;h=82a7936c02768781aa80035b… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Oct 12 00:02:53 2020 +0200 winmgmt: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winmgmt/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winmgmt/main.c b/programs/winmgmt/main.c index 8b262d00f3..bc7150a08c 100644 --- a/programs/winmgmt/main.c +++ b/programs/winmgmt/main.c @@ -24,7 +24,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(winmgmt); -static WCHAR winmgmtW[] = {'W','i','n','m','g','m','t',0}; +static WCHAR winmgmtW[] = L"Winmgmt"; static SERVICE_STATUS_HANDLE service_handle; static HANDLE stop_event;

1 0

Michael Stefaniuc : localui: Use wide-char string literals.
by Alexandre Julliard 12 Oct '20

12 Oct '20

Module: wine Branch: master Commit: 3503fb0eef1a99cf69f958ca6424d4c3058ace1d URL: https://source.winehq.org/git/wine.git/?a=commit;h=3503fb0eef1a99cf69f958ca… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Oct 9 19:20:09 2020 +0200 localui: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/localui/localui.c | 58 ++++++++++++-------------------------------- dlls/localui/tests/localui.c | 19 ++++++--------- 2 files changed, 23 insertions(+), 54 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3503fb0eef1a99cf69f9…

1 0