Paul Vriens : oleaut32/tests: Use GetModuleHandle and add a few
skip's.
Alexandre Julliard
julliard at wine.codeweavers.com
Mon Aug 20 07:42:34 CDT 2007
Module: wine
Branch: master
Commit: 9b396275ad637697815e24582f7420088a7baf83
URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b396275ad637697815e24582f7420088a7baf83
Author: Paul Vriens <paul.vriens.wine at gmail.com>
Date: Fri Aug 17 14:10:32 2007 +0200
oleaut32/tests: Use GetModuleHandle and add a few skip's.
---
dlls/oleaut32/tests/olefont.c | 5 ++++-
dlls/oleaut32/tests/olepicture.c | 5 ++++-
dlls/oleaut32/tests/safearray.c | 2 +-
dlls/oleaut32/tests/varformat.c | 2 +-
dlls/oleaut32/tests/vartype.c | 5 +----
5 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/dlls/oleaut32/tests/olefont.c b/dlls/oleaut32/tests/olefont.c
index 69621cf..1e6678b 100644
--- a/dlls/oleaut32/tests/olefont.c
+++ b/dlls/oleaut32/tests/olefont.c
@@ -798,10 +798,13 @@ static void test_AddRefHfont(void)
START_TEST(olefont)
{
- hOleaut32 = LoadLibraryA("oleaut32.dll");
+ hOleaut32 = GetModuleHandleA("oleaut32.dll");
pOleCreateFontIndirect = (void*)GetProcAddress(hOleaut32, "OleCreateFontIndirect");
if (!pOleCreateFontIndirect)
+ {
+ skip("OleCreateFontIndirect not available\n");
return;
+ }
test_QueryInterface();
test_type_info();
diff --git a/dlls/oleaut32/tests/olepicture.c b/dlls/oleaut32/tests/olepicture.c
index 00027de..99cefd2 100644
--- a/dlls/oleaut32/tests/olepicture.c
+++ b/dlls/oleaut32/tests/olepicture.c
@@ -426,11 +426,14 @@ static void test_OleCreatePictureIndirect(void)
START_TEST(olepicture)
{
- hOleaut32 = LoadLibraryA("oleaut32.dll");
+ hOleaut32 = GetModuleHandleA("oleaut32.dll");
pOleLoadPicture = (void*)GetProcAddress(hOleaut32, "OleLoadPicture");
pOleCreatePictureIndirect = (void*)GetProcAddress(hOleaut32, "OleCreatePictureIndirect");
if (!pOleLoadPicture)
+ {
+ skip("OleLoadPicture is not available\n");
return;
+ }
/* Test regular 1x1 pixel images of gif, jpg, bmp type */
test_pic(gifimage, sizeof(gifimage));
diff --git a/dlls/oleaut32/tests/safearray.c b/dlls/oleaut32/tests/safearray.c
index 429f08c..1857ab5 100644
--- a/dlls/oleaut32/tests/safearray.c
+++ b/dlls/oleaut32/tests/safearray.c
@@ -1682,7 +1682,7 @@ static void test_SafeArrayDestroyData (void)
START_TEST(safearray)
{
- hOleaut32 = LoadLibraryA("oleaut32.dll");
+ hOleaut32 = GetModuleHandleA("oleaut32.dll");
GETPTR(SafeArrayAllocDescriptorEx);
GETPTR(SafeArrayCopyData);
diff --git a/dlls/oleaut32/tests/varformat.c b/dlls/oleaut32/tests/varformat.c
index afec605..f7c7c28 100644
--- a/dlls/oleaut32/tests/varformat.c
+++ b/dlls/oleaut32/tests/varformat.c
@@ -394,7 +394,7 @@ static void test_VarFormat(void)
START_TEST(varformat)
{
- hOleaut32 = LoadLibraryA("oleaut32.dll");
+ hOleaut32 = GetModuleHandleA("oleaut32.dll");
test_VarFormatNumber();
test_VarFormat();
diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c
index d6f2693..49106ff 100644
--- a/dlls/oleaut32/tests/vartype.c
+++ b/dlls/oleaut32/tests/vartype.c
@@ -5765,10 +5765,7 @@ static void test_ChangeType_keep_dst(void)
START_TEST(vartype)
{
- hOleaut32 = LoadLibraryA("oleaut32.dll");
- ok(hOleaut32 != 0, "Failed to load oleaut32.dll\n");
- if (!hOleaut32)
- return;
+ hOleaut32 = GetModuleHandleA("oleaut32.dll");
trace("LCID's: System=0x%08x, User=0x%08x\n", GetSystemDefaultLCID(),
GetUserDefaultLCID());
More information about the wine-cvs
mailing list