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

Aric Stewart : msctf/tests: Test framework for ITfKeyEventSink.
by Alexandre Julliard 23 Apr '09

23 Apr '09

Module: wine Branch: master Commit: bd598adfdd2f601d07229c2e4a5748a700b84af8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd598adfdd2f601d07229c2e4… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Apr 22 12:37:57 2009 -0500 msctf/tests: Test framework for ITfKeyEventSink. --- dlls/msctf/tests/inputprocessor.c | 136 +++++++++++++++++++++++++++++++++++++ 1 files changed, 136 insertions(+), 0 deletions(-) diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index 2b2adde..3556922 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -53,6 +53,7 @@ static INT test_OnSetFocus = SINK_UNEXPECTED; static INT test_OnInitDocumentMgr = SINK_UNEXPECTED; static INT test_OnPushContext = SINK_UNEXPECTED; static INT test_OnPopContext = SINK_UNEXPECTED; +static INT test_KEV_OnSetFocus = SINK_UNEXPECTED; HRESULT RegisterTextService(REFCLSID rclsid); HRESULT UnregisterTextService(); @@ -259,12 +260,138 @@ static void test_ThreadMgrUnadviseSinks(void) ITfSource_Release(source); } +/********************************************************************** + * ITfKeyEventSink + **********************************************************************/ +typedef struct tagKeyEventSink +{ + const ITfKeyEventSinkVtbl *KeyEventSinkVtbl; + LONG refCount; +} KeyEventSink; + +static void KeyEventSink_Destructor(KeyEventSink *This) +{ + HeapFree(GetProcessHeap(),0,This); +} + +static HRESULT WINAPI KeyEventSink_QueryInterface(ITfKeyEventSink *iface, REFIID iid, LPVOID *ppvOut) +{ + KeyEventSink *This = (KeyEventSink *)iface; + *ppvOut = NULL; + + if (IsEqualIID(iid, &IID_IUnknown) || IsEqualIID(iid, &IID_ITfKeyEventSink)) + { + *ppvOut = This; + } + + if (*ppvOut) + { + IUnknown_AddRef(iface); + return S_OK; + } + + return E_NOINTERFACE; +} + +static ULONG WINAPI KeyEventSink_AddRef(ITfKeyEventSink *iface) +{ + KeyEventSink *This = (KeyEventSink *)iface; + return InterlockedIncrement(&This->refCount); +} + +static ULONG WINAPI KeyEventSink_Release(ITfKeyEventSink *iface) +{ + KeyEventSink *This = (KeyEventSink *)iface; + ULONG ret; + + ret = InterlockedDecrement(&This->refCount); + if (ret == 0) + KeyEventSink_Destructor(This); + return ret; +} + +static HRESULT WINAPI KeyEventSink_OnSetFocus(ITfKeyEventSink *iface, + BOOL fForeground) +{ + ok(test_KEV_OnSetFocus == SINK_EXPECTED,"Unexpected KeyEventSink_OnSetFocus\n"); + test_KEV_OnSetFocus = SINK_FIRED; + return S_OK; +} + +static HRESULT WINAPI KeyEventSink_OnTestKeyDown(ITfKeyEventSink *iface, + ITfContext *pic, WPARAM wParam, LPARAM lParam, BOOL *pfEaten) +{ + trace("\n"); + return S_OK; +} + +static HRESULT WINAPI KeyEventSink_OnTestKeyUp(ITfKeyEventSink *iface, + ITfContext *pic, WPARAM wParam, LPARAM lParam, BOOL *pfEaten) +{ + trace("\n"); + return S_OK; +} + +static HRESULT WINAPI KeyEventSink_OnKeyDown(ITfKeyEventSink *iface, + ITfContext *pic, WPARAM wParam, LPARAM lParam, BOOL *pfEaten) +{ + trace("\n"); + return S_OK; +} + +static HRESULT WINAPI KeyEventSink_OnKeyUp(ITfKeyEventSink *iface, + ITfContext *pic, WPARAM wParam, LPARAM lParam, BOOL *pfEaten) +{ + trace("\n"); + return S_OK; +} + +static HRESULT WINAPI KeyEventSink_OnPreservedKey(ITfKeyEventSink *iface, + ITfContext *pic, REFGUID rguid, BOOL *pfEaten) +{ + trace("\n"); + return S_OK; +} + +static const ITfKeyEventSinkVtbl KeyEventSink_KeyEventSinkVtbl = +{ + KeyEventSink_QueryInterface, + KeyEventSink_AddRef, + KeyEventSink_Release, + + KeyEventSink_OnSetFocus, + KeyEventSink_OnTestKeyDown, + KeyEventSink_OnTestKeyUp, + KeyEventSink_OnKeyDown, + KeyEventSink_OnKeyUp, + KeyEventSink_OnPreservedKey +}; + +HRESULT KeyEventSink_Constructor(ITfKeyEventSink **ppOut) +{ + KeyEventSink *This; + + This = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(KeyEventSink)); + if (This == NULL) + return E_OUTOFMEMORY; + + This->KeyEventSinkVtbl = &KeyEventSink_KeyEventSinkVtbl; + This->refCount = 1; + + *ppOut = (ITfKeyEventSink*)This; + return S_OK; +} + + static void test_KeystrokeMgr(void) { ITfKeystrokeMgr *keymgr= NULL; HRESULT hr; TF_PRESERVEDKEY tfpk; BOOL preserved; + ITfKeyEventSink *sink; + + KeyEventSink_Constructor(&sink); hr = ITfThreadMgr_QueryInterface(g_tm, &IID_ITfKeystrokeMgr, (LPVOID*)&keymgr); ok(SUCCEEDED(hr),"Failed to get IID_ITfKeystrokeMgr for ThreadMgr\n"); @@ -272,6 +399,11 @@ static void test_KeystrokeMgr(void) tfpk.uVKey = 'A'; tfpk.uModifiers = TF_MOD_SHIFT; + test_KEV_OnSetFocus = SINK_EXPECTED; + hr = ITfKeystrokeMgr_AdviseKeyEventSink(keymgr,tid,sink,TRUE); + todo_wine ok(SUCCEEDED(hr),"ITfKeystrokeMgr_AdviseKeyEventSink failed\n"); + todo_wine ok(test_KEV_OnSetFocus == SINK_FIRED, "KeyEventSink_OnSetFocus not fired as expected\n"); + hr =ITfKeystrokeMgr_PreserveKey(keymgr, 0, &CLSID_PreservedKey, &tfpk, NULL, 0); todo_wine ok(hr==E_INVALIDARG,"ITfKeystrokeMgr_PreserveKey inproperly succeeded\n"); @@ -296,7 +428,11 @@ static void test_KeystrokeMgr(void) hr = ITfKeystrokeMgr_UnpreserveKey(keymgr, &CLSID_PreservedKey,&tfpk); todo_wine ok(hr==CONNECT_E_NOCONNECTION,"ITfKeystrokeMgr_UnpreserveKey inproperly succeeded\n"); + hr = ITfKeystrokeMgr_UnadviseKeyEventSink(keymgr,tid); + todo_wine ok(SUCCEEDED(hr),"ITfKeystrokeMgr_UnadviseKeyEventSink failed\n"); + ITfKeystrokeMgr_Release(keymgr); + ITfKeyEventSink_Release(sink); } static void test_Activate(void)

1 0

Huw Davies : ole32: Add a stub for OleCreateFromDataEx.
by Alexandre Julliard 23 Apr '09

23 Apr '09

Module: wine Branch: master Commit: 689c510f6360cda60ad0a915157d31c6fd528f7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=689c510f6360cda60ad0a9151… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Apr 23 14:09:15 2009 +0100 ole32: Add a stub for OleCreateFromDataEx. --- dlls/ole32/ole2impl.c | 18 ++++++++++++++++++ dlls/ole32/ole32.spec | 2 +- include/ole2.h | 3 +++ 3 files changed, 22 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/ole2impl.c b/dlls/ole32/ole2impl.c index da50f4a..e9310ac 100644 --- a/dlls/ole32/ole2impl.c +++ b/dlls/ole32/ole2impl.c @@ -86,6 +86,24 @@ HRESULT WINAPI OleQueryCreateFromData(LPDATAOBJECT pSrcDataObject) } /****************************************************************************** + * OleCreateFromDataEx [OLE32.@] + * + * Creates an embedded object from data transfer object retrieved from + * the clipboard or OLE drag and drop. + */ +HRESULT WINAPI OleCreateFromDataEx(IDataObject *data, REFIID iid, DWORD flags, + DWORD renderopt, ULONG num_fmts, DWORD *adv_flags, FORMATETC *fmts, + IAdviseSink *sink, DWORD *conns, + IOleClientSite *client_site, IStorage *stg, void **obj) +{ + FIXME("(%p, %s, %08x, %08x, %d, %p, %p, %p, %p, %p, %p, %p): stub\n", + data, debugstr_guid(iid), flags, renderopt, num_fmts, adv_flags, fmts, + sink, conns, client_site, stg, obj); + + return E_NOTIMPL; +} + +/****************************************************************************** * OleCreateFromData [OLE32.@] * * Author : Abey George diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index 7d69bd8..b9e5c4c 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -183,7 +183,7 @@ @ stub OleCreateEmbeddingHelper @ stub OleCreateEx @ stdcall OleCreateFromData(ptr ptr long ptr ptr ptr ptr) -@ stub OleCreateFromDataEx +@ stdcall OleCreateFromDataEx(ptr ptr long long long ptr ptr ptr ptr ptr ptr ptr) @ stdcall OleCreateFromFile(ptr ptr ptr long ptr ptr ptr ptr) @ stub OleCreateFromFileEx @ stdcall OleCreateLink(ptr ptr long ptr ptr ptr ptr) diff --git a/include/ole2.h b/include/ole2.h index a92c2f4..cc75afd 100644 --- a/include/ole2.h +++ b/include/ole2.h @@ -122,6 +122,9 @@ HRESULT WINAPI WriteFmtUserTypeStg(LPSTORAGE pstg, CLIPFORMAT cf, LPOLESTR l HRESULT WINAPI OleTranslateAccelerator (LPOLEINPLACEFRAME lpFrame, LPOLEINPLACEFRAMEINFO lpFrameInfo, struct tagMSG* lpmsg); HRESULT WINAPI OleCreateFromData(LPDATAOBJECT pSrcDataObj, REFIID riid, DWORD renderopt, LPFORMATETC pFormatEtc, LPOLECLIENTSITE pClientSite, LPSTORAGE pStg, LPVOID* ppvObj); +HRESULT WINAPI OleCreateFromDataEx(LPDATAOBJECT pSrcDataObj, REFIID riid, DWORD dwFlags, DWORD renderopt, ULONG num_formats, + DWORD *adv_flags, LPFORMATETC fmts, IAdviseSink *sink, DWORD *conns, + LPOLECLIENTSITE pClientSite, LPSTORAGE pStg, LPVOID* ppvObj); HRESULT WINAPI OleCreateDefaultHandler(REFCLSID clsid, LPUNKNOWN pUnkOuter, REFIID riid,

1 0

Huw Davies : ole32: Register a few more clipboard formats and make them have global scope.
by Alexandre Julliard 23 Apr '09

23 Apr '09

Module: wine Branch: master Commit: b133e94b621d652ac20693361dd0038e241e17f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b133e94b621d652ac20693361… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Apr 23 15:04:56 2009 +0100 ole32: Register a few more clipboard formats and make them have global scope. --- dlls/ole32/clipboard.c | 52 +++++++++++++++++++++++++++++------------ dlls/ole32/compobj_private.h | 12 +++++++++ 2 files changed, 49 insertions(+), 15 deletions(-) diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index 92795c6..ec11411 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -196,9 +196,17 @@ static const WCHAR clipbrd_wndclass[] = {'C','L','I','P','B','R','D','W','N','D' static const WCHAR wine_marshal_dataobject[] = {'W','i','n','e',' ','m','a','r','s','h','a','l',' ','d','a','t','a','o','b','j','e','c','t',0}; -static UINT dataobject_clipboard_format; -static UINT ole_priv_data_clipboard_format; -static UINT embed_source_clipboard_format; +UINT ownerlink_clipboard_format = 0; +UINT filename_clipboard_format = 0; +UINT filenameW_clipboard_format = 0; +UINT dataobject_clipboard_format = 0; +UINT embedded_object_clipboard_format = 0; +UINT embed_source_clipboard_format = 0; +UINT custom_link_source_clipboard_format = 0; +UINT link_source_clipboard_format = 0; +UINT object_descriptor_clipboard_format = 0; +UINT link_source_descriptor_clipboard_format = 0; +UINT ole_private_data_clipboard_format = 0; static inline char *dump_fmtetc(FORMATETC *fmt) { @@ -952,7 +960,7 @@ static HRESULT get_priv_data(ole_priv_data **data) *data = NULL; - handle = GetClipboardData( ole_priv_data_clipboard_format ); + handle = GetClipboardData( ole_private_data_clipboard_format ); if(handle) { ole_priv_data *src = GlobalLock(handle); @@ -1358,16 +1366,30 @@ static snapshot *snapshot_construct(DWORD seq_no) */ static void register_clipboard_formats(void) { - static const WCHAR DataObjectW[] = { 'D','a','t','a','O','b','j','e','c','t',0 }; - static const WCHAR OlePrivateDataW[] = { 'O','l','e',' ','P','r','i','v','a','t','e',' ','D','a','t','a',0 }; - static const WCHAR EmbedSourceW[] = { 'E','m','b','e','d',' ','S','o','u','r','c','e',0 }; - - if(!dataobject_clipboard_format) - dataobject_clipboard_format = RegisterClipboardFormatW(DataObjectW); - if(!ole_priv_data_clipboard_format) - ole_priv_data_clipboard_format = RegisterClipboardFormatW(OlePrivateDataW); - if(!embed_source_clipboard_format) - embed_source_clipboard_format = RegisterClipboardFormatW(EmbedSourceW); + static const WCHAR OwnerLink[] = {'O','w','n','e','r','L','i','n','k',0}; + static const WCHAR FileName[] = {'F','i','l','e','N','a','m','e',0}; + static const WCHAR FileNameW[] = {'F','i','l','e','N','a','m','e','W',0}; + static const WCHAR DataObject[] = {'D','a','t','a','O','b','j','e','c','t',0}; + static const WCHAR EmbeddedObject[] = {'E','m','b','e','d','d','e','d',' ','O','b','j','e','c','t',0}; + static const WCHAR EmbedSource[] = {'E','m','b','e','d',' ','S','o','u','r','c','e',0}; + static const WCHAR CustomLinkSource[] = {'C','u','s','t','o','m',' ','L','i','n','k',' ','S','o','u','r','c','e',0}; + static const WCHAR LinkSource[] = {'L','i','n','k',' ','S','o','u','r','c','e',0}; + static const WCHAR ObjectDescriptor[] = {'O','b','j','e','c','t',' ','D','e','s','c','r','i','p','t','o','r',0}; + static const WCHAR LinkSourceDescriptor[] = {'L','i','n','k',' ','S','o','u','r','c','e',' ', + 'D','e','s','c','r','i','p','t','o','r',0}; + static const WCHAR OlePrivateData[] = {'O','l','e',' ','P','r','i','v','a','t','e',' ','D','a','t','a',0}; + + ownerlink_clipboard_format = RegisterClipboardFormatW(OwnerLink); + filename_clipboard_format = RegisterClipboardFormatW(FileName); + filenameW_clipboard_format = RegisterClipboardFormatW(FileNameW); + dataobject_clipboard_format = RegisterClipboardFormatW(DataObject); + embedded_object_clipboard_format = RegisterClipboardFormatW(EmbeddedObject); + embed_source_clipboard_format = RegisterClipboardFormatW(EmbedSource); + custom_link_source_clipboard_format = RegisterClipboardFormatW(CustomLinkSource); + link_source_clipboard_format = RegisterClipboardFormatW(LinkSource); + object_descriptor_clipboard_format = RegisterClipboardFormatW(ObjectDescriptor); + link_source_descriptor_clipboard_format = RegisterClipboardFormatW(LinkSourceDescriptor); + ole_private_data_clipboard_format = RegisterClipboardFormatW(OlePrivateData); } /*********************************************************************** @@ -1524,7 +1546,7 @@ static HRESULT set_clipboard_formats(ole_clipbrd *clipbrd, IDataObject *data) td_offs_to_ptr(clipbrd->cached_enum, (DWORD_PTR)clipbrd->cached_enum->entries[idx].fmtetc.ptd); GlobalUnlock(priv_data_handle); - SetClipboardData(ole_priv_data_clipboard_format, priv_data_handle); + SetClipboardData(ole_private_data_clipboard_format, priv_data_handle); return S_OK; } diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index 65d459f..a7c6dfa 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -319,4 +319,16 @@ extern HRESULT WINAPI OLE32_DllUnregisterServer(void) DECLSPEC_HIDDEN; HRESULT DataAdviseHolder_OnConnect(IDataAdviseHolder *iface, IDataObject *pDelegate); void DataAdviseHolder_OnDisconnect(IDataAdviseHolder *iface); +extern UINT ownerlink_clipboard_format; +extern UINT filename_clipboard_format; +extern UINT filenameW_clipboard_format; +extern UINT dataobject_clipboard_format; +extern UINT embedded_object_clipboard_format; +extern UINT embed_source_clipboard_format; +extern UINT custom_link_source_clipboard_format; +extern UINT link_source_clipboard_format; +extern UINT object_descriptor_clipboard_format; +extern UINT link_source_descriptor_clipboard_format; +extern UINT ole_private_data_clipboard_format; + #endif /* __WINE_OLE_COMPOBJ_H */

1 0

Huw Davies : ole32: Rewrite OleQueryCreateFromData so it compares clipboard format ids rather than strings and be sure to free the enumerator .
by Alexandre Julliard 23 Apr '09

23 Apr '09

Module: wine Branch: master Commit: 211268a74e739b5902be4246be2402a96a4afe82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=211268a74e739b5902be4246b… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Apr 23 11:52:22 2009 +0100 ole32: Rewrite OleQueryCreateFromData so it compares clipboard format ids rather than strings and be sure to free the enumerator. --- dlls/ole32/ole2impl.c | 69 ++++++++++++++++++++++++------------------------- 1 files changed, 34 insertions(+), 35 deletions(-) diff --git a/dlls/ole32/ole2impl.c b/dlls/ole32/ole2impl.c index e9310ac..f7da399 100644 --- a/dlls/ole32/ole2impl.c +++ b/dlls/ole32/ole2impl.c @@ -32,6 +32,7 @@ #include "wine/debug.h" #include "ole2.h" #include "olestd.h" +#include "compobj_private.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); @@ -40,7 +41,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); /****************************************************************************** * OleQueryCreateFromData [OLE32.@] * - * Author : Abey George * Checks whether an object can become an embedded object. * the clipboard or OLE drag and drop. * Returns : S_OK - Format that supports Embedded object creation are present. @@ -48,41 +48,40 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); * S_FALSE - No acceptable format is available. */ -HRESULT WINAPI OleQueryCreateFromData(LPDATAOBJECT pSrcDataObject) +HRESULT WINAPI OleQueryCreateFromData(IDataObject *data) { - IEnumFORMATETC *pfmt; - FORMATETC fmt; - CHAR szFmtName[MAX_CLIPFORMAT_NAME]; - BOOL bFoundStatic = FALSE; - - HRESULT hr = IDataObject_EnumFormatEtc(pSrcDataObject, DATADIR_GET, &pfmt); - - if (hr == S_OK) - hr = IEnumFORMATETC_Next(pfmt, 1, &fmt, NULL); - - while (hr == S_OK) - { - GetClipboardFormatNameA(fmt.cfFormat, szFmtName, MAX_CLIPFORMAT_NAME-1); + IEnumFORMATETC *enum_fmt; + FORMATETC fmt; + BOOL found_static = FALSE; + HRESULT hr; - /* first, Check for Embedded Object, Embed Source or Filename */ + hr = IDataObject_EnumFormatEtc(data, DATADIR_GET, &enum_fmt); - if (!strcmp(szFmtName, CF_EMBEDDEDOBJECT) || !strcmp(szFmtName, CF_EMBEDSOURCE) || !strcmp(szFmtName, CF_FILENAME)) - return S_OK; + if(FAILED(hr)) return hr; - /* Check for Metafile, Bitmap or DIB */ - - if (fmt.cfFormat == CF_METAFILEPICT || fmt.cfFormat == CF_BITMAP || fmt.cfFormat == CF_DIB) - bFoundStatic = TRUE; - - hr = IEnumFORMATETC_Next(pfmt, 1, &fmt, NULL); - } + do + { + hr = IEnumFORMATETC_Next(enum_fmt, 1, &fmt, NULL); + if(hr == S_OK) + { + if(fmt.cfFormat == embedded_object_clipboard_format || + fmt.cfFormat == embed_source_clipboard_format || + fmt.cfFormat == filename_clipboard_format) + { + IEnumFORMATETC_Release(enum_fmt); + return S_OK; + } - /* Found a static format, but no embed format */ + if(fmt.cfFormat == CF_METAFILEPICT || + fmt.cfFormat == CF_BITMAP || + fmt.cfFormat == CF_DIB) + found_static = TRUE; + } + } while (hr == S_OK); - if (bFoundStatic) - return OLE_S_STATIC; + IEnumFORMATETC_Release(enum_fmt); - return S_FALSE; + return found_static ? OLE_S_STATIC : S_FALSE; } /******************************************************************************

1 0

Francois Gouget : wined3d: Avoid using an implicit value to set fogcoord to 0.0.
by Alexandre Julliard 23 Apr '09

23 Apr '09

Module: wine Branch: master Commit: 637694126667a251827439f6405a1c494412af0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=637694126667a251827439f64… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Apr 23 16:03:12 2009 +0200 wined3d: Avoid using an implicit value to set fogcoord to 0.0. --- dlls/wined3d/arb_program_shader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 1db1e46..fc3417c 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -2125,7 +2125,7 @@ static GLuint shader_arb_generate_vshader(IWineD3DVertexShader *iface, SHADER_BU if(args->fog_src == VS_FOG_Z) { shader_addline(buffer, "MOV result.fogcoord, TMP_OUT.z;\n"); } else if (!reg_maps->fog) { - shader_addline(buffer, "MOV result.fogcoord, 0.0;\n"); + shader_addline(buffer, "MOV result.fogcoord, helper_const.w;\n"); } /* Write the final position.

1 0

Paul Vriens : gdi32/tests: Fix a test failure on NT4.
by Alexandre Julliard 23 Apr '09

23 Apr '09

Module: wine Branch: master Commit: 05c50725db22d15a758cfd7c8152d1d6fdfd61e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05c50725db22d15a758cfd7c8… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Apr 23 16:07:25 2009 +0200 gdi32/tests: Fix a test failure on NT4. --- dlls/gdi32/tests/mapping.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/tests/mapping.c b/dlls/gdi32/tests/mapping.c index ffb92cb..0342817 100644 --- a/dlls/gdi32/tests/mapping.c +++ b/dlls/gdi32/tests/mapping.c @@ -161,7 +161,9 @@ static void test_world_transform(void) xform.eDx = 0.0f; xform.eDy = 0.0f; ret = SetWorldTransform(hdc, &xform); - ok(!ret, "SetWorldTransform should fail with an invalid xform\n"); + ok(!ret || + broken(ret), /* NT4 */ + "SetWorldTransform should fail with an invalid xform\n"); xform.eM11 = 20.0f; xform.eM12 = 0.0f;

1 0

Paul Vriens : shell32/tests: Fix a test failure on Win95 and NT4.
by Alexandre Julliard 23 Apr '09

23 Apr '09

Module: wine Branch: master Commit: 0a42190c8e2754e9a6224898796f3d374398ee2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a42190c8e2754e9a62248987… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Apr 23 16:21:46 2009 +0200 shell32/tests: Fix a test failure on Win95 and NT4. --- dlls/shell32/tests/shlfolder.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 72c4034..6a32ccf 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -609,7 +609,8 @@ static void test_CallForAttributes(void) hr = IShellFolder_ParseDisplayName(psfDesktop, NULL, NULL, wszMyDocuments, NULL, &pidlMyDocuments, NULL); - ok (SUCCEEDED(hr), + ok (SUCCEEDED(hr) || + broken(hr == E_INVALIDARG), /* Win95, NT4 */ "Desktop's ParseDisplayName failed to parse MyDocuments's CLSID! hr = %08x\n", hr); if (FAILED(hr)) { IShellFolder_Release(psfDesktop);

1 0

Paul Vriens : shell32/tests: Fix some test failures on NT4.
by Alexandre Julliard 23 Apr '09

23 Apr '09

Module: wine Branch: master Commit: 9ae14c8e3ae9f7d4fa8c9cac804ffcb2056fb15f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ae14c8e3ae9f7d4fa8c9cac8… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Apr 22 17:07:45 2009 +0200 shell32/tests: Fix some test failures on NT4. --- dlls/shell32/tests/shlfileop.c | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index ff060ba..540fd0d 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -2063,21 +2063,27 @@ static void test_sh_new_link_info(void) set_curr_dir_path(linkto, "nosuchfile.txt\0"); set_curr_dir_path(destdir, "testdir2\0"); ret = SHGetNewLinkInfoA(linkto, destdir, result, &mustcopy, 0); - ok(ret == FALSE, "SHGetNewLinkInfoA succeeded\n"); + ok(ret == FALSE || + broken(ret == lstrlenA(result) + 1), /* NT4 */ + "SHGetNewLinkInfoA succeeded\n"); ok(mustcopy == FALSE, "mustcopy should be FALSE\n"); /* dest dir does not exist */ set_curr_dir_path(linkto, "test1.txt\0"); set_curr_dir_path(destdir, "nosuchdir\0"); ret = SHGetNewLinkInfoA(linkto, destdir, result, &mustcopy, 0); - ok(ret == TRUE, "SHGetNewLinkInfoA failed, err=%i\n", GetLastError()); + ok(ret == TRUE || + broken(ret == lstrlenA(result) + 1), /* NT4 */ + "SHGetNewLinkInfoA failed, err=%i\n", GetLastError()); ok(mustcopy == FALSE, "mustcopy should be FALSE\n"); /* source file exists */ set_curr_dir_path(linkto, "test1.txt\0"); set_curr_dir_path(destdir, "testdir2\0"); ret = SHGetNewLinkInfoA(linkto, destdir, result, &mustcopy, 0); - ok(ret == TRUE, "SHGetNewLinkInfoA failed, err=%i\n", GetLastError()); + ok(ret == TRUE || + broken(ret == lstrlenA(result) + 1), /* NT4 */ + "SHGetNewLinkInfoA failed, err=%i\n", GetLastError()); ok(mustcopy == FALSE, "mustcopy should be FALSE\n"); ok(CompareStringA(LOCALE_SYSTEM_DEFAULT, NORM_IGNORECASE, destdir, lstrlenA(destdir), result, lstrlenA(destdir)) == CSTR_EQUAL, @@ -2088,7 +2094,9 @@ static void test_sh_new_link_info(void) /* preferred target name already exists */ createTestFile(result); ret = SHGetNewLinkInfoA(linkto, destdir, result2, &mustcopy, 0); - ok(ret == TRUE, "SHGetNewLinkInfoA failed, err=%i\n", GetLastError()); + ok(ret == TRUE || + broken(ret == lstrlenA(result2) + 1), /* NT4 */ + "SHGetNewLinkInfoA failed, err=%i\n", GetLastError()); ok(mustcopy == FALSE, "mustcopy should be FALSE\n"); ok(CompareStringA(LOCALE_SYSTEM_DEFAULT, NORM_IGNORECASE, destdir, lstrlenA(destdir), result2, lstrlenA(destdir)) == CSTR_EQUAL,

1 0

Aric Stewart : msctf: Add ITfKeystrokeMgr framework to ThreadMgr.
by Alexandre Julliard 23 Apr '09

23 Apr '09

Module: wine Branch: master Commit: 987387c7c8c88095e1b45d0dc4ce99fecf0c2912 URL: http://source.winehq.org/git/wine.git/?a=commit;h=987387c7c8c88095e1b45d0dc… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Apr 22 12:37:43 2009 -0500 msctf: Add ITfKeystrokeMgr framework to ThreadMgr. --- dlls/msctf/threadmgr.c | 168 ++++++++++++++++++++++++++++++++++++++++++++++++ include/msctf.idl | 82 +++++++++++++++++++++++ 2 files changed, 250 insertions(+), 0 deletions(-) diff --git a/dlls/msctf/threadmgr.c b/dlls/msctf/threadmgr.c index f6f9be4..2d43a19 100644 --- a/dlls/msctf/threadmgr.c +++ b/dlls/msctf/threadmgr.c @@ -59,6 +59,7 @@ typedef struct tagThreadMgrSink { typedef struct tagACLMulti { const ITfThreadMgrVtbl *ThreadMgrVtbl; const ITfSourceVtbl *SourceVtbl; + const ITfKeystrokeMgrVtbl *KeystrokeMgrVtbl; LONG refCount; const ITfThreadMgrEventSinkVtbl *ThreadMgrEventSinkVtbl; /* internal */ @@ -79,6 +80,11 @@ static inline ThreadMgr *impl_from_ITfSourceVtbl(ITfSource *iface) return (ThreadMgr *)((char *)iface - FIELD_OFFSET(ThreadMgr,SourceVtbl)); } +static inline ThreadMgr *impl_from_ITfKeystrokeMgrVtbl(ITfKeystrokeMgr *iface) +{ + return (ThreadMgr *)((char *)iface - FIELD_OFFSET(ThreadMgr,KeystrokeMgrVtbl)); +} + static inline ThreadMgr *impl_from_ITfThreadMgrEventSink(ITfThreadMgrEventSink *iface) { return (ThreadMgr *)((char *)iface - FIELD_OFFSET(ThreadMgr,ThreadMgrEventSinkVtbl)); @@ -153,6 +159,10 @@ static HRESULT WINAPI ThreadMgr_QueryInterface(ITfThreadMgr *iface, REFIID iid, { *ppvOut = &This->SourceVtbl; } + else if (IsEqualIID(iid, &IID_ITfKeystrokeMgr)) + { + *ppvOut = &This->KeystrokeMgrVtbl; + } if (*ppvOut) { @@ -409,6 +419,163 @@ static const ITfSourceVtbl ThreadMgr_SourceVtbl = }; /***************************************************** + * ITfKeystrokeMgr functions + *****************************************************/ + +static HRESULT WINAPI KeystrokeMgr_QueryInterface(ITfKeystrokeMgr *iface, REFIID iid, LPVOID *ppvOut) +{ + ThreadMgr *This = impl_from_ITfKeystrokeMgrVtbl(iface); + return ThreadMgr_QueryInterface((ITfThreadMgr *)This, iid, *ppvOut); +} + +static ULONG WINAPI KeystrokeMgr_AddRef(ITfKeystrokeMgr *iface) +{ + ThreadMgr *This = impl_from_ITfKeystrokeMgrVtbl(iface); + return ThreadMgr_AddRef((ITfThreadMgr*)This); +} + +static ULONG WINAPI KeystrokeMgr_Release(ITfKeystrokeMgr *iface) +{ + ThreadMgr *This = impl_from_ITfKeystrokeMgrVtbl(iface); + return ThreadMgr_Release((ITfThreadMgr *)This); +} + +static HRESULT WINAPI KeystrokeMgr_AdviseKeyEventSink(ITfKeystrokeMgr *iface, + TfClientId tid, ITfKeyEventSink *pSink, BOOL fForeground) +{ + ThreadMgr *This = impl_from_ITfKeystrokeMgrVtbl(iface); + FIXME("STUB:(%p)\n",This); + return E_NOTIMPL; +} + +static HRESULT WINAPI KeystrokeMgr_UnadviseKeyEventSink(ITfKeystrokeMgr *iface, + TfClientId tid) +{ + ThreadMgr *This = impl_from_ITfKeystrokeMgrVtbl(iface); + FIXME("STUB:(%p)\n",This); + return E_NOTIMPL; +} + +static HRESULT WINAPI KeystrokeMgr_GetForeground(ITfKeystrokeMgr *iface, + CLSID *pclsid) +{ + ThreadMgr *This = impl_from_ITfKeystrokeMgrVtbl(iface); + FIXME("STUB:(%p)\n",This); + return E_NOTIMPL; +} + +static HRESULT WINAPI KeystrokeMgr_TestKeyDown(ITfKeystrokeMgr *iface, + WPARAM wParam, LPARAM lParam, BOOL *pfEaten) +{ + ThreadMgr *This = impl_from_ITfKeystrokeMgrVtbl(iface); + FIXME("STUB:(%p)\n",This); + return E_NOTIMPL; +} + +static HRESULT WINAPI KeystrokeMgr_TestKeyUp(ITfKeystrokeMgr *iface, + WPARAM wParam, LPARAM lParam, BOOL *pfEaten) +{ + ThreadMgr *This = impl_from_ITfKeystrokeMgrVtbl(iface); + FIXME("STUB:(%p)\n",This); + return E_NOTIMPL; +} + +static HRESULT WINAPI KeystrokeMgr_KeyDown(ITfKeystrokeMgr *iface, + WPARAM wParam, LPARAM lParam, BOOL *pfEaten) +{ + ThreadMgr *This = impl_from_ITfKeystrokeMgrVtbl(iface); + FIXME("STUB:(%p)\n",This); + return E_NOTIMPL; +} + +static HRESULT WINAPI KeystrokeMgr_KeyUp(ITfKeystrokeMgr *iface, + WPARAM wParam, LPARAM lParam, BOOL *pfEaten) +{ + ThreadMgr *This = impl_from_ITfKeystrokeMgrVtbl(iface); + FIXME("STUB:(%p)\n",This); + return E_NOTIMPL; +} + +static HRESULT WINAPI KeystrokeMgr_GetPreservedKey(ITfKeystrokeMgr *iface, + ITfContext *pic, const TF_PRESERVEDKEY *pprekey, GUID *pguid) +{ + ThreadMgr *This = impl_from_ITfKeystrokeMgrVtbl(iface); + FIXME("STUB:(%p)\n",This); + return E_NOTIMPL; +} + +static HRESULT WINAPI KeystrokeMgr_IsPreservedKey(ITfKeystrokeMgr *iface, + REFGUID rguid, const TF_PRESERVEDKEY *pprekey, BOOL *pfRegistered) +{ + ThreadMgr *This = impl_from_ITfKeystrokeMgrVtbl(iface); + FIXME("STUB:(%p)\n",This); + return E_NOTIMPL; +} + +static HRESULT WINAPI KeystrokeMgr_PreserveKey(ITfKeystrokeMgr *iface, + TfClientId tid, REFGUID rguid, const TF_PRESERVEDKEY *prekey, + const WCHAR *pchDesc, ULONG cchDesc) +{ + ThreadMgr *This = impl_from_ITfKeystrokeMgrVtbl(iface); + FIXME("STUB:(%p)\n",This); + return E_NOTIMPL; +} + +static HRESULT WINAPI KeystrokeMgr_UnpreserveKey(ITfKeystrokeMgr *iface, + REFGUID rguid, const TF_PRESERVEDKEY *pprekey) +{ + ThreadMgr *This = impl_from_ITfKeystrokeMgrVtbl(iface); + FIXME("STUB:(%p)\n",This); + return E_NOTIMPL; +} + +static HRESULT WINAPI KeystrokeMgr_SetPreservedKeyDescription(ITfKeystrokeMgr *iface, + REFGUID rguid, const WCHAR *pchDesc, ULONG cchDesc) +{ + ThreadMgr *This = impl_from_ITfKeystrokeMgrVtbl(iface); + FIXME("STUB:(%p)\n",This); + return E_NOTIMPL; +} + +static HRESULT WINAPI KeystrokeMgr_GetPreservedKeyDescription(ITfKeystrokeMgr *iface, + REFGUID rguid, BSTR *pbstrDesc) +{ + ThreadMgr *This = impl_from_ITfKeystrokeMgrVtbl(iface); + FIXME("STUB:(%p)\n",This); + return E_NOTIMPL; +} + +static HRESULT WINAPI KeystrokeMgr_SimulatePreservedKey(ITfKeystrokeMgr *iface, + ITfContext *pic, REFGUID rguid, BOOL *pfEaten) +{ + ThreadMgr *This = impl_from_ITfKeystrokeMgrVtbl(iface); + FIXME("STUB:(%p)\n",This); + return E_NOTIMPL; +} + +static const ITfKeystrokeMgrVtbl ThreadMgr_KeystrokeMgrVtbl = +{ + KeystrokeMgr_QueryInterface, + KeystrokeMgr_AddRef, + KeystrokeMgr_Release, + + KeystrokeMgr_AdviseKeyEventSink, + KeystrokeMgr_UnadviseKeyEventSink, + KeystrokeMgr_GetForeground, + KeystrokeMgr_TestKeyDown, + KeystrokeMgr_TestKeyUp, + KeystrokeMgr_KeyDown, + KeystrokeMgr_KeyUp, + KeystrokeMgr_GetPreservedKey, + KeystrokeMgr_IsPreservedKey, + KeystrokeMgr_PreserveKey, + KeystrokeMgr_UnpreserveKey, + KeystrokeMgr_SetPreservedKeyDescription, + KeystrokeMgr_GetPreservedKeyDescription, + KeystrokeMgr_SimulatePreservedKey +}; + +/***************************************************** * ITfThreadMgrEventSink functions (internal) *****************************************************/ static HRESULT WINAPI ThreadMgrEventSink_QueryInterface(ITfThreadMgrEventSink *iface, REFIID iid, LPVOID *ppvOut) @@ -550,6 +717,7 @@ HRESULT ThreadMgr_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) This->ThreadMgrVtbl= &ThreadMgr_ThreadMgrVtbl; This->SourceVtbl = &ThreadMgr_SourceVtbl; + This->KeystrokeMgrVtbl= &ThreadMgr_KeystrokeMgrVtbl; This->ThreadMgrEventSinkVtbl = &ThreadMgr_ThreadMgrEventSinkVtbl; This->refCount = 1; TlsSetValue(tlsIndex,This); diff --git a/include/msctf.idl b/include/msctf.idl index c81c0da..a0708ab 100644 --- a/include/msctf.idl +++ b/include/msctf.idl @@ -56,6 +56,7 @@ interface ITfRangeBackup; interface IEnumTfLanguageProfiles; interface ITfEditRecord; interface ITfCompositionView; +interface ITfKeyEventSink; typedef [uuid(e1b5808d-1e46-4c19-84dc-68c5f5978cc8)] struct TF_LANGUAGEPROFILE { @@ -66,6 +67,12 @@ typedef [uuid(e1b5808d-1e46-4c19-84dc-68c5f5978cc8)] struct TF_LANGUAGEPROFILE GUID guidProfile; } TF_LANGUAGEPROFILE; +typedef [uuid(77c12f95-b783-450d-879f-1cd2362c6521)] struct TF_PRESERVEDKEY +{ + UINT uVKey; + UINT uModifiers; +} TF_PRESERVEDKEY; + [ object, uuid(aa80e801-2021-11d2-93e0-0060b067b86e), @@ -510,3 +517,78 @@ interface ITfThreadMgrEventSink : IUnknown HRESULT OnPopContext( [in] ITfContext *pic); }; + +[ + object, + local, + uuid(aa80e7f0-2021-11d2-93e0-0060b067b86e), + pointer_default(unique) +] +interface ITfKeystrokeMgr : IUnknown +{ + HRESULT AdviseKeyEventSink( + [in] TfClientId tid, + [in] ITfKeyEventSink *pSink, + [in] BOOL fForeground); + + HRESULT UnadviseKeyEventSink( + [in] TfClientId tid); + + HRESULT GetForeground( + [out] CLSID *pclsid); + + HRESULT TestKeyDown( + [in] WPARAM wParam, + [in] LPARAM lParam, + [out] BOOL *pfEaten); + + HRESULT TestKeyUp( + [in] WPARAM wParam, + [in] LPARAM lParam, + [out] BOOL *pfEaten); + + HRESULT KeyDown( + [in] WPARAM wParam, + [in] LPARAM lParam, + [out] BOOL *pfEaten); + + HRESULT KeyUp( + [in] WPARAM wParam, + [in] LPARAM lParam, + [out] BOOL *pfEaten); + + HRESULT GetPreservedKey( + [in] ITfContext *pic, + [in] const TF_PRESERVEDKEY *pprekey, + [out] GUID *pguid); + + HRESULT IsPreservedKey( + [in] REFGUID rguid, + [in] const TF_PRESERVEDKEY *pprekey, + [out] BOOL *pfRegistered); + + HRESULT PreserveKey( + [in] TfClientId tid, + [in] REFGUID rguid, + [in] const TF_PRESERVEDKEY *prekey, + [in, size_is(cchDesc)] const WCHAR *pchDesc, + [in] ULONG cchDesc); + + HRESULT UnpreserveKey( + [in] REFGUID rguid, + [in] const TF_PRESERVEDKEY *pprekey); + + HRESULT SetPreservedKeyDescription( + [in] REFGUID rguid, + [in, size_is(cchDesc)] const WCHAR *pchDesc, + [in] ULONG cchDesc); + + HRESULT GetPreservedKeyDescription( + [in] REFGUID rguid, + [out] BSTR *pbstrDesc); + + HRESULT SimulatePreservedKey( + [in] ITfContext *pic, + [in] REFGUID rguid, + [out] BOOL *pfEaten); +};

1 0

Aric Stewart : msctf: Define ITfKeyEventSink.
by Alexandre Julliard 23 Apr '09

23 Apr '09

Module: wine Branch: master Commit: 0730d4ae24cb9d68bdb305c341753d68856a4607 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0730d4ae24cb9d68bdb305c34… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Apr 22 12:37:45 2009 -0500 msctf: Define ITfKeyEventSink. --- include/msctf.idl | 41 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 41 insertions(+), 0 deletions(-) diff --git a/include/msctf.idl b/include/msctf.idl index a0708ab..4c0d486 100644 --- a/include/msctf.idl +++ b/include/msctf.idl @@ -592,3 +592,44 @@ interface ITfKeystrokeMgr : IUnknown [in] REFGUID rguid, [out] BOOL *pfEaten); }; + +[ + object, + local, + uuid(aa80e7f5-2021-11d2-93e0-0060b067b86e), + pointer_default(unique) +] +interface ITfKeyEventSink : IUnknown +{ + HRESULT OnSetFocus( + [in] BOOL fForeground); + + HRESULT OnTestKeyDown( + [in] ITfContext *pic, + [in] WPARAM wParam, + [in] LPARAM lParam, + [out] BOOL *pfEaten); + + HRESULT OnTestKeyUp( + [in] ITfContext *pic, + [in] WPARAM wParam, + [in] LPARAM lParam, + [out] BOOL *pfEaten); + + HRESULT OnKeyDown( + [in] ITfContext *pic, + [in] WPARAM wParam, + [in] LPARAM lParam, + [out] BOOL *pfEaten); + + HRESULT OnKeyUp( + [in] ITfContext *pic, + [in] WPARAM wParam, + [in] LPARAM lParam, + [out] BOOL *pfEaten); + + HRESULT OnPreservedKey( + [in] ITfContext *pic, + [in] REFGUID rguid, + [out] BOOL *pfEaten); +};

1 0