https://git.reactos.org/?p=reactos.git;a=commitdiff;h=aee6cbc50a53b8e63bd290537bfb14d57e538196
commit aee6cbc50a53b8e63bd290537bfb14d57e538196 Author: Thomas Faber <[email protected]> AuthorDate: Sat Nov 30 11:02:06 2019 +0100 Commit: Thomas Faber <[email protected]> CommitDate: Sat Jan 18 13:10:35 2020 +0100 [SHELL] Add SHOpenFolderAndSelectItems to shlobj.h. --- dll/win32/browseui/shellfind/CFindFolder.cpp | 8 -------- dll/win32/shell32/CShellLink.cpp | 7 ------- dll/win32/shell32/shlfolder.cpp | 2 +- sdk/include/psdk/shlobj.h | 8 ++++++++ 4 files changed, 9 insertions(+), 16 deletions(-) diff --git a/dll/win32/browseui/shellfind/CFindFolder.cpp b/dll/win32/browseui/shellfind/CFindFolder.cpp index 5509f38f78b..19814517bb2 100644 --- a/dll/win32/browseui/shellfind/CFindFolder.cpp +++ b/dll/win32/browseui/shellfind/CFindFolder.cpp @@ -10,14 +10,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(shellfind); -// FIXME: Remove this declaration after the function has been fully implemented -EXTERN_C HRESULT -WINAPI -SHOpenFolderAndSelectItems(LPITEMIDLIST pidlFolder, - UINT cidl, - PCUITEMID_CHILD_ARRAY apidl, - DWORD dwFlags); - static HRESULT SHELL32_CoCreateInitSF(LPCITEMIDLIST pidlRoot, PERSIST_FOLDER_TARGET_INFO* ppfti, LPCITEMIDLIST pidlChild, const GUID* clsid, REFIID riid, LPVOID *ppvOut) { diff --git a/dll/win32/shell32/CShellLink.cpp b/dll/win32/shell32/CShellLink.cpp index 90f2140a9c5..047813cfaab 100644 --- a/dll/win32/shell32/CShellLink.cpp +++ b/dll/win32/shell32/CShellLink.cpp @@ -2769,13 +2769,6 @@ INT_PTR CALLBACK ExtendedShortcutProc(HWND hwndDlg, UINT uMsg, return FALSE; } -EXTERN_C HRESULT -WINAPI -SHOpenFolderAndSelectItems(LPITEMIDLIST pidlFolder, - UINT cidl, - PCUITEMID_CHILD_ARRAY apidl, - DWORD dwFlags); - /************************************************************************** * SH_GetTargetTypeByPath * diff --git a/dll/win32/shell32/shlfolder.cpp b/dll/win32/shell32/shlfolder.cpp index f652378616e..471973516ee 100644 --- a/dll/win32/shell32/shlfolder.cpp +++ b/dll/win32/shell32/shlfolder.cpp @@ -386,7 +386,7 @@ HRESULT WINAPI SHCreateLinks( HWND hWnd, LPCSTR lpszDir, IDataObject * lpDataObj */ EXTERN_C HRESULT WINAPI -SHOpenFolderAndSelectItems(LPITEMIDLIST pidlFolder, +SHOpenFolderAndSelectItems(PCIDLIST_ABSOLUTE pidlFolder, UINT cidl, PCUITEMID_CHILD_ARRAY apidl, DWORD dwFlags) diff --git a/sdk/include/psdk/shlobj.h b/sdk/include/psdk/shlobj.h index a425b21bc79..82df46527fe 100644 --- a/sdk/include/psdk/shlobj.h +++ b/sdk/include/psdk/shlobj.h @@ -320,6 +320,14 @@ SHObjectProperties( _In_ LPCWSTR, _In_opt_ LPCWSTR); +HRESULT +WINAPI +SHOpenFolderAndSelectItems( + _In_ PCIDLIST_ABSOLUTE pidlFolder, + _In_ UINT cidl, + _In_reads_opt_(cidl) PCUITEMID_CHILD_ARRAY, + _In_ DWORD); + #define PCS_FATAL 0x80000000 #define PCS_REPLACEDCHAR 0x00000001 #define PCS_REMOVEDCHAR 0x00000002
