Rob Shearman : oleaut32: Remove LPVOID variables in olefont tests and pass IFont pointers into OleCreateFontIndirect directly .
Alexandre Julliard
julliard at winehq.org
Tue Dec 1 09:19:44 CST 2009
Module: wine
Branch: master
Commit: f7624cbfbc868601719722d6aa94621af0f98f92
URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7624cbfbc868601719722d6aa94621af0f98f92
Author: Rob Shearman <robertshearman at gmail.com>
Date: Tue Dec 1 13:13:40 2009 +0000
oleaut32: Remove LPVOID variables in olefont tests and pass IFont pointers into OleCreateFontIndirect directly.
In many places the assignment of the LPVOID variable into the
corresponding IFont * variable has been forgotten.
---
dlls/oleaut32/tests/olefont.c | 27 ++++++++++-----------------
1 files changed, 10 insertions(+), 17 deletions(-)
diff --git a/dlls/oleaut32/tests/olefont.c b/dlls/oleaut32/tests/olefont.c
index b457f36..55e0e58 100644
--- a/dlls/oleaut32/tests/olefont.c
+++ b/dlls/oleaut32/tests/olefont.c
@@ -491,8 +491,6 @@ static void test_Invoke(void)
static void test_IsEqual(void)
{
FONTDESC fd;
- LPVOID pvObj = NULL;
- LPVOID pvObj2 = NULL;
IFont* ifnt = NULL;
IFont* ifnt2 = NULL;
HRESULT hres;
@@ -509,12 +507,10 @@ static void test_IsEqual(void)
fd.fStrikethrough = 0;
/* Create font */
- pOleCreateFontIndirect(&fd, &IID_IFont, &pvObj);
- ifnt = pvObj;
+ pOleCreateFontIndirect(&fd, &IID_IFont, (void **)&ifnt);
/* Test equal fonts */
- pOleCreateFontIndirect(&fd, &IID_IFont, &pvObj2);
- ifnt2 = pvObj2;
+ pOleCreateFontIndirect(&fd, &IID_IFont, (void **)&ifnt2);
hres = IFont_IsEqual(ifnt,ifnt2);
ok(hres == S_OK,
"IFont_IsEqual: (EQUAL) Expected S_OK but got 0x%08x\n",hres);
@@ -527,7 +523,7 @@ static void test_IsEqual(void)
/* Test strName */
fd.lpstrName = arial_font;
- pOleCreateFontIndirect(&fd, &IID_IFont, &pvObj2);
+ pOleCreateFontIndirect(&fd, &IID_IFont, (void **)&ifnt2);
hres = IFont_IsEqual(ifnt,ifnt2);
ok(hres == S_FALSE,
"IFont_IsEqual: (strName) Expected S_FALSE but got 0x%08x\n",hres);
@@ -536,8 +532,7 @@ static void test_IsEqual(void)
/* Test lo font size */
S(fd.cySize).Lo = 10000;
- pOleCreateFontIndirect(&fd, &IID_IFont, &pvObj2);
- ifnt2 = pvObj2;
+ pOleCreateFontIndirect(&fd, &IID_IFont, (void **)&ifnt2);
hres = IFont_IsEqual(ifnt,ifnt2);
ok(hres == S_FALSE,
"IFont_IsEqual: (Lo font size) Expected S_FALSE but got 0x%08x\n",hres);
@@ -546,8 +541,7 @@ static void test_IsEqual(void)
/* Test hi font size */
S(fd.cySize).Hi = 10000;
- pOleCreateFontIndirect(&fd, &IID_IFont, &pvObj2);
- ifnt2 = pvObj2;
+ pOleCreateFontIndirect(&fd, &IID_IFont, (void **)&ifnt2);
hres = IFont_IsEqual(ifnt,ifnt2);
ok(hres == S_FALSE,
"IFont_IsEqual: (Hi font size) Expected S_FALSE but got 0x%08x\n",hres);
@@ -556,8 +550,7 @@ static void test_IsEqual(void)
/* Test font weight */
fd.sWeight = 100;
- pOleCreateFontIndirect(&fd, &IID_IFont, &pvObj2);
- ifnt2 = pvObj2;
+ pOleCreateFontIndirect(&fd, &IID_IFont, (void **)&ifnt2);
hres = IFont_IsEqual(ifnt,ifnt2);
ok(hres == S_FALSE,
"IFont_IsEqual: (Weight) Expected S_FALSE but got 0x%08x\n",hres);
@@ -566,7 +559,7 @@ static void test_IsEqual(void)
/* Test charset */
fd.sCharset = 1;
- pOleCreateFontIndirect(&fd, &IID_IFont, &pvObj2);
+ pOleCreateFontIndirect(&fd, &IID_IFont, (void **)&ifnt2);
hres = IFont_IsEqual(ifnt,ifnt2);
ok(hres == S_FALSE,
"IFont_IsEqual: (Charset) Expected S_FALSE but got 0x%08x\n",hres);
@@ -575,7 +568,7 @@ static void test_IsEqual(void)
/* Test italic setting */
fd.fItalic = 1;
- pOleCreateFontIndirect(&fd, &IID_IFont, &pvObj2);
+ pOleCreateFontIndirect(&fd, &IID_IFont, (void **)&ifnt2);
hres = IFont_IsEqual(ifnt,ifnt2);
ok(hres == S_FALSE,
"IFont_IsEqual: (Italic) Expected S_FALSE but got 0x%08x\n",hres);
@@ -584,7 +577,7 @@ static void test_IsEqual(void)
/* Test underline setting */
fd.fUnderline = 1;
- pOleCreateFontIndirect(&fd, &IID_IFont, &pvObj2);
+ pOleCreateFontIndirect(&fd, &IID_IFont, (void **)&ifnt2);
hres = IFont_IsEqual(ifnt,ifnt2);
ok(hres == S_FALSE,
"IFont_IsEqual: (Underline) Expected S_FALSE but got 0x%08x\n",hres);
@@ -593,7 +586,7 @@ static void test_IsEqual(void)
/* Test strikethrough setting */
fd.fStrikethrough = 1;
- pOleCreateFontIndirect(&fd, &IID_IFont, &pvObj2);
+ pOleCreateFontIndirect(&fd, &IID_IFont, (void **)&ifnt2);
hres = IFont_IsEqual(ifnt,ifnt2);
ok(hres == S_FALSE,
"IFont_IsEqual: (Strikethrough) Expected S_FALSE but got 0x%08x\n",hres);
More information about the wine-cvs
mailing list