August 2009 - Wine-commits - list.winehq.org

Henri Verbeet : wined3d: Properly check if an attribute is used in drawStridedInstanced().
by Alexandre Julliard 27 Aug '09

27 Aug '09

Module: wine Branch: master Commit: c51432344282189c2b3b8a9b0867054ec3d0a229 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c51432344282189c2b3b8a9b0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 27 10:04:52 2009 +0200 wined3d: Properly check if an attribute is used in drawStridedInstanced(). --- dlls/wined3d/drawprim.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 6103ff3..5627b90 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -522,6 +522,8 @@ static inline void drawStridedInstanced(IWineD3DDevice *iface, const struct wine for (i = 0; i < sizeof(si->elements) / sizeof(*si->elements); ++i) { + if (!(si->use_map & (1 << i))) continue; + if (stateblock->streamFlags[si->elements[i].stream_idx] & WINED3DSTREAMSOURCE_INSTANCEDATA) { instancedData[numInstancedAttribs] = i;

1 0

Michael Stefaniuc : user32: Remove a stray '; ' that produces an empty if condition.
by Alexandre Julliard 27 Aug '09

27 Aug '09

Module: wine Branch: master Commit: 3a7a0eb9dd9b8b68eb93ee9273fcf065cd995da9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a7a0eb9dd9b8b68eb93ee927… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Aug 27 00:30:56 2009 +0200 user32: Remove a stray ';' that produces an empty if condition. --- dlls/user32/edit.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 83e004a..5a62bc2 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -3636,7 +3636,7 @@ static LRESULT EDIT_WM_KeyDown(EDITSTATE *es, INT key) } break; case VK_ESCAPE: - if ((es->style & ES_MULTILINE) && EDIT_IsInsideDialog(es)); + if ((es->style & ES_MULTILINE) && EDIT_IsInsideDialog(es)) PostMessageW(es->hwndParent, WM_CLOSE, 0, 0); break; case VK_TAB:

1 0

Jacek Caban : mshtml: Update wine_url in nsIURL::SetQuery.
by Alexandre Julliard 27 Aug '09

27 Aug '09

Module: wine Branch: master Commit: 46ca3c433f99344b2c9cc03bb816633f207f46ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=46ca3c433f99344b2c9cc03bb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 26 23:14:20 2009 +0200 mshtml: Update wine_url in nsIURL::SetQuery. --- dlls/mshtml/nsio.c | 46 +++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 43 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index b5fe51e..12e8520 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -1856,14 +1856,54 @@ static nsresult NSAPI nsURL_GetQuery(nsIWineURI *iface, nsACString *aQuery) static nsresult NSAPI nsURL_SetQuery(nsIWineURI *iface, const nsACString *aQuery) { nsURI *This = NSURI_THIS(iface); + const WCHAR *ptr1, *ptr2; + const char *query; + WCHAR *new_url, *ptr; + DWORD len, size; TRACE("(%p)->(%s)\n", This, debugstr_nsacstr(aQuery)); if(This->nsurl) - return nsIURL_SetQuery(This->nsurl, aQuery); + nsIURL_SetQuery(This->nsurl, aQuery); - FIXME("default action not implemented\n"); - return NS_ERROR_NOT_IMPLEMENTED; + if(!This->wine_url) + return NS_OK; + + nsACString_GetData(aQuery, &query); + size = len = MultiByteToWideChar(CP_ACP, 0, query, -1, NULL, 0); + ptr1 = strchrW(This->wine_url, '?'); + if(ptr1) { + size += ptr1-This->wine_url; + ptr2 = strchrW(ptr1, '#'); + if(ptr2) + size += strlenW(ptr2); + }else { + ptr1 = This->wine_url + strlenW(This->wine_url); + ptr2 = NULL; + size += strlenW(This->wine_url); + } + + if(*query) + size++; + + new_url = heap_alloc(size*sizeof(WCHAR)); + memcpy(new_url, This->wine_url, (ptr1-This->wine_url)*sizeof(WCHAR)); + ptr = new_url + (ptr1-This->wine_url); + if(*query) { + *ptr++ = '?'; + MultiByteToWideChar(CP_ACP, 0, query, -1, ptr, len); + ptr += len-1; + } + if(ptr2) + strcpyW(ptr, ptr2); + else + *ptr = 0; + + TRACE("setting %s\n", debugstr_w(new_url)); + + heap_free(This->wine_url); + This->wine_url = new_url; + return NS_OK; } static nsresult NSAPI nsURL_GetRef(nsIWineURI *iface, nsACString *aRef)

1 0

Jacek Caban : mshtml: Remove no longer used create_nsstream.
by Alexandre Julliard 27 Aug '09

27 Aug '09

Module: wine Branch: master Commit: 9545da643f31adce5a1bc5de07a7ecbcd124f1d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9545da643f31adce5a1bc5de0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 26 23:13:29 2009 +0200 mshtml: Remove no longer used create_nsstream. --- dlls/mshtml/nsembed.c | 30 ------------------------------ dlls/mshtml/nsiface.idl | 13 ------------- 2 files changed, 0 insertions(+), 43 deletions(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 41f762f..50001aa 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -38,14 +38,10 @@ WINE_DECLARE_DEBUG_CHANNEL(gecko); #define NS_APPSTARTUPNOTIFIER_CONTRACTID "@mozilla.org/embedcomp/appstartup-notifier;1" #define NS_WEBBROWSER_CONTRACTID "@mozilla.org/embedding/browser/nsWebBrowser;1" -#define NS_PROFILE_CONTRACTID "@mozilla.org/profile/manager;1" #define NS_MEMORY_CONTRACTID "@mozilla.org/xpcom/memory-service;1" -#define NS_STRINGSTREAM_CONTRACTID "@mozilla.org/io/string-input-stream;1" #define NS_COMMANDPARAMS_CONTRACTID "@mozilla.org/embedcomp/command-params;1" #define NS_HTMLSERIALIZER_CONTRACTID "@mozilla.org/layout/contentserializer;1?mimetype=text/html" #define NS_EDITORCONTROLLER_CONTRACTID "@mozilla.org/editor/editorcontroller;1" -#define NS_ARRAY_CONTRACTID "@mozilla.org/array;1" -#define NS_VARIANT_CONTRACTID "@mozilla.org/variant;1" #define NS_PREFERENCES_CONTRACTID "@mozilla.org/preferences;1" #define APPSTARTUP_TOPIC "app-startup" @@ -581,32 +577,6 @@ void nsAString_Finish(nsAString *str) NS_StringContainerFinish(str); } -nsIInputStream *create_nsstream(const char *data, PRInt32 data_len) -{ - nsIStringInputStream *ret; - nsresult nsres; - - if(!pCompMgr) - return NULL; - - nsres = nsIComponentManager_CreateInstanceByContractID(pCompMgr, - NS_STRINGSTREAM_CONTRACTID, NULL, &IID_nsIStringInputStream, - (void**)&ret); - if(NS_FAILED(nsres)) { - ERR("Could not get nsIStringInputStream\n"); - return NULL; - } - - nsres = nsIStringInputStream_SetData(ret, data, data_len); - if(NS_FAILED(nsres)) { - ERR("AdoptData failed: %08x\n", nsres); - nsIStringInputStream_Release(ret); - return NULL; - } - - return (nsIInputStream*)ret; -} - nsICommandParams *create_nscommand_params(void) { nsICommandParams *ret = NULL; diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index b6ae250..1bfc67d 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -286,19 +286,6 @@ interface nsIInputStream : nsISupports [ object, - uuid(450cd2d4-f0fd-424d-b365-b1251f80fd53), - local - /* NOT_FROZEN */ -] -interface nsIStringInputStream : nsIInputStream -{ - nsresult SetData(const char *data, PRInt32 dataLen); - nsresult AdoptData(char *data, PRInt32 dataLen); - nsresult ShareData(const char *data, PRInt32 dataLen); -} - -[ - object, uuid(07a22cc0-0ce5-11d3-9331-00104ba0fd40), local /* FROZEN */

1 0

Jacek Caban : mshtml: Wrap nsIURL interface.
by Alexandre Julliard 27 Aug '09

27 Aug '09

Module: wine Branch: master Commit: d6215843d79bea52badca3d7ace6e0bb323d1d81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6215843d79bea52badca3d7a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 27 11:31:14 2009 +0200 mshtml: Wrap nsIURL interface. --- dlls/mshtml/nsiface.idl | 30 +++++- dlls/mshtml/nsio.c | 271 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 300 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d6215843d79bea52badca…

1 0

Juan Lang : crypt32: Fix a test failure on Windows 7.
by Alexandre Julliard 27 Aug '09

27 Aug '09

Module: wine Branch: master Commit: 9227947a5952f38fd4c79c0a01ec75a53b3da2af URL: http://source.winehq.org/git/wine.git/?a=commit;h=9227947a5952f38fd4c79c0a0… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Aug 26 08:56:55 2009 -0700 crypt32: Fix a test failure on Windows 7. --- dlls/crypt32/tests/oid.c | 8 -------- 1 files changed, 0 insertions(+), 8 deletions(-) diff --git a/dlls/crypt32/tests/oid.c b/dlls/crypt32/tests/oid.c index 8b680c4..030a548 100644 --- a/dlls/crypt32/tests/oid.c +++ b/dlls/crypt32/tests/oid.c @@ -98,16 +98,8 @@ static void testOIDToAlgID(void) DWORD alg; /* Test with a bogus one */ - SetLastError(0xdeadbeef); alg = CertOIDToAlgId("1.2.3"); ok(!alg, "Expected failure, got %d\n", alg); - ok(GetLastError() == 0xdeadbeef || - GetLastError() == ERROR_RESOURCE_NAME_NOT_FOUND || - GetLastError() == ERROR_INVALID_PARAMETER || /* Vista */ - GetLastError() == ERROR_SUCCESS || /* win2k */ - GetLastError() == ERROR_FILE_INVALID, /* another Vista */ - "Expected ERROR_RESOURCE_NAME_NOT_FOUND, ERROR_INVALID_PARAMETER, " - "ERROR_SUCCESS or no error set, got %08x\n", GetLastError()); for (i = 0; i < sizeof(oidToAlgID) / sizeof(oidToAlgID[0]); i++) {

1 0

Juan Lang : comctl32: Return the number of characters copied in WM_GETTEXT even if the buffer is too small .
by Alexandre Julliard 27 Aug '09

27 Aug '09

Module: wine Branch: master Commit: 390a248e0649cf5cc4c4e8a476f0747bc204c3ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=390a248e0649cf5cc4c4e8a47… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Aug 26 08:50:39 2009 -0700 comctl32: Return the number of characters copied in WM_GETTEXT even if the buffer is too small. --- dlls/comctl32/status.c | 11 ++++++++--- dlls/comctl32/tests/status.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/status.c b/dlls/comctl32/status.c index 11a977d..d6b627a 100644 --- a/dlls/comctl32/status.c +++ b/dlls/comctl32/status.c @@ -1016,12 +1016,17 @@ STATUSBAR_WMGetText (const STATUS_INFO *infoPtr, INT size, LPWSTR buf) len = strlenW (infoPtr->parts[0].text); - if (size > len) { + if (!size) + return len; + else if (size > len) { strcpyW (buf, infoPtr->parts[0].text); return len; } - - return -1; + else { + memcpy (buf, infoPtr->parts[0].text, (size - 1) * sizeof(WCHAR)); + buf[size - 1] = 0; + return size - 1; + } } diff --git a/dlls/comctl32/tests/status.c b/dlls/comctl32/tests/status.c index f1cbda4..28df50f 100644 --- a/dlls/comctl32/tests/status.c +++ b/dlls/comctl32/tests/status.c @@ -466,6 +466,34 @@ static void test_status_ownerdraw(void) SetWindowLongPtr( g_hMainWnd, GWLP_WNDPROC, (LONG_PTR)g_wndproc_saved ); } +static void test_gettext(void) +{ + HWND hwndStatus = CreateWindow(SUBCLASS_NAME, NULL, WS_CHILD|WS_VISIBLE, + 0, 0, 300, 20, g_hMainWnd, NULL, NULL, NULL); + char buf[5]; + int r; + + r = SendMessage(hwndStatus, SB_SETTEXT, 0, (LPARAM)"Text"); + expect(TRUE, r); + r = SendMessage(hwndStatus, WM_GETTEXTLENGTH, 0, 0); + expect(4, r); + /* A size of 0 returns the length of the text */ + r = SendMessage(hwndStatus, WM_GETTEXT, 0, 0); + expect(4, r); + /* A size of 1 only stores the NULL terminator */ + buf[0] = 0xa; + r = SendMessage(hwndStatus, WM_GETTEXT, 1, (LPARAM)buf); + expect(0, r); + ok(!buf[0], "expected empty buffer\n"); + /* A size of 2 returns a length 1 */ + r = SendMessage(hwndStatus, WM_GETTEXT, 2, (LPARAM)buf); + expect(1, r); + r = SendMessage(hwndStatus, WM_GETTEXT, sizeof(buf), (LPARAM)buf); + expect(4, r); + ok(!strcmp(buf, "Text"), "expected Text, got %s\n", buf); + DestroyWindow(hwndStatus); +} + START_TEST(status) { hinst = GetModuleHandleA(NULL); @@ -483,4 +511,5 @@ START_TEST(status) test_create(); test_height(); test_status_ownerdraw(); + test_gettext(); }

1 0

Alexandre Julliard : ntdll: Correctly jump to the modified context after an exception on x86_64.
by Alexandre Julliard 27 Aug '09

27 Aug '09

Module: wine Branch: master Commit: 70c39c4456cd0492417b3df938b0a6b0d5351f7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=70c39c4456cd0492417b3df93… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 26 21:24:17 2009 +0200 ntdll: Correctly jump to the modified context after an exception on x86_64. --- dlls/ntdll/signal_x86_64.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 716efea..1a0fd88 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -1685,6 +1685,7 @@ static void raise_segv_exception( EXCEPTION_RECORD *rec, CONTEXT *context ) } status = raise_exception( rec, context, TRUE ); if (status) raise_status( status, rec ); + set_cpu_context( context ); } @@ -1697,6 +1698,7 @@ static void raise_generic_exception( EXCEPTION_RECORD *rec, CONTEXT *context ) { NTSTATUS status = raise_exception( rec, context, TRUE ); if (status) raise_status( status, rec ); + set_cpu_context( context ); }

1 0

Jörg Höhle : wined3d: Delete meaningless UNIX GL driver version parsing.
by Alexandre Julliard 27 Aug '09

27 Aug '09

Module: wine Branch: master Commit: b9d955b86d2c03ad877767d97ad77f092d664ceb URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9d955b86d2c03ad877767d97… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sun Aug 23 19:35:36 2009 +0200 wined3d: Delete meaningless UNIX GL driver version parsing. --- dlls/wined3d/directx.c | 109 ++--------------------------------------------- 1 files changed, 5 insertions(+), 104 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 64f04fc..8d1995d 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -927,7 +927,9 @@ static void fixup_extensions(struct wined3d_gl_info *gl_info, const char *gl_ren /* Find out if PBOs work as they are supposed to. */ test_pbo_functionality(gl_info); - /* Fixup the driver version */ + /* Fixup the driver version we'll report to the app. */ + gl_info->driver_version = MAKEDWORD_VERSION(8, 6); /* Nvidia RIVA TNT, arbitrary */ + gl_info->driver_version_hipart = MAKEDWORD_VERSION(7, 1); for (i = 0; i < (sizeof(driver_version_table) / sizeof(driver_version_table[0])); ++i) { if (gl_info->gl_vendor == driver_version_table[i].vendor @@ -944,6 +946,8 @@ static void fixup_extensions(struct wined3d_gl_info *gl_info, const char *gl_ren break; } } + TRACE_(d3d_caps)("Reporting (fake) driver version 0x%08X-0x%08X.\n", + gl_info->driver_version_hipart, gl_info->driver_version); } static DWORD wined3d_parse_gl_version(const char *gl_version) @@ -964,105 +968,6 @@ static DWORD wined3d_parse_gl_version(const char *gl_version) return MAKEDWORD_VERSION(major, minor); } -static DWORD wined3d_guess_driver_version(const char *gl_version, GL_Vendors vendor) -{ - int major, minor; - const char *ptr; - DWORD ret; - - /* Now parse the driver specific string which we'll report to the app. */ - switch (vendor) - { - case VENDOR_NVIDIA: - ptr = strstr(gl_version, "NVIDIA"); - if (!ptr) return 0; - - ptr = strstr(ptr, " "); - if (!ptr) return 0; - - while (isspace(*ptr)) ++ptr; - if (!*ptr) return 0; - - major = atoi(ptr); - while (isdigit(*ptr)) ++ptr; - - if (*ptr++ != '.') return 0; - - minor = atoi(ptr); - minor = major * 100 + minor; - major = 10; - break; - - case VENDOR_ATI: - major = minor = 0; - - ptr = strchr(gl_version, '-'); - if (!ptr) return 0; - - ++ptr; - - /* Check if version number is of the form x.y.z. */ - if (strlen(ptr) < 5 - || !isdigit(ptr[0]) || ptr[1] != '.' - || !isdigit(ptr[2]) || ptr[3] != '.' - || !isdigit(ptr[4])) - { - return 0; - } - - major = ptr[0] - '0'; - minor = ((ptr[2] - '0') << 8) | (ptr[4] - '0'); - break; - - case VENDOR_INTEL: - /* Apple and Mesa version strings look differently, but both provide intel drivers. */ - if (strstr(gl_version, "APPLE")) - { - /* [0-9]+.[0-9]+ APPLE-[0-9]+.[0.9]+.[0.9]+ - * We only need the first part, and use the APPLE as identification - * "1.2 APPLE-1.4.56". */ - ptr = gl_version; - - major = atoi(ptr); - while (isdigit(*ptr)) ++ptr; - - if (*ptr++ != '.') return 0; - - minor = atoi(ptr); - break; - } - /* Fallthrough */ - - case VENDOR_MESA: - ptr = strstr(gl_version, "Mesa"); - if (!ptr) return 0; - - ptr = strstr(ptr, " "); - if (!ptr) return 0; - - while (isspace(*ptr)) ++ptr; - if (!*ptr) return 0; - - major = atoi(ptr); - while (isdigit(*ptr)) ++ptr; - - if (*ptr++ != '.') return 0; - - minor = atoi(ptr); - break; - - default: - FIXME("Unhandled vendor %#x.\n", vendor); - return 0; - } - - ret = MAKEDWORD_VERSION(major, minor); - TRACE_(d3d_caps)("Found driver version %s -> %d.%d -> 0x%08x.\n", - debugstr_a(gl_version), major, minor, ret); - - return ret; -} - static GL_Vendors wined3d_guess_vendor(const char *gl_vendor, const char *gl_renderer) { if (strstr(gl_vendor, "NVIDIA")) @@ -1605,10 +1510,6 @@ static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_gl_info *gl_info) return FALSE; } gl_version = wined3d_parse_gl_version(gl_string); - gl_info->driver_version = wined3d_guess_driver_version(gl_string, gl_info->gl_vendor); - if (!gl_info->driver_version) FIXME_(d3d_caps)("Unrecognized GL_VERSION %s.\n", debugstr_a(gl_string)); - /* Current Windows drivers have versions like 6.14.... (some older have an earlier version). */ - gl_info->driver_version_hipart = MAKEDWORD_VERSION(6, 14); /* * Initialize openGL extension related variables

1 0

Alexandre Julliard : riched20: Make sure we have a valid ITextHost vtable for all platforms.
by Alexandre Julliard 27 Aug '09

27 Aug '09

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

1 0