June 2009 - Wine-Commits - list.winehq.org

Alexandre Julliard : riched20: Move the textHostVtbl definition to work around Mac OS X breakage with __ASM_GLOBAL_FUNC .
by Alexandre Julliard June 15, 2009

June 15, 2009

Module: wine Branch: master Commit: 3fe51326cd84dafc7f50731c8846401475ed937a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fe51326cd84dafc7f50731c8… 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,

1 0

Paul Vriens : riched32/tests: Fix a few test failures on Win9x/WinME/NT4.
by Alexandre Julliard June 12, 2009

June 12, 2009

Module: wine Branch: master Commit: 5084632864b9efca977a477227fb96628114f20a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5084632864b9efca977a47722… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Jun 12 13:19:34 2009 +0200 riched32/tests: Fix a few test failures on Win9x/WinME/NT4. --- dlls/riched32/tests/editor.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/riched32/tests/editor.c b/dlls/riched32/tests/editor.c index da74b72..c29d6d7 100644 --- a/dlls/riched32/tests/editor.c +++ b/dlls/riched32/tests/editor.c @@ -988,7 +988,8 @@ static void test_EM_GETOPTIONS(void) WS_POPUP|WS_VSCROLL|WS_HSCROLL, 0, 0, 200, 60, NULL, NULL, hmoduleRichEdit, NULL); options = SendMessage(hwnd, EM_GETOPTIONS, 0, 0); - ok(options == ECO_AUTOVSCROLL, + ok(options == ECO_AUTOVSCROLL || + broken(options == 0), /* Win9x, WinME and NT4 */ "Incorrect initial options %x\n", options); DestroyWindow(hwnd); } @@ -1005,10 +1006,15 @@ static void test_autoscroll(void) 0, 0, 200, 60, NULL, NULL, hmoduleRichEdit, NULL); ok(hwnd != NULL, "class: %s, error: %d\n", RICHEDIT_CLASS10A, (int) GetLastError()); ret = SendMessage(hwnd, EM_GETOPTIONS, 0, 0); - ok(ret & ECO_AUTOVSCROLL, "ECO_AUTOVSCROLL isn't set.\n"); + ok(ret & ECO_AUTOVSCROLL || + broken(!(ret & ECO_AUTOVSCROLL)), /* Win9x, WinME and NT4 */ + "ECO_AUTOVSCROLL isn't set.\n"); ok(!(ret & ECO_AUTOHSCROLL), "ECO_AUTOHSCROLL is set.\n"); ret = GetWindowLong(hwnd, GWL_STYLE); - todo_wine ok(ret & ES_AUTOVSCROLL, "ES_AUTOVSCROLL isn't set.\n"); + todo_wine + ok(ret & ES_AUTOVSCROLL || + broken(!(ret & ES_AUTOVSCROLL)), /* Win9x, WinMe and NT4 */ + "ES_AUTOVSCROLL isn't set.\n"); ok(!(ret & ES_AUTOHSCROLL), "ES_AUTOHSCROLL is set.\n"); DestroyWindow(hwnd);

1 0

Hans Leidekker : msi: Add some reinstall tests.
by Alexandre Julliard June 12, 2009

June 12, 2009

Module: wine Branch: master Commit: e3a7ae8a30ab155bc46f355810be87518ad0cccb URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3a7ae8a30ab155bc46f35581… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jun 12 11:35:47 2009 +0200 msi: Add some reinstall tests. --- dlls/msi/tests/install.c | 379 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 378 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e3a7ae8a30ab155bc46f3…

1 0

Dmitry Timoshkov : user32: Add a test for PeekMessage((HWND)-1), make it pass under Wine.
by Alexandre Julliard June 12, 2009

June 12, 2009

Module: wine Branch: master Commit: acb05666bbfd4814ee6fef59d8c59e716e4062d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=acb05666bbfd4814ee6fef59d… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Jun 11 21:49:31 2009 +0900 user32: Add a test for PeekMessage((HWND)-1), make it pass under Wine. --- dlls/user32/message.c | 2 + dlls/user32/tests/msg.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++ server/queue.c | 10 +++++++- 3 files changed, 65 insertions(+), 1 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 0d82001..f4913e1 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -2034,6 +2034,8 @@ static BOOL peek_message( MSG *msg, HWND hwnd, UINT first, UINT last, UINT flags if (!(buffer = HeapAlloc( GetProcessHeap(), 0, buffer_size ))) return FALSE; if (!first && !last) last = ~0; + if (hwnd == HWND_BROADCAST || hwnd == HWND_TOPMOST || hwnd == HWND_BOTTOM) + hwnd = (HWND)-1; for (;;) { diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 0a59ae8..28b0420 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -11592,6 +11592,59 @@ static void test_defwinproc(void) DestroyWindow( hwnd); } +static void test_PostMessage(void) +{ + static const struct + { + HWND hwnd; + BOOL ret; + } data[] = + { + { HWND_TOP /* 0 */, TRUE }, + { HWND_BROADCAST, TRUE }, + { HWND_BOTTOM, TRUE }, + { HWND_TOPMOST, TRUE }, + { HWND_NOTOPMOST, FALSE }, + { HWND_MESSAGE, FALSE }, + { (HWND)0xdeadbeef, FALSE } + }; + int i; + HWND hwnd; + BOOL ret; + MSG msg; + + hwnd = CreateWindowExA(0, "static", NULL, WS_POPUP, 0,0,0,0,0,0,0, NULL); + assert(hwnd); + + flush_events(); + + PostMessage(hwnd, WM_USER+1, 0x1234, 0x5678); + PostMessage(0, WM_USER+2, 0x5678, 0x1234); + + for (i = 0; i < sizeof(data)/sizeof(data[0]); i++) + { + memset(&msg, 0xab, sizeof(msg)); + ret = PeekMessageA(&msg, data[i].hwnd, 0, 0, PM_NOREMOVE); + ok(ret == data[i].ret, "%d: hwnd %p expected %d, got %d\n", i, data[i].hwnd, data[i].ret, ret); + if (data[i].ret) + { + if (data[i].hwnd) + ok(ret && msg.hwnd == 0 && msg.message == WM_USER+2 && + msg.wParam == 0x5678 && msg.lParam == 0x1234, + "got ret %d hwnd %p msg %04x wParam %08lx lParam %08lx instead of TRUE/0/WM_USER/0x1234/0x5678\n", + ret, msg.hwnd, msg.message, msg.wParam, msg.lParam); + else + ok(ret && msg.hwnd == hwnd && msg.message == WM_USER+1 && + msg.wParam == 0x1234 && msg.lParam == 0x5678, + "got ret %d hwnd %p msg %04x wParam %08lx lParam %08lx instead of TRUE/0/WM_USER/0x1234/0x5678\n", + ret, msg.hwnd, msg.message, msg.wParam, msg.lParam); + } + } + + DestroyWindow(hwnd); + flush_events(); +} + START_TEST(msg) { BOOL ret; @@ -11633,6 +11686,7 @@ START_TEST(msg) hEvent_hook = 0; #endif + test_PostMessage(); test_ShowWindow(); test_PeekMessage(); test_PeekMessage2(); diff --git a/server/queue.c b/server/queue.c index e603b16..c5841c9 100644 --- a/server/queue.c +++ b/server/queue.c @@ -648,6 +648,14 @@ static void reply_message( struct msg_queue *queue, lparam_t result, } } +static int match_window( user_handle_t win, user_handle_t msg_win ) +{ + if (!win) return 1; + if (win == (user_handle_t)-1) return !msg_win; + if (msg_win == win) return 1; + return is_child_window( win, msg_win ); +} + /* retrieve a posted message */ static int get_posted_message( struct msg_queue *queue, user_handle_t win, unsigned int first, unsigned int last, unsigned int flags, @@ -658,7 +666,7 @@ static int get_posted_message( struct msg_queue *queue, user_handle_t win, /* check against the filters */ LIST_FOR_EACH_ENTRY( msg, &queue->msg_list[POST_MESSAGE], struct message, entry ) { - if (win && msg->win && msg->win != win && !is_child_window( win, msg->win )) continue; + if (!match_window( win, msg->win )) continue; if (!check_msg_filter( msg->msg, first, last )) continue; goto found; /* found one */ }

1 0

Aric Stewart : msctf: Framework for ITfCompartmentMgr.
by Alexandre Julliard June 12, 2009

June 12, 2009

Module: wine Branch: master Commit: 2b08041bf17fc2913838ce3612ebbdf6ba8611f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b08041bf17fc2913838ce361… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Jun 11 13:32:57 2009 -0500 msctf: Framework for ITfCompartmentMgr. --- dlls/msctf/Makefile.in | 3 +- dlls/msctf/compartmentmgr.c | 199 +++++++++++++++++++++++++++++++++++++++++++ dlls/msctf/msctf_internal.h | 2 + 3 files changed, 203 insertions(+), 1 deletions(-) diff --git a/dlls/msctf/Makefile.in b/dlls/msctf/Makefile.in index 33c69ec..2c319f1 100644 --- a/dlls/msctf/Makefile.in +++ b/dlls/msctf/Makefile.in @@ -3,10 +3,11 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = msctf.dll -IMPORTS = uuid ole32 user32 advapi32 kernel32 ntdll +IMPORTS = uuid ole32 oleaut32 user32 advapi32 kernel32 ntdll C_SRCS = \ categorymgr.c \ + compartmentmgr.c \ context.c \ documentmgr.c \ inputprocessor.c \ diff --git a/dlls/msctf/compartmentmgr.c b/dlls/msctf/compartmentmgr.c new file mode 100644 index 0000000..33369c2 --- /dev/null +++ b/dlls/msctf/compartmentmgr.c @@ -0,0 +1,199 @@ +/* + * ITfCompartmentMgr implementation + * + * Copyright 2009 Aric Stewart, CodeWeavers + * + * 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 <stdarg.h> + +#define COBJMACROS + +#include "wine/debug.h" +#include "windef.h" +#include "winbase.h" +#include "winreg.h" +#include "winuser.h" +#include "shlwapi.h" +#include "winerror.h" +#include "objbase.h" +#include "oleauto.h" + +#include "wine/unicode.h" +#include "wine/list.h" + +#include "msctf.h" +#include "msctf_internal.h" + +WINE_DEFAULT_DEBUG_CHANNEL(msctf); + +typedef struct tagCompartmentValue { + struct list entry; + GUID guid; + TfClientId owner; + ITfCompartment *compartment; +} CompartmentValue; + +typedef struct tagCompartmentMgr { + const ITfCompartmentMgrVtbl *CompartmentMgrVtbl; + LONG refCount; + + IUnknown *pUnkOuter; + + struct list values; +} CompartmentMgr; + + +HRESULT CompartmentMgr_Destructor(ITfCompartmentMgr *iface) +{ + CompartmentMgr *This = (CompartmentMgr *)iface; + struct list *cursor, *cursor2; + + LIST_FOR_EACH_SAFE(cursor, cursor2, &This->values) + { + CompartmentValue* value = LIST_ENTRY(cursor,CompartmentValue,entry); + list_remove(cursor); + ITfCompartment_Release(value->compartment); + HeapFree(GetProcessHeap(),0,value); + } + + HeapFree(GetProcessHeap(),0,This); + return S_OK; +} + +/***************************************************** + * ITfCompartmentMgr functions + *****************************************************/ +static HRESULT WINAPI CompartmentMgr_QueryInterface(ITfCompartmentMgr *iface, REFIID iid, LPVOID *ppvOut) +{ + CompartmentMgr *This = (CompartmentMgr *)iface; + if (This->pUnkOuter) + return IUnknown_QueryInterface(This->pUnkOuter, iid, *ppvOut); + else + { + *ppvOut = NULL; + + if (IsEqualIID(iid, &IID_IUnknown) || IsEqualIID(iid, &IID_ITfCompartmentMgr)) + { + *ppvOut = This; + } + + if (*ppvOut) + { + IUnknown_AddRef(iface); + return S_OK; + } + + WARN("unsupported interface: %s\n", debugstr_guid(iid)); + return E_NOINTERFACE; + } +} + +static ULONG WINAPI CompartmentMgr_AddRef(ITfCompartmentMgr *iface) +{ + CompartmentMgr *This = (CompartmentMgr *)iface; + if (This->pUnkOuter) + return IUnknown_AddRef(This->pUnkOuter); + else + return InterlockedIncrement(&This->refCount); +} + +static ULONG WINAPI CompartmentMgr_Release(ITfCompartmentMgr *iface) +{ + CompartmentMgr *This = (CompartmentMgr *)iface; + if (This->pUnkOuter) + return IUnknown_Release(This->pUnkOuter); + else + { + ULONG ret; + + ret = InterlockedDecrement(&This->refCount); + if (ret == 0) + CompartmentMgr_Destructor(iface); + return ret; + } +} + +HRESULT WINAPI CompartmentMgr_GetCompartment(ITfCompartmentMgr *iface, + REFGUID rguid, ITfCompartment **ppcomp) +{ + CompartmentMgr *This = (CompartmentMgr *)iface; + FIXME("STUB:(%p)\n",This); + return E_NOTIMPL; +} + +HRESULT WINAPI CompartmentMgr_ClearCompartment(ITfCompartmentMgr *iface, + TfClientId tid, REFGUID rguid) +{ + CompartmentMgr *This = (CompartmentMgr *)iface; + FIXME("STUB:(%p)\n",This); + return E_NOTIMPL; +} + +HRESULT WINAPI CompartmentMgr_EnumCompartments(ITfCompartmentMgr *iface, + IEnumGUID **ppEnum) +{ + CompartmentMgr *This = (CompartmentMgr *)iface; + FIXME("STUB:(%p)\n",This); + return E_NOTIMPL; +} + +static const ITfCompartmentMgrVtbl CompartmentMgr_CompartmentMgrVtbl = +{ + CompartmentMgr_QueryInterface, + CompartmentMgr_AddRef, + CompartmentMgr_Release, + + CompartmentMgr_GetCompartment, + CompartmentMgr_ClearCompartment, + CompartmentMgr_EnumCompartments +}; + +HRESULT CompartmentMgr_Constructor(IUnknown *pUnkOuter, REFIID riid, IUnknown **ppOut) +{ + CompartmentMgr *This; + + if (!ppOut) + return E_POINTER; + + if (pUnkOuter && !IsEqualIID (riid, &IID_IUnknown)) + return CLASS_E_NOAGGREGATION; + + This = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(CompartmentMgr)); + if (This == NULL) + return E_OUTOFMEMORY; + + This->CompartmentMgrVtbl = &CompartmentMgr_CompartmentMgrVtbl; + This->pUnkOuter = pUnkOuter; + list_init(&This->values); + + if (pUnkOuter) + { + TRACE("returning %p\n", This); + *ppOut = (IUnknown*)This; + return S_OK; + } + else + { + HRESULT hr; + hr = IUnknown_QueryInterface((IUnknown*)This, riid, (LPVOID*)ppOut); + if (FAILED(hr)) + HeapFree(GetProcessHeap(),0,This); + return hr; + } +} diff --git a/dlls/msctf/msctf_internal.h b/dlls/msctf/msctf_internal.h index f88516b..b4e7446 100644 --- a/dlls/msctf/msctf_internal.h +++ b/dlls/msctf/msctf_internal.h @@ -36,6 +36,8 @@ extern HRESULT Context_Constructor(TfClientId tidOwner, IUnknown *punk, ITfConte extern HRESULT InputProcessorProfiles_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut); extern HRESULT CategoryMgr_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut); extern HRESULT Range_Constructor(ITfContext *context, ITextStoreACP *textstore, DWORD lockType, DWORD anchorStart, DWORD anchorEnd, ITfRange **ppOut); +extern HRESULT CompartmentMgr_Constructor(IUnknown *pUnkOuter, REFIID riid, IUnknown **ppOut); +extern HRESULT CompartmentMgr_Destructor(ITfCompartmentMgr *This); extern HRESULT Context_Initialize(ITfContext *cxt); extern HRESULT Context_Uninitialize(ITfContext *cxt);

1 0

Aric Stewart : msctf: Define ITfCompartmentMgr for Context.
by Alexandre Julliard June 12, 2009

June 12, 2009

Module: wine Branch: master Commit: 3726e38b1952510124b6c22e2ddd492605a3e774 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3726e38b1952510124b6c22e2… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Jun 11 13:33:33 2009 -0500 msctf: Define ITfCompartmentMgr for Context. --- dlls/msctf/context.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/msctf/context.c b/dlls/msctf/context.c index be1ee2d..2c7acb0 100644 --- a/dlls/msctf/context.c +++ b/dlls/msctf/context.c @@ -68,6 +68,9 @@ typedef struct tagContext { LONG refCount; BOOL connected; + /* Aggregation */ + ITfCompartmentMgr *CompartmentMgr; + TfClientId tidOwner; TfEditCookie defaultCookie; TS_STATUS documentStatus; @@ -175,6 +178,7 @@ static void Context_Destructor(Context *This) free_sink(sink); } + CompartmentMgr_Destructor(This->CompartmentMgr); HeapFree(GetProcessHeap(),0,This); } @@ -195,6 +199,10 @@ static HRESULT WINAPI Context_QueryInterface(ITfContext *iface, REFIID iid, LPVO { *ppvOut = &This->InsertAtSelectionVtbl; } + else if (IsEqualIID(iid, &IID_ITfCompartmentMgr)) + { + *ppvOut = This->CompartmentMgr; + } if (*ppvOut) { @@ -718,6 +726,8 @@ HRESULT Context_Constructor(TfClientId tidOwner, IUnknown *punk, ITfContext **pp This->tidOwner = tidOwner; This->connected = FALSE; + CompartmentMgr_Constructor((IUnknown*)This, &IID_IUnknown, (IUnknown**)&This->CompartmentMgr); + cookie->lockType = TF_ES_READ; cookie->pOwningContext = This;

1 0

Hans Leidekker : wintrust: Add stub implementations of HTTPSCertificateTrust and HTTPSFinalProv.
by Alexandre Julliard June 12, 2009

June 12, 2009

Module: wine Branch: master Commit: f0cf772d525381e217037844f17d163805a44500 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0cf772d525381e217037844f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jun 12 11:36:08 2009 +0200 wintrust: Add stub implementations of HTTPSCertificateTrust and HTTPSFinalProv. --- dlls/wintrust/softpub.c | 12 ++++++++++++ dlls/wintrust/wintrust.spec | 4 ++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/wintrust/softpub.c b/dlls/wintrust/softpub.c index e59c31f..9c79fa8 100644 --- a/dlls/wintrust/softpub.c +++ b/dlls/wintrust/softpub.c @@ -1060,3 +1060,15 @@ HRESULT WINAPI SoftpubCleanup(CRYPT_PROVIDER_DATA *data) return S_OK; } + +HRESULT WINAPI HTTPSCertificateTrust(CRYPT_PROVIDER_DATA *data) +{ + FIXME("(%p)\n", data); + return S_OK; +} + +HRESULT WINAPI HTTPSFinalProv(CRYPT_PROVIDER_DATA *data) +{ + FIXME("(%p)\n", data); + return S_OK; +} diff --git a/dlls/wintrust/wintrust.spec b/dlls/wintrust/wintrust.spec index 9c5b1cb..602d4bd 100644 --- a/dlls/wintrust/wintrust.spec +++ b/dlls/wintrust/wintrust.spec @@ -48,8 +48,8 @@ @ stub FindCertsByIssuer @ stdcall GenericChainCertificateTrust(ptr) @ stdcall GenericChainFinalProv(ptr) -@ stub HTTPSCertificateTrust -@ stub HTTPSFinalProv +@ stdcall HTTPSCertificateTrust(ptr) +@ stdcall HTTPSFinalProv(ptr) @ stub IsCatalogFile @ stub MsCatConstructHashTag @ stub MsCatFreeHashTag

1 0

Paul Vriens : riched32/tests: Cater for differences between platforms.
by Alexandre Julliard June 12, 2009

June 12, 2009

Module: wine Branch: master Commit: 45629dc050f46988c23ded35ad18bbd8c63e4e65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45629dc050f46988c23ded35a… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Jun 12 15:05:15 2009 +0200 riched32/tests: Cater for differences between platforms. --- dlls/riched32/tests/editor.c | 40 +++++++++++++++++++++++++++++++--------- 1 files changed, 31 insertions(+), 9 deletions(-) diff --git a/dlls/riched32/tests/editor.c b/dlls/riched32/tests/editor.c index c29d6d7..0d853a6 100644 --- a/dlls/riched32/tests/editor.c +++ b/dlls/riched32/tests/editor.c @@ -348,11 +348,12 @@ static const struct getline_s { int line; size_t buffer_len; const char *text; + const char *broken_text; } gl[] = { - {0, 10, "foo bar\r\n"}, - {1, 10, "\r"}, - {2, 10, "\r\r\n"}, - {3, 10, "bar\n"}, + {0, 10, "foo bar\r\n", "foo bar\r\n"}, + {1, 10, "\r", "\r\r\r\n"}, + {2, 10, "\r\r\n", "bar\n"}, + {3, 10, "bar\n", "\r\n"}, {4, 10, "\r\n"}, /* Buffer smaller than line length */ @@ -367,19 +368,40 @@ static void test_EM_GETLINE(void) HWND hwndRichEdit = new_richedit(NULL); static const int nBuf = 1024; char dest[1024], origdest[1024]; + LRESULT linecount; const char text[] = "foo bar\r\n" "\r" "\r\r\n" "bar\n"; + BOOL broken_os = FALSE; SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) text); + linecount = SendMessage(hwndRichEdit, EM_GETLINECOUNT, 0, 0); + if (linecount == 4) + { + broken_os = TRUE; + win_skip("Win9x, WinME and NT4 handle '\\r only' differently\n"); + } memset(origdest, 0xBB, nBuf); for (i = 0; i < sizeof(gl)/sizeof(struct getline_s); i++) { - int nCopied; - int expected_nCopied = min(gl[i].buffer_len, strlen(gl[i].text)); - int expected_bytes_written = min(gl[i].buffer_len, strlen(gl[i].text) + 1); + int nCopied, expected_nCopied, expected_bytes_written; + char gl_text[1024]; + + if (gl[i].line >= linecount) + continue; /* Win9x, WinME and NT4 */ + + if (broken_os && gl[i].broken_text) + /* Win9x, WinME and NT4 */ + strcpy(gl_text, gl[i].broken_text); + else + strcpy(gl_text, gl[i].text); + + expected_nCopied = min(gl[i].buffer_len, strlen(gl_text)); + /* Cater for the fact that Win9x, WinME and NT4 don't append the '\0' */ + expected_bytes_written = min(gl[i].buffer_len, strlen(gl_text) + (broken_os ? 0 : 1)); + memset(dest, 0xBB, nBuf); *(WORD *) dest = gl[i].buffer_len; @@ -393,11 +415,11 @@ static void test_EM_GETLINE(void) ok(!dest[0] && !dest[1] && !strncmp(dest+2, origdest+2, nBuf-2), "buffer_len=0\n"); else if (gl[i].buffer_len == 1) - ok(dest[0] == gl[i].text[0] && !dest[1] && + ok(dest[0] == gl_text[0] && !dest[1] && !strncmp(dest+2, origdest+2, nBuf-2), "buffer_len=1\n"); else { - ok(!strncmp(dest, gl[i].text, expected_bytes_written), + ok(!strncmp(dest, gl_text, expected_bytes_written), "%d: expected_bytes_written=%d\n", i, expected_bytes_written); ok(!strncmp(dest + expected_bytes_written, origdest + expected_bytes_written, nBuf - expected_bytes_written),

1 0

Aric Stewart : msctf: Add ITfComponentMgr to documentmgr.
by Alexandre Julliard June 12, 2009

June 12, 2009

Module: wine Branch: master Commit: 1ffa3515ddd3f6e1ebfb1b8c9e680b04b8c7e785 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ffa3515ddd3f6e1ebfb1b8c9… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Jun 11 13:33:23 2009 -0500 msctf: Add ITfComponentMgr to documentmgr. --- dlls/msctf/documentmgr.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/msctf/documentmgr.c b/dlls/msctf/documentmgr.c index 7fd354a..3d4dbe9 100644 --- a/dlls/msctf/documentmgr.c +++ b/dlls/msctf/documentmgr.c @@ -45,6 +45,9 @@ typedef struct tagDocumentMgr { const ITfSourceVtbl *SourceVtbl; LONG refCount; + /* Aggregation */ + ITfCompartmentMgr *CompartmentMgr; + ITfContext* contextStack[2]; /* limit of 2 contexts */ ITfThreadMgrEventSink* ThreadMgrSink; } DocumentMgr; @@ -61,6 +64,7 @@ static void DocumentMgr_Destructor(DocumentMgr *This) ITfContext_Release(This->contextStack[0]); if (This->contextStack[1]) ITfContext_Release(This->contextStack[1]); + CompartmentMgr_Destructor(This->CompartmentMgr); HeapFree(GetProcessHeap(),0,This); } @@ -77,6 +81,10 @@ static HRESULT WINAPI DocumentMgr_QueryInterface(ITfDocumentMgr *iface, REFIID i { *ppvOut = &This->SourceVtbl; } + else if (IsEqualIID(iid, &IID_ITfCompartmentMgr)) + { + *ppvOut = This->CompartmentMgr; + } if (*ppvOut) { @@ -303,6 +311,8 @@ HRESULT DocumentMgr_Constructor(ITfThreadMgrEventSink *ThreadMgrSink, ITfDocumen This->refCount = 1; This->ThreadMgrSink = ThreadMgrSink; + CompartmentMgr_Constructor((IUnknown*)This, &IID_IUnknown, (IUnknown**)&This->CompartmentMgr); + TRACE("returning %p\n", This); *ppOut = (ITfDocumentMgr*)This; return S_OK;

1 0

Aric Stewart : msctf: Define ITfCompartmentMgr for ThreadMgr.
by Alexandre Julliard June 12, 2009

June 12, 2009

Module: wine Branch: master Commit: 819518c4618bdf14e43c30d9e851c2f3b2d747d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=819518c4618bdf14e43c30d9e… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Jun 11 13:33:07 2009 -0500 msctf: Define ITfCompartmentMgr for ThreadMgr. --- dlls/msctf/threadmgr.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/msctf/threadmgr.c b/dlls/msctf/threadmgr.c index 9b887f0..490bfc6 100644 --- a/dlls/msctf/threadmgr.c +++ b/dlls/msctf/threadmgr.c @@ -78,6 +78,9 @@ typedef struct tagACLMulti { /* const ITfSourceSingleVtbl *SourceSingleVtbl; */ LONG refCount; + /* Aggregation */ + ITfCompartmentMgr *CompartmentMgr; + const ITfThreadMgrEventSinkVtbl *ThreadMgrEventSinkVtbl; /* internal */ ITfDocumentMgr *focus; @@ -183,6 +186,8 @@ static void ThreadMgr_Destructor(ThreadMgr *This) HeapFree(GetProcessHeap(),0,key); } + CompartmentMgr_Destructor(This->CompartmentMgr); + HeapFree(GetProcessHeap(),0,This); } @@ -211,6 +216,10 @@ static HRESULT WINAPI ThreadMgr_QueryInterface(ITfThreadMgr *iface, REFIID iid, { *ppvOut = &This->ClientIdVtbl; } + else if (IsEqualIID(iid, &IID_ITfCompartmentMgr)) + { + *ppvOut = This->CompartmentMgr; + } if (*ppvOut) { @@ -1054,6 +1063,8 @@ HRESULT ThreadMgr_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) This->refCount = 1; TlsSetValue(tlsIndex,This); + CompartmentMgr_Constructor((IUnknown*)This, &IID_IUnknown, (IUnknown**)&This->CompartmentMgr); + list_init(&This->CurrentPreservedKeys); list_init(&This->ActiveLanguageProfileNotifySink);

1 0