[PATCH 3/3] Fix a crash on shell32 < 5.0

[Paul Vriens]

---
 dlls/shell32/tests/shlview.c |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/dlls/shell32/tests/shlview.c b/dlls/shell32/tests/shlview.c
index 59716d5..f1811c1 100644
--- a/dlls/shell32/tests/shlview.c
+++ b/dlls/shell32/tests/shlview.c
@@ -574,9 +574,14 @@ static void test_IShellFolderView(void)
         return;
     }
 
-    /* ::MoveIcons */
-    hr = IShellFolderView_MoveIcons(folderview, NULL);
-    ok(hr == E_NOTIMPL, "got (0x%08x)\n", hr);
+    if (GetProcAddress(GetModuleHandleA("shell32.dll"), "SHGetFolderLocation"))
+    {
+        /* ::MoveIcons */
+        hr = IShellFolderView_MoveIcons(folderview, NULL);
+        ok(hr == E_NOTIMPL, "got (0x%08x)\n", hr);
+    }
+    else
+        win_skip("MoveIcons test crashes on shell32 < 5.0\n");
 
     /* ::SetRedraw without list created */
     hr = IShellFolderView_SetRedraw(folderview, TRUE);
-- 
1.6.2.5


--------------030907080201030006020007--