February 2009 - Wine-commits

Paul TBBle Hampson : winefile: Don't use child after it has been freed.
by Alexandre Julliard 03 Feb '09

03 Feb '09

Module: wine Branch: master Commit: c09f1357bccbdf25ab7b46d508c27fad5801bac4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c09f1357bccbdf25ab7b46d50… Author: Paul TBBle Hampson <Paul.Hampson(a)Pobox.com> Date: Tue Feb 3 09:39:32 2009 +1100 winefile: Don't use child after it has been freed. If winefile is unable to create a window, it frees the child pointer. However, it then proceeds to use the child pointer. --- programs/winefile/winefile.c | 17 ++++++++++++----- 1 files changed, 12 insertions(+), 5 deletions(-) diff --git a/programs/winefile/winefile.c b/programs/winefile/winefile.c index aefe7bd..0193c7b 100644 --- a/programs/winefile/winefile.c +++ b/programs/winefile/winefile.c @@ -4706,7 +4706,7 @@ static void InitInstance(HINSTANCE hinstance) } -static void show_frame(HWND hwndParent, int cmdshow, LPCTSTR path) +static BOOL show_frame(HWND hwndParent, int cmdshow, LPCTSTR path) { static const TCHAR sMDICLIENT[] = {'M','D','I','C','L','I','E','N','T','\0'}; @@ -4718,7 +4718,7 @@ static void show_frame(HWND hwndParent, int cmdshow, LPCTSTR path) CLIENTCREATESTRUCT ccs; if (Globals.hMainWnd) - return; + return TRUE; opts = load_registry_settings(); hMenuFrame = LoadMenu(Globals.hInstance, MAKEINTRESOURCE(IDM_WINEFILE)); @@ -4796,8 +4796,10 @@ static void show_frame(HWND hwndParent, int cmdshow, LPCTSTR path) child->pos.rcNormalPosition.right = 320; child->pos.rcNormalPosition.bottom = 280; - if (!create_child_window(child)) + if (!create_child_window(child)) { HeapFree(GetProcessHeap(), 0, child); + return FALSE; + } SetWindowPlacement(child->hwnd, &child->pos); @@ -4807,7 +4809,7 @@ static void show_frame(HWND hwndParent, int cmdshow, LPCTSTR path) UpdateWindow(Globals.hMainWnd); - if (path && path[0]) + if (child->hwnd && path && path[0]) { int index,count; TCHAR drv[_MAX_DRIVE+1], dir[_MAX_DIR], name[_MAX_FNAME], ext[_MAX_EXT]; @@ -4835,6 +4837,7 @@ static void show_frame(HWND hwndParent, int cmdshow, LPCTSTR path) } } } + return TRUE; } static void ExitInstance(void) @@ -4888,7 +4891,11 @@ static int winefile_main(HINSTANCE hinstance, int cmdshow, LPCTSTR path) InitInstance(hinstance); - show_frame(0, cmdshow, path); + if( !show_frame(0, cmdshow, path) ) + { + ExitInstance(); + return 1; + } while(GetMessage(&msg, 0, 0, 0)) { if (Globals.hmdiclient && TranslateMDISysAccel(Globals.hmdiclient, &msg))

1 0

Jeremy White : twain_32: Add the ability to thoroughly test basic capability types, and add that test for the one capability Wine supports, ICAP_XFERMECH.
by Alexandre Julliard 03 Feb '09

03 Feb '09

Module: wine Branch: master Commit: 1199c30c9c4b45200cd198ee22fc8d158c388482 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1199c30c9c4b45200cd198ee2… Author: Jeremy White <jwhite(a)winehq.org> Date: Mon Feb 2 16:12:44 2009 -0600 twain_32: Add the ability to thoroughly test basic capability types, and add that test for the one capability Wine supports, ICAP_XFERMECH. --- dlls/twain_32/tests/dsm.c | 211 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 211 insertions(+), 0 deletions(-) diff --git a/dlls/twain_32/tests/dsm.c b/dlls/twain_32/tests/dsm.c index 278ea7c..cf9acef 100644 --- a/dlls/twain_32/tests/dsm.c +++ b/dlls/twain_32/tests/dsm.c @@ -57,6 +57,214 @@ static void get_condition_code(TW_IDENTITY *appid, TW_IDENTITY *source, TW_STATU ok(rc == TWRC_SUCCESS, "Condition code not available, rc %d\n", rc); } +static BOOL get_onevalue(TW_HANDLE hcontainer, TW_UINT32 *ret, TW_UINT16 *type) +{ + TW_ONEVALUE *onev; + onev = GlobalLock(hcontainer); + if (onev) + { + *ret = onev->Item; + if (type) + *type = onev->ItemType; + GlobalUnlock(hcontainer); + return TRUE; + } + return FALSE; +} + +static TW_HANDLE alloc_and_set_onevalue(TW_UINT32 val, TW_UINT16 type) +{ + TW_HANDLE hcontainer; + TW_ONEVALUE *onev; + hcontainer = GlobalAlloc(0, sizeof(*onev)); + if (hcontainer) + { + onev = GlobalLock(hcontainer); + if (onev) + { + onev->ItemType = type; + onev->Item = val; + GlobalUnlock(hcontainer); + } + else + hcontainer = 0; + } + return hcontainer; +} + +static void check_get(TW_CAPABILITY *pCapability, + TW_UINT32 orig_value, TW_UINT32 default_value, TW_UINT32 *suggested_set_value) +{ + void *p; + if (suggested_set_value) + *suggested_set_value = orig_value + 1; + p = GlobalLock(pCapability->hContainer); + if (p) + { + if (pCapability->ConType == TWON_ONEVALUE) + { + TW_ONEVALUE *onev = (TW_ONEVALUE *) p; + ok(onev->Item == orig_value, "MSG_GET of 0x%x returned 0x%x, expecting 0x%x\n", + pCapability->Cap, onev->Item, orig_value); + } + else if (pCapability->ConType == TWON_ENUMERATION) + { + int i; + TW_UINT8 *p8; + TW_UINT16 *p16; + TW_UINT32 *p32; + TW_ENUMERATION *enumv = (TW_ENUMERATION *) p; + p8 = enumv->ItemList; + p16 = (TW_UINT16 *) p8; + p32 = (TW_UINT32 *) p8; + trace("MSG_GET of 0x%x returned %d items:\n", pCapability->Cap, enumv->NumItems); + for (i = 0; i < enumv->NumItems; i++) + { + if (enumv->ItemType == TWTY_UINT8 || enumv->ItemType == TWTY_INT8) + trace(" %d: 0x%x\n", i, p8[i]); + if (enumv->ItemType == TWTY_UINT16 || enumv->ItemType == TWTY_INT16) + trace(" %d: 0x%x\n", i, p16[i]); + if (enumv->ItemType == TWTY_UINT32 || enumv->ItemType == TWTY_INT32) + trace(" %d: 0x%x\n", i, p32[i]); + } + if (enumv->ItemType == TWTY_UINT16 || enumv->ItemType == TWTY_INT16) + { + ok(p16[enumv->CurrentIndex] == orig_value, + "Type 0x%x, values from MSG_GET (0x%x) and MSG_GETCURRENT (0x%x) do not match.\n", + pCapability->Cap, p16[enumv->CurrentIndex], orig_value); + ok(p16[enumv->DefaultIndex] == default_value, + "Type 0x%x, values from MSG_GET (0x%x) and MSG_GETDEFAULT (0x%x) do not match.\n", + pCapability->Cap, p16[enumv->DefaultIndex], default_value); + if (suggested_set_value) + *suggested_set_value = p16[(enumv->CurrentIndex + 1) % enumv->NumItems]; + } + if (enumv->ItemType == TWTY_UINT32 || enumv->ItemType == TWTY_INT32) + { + ok(p32[enumv->CurrentIndex] == orig_value, + "Type 0x%x, values from MSG_GET (0x%x) and MSG_GETCURRENT (0x%x) do not match.\n", + pCapability->Cap, p32[enumv->CurrentIndex], orig_value); + ok(p32[enumv->DefaultIndex] == default_value, + "Type 0x%x, values from MSG_GET (0x%x) and MSG_GETDEFAULT (0x%x) do not match.\n", + pCapability->Cap, p32[enumv->DefaultIndex], default_value); + if (suggested_set_value) + *suggested_set_value = p32[(enumv->CurrentIndex + 1) % enumv->NumItems]; + } + } + else + trace("MSG_GET on type 0x%x returned type 0x%x, which we didn't check.\n", pCapability->Cap, pCapability->ConType); + GlobalUnlock(pCapability->hContainer); + } +} + +static void test_onevalue_cap(TW_IDENTITY *appid, TW_IDENTITY *source, TW_UINT16 captype, TW_UINT16 type, TW_INT32 expected_support) +{ + TW_UINT16 rc; + TW_UINT16 rtype; + TW_STATUS status; + TW_CAPABILITY cap; + TW_UINT32 orig_value = 0; + TW_UINT32 new_value; + TW_UINT32 default_value = 0; + TW_INT32 actual_support; + + memset(&cap, 0, sizeof(cap)); + cap.Cap = captype; + cap.ConType = TWON_DONTCARE16; + + rc = pDSM_Entry(appid, source, DG_CONTROL, DAT_CAPABILITY, MSG_QUERYSUPPORT, &cap); + get_condition_code(appid, source, &status); + ok(rc == TWRC_SUCCESS && status.ConditionCode == TWCC_SUCCESS, + "Error [rc %d|cc %d] doing MSG_QUERYSUPPORT for type 0x%x\n", rc, status.ConditionCode, captype); + if (rc != TWRC_SUCCESS) + return; + ok(get_onevalue(cap.hContainer, (TW_UINT32 *) &actual_support, NULL), "Returned cap.hContainer invalid for QuerySupport on type 0x%x", captype); + ok(actual_support == expected_support, + "Error: expected support 0x%x for type 0x%x, got 0x%x\n", expected_support, + captype, actual_support); + + + if (actual_support & TWQC_GETCURRENT) + { + memset(&cap, 0, sizeof(cap)); + cap.Cap = captype; + cap.ConType = TWON_DONTCARE16; + + rc = pDSM_Entry(appid, source, DG_CONTROL, DAT_CAPABILITY, MSG_GETCURRENT, &cap); + get_condition_code(appid, source, &status); + ok(rc == TWRC_SUCCESS && status.ConditionCode == TWCC_SUCCESS, + "Error [rc %d|cc %d] doing MSG_GETCURRENT for type 0x%x\n", rc, status.ConditionCode, captype); + if (rc == TWRC_SUCCESS) + { + ok(get_onevalue(cap.hContainer, &orig_value, &rtype), "Returned cap.hContainer invalid for GETCURRENT on type 0x%x", captype); + ok(rtype == type, "Returned GETCURRENT type 0x%x for cap 0x%x is not expected 0x%x\n", rtype, captype, type); + GlobalFree(cap.hContainer); + } + } + + if (actual_support & TWQC_GETDEFAULT) + { + memset(&cap, 0, sizeof(cap)); + cap.Cap = captype; + cap.ConType = TWON_DONTCARE16; + + rc = pDSM_Entry(appid, source, DG_CONTROL, DAT_CAPABILITY, MSG_GETDEFAULT, &cap); + get_condition_code(appid, source, &status); + ok(rc == TWRC_SUCCESS && status.ConditionCode == TWCC_SUCCESS, + "Error [rc %d|cc %d] doing MSG_GETDEFAULT for type 0x%x\n", rc, status.ConditionCode, captype); + if (rc == TWRC_SUCCESS) + { + ok(get_onevalue(cap.hContainer, &default_value, &rtype), "Returned cap.hContainer invalid for GETDEFAULT on type 0x%x", captype); + ok(rtype == type, "Returned GETDEFAULT type 0x%x for cap 0x%x is not expected 0x%x\n", rtype, captype, type); + GlobalFree(cap.hContainer); + } + } + + new_value = orig_value; + if (actual_support & TWQC_GET) + { + memset(&cap, 0, sizeof(cap)); + cap.Cap = captype; + cap.ConType = TWON_DONTCARE16; + + rc = pDSM_Entry(appid, source, DG_CONTROL, DAT_CAPABILITY, MSG_GET, &cap); + get_condition_code(appid, source, &status); + ok(rc == TWRC_SUCCESS && status.ConditionCode == TWCC_SUCCESS, + "Error [rc %d|cc %d] doing MSG_GET for type 0x%x\n", rc, status.ConditionCode, captype); + check_get(&cap, orig_value, default_value, &new_value); + if (rc == TWRC_SUCCESS) + GlobalFree(cap.hContainer); + } + + if (actual_support & TWQC_SET) + { + memset(&cap, 0, sizeof(cap)); + cap.Cap = captype; + cap.ConType = TWON_ONEVALUE; + cap.hContainer = alloc_and_set_onevalue(new_value, type); + + rc = pDSM_Entry(appid, source, DG_CONTROL, DAT_CAPABILITY, MSG_SET, &cap); + get_condition_code(appid, source, &status); + ok(rc == TWRC_SUCCESS && status.ConditionCode == TWCC_SUCCESS, + "Error [rc %d|cc %d] doing MSG_SET for type 0x%x\n", rc, status.ConditionCode, captype); + GlobalFree(cap.hContainer); + } + + if (actual_support & TWQC_RESET) + { + memset(&cap, 0, sizeof(cap)); + cap.Cap = captype; + cap.ConType = TWON_DONTCARE16; + + rc = pDSM_Entry(appid, source, DG_CONTROL, DAT_CAPABILITY, MSG_RESET, &cap); + get_condition_code(appid, source, &status); + ok(rc == TWRC_SUCCESS && status.ConditionCode == TWCC_SUCCESS, + "Error [rc %d|cc %d] doing MSG_RESET for type 0x%x\n", rc, status.ConditionCode, captype); + if (rc == TWRC_SUCCESS) + GlobalFree(cap.hContainer); + } +} + + static void test_single_source(TW_IDENTITY *appid, TW_IDENTITY *source) { TW_UINT16 rc; @@ -133,6 +341,9 @@ static void test_single_source(TW_IDENTITY *appid, TW_IDENTITY *source) todo_wine ok(capabilities[ICAP_UNITS], "ICAP_UNITS not supported\n"); ok(capabilities[ICAP_XFERMECH], "ICAP_XFERMECH not supported\n"); + if (capabilities[ICAP_XFERMECH]) + test_onevalue_cap(appid, source, ICAP_XFERMECH, TWTY_UINT16, + TWQC_GET | TWQC_SET | TWQC_GETDEFAULT | TWQC_GETCURRENT | TWQC_RESET); todo_wine ok(capabilities[ICAP_XRESOLUTION], "ICAP_XRESOLUTION not supported\n"); todo_wine

1 0

Aric Stewart : msctf: Implement ITfDocumentMgr::GetBase.
by Alexandre Julliard 03 Feb '09

03 Feb '09

Module: wine Branch: master Commit: e1014b3ea4e2d7210f807d73fd203157344171dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1014b3ea4e2d7210f807d73f… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Feb 2 10:25:30 2009 -0600 msctf: Implement ITfDocumentMgr::GetBase. --- dlls/msctf/documentmgr.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/msctf/documentmgr.c b/dlls/msctf/documentmgr.c index c8c6e92..9551999 100644 --- a/dlls/msctf/documentmgr.c +++ b/dlls/msctf/documentmgr.c @@ -172,8 +172,16 @@ static HRESULT WINAPI DocumentMgr_GetTop(ITfDocumentMgr *iface, ITfContext **ppi static HRESULT WINAPI DocumentMgr_GetBase(ITfDocumentMgr *iface, ITfContext **ppic) { DocumentMgr *This = (DocumentMgr *)iface; - FIXME("STUB:(%p)\n",This); - return E_NOTIMPL; + TRACE("(%p)\n",This); + if (!ppic) + return E_INVALIDARG; + + if (This->contextStack[1]) + ITfContext_AddRef(This->contextStack[1]); + + *ppic = This->contextStack[1]; + + return S_OK; } static HRESULT WINAPI DocumentMgr_EnumContexts(ITfDocumentMgr *iface, IEnumTfContexts **ppEnum)

1 0

Aric Stewart : msctf: Add definition of ITfSource interface.
by Alexandre Julliard 03 Feb '09

03 Feb '09

Module: wine Branch: master Commit: d09f4c0ab51e538925a2202d5a8fe94d5a6de3bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=d09f4c0ab51e538925a2202d5… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Feb 2 10:25:36 2009 -0600 msctf: Add definition of ITfSource interface. --- include/msctf.idl | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/include/msctf.idl b/include/msctf.idl index fffac33..93780f0 100644 --- a/include/msctf.idl +++ b/include/msctf.idl @@ -224,3 +224,19 @@ interface ITfContext : IUnknown [out] ITfRangeBackup **ppBackup); }; + +[ + object, + uuid(4ea48a35-60ae-446f-8fd6-e6a8d82459f7), + pointer_default(unique) +] +interface ITfSource : IUnknown +{ + HRESULT AdviseSink( + [in] REFIID riid, + [in, iid_is(riid)] IUnknown *punk, + [out] DWORD *pdwCookie); + + HRESULT UnadviseSink( + [in] DWORD dwCookie); +};

1 0

Aric Stewart : msctf: Add ITfSource interface to Context.
by Alexandre Julliard 03 Feb '09

03 Feb '09

Module: wine Branch: master Commit: efbd3b4f560c4ff7740a8cefac78b63db2334639 URL: http://source.winehq.org/git/wine.git/?a=commit;h=efbd3b4f560c4ff7740a8cefa… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Feb 2 10:25:42 2009 -0600 msctf: Add ITfSource interface to Context. --- dlls/msctf/context.c | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 57 insertions(+), 0 deletions(-) diff --git a/dlls/msctf/context.c b/dlls/msctf/context.c index 696db65..aa8647c 100644 --- a/dlls/msctf/context.c +++ b/dlls/msctf/context.c @@ -42,12 +42,18 @@ WINE_DEFAULT_DEBUG_CHANNEL(msctf); typedef struct tagContext { const ITfContextVtbl *ContextVtbl; + const ITfSourceVtbl *SourceVtbl; LONG refCount; TfClientId tidOwner; IUnknown *punk; /* possible ITextStoreACP or ITfContextOwnerCompositionSink */ } Context; +static inline Context *impl_from_ITfSourceVtbl(ITfSource *iface) +{ + return (Context *)((char *)iface - FIELD_OFFSET(Context,SourceVtbl)); +} + static void Context_Destructor(Context *This) { TRACE("destroying %p\n", This); @@ -63,6 +69,10 @@ static HRESULT WINAPI Context_QueryInterface(ITfContext *iface, REFIID iid, LPVO { *ppvOut = This; } + else if (IsEqualIID(iid, &IID_ITfSource)) + { + *ppvOut = &This->SourceVtbl; + } if (*ppvOut) { @@ -241,6 +251,52 @@ static const ITfContextVtbl Context_ContextVtbl = Context_CreateRangeBackup }; +static HRESULT WINAPI Source_QueryInterface(ITfSource *iface, REFIID iid, LPVOID *ppvOut) +{ + Context *This = impl_from_ITfSourceVtbl(iface); + return Context_QueryInterface((ITfContext *)This, iid, *ppvOut); +} + +static ULONG WINAPI Source_AddRef(ITfSource *iface) +{ + Context *This = impl_from_ITfSourceVtbl(iface); + return Context_AddRef((ITfContext *)This); +} + +static ULONG WINAPI Source_Release(ITfSource *iface) +{ + Context *This = impl_from_ITfSourceVtbl(iface); + return Context_Release((ITfContext *)This); +} + +/***************************************************** + * ITfSource functions + *****************************************************/ +static WINAPI HRESULT ContextSource_AdviseSink(ITfSource *iface, + REFIID riid, IUnknown *punk, DWORD *pdwCookie) +{ + Context *This = impl_from_ITfSourceVtbl(iface); + FIXME("STUB:(%p)\n",This); + return E_NOTIMPL; +} + +static WINAPI HRESULT ContextSource_UnadviseSink(ITfSource *iface, DWORD pdwCookie) +{ + Context *This = impl_from_ITfSourceVtbl(iface); + FIXME("STUB:(%p)\n",This); + return E_NOTIMPL; +} + +static const ITfSourceVtbl Context_SourceVtbl = +{ + Source_QueryInterface, + Source_AddRef, + Source_Release, + + ContextSource_AdviseSink, + ContextSource_UnadviseSink, +}; + HRESULT Context_Constructor(TfClientId tidOwner, IUnknown *punk, ITfContext **ppOut, TfEditCookie *pecTextStore) { Context *This; @@ -250,6 +306,7 @@ HRESULT Context_Constructor(TfClientId tidOwner, IUnknown *punk, ITfContext **pp return E_OUTOFMEMORY; This->ContextVtbl= &Context_ContextVtbl; + This->SourceVtbl = &Context_SourceVtbl; This->refCount = 1; This->tidOwner = tidOwner; This->punk = punk;

1 0

Aric Stewart : msctf: Implement ITfDocumentMgr::GetTop.
by Alexandre Julliard 03 Feb '09

03 Feb '09

Module: wine Branch: master Commit: 130303bcea5e315810d27e9cf224c6984da17a66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=130303bcea5e315810d27e9cf… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Feb 2 10:25:22 2009 -0600 msctf: Implement ITfDocumentMgr::GetTop. --- dlls/msctf/documentmgr.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/msctf/documentmgr.c b/dlls/msctf/documentmgr.c index 040db7b..c8c6e92 100644 --- a/dlls/msctf/documentmgr.c +++ b/dlls/msctf/documentmgr.c @@ -157,8 +157,16 @@ static HRESULT WINAPI DocumentMgr_Pop(ITfDocumentMgr *iface, DWORD dwFlags) static HRESULT WINAPI DocumentMgr_GetTop(ITfDocumentMgr *iface, ITfContext **ppic) { DocumentMgr *This = (DocumentMgr *)iface; - FIXME("STUB:(%p)\n",This); - return E_NOTIMPL; + TRACE("(%p)\n",This); + if (!ppic) + return E_INVALIDARG; + + if (This->contextStack[0]) + ITfContext_AddRef(This->contextStack[0]); + + *ppic = This->contextStack[0]; + + return S_OK; } static HRESULT WINAPI DocumentMgr_GetBase(ITfDocumentMgr *iface, ITfContext **ppic)

1 0

Aric Stewart : msctf: Implement ITfDocumentMgr::Pop.
by Alexandre Julliard 03 Feb '09

03 Feb '09

Module: wine Branch: master Commit: f3e2027b43fd5c28534036d11b9f7b2dc746a2b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3e2027b43fd5c28534036d11… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Feb 2 10:25:16 2009 -0600 msctf: Implement ITfDocumentMgr::Pop. --- dlls/msctf/documentmgr.c | 25 +++++++++++++++++++++++-- 1 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/msctf/documentmgr.c b/dlls/msctf/documentmgr.c index eb6e4d2..040db7b 100644 --- a/dlls/msctf/documentmgr.c +++ b/dlls/msctf/documentmgr.c @@ -129,8 +129,29 @@ static HRESULT WINAPI DocumentMgr_Push(ITfDocumentMgr *iface, ITfContext *pic) static HRESULT WINAPI DocumentMgr_Pop(ITfDocumentMgr *iface, DWORD dwFlags) { DocumentMgr *This = (DocumentMgr *)iface; - FIXME("STUB:(%p)\n",This); - return E_NOTIMPL; + TRACE("(%p) 0x%x\n",This,dwFlags); + + if (dwFlags == TF_POPF_ALL) + { + if (This->contextStack[0]) + ITfContext_Release(This->contextStack[0]); + if (This->contextStack[1]) + ITfContext_Release(This->contextStack[1]); + This->contextStack[0] = This->contextStack[1] = NULL; + return S_OK; + } + + if (dwFlags) + return E_INVALIDARG; + + if (This->contextStack[0] == NULL) /* Cannot pop last context */ + return E_FAIL; + + ITfContext_Release(This->contextStack[0]); + This->contextStack[0] = This->contextStack[1]; + This->contextStack[1] = NULL; + + return S_OK; } static HRESULT WINAPI DocumentMgr_GetTop(ITfDocumentMgr *iface, ITfContext **ppic)

1 0

Aric Stewart : msctf: Implement stub ITfContext.
by Alexandre Julliard 03 Feb '09

03 Feb '09

Module: wine Branch: master Commit: b712f39b66dbf2a7b9831365b8dfa6c2cb0c86df URL: http://source.winehq.org/git/wine.git/?a=commit;h=b712f39b66dbf2a7b9831365b… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Feb 2 10:24:59 2009 -0600 msctf: Implement stub ITfContext. --- dlls/msctf/Makefile.in | 1 + dlls/msctf/context.c | 262 +++++++++++++++++++++++++++++++++++++++++++ dlls/msctf/documentmgr.c | 4 +- dlls/msctf/msctf_internal.h | 1 + include/msctf.idl | 114 +++++++++++++++++++- 5 files changed, 379 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b712f39b66dbf2a7b9831…

1 0

Aric Stewart : msctf: Implement ITfDocumentMgr::Push.
by Alexandre Julliard 03 Feb '09

03 Feb '09

Module: wine Branch: master Commit: fd8c2a18cfc4ef8540c0d9a2128a7105a63a6f83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd8c2a18cfc4ef8540c0d9a21… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Feb 2 10:25:06 2009 -0600 msctf: Implement ITfDocumentMgr::Push. --- dlls/msctf/documentmgr.c | 22 ++++++++++++++++++++-- include/msctf.idl | 1 + 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/msctf/documentmgr.c b/dlls/msctf/documentmgr.c index 6245037..eb6e4d2 100644 --- a/dlls/msctf/documentmgr.c +++ b/dlls/msctf/documentmgr.c @@ -43,11 +43,17 @@ WINE_DEFAULT_DEBUG_CHANNEL(msctf); typedef struct tagDocumentMgr { const ITfDocumentMgrVtbl *DocumentMgrVtbl; LONG refCount; + + ITfContext* contextStack[2]; /* limit of 2 contexts */ } DocumentMgr; static void DocumentMgr_Destructor(DocumentMgr *This) { TRACE("destroying %p\n", This); + if (This->contextStack[0]) + ITfContext_Release(This->contextStack[0]); + if (This->contextStack[1]) + ITfContext_Release(This->contextStack[1]); HeapFree(GetProcessHeap(),0,This); } @@ -104,8 +110,20 @@ static HRESULT WINAPI DocumentMgr_CreateContext(ITfDocumentMgr *iface, static HRESULT WINAPI DocumentMgr_Push(ITfDocumentMgr *iface, ITfContext *pic) { DocumentMgr *This = (DocumentMgr *)iface; - FIXME("STUB:(%p)\n",This); - return E_NOTIMPL; + ITfContext *check; + + TRACE("(%p) %p\n",This,pic); + + if (This->contextStack[1]) /* FUll */ + return TF_E_STACKFULL; + + if (!pic || FAILED(IUnknown_QueryInterface(pic,&IID_ITfContext,(LPVOID*) &check))) + return E_INVALIDARG; + + This->contextStack[1] = This->contextStack[0]; + This->contextStack[0] = check; + + return S_OK; } static HRESULT WINAPI DocumentMgr_Pop(ITfDocumentMgr *iface, DWORD dwFlags) diff --git a/include/msctf.idl b/include/msctf.idl index 29f3a80..fffac33 100644 --- a/include/msctf.idl +++ b/include/msctf.idl @@ -23,6 +23,7 @@ import "textstor.idl"; /* import "ctfutb.idl"; */ #endif +cpp_quote("#define TF_E_STACKFULL MAKE_HRESULT(SEVERITY_ERROR, FACILITY_ITF, 0x0501)") cpp_quote("EXTERN_C const CLSID CLSID_TF_ThreadMgr;") typedef [uuid(7213778c-7bb0-4270-b050-6189ee594e97)] DWORD TfEditCookie;

1 0

Aric Stewart : msctf: Only 1 ITfThreadMgr is created per thread.
by Alexandre Julliard 03 Feb '09

03 Feb '09

Module: wine Branch: master Commit: 8b34370d7cf870015d003ef8307d833f3f0c9600 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b34370d7cf870015d003ef83… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Feb 2 10:24:47 2009 -0600 msctf: Only 1 ITfThreadMgr is created per thread. --- dlls/msctf/msctf.c | 7 ++++++- dlls/msctf/msctf_internal.h | 1 + dlls/msctf/threadmgr.c | 11 +++++++++++ 3 files changed, 18 insertions(+), 1 deletions(-) diff --git a/dlls/msctf/msctf.c b/dlls/msctf/msctf.c index 254444b..7dc1bcd 100644 --- a/dlls/msctf/msctf.c +++ b/dlls/msctf/msctf.c @@ -43,6 +43,8 @@ static LONG MSCTF_refCount; static HINSTANCE MSCTF_hinstance; +DWORD tlsIndex = 0; + typedef HRESULT (*LPFNCONSTRUCTOR)(IUnknown *pUnkOuter, IUnknown **ppvOut); static const struct { @@ -159,8 +161,11 @@ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD fdwReason, LPVOID fImpLoad) case DLL_WINE_PREATTACH: return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinst); MSCTF_hinstance = hinst; + tlsIndex = TlsAlloc(); + break; + case DLL_PROCESS_DETACH: + TlsFree(tlsIndex); break; } return TRUE; diff --git a/dlls/msctf/msctf_internal.h b/dlls/msctf/msctf_internal.h index ee87a50..fa4a6ef 100644 --- a/dlls/msctf/msctf_internal.h +++ b/dlls/msctf/msctf_internal.h @@ -20,6 +20,7 @@ #ifndef __WINE_MSCTF_I_H #define __WINE_MSCTF_I_H +extern DWORD tlsIndex; extern HRESULT ThreadMgr_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut); extern HRESULT DocumentMgr_Constructor(ITfDocumentMgr **ppOut); diff --git a/dlls/msctf/threadmgr.c b/dlls/msctf/threadmgr.c index b16f7ec..7385f0b 100644 --- a/dlls/msctf/threadmgr.c +++ b/dlls/msctf/threadmgr.c @@ -49,6 +49,7 @@ typedef struct tagACLMulti { static void ThreadMgr_Destructor(ThreadMgr *This) { + TlsSetValue(tlsIndex,NULL); TRACE("destroying %p\n", This); if (This->focus) ITfDocumentMgr_Release(This->focus); @@ -227,12 +228,22 @@ HRESULT ThreadMgr_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) if (pUnkOuter) return CLASS_E_NOAGGREGATION; + /* Only 1 ThreadMgr is created per thread */ + This = TlsGetValue(tlsIndex); + if (This) + { + ThreadMgr_AddRef((ITfThreadMgr*)This); + *ppOut = (IUnknown*)This; + return S_OK; + } + This = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(ThreadMgr)); if (This == NULL) return E_OUTOFMEMORY; This->ThreadMgrVtbl= &ThreadMgr_ThreadMgrVtbl; This->refCount = 1; + TlsSetValue(tlsIndex,This); TRACE("returning %p\n", This); *ppOut = (IUnknown *)This;

1 0