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
2c389667
Commit
2c389667
authored
Apr 19, 2019
by
Jacek Caban
Committed by
Alexandre Julliard
Apr 20, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mshtml: Support VT_R8 in variant_to_nsstr.
Signed-off-by:
Jacek Caban
<
jacek@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
d538e86a
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
27 additions
and
0 deletions
+27
-0
nsembed.c
dlls/mshtml/nsembed.c
+15
-0
elements.js
dlls/mshtml/tests/elements.js
+2
-0
style.c
dlls/mshtml/tests/style.c
+10
-0
No files found.
dlls/mshtml/nsembed.c
View file @
2c389667
...
...
@@ -962,6 +962,21 @@ HRESULT variant_to_nsstr(VARIANT *v, BOOL hex_int, nsAString *nsstr)
nsAString_Init
(
nsstr
,
buf
);
break
;
case
VT_R8
:
{
VARIANT
strv
;
HRESULT
hres
;
V_VT
(
&
strv
)
=
VT_EMPTY
;
hres
=
VariantChangeTypeEx
(
&
strv
,
v
,
MAKELCID
(
MAKELANGID
(
LANG_ENGLISH
,
SUBLANG_ENGLISH_US
),
SORT_DEFAULT
),
0
,
VT_BSTR
);
if
(
FAILED
(
hres
))
return
hres
;
nsAString_Init
(
nsstr
,
V_BSTR
(
&
strv
));
SysFreeString
(
V_BSTR
(
&
strv
));
break
;
}
default:
FIXME
(
"not implemented for %s
\n
"
,
debugstr_variant
(
v
));
return
E_NOTIMPL
;
...
...
dlls/mshtml/tests/elements.js
View file @
2c389667
...
...
@@ -81,6 +81,8 @@ function test_textContent() {
ok
(
div
.
textContent
===
""
,
"div.textContent = "
+
div
.
textContent
);
div
.
textContent
=
11
;
ok
(
div
.
textContent
===
"11"
,
"div.textContent = "
+
div
.
textContent
);
div
.
textContent
=
10.5
;
ok
(
div
.
textContent
===
"10.5"
,
"div.textContent = "
+
div
.
textContent
);
ok
(
document
.
textContent
===
null
,
"document.textContent = "
+
document
.
textContent
);
...
...
dlls/mshtml/tests/style.c
View file @
2c389667
...
...
@@ -852,6 +852,16 @@ static void test_css_style_declaration(IHTMLCSSStyleDeclaration *css_style)
test_var_bstr
(
&
v
,
"0"
);
VariantClear
(
&
v
);
V_VT
(
&
v
)
=
VT_R8
;
V_R8
(
&
v
)
=
0
.
5
;
hres
=
IHTMLCSSStyleDeclaration_put_opacity
(
css_style
,
v
);
ok
(
hres
==
S_OK
,
"put_opacity failed: %08x
\n
"
,
hres
);
hres
=
IHTMLCSSStyleDeclaration_get_opacity
(
css_style
,
&
v
);
ok
(
hres
==
S_OK
,
"get_opacity failed: %08x
\n
"
,
hres
);
test_var_bstr
(
&
v
,
"0.5"
);
VariantClear
(
&
v
);
V_VT
(
&
v
)
=
VT_BSTR
;
V_BSTR
(
&
v
)
=
a2bstr
(
"1"
);
hres
=
IHTMLCSSStyleDeclaration_put_opacity
(
css_style
,
v
);
...
...
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