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.

shell32/tests: Skip interactive part of SetNameOf test on Win2k.
eb57396f · Nicolas Le Cam · Alexandre Julliard · 1f52f12f · eb57396f
Commit eb57396f authored Apr 07, 2009 by Nicolas Le Cam Committed by Alexandre Julliard Apr 09, 2009
Show whitespace changes
Inline Side-by-side

Showing with 7 additions and 2 deletions

shlfolder.c dlls/shell32/tests/shlfolder.c +7 -2

No files found.
--- a/dlls/shell32/tests/shlfolder.c
+++ b/dlls/shell32/tests/shlfolder.c
@@ -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);