[1/5] richedit: Implemented ITextHost for windowed richedit controls.
Dylan Smith
dylan.ah.smith at gmail.com
Tue Jan 20 00:41:25 CST 2009
I plan on implementing windowless richedit controls by refactoring out
the references the richedit controls hWnd into an ITextHost
implementation. This way windowless richedit controls can be
implemented using the same code by using the ITextHost implementation
provided to the CreateTextServices function.
This patch mostly aims to provide an implementation of ITextHost that
can be created and used in the windowed richedit control. Later patches
will use the ITextHost interface to avoid using the richedit controls
hWnd. Once the existing code is able to properly handle to the case
where hWnd is NULL by using ITextHost, then ITextServices can be
implemented using the existing richedit code.
---
dlls/riched20/Makefile.in | 1 +
dlls/riched20/editor.c | 71 +++--
dlls/riched20/editor.h | 49 +++
dlls/riched20/editstr.h | 7 +
dlls/riched20/txthost.c | 726 +++++++++++++++++++++++++++++++++++++++++++++
include/textserv.h | 40 ---
6 files changed, 830 insertions(+), 64 deletions(-)
create mode 100644 dlls/riched20/txthost.c
-------------- next part --------------
diff --git a/dlls/riched20/Makefile.in b/dlls/riched20/Makefile.in
index 8bcf8ed..7f85120 100644
--- a/dlls/riched20/Makefile.in
+++ b/dlls/riched20/Makefile.in
@@ -21,6 +21,7 @@ C_SRCS = \
string.c \
style.c \
table.c \
+ txthost.c \
txtsrv.c \
undo.c \
wrap.c \
diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c
index e3920d4..f69c185 100644
--- a/dlls/riched20/editor.c
+++ b/dlls/riched20/editor.c
@@ -2657,17 +2657,26 @@ static BOOL ME_ShowContextMenu(ME_TextEditor *editor, int x, int y)
return TRUE;
}
-static ME_TextEditor *ME_MakeEditor(HWND hWnd, BOOL bEmulateVersion10)
+ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10)
{
ME_TextEditor *ed = ALLOC_OBJ(ME_TextEditor);
int i;
- ed->hWnd = hWnd;
+ DWORD props;
+ LONG selbarwidth;
+
+ ed->hWnd = NULL;
+ ed->texthost = texthost;
ed->bEmulateVersion10 = bEmulateVersion10;
- ed->styleFlags = GetWindowLongW(hWnd, GWL_STYLE);
- if (ed->styleFlags & WS_VSCROLL)
- ed->styleFlags |= ES_AUTOVSCROLL;
- if (!ed->bEmulateVersion10 && (ed->styleFlags & WS_HSCROLL))
- ed->styleFlags |= ES_AUTOHSCROLL;
+ ITextHost_TxGetPropertyBits(texthost,
+ (TXTBIT_RICHTEXT|TXTBIT_MULTILINE|
+ TXTBIT_READONLY|TXTBIT_USEPASSWORD|
+ TXTBIT_HIDESELECTION|TXTBIT_SAVESELECTION|
+ TXTBIT_AUTOWORDSEL|TXTBIT_VERTICAL|
+ TXTBIT_WORDWRAP|TXTBIT_DISABLEDRAG),
+ &props);
+ ITextHost_TxGetScrollBars(texthost, &ed->styleFlags);
+ ed->styleFlags &= (WS_VSCROLL|WS_HSCROLL|ES_AUTOVSCROLL|
+ ES_AUTOHSCROLL|ES_DISABLENOSCROLL);
ed->pBuffer = ME_MakeText();
ed->nZoomNumerator = ed->nZoomDenominator = 0;
ME_MakeFirstParagraph(ed);
@@ -2702,12 +2711,13 @@ static ME_TextEditor *ME_MakeEditor(HWND hWnd, BOOL bEmulateVersion10)
ed->nParagraphs = 1;
ed->nLastSelStart = ed->nLastSelEnd = 0;
ed->pLastSelStartPara = ed->pLastSelEndPara = ME_FindItemFwd(ed->pBuffer->pFirst, diParagraph);
- ed->bWordWrap = !(ed->styleFlags & ES_AUTOHSCROLL);
+ ed->bWordWrap = (props & TXTBIT_WORDWRAP) != 0;
ed->bHideSelection = FALSE;
ed->nInvalidOfs = -1;
ed->pfnWordBreak = NULL;
ed->lpOleCallback = NULL;
ed->mode = TM_RICHTEXT | TM_MULTILEVELUNDO | TM_MULTICODEPAGE;
+ ed->mode |= (props & TXTBIT_RICHTEXT) ? TM_RICHTEXT : TM_PLAINTEXT;
ed->AutoURLDetect_bEnable = FALSE;
ed->bHaveFocus = FALSE;
ed->bMouseCaptured = FALSE;
@@ -2719,17 +2729,30 @@ static ME_TextEditor *ME_MakeEditor(HWND hWnd, BOOL bEmulateVersion10)
}
ME_CheckCharOffsets(ed);
- if (ed->styleFlags & ES_SELECTIONBAR)
- ed->selofs = SELECTIONBAR_WIDTH;
- else
- ed->selofs = 0;
ed->bDefaultFormatRect = TRUE;
+ ITextHost_TxGetSelectionBarWidth(ed->texthost, &selbarwidth);
+ /* FIXME: Convert selbarwidth from HIMETRIC to pixels */
+ ed->selofs = selbarwidth ? SELECTIONBAR_WIDTH : 0;
ed->nSelectionType = stPosition;
- if (ed->styleFlags & ES_PASSWORD)
- ed->cPasswordMask = '*';
- else
- ed->cPasswordMask = 0;
+ ed->cPasswordMask = 0;
+ if (props & TXTBIT_USEPASSWORD)
+ ITextHost_TxGetPasswordChar(texthost, &ed->cPasswordMask);
+
+ if (props & TXTBIT_AUTOWORDSEL)
+ ed->styleFlags |= ECO_AUTOWORDSELECTION;
+ if (props & TXTBIT_MULTILINE)
+ ed->styleFlags |= ES_MULTILINE;
+ if (props & TXTBIT_READONLY)
+ ed->styleFlags |= ES_READONLY;
+ if (!(props & TXTBIT_HIDESELECTION))
+ ed->styleFlags |= ES_NOHIDESEL;
+ if (props & TXTBIT_SAVESELECTION)
+ ed->styleFlags |= ES_SAVESEL;
+ if (props & TXTBIT_VERTICAL)
+ ed->styleFlags |= ES_VERTICAL;
+ if (props & TXTBIT_DISABLEDRAG)
+ ed->styleFlags |= ES_NOOLEDRAGDROP;
ed->notified_cr.cpMin = ed->notified_cr.cpMax = 0;
@@ -2774,7 +2797,7 @@ static void ME_DestroyEditor(ME_TextEditor *editor)
DeleteObject(editor->hbrBackground);
if(editor->lpOleCallback)
IUnknown_Release(editor->lpOleCallback);
- SetWindowLongPtrW(editor->hWnd, 0, 0);
+ IUnknown_Release(editor->texthost);
OleUninitialize();
FREE_OBJ(editor->pBuffer);
@@ -4425,10 +4448,11 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam,
if (msg == WM_NCCREATE)
{
CREATESTRUCTW *pcs = (CREATESTRUCTW *)lParam;
+ ITextHost *texthost;
+
TRACE("WM_NCCREATE: hWnd %p style 0x%08x\n", hWnd, pcs->style);
- editor = ME_MakeEditor(hWnd, FALSE);
- SetWindowLongPtrW(hWnd, 0, (LONG_PTR)editor);
- return TRUE;
+ texthost = ME_CreateTextHost(hWnd, FALSE);
+ return texthost != NULL;
}
else if (msg != WM_NCDESTROY)
{
@@ -4479,13 +4503,12 @@ LRESULT WINAPI RichEdit10ANSIWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM
{
if (msg == WM_NCCREATE && !GetWindowLongPtrW(hWnd, 0))
{
- ME_TextEditor *editor;
+ ITextHost *texthost;
CREATESTRUCTW *pcs = (CREATESTRUCTW *)lParam;
TRACE("WM_NCCREATE: hWnd %p style 0x%08x\n", hWnd, pcs->style);
- editor = ME_MakeEditor(hWnd, TRUE);
- SetWindowLongPtrW(hWnd, 0, (LONG_PTR)editor);
- return TRUE;
+ texthost = ME_CreateTextHost(hWnd, TRUE);
+ return texthost != NULL;
}
return RichEditANSIWndProc(hWnd, msg, wParam, lParam);
}
diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h
index dfe67fe..bcd1da1 100644
--- a/dlls/riched20/editor.h
+++ b/dlls/riched20/editor.h
@@ -261,6 +261,7 @@ void ME_CopyReObject(REOBJECT* dst, const REOBJECT* src);
void ME_DeleteReObject(REOBJECT* reo);
/* editor.c */
+ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10);
void ME_SendOldNotify(ME_TextEditor *editor, int nCode);
int ME_GetTextW(ME_TextEditor *editor, WCHAR *buffer, int nStart, int nChars, BOOL bCRLF);
ME_DisplayItem *ME_FindItemAtOffset(ME_TextEditor *editor, ME_DIType nItemType, int nOffset, int *nItemOffset);
@@ -289,6 +290,54 @@ void ME_MoveCursorFromTableRowStartParagraph(ME_TextEditor *editor);
struct RTFTable *ME_MakeTableDef(ME_TextEditor *editor);
void ME_InitTableDef(ME_TextEditor *editor, struct RTFTable *tableDef);
+/* txthost.c */
+ITextHost *ME_CreateTextHost(HWND hwnd, BOOL bEmulateVersion10);
+#ifdef __i386__ /* Use wrappers to perform thiscall on i386 */
+#define TXTHOST_VTABLE(This) (&itextHostStdcallVtbl)
+#else /* __i386__ */
+#define TXTHOST_VTABLE(This) (This)->lpVtbl
+#endif /* __i386__ */
+ /*** ITextHost methods ***/
+#define ITextHost_TxGetDC(This) TXTHOST_VTABLE(This)->TxGetDC(This)
+#define ITextHost_TxReleaseDC(This,a) TXTHOST_VTABLE(This)->TxReleaseDC(This,a)
+#define ITextHost_TxShowScrollBar(This,a,b) TXTHOST_VTABLE(This)->TxShowScrollBar(This,a,b)
+#define ITextHost_TxEnableScrollBar(This,a,b) TXTHOST_VTABLE(This)->TxEnableScrollBar(This,a,b)
+#define ITextHost_TxSetScrollRange(This,a,b,c,d) TXTHOST_VTABLE(This)->TxSetScrollRange(This,a,b,c,d)
+#define ITextHost_TxSetScrollPos(This,a,b,c) TXTHOST_VTABLE(This)->TxSetScrollPos(This,a,b,c)
+#define ITextHost_TxInvalidateRect(This,a,b) TXTHOST_VTABLE(This)->TxInvalidateRect(This,a,b)
+#define ITextHost_TxViewChange(This,a) TXTHOST_VTABLE(This)->TxViewChange(This,a)
+#define ITextHost_TxCreateCaret(This,a,b,c) TXTHOST_VTABLE(This)->TxCreateCaret(This,a,b,c)
+#define ITextHost_TxShowCaret(This,a) TXTHOST_VTABLE(This)->TxShowCaret(This,a)
+#define ITextHost_TxSetCaretPos(This,a,b) TXTHOST_VTABLE(This)->TxSetCaretPos(This,a,b)
+#define ITextHost_TxSetTimer(This,a,b) TXTHOST_VTABLE(This)->TxSetTimer(This,a,b)
+#define ITextHost_TxKillTimer(This,a) TXTHOST_VTABLE(This)->TxKillTimer(This,a)
+#define ITextHost_TxScrollWindowEx(This,a,b,c,d,e,f,g) TXTHOST_VTABLE(This)->TxScrollWindowEx(This,a,b,c,d,e,f,g)
+#define ITextHost_TxSetCapture(This,a) TXTHOST_VTABLE(This)->TxSetCapture(This,a)
+#define ITextHost_TxSetFocus(This) TXTHOST_VTABLE(This)->TxSetFocus(This)
+#define ITextHost_TxSetCursor(This,a,b) TXTHOST_VTABLE(This)->TxSetCursor(This,a,b)
+#define ITextHost_TxScreenToClient(This,a) TXTHOST_VTABLE(This)->TxScreenToClient(This,a)
+#define ITextHost_TxClientToScreen(This,a) TXTHOST_VTABLE(This)->TxClientToScreen(This,a)
+#define ITextHost_TxActivate(This,a) TXTHOST_VTABLE(This)->TxActivate(This,a)
+#define ITextHost_TxDeactivate(This,a) TXTHOST_VTABLE(This)->TxDeactivate(This,a)
+#define ITextHost_TxGetClientRect(This,a) TXTHOST_VTABLE(This)->TxGetClientRect(This,a)
+#define ITextHost_TxGetViewInset(This,a) TXTHOST_VTABLE(This)->TxGetViewInset(This,a)
+#define ITextHost_TxGetCharFormat(This,a) TXTHOST_VTABLE(This)->TxGetCharFormat(This,a)
+#define ITextHost_TxGetParaFormat(This,a) TXTHOST_VTABLE(This)->TxGetParaFormat(This,a)
+#define ITextHost_TxGetSysColor(This,a) TXTHOST_VTABLE(This)->TxGetSysColor(This,a)
+#define ITextHost_TxGetBackStyle(This,a) TXTHOST_VTABLE(This)->TxGetBackStyle(This,a)
+#define ITextHost_TxGetMaxLength(This,a) TXTHOST_VTABLE(This)->TxGetMaxLength(This,a)
+#define ITextHost_TxGetScrollBars(This,a) TXTHOST_VTABLE(This)->TxGetScrollBars(This,a)
+#define ITextHost_TxGetPasswordChar(This,a) TXTHOST_VTABLE(This)->TxGetPasswordChar(This,a)
+#define ITextHost_TxGetAcceleratorPos(This,a) TXTHOST_VTABLE(This)->TxGetAcceleratorPos(This,a)
+#define ITextHost_TxGetExtent(This,a) TXTHOST_VTABLE(This)->TxGetExtent(This,a)
+#define ITextHost_OnTxCharFormatChange(This,a) TXTHOST_VTABLE(This)->OnTxCharFormatChange(This,a)
+#define ITextHost_OnTxParaFormatChange(This,a) TXTHOST_VTABLE(This)->OnTxParaFormatChange(This,a)
+#define ITextHost_TxGetPropertyBits(This,a,b) TXTHOST_VTABLE(This)->TxGetPropertyBits(This,a,b)
+#define ITextHost_TxNotify(This,a,b) TXTHOST_VTABLE(This)->TxNotify(This,a,b)
+#define ITextHost_TxImmGetContext(This) TXTHOST_VTABLE(This)->TxImmGetContext(This)
+#define ITextHost_TxImmReleaseContext(This,a) TXTHOST_VTABLE(This)->TxImmReleaseContext(This,a)
+#define ITextHost_TxGetSelectionBarWidth(This,a) TXTHOST_VTABLE(This)->TxGetSelectionBarWidth(This,a)
+
/* undo.c */
ME_UndoItem *ME_AddUndoItem(ME_TextEditor *editor, ME_DIType type, const ME_DisplayItem *pdi);
void ME_CommitUndo(ME_TextEditor *editor);
diff --git a/dlls/riched20/editstr.h b/dlls/riched20/editstr.h
index d289509..02fa828 100644
--- a/dlls/riched20/editstr.h
+++ b/dlls/riched20/editstr.h
@@ -44,9 +44,15 @@
#include <commctrl.h>
#include <ole2.h>
#include <richole.h>
+#include "imm.h"
+#include <textserv.h>
#include "wine/debug.h"
+#ifdef __i386__
+extern struct ITextHostVtbl itextHostStdcallVtbl;
+#endif /* __i386__ */
+
typedef struct tagME_String
{
WCHAR *szData;
@@ -327,6 +333,7 @@ typedef struct tagME_FontCacheItem
typedef struct tagME_TextEditor
{
HWND hWnd;
+ ITextHost *texthost;
BOOL bEmulateVersion10;
ME_TextBuffer *pBuffer;
ME_Cursor *pCursors;
diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c
new file mode 100644
index 0000000..6a4ed56
--- /dev/null
+++ b/dlls/riched20/txthost.c
@@ -0,0 +1,726 @@
+/*
+ * RichEdit - ITextHost implementation for windowed richedit controls
+ *
+ * Copyright 2009 by Dylan Smith
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#include "config.h"
+#include "wine/port.h"
+
+#define NONAMELESSSTRUCT
+#define NONAMELESSUNION
+#define COBJMACROS
+
+#include "editor.h"
+#include "ole2.h"
+#include "richole.h"
+#include "imm.h"
+#include "textserv.h"
+#include "wine/debug.h"
+#include "editstr.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(richedit);
+
+typedef struct ITextHostImpl {
+ const ITextHostVtbl *lpVtbl;
+ LONG ref;
+ HWND hWnd;
+ BOOL bEmulateVersion10;
+} ITextHostImpl;
+
+static ITextHostVtbl textHostVtbl;
+
+ITextHost *ME_CreateTextHost(HWND hwnd, BOOL bEmulateVersion10)
+{
+ ITextHostImpl *texthost;
+ texthost = CoTaskMemAlloc(sizeof(*texthost));
+ if (texthost)
+ {
+ ME_TextEditor *editor;
+
+ texthost->lpVtbl = &textHostVtbl;
+ texthost->ref = 1;
+ texthost->hWnd = hwnd;
+ texthost->bEmulateVersion10 = bEmulateVersion10;
+
+ editor = ME_MakeEditor((ITextHost*)texthost, bEmulateVersion10);
+ editor->hWnd = hwnd; /* FIXME: Remove editor's dependance on hWnd */
+ SetWindowLongPtrW(hwnd, 0, (LONG_PTR)editor);
+ }
+
+ return (ITextHost*)texthost;
+}
+
+static HRESULT WINAPI ITextHostImpl_QueryInterface(ITextHost *iface,
+ REFIID riid,
+ LPVOID *ppvObject)
+{
+ ITextHostImpl *This = (ITextHostImpl *)iface;
+
+ if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_ITextHost)) {
+ *ppvObject = This;
+ ITextHost_AddRef((ITextHost *)*ppvObject);
+ return S_OK;
+ }
+
+ FIXME("Unknown interface: %s\n", debugstr_guid(riid));
+ return E_NOINTERFACE;
+}
+
+static ULONG WINAPI ITextHostImpl_AddRef(ITextHost *iface)
+{
+ ITextHostImpl *This = (ITextHostImpl *)iface;
+ ULONG ref = InterlockedIncrement(&This->ref);
+ return ref;
+}
+
+static ULONG WINAPI ITextHostImpl_Release(ITextHost *iface)
+{
+ ITextHostImpl *This = (ITextHostImpl *)iface;
+ ULONG ref = InterlockedDecrement(&This->ref);
+
+ if (!ref)
+ {
+ SetWindowLongPtrW(This->hWnd, 0, 0);
+ CoTaskMemFree(This);
+ }
+ return ref;
+}
+
+HDC WINAPI ITextHostImpl_TxGetDC(ITextHost *iface)
+{
+ ITextHostImpl *This = (ITextHostImpl *)iface;
+ return GetDC(This->hWnd);
+}
+
+INT WINAPI ITextHostImpl_TxReleaseDC(ITextHost *iface,
+ HDC hdc)
+{
+ ITextHostImpl *This = (ITextHostImpl *)iface;
+ return ReleaseDC(This->hWnd, hdc);
+}
+
+BOOL WINAPI ITextHostImpl_TxShowScrollBar(ITextHost *iface,
+ INT fnBar,
+ BOOL fShow)
+{
+ ITextHostImpl *This = (ITextHostImpl *)iface;
+ return ShowScrollBar(This->hWnd, fnBar, fShow);
+}
+
+BOOL WINAPI ITextHostImpl_TxEnableScrollBar(ITextHost *iface,
+ INT fuSBFlags,
+ INT fuArrowflags)
+{
+ ITextHostImpl *This = (ITextHostImpl *)iface;
+ return EnableScrollBar(This->hWnd, fuSBFlags, fuArrowflags);
+}
+
+BOOL WINAPI ITextHostImpl_TxSetScrollRange(ITextHost *iface,
+ INT fnBar,
+ LONG nMinPos,
+ INT nMaxPos,
+ BOOL fRedraw)
+{
+ ITextHostImpl *This = (ITextHostImpl *)iface;
+ return SetScrollRange(This->hWnd, fnBar, nMinPos, nMaxPos, fRedraw);
+}
+
+BOOL WINAPI ITextHostImpl_TxSetScrollPos(ITextHost *iface,
+ INT fnBar,
+ INT nPos,
+ BOOL fRedraw)
+{
+ ITextHostImpl *This = (ITextHostImpl *)iface;
+ int pos = SetScrollPos(This->hWnd, fnBar, nPos, fRedraw);
+ return (pos ? TRUE : FALSE);
+}
+
+void WINAPI ITextHostImpl_TxInvalidateRect(ITextHost *iface,
+ LPCRECT prc,
+ BOOL fMode)
+{
+ ITextHostImpl *This = (ITextHostImpl *)iface;
+ InvalidateRect(This->hWnd, prc, fMode);
+}
+
+void WINAPI ITextHostImpl_TxViewChange(ITextHost *iface,
+ BOOL fUpdate)
+{
+ ITextHostImpl *This = (ITextHostImpl *)iface;
+ if (fUpdate)
+ UpdateWindow(This->hWnd);
+}
+
+BOOL WINAPI ITextHostImpl_TxCreateCaret(ITextHost *iface,
+ HBITMAP hbmp,
+ INT xWidth, INT yHeight)
+{
+ ITextHostImpl *This = (ITextHostImpl *)iface;
+ return CreateCaret(This->hWnd, hbmp, xWidth, yHeight);
+}
+
+BOOL WINAPI ITextHostImpl_TxShowCaret(ITextHost *iface, BOOL fShow)
+{
+ ITextHostImpl *This = (ITextHostImpl *)iface;
+ if (fShow)
+ return ShowCaret(This->hWnd);
+ else
+ return HideCaret(This->hWnd);
+}
+
+BOOL WINAPI ITextHostImpl_TxSetCaretPos(ITextHost *iface,
+ INT x, INT y)
+{
+ return SetCaretPos(x, y);
+}
+
+BOOL WINAPI ITextHostImpl_TxSetTimer(ITextHost *iface,
+ UINT idTimer, UINT uTimeout)
+{
+ ITextHostImpl *This = (ITextHostImpl *)iface;
+ return SetTimer(This->hWnd, idTimer, uTimeout, NULL) != 0;
+}
+
+void WINAPI ITextHostImpl_TxKillTimer(ITextHost *iface,
+ UINT idTimer)
+{
+ ITextHostImpl *This = (ITextHostImpl *)iface;
+ KillTimer(This->hWnd, idTimer);
+}
+
+void WINAPI ITextHostImpl_TxScrollWindowEx(ITextHost *iface,
+ INT dx, INT dy,
+ LPCRECT lprcScroll,
+ LPCRECT lprcClip,
+ HRGN hRgnUpdate,
+ LPRECT lprcUpdate,
+ UINT fuScroll)
+{
+ ITextHostImpl *This = (ITextHostImpl *)iface;
+ ScrollWindowEx(This->hWnd, dx, dy, lprcScroll, lprcClip,
+ hRgnUpdate, lprcUpdate, fuScroll);
+}
+
+void WINAPI ITextHostImpl_TxSetCapture(ITextHost *iface,
+ BOOL fCapture)
+{
+ ITextHostImpl *This = (ITextHostImpl *)iface;
+ if (fCapture)
+ SetCapture(This->hWnd);
+ else
+ ReleaseCapture();
+}
+
+void WINAPI ITextHostImpl_TxSetFocus(ITextHost *iface)
+{
+ ITextHostImpl *This = (ITextHostImpl *)iface;
+ SetFocus(This->hWnd);
+}
+
+void WINAPI ITextHostImpl_TxSetCursor(ITextHost *iface,
+ HCURSOR hcur,
+ BOOL fText)
+{
+ SetCursor(hcur);
+}
+
+BOOL WINAPI ITextHostImpl_TxScreenToClient(ITextHost *iface,
+ LPPOINT lppt)
+{
+ ITextHostImpl *This = (ITextHostImpl *)iface;
+ return ScreenToClient(This->hWnd, lppt);
+}
+
+BOOL WINAPI ITextHostImpl_TxClientToScreen(ITextHost *iface,
+ LPPOINT lppt)
+{
+ ITextHostImpl *This = (ITextHostImpl *)iface;
+ return ClientToScreen(This->hWnd, lppt);
+}
+
+HRESULT WINAPI ITextHostImpl_TxActivate(ITextHost *iface,
+ LONG *plOldState)
+{
+ ITextHostImpl *This = (ITextHostImpl *)iface;
+ *plOldState = (LONG)SetActiveWindow(This->hWnd);
+ return (*plOldState ? S_OK : E_FAIL);
+}
+
+HRESULT WINAPI ITextHostImpl_TxDeactivate(ITextHost *iface,
+ LONG lNewState)
+{
+ HWND ret = SetActiveWindow((HWND)lNewState);
+ return (ret ? S_OK : E_FAIL);
+}
+
+HRESULT WINAPI ITextHostImpl_TxGetClientRect(ITextHost *iface,
+ LPRECT prc)
+{
+ ITextHostImpl *This = (ITextHostImpl *)iface;
+ int ret = GetClientRect(This->hWnd, prc);
+ return (ret ? S_OK : E_FAIL);
+}
+
+HRESULT WINAPI ITextHostImpl_TxGetViewInset(ITextHost *iface,
+ LPRECT prc)
+{
+ prc->top = 0;
+ prc->left = 0;
+ prc->bottom = 0;
+ prc->right = 0;
+ return S_OK;
+}
+
+HRESULT WINAPI ITextHostImpl_TxGetCharFormat(ITextHost *iface,
+ const CHARFORMATW **ppCF)
+{
+ return E_NOTIMPL;
+}
+
+HRESULT WINAPI ITextHostImpl_TxGetParaFormat(ITextHost *iface,
+ const PARAFORMAT **ppPF)
+{
+ return E_NOTIMPL;
+}
+
+COLORREF WINAPI ITextHostImpl_TxGetSysColor(ITextHost *iface,
+ int nIndex)
+{
+ return GetSysColor(nIndex);
+}
+
+HRESULT WINAPI ITextHostImpl_TxGetBackStyle(ITextHost *iface,
+ TXTBACKSTYLE *pStyle)
+{
+ *pStyle = TXTBACK_OPAQUE;
+ return S_OK;
+}
+
+HRESULT WINAPI ITextHostImpl_TxGetMaxLength(ITextHost *iface,
+ DWORD *pLength)
+{
+ *pLength = INFINITE;
+ return S_OK;
+}
+
+HRESULT WINAPI ITextHostImpl_TxGetScrollBars(ITextHost *iface,
+ DWORD *pdwScrollBar)
+{
+ ITextHostImpl *This = (ITextHostImpl *)iface;
+ ME_TextEditor *editor = (ME_TextEditor*)GetWindowLongW(This->hWnd, 0);
+ const DWORD mask = WS_VSCROLL|
+ WS_HSCROLL|
+ ES_AUTOVSCROLL|
+ ES_AUTOHSCROLL|
+ ES_DISABLENOSCROLL;
+ if (editor)
+ {
+ *pdwScrollBar = editor->styleFlags & mask;
+ } else {
+ DWORD style = GetWindowLongW(This->hWnd, GWL_STYLE);
+ if (style & WS_VSCROLL)
+ style |= ES_AUTOVSCROLL;
+ if (!This->bEmulateVersion10 && (style & WS_HSCROLL))
+ style |= ES_AUTOHSCROLL;
+ *pdwScrollBar = style & mask;
+ }
+ return S_OK;
+}
+
+HRESULT WINAPI ITextHostImpl_TxGetPasswordChar(ITextHost *iface,
+ WCHAR *pch)
+{
+ *pch = '*';
+ return S_OK;
+}
+
+HRESULT WINAPI ITextHostImpl_TxGetAcceleratorPos(ITextHost *iface,
+ LONG *pch)
+{
+ *pch = -1;
+ return S_OK;
+}
+
+HRESULT WINAPI ITextHostImpl_TxGetExtent(ITextHost *iface,
+ LPSIZEL lpExtent)
+{
+ return E_NOTIMPL;
+}
+
+HRESULT WINAPI ITextHostImpl_OnTxCharFormatChange(ITextHost *iface,
+ const CHARFORMATW *pcf)
+{
+ return S_OK;
+}
+
+HRESULT WINAPI ITextHostImpl_OnTxParaFormatChange(ITextHost *iface,
+ const PARAFORMAT *ppf)
+{
+ return S_OK;
+}
+
+HRESULT WINAPI ITextHostImpl_TxGetPropertyBits(ITextHost *iface,
+ DWORD dwMask,
+ DWORD *pdwBits)
+{
+ ITextHostImpl *This = (ITextHostImpl *)iface;
+ ME_TextEditor *editor = (ME_TextEditor *)GetWindowLongPtrW(This->hWnd, 0);
+ DWORD style;
+ DWORD dwBits = 0;
+
+ if (editor)
+ {
+ style = editor->styleFlags;
+ if (editor->mode & TM_RICHTEXT)
+ dwBits |= TXTBIT_RICHTEXT;
+ if (editor->bWordWrap)
+ dwBits |= TXTBIT_WORDWRAP;
+ if (style & ECO_AUTOWORDSELECTION)
+ dwBits |= TXTBIT_AUTOWORDSEL;
+ } else {
+ DWORD dwScrollBar;
+
+ style = GetWindowLongW(This->hWnd, GWL_STYLE);
+ ITextHostImpl_TxGetScrollBars(iface, &dwScrollBar);
+
+ dwBits |= TXTBIT_RICHTEXT|TXTBIT_AUTOWORDSEL;
+ if (!(dwScrollBar & ES_AUTOHSCROLL))
+ dwBits |= TXTBIT_WORDWRAP;
+ }
+
+ /* Bits that correspond to window styles. */
+ if (style & ES_MULTILINE)
+ dwBits |= TXTBIT_MULTILINE;
+ if (style & ES_READONLY)
+ dwBits |= TXTBIT_READONLY;
+ if (style & ES_PASSWORD)
+ dwBits |= TXTBIT_USEPASSWORD;
+ if (!(style & ES_NOHIDESEL))
+ dwBits |= TXTBIT_HIDESELECTION;
+ if (style & ES_SAVESEL)
+ dwBits |= TXTBIT_SAVESELECTION;
+ if (style & ES_VERTICAL)
+ dwBits |= TXTBIT_VERTICAL;
+ if (style & ES_NOOLEDRAGDROP)
+ dwBits |= TXTBIT_DISABLEDRAG;
+
+ dwBits |= TXTBIT_ALLOWBEEP;
+
+ /* The following bits are always FALSE because they are probably only
+ * needed for ITextServices_OnTxPropertyBitsChange:
+ * TXTBIT_VIEWINSETCHANGE
+ * TXTBIT_BACKSTYLECHANGE
+ * TXTBIT_MAXLENGTHCHANGE
+ * TXTBIT_CHARFORMATCHANGE
+ * TXTBIT_PARAFORMATCHANGE
+ * TXTBIT_SHOWACCELERATOR
+ * TXTBIT_EXTENTCHANGE
+ * TXTBIT_SELBARCHANGE
+ * TXTBIT_SCROLLBARCHANGE
+ * TXTBIT_CLIENTRECTCHANGE
+ *
+ * Documented by MSDN as not supported:
+ * TXTBIT_USECURRENTBKG
+ */
+
+ *pdwBits = dwBits & dwMask;
+ return S_OK;
+}
+
+HRESULT WINAPI ITextHostImpl_TxNotify(ITextHost *iface,
+ DWORD iNotify,
+ void *pv)
+{
+ ITextHostImpl *This = (ITextHostImpl *)iface;
+ HWND hwnd = This->hWnd;
+ HWND parent = GetParent(hwnd);
+ UINT id = GetWindowLongW(hwnd, GWLP_ID);
+
+ /* Note: EN_MSGFILTER is documented as not being sent to TxNotify */
+
+ switch (iNotify)
+ {
+ case EN_DROPFILES:
+ case EN_LINK:
+ case EN_OLEOPFAILED:
+ case EN_PROTECTED:
+ case EN_REQUESTRESIZE:
+ case EN_SAVECLIPBOARD:
+ case EN_SELCHANGE:
+ case EN_STOPNOUNDO:
+ {
+ /* FIXME: Verify this assumption that pv starts with NMHDR. */
+ NMHDR *info = (NMHDR*)pv;
+ if (!info)
+ return E_FAIL;
+
+ info->hwndFrom = hwnd;
+ info->idFrom = id;
+ info->code = iNotify;
+ SendMessageW(parent, WM_NOTIFY, id, (LPARAM)info);
+ break;
+ }
+
+ case EN_UPDATE:
+ /* Only sent when the window is visible. */
+ if (!IsWindowVisible(This->hWnd))
+ break;
+ /* Fall through */
+ case EN_CHANGE:
+ case EN_ERRSPACE:
+ case EN_HSCROLL:
+ case EN_KILLFOCUS:
+ case EN_MAXTEXT:
+ case EN_SETFOCUS:
+ case EN_VSCROLL:
+ SendMessageW(parent, WM_COMMAND, MAKEWPARAM(id, iNotify), (LPARAM)hwnd);
+ break;
+
+ default:
+ return E_FAIL;
+ }
+ return S_OK;
+}
+
+HIMC WINAPI ITextHostImpl_TxImmGetContext(ITextHost *iface)
+{
+ ITextHostImpl *This = (ITextHostImpl *)iface;
+ return ImmGetContext(This->hWnd);;
+}
+
+void WINAPI ITextHostImpl_TxImmReleaseContext(ITextHost *iface,
+ HIMC himc)
+{
+ ITextHostImpl *This = (ITextHostImpl *)iface;
+ ImmReleaseContext(This->hWnd, himc);
+}
+
+HRESULT WINAPI ITextHostImpl_TxGetSelectionBarWidth(ITextHost *iface,
+ LONG *lSelBarWidth)
+{
+ ITextHostImpl *This = (ITextHostImpl *)iface;
+ ME_TextEditor *editor = (ME_TextEditor *)GetWindowLongPtrW(This->hWnd, 0);
+
+ DWORD style = editor ? editor->styleFlags
+ : GetWindowLongW(This->hWnd, GWL_STYLE);
+ *lSelBarWidth = (style & ES_SELECTIONBAR) ? 225 : 0; /* in HIMETRIC */
+ return S_OK;
+}
+
+
+#ifdef __i386__ /* thiscall functions are i386-specific */
+
+#define THISCALL(func) __thiscall_ ## func
+#define DEFINE_THISCALL_WRAPPER(func) \
+ extern typeof(func) THISCALL(func); \
+ __ASM_GLOBAL_FUNC(__thiscall_ ## func, \
+ "popl %eax\n\t" \
+ "pushl %ecx\n\t" \
+ "pushl %eax\n\t" \
+ "jmp " __ASM_NAME(#func) )
+
+#else /* __i386__ */
+
+#define THISCALL(func) func
+#define DEFINE_THISCALL_WRAPPER(func) /* nothing */
+
+#endif /* __i386__ */
+
+DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetDC);
+DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxReleaseDC);
+DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxShowScrollBar);
+DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxEnableScrollBar);
+DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxSetScrollRange);
+DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxSetScrollPos);
+DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxInvalidateRect);
+DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxViewChange);
+DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxCreateCaret);
+DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxShowCaret);
+DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxSetCaretPos);
+DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxSetTimer);
+DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxKillTimer);
+DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxScrollWindowEx);
+DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxSetCapture);
+DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxSetFocus);
+DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxSetCursor);
+DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxScreenToClient);
+DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxClientToScreen);
+DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxActivate);
+DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxDeactivate);
+DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetClientRect);
+DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetViewInset);
+DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetCharFormat);
+DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetParaFormat);
+DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetSysColor);
+DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetBackStyle);
+DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetMaxLength);
+DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetScrollBars);
+DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetPasswordChar);
+DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetAcceleratorPos);
+DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetExtent);
+DEFINE_THISCALL_WRAPPER(ITextHostImpl_OnTxCharFormatChange);
+DEFINE_THISCALL_WRAPPER(ITextHostImpl_OnTxParaFormatChange);
+DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetPropertyBits);
+DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxNotify);
+DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxImmGetContext);
+DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxImmReleaseContext);
+DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetSelectionBarWidth);
+
+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),
+};
+
+#ifdef __i386__ /* thiscall functions are i386-specific */
+
+#define STDCALL(func) __stdcall_ ## func
+#define DEFINE_STDCALL_WRAPPER(num,func) \
+ extern typeof(func) __stdcall_ ## func; \
+ __ASM_GLOBAL_FUNC(__stdcall_ ## func, \
+ "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);
+DEFINE_STDCALL_WRAPPER(4,ITextHostImpl_TxReleaseDC);
+DEFINE_STDCALL_WRAPPER(5,ITextHostImpl_TxShowScrollBar);
+DEFINE_STDCALL_WRAPPER(6,ITextHostImpl_TxEnableScrollBar);
+DEFINE_STDCALL_WRAPPER(7,ITextHostImpl_TxSetScrollRange);
+DEFINE_STDCALL_WRAPPER(8,ITextHostImpl_TxSetScrollPos);
+DEFINE_STDCALL_WRAPPER(9,ITextHostImpl_TxInvalidateRect);
+DEFINE_STDCALL_WRAPPER(10,ITextHostImpl_TxViewChange);
+DEFINE_STDCALL_WRAPPER(11,ITextHostImpl_TxCreateCaret);
+DEFINE_STDCALL_WRAPPER(12,ITextHostImpl_TxShowCaret);
+DEFINE_STDCALL_WRAPPER(13,ITextHostImpl_TxSetCaretPos);
+DEFINE_STDCALL_WRAPPER(14,ITextHostImpl_TxSetTimer);
+DEFINE_STDCALL_WRAPPER(15,ITextHostImpl_TxKillTimer);
+DEFINE_STDCALL_WRAPPER(16,ITextHostImpl_TxScrollWindowEx);
+DEFINE_STDCALL_WRAPPER(17,ITextHostImpl_TxSetCapture);
+DEFINE_STDCALL_WRAPPER(18,ITextHostImpl_TxSetFocus);
+DEFINE_STDCALL_WRAPPER(19,ITextHostImpl_TxSetCursor);
+DEFINE_STDCALL_WRAPPER(20,ITextHostImpl_TxScreenToClient);
+DEFINE_STDCALL_WRAPPER(21,ITextHostImpl_TxClientToScreen);
+DEFINE_STDCALL_WRAPPER(22,ITextHostImpl_TxActivate);
+DEFINE_STDCALL_WRAPPER(23,ITextHostImpl_TxDeactivate);
+DEFINE_STDCALL_WRAPPER(24,ITextHostImpl_TxGetClientRect);
+DEFINE_STDCALL_WRAPPER(25,ITextHostImpl_TxGetViewInset);
+DEFINE_STDCALL_WRAPPER(26,ITextHostImpl_TxGetCharFormat);
+DEFINE_STDCALL_WRAPPER(27,ITextHostImpl_TxGetParaFormat);
+DEFINE_STDCALL_WRAPPER(28,ITextHostImpl_TxGetSysColor);
+DEFINE_STDCALL_WRAPPER(29,ITextHostImpl_TxGetBackStyle);
+DEFINE_STDCALL_WRAPPER(30,ITextHostImpl_TxGetMaxLength);
+DEFINE_STDCALL_WRAPPER(31,ITextHostImpl_TxGetScrollBars);
+DEFINE_STDCALL_WRAPPER(32,ITextHostImpl_TxGetPasswordChar);
+DEFINE_STDCALL_WRAPPER(33,ITextHostImpl_TxGetAcceleratorPos);
+DEFINE_STDCALL_WRAPPER(34,ITextHostImpl_TxGetExtent);
+DEFINE_STDCALL_WRAPPER(35,ITextHostImpl_OnTxCharFormatChange);
+DEFINE_STDCALL_WRAPPER(36,ITextHostImpl_OnTxParaFormatChange);
+DEFINE_STDCALL_WRAPPER(37,ITextHostImpl_TxGetPropertyBits);
+DEFINE_STDCALL_WRAPPER(38,ITextHostImpl_TxNotify);
+DEFINE_STDCALL_WRAPPER(39,ITextHostImpl_TxImmGetContext);
+DEFINE_STDCALL_WRAPPER(40,ITextHostImpl_TxImmReleaseContext);
+DEFINE_STDCALL_WRAPPER(41,ITextHostImpl_TxGetSelectionBarWidth);
+
+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,
+};
+
+#endif /* __i386__ */
diff --git a/include/textserv.h b/include/textserv.h
index e9ff4da..7a0cfbf 100644
--- a/include/textserv.h
+++ b/include/textserv.h
@@ -357,46 +357,6 @@ DECLARE_INTERFACE_(ITextHost,IUnknown)
#define ITextHost_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
#define ITextHost_AddRef(p) (p)->lpVtbl->AddRef(p)
#define ITextHost_Release(p) (p)->lpVtbl->Release(p)
-/*** ITextHost methods ***/
-#define ITextHost_TxGetDC(p) (p)->lpVtbl->TxGetDC(p)
-#define ITextHost_TxReleaseDC(p,a) (p)->lpVtbl->TxReleaseDC(p,a)
-#define ITextHost_TxShowScrollBar(p,a,b) (p)->lpVtbl->TxShowScrollBar(p,a,b)
-#define ITextHost_TxEnableScrollBar(p,a,b) (p)->lpVtbl->TxEnableScrollBar(p,a,b)
-#define ITextHost_TxSetScrollRange(p,a,b,c,d) (p)->lpVtbl->TxSetScrollRange(p,a,b,c,d)
-#define ITextHost_TxSetScrollPos(p,a,b,c) (p)->lpVtbl->TxSetScrollPos(p,a,b,c)
-#define ITextHost_TxInvalidateRect(p,a,b) (p)->lpVtbl->TxInvalidateRect(p,a,b)
-#define ITextHost_TxViewChange(p,a) (p)->lpVtbl->TxViewChange(p,a)
-#define ITextHost_TxCreateCaret(p,a,b,c) (p)->lpVtbl->TxCreateCaret(p,a,b,c)
-#define ITextHost_TxShowCaret(p,a) (p)->lpVtbl->TxShowCaret(p,a)
-#define ITextHost_TxSetCarentPos(p,a,b) (p)->lpVtbl->TxSetCarentPos(p,a,b)
-#define ITextHost_TxSetTimer(p,a,b) (p)->lpVtbl->TxSetTimer(p,a,b)
-#define ITextHost_TxKillTimer(p,a) (p)->lpVtbl->TxKillTimer(p,a)
-#define ITextHost_TxScrollWindowEx(p,a,b,c,d,e,f,g) (p)->lpVtbl->TxScrollWindowEx(p,a,b,c,d,e,f,g)
-#define ITextHost_TxSetCapture(p,a) (p)->lpVtbl->TxSetCapture(p,a)
-#define ITextHost_TxSetFocus(p) (p)->lpVtbl->TxSetFocus(p)
-#define ITextHost_TxSetCursor(p,a,b) (p)->lpVtbl->TxSetCursor(p,a,b)
-#define ITextHost_TxScreenToClient(p,a) (p)->lpVtbl->TxScreenToClient(p,a)
-#define ITextHost_TxClientToScreen(p,a) (p)->lpVtbl->TxClientToScreen(p,a)
-#define ITextHost_TxActivate(p,a) (p)->lpVtbl->TxActivate(p,a)
-#define ITextHost_TxDeactivate(p,a) (p)->lpVtbl->TxDeactivate(p,a)
-#define ITextHost_TxGetClientRect(p,a) (p)->lpVtbl->TxGetClientRect(p,a)
-#define ITextHost_TxGetViewInset(p,a) (p)->lpVtbl->TxGetViewInset(p,a)
-#define ITextHost_TxGetCharFormat(p,a) (p)->lpVtbl->TxGetCharFormat(p,a)
-#define ITextHost_TxGetParaFormat(p,a) (p)->lpVtbl->TxGetParaFormat(p,a)
-#define ITextHost_TxGetSysColor(p,a) (p)->lpVtbl->TxGetSysColor(p,a)
-#define ITextHost_TxGetBackStyle(p,a) (p)->lpVtbl->TxGetBackStyle(p,a)
-#define ITextHost_TxGetMaxLength(p,a) (p)->lpVtbl->TxGetMaxLength(p,a)
-#define ITextHost_TxGetScrollBars(p,a) (p)->lpVtbl->TxGetScrollBars(p,a)
-#define ITextHost_TxGetPasswordChar(p,a) (p)->lpVtbl->TxGetPasswordChar(p,a)
-#define ITextHost_TxGetAcceleratorPos(p,a) (p)->lpVtbl->TxGetAcceleratorPos(p,a)
-#define ITextHost_TxGetExtent(p,a) (p)->lpVtbl->TxGetExtent(p,a)
-#define ITextHost_OnTxCharFormatChange(p,a) (p)->lpVtbl->OnTxCharFormatChange(p,a)
-#define ITextHost_OnTxParaFormatChange(p,a) (p)->lpVtbl->OnTxParaFormatChange(p,a)
-#define ITextHost_TxGetPropertyBits(p,a,b) (p)->lpVtbl->TxGetPropertyBits(p,a,b)
-#define ITextHost_TxNotify(p,a,b) (p)->lpVtbl->TxNotify(p,a,b)
-#define ITextHost_TxImmGetContext(p) (p)->lpVtbl->TxImmGetContext(p)
-#define ITextHost_TxImmReleaseContext(p,a) (p)->lpVtbl->TxImmReleaseContext(p,a)
-#define ITextHost_TxGetSelectionBarWidth(p,a) (p)->lpVtbl->TxGetSelectionBarWidth(p,a)
#endif
#undef INTERFACE
More information about the wine-patches
mailing list