March 2021 - Wine-Commits - list.winehq.org

Esme Povirk : mscoree: Update Wine Mono to 6.1.1.
by Alexandre Julliard March 31, 2021

March 31, 2021

Module: wine Branch: master Commit: 2c94b7a609fe40a79ea30096bdb2dcac4198069e URL: https://source.winehq.org/git/wine.git/?a=commit;h=2c94b7a609fe40a79ea30096… Author: Esme Povirk <esme(a)codeweavers.com> Date: Wed Mar 31 11:03:07 2021 -0500 mscoree: Update Wine Mono to 6.1.1. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/appwiz.cpl/addons.c | 4 ++-- dlls/mscoree/mscoree_private.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index b2e726422da..e3004c972f1 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -57,10 +57,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(appwizcpl); #define GECKO_SHA "???" #endif -#define MONO_VERSION "6.0.0" +#define MONO_VERSION "6.1.1" #if defined(__i386__) || defined(__x86_64__) #define MONO_ARCH "x86" -#define MONO_SHA "5c7af5976d101be359a77045c9cc8fc40feac028263d00e731578864e8b183d0" +#define MONO_SHA "ac3b14beafde34b8482287e597000113dc06a915f32c9fd06c77eb819079e38b" #else #define MONO_ARCH "" #define MONO_SHA "???" diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index 69c30e5e3e0..e396d855e71 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -45,7 +45,7 @@ extern HRESULT assembly_get_runtime_version(ASSEMBLY *assembly, LPSTR *version) extern HRESULT assembly_get_vtable_fixups(ASSEMBLY *assembly, VTableFixup **fixups, DWORD *count) DECLSPEC_HIDDEN; extern HRESULT assembly_get_native_entrypoint(ASSEMBLY *assembly, NativeEntryPointFunc *func) DECLSPEC_HIDDEN; -#define WINE_MONO_VERSION "6.0.0" +#define WINE_MONO_VERSION "6.1.1" /* Mono embedding */ typedef struct _MonoDomain MonoDomain;

1 0

Paul Gofman : server: Do not cancel process sigkill in kill_process().
by Alexandre Julliard March 31, 2021

March 31, 2021

Module: wine Branch: master Commit: df066eabdc896eb3ea249ee639d703875214250f URL: https://source.winehq.org/git/wine.git/?a=commit;h=df066eabdc896eb3ea249ee6… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Mar 30 20:32:13 2021 +0300 server: Do not cancel process sigkill in kill_process(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/process.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/server/process.c b/server/process.c index 7bc096a7b1f..9ca1eb64469 100644 --- a/server/process.c +++ b/server/process.c @@ -945,13 +945,7 @@ void kill_process( struct process *process, int violent_death ) process->msg_fd = NULL; } - if (process->sigkill_timeout) /* already waiting for it to die */ - { - remove_timeout_user( process->sigkill_timeout ); - process->sigkill_timeout = NULL; - process_died( process ); - return; - } + if (process->sigkill_timeout) return; /* already waiting for it to die */ if (violent_death) terminate_process( process, NULL, 1 ); else

1 0

Paul Gofman : server: Add sigkill timer even if msg_fd is closed.
by Alexandre Julliard March 31, 2021

March 31, 2021

Module: wine Branch: master Commit: 672df33f7d7b3a221d636bf561fa4c6052af7fb6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=672df33f7d7b3a221d636bf5… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Mar 30 20:32:14 2021 +0300 server: Add sigkill timer even if msg_fd is closed. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/process.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/process.c b/server/process.c index 9ca1eb64469..433c0cbdd73 100644 --- a/server/process.c +++ b/server/process.c @@ -503,7 +503,7 @@ static void process_sigkill( void *private ) static void start_sigkill_timer( struct process *process ) { grab_object( process ); - if (process->unix_pid != -1 && process->msg_fd) + if (process->unix_pid != -1) process->sigkill_timeout = add_timeout_user( -TICKS_PER_SEC, process_sigkill, process ); else process_died( process );

1 0

Jan Sikorski : wined3d: Introduce wined3d_gl_get_internal_format().
by Alexandre Julliard March 31, 2021

March 31, 2021

Module: wine Branch: master Commit: f42f8925f770ef7db5e84dc211b2586959531d8b URL: https://source.winehq.org/git/wine.git/?a=commit;h=f42f8925f770ef7db5e84dc2… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Wed Mar 31 12:27:39 2021 +0200 wined3d: Introduce wined3d_gl_get_internal_format(). Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 18 ++---------------- dlls/wined3d/wined3d_private.h | 11 +++++++++++ 2 files changed, 13 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 6f2f408f11e..0736f612f12 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1999,13 +1999,7 @@ void wined3d_texture_gl_prepare_texture(struct wined3d_texture_gl *texture_gl, wined3d_texture_gl_bind_and_dirtify(texture_gl, context_gl, srgb); - if (srgb) - internal = format_gl->srgb_internal; - else if (resource->bind_flags & WINED3D_BIND_RENDER_TARGET && wined3d_resource_is_offscreen(resource)) - internal = format_gl->rt_internal; - else - internal = format_gl->internal; - + internal = wined3d_gl_get_internal_format(resource, format_gl, srgb); if (!internal) FIXME("No GL internal format for format %s.\n", debug_d3dformat(format->id)); @@ -2146,16 +2140,8 @@ static void wined3d_texture_gl_upload_bo(const struct wined3d_format *src_format if (src_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_COMPRESSED) { + GLenum internal = wined3d_gl_get_internal_format(&dst_texture->resource, format_gl, srgb); unsigned int dst_row_pitch, dst_slice_pitch; - GLenum internal; - - if (srgb) - internal = format_gl->srgb_internal; - else if (dst_texture->resource.bind_flags & WINED3D_BIND_RENDER_TARGET - && wined3d_resource_is_offscreen(&dst_texture->resource)) - internal = format_gl->rt_internal; - else - internal = format_gl->internal; wined3d_format_calculate_pitch(src_format, 1, update_w, update_h, &dst_row_pitch, &dst_slice_pitch); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 21941afbd82..e9e73da9f25 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -5930,6 +5930,17 @@ static inline GLuint wined3d_texture_gl_get_texture_name(const struct wined3d_te ? texture_gl->texture_srgb.name : texture_gl->texture_rgb.name; } +static inline GLuint wined3d_gl_get_internal_format(struct wined3d_resource *resource, + const struct wined3d_format_gl *format_gl, bool srgb) +{ + if (srgb) + return format_gl->srgb_internal; + else if (resource->bind_flags & WINED3D_BIND_RENDER_TARGET && wined3d_resource_is_offscreen(resource)) + return format_gl->rt_internal; + else + return format_gl->internal; +} + static inline BOOL can_use_texture_swizzle(const struct wined3d_d3d_info *d3d_info, const struct wined3d_format *format) { return d3d_info->texture_swizzle && !is_complex_fixup(format->color_fixup) && !is_scaling_fixup(format->color_fixup);

1 0

Rémi Bernon : winex11.drv: Introduce new map_event_coords helper.
by Alexandre Julliard March 31, 2021

March 31, 2021

Module: wine Branch: master Commit: 40f101e2884298045f52097b45a562b1054aab9e URL: https://source.winehq.org/git/wine.git/?a=commit;h=40f101e2884298045f52097b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Mar 25 19:00:18 2021 +0100 winex11.drv: Introduce new map_event_coords helper. Based on a patch from Gabriel Ivăncescu <gabrielopcode(a)gmail.com>. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46309 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/mouse.c | 46 +++++++++++++++++++++++++++++----------------- 1 file changed, 29 insertions(+), 17 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index dd25f8b172c..8a379e5a3b7 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -587,6 +587,34 @@ static BOOL is_old_motion_event( unsigned long serial ) } +/*********************************************************************** + * map_event_coords + * + * Map the input event coordinates so they're relative to the desktop. + */ +static POINT map_event_coords( HWND hwnd, Window window, struct x11drv_win_data *data, const INPUT *input ) +{ + POINT pt = { input->u.mi.dx, input->u.mi.dy }; + + TRACE( "hwnd %p, window %lx, data %p, input %p\n", hwnd, window, data, input ); + + if (window == root_window) pt = root_to_virtual_screen( pt.x, pt.y ); + if (window == data->whole_window) + { + pt.x += data->whole_rect.left - data->client_rect.left; + pt.y += data->whole_rect.top - data->client_rect.top; + } + + if (GetWindowLongW( hwnd, GWL_EXSTYLE ) & WS_EX_LAYOUTRTL) + pt.x = data->client_rect.right - data->client_rect.left - 1 - pt.x; + MapWindowPoints( hwnd, 0, &pt, 1 ); + + TRACE( "mapped %s to %s\n", wine_dbgstr_point( (POINT *)&input->u.mi.dx ), wine_dbgstr_point( &pt ) ); + + return pt; +} + + /*********************************************************************** * send_mouse_input * @@ -618,24 +646,8 @@ static void send_mouse_input( HWND hwnd, Window window, unsigned int state, INPU return; } - if (window != root_window) - { - pt.x = input->u.mi.dx; - pt.y = input->u.mi.dy; - } - else pt = root_to_virtual_screen( input->u.mi.dx, input->u.mi.dy ); - if (!(data = get_win_data( hwnd ))) return; - - if (window == data->whole_window) - { - pt.x += data->whole_rect.left - data->client_rect.left; - pt.y += data->whole_rect.top - data->client_rect.top; - } - - if (GetWindowLongW( data->hwnd, GWL_EXSTYLE ) & WS_EX_LAYOUTRTL) - pt.x = data->client_rect.right - data->client_rect.left - 1 - pt.x; - MapWindowPoints( hwnd, 0, &pt, 1 ); + pt = map_event_coords( hwnd, window, data, input ); if (InterlockedExchangePointer( (void **)&cursor_window, hwnd ) != hwnd || input->u.mi.time - last_cursor_change > 100)

1 0

Zebediah Figura : ntoskrnl/tests: Fix a test failure on LUA Windows.
by Alexandre Julliard March 31, 2021

March 31, 2021

Module: wine Branch: master Commit: e687f589dc23f604dc34d53e2b1ef0d1ee81294b URL: https://source.winehq.org/git/wine.git/?a=commit;h=e687f589dc23f604dc34d53e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Mar 31 11:16:31 2021 -0500 ntoskrnl/tests: Fix a test failure on LUA Windows. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 50abb9f9d1f..c3ebe5b8ee1 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -173,6 +173,17 @@ static BOOL testsign_create_cert(struct testsign_context *ctx) ok(ret, "Failed to set provider info, error %#x\n", GetLastError()); ctx->root_store = CertOpenStore(CERT_STORE_PROV_SYSTEM_REGISTRY_A, 0, 0, CERT_SYSTEM_STORE_LOCAL_MACHINE, "root"); + if (!ctx->root_store && GetLastError() == ERROR_ACCESS_DENIED) + { + skip("Failed to open root store.\n"); + + ret = CertFreeCertificateContext(ctx->cert); + ok(ret, "Failed to free certificate, error %u\n", GetLastError()); + ret = CryptReleaseContext(ctx->provider, 0); + ok(ret, "failed to release context, error %u\n", GetLastError()); + + return FALSE; + } ok(!!ctx->root_store, "Failed to open store, error %u\n", GetLastError()); ret = CertAddCertificateContextToStore(ctx->root_store, ctx->cert, CERT_STORE_ADD_ALWAYS, &ctx->root_cert); if (!ret && GetLastError() == ERROR_ACCESS_DENIED)

1 0

Paul Gofman : ntdll: Close server socket before calling exit().
by Alexandre Julliard March 31, 2021

March 31, 2021

Module: wine Branch: master Commit: 51f7c9d15ed4af06f39f863c253252f77336d0e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=51f7c9d15ed4af06f39f863c… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Mar 30 20:32:15 2021 +0300 ntdll: Close server socket before calling exit(). So if a native exit handler hangs the process eventually gets killed by server. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/server.c | 12 ++++++++++++ dlls/ntdll/unix/thread.c | 2 +- dlls/ntdll/unix/unix_private.h | 1 + 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index 3f446e8348a..50d89f79c0d 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -1470,6 +1470,18 @@ static void init_teb64( TEB *teb ) #endif } +/*********************************************************************** + * process_exit_wrapper + * + * Close server socket and exit process normally. + */ +void process_exit_wrapper( int status ) +{ + close( fd_socket ); + exit( status ); +} + + /*********************************************************************** * server_init_process * diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index 00d29ae706b..1a882a99855 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -329,7 +329,7 @@ static void exit_thread( int status ) void exit_process( int status ) { pthread_sigmask( SIG_BLOCK, &server_block_set, NULL ); - signal_exit_thread( get_unix_exit_code( status ), exit ); + signal_exit_thread( get_unix_exit_code( status ), process_exit_wrapper ); } diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 3987cc6c4d0..b49789b641e 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -164,6 +164,7 @@ extern unsigned int server_queue_process_apc( HANDLE process, const apc_call_t * apc_result_t *result ) DECLSPEC_HIDDEN; extern int server_get_unix_fd( HANDLE handle, unsigned int wanted_access, int *unix_fd, int *needs_close, enum server_fd_type *type, unsigned int *options ) DECLSPEC_HIDDEN; +extern void process_exit_wrapper( int status ) DECLSPEC_HIDDEN; extern size_t server_init_process(void) DECLSPEC_HIDDEN; extern void server_init_process_done(void) DECLSPEC_HIDDEN; extern void server_init_thread( void *entry_point, BOOL *suspend ) DECLSPEC_HIDDEN;

1 0

Nikolay Sivov : dwrite: Use wide-char literals.
by Alexandre Julliard March 31, 2021

March 31, 2021

Module: wine Branch: master Commit: fcd8508993719c0c01af93822def84d6610976be URL: https://source.winehq.org/git/wine.git/?a=commit;h=fcd8508993719c0c01af9382… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 31 13:06:29 2021 +0300 dwrite: Use wide-char literals. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 10 +- dlls/dwrite/font.c | 408 ++++++++++++++++++++++--------------------------- dlls/dwrite/main.c | 6 +- dlls/dwrite/opentype.c | 25 ++- 4 files changed, 196 insertions(+), 253 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=fcd8508993719c0c01af…

1 0

Jacek Caban : d3d11: Use nameless unions.
by Alexandre Julliard March 31, 2021

March 31, 2021

Module: wine Branch: master Commit: 68f8c454ecd09fc79b3ce14b595e7c16dde56c14 URL: https://source.winehq.org/git/wine.git/?a=commit;h=68f8c454ecd09fc79b3ce14b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 30 20:09:55 2021 +0200 d3d11: Use nameless unions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/Makefile.in | 1 - dlls/d3d11/device.c | 1 + dlls/d3d11/view.c | 1 + 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/Makefile.in b/dlls/d3d11/Makefile.in index 5f664007444..db9e40d2e60 100644 --- a/dlls/d3d11/Makefile.in +++ b/dlls/d3d11/Makefile.in @@ -1,7 +1,6 @@ MODULE = d3d11.dll IMPORTLIB = d3d11 IMPORTS = dxguid uuid dxgi wined3d -EXTRADEFS = -DWINE_NO_NAMELESS_EXTENSION EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 4c8aa8c854c..f154bfdf480 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -18,6 +18,7 @@ */ #define NONAMELESSUNION +#define WINE_NO_NAMELESS_EXTENSION #include "d3d11_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d11); diff --git a/dlls/d3d11/view.c b/dlls/d3d11/view.c index 4393d6540e3..734c9619e5b 100644 --- a/dlls/d3d11/view.c +++ b/dlls/d3d11/view.c @@ -18,6 +18,7 @@ */ #define NONAMELESSUNION +#define WINE_NO_NAMELESS_EXTENSION #include "d3d11_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d11);

1 0

Jacek Caban : conhost: Delay window refresh on output update.
by Alexandre Julliard March 31, 2021

March 31, 2021

Module: wine Branch: master Commit: 8ccf24ccb0a4362c407aea61927e604e60d41f6e URL: https://source.winehq.org/git/wine.git/?a=commit;h=8ccf24ccb0a4362c407aea61… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 30 21:28:01 2021 +0200 conhost: Delay window refresh on output update. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/conhost.c | 8 ++++---- programs/conhost/conhost.h | 2 +- programs/conhost/window.c | 15 +++++++++++---- 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index fbee37d9c01..39544fb8a9d 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -1211,7 +1211,7 @@ static void update_read_output( struct console *console ) if (console->is_unix) set_tty_cursor_relative( screen_buffer->console, screen_buffer->cursor_x, screen_buffer->cursor_y ); tty_sync( screen_buffer->console ); - update_window_config( screen_buffer->console ); + update_window_config( screen_buffer->console, TRUE ); } static NTSTATUS process_console_input( struct console *console ) @@ -1703,7 +1703,7 @@ static NTSTATUS screen_buffer_activate( struct screen_buffer *screen_buffer ) SetRect( &update_rect, 0, 0, screen_buffer->width - 1, screen_buffer->height - 1 ); update_output( screen_buffer, &update_rect ); tty_sync( screen_buffer->console ); - update_window_config( screen_buffer->console ); + update_window_config( screen_buffer->console, FALSE ); return STATUS_SUCCESS; } @@ -1896,7 +1896,7 @@ static NTSTATUS set_output_info( struct screen_buffer *screen_buffer, if (is_active( screen_buffer )) { tty_sync( screen_buffer->console ); - update_window_config( screen_buffer->console ); + update_window_config( screen_buffer->console, FALSE ); } return STATUS_SUCCESS; } @@ -1955,7 +1955,7 @@ static NTSTATUS write_console( struct screen_buffer *screen_buffer, const WCHAR scroll_to_cursor( screen_buffer ); update_output( screen_buffer, &update_rect ); tty_sync( screen_buffer->console ); - update_window_config( screen_buffer->console ); + update_window_config( screen_buffer->console, TRUE ); return STATUS_SUCCESS; } diff --git a/programs/conhost/conhost.h b/programs/conhost/conhost.h index 6f3985352e2..6446cd1d767 100644 --- a/programs/conhost/conhost.h +++ b/programs/conhost/conhost.h @@ -132,7 +132,7 @@ struct screen_buffer BOOL init_window( struct console *console ); void update_window_region( struct console *console, const RECT *update ); -void update_window_config( struct console *console ); +void update_window_config( struct console *console, BOOL delay ); NTSTATUS write_console_input( struct console *console, const INPUT_RECORD *records, unsigned int count, BOOL flush ); diff --git a/programs/conhost/window.c b/programs/conhost/window.c index a665cbb84d4..0ea929df943 100644 --- a/programs/conhost/window.c +++ b/programs/conhost/window.c @@ -2170,8 +2170,10 @@ static LRESULT WINAPI window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lp PostQuitMessage( 0 ); break; + case WM_TIMER: case WM_UPDATE_CONFIG: - update_window( console ); + if (console->window->update_state == UPDATE_PENDING) + update_window( console ); break; case WM_PAINT: @@ -2457,11 +2459,16 @@ static LRESULT WINAPI window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lp return 0; } -void update_window_config( struct console *console ) +void update_window_config( struct console *console, BOOL delay ) { + const int delay_timeout = 50; + if (!console->win || console->window->update_state != UPDATE_NONE) return; console->window->update_state = UPDATE_PENDING; - PostMessageW( console->win, WM_UPDATE_CONFIG, 0, 0 ); + if (delay) + SetTimer( console->win, 1, delay_timeout, NULL ); + else + PostMessageW( console->win, WM_UPDATE_CONFIG, 0, 0 ); } void update_window_region( struct console *console, const RECT *update ) @@ -2471,7 +2478,7 @@ void update_window_region( struct console *console, const RECT *update ) window_rect->top = min( window_rect->top, update->top ); window_rect->right = max( window_rect->right, update->right ); window_rect->bottom = max( window_rect->bottom, update->bottom ); - update_window_config( console ); + update_window_config( console, TRUE ); } BOOL init_window( struct console *console )

1 0