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 4b1690a..ef8845b 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -62,6 +62,9 @@ static HRESULT (WINAPI *pSHIShellFolder_EnumObjects)(LPSHELLFOLDER, HWND, SHCONT 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','\\', @@ -2505,7 +2508,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; @@ -2554,6 +2557,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(); @@ -2570,4 +2576,7 @@ START_TEST(ordinal) test_IUnknown_ProfferService(); test_SHCreateWorkerWindowA(); test_SHIShellFolder_EnumObjects(); + + FreeLibrary(hshell32); + FreeLibrary(hmlang); }