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

Jacek Caban : server: Support blocking console host ioctls.
by Alexandre Julliard Aug. 26, 2020

Aug. 26, 2020

Module: wine Branch: master Commit: b75ae8c31eba2a59e2b32bf8d456ca5756ac6e0d URL: https://source.winehq.org/git/wine.git/?a=commit;h=b75ae8c31eba2a59e2b32bf8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 25 14:52:48 2020 +0200 server: Support blocking console host ioctls. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/server_protocol.h | 4 ++- server/console.c | 71 ++++++++++++++++++++++++++++++++++++++---- server/protocol.def | 1 + server/request.h | 5 +-- server/trace.c | 1 + 5 files changed, 73 insertions(+), 9 deletions(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index af3353eae3..76206413d4 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -1943,8 +1943,10 @@ struct get_next_console_request_request struct request_header __header; obj_handle_t handle; int signal; + int read; unsigned int status; /* VARARG(out_data,bytes); */ + char __pad_28[4]; }; struct get_next_console_request_reply { @@ -6333,7 +6335,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 638 +#define SERVER_PROTOCOL_VERSION 639 /* ### protocol_version end ### */ diff --git a/server/console.c b/server/console.c index 5cdf3e7822..2c2978fc0c 100644 --- a/server/console.c +++ b/server/console.c @@ -192,6 +192,7 @@ struct console_server struct object obj; /* object header */ struct console_input *console; /* attached console */ struct list queue; /* ioctl queue */ + struct list read_queue; /* blocking read queue */ int busy; /* flag if server processing an ioctl */ }; @@ -577,6 +578,12 @@ static void disconnect_console_server( struct console_server *server ) list_remove( &call->entry ); console_host_ioctl_terminate( call, STATUS_CANCELLED ); } + while (!list_empty( &server->read_queue )) + { + struct console_host_ioctl *call = LIST_ENTRY( list_head( &server->read_queue ), struct console_host_ioctl, entry ); + list_remove( &call->entry ); + console_host_ioctl_terminate( call, STATUS_CANCELLED ); + } if (server->console) { @@ -1638,10 +1645,16 @@ static struct object *create_console_server( void ) server->console = NULL; server->busy = 0; list_init( &server->queue ); + list_init( &server->read_queue ); return &server->obj; } +static int is_blocking_read_ioctl( unsigned int code ) +{ + return code == IOCTL_CONDRV_READ_INPUT; +} + static int console_input_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) { struct console_input *console = get_fd_user( fd ); @@ -2385,11 +2398,10 @@ DECL_HANDLER(get_console_wait_event) /* retrieve the next pending console ioctl request */ DECL_HANDLER(get_next_console_request) { - struct console_host_ioctl *ioctl = NULL; + struct console_host_ioctl *ioctl = NULL, *next; struct console_server *server; struct iosb *iosb = NULL; - server = (struct console_server *)get_handle_obj( current->process, req->handle, 0, &console_server_ops ); if (!server) return; @@ -2403,12 +2415,30 @@ DECL_HANDLER(get_next_console_request) if (req->signal) set_event( server->console->event); else reset_event( server->console->event ); - /* set result of previous ioctl, if any */ - if (server->busy) + if (req->read) { - unsigned int status = req->status; + /* set result of current pending ioctl */ + if (list_empty( &server->read_queue )) + { + set_error( STATUS_INVALID_HANDLE ); + release_object( server ); + return; + } + + ioctl = LIST_ENTRY( list_head( &server->read_queue ), struct console_host_ioctl, entry ); + list_remove( &ioctl->entry ); + list_move_tail( &server->queue, &server->read_queue ); + } + else if (server->busy) + { + /* set result of previous ioctl */ ioctl = LIST_ENTRY( list_head( &server->queue ), struct console_host_ioctl, entry ); list_remove( &ioctl->entry ); + } + + if (ioctl) + { + unsigned int status = req->status; if (ioctl->async) { iosb = async_get_iosb( ioctl->async ); @@ -2430,9 +2460,32 @@ DECL_HANDLER(get_next_console_request) } console_host_ioctl_terminate( ioctl, status ); if (iosb) release_object( iosb ); + + if (req->read) + { + release_object( server ); + return; + } server->busy = 0; } + /* if we have a blocking read ioctl in queue head and previous blocking read is still waiting, + * move it to read queue for execution after current read is complete. move all blocking + * ioctl at the same time to preserve their order. */ + if (!list_empty( &server->queue ) && !list_empty( &server->read_queue )) + { + ioctl = LIST_ENTRY( list_head( &server->queue ), struct console_host_ioctl, entry ); + if (is_blocking_read_ioctl( ioctl->code )) + { + LIST_FOR_EACH_ENTRY_SAFE( ioctl, next, &server->queue, struct console_host_ioctl, entry ) + { + if (!is_blocking_read_ioctl( ioctl->code )) continue; + list_remove( &ioctl->entry ); + list_add_tail( &server->read_queue, &ioctl->entry ); + } + } + } + /* return the next ioctl */ if (!list_empty( &server->queue )) { @@ -2450,7 +2503,13 @@ DECL_HANDLER(get_next_console_request) iosb->in_data = NULL; } - server->busy = 1; + if (is_blocking_read_ioctl( ioctl->code )) + { + list_remove( &ioctl->entry ); + assert( list_empty( &server->read_queue )); + list_add_tail( &server->read_queue, &ioctl->entry ); + } + else server->busy = 1; } else { diff --git a/server/protocol.def b/server/protocol.def index 75888ea9a2..14bf046816 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1526,6 +1526,7 @@ enum server_fd_type @REQ(get_next_console_request) obj_handle_t handle; /* console server handle */ int signal; /* server signal state */ + int read; /* 1 if reporting result of blocked read ioctl */ unsigned int status; /* status of previous ioctl */ VARARG(out_data,bytes); /* out_data of previous ioctl */ @REPLY diff --git a/server/request.h b/server/request.h index ba278122eb..4c16b24685 100644 --- a/server/request.h +++ b/server/request.h @@ -1136,8 +1136,9 @@ C_ASSERT( FIELD_OFFSET(struct send_console_signal_request, group_id) == 16 ); C_ASSERT( sizeof(struct send_console_signal_request) == 24 ); C_ASSERT( FIELD_OFFSET(struct get_next_console_request_request, handle) == 12 ); C_ASSERT( FIELD_OFFSET(struct get_next_console_request_request, signal) == 16 ); -C_ASSERT( FIELD_OFFSET(struct get_next_console_request_request, status) == 20 ); -C_ASSERT( sizeof(struct get_next_console_request_request) == 24 ); +C_ASSERT( FIELD_OFFSET(struct get_next_console_request_request, read) == 20 ); +C_ASSERT( FIELD_OFFSET(struct get_next_console_request_request, status) == 24 ); +C_ASSERT( sizeof(struct get_next_console_request_request) == 32 ); C_ASSERT( FIELD_OFFSET(struct get_next_console_request_reply, code) == 8 ); C_ASSERT( FIELD_OFFSET(struct get_next_console_request_reply, out_size) == 12 ); C_ASSERT( sizeof(struct get_next_console_request_reply) == 16 ); diff --git a/server/trace.c b/server/trace.c index 42e048998c..dac0a5f6e1 100644 --- a/server/trace.c +++ b/server/trace.c @@ -2098,6 +2098,7 @@ static void dump_get_next_console_request_request( const struct get_next_console { fprintf( stderr, " handle=%04x", req->handle ); fprintf( stderr, ", signal=%d", req->signal ); + fprintf( stderr, ", read=%d", req->read ); fprintf( stderr, ", status=%08x", req->status ); dump_varargs_bytes( ", out_data=", cur_size ); }

1 0

Zhiyi Zhang : winex11.drv: Support full screen windows on non-primary monitors.
by Alexandre Julliard Aug. 26, 2020

Aug. 26, 2020

Module: wine Branch: master Commit: 715a04daabdab616b530ef5a937827df7c2523c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=715a04daabdab616b530ef5a… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Aug 25 15:20:48 2020 +0800 winex11.drv: Support full screen windows on non-primary monitors. A window can be maximized or full screen on non-primary monitors. In this case we need to add _NET_WM_STATE_MAXIMIZED or _NET_WM_STATE_FULLSCREEN hint to the window so that they can be handled correctly by window managers. For example, a full screen window on the secondary monitor needs _NET_WM_STATE_FULLSCREEN so that window managers prevent panels from obscuring it. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/window.c | 31 +++++++++++++++++++++++++++++-- dlls/winex11.drv/x11drv.h | 1 + 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 09475d1adb..6378c9c765 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -272,9 +272,36 @@ static inline BOOL is_window_resizable( struct x11drv_win_data *data, DWORD styl { if (style & WS_THICKFRAME) return TRUE; /* Metacity needs the window to be resizable to make it fullscreen */ - return is_window_rect_fullscreen( &data->whole_rect ); + return is_window_rect_full_screen( &data->whole_rect ); } +struct monitor_info +{ + const RECT *rect; + BOOL full_screen; +}; + +static BOOL CALLBACK enum_monitor_proc( HMONITOR monitor, HDC hdc, RECT *monitor_rect, LPARAM lparam ) +{ + struct monitor_info *info = (struct monitor_info *)lparam; + + if (info->rect->left <= monitor_rect->left && info->rect->right >= monitor_rect->right && + info->rect->top <= monitor_rect->top && info->rect->bottom >= monitor_rect->bottom) + { + info->full_screen = TRUE; + return FALSE; + } + + return TRUE; +} + +BOOL is_window_rect_full_screen( const RECT *rect ) +{ + struct monitor_info info = {rect, FALSE}; + + EnumDisplayMonitors( NULL, NULL, enum_monitor_proc, (LPARAM)&info ); + return info.full_screen; +} /*********************************************************************** * get_mwm_decorations @@ -945,7 +972,7 @@ void update_net_wm_states( struct x11drv_win_data *data ) style = GetWindowLongW( data->hwnd, GWL_STYLE ); if (style & WS_MINIMIZE) new_state |= data->net_wm_state & ((1 << NET_WM_STATE_FULLSCREEN)|(1 << NET_WM_STATE_MAXIMIZED)); - if (is_window_rect_fullscreen( &data->whole_rect )) + if (is_window_rect_full_screen( &data->whole_rect )) { if ((style & WS_MAXIMIZE) && (style & WS_CAPTION) == WS_CAPTION) new_state |= (1 << NET_WM_STATE_MAXIMIZED); diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 233891f7b0..ce00e6c54d 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -641,6 +641,7 @@ typedef int (*x11drv_error_callback)( Display *display, XErrorEvent *event, void extern void X11DRV_expect_error( Display *display, x11drv_error_callback callback, void *arg ) DECLSPEC_HIDDEN; extern int X11DRV_check_error(void) DECLSPEC_HIDDEN; extern void X11DRV_X_to_window_rect( struct x11drv_win_data *data, RECT *rect, int x, int y, int cx, int cy ) DECLSPEC_HIDDEN; +extern BOOL is_window_rect_full_screen( const RECT *rect ) DECLSPEC_HIDDEN; extern POINT virtual_screen_to_root( INT x, INT y ) DECLSPEC_HIDDEN; extern POINT root_to_virtual_screen( INT x, INT y ) DECLSPEC_HIDDEN; extern RECT get_virtual_screen_rect(void) DECLSPEC_HIDDEN;

1 0

Nikolay Sivov : combase: Move CoFreeUnusedLibrariesEx().
by Alexandre Julliard Aug. 26, 2020

Aug. 26, 2020

Module: wine Branch: master Commit: e540630750e9b2cd9b219cbd27b937c070f5388a URL: https://source.winehq.org/git/wine.git/?a=commit;h=e540630750e9b2cd9b219cbd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 25 18:18:17 2020 +0300 combase: Move CoFreeUnusedLibrariesEx(). 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/apartment.c | 2 +- dlls/combase/combase.c | 15 +++++++++++++++ dlls/combase/combase.spec | 3 +-- dlls/combase/combase_private.h | 1 + dlls/ole32/compobj.c | 29 ----------------------------- dlls/ole32/compobj_private.h | 1 - dlls/ole32/ole32.spec | 2 +- 7 files changed, 19 insertions(+), 34 deletions(-) diff --git a/dlls/combase/apartment.c b/dlls/combase/apartment.c index dbf4553fa4..81071563c0 100644 --- a/dlls/combase/apartment.c +++ b/dlls/combase/apartment.c @@ -426,7 +426,7 @@ static struct apartment *apartment_construct(DWORD model) } /* Frees unused libraries loaded into apartment */ -void WINAPI apartment_freeunusedlibraries(struct apartment *apt, DWORD delay) +void apartment_freeunusedlibraries(struct apartment *apt, DWORD delay) { struct apartment_loaded_dll *entry, *next; diff --git a/dlls/combase/combase.c b/dlls/combase/combase.c index 286b7be8b8..4ce43717fb 100644 --- a/dlls/combase/combase.c +++ b/dlls/combase/combase.c @@ -2252,6 +2252,21 @@ DWORD WINAPI CoGetCurrentProcess(void) return tlsdata->thread_seqid; } +/*********************************************************************** + * CoFreeUnusedLibrariesEx (combase.@) + */ +void WINAPI DECLSPEC_HOTPATCH CoFreeUnusedLibrariesEx(DWORD unload_delay, DWORD reserved) +{ + struct apartment *apt = com_get_current_apt(); + if (!apt) + { + ERR("apartment not initialised\n"); + return; + } + + apartment_freeunusedlibraries(apt, unload_delay); +} + /*********************************************************************** * DllMain (combase.@) */ diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index 980ffa820c..00aea556d9 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -93,7 +93,7 @@ @ stdcall CoEnableCallCancellation(ptr) ole32.CoEnableCallCancellation @ stdcall CoFileTimeNow(ptr) @ stdcall CoFreeUnusedLibraries() -@ stdcall CoFreeUnusedLibrariesEx(long long) ole32.CoFreeUnusedLibrariesEx +@ stdcall CoFreeUnusedLibrariesEx(long long) @ stdcall CoGetActivationState(int128 long ptr) @ stub CoGetApartmentID @ stdcall CoGetApartmentType(ptr ptr) ole32.CoGetApartmentType @@ -357,7 +357,6 @@ @ stdcall enter_apartment(ptr long) @ stdcall leave_apartment(ptr) @ stdcall apartment_get_inproc_class_object(ptr ptr ptr ptr long ptr) -@ stdcall apartment_freeunusedlibraries(ptr long) @ stdcall apartment_get_mta() @ stdcall apartment_decrement_mta_usage(ptr) @ stdcall apartment_increment_mta_usage(ptr) diff --git a/dlls/combase/combase_private.h b/dlls/combase/combase_private.h index 16d926d13b..7fe548af59 100644 --- a/dlls/combase/combase_private.h +++ b/dlls/combase/combase_private.h @@ -98,6 +98,7 @@ static inline struct apartment* com_get_current_apt(void) HWND WINAPI apartment_getwindow(const struct apartment *apt) DECLSPEC_HIDDEN; HRESULT WINAPI apartment_createwindowifneeded(struct apartment *apt) DECLSPEC_HIDDEN; +void apartment_freeunusedlibraries(struct apartment *apt, DWORD unload_delay) DECLSPEC_HIDDEN; /* RpcSs interface */ HRESULT rpcss_get_next_seqid(DWORD *id) DECLSPEC_HIDDEN; diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 8451953baa..55d06f197f 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -1449,35 +1449,6 @@ void WINAPI CoFreeAllLibraries(void) /* NOP */ } -/*********************************************************************** - * CoFreeUnusedLibrariesEx [OLE32.@] - * - * Frees any previously unused libraries whose delay has expired and marks - * currently unused libraries for unloading. Unused are identified as those that - * return S_OK from their DllCanUnloadNow function. - * - * PARAMS - * dwUnloadDelay [I] Unload delay in milliseconds. - * dwReserved [I] Reserved. Set to 0. - * - * RETURNS - * Nothing. - * - * SEE ALSO - * CoLoadLibrary, CoFreeAllLibraries, CoFreeLibrary - */ -void WINAPI DECLSPEC_HOTPATCH CoFreeUnusedLibrariesEx(DWORD dwUnloadDelay, DWORD dwReserved) -{ - struct apartment *apt = COM_CurrentApt(); - if (!apt) - { - ERR("apartment not initialised\n"); - return; - } - - apartment_freeunusedlibraries(apt, dwUnloadDelay); -} - /****************************************************************************** * CoLockObjectExternal [OLE32.@] * diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index 34fe1e7a38..29e4cac362 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -267,7 +267,6 @@ extern void WINAPI apartment_decrement_mta_usage(CO_MTA_USAGE_COOKIE cookie) DEC extern HRESULT WINAPI apartment_increment_mta_usage(CO_MTA_USAGE_COOKIE *cookie) DECLSPEC_HIDDEN; extern struct apartment * WINAPI apartment_get_mta(void) DECLSPEC_HIDDEN; extern HRESULT WINAPI apartment_get_local_server_stream(struct apartment *apt, IStream **ret) DECLSPEC_HIDDEN; -extern void WINAPI apartment_freeunusedlibraries(struct apartment *apt, DWORD delay) DECLSPEC_HIDDEN; extern void WINAPI apartment_global_cleanup(void) DECLSPEC_HIDDEN; HRESULT COM_GetRegisteredClassObject(const struct apartment *apt, REFCLSID rclsid, diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index 4a2e6b531a..4908729d1f 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -24,7 +24,7 @@ @ stdcall CoFreeAllLibraries() @ stdcall CoFreeLibrary(long) @ stdcall CoFreeUnusedLibraries() combase.CoFreeUnusedLibraries -@ stdcall CoFreeUnusedLibrariesEx(long long) +@ stdcall CoFreeUnusedLibrariesEx(long long) combase.CoFreeUnusedLibrariesEx @ stdcall CoGetActivationState(int128 long ptr) combase.CoGetActivationState @ stdcall CoGetApartmentType(ptr ptr) @ stdcall CoGetCallContext(ptr ptr) combase.CoGetCallContext

1 0

Zhiyi Zhang : winex11.drv: Always update _NET_WM_STATE in update_net_wm_states().
by Alexandre Julliard Aug. 26, 2020

Aug. 26, 2020

Module: wine Branch: master Commit: c5ec1585f6e5211a2b63e3435748210552250534 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c5ec1585f6e5211a2b63e343… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Aug 25 15:20:39 2020 +0800 winex11.drv: Always update _NET_WM_STATE in update_net_wm_states(). KWin treats a window covering exactly the whole monitor as maximized when handling its first map request and expects applications to update maximized state later. Wine doesn't know about this added maximized state and expect it unchanged, making the window always maximized as far as KWin is concerned. So always send _NET_WM_STATE updates even if Wine doesn't expect changes to hint KWin that a window should not be maximized. Fix test failures when running the tests introduced by 36b720357bcaf0a1e625f488e0c981ce10e8affa with KWin. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/window.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index f4920b802e..09475d1adb 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -996,8 +996,6 @@ void update_net_wm_states( struct x11drv_win_data *data ) for (i = 0; i < NB_NET_WM_STATES; i++) { - if (!((data->net_wm_state ^ new_state) & (1 << i))) continue; /* unchanged */ - TRACE( "setting wm state %u for window %p/%lx to %u prev %u\n", i, data->hwnd, data->whole_window, (new_state & (1 << i)) != 0, (data->net_wm_state & (1 << i)) != 0 );

1 0

Zhiyi Zhang : winex11.drv: Support clipping full screen windows on non-primary monitors.
by Alexandre Julliard Aug. 26, 2020

Aug. 26, 2020

Module: wine Branch: master Commit: d9625e5a01a52496d1fb7f1a9a691fd3ec8332db URL: https://source.winehq.org/git/wine.git/?a=commit;h=d9625e5a01a52496d1fb7f1a… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Aug 25 15:21:03 2020 +0800 winex11.drv: Support clipping full screen windows on non-primary monitors. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/mouse.c | 15 ++++++++++----- dlls/winex11.drv/window.c | 2 +- dlls/winex11.drv/x11drv.h | 7 ------- 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index d78449c2cc..eb5e6a6c0d 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -548,7 +548,8 @@ BOOL clip_fullscreen_window( HWND hwnd, BOOL reset ) { struct x11drv_win_data *data; struct x11drv_thread_data *thread_data; - RECT rect; + MONITORINFO monitor_info; + HMONITOR monitor; DWORD style; BOOL fullscreen; @@ -559,21 +560,25 @@ BOOL clip_fullscreen_window( HWND hwnd, BOOL reset ) /* maximized windows don't count as full screen */ if ((style & WS_MAXIMIZE) && (style & WS_CAPTION) == WS_CAPTION) return FALSE; if (!(data = get_win_data( hwnd ))) return FALSE; - fullscreen = is_window_rect_fullscreen( &data->whole_rect ); + fullscreen = is_window_rect_full_screen( &data->whole_rect ); release_win_data( data ); if (!fullscreen) return FALSE; if (!(thread_data = x11drv_thread_data())) return FALSE; if (GetTickCount() - thread_data->clip_reset < 1000) return FALSE; if (!reset && clipping_cursor && thread_data->clip_hwnd) return FALSE; /* already clipping */ - rect = get_primary_monitor_rect(); + + monitor = MonitorFromWindow( hwnd, MONITOR_DEFAULTTONEAREST ); + if (!monitor) return FALSE; + monitor_info.cbSize = sizeof(monitor_info); + if (!GetMonitorInfoW( monitor, &monitor_info )) return FALSE; if (!grab_fullscreen) { RECT virtual_rect = get_virtual_screen_rect(); - if (!EqualRect( &rect, &virtual_rect )) return FALSE; + if (!EqualRect( &monitor_info.rcMonitor, &virtual_rect )) return FALSE; if (is_virtual_desktop()) return FALSE; } TRACE( "win %p clipping fullscreen\n", hwnd ); - return grab_clipping_window( &rect ); + return grab_clipping_window( &monitor_info.rcMonitor ); } diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 6378c9c765..455957264b 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2460,7 +2460,7 @@ void CDECL X11DRV_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_flags { release_win_data( data ); unmap_window( hwnd ); - if (is_window_rect_fullscreen( &old_window_rect )) reset_clipping_window(); + if (is_window_rect_full_screen( &old_window_rect )) reset_clipping_window(); if (!(data = get_win_data( hwnd ))) return; } } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index ce00e6c54d..a92c738a68 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -822,11 +822,4 @@ static inline BOOL is_window_rect_mapped( const RECT *rect ) max( rect->bottom, rect->top + 1 ) > virtual_rect.top); } -static inline BOOL is_window_rect_fullscreen( const RECT *rect ) -{ - RECT primary_rect = get_primary_monitor_rect(); - return (rect->left <= primary_rect.left && rect->right >= primary_rect.right && - rect->top <= primary_rect.top && rect->bottom >= primary_rect.bottom); -} - #endif /* __WINE_X11DRV_H */

1 0

Alexandre Julliard : ntdll: Get rid of the server_init_process_done() Unix library callback.
by Alexandre Julliard Aug. 26, 2020

Aug. 26, 2020

Module: wine Branch: master Commit: 1581fb619b879b58a402bc64ad81bde265b926e8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1581fb619b879b58a402bc64… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 26 12:00:22 2020 +0200 ntdll: Get rid of the server_init_process_done() Unix library callback. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 30 ++++++++++++++++++++++-------- dlls/ntdll/ntdll_misc.h | 1 - dlls/ntdll/unix/loader.c | 2 +- dlls/ntdll/unix/server.c | 4 ++-- dlls/ntdll/unix/signal_arm.c | 1 - dlls/ntdll/unix/signal_arm64.c | 1 - dlls/ntdll/unix/signal_i386.c | 2 -- dlls/ntdll/unix/signal_x86_64.c | 1 - dlls/ntdll/unix/unix_private.h | 2 +- dlls/ntdll/unixlib.h | 5 +---- 10 files changed, 27 insertions(+), 22 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1581fb619b879b58a402…

1 0

Nikolay Sivov : ole32: Get rid of typedef'ed type for apartment structure.
by Alexandre Julliard Aug. 26, 2020

Aug. 26, 2020

Module: wine Branch: master Commit: 929575154214482a11761a82b19db8b035a4ad1b URL: https://source.winehq.org/git/wine.git/?a=commit;h=929575154214482a11761a82… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 25 18:18:13 2020 +0300 ole32: Get rid of typedef'ed type for apartment structure. 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/ole32/compobj.c | 56 ++++++++++++++++++++++---------------------- dlls/ole32/compobj_private.h | 24 +++++++++---------- dlls/ole32/marshal.c | 19 +++++++-------- dlls/ole32/rpc.c | 10 ++++---- dlls/ole32/stubmanager.c | 26 ++++++++++---------- 5 files changed, 67 insertions(+), 68 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=929575154214482a1176…

1 0

Nikolay Sivov : ole32: Move apartment and activation management to a separate file.
by Alexandre Julliard Aug. 26, 2020

Aug. 26, 2020

Module: wine Branch: master Commit: 04e11b587123e1068189015e3e6f2ad5c1faa2f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=04e11b587123e1068189015e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 25 18:18:15 2020 +0300 ole32: Move apartment and activation management to a separate file. 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/ole32/Makefile.in | 1 + dlls/ole32/apartment.c | 1289 ++++++++++++++++++++++++++++++++++++ dlls/ole32/compobj.c | 1497 +++++------------------------------------- dlls/ole32/compobj_private.h | 20 +- 4 files changed, 1456 insertions(+), 1351 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=04e11b587123e1068189…

1 0

Zhiyi Zhang : winex11.drv: Allow setting a 0-bit color depth display mode.
by Alexandre Julliard Aug. 26, 2020

Aug. 26, 2020

Module: wine Branch: master Commit: f04360cfbec574dc37675df141ef8fc14e1302ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=f04360cfbec574dc37675df1… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Aug 25 15:16:51 2020 +0800 winex11.drv: Allow setting a 0-bit color depth display mode. Windows 8.1 and older allow setting a display mode with 0-bit color depth. Fix a regression from 981fb4edb371dd2ccf57dd350e76451df50c0a98. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/settings.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/winex11.drv/settings.c b/dlls/winex11.drv/settings.c index 7827ede656..902f1ec15d 100644 --- a/dlls/winex11.drv/settings.c +++ b/dlls/winex11.drv/settings.c @@ -473,7 +473,9 @@ static DEVMODEW *get_full_mode(ULONG_PTR id, DEVMODEW *dev_mode) { found_mode = (DEVMODEW *)((BYTE *)modes + (sizeof(*modes) + modes[0].dmDriverExtra) * mode_idx); - if (dev_mode->dmFields & DM_BITSPERPEL && found_mode->dmBitsPerPel != dev_mode->dmBitsPerPel) + if (dev_mode->dmFields & DM_BITSPERPEL && + dev_mode->dmBitsPerPel && + found_mode->dmBitsPerPel != dev_mode->dmBitsPerPel) continue; if (dev_mode->dmFields & DM_PELSWIDTH && found_mode->dmPelsWidth != dev_mode->dmPelsWidth) continue;

1 0

Nikolay Sivov : combase: Move core apartment and activation functionality.
by Alexandre Julliard Aug. 26, 2020

Aug. 26, 2020

Module: wine Branch: master Commit: ae969df3bc992a6c1c0084cd6eb30c68a2fd6d04 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae969df3bc992a6c1c0084cd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 25 18:18:16 2020 +0300 combase: Move core apartment and activation functionality. 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/Makefile.in | 1 + dlls/{ole32 => combase}/apartment.c | 94 ++++++++++++++++++++++--------------- dlls/combase/combase.c | 19 ++++++++ dlls/combase/combase.spec | 16 +++++++ dlls/combase/combase_private.h | 42 +++++++++++++++++ dlls/ole32/Makefile.in | 1 - dlls/ole32/compobj.c | 10 ++-- dlls/ole32/compobj_private.h | 31 ++++++------ dlls/ole32/marshal.c | 2 +- dlls/ole32/ole32.spec | 5 ++ dlls/ole32/rpc.c | 4 +- dlls/ole32/stubmanager.c | 5 ++ 12 files changed, 165 insertions(+), 65 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ae969df3bc992a6c1c00…

1 0