Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-cw
Commits
00aeadc6
Commit
00aeadc6
authored
Jan 17, 2014
by
Erich E. Hoover
Committed by
Alexandre Julliard
Feb 04, 2014
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
oleaut32: Fix OLEFontImpl_SetRatio return when either cyLogical or cyHimetric are 0.
parent
ba2ce9db
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
8 deletions
+5
-8
olefont.c
dlls/oleaut32/olefont.c
+1
-1
olefont.c
dlls/oleaut32/tests/olefont.c
+4
-7
No files found.
dlls/oleaut32/olefont.c
View file @
00aeadc6
...
...
@@ -1083,7 +1083,7 @@ static HRESULT WINAPI OLEFontImpl_SetRatio(
TRACE
(
"(%p)->(%d, %d)
\n
"
,
this
,
cyLogical
,
cyHimetric
);
if
(
cyLogical
==
0
||
cyHimetric
==
0
)
return
E_
INVALIDARG
;
return
E_
FAIL
;
/* cyLogical and cyHimetric both set to 1 is a special case that
does not change the scaling but also does not fail */
...
...
dlls/oleaut32/tests/olefont.c
View file @
00aeadc6
...
...
@@ -88,13 +88,10 @@ static void test_ifont_size(LONG lo_size, LONG hi_size,
test_name
,
hres
);
ok
(
pvObj
!=
NULL
,
"%s: OCFI returns NULL.
\n
"
,
test_name
);
/* If scaling ration specified, change ratio. */
if
(
ratio_logical
&&
ratio_himetric
)
{
hres
=
IFont_SetRatio
(
ifnt
,
ratio_logical
,
ratio_himetric
);
ok
(
hres
==
S_OK
,
"%s: IFont_SetRatio returns 0x%08x instead of S_OK.
\n
"
,
test_name
,
hres
);
}
/* Change the scaling ratio */
hres
=
IFont_SetRatio
(
ifnt
,
ratio_logical
,
ratio_himetric
);
ok
((
ratio_logical
&&
ratio_himetric
)
?
hres
==
S_OK
:
hres
==
E_FAIL
,
"%s: IFont_SetRatio unexpectedly returned 0x%08x.
\n
"
,
test_name
,
hres
);
/* Read back size. */
hres
=
IFont_get_Size
(
ifnt
,
&
psize
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment