Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Package registry
Container registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Lorenzo Ferrillo
wine
Commits
40bf2f0e
Commit
40bf2f0e
authored
14 years ago
by
Michael Stefaniuc
Committed by
Alexandre Julliard
14 years ago
Browse files
Options
Downloads
Patches
Plain Diff
mshtml: COM cleanup for the IHTMLStyle4 iface.
parent
0ed90782
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
dlls/mshtml/htmlstyle.c
+1
-1
1 addition, 1 deletion
dlls/mshtml/htmlstyle.c
dlls/mshtml/htmlstyle.h
+1
-3
1 addition, 3 deletions
dlls/mshtml/htmlstyle.h
dlls/mshtml/htmlstyle3.c
+16
-13
16 additions, 13 deletions
dlls/mshtml/htmlstyle3.c
with
18 additions
and
17 deletions
dlls/mshtml/htmlstyle.c
+
1
−
1
View file @
40bf2f0e
...
...
@@ -579,7 +579,7 @@ static HRESULT WINAPI HTMLStyle_QueryInterface(IHTMLStyle *iface, REFIID riid, v
*
ppv
=
&
This
->
IHTMLStyle3_iface
;
}
else
if
(
IsEqualGUID
(
&
IID_IHTMLStyle4
,
riid
))
{
TRACE
(
"(%p)->(IID_IHTMLStyle4 %p)
\n
"
,
This
,
ppv
);
*
ppv
=
HTMLSTYLE4
(
This
)
;
*
ppv
=
&
This
->
IHTMLStyle4_iface
;
}
else
if
(
dispex_query_interface
(
&
This
->
dispex
,
riid
,
ppv
))
{
return
*
ppv
?
S_OK
:
E_NOINTERFACE
;
}
...
...
This diff is collapsed.
Click to expand it.
dlls/mshtml/htmlstyle.h
+
1
−
3
View file @
40bf2f0e
...
...
@@ -21,15 +21,13 @@ struct HTMLStyle {
IHTMLStyle
IHTMLStyle_iface
;
IHTMLStyle2
IHTMLStyle2_iface
;
IHTMLStyle3
IHTMLStyle3_iface
;
const
IHTMLStyle4
Vtbl
*
lp
HTMLStyle4
Vtbl
;
IHTMLStyle4
I
HTMLStyle4
_iface
;
LONG
ref
;
nsIDOMCSSStyleDeclaration
*
nsstyle
;
};
#define HTMLSTYLE4(x) ((IHTMLStyle4*) &(x)->lpHTMLStyle4Vtbl)
/* NOTE: Make sure to keep in sync with style_tbl in htmlstyle.c */
typedef
enum
{
STYLEID_BACKGROUND
,
...
...
This diff is collapsed.
Click to expand it.
dlls/mshtml/htmlstyle3.c
+
16
−
13
View file @
40bf2f0e
...
...
@@ -355,39 +355,42 @@ static const IHTMLStyle3Vtbl HTMLStyle3Vtbl = {
/*
* IHTMLStyle4 Interface
*/
#define HTMLSTYLE4_THIS(iface) DEFINE_THIS(HTMLStyle, HTMLStyle4, iface)
static
inline
HTMLStyle
*
impl_from_IHTMLStyle4
(
IHTMLStyle4
*
iface
)
{
return
CONTAINING_RECORD
(
iface
,
HTMLStyle
,
IHTMLStyle4_iface
);
}
static
HRESULT
WINAPI
HTMLStyle4_QueryInterface
(
IHTMLStyle4
*
iface
,
REFIID
riid
,
void
**
ppv
)
{
HTMLStyle
*
This
=
HTMLSTYLE4_THIS
(
iface
);
HTMLStyle
*
This
=
impl_from_IHTMLStyle4
(
iface
);
return
IHTMLStyle_QueryInterface
(
&
This
->
IHTMLStyle_iface
,
riid
,
ppv
);
}
static
ULONG
WINAPI
HTMLStyle4_AddRef
(
IHTMLStyle4
*
iface
)
{
HTMLStyle
*
This
=
HTMLSTYLE4_THIS
(
iface
);
HTMLStyle
*
This
=
impl_from_IHTMLStyle4
(
iface
);
return
IHTMLStyle_AddRef
(
&
This
->
IHTMLStyle_iface
);
}
static
ULONG
WINAPI
HTMLStyle4_Release
(
IHTMLStyle4
*
iface
)
{
HTMLStyle
*
This
=
HTMLSTYLE4_THIS
(
iface
);
HTMLStyle
*
This
=
impl_from_IHTMLStyle4
(
iface
);
return
IHTMLStyle_Release
(
&
This
->
IHTMLStyle_iface
);
}
static
HRESULT
WINAPI
HTMLStyle4_GetTypeInfoCount
(
IHTMLStyle4
*
iface
,
UINT
*
pctinfo
)
{
HTMLStyle
*
This
=
HTMLSTYLE4_THIS
(
iface
);
HTMLStyle
*
This
=
impl_from_IHTMLStyle4
(
iface
);
return
IDispatchEx_GetTypeInfoCount
(
&
This
->
dispex
.
IDispatchEx_iface
,
pctinfo
);
}
static
HRESULT
WINAPI
HTMLStyle4_GetTypeInfo
(
IHTMLStyle4
*
iface
,
UINT
iTInfo
,
LCID
lcid
,
ITypeInfo
**
ppTInfo
)
{
HTMLStyle
*
This
=
HTMLSTYLE4_THIS
(
iface
);
HTMLStyle
*
This
=
impl_from_IHTMLStyle4
(
iface
);
return
IDispatchEx_GetTypeInfo
(
&
This
->
dispex
.
IDispatchEx_iface
,
iTInfo
,
lcid
,
ppTInfo
);
}
...
...
@@ -395,7 +398,7 @@ static HRESULT WINAPI HTMLStyle4_GetIDsOfNames(IHTMLStyle4 *iface, REFIID riid,
LPOLESTR
*
rgszNames
,
UINT
cNames
,
LCID
lcid
,
DISPID
*
rgDispId
)
{
HTMLStyle
*
This
=
HTMLSTYLE4_THIS
(
iface
);
HTMLStyle
*
This
=
impl_from_IHTMLStyle4
(
iface
);
return
IDispatchEx_GetIDsOfNames
(
&
This
->
dispex
.
IDispatchEx_iface
,
riid
,
rgszNames
,
cNames
,
lcid
,
rgDispId
);
}
...
...
@@ -404,28 +407,28 @@ static HRESULT WINAPI HTMLStyle4_Invoke(IHTMLStyle4 *iface, DISPID dispIdMember,
REFIID
riid
,
LCID
lcid
,
WORD
wFlags
,
DISPPARAMS
*
pDispParams
,
VARIANT
*
pVarResult
,
EXCEPINFO
*
pExcepInfo
,
UINT
*
puArgErr
)
{
HTMLStyle
*
This
=
HTMLSTYLE4_THIS
(
iface
);
HTMLStyle
*
This
=
impl_from_IHTMLStyle4
(
iface
);
return
IDispatchEx_Invoke
(
&
This
->
dispex
.
IDispatchEx_iface
,
dispIdMember
,
riid
,
lcid
,
wFlags
,
pDispParams
,
pVarResult
,
pExcepInfo
,
puArgErr
);
}
static
HRESULT
WINAPI
HTMLStyle4_put_textOverflow
(
IHTMLStyle4
*
iface
,
BSTR
v
)
{
HTMLStyle
*
This
=
HTMLSTYLE4_THIS
(
iface
);
HTMLStyle
*
This
=
impl_from_IHTMLStyle4
(
iface
);
FIXME
(
"(%p)->(%s)
\n
"
,
This
,
debugstr_w
(
v
));
return
E_NOTIMPL
;
}
static
HRESULT
WINAPI
HTMLStyle4_get_textOverflow
(
IHTMLStyle4
*
iface
,
BSTR
*
p
)
{
HTMLStyle
*
This
=
HTMLSTYLE4_THIS
(
iface
);
HTMLStyle
*
This
=
impl_from_IHTMLStyle4
(
iface
);
FIXME
(
"(%p)->(%p)
\n
"
,
This
,
p
);
return
E_NOTIMPL
;
}
static
HRESULT
WINAPI
HTMLStyle4_put_minHeight
(
IHTMLStyle4
*
iface
,
VARIANT
v
)
{
HTMLStyle
*
This
=
HTMLSTYLE4_THIS
(
iface
);
HTMLStyle
*
This
=
impl_from_IHTMLStyle4
(
iface
);
TRACE
(
"(%p)->(%s)
\n
"
,
This
,
debugstr_variant
(
&
v
));
...
...
@@ -434,7 +437,7 @@ static HRESULT WINAPI HTMLStyle4_put_minHeight(IHTMLStyle4 *iface, VARIANT v)
static
HRESULT
WINAPI
HTMLStyle4_get_minHeight
(
IHTMLStyle4
*
iface
,
VARIANT
*
p
)
{
HTMLStyle
*
This
=
HTMLSTYLE4_THIS
(
iface
);
HTMLStyle
*
This
=
impl_from_IHTMLStyle4
(
iface
);
TRACE
(
"(%p)->(%p)
\n
"
,
This
,
p
);
...
...
@@ -458,5 +461,5 @@ static const IHTMLStyle4Vtbl HTMLStyle4Vtbl = {
void
HTMLStyle3_Init
(
HTMLStyle
*
This
)
{
This
->
IHTMLStyle3_iface
.
lpVtbl
=
&
HTMLStyle3Vtbl
;
This
->
lp
HTMLStyle4Vtbl
=
&
HTMLStyle4Vtbl
;
This
->
I
HTMLStyle4
_iface
.
lp
Vtbl
=
&
HTMLStyle4Vtbl
;
}
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment