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
b7d14434
Commit
b7d14434
authored
Mar 28, 2012
by
Michael Stefaniuc
Committed by
Alexandre Julliard
Jun 15, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
riched20: Avoid a forward declaration of a vtbl.
(cherry picked from commit
6f299c5d
)
parent
1345ad4a
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
40 additions
and
44 deletions
+40
-44
txtsrv.c
dlls/riched20/txtsrv.c
+40
-44
No files found.
dlls/riched20/txtsrv.c
View file @
b7d14434
...
...
@@ -62,49 +62,6 @@ typedef struct ITextServicesImpl {
char
spare
[
256
];
}
ITextServicesImpl
;
static
const
ITextServicesVtbl
textservices_Vtbl
;
/******************************************************************
* CreateTextServices (RICHED20.4)
*/
HRESULT
WINAPI
CreateTextServices
(
IUnknown
*
pUnkOuter
,
ITextHost
*
pITextHost
,
IUnknown
**
ppUnk
)
{
ITextServicesImpl
*
ITextImpl
;
HRESULT
hres
;
TRACE
(
"%p %p --> %p
\n
"
,
pUnkOuter
,
pITextHost
,
ppUnk
);
if
(
pITextHost
==
NULL
)
return
E_POINTER
;
ITextImpl
=
CoTaskMemAlloc
(
sizeof
(
*
ITextImpl
));
if
(
ITextImpl
==
NULL
)
return
E_OUTOFMEMORY
;
InitializeCriticalSection
(
&
ITextImpl
->
csTxtSrv
);
ITextImpl
->
csTxtSrv
.
DebugInfo
->
Spare
[
0
]
=
(
DWORD_PTR
)(
__FILE__
": ITextServicesImpl.csTxtSrv"
);
ITextImpl
->
ref
=
1
;
ITextHost_AddRef
(
pITextHost
);
ITextImpl
->
pMyHost
=
pITextHost
;
ITextImpl
->
ITextServices_iface
.
lpVtbl
=
&
textservices_Vtbl
;
ITextImpl
->
editor
=
ME_MakeEditor
(
pITextHost
,
FALSE
);
ITextImpl
->
editor
->
exStyleFlags
=
0
;
ITextImpl
->
editor
->
rcFormat
.
left
=
0
;
ITextImpl
->
editor
->
rcFormat
.
top
=
0
;
ITextImpl
->
editor
->
rcFormat
.
right
=
0
;
ITextImpl
->
editor
->
rcFormat
.
bottom
=
0
;
ME_HandleMessage
(
ITextImpl
->
editor
,
WM_CREATE
,
0
,
0
,
TRUE
,
&
hres
);
if
(
pUnkOuter
)
{
FIXME
(
"Support aggregation
\n
"
);
return
CLASS_E_NOAGGREGATION
;
}
*
ppUnk
=
(
IUnknown
*
)
&
ITextImpl
->
ITextServices_iface
;
return
S_OK
;
}
static
inline
ITextServicesImpl
*
impl_from_ITextServices
(
ITextServices
*
iface
)
{
return
CONTAINING_RECORD
(
iface
,
ITextServicesImpl
,
ITextServices_iface
);
...
...
@@ -370,7 +327,7 @@ DEFINE_THISCALL_WRAPPER(fnTextSrv_TxGetDropTarget,8)
DEFINE_THISCALL_WRAPPER
(
fnTextSrv_OnTxPropertyBitsChange
,
12
)
DEFINE_THISCALL_WRAPPER
(
fnTextSrv_TxGetCachedSize
,
12
)
static
const
ITextServicesVtbl
textservices_
V
tbl
=
static
const
ITextServicesVtbl
textservices_
v
tbl
=
{
fnTextSrv_QueryInterface
,
fnTextSrv_AddRef
,
...
...
@@ -394,3 +351,42 @@ static const ITextServicesVtbl textservices_Vtbl =
THISCALL
(
fnTextSrv_OnTxPropertyBitsChange
),
THISCALL
(
fnTextSrv_TxGetCachedSize
)
};
/******************************************************************
* CreateTextServices (RICHED20.4)
*/
HRESULT
WINAPI
CreateTextServices
(
IUnknown
*
pUnkOuter
,
ITextHost
*
pITextHost
,
IUnknown
**
ppUnk
)
{
ITextServicesImpl
*
ITextImpl
;
HRESULT
hres
;
TRACE
(
"%p %p --> %p
\n
"
,
pUnkOuter
,
pITextHost
,
ppUnk
);
if
(
pITextHost
==
NULL
)
return
E_POINTER
;
ITextImpl
=
CoTaskMemAlloc
(
sizeof
(
*
ITextImpl
));
if
(
ITextImpl
==
NULL
)
return
E_OUTOFMEMORY
;
InitializeCriticalSection
(
&
ITextImpl
->
csTxtSrv
);
ITextImpl
->
csTxtSrv
.
DebugInfo
->
Spare
[
0
]
=
(
DWORD_PTR
)(
__FILE__
": ITextServicesImpl.csTxtSrv"
);
ITextImpl
->
ref
=
1
;
ITextHost_AddRef
(
pITextHost
);
ITextImpl
->
pMyHost
=
pITextHost
;
ITextImpl
->
ITextServices_iface
.
lpVtbl
=
&
textservices_vtbl
;
ITextImpl
->
editor
=
ME_MakeEditor
(
pITextHost
,
FALSE
);
ITextImpl
->
editor
->
exStyleFlags
=
0
;
ITextImpl
->
editor
->
rcFormat
.
left
=
0
;
ITextImpl
->
editor
->
rcFormat
.
top
=
0
;
ITextImpl
->
editor
->
rcFormat
.
right
=
0
;
ITextImpl
->
editor
->
rcFormat
.
bottom
=
0
;
ME_HandleMessage
(
ITextImpl
->
editor
,
WM_CREATE
,
0
,
0
,
TRUE
,
&
hres
);
if
(
pUnkOuter
)
{
FIXME
(
"Support aggregation
\n
"
);
return
CLASS_E_NOAGGREGATION
;
}
*
ppUnk
=
(
IUnknown
*
)
&
ITextImpl
->
ITextServices_iface
;
return
S_OK
;
}
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