Use function ptrs for call only present in later versions.

Fix tests that fail with old versions.

Use function ptrs for call only present in later versions.
19271d7a · Jon Griffiths · Alexandre Julliard · 0601f637 · 19271d7a · 19271d7a
Commit 19271d7a authored Mar 17, 2004 by Jon Griffiths Committed by Alexandre Julliard Mar 17, 2004
Expand all Show whitespace changes
Inline Side-by-side

Showing with 76 additions and 33 deletions

olefont.c dlls/oleaut32/tests/olefont.c +9 -1

safearray.c dlls/oleaut32/tests/safearray.c +67 -32

No files found.
--- a/dlls/oleaut32/tests/olefont.c
+++ b/dlls/oleaut32/tests/olefont.c
@@ -38,6 +38,9 @@
 #include <wtypes.h>
 #include <olectl.h>

+static HMODULE hOleaut32;
+
+static HRESULT (WINAPI *pOleCreateFontIndirect)(LPFONTDESC,REFIID,LPVOID*);

 START_TEST(olefont)
 {
@@ -45,7 +48,12 @@ START_TEST(olefont)
 	HRESULT hres;
 	IFont*	font = NULL;

-	hres = OleCreateFontIndirect(NULL, &IID_IFont, &pvObj);
+	hOleaut32 = LoadLibraryA("oleaut32.dll");    
+	pOleCreateFontIndirect = (void*)GetProcAddress(hOleaut32, "OleCreateFontIndirect");
+	if (!pOleCreateFontIndirect)
+	    return;
+
+	hres = pOleCreateFontIndirect(NULL, &IID_IFont, &pvObj);
 	font = pvObj;

 	ok(hres == S_OK,"OCFI (NULL,..) does not return 0, but 0x%08lx\n",hres);

--- a/dlls/oleaut32/tests/safearray.c
+++ b/dlls/oleaut32/tests/safearray.c