ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

shell32: Partially implement SHGetKnownFolderIDList().

This commit is contained in:
Nikolay Sivov 2015-05-09 21:46:56 +03:00 committed by Alexandre Julliard
parent 4367f4b230
commit 80d28abdc8
2 changed files with 77 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
dlls/shell32/shellpath.c
View File

@ -5727,8 +5727,48 @@ HRESULT WINAPI KnownFolderManager_Constructor( IUnknown *punk, REFIID riid, void
HRESULT WINAPI SHGetKnownFolderIDList(REFKNOWNFOLDERID rfid, DWORD flags, HANDLE token, PIDLIST_ABSOLUTE *pidl)
{
FIXME("%s, 0x%08x, %p, %p\n", debugstr_guid(rfid), flags, token, pidl);
return E_NOTIMPL;
TRACE("%s, 0x%08x, %p, %p\n", debugstr_guid(rfid), flags, token, pidl);
if (!pidl)
return E_INVALIDARG;
if (flags)
FIXME("unsupported flags: 0x%08x\n", flags);
if (token)
FIXME("user token is not used.\n");
*pidl = NULL;
if (IsEqualIID(rfid, &FOLDERID_Desktop))
*pidl = _ILCreateDesktop();
else if (IsEqualIID(rfid, &FOLDERID_RecycleBinFolder))
*pidl = _ILCreateBitBucket();
else if (IsEqualIID(rfid, &FOLDERID_ComputerFolder))
*pidl = _ILCreateMyComputer();
else if (IsEqualIID(rfid, &FOLDERID_PrintersFolder))
*pidl = _ILCreatePrinters();
else if (IsEqualIID(rfid, &FOLDERID_ControlPanelFolder))
*pidl = _ILCreateControlPanel();
else if (IsEqualIID(rfid, &FOLDERID_NetworkFolder))
*pidl = _ILCreateNetwork();
else if (IsEqualIID(rfid, &FOLDERID_Documents))
*pidl = _ILCreateMyDocuments();
else
{
DWORD attributes = 0;
WCHAR *pathW;
HRESULT hr;
hr = SHGetKnownFolderPath(rfid, flags, token, &pathW);
if (FAILED(hr))
return hr;
hr = SHILCreateFromPathW(pathW, pidl, &attributes);
CoTaskMemFree(pathW);
return hr;
}
return *pidl ? S_OK : E_FAIL;
}
HRESULT WINAPI SHGetKnownFolderItem(REFKNOWNFOLDERID rfid, KNOWN_FOLDER_FLAG flags, HANDLE hToken,

35
dlls/shell32/tests/shellpath.c
View File

@ -102,6 +102,7 @@ static HRESULT (WINAPI *pSHGetKnownFolderPath)(REFKNOWNFOLDERID, DWORD, HANDLE,
static HRESULT (WINAPI *pSHSetKnownFolderPath)(REFKNOWNFOLDERID, DWORD, HANDLE, PWSTR);
static HRESULT (WINAPI *pSHGetFolderPathEx)(REFKNOWNFOLDERID, DWORD, HANDLE, LPWSTR, DWORD);
static BOOL (WINAPI *pPathYetAnotherMakeUniqueName)(PWSTR, PCWSTR, PCWSTR, PCWSTR);
static HRESULT (WINAPI *pSHGetKnownFolderIDList)(REFKNOWNFOLDERID, DWORD, HANDLE, PIDLIST_ABSOLUTE*);
static DLLVERSIONINFO shellVersion = { 0 };
static LPMALLOC pMalloc;
@ -209,6 +210,7 @@ static void loadShell32(void)
GET_PROC(SHFileOperationA)
GET_PROC(SHGetMalloc)
GET_PROC(PathYetAnotherMakeUniqueName)
GET_PROC(SHGetKnownFolderIDList)
ok(pSHGetMalloc != NULL, "shell32 is missing SHGetMalloc\n");
if (pSHGetMalloc)
@ -2728,6 +2730,38 @@ if (0)
ok(!lstrcmpW(nameW, buffW), "got %s, expected %s\n", wine_dbgstr_w(nameW), wine_dbgstr_w(buffW));
}
static void test_SHGetKnownFolderIDList(void)
{
PIDLIST_ABSOLUTE pidl;
HRESULT hr;
if (!pSHGetKnownFolderIDList)
{
win_skip("SHGetKnownFolderIDList is not available.\n");
return;
}
hr = pSHGetKnownFolderIDList(NULL, 0, NULL, NULL);
ok(hr == E_INVALIDARG, "got 0x%08x\n", hr);
if (0) { /* crashes on native */
pidl = (void*)0xdeadbeef;
hr = pSHGetKnownFolderIDList(NULL, 0, NULL, &pidl);
}
/* not a known folder */
pidl = (void*)0xdeadbeef;
hr = pSHGetKnownFolderIDList(&IID_IUnknown, 0, NULL, &pidl);
ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "got 0x%08x\n", hr);
ok(pidl == NULL, "got %p\n", pidl);
hr = pSHGetKnownFolderIDList(&FOLDERID_Desktop, 0, NULL, NULL);
ok(hr == E_INVALIDARG, "got 0x%08x\n", hr);
hr = pSHGetKnownFolderIDList(&FOLDERID_Desktop, 0, NULL, &pidl);
ok(hr == S_OK, "got 0x%08x\n", hr);
CoTaskMemFree(pidl);
}
START_TEST(shellpath)
{
if (!init()) return;
@ -2757,5 +2791,6 @@ START_TEST(shellpath)
test_knownFolders();
test_DoEnvironmentSubst();
test_PathYetAnotherMakeUniqueName();
test_SHGetKnownFolderIDList();
}
}