dll/win32/riched20/riched20.h | 145 ++++++++++---------- dll/win32/riched20/txthost.c | 311 +++++++++++++++++++++--------------------- dll/win32/riched20/txtsrv.c | 146 ++++++++++---------- 3 files changed, 304 insertions(+), 298 deletions(-) diff --git a/dll/win32/riched20/riched20.h b/dll/win32/riched20/riched20.h index d7246c0c1ab..42ae98aeddc 100644 --- a/dll/win32/riched20/riched20.h +++ b/dll/win32/riched20/riched20.h @@ -25,161 +25,162 @@ /* Forward definitions from txtsrv.c to make MSVC compile in ReactOS. */ -DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_TxSendMessage( ITextServices *iface, UINT msg, WPARAM wparam, +DECLSPEC_HIDDEN HRESULT __stdcall fnTextSrv_TxSendMessage( ITextServices *iface, UINT msg, WPARAM wparam, LPARAM lparam, LRESULT *result ); -DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_TxDraw( ITextServices *iface, DWORD aspect, LONG index, void *aspect_info, +DECLSPEC_HIDDEN HRESULT __stdcall fnTextSrv_TxDraw( ITextServices *iface, DWORD aspect, LONG index, void *aspect_info, DVTARGETDEVICE *td, HDC draw, HDC target, const RECTL *bounds, const RECTL *mf_bounds, RECT *update, BOOL (CALLBACK *continue_fn)(DWORD), DWORD continue_param, LONG view_id ); -DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_TxGetHScroll( ITextServices *iface, LONG *min_pos, LONG *max_pos, LONG *pos, +DECLSPEC_HIDDEN HRESULT __stdcall fnTextSrv_TxGetHScroll( ITextServices *iface, LONG *min_pos, LONG *max_pos, LONG *pos, LONG *page, BOOL *enabled ); -DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_TxGetVScroll( ITextServices *iface, LONG *min_pos, LONG *max_pos, LONG *pos, +DECLSPEC_HIDDEN HRESULT __stdcall fnTextSrv_TxGetVScroll( ITextServices *iface, LONG *min_pos, LONG *max_pos, LONG *pos, LONG *page, BOOL *enabled ); -DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_OnTxSetCursor( ITextServices *iface, DWORD aspect, LONG index, +DECLSPEC_HIDDEN HRESULT __stdcall fnTextSrv_OnTxSetCursor( ITextServices *iface, DWORD aspect, LONG index, void *aspect_info, DVTARGETDEVICE *td, HDC draw, HDC target, const RECT *client, INT x, INT y ); -DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_TxQueryHitPoint(ITextServices *iface, DWORD dwDrawAspect, LONG lindex, +DECLSPEC_HIDDEN HRESULT __stdcall fnTextSrv_TxQueryHitPoint(ITextServices *iface, DWORD dwDrawAspect, LONG lindex, void *pvAspect, DVTARGETDEVICE *ptd, HDC hdcDraw, HDC hicTargetDev, LPCRECT lprcClient, INT x, INT y, DWORD *pHitResult); -DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_OnTxInPlaceActivate( ITextServices *iface, const RECT *client ); +DECLSPEC_HIDDEN HRESULT __stdcall fnTextSrv_OnTxInPlaceActivate( ITextServices *iface, const RECT *client ); -DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_OnTxInPlaceDeactivate(ITextServices *iface); +DECLSPEC_HIDDEN HRESULT __stdcall fnTextSrv_OnTxInPlaceDeactivate(ITextServices *iface); -DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_OnTxUIActivate(ITextServices *iface); +DECLSPEC_HIDDEN HRESULT __stdcall fnTextSrv_OnTxUIActivate(ITextServices *iface); -DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_OnTxUIDeactivate(ITextServices *iface); +DECLSPEC_HIDDEN HRESULT __stdcall fnTextSrv_OnTxUIDeactivate(ITextServices *iface); -DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_TxGetText( ITextServices *iface, BSTR *text ); +DECLSPEC_HIDDEN HRESULT __stdcall fnTextSrv_TxGetText( ITextServices *iface, BSTR *text ); -DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_TxSetText( ITextServices *iface, const WCHAR *text ); +DECLSPEC_HIDDEN HRESULT __stdcall fnTextSrv_TxSetText( ITextServices *iface, const WCHAR *text ); -DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_TxGetCurTargetX(ITextServices *iface, LONG *x); +DECLSPEC_HIDDEN HRESULT __stdcall fnTextSrv_TxGetCurTargetX(ITextServices *iface, LONG *x); -DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_TxGetBaseLinePos(ITextServices *iface, LONG *x); +DECLSPEC_HIDDEN HRESULT __stdcall fnTextSrv_TxGetBaseLinePos(ITextServices *iface, LONG *x); -DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_TxGetNaturalSize( ITextServices *iface, DWORD aspect, HDC draw, +DECLSPEC_HIDDEN HRESULT __stdcall fnTextSrv_TxGetNaturalSize( ITextServices *iface, DWORD aspect, HDC draw, HDC target, DVTARGETDEVICE *td, DWORD mode, const SIZEL *extent, LONG *width, LONG *height ); -DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_TxGetDropTarget(ITextServices *iface, IDropTarget **ppDropTarget); +DECLSPEC_HIDDEN HRESULT __stdcall fnTextSrv_TxGetDropTarget(ITextServices *iface, IDropTarget **ppDropTarget); -DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_OnTxPropertyBitsChange( ITextServices *iface, DWORD mask, DWORD bits ); +DECLSPEC_HIDDEN HRESULT __stdcall fnTextSrv_OnTxPropertyBitsChange( ITextServices *iface, DWORD mask, DWORD bits ); -DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_TxGetCachedSize(ITextServices *iface, DWORD *pdwWidth, DWORD *pdwHeight); +DECLSPEC_HIDDEN HRESULT __stdcall fnTextSrv_TxGetCachedSize(ITextServices *iface, DWORD *pdwWidth, DWORD *pdwHeight); /* Forward definitions from txthost.c to make MSVC compile in ReactOS. */ +#undef DECLSPEC_HIDDEN +#define DECLSPEC_HIDDEN +#if 0 +DECLSPEC_HIDDEN HDC __stdcall ITextHostImpl_TxGetDC( ITextHost2 *iface ); +DECLSPEC_HIDDEN INT __stdcall ITextHostImpl_TxReleaseDC( ITextHost2 *iface, HDC hdc ); -DECLSPEC_HIDDEN HDC __thiscall ITextHostImpl_TxGetDC( ITextHost2 *iface ); +DECLSPEC_HIDDEN BOOL __stdcall ITextHostImpl_TxShowScrollBar( ITextHost2 *iface, INT bar, BOOL show ); -DECLSPEC_HIDDEN INT __thiscall ITextHostImpl_TxReleaseDC( ITextHost2 *iface, HDC hdc ); +DECLSPEC_HIDDEN BOOL __stdcall ITextHostImpl_TxEnableScrollBar( ITextHost2 *iface, INT bar, INT arrows ); -DECLSPEC_HIDDEN BOOL __thiscall ITextHostImpl_TxShowScrollBar( ITextHost2 *iface, INT bar, BOOL show ); +DECLSPEC_HIDDEN BOOL __stdcall ITextHostImpl_TxSetScrollRange( ITextHost2 *iface, INT bar, LONG min_pos, INT max_pos, BOOL redraw ); -DECLSPEC_HIDDEN BOOL __thiscall ITextHostImpl_TxEnableScrollBar( ITextHost2 *iface, INT bar, INT arrows ); +DECLSPEC_HIDDEN BOOL __stdcall ITextHostImpl_TxSetScrollPos( ITextHost2 *iface, INT bar, INT pos, BOOL redraw ); -DECLSPEC_HIDDEN BOOL __thiscall ITextHostImpl_TxSetScrollRange( ITextHost2 *iface, INT bar, LONG min_pos, INT max_pos, BOOL redraw ); +DECLSPEC_HIDDEN void __stdcall ITextHostImpl_TxInvalidateRect( ITextHost2 *iface, const RECT *rect, BOOL mode ); -DECLSPEC_HIDDEN BOOL __thiscall ITextHostImpl_TxSetScrollPos( ITextHost2 *iface, INT bar, INT pos, BOOL redraw ); +DECLSPEC_HIDDEN void __stdcall ITextHostImpl_TxViewChange( ITextHost2 *iface, BOOL update ); -DECLSPEC_HIDDEN void __thiscall ITextHostImpl_TxInvalidateRect( ITextHost2 *iface, const RECT *rect, BOOL mode ); +DECLSPEC_HIDDEN BOOL __stdcall ITextHostImpl_TxCreateCaret( ITextHost2 *iface, HBITMAP bitmap, INT width, INT height ); -DECLSPEC_HIDDEN void __thiscall ITextHostImpl_TxViewChange( ITextHost2 *iface, BOOL update ); +DECLSPEC_HIDDEN BOOL __stdcall ITextHostImpl_TxShowCaret( ITextHost2 *iface, BOOL show ); -DECLSPEC_HIDDEN BOOL __thiscall ITextHostImpl_TxCreateCaret( ITextHost2 *iface, HBITMAP bitmap, INT width, INT height ); +DECLSPEC_HIDDEN BOOL __stdcall ITextHostImpl_TxSetCaretPos( ITextHost2 *iface, INT x, INT y ); -DECLSPEC_HIDDEN BOOL __thiscall ITextHostImpl_TxShowCaret( ITextHost2 *iface, BOOL show ); +DECLSPEC_HIDDEN BOOL __stdcall ITextHostImpl_TxSetTimer( ITextHost2 *iface, UINT id, UINT timeout ); -DECLSPEC_HIDDEN BOOL __thiscall ITextHostImpl_TxSetCaretPos( ITextHost2 *iface, INT x, INT y ); +DECLSPEC_HIDDEN void __stdcall ITextHostImpl_TxKillTimer( ITextHost2 *iface, UINT id ); -DECLSPEC_HIDDEN BOOL __thiscall ITextHostImpl_TxSetTimer( ITextHost2 *iface, UINT id, UINT timeout ); - -DECLSPEC_HIDDEN void __thiscall ITextHostImpl_TxKillTimer( ITextHost2 *iface, UINT id ); - -DECLSPEC_HIDDEN void __thiscall ITextHostImpl_TxScrollWindowEx( ITextHost2 *iface, INT dx, INT dy, const RECT *scroll, +DECLSPEC_HIDDEN void __stdcall ITextHostImpl_TxScrollWindowEx( ITextHost2 *iface, INT dx, INT dy, const RECT *scroll, const RECT *clip, HRGN update_rgn, RECT *update_rect, UINT flags ); -DECLSPEC_HIDDEN void __thiscall ITextHostImpl_TxSetCapture( ITextHost2 *iface, BOOL capture ); - -DECLSPEC_HIDDEN void __thiscall ITextHostImpl_TxSetFocus( ITextHost2 *iface ); +DECLSPEC_HIDDEN void __stdcall ITextHostImpl_TxSetCapture( ITextHost2 *iface, BOOL capture ); -DECLSPEC_HIDDEN void __thiscall ITextHostImpl_TxSetCursor( ITextHost2 *iface, HCURSOR cursor, BOOL text ); +DECLSPEC_HIDDEN void __stdcall ITextHostImpl_TxSetFocus( ITextHost2 *iface ); -DECLSPEC_HIDDEN BOOL __thiscall ITextHostImpl_TxScreenToClient( ITextHost2 *iface, POINT *pt ); +DECLSPEC_HIDDEN void __stdcall ITextHostImpl_TxSetCursor( ITextHost2 *iface, HCURSOR cursor, BOOL text ); -DECLSPEC_HIDDEN BOOL __thiscall ITextHostImpl_TxClientToScreen( ITextHost2 *iface, POINT *pt ); +DECLSPEC_HIDDEN BOOL __stdcall ITextHostImpl_TxScreenToClient( ITextHost2 *iface, POINT *pt ); -DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxActivate( ITextHost2 *iface, LONG *old_state ); +DECLSPEC_HIDDEN BOOL __stdcall ITextHostImpl_TxClientToScreen( ITextHost2 *iface, POINT *pt ); -DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxDeactivate( ITextHost2 *iface, LONG new_state ); +DECLSPEC_HIDDEN HRESULT __stdcall ITextHostImpl_TxActivate( ITextHost2 *iface, LONG *old_state ); -DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxGetClientRect( ITextHost2 *iface, RECT *rect ); +DECLSPEC_HIDDEN HRESULT __stdcall ITextHostImpl_TxDeactivate( ITextHost2 *iface, LONG new_state ); -DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxGetViewInset( ITextHost2 *iface, RECT *rect ); +DECLSPEC_HIDDEN HRESULT __stdcall ITextHostImpl_TxGetClientRect( ITextHost2 *iface, RECT *rect ); -DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxGetCharFormat( ITextHost2 *iface, const CHARFORMATW **ppCF ); +DECLSPEC_HIDDEN HRESULT __stdcall ITextHostImpl_TxGetViewInset( ITextHost2 *iface, RECT *rect ); -DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxGetParaFormat( ITextHost2 *iface, const PARAFORMAT **fmt ); +DECLSPEC_HIDDEN HRESULT __stdcall ITextHostImpl_TxGetCharFormat( ITextHost2 *iface, const CHARFORMATW **ppCF ); -DECLSPEC_HIDDEN COLORREF __thiscall ITextHostImpl_TxGetSysColor( ITextHost2 *iface, int index ); +DECLSPEC_HIDDEN HRESULT __stdcall ITextHostImpl_TxGetParaFormat( ITextHost2 *iface, const PARAFORMAT **fmt ); -DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxGetBackStyle( ITextHost2 *iface, TXTBACKSTYLE *style ); +DECLSPEC_HIDDEN COLORREF __stdcall ITextHostImpl_TxGetSysColor( ITextHost2 *iface, int index ); -DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxGetMaxLength( ITextHost2 *iface, DWORD *length ); +DECLSPEC_HIDDEN HRESULT __stdcall ITextHostImpl_TxGetBackStyle( ITextHost2 *iface, TXTBACKSTYLE *style ); -DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxGetScrollBars( ITextHost2 *iface, DWORD *scrollbars ); +DECLSPEC_HIDDEN HRESULT __stdcall ITextHostImpl_TxGetMaxLength( ITextHost2 *iface, DWORD *length ); -DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxGetPasswordChar( ITextHost2 *iface, WCHAR *c ); +DECLSPEC_HIDDEN HRESULT __stdcall ITextHostImpl_TxGetScrollBars( ITextHost2 *iface, DWORD *scrollbars ); -DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxGetAcceleratorPos( ITextHost2 *iface, LONG *pos ); +DECLSPEC_HIDDEN HRESULT __stdcall ITextHostImpl_TxGetPasswordChar( ITextHost2 *iface, WCHAR *c ); -DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxGetExtent( ITextHost2 *iface, SIZEL *extent ); +DECLSPEC_HIDDEN HRESULT __stdcall ITextHostImpl_TxGetAcceleratorPos( ITextHost2 *iface, LONG *pos ); -DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_OnTxCharFormatChange( ITextHost2 *iface, const CHARFORMATW *pcf ); +DECLSPEC_HIDDEN HRESULT __stdcall ITextHostImpl_TxGetExtent( ITextHost2 *iface, SIZEL *extent ); -DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_OnTxParaFormatChange( ITextHost2 *iface, const PARAFORMAT *ppf ); +DECLSPEC_HIDDEN HRESULT __stdcall ITextHostImpl_OnTxCharFormatChange( ITextHost2 *iface, const CHARFORMATW *pcf ); -DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxGetPropertyBits( ITextHost2 *iface, DWORD mask, DWORD *bits ); +DECLSPEC_HIDDEN HRESULT __stdcall ITextHostImpl_OnTxParaFormatChange( ITextHost2 *iface, const PARAFORMAT *ppf ); -DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxNotify( ITextHost2 *iface, DWORD iNotify, void *pv ); +DECLSPEC_HIDDEN HRESULT __stdcall ITextHostImpl_TxGetPropertyBits( ITextHost2 *iface, DWORD mask, DWORD *bits ); -DECLSPEC_HIDDEN HIMC __thiscall ITextHostImpl_TxImmGetContext( ITextHost2 *iface ); +DECLSPEC_HIDDEN HRESULT __stdcall ITextHostImpl_TxNotify( ITextHost2 *iface, DWORD iNotify, void *pv ); -DECLSPEC_HIDDEN void __thiscall ITextHostImpl_TxImmReleaseContext( ITextHost2 *iface, HIMC context ); +DECLSPEC_HIDDEN HIMC __stdcall ITextHostImpl_TxImmGetContext( ITextHost2 *iface ); -DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxGetSelectionBarWidth( ITextHost2 *iface, LONG *width ); +DECLSPEC_HIDDEN void __stdcall ITextHostImpl_TxImmReleaseContext( ITextHost2 *iface, HIMC context ); -DECLSPEC_HIDDEN BOOL __thiscall ITextHostImpl_TxIsDoubleClickPending( ITextHost2 *iface ); +DECLSPEC_HIDDEN HRESULT __stdcall ITextHostImpl_TxGetSelectionBarWidth( ITextHost2 *iface, LONG *width ); -DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxGetWindow( ITextHost2 *iface, HWND *hwnd ); +DECLSPEC_HIDDEN BOOL __stdcall ITextHostImpl_TxIsDoubleClickPending( ITextHost2 *iface ); -DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxSetForegroundWindow( ITextHost2 *iface ); +DECLSPEC_HIDDEN HRESULT __stdcall ITextHostImpl_TxGetWindow( ITextHost2 *iface, HWND *hwnd ); -DECLSPEC_HIDDEN HPALETTE __thiscall ITextHostImpl_TxGetPalette( ITextHost2 *iface ); +DECLSPEC_HIDDEN HRESULT __stdcall ITextHostImpl_TxSetForegroundWindow( ITextHost2 *iface ); -DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxGetEastAsianFlags( ITextHost2 *iface, LONG *flags ); +DECLSPEC_HIDDEN HPALETTE __stdcall ITextHostImpl_TxGetPalette( ITextHost2 *iface ); -DECLSPEC_HIDDEN HCURSOR __thiscall ITextHostImpl_TxSetCursor2( ITextHost2 *iface, HCURSOR cursor, BOOL text ); +DECLSPEC_HIDDEN HRESULT __stdcall ITextHostImpl_TxGetEastAsianFlags( ITextHost2 *iface, LONG *flags ); -DECLSPEC_HIDDEN void __thiscall ITextHostImpl_TxFreeTextServicesNotification( ITextHost2 *iface ); +DECLSPEC_HIDDEN HCURSOR __stdcall ITextHostImpl_TxSetCursor2( ITextHost2 *iface, HCURSOR cursor, BOOL text ); -DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxGetEditStyle( ITextHost2 *iface, DWORD item, DWORD *data ); +DECLSPEC_HIDDEN void __stdcall ITextHostImpl_TxFreeTextServicesNotification( ITextHost2 *iface ); -DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxGetWindowStyles( ITextHost2 *iface, DWORD *style, DWORD *ex_style ); +DECLSPEC_HIDDEN HRESULT __stdcall ITextHostImpl_TxGetEditStyle( ITextHost2 *iface, DWORD item, DWORD *data ); -DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxShowDropCaret( ITextHost2 *iface, BOOL show, HDC hdc, const RECT *rect ); +DECLSPEC_HIDDEN HRESULT __stdcall ITextHostImpl_TxGetWindowStyles( ITextHost2 *iface, DWORD *style, DWORD *ex_style ); -DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxDestroyCaret( ITextHost2 *iface ); +DECLSPEC_HIDDEN HRESULT __stdcall ITextHostImpl_TxShowDropCaret( ITextHost2 *iface, BOOL show, HDC hdc, const RECT *rect ); -DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxGetHorzExtent( ITextHost2 *iface, LONG *horz_extent ); +DECLSPEC_HIDDEN HRESULT __stdcall ITextHostImpl_TxDestroyCaret( ITextHost2 *iface ); +DECLSPEC_HIDDEN HRESULT __stdcall ITextHostImpl_TxGetHorzExtent( ITextHost2 *iface, LONG *horz_extent ); +#endif diff --git a/dll/win32/riched20/txthost.c b/dll/win32/riched20/txthost.c index cd3a2457ec4..30ecef1a4f9 100644 --- a/dll/win32/riched20/txthost.c +++ b/dll/win32/riched20/txthost.c @@ -165,36 +165,36 @@ static ULONG WINAPI ITextHostImpl_Release( ITextHost2 *iface ) return ref; } -DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetDC,4) -DECLSPEC_HIDDEN HDC __thiscall ITextHostImpl_TxGetDC( ITextHost2 *iface ) +//DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetDC,4) +DECLSPEC_HIDDEN HDC __stdcall ITextHostImpl_TxGetDC( ITextHost2 *iface ) { struct host *host = impl_from_ITextHost( iface ); return GetDC( host->window ); } -DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxReleaseDC,8) -DECLSPEC_HIDDEN INT __thiscall ITextHostImpl_TxReleaseDC( ITextHost2 *iface, HDC hdc ) +//DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxReleaseDC,8) +DECLSPEC_HIDDEN INT __stdcall ITextHostImpl_TxReleaseDC( ITextHost2 *iface, HDC hdc ) { struct host *host = impl_from_ITextHost( iface ); return ReleaseDC( host->window, hdc ); } -DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxShowScrollBar,12) -DECLSPEC_HIDDEN BOOL __thiscall ITextHostImpl_TxShowScrollBar( ITextHost2 *iface, INT bar, BOOL show ) +//DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxShowScrollBar,12) +DECLSPEC_HIDDEN BOOL __stdcall ITextHostImpl_TxShowScrollBar( ITextHost2 *iface, INT bar, BOOL show ) { struct host *host = impl_from_ITextHost( iface ); return ShowScrollBar( host->window, bar, show ); } -DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxEnableScrollBar,12) -DECLSPEC_HIDDEN BOOL __thiscall ITextHostImpl_TxEnableScrollBar( ITextHost2 *iface, INT bar, INT arrows ) +//DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxEnableScrollBar,12) +DECLSPEC_HIDDEN BOOL __stdcall ITextHostImpl_TxEnableScrollBar( ITextHost2 *iface, INT bar, INT arrows ) { struct host *host = impl_from_ITextHost( iface ); return EnableScrollBar( host->window, bar, arrows ); } -DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxSetScrollRange,20) -DECLSPEC_HIDDEN BOOL __thiscall ITextHostImpl_TxSetScrollRange( ITextHost2 *iface, INT bar, LONG min_pos, INT max_pos, BOOL redraw ) +//DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxSetScrollRange,20) +DECLSPEC_HIDDEN BOOL __stdcall ITextHostImpl_TxSetScrollRange( ITextHost2 *iface, INT bar, LONG min_pos, INT max_pos, BOOL redraw ) { struct host *host = impl_from_ITextHost( iface ); SCROLLINFO info = { .cbSize = sizeof(info), .fMask = SIF_PAGE | SIF_RANGE }; @@ -218,8 +218,8 @@ DECLSPEC_HIDDEN BOOL __thiscall ITextHostImpl_TxSetScrollRange( ITextHost2 *ifac return SetScrollInfo( host->window, bar, &info, redraw ); } -DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxSetScrollPos,16) -DECLSPEC_HIDDEN BOOL __thiscall ITextHostImpl_TxSetScrollPos( ITextHost2 *iface, INT bar, INT pos, BOOL redraw ) +//DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxSetScrollPos,16) +DECLSPEC_HIDDEN BOOL __stdcall ITextHostImpl_TxSetScrollPos( ITextHost2 *iface, INT bar, INT pos, BOOL redraw ) { struct host *host = impl_from_ITextHost( iface ); DWORD style = GetWindowLongW( host->window, GWL_STYLE ); @@ -243,57 +243,57 @@ DECLSPEC_HIDDEN BOOL __thiscall ITextHostImpl_TxSetScrollPos( ITextHost2 *iface, return SetScrollPos( host->window, bar, pos, redraw ) != 0; } -DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxInvalidateRect,12) -DECLSPEC_HIDDEN void __thiscall ITextHostImpl_TxInvalidateRect( ITextHost2 *iface, const RECT *rect, BOOL mode ) +//DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxInvalidateRect,12) +DECLSPEC_HIDDEN void __stdcall ITextHostImpl_TxInvalidateRect( ITextHost2 *iface, const RECT *rect, BOOL mode ) { struct host *host = impl_from_ITextHost( iface ); InvalidateRect( host->window, rect, mode ); } -DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxViewChange,8) -DECLSPEC_HIDDEN void __thiscall ITextHostImpl_TxViewChange( ITextHost2 *iface, BOOL update ) +//DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxViewChange,8) +DECLSPEC_HIDDEN void __stdcall ITextHostImpl_TxViewChange( ITextHost2 *iface, BOOL update ) { struct host *host = impl_from_ITextHost( iface ); if (update) UpdateWindow( host->window ); } -DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxCreateCaret,16) -DECLSPEC_HIDDEN BOOL __thiscall ITextHostImpl_TxCreateCaret( ITextHost2 *iface, HBITMAP bitmap, INT width, INT height ) +//DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxCreateCaret,16) +DECLSPEC_HIDDEN BOOL __stdcall ITextHostImpl_TxCreateCaret( ITextHost2 *iface, HBITMAP bitmap, INT width, INT height ) { struct host *host = impl_from_ITextHost( iface ); return CreateCaret( host->window, bitmap, width, height ); } -DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxShowCaret,8) -DECLSPEC_HIDDEN BOOL __thiscall ITextHostImpl_TxShowCaret( ITextHost2 *iface, BOOL show ) +//DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxShowCaret,8) +DECLSPEC_HIDDEN BOOL __stdcall ITextHostImpl_TxShowCaret( ITextHost2 *iface, BOOL show ) { struct host *host = impl_from_ITextHost( iface ); if (show) return ShowCaret( host->window ); else return HideCaret( host->window ); } -DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxSetCaretPos,12) -DECLSPEC_HIDDEN BOOL __thiscall ITextHostImpl_TxSetCaretPos( ITextHost2 *iface, INT x, INT y ) +//DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxSetCaretPos,12) +DECLSPEC_HIDDEN BOOL __stdcall ITextHostImpl_TxSetCaretPos( ITextHost2 *iface, INT x, INT y ) { return SetCaretPos(x, y); } -DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxSetTimer,12) -DECLSPEC_HIDDEN BOOL __thiscall ITextHostImpl_TxSetTimer( ITextHost2 *iface, UINT id, UINT timeout ) +//DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxSetTimer,12) +DECLSPEC_HIDDEN BOOL __stdcall ITextHostImpl_TxSetTimer( ITextHost2 *iface, UINT id, UINT timeout ) { struct host *host = impl_from_ITextHost( iface ); return SetTimer( host->window, id, timeout, NULL ) != 0; } -DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxKillTimer,8) -DECLSPEC_HIDDEN void __thiscall ITextHostImpl_TxKillTimer( ITextHost2 *iface, UINT id ) +//DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxKillTimer,8) +DECLSPEC_HIDDEN void __stdcall ITextHostImpl_TxKillTimer( ITextHost2 *iface, UINT id ) { struct host *host = impl_from_ITextHost( iface ); KillTimer( host->window, id ); } -DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxScrollWindowEx,32) -DECLSPEC_HIDDEN void __thiscall ITextHostImpl_TxScrollWindowEx( ITextHost2 *iface, INT dx, INT dy, const RECT *scroll, +//DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxScrollWindowEx,32) +DECLSPEC_HIDDEN void __stdcall ITextHostImpl_TxScrollWindowEx( ITextHost2 *iface, INT dx, INT dy, const RECT *scroll, const RECT *clip, HRGN update_rgn, RECT *update_rect, UINT flags ) { @@ -301,58 +301,58 @@ DECLSPEC_HIDDEN void __thiscall ITextHostImpl_TxScrollWindowEx( ITextHost2 *ifac ScrollWindowEx( host->window, dx, dy, scroll, clip, update_rgn, update_rect, flags ); } -DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxSetCapture,8) -DECLSPEC_HIDDEN void __thiscall ITextHostImpl_TxSetCapture( ITextHost2 *iface, BOOL capture ) +//DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxSetCapture,8) +DECLSPEC_HIDDEN void __stdcall ITextHostImpl_TxSetCapture( ITextHost2 *iface, BOOL capture ) { struct host *host = impl_from_ITextHost( iface ); if (capture) SetCapture( host->window ); else ReleaseCapture(); } -DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxSetFocus,4) -DECLSPEC_HIDDEN void __thiscall ITextHostImpl_TxSetFocus( ITextHost2 *iface ) +//DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxSetFocus,4) +DECLSPEC_HIDDEN void __stdcall ITextHostImpl_TxSetFocus( ITextHost2 *iface ) { struct host *host = impl_from_ITextHost( iface ); SetFocus( host->window ); } -DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxSetCursor,12) -DECLSPEC_HIDDEN void __thiscall ITextHostImpl_TxSetCursor( ITextHost2 *iface, HCURSOR cursor, BOOL text ) +//DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxSetCursor,12) +DECLSPEC_HIDDEN void __stdcall ITextHostImpl_TxSetCursor( ITextHost2 *iface, HCURSOR cursor, BOOL text ) { SetCursor( cursor ); } -DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxScreenToClient,8) -DECLSPEC_HIDDEN BOOL __thiscall ITextHostImpl_TxScreenToClient( ITextHost2 *iface, POINT *pt ) +//DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxScreenToClient,8) +DECLSPEC_HIDDEN BOOL __stdcall ITextHostImpl_TxScreenToClient( ITextHost2 *iface, POINT *pt ) { struct host *host = impl_from_ITextHost( iface ); return ScreenToClient( host->window, pt ); } -DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxClientToScreen,8) -DECLSPEC_HIDDEN BOOL __thiscall ITextHostImpl_TxClientToScreen( ITextHost2 *iface, POINT *pt ) +//DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxClientToScreen,8) +DECLSPEC_HIDDEN BOOL __stdcall ITextHostImpl_TxClientToScreen( ITextHost2 *iface, POINT *pt ) { struct host *host = impl_from_ITextHost( iface ); return ClientToScreen( host->window, pt ); } -DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxActivate,8) -DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxActivate( ITextHost2 *iface, LONG *old_state ) +//DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxActivate,8) +DECLSPEC_HIDDEN HRESULT __stdcall ITextHostImpl_TxActivate( ITextHost2 *iface, LONG *old_state ) { struct host *host = impl_from_ITextHost( iface ); *old_state = HandleToLong( SetActiveWindow( host->window ) ); return *old_state ? S_OK : E_FAIL; } -DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxDeactivate,8) -DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxDeactivate( ITextHost2 *iface, LONG new_state ) +//DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxDeactivate,8) +DECLSPEC_HIDDEN HRESULT __stdcall ITextHostImpl_TxDeactivate( ITextHost2 *iface, LONG new_state ) { HWND ret = SetActiveWindow( LongToHandle( new_state ) ); return ret ? S_OK : E_FAIL; } -DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetClientRect,8) -DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxGetClientRect( ITextHost2 *iface, RECT *rect ) +//DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetClientRect,8) +DECLSPEC_HIDDEN HRESULT __stdcall ITextHostImpl_TxGetClientRect( ITextHost2 *iface, RECT *rect ) { struct host *host = impl_from_ITextHost( iface ); @@ -367,29 +367,29 @@ DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxGetClientRect( ITextHost2 *if return S_OK; } -DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetViewInset,8) -DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxGetViewInset( ITextHost2 *iface, RECT *rect ) +//DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetViewInset,8) +DECLSPEC_HIDDEN HRESULT __stdcall ITextHostImpl_TxGetViewInset( ITextHost2 *iface, RECT *rect ) { SetRectEmpty( rect ); return S_OK; } -DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetCharFormat,8) -DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxGetCharFormat( ITextHost2 *iface, const CHARFORMATW **ppCF ) +//DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetCharFormat,8) +DECLSPEC_HIDDEN HRESULT __stdcall ITextHostImpl_TxGetCharFormat( ITextHost2 *iface, const CHARFORMATW **ppCF ) { return E_NOTIMPL; } -DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetParaFormat,8) -DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxGetParaFormat( ITextHost2 *iface, const PARAFORMAT **fmt ) +//DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetParaFormat,8) +DECLSPEC_HIDDEN HRESULT __stdcall ITextHostImpl_TxGetParaFormat( ITextHost2 *iface, const PARAFORMAT **fmt ) { struct host *host = impl_from_ITextHost( iface ); *fmt = (const PARAFORMAT *)&host->para_fmt; return S_OK; } -DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetSysColor,8) -DECLSPEC_HIDDEN COLORREF __thiscall ITextHostImpl_TxGetSysColor( ITextHost2 *iface, int index ) +//DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetSysColor,8) +DECLSPEC_HIDDEN COLORREF __stdcall ITextHostImpl_TxGetSysColor( ITextHost2 *iface, int index ) { struct host *host = impl_from_ITextHost( iface ); @@ -397,22 +397,22 @@ DECLSPEC_HIDDEN COLORREF __thiscall ITextHostImpl_TxGetSysColor( ITextHost2 *ifa return GetSysColor( index ); } -DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetBackStyle,8) -DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxGetBackStyle( ITextHost2 *iface, TXTBACKSTYLE *style ) +//DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetBackStyle,8) +DECLSPEC_HIDDEN HRESULT __stdcall ITextHostImpl_TxGetBackStyle( ITextHost2 *iface, TXTBACKSTYLE *style ) { *style = TXTBACK_OPAQUE; return S_OK; } -DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetMaxLength,8) -DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxGetMaxLength( ITextHost2 *iface, DWORD *length ) +//DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetMaxLength,8) +DECLSPEC_HIDDEN HRESULT __stdcall ITextHostImpl_TxGetMaxLength( ITextHost2 *iface, DWORD *length ) { *length = INFINITE; return S_OK; } -DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetScrollBars,8) -DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxGetScrollBars( ITextHost2 *iface, DWORD *scrollbars ) +//DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetScrollBars,8) +DECLSPEC_HIDDEN HRESULT __stdcall ITextHostImpl_TxGetScrollBars( ITextHost2 *iface, DWORD *scrollbars ) { struct host *host = impl_from_ITextHost( iface ); @@ -420,8 +420,8 @@ DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxGetScrollBars( ITextHost2 *if return S_OK; } -DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetPasswordChar,8) -DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxGetPasswordChar( ITextHost2 *iface, WCHAR *c ) +//DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetPasswordChar,8) +DECLSPEC_HIDDEN HRESULT __stdcall ITextHostImpl_TxGetPasswordChar( ITextHost2 *iface, WCHAR *c ) { struct host *host = impl_from_ITextHost( iface ); @@ -429,42 +429,47 @@ DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxGetPasswordChar( ITextHost2 * return *c ? S_OK : S_FALSE; } -DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetAcceleratorPos,8) -DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxGetAcceleratorPos( ITextHost2 *iface, LONG *pos ) +//DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetAcceleratorPos,8) +DECLSPEC_HIDDEN HRESULT __stdcall ITextHostImpl_TxGetAcceleratorPos( ITextHost2 *iface, LONG *pos ) { *pos = -1; return S_OK; } -DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetExtent,8) -DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxGetExtent( ITextHost2 *iface, SIZEL *extent ) +//DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetExtent,8) +DECLSPEC_HIDDEN HRESULT __stdcall ITextHostImpl_TxGetExtent( ITextHost2 *iface, SIZEL *extent ) { return E_NOTIMPL; } -DEFINE_THISCALL_WRAPPER(ITextHostImpl_OnTxCharFormatChange,8) -DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_OnTxCharFormatChange( ITextHost2 *iface, const CHARFORMATW *pcf ) +//DEFINE_THISCALL_WRAPPER(ITextHostImpl_OnTxCharFormatChange,8) +DECLSPEC_HIDDEN HRESULT __stdcall ITextHostImpl_OnTxCharFormatChange( ITextHost2 *iface, const CHARFORMATW *pcf ) { return S_OK; } -DEFINE_THISCALL_WRAPPER(ITextHostImpl_OnTxParaFormatChange,8) -DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_OnTxParaFormatChange( ITextHost2 *iface, const PARAFORMAT *ppf ) +//DEFINE_THISCALL_WRAPPER(ITextHostImpl_OnTxParaFormatChange,8) +DECLSPEC_HIDDEN HRESULT __stdcall ITextHostImpl_OnTxParaFormatChange( ITextHost2 *iface, const PARAFORMAT *ppf ) { return S_OK; } -DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetPropertyBits,12) -DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxGetPropertyBits( ITextHost2 *iface, DWORD mask, DWORD *bits ) +//DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetPropertyBits,12) +HRESULT __stdcall ITextHostImpl_TxGetPropertyBits(ITextHost2 *iface, DWORD mask, DWORD *bits ) { + DPRINTF("(riched20/txthost.c:%d) iface %p\n", __LINE__, iface); + DPRINTF("(riched20/txthost.c:%d) mask 0x%x\n", __LINE__, mask); + DPRINTF("(riched20/txthost.c:%d) bits %p\n", __LINE__, *bits); + struct host *host = impl_from_ITextHost( iface ); + DPRINTF("host %p\n", host); *bits = host->props & mask; return S_OK; } -DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxNotify,12) -DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxNotify( ITextHost2 *iface, DWORD iNotify, void *pv ) +//DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxNotify,12) +DECLSPEC_HIDDEN HRESULT __stdcall ITextHostImpl_TxNotify( ITextHost2 *iface, DWORD iNotify, void *pv ) { struct host *host = impl_from_ITextHost( iface ); UINT id; @@ -520,22 +525,22 @@ DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxNotify( ITextHost2 *iface, DW return S_OK; } -DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxImmGetContext,4) -DECLSPEC_HIDDEN HIMC __thiscall ITextHostImpl_TxImmGetContext( ITextHost2 *iface ) +//DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxImmGetContext,4) +DECLSPEC_HIDDEN HIMC __stdcall ITextHostImpl_TxImmGetContext( ITextHost2 *iface ) { struct host *host = impl_from_ITextHost( iface ); return ImmGetContext( host->window ); } -DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxImmReleaseContext,8) -DECLSPEC_HIDDEN void __thiscall ITextHostImpl_TxImmReleaseContext( ITextHost2 *iface, HIMC context ) +//DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxImmReleaseContext,8) +DECLSPEC_HIDDEN void __stdcall ITextHostImpl_TxImmReleaseContext( ITextHost2 *iface, HIMC context ) { struct host *host = impl_from_ITextHost( iface ); ImmReleaseContext( host->window, context ); } -DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetSelectionBarWidth,8) -DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxGetSelectionBarWidth( ITextHost2 *iface, LONG *width ) +//DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetSelectionBarWidth,8) +DECLSPEC_HIDDEN HRESULT __stdcall ITextHostImpl_TxGetSelectionBarWidth( ITextHost2 *iface, LONG *width ) { struct host *host = impl_from_ITextHost( iface ); @@ -543,76 +548,76 @@ DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxGetSelectionBarWidth( ITextHo return S_OK; } -DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxIsDoubleClickPending,4) -DECLSPEC_HIDDEN BOOL __thiscall ITextHostImpl_TxIsDoubleClickPending( ITextHost2 *iface ) +//DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxIsDoubleClickPending,4) +DECLSPEC_HIDDEN BOOL __stdcall ITextHostImpl_TxIsDoubleClickPending( ITextHost2 *iface ) { return FALSE; } -DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetWindow,8) -DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxGetWindow( ITextHost2 *iface, HWND *hwnd ) +//DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetWindow,8) +DECLSPEC_HIDDEN HRESULT __stdcall ITextHostImpl_TxGetWindow( ITextHost2 *iface, HWND *hwnd ) { struct host *host = impl_from_ITextHost( iface ); *hwnd = host->window; return S_OK; } -DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxSetForegroundWindow,4) -DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxSetForegroundWindow( ITextHost2 *iface ) +//DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxSetForegroundWindow,4) +DECLSPEC_HIDDEN HRESULT __stdcall ITextHostImpl_TxSetForegroundWindow( ITextHost2 *iface ) { return E_NOTIMPL; } -DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetPalette,4) -DECLSPEC_HIDDEN HPALETTE __thiscall ITextHostImpl_TxGetPalette( ITextHost2 *iface ) +//DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetPalette,4) +DECLSPEC_HIDDEN HPALETTE __stdcall ITextHostImpl_TxGetPalette( ITextHost2 *iface ) { return NULL; } -DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetEastAsianFlags,8) -DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxGetEastAsianFlags( ITextHost2 *iface, LONG *flags ) +//DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetEastAsianFlags,8) +DECLSPEC_HIDDEN HRESULT __stdcall ITextHostImpl_TxGetEastAsianFlags( ITextHost2 *iface, LONG *flags ) { return E_NOTIMPL; } -DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxSetCursor2,12) -DECLSPEC_HIDDEN HCURSOR __thiscall ITextHostImpl_TxSetCursor2( ITextHost2 *iface, HCURSOR cursor, BOOL text ) +//DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxSetCursor2,12) +DECLSPEC_HIDDEN HCURSOR __stdcall ITextHostImpl_TxSetCursor2( ITextHost2 *iface, HCURSOR cursor, BOOL text ) { return NULL; } -DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxFreeTextServicesNotification,4) -DECLSPEC_HIDDEN void __thiscall ITextHostImpl_TxFreeTextServicesNotification( ITextHost2 *iface ) +//DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxFreeTextServicesNotification,4) +DECLSPEC_HIDDEN void __stdcall ITextHostImpl_TxFreeTextServicesNotification( ITextHost2 *iface ) { return; } -DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetEditStyle,12) -DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxGetEditStyle( ITextHost2 *iface, DWORD item, DWORD *data ) +//DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetEditStyle,12) +DECLSPEC_HIDDEN HRESULT __stdcall ITextHostImpl_TxGetEditStyle( ITextHost2 *iface, DWORD item, DWORD *data ) { return E_NOTIMPL; } -DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetWindowStyles,12) -DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxGetWindowStyles( ITextHost2 *iface, DWORD *style, DWORD *ex_style ) +//DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetWindowStyles,12) +DECLSPEC_HIDDEN HRESULT __stdcall ITextHostImpl_TxGetWindowStyles( ITextHost2 *iface, DWORD *style, DWORD *ex_style ) { return E_NOTIMPL; } -DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxShowDropCaret,16) -DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxShowDropCaret( ITextHost2 *iface, BOOL show, HDC hdc, const RECT *rect ) +//DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxShowDropCaret,16) +DECLSPEC_HIDDEN HRESULT __stdcall ITextHostImpl_TxShowDropCaret( ITextHost2 *iface, BOOL show, HDC hdc, const RECT *rect ) { return E_NOTIMPL; } -DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxDestroyCaret,4) -DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxDestroyCaret( ITextHost2 *iface ) +//DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxDestroyCaret,4) +DECLSPEC_HIDDEN HRESULT __stdcall ITextHostImpl_TxDestroyCaret( ITextHost2 *iface ) { return E_NOTIMPL; } -DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetHorzExtent,8) -DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxGetHorzExtent( ITextHost2 *iface, LONG *horz_extent ) +//DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetHorzExtent,8) +DECLSPEC_HIDDEN HRESULT __stdcall ITextHostImpl_TxGetHorzExtent( ITextHost2 *iface, LONG *horz_extent ) { return E_NOTIMPL; } @@ -761,58 +766,58 @@ static const ITextHost2Vtbl 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), + 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, /* ITextHost2 */ - THISCALL(ITextHostImpl_TxIsDoubleClickPending), - THISCALL(ITextHostImpl_TxGetWindow), - THISCALL(ITextHostImpl_TxSetForegroundWindow), - THISCALL(ITextHostImpl_TxGetPalette), - THISCALL(ITextHostImpl_TxGetEastAsianFlags), - THISCALL(ITextHostImpl_TxSetCursor2), - THISCALL(ITextHostImpl_TxFreeTextServicesNotification), - THISCALL(ITextHostImpl_TxGetEditStyle), - THISCALL(ITextHostImpl_TxGetWindowStyles), - THISCALL(ITextHostImpl_TxShowDropCaret), - THISCALL(ITextHostImpl_TxDestroyCaret), - THISCALL(ITextHostImpl_TxGetHorzExtent) + ITextHostImpl_TxIsDoubleClickPending, + ITextHostImpl_TxGetWindow, + ITextHostImpl_TxSetForegroundWindow, + ITextHostImpl_TxGetPalette, + ITextHostImpl_TxGetEastAsianFlags, + ITextHostImpl_TxSetCursor2, + ITextHostImpl_TxFreeTextServicesNotification, + ITextHostImpl_TxGetEditStyle, + ITextHostImpl_TxGetWindowStyles, + ITextHostImpl_TxShowDropCaret, + ITextHostImpl_TxDestroyCaret, + ITextHostImpl_TxGetHorzExtent }; static const char * const edit_messages[] = diff --git a/dll/win32/riched20/txtsrv.c b/dll/win32/riched20/txtsrv.c index 1e119601e92..78403be55dd 100644 --- a/dll/win32/riched20/txtsrv.c +++ b/dll/win32/riched20/txtsrv.c @@ -117,8 +117,8 @@ static ULONG WINAPI fnTextSrv_Release(ITextServices *iface) return IUnknown_Release( services->outer_unk ); } -DEFINE_THISCALL_WRAPPER(fnTextSrv_TxSendMessage,20) -DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_TxSendMessage( ITextServices *iface, UINT msg, WPARAM wparam, +//DEFINE_THISCALL_WRAPPER(fnTextSrv_TxSendMessage,20) +DECLSPEC_HIDDEN HRESULT __stdcall fnTextSrv_TxSendMessage( ITextServices *iface, UINT msg, WPARAM wparam, LPARAM lparam, LRESULT *result ) { struct text_services *services = impl_from_ITextServices( iface ); @@ -150,8 +150,8 @@ static HRESULT update_client_rect( struct text_services *services, const RECT *c return S_OK; } -DEFINE_THISCALL_WRAPPER(fnTextSrv_TxDraw,52) -DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_TxDraw( ITextServices *iface, DWORD aspect, LONG index, void *aspect_info, +//DEFINE_THISCALL_WRAPPER(fnTextSrv_TxDraw,52) +DECLSPEC_HIDDEN HRESULT __stdcall fnTextSrv_TxDraw( ITextServices *iface, DWORD aspect, LONG index, void *aspect_info, DVTARGETDEVICE *td, HDC draw, HDC target, const RECTL *bounds, const RECTL *mf_bounds, RECT *update, BOOL (CALLBACK *continue_fn)(DWORD), DWORD continue_param, @@ -192,8 +192,8 @@ DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_TxDraw( ITextServices *iface, DWORD return S_OK; } -DEFINE_THISCALL_WRAPPER(fnTextSrv_TxGetHScroll,24) -DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_TxGetHScroll( ITextServices *iface, LONG *min_pos, LONG *max_pos, LONG *pos, +//DEFINE_THISCALL_WRAPPER(fnTextSrv_TxGetHScroll,24) +DECLSPEC_HIDDEN HRESULT __stdcall fnTextSrv_TxGetHScroll( ITextServices *iface, LONG *min_pos, LONG *max_pos, LONG *pos, LONG *page, BOOL *enabled ) { struct text_services *services = impl_from_ITextServices( iface ); @@ -206,8 +206,8 @@ DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_TxGetHScroll( ITextServices *iface, return S_OK; } -DEFINE_THISCALL_WRAPPER(fnTextSrv_TxGetVScroll,24) -DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_TxGetVScroll( ITextServices *iface, LONG *min_pos, LONG *max_pos, LONG *pos, +//DEFINE_THISCALL_WRAPPER(fnTextSrv_TxGetVScroll,24) +DECLSPEC_HIDDEN HRESULT __stdcall fnTextSrv_TxGetVScroll( ITextServices *iface, LONG *min_pos, LONG *max_pos, LONG *pos, LONG *page, BOOL *enabled ) { struct text_services *services = impl_from_ITextServices( iface ); @@ -220,8 +220,8 @@ DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_TxGetVScroll( ITextServices *iface, return S_OK; } -DEFINE_THISCALL_WRAPPER(fnTextSrv_OnTxSetCursor,40) -DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_OnTxSetCursor( ITextServices *iface, DWORD aspect, LONG index, +//DEFINE_THISCALL_WRAPPER(fnTextSrv_OnTxSetCursor,40) +DECLSPEC_HIDDEN HRESULT __stdcall fnTextSrv_OnTxSetCursor( ITextServices *iface, DWORD aspect, LONG index, void *aspect_info, DVTARGETDEVICE *td, HDC draw, HDC target, const RECT *client, INT x, INT y ) { @@ -238,8 +238,8 @@ DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_OnTxSetCursor( ITextServices *iface return S_OK; } -DEFINE_THISCALL_WRAPPER(fnTextSrv_TxQueryHitPoint,44) -DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_TxQueryHitPoint(ITextServices *iface, DWORD dwDrawAspect, LONG lindex, +//DEFINE_THISCALL_WRAPPER(fnTextSrv_TxQueryHitPoint,44) +DECLSPEC_HIDDEN HRESULT __stdcall fnTextSrv_TxQueryHitPoint(ITextServices *iface, DWORD dwDrawAspect, LONG lindex, void *pvAspect, DVTARGETDEVICE *ptd, HDC hdcDraw, HDC hicTargetDev, LPCRECT lprcClient, INT x, INT y, DWORD *pHitResult) @@ -250,8 +250,8 @@ DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_TxQueryHitPoint(ITextServices *ifac return E_NOTIMPL; } -DEFINE_THISCALL_WRAPPER(fnTextSrv_OnTxInPlaceActivate,8) -DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_OnTxInPlaceActivate( ITextServices *iface, const RECT *client ) +//DEFINE_THISCALL_WRAPPER(fnTextSrv_OnTxInPlaceActivate,8) +DECLSPEC_HIDDEN HRESULT __stdcall fnTextSrv_OnTxInPlaceActivate( ITextServices *iface, const RECT *client ) { struct text_services *services = impl_from_ITextServices( iface ); HRESULT hr; @@ -270,8 +270,8 @@ DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_OnTxInPlaceActivate( ITextServices return S_OK; } -DEFINE_THISCALL_WRAPPER(fnTextSrv_OnTxInPlaceDeactivate,4) -DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_OnTxInPlaceDeactivate(ITextServices *iface) +//DEFINE_THISCALL_WRAPPER(fnTextSrv_OnTxInPlaceDeactivate,4) +DECLSPEC_HIDDEN HRESULT __stdcall fnTextSrv_OnTxInPlaceDeactivate(ITextServices *iface) { struct text_services *services = impl_from_ITextServices( iface ); @@ -280,8 +280,8 @@ DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_OnTxInPlaceDeactivate(ITextServices return S_OK; } -DEFINE_THISCALL_WRAPPER(fnTextSrv_OnTxUIActivate,4) -DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_OnTxUIActivate(ITextServices *iface) +//DEFINE_THISCALL_WRAPPER(fnTextSrv_OnTxUIActivate,4) +DECLSPEC_HIDDEN HRESULT __stdcall fnTextSrv_OnTxUIActivate(ITextServices *iface) { struct text_services *services = impl_from_ITextServices( iface ); @@ -289,8 +289,8 @@ DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_OnTxUIActivate(ITextServices *iface return E_NOTIMPL; } -DEFINE_THISCALL_WRAPPER(fnTextSrv_OnTxUIDeactivate,4) -DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_OnTxUIDeactivate(ITextServices *iface) +//DEFINE_THISCALL_WRAPPER(fnTextSrv_OnTxUIDeactivate,4) +DECLSPEC_HIDDEN HRESULT __stdcall fnTextSrv_OnTxUIDeactivate(ITextServices *iface) { struct text_services *services = impl_from_ITextServices( iface ); @@ -298,8 +298,8 @@ DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_OnTxUIDeactivate(ITextServices *ifa return E_NOTIMPL; } -DEFINE_THISCALL_WRAPPER(fnTextSrv_TxGetText,8) -DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_TxGetText( ITextServices *iface, BSTR *text ) +//DEFINE_THISCALL_WRAPPER(fnTextSrv_TxGetText,8) +DECLSPEC_HIDDEN HRESULT __stdcall fnTextSrv_TxGetText( ITextServices *iface, BSTR *text ) { struct text_services *services = impl_from_ITextServices( iface ); int length; @@ -321,8 +321,8 @@ DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_TxGetText( ITextServices *iface, BS return S_OK; } -DEFINE_THISCALL_WRAPPER(fnTextSrv_TxSetText,8) -DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_TxSetText( ITextServices *iface, const WCHAR *text ) +//DEFINE_THISCALL_WRAPPER(fnTextSrv_TxSetText,8) +DECLSPEC_HIDDEN HRESULT __stdcall fnTextSrv_TxSetText( ITextServices *iface, const WCHAR *text ) { struct text_services *services = impl_from_ITextServices( iface ); ME_Cursor cursor; @@ -339,8 +339,8 @@ DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_TxSetText( ITextServices *iface, co return S_OK; } -DEFINE_THISCALL_WRAPPER(fnTextSrv_TxGetCurTargetX,8) -DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_TxGetCurTargetX(ITextServices *iface, LONG *x) +//DEFINE_THISCALL_WRAPPER(fnTextSrv_TxGetCurTargetX,8) +DECLSPEC_HIDDEN HRESULT __stdcall fnTextSrv_TxGetCurTargetX(ITextServices *iface, LONG *x) { struct text_services *services = impl_from_ITextServices( iface ); @@ -348,8 +348,8 @@ DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_TxGetCurTargetX(ITextServices *ifac return E_NOTIMPL; } -DEFINE_THISCALL_WRAPPER(fnTextSrv_TxGetBaseLinePos,8) -DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_TxGetBaseLinePos(ITextServices *iface, LONG *x) +//DEFINE_THISCALL_WRAPPER(fnTextSrv_TxGetBaseLinePos,8) +DECLSPEC_HIDDEN HRESULT __stdcall fnTextSrv_TxGetBaseLinePos(ITextServices *iface, LONG *x) { struct text_services *services = impl_from_ITextServices( iface ); @@ -357,8 +357,8 @@ DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_TxGetBaseLinePos(ITextServices *ifa return E_NOTIMPL; } -DEFINE_THISCALL_WRAPPER(fnTextSrv_TxGetNaturalSize,36) -DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_TxGetNaturalSize( ITextServices *iface, DWORD aspect, HDC draw, +//DEFINE_THISCALL_WRAPPER(fnTextSrv_TxGetNaturalSize,36) +DECLSPEC_HIDDEN HRESULT __stdcall fnTextSrv_TxGetNaturalSize( ITextServices *iface, DWORD aspect, HDC draw, HDC target, DVTARGETDEVICE *td, DWORD mode, const SIZEL *extent, LONG *width, LONG *height ) { @@ -397,8 +397,8 @@ DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_TxGetNaturalSize( ITextServices *if return S_OK; } -DEFINE_THISCALL_WRAPPER(fnTextSrv_TxGetDropTarget,8) -DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_TxGetDropTarget(ITextServices *iface, IDropTarget **ppDropTarget) +//DEFINE_THISCALL_WRAPPER(fnTextSrv_TxGetDropTarget,8) +DECLSPEC_HIDDEN HRESULT __stdcall fnTextSrv_TxGetDropTarget(ITextServices *iface, IDropTarget **ppDropTarget) { struct text_services *services = impl_from_ITextServices( iface ); @@ -406,8 +406,8 @@ DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_TxGetDropTarget(ITextServices *ifac return E_NOTIMPL; } -DEFINE_THISCALL_WRAPPER(fnTextSrv_OnTxPropertyBitsChange,12) -DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_OnTxPropertyBitsChange( ITextServices *iface, DWORD mask, DWORD bits ) +//DEFINE_THISCALL_WRAPPER(fnTextSrv_OnTxPropertyBitsChange,12) +DECLSPEC_HIDDEN HRESULT __stdcall fnTextSrv_OnTxPropertyBitsChange( ITextServices *iface, DWORD mask, DWORD bits ) { struct text_services *services = impl_from_ITextServices( iface ); DWORD scrollbars; @@ -470,8 +470,8 @@ DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_OnTxPropertyBitsChange( ITextServic return S_OK; } -DEFINE_THISCALL_WRAPPER(fnTextSrv_TxGetCachedSize,12) -DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_TxGetCachedSize(ITextServices *iface, DWORD *pdwWidth, DWORD *pdwHeight) +//DEFINE_THISCALL_WRAPPER(fnTextSrv_TxGetCachedSize,12) +DECLSPEC_HIDDEN HRESULT __stdcall fnTextSrv_TxGetCachedSize(ITextServices *iface, DWORD *pdwWidth, DWORD *pdwHeight) { struct text_services *services = impl_from_ITextServices( iface ); @@ -481,7 +481,7 @@ DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_TxGetCachedSize(ITextServices *ifac #ifdef __ASM_USE_THISCALL_WRAPPER -#define STDCALL(func) (void *) __stdcall_ ## func +#define func) (void *) __stdcall_ ## func #ifdef _MSC_VER #define DEFINE_STDCALL_WRAPPER(num,func) \ __declspec(naked) HRESULT __stdcall_##func(void) \ @@ -527,24 +527,24 @@ const ITextServicesVtbl text_services_stdcall_vtbl = NULL, NULL, NULL, - STDCALL(ITextServices_TxSendMessage), - STDCALL(ITextServices_TxDraw), - STDCALL(ITextServices_TxGetHScroll), - STDCALL(ITextServices_TxGetVScroll), - STDCALL(ITextServices_OnTxSetCursor), - STDCALL(ITextServices_TxQueryHitPoint), - STDCALL(ITextServices_OnTxInPlaceActivate), - STDCALL(ITextServices_OnTxInPlaceDeactivate), - STDCALL(ITextServices_OnTxUIActivate), - STDCALL(ITextServices_OnTxUIDeactivate), - STDCALL(ITextServices_TxGetText), - STDCALL(ITextServices_TxSetText), - STDCALL(ITextServices_TxGetCurTargetX), - STDCALL(ITextServices_TxGetBaseLinePos), - STDCALL(ITextServices_TxGetNaturalSize), - STDCALL(ITextServices_TxGetDropTarget), - STDCALL(ITextServices_OnTxPropertyBitsChange), - STDCALL(ITextServices_TxGetCachedSize), + ITextServices_TxSendMessage, + ITextServices_TxDraw, + ITextServices_TxGetHScroll, + ITextServices_TxGetVScroll, + ITextServices_OnTxSetCursor, + ITextServices_TxQueryHitPoint, + ITextServices_OnTxInPlaceActivate, + ITextServices_OnTxInPlaceDeactivate, + ITextServices_OnTxUIActivate, + ITextServices_OnTxUIDeactivate, + ITextServices_TxGetText, + ITextServices_TxSetText, + ITextServices_TxGetCurTargetX, + ITextServices_TxGetBaseLinePos, + ITextServices_TxGetNaturalSize, + ITextServices_TxGetDropTarget, + ITextServices_OnTxPropertyBitsChange, + ITextServices_TxGetCachedSize, }; #endif /* __ASM_USE_THISCALL_WRAPPER */ @@ -554,24 +554,24 @@ static const ITextServicesVtbl textservices_vtbl = fnTextSrv_QueryInterface, fnTextSrv_AddRef, fnTextSrv_Release, - THISCALL(fnTextSrv_TxSendMessage), - THISCALL(fnTextSrv_TxDraw), - THISCALL(fnTextSrv_TxGetHScroll), - THISCALL(fnTextSrv_TxGetVScroll), - THISCALL(fnTextSrv_OnTxSetCursor), - THISCALL(fnTextSrv_TxQueryHitPoint), - THISCALL(fnTextSrv_OnTxInPlaceActivate), - THISCALL(fnTextSrv_OnTxInPlaceDeactivate), - THISCALL(fnTextSrv_OnTxUIActivate), - THISCALL(fnTextSrv_OnTxUIDeactivate), - THISCALL(fnTextSrv_TxGetText), - THISCALL(fnTextSrv_TxSetText), - THISCALL(fnTextSrv_TxGetCurTargetX), - THISCALL(fnTextSrv_TxGetBaseLinePos), - THISCALL(fnTextSrv_TxGetNaturalSize), - THISCALL(fnTextSrv_TxGetDropTarget), - THISCALL(fnTextSrv_OnTxPropertyBitsChange), - THISCALL(fnTextSrv_TxGetCachedSize) + fnTextSrv_TxSendMessage, + fnTextSrv_TxDraw, + fnTextSrv_TxGetHScroll, + fnTextSrv_TxGetVScroll, + fnTextSrv_OnTxSetCursor, + fnTextSrv_TxQueryHitPoint, + fnTextSrv_OnTxInPlaceActivate, + fnTextSrv_OnTxInPlaceDeactivate, + fnTextSrv_OnTxUIActivate, + fnTextSrv_OnTxUIDeactivate, + fnTextSrv_TxGetText, + fnTextSrv_TxSetText, + fnTextSrv_TxGetCurTargetX, + fnTextSrv_TxGetBaseLinePos, + fnTextSrv_TxGetNaturalSize, + fnTextSrv_TxGetDropTarget, + fnTextSrv_OnTxPropertyBitsChange, + fnTextSrv_TxGetCachedSize }; HRESULT create_text_services( IUnknown *outer, ITextHost *text_host, IUnknown **unk, BOOL emulate_10 )