Alexandre Julliard : riched20: Move the textHostVtbl definition to work around Mac OS X breakage with __ASM_GLOBAL_FUNC .

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 3fe51326cd84dafc7f50731c8846401475ed937a
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=3fe51326cd84dafc7f50731c88...

Author: Alexandre Julliard <julliard(a)winehq.org>
Date:   Sat Jun 13 12:19:40 2009 +0200

riched20: Move the textHostVtbl definition to work around Mac OS X breakage with __ASM_GLOBAL_FUNC.

---

 dlls/riched20/txthost.c |   90 +++++++++++++++++++++++-----------------------
 1 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c
index 8fabd83..ae15e62 100644
--- a/dlls/riched20/txthost.c
+++ b/dlls/riched20/txthost.c
@@ -583,51 +583,6 @@ 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
@@ -680,6 +635,51 @@ DEFINE_STDCALL_WRAPPER(39,ITextHostImpl_TxImmGetContext);
 DEFINE_STDCALL_WRAPPER(40,ITextHostImpl_TxImmReleaseContext);
 DEFINE_STDCALL_WRAPPER(41,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),
+};
+
 ITextHostVtbl itextHostStdcallVtbl = {
     NULL,
     NULL,