wine-commits October 2020

wine-commits@winehq.org

1 participants
796 discussions

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

13 Oct '20

Module: wine Branch: master Commit: 845d04a8d39caf0a64c60c1d7cc5cf762684e07b URL: https://source.winehq.org/git/wine.git/?a=commit;h=845d04a8d39caf0a64c60c1d… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Oct 12 23:17:48 2020 +0200 iexplore: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/iexplore/main.c | 27 +++++++-------------------- 1 file changed, 7 insertions(+), 20 deletions(-) diff --git a/programs/iexplore/main.c b/programs/iexplore/main.c index 01ad9d02f5..ade9f8c522 100644 --- a/programs/iexplore/main.c +++ b/programs/iexplore/main.c @@ -35,28 +35,18 @@ static BOOL check_native_ie(void) void* buf; BOOL ret = TRUE; LPWORD translation; - - static const WCHAR browseui_dllW[] = {'b','r','o','w','s','e','u','i','.','d','l','l',0}; - static const WCHAR wineW[] = {'W','i','n','e',0}; - static const WCHAR translationW[] = - {'\\','V','a','r','F','i','l','e','I','n','f','o', - '\\','T','r','a','n','s','l','a','t','i','o','n',0}; - static const WCHAR file_desc_fmtW[] = - {'\\','S','t','r','i','n','g','F','i','l','e','I','n','f','o', - '\\','%','0','4','x','%','0','4','x', - '\\','F','i','l','e','D','e','s','c','r','i','p','t','i','o','n',0}; WCHAR file_desc_strW[48]; - size = GetFileVersionInfoSizeW(browseui_dllW, &handle); + size = GetFileVersionInfoSizeW(L"browseui.dll", &handle); if(!size) return TRUE; buf = HeapAlloc(GetProcessHeap(), 0, size); - GetFileVersionInfoW(browseui_dllW, 0, size,buf); - if (VerQueryValueW(buf, translationW, (void **)&translation, &bytes)) + GetFileVersionInfoW(L"browseui.dll", 0, size,buf); + if (VerQueryValueW(buf, L"\\VarFileInfo\\Translation", (void **)&translation, &bytes)) { - wsprintfW(file_desc_strW, file_desc_fmtW, translation[0], translation[1]); - ret = !VerQueryValueW(buf, file_desc_strW, (void**)&file_desc, &bytes) || !wcsstr(file_desc, wineW); + wsprintfW(file_desc_strW, L"\\StringFileInfo\\%04x%04x\\FileDescription", translation[0], translation[1]); + ret = !VerQueryValueW(buf, file_desc_strW, (void**)&file_desc, &bytes) || !wcsstr(file_desc, L"Wine"); } HeapFree(GetProcessHeap(), 0, buf); @@ -78,13 +68,10 @@ static DWORD register_iexplore(BOOL doregister) int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE prev, WCHAR *cmdline, int show) { - static const WCHAR regserverW[] = {'r','e','g','s','e','r','v','e','r',0}; - static const WCHAR unregserverW[] = {'u','n','r','e','g','s','e','r','v','e','r',0}; - if(*cmdline == '-' || *cmdline == '/') { - if(!wcsicmp(cmdline+1, regserverW)) + if(!wcsicmp(cmdline+1, L"regserver")) return register_iexplore(TRUE); - if(!wcsicmp(cmdline+1, unregserverW)) + if(!wcsicmp(cmdline+1, L"unregserver")) return register_iexplore(FALSE); }

1 0

Robert Wilhelm : jscript: Cc_parser_parse implement '&&' expression.
by Alexandre Julliard 13 Oct '20

13 Oct '20

Module: wine Branch: master Commit: f586348deb97e8dea5f78ea3e45db39951ee8d30 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f586348deb97e8dea5f78ea3… Author: Robert Wilhelm <robert.wilhelm(a)gmx.net> Date: Mon Oct 12 22:25:33 2020 +0200 jscript: Cc_parser_parse implement '&&' expression. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49450 Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/cc_parser.y | 2 +- dlls/jscript/tests/cc.js | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/jscript/cc_parser.y b/dlls/jscript/cc_parser.y index 4bc6260f19..dd72f61b03 100644 --- a/dlls/jscript/cc_parser.y +++ b/dlls/jscript/cc_parser.y @@ -161,7 +161,7 @@ CCLogicalORExpression CCLogicalANDExpression : CCBitwiseORExpression { $$ = $1; } | CCBitwiseANDExpression tAND CCBitwiseORExpression - { FIXME("'&&' expression not implemented\n"); ctx->hres = E_NOTIMPL; YYABORT; } + { $$ = ccval_bool(get_ccbool($1) && get_ccbool($3)); } CCBitwiseORExpression : CCBitwiseXORExpression { $$ = $1; } diff --git a/dlls/jscript/tests/cc.js b/dlls/jscript/tests/cc.js index 8f45a3dd33..2232d2fb68 100644 --- a/dlls/jscript/tests/cc.js +++ b/dlls/jscript/tests/cc.js @@ -180,6 +180,23 @@ expect(@test, true); @set @test = (1 >= true-1) expect(@test, true); +@set @test = (true && true) +expect(@test, true); + +@set @test = (false && true) +expect(@test, false); + +@set @test = (true && false) +expect(@test, false); + +@set @test = (false && false) +expect(@test, false); + +if(!isWin64) { +@set @test = (@_win32&&@_jscript_version>=5) +expect(@test, true); +} + @if (false) this wouldn not parse "@end

1 0

Sven Baars : evr/tests: Fix a test failure on Windows 7.
by Alexandre Julliard 13 Oct '20

13 Oct '20

Module: wine Branch: master Commit: 109fab2a559ab39cec01fbd0da9074f966414e85 URL: https://source.winehq.org/git/wine.git/?a=commit;h=109fab2a559ab39cec01fbd0… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Mon Oct 12 14:05:05 2020 +0200 evr/tests: Fix a test failure on Windows 7. Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/tests/evr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 5829815988..7a51b3c17d 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -1083,7 +1083,7 @@ static void test_default_presenter(void) ok(present_params.hDeviceWindow == GetDesktopWindow(), "Unexpected device window.\n"); ok(present_params.Windowed, "Unexpected windowed mode.\n"); ok(present_params.SwapEffect == D3DSWAPEFFECT_COPY, "Unexpected swap effect.\n"); - ok(present_params.Flags == D3DPRESENTFLAG_VIDEO, "Unexpected flags.\n"); + ok(present_params.Flags & D3DPRESENTFLAG_VIDEO, "Unexpected flags %#x.\n", present_params.Flags); ok(present_params.PresentationInterval == D3DPRESENT_INTERVAL_IMMEDIATE, "Unexpected present interval.\n"); IDirect3DDevice9_Release(d3d_device);

1 0

Brendan Shanks : winemac: Remove unused GetCurrentProcess() call.
by Alexandre Julliard 12 Oct '20

12 Oct '20

Module: wine Branch: master Commit: 863683342ded500d3939f7ff66d2d9c1a4134caf URL: https://source.winehq.org/git/wine.git/?a=commit;h=863683342ded500d3939f7ff… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Tue Oct 6 15:52:18 2020 -0700 winemac: Remove unused GetCurrentProcess() call. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_app.m | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index b4dcbfff47..e296d4b4af 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -19,7 +19,6 @@ */ #import <Carbon/Carbon.h> -#include <dlfcn.h> #import "cocoa_app.h" #import "cocoa_event.h" @@ -1332,8 +1331,6 @@ static NSString* WineLocalizedString(unsigned int stringID) - (BOOL) installEventTap { - ProcessSerialNumber psn; - OSErr err; CGEventMask mask = CGEventMaskBit(kCGEventLeftMouseDown) | CGEventMaskBit(kCGEventLeftMouseUp) | CGEventMaskBit(kCGEventRightMouseDown) | @@ -1346,31 +1343,10 @@ static NSString* WineLocalizedString(unsigned int stringID) CGEventMaskBit(kCGEventOtherMouseDragged) | CGEventMaskBit(kCGEventScrollWheel); CFRunLoopSourceRef source; - void* appServices; - OSErr (*pGetCurrentProcess)(ProcessSerialNumber* PSN); if (cursorClippingEventTap) return TRUE; - // We need to get the Mac GetCurrentProcess() from the ApplicationServices - // framework with dlsym() because the Win32 function of the same name - // obscures it. - appServices = dlopen("/System/Library/Frameworks/ApplicationServices.framework/ApplicationServices", RTLD_LAZY); - if (!appServices) - return FALSE; - - pGetCurrentProcess = dlsym(appServices, "GetCurrentProcess"); - if (!pGetCurrentProcess) - { - dlclose(appServices); - return FALSE; - } - - err = pGetCurrentProcess(&psn); - dlclose(appServices); - if (err != noErr) - return FALSE; - // We create an annotated session event tap rather than a process-specific // event tap because we need to programmatically move the cursor even when // mouse moves are directed to other processes. We disable our tap when

1 0

Jacek Caban : wineconsole: Reimplement as AllocConsole wrapper.
by Alexandre Julliard 12 Oct '20

12 Oct '20

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

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 : 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: 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: 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

← Newer
1
...
41
42
43
44
45
46
47
...
80
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2020