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

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

26 Aug '20

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

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

26 Aug '20

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 26 Aug '20

26 Aug '20

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

Alexandre Julliard : ntdll: Use exported APIs instead of virtual_map_section() to load PE modules.
by Alexandre Julliard 26 Aug '20

26 Aug '20

Module: wine Branch: master Commit: 65c37cee249984884af40d91aa14706d81e128bf URL: https://source.winehq.org/git/wine.git/?a=commit;h=65c37cee249984884af40d91… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 26 13:02:02 2020 +0200 ntdll: Use exported APIs instead of virtual_map_section() to load PE modules. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 75 ++++++++++++++++++++++-------------------- dlls/ntdll/unix/loader.c | 37 ++++++++++++++++----- dlls/ntdll/unix/unix_private.h | 3 -- dlls/ntdll/unix/virtual.c | 8 ++--- dlls/ntdll/unixlib.h | 7 ++-- 5 files changed, 73 insertions(+), 57 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=65c37cee249984884af4…

1 0

Dmitry Kislyuk : vbscript: Implement case-insensitive search in Replace function.
by Alexandre Julliard 26 Aug '20

26 Aug '20

Module: wine Branch: master Commit: 3be18bb757de4fbd7515c47b71df70395f01a44a URL: https://source.winehq.org/git/wine.git/?a=commit;h=3be18bb757de4fbd7515c47b… Author: Dmitry Kislyuk <dimaki(a)rocketmail.com> Date: Tue Aug 25 12:47:17 2020 -0500 vbscript: Implement case-insensitive search in Replace function. Signed-off-by: Dmitry Kislyuk <dimaki(a)rocketmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/global.c | 22 ++++++++++++++++++---- dlls/vbscript/tests/api.vbs | 34 ++++++++++++++++++++++++++++++++++ dlls/vbscript/vbregexp.c | 19 +++++++++++-------- dlls/vbscript/vbscript.h | 2 +- 4 files changed, 64 insertions(+), 13 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index cdfbdf2215..80323fe136 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -2449,12 +2449,19 @@ error: static HRESULT Global_Replace(BuiltinDisp *This, VARIANT *args, unsigned args_cnt, VARIANT *res) { BSTR string, find = NULL, replace = NULL, ret; - int from = 1, cnt = -1; + int from = 1, cnt = -1, mode = 0; HRESULT hres = S_OK; TRACE("%s %s %s %u...\n", debugstr_variant(args), debugstr_variant(args+1), debugstr_variant(args+2), args_cnt); assert(3 <= args_cnt && args_cnt <= 6); + + if(V_VT(args) == VT_NULL || V_VT(args+1) == VT_NULL || (V_VT(args+2) == VT_NULL) + || (args_cnt >= 4 && V_VT(args+3) == VT_NULL) || (args_cnt >= 5 && V_VT(args+4) == VT_NULL) + || (args_cnt == 6 && V_VT(args+5) == VT_NULL)) + return MAKE_VBSERROR(VBSE_ILLEGAL_NULL_USE); + + if(V_VT(args) != VT_BSTR) { hres = to_string(args, &string); if(FAILED(hres)) @@ -2499,10 +2506,17 @@ static HRESULT Global_Replace(BuiltinDisp *This, VARIANT *args, unsigned args_cn } } - if(args_cnt == 6) - FIXME("copare argument not supported\n"); + if(args_cnt == 6) { + hres = to_int(args+5, &mode); + if(FAILED(hres)) + goto error; + if (mode != 0 && mode != 1) { + hres = MAKE_VBSERROR(VBSE_ILLEGAL_FUNC_CALL); + goto error; + } + } - ret = string_replace(string, find, replace, from - 1, cnt); + ret = string_replace(string, find, replace, from - 1, cnt, mode); if(!ret) { hres = E_OUTOFMEMORY; }else if(res) { diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 4834029183..be95aae4b9 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -844,6 +844,7 @@ TestRTrim "", "" TestRTrim 123, "123" if isEnglishLang then TestRTrim true, "True" + sub test_replace(str, find, rep, exp) dim r r = Replace(str, find, rep) @@ -865,8 +866,17 @@ sub test_replace_cnt(str, find, rep, from, cnt, exp) r & """ expected """ & exp & """" end sub +sub test_replace_mode(str, find, rep, from, cnt, mode, exp) + dim r + r = Replace(str, find, rep, from, cnt, mode) + ok r = exp, "Replace(""" & str & """, """ & find & """, """ & rep & """, " & from & ", " & cnt & ", " & mode _ + & ") = """ & r & """ expected """ & exp & """" +end sub + test_replace "xx testxx(xx)", "xx", "!", "! test!(!)" +test_replace "", "x", "y", "" test_replace "xxx", "", "y", "xxx" +test_replace "yxxy", "x", "", "yy" test_replace "xxxxx", "xx", "y", "yyx" test_replace 123, 2, 6, "163" test_replace "xyz" & Chr(0) & "xyz", "y", "Y", "xYz" & Chr(0) & "xYz" @@ -884,6 +894,12 @@ test_replace_cnt "xx testxx(xx)", "xx", "!", 2, 1, "x test!(xx)" test_replace_cnt "xx testxx(xx)", "xx", "!", 1, -1, "! test!(!)" test_replace_cnt "xx testxx(xx)", "xx", "!", 1, 0, "xx testxx(xx)" +test_replace_mode "Aa testAAa(aa)", "aa", "!", 1, 2, 1, "! test!a(aa)" +test_replace_mode "aA testaa(aa)", "AA", "!", 1, 1, 1, "! testaa(aa)" +test_replace_mode "aa testAa(aa)", "aa", "!", 2, 2, 0, "a testAa(!)" +test_replace_mode "aa testAA(aA)", "Aa", "!", 1, -1, 1, "! test!(!)" +test_replace_mode "aa testaa(aa)", "A", "!", 1, -1, 1, "!! test!!(!!)" + on error resume next Replace "xx", "x", "y", -1 x = err.number @@ -902,6 +918,24 @@ x = err.number on error goto 0 ok x = 5, "err = " & x +Sub testReplaceError(arg1, arg2, arg3, arg4, arg5, arg6, error_num) + on error resume next + Dim x + + Call Err.clear() + x = Replace(arg1, arg2, arg3, arg4, arg5, arg6) + Call ok(Err.number = error_num, "Err.number = " & Err.number) +End Sub + +Call testReplaceError(Null, "x", "y", 1, 1, 0, 94) +Call testReplaceError("xx", null, "y", 1, 1, 0, 94) +Call testReplaceError("xx", "x", null, 1, 1, 0, 94) +Call testReplaceError("xx", "x", "y", null, 1, 0, 94) +Call testReplaceError("xx", "x", "y", 1, null, 0, 94) +Call testReplaceError("xx", "x", "y", 1, 1, null, 94) +Call testReplaceError("xx", "x", "y", 1, 1, 8, 5) + + Sub TestRound(val, exval, vt) Call ok(Round(val) = exval, "Round(" & val & ") = " & Round(val)) Call ok(getVT(Round(val)) = vt, "getVT(Round(" & val & ")) = " & getVT(Round(val))) diff --git a/dlls/vbscript/vbregexp.c b/dlls/vbscript/vbregexp.c index 60c99772d3..49046bc781 100644 --- a/dlls/vbscript/vbregexp.c +++ b/dlls/vbscript/vbregexp.c @@ -1629,33 +1629,36 @@ static const IRegExp2Vtbl RegExp2Vtbl = { RegExp2_Replace }; -BSTR string_replace(BSTR string, BSTR find, BSTR replace, int from, int cnt) +BSTR string_replace(BSTR string, BSTR find, BSTR replace, int from, int cnt, int mode) { const WCHAR *ptr, *string_end; strbuf_t buf = { NULL, 0, 0 }; size_t replace_len, find_len; BSTR ret = NULL; HRESULT hres = S_OK; + int pos; string_end = string + SysStringLen(string); ptr = from > SysStringLen(string) ? string_end : string + from; find_len = SysStringLen(find); replace_len = SysStringLen(replace); - if(!replace_len) - cnt = 0; while(string_end - ptr >= find_len && cnt && find_len) { - if(memcmp(ptr, find, find_len * sizeof(WCHAR))) { - hres = strbuf_append(&buf, ptr, 1); + pos = FindStringOrdinal(FIND_FROMSTART, ptr, string_end - ptr, + find, find_len, mode); + + if(pos == -1) + break; + else { + hres = strbuf_append(&buf, ptr, pos); if(FAILED(hres)) break; - ptr++; - }else { hres = strbuf_append(&buf, replace, replace_len); if(FAILED(hres)) break; - ptr += find_len; + + ptr = ptr + pos + find_len; if(cnt != -1) cnt--; } diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index aa75b1c0dd..1edf7906af 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -393,7 +393,7 @@ static inline BOOL is_digit(WCHAR c) } HRESULT create_regexp(IDispatch**) DECLSPEC_HIDDEN; -BSTR string_replace(BSTR,BSTR,BSTR,int,int) DECLSPEC_HIDDEN; +BSTR string_replace(BSTR,BSTR,BSTR,int,int,int) DECLSPEC_HIDDEN; HRESULT map_hres(HRESULT) DECLSPEC_HIDDEN;

1 0

Jacek Caban : conhost: Implement IOCTL_CONDRV_WRITE_INPUT.
by Alexandre Julliard 26 Aug '20

26 Aug '20

Module: wine Branch: master Commit: 4225ec994e64f365b0b093609a3343c0ae1987f0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4225ec994e64f365b0b09360… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 25 14:52:25 2020 +0200 conhost: Implement IOCTL_CONDRV_WRITE_INPUT. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/conhost.c | 54 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 52 insertions(+), 2 deletions(-) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index c658deb1cf..525ca9058e 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -45,7 +45,9 @@ struct console { HANDLE server; /* console server handle */ unsigned int mode; /* input mode */ - unsigned int recnum; /* number of input records */ + INPUT_RECORD *records; /* input records */ + unsigned int record_count; /* number of input records */ + unsigned int record_size; /* size of input records buffer */ WCHAR *title; /* console title */ size_t title_len; /* length of console title */ struct history_line **history; /* lines history */ @@ -73,6 +75,49 @@ static void *alloc_ioctl_buffer( size_t size ) return ioctl_buffer; } +/* add input events to a console input queue */ +static NTSTATUS write_console_input( struct console *console, const INPUT_RECORD *records, + unsigned int count ) +{ + TRACE( "%u\n", count ); + + if (!count) return STATUS_SUCCESS; + if (console->record_count + count > console->record_size) + { + INPUT_RECORD *new_rec; + if (!(new_rec = realloc( console->records, (console->record_size * 2 + count) * sizeof(INPUT_RECORD) ))) + return STATUS_NO_MEMORY; + console->records = new_rec; + console->record_size = console->record_size * 2 + count; + } + memcpy( console->records + console->record_count, records, count * sizeof(INPUT_RECORD) ); + + if (console->mode & ENABLE_PROCESSED_INPUT) + { + unsigned int i = 0; + while (i < count) + { + if (records[i].EventType == KEY_EVENT && + records[i].Event.KeyEvent.uChar.UnicodeChar == 'C' - 64 && + !(records[i].Event.KeyEvent.dwControlKeyState & ENHANCED_KEY)) + { + if (i != count - 1) + memcpy( &console->records[console->record_count + i], + &console->records[console->record_count + i + 1], + (count - i - 1) * sizeof(INPUT_RECORD) ); + count--; + if (records[i].Event.KeyEvent.bKeyDown) + { + FIXME("CTRL C\n"); + } + } + else i++; + } + } + console->record_count += count; + return STATUS_SUCCESS; +} + static NTSTATUS set_console_title( struct console *console, const WCHAR *in_title, size_t size ) { WCHAR *title = NULL; @@ -111,6 +156,10 @@ static NTSTATUS console_input_ioctl( struct console *console, unsigned int code, TRACE( "set %x mode\n", console->mode ); return STATUS_SUCCESS; + case IOCTL_CONDRV_WRITE_INPUT: + if (in_size % sizeof(INPUT_RECORD) || *out_size) return STATUS_INVALID_PARAMETER; + return write_console_input( console, in_data, in_size / sizeof(INPUT_RECORD) ); + case IOCTL_CONDRV_GET_INPUT_INFO: { struct condrv_input_info *info; @@ -124,7 +173,7 @@ static NTSTATUS console_input_ioctl( struct console *console, unsigned int code, info->input_cp = console->input_cp; info->output_cp = console->output_cp; info->win = console->win; - info->input_count = console->recnum; + info->input_count = console->record_count; return STATUS_SUCCESS; } @@ -221,6 +270,7 @@ static NTSTATUS process_console_ioctls( struct console *console ) { req->handle = wine_server_obj_handle( console->server ); req->status = status; + req->signal = console->record_count != 0; wine_server_add_data( req, ioctl_buffer, out_size ); wine_server_set_reply( req, ioctl_buffer, ioctl_buffer_size ); status = wine_server_call( req );

1 0

Jacek Caban : server: Support blocking console host ioctls.
by Alexandre Julliard 26 Aug '20

26 Aug '20

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

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

26 Aug '20

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: Simplify apartment lookup helper.
by Alexandre Julliard 26 Aug '20

26 Aug '20

Module: wine Branch: master Commit: 89d8e13bf0d922bce2ed3fc9bab7d89c945d4408 URL: https://source.winehq.org/git/wine.git/?a=commit;h=89d8e13bf0d922bce2ed3fc9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 25 18:18:14 2020 +0300 ole32: Simplify apartment lookup helper. 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 | 10 +++------- dlls/ole32/compobj_private.h | 2 +- dlls/ole32/marshal.c | 4 ++-- dlls/ole32/stubmanager.c | 2 +- 4 files changed, 7 insertions(+), 11 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 4bd8c2474b..a68cab0fe9 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -1237,12 +1237,8 @@ DWORD apartment_release(struct apartment *apt) return ret; } -/* The given OXID must be local to this process: - * - * The ref parameter is here mostly to ensure people remember that - * they get one, you should normally take a ref for thread safety. - */ -struct apartment *apartment_findfromoxid(OXID oxid, BOOL ref) +/* The given OXID must be local to this process */ +struct apartment *apartment_findfromoxid(OXID oxid) { struct apartment *result = NULL; struct list *cursor; @@ -1254,7 +1250,7 @@ struct apartment *apartment_findfromoxid(OXID oxid, BOOL ref) if (apt->oxid == oxid) { result = apt; - if (ref) apartment_addref(result); + apartment_addref(result); break; } } diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index 7958b119bc..6e8b7ae2cf 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -246,7 +246,7 @@ void OLEDD_UnInitialize(void) DECLSPEC_HIDDEN; /* Apartment Functions */ -struct apartment *apartment_findfromoxid(OXID oxid, BOOL ref) DECLSPEC_HIDDEN; +struct apartment *apartment_findfromoxid(OXID oxid) DECLSPEC_HIDDEN; struct apartment *apartment_findfromtid(DWORD tid) DECLSPEC_HIDDEN; DWORD apartment_release(struct apartment *apt) DECLSPEC_HIDDEN; HRESULT apartment_disconnectproxies(struct apartment *apt) DECLSPEC_HIDDEN; diff --git a/dlls/ole32/marshal.c b/dlls/ole32/marshal.c index 9fb68e66f0..8cc35354d5 100644 --- a/dlls/ole32/marshal.c +++ b/dlls/ole32/marshal.c @@ -1468,7 +1468,7 @@ static HRESULT std_unmarshal_interface(MSHCTX dest_context, void *dest_context_d * ignore table marshaling and normal marshaling rules regarding number of * unmarshals, etc, but if you abuse these rules then your proxy could end * up returning RPC_E_DISCONNECTED. */ - if ((stub_apt = apartment_findfromoxid(obj.std.oxid, TRUE))) + if ((stub_apt = apartment_findfromoxid(obj.std.oxid))) { if ((stubmgr = get_stub_manager(stub_apt, obj.std.oid))) { @@ -1555,7 +1555,7 @@ static HRESULT std_release_marshal_data(IStream *pStm) wine_dbgstr_longlong(obj.std.oid), wine_dbgstr_guid(&obj.std.ipid)); - if (!(apt = apartment_findfromoxid(obj.std.oxid, TRUE))) + if (!(apt = apartment_findfromoxid(obj.std.oxid))) { WARN("Could not map OXID %s to apartment object\n", wine_dbgstr_longlong(obj.std.oxid)); diff --git a/dlls/ole32/stubmanager.c b/dlls/ole32/stubmanager.c index 16f9c3dc52..338b89750e 100644 --- a/dlls/ole32/stubmanager.c +++ b/dlls/ole32/stubmanager.c @@ -503,7 +503,7 @@ static HRESULT ipid_to_ifstub(const IPID *ipid, struct apartment **stub_apt, { /* FIXME: hack for IRemUnknown */ if (ipid->Data2 == 0xffff) - *stub_apt = apartment_findfromoxid(*(const OXID *)ipid->Data4, TRUE); + *stub_apt = apartment_findfromoxid(*(const OXID *)ipid->Data4); else *stub_apt = apartment_findfromtid(ipid->Data2); if (!*stub_apt)

1 0

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

26 Aug '20

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