wine-commits November 2021

wine-commits@winehq.org

2 participants
951 discussions

Zhiyi Zhang : explorerframe: Implement taskbar_list_AddTab() for x11 driver.
by Alexandre Julliard 25 Nov '21

25 Nov '21

Module: wine Branch: master Commit: 1c1fe30cc50da2b0596096b04b75d8c1e598f8e7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1c1fe30cc50da2b0596096b0… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Nov 25 14:41:44 2021 +0800 explorerframe: Implement taskbar_list_AddTab() for x11 driver. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 f3891fdd080..b4b7357f245 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: SendNotifyMessageW( (HWND)wp, WM_X11DRV_DELETE_TAB, 0, 0 ); break; + case WM_WINE_ADD_TAB: + SendNotifyMessageW( (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 */

1 0

Zhiyi Zhang : explorerframe: Implement taskbar_list_DeleteTab() for x11 driver.
by Alexandre Julliard 25 Nov '21

25 Nov '21

Module: wine Branch: master Commit: d9b1df267a7e91efdba9cb2bdd2d3a7148ca88e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d9b1df267a7e91efdba9cb2b… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Nov 25 14:41:35 2021 +0800 explorerframe: Implement taskbar_list_DeleteTab() for x11 driver. 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> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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..f3891fdd080 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: + SendNotifyMessageW( (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 */

1 0

Zhiyi Zhang : explorerframe/tests: Add ITaskbarList tests.
by Alexandre Julliard 25 Nov '21

25 Nov '21

Module: wine Branch: master Commit: 10a3dbbd656fed4653d8e97cecd71cab5494384c URL: https://source.winehq.org/git/wine.git/?a=commit;h=10a3dbbd656fed4653d8e97c… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Nov 25 14:41:28 2021 +0800 explorerframe/tests: Add ITaskbarList tests. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/explorerframe/tests/Makefile.in | 3 +- dlls/explorerframe/tests/taskbarlist.c | 185 +++++++++++++++++++++++++++++++++ 2 files changed, 187 insertions(+), 1 deletion(-) 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(); +}

1 0

Zhiyi Zhang : comctl32/tests: Add an optional message to avoid test failures.
by Alexandre Julliard 25 Nov '21

25 Nov '21

Module: wine Branch: master Commit: 3c789e2f10b7b878a3a3607015984a608be9f9be URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c789e2f10b7b878a3a36070… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Nov 25 14:43:07 2021 +0800 comctl32/tests: Add an optional message to avoid test failures. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 9acdea85c66..3089454d18d 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 },

1 0

Alex Henrie : oleacc/tests: Add AccessibleObjectFromPoint tests.
by Alexandre Julliard 25 Nov '21

25 Nov '21

Module: wine Branch: master Commit: 9d8bf363cf6251e54ebca29ebcdc9451c359faab URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d8bf363cf6251e54ebca29e… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Nov 25 18:55:21 2021 +0100 oleacc/tests: Add AccessibleObjectFromPoint tests. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleacc/tests/main.c | 67 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) diff --git a/dlls/oleacc/tests/main.c b/dlls/oleacc/tests/main.c index 8c234aee8aa..1f09581f64f 100644 --- a/dlls/oleacc/tests/main.c +++ b/dlls/oleacc/tests/main.c @@ -1304,6 +1304,72 @@ static void test_default_client_accessible_object(void) IAccessible_Release(acc); } +static void test_AccessibleObjectFromPoint(void) +{ + HWND hwnd, child; + IAccessible *acc; + VARIANT cid, var; + POINT point; + HRESULT hr; + + hwnd = CreateWindowA("oleacc_test", "test", WS_POPUP | WS_VISIBLE, + 0, 0, 400, 300, NULL, NULL, NULL, NULL); + ok(hwnd != NULL, "CreateWindow failed\n"); + ok(SetWindowLongPtrA(hwnd, GWLP_WNDPROC, (LONG_PTR)&DefWindowProcA), + "SetWindowLongPtr failed\n"); + + point.x = point.y = 0; + ok(ClientToScreen(hwnd, &point), "ClientToScreen failed\n"); + + if (WindowFromPoint(point) != hwnd) + { + win_skip("test window not returned from WindowFromPoint\n"); + return; + } + + hr = AccessibleObjectFromPoint(point, NULL, NULL); + ok(hr == E_INVALIDARG, "got %x\n", hr); + + hr = AccessibleObjectFromPoint(point, &acc, NULL); + ok(hr == E_INVALIDARG, "got %x\n", hr); + + V_VT(&cid) = VT_DISPATCH; + V_DISPATCH(&cid) = (IDispatch*)0xdeadbeef; + hr = AccessibleObjectFromPoint(point, NULL, &cid); + ok(hr == E_INVALIDARG, "got %x\n", hr); + ok(V_VT(&cid) == VT_DISPATCH, "got %#x, expected %#x\n", V_VT(&cid), VT_DISPATCH); + + hr = AccessibleObjectFromPoint(point, &acc, &cid); + ok(hr == S_OK, "got %x\n", hr); + ok(V_VT(&cid) == VT_I4, "got %#x, expected %#x\n", V_VT(&cid), VT_I4); + ok(V_I4(&cid) == CHILDID_SELF, "got %#x, expected %#x\n", V_I4(&cid), CHILDID_SELF); + check_acc_hwnd((IUnknown*)acc, hwnd); + hr = IAccessible_get_accRole(acc, cid, &var); + ok(hr == S_OK, "got %x\n", hr); + ok(V_VT(&var) == VT_I4, "got %#x, expected %#x\n", V_VT(&var), VT_I4); + ok(V_I4(&var) == ROLE_SYSTEM_CLIENT, "got %#x, expected %#x\n", + V_I4(&var), ROLE_SYSTEM_CLIENT); + IAccessible_Release(acc); + + child = CreateWindowA("edit", "edit", WS_CHILD | WS_VISIBLE, + 0, 0, 100, 100, hwnd, NULL, NULL, NULL); + ok(child != NULL, "CreateWindow failed\n"); + + hr = AccessibleObjectFromPoint(point, &acc, &cid); + ok(hr == S_OK, "got %x\n", hr); + ok(V_VT(&cid) == VT_I4, "got %#x, expected %#x\n", V_VT(&cid), VT_I4); + ok(V_I4(&cid) == CHILDID_SELF, "got %#x, expected %#x\n", V_I4(&cid), CHILDID_SELF); + check_acc_hwnd((IUnknown*)acc, child); + hr = IAccessible_get_accRole(acc, cid, &var); + ok(hr == S_OK, "got %x\n", hr); + ok(V_VT(&var) == VT_I4, "got %#x, expected %#x\n", V_VT(&var), VT_I4); + ok(V_I4(&var) == ROLE_SYSTEM_TEXT, "got %#x, expected %#x\n", + V_I4(&var), ROLE_SYSTEM_TEXT); + IAccessible_Release(acc); + + DestroyWindow(hwnd); +} + static void test_CAccPropServices(void) { IAccPropServices *acc_prop_services; @@ -1749,6 +1815,7 @@ START_TEST(main) test_default_client_accessible_object(); test_AccessibleChildren(&Accessible); test_AccessibleObjectFromEvent(); + test_AccessibleObjectFromPoint(); test_CreateStdAccessibleObject_classes(); test_default_edit_accessible_object();

1 0

Piotr Caban : oleacc: Add AccessibleObjectFromPoint implementation.
by Alexandre Julliard 25 Nov '21

25 Nov '21

Module: wine Branch: master Commit: 92f4f4a4c13e822cb5eb03207ec76f71640353d8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=92f4f4a4c13e822cb5eb0320… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Nov 25 18:55:07 2021 +0100 oleacc: Add AccessibleObjectFromPoint implementation. Based on a patch by Alex Henrie. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleacc/main.c | 71 +++++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 65 insertions(+), 6 deletions(-) diff --git a/dlls/oleacc/main.c b/dlls/oleacc/main.c index 3ce616ae0c1..d2a80cfde34 100644 --- a/dlls/oleacc/main.c +++ b/dlls/oleacc/main.c @@ -263,18 +263,77 @@ LRESULT WINAPI LresultFromObject( REFIID riid, WPARAM wParam, LPUNKNOWN pAcc ) return atom; } -HRESULT WINAPI AccessibleObjectFromPoint( POINT ptScreen, IAccessible** ppacc, VARIANT* pvarChild ) -{ - FIXME("{%d,%d} %p %p: stub\n", ptScreen.x, ptScreen.y, ppacc, pvarChild ); - return E_NOTIMPL; -} - static void variant_init_i4( VARIANT *v, int val ) { V_VT(v) = VT_I4; V_I4(v) = val; } +HRESULT WINAPI AccessibleObjectFromPoint( POINT point, IAccessible** acc, VARIANT* child_id ) +{ + IAccessible *cur; + HRESULT hr; + VARIANT v; + HWND hwnd; + + TRACE("{%d,%d} %p %p\n", point.x, point.y, acc, child_id); + + if (!acc || !child_id) + return E_INVALIDARG; + + *acc = NULL; + V_VT(child_id) = VT_EMPTY; + + hwnd = WindowFromPoint(point); + if (!hwnd) + return E_FAIL; + hwnd = GetAncestor(hwnd, GA_ROOT); + + hr = AccessibleObjectFromWindow(hwnd, OBJID_WINDOW, &IID_IAccessible, (void **)&cur); + if (FAILED(hr)) + return hr; + if (!cur) + return E_FAIL; + + V_VT(&v) = VT_EMPTY; + while (1) + { + hr = IAccessible_accHitTest(cur, point.x, point.y, &v); + if (FAILED(hr)) + { + IAccessible_Release(cur); + return hr; + } + + if (V_VT(&v) == VT_I4) + { + *acc = cur; + variant_init_i4(child_id, V_I4(&v)); + return S_OK; + } + else if (V_VT(&v) == VT_DISPATCH) + { + IAccessible_Release(cur); + + hr = IDispatch_QueryInterface(V_DISPATCH(&v), &IID_IAccessible, (void**)&cur); + VariantClear(&v); + if (FAILED(hr)) + return hr; + if (!cur) + return E_FAIL; + } + else + { + VariantClear(&v); + IAccessible_Release(cur); + FIXME("unhandled variant type: %d\n", V_VT(&v)); + return E_NOTIMPL; + } + } + + return S_OK; +} + HRESULT WINAPI AccessibleObjectFromEvent( HWND hwnd, DWORD object_id, DWORD child_id, IAccessible **acc_out, VARIANT *child_id_out ) {

1 0

Piotr Caban : oleacc: Add partial Window_accHitTest implementation.
by Alexandre Julliard 25 Nov '21

25 Nov '21

Module: wine Branch: master Commit: b704a6f336ebf8ae28d4b4424f718a5d87ebe00a URL: https://source.winehq.org/git/wine.git/?a=commit;h=b704a6f336ebf8ae28d4b442… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Nov 25 18:54:58 2021 +0100 oleacc: Add partial Window_accHitTest implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleacc/window.c | 33 ++++++++++++++++++++++++++++++--- 1 file changed, 30 insertions(+), 3 deletions(-) diff --git a/dlls/oleacc/window.c b/dlls/oleacc/window.c index aa433d624cf..87f9956b49e 100644 --- a/dlls/oleacc/window.c +++ b/dlls/oleacc/window.c @@ -247,11 +247,38 @@ static HRESULT WINAPI Window_accNavigate(IAccessible *iface, return E_NOTIMPL; } -static HRESULT WINAPI Window_accHitTest(IAccessible *iface, - LONG xLeft, LONG yTop, VARIANT *pvarID) +static HRESULT WINAPI Window_accHitTest(IAccessible *iface, LONG x, LONG y, VARIANT *v) { Window *This = impl_from_Window(iface); - FIXME("(%p)->(%d %d %p)\n", This, xLeft, yTop, pvarID); + IDispatch *disp; + POINT pt; + HRESULT hr; + RECT rect; + + TRACE("(%p)->(%d %d %p)\n", This, x, y, v); + + V_VT(v) = VT_EMPTY; + if (!GetClientRect(This->hwnd, &rect)) + return E_FAIL; + if (!ClientToScreen(This->hwnd, (POINT*)&rect) || + !ClientToScreen(This->hwnd, &((POINT*)&rect)[1])) + return E_FAIL; + pt.x = x; + pt.y = y; + if (PtInRect(&rect, pt)) + { + hr = AccessibleObjectFromWindow(This->hwnd, OBJID_CLIENT, &IID_IDispatch, (void**)&disp); + if (FAILED(hr)) + return hr; + if (!disp) + return E_FAIL; + + V_VT(v) = VT_DISPATCH; + V_DISPATCH(v) = disp; + return S_OK; + } + + FIXME("non-client area not handled yet\n"); return E_NOTIMPL; }

1 0

Alexandre Julliard : mountmgr: Put the Unix helpers in a separate Unix library.
by Alexandre Julliard 25 Nov '21

25 Nov '21

Module: wine Branch: master Commit: 9d293a1e9be980b48544c92fb43a9e964331877d URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d293a1e9be980b48544c92f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 25 19:00:21 2021 +0100 mountmgr: Put the Unix helpers in a separate Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mountmgr.sys/Makefile.in | 1 + dlls/mountmgr.sys/device.c | 53 ++++++++++++++++------- dlls/mountmgr.sys/mountmgr.c | 27 +++++++++--- dlls/mountmgr.sys/unixlib.c | 97 ++++++++++++++++++++++++++++--------------- dlls/mountmgr.sys/unixlib.h | 88 ++++++++++++++++++++++++++++++++++----- 5 files changed, 201 insertions(+), 65 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9d293a1e9be980b48544…

1 0

Alexandre Julliard : mountmgr: Move the macOS credentials support to a separate file.
by Alexandre Julliard 25 Nov '21

25 Nov '21

Module: wine Branch: master Commit: af7b364a289dcfd09747758ca1328f4dd9787301 URL: https://source.winehq.org/git/wine.git/?a=commit;h=af7b364a289dcfd09747758c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 25 17:35:38 2021 +0100 mountmgr: Move the macOS credentials support to a separate file. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mountmgr.sys/Makefile.in | 1 + dlls/mountmgr.sys/cred.c | 633 ++++++++++++++++++++++++++++++++++++++++++ dlls/mountmgr.sys/mountmgr.c | 593 ++------------------------------------- dlls/mountmgr.sys/unixlib.h | 6 + 4 files changed, 658 insertions(+), 575 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=af7b364a289dcfd09747…

1 0

Alexandre Julliard : mountmgr: Add some helpers to abstract the Unix calls from mountmgr.c.
by Alexandre Julliard 25 Nov '21

25 Nov '21

Module: wine Branch: master Commit: 086e9e0eda074bba36d1cb35cd0e2fc8c2e8e285 URL: https://source.winehq.org/git/wine.git/?a=commit;h=086e9e0eda074bba36d1cb35… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 25 17:20:07 2021 +0100 mountmgr: Add some helpers to abstract the Unix calls from mountmgr.c. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mountmgr.sys/mountmgr.c | 63 +++++-------------------------------------- dlls/mountmgr.sys/unixlib.c | 64 ++++++++++++++++++++++++++++++++++++++++++++ dlls/mountmgr.sys/unixlib.h | 2 ++ 3 files changed, 72 insertions(+), 57 deletions(-) diff --git a/dlls/mountmgr.sys/mountmgr.c b/dlls/mountmgr.sys/mountmgr.c index 6c7f21172fa..33be9293713 100644 --- a/dlls/mountmgr.sys/mountmgr.c +++ b/dlls/mountmgr.sys/mountmgr.c @@ -33,14 +33,12 @@ #include <stdarg.h> #include <stdlib.h> #include <unistd.h> -#ifdef HAVE_SYS_STAT_H -#include <sys/stat.h> -#endif #define NONAMELESSUNION #include "mountmgr.h" #include "winreg.h" +#include "unixlib.h" #include "wine/list.h" #include "wine/unicode.h" #include "wine/debug.h" @@ -297,9 +295,7 @@ static NTSTATUS define_shell_folder( const void *in_buff, SIZE_T insize ) UNICODE_STRING name; NTSTATUS status; ULONG size = 256; - const char *home; - char *buffer = NULL, *backup = NULL, *homelink = NULL; - struct stat st; + char *buffer = NULL, *backup = NULL; if (input->folder_offset >= insize || input->folder_size > insize - input->folder_offset || input->symlink_offset >= insize) @@ -313,22 +309,6 @@ static NTSTATUS define_shell_folder( const void *in_buff, SIZE_T insize ) if (!link[0]) link = NULL; } - if (link && (!strcmp( link, "$HOME" ) || !strncmp( link, "$HOME/", 6 )) && (home = getenv( "HOME" ))) - { - link += 5; - homelink = HeapAlloc( GetProcessHeap(), 0, strlen(home) + strlen(link) + 1 ); - strcpy( homelink, home ); - strcat( homelink, link ); - link = homelink; - } - - /* ignore nonexistent link targets */ - if (link && (stat( link, &st ) || !S_ISDIR( st.st_mode ))) - { - status = STATUS_OBJECT_NAME_NOT_FOUND; - goto done; - } - name.Buffer = (WCHAR *)((char *)in_buff + input->folder_offset); name.Length = input->folder_size; InitializeObjectAttributes( &attr, &name, 0, 0, NULL ); @@ -358,37 +338,11 @@ static NTSTATUS define_shell_folder( const void *in_buff, SIZE_T insize ) strcat( backup, ".backup" ); } - if (!lstat( buffer, &st )) /* move old folder/link out of the way */ - { - if (S_ISLNK( st.st_mode )) - { - unlink( buffer ); - } - else if (link && S_ISDIR( st.st_mode )) - { - if (rmdir( buffer )) /* non-empty dir, try to make a backup */ - { - if (!backup || rename( buffer, backup )) - { - status = STATUS_OBJECT_NAME_COLLISION; - goto done; - } - } - } - else goto done; /* nothing to do, folder already exists */ - } - - if (link) symlink( link, buffer ); - else - { - if (backup && !lstat( backup, &st ) && S_ISDIR( st.st_mode )) rename( backup, buffer ); - else mkdir( buffer, 0777 ); - } + status = set_shell_folder( buffer, backup, link ); done: HeapFree( GetProcessHeap(), 0, buffer ); HeapFree( GetProcessHeap(), 0, backup ); - HeapFree( GetProcessHeap(), 0, homelink ); return status; } @@ -401,7 +355,6 @@ static NTSTATUS query_shell_folder( void *buff, SIZE_T insize, SIZE_T outsize, I NTSTATUS status; ULONG size = 256; char *buffer; - int ret; name.Buffer = buff; name.Length = insize; @@ -415,13 +368,9 @@ static NTSTATUS query_shell_folder( void *buff, SIZE_T insize, SIZE_T outsize, I HeapFree( GetProcessHeap(), 0, buffer ); if (status != STATUS_BUFFER_TOO_SMALL) return status; } - ret = readlink( buffer, output, outsize - 1 ); - if (ret >= 0) - { - output[ret] = 0; - iosb->Information = ret + 1; - } - else status = STATUS_OBJECT_NAME_NOT_FOUND; + + status = get_shell_folder( buffer, output, outsize ); + if (!status) iosb->Information = strlen(output) + 1; HeapFree( GetProcessHeap(), 0, buffer ); return status; diff --git a/dlls/mountmgr.sys/unixlib.c b/dlls/mountmgr.sys/unixlib.c index b2c475c90cc..8e6378e5637 100644 --- a/dlls/mountmgr.sys/unixlib.c +++ b/dlls/mountmgr.sys/unixlib.c @@ -277,3 +277,67 @@ NTSTATUS detect_parallel_ports( char *names, ULONG size ) detect_devices( paths, names, size ); return STATUS_SUCCESS; } + +NTSTATUS set_shell_folder( const char *folder, const char *backup, const char *link ) +{ + struct stat st; + const char *home; + char *homelink = NULL; + NTSTATUS status = STATUS_SUCCESS; + + if (link && (!strcmp( link, "$HOME" ) || !strncmp( link, "$HOME/", 6 )) && (home = getenv( "HOME" ))) + { + link += 5; + homelink = malloc( strlen(home) + strlen(link) + 1 ); + strcpy( homelink, home ); + strcat( homelink, link ); + link = homelink; + } + + /* ignore nonexistent link targets */ + if (link && (stat( link, &st ) || !S_ISDIR( st.st_mode ))) + { + status = STATUS_OBJECT_NAME_NOT_FOUND; + goto done; + } + + if (!lstat( folder, &st )) /* move old folder/link out of the way */ + { + if (S_ISLNK( st.st_mode )) + { + unlink( folder ); + } + else if (link && S_ISDIR( st.st_mode )) + { + if (rmdir( folder )) /* non-empty dir, try to make a backup */ + { + if (!backup || rename( folder, backup )) + { + status = STATUS_OBJECT_NAME_COLLISION; + goto done; + } + } + } + else goto done; /* nothing to do, folder already exists */ + } + + if (link) symlink( link, folder ); + else + { + if (backup && !lstat( backup, &st ) && S_ISDIR( st.st_mode )) rename( backup, folder ); + else mkdir( folder, 0777 ); + } + +done: + free( homelink ); + return status; +} + +NTSTATUS get_shell_folder( const char *folder, char *buffer, ULONG size ) +{ + int ret = readlink( folder, buffer, size - 1 ); + + if (ret < 0) return STATUS_OBJECT_NAME_NOT_FOUND; + buffer[ret] = 0; + return STATUS_SUCCESS; +} diff --git a/dlls/mountmgr.sys/unixlib.h b/dlls/mountmgr.sys/unixlib.h index b99ea7adca8..ab51481cabb 100644 --- a/dlls/mountmgr.sys/unixlib.h +++ b/dlls/mountmgr.sys/unixlib.h @@ -28,3 +28,5 @@ extern NTSTATUS read_volume_file( const char *volume, const char *file, void *bu extern BOOL match_unixdev( const char *device, ULONGLONG unix_dev ) DECLSPEC_HIDDEN; extern NTSTATUS detect_serial_ports( char *names, ULONG size ) DECLSPEC_HIDDEN; extern NTSTATUS detect_parallel_ports( char *names, ULONG size ) DECLSPEC_HIDDEN; +extern NTSTATUS set_shell_folder( const char *folder, const char *backup, const char *link ) DECLSPEC_HIDDEN; +extern NTSTATUS get_shell_folder( const char *folder, char *buffer, ULONG size ) DECLSPEC_HIDDEN;

1 0

← Newer
1
...
10
11
12
13
14
15
16
...
96
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2021