marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

- Move test init code back to START_TEST(shlfolder). 

- Move creation and cleanup of a test-folders nearer to
  test_EnumObjects.
oldstable
Saulius Krasuckas 2005-06-22 18:04:04 +00:00 committed by Alexandre Julliard
parent 8af1ce0ba1
commit 77577822e3
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -455,8 +455,6 @@ static void test_EnumObjects_and_CompareIDs(void)
WCHAR cCurrDirW [MAX_PATH];
static const WCHAR cTestDirW[] = {'\\','t','e','s','t','d','i','r',0};
HRESULT hr;
init_function_pointers();
GetCurrentDirectoryA(MAX_PATH, cCurrDirA);
MultiByteToWideChar(CP_ACP, 0, cCurrDirA, -1, cCurrDirW, MAX_PATH);
@ -467,29 +465,31 @@ static void test_EnumObjects_and_CompareIDs(void)
hr = SHGetMalloc(&ppM);
ok(hr == S_OK, "SHGetMalloc failed %08lx\n", hr);
CreateFilesFolders();
hr = SHGetDesktopFolder(&IDesktopFolder);
ok(hr == S_OK, "SHGetDesktopfolder failed %08lx\n", hr);
CreateFilesFolders();
hr = IShellFolder_ParseDisplayName(IDesktopFolder, NULL, NULL, cCurrDirW, NULL, &newPIDL, 0);
ok(hr == S_OK, "ParseDisplayName failed %08lx\n", hr);
hr = IShellFolder_BindToObject(IDesktopFolder, newPIDL, NULL, (REFIID)&IID_IShellFolder, (LPVOID *)&testIShellFolder);
ok(hr == S_OK, "BindToObject failed %08lx\n", hr);
test_EnumObjects(testIShellFolder);
hr = IShellFolder_Release(testIShellFolder);
ok(hr == S_OK, "IShellFolder_Release failed %08lx\n", hr);
IMalloc_Free(ppM, newPIDL);
Cleanup();
IMalloc_Free(ppM, newPIDL);
}
START_TEST(shlfolder)
{
init_function_pointers();
test_EnumObjects_and_CompareIDs();
test_BindToObject();
test_GetDisplayName();