shell32: Stop shlfolder tests crashing under win98.
This commit is contained in:
parent
185ad65d12
commit
996e5d62b8
|
@ -432,6 +432,12 @@ static void test_GetDisplayName(void)
|
||||||
if (SUCCEEDED(hr)) {
|
if (SUCCEEDED(hr)) {
|
||||||
IShellFolder_Release(psfFile);
|
IShellFolder_Release(psfFile);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if(!pSHBindToParent)
|
||||||
|
{
|
||||||
|
skip("SHBindToParent is missing\n");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
/* Some tests for IShellFolder::SetNameOf */
|
/* Some tests for IShellFolder::SetNameOf */
|
||||||
hr = pSHBindToParent(pidlTestFile, &IID_IShellFolder, (VOID**)&psfPersonal, &pidlLast);
|
hr = pSHBindToParent(pidlTestFile, &IID_IShellFolder, (VOID**)&psfPersonal, &pidlLast);
|
||||||
|
@ -474,8 +480,6 @@ static void test_GetDisplayName(void)
|
||||||
ok (!lstrcmpiW(wszTestFile, wszTestFile2), "SHGetPathFromIDListW returns incorrect path!\n");
|
ok (!lstrcmpiW(wszTestFile, wszTestFile2), "SHGetPathFromIDListW returns incorrect path!\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
if(!pSHBindToParent) return;
|
|
||||||
|
|
||||||
/* SHBindToParent fails, if called with a NULL PIDL. */
|
/* SHBindToParent fails, if called with a NULL PIDL. */
|
||||||
hr = pSHBindToParent(NULL, &IID_IShellFolder, (VOID**)&psfPersonal, &pidlLast);
|
hr = pSHBindToParent(NULL, &IID_IShellFolder, (VOID**)&psfPersonal, &pidlLast);
|
||||||
ok (FAILED(hr), "SHBindToParent(NULL) should fail!\n");
|
ok (FAILED(hr), "SHBindToParent(NULL) should fail!\n");
|
||||||
|
|
Loading…
Reference in New Issue