Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
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-winehq
Commits
b4959154
Commit
b4959154
authored
May 28, 2015
by
Nikolay Sivov
Committed by
Alexandre Julliard
May 29, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
riched20: Switch font unit is not allowed.
parent
eecb7572
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
29 additions
and
0 deletions
+29
-0
richole.c
dlls/riched20/richole.c
+6
-0
richole.c
dlls/riched20/tests/richole.c
+23
-0
No files found.
dlls/riched20/richole.c
View file @
b4959154
...
@@ -2445,6 +2445,9 @@ static HRESULT WINAPI TextFont_Reset(ITextFont *iface, LONG value)
...
@@ -2445,6 +2445,9 @@ static HRESULT WINAPI TextFont_Reset(ITextFont *iface, LONG value)
This
->
set_cache_enabled
=
FALSE
;
This
->
set_cache_enabled
=
FALSE
;
textfont_apply_range_props
(
This
);
textfont_apply_range_props
(
This
);
break
;
break
;
case
tomUsePoints
:
case
tomUseTwips
:
return
E_INVALIDARG
;
default:
default:
FIXME
(
"reset mode %d not supported
\n
"
,
value
);
FIXME
(
"reset mode %d not supported
\n
"
,
value
);
}
}
...
@@ -2467,6 +2470,9 @@ static HRESULT WINAPI TextFont_Reset(ITextFont *iface, LONG value)
...
@@ -2467,6 +2470,9 @@ static HRESULT WINAPI TextFont_Reset(ITextFont *iface, LONG value)
case
tomTrackParms
:
case
tomTrackParms
:
case
tomCacheParms
:
case
tomCacheParms
:
return
S_OK
;
return
S_OK
;
case
tomUsePoints
:
case
tomUseTwips
:
return
E_INVALIDARG
;
}
}
}
}
...
...
dlls/riched20/tests/richole.c
View file @
b4959154
...
@@ -2141,6 +2141,12 @@ static void test_ITextFont(void)
...
@@ -2141,6 +2141,12 @@ static void test_ITextFont(void)
hr
=
ITextRange_GetFont
(
range
,
&
font
);
hr
=
ITextRange_GetFont
(
range
,
&
font
);
ok
(
hr
==
S_OK
,
"got 0x%08x
\n
"
,
hr
);
ok
(
hr
==
S_OK
,
"got 0x%08x
\n
"
,
hr
);
hr
=
ITextFont_Reset
(
font
,
tomUseTwips
);
ok
(
hr
==
E_INVALIDARG
,
"got 0x%08x
\n
"
,
hr
);
hr
=
ITextFont_Reset
(
font
,
tomUsePoints
);
ok
(
hr
==
E_INVALIDARG
,
"got 0x%08x
\n
"
,
hr
);
hr
=
ITextFont_GetName
(
font
,
NULL
);
hr
=
ITextFont_GetName
(
font
,
NULL
);
ok
(
hr
==
E_INVALIDARG
,
"got 0x%08x
\n
"
,
hr
);
ok
(
hr
==
E_INVALIDARG
,
"got 0x%08x
\n
"
,
hr
);
...
@@ -2176,6 +2182,23 @@ static void test_ITextFont(void)
...
@@ -2176,6 +2182,23 @@ static void test_ITextFont(void)
ok
(
position
==
twips_to_points
(
cf
.
yOffset
),
"got yOffset %d, position %.2f
\n
"
,
cf
.
yOffset
,
position
);
ok
(
position
==
twips_to_points
(
cf
.
yOffset
),
"got yOffset %d, position %.2f
\n
"
,
cf
.
yOffset
,
position
);
ok
(
kerning
==
twips_to_points
(
cf
.
wKerning
),
"got wKerning %d, kerning %.2f
\n
"
,
cf
.
wKerning
,
kerning
);
ok
(
kerning
==
twips_to_points
(
cf
.
wKerning
),
"got wKerning %d, kerning %.2f
\n
"
,
cf
.
wKerning
,
kerning
);
hr
=
ITextFont_Reset
(
font
,
tomUseTwips
);
ok
(
hr
==
E_INVALIDARG
,
"got 0x%08x
\n
"
,
hr
);
hr
=
ITextFont_Reset
(
font
,
tomUsePoints
);
ok
(
hr
==
E_INVALIDARG
,
"got 0x%08x
\n
"
,
hr
);
hr
=
ITextFont_GetDuplicate
(
font
,
&
font2
);
ok
(
hr
==
S_OK
,
"got 0x%08x
\n
"
,
hr
);
hr
=
ITextFont_Reset
(
font2
,
tomUseTwips
);
ok
(
hr
==
E_INVALIDARG
,
"got 0x%08x
\n
"
,
hr
);
hr
=
ITextFont_Reset
(
font2
,
tomUsePoints
);
ok
(
hr
==
E_INVALIDARG
,
"got 0x%08x
\n
"
,
hr
);
ITextFont_Release
(
font2
);
/* default font name */
/* default font name */
str
=
NULL
;
str
=
NULL
;
hr
=
ITextFont_GetName
(
font
,
&
str
);
hr
=
ITextFont_GetName
(
font
,
&
str
);
...
...
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