Alexandre Julliard : riched20: Make sure we have a valid ITextHost vtable for all platforms.
Alexandre Julliard
julliard at winehq.org
Thu Aug 27 10:31:04 CDT 2009
Module: wine
Branch: master
Commit: c1a1f0cfb4c783f22dd7b6dc7adf72ea8b35b981
URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1a1f0cfb4c783f22dd7b6dc7adf72ea8b35b981
Author: Alexandre Julliard <julliard at winehq.org>
Date: Wed Aug 26 21:23:52 2009 +0200
riched20: Make sure we have a valid ITextHost vtable for all platforms.
---
dlls/riched20/txthost.c | 90 +++++++++++++++++++++++-----------------------
1 files changed, 45 insertions(+), 45 deletions(-)
diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c
index cd5a54f..ddf3d76 100644
--- a/dlls/riched20/txthost.c
+++ b/dlls/riched20/txthost.c
@@ -635,51 +635,6 @@ DEFINE_STDCALL_WRAPPER(39,ITextHostImpl_TxImmGetContext,4)
DEFINE_STDCALL_WRAPPER(40,ITextHostImpl_TxImmReleaseContext,8)
DEFINE_STDCALL_WRAPPER(41,ITextHostImpl_TxGetSelectionBarWidth,8)
-static ITextHostVtbl textHostVtbl = {
- ITextHostImpl_QueryInterface,
- ITextHostImpl_AddRef,
- ITextHostImpl_Release,
- THISCALL(ITextHostImpl_TxGetDC),
- THISCALL(ITextHostImpl_TxReleaseDC),
- THISCALL(ITextHostImpl_TxShowScrollBar),
- THISCALL(ITextHostImpl_TxEnableScrollBar),
- THISCALL(ITextHostImpl_TxSetScrollRange),
- THISCALL(ITextHostImpl_TxSetScrollPos),
- THISCALL(ITextHostImpl_TxInvalidateRect),
- THISCALL(ITextHostImpl_TxViewChange),
- THISCALL(ITextHostImpl_TxCreateCaret),
- THISCALL(ITextHostImpl_TxShowCaret),
- THISCALL(ITextHostImpl_TxSetCaretPos),
- THISCALL(ITextHostImpl_TxSetTimer),
- THISCALL(ITextHostImpl_TxKillTimer),
- THISCALL(ITextHostImpl_TxScrollWindowEx),
- THISCALL(ITextHostImpl_TxSetCapture),
- THISCALL(ITextHostImpl_TxSetFocus),
- THISCALL(ITextHostImpl_TxSetCursor),
- THISCALL(ITextHostImpl_TxScreenToClient),
- THISCALL(ITextHostImpl_TxClientToScreen),
- THISCALL(ITextHostImpl_TxActivate),
- THISCALL(ITextHostImpl_TxDeactivate),
- THISCALL(ITextHostImpl_TxGetClientRect),
- THISCALL(ITextHostImpl_TxGetViewInset),
- THISCALL(ITextHostImpl_TxGetCharFormat),
- THISCALL(ITextHostImpl_TxGetParaFormat),
- THISCALL(ITextHostImpl_TxGetSysColor),
- THISCALL(ITextHostImpl_TxGetBackStyle),
- THISCALL(ITextHostImpl_TxGetMaxLength),
- THISCALL(ITextHostImpl_TxGetScrollBars),
- THISCALL(ITextHostImpl_TxGetPasswordChar),
- THISCALL(ITextHostImpl_TxGetAcceleratorPos),
- THISCALL(ITextHostImpl_TxGetExtent),
- THISCALL(ITextHostImpl_OnTxCharFormatChange),
- THISCALL(ITextHostImpl_OnTxParaFormatChange),
- THISCALL(ITextHostImpl_TxGetPropertyBits),
- THISCALL(ITextHostImpl_TxNotify),
- THISCALL(ITextHostImpl_TxImmGetContext),
- THISCALL(ITextHostImpl_TxImmReleaseContext),
- THISCALL(ITextHostImpl_TxGetSelectionBarWidth),
-};
-
ITextHostVtbl itextHostStdcallVtbl = {
NULL,
NULL,
@@ -726,3 +681,48 @@ ITextHostVtbl itextHostStdcallVtbl = {
};
#endif /* __i386__ */
+
+static ITextHostVtbl textHostVtbl = {
+ ITextHostImpl_QueryInterface,
+ ITextHostImpl_AddRef,
+ ITextHostImpl_Release,
+ THISCALL(ITextHostImpl_TxGetDC),
+ THISCALL(ITextHostImpl_TxReleaseDC),
+ THISCALL(ITextHostImpl_TxShowScrollBar),
+ THISCALL(ITextHostImpl_TxEnableScrollBar),
+ THISCALL(ITextHostImpl_TxSetScrollRange),
+ THISCALL(ITextHostImpl_TxSetScrollPos),
+ THISCALL(ITextHostImpl_TxInvalidateRect),
+ THISCALL(ITextHostImpl_TxViewChange),
+ THISCALL(ITextHostImpl_TxCreateCaret),
+ THISCALL(ITextHostImpl_TxShowCaret),
+ THISCALL(ITextHostImpl_TxSetCaretPos),
+ THISCALL(ITextHostImpl_TxSetTimer),
+ THISCALL(ITextHostImpl_TxKillTimer),
+ THISCALL(ITextHostImpl_TxScrollWindowEx),
+ THISCALL(ITextHostImpl_TxSetCapture),
+ THISCALL(ITextHostImpl_TxSetFocus),
+ THISCALL(ITextHostImpl_TxSetCursor),
+ THISCALL(ITextHostImpl_TxScreenToClient),
+ THISCALL(ITextHostImpl_TxClientToScreen),
+ THISCALL(ITextHostImpl_TxActivate),
+ THISCALL(ITextHostImpl_TxDeactivate),
+ THISCALL(ITextHostImpl_TxGetClientRect),
+ THISCALL(ITextHostImpl_TxGetViewInset),
+ THISCALL(ITextHostImpl_TxGetCharFormat),
+ THISCALL(ITextHostImpl_TxGetParaFormat),
+ THISCALL(ITextHostImpl_TxGetSysColor),
+ THISCALL(ITextHostImpl_TxGetBackStyle),
+ THISCALL(ITextHostImpl_TxGetMaxLength),
+ THISCALL(ITextHostImpl_TxGetScrollBars),
+ THISCALL(ITextHostImpl_TxGetPasswordChar),
+ THISCALL(ITextHostImpl_TxGetAcceleratorPos),
+ THISCALL(ITextHostImpl_TxGetExtent),
+ THISCALL(ITextHostImpl_OnTxCharFormatChange),
+ THISCALL(ITextHostImpl_OnTxParaFormatChange),
+ THISCALL(ITextHostImpl_TxGetPropertyBits),
+ THISCALL(ITextHostImpl_TxNotify),
+ THISCALL(ITextHostImpl_TxImmGetContext),
+ THISCALL(ITextHostImpl_TxImmReleaseContext),
+ THISCALL(ITextHostImpl_TxGetSelectionBarWidth),
+};
More information about the wine-cvs
mailing list