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
3f2f2eb6
Commit
3f2f2eb6
authored
May 18, 2011
by
Michael Stefaniuc
Committed by
Alexandre Julliard
May 19, 2011
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
riched20: Finish the COM cleanup in richole.c.
parent
b1ae9629
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
12 deletions
+11
-12
richole.c
dlls/riched20/richole.c
+11
-12
No files found.
dlls/riched20/richole.c
View file @
3f2f2eb6
...
...
@@ -55,8 +55,8 @@ typedef struct ITextSelectionImpl ITextSelectionImpl;
typedef
struct
IOleClientSiteImpl
IOleClientSiteImpl
;
typedef
struct
IRichEditOleImpl
{
const
IRichEditOleVtbl
*
lpRichEditOleVtbl
;
const
ITextDocumentVtbl
*
lpTextDocumentVtbl
;
IRichEditOle
IRichEditOle_iface
;
ITextDocument
ITextDocument_iface
;
LONG
ref
;
ME_TextEditor
*
editor
;
...
...
@@ -80,12 +80,12 @@ struct IOleClientSiteImpl {
static
inline
IRichEditOleImpl
*
impl_from_IRichEditOle
(
IRichEditOle
*
iface
)
{
return
(
IRichEditOleImpl
*
)((
BYTE
*
)
iface
-
FIELD_OFFSET
(
IRichEditOleImpl
,
lpRichEditOleVtbl
)
);
return
CONTAINING_RECORD
(
iface
,
IRichEditOleImpl
,
IRichEditOle_iface
);
}
static
inline
IRichEditOleImpl
*
impl_from_ITextDocument
(
ITextDocument
*
iface
)
{
return
(
IRichEditOleImpl
*
)((
BYTE
*
)
iface
-
FIELD_OFFSET
(
IRichEditOleImpl
,
lpTextDocumentVtbl
)
);
return
CONTAINING_RECORD
(
iface
,
IRichEditOleImpl
,
ITextDocument_iface
);
}
static
HRESULT
WINAPI
...
...
@@ -98,9 +98,9 @@ IRichEditOle_fnQueryInterface(IRichEditOle *me, REFIID riid, LPVOID *ppvObj)
*
ppvObj
=
NULL
;
if
(
IsEqualGUID
(
riid
,
&
IID_IUnknown
)
||
IsEqualGUID
(
riid
,
&
IID_IRichEditOle
))
*
ppvObj
=
&
This
->
lpRichEditOleVtbl
;
*
ppvObj
=
&
This
->
IRichEditOle_iface
;
else
if
(
IsEqualGUID
(
riid
,
&
IID_ITextDocument
))
*
ppvObj
=
&
This
->
lpTextDocumentVtbl
;
*
ppvObj
=
&
This
->
ITextDocument_iface
;
if
(
*
ppvObj
)
{
IRichEditOle_AddRef
(
me
);
...
...
@@ -452,22 +452,21 @@ ITextDocument_fnQueryInterface(ITextDocument* me, REFIID riid,
void
**
ppvObject
)
{
IRichEditOleImpl
*
This
=
impl_from_ITextDocument
(
me
);
return
IRichEditOle_fnQueryInterface
((
IRichEditOle
*
)
&
This
->
lpRichEditOleVtbl
,
riid
,
ppvObject
);
return
IRichEditOle_fnQueryInterface
(
&
This
->
IRichEditOle_iface
,
riid
,
ppvObject
);
}
static
ULONG
WINAPI
ITextDocument_fnAddRef
(
ITextDocument
*
me
)
{
IRichEditOleImpl
*
This
=
impl_from_ITextDocument
(
me
);
return
IRichEditOle_fnAddRef
(
(
IRichEditOle
*
)
&
This
->
lpRichEditOleVtbl
);
return
IRichEditOle_fnAddRef
(
&
This
->
IRichEditOle_iface
);
}
static
ULONG
WINAPI
ITextDocument_fnRelease
(
ITextDocument
*
me
)
{
IRichEditOleImpl
*
This
=
impl_from_ITextDocument
(
me
);
return
IRichEditOle_fnRelease
(
(
IRichEditOle
*
)
&
This
->
lpRichEditOleVtbl
);
return
IRichEditOle_fnRelease
(
&
This
->
IRichEditOle_iface
);
}
static
HRESULT
WINAPI
...
...
@@ -1508,8 +1507,8 @@ LRESULT CreateIRichEditOle(ME_TextEditor *editor, LPVOID *ppObj)
if
(
!
reo
)
return
0
;
reo
->
lpRichEditOle
Vtbl
=
&
revt
;
reo
->
lpTextDocument
Vtbl
=
&
tdvt
;
reo
->
IRichEditOle_iface
.
lp
Vtbl
=
&
revt
;
reo
->
ITextDocument_iface
.
lp
Vtbl
=
&
tdvt
;
reo
->
ref
=
1
;
reo
->
editor
=
editor
;
reo
->
txtSel
=
CreateTextSelection
(
reo
);
...
...
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