November 2021 - Wine-Devel - list.winehq.org

[PATCH 5/9] win32u: Implement monitor registration.
by Jacek Caban Nov. 25, 2021

Nov. 25, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/win32u/sysparams.c | 143 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 142 insertions(+), 1 deletion(-)

2 2

[PATCH 2/9] win32u: Introduce UpdateDisplayDevice user driver entry point.
by Jacek Caban Nov. 25, 2021

Nov. 25, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- The idea is to provide a way to drivers to do the registration instead of duplicating it in each driver. The new way also allows drivers to set those without SetupAPI, which is problematic for unix libs. dlls/user32/driver.c | 1 + dlls/win32u/driver.c | 13 +++++++ dlls/win32u/sysparams.c | 75 ++++++++++++++++++++++++++++++++++++++- include/wine/gdi_driver.h | 37 +++++++++++++++++++ 4 files changed, 125 insertions(+), 1 deletion(-)

2 2

[PATCH 4/9] win32u: Implement display adapter registration.
by Jacek Caban Nov. 25, 2021

Nov. 25, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/win32u/font.c | 4 ++- dlls/win32u/sysparams.c | 71 ++++++++++++++++++++++++++++++++++++++++- 2 files changed, 73 insertions(+), 2 deletions(-)

2 3

[PATCH v7 01/11] jscript: Treat prototype refs as non-existent when deleting.
by Gabriel Ivăncescu Nov. 25, 2021

Nov. 25, 2021

Delete only affects own properties. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/dispex.c | 5 +++++ dlls/jscript/tests/lang.js | 5 +++++ dlls/mshtml/tests/documentmode.js | 1 - 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index e64a520..df81e1a 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -1621,6 +1621,11 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc static HRESULT delete_prop(dispex_prop_t *prop, BOOL *ret) { + if(prop->type == PROP_PROTREF) { + *ret = TRUE; + return S_OK; + } + if(!(prop->flags & PROPF_CONFIGURABLE)) { *ret = FALSE; return S_OK; diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 63aa669..f259c70 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -1565,6 +1565,11 @@ ok(arr["test1"] === true, "arr[test1] !== true"); ok(arr["test2"] === true, "arr[test2] !== true"); ok(arr["test3"] === true, "arr[test3] !== true"); +ok((delete inobj.test1) === true, "delete inobj.test1 returned false"); +ok(!("test1" in inobj), "test1 is still in inobj after delete"); +ok((delete inobj.test3) === true, "delete inobj.test3 returned false"); +ok("test3" in inobj, "test3 is not in inobj after delete"); + tmp = new Object(); tmp.test = false; ok((delete tmp.test) === true, "delete returned false"); diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index d5f33dd..041025c 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -1192,7 +1192,6 @@ sync_test("__proto__", function() { ok(obj.__proto__ === ctor.prototype, "obj.__proto__ !== ctor.prototype"); r = (delete x.__proto__); - todo_wine. ok(r, "delete x.__proto__ returned " + r); ok(Object.prototype.hasOwnProperty("__proto__"), "__proto__ is not a property of Object.prototype after delete"); r = Object.getPrototypeOf(x); -- 2.31.1

3 26

[PATCH 00/12] winecoreaudio: Move the midi out handling to the unixlib.
by Huw Davies Nov. 25, 2021

Nov. 25, 2021

This series moves all of the midi out handling to the unixlib. The idea is that coremidi.c will be the unix-side, midi.c will become PE with audiounit.c being removed in the process. Huw D. M. Davies (12): winecoreaudio: Temporarily move MIDIOut_Send() to audiounit.c. winecoreaudio: Combine MIDIIn_SendMessage into MIDIIn_ReadProc. winecoreaudio: Move midi_init and midi_release to the unixlib. winecoreaudio: Move midi_out_open to the unixlib. winecoreaudio: Move midi_out_close to the unixlib. winecoreaudio: Move midi_out_data to the unixlib. winecoreaudio: Move midi_out_long_data to the unixlib. winecoreaudio: Move midi_out_prepare and midi_out_unprepare to the unixlib. winecoreaudio: Move midi_out_get_devcaps to the unixlib. winecoreaudio: Move midi_out_get_num_devs to the unixlib. winecoreaudio: Move midi_out_[gs]et_volume to the unixlib. winecoreaudio: Move midi_out_reset to the unixlib. dlls/winecoreaudio.drv/Makefile.in | 1 - dlls/winecoreaudio.drv/audiounit.c | 197 -------- dlls/winecoreaudio.drv/coreaudio.c | 3 + dlls/winecoreaudio.drv/coremidi.c | 750 +++++++++++++++++++++++++++-- dlls/winecoreaudio.drv/coremidi.h | 30 +- dlls/winecoreaudio.drv/midi.c | 583 ++-------------------- dlls/winecoreaudio.drv/unixlib.h | 40 ++ 7 files changed, 831 insertions(+), 773 deletions(-) delete mode 100644 dlls/winecoreaudio.drv/audiounit.c -- 2.23.0

1 0

[PATCH 2/2] comctl32/tests: Add an optional message to avoid test failures.
by Zhiyi Zhang Nov. 25, 2021

Nov. 25, 2021

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/tests/propsheet.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/comctl32/tests/propsheet.c b/dlls/comctl32/tests/propsheet.c index 04a540b07e6..82af9f02000 100644 --- a/dlls/comctl32/tests/propsheet.c +++ b/dlls/comctl32/tests/propsheet.c @@ -648,6 +648,7 @@ static const struct message property_sheet_seq[] = { { DM_REPOSITION, sent|id, 0, 0, RECEIVER_SHEET_WINPROC },*/ { WM_WINDOWPOSCHANGING, sent|id, 0, 0, RECEIVER_SHEET_WINPROC }, { WM_WINDOWPOSCHANGING, sent|id, 0, 0, RECEIVER_SHEET_WINPROC }, + { WM_WINDOWPOSCHANGED, sent|id|optional, 0, 0, RECEIVER_SHEET_WINPROC }, { WM_ACTIVATEAPP, sent|id, 0, 0, RECEIVER_SHEET_WINPROC }, /*{ WM_NCACTIVATE, sent|id, 0, 0, RECEIVER_SHEET_WINPROC }, { WM_GETTEXT, sent|id, 0, 0, RECEIVER_SHEET_WINPROC }, -- 2.32.0

1 0

[PATCH v2 3/3] explorerframe: Implement taskbar_list_AddTab() for x11 driver.
by Zhiyi Zhang Nov. 25, 2021

Nov. 25, 2021

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/explorerframe/taskbarlist.c | 6 +++-- dlls/explorerframe/tests/taskbarlist.c | 8 ------ dlls/winex11.drv/window.c | 36 +++++++++++++++++++++++--- dlls/winex11.drv/x11drv.h | 4 ++- 4 files changed, 39 insertions(+), 15 deletions(-) diff --git a/dlls/explorerframe/taskbarlist.c b/dlls/explorerframe/taskbarlist.c index 839ae210daa..7e1f5b92c5b 100644 --- a/dlls/explorerframe/taskbarlist.c +++ b/dlls/explorerframe/taskbarlist.c @@ -26,6 +26,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(explorerframe); #define WM_WINE_DELETE_TAB (WM_USER + 1) +#define WM_WINE_ADD_TAB (WM_USER + 2) struct taskbar_list { @@ -98,9 +99,10 @@ static HRESULT STDMETHODCALLTYPE taskbar_list_HrInit(ITaskbarList4 *iface) static HRESULT STDMETHODCALLTYPE taskbar_list_AddTab(ITaskbarList4 *iface, HWND hwnd) { - FIXME("iface %p, hwnd %p stub!\n", iface, hwnd); + TRACE("iface %p, hwnd %p\n", iface, hwnd); - return E_NOTIMPL; + SendMessageW(GetDesktopWindow(), WM_WINE_ADD_TAB, (WPARAM)hwnd, 0); + return S_OK; } static HRESULT STDMETHODCALLTYPE taskbar_list_DeleteTab(ITaskbarList4 *iface, HWND hwnd) diff --git a/dlls/explorerframe/tests/taskbarlist.c b/dlls/explorerframe/tests/taskbarlist.c index 9b2de996000..5f5cc98c5b4 100644 --- a/dlls/explorerframe/tests/taskbarlist.c +++ b/dlls/explorerframe/tests/taskbarlist.c @@ -43,7 +43,6 @@ static void test_ITaskbarList(void) /* Test calling methods before calling ITaskbarList::HrInit() */ hr = ITaskbarList_AddTab(taskbarlist, hwnd); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); hr = ITaskbarList_SetActiveAlt(taskbarlist, hwnd); @@ -69,21 +68,17 @@ static void test_ITaskbarList(void) /* Test ITaskbarList::AddTab() */ /* Check invalid parameters */ hr = ITaskbarList_AddTab(taskbarlist, NULL); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); hr = ITaskbarList_AddTab(taskbarlist, (HWND)0xdeadbeef); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); /* Normal ITaskbarList::AddTab() */ hr = ITaskbarList_AddTab(taskbarlist, hwnd); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); /* Repeat ITaskbarList::AddTab() with the same hwnd */ hr = ITaskbarList_AddTab(taskbarlist, hwnd); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); hr = ITaskbarList_DeleteTab(taskbarlist, hwnd); @@ -101,7 +96,6 @@ static void test_ITaskbarList(void) /* Normal ITaskbarList::SetActiveAlt() */ hr = ITaskbarList_AddTab(taskbarlist, hwnd); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); hr = ITaskbarList_SetActiveAlt(taskbarlist, hwnd); @@ -128,7 +122,6 @@ static void test_ITaskbarList(void) /* Normal ITaskbarList::ActivateTab() */ hr = ITaskbarList_AddTab(taskbarlist, hwnd); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); hr = ITaskbarList_ActivateTab(taskbarlist, hwnd); @@ -156,7 +149,6 @@ static void test_ITaskbarList(void) /* Normal ITaskbarList::DeleteTab() */ hr = ITaskbarList_AddTab(taskbarlist, hwnd); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); hr = ITaskbarList_DeleteTab(taskbarlist, hwnd); diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index dacb1293a9e..8096d756ccf 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -994,10 +994,13 @@ void update_net_wm_states( struct x11drv_win_data *data ) ex_style = GetWindowLongW( data->hwnd, GWL_EXSTYLE ); if (ex_style & WS_EX_TOPMOST) new_state |= (1 << NET_WM_STATE_ABOVE); - if (data->skip_taskbar || (ex_style & (WS_EX_TOOLWINDOW | WS_EX_NOACTIVATE))) - new_state |= (1 << NET_WM_STATE_SKIP_TASKBAR) | (1 << NET_WM_STATE_SKIP_PAGER); - else if (!(ex_style & WS_EX_APPWINDOW) && GetWindow( data->hwnd, GW_OWNER )) - new_state |= (1 << NET_WM_STATE_SKIP_TASKBAR); + if (!data->add_taskbar) + { + if (data->skip_taskbar || (ex_style & (WS_EX_TOOLWINDOW | WS_EX_NOACTIVATE))) + new_state |= (1 << NET_WM_STATE_SKIP_TASKBAR) | (1 << NET_WM_STATE_SKIP_PAGER); + else if (!(ex_style & WS_EX_APPWINDOW) && GetWindow( data->hwnd, GW_OWNER )) + new_state |= (1 << NET_WM_STATE_SKIP_TASKBAR); + } if (!data->mapped) /* set the _NET_WM_STATE atom directly */ { @@ -1859,6 +1862,7 @@ static WNDPROC desktop_orig_wndproc; #define WM_WINE_NOTIFY_ACTIVITY WM_USER #define WM_WINE_DELETE_TAB (WM_USER + 1) +#define WM_WINE_ADD_TAB (WM_USER + 2) static LRESULT CALLBACK desktop_wndproc_wrapper( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ) { @@ -1881,6 +1885,9 @@ static LRESULT CALLBACK desktop_wndproc_wrapper( HWND hwnd, UINT msg, WPARAM wp, case WM_WINE_DELETE_TAB: SendMessageA( (HWND)wp, WM_X11DRV_DELETE_TAB, 0, 0 ); break; + case WM_WINE_ADD_TAB: + SendMessageA( (HWND)wp, WM_X11DRV_ADD_TAB, 0, 0 ); + break; } return desktop_orig_wndproc( hwnd, msg, wp, lp ); } @@ -2781,6 +2788,23 @@ done: return ret; } +/* Add a window to taskbar */ +static void taskbar_add_tab( HWND hwnd ) +{ + struct x11drv_win_data *data; + + TRACE("hwnd %p\n", hwnd); + + data = get_win_data( hwnd ); + if (!data) + return; + + data->add_taskbar = TRUE; + data->skip_taskbar = FALSE; + update_net_wm_states( data ); + release_win_data( data ); +} + /* Delete a window from taskbar */ static void taskbar_delete_tab( HWND hwnd ) { @@ -2793,6 +2817,7 @@ static void taskbar_delete_tab( HWND hwnd ) return; data->skip_taskbar = TRUE; + data->add_taskbar = FALSE; update_net_wm_states( data ); release_win_data( data ); } @@ -2835,6 +2860,9 @@ LRESULT CDECL X11DRV_WindowMessage( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ) case WM_X11DRV_DELETE_TAB: taskbar_delete_tab( hwnd ); return 0; + case WM_X11DRV_ADD_TAB: + taskbar_add_tab( hwnd ); + return 0; default: FIXME( "got window msg %x hwnd %p wp %lx lp %lx\n", msg, hwnd, wp, lp ); return 0; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 6a38fc5a20e..d678d93905d 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -585,7 +585,8 @@ enum x11drv_window_messages WM_X11DRV_SET_CURSOR, WM_X11DRV_CLIP_CURSOR_NOTIFY, WM_X11DRV_CLIP_CURSOR_REQUEST, - WM_X11DRV_DELETE_TAB + WM_X11DRV_DELETE_TAB, + WM_X11DRV_ADD_TAB }; /* _NET_WM_STATE properties that we keep track of */ @@ -621,6 +622,7 @@ struct x11drv_win_data BOOL layered : 1; /* is window layered and with valid attributes? */ BOOL use_alpha : 1; /* does window use an alpha channel? */ BOOL skip_taskbar : 1; /* does window should be deleted from taskbar */ + BOOL add_taskbar : 1; /* does window should be added to taskbar regardless of style */ int wm_state; /* current value of the WM_STATE property */ DWORD net_wm_state; /* bit mask of active x11drv_net_wm_state values */ Window embedder; /* window id of embedder */ -- 2.32.0

1 0

[PATCH v2 2/3] explorerframe: Implement taskbar_list_DeleteTab() for x11 driver.
by Zhiyi Zhang Nov. 25, 2021

Nov. 25, 2021

Partially fix Excel 2007 and 2010 showing an extra taskbar icon when opening multiple documents in one instance. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/explorerframe/taskbarlist.c | 7 +++++-- dlls/explorerframe/tests/taskbarlist.c | 8 -------- dlls/winex11.drv/window.c | 26 ++++++++++++++++++++++++-- dlls/winex11.drv/x11drv.h | 4 +++- 4 files changed, 32 insertions(+), 13 deletions(-) diff --git a/dlls/explorerframe/taskbarlist.c b/dlls/explorerframe/taskbarlist.c index 6f24f359927..839ae210daa 100644 --- a/dlls/explorerframe/taskbarlist.c +++ b/dlls/explorerframe/taskbarlist.c @@ -25,6 +25,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(explorerframe); +#define WM_WINE_DELETE_TAB (WM_USER + 1) + struct taskbar_list { ITaskbarList4 ITaskbarList4_iface; @@ -103,9 +105,10 @@ static HRESULT STDMETHODCALLTYPE taskbar_list_AddTab(ITaskbarList4 *iface, HWND static HRESULT STDMETHODCALLTYPE taskbar_list_DeleteTab(ITaskbarList4 *iface, HWND hwnd) { - FIXME("iface %p, hwnd %p stub!\n", iface, hwnd); + TRACE("iface %p, hwnd %p\n", iface, hwnd); - return E_NOTIMPL; + SendMessageW(GetDesktopWindow(), WM_WINE_DELETE_TAB, (WPARAM)hwnd, 0); + return S_OK; } static HRESULT STDMETHODCALLTYPE taskbar_list_ActivateTab(ITaskbarList4 *iface, HWND hwnd) diff --git a/dlls/explorerframe/tests/taskbarlist.c b/dlls/explorerframe/tests/taskbarlist.c index ed1bc44a6ac..9b2de996000 100644 --- a/dlls/explorerframe/tests/taskbarlist.c +++ b/dlls/explorerframe/tests/taskbarlist.c @@ -55,7 +55,6 @@ static void test_ITaskbarList(void) ok(hr == S_OK, "Got hr %#x.\n", hr); hr = ITaskbarList_DeleteTab(taskbarlist, hwnd); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); /* Call ITaskbarList::HrInit() */ @@ -88,7 +87,6 @@ static void test_ITaskbarList(void) ok(hr == S_OK, "Got hr %#x.\n", hr); hr = ITaskbarList_DeleteTab(taskbarlist, hwnd); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); /* Test ITaskbarList::SetActiveAlt() */ @@ -116,7 +114,6 @@ static void test_ITaskbarList(void) ok(hr == S_OK, "Got hr %#x.\n", hr); hr = ITaskbarList_DeleteTab(taskbarlist, hwnd); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); /* Test ITaskbarList::ActivateTab() */ @@ -144,21 +141,17 @@ static void test_ITaskbarList(void) ok(hr == S_OK, "Got hr %#x.\n", hr); hr = ITaskbarList_DeleteTab(taskbarlist, hwnd); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); /* Test ITaskbarList::DeleteTab() */ /* Check invalid parameters */ hr = ITaskbarList_DeleteTab(taskbarlist, NULL); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); hr = ITaskbarList_DeleteTab(taskbarlist, (HWND)0xdeadbeef); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); hr = ITaskbarList_DeleteTab(taskbarlist, hwnd); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); /* Normal ITaskbarList::DeleteTab() */ @@ -167,7 +160,6 @@ static void test_ITaskbarList(void) ok(hr == S_OK, "Got hr %#x.\n", hr); hr = ITaskbarList_DeleteTab(taskbarlist, hwnd); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); ref_count = ITaskbarList_Release(taskbarlist); diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index bcb0b8044bc..dacb1293a9e 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -994,9 +994,9 @@ void update_net_wm_states( struct x11drv_win_data *data ) ex_style = GetWindowLongW( data->hwnd, GWL_EXSTYLE ); if (ex_style & WS_EX_TOPMOST) new_state |= (1 << NET_WM_STATE_ABOVE); - if (ex_style & (WS_EX_TOOLWINDOW | WS_EX_NOACTIVATE)) + if (data->skip_taskbar || (ex_style & (WS_EX_TOOLWINDOW | WS_EX_NOACTIVATE))) new_state |= (1 << NET_WM_STATE_SKIP_TASKBAR) | (1 << NET_WM_STATE_SKIP_PAGER); - if (!(ex_style & WS_EX_APPWINDOW) && GetWindow( data->hwnd, GW_OWNER )) + else if (!(ex_style & WS_EX_APPWINDOW) && GetWindow( data->hwnd, GW_OWNER )) new_state |= (1 << NET_WM_STATE_SKIP_TASKBAR); if (!data->mapped) /* set the _NET_WM_STATE atom directly */ @@ -1858,6 +1858,7 @@ BOOL CDECL X11DRV_CreateDesktopWindow( HWND hwnd ) static WNDPROC desktop_orig_wndproc; #define WM_WINE_NOTIFY_ACTIVITY WM_USER +#define WM_WINE_DELETE_TAB (WM_USER + 1) static LRESULT CALLBACK desktop_wndproc_wrapper( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ) { @@ -1877,6 +1878,9 @@ static LRESULT CALLBACK desktop_wndproc_wrapper( HWND hwnd, UINT msg, WPARAM wp, } break; } + case WM_WINE_DELETE_TAB: + SendMessageA( (HWND)wp, WM_X11DRV_DELETE_TAB, 0, 0 ); + break; } return desktop_orig_wndproc( hwnd, msg, wp, lp ); } @@ -2777,6 +2781,21 @@ done: return ret; } +/* Delete a window from taskbar */ +static void taskbar_delete_tab( HWND hwnd ) +{ + struct x11drv_win_data *data; + + TRACE("hwnd %p\n", hwnd); + + data = get_win_data( hwnd ); + if (!data) + return; + + data->skip_taskbar = TRUE; + update_net_wm_states( data ); + release_win_data( data ); +} /********************************************************************** * X11DRV_WindowMessage (X11DRV.@) @@ -2813,6 +2832,9 @@ LRESULT CDECL X11DRV_WindowMessage( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ) return clip_cursor_notify( hwnd, (HWND)wp, (HWND)lp ); case WM_X11DRV_CLIP_CURSOR_REQUEST: return clip_cursor_request( hwnd, (BOOL)wp, (BOOL)lp ); + case WM_X11DRV_DELETE_TAB: + taskbar_delete_tab( hwnd ); + return 0; default: FIXME( "got window msg %x hwnd %p wp %lx lp %lx\n", msg, hwnd, wp, lp ); return 0; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 4b4ee8daaeb..6a38fc5a20e 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -584,7 +584,8 @@ enum x11drv_window_messages WM_X11DRV_RESIZE_DESKTOP, WM_X11DRV_SET_CURSOR, WM_X11DRV_CLIP_CURSOR_NOTIFY, - WM_X11DRV_CLIP_CURSOR_REQUEST + WM_X11DRV_CLIP_CURSOR_REQUEST, + WM_X11DRV_DELETE_TAB }; /* _NET_WM_STATE properties that we keep track of */ @@ -619,6 +620,7 @@ struct x11drv_win_data BOOL shaped : 1; /* is window using a custom region shape? */ BOOL layered : 1; /* is window layered and with valid attributes? */ BOOL use_alpha : 1; /* does window use an alpha channel? */ + BOOL skip_taskbar : 1; /* does window should be deleted from taskbar */ int wm_state; /* current value of the WM_STATE property */ DWORD net_wm_state; /* bit mask of active x11drv_net_wm_state values */ Window embedder; /* window id of embedder */ -- 2.32.0

1 0

[PATCH v2 1/3] explorerframe/tests: Add ITaskbarList tests.
by Zhiyi Zhang Nov. 25, 2021

Nov. 25, 2021

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v2: Supersede 219399~219401. Use messages rather than direct functions calls into graphics driver. dlls/explorerframe/tests/Makefile.in | 3 +- dlls/explorerframe/tests/taskbarlist.c | 185 +++++++++++++++++++++++++ 2 files changed, 187 insertions(+), 1 deletion(-) create mode 100644 dlls/explorerframe/tests/taskbarlist.c diff --git a/dlls/explorerframe/tests/Makefile.in b/dlls/explorerframe/tests/Makefile.in index b0b88657788..ede5443bcd1 100644 --- a/dlls/explorerframe/tests/Makefile.in +++ b/dlls/explorerframe/tests/Makefile.in @@ -2,4 +2,5 @@ TESTDLL = explorerframe.dll IMPORTS = uuid shell32 ole32 user32 C_SRCS = \ - nstc.c + nstc.c \ + taskbarlist.c diff --git a/dlls/explorerframe/tests/taskbarlist.c b/dlls/explorerframe/tests/taskbarlist.c new file mode 100644 index 00000000000..ed1bc44a6ac --- /dev/null +++ b/dlls/explorerframe/tests/taskbarlist.c @@ -0,0 +1,185 @@ +/* + * Unit tests for ITaskbarList interface + * + * Copyright 2021 Zhiyi Zhang for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS +#include <shobjidl.h> +#include <wine/test.h> + +static void test_ITaskbarList(void) +{ + ITaskbarList *taskbarlist; + ULONG ref_count; + HRESULT hr; + HWND hwnd; + + hwnd = CreateWindowA(WC_STATICA, "test", WS_POPUP | WS_VISIBLE, 0, 0, 50, 50, 0, 0, 0, NULL); + ok(hwnd != NULL, "Failed to create a test window, error %u.\n", GetLastError()); + + hr = CoCreateInstance((const CLSID *)&CLSID_TaskbarList, NULL, CLSCTX_INPROC_SERVER, + (const IID *)&IID_ITaskbarList, (void **)&taskbarlist); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ref_count = ITaskbarList_AddRef(taskbarlist); + ok(ref_count == 2, "Got unexpected reference count %u.\n", ref_count); + ref_count = ITaskbarList_Release(taskbarlist); + ok(ref_count == 1, "Got unexpected reference count %u.\n", ref_count); + + /* Test calling methods before calling ITaskbarList::HrInit() */ + hr = ITaskbarList_AddTab(taskbarlist, hwnd); + todo_wine + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = ITaskbarList_SetActiveAlt(taskbarlist, hwnd); + todo_wine + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = ITaskbarList_ActivateTab(taskbarlist, hwnd); + todo_wine + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = ITaskbarList_DeleteTab(taskbarlist, hwnd); + todo_wine + ok(hr == S_OK, "Got hr %#x.\n", hr); + + /* Call ITaskbarList::HrInit() */ + hr = ITaskbarList_HrInit(taskbarlist); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + /* Test ITaskbarList::HrInit() */ + /* Call ITaskbarList::HrInit() again */ + hr = ITaskbarList_HrInit(taskbarlist); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + /* Test ITaskbarList::AddTab() */ + /* Check invalid parameters */ + hr = ITaskbarList_AddTab(taskbarlist, NULL); + todo_wine + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = ITaskbarList_AddTab(taskbarlist, (HWND)0xdeadbeef); + todo_wine + ok(hr == S_OK, "Got hr %#x.\n", hr); + + /* Normal ITaskbarList::AddTab() */ + hr = ITaskbarList_AddTab(taskbarlist, hwnd); + todo_wine + ok(hr == S_OK, "Got hr %#x.\n", hr); + + /* Repeat ITaskbarList::AddTab() with the same hwnd */ + hr = ITaskbarList_AddTab(taskbarlist, hwnd); + todo_wine + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = ITaskbarList_DeleteTab(taskbarlist, hwnd); + todo_wine + ok(hr == S_OK, "Got hr %#x.\n", hr); + + /* Test ITaskbarList::SetActiveAlt() */ + /* Check invalid parameters */ + hr = ITaskbarList_SetActiveAlt(taskbarlist, NULL); + todo_wine + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = ITaskbarList_SetActiveAlt(taskbarlist, (HWND)0xdeadbeef); + todo_wine + ok(hr == S_OK, "Got hr %#x.\n", hr); + + /* Normal ITaskbarList::SetActiveAlt() */ + hr = ITaskbarList_AddTab(taskbarlist, hwnd); + todo_wine + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = ITaskbarList_SetActiveAlt(taskbarlist, hwnd); + todo_wine + ok(hr == S_OK, "Got hr %#x.\n", hr); + + /* Repeat ITaskbarList::SetActiveAlt() with the same hwnd */ + hr = ITaskbarList_SetActiveAlt(taskbarlist, hwnd); + todo_wine + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = ITaskbarList_DeleteTab(taskbarlist, hwnd); + todo_wine + ok(hr == S_OK, "Got hr %#x.\n", hr); + + /* Test ITaskbarList::ActivateTab() */ + /* Check invalid parameters */ + hr = ITaskbarList_ActivateTab(taskbarlist, NULL); + todo_wine + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = ITaskbarList_ActivateTab(taskbarlist, (HWND)0xdeadbeef); + todo_wine + ok(hr == S_OK, "Got hr %#x.\n", hr); + + /* Normal ITaskbarList::ActivateTab() */ + hr = ITaskbarList_AddTab(taskbarlist, hwnd); + todo_wine + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = ITaskbarList_ActivateTab(taskbarlist, hwnd); + todo_wine + ok(hr == S_OK, "Got hr %#x.\n", hr); + + /* Repeat ITaskbarList::ActivateTab() with the same hwnd */ + hr = ITaskbarList_ActivateTab(taskbarlist, hwnd); + todo_wine + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = ITaskbarList_DeleteTab(taskbarlist, hwnd); + todo_wine + ok(hr == S_OK, "Got hr %#x.\n", hr); + + /* Test ITaskbarList::DeleteTab() */ + /* Check invalid parameters */ + hr = ITaskbarList_DeleteTab(taskbarlist, NULL); + todo_wine + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = ITaskbarList_DeleteTab(taskbarlist, (HWND)0xdeadbeef); + todo_wine + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = ITaskbarList_DeleteTab(taskbarlist, hwnd); + todo_wine + ok(hr == S_OK, "Got hr %#x.\n", hr); + + /* Normal ITaskbarList::DeleteTab() */ + hr = ITaskbarList_AddTab(taskbarlist, hwnd); + todo_wine + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = ITaskbarList_DeleteTab(taskbarlist, hwnd); + todo_wine + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ref_count = ITaskbarList_Release(taskbarlist); + ok(ref_count == 0, "Got unexpected reference count %u.\n", ref_count); + DestroyWindow(hwnd); +} + +START_TEST(taskbarlist) +{ + CoInitialize(NULL); + + test_ITaskbarList(); + + CoUninitialize(); +} -- 2.32.0

1 0

[PATCH 1/2] include: Add ISharedPropertyGroupManager interface.
by Jactry Zeng Nov. 25, 2021

Nov. 25, 2021

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- include/comsvcs.idl | 63 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/include/comsvcs.idl b/include/comsvcs.idl index d64af1f5a85..902c78b05c8 100644 --- a/include/comsvcs.idl +++ b/include/comsvcs.idl @@ -37,6 +37,8 @@ typedef DWORD_PTR TRANSID; ] library COMSVCSLib { + importlib("stdole2.tlb"); + [ object, hidden, @@ -96,4 +98,65 @@ library COMSVCSLib { [default] interface IDispenserManager; }; + + [ + object, + hidden, + local, + uuid(2a005c01-a5de-11cf-9e66-00aa00a3f464), + pointer_default(unique) + ] + interface ISharedProperty : IDispatch + { + [id(DISPID_VALUE), propget] HRESULT Value([out, retval] VARIANT *value); + [id(DISPID_VALUE), propput] HRESULT Value([in] VARIANT value); + } + + [ + object, + hidden, + local, + uuid(2a005c07-a5de-11cf-9e66-00aa00a3f464), + pointer_default(unique) + ] + interface ISharedPropertyGroup : IDispatch + { + [id(0x00000001)] + HRESULT CreatePropertyByPosition([in] int index, [out] VARIANT_BOOL *exists, [out, retval] ISharedProperty **property); + [id(0x00000002), propget] + HRESULT PropertyByPosition([in] int index, [out, retval] ISharedProperty **property); + [id(0x00000003)] + HRESULT CreateProperty([in] BSTR name, [out] VARIANT_BOOL *exists, [out, retval] ISharedProperty **property); + [id(0x00000004), propget] + HRESULT Property([in] BSTR name, [out, retval] ISharedProperty **property); + } + + [ + object, + hidden, + local, + uuid(2a005c0d-a5de-11cf-9e66-00aa00a3f464), + pointer_default(unique) + ] + interface ISharedPropertyGroupManager : IDispatch + { + [id(0x00000001)] + HRESULT CreatePropertyGroup([in] BSTR name, [in, out] LONG *isolation, [in, out] LONG *release, + [out] VARIANT_BOOL *exists, [out, retval] ISharedPropertyGroup **group); + [id(0x00000002), propget] + HRESULT Group([in] BSTR name, [out, retval] ISharedPropertyGroup **group); + [id(DISPID_NEWENUM), propget] + HRESULT _NewEnum([out, retval] IUnknown **retval); + } + + [ + uuid(2a005c11-a5de-11cf-9e66-00aa00a3f464), + progid("MTxSpm.SharedPropertyGroupManager.1"), + vi_progid("MTxSpm.SharedPropertyGroupManager"), + threading(both) + ] + coclass SharedPropertyGroupManager + { + [default] interface ISharedPropertyGroupManager; + } } -- 2.33.0

1 1