February 2009 - Wine-commits

Dylan Smith : richedit: Simplified the character length delete protection.
by Alexandre Julliard 06 Feb '09

06 Feb '09

Module: wine Branch: master Commit: a490e155dcec13903a04a4c7122d6149e949e1bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=a490e155dcec13903a04a4c71… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Fri Feb 6 01:09:30 2009 -0500 richedit: Simplified the character length delete protection. The value for nMaxChars can be found easier by using ME_GetTextLength. --- dlls/riched20/caret.c | 10 ++-------- 1 files changed, 2 insertions(+), 8 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index cdd8f79..7bdd0a7 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -273,14 +273,8 @@ BOOL ME_InternalDeleteText(ME_TextEditor *editor, int nOfs, int nChars, int totalChars = nChars; ME_DisplayItem *start_para; - { - /* Prevent deletion past last end of paragraph run. */ - ME_DisplayItem *pTextEnd = editor->pBuffer->pLast; - int nMaxChars = pTextEnd->member.para.prev_para->member.para.nCharOfs; - nMaxChars += ME_FindItemBack(pTextEnd, diRun)->member.run.nCharOfs; - nMaxChars -= nOfs; - nChars = min(nChars, nMaxChars); - } + /* Prevent deletion past last end of paragraph run. */ + nChars = min(nChars, ME_GetTextLength(editor) - nOfs); ME_CursorFromCharOfs(editor, nOfs, &c); start_para = ME_GetParagraph(c.pRun);

1 0

Juan Lang : crypt32: Fix some test failures on older versions of Windows.
by Alexandre Julliard 06 Feb '09

06 Feb '09

Module: wine Branch: master Commit: 1f3fd357dbd9c12a8ac45ee54ed63fe3da6cf4da URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f3fd357dbd9c12a8ac45ee54… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Feb 5 10:12:55 2009 -0800 crypt32: Fix some test failures on older versions of Windows. --- dlls/crypt32/tests/chain.c | 29 ++++++++++++++++++++++++----- 1 files changed, 24 insertions(+), 5 deletions(-) diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index 34dfb6a..aabea27 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -1515,21 +1515,32 @@ static ChainCheck chainCheck[] = { { { CERT_TRUST_IS_NOT_TIME_NESTED, CERT_TRUST_HAS_PREFERRED_ISSUER }, { CERT_TRUST_IS_UNTRUSTED_ROOT | CERT_TRUST_IS_NOT_TIME_VALID, 0 }, 1, simpleStatus2 }, 0 }, + /* Earlier versions of Windows incorrectly don't set + * CERT_TRUST_INVALID_BASIC_CONSTRAINTS on this chain. + */ { { sizeof(chain3) / sizeof(chain3[0]), chain3 }, - { { CERT_TRUST_IS_NOT_TIME_NESTED, CERT_TRUST_HAS_PREFERRED_ISSUER }, + { { CERT_TRUST_IS_NOT_TIME_NESTED | CERT_TRUST_INVALID_BASIC_CONSTRAINTS, + CERT_TRUST_HAS_PREFERRED_ISSUER }, { CERT_TRUST_INVALID_BASIC_CONSTRAINTS | CERT_TRUST_IS_UNTRUSTED_ROOT | CERT_TRUST_IS_NOT_TIME_VALID, 0 }, 1, simpleStatus3 }, 0 }, + /* Earlier versions of Windows incorrectly don't set + * CERT_TRUST_INVALID_BASIC_CONSTRAINTS on this chain. + */ { { sizeof(chain4) / sizeof(chain4[0]), chain4 }, - { { CERT_TRUST_IS_NOT_TIME_NESTED, CERT_TRUST_HAS_PREFERRED_ISSUER }, + { { CERT_TRUST_IS_NOT_TIME_NESTED | CERT_TRUST_INVALID_BASIC_CONSTRAINTS, + CERT_TRUST_HAS_PREFERRED_ISSUER }, { CERT_TRUST_INVALID_BASIC_CONSTRAINTS | CERT_TRUST_IS_UNTRUSTED_ROOT | CERT_TRUST_IS_NOT_TIME_VALID, 0 }, 1, simpleStatus4 }, 0 }, /* Windows versions prior to Vista/2008 incorrectly set * CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT on this chain, so ignore it. + * Similarly, some older versions of Windows incorrectly set + * CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT, ignore that too. */ { { sizeof(chain5) / sizeof(chain5[0]), chain5 }, - { { CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT, + { { CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT | + CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT, CERT_TRUST_HAS_PREFERRED_ISSUER }, { CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT | CERT_TRUST_IS_UNTRUSTED_ROOT, 0 }, 1, simpleStatus5 }, 0 }, @@ -1539,14 +1550,22 @@ static ChainCheck chainCheck[] = { { { sizeof(chain7) / sizeof(chain7[0]), chain7 }, { { 0, CERT_TRUST_HAS_PREFERRED_ISSUER }, { CERT_TRUST_IS_UNTRUSTED_ROOT, 0 }, 1, simpleStatus7 }, 0 }, + /* Earlier versions of Windows incorrectly don't set + * CERT_TRUST_INVALID_BASIC_CONSTRAINTS on this chain. + */ { { sizeof(chain8) / sizeof(chain8[0]), chain8 }, - { { CERT_TRUST_IS_NOT_TIME_NESTED, CERT_TRUST_HAS_PREFERRED_ISSUER }, + { { CERT_TRUST_IS_NOT_TIME_NESTED | CERT_TRUST_INVALID_BASIC_CONSTRAINTS, + CERT_TRUST_HAS_PREFERRED_ISSUER }, { CERT_TRUST_INVALID_BASIC_CONSTRAINTS | CERT_TRUST_IS_UNTRUSTED_ROOT | CERT_TRUST_IS_NOT_TIME_VALID, 0 }, 1, simpleStatus8 }, TODO_ERROR }, + /* Earlier versions of Windows incorrectly don't set + * CERT_TRUST_INVALID_BASIC_CONSTRAINTS on this chain. + */ { { sizeof(chain9) / sizeof(chain9[0]), chain9 }, - { { CERT_TRUST_IS_NOT_TIME_NESTED, CERT_TRUST_HAS_PREFERRED_ISSUER }, + { { CERT_TRUST_IS_NOT_TIME_NESTED | CERT_TRUST_INVALID_BASIC_CONSTRAINTS, + CERT_TRUST_HAS_PREFERRED_ISSUER }, { CERT_TRUST_IS_PARTIAL_CHAIN | CERT_TRUST_INVALID_BASIC_CONSTRAINTS | CERT_TRUST_IS_CYCLIC, 0 }, 1, simpleStatus9 },

1 0

Aric Stewart : msctf: Define ITfContextOwnerCompositionSink. This is implemented by a tsf aware application.
by Alexandre Julliard 06 Feb '09

06 Feb '09

Module: wine Branch: master Commit: 1adb1d8aeaf50283f9fa69d08027f0df8ff0bd02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1adb1d8aeaf50283f9fa69d08… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Feb 5 14:17:50 2009 -0600 msctf: Define ITfContextOwnerCompositionSink. This is implemented by a tsf aware application. --- include/msctf.idl | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/include/msctf.idl b/include/msctf.idl index 47bec71..49fa875 100644 --- a/include/msctf.idl +++ b/include/msctf.idl @@ -49,6 +49,7 @@ interface IEnumTfProperties; interface ITfRangeBackup; interface IEnumTfLanguageProfiles; interface ITfEditRecord; +interface ITfCompositionView; [ object, @@ -415,3 +416,22 @@ interface ITfTextEditSink : IUnknown [in] TfEditCookie ecReadOnly, [in] ITfEditRecord *pEditRecord); }; + +[ + object, + uuid(5F20AA40-B57A-4F34-96AB-3576F377CC79), + pointer_default(unique) +] +interface ITfContextOwnerCompositionSink : IUnknown +{ + HRESULT OnStartComposition( + [in] ITfCompositionView *pComposition, + [out] BOOL *pfOk); + + HRESULT OnUpdateComposition( + [in] ITfCompositionView *pComposition, + [in] ITfRange *pRangeNew); + + HRESULT OnEndComposition( + [in] ITfCompositionView *pComposition); +};

1 0

Jacek Caban : mshtml: Remove document observer before releasing nsdoc.
by Alexandre Julliard 06 Feb '09

06 Feb '09

Module: wine Branch: master Commit: 21e1b15795d3d34ebea1eef1066e80ef7d7b26c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21e1b15795d3d34ebea1eef10… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 5 21:18:16 2009 +0100 mshtml: Remove document observer before releasing nsdoc. --- dlls/mshtml/htmldoc.c | 4 +++- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/mutation.c | 15 +++++++++++++++ dlls/mshtml/nsembed.c | 4 +++- 4 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 32da2e0..a6aa73f 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -214,8 +214,10 @@ static ULONG WINAPI HTMLDocument_Release(IHTMLDocument2 *iface) ConnectionPointContainer_Destroy(&This->cp_container); - if(This->nsdoc) + if(This->nsdoc) { + remove_mutation_observer(This->nscontainer, This->nsdoc); nsIDOMHTMLDocument_Release(This->nsdoc); + } if(This->nscontainer) NSContainer_Release(This->nscontainer); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index e4c98a7..b67c485 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -510,6 +510,7 @@ void NSContainer_Release(NSContainer*); void init_mutation(NSContainer*); void set_mutation_observer(NSContainer*,nsIDOMHTMLDocument*); +void remove_mutation_observer(NSContainer*,nsIDOMHTMLDocument*); void HTMLDocument_LockContainer(HTMLDocument*,BOOL); void show_context_menu(HTMLDocument*,DWORD,POINT*,IDispatch*); diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c index ea61d5a..ab9649c 100644 --- a/dlls/mshtml/mutation.c +++ b/dlls/mshtml/mutation.c @@ -55,6 +55,21 @@ void set_mutation_observer(NSContainer *nscontainer, nsIDOMHTMLDocument *nshtmld nsIDOMNSDocument_Release(nsdoc); } +void remove_mutation_observer(NSContainer *nscontainer, nsIDOMHTMLDocument *nshtmldoc) +{ + nsIDOMNSDocument *nsdoc; + nsresult nsres; + + nsres = nsIDOMHTMLDocument_QueryInterface(nshtmldoc, &IID_nsIDOMNSDocument, (void**)&nsdoc); + if(NS_FAILED(nsres)) { + ERR("Could not get nsIDOMNSDocument: %08x\n", nsres); + return; + } + + nsIDOMNSDocument_WineRemoveObserver(nsdoc, NSDOCOBS(nscontainer)); + nsIDOMNSDocument_Release(nsdoc); +} + #define IE_MAJOR_VERSION 7 #define IE_MINOR_VERSION 0 diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index ee386ac..16ac21e 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -857,8 +857,10 @@ void update_nsdocument(HTMLDocument *doc) return; } - if(doc->nsdoc) + if(doc->nsdoc) { + remove_mutation_observer(doc->nscontainer, doc->nsdoc); nsIDOMHTMLDocument_Release(doc->nsdoc); + } doc->nsdoc = nsdoc;

1 0

Aric Stewart : msctf: Add stub ITextStoreACPSink.
by Alexandre Julliard 06 Feb '09

06 Feb '09

Module: wine Branch: master Commit: 44148fe99a0c83cbe78ccc059148e60b38eada8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=44148fe99a0c83cbe78ccc059… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Feb 5 14:17:26 2009 -0600 msctf: Add stub ITextStoreACPSink. --- dlls/msctf/context.c | 157 ++++++++++++++++++++++++++++++++++++++++++++++++++ include/textstor.idl | 46 +++++++++++++++ 2 files changed, 203 insertions(+), 0 deletions(-) diff --git a/dlls/msctf/context.c b/dlls/msctf/context.c index 593f0ad..17396ef 100644 --- a/dlls/msctf/context.c +++ b/dlls/msctf/context.c @@ -72,6 +72,17 @@ typedef struct tagContext { } Context; + +typedef struct tagTextStoreACPSink { + const ITextStoreACPSinkVtbl *TextStoreACPSinkVtbl; + LONG refCount; + + Context *pContext; +} TextStoreACPSink; + + +static HRESULT TextStoreACPSink_Constructor(ITextStoreACPSink **ppOut, Context *pContext); + static inline Context *impl_from_ITfSourceVtbl(ITfSource *iface) { return (Context *)((char *)iface - FIELD_OFFSET(Context,SourceVtbl)); @@ -416,3 +427,149 @@ HRESULT Context_Constructor(TfClientId tidOwner, IUnknown *punk, ITfContext **pp return S_OK; } + +/************************************************************************** + * ITextStoreACPSink + **************************************************************************/ + +static void TextStoreACPSink_Destructor(TextStoreACPSink *This) +{ + TRACE("destroying %p\n", This); + HeapFree(GetProcessHeap(),0,This); +} + +static HRESULT WINAPI TextStoreACPSink_QueryInterface(ITextStoreACPSink *iface, REFIID iid, LPVOID *ppvOut) +{ + TextStoreACPSink *This = (TextStoreACPSink *)iface; + *ppvOut = NULL; + + if (IsEqualIID(iid, &IID_IUnknown) || IsEqualIID(iid, &IID_ITextStoreACPSink)) + { + *ppvOut = This; + } + + if (*ppvOut) + { + IUnknown_AddRef(iface); + return S_OK; + } + + WARN("unsupported interface: %s\n", debugstr_guid(iid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI TextStoreACPSink_AddRef(ITextStoreACPSink *iface) +{ + TextStoreACPSink *This = (TextStoreACPSink *)iface; + return InterlockedIncrement(&This->refCount); +} + +static ULONG WINAPI TextStoreACPSink_Release(ITextStoreACPSink *iface) +{ + TextStoreACPSink *This = (TextStoreACPSink *)iface; + ULONG ret; + + ret = InterlockedDecrement(&This->refCount); + if (ret == 0) + TextStoreACPSink_Destructor(This); + return ret; +} + +/***************************************************** + * ITextStoreACPSink functions + *****************************************************/ + +static HRESULT WINAPI TextStoreACPSink_OnTextChange(ITextStoreACPSink *iface, + DWORD dwFlags, const TS_TEXTCHANGE *pChange) +{ + TextStoreACPSink *This = (TextStoreACPSink *)iface; + FIXME("STUB:(%p)\n",This); + return E_NOTIMPL; +} + +static HRESULT WINAPI TextStoreACPSink_OnSelectionChange(ITextStoreACPSink *iface) +{ + TextStoreACPSink *This = (TextStoreACPSink *)iface; + FIXME("STUB:(%p)\n",This); + return E_NOTIMPL; +} + +static HRESULT WINAPI TextStoreACPSink_OnLayoutChange(ITextStoreACPSink *iface, + TsLayoutCode lcode, TsViewCookie vcView) +{ + TextStoreACPSink *This = (TextStoreACPSink *)iface; + FIXME("STUB:(%p)\n",This); + return E_NOTIMPL; +} + +static HRESULT WINAPI TextStoreACPSink_OnStatusChange(ITextStoreACPSink *iface, + DWORD dwFlags) +{ + TextStoreACPSink *This = (TextStoreACPSink *)iface; + FIXME("STUB:(%p)\n",This); + return E_NOTIMPL; +} + +static HRESULT WINAPI TextStoreACPSink_OnAttrsChange(ITextStoreACPSink *iface, + LONG acpStart, LONG acpEnd, ULONG cAttrs, const TS_ATTRID *paAttrs) +{ + TextStoreACPSink *This = (TextStoreACPSink *)iface; + FIXME("STUB:(%p)\n",This); + return E_NOTIMPL; +} + +static HRESULT WINAPI TextStoreACPSink_OnLockGranted(ITextStoreACPSink *iface, + DWORD dwLockFlags) +{ + TextStoreACPSink *This = (TextStoreACPSink *)iface; + FIXME("STUB:(%p)\n",This); + return E_NOTIMPL; +} + +static HRESULT WINAPI TextStoreACPSink_OnStartEditTransaction(ITextStoreACPSink *iface) +{ + TextStoreACPSink *This = (TextStoreACPSink *)iface; + FIXME("STUB:(%p)\n",This); + return E_NOTIMPL; +} + +static HRESULT WINAPI TextStoreACPSink_OnEndEditTransaction(ITextStoreACPSink *iface) +{ + TextStoreACPSink *This = (TextStoreACPSink *)iface; + FIXME("STUB:(%p)\n",This); + return E_NOTIMPL; +} + +static const ITextStoreACPSinkVtbl TextStoreACPSink_TextStoreACPSinkVtbl = +{ + TextStoreACPSink_QueryInterface, + TextStoreACPSink_AddRef, + TextStoreACPSink_Release, + + TextStoreACPSink_OnTextChange, + TextStoreACPSink_OnSelectionChange, + TextStoreACPSink_OnLayoutChange, + TextStoreACPSink_OnStatusChange, + TextStoreACPSink_OnAttrsChange, + TextStoreACPSink_OnLockGranted, + TextStoreACPSink_OnStartEditTransaction, + TextStoreACPSink_OnEndEditTransaction +}; + +static HRESULT TextStoreACPSink_Constructor(ITextStoreACPSink **ppOut, Context *pContext) +{ + TextStoreACPSink *This; + + This = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(TextStoreACPSink)); + if (This == NULL) + return E_OUTOFMEMORY; + + This->TextStoreACPSinkVtbl= &TextStoreACPSink_TextStoreACPSinkVtbl; + This->refCount = 1; + + This->pContext = pContext; + + TRACE("returning %p\n", This); + *ppOut = (ITextStoreACPSink*)This; + return S_OK; +} diff --git a/include/textstor.idl b/include/textstor.idl index f9624f6..86a01e0 100644 --- a/include/textstor.idl +++ b/include/textstor.idl @@ -35,3 +35,49 @@ typedef [uuid(fec4f516-c503-45b1-a5fd-7a3d8ab07049)] struct TS_STATUS DWORD dwDynamicFlags; DWORD dwStaticFlags; } TS_STATUS; + +typedef [uuid(f3181bd6-bcf0-41d3-a81c-474b17ec38fb)] struct TS_TEXTCHANGE +{ + LONG acpStart; + LONG acpOldEnd; + LONG acpNewEnd; +} TS_TEXTCHANGE; + +typedef [uuid(ef3457d9-8446-49a7-a9e6-b50d9d5f3fd9)] GUID TS_ATTRID; +typedef [uuid(7899d7c4-5f07-493c-a89a-fac8e777f476)] enum { TS_LC_CREATE, TS_LC_CHANGE, TS_LC_DESTROY } TsLayoutCode; +typedef [uuid(1faf509e-44c1-458e-950a-38a96705a62b)] DWORD TsViewCookie; + + +[ + object, + uuid(22d44c94-a419-4542-a272-ae26093ececf), + pointer_default(unique) +] +interface ITextStoreACPSink : IUnknown +{ + HRESULT OnTextChange( + [in] DWORD dwFlags, + [in] const TS_TEXTCHANGE *pChange); + + HRESULT OnSelectionChange(); + + HRESULT OnLayoutChange( + [in] TsLayoutCode lcode, + [in] TsViewCookie vcView); + + HRESULT OnStatusChange( + [in] DWORD dwFlags); + + HRESULT OnAttrsChange( + [in] LONG acpStart, + [in] LONG acpEnd, + [in] ULONG cAttrs, + [in, size_is(cAttrs)] const TS_ATTRID *paAttrs); + + HRESULT OnLockGranted( + [in] DWORD dwLockFlags); + + HRESULT OnStartEditTransaction(); + + HRESULT OnEndEditTransaction(); +};

1 0

Aric Stewart : msctf: Define ITextStoreACP.
by Alexandre Julliard 06 Feb '09

06 Feb '09

Module: wine Branch: master Commit: 5e7493d51cfdf0bbe8c671409a3e8e75d3cfc65f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e7493d51cfdf0bbe8c671409… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Feb 5 14:17:32 2009 -0600 msctf: Define ITextStoreACP. --- include/textstor.idl | 189 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 187 insertions(+), 2 deletions(-) diff --git a/include/textstor.idl b/include/textstor.idl index 86a01e0..0d75d17 100644 --- a/include/textstor.idl +++ b/include/textstor.idl @@ -30,6 +30,10 @@ const DWORD TS_SS_REGIONS = 0x002; const DWORD TS_SS_TRANSITORY = 0x004; const DWORD TS_SS_NOHIDDENTEXT = 0x008; +typedef [uuid(05fcf85b-5e9c-4c3e-ab71-29471d4f38e7)] enum { TS_AE_NONE, TS_AE_START, TS_AE_END } TsActiveSelEnd; +typedef [uuid(033b0df0-f193-4170-b47b-141afc247878)] enum { TS_RT_PLAIN, TS_RT_HIDDEN, TS_RT_OPAQUE } TsRunType; +typedef [uuid(ef3457d9-8446-49a7-a9e6-b50d9d5f3fd9)] GUID TS_ATTRID; + typedef [uuid(fec4f516-c503-45b1-a5fd-7a3d8ab07049)] struct TS_STATUS { DWORD dwDynamicFlags; @@ -43,11 +47,35 @@ typedef [uuid(f3181bd6-bcf0-41d3-a81c-474b17ec38fb)] struct TS_TEXTCHANGE LONG acpNewEnd; } TS_TEXTCHANGE; -typedef [uuid(ef3457d9-8446-49a7-a9e6-b50d9d5f3fd9)] GUID TS_ATTRID; +typedef [uuid(7ecc3ffa-8f73-4d91-98ed-76f8ac5b1600)] struct TS_SELECTIONSTYLE +{ + TsActiveSelEnd ase; + BOOL fInterimChar; +} TS_SELECTIONSTYLE; + +typedef [uuid(c4b9c33b-8a0d-4426-bebe-d444a4701fe9)] struct TS_SELECTION_ACP +{ + LONG acpStart; + LONG acpEnd; + TS_SELECTIONSTYLE style; +} TS_SELECTION_ACP; + +typedef [uuid(a6231949-37c5-4b74-a24e-2a26c327201d)] struct TS_RUNINFO +{ + ULONG uCount; + TsRunType type; +} TS_RUNINFO; + +typedef [uuid(2cc2b33f-1174-4507-b8d9-5bc0eb37c197)] struct TS_ATTRVAL +{ + TS_ATTRID idAttr; + DWORD dwOverlapId; + VARIANT varValue; +} TS_ATTRVAL; + typedef [uuid(7899d7c4-5f07-493c-a89a-fac8e777f476)] enum { TS_LC_CREATE, TS_LC_CHANGE, TS_LC_DESTROY } TsLayoutCode; typedef [uuid(1faf509e-44c1-458e-950a-38a96705a62b)] DWORD TsViewCookie; - [ object, uuid(22d44c94-a419-4542-a272-ae26093ececf), @@ -81,3 +109,160 @@ interface ITextStoreACPSink : IUnknown HRESULT OnEndEditTransaction(); }; + +[ + object, + uuid(28888fe3-c2a0-483a-a3ea-8cb1ce51ff3d), + pointer_default(unique) +] +interface ITextStoreACP : IUnknown +{ + HRESULT AdviseSink( + [in] REFIID riid, + [in, iid_is(riid)] IUnknown *punk, + [in] DWORD dwMask); + + HRESULT UnadviseSink( + [in] IUnknown *punk); + + HRESULT RequestLock( + [in] DWORD dwLockFlags, + [out] HRESULT *phrSession); + + HRESULT GetStatus( + [out] TS_STATUS *pdcs); + + HRESULT QueryInsert( + [in] LONG acpTestStart, + [in] LONG acpTestEnd, + [in] ULONG cch, + [out] LONG *pacpResultStart, + [out] LONG *pacpResultEnd); + + HRESULT GetSelection( + [in] ULONG ulIndex, + [in] ULONG ulCount, + [out, size_is(ulCount), length_is(*pcFetched)] TS_SELECTION_ACP *pSelection, + [out] ULONG *pcFetched); + + HRESULT SetSelection( + [in] ULONG ulCount, + [in, size_is(ulCount)] const TS_SELECTION_ACP *pSelection); + + HRESULT GetText( + [in] LONG acpStart, + [in] LONG acpEnd, + [out, size_is(cchPlainReq), length_is(*pcchPlainRet)] WCHAR *pchPlain, + [in] ULONG cchPlainReq, + [out] ULONG *pcchPlainRet, + [out, size_is(cRunInfoReq), length_is(*pcRunInfoRet)] TS_RUNINFO *prgRunInfo, + [in] ULONG cRunInfoReq, + [out] ULONG *pcRunInfoRet, + [out] LONG *pacpNext); + + HRESULT SetText( + [in] DWORD dwFlags, + [in] LONG acpStart, + [in] LONG acpEnd, + [in, size_is(cch)] const WCHAR *pchText, + [in] ULONG cch, + [out] TS_TEXTCHANGE *pChange); + + HRESULT GetFormattedText( + [in] LONG acpStart, + [in] LONG acpEnd, + [out] IDataObject **ppDataObject); + + HRESULT GetEmbedded( + [in] LONG acpPos, + [in] REFGUID rguidService, + [in] REFIID riid, + [out, iid_is(riid)] IUnknown **ppunk); + + HRESULT QueryInsertEmbedded( + [in] const GUID *pguidService, + [in] const FORMATETC *pFormatEtc, + [out] BOOL *pfInsertable); + + HRESULT InsertEmbedded( + [in] DWORD dwFlags, + [in] LONG acpStart, + [in] LONG acpEnd, + [in] IDataObject *pDataObject, + [out] TS_TEXTCHANGE *pChange); + + + HRESULT InsertTextAtSelection( + [in] DWORD dwFlags, + [in, size_is(cch)] const WCHAR *pchText, + [in] ULONG cch, + [out] LONG *pacpStart, + [out] LONG *pacpEnd, + [out] TS_TEXTCHANGE *pChange); + + HRESULT InsertEmbeddedAtSelection( + [in] DWORD dwFlags, + [in] IDataObject *pDataObject, + [out] LONG *pacpStart, + [out] LONG *pacpEnd, + [out] TS_TEXTCHANGE *pChange); + + HRESULT RequestSupportedAttrs( + [in] DWORD dwFlags, + [in] ULONG cFilterAttrs, + [in, size_is(cFilterAttrs), unique] const TS_ATTRID *paFilterAttrs); + + HRESULT RequestAttrsAtPosition( + [in] LONG acpPos, + [in] ULONG cFilterAttrs, + [in, size_is(cFilterAttrs), unique] const TS_ATTRID *paFilterAttrs, + [in] DWORD dwFlags); + + HRESULT RequestAttrsTransitioningAtPosition( + [in] LONG acpPos, + [in] ULONG cFilterAttrs, + [in, size_is(cFilterAttrs), unique] const TS_ATTRID *paFilterAttrs, + [in] DWORD dwFlags); + + HRESULT FindNextAttrTransition( + [in] LONG acpStart, + [in] LONG acpHalt, + [in] ULONG cFilterAttrs, + [in, size_is(cFilterAttrs), unique] const TS_ATTRID *paFilterAttrs, + [in] DWORD dwFlags, + [out] LONG *pacpNext, + [out] BOOL *pfFound, + [out] LONG *plFoundOffset); + + HRESULT RetrieveRequestedAttrs( + [in] ULONG ulCount, + [out, size_is(ulCount), length_is(*pcFetched)] TS_ATTRVAL *paAttrVals, + [out] ULONG *pcFetched); + + HRESULT GetEndACP( + [out] LONG *pacp); + + HRESULT GetActiveView( + [out] TsViewCookie *pvcView); + + HRESULT GetACPFromPoint( + [in] TsViewCookie vcView, + [in] const POINT *ptScreen, + [in] DWORD dwFlags, + [out] LONG *pacp); + + HRESULT GetTextExt( + [in] TsViewCookie vcView, + [in] LONG acpStart, + [in] LONG acpEnd, + [out] RECT *prc, + [out] BOOL *pfClipped); + + HRESULT GetScreenExt( + [in] TsViewCookie vcView, + [out] RECT *prc); + + HRESULT GetWnd( + [in] TsViewCookie vcView, + [out] HWND *phwnd); +};

1 0

Aric Stewart : msctf: When a Context is created connect to the ITextStoreACP if provided and create and advise our ITextStoreACPSink .
by Alexandre Julliard 06 Feb '09

06 Feb '09

Module: wine Branch: master Commit: 67d00e3ee63a799e06a4831b863f642cec158c65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67d00e3ee63a799e06a4831b8… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Feb 5 14:17:41 2009 -0600 msctf: When a Context is created connect to the ITextStoreACP if provided and create and advise our ITextStoreACPSink. --- dlls/msctf/context.c | 28 ++++++++++++++++++++++++++-- include/textstor.idl | 9 +++++++++ 2 files changed, 35 insertions(+), 2 deletions(-) diff --git a/dlls/msctf/context.c b/dlls/msctf/context.c index 17396ef..37c651c 100644 --- a/dlls/msctf/context.c +++ b/dlls/msctf/context.c @@ -61,7 +61,11 @@ typedef struct tagContext { LONG refCount; TfClientId tidOwner; - IUnknown *punk; /* possible ITextStoreACP or ITfContextOwnerCompositionSink */ + + ITextStoreACP *pITextStoreACP; + /* ITfContextOwnerCompositionSink */ + + ITextStoreACPSink *pITextStoreACPSink; /* kept as seperate lists to reduce unnesseccary iterations */ struct list pContextKeyEventSink; @@ -99,6 +103,15 @@ static void Context_Destructor(Context *This) struct list *cursor, *cursor2; TRACE("destroying %p\n", This); + if (This->pITextStoreACPSink) + { + ITextStoreACP_UnadviseSink(This->pITextStoreACP, (IUnknown*)This->pITextStoreACPSink); + ITextStoreACPSink_Release(This->pITextStoreACPSink); + } + + if (This->pITextStoreACP) + ITextStoreACPSink_Release(This->pITextStoreACP); + LIST_FOR_EACH_SAFE(cursor, cursor2, &This->pContextKeyEventSink) { ContextSink* sink = LIST_ENTRY(cursor,ContextSink,entry); @@ -408,11 +421,22 @@ HRESULT Context_Constructor(TfClientId tidOwner, IUnknown *punk, ITfContext **pp if (This == NULL) return E_OUTOFMEMORY; + TRACE("(%p) %x %p %p %p\n",This, tidOwner, punk, ppOut, pecTextStore); + This->ContextVtbl= &Context_ContextVtbl; This->SourceVtbl = &Context_SourceVtbl; This->refCount = 1; This->tidOwner = tidOwner; - This->punk = punk; + + if (punk && SUCCEEDED(IUnknown_QueryInterface(punk, &IID_ITextStoreACP, + (LPVOID*)&This->pITextStoreACP))) + { + if (SUCCEEDED(TextStoreACPSink_Constructor(&This->pITextStoreACPSink, This))) + ITextStoreACP_AdviseSink(This->pITextStoreACP, &IID_ITextStoreACPSink, + (IUnknown*)This->pITextStoreACPSink, TS_AS_ALL_SINKS); + } + else if (punk) + FIXME("Unhandled pUnk\n"); TRACE("returning %p\n", This); *ppOut = (ITfContext*)This; diff --git a/include/textstor.idl b/include/textstor.idl index 0d75d17..08ee21d 100644 --- a/include/textstor.idl +++ b/include/textstor.idl @@ -30,6 +30,15 @@ const DWORD TS_SS_REGIONS = 0x002; const DWORD TS_SS_TRANSITORY = 0x004; const DWORD TS_SS_NOHIDDENTEXT = 0x008; +const DWORD TS_AS_TEXT_CHANGE = 0x01; +const DWORD TS_AS_SEL_CHANGE = 0x02; +const DWORD TS_AS_LAYOUT_CHANGE = 0x04; +const DWORD TS_AS_ATTR_CHANGE = 0x08; +const DWORD TS_AS_STATUS_CHANGE = 0x10; + +const DWORD TS_AS_ALL_SINKS = (TS_AS_TEXT_CHANGE | TS_AS_SEL_CHANGE | TS_AS_LAYOUT_CHANGE | TS_AS_ATTR_CHANGE | TS_AS_STATUS_CHANGE); + + typedef [uuid(05fcf85b-5e9c-4c3e-ab71-29471d4f38e7)] enum { TS_AE_NONE, TS_AE_START, TS_AE_END } TsActiveSelEnd; typedef [uuid(033b0df0-f193-4170-b47b-141afc247878)] enum { TS_RT_PLAIN, TS_RT_HIDDEN, TS_RT_OPAQUE } TsRunType; typedef [uuid(ef3457d9-8446-49a7-a9e6-b50d9d5f3fd9)] GUID TS_ATTRID;

1 0

Jacek Caban : mshtml: Wine Gecko 0.9.1 release.
by Alexandre Julliard 06 Feb '09

06 Feb '09

Module: wine Branch: master Commit: d0c693966360eff9606925e8727384d275f39bf9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0c693966360eff9606925e87… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 5 21:17:58 2009 +0100 mshtml: Wine Gecko 0.9.1 release. --- dlls/mshtml/nsiface.idl | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index 219ac0c..ef64145 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -23,7 +23,7 @@ * compatible with XPCOM, usable in C code. */ -cpp_quote("#define GECKO_VERSION \"0.9.0\"") +cpp_quote("#define GECKO_VERSION \"0.9.1\"") cpp_quote("#define GECKO_VERSION_STRING \"Wine Gecko \" GECKO_VERSION") import "wtypes.idl"; @@ -873,6 +873,7 @@ interface nsIDOMNSDocument : nsISupports /* Wine extensions */ nsresult WineAddObserver(nsIDocumentObserver *aObserver); + nsresult WineRemoveObserver(nsIDocumentObserver *aObserver); nsresult WineAddScriptRunner(nsIRunnable *aRunnable); }

1 0

Paul Vriens : fusion/tests: Fix some tests failures on .NET 1.1 (and Win98) .
by Alexandre Julliard 06 Feb '09

06 Feb '09

Module: wine Branch: master Commit: f42e50703705a1276a77175bca91dff8c5116f4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f42e50703705a1276a77175bc… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Feb 6 11:20:00 2009 +0100 fusion/tests: Fix some tests failures on .NET 1.1 (and Win98). --- dlls/fusion/tests/asmname.c | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/fusion/tests/asmname.c b/dlls/fusion/tests/asmname.c index fa6e996..29b0ec8 100644 --- a/dlls/fusion/tests/asmname.c +++ b/dlls/fusion/tests/asmname.c @@ -362,12 +362,17 @@ static void test_assembly_name_props_line(IAssemblyName *name, hr = IAssemblyName_GetProperty(name, i, str, &size); to_multibyte(val, str); - if (i == ASM_NAME_PUBLIC_KEY_TOKEN) - lstrcpyA((LPSTR)expect, vals[i].val); - - ok(hr == vals[i].hr, "%d: prop %d: Expected %08x, got %08x\n", line, i, vals[i].hr, hr); - ok(!lstrcmpW(str, expect), "%d: prop %d: Expected \"%s\", got \"%s\"\n", line, i, vals[i].val, val); - ok(size == vals[i].size, "%d: prop %d: Expected %d, got %d\n", line, i, vals[i].size, size); + ok(hr == vals[i].hr || + broken(i >= ASM_NAME_CONFIG_MASK && hr == E_INVALIDARG), /* .NET 1.1 */ + "%d: prop %d: Expected %08x, got %08x\n", line, i, vals[i].hr, hr); + if (hr != E_INVALIDARG) + { + if (i == ASM_NAME_PUBLIC_KEY_TOKEN) + ok(!memcmp(vals[i].val, str, size), "Expected a correct ASM_NAME_PUBLIC_KEY_TOKEN\n"); + else + ok(!lstrcmpA(vals[i].val, val), "%d: prop %d: Expected \"%s\", got \"%s\"\n", line, i, vals[i].val, val); + ok(size == vals[i].size, "%d: prop %d: Expected %d, got %d\n", line, i, vals[i].size, size); + } } }

1 0

Paul Vriens : fusion/tests: Fix some test failures on systems with .NET 1.1 .
by Alexandre Julliard 06 Feb '09

06 Feb '09

Module: wine Branch: master Commit: a89bd3f562276d6f938bffef30f28fb35171fa5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a89bd3f562276d6f938bffef3… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Feb 6 08:27:08 2009 +0100 fusion/tests: Fix some test failures on systems with .NET 1.1. --- dlls/fusion/tests/fusion.c | 41 +++++++++++++++++++++++++++-------------- 1 files changed, 27 insertions(+), 14 deletions(-) diff --git a/dlls/fusion/tests/fusion.c b/dlls/fusion/tests/fusion.c index ecdf87c..d2ed0f9 100644 --- a/dlls/fusion/tests/fusion.c +++ b/dlls/fusion/tests/fusion.c @@ -144,13 +144,37 @@ static void test_GetCachePath(void) "Expected HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), got %08x\n", hr); ok_w2("Expected \"%s\", got \"%s\"\n", nochange, path); + lstrcpyW(cachepath, windir); + lstrcatW(cachepath, backslash); + lstrcatW(cachepath, assembly); + + /* ASM_CACHE_ROOT */ + lstrcpyW(path, nochange); + size = MAX_PATH; + hr = pGetCachePath(ASM_CACHE_ROOT, path, &size); + ok(hr == S_OK || + broken(hr == E_INVALIDARG), /* .NET 1.1 */ + "Expected S_OK, got %08x\n", hr); + if (hr == S_OK) + ok_w2("Expected \"%s\", got \"%s\"\n", cachepath, path); + if (pGetCORVersion) { CHAR versionA[MAX_PATH]; CHAR cachepathA[MAX_PATH]; - - static const CHAR nativeimgA[] = "NativeImages_"; - static const CHAR zapfmtA[] = "%s\\%s\\%s%s_32"; + CHAR nativeimgA[MAX_PATH]; + CHAR zapfmtA[MAX_PATH]; + + if (hr == S_OK) + { + lstrcpyA(nativeimgA, "NativeImages_"); + lstrcpyA(zapfmtA, "%s\\%s\\%s%s_32"); + } + else + { + lstrcpyA(nativeimgA, "NativeImages1_"); + lstrcpyA(zapfmtA, "%s\\%s\\%s%s"); + } pGetCORVersion(version, MAX_PATH, &size); WideCharToMultiByte(CP_ACP, 0, version, -1, versionA, MAX_PATH, 0, 0); @@ -166,17 +190,6 @@ static void test_GetCachePath(void) ok_w2("Expected \"%s\", got \"%s\"\n", cachepath, path); } - lstrcpyW(cachepath, windir); - lstrcatW(cachepath, backslash); - lstrcatW(cachepath, assembly); - - /* ASM_CACHE_ROOT */ - lstrcpyW(path, nochange); - size = MAX_PATH; - hr = pGetCachePath(ASM_CACHE_ROOT, path, &size); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - ok_w2("Expected \"%s\", got \"%s\"\n", cachepath, path); - /* two flags at once */ lstrcpyW(path, nochange); size = MAX_PATH;

1 0