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

shell32: Allow updating knownfolder definitions.

Browse Source
This commit is contained in:
Andrew Eikum 2015-03-17 10:03:13 -05:00 committed by Alexandre Julliard
parent 2a5886974d
commit 7c9151c1e6
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dlls/shell32/shellpath.c
View File

@ -3931,9 +3931,6 @@ static HRESULT WINAPI foldermanager_RegisterFolder(
if(SUCCEEDED(hr)) if(SUCCEEDED(hr))
{ {
if(dwDisp == REG_OPENED_EXISTING_KEY)
hr = E_FAIL;
if(SUCCEEDED(hr)) if(SUCCEEDED(hr))
hr = HRESULT_FROM_WIN32(RegSetValueExW(hKey, szCategory, 0, REG_DWORD, (LPBYTE)&pKFD->category, sizeof(pKFD->category))); hr = HRESULT_FROM_WIN32(RegSetValueExW(hKey, szCategory, 0, REG_DWORD, (LPBYTE)&pKFD->category, sizeof(pKFD->category)));

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

@ -2458,6 +2458,26 @@ static void test_knownFolders(void)
hr = IKnownFolder_Release(folder); hr = IKnownFolder_Release(folder);
ok(hr == S_OK, "failed to release KnownFolder instance: 0x%08x\n", hr); ok(hr == S_OK, "failed to release KnownFolder instance: 0x%08x\n", hr);
/* update the folder */
CoTaskMemFree(kfDefinition.pszName);
kfDefinition.pszName = CoTaskMemAlloc(sizeof(sExample2));
lstrcpyW(kfDefinition.pszName, sExample2);
hr = IKnownFolderManager_RegisterFolder(mgr, &newFolderId, &kfDefinition);
ok(hr == S_OK, "failed to re-register known folder: 0x%08x\n", hr);
hr = IKnownFolderManager_GetFolder(mgr, &newFolderId, &folder);
ok(hr == S_OK, "failed to get known folder: 0x%08x\n", hr);
hr = IKnownFolder_GetFolderDefinition(folder, &kfSubDefinition);
ok(hr == S_OK, "failed to get folder definition: 0x%08x\n", hr);
ok(!memcmp(kfDefinition.pszName, kfSubDefinition.pszName, sizeof(sExample2)),
"Got wrong updated name: %s\n", wine_dbgstr_w(kfSubDefinition.pszName));
FreeKnownFolderDefinitionFields(&kfSubDefinition);
hr = IKnownFolder_Release(folder);
ok(hr == S_OK, "failed to release KnownFolder instance: 0x%08x\n", hr);
} }
hr = IKnownFolderManager_UnregisterFolder(mgr, &newFolderId); hr = IKnownFolderManager_UnregisterFolder(mgr, &newFolderId);