March 2024 - Wine-commits - list.winehq.org

Zebediah Figura : shell32: Reimplement pasting from a CIDA without ISFHelper.
by Alexandre Julliard 07 Mar '24

07 Mar '24

Module: wine Branch: master Commit: a277ab8e42e657b5f6a9aa03740c93b41bed9e7e URL: https://gitlab.winehq.org/wine/wine/-/commit/a277ab8e42e657b5f6a9aa03740c93… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Mar 5 00:31:05 2024 -0600 shell32: Reimplement pasting from a CIDA without ISFHelper. --- dlls/shell32/shlview_cmenu.c | 172 +++++++++++++++++++++---------------------- 1 file changed, 86 insertions(+), 86 deletions(-) diff --git a/dlls/shell32/shlview_cmenu.c b/dlls/shell32/shlview_cmenu.c index cb7ce331897..fa29ac2dc02 100644 --- a/dlls/shell32/shlview_cmenu.c +++ b/dlls/shell32/shlview_cmenu.c @@ -345,60 +345,65 @@ static void DoCopyOrCut(ContextMenu *This, HWND hwnd, BOOL cut) } } -static HRESULT paste_pidls(IShellFolder *dst_folder, - const ITEMIDLIST *src_parent, ITEMIDLIST **pidls, unsigned int count) +static HRESULT get_data_format(IDataObject *data, UINT cf, STGMEDIUM *medium) { - IShellFolder *src_folder; - HRESULT hr = S_OK; + FORMATETC format; + + InitFormatEtc(format, cf, TYMED_HGLOBAL); + return IDataObject_GetData(data, &format, medium); +} + +static WCHAR *build_source_paths(ITEMIDLIST *root_pidl, ITEMIDLIST **pidls, unsigned int count) +{ + WCHAR root_path[MAX_PATH], pidl_path[MAX_PATH]; + size_t size = 1, pos = 0, root_len; + WCHAR *paths; - if (FAILED(hr = SHBindToObject(NULL, src_parent, NULL, &IID_IShellFolder, (void **)&src_folder))) + if (!SHGetPathFromIDListW(root_pidl, root_path)) { - ERR("Failed to get folder from source PIDL, hr %#lx.\n", hr); - return hr; + ERR("Failed to get source root path.\n"); + return NULL; } + root_len = wcslen(root_path); - for (unsigned int i = 0; SUCCEEDED(hr) && i < count; i++) + for (unsigned int i = 0; i < count; ++i) { - ISFHelper *psfhlpdst = NULL, *psfhlpsrc = NULL; + if (!_ILIsValue(pidls[i]) && !_ILIsFolder(pidls[i])) + ERR("Unexpected child pidl type.\n"); - hr = IShellFolder_QueryInterface(dst_folder, &IID_ISFHelper, (void **)&psfhlpdst); - if (SUCCEEDED(hr)) - hr = IShellFolder_QueryInterface(src_folder, &IID_ISFHelper, (void **)&psfhlpsrc); - - if (psfhlpdst && psfhlpsrc) - { - hr = ISFHelper_CopyItems(psfhlpdst, src_folder, 1, (LPCITEMIDLIST *)&pidls[i]); - /* FIXME handle move - ISFHelper_DeleteItems(psfhlpsrc, 1, &pidl_item); - */ - } - if (psfhlpdst) - ISFHelper_Release(psfhlpdst); - if (psfhlpsrc) - ISFHelper_Release(psfhlpsrc); + _ILSimpleGetTextW(pidls[i], pidl_path, ARRAY_SIZE(pidl_path)); + size += root_len + 1 + wcslen(pidl_path) + 1; } - IShellFolder_Release(src_folder); - return hr; -} + paths = malloc(size * sizeof(WCHAR)); -static HRESULT get_data_format(IDataObject *data, UINT cf, STGMEDIUM *medium) -{ - FORMATETC format; + for (unsigned int i = 0; i < count; ++i) + { + if (!_ILIsValue(pidls[i]) && !_ILIsFolder(pidls[i])) + ERR("Unexpected child pidl type.\n"); + + memcpy(paths + pos, root_path, root_len * sizeof(WCHAR)); + pos += root_len; + paths[pos++] = '\\'; + _ILSimpleGetTextW(pidls[i], paths + pos, size - pos); + pos += wcslen(paths + pos) + 1; + } + paths[pos++] = 0; - InitFormatEtc(format, cf, TYMED_HGLOBAL); - return IDataObject_GetData(data, &format, medium); + return paths; } static HRESULT do_paste(ContextMenu *menu, HWND hwnd) { + IPersistFolder2 *dst_persist; IShellFolder *dst_folder; + WCHAR dst_path[MAX_PATH]; + SHFILEOPSTRUCTW op = {0}; + ITEMIDLIST *dst_pidl; IDataObject *data; HRESULT hr; STGMEDIUM medium; - - if (FAILED(hr = OleGetClipboard(&data))) - return hr; + int ret; if (menu->cidl) { @@ -415,71 +420,66 @@ static HRESULT do_paste(ContextMenu *menu, HWND hwnd) IShellFolder_AddRef(dst_folder); } + if (FAILED(hr = IShellFolder_QueryInterface(dst_folder, &IID_IPersistFolder2, (void **)&dst_persist))) + { + WARN("Failed to get IPersistFolder2, hr %#lx.\n", hr); + return hr; + } + + hr = IPersistFolder2_GetCurFolder(dst_persist, &dst_pidl); + IPersistFolder2_Release(dst_persist); + if (FAILED(hr)) + { + ERR("Failed to get dst folder pidl, hr %#lx.\n", hr); + return hr; + } + + if (!SHGetPathFromIDListW(dst_pidl, dst_path)) + { + ERR("Failed to get path, hr %#lx.\n", hr); + ILFree(dst_pidl); + return E_FAIL; + } + ILFree(dst_pidl); + + op.hwnd = hwnd; + op.wFunc = FO_COPY; + op.pTo = dst_path; + op.fFlags = FOF_ALLOWUNDO; + + if (FAILED(hr = OleGetClipboard(&data))) + return hr; + if (SUCCEEDED(get_data_format(data, RegisterClipboardFormatW(CFSTR_SHELLIDLISTW), &medium))) { - CIDA *cida = GlobalLock(medium.hGlobal); - ITEMIDLIST **pidls; - ITEMIDLIST *pidl; + const CIDA *cida = GlobalLock(medium.hGlobal); + ITEMIDLIST **pidls, *root_pidl; + WCHAR *src_paths; + + pidls = _ILCopyCidaToaPidl(&root_pidl, cida); - if (cida) + if ((src_paths = build_source_paths(root_pidl, pidls, cida->cidl))) { - pidls = _ILCopyCidaToaPidl(&pidl, cida); - if (pidls) - { - hr = paste_pidls(dst_folder, pidl, pidls, cida->cidl); - _ILFreeaPidl(pidls, cida->cidl); - SHFree(pidl); - } - else + op.pFrom = src_paths; + if ((ret = SHFileOperationW(&op))) { - hr = HRESULT_FROM_WIN32(GetLastError()); + WARN("Failed to copy, ret %d.\n", ret); + hr = E_FAIL; } - GlobalUnlock(medium.hGlobal); - } - else - { - hr = HRESULT_FROM_WIN32(GetLastError()); } + + free(src_paths); + _ILFreeaPidl(pidls, cida->cidl); + ILFree(root_pidl); + + GlobalUnlock(medium.hGlobal); ReleaseStgMedium(&medium); } else if (SUCCEEDED(get_data_format(data, CF_HDROP, &medium))) { const DROPFILES *dropfiles = GlobalLock(medium.hGlobal); - IPersistFolder2 *dst_persist; - SHFILEOPSTRUCTW op = {0}; - WCHAR dst_path[MAX_PATH]; - ITEMIDLIST *dst_pidl; - int ret; - - if (FAILED(hr = IShellFolder_QueryInterface(dst_folder, &IID_IPersistFolder2, (void **)&dst_persist))) - { - WARN("Failed to get IPersistFolder2, hr %#lx.\n", hr); - IDataObject_Release(data); - return hr; - } - - hr = IPersistFolder2_GetCurFolder(dst_persist, &dst_pidl); - IPersistFolder2_Release(dst_persist); - if (FAILED(hr)) - { - ERR("Failed to get dst folder pidl, hr %#lx.\n", hr); - IDataObject_Release(data); - return hr; - } - - if (!SHGetPathFromIDListW(dst_pidl, dst_path)) - { - ERR("Failed to get path, hr %#lx.\n", hr); - ILFree(dst_pidl); - IDataObject_Release(data); - return E_FAIL; - } - op.hwnd = hwnd; - op.wFunc = FO_COPY; op.pFrom = (const WCHAR *)((const char *)dropfiles + dropfiles->pFiles); - op.pTo = dst_path; - op.fFlags = FOF_ALLOWUNDO; if ((ret = SHFileOperationW(&op))) { WARN("Failed to copy, ret %d.\n", ret);

1 0

Zebediah Figura : shell32: Remove the no longer used ISFHelper::CopyItems() helper.
by Alexandre Julliard 07 Mar '24

07 Mar '24

Module: wine Branch: master Commit: 0c35d5cc29ceceff574087b69e0fb3af83348379 URL: https://gitlab.winehq.org/wine/wine/-/commit/0c35d5cc29ceceff574087b69e0fb3… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Mar 5 21:33:44 2024 -0600 shell32: Remove the no longer used ISFHelper::CopyItems() helper. --- dlls/shell32/recyclebin.c | 8 ------- dlls/shell32/shellfolder.h | 2 -- dlls/shell32/shfldr_fs.c | 55 ---------------------------------------------- 3 files changed, 65 deletions(-) diff --git a/dlls/shell32/recyclebin.c b/dlls/shell32/recyclebin.c index 91f13413dce..b6d9879fa39 100644 --- a/dlls/shell32/recyclebin.c +++ b/dlls/shell32/recyclebin.c @@ -1200,13 +1200,6 @@ static HRESULT WINAPI RecycleBin_DeleteItems(ISFHelper * iface, UINT cidl, return erase_items(GetActiveWindow(),apidl,cidl,TRUE); } -static HRESULT WINAPI RecycleBin_CopyItems(ISFHelper * iface, - IShellFolder * pSFFrom, - UINT cidl, LPCITEMIDLIST * apidl) -{ - return E_NOTIMPL; -} - static const ISFHelperVtbl sfhelperVtbl = { RecycleBin_ISFHelper_QueryInterface, @@ -1215,7 +1208,6 @@ static const ISFHelperVtbl sfhelperVtbl = RecycleBin_GetUniqueName, RecycleBin_AddFolder, RecycleBin_DeleteItems, - RecycleBin_CopyItems }; HRESULT WINAPI SHQueryRecycleBinA(LPCSTR pszRootPath, LPSHQUERYRBINFO pSHQueryRBInfo) diff --git a/dlls/shell32/shellfolder.h b/dlls/shell32/shellfolder.h index 942e0e7ea28..da3e7b568e6 100644 --- a/dlls/shell32/shellfolder.h +++ b/dlls/shell32/shellfolder.h @@ -49,7 +49,6 @@ DECLARE_INTERFACE_(ISFHelper,IUnknown) STDMETHOD(GetUniqueName)(THIS_ LPWSTR lpName, UINT uLen) PURE; STDMETHOD(AddFolder)(THIS_ HWND hwnd, LPCWSTR lpName, LPITEMIDLIST * ppidlOut) PURE; STDMETHOD(DeleteItems)(THIS_ UINT cidl, LPCITEMIDLIST * apidl) PURE; - STDMETHOD(CopyItems)(THIS_ IShellFolder * pSFFrom, UINT cidl, LPCITEMIDLIST * apidl) PURE; }; #undef INTERFACE @@ -62,7 +61,6 @@ DECLARE_INTERFACE_(ISFHelper,IUnknown) #define ISFHelper_GetUniqueName(p,a,b) (p)->lpVtbl->GetUniqueName(p,a,b) #define ISFHelper_AddFolder(p,a,b,c) (p)->lpVtbl->AddFolder(p,a,b,c) #define ISFHelper_DeleteItems(p,a,b) (p)->lpVtbl->DeleteItems(p,a,b) -#define ISFHelper_CopyItems(p,a,b,c) (p)->lpVtbl->CopyItems(p,a,b,c) #endif #endif /* __WINE_SHELLFOLDER_HELP_H */ diff --git a/dlls/shell32/shfldr_fs.c b/dlls/shell32/shfldr_fs.c index 54828f99acc..808b20c9cae 100644 --- a/dlls/shell32/shfldr_fs.c +++ b/dlls/shell32/shfldr_fs.c @@ -1314,60 +1314,6 @@ ISFHelper_fnDeleteItems (ISFHelper * iface, UINT cidl, LPCITEMIDLIST * apidl) return ret; } -/**************************************************************************** - * ISFHelper_fnCopyItems - * - * copies items to this folder - */ -static HRESULT WINAPI -ISFHelper_fnCopyItems (ISFHelper * iface, IShellFolder * pSFFrom, UINT cidl, - LPCITEMIDLIST * apidl) -{ - HRESULT ret=E_FAIL; - IPersistFolder2 *ppf2 = NULL; - WCHAR wszSrcPathRoot[MAX_PATH], - wszDstPath[MAX_PATH+1]; - WCHAR *wszSrcPathsList; - IGenericSFImpl *This = impl_from_ISFHelper(iface); - - SHFILEOPSTRUCTW fop; - - TRACE ("(%p)->(%p,%u,%p)\n", This, pSFFrom, cidl, apidl); - - IShellFolder_QueryInterface (pSFFrom, &IID_IPersistFolder2, - (LPVOID *) & ppf2); - if (ppf2) { - LPITEMIDLIST pidl; - - if (SUCCEEDED (IPersistFolder2_GetCurFolder (ppf2, &pidl))) { - SHGetPathFromIDListW (pidl, wszSrcPathRoot); - if (This->sPathTarget) - lstrcpynW(wszDstPath, This->sPathTarget, MAX_PATH); - else - wszDstPath[0] = 0; - PathAddBackslashW(wszSrcPathRoot); - PathAddBackslashW(wszDstPath); - wszSrcPathsList = build_paths_list(wszSrcPathRoot, cidl, apidl); - ZeroMemory(&fop, sizeof(fop)); - fop.hwnd = GetActiveWindow(); - fop.wFunc = FO_COPY; - fop.pFrom = wszSrcPathsList; - fop.pTo = wszDstPath; - fop.fFlags = FOF_ALLOWUNDO; - ret = S_OK; - if(SHFileOperationW(&fop)) - { - WARN("Copy failed\n"); - ret = E_FAIL; - } - free(wszSrcPathsList); - } - SHFree(pidl); - IPersistFolder2_Release(ppf2); - } - return ret; -} - static const ISFHelperVtbl shvt = { ISFHelper_fnQueryInterface, @@ -1376,7 +1322,6 @@ static const ISFHelperVtbl shvt = ISFHelper_fnGetUniqueName, ISFHelper_fnAddFolder, ISFHelper_fnDeleteItems, - ISFHelper_fnCopyItems }; /************************************************************************

1 0

Zebediah Figura : shell32: Set the drop effect from the context menu.
by Alexandre Julliard 07 Mar '24

07 Mar '24

Module: wine Branch: master Commit: a415874f5973d9d2351223cdf69511967e92d871 URL: https://gitlab.winehq.org/wine/wine/-/commit/a415874f5973d9d2351223cdf69511… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Mar 5 00:32:06 2024 -0600 shell32: Set the drop effect from the context menu. --- dlls/shell32/shlview_cmenu.c | 37 +++++++++++++++++++++++++------------ 1 file changed, 25 insertions(+), 12 deletions(-) diff --git a/dlls/shell32/shlview_cmenu.c b/dlls/shell32/shlview_cmenu.c index fa29ac2dc02..7fee1c1c2df 100644 --- a/dlls/shell32/shlview_cmenu.c +++ b/dlls/shell32/shlview_cmenu.c @@ -327,19 +327,32 @@ static void DoDelete(ContextMenu *This) } } -/************************************************************************** - * DoCopyOrCut - * - * copies the currently selected items into the clipboard - */ -static void DoCopyOrCut(ContextMenu *This, HWND hwnd, BOOL cut) +static void do_copy(ContextMenu *This, HWND hwnd, DWORD drop_effect) { IDataObject *dataobject; - TRACE("(%p)->(wnd=%p, cut=%d)\n", This, hwnd, cut); - if (SUCCEEDED(IShellFolder_GetUIObjectOf(This->parent, hwnd, This->cidl, (LPCITEMIDLIST*)This->apidl, &IID_IDataObject, 0, (void**)&dataobject))) { + FORMATETC format; + STGMEDIUM medium; + DWORD *effect_ptr; + HRESULT hr; + + InitFormatEtc(format, RegisterClipboardFormatW(CFSTR_PREFERREDDROPEFFECTW), TYMED_HGLOBAL); + medium.tymed = TYMED_HGLOBAL; + medium.pUnkForRelease = NULL; + if (!(medium.hGlobal = GlobalAlloc(GMEM_MOVEABLE, sizeof(DWORD)))) + { + IDataObject_Release(dataobject); + return; + } + effect_ptr = GlobalLock(medium.hGlobal); + *effect_ptr = drop_effect; + GlobalUnlock(medium.hGlobal); + + if (FAILED(hr = IDataObject_SetData(dataobject, &format, &medium, TRUE))) + ERR("Failed to set data, hr %#lx.\n", hr); + OleSetClipboard(dataobject); IDataObject_Release(dataobject); } @@ -973,11 +986,11 @@ static HRESULT WINAPI ItemMenu_InvokeCommand( break; case FCIDM_SHVIEW_COPY: TRACE("Verb FCIDM_SHVIEW_COPY\n"); - DoCopyOrCut(This, lpcmi->hwnd, FALSE); + do_copy(This, lpcmi->hwnd, DROPEFFECT_COPY | DROPEFFECT_LINK); break; case FCIDM_SHVIEW_CUT: TRACE("Verb FCIDM_SHVIEW_CUT\n"); - DoCopyOrCut(This, lpcmi->hwnd, TRUE); + do_copy(This, lpcmi->hwnd, DROPEFFECT_MOVE); break; case FCIDM_SHVIEW_INSERT: do_paste(This, lpcmi->hwnd); @@ -997,9 +1010,9 @@ static HRESULT WINAPI ItemMenu_InvokeCommand( if (strcmp(lpcmi->lpVerb,"delete")==0) DoDelete(This); else if (strcmp(lpcmi->lpVerb,"copy")==0) - DoCopyOrCut(This, lpcmi->hwnd, FALSE); + do_copy(This, lpcmi->hwnd, DROPEFFECT_COPY | DROPEFFECT_LINK); else if (strcmp(lpcmi->lpVerb,"cut")==0) - DoCopyOrCut(This, lpcmi->hwnd, TRUE); + do_copy(This, lpcmi->hwnd, DROPEFFECT_MOVE); else if (!strcmp(lpcmi->lpVerb, "paste")) do_paste(This, lpcmi->hwnd); else if (strcmp(lpcmi->lpVerb,"properties")==0)

1 0

Zebediah Figura : shell32: Respect the drop effect in do_paste().
by Alexandre Julliard 07 Mar '24

07 Mar '24

Module: wine Branch: master Commit: e5afb283cf11ec81c4022bc69c22b4765064f0e5 URL: https://gitlab.winehq.org/wine/wine/-/commit/e5afb283cf11ec81c4022bc69c22b4… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Mar 5 21:31:03 2024 -0600 shell32: Respect the drop effect in do_paste(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=34322 --- dlls/shell32/shlview_cmenu.c | 17 ++++++++++++++++- dlls/shell32/tests/shlfolder.c | 22 +++------------------- 2 files changed, 19 insertions(+), 20 deletions(-) diff --git a/dlls/shell32/shlview_cmenu.c b/dlls/shell32/shlview_cmenu.c index 7fee1c1c2df..cac33c39af7 100644 --- a/dlls/shell32/shlview_cmenu.c +++ b/dlls/shell32/shlview_cmenu.c @@ -409,6 +409,7 @@ static WCHAR *build_source_paths(ITEMIDLIST *root_pidl, ITEMIDLIST **pidls, unsi static HRESULT do_paste(ContextMenu *menu, HWND hwnd) { IPersistFolder2 *dst_persist; + const DWORD *drop_effect; IShellFolder *dst_folder; WCHAR dst_path[MAX_PATH]; SHFILEOPSTRUCTW op = {0}; @@ -456,13 +457,27 @@ static HRESULT do_paste(ContextMenu *menu, HWND hwnd) ILFree(dst_pidl); op.hwnd = hwnd; - op.wFunc = FO_COPY; op.pTo = dst_path; op.fFlags = FOF_ALLOWUNDO; if (FAILED(hr = OleGetClipboard(&data))) return hr; + if (FAILED(hr = get_data_format(data, RegisterClipboardFormatW(CFSTR_PREFERREDDROPEFFECTW), &medium))) + { + ERR("Failed to get drop effect.\n"); + IDataObject_Release(data); + return hr; + } + drop_effect = GlobalLock(medium.hGlobal); + if (*drop_effect & DROPEFFECT_COPY) + op.wFunc = FO_COPY; + else if (*drop_effect & DROPEFFECT_MOVE) + op.wFunc = FO_MOVE; + else + FIXME("Unhandled drop effect %#lx.\n", *drop_effect); + GlobalUnlock(medium.hGlobal); + if (SUCCEEDED(get_data_format(data, RegisterClipboardFormatW(CFSTR_SHELLIDLISTW), &medium))) { const CIDA *cida = GlobalLock(medium.hGlobal); diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index b2448938728..06ccfe2f553 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -5890,14 +5890,7 @@ static void test_copy_paste(void) format.cfFormat = RegisterClipboardFormatW(CFSTR_PREFERREDDROPEFFECTW); hr = IDataObject_GetData(data_obj, &format, &medium); - todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); - if (hr == S_OK) - { - effect = GlobalLock(medium.hGlobal); - ok(*effect == DROPEFFECT_MOVE, "Got effect %#lx.\n", *effect); - GlobalUnlock(medium.hGlobal); - ReleaseStgMedium(&medium); - } + ok(hr == S_OK, "Got hr %#lx.\n", hr); IDataObject_Release(data_obj); @@ -5913,9 +5906,7 @@ static void test_copy_paste(void) ok(hr == S_OK, "Got hr %#lx.\n", hr); ret = MoveFileExW(L"testcopy_dst/testcopy_src", L"testcopy_src", 0); - todo_wine ok(ret, "Got error %lu.\n", GetLastError()); - if (!ret && GetLastError() == ERROR_ALREADY_EXISTS) - RemoveDirectoryW(L"testcopy_dst/testcopy_src"); + ok(ret, "Got error %lu.\n", GetLastError()); /* Copy. */ @@ -5933,14 +5924,7 @@ static void test_copy_paste(void) format.cfFormat = RegisterClipboardFormatW(CFSTR_PREFERREDDROPEFFECTW); hr = IDataObject_GetData(data_obj, &format, &medium); - todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); - if (hr == S_OK) - { - effect = GlobalLock(medium.hGlobal); - ok(*effect == (DROPEFFECT_COPY | DROPEFFECT_LINK), "Got effect %#lx.\n", *effect); - GlobalUnlock(medium.hGlobal); - ReleaseStgMedium(&medium); - } + ok(hr == S_OK, "Got hr %#lx.\n", hr); IDataObject_Release(data_obj);

1 0

Rémi Bernon : win32u: Keep a reference on the adapters gpu.
by Alexandre Julliard 07 Mar '24

07 Mar '24

Module: wine Branch: master Commit: c179b269abd8cf8b9bcb1dcb4bd38c697b690097 URL: https://gitlab.winehq.org/wine/wine/-/commit/c179b269abd8cf8b9bcb1dcb4bd38c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 27 14:27:33 2024 +0100 win32u: Keep a reference on the adapters gpu. --- dlls/win32u/sysparams.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 9457c9010f0..426eff75907 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -98,6 +98,7 @@ struct display_device struct gpu { + LONG refcount; struct list entry; LUID luid; unsigned int adapter_count; @@ -110,6 +111,7 @@ struct adapter struct display_device dev; LUID gpu_luid; unsigned int id; + struct gpu *gpu; const WCHAR *config_key; unsigned int mode_count; DEVMODEW *modes; @@ -336,6 +338,18 @@ static void release_display_device_init_mutex( HANDLE mutex ) NtClose( mutex ); } +static struct gpu *gpu_acquire( struct gpu *gpu ) +{ + InterlockedIncrement( &gpu->refcount ); + return gpu; +} + +static void gpu_release( struct gpu *gpu ) +{ + if (!InterlockedDecrement( &gpu->refcount )) + free( gpu ); +} + static struct adapter *adapter_acquire( struct adapter *adapter ) { InterlockedIncrement( &adapter->refcount ); @@ -346,6 +360,7 @@ static void adapter_release( struct adapter *adapter ) { if (!InterlockedDecrement( &adapter->refcount )) { + gpu_release( adapter->gpu ); free( adapter->modes ); free( adapter ); } @@ -1477,7 +1492,7 @@ static void clear_display_devices(void) { gpu = LIST_ENTRY( list_head( &gpus ), struct gpu, entry ); list_remove( &gpu->entry ); - free( gpu ); + gpu_release( gpu ); } } @@ -1521,7 +1536,8 @@ static BOOL update_display_cache_from_registry(void) if (!read_display_adapter_settings( adapter_id, adapter )) { - adapter_release( adapter ); + free( adapter->modes ); + free( adapter ); break; } @@ -1588,6 +1604,7 @@ static BOOL update_display_cache_from_registry(void) NtClose( gpu_key ); continue; } + gpu->refcount = 1; if ((prop_key = reg_open_ascii_key( gpu_key, devpropkey_gpu_luidA ))) { @@ -1599,7 +1616,10 @@ static BOOL update_display_cache_from_registry(void) LIST_FOR_EACH_ENTRY(adapter, &adapters, struct adapter, entry) { if (!memcmp( &adapter->gpu_luid, &gpu->luid, sizeof(LUID) )) + { + adapter->gpu = gpu_acquire( gpu ); gpu->adapter_count++; + } } list_add_tail( &gpus, &gpu->entry );

1 0

Rémi Bernon : win32u: Load gpus from registry before adapters.
by Alexandre Julliard 07 Mar '24

07 Mar '24

Module: wine Branch: master Commit: 955ddc6ea64b2618eae116f1e3889a6fbd230b0e URL: https://gitlab.winehq.org/wine/wine/-/commit/955ddc6ea64b2618eae116f1e3889a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 27 14:34:26 2024 +0100 win32u: Load gpus from registry before adapters. --- dlls/win32u/sysparams.c | 113 ++++++++++++++++++++++++------------------------ 1 file changed, 57 insertions(+), 56 deletions(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 426eff75907..e0c89f76707 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -1528,53 +1528,6 @@ static BOOL update_display_cache_from_registry(void) clear_display_devices(); - for (adapter_id = 0;; adapter_id++) - { - if (!(adapter = calloc( 1, sizeof(*adapter) ))) break; - adapter->refcount = 1; - adapter->id = adapter_id; - - if (!read_display_adapter_settings( adapter_id, adapter )) - { - free( adapter->modes ); - free( adapter ); - break; - } - - list_add_tail( &adapters, &adapter->entry ); - for (monitor_id = 0;; monitor_id++) - { - if (!(monitor = calloc( 1, sizeof(*monitor) ))) break; - if (!read_monitor_settings( adapter, monitor_id, monitor )) - { - free( monitor ); - break; - } - - monitor->id = monitor_id; - monitor->adapter = adapter_acquire( adapter ); - - monitor->dev.state_flags |= DISPLAY_DEVICE_ATTACHED; - if (adapter->dev.state_flags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP) - { - if (!IsRectEmpty(&monitor->rc_monitor)) monitor->dev.state_flags |= DISPLAY_DEVICE_ACTIVE; - - LIST_FOR_EACH_ENTRY( monitor2, &monitors, struct monitor, entry ) - { - if (!(monitor2->dev.state_flags & DISPLAY_DEVICE_ACTIVE)) continue; - if (EqualRect( &monitor2->rc_monitor, &monitor->rc_monitor )) - { - monitor->is_clone = TRUE; - break; - } - } - } - - monitor->handle = UlongToHandle( ++monitor_count ); - list_add_tail( &monitors, &monitor->entry ); - } - } - if ((pci_key = reg_open_ascii_key( enum_key, "PCI" ))) { unsigned int i = 0; @@ -1613,15 +1566,6 @@ static BOOL update_display_cache_from_registry(void) NtClose( prop_key ); } - LIST_FOR_EACH_ENTRY(adapter, &adapters, struct adapter, entry) - { - if (!memcmp( &adapter->gpu_luid, &gpu->luid, sizeof(LUID) )) - { - adapter->gpu = gpu_acquire( gpu ); - gpu->adapter_count++; - } - } - list_add_tail( &gpus, &gpu->entry ); NtClose( gpu_key ); } @@ -1632,6 +1576,63 @@ static BOOL update_display_cache_from_registry(void) NtClose( pci_key ); } + for (adapter_id = 0;; adapter_id++) + { + if (!(adapter = calloc( 1, sizeof(*adapter) ))) break; + adapter->refcount = 1; + adapter->id = adapter_id; + + if (!read_display_adapter_settings( adapter_id, adapter )) + { + free( adapter->modes ); + free( adapter ); + break; + } + + LIST_FOR_EACH_ENTRY(gpu, &gpus, struct gpu, entry) + { + if (!memcmp( &adapter->gpu_luid, &gpu->luid, sizeof(LUID) )) + { + adapter->gpu = gpu_acquire( gpu ); + gpu->adapter_count++; + break; + } + } + + list_add_tail( &adapters, &adapter->entry ); + for (monitor_id = 0;; monitor_id++) + { + if (!(monitor = calloc( 1, sizeof(*monitor) ))) break; + if (!read_monitor_settings( adapter, monitor_id, monitor )) + { + free( monitor ); + break; + } + + monitor->id = monitor_id; + monitor->adapter = adapter_acquire( adapter ); + + monitor->dev.state_flags |= DISPLAY_DEVICE_ATTACHED; + if (adapter->dev.state_flags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP) + { + if (!IsRectEmpty(&monitor->rc_monitor)) monitor->dev.state_flags |= DISPLAY_DEVICE_ACTIVE; + + LIST_FOR_EACH_ENTRY( monitor2, &monitors, struct monitor, entry ) + { + if (!(monitor2->dev.state_flags & DISPLAY_DEVICE_ACTIVE)) continue; + if (EqualRect( &monitor2->rc_monitor, &monitor->rc_monitor )) + { + monitor->is_clone = TRUE; + break; + } + } + } + + monitor->handle = UlongToHandle( ++monitor_count ); + list_add_tail( &monitors, &monitor->entry ); + } + } + if ((ret = !list_empty( &adapters ) && !list_empty( &monitors ))) last_query_display_time = key.LastWriteTime.QuadPart; pthread_mutex_unlock( &display_lock );

1 0

Rémi Bernon : win32u: Lookup adapter gpus from their device paths.
by Alexandre Julliard 07 Mar '24

07 Mar '24

Module: wine Branch: master Commit: 788ba7543224fa3f66aa65e62b743153dce0330e URL: https://gitlab.winehq.org/wine/wine/-/commit/788ba7543224fa3f66aa65e62b7431… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 27 14:39:41 2024 +0100 win32u: Lookup adapter gpus from their device paths. --- dlls/win32u/sysparams.c | 51 ++++++++++++++++++++++--------------------------- 1 file changed, 23 insertions(+), 28 deletions(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index e0c89f76707..4d8ed9efae1 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -100,6 +100,7 @@ struct gpu { LONG refcount; struct list entry; + char path[MAX_PATH]; LUID luid; unsigned int adapter_count; }; @@ -109,7 +110,6 @@ struct adapter LONG refcount; struct list entry; struct display_device dev; - LUID gpu_luid; unsigned int id; struct gpu *gpu; const WCHAR *config_key; @@ -600,7 +600,7 @@ static unsigned int query_reg_subkey_value( HKEY hkey, const char *name, KEY_VAL return size; } -static BOOL read_display_adapter_settings( unsigned int index, struct adapter *info ) +static BOOL read_display_adapter_settings( unsigned int index, struct adapter *info, char *gpu_path ) { char buffer[4096]; KEY_VALUE_PARTIAL_INFORMATION *value = (void *)buffer; @@ -669,17 +669,10 @@ static BOOL read_display_adapter_settings( unsigned int index, struct adapter *i NtClose( hkey ); if (!size || value->Type != REG_SZ || !info->mode_count || !info->modes) return FALSE; + for (i = 0; i < value->DataLength / sizeof(WCHAR); i++) gpu_path[i] = value_str[i]; if (!(hkey = reg_open_key( enum_key, value_str, value->DataLength - sizeof(WCHAR) ))) return FALSE; - size = query_reg_subkey_value( hkey, devpropkey_gpu_luidA, value, sizeof(buffer) ); - if (size != sizeof(info->gpu_luid)) - { - NtClose( hkey ); - return FALSE; - } - memcpy( &info->gpu_luid, value->Data, sizeof(info->gpu_luid) ); - size = query_reg_ascii_value( hkey, "HardwareID", value, sizeof(buffer) ); NtClose( hkey ); if (!size || (value->Type != REG_SZ && value->Type != REG_MULTI_SZ)) @@ -1496,9 +1489,20 @@ static void clear_display_devices(void) } } +static struct gpu *find_gpu_from_path( const char *path ) +{ + struct gpu *gpu; + + LIST_FOR_EACH_ENTRY( gpu, &gpus, struct gpu, entry ) + if (!strcmp( gpu->path, path )) return gpu_acquire( gpu ); + + ERR( "Failed to find gpu with path %s\n", debugstr_a(path) ); + return NULL; +} + static BOOL update_display_cache_from_registry(void) { - char buffer[1024]; + char path[MAX_PATH], buffer[1024]; DWORD adapter_id, monitor_id, monitor_count = 0, size; KEY_VALUE_PARTIAL_INFORMATION *value = (void *)buffer; KEY_BASIC_INFORMATION key, *key2 = (void *)buffer; @@ -1582,23 +1586,14 @@ static BOOL update_display_cache_from_registry(void) adapter->refcount = 1; adapter->id = adapter_id; - if (!read_display_adapter_settings( adapter_id, adapter )) + if (!read_display_adapter_settings( adapter_id, adapter, path ) || + !(adapter->gpu = find_gpu_from_path( path ))) { free( adapter->modes ); free( adapter ); break; } - LIST_FOR_EACH_ENTRY(gpu, &gpus, struct gpu, entry) - { - if (!memcmp( &adapter->gpu_luid, &gpu->luid, sizeof(LUID) )) - { - adapter->gpu = gpu_acquire( gpu ); - gpu->adapter_count++; - break; - } - } - list_add_tail( &adapters, &adapter->entry ); for (monitor_id = 0;; monitor_id++) { @@ -2478,7 +2473,7 @@ LONG WINAPI NtUserQueryDisplayConfig( UINT32 flags, UINT32 *paths_count, DISPLAY continue; adapter_index = monitor->adapter->id; - gpu_luid = &monitor->adapter->gpu_luid; + gpu_luid = &monitor->adapter->gpu->luid; output_id = monitor->output_id; memset( &devmode, 0, sizeof(devmode) ); @@ -6273,7 +6268,7 @@ NTSTATUS WINAPI NtUserDisplayConfigGetDeviceInfo( DISPLAYCONFIG_DEVICE_INFO_HEAD LIST_FOR_EACH_ENTRY(adapter, &adapters, struct adapter, entry) { if (source_name->header.id != adapter->id) continue; - if (memcmp( &source_name->header.adapterId, &adapter->gpu_luid, sizeof(adapter->gpu_luid) )) continue; + if (memcmp( &source_name->header.adapterId, &adapter->gpu->luid, sizeof(adapter->gpu->luid) )) continue; lstrcpyW( source_name->viewGdiDeviceName, adapter->dev.device_name ); ret = STATUS_SUCCESS; @@ -6301,8 +6296,8 @@ NTSTATUS WINAPI NtUserDisplayConfigGetDeviceInfo( DISPLAYCONFIG_DEVICE_INFO_HEAD LIST_FOR_EACH_ENTRY(monitor, &monitors, struct monitor, entry) { if (target_name->header.id != monitor->output_id) continue; - if (memcmp( &target_name->header.adapterId, &monitor->adapter->gpu_luid, - sizeof(monitor->adapter->gpu_luid) )) + if (memcmp( &target_name->header.adapterId, &monitor->adapter->gpu->luid, + sizeof(monitor->adapter->gpu->luid) )) continue; target_name->outputTechnology = DISPLAYCONFIG_OUTPUT_TECHNOLOGY_INTERNAL; @@ -6348,8 +6343,8 @@ NTSTATUS WINAPI NtUserDisplayConfigGetDeviceInfo( DISPLAYCONFIG_DEVICE_INFO_HEAD LIST_FOR_EACH_ENTRY(monitor, &monitors, struct monitor, entry) { if (preferred_mode->header.id != monitor->output_id) continue; - if (memcmp( &preferred_mode->header.adapterId, &monitor->adapter->gpu_luid, - sizeof(monitor->adapter->gpu_luid) )) + if (memcmp( &preferred_mode->header.adapterId, &monitor->adapter->gpu->luid, + sizeof(monitor->adapter->gpu->luid) )) continue; for (i = 0; i < monitor->adapter->mode_count; ++i)

1 0

Rémi Bernon : win32u: Enumerate devices with a dedicated helper.
by Alexandre Julliard 07 Mar '24

07 Mar '24

Module: wine Branch: master Commit: c67726b3d0dc8c7680b6fe7071133855c1124747 URL: https://gitlab.winehq.org/wine/wine/-/commit/c67726b3d0dc8c7680b6fe70711338… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 27 14:37:50 2024 +0100 win32u: Enumerate devices with a dedicated helper. Which will allow us to enumerate monitor devices later as well. --- dlls/win32u/sysparams.c | 110 +++++++++++++++++++++++++++++------------------- 1 file changed, 66 insertions(+), 44 deletions(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 4d8ed9efae1..8db33fb6bde 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -1489,6 +1489,60 @@ static void clear_display_devices(void) } } +static void enum_device_keys( const char *root, const WCHAR *classW, UINT class_size, void (*callback)(const char *) ) +{ + char buffer[1024]; + KEY_VALUE_PARTIAL_INFORMATION *value = (void *)buffer; + KEY_BASIC_INFORMATION *key2 = (void *)buffer; + HKEY root_key, device_key, instance_key; + DWORD size, root_len, i = 0; + char path[MAX_PATH]; + + if (!(root_key = reg_open_ascii_key( enum_key, root ))) return; + root_len = sprintf( path, "%s\\", root ); + + while (!NtEnumerateKey( root_key, i++, KeyBasicInformation, key2, sizeof(buffer), &size )) + { + DWORD j = 0, k, len, device_len; + + if (!(device_key = reg_open_key( root_key, key2->Name, key2->NameLength ))) continue; + for (k = 0, len = root_len; k < key2->NameLength / sizeof(WCHAR); k++) path[len++] = key2->Name[k]; + path[len++] = '\\'; + device_len = len; + + while (!NtEnumerateKey( device_key, j++, KeyBasicInformation, key2, sizeof(buffer), &size )) + { + if (!(instance_key = reg_open_key( device_key, key2->Name, key2->NameLength ))) continue; + for (k = 0, len = device_len; k < key2->NameLength / sizeof(WCHAR); k++) path[len++] = key2->Name[k]; + path[len++] = 0; + + size = query_reg_ascii_value( instance_key, "ClassGUID", value, sizeof(buffer) ); + if (size != class_size || wcscmp( (WCHAR *)value->Data, classW )) + { + NtClose( instance_key ); + continue; + } + + callback( path ); + + NtClose( instance_key ); + } + + NtClose( device_key ); + } + + NtClose( root_key ); +} + +static void enum_gpus( const char *path ) +{ + struct gpu *gpu; + if (!(gpu = calloc( 1, sizeof(*gpu) ))) return; + gpu->refcount = 1; + strcpy( gpu->path, path ); + list_add_tail( &gpus, &gpu->entry ); +} + static struct gpu *find_gpu_from_path( const char *path ) { struct gpu *gpu; @@ -1502,11 +1556,11 @@ static struct gpu *find_gpu_from_path( const char *path ) static BOOL update_display_cache_from_registry(void) { - char path[MAX_PATH], buffer[1024]; + char buffer[1024], path[MAX_PATH]; DWORD adapter_id, monitor_id, monitor_count = 0, size; KEY_VALUE_PARTIAL_INFORMATION *value = (void *)buffer; - KEY_BASIC_INFORMATION key, *key2 = (void *)buffer; - HKEY pci_key, device_key, gpu_key, prop_key; + KEY_BASIC_INFORMATION key; + HKEY gpu_key, prop_key; struct adapter *adapter; struct monitor *monitor, *monitor2; HANDLE mutex = NULL; @@ -1532,52 +1586,20 @@ static BOOL update_display_cache_from_registry(void) clear_display_devices(); - if ((pci_key = reg_open_ascii_key( enum_key, "PCI" ))) + enum_device_keys( "PCI", guid_devclass_displayW, sizeof(guid_devclass_displayW), enum_gpus ); + + LIST_FOR_EACH_ENTRY( gpu, &gpus, struct gpu, entry ) { - unsigned int i = 0; + if (!(gpu_key = reg_open_ascii_key( enum_key, gpu->path ))) continue; - while (!NtEnumerateKey( pci_key, i++, KeyBasicInformation, key2, sizeof(buffer), &size )) + if ((prop_key = reg_open_ascii_key( gpu_key, devpropkey_gpu_luidA ))) { - unsigned int j = 0; - - if (!(device_key = reg_open_key( pci_key, key2->Name, key2->NameLength ))) - continue; - - while (!NtEnumerateKey( device_key, j++, KeyBasicInformation, key2, sizeof(buffer), &size )) - { - if (!(gpu_key = reg_open_key( device_key, key2->Name, key2->NameLength ))) - continue; - - size = query_reg_ascii_value( gpu_key, "ClassGUID", value, sizeof(buffer) ); - if (size != sizeof(guid_devclass_displayW) - || wcscmp( (WCHAR *)value->Data, guid_devclass_displayW )) - { - NtClose( gpu_key ); - continue; - } - - if (!(gpu = calloc( 1, sizeof(*gpu) ))) - { - NtClose( gpu_key ); - continue; - } - gpu->refcount = 1; - - if ((prop_key = reg_open_ascii_key( gpu_key, devpropkey_gpu_luidA ))) - { - if (query_reg_value( prop_key, NULL, value, sizeof(buffer) ) == sizeof(LUID)) - gpu->luid = *(const LUID *)value->Data; - NtClose( prop_key ); - } - - list_add_tail( &gpus, &gpu->entry ); - NtClose( gpu_key ); - } - - NtClose( device_key ); + if (query_reg_value( prop_key, NULL, value, sizeof(buffer) ) == sizeof(LUID)) + gpu->luid = *(const LUID *)value->Data; + NtClose( prop_key ); } - NtClose( pci_key ); + NtClose( gpu_key ); } for (adapter_id = 0;; adapter_id++)

1 0

Rémi Bernon : win32u: Split read / write of gpu to registry to separate helpers.
by Alexandre Julliard 07 Mar '24

07 Mar '24

Module: wine Branch: master Commit: c8d2955cdc4baa9858a302a37ccf09f6b2a3b72a URL: https://gitlab.winehq.org/wine/wine/-/commit/c8d2955cdc4baa9858a302a37ccf09… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 27 14:32:00 2024 +0100 win32u: Split read / write of gpu to registry to separate helpers. --- dlls/win32u/sysparams.c | 261 ++++++++++++++++++++++++++++++------------------ 1 file changed, 163 insertions(+), 98 deletions(-)

1 0

Rémi Bernon : win32u: Keep the vulkan GUID on the gpu structure.
by Alexandre Julliard 07 Mar '24

07 Mar '24

Module: wine Branch: master Commit: 0d8bdf392f011101d911e7e8b17e5d3fc513b83f URL: https://gitlab.winehq.org/wine/wine/-/commit/0d8bdf392f011101d911e7e8b17e5d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Feb 28 14:27:15 2024 +0100 win32u: Keep the vulkan GUID on the gpu structure. --- dlls/win32u/sysparams.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index c615b0b37bc..6c4223f0cdb 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -113,6 +113,7 @@ struct gpu char guid[39]; LUID luid; UINT index; + GUID vulkan_uuid; UINT adapter_count; }; @@ -1059,13 +1060,20 @@ static BOOL read_gpu_from_registry( struct gpu *gpu ) NtClose( subkey ); } + if ((subkey = reg_open_ascii_key( hkey, devpropkey_gpu_vulkan_uuidA ))) + { + if (query_reg_value( subkey, NULL, value, sizeof(buffer) ) == sizeof(GUID)) + gpu->vulkan_uuid = *(const GUID *)value->Data; + NtClose( subkey ); + } + NtClose( hkey ); return TRUE; } static BOOL write_gpu_to_registry( const struct gpu *gpu, const struct pci_id *pci, - const GUID *vulkan_uuid, ULONGLONG memory_size ) + ULONGLONG memory_size ) { const WCHAR *desc; char buffer[4096], *tmp; @@ -1158,7 +1166,7 @@ static BOOL write_gpu_to_registry( const struct gpu *gpu, const struct pci_id *p if ((subkey = reg_create_ascii_key( hkey, devpropkey_gpu_vulkan_uuidA, 0, NULL ))) { set_reg_value( subkey, NULL, 0xffff0000 | DEVPROP_TYPE_GUID, - &vulkan_uuid, sizeof(vulkan_uuid) ); + &gpu->vulkan_uuid, sizeof(gpu->vulkan_uuid) ); NtClose( subkey ); } @@ -1266,6 +1274,7 @@ static void add_gpu( const struct gdi_gpu *gpu, void *param ) memset( &ctx->gpu, 0, sizeof(ctx->gpu) ); ctx->gpu.index = ctx->gpu_count; lstrcpyW( ctx->gpu.name, gpu->name ); + ctx->gpu.vulkan_uuid = gpu->vulkan_uuid; ctx->monitor_count = 0; ctx->mode_count = 0; @@ -1311,7 +1320,7 @@ static void add_gpu( const struct gdi_gpu *gpu, void *param ) NtClose( hkey ); - if (!write_gpu_to_registry( &ctx->gpu, &pci_id, &gpu->vulkan_uuid, gpu->memory_size )) + if (!write_gpu_to_registry( &ctx->gpu, &pci_id, gpu->memory_size )) WARN( "Failed to write gpu to registry\n" ); else ctx->gpu_count++;

1 0