riched20: Remove the unneeded DEFINE_STDCALL_WRAPPER.
Michael Stefaniuc
mstefani at redhat.de
Thu Apr 7 04:30:27 CDT 2011
The COM methods are already __stdcall.
---
dlls/riched20/txthost.c | 128 ++++++++++++++--------------------------------
1 files changed, 39 insertions(+), 89 deletions(-)
diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c
index 68f4437..6cfe4a5 100644
--- a/dlls/riched20/txthost.c
+++ b/dlls/riched20/txthost.c
@@ -591,99 +591,49 @@ DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetSelectionBarWidth,8)
#ifdef __i386__ /* thiscall functions are i386-specific */
-#define STDCALL(func) __stdcall_ ## func
-#define DEFINE_STDCALL_WRAPPER(num,func,args) \
- extern typeof(func) __stdcall_ ## func; \
- __ASM_STDCALL_FUNC(__stdcall_ ## func, args, \
- "popl %eax\n\t" \
- "popl %ecx\n\t" \
- "pushl %eax\n\t" \
- "movl (%ecx), %eax\n\t" \
- "jmp *(4*(" #num "))(%eax)" )
-
-DEFINE_STDCALL_WRAPPER(3,ITextHostImpl_TxGetDC,4)
-DEFINE_STDCALL_WRAPPER(4,ITextHostImpl_TxReleaseDC,8)
-DEFINE_STDCALL_WRAPPER(5,ITextHostImpl_TxShowScrollBar,12)
-DEFINE_STDCALL_WRAPPER(6,ITextHostImpl_TxEnableScrollBar,12)
-DEFINE_STDCALL_WRAPPER(7,ITextHostImpl_TxSetScrollRange,20)
-DEFINE_STDCALL_WRAPPER(8,ITextHostImpl_TxSetScrollPos,16)
-DEFINE_STDCALL_WRAPPER(9,ITextHostImpl_TxInvalidateRect,12)
-DEFINE_STDCALL_WRAPPER(10,ITextHostImpl_TxViewChange,8)
-DEFINE_STDCALL_WRAPPER(11,ITextHostImpl_TxCreateCaret,16)
-DEFINE_STDCALL_WRAPPER(12,ITextHostImpl_TxShowCaret,8)
-DEFINE_STDCALL_WRAPPER(13,ITextHostImpl_TxSetCaretPos,12)
-DEFINE_STDCALL_WRAPPER(14,ITextHostImpl_TxSetTimer,12)
-DEFINE_STDCALL_WRAPPER(15,ITextHostImpl_TxKillTimer,8)
-DEFINE_STDCALL_WRAPPER(16,ITextHostImpl_TxScrollWindowEx,32)
-DEFINE_STDCALL_WRAPPER(17,ITextHostImpl_TxSetCapture,8)
-DEFINE_STDCALL_WRAPPER(18,ITextHostImpl_TxSetFocus,4)
-DEFINE_STDCALL_WRAPPER(19,ITextHostImpl_TxSetCursor,12)
-DEFINE_STDCALL_WRAPPER(20,ITextHostImpl_TxScreenToClient,8)
-DEFINE_STDCALL_WRAPPER(21,ITextHostImpl_TxClientToScreen,8)
-DEFINE_STDCALL_WRAPPER(22,ITextHostImpl_TxActivate,8)
-DEFINE_STDCALL_WRAPPER(23,ITextHostImpl_TxDeactivate,8)
-DEFINE_STDCALL_WRAPPER(24,ITextHostImpl_TxGetClientRect,8)
-DEFINE_STDCALL_WRAPPER(25,ITextHostImpl_TxGetViewInset,8)
-DEFINE_STDCALL_WRAPPER(26,ITextHostImpl_TxGetCharFormat,8)
-DEFINE_STDCALL_WRAPPER(27,ITextHostImpl_TxGetParaFormat,8)
-DEFINE_STDCALL_WRAPPER(28,ITextHostImpl_TxGetSysColor,8)
-DEFINE_STDCALL_WRAPPER(29,ITextHostImpl_TxGetBackStyle,8)
-DEFINE_STDCALL_WRAPPER(30,ITextHostImpl_TxGetMaxLength,8)
-DEFINE_STDCALL_WRAPPER(31,ITextHostImpl_TxGetScrollBars,8)
-DEFINE_STDCALL_WRAPPER(32,ITextHostImpl_TxGetPasswordChar,8)
-DEFINE_STDCALL_WRAPPER(33,ITextHostImpl_TxGetAcceleratorPos,8)
-DEFINE_STDCALL_WRAPPER(34,ITextHostImpl_TxGetExtent,8)
-DEFINE_STDCALL_WRAPPER(35,ITextHostImpl_OnTxCharFormatChange,8)
-DEFINE_STDCALL_WRAPPER(36,ITextHostImpl_OnTxParaFormatChange,8)
-DEFINE_STDCALL_WRAPPER(37,ITextHostImpl_TxGetPropertyBits,12)
-DEFINE_STDCALL_WRAPPER(38,ITextHostImpl_TxNotify,12)
-DEFINE_STDCALL_WRAPPER(39,ITextHostImpl_TxImmGetContext,4)
-DEFINE_STDCALL_WRAPPER(40,ITextHostImpl_TxImmReleaseContext,8)
-DEFINE_STDCALL_WRAPPER(41,ITextHostImpl_TxGetSelectionBarWidth,8)
-
const ITextHostVtbl itextHostStdcallVtbl = {
NULL,
NULL,
NULL,
- __stdcall_ITextHostImpl_TxGetDC,
- __stdcall_ITextHostImpl_TxReleaseDC,
- __stdcall_ITextHostImpl_TxShowScrollBar,
- __stdcall_ITextHostImpl_TxEnableScrollBar,
- __stdcall_ITextHostImpl_TxSetScrollRange,
- __stdcall_ITextHostImpl_TxSetScrollPos,
- __stdcall_ITextHostImpl_TxInvalidateRect,
- __stdcall_ITextHostImpl_TxViewChange,
- __stdcall_ITextHostImpl_TxCreateCaret,
- __stdcall_ITextHostImpl_TxShowCaret,
- __stdcall_ITextHostImpl_TxSetCaretPos,
- __stdcall_ITextHostImpl_TxSetTimer,
- __stdcall_ITextHostImpl_TxKillTimer,
- __stdcall_ITextHostImpl_TxScrollWindowEx,
- __stdcall_ITextHostImpl_TxSetCapture,
- __stdcall_ITextHostImpl_TxSetFocus,
- __stdcall_ITextHostImpl_TxSetCursor,
- __stdcall_ITextHostImpl_TxScreenToClient,
- __stdcall_ITextHostImpl_TxClientToScreen,
- __stdcall_ITextHostImpl_TxActivate,
- __stdcall_ITextHostImpl_TxDeactivate,
- __stdcall_ITextHostImpl_TxGetClientRect,
- __stdcall_ITextHostImpl_TxGetViewInset,
- __stdcall_ITextHostImpl_TxGetCharFormat,
- __stdcall_ITextHostImpl_TxGetParaFormat,
- __stdcall_ITextHostImpl_TxGetSysColor,
- __stdcall_ITextHostImpl_TxGetBackStyle,
- __stdcall_ITextHostImpl_TxGetMaxLength,
- __stdcall_ITextHostImpl_TxGetScrollBars,
- __stdcall_ITextHostImpl_TxGetPasswordChar,
- __stdcall_ITextHostImpl_TxGetAcceleratorPos,
- __stdcall_ITextHostImpl_TxGetExtent,
- __stdcall_ITextHostImpl_OnTxCharFormatChange,
- __stdcall_ITextHostImpl_OnTxParaFormatChange,
- __stdcall_ITextHostImpl_TxGetPropertyBits,
- __stdcall_ITextHostImpl_TxNotify,
- __stdcall_ITextHostImpl_TxImmGetContext,
- __stdcall_ITextHostImpl_TxImmReleaseContext,
- __stdcall_ITextHostImpl_TxGetSelectionBarWidth,
+ ITextHostImpl_TxGetDC,
+ ITextHostImpl_TxReleaseDC,
+ ITextHostImpl_TxShowScrollBar,
+ ITextHostImpl_TxEnableScrollBar,
+ ITextHostImpl_TxSetScrollRange,
+ ITextHostImpl_TxSetScrollPos,
+ ITextHostImpl_TxInvalidateRect,
+ ITextHostImpl_TxViewChange,
+ ITextHostImpl_TxCreateCaret,
+ ITextHostImpl_TxShowCaret,
+ ITextHostImpl_TxSetCaretPos,
+ ITextHostImpl_TxSetTimer,
+ ITextHostImpl_TxKillTimer,
+ ITextHostImpl_TxScrollWindowEx,
+ ITextHostImpl_TxSetCapture,
+ ITextHostImpl_TxSetFocus,
+ ITextHostImpl_TxSetCursor,
+ ITextHostImpl_TxScreenToClient,
+ ITextHostImpl_TxClientToScreen,
+ ITextHostImpl_TxActivate,
+ ITextHostImpl_TxDeactivate,
+ ITextHostImpl_TxGetClientRect,
+ ITextHostImpl_TxGetViewInset,
+ ITextHostImpl_TxGetCharFormat,
+ ITextHostImpl_TxGetParaFormat,
+ ITextHostImpl_TxGetSysColor,
+ ITextHostImpl_TxGetBackStyle,
+ ITextHostImpl_TxGetMaxLength,
+ ITextHostImpl_TxGetScrollBars,
+ ITextHostImpl_TxGetPasswordChar,
+ ITextHostImpl_TxGetAcceleratorPos,
+ ITextHostImpl_TxGetExtent,
+ ITextHostImpl_OnTxCharFormatChange,
+ ITextHostImpl_OnTxParaFormatChange,
+ ITextHostImpl_TxGetPropertyBits,
+ ITextHostImpl_TxNotify,
+ ITextHostImpl_TxImmGetContext,
+ ITextHostImpl_TxImmReleaseContext,
+ ITextHostImpl_TxGetSelectionBarWidth,
};
#endif /* __i386__ */
--
1.7.4
More information about the wine-patches
mailing list