Paul Vriens : shlwapi/tests: Load shell32 explicitly.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: eaa6376e64f1de887153b9d23ac3bdd922763cfb
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=eaa6376e64f1de887153b9d23a...

Author: Paul Vriens 
Date:   Thu Jul 22 15:13:06 2010 +0200

shlwapi/tests: Load shell32 explicitly.

---

dlls/shlwapi/tests/Makefile.in |    2 +-
 dlls/shlwapi/tests/ordinal.c   |   11 ++++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/dlls/shlwapi/tests/Makefile.in b/dlls/shlwapi/tests/Makefile.in
index a810f84..e3f9b94 100644
--- a/dlls/shlwapi/tests/Makefile.in
+++ b/dlls/shlwapi/tests/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = shlwapi.dll
-IMPORTS   = shell32 shlwapi user32 ole32 oleaut32 advapi32
+IMPORTS   = shlwapi user32 ole32 oleaut32 advapi32

C_SRCS = \
    assoc.c \
diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c
index 88165ef..d60effd 100644
--- a/dlls/shlwapi/tests/ordinal.c
+++ b/dlls/shlwapi/tests/ordinal.c
@@ -64,6 +64,9 @@ static BOOL    (WINAPI *pSHSetIniStringW)(LPCWSTR, LPCWSTR, LPCWSTR, LPCWSTR);
 static HMODULE hmlang;
 static HRESULT (WINAPI *pLcidToRfc1766A)(LCID, LPSTR, INT);

+static HMODULE hshell32;
+static HRESULT (WINAPI *pSHGetDesktopFolder)(IShellFolder**);
+
 static const CHAR ie_international[] = {
     'S','o','f','t','w','a','r','e','\',
     'M','i','c','r','o','s','o','f','t','\',
@@ -2514,7 +2517,7 @@ static void test_SHIShellFolder_EnumObjects(void)
     ok(enm == (IEnumIDList*)0xcafebabe, "Didn't get expected enumerator location, instead: %p\n", enm);

/* SHIShellFolder_EnumObjects isn't strict about the IShellFolder object */
-    hres = SHGetDesktopFolder(&folder);
+    hres = pSHGetDesktopFolder(&folder);
     ok(hres == S_OK, "SHGetDesktopFolder failed: 0x%08x\n", hres);

enm = NULL;
@@ -2696,6 +2699,9 @@ START_TEST(ordinal)
     hmlang = LoadLibraryA("mlang.dll");
     pLcidToRfc1766A = (void *)GetProcAddress(hmlang, "LcidToRfc1766A");

+    hshell32 = LoadLibraryA("shell32.dll");
+    pSHGetDesktopFolder = (void *)GetProcAddress(hshell32, "SHGetDesktopFolder");
+
     test_GetAcceptLanguagesA();
     test_SHSearchMapInt();
     test_alloc_shared();
@@ -2714,4 +2720,7 @@ START_TEST(ordinal)
     test_SHIShellFolder_EnumObjects();
     test_SHGetIniString();
     test_SHSetIniString();
+
+    FreeLibrary(hshell32);
+    FreeLibrary(hmlang);
 }