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
5d52373c
Commit
5d52373c
authored
Aug 14, 2015
by
Jacek Caban
Committed by
Alexandre Julliard
Aug 17, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mshtml: Added IHTMLCurrentStyle3::whiteSpace property implementation.
parent
4d1fa5d1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
26 additions
and
2 deletions
+26
-2
htmlcurstyle.c
dlls/mshtml/htmlcurstyle.c
+4
-2
style.c
dlls/mshtml/tests/style.c
+22
-0
No files found.
dlls/mshtml/htmlcurstyle.c
View file @
5d52373c
...
...
@@ -1191,8 +1191,10 @@ static HRESULT WINAPI HTMLCurrentStyle3_get_wordSpacing(IHTMLCurrentStyle3 *ifac
static
HRESULT
WINAPI
HTMLCurrentStyle3_get_whiteSpace
(
IHTMLCurrentStyle3
*
iface
,
BSTR
*
p
)
{
HTMLCurrentStyle
*
This
=
impl_from_IHTMLCurrentStyle3
(
iface
);
FIXME
(
"(%p)->(%p)
\n
"
,
This
,
p
);
return
E_NOTIMPL
;
TRACE
(
"(%p)->(%p)
\n
"
,
This
,
p
);
return
get_nsstyle_attr
(
This
->
nsstyle
,
STYLEID_WHITE_SPACE
,
p
,
0
);
}
static
const
IHTMLCurrentStyle3Vtbl
HTMLCurrentStyle3Vtbl
=
{
...
...
dlls/mshtml/tests/style.c
View file @
5d52373c
...
...
@@ -2435,6 +2435,17 @@ static void test_body_style(IHTMLStyle *style)
ok
(
!
strcmp_wa
(
str
,
"nowrap"
),
"whiteSpace = %s
\n
"
,
wine_dbgstr_w
(
str
));
SysFreeString
(
str
);
str
=
a2bstr
(
"normal"
);
hres
=
IHTMLStyle_put_whiteSpace
(
style
,
str
);
SysFreeString
(
str
);
ok
(
hres
==
S_OK
,
"put_whiteSpace failed: %08x
\n
"
,
hres
);
str
=
NULL
;
hres
=
IHTMLStyle_get_whiteSpace
(
style
,
&
str
);
ok
(
hres
==
S_OK
,
"get_whiteSpace failed: %08x
\n
"
,
hres
);
ok
(
!
strcmp_wa
(
str
,
"normal"
),
"whiteSpace = %s
\n
"
,
wine_dbgstr_w
(
str
));
SysFreeString
(
str
);
/* listStyleType */
hres
=
IHTMLStyle_get_listStyleType
(
style
,
&
str
);
ok
(
hres
==
S_OK
,
"get_listStyleType failed: %08x
\n
"
,
hres
);
...
...
@@ -2622,6 +2633,7 @@ static void test_style_filters(IHTMLElement *elem)
static
void
test_current_style
(
IHTMLCurrentStyle
*
current_style
)
{
IHTMLCurrentStyle2
*
current_style2
;
IHTMLCurrentStyle3
*
current_style3
;
VARIANT_BOOL
b
;
BSTR
str
;
HRESULT
hres
;
...
...
@@ -2895,6 +2907,16 @@ static void test_current_style(IHTMLCurrentStyle *current_style)
ok
(
b
==
VARIANT_TRUE
,
"hasLayout = %x
\n
"
,
b
);
IHTMLCurrentStyle2_Release
(
current_style2
);
hres
=
IHTMLCurrentStyle_QueryInterface
(
current_style
,
&
IID_IHTMLCurrentStyle3
,
(
void
**
)
&
current_style3
);
ok
(
hres
==
S_OK
,
"Could not get IHTMLCurrentStyle3 iface: %08x
\n
"
,
hres
);
hres
=
IHTMLCurrentStyle3_get_whiteSpace
(
current_style3
,
&
str
);
ok
(
hres
==
S_OK
,
"get_whiteSpace failed: %08x
\n
"
,
hres
);
ok
(
!
strcmp_wa
(
str
,
"normal"
),
"whiteSpace = %s
\n
"
,
wine_dbgstr_w
(
str
));
SysFreeString
(
str
);
IHTMLCurrentStyle3_Release
(
current_style3
);
}
static
const
char
basic_test_str
[]
=
"<html><body><div id=
\"
divid
\"
></div/</body></html>"
;
...
...
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