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
d3431243
Commit
d3431243
authored
Mar 05, 2009
by
Alistair Leslie-Hughes
Committed by
Alexandre Julliard
Aug 20, 2009
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mshtml: Implement IHTMLStyle get/put borderLeftWidth.
parent
b308157b
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
29 additions
and
6 deletions
+29
-6
htmlstyle.c
dlls/mshtml/htmlstyle.c
+7
-4
htmlstyle.h
dlls/mshtml/htmlstyle.h
+1
-0
dom.c
dlls/mshtml/tests/dom.c
+21
-2
No files found.
dlls/mshtml/htmlstyle.c
View file @
d3431243
...
...
@@ -59,6 +59,8 @@ static const WCHAR attrBorderLeft[] =
{
'b'
,
'o'
,
'r'
,
'd'
,
'e'
,
'r'
,
'-'
,
'l'
,
'e'
,
'f'
,
't'
,
0
};
static
const
WCHAR
attrBorderLeftStyle
[]
=
{
'b'
,
'o'
,
'r'
,
'd'
,
'e'
,
'r'
,
'-'
,
'l'
,
'e'
,
'f'
,
't'
,
'-'
,
's'
,
't'
,
'y'
,
'l'
,
'e'
,
0
};
static
const
WCHAR
attrBorderLeftWidth
[]
=
{
'b'
,
'o'
,
'r'
,
'd'
,
'e'
,
'r'
,
'-'
,
'l'
,
'e'
,
'f'
,
't'
,
'-'
,
'w'
,
'i'
,
'd'
,
't'
,
'h'
,
0
};
static
const
WCHAR
attrBorderRightStyle
[]
=
{
'b'
,
'o'
,
'r'
,
'd'
,
'e'
,
'r'
,
'-'
,
'r'
,
'i'
,
'g'
,
'h'
,
't'
,
'-'
,
's'
,
't'
,
'y'
,
'l'
,
'e'
,
0
};
static
const
WCHAR
attrBorderRightWidth
[]
=
...
...
@@ -140,6 +142,7 @@ static const struct{
{
attrBorderColor
,
DISPID_IHTMLSTYLE_BORDERCOLOR
},
{
attrBorderLeft
,
DISPID_IHTMLSTYLE_BORDERLEFT
},
{
attrBorderLeftStyle
,
DISPID_IHTMLSTYLE_BORDERLEFTSTYLE
},
{
attrBorderLeftWidth
,
DISPID_IHTMLSTYLE_BORDERLEFTWIDTH
},
{
attrBorderRightStyle
,
DISPID_IHTMLSTYLE_BORDERRIGHTSTYLE
},
{
attrBorderRightWidth
,
DISPID_IHTMLSTYLE_BORDERRIGHTWIDTH
},
{
attrBorderStyle
,
DISPID_IHTMLSTYLE_BORDERSTYLE
},
...
...
@@ -1574,15 +1577,15 @@ static HRESULT WINAPI HTMLStyle_get_borderBottomWidth(IHTMLStyle *iface, VARIANT
static
HRESULT
WINAPI
HTMLStyle_put_borderLeftWidth
(
IHTMLStyle
*
iface
,
VARIANT
v
)
{
HTMLStyle
*
This
=
HTMLSTYLE_THIS
(
iface
);
FIXM
E
(
"(%p)->(v%d)
\n
"
,
This
,
V_VT
(
&
v
));
return
E_NOTIMPL
;
TRAC
E
(
"(%p)->(v%d)
\n
"
,
This
,
V_VT
(
&
v
));
return
set_nsstyle_attr_var
(
This
->
nsstyle
,
STYLEID_BORDER_LEFT_WIDTH
,
&
v
,
0
)
;
}
static
HRESULT
WINAPI
HTMLStyle_get_borderLeftWidth
(
IHTMLStyle
*
iface
,
VARIANT
*
p
)
{
HTMLStyle
*
This
=
HTMLSTYLE_THIS
(
iface
);
FIXM
E
(
"(%p)->(%p)
\n
"
,
This
,
p
);
return
E_NOTIMPL
;
TRAC
E
(
"(%p)->(%p)
\n
"
,
This
,
p
);
return
get_nsstyle_attr_var
(
This
->
nsstyle
,
STYLEID_BORDER_LEFT_WIDTH
,
p
,
0
)
;
}
static
HRESULT
WINAPI
HTMLStyle_put_borderStyle
(
IHTMLStyle
*
iface
,
BSTR
v
)
...
...
dlls/mshtml/htmlstyle.h
View file @
d3431243
...
...
@@ -47,6 +47,7 @@ typedef enum {
STYLEID_BORDER_COLOR
,
STYLEID_BORDER_LEFT
,
STYLEID_BORDER_LEFT_STYLE
,
STYLEID_BORDER_LEFT_WIDTH
,
STYLEID_BORDER_RIGHT_STYLE
,
STYLEID_BORDER_RIGHT_WIDTH
,
STYLEID_BORDER_STYLE
,
...
...
dlls/mshtml/tests/dom.c
View file @
d3431243
...
...
@@ -3557,8 +3557,8 @@ static void test_default_style(IHTMLStyle *style)
V_BSTR
(
&
v
)
=
NULL
;
hres
=
IHTMLStyle_get_borderLeftWidth
(
style
,
&
v
);
todo_wine
ok
(
hres
==
S_OK
,
"get_borderLeftWidth failed: %08x
\n
"
,
hres
);
todo_wine
ok
(
!
strcmp_wa
(
V_BSTR
(
&
v
),
"thick"
),
"str=%s
\n
"
,
wine_dbgstr_w
(
V_BSTR
(
&
v
)));
ok
(
hres
==
S_OK
,
"get_borderLeftWidth failed: %08x
\n
"
,
hres
);
ok
(
!
strcmp_wa
(
V_BSTR
(
&
v
),
"thick"
),
"str=%s
\n
"
,
wine_dbgstr_w
(
V_BSTR
(
&
v
)));
VariantClear
(
&
v
);
hres
=
IHTMLStyle_get_borderLeftStyle
(
style
,
&
str
);
...
...
@@ -3665,6 +3665,25 @@ static void test_default_style(IHTMLStyle *style)
ok
(
hres
==
S_OK
,
"put_borderBottomWidth: %08x
\n
"
,
hres
);
VariantClear
(
&
vDefault
);
/* borderLeftWidth */
hres
=
IHTMLStyle_get_borderLeftWidth
(
style
,
&
vDefault
);
ok
(
hres
==
S_OK
,
"get_borderLeftWidth: %08x
\n
"
,
hres
);
V_VT
(
&
v
)
=
VT_BSTR
;
V_BSTR
(
&
v
)
=
a2bstr
(
"10"
);
hres
=
IHTMLStyle_put_borderLeftWidth
(
style
,
v
);
ok
(
hres
==
S_OK
,
"put_borderLeftWidth: %08x
\n
"
,
hres
);
VariantClear
(
&
v
);
hres
=
IHTMLStyle_get_borderLeftWidth
(
style
,
&
v
);
ok
(
hres
==
S_OK
,
"get_borderLeftWidth: %08x
\n
"
,
hres
);
ok
(
!
strcmp_wa
(
V_BSTR
(
&
v
),
"10px"
),
"expected 10px = %s
\n
"
,
wine_dbgstr_w
(
V_BSTR
(
&
v
)));
VariantClear
(
&
v
);
hres
=
IHTMLStyle_put_borderLeftWidth
(
style
,
vDefault
);
ok
(
hres
==
S_OK
,
"put_borderLeftWidth: %08x
\n
"
,
hres
);
VariantClear
(
&
vDefault
);
hres
=
IHTMLStyle_QueryInterface
(
style
,
&
IID_IHTMLStyle2
,
(
void
**
)
&
style2
);
ok
(
hres
==
S_OK
,
"Could not get IHTMLStyle2 iface: %08x
\n
"
,
hres
);
if
(
SUCCEEDED
(
hres
))
{
...
...
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