wine-commits June 2009

wine-commits@winehq.org

5 participants
1115 discussions

Francois Gouget : Assorted spelling fixes.
by Alexandre Julliard 22 Jun '09

22 Jun '09

Module: wine Branch: master Commit: 03584b4ff6392f259a2f046cdf11b7976062b55e URL: http://source.winehq.org/git/wine.git/?a=commit;h=03584b4ff6392f259a2f046cd… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jun 22 10:45:15 2009 +0200 Assorted spelling fixes. --- dlls/comctl32/tests/listview.c | 9 +++++---- dlls/kernel32/tests/volume.c | 4 ++-- dlls/mlang/tests/mlang.c | 2 +- dlls/msctf/tests/inputprocessor.c | 2 +- dlls/opengl32/tests/opengl.c | 2 +- 5 files changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 6c6a3b8..2d697bb 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -3204,7 +3204,7 @@ static void test_editbox(void) ok(hwndedit2 == NULL, "Expected Edit window not to be created\n"); ok(!IsWindow(hwndedit), "Expected Edit window to be destroyed\n"); ok(GetFocus() == hwnd, "Expected List to be focused\n"); - /* and value greater then max item index */ + /* and value greater than max item index */ hwndedit = (HWND)SendMessage(hwnd, LVM_EDITLABEL, 0, 0); ok(IsWindow(hwndedit), "Expected Edit window to be created\n"); ok(GetFocus() == hwndedit, "Expected Edit to be focused\n"); @@ -3312,7 +3312,7 @@ static void test_notifyformat(void) r = SendMessage(header, HDM_GETUNICODEFORMAT, 0, 0); expect(1, r); DestroyWindow(hwnd); - /* recieving error code defaulting to ansi */ + /* receiving error code defaulting to ansi */ notifyFormat = 0; hwnd = create_listview_controlW(0, hwndparentW); ok(hwnd != NULL, "failed to create a listview window\n"); @@ -3323,7 +3323,7 @@ static void test_notifyformat(void) r = SendMessage(header, HDM_GETUNICODEFORMAT, 0, 0); expect(1, r); DestroyWindow(hwnd); - /* recieving ansi code from unicode window, use it */ + /* receiving ansi code from unicode window, use it */ notifyFormat = NFR_ANSI; hwnd = create_listview_controlW(0, hwndparentW); ok(hwnd != NULL, "failed to create a listview window\n"); @@ -3484,9 +3484,10 @@ static BOOL load_v6_module(ULONG_PTR *pcookie) if (!ret) { - win_skip("A problem during context activation occured.\n"); + win_skip("A problem during context activation occurred.\n"); DeleteFileA(manifest_name); } + else { /* this is a XP SP3 failure workaround */ diff --git a/dlls/kernel32/tests/volume.c b/dlls/kernel32/tests/volume.c index 2c25465..4f8c1c0 100644 --- a/dlls/kernel32/tests/volume.c +++ b/dlls/kernel32/tests/volume.c @@ -160,7 +160,7 @@ static void test_GetVolumeNameForVolumeMountPointA(void) "GetVolumeNameForVolumeMountPointA failed on %s, last=%d\n", temp_path, GetLastError()); - /* Try on a non-existent dos drive */ + /* Try on a nonexistent dos drive */ path[2] = 0; for (;path[0] <= 'z'; path[0]++) { ret = QueryDosDeviceA( path, volume, len); @@ -174,7 +174,7 @@ static void test_GetVolumeNameForVolumeMountPointA(void) "GetVolumeNameForVolumeMountPointA failed on %s, last=%d\n", path, GetLastError()); - /* Try without trailing \ and on a non-existent dos drive */ + /* Try without trailing \ and on a nonexistent dos drive */ path[2] = 0; ret = pGetVolumeNameForVolumeMountPointA(path, volume, len); ok(ret == FALSE && GetLastError() == ERROR_INVALID_NAME, diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index d4e3941..54ab987 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -60,7 +60,7 @@ typedef struct lcid_tag_table { /* en, ar and zh use SUBLANG_NEUTRAL for the rfc1766 name without the country all others suppress the country with SUBLANG_DEFAULT. - For 3 letter language codes, the rfc1766 is to small for the country */ + For 3 letter language codes, the rfc1766 is too small for the country */ static const lcid_table_entry lcid_table[] = { {"e", -1, E_FAIL}, diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index 97089bb..61389cf 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -1321,7 +1321,7 @@ static void test_ClientId(void) GUID g2; hr = ITfThreadMgr_QueryInterface(g_tm, &IID_ITfClientId, (LPVOID*)&pcid); - ok(SUCCEEDED(hr),"Unable to aquire ITfClientId interface\n"); + ok(SUCCEEDED(hr),"Unable to acquire ITfClientId interface\n"); CoCreateGuid(&g2); diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index 3078b79..2ced97d 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -320,7 +320,7 @@ static void test_sharelists(HDC winhdc) } /* Test 3: Share display lists with a context which already shares display lists with another context. - * According to MSDN the second paramater can't share any display lists but some buggy drivers might allow it */ + * According to MSDN the second parameter cannot share any display lists but some buggy drivers might allow it */ hglrc3 = wglCreateContext(winhdc); if(hglrc3) {

1 0

Francois Gouget : ole32: Make stub_manager_int_addref() static.
by Alexandre Julliard 22 Jun '09

22 Jun '09

Module: wine Branch: master Commit: 872035f1ab1f5000818919671b995e712a4988ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=872035f1ab1f5000818919671… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jun 22 10:47:06 2009 +0200 ole32: Make stub_manager_int_addref() static. --- dlls/ole32/compobj_private.h | 1 - dlls/ole32/stubmanager.c | 2 +- 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index a7c6dfa..43e6e25 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -203,7 +203,6 @@ HRESULT FTMarshalCF_Create(REFIID riid, LPVOID *ppv); /* Stub Manager */ -ULONG stub_manager_int_addref(struct stub_manager *This); ULONG stub_manager_int_release(struct stub_manager *This); struct stub_manager *new_stub_manager(APARTMENT *apt, IUnknown *object); ULONG stub_manager_ext_addref(struct stub_manager *m, ULONG refs, BOOL tableweak); diff --git a/dlls/ole32/stubmanager.c b/dlls/ole32/stubmanager.c index c15e9d3..12813c6 100644 --- a/dlls/ole32/stubmanager.c +++ b/dlls/ole32/stubmanager.c @@ -251,7 +251,7 @@ static void stub_manager_delete(struct stub_manager *m) } /* increments the internal refcount */ -ULONG stub_manager_int_addref(struct stub_manager *This) +static ULONG stub_manager_int_addref(struct stub_manager *This) { ULONG refs;

1 0

Francois Gouget : ole32: Reorder some stubmanager functions to avoid forward declarations.
by Alexandre Julliard 22 Jun '09

22 Jun '09

Module: wine Branch: master Commit: 887c395ce2c29574b134c1bbacd46cf138485f65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=887c395ce2c29574b134c1bba… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jun 22 10:46:58 2009 +0200 ole32: Reorder some stubmanager functions to avoid forward declarations. --- dlls/ole32/stubmanager.c | 324 +++++++++++++++++++++++----------------------- 1 files changed, 161 insertions(+), 163 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=887c395ce2c29574b134c…

1 0

Francois Gouget : msvfw32: Move MSVIDEO_SendMessage() up and make it and MSVIDEO_GetHicPtr() static.
by Alexandre Julliard 22 Jun '09

22 Jun '09

Module: wine Branch: master Commit: 0601902740dd7bef33d8e3a1ff2d5a421c8585bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=0601902740dd7bef33d8e3a1f… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jun 22 10:46:45 2009 +0200 msvfw32: Move MSVIDEO_SendMessage() up and make it and MSVIDEO_GetHicPtr() static. --- dlls/msvfw32/msvideo_main.c | 175 ++++++++++++++++++++-------------------- dlls/msvfw32/msvideo_private.h | 1 - 2 files changed, 87 insertions(+), 89 deletions(-) diff --git a/dlls/msvfw32/msvideo_main.c b/dlls/msvfw32/msvideo_main.c index 7c98a16..6196fac 100644 --- a/dlls/msvfw32/msvideo_main.c +++ b/dlls/msvfw32/msvideo_main.c @@ -91,6 +91,92 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) return TRUE; } +/****************************************************************** + * MSVIDEO_SendMessage + * + * + */ +static LRESULT MSVIDEO_SendMessage(WINE_HIC* whic, UINT msg, DWORD_PTR lParam1, DWORD_PTR lParam2) +{ + LRESULT ret; + +#define XX(x) case x: TRACE("(%p,"#x",0x%08lx,0x%08lx)\n",whic,lParam1,lParam2); break + + switch (msg) { + /* DRV_* */ + XX(DRV_LOAD); + XX(DRV_ENABLE); + XX(DRV_OPEN); + XX(DRV_CLOSE); + XX(DRV_DISABLE); + XX(DRV_FREE); + /* ICM_RESERVED+X */ + XX(ICM_ABOUT); + XX(ICM_CONFIGURE); + XX(ICM_GET); + XX(ICM_GETINFO); + XX(ICM_GETDEFAULTQUALITY); + XX(ICM_GETQUALITY); + XX(ICM_GETSTATE); + XX(ICM_SETQUALITY); + XX(ICM_SET); + XX(ICM_SETSTATE); + /* ICM_USER+X */ + XX(ICM_COMPRESS_FRAMES_INFO); + XX(ICM_COMPRESS_GET_FORMAT); + XX(ICM_COMPRESS_GET_SIZE); + XX(ICM_COMPRESS_QUERY); + XX(ICM_COMPRESS_BEGIN); + XX(ICM_COMPRESS); + XX(ICM_COMPRESS_END); + XX(ICM_DECOMPRESS_GET_FORMAT); + XX(ICM_DECOMPRESS_QUERY); + XX(ICM_DECOMPRESS_BEGIN); + XX(ICM_DECOMPRESS); + XX(ICM_DECOMPRESS_END); + XX(ICM_DECOMPRESS_SET_PALETTE); + XX(ICM_DECOMPRESS_GET_PALETTE); + XX(ICM_DRAW_QUERY); + XX(ICM_DRAW_BEGIN); + XX(ICM_DRAW_GET_PALETTE); + XX(ICM_DRAW_START); + XX(ICM_DRAW_STOP); + XX(ICM_DRAW_END); + XX(ICM_DRAW_GETTIME); + XX(ICM_DRAW); + XX(ICM_DRAW_WINDOW); + XX(ICM_DRAW_SETTIME); + XX(ICM_DRAW_REALIZE); + XX(ICM_DRAW_FLUSH); + XX(ICM_DRAW_RENDERBUFFER); + XX(ICM_DRAW_START_PLAY); + XX(ICM_DRAW_STOP_PLAY); + XX(ICM_DRAW_SUGGESTFORMAT); + XX(ICM_DRAW_CHANGEPALETTE); + XX(ICM_GETBUFFERSWANTED); + XX(ICM_GETDEFAULTKEYFRAMERATE); + XX(ICM_DECOMPRESSEX_BEGIN); + XX(ICM_DECOMPRESSEX_QUERY); + XX(ICM_DECOMPRESSEX); + XX(ICM_DECOMPRESSEX_END); + XX(ICM_SET_STATUS_PROC); + default: + FIXME("(%p,0x%08x,0x%08lx,0x%08lx) unknown message\n",whic,msg,lParam1,lParam2); + } + +#undef XX + + if (whic->driverproc) { + /* dwDriverId parameter is the value returned by the DRV_OPEN */ + ret = whic->driverproc(whic->driverId, whic->hdrv, msg, lParam1, lParam2); + } else { + ret = SendDriverMessage(whic->hdrv, msg, lParam1, lParam2); + } + + TRACE(" -> 0x%08lx\n", ret); + return ret; +} + static int compare_fourcc(DWORD fcc1, DWORD fcc2) { char fcc_str1[4]; @@ -152,7 +238,7 @@ static BOOL enum_drivers(DWORD fccType, enum_handler_t handler, void* param) * * */ -WINE_HIC* MSVIDEO_GetHicPtr(HIC hic) +static WINE_HIC* MSVIDEO_GetHicPtr(HIC hic) { WINE_HIC* whic; @@ -1000,93 +1086,6 @@ void VFWAPI ICCompressorFree(PCOMPVARS pc) } } - -/****************************************************************** - * MSVIDEO_SendMessage - * - * - */ -LRESULT MSVIDEO_SendMessage(WINE_HIC* whic, UINT msg, DWORD_PTR lParam1, DWORD_PTR lParam2) -{ - LRESULT ret; - -#define XX(x) case x: TRACE("(%p,"#x",0x%08lx,0x%08lx)\n",whic,lParam1,lParam2); break - - switch (msg) { - /* DRV_* */ - XX(DRV_LOAD); - XX(DRV_ENABLE); - XX(DRV_OPEN); - XX(DRV_CLOSE); - XX(DRV_DISABLE); - XX(DRV_FREE); - /* ICM_RESERVED+X */ - XX(ICM_ABOUT); - XX(ICM_CONFIGURE); - XX(ICM_GET); - XX(ICM_GETINFO); - XX(ICM_GETDEFAULTQUALITY); - XX(ICM_GETQUALITY); - XX(ICM_GETSTATE); - XX(ICM_SETQUALITY); - XX(ICM_SET); - XX(ICM_SETSTATE); - /* ICM_USER+X */ - XX(ICM_COMPRESS_FRAMES_INFO); - XX(ICM_COMPRESS_GET_FORMAT); - XX(ICM_COMPRESS_GET_SIZE); - XX(ICM_COMPRESS_QUERY); - XX(ICM_COMPRESS_BEGIN); - XX(ICM_COMPRESS); - XX(ICM_COMPRESS_END); - XX(ICM_DECOMPRESS_GET_FORMAT); - XX(ICM_DECOMPRESS_QUERY); - XX(ICM_DECOMPRESS_BEGIN); - XX(ICM_DECOMPRESS); - XX(ICM_DECOMPRESS_END); - XX(ICM_DECOMPRESS_SET_PALETTE); - XX(ICM_DECOMPRESS_GET_PALETTE); - XX(ICM_DRAW_QUERY); - XX(ICM_DRAW_BEGIN); - XX(ICM_DRAW_GET_PALETTE); - XX(ICM_DRAW_START); - XX(ICM_DRAW_STOP); - XX(ICM_DRAW_END); - XX(ICM_DRAW_GETTIME); - XX(ICM_DRAW); - XX(ICM_DRAW_WINDOW); - XX(ICM_DRAW_SETTIME); - XX(ICM_DRAW_REALIZE); - XX(ICM_DRAW_FLUSH); - XX(ICM_DRAW_RENDERBUFFER); - XX(ICM_DRAW_START_PLAY); - XX(ICM_DRAW_STOP_PLAY); - XX(ICM_DRAW_SUGGESTFORMAT); - XX(ICM_DRAW_CHANGEPALETTE); - XX(ICM_GETBUFFERSWANTED); - XX(ICM_GETDEFAULTKEYFRAMERATE); - XX(ICM_DECOMPRESSEX_BEGIN); - XX(ICM_DECOMPRESSEX_QUERY); - XX(ICM_DECOMPRESSEX); - XX(ICM_DECOMPRESSEX_END); - XX(ICM_SET_STATUS_PROC); - default: - FIXME("(%p,0x%08x,0x%08lx,0x%08lx) unknown message\n",whic,msg,lParam1,lParam2); - } - -#undef XX - - if (whic->driverproc) { - /* dwDriverId parameter is the value returned by the DRV_OPEN */ - ret = whic->driverproc(whic->driverId, whic->hdrv, msg, lParam1, lParam2); - } else { - ret = SendDriverMessage(whic->hdrv, msg, lParam1, lParam2); - } - - TRACE(" -> 0x%08lx\n", ret); - return ret; -} - /*********************************************************************** * ICSendMessage [MSVFW32.@] */ diff --git a/dlls/msvfw32/msvideo_private.h b/dlls/msvfw32/msvideo_private.h index d1e5f8d..d6b2d19 100644 --- a/dlls/msvfw32/msvideo_private.h +++ b/dlls/msvfw32/msvideo_private.h @@ -41,7 +41,6 @@ typedef struct tagWINE_HIC { struct tagWINE_HIC* next; } WINE_HIC; -LRESULT MSVIDEO_SendMessage(WINE_HIC*, UINT, DWORD_PTR, DWORD_PTR); #define IDC_CONFIGURE 882 #define IDC_ABOUT 883

1 0

Aric Stewart : msctf: Implement ITfCompartmentEventSink.
by Alexandre Julliard 22 Jun '09

22 Jun '09

Module: wine Branch: master Commit: 7aa9bd9823f0e56e9ae209b417b71e2f277f451e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7aa9bd9823f0e56e9ae209b41… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Jun 22 12:04:41 2009 +0900 msctf: Implement ITfCompartmentEventSink. --- dlls/msctf/compartmentmgr.c | 34 +++++++++++++++++++++++++++++++--- include/msctf.idl | 11 +++++++++++ 2 files changed, 42 insertions(+), 3 deletions(-) diff --git a/dlls/msctf/compartmentmgr.c b/dlls/msctf/compartmentmgr.c index 7e11690..3afcfda 100644 --- a/dlls/msctf/compartmentmgr.c +++ b/dlls/msctf/compartmentmgr.c @@ -72,7 +72,7 @@ typedef struct tagCompartmentSink { struct list entry; union { IUnknown *pIUnknown; - /* ITfCompartmentEventSink *pITfCompartmentEventSink; */ + ITfCompartmentEventSink *pITfCompartmentEventSink; } interfaces; } CompartmentSink; @@ -493,6 +493,7 @@ static HRESULT WINAPI Compartment_SetValue(ITfCompartment *iface, TfClientId tid, const VARIANT *pvarValue) { Compartment *This = (Compartment *)iface; + struct list *cursor; TRACE("(%p) %i %p\n",This,tid,pvarValue); @@ -517,6 +518,12 @@ static HRESULT WINAPI Compartment_SetValue(ITfCompartment *iface, else if (V_VT(pvarValue) == VT_UNKNOWN) IUnknown_AddRef(V_UNKNOWN(&This->variant)); + LIST_FOR_EACH(cursor, &This->CompartmentEventSink) + { + CompartmentSink* sink = LIST_ENTRY(cursor,CompartmentSink,entry); + ITfCompartmentEventSink_OnChange(sink->interfaces.pITfCompartmentEventSink,&This->valueData->guid); + } + return S_OK; } @@ -570,6 +577,7 @@ static ULONG WINAPI Source_Release(ITfSource *iface) static WINAPI HRESULT CompartmentSource_AdviseSink(ITfSource *iface, REFIID riid, IUnknown *punk, DWORD *pdwCookie) { + CompartmentSink *cs; Compartment *This = impl_from_ITfSourceVtbl(iface); TRACE("(%p) %s %p %p\n",This,debugstr_guid(riid),punk,pdwCookie); @@ -577,8 +585,28 @@ static WINAPI HRESULT CompartmentSource_AdviseSink(ITfSource *iface, if (!riid || !punk || !pdwCookie) return E_INVALIDARG; - FIXME("(%p) Unhandled Sink: %s\n",This,debugstr_guid(riid)); - return E_NOTIMPL; + if (IsEqualIID(riid, &IID_ITfCompartmentEventSink)) + { + cs = HeapAlloc(GetProcessHeap(),0,sizeof(CompartmentSink)); + if (!cs) + return E_OUTOFMEMORY; + if (FAILED(IUnknown_QueryInterface(punk, riid, (LPVOID *)&cs->interfaces.pITfCompartmentEventSink))) + { + HeapFree(GetProcessHeap(),0,cs); + return CONNECT_E_CANNOTCONNECT; + } + list_add_head(&This->CompartmentEventSink,&cs->entry); + *pdwCookie = generate_Cookie(COOKIE_MAGIC_COMPARTMENTSINK , cs); + } + else + { + FIXME("(%p) Unhandled Sink: %s\n",This,debugstr_guid(riid)); + return E_NOTIMPL; + } + + TRACE("cookie %x\n",*pdwCookie); + + return S_OK; } static WINAPI HRESULT CompartmentSource_UnadviseSink(ITfSource *iface, DWORD pdwCookie) diff --git a/include/msctf.idl b/include/msctf.idl index 4db67f4..1058057 100644 --- a/include/msctf.idl +++ b/include/msctf.idl @@ -938,3 +938,14 @@ interface ITfCompartmentMgr : IUnknown HRESULT EnumCompartments( [out] IEnumGUID **ppEnum); }; + +[ + object, + uuid(743abd5f-f26d-48df-8cc5-238492419b64), + pointer_default(unique) +] +interface ITfCompartmentEventSink : IUnknown +{ + HRESULT OnChange( + [in] REFGUID rguid); +}

1 0

Aric Stewart : msctf: Define ITfSource for Compartments.
by Alexandre Julliard 22 Jun '09

22 Jun '09

Module: wine Branch: master Commit: 3bdfa1cc67349ce84f8cf39f24d9d0de6e54c5f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bdfa1cc67349ce84f8cf39f2… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Jun 22 12:04:24 2009 +0900 msctf: Define ITfSource for Compartments. --- dlls/msctf/compartmentmgr.c | 102 +++++++++++++++++++++++++++++++++++++++++++ dlls/msctf/msctf_internal.h | 1 + 2 files changed, 103 insertions(+), 0 deletions(-) diff --git a/dlls/msctf/compartmentmgr.c b/dlls/msctf/compartmentmgr.c index 5379495..7e11690 100644 --- a/dlls/msctf/compartmentmgr.c +++ b/dlls/msctf/compartmentmgr.c @@ -67,18 +67,34 @@ typedef struct tagCompartmentEnumGuid { struct list *cursor; } CompartmentEnumGuid; + +typedef struct tagCompartmentSink { + struct list entry; + union { + IUnknown *pIUnknown; + /* ITfCompartmentEventSink *pITfCompartmentEventSink; */ + } interfaces; +} CompartmentSink; + typedef struct tagCompartment { const ITfCompartmentVtbl *Vtbl; + const ITfSourceVtbl *SourceVtbl; LONG refCount; /* Only VT_I4, VT_UNKNOWN and VT_BSTR data types are allowed */ VARIANT variant; CompartmentValue *valueData; + struct list CompartmentEventSink; } Compartment; static HRESULT CompartmentEnumGuid_Constructor(struct list* values, IEnumGUID **ppOut); static HRESULT Compartment_Constructor(CompartmentValue *value, ITfCompartment **ppOut); +static inline Compartment *impl_from_ITfSourceVtbl(ITfSource *iface) +{ + return (Compartment *)((char *)iface - FIELD_OFFSET(Compartment,SourceVtbl)); +} + HRESULT CompartmentMgr_Destructor(ITfCompartmentMgr *iface) { CompartmentMgr *This = (CompartmentMgr *)iface; @@ -412,10 +428,23 @@ static HRESULT CompartmentEnumGuid_Constructor(struct list *values, IEnumGUID ** /************************************************** * ITfCompartment **************************************************/ +static void free_sink(CompartmentSink *sink) +{ + IUnknown_Release(sink->interfaces.pIUnknown); + HeapFree(GetProcessHeap(),0,sink); +} + static void Compartment_Destructor(Compartment *This) { + struct list *cursor, *cursor2; TRACE("destroying %p\n", This); VariantClear(&This->variant); + LIST_FOR_EACH_SAFE(cursor, cursor2, &This->CompartmentEventSink) + { + CompartmentSink* sink = LIST_ENTRY(cursor,CompartmentSink,entry); + list_remove(cursor); + free_sink(sink); + } HeapFree(GetProcessHeap(),0,This); } @@ -428,6 +457,10 @@ static HRESULT WINAPI Compartment_QueryInterface(ITfCompartment *iface, REFIID i { *ppvOut = This; } + else if (IsEqualIID(iid, &IID_ITfSource)) + { + *ppvOut = &This->SourceVtbl; + } if (*ppvOut) { @@ -512,6 +545,72 @@ static const ITfCompartmentVtbl ITfCompartment_Vtbl ={ Compartment_GetValue }; +/***************************************************** + * ITfSource functions + *****************************************************/ + +static HRESULT WINAPI Source_QueryInterface(ITfSource *iface, REFIID iid, LPVOID *ppvOut) +{ + Compartment *This = impl_from_ITfSourceVtbl(iface); + return Compartment_QueryInterface((ITfCompartment *)This, iid, *ppvOut); +} + +static ULONG WINAPI Source_AddRef(ITfSource *iface) +{ + Compartment *This = impl_from_ITfSourceVtbl(iface); + return Compartment_AddRef((ITfCompartment*)This); +} + +static ULONG WINAPI Source_Release(ITfSource *iface) +{ + Compartment *This = impl_from_ITfSourceVtbl(iface); + return Compartment_Release((ITfCompartment *)This); +} + +static WINAPI HRESULT CompartmentSource_AdviseSink(ITfSource *iface, + REFIID riid, IUnknown *punk, DWORD *pdwCookie) +{ + Compartment *This = impl_from_ITfSourceVtbl(iface); + + TRACE("(%p) %s %p %p\n",This,debugstr_guid(riid),punk,pdwCookie); + + if (!riid || !punk || !pdwCookie) + return E_INVALIDARG; + + FIXME("(%p) Unhandled Sink: %s\n",This,debugstr_guid(riid)); + return E_NOTIMPL; +} + +static WINAPI HRESULT CompartmentSource_UnadviseSink(ITfSource *iface, DWORD pdwCookie) +{ + CompartmentSink *sink; + Compartment *This = impl_from_ITfSourceVtbl(iface); + + TRACE("(%p) %x\n",This,pdwCookie); + + if (get_Cookie_magic(pdwCookie)!=COOKIE_MAGIC_COMPARTMENTSINK) + return E_INVALIDARG; + + sink = (CompartmentSink*)remove_Cookie(pdwCookie); + if (!sink) + return CONNECT_E_NOCONNECTION; + + list_remove(&sink->entry); + free_sink(sink); + + return S_OK; +} + +static const ITfSourceVtbl Compartment_SourceVtbl = +{ + Source_QueryInterface, + Source_AddRef, + Source_Release, + + CompartmentSource_AdviseSink, + CompartmentSource_UnadviseSink, +}; + static HRESULT Compartment_Constructor(CompartmentValue *valueData, ITfCompartment **ppOut) { Compartment *This; @@ -521,11 +620,14 @@ static HRESULT Compartment_Constructor(CompartmentValue *valueData, ITfCompartme return E_OUTOFMEMORY; This->Vtbl= &ITfCompartment_Vtbl; + This->SourceVtbl = &Compartment_SourceVtbl; This->refCount = 1; This->valueData = valueData; VariantInit(&This->variant); + list_init(&This->CompartmentEventSink); + TRACE("returning %p\n", This); *ppOut = (ITfCompartment*)This; return S_OK; diff --git a/dlls/msctf/msctf_internal.h b/dlls/msctf/msctf_internal.h index d2b1a2e..eff30c9 100644 --- a/dlls/msctf/msctf_internal.h +++ b/dlls/msctf/msctf_internal.h @@ -26,6 +26,7 @@ #define COOKIE_MAGIC_GUIDATOM 0x0030 #define COOKIE_MAGIC_IPPSINK 0x0040 #define COOKIE_MAGIC_EDITCOOKIE 0x0050 +#define COOKIE_MAGIC_COMPARTMENTSINK 0x0060 extern DWORD tlsIndex; extern TfClientId processId;

1 0

Aric Stewart : msctf: ITfCompartmentMgr tests.
by Alexandre Julliard 22 Jun '09

22 Jun '09

Module: wine Branch: master Commit: 9d12acf34269903cd18e0a390f135c4e9b2101a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d12acf34269903cd18e0a390… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Jun 22 12:04:03 2009 +0900 msctf: ITfCompartmentMgr tests. --- dlls/msctf/tests/inputprocessor.c | 91 ++++++++++++++++++++++++++++++++++++- 1 files changed, 90 insertions(+), 1 deletions(-) diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index 67d53c6..97089bb 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -694,7 +694,15 @@ DEFINE_GUID (GUID_TFCAT_DISPLAYATTRIBUTEPROVIDER, 0x046B8C80,0x1647,0x40F7,0x9B DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); DEFINE_GUID(CLSID_TF_ThreadMgr, 0x529a9e6b,0x6587,0x4f23,0xab,0x9e,0x9c,0x7d,0x68,0x3e,0x3c,0x50); DEFINE_GUID(CLSID_PreservedKey, 0xA0ED8E55,0xCD3B,0x4274,0xB2,0x95,0xF6,0xC9,0xBA,0x2B,0x84,0x72); - +DEFINE_GUID(GUID_COMPARTMENT_KEYBOARD_DISABLED, 0x71a5b253,0x1951,0x466b,0x9f,0xbc,0x9c,0x88,0x08,0xfa,0x84,0xf2); +DEFINE_GUID(GUID_COMPARTMENT_KEYBOARD_OPENCLOSE, 0x58273aad,0x01bb,0x4164,0x95,0xc6,0x75,0x5b,0xa0,0xb5,0x16,0x2d); +DEFINE_GUID(GUID_COMPARTMENT_HANDWRITING_OPENCLOSE, 0xf9ae2c6b,0x1866,0x4361,0xaf,0x72,0x7a,0xa3,0x09,0x48,0x89,0x0e); +DEFINE_GUID(GUID_COMPARTMENT_SPEECH_DISABLED, 0x56c5c607,0x0703,0x4e59,0x8e,0x52,0xcb,0xc8,0x4e,0x8b,0xbe,0x35); +DEFINE_GUID(GUID_COMPARTMENT_SPEECH_OPENCLOSE, 0x544d6a63,0xe2e8,0x4752,0xbb,0xd1,0x00,0x09,0x60,0xbc,0xa0,0x83); +DEFINE_GUID(GUID_COMPARTMENT_SPEECH_GLOBALSTATE, 0x2a54fe8e,0x0d08,0x460c,0xa7,0x5d,0x87,0x03,0x5f,0xf4,0x36,0xc5); +DEFINE_GUID(GUID_COMPARTMENT_PERSISTMENUENABLED, 0x575f3783,0x70c8,0x47c8,0xae,0x5d,0x91,0xa0,0x1a,0x1f,0x75,0x92); +DEFINE_GUID(GUID_COMPARTMENT_EMPTYCONTEXT, 0xd7487dbf,0x804e,0x41c5,0x89,0x4d,0xad,0x96,0xfd,0x4e,0xea,0x13); +DEFINE_GUID(GUID_COMPARTMENT_TIPUISTATUS, 0x148ca3ec,0x0366,0x401c,0x8d,0x75,0xed,0x97,0x8d,0x85,0xfb,0xc9); static HRESULT initialize(void) { @@ -1552,6 +1560,86 @@ static void test_TStoApplicationText(void) ITfEditSession_Release(es); } +static void enum_compartments(ITfCompartmentMgr *cmpmgr, REFGUID present, REFGUID absent) +{ + BOOL found,found2; + IEnumGUID *ppEnum; + found = FALSE; + found2 = FALSE; + if (SUCCEEDED(ITfCompartmentMgr_EnumCompartments(cmpmgr, &ppEnum))) + { + ULONG fetched; + GUID g; + while (IEnumGUID_Next(ppEnum, 1, &g, &fetched) == S_OK) + { + WCHAR str[50]; + CHAR strA[50]; + StringFromGUID2(&g,str,50); + WideCharToMultiByte(CP_ACP,0,str,50,strA,50,0,0); + trace("found %s\n",strA); + if (present && IsEqualGUID(present,&g)) + found = TRUE; + if (absent && IsEqualGUID(absent, &g)) + found2 = TRUE; + } + IEnumGUID_Release(ppEnum); + } + if (present) + ok(found,"Did not find compartment\n"); + if (absent) + ok(!found2,"Found compartment that should be absent\n"); +} + +static void test_Compartments(void) +{ + ITfContext *cxt; + ITfDocumentMgr *dm; + ITfCompartmentMgr *cmpmgr; + ITfCompartment *cmp; + HRESULT hr; + + ITfThreadMgr_GetFocus(g_tm, &dm); + ITfDocumentMgr_GetTop(dm,&cxt); + + /* Global */ + hr = ITfThreadMgr_GetGlobalCompartment(g_tm, &cmpmgr); + ok(SUCCEEDED(hr),"GetGlobalCompartment failed\n"); + hr = ITfCompartmentMgr_GetCompartment(cmpmgr, &GUID_COMPARTMENT_SPEECH_OPENCLOSE, &cmp); + ok(SUCCEEDED(hr),"GetCompartment failed\n"); + ITfCompartment_Release(cmp); + enum_compartments(cmpmgr,&GUID_COMPARTMENT_SPEECH_OPENCLOSE,NULL); + ITfCompartmentMgr_Release(cmpmgr); + + /* Thread */ + hr = ITfThreadMgr_QueryInterface(g_tm, &IID_ITfCompartmentMgr, (LPVOID*)&cmpmgr); + ok(SUCCEEDED(hr),"ThreadMgr QI for IID_ITfCompartmentMgr failed\n"); + hr = ITfCompartmentMgr_GetCompartment(cmpmgr, &CLSID_FakeService, &cmp); + ok(SUCCEEDED(hr),"GetCompartment failed\n"); + enum_compartments(cmpmgr,&CLSID_FakeService,&GUID_COMPARTMENT_SPEECH_OPENCLOSE); + ITfCompartmentMgr_ClearCompartment(cmpmgr,tid,&CLSID_FakeService); + enum_compartments(cmpmgr,NULL,&CLSID_FakeService); + ITfCompartmentMgr_Release(cmpmgr); + ITfCompartment_Release(cmp); + + /* DocumentMgr */ + hr = ITfDocumentMgr_QueryInterface(dm, &IID_ITfCompartmentMgr, (LPVOID*)&cmpmgr); + ok(SUCCEEDED(hr),"DocumentMgr QI for IID_ITfCompartmentMgr failed\n"); + + hr = ITfCompartmentMgr_GetCompartment(cmpmgr, &GUID_COMPARTMENT_PERSISTMENUENABLED, &cmp); + ok(SUCCEEDED(hr),"GetCompartment failed\n"); + enum_compartments(cmpmgr,&GUID_COMPARTMENT_PERSISTMENUENABLED,&GUID_COMPARTMENT_SPEECH_OPENCLOSE); + ITfCompartmentMgr_Release(cmpmgr); + + /* Context */ + hr = ITfContext_QueryInterface(cxt, &IID_ITfCompartmentMgr, (LPVOID*)&cmpmgr); + ok(SUCCEEDED(hr),"Context QI for IID_ITfCompartmentMgr failed\n"); + enum_compartments(cmpmgr,NULL,&GUID_COMPARTMENT_PERSISTMENUENABLED); + ITfCompartmentMgr_Release(cmpmgr); + + ITfContext_Release(cxt); + ITfDocumentMgr_Release(dm); +} + START_TEST(inputprocessor) { if (SUCCEEDED(initialize())) @@ -1567,6 +1655,7 @@ START_TEST(inputprocessor) test_ClientId(); test_KeystrokeMgr(); test_TStoApplicationText(); + test_Compartments(); test_endSession(); test_EnumLanguageProfiles(); test_FindClosestCategory();

1 0

Aric Stewart : msctf: Implement ITfCompartmentMgr::GetCompartment.
by Alexandre Julliard 22 Jun '09

22 Jun '09

Module: wine Branch: master Commit: ba69aebd3eb2b5b4063dcf9a377147cc25dec35a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba69aebd3eb2b5b4063dcf9a3… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Jun 22 12:02:49 2009 +0900 msctf: Implement ITfCompartmentMgr::GetCompartment. --- dlls/msctf/compartmentmgr.c | 35 +++++++++++++++++++++++++++++++++-- 1 files changed, 33 insertions(+), 2 deletions(-) diff --git a/dlls/msctf/compartmentmgr.c b/dlls/msctf/compartmentmgr.c index 09b71b1..5379495 100644 --- a/dlls/msctf/compartmentmgr.c +++ b/dlls/msctf/compartmentmgr.c @@ -153,8 +153,39 @@ static HRESULT WINAPI CompartmentMgr_GetCompartment(ITfCompartmentMgr *iface, REFGUID rguid, ITfCompartment **ppcomp) { CompartmentMgr *This = (CompartmentMgr *)iface; - FIXME("STUB:(%p)\n",This); - return E_NOTIMPL; + CompartmentValue* value; + struct list *cursor; + HRESULT hr; + + TRACE("(%p) %s %p\n",This,debugstr_guid(rguid),ppcomp); + + LIST_FOR_EACH(cursor, &This->values) + { + value = LIST_ENTRY(cursor,CompartmentValue,entry); + if (IsEqualGUID(rguid,&value->guid)) + { + ITfCompartment_AddRef(value->compartment); + *ppcomp = value->compartment; + return S_OK; + } + } + + value = HeapAlloc(GetProcessHeap(),0,sizeof(CompartmentValue)); + value->guid = *rguid; + value->owner = 0; + hr = Compartment_Constructor(value,&value->compartment); + if (SUCCEEDED(hr)) + { + list_add_head(&This->values,&value->entry); + ITfCompartment_AddRef(value->compartment); + *ppcomp = value->compartment; + } + else + { + HeapFree(GetProcessHeap(),0,value); + *ppcomp = NULL; + } + return hr; } static HRESULT WINAPI CompartmentMgr_ClearCompartment(ITfCompartmentMgr *iface,

1 0

Aric Stewart : msctf: Implement ITfCompartment::SetValue.
by Alexandre Julliard 22 Jun '09

22 Jun '09

Module: wine Branch: master Commit: 3a18408dd590ccbb8d28bc66615b4a8801c9af12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a18408dd590ccbb8d28bc666… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Jun 22 12:03:35 2009 +0900 msctf: Implement ITfCompartment::SetValue. --- dlls/msctf/compartmentmgr.c | 27 +++++++++++++++++++++++++-- 1 files changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/msctf/compartmentmgr.c b/dlls/msctf/compartmentmgr.c index 253bec7..09b71b1 100644 --- a/dlls/msctf/compartmentmgr.c +++ b/dlls/msctf/compartmentmgr.c @@ -429,8 +429,31 @@ static HRESULT WINAPI Compartment_SetValue(ITfCompartment *iface, TfClientId tid, const VARIANT *pvarValue) { Compartment *This = (Compartment *)iface; - FIXME("STUB:(%p)\n",This); - return E_NOTIMPL; + + TRACE("(%p) %i %p\n",This,tid,pvarValue); + + if (!pvarValue) + return E_INVALIDARG; + + if (!(V_VT(pvarValue) == VT_BSTR || V_VT(pvarValue) == VT_I4 || + V_VT(pvarValue) == VT_UNKNOWN)) + return E_INVALIDARG; + + if (!This->valueData->owner) + This->valueData->owner = tid; + + VariantClear(&This->variant); + + /* Shallow copy of value and type */ + This->variant = *pvarValue; + + if (V_VT(pvarValue) == VT_BSTR) + V_BSTR(&This->variant) = SysAllocStringByteLen((char*)V_BSTR(pvarValue), + SysStringByteLen(V_BSTR(pvarValue))); + else if (V_VT(pvarValue) == VT_UNKNOWN) + IUnknown_AddRef(V_UNKNOWN(&This->variant)); + + return S_OK; } static HRESULT WINAPI Compartment_GetValue(ITfCompartment *iface,

1 0

Aric Stewart : msctf: Define ITfCompartment.
by Alexandre Julliard 22 Jun '09

22 Jun '09

Module: wine Branch: master Commit: e842f250ee475047138894aafe66977d8911e485 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e842f250ee475047138894aaf… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Jun 22 12:02:08 2009 +0900 msctf: Define ITfCompartment. --- dlls/msctf/compartmentmgr.c | 101 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 101 insertions(+), 0 deletions(-) diff --git a/dlls/msctf/compartmentmgr.c b/dlls/msctf/compartmentmgr.c index 5342568..7e23b86 100644 --- a/dlls/msctf/compartmentmgr.c +++ b/dlls/msctf/compartmentmgr.c @@ -67,7 +67,17 @@ typedef struct tagCompartmentEnumGuid { struct list *cursor; } CompartmentEnumGuid; +typedef struct tagCompartment { + const ITfCompartmentVtbl *Vtbl; + LONG refCount; + + /* Only VT_I4, VT_UNKNOWN and VT_BSTR data types are allowed */ + VARIANT variant; + CompartmentValue *valueData; +} Compartment; + static HRESULT CompartmentEnumGuid_Constructor(struct list* values, IEnumGUID **ppOut); +static HRESULT Compartment_Constructor(CompartmentValue *value, ITfCompartment **ppOut); HRESULT CompartmentMgr_Destructor(ITfCompartmentMgr *iface) { @@ -367,3 +377,94 @@ static HRESULT CompartmentEnumGuid_Constructor(struct list *values, IEnumGUID ** *ppOut = (IEnumGUID*)This; return S_OK; } + +/************************************************** + * ITfCompartment + **************************************************/ +static void Compartment_Destructor(Compartment *This) +{ + TRACE("destroying %p\n", This); + VariantClear(&This->variant); + HeapFree(GetProcessHeap(),0,This); +} + +static HRESULT WINAPI Compartment_QueryInterface(ITfCompartment *iface, REFIID iid, LPVOID *ppvOut) +{ + Compartment *This = (Compartment *)iface; + *ppvOut = NULL; + + if (IsEqualIID(iid, &IID_IUnknown) || IsEqualIID(iid, &IID_ITfCompartment)) + { + *ppvOut = This; + } + + if (*ppvOut) + { + IUnknown_AddRef(iface); + return S_OK; + } + + WARN("unsupported interface: %s\n", debugstr_guid(iid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI Compartment_AddRef(ITfCompartment *iface) +{ + Compartment *This = (Compartment*)iface; + return InterlockedIncrement(&This->refCount); +} + +static ULONG WINAPI Compartment_Release(ITfCompartment *iface) +{ + Compartment *This = (Compartment *)iface; + ULONG ret; + + ret = InterlockedDecrement(&This->refCount); + if (ret == 0) + Compartment_Destructor(This); + return ret; +} + +static HRESULT WINAPI Compartment_SetValue(ITfCompartment *iface, + TfClientId tid, const VARIANT *pvarValue) +{ + Compartment *This = (Compartment *)iface; + FIXME("STUB:(%p)\n",This); + return E_NOTIMPL; +} + +static HRESULT WINAPI Compartment_GetValue(ITfCompartment *iface, + VARIANT *pvarValue) +{ + Compartment *This = (Compartment *)iface; + FIXME("STUB:(%p)\n",This); + return E_NOTIMPL; +} + +static const ITfCompartmentVtbl ITfCompartment_Vtbl ={ + Compartment_QueryInterface, + Compartment_AddRef, + Compartment_Release, + + Compartment_SetValue, + Compartment_GetValue +}; + +static HRESULT Compartment_Constructor(CompartmentValue *valueData, ITfCompartment **ppOut) +{ + Compartment *This; + + This = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(Compartment)); + if (This == NULL) + return E_OUTOFMEMORY; + + This->Vtbl= &ITfCompartment_Vtbl; + This->refCount = 1; + + This->valueData = valueData; + VariantInit(&This->variant); + + TRACE("returning %p\n", This); + *ppOut = (ITfCompartment*)This; + return S_OK; +}

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2009