ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Rob Shearman 2009-12-01 13:13:40 +00:00 committed by Alexandre Julliard
parent 58c7aa4691
commit f7624cbfbc
1 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
dlls/oleaut32/tests/olefont.c
View File

@ -491,8 +491,6 @@ static void test_Invoke(void)
static void test_IsEqual(void) static void test_IsEqual(void)
{ {
FONTDESC fd; FONTDESC fd;
LPVOID pvObj = NULL;
LPVOID pvObj2 = NULL;
IFont* ifnt = NULL; IFont* ifnt = NULL;
IFont* ifnt2 = NULL; IFont* ifnt2 = NULL;
HRESULT hres; HRESULT hres;
@ -509,12 +507,10 @@ static void test_IsEqual(void)
fd.fStrikethrough = 0; fd.fStrikethrough = 0;
/* Create font */ /* Create font */
pOleCreateFontIndirect(&fd, &IID_IFont, &pvObj); pOleCreateFontIndirect(&fd, &IID_IFont, (void **)&ifnt);
ifnt = pvObj;
/* Test equal fonts */ /* Test equal fonts */
pOleCreateFontIndirect(&fd, &IID_IFont, &pvObj2); pOleCreateFontIndirect(&fd, &IID_IFont, (void **)&ifnt2);
ifnt2 = pvObj2;
hres = IFont_IsEqual(ifnt,ifnt2); hres = IFont_IsEqual(ifnt,ifnt2);
ok(hres == S_OK, ok(hres == S_OK,
"IFont_IsEqual: (EQUAL) Expected S_OK but got 0x%08x\n",hres); "IFont_IsEqual: (EQUAL) Expected S_OK but got 0x%08x\n",hres);
@ -527,7 +523,7 @@ static void test_IsEqual(void)
/* Test strName */ /* Test strName */
fd.lpstrName = arial_font; fd.lpstrName = arial_font;
pOleCreateFontIndirect(&fd, &IID_IFont, &pvObj2); pOleCreateFontIndirect(&fd, &IID_IFont, (void **)&ifnt2);
hres = IFont_IsEqual(ifnt,ifnt2); hres = IFont_IsEqual(ifnt,ifnt2);
ok(hres == S_FALSE, ok(hres == S_FALSE,
"IFont_IsEqual: (strName) Expected S_FALSE but got 0x%08x\n",hres); "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 */ /* Test lo font size */
S(fd.cySize).Lo = 10000; S(fd.cySize).Lo = 10000;
pOleCreateFontIndirect(&fd, &IID_IFont, &pvObj2); pOleCreateFontIndirect(&fd, &IID_IFont, (void **)&ifnt2);
ifnt2 = pvObj2;
hres = IFont_IsEqual(ifnt,ifnt2); hres = IFont_IsEqual(ifnt,ifnt2);
ok(hres == S_FALSE, ok(hres == S_FALSE,
"IFont_IsEqual: (Lo font size) Expected S_FALSE but got 0x%08x\n",hres); "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 */ /* Test hi font size */
S(fd.cySize).Hi = 10000; S(fd.cySize).Hi = 10000;
pOleCreateFontIndirect(&fd, &IID_IFont, &pvObj2); pOleCreateFontIndirect(&fd, &IID_IFont, (void **)&ifnt2);
ifnt2 = pvObj2;
hres = IFont_IsEqual(ifnt,ifnt2); hres = IFont_IsEqual(ifnt,ifnt2);
ok(hres == S_FALSE, ok(hres == S_FALSE,
"IFont_IsEqual: (Hi font size) Expected S_FALSE but got 0x%08x\n",hres); "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 */ /* Test font weight */
fd.sWeight = 100; fd.sWeight = 100;
pOleCreateFontIndirect(&fd, &IID_IFont, &pvObj2); pOleCreateFontIndirect(&fd, &IID_IFont, (void **)&ifnt2);
ifnt2 = pvObj2;
hres = IFont_IsEqual(ifnt,ifnt2); hres = IFont_IsEqual(ifnt,ifnt2);
ok(hres == S_FALSE, ok(hres == S_FALSE,
"IFont_IsEqual: (Weight) Expected S_FALSE but got 0x%08x\n",hres); "IFont_IsEqual: (Weight) Expected S_FALSE but got 0x%08x\n",hres);
@ -566,7 +559,7 @@ static void test_IsEqual(void)
/* Test charset */ /* Test charset */
fd.sCharset = 1; fd.sCharset = 1;
pOleCreateFontIndirect(&fd, &IID_IFont, &pvObj2); pOleCreateFontIndirect(&fd, &IID_IFont, (void **)&ifnt2);
hres = IFont_IsEqual(ifnt,ifnt2); hres = IFont_IsEqual(ifnt,ifnt2);
ok(hres == S_FALSE, ok(hres == S_FALSE,
"IFont_IsEqual: (Charset) Expected S_FALSE but got 0x%08x\n",hres); "IFont_IsEqual: (Charset) Expected S_FALSE but got 0x%08x\n",hres);
@ -575,7 +568,7 @@ static void test_IsEqual(void)
/* Test italic setting */ /* Test italic setting */
fd.fItalic = 1; fd.fItalic = 1;
pOleCreateFontIndirect(&fd, &IID_IFont, &pvObj2); pOleCreateFontIndirect(&fd, &IID_IFont, (void **)&ifnt2);
hres = IFont_IsEqual(ifnt,ifnt2); hres = IFont_IsEqual(ifnt,ifnt2);
ok(hres == S_FALSE, ok(hres == S_FALSE,
"IFont_IsEqual: (Italic) Expected S_FALSE but got 0x%08x\n",hres); "IFont_IsEqual: (Italic) Expected S_FALSE but got 0x%08x\n",hres);
@ -584,7 +577,7 @@ static void test_IsEqual(void)
/* Test underline setting */ /* Test underline setting */
fd.fUnderline = 1; fd.fUnderline = 1;
pOleCreateFontIndirect(&fd, &IID_IFont, &pvObj2); pOleCreateFontIndirect(&fd, &IID_IFont, (void **)&ifnt2);
hres = IFont_IsEqual(ifnt,ifnt2); hres = IFont_IsEqual(ifnt,ifnt2);
ok(hres == S_FALSE, ok(hres == S_FALSE,
"IFont_IsEqual: (Underline) Expected S_FALSE but got 0x%08x\n",hres); "IFont_IsEqual: (Underline) Expected S_FALSE but got 0x%08x\n",hres);
@ -593,7 +586,7 @@ static void test_IsEqual(void)
/* Test strikethrough setting */ /* Test strikethrough setting */
fd.fStrikethrough = 1; fd.fStrikethrough = 1;
pOleCreateFontIndirect(&fd, &IID_IFont, &pvObj2); pOleCreateFontIndirect(&fd, &IID_IFont, (void **)&ifnt2);
hres = IFont_IsEqual(ifnt,ifnt2); hres = IFont_IsEqual(ifnt,ifnt2);
ok(hres == S_FALSE, ok(hres == S_FALSE,
"IFont_IsEqual: (Strikethrough) Expected S_FALSE but got 0x%08x\n",hres); "IFont_IsEqual: (Strikethrough) Expected S_FALSE but got 0x%08x\n",hres);