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
7eddb864
Commit
7eddb864
authored
Dec 08, 2014
by
Jacek Caban
Committed by
Alexandre Julliard
Dec 08, 2014
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mshtml: Allow setting fontWeight to empty string.
parent
f51c19b9
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
12 deletions
+16
-12
htmlstyle.c
dlls/mshtml/htmlstyle.c
+6
-12
style.c
dlls/mshtml/tests/style.c
+10
-0
No files found.
dlls/mshtml/htmlstyle.c
View file @
7eddb864
...
...
@@ -935,19 +935,13 @@ static HRESULT WINAPI HTMLStyle_put_fontWeight(IHTMLStyle *iface, BSTR v)
TRACE
(
"(%p)->(%s)
\n
"
,
This
,
debugstr_w
(
v
));
/* fontWeight can only be one of the following */
if
(
!
v
||
strcmpiW
(
szNormal
,
v
)
==
0
||
strcmpiW
(
styleBold
,
v
)
==
0
||
strcmpiW
(
styleBolder
,
v
)
==
0
||
strcmpiW
(
styleLighter
,
v
)
==
0
||
strcmpiW
(
style100
,
v
)
==
0
||
strcmpiW
(
style200
,
v
)
==
0
||
strcmpiW
(
style300
,
v
)
==
0
||
strcmpiW
(
style400
,
v
)
==
0
||
strcmpiW
(
style500
,
v
)
==
0
||
strcmpiW
(
style600
,
v
)
==
0
||
strcmpiW
(
style700
,
v
)
==
0
||
strcmpiW
(
style800
,
v
)
==
0
||
strcmpiW
(
style900
,
v
)
==
0
)
{
return
set_nsstyle_attr
(
This
->
nsstyle
,
STYLEID_FONT_WEIGHT
,
v
,
0
);
}
if
(
v
&&
*
v
&&
strcmpiW
(
szNormal
,
v
)
&&
strcmpiW
(
styleBold
,
v
)
&&
strcmpiW
(
styleBolder
,
v
)
&&
strcmpiW
(
styleLighter
,
v
)
&&
strcmpiW
(
style100
,
v
)
&&
strcmpiW
(
style200
,
v
)
&&
strcmpiW
(
style300
,
v
)
&&
strcmpiW
(
style400
,
v
)
&&
strcmpiW
(
style500
,
v
)
&&
strcmpiW
(
style600
,
v
)
&&
strcmpiW
(
style700
,
v
)
&&
strcmpiW
(
style800
,
v
)
&&
strcmpiW
(
style900
,
v
))
return
E_INVALIDARG
;
return
E_INVALIDARG
;
return
set_nsstyle_attr
(
This
->
nsstyle
,
STYLEID_FONT_WEIGHT
,
v
,
0
)
;
}
static
HRESULT
WINAPI
HTMLStyle_get_fontWeight
(
IHTMLStyle
*
iface
,
BSTR
*
p
)
...
...
dlls/mshtml/tests/style.c
View file @
7eddb864
...
...
@@ -823,6 +823,16 @@ static void test_body_style(IHTMLStyle *style)
ok
(
!
strcmp_wa
(
str
,
"900"
),
"str != style900
\n
"
);
SysFreeString
(
str
);
str
=
a2bstr
(
""
);
hres
=
IHTMLStyle_put_fontWeight
(
style
,
str
);
ok
(
hres
==
S_OK
,
"put_fontWeight failed: %08x
\n
"
,
hres
);
SysFreeString
(
str
);
hres
=
IHTMLStyle_get_fontWeight
(
style
,
&
str
);
ok
(
hres
==
S_OK
,
"get_fontWeight failed: %08x
\n
"
,
hres
);
ok
(
!
str
,
"str != NULL
\n
"
);
SysFreeString
(
str
);
hres
=
IHTMLStyle_put_fontWeight
(
style
,
sDefault
);
ok
(
hres
==
S_OK
,
"put_fontWeight failed: %08x
\n
"
,
hres
);
SysFreeString
(
sDefault
);
...
...
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