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

shell32/tests: Added test for Desktop::ParseDisplayName(SHGetFolderPath(CSIDL_PERSONAL))

Browse Source 
Test if the Desktop Folder's ParseDisplayName recognizes MyDocument's
path.  Removed some HRESULT tests on IUnknown_Release calls, which
returns ULONG.
This commit is contained in:
Michael Jung 2006-02-24 22:24:12 +01:00 committed by Alexandre Julliard
parent b7e8057eec
commit 50f3eaef77
1 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
dlls/shell32/tests/shlfolder.c
View File

@ -81,6 +81,7 @@ static void test_ParseDisplayName(void)
DWORD res; DWORD res;
WCHAR cTestDirW [MAX_PATH] = {0}; WCHAR cTestDirW [MAX_PATH] = {0};
ITEMIDLIST *newPIDL; ITEMIDLIST *newPIDL;
BOOL bRes;
hr = SHGetDesktopFolder(&IDesktopFolder); hr = SHGetDesktopFolder(&IDesktopFolder);
if(hr != S_OK) return; if(hr != S_OK) return;
@ -103,8 +104,25 @@ static void test_ParseDisplayName(void)
ok((hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)) || (hr == E_FAIL) || (hr == E_INVALIDARG), ok((hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)) || (hr == E_FAIL) || (hr == E_INVALIDARG),
"ParseDisplayName returned %08lx, expected 80070002, E_FAIL or E_INVALIDARG\n", hr); "ParseDisplayName returned %08lx, expected 80070002, E_FAIL or E_INVALIDARG\n", hr);
hr = IShellFolder_Release(IDesktopFolder); /* I thought that perhaps the DesktopFolder's ParseDisplayName would recognize the
ok(hr == S_OK, "IShellFolder_Release failed %08lx\n", hr); * path corresponding to CSIDL_PERSONAL and return a CLSID_MyDocuments PIDL. Turns
* out it doesn't. The magic seems to happen in the file dialogs, then. */
if (!pSHGetSpecialFolderPathW || !pILFindLastID) goto finished;
bRes = pSHGetSpecialFolderPathW(NULL, cTestDirW, CSIDL_PERSONAL, FALSE);
ok(bRes, "SHGetSpecialFolderPath(CSIDL_PERSONAL) failed! %ld\n", GetLastError());
if (!bRes) goto finished;
hr = IShellFolder_ParseDisplayName(IDesktopFolder, NULL, NULL, cTestDirW, NULL, &newPIDL, 0);
ok(SUCCEEDED(hr), "DesktopFolder->ParseDisplayName failed. hr = %08lx.\n", hr);
if (FAILED(hr)) goto finished;
ok(pILFindLastID(newPIDL)->mkid.abID[0] == 0x31, "Last pidl should be of type "
"PT_FOLDER, but is: %02x\n", pILFindLastID(newPIDL)->mkid.abID[0]);
IMalloc_Free(ppM, newPIDL);
finished:
IShellFolder_Release(IDesktopFolder);
} }
/* creates a file with the specified name for tests */ /* creates a file with the specified name for tests */
@ -724,13 +742,11 @@ static void test_GetAttributesOf(void)
/* free memory */ /* free memory */
IMalloc_Free(ppM, newPIDL); IMalloc_Free(ppM, newPIDL);
hr = IShellFolder_Release(testIShellFolder); IShellFolder_Release(testIShellFolder);
ok(hr == S_OK, "IShellFolder_Release failed %08lx\n", hr);
Cleanup(); Cleanup();
hr = IShellFolder_Release(IDesktopFolder); IShellFolder_Release(IDesktopFolder);
ok(hr == S_OK, "IShellFolder_Release failed %08lx\n", hr);
} }
static void test_SHGetPathFromIDList(void) static void test_SHGetPathFromIDList(void)
@ -889,15 +905,13 @@ static void test_EnumObjects_and_CompareIDs(void)
test_EnumObjects(testIShellFolder); test_EnumObjects(testIShellFolder);
hr = IShellFolder_Release(testIShellFolder); IShellFolder_Release(testIShellFolder);
ok(hr == S_OK, "IShellFolder_Release failed %08lx\n", hr);
Cleanup(); Cleanup();
IMalloc_Free(ppM, newPIDL); IMalloc_Free(ppM, newPIDL);
hr = IShellFolder_Release(IDesktopFolder); IShellFolder_Release(IDesktopFolder);
ok(hr == S_OK, "IShellFolder_Release failed %08lx\n", hr);
} }
/* A simple implementation of an IPropertyBag, which returns fixed values for /* A simple implementation of an IPropertyBag, which returns fixed values for