shell32/tests: Make sure we test on Win95.

This commit is contained in:
Paul Vriens 2009-03-04 21:53:16 +01:00 committed by Alexandre Julliard
parent 575b93c5eb
commit b24e378f52
1 changed files with 6 additions and 7 deletions

View File

@ -707,7 +707,6 @@ static void test_GetAttributesOf(void)
char cCurrDirA [MAX_PATH] = {0};
WCHAR cCurrDirW [MAX_PATH];
static WCHAR cTestDirW[] = {'t','e','s','t','d','i','r',0};
static const WCHAR cBackSlash[] = {'\\',0};
IShellFolder *IDesktopFolder, *testIShellFolder;
ITEMIDLIST *newPIDL;
int len;
@ -768,19 +767,19 @@ static void test_GetAttributesOf(void)
IShellFolder_Release(psfMyComputer);
/* create test directory */
CreateFilesFolders();
GetCurrentDirectoryA(MAX_PATH, cCurrDirA);
len = lstrlenA(cCurrDirA);
if (len == 0) {
trace("GetCurrentDirectoryA returned empty string. Skipping test_EnumObjects_and_CompareIDs\n");
win_skip("GetCurrentDirectoryA returned empty string. Skipping test_GetAttributesOf\n");
return;
}
if(cCurrDirA[len-1] == '\\')
cCurrDirA[len-1] = 0;
/* create test directory */
CreateFilesFolders();
MultiByteToWideChar(CP_ACP, 0, cCurrDirA, -1, cCurrDirW, MAX_PATH);
hr = SHGetDesktopFolder(&IDesktopFolder);
@ -808,8 +807,8 @@ static void test_GetAttributesOf(void)
IMalloc_Free(ppM, newPIDL);
/* append testdirectory name to path */
lstrcatW(cCurrDirW, cBackSlash);
lstrcatW(cCurrDirW, cTestDirW);
lstrcatA(cCurrDirA, "\\testdir");
MultiByteToWideChar(CP_ACP, 0, cCurrDirA, -1, cCurrDirW, MAX_PATH);
hr = IShellFolder_ParseDisplayName(IDesktopFolder, NULL, NULL, cCurrDirW, NULL, &newPIDL, 0);
ok(hr == S_OK, "ParseDisplayName failed %08x\n", hr);