oleaut32/tests: Use GetModuleHandle and add a few skip's.
This commit is contained in:
parent
e9ec5d4aff
commit
9b396275ad
|
@ -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();
|
||||
|
|
|
@ -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));
|
||||
|
|
|
@ -1682,7 +1682,7 @@ static void test_SafeArrayDestroyData (void)
|
|||
|
||||
START_TEST(safearray)
|
||||
{
|
||||
hOleaut32 = LoadLibraryA("oleaut32.dll");
|
||||
hOleaut32 = GetModuleHandleA("oleaut32.dll");
|
||||
|
||||
GETPTR(SafeArrayAllocDescriptorEx);
|
||||
GETPTR(SafeArrayCopyData);
|
||||
|
|
|
@ -394,7 +394,7 @@ static void test_VarFormat(void)
|
|||
|
||||
START_TEST(varformat)
|
||||
{
|
||||
hOleaut32 = LoadLibraryA("oleaut32.dll");
|
||||
hOleaut32 = GetModuleHandleA("oleaut32.dll");
|
||||
|
||||
test_VarFormatNumber();
|
||||
test_VarFormat();
|
||||
|
|
|
@ -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());
|
||||
|
|
Loading…
Reference in New Issue