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

shell32/tests: Skip interactive part of SetNameOf test on Win2k. 

Passing an absolute path to SetNameOf on Win2k display an error
message box about invalid characters in filename, forcing interaction
during test.
This commit is contained in:
Nicolas Le Cam 2009-04-07 19:15:35 +02:00 committed by Alexandre Julliard
parent 1f52f12f3c
commit eb57396fc6
1 changed files with 32 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -473,7 +473,7 @@ static void test_GetDisplayName(void)
IShellFolder_Release(psfFile);
}
if(!pSHBindToParent)
if (!pSHBindToParent)
{
win_skip("SHBindToParent is missing\n");
DeleteFileA(szTestFile);
@ -482,6 +482,8 @@ static void test_GetDisplayName(void)
}
/* Some tests for IShellFolder::SetNameOf */
if (pSHGetFolderPathAndSubDirA)
{
hr = pSHBindToParent(pidlTestFile, &IID_IShellFolder, (VOID**)&psfPersonal, &pidlLast);
ok(SUCCEEDED(hr), "SHBindToParent failed! hr = %08x\n", hr);
if (SUCCEEDED(hr)) {
@ -492,7 +494,7 @@ static void test_GetDisplayName(void)
/* The pidl returned through the last parameter of SetNameOf is a simple one. */
hr = IShellFolder_SetNameOf(psfPersonal, NULL, pidlLast, wszDirName, SHGDN_NORMAL, &pidlNew);
ok (SUCCEEDED(hr), "SetNameOf failed! hr = %08x\n", hr);
if(hr == S_OK)
if (hr == S_OK)
{
ok (((LPITEMIDLIST)((LPBYTE)pidlNew+pidlNew->mkid.cb))->mkid.cb == 0,
"pidl returned from SetNameOf should be simple!\n");
@ -513,6 +515,9 @@ static void test_GetDisplayName(void)
IShellFolder_Release(psfPersonal);
}
}
else
win_skip("Avoid needs of interaction on Win2k\n");
/* Deleting the file and the directory */
DeleteFileA(szTestFile);