September 2019 - Wine-devel

[PATCH] mscoree: Update Wine Mono to 4.9.3.
by Vincent Povirk 25 Sep '19

25 Sep '19

Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> --- dlls/appwiz.cpl/addons.c | 4 ++-- dlls/mscoree/mscoree_private.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index 8be579d6dc8..e501054e16d 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -58,8 +58,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(appwizcpl); #define GECKO_SHA "???" #endif -#define MONO_VERSION "4.9.2" -#define MONO_SHA "b91f4656fca72d036934c2a9e845b2dfadad291e48e0b013fb2b08698200ff74" +#define MONO_VERSION "4.9.3" +#define MONO_SHA "7cf6b7674697f9de9cd1630ceb1de4c56adebb617fcca4d179a22cb7e1b2476d" typedef struct { const char *version; diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index bcad7f4f252..db18aff3eb5 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -45,7 +45,7 @@ extern HRESULT assembly_get_runtime_version(ASSEMBLY *assembly, LPSTR *version) extern HRESULT assembly_get_vtable_fixups(ASSEMBLY *assembly, VTableFixup **fixups, DWORD *count) DECLSPEC_HIDDEN; extern HRESULT assembly_get_native_entrypoint(ASSEMBLY *assembly, NativeEntryPointFunc *func) DECLSPEC_HIDDEN; -#define WINE_MONO_VERSION "4.9.2" +#define WINE_MONO_VERSION "4.9.3" /* Mono embedding */ typedef struct _MonoDomain MonoDomain; -- 2.17.1

1 0

[PATCH 3/3] msctf: Add ITextStoreACP2 support for ITfDocumentMgr::CreateContext().
by Jactry Zeng 25 Sep '19

25 Sep '19

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/msctf/context.c | 67 +++++++++++++++++-------------- dlls/msctf/msctf_internal.h | 3 +- dlls/msctf/range.c | 9 +++-- dlls/msctf/tests/inputprocessor.c | 31 +++++++++++++- 4 files changed, 75 insertions(+), 35 deletions(-) diff --git a/dlls/msctf/context.c b/dlls/msctf/context.c index 63f2bf5455..6c82088f58 100644 --- a/dlls/msctf/context.c +++ b/dlls/msctf/context.c @@ -60,7 +60,8 @@ typedef struct tagContext { TS_STATUS documentStatus; ITfDocumentMgr *manager; - ITextStoreACP *pITextStoreACP; + ITextStoreACP2 *textstore; + UINT textstore_ver; ITfContextOwnerCompositionSink *pITfContextOwnerCompositionSink; ITfEditSession* currentEditSession; @@ -119,8 +120,8 @@ static void Context_Destructor(Context *This) EditCookie *cookie; TRACE("destroying %p\n", This); - if (This->pITextStoreACP) - ITextStoreACP_Release(This->pITextStoreACP); + if (This->textstore) + ITextStoreACP2_Release(This->textstore); if (This->pITfContextOwnerCompositionSink) ITfContextOwnerCompositionSink_Release(This->pITfContextOwnerCompositionSink); @@ -218,7 +219,7 @@ static HRESULT WINAPI Context_RequestEditSession (ITfContext *iface, return E_INVALIDARG; } - if (!This->pITextStoreACP) + if (!This->textstore) { FIXME("No ITextStoreACP available\n"); *phrSession = E_FAIL; @@ -234,7 +235,7 @@ static HRESULT WINAPI Context_RequestEditSession (ITfContext *iface, dwLockFlags |= TS_LF_READ; if (!This->documentStatus.dwDynamicFlags) - ITextStoreACP_GetStatus(This->pITextStoreACP, &This->documentStatus); + ITextStoreACP2_GetStatus(This->textstore, &This->documentStatus); if (((dwFlags & TF_ES_READWRITE) == TF_ES_READWRITE) && (This->documentStatus.dwDynamicFlags & TS_SD_READONLY)) { @@ -248,7 +249,7 @@ static HRESULT WINAPI Context_RequestEditSession (ITfContext *iface, return E_INVALIDARG; } - hr = ITextStoreACP_RequestLock(This->pITextStoreACP, dwLockFlags, phrSession); + hr = ITextStoreACP2_RequestLock(This->textstore, dwLockFlags, phrSession); return hr; } @@ -283,7 +284,7 @@ static HRESULT WINAPI Context_GetSelection (ITfContext *iface, if (get_Cookie_magic(ec)!=COOKIE_MAGIC_EDITCOOKIE) return TF_E_NOLOCK; - if (!This->pITextStoreACP) + if (!This->textstore) { FIXME("Context does not have a ITextStoreACP\n"); return E_NOTIMPL; @@ -301,8 +302,7 @@ static HRESULT WINAPI Context_GetSelection (ITfContext *iface, DWORD fetched; TS_SELECTION_ACP acps; - hr = ITextStoreACP_GetSelection(This->pITextStoreACP, ulIndex + i, - 1, &acps, &fetched); + hr = ITextStoreACP2_GetSelection(This->textstore, ulIndex + i, 1, &acps, &fetched); if (hr == TS_E_NOLOCK) return TF_E_NOLOCK; @@ -310,7 +310,8 @@ static HRESULT WINAPI Context_GetSelection (ITfContext *iface, { pSelection[totalFetched].style.ase = acps.style.ase; pSelection[totalFetched].style.fInterimChar = acps.style.fInterimChar; - Range_Constructor(iface, This->pITextStoreACP, cookie->lockType, acps.acpStart, acps.acpEnd, &pSelection[totalFetched].range); + Range_Constructor(iface, This->textstore, This->textstore_ver, cookie->lockType, acps.acpStart, + acps.acpEnd, &pSelection[totalFetched].range); totalFetched ++; } else @@ -332,7 +333,7 @@ static HRESULT WINAPI Context_SetSelection (ITfContext *iface, TRACE("(%p) %i %i %p\n",This,ec,ulCount,pSelection); - if (!This->pITextStoreACP) + if (!This->textstore) { FIXME("Context does not have a ITextStoreACP\n"); return E_NOTIMPL; @@ -353,7 +354,7 @@ static HRESULT WINAPI Context_SetSelection (ITfContext *iface, return E_FAIL; } - hr = ITextStoreACP_SetSelection(This->pITextStoreACP, ulCount, acp); + hr = ITextStoreACP2_SetSelection(This->textstore, ulCount, acp); HeapFree(GetProcessHeap(), 0, acp); @@ -379,7 +380,7 @@ static HRESULT WINAPI Context_GetStart (ITfContext *iface, return TF_E_NOLOCK; cookie = get_Cookie_data(ec); - return Range_Constructor(iface, This->pITextStoreACP, cookie->lockType, 0, 0, ppStart); + return Range_Constructor(iface, This->textstore, This->textstore_ver, cookie->lockType, 0, 0, ppStart); } static HRESULT WINAPI Context_GetEnd (ITfContext *iface, @@ -401,16 +402,16 @@ static HRESULT WINAPI Context_GetEnd (ITfContext *iface, if (get_Cookie_magic(ec)!=COOKIE_MAGIC_EDITCOOKIE) return TF_E_NOLOCK; - if (!This->pITextStoreACP) + if (!This->textstore) { FIXME("Context does not have a ITextStoreACP\n"); return E_NOTIMPL; } cookie = get_Cookie_data(ec); - ITextStoreACP_GetEndACP(This->pITextStoreACP,&end); + ITextStoreACP2_GetEndACP(This->textstore,&end); - return Range_Constructor(iface, This->pITextStoreACP, cookie->lockType, end, end, ppEnd); + return Range_Constructor(iface, This->textstore, This->textstore_ver, cookie->lockType, end, end, ppEnd); } static HRESULT WINAPI Context_GetActiveView (ITfContext *iface, @@ -441,13 +442,13 @@ static HRESULT WINAPI Context_GetStatus (ITfContext *iface, if (!pdcs) return E_INVALIDARG; - if (!This->pITextStoreACP) + if (!This->textstore) { FIXME("Context does not have a ITextStoreACP\n"); return E_NOTIMPL; } - ITextStoreACP_GetStatus(This->pITextStoreACP, &This->documentStatus); + ITextStoreACP2_GetStatus(This->textstore, &This->documentStatus); *pdcs = This->documentStatus; @@ -712,15 +713,16 @@ static HRESULT WINAPI InsertAtSelection_InsertTextAtSelection( if ((cookie->lockType & TS_LF_READWRITE) != TS_LF_READWRITE ) return TS_E_READONLY; - if (!This->pITextStoreACP) + if (!This->textstore) { FIXME("Context does not have a ITextStoreACP\n"); return E_NOTIMPL; } - hr = ITextStoreACP_InsertTextAtSelection(This->pITextStoreACP, dwFlags, pchText, cch, &acpStart, &acpEnd, &change); + hr = ITextStoreACP2_InsertTextAtSelection(This->textstore, dwFlags, pchText, cch, &acpStart, &acpEnd, &change); if (SUCCEEDED(hr)) - Range_Constructor(&This->ITfContext_iface, This->pITextStoreACP, cookie->lockType, change.acpStart, change.acpNewEnd, ppRange); + Range_Constructor(&This->ITfContext_iface, This->textstore, This->textstore_ver, cookie->lockType, + change.acpStart, change.acpNewEnd, ppRange); return hr; } @@ -863,13 +865,13 @@ static HRESULT WINAPI TextStoreACPSink_OnStatusChange(ITextStoreACPSink *iface, TRACE("(%p) %x\n",This, dwFlags); - if (!This->pITextStoreACP) + if (!This->textstore) { FIXME("Context does not have a ITextStoreACP\n"); return E_NOTIMPL; } - hr = ITextStoreACP_RequestLock(This->pITextStoreACP, TS_LF_READ, &hrSession); + hr = ITextStoreACP2_RequestLock(This->textstore, TS_LF_READ, &hrSession); if(SUCCEEDED(hr) && SUCCEEDED(hrSession)) This->documentStatus.dwDynamicFlags = dwFlags; @@ -1081,13 +1083,18 @@ HRESULT Context_Constructor(TfClientId tidOwner, IUnknown *punk, ITfDocumentMgr if (punk) { - IUnknown_QueryInterface(punk, &IID_ITextStoreACP, - (LPVOID*)&This->pITextStoreACP); + This->textstore_ver = 1; + IUnknown_QueryInterface(punk, &IID_ITextStoreACP, (void **)&This->textstore); + if (!This->textstore) + { + IUnknown_QueryInterface(punk, &IID_ITextStoreACP2, (void **)&This->textstore); + This->textstore_ver = 2; + } IUnknown_QueryInterface(punk, &IID_ITfContextOwnerCompositionSink, (LPVOID*)&This->pITfContextOwnerCompositionSink); - if (!This->pITextStoreACP && !This->pITfContextOwnerCompositionSink) + if (!This->textstore && !This->pITfContextOwnerCompositionSink) FIXME("Unhandled pUnk\n"); } @@ -1110,8 +1117,8 @@ HRESULT Context_Initialize(ITfContext *iface, ITfDocumentMgr *manager) { Context *This = impl_from_ITfContext(iface); - if (This->pITextStoreACP) - ITextStoreACP_AdviseSink(This->pITextStoreACP, &IID_ITextStoreACPSink, + if (This->textstore) + ITextStoreACP2_AdviseSink(This->textstore, &IID_ITextStoreACPSink, (IUnknown*)&This->ITextStoreACPSink_iface, TS_AS_ALL_SINKS); This->connected = TRUE; This->manager = manager; @@ -1122,8 +1129,8 @@ HRESULT Context_Uninitialize(ITfContext *iface) { Context *This = impl_from_ITfContext(iface); - if (This->pITextStoreACP) - ITextStoreACP_UnadviseSink(This->pITextStoreACP, (IUnknown*)&This->ITextStoreACPSink_iface); + if (This->textstore) + ITextStoreACP2_UnadviseSink(This->textstore, (IUnknown*)&This->ITextStoreACPSink_iface); This->connected = FALSE; This->manager = NULL; return S_OK; diff --git a/dlls/msctf/msctf_internal.h b/dlls/msctf/msctf_internal.h index 584bb1044e..db6e966b50 100644 --- a/dlls/msctf/msctf_internal.h +++ b/dlls/msctf/msctf_internal.h @@ -44,7 +44,8 @@ extern HRESULT DocumentMgr_Constructor(ITfThreadMgrEventSink*, ITfDocumentMgr ** extern HRESULT Context_Constructor(TfClientId tidOwner, IUnknown *punk, ITfDocumentMgr *mgr, ITfContext **ppOut, TfEditCookie *pecTextStore) DECLSPEC_HIDDEN; extern HRESULT InputProcessorProfiles_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) DECLSPEC_HIDDEN; extern HRESULT CategoryMgr_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) DECLSPEC_HIDDEN; -extern HRESULT Range_Constructor(ITfContext *context, ITextStoreACP *textstore, DWORD lockType, DWORD anchorStart, DWORD anchorEnd, ITfRange **ppOut) DECLSPEC_HIDDEN; +extern HRESULT Range_Constructor(ITfContext *context, ITextStoreACP2 *textstore, UINT textstore_ver, DWORD lockType, + DWORD anchorStart, DWORD anchorEnd, ITfRange **ppOut) DECLSPEC_HIDDEN; extern HRESULT CompartmentMgr_Constructor(IUnknown *pUnkOuter, REFIID riid, IUnknown **ppOut) DECLSPEC_HIDDEN; extern HRESULT CompartmentMgr_Destructor(ITfCompartmentMgr *This) DECLSPEC_HIDDEN; extern HRESULT LangBarMgr_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) DECLSPEC_HIDDEN; diff --git a/dlls/msctf/range.c b/dlls/msctf/range.c index c4eee2501f..22dc8303a6 100644 --- a/dlls/msctf/range.c +++ b/dlls/msctf/range.c @@ -41,7 +41,8 @@ typedef struct tagRange { /* const ITfRangeACPVtb *RangeACPVtbl; */ LONG refCount; - ITextStoreACP *pITextStoreACP; + ITextStoreACP2 *textstore; + UINT textstore_ver; ITfContext *pITfContext; DWORD lockType; @@ -322,7 +323,8 @@ static const ITfRangeVtbl Range_RangeVtbl = Range_GetContext }; -HRESULT Range_Constructor(ITfContext *context, ITextStoreACP *textstore, DWORD lockType, DWORD anchorStart, DWORD anchorEnd, ITfRange **ppOut) +HRESULT Range_Constructor(ITfContext *context, ITextStoreACP2 *textstore, UINT textstore_ver, + DWORD lockType, DWORD anchorStart, DWORD anchorEnd, ITfRange **ppOut) { Range *This; @@ -335,7 +337,8 @@ HRESULT Range_Constructor(ITfContext *context, ITextStoreACP *textstore, DWORD l This->ITfRange_iface.lpVtbl = &Range_RangeVtbl; This->refCount = 1; This->pITfContext = context; - This->pITextStoreACP = textstore; + This->textstore = textstore; + This->textstore_ver = textstore_ver; This->lockType = lockType; This->anchorStart = anchorStart; This->anchorEnd = anchorEnd; diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index ebc0e36154..f0f8031ae8 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -192,13 +192,23 @@ static void TextStoreACP_Destructor(TextStoreACP *This) HeapFree(GetProcessHeap(),0,This); } +static int text_store_acp_ver = 0; +static BOOL acp2only = FALSE; + static HRESULT WINAPI TextStoreACP_QueryInterface(ITextStoreACP *iface, REFIID iid, LPVOID *ppvOut) { *ppvOut = NULL; - if (IsEqualIID(iid, &IID_IUnknown) || IsEqualIID(iid, &IID_ITextStoreACP)) + if (IsEqualIID(iid, &IID_IUnknown) || + (IsEqualIID(iid, &IID_ITextStoreACP) && !acp2only)) + { + *ppvOut = iface; + text_store_acp_ver = 1; + } + else if (IsEqualIID(iid, &IID_ITextStoreACP2)) { *ppvOut = iface; + text_store_acp_ver = 2; } if (*ppvOut) @@ -2561,9 +2571,12 @@ static void test_MultiThreadApartment(void) static void test_thread_mgr2(void) { TfClientId clientid1, clientid2, clientid3; + ITextStoreACP *textstore; ITfDocumentMgr *docmgr; ITfThreadMgr2 *thmgr2; ITfThreadMgr *thmgr; + ITfContext *context; + DWORD cookie; HRESULT hr; hr = CoCreateInstance(&CLSID_TF_ThreadMgr, NULL, CLSCTX_INPROC_SERVER, @@ -2595,6 +2608,22 @@ static void test_thread_mgr2(void) hr = ITfThreadMgr2_CreateDocumentMgr(thmgr2, &docmgr); ok(hr == S_OK, "ITfThreadMgr2_CreateDocumentMgr failed: %#x.\n", hr); + hr = TextStoreACP_Constructor((IUnknown**)&textstore); + ok(hr == S_OK,"TextStoreACP_Constructor failed: %#x.\n", hr); + + hr = ITfDocumentMgr_CreateContext(docmgr, clientid1, 0, (IUnknown *)textstore, &context, &cookie); + ok(hr == S_OK,"ITfDocumentMgr_CreateContext failed: %#x.\n", hr); + ok(text_store_acp_ver == 1, "Got wrong TextStoreACP version: %d.\n", text_store_acp_ver); + ITfContext_Release(context); + + acp2only = TRUE; + hr = ITfDocumentMgr_CreateContext(docmgr, clientid1, 0, (IUnknown *)textstore, &context, &cookie); + ok(hr == S_OK,"ITfDocumentMgr_CreateContext failed: %#x.\n", hr); + ok(text_store_acp_ver == 2, "Got wrong TextStoreACP version: %d.\n", text_store_acp_ver); + acp2only = FALSE; + ITfContext_Release(context); + TextStoreACP_Release(textstore); + hr = ITfThreadMgr2_Deactivate(thmgr2); ok(hr == S_OK, "ITfThreadMgr2_Deactivate failed: %#x.\n", hr); hr = ITfThreadMgr2_Deactivate(thmgr2); -- 2.23.0

1 0

[PATCH 2/3] include: Add ITextStoreACP2 interface.
by Jactry Zeng 25 Sep '19

25 Sep '19

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- include/textstor.idl | 59 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/include/textstor.idl b/include/textstor.idl index c6d88c7d04..e9f14025c0 100644 --- a/include/textstor.idl +++ b/include/textstor.idl @@ -312,3 +312,62 @@ interface ITextStoreACP : IUnknown [in] TsViewCookie vcView, [out] HWND *phwnd); } + +[ + object, + uuid(f86ad89f-5fe4-4b8d-bb9f-ef3797a84f1f), + pointer_default(unique) +] +interface ITextStoreACP2 : IUnknown +{ + HRESULT AdviseSink([in] REFIID riid, [in, iid_is(riid)] IUnknown *punk, [in] DWORD mask); + HRESULT UnadviseSink([in] IUnknown *punk); + HRESULT RequestLock([in] DWORD flags, [out] HRESULT *session); + HRESULT GetStatus([out] TS_STATUS *status); + HRESULT QueryInsert([in] LONG start, [in] LONG end, [in] ULONG cch, + [out] LONG *result_start, [out] LONG *result_end); + HRESULT GetSelection([in] ULONG index, [in] ULONG count, + [out, size_is(count), length_is(*fetched)] TS_SELECTION_ACP *selection, + [out] ULONG *fetched); + HRESULT SetSelection([in] ULONG count, [in, size_is(count)] const TS_SELECTION_ACP *selection); + HRESULT GetText([in] LONG start, [in] LONG end, + [out, size_is(plain_size), length_is(*plain_length)] WCHAR *plain, + [in] ULONG plain_size, [out] ULONG *plain_length, + [out, size_is(runinfo_size), length_is(*runinfo_length)] TS_RUNINFO *runinfo, + [in] ULONG runinfo_size, [out] ULONG *runinfo_length, [out] LONG *next); + HRESULT SetText([in] DWORD flags, [in] LONG start, [in] LONG end, [in, size_is(cch)] const WCHAR *text, + [in] ULONG cch, [out] TS_TEXTCHANGE *change); + HRESULT GetFormattedText([in] LONG start, [in] LONG end, [out] IDataObject **object); + HRESULT GetEmbedded([in] LONG pos, [in] REFGUID service, [in] REFIID riid, + [out, iid_is(riid)] IUnknown **ppunk); + HRESULT QueryInsertEmbedded([in] const GUID *service, [in] const FORMATETC *format, + [out] BOOL *insertable); + HRESULT InsertEmbedded([in] DWORD flags, [in] LONG start, [in] LONG end, + [in] IDataObject *object, [out] TS_TEXTCHANGE *change); + HRESULT InsertTextAtSelection([in] DWORD flags, [in, size_is(cch)] const WCHAR *text, [in] ULONG cch, + [out] LONG *start, [out] LONG *end, [out] TS_TEXTCHANGE *change); + HRESULT InsertEmbeddedAtSelection([in] DWORD flags, [in] IDataObject *object, [out] LONG *start, + [out] LONG *end, [out] TS_TEXTCHANGE *change); + HRESULT RequestSupportedAttrs([in] DWORD flags, [in] ULONG count, + [in, size_is(count), unique] const TS_ATTRID *attrs); + HRESULT RequestAttrsAtPosition([in] LONG pos, [in] ULONG count, + [in, size_is(count), unique] const TS_ATTRID *attrs, + [in] DWORD flags); + HRESULT RequestAttrsTransitioningAtPosition([in] LONG pos, [in] ULONG count, + [in, size_is(count), unique] const TS_ATTRID *attrs, + [in] DWORD flags); + HRESULT FindNextAttrTransition([in] LONG start, [in] LONG halt, [in] ULONG count, + [in, size_is(count), unique] const TS_ATTRID *attrs, + [in] DWORD flags, [out] LONG *next, [out] BOOL *found, + [out] LONG *offset); + HRESULT RetrieveRequestedAttrs([in] ULONG count, + [out, size_is(count), length_is(*fetched)] TS_ATTRVAL *attrs, + [out] ULONG *fetched); + HRESULT GetEndACP([out] LONG *pacp); + HRESULT GetActiveView([out] TsViewCookie *view); + HRESULT GetACPFromPoint([in] TsViewCookie view, [in] const POINT *screen, + [in] DWORD flags, [out] LONG *pacp); + HRESULT GetTextExt([in] TsViewCookie view, [in] LONG start, [in] LONG end, + [out] RECT *rect, [out] BOOL *clipped); + HRESULT GetScreenExt([in] TsViewCookie view, [out] RECT *rect); +} -- 2.23.0

1 0

[PATCH 1/3] msctf: Implement ITfThreadMgr2 stub.
by Jactry Zeng 25 Sep '19

25 Sep '19

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/msctf/tests/inputprocessor.c | 49 +++++++++ dlls/msctf/threadmgr.c | 176 ++++++++++++++++++++++++++++++ include/msctf.idl | 23 ++++ 3 files changed, 248 insertions(+) diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index 1222085fe0..ebc0e36154 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -2558,6 +2558,54 @@ static void test_MultiThreadApartment(void) CloseHandle(thread); } +static void test_thread_mgr2(void) +{ + TfClientId clientid1, clientid2, clientid3; + ITfDocumentMgr *docmgr; + ITfThreadMgr2 *thmgr2; + ITfThreadMgr *thmgr; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_TF_ThreadMgr, NULL, CLSCTX_INPROC_SERVER, + &IID_ITfThreadMgr2, (void**)&thmgr2); + ok(hr == S_OK || broken(hr == E_NOINTERFACE), /* pre-win8 */ + "Couldn't create ITfThreadMgr2: %#x.\n", hr); + + if (FAILED(hr)) + { + win_skip("ITfThreadMgr2 interface isn't available.\n"); + return; + } + + hr = ITfThreadMgr2_QueryInterface(thmgr2, &IID_ITfThreadMgr, (void **)&thmgr); + ok(hr == S_OK, "ITfThreadMgr2_QueryInterface failed: %#x.\n", hr); + ITfThreadMgr_Release(thmgr); + + hr = ITfThreadMgr2_ActivateEx(thmgr2, &clientid1, 0); + ok(hr == S_OK, "ITfThreadMgr2_ActivateEx failed: %#x.\n", hr); + + hr = ITfThreadMgr_Activate(g_tm, &clientid2); + ok(hr == S_OK, "ITfThreadMgr_Activate failed: %#x.\n", hr); + ok(clientid1 == clientid2, "Got unexpected client ID.\n"); + + hr = ITfThreadMgr_Activate(thmgr, &clientid3); + ok(hr == S_OK, "ITfThreadMgr_Activate failed: %#x.\n", hr); + ok(clientid1 == clientid3, "Got unexpected client ID.\n"); + + hr = ITfThreadMgr2_CreateDocumentMgr(thmgr2, &docmgr); + ok(hr == S_OK, "ITfThreadMgr2_CreateDocumentMgr failed: %#x.\n", hr); + + hr = ITfThreadMgr2_Deactivate(thmgr2); + ok(hr == S_OK, "ITfThreadMgr2_Deactivate failed: %#x.\n", hr); + hr = ITfThreadMgr2_Deactivate(thmgr2); + ok(hr == S_OK, "ITfThreadMgr2_Deactivate failed: %#x.\n", hr); + hr = ITfThreadMgr2_Deactivate(thmgr2); + ok(hr == S_OK, "ITfThreadMgr2_Deactivate failed: %#x.\n", hr); + + ITfDocumentMgr_Release(docmgr); + ITfThreadMgr2_Release(thmgr2); +} + START_TEST(inputprocessor) { if (SUCCEEDED(initialize())) @@ -2588,6 +2636,7 @@ START_TEST(inputprocessor) test_Unregister(); test_profile_mgr(); test_MultiThreadApartment(); + test_thread_mgr2(); ITextStoreACPSink_Release(ACPSink); ITfDocumentMgr_Release(g_dm); diff --git a/dlls/msctf/threadmgr.c b/dlls/msctf/threadmgr.c index 2c208fbc04..2e5deb62ee 100644 --- a/dlls/msctf/threadmgr.c +++ b/dlls/msctf/threadmgr.c @@ -61,6 +61,7 @@ typedef struct tagAssociatedWindow typedef struct tagACLMulti { ITfThreadMgrEx ITfThreadMgrEx_iface; + ITfThreadMgr2 ITfThreadMgr2_iface; ITfSource ITfSource_iface; ITfKeystrokeMgr ITfKeystrokeMgr_iface; ITfMessagePump ITfMessagePump_iface; @@ -115,6 +116,11 @@ static inline ThreadMgr *impl_from_ITfThreadMgrEx(ITfThreadMgrEx *iface) return CONTAINING_RECORD(iface, ThreadMgr, ITfThreadMgrEx_iface); } +static inline ThreadMgr *impl_from_ITfThreadMgr2(ITfThreadMgr2 *iface) +{ + return CONTAINING_RECORD(iface, ThreadMgr, ITfThreadMgr2_iface); +} + static inline ThreadMgr *impl_from_ITfSource(ITfSource *iface) { return CONTAINING_RECORD(iface, ThreadMgr, ITfSource_iface); @@ -215,6 +221,10 @@ static HRESULT WINAPI ThreadMgr_QueryInterface(ITfThreadMgrEx *iface, REFIID iid { *ppvOut = &This->ITfThreadMgrEx_iface; } + else if (IsEqualIID(iid, &IID_ITfThreadMgr2)) + { + *ppvOut = &This->ITfThreadMgr2_iface; + } else if (IsEqualIID(iid, &IID_ITfSource)) { *ppvOut = &This->ITfSource_iface; @@ -581,6 +591,171 @@ static const ITfThreadMgrExVtbl ThreadMgrExVtbl = ThreadMgr_GetActiveFlags }; +static HRESULT WINAPI ThreadMgr2_QueryInterface(ITfThreadMgr2 *iface, REFIID iid, LPVOID *out) +{ + ThreadMgr *This = impl_from_ITfThreadMgr2(iface); + return ITfThreadMgrEx_QueryInterface(&This->ITfThreadMgrEx_iface, iid, out); +} + +static ULONG WINAPI ThreadMgr2_AddRef(ITfThreadMgr2 *iface) +{ + ThreadMgr *This = impl_from_ITfThreadMgr2(iface); + return ITfThreadMgrEx_AddRef(&This->ITfThreadMgrEx_iface); +} + +static ULONG WINAPI ThreadMgr2_Release(ITfThreadMgr2 *iface) +{ + ThreadMgr *This = impl_from_ITfThreadMgr2(iface); + return ITfThreadMgrEx_Release(&This->ITfThreadMgrEx_iface); +} + +static HRESULT WINAPI ThreadMgr2_Activate(ITfThreadMgr2 *iface, TfClientId *id) +{ + ThreadMgr *This = impl_from_ITfThreadMgr2(iface); + + TRACE("(%p, %p).\n", This, id); + + return ITfThreadMgrEx_Activate(&This->ITfThreadMgrEx_iface, id); +} + +static HRESULT WINAPI ThreadMgr2_Deactivate(ITfThreadMgr2 *iface) +{ + ThreadMgr *This = impl_from_ITfThreadMgr2(iface); + + TRACE("(%p).\n", This); + + return ITfThreadMgrEx_Deactivate(&This->ITfThreadMgrEx_iface); +} + +static HRESULT WINAPI ThreadMgr2_CreateDocumentMgr(ITfThreadMgr2 *iface, ITfDocumentMgr **manager) +{ + ThreadMgr *This = impl_from_ITfThreadMgr2(iface); + + TRACE("(%p, %p).\n", This, manager); + + return ITfThreadMgrEx_CreateDocumentMgr(&This->ITfThreadMgrEx_iface, manager); +} + +static HRESULT WINAPI ThreadMgr2_EnumDocumentMgrs(ITfThreadMgr2 *iface, IEnumTfDocumentMgrs **managers) +{ + ThreadMgr *This = impl_from_ITfThreadMgr2(iface); + + FIXME("(%p, %p): stub.\n", This, managers); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ThreadMgr2_GetFocus(ITfThreadMgr2 *iface, ITfDocumentMgr **focus) +{ + ThreadMgr *This = impl_from_ITfThreadMgr2(iface); + + FIXME("(%p, %p): stub.\n", This, focus); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ThreadMgr2_SetFocus(ITfThreadMgr2 *iface, ITfDocumentMgr *focus) +{ + ThreadMgr *This = impl_from_ITfThreadMgr2(iface); + + FIXME("(%p, %p): stub.\n", This, focus); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ThreadMgr2_IsThreadFocus(ITfThreadMgr2 *iface, BOOL *focus) +{ + ThreadMgr *This = impl_from_ITfThreadMgr2(iface); + + FIXME("(%p, %p): stub.\n", This, focus); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ThreadMgr2_GetFunctionProvider(ITfThreadMgr2 *iface, REFCLSID clsid, ITfFunctionProvider **provider) +{ + ThreadMgr *This = impl_from_ITfThreadMgr2(iface); + + FIXME("(%p, %p): stub.\n", This, provider); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ThreadMgr2_EnumFunctionProviders(ITfThreadMgr2 *iface, IEnumTfFunctionProviders **providers) +{ + ThreadMgr *This = impl_from_ITfThreadMgr2(iface); + + FIXME("(%p, %p): stub.\n", This, providers); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ThreadMgr2_GetGlobalCompartment(ITfThreadMgr2 *iface, ITfCompartmentMgr **compartment) +{ + ThreadMgr *This = impl_from_ITfThreadMgr2(iface); + + FIXME("(%p, %p): stub.\n", This, compartment); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ThreadMgr2_ActivateEx(ITfThreadMgr2 *iface, TfClientId *id, DWORD flags) +{ + ThreadMgr *This = impl_from_ITfThreadMgr2(iface); + + TRACE("(%p, %p, %x).\n", This, id, flags); + + return ITfThreadMgrEx_ActivateEx(&This->ITfThreadMgrEx_iface, id, flags); +} + +static HRESULT WINAPI ThreadMgr2_GetActiveFlags(ITfThreadMgr2 *iface, DWORD *flags) +{ + ThreadMgr *This = impl_from_ITfThreadMgr2(iface); + + FIXME("(%p, %p): stub.\n", This, flags); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ThreadMgr2_SuspendKeystrokeHandling(ITfThreadMgr2 *iface) +{ + ThreadMgr *This = impl_from_ITfThreadMgr2(iface); + + FIXME("(%p): stub.\n", This); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ThreadMgr2_ResumeKeystrokeHandling(ITfThreadMgr2 *iface) +{ + ThreadMgr *This = impl_from_ITfThreadMgr2(iface); + + FIXME("(%p): stub.\n", This); + + return E_NOTIMPL; +} + +static const ITfThreadMgr2Vtbl ThreadMgr2Vtbl = +{ + ThreadMgr2_QueryInterface, + ThreadMgr2_AddRef, + ThreadMgr2_Release, + ThreadMgr2_Activate, + ThreadMgr2_Deactivate, + ThreadMgr2_CreateDocumentMgr, + ThreadMgr2_EnumDocumentMgrs, + ThreadMgr2_GetFocus, + ThreadMgr2_SetFocus, + ThreadMgr2_IsThreadFocus, + ThreadMgr2_GetFunctionProvider, + ThreadMgr2_EnumFunctionProviders, + ThreadMgr2_GetGlobalCompartment, + ThreadMgr2_ActivateEx, + ThreadMgr2_GetActiveFlags, + ThreadMgr2_SuspendKeystrokeHandling, + ThreadMgr2_ResumeKeystrokeHandling, +}; + static HRESULT WINAPI Source_QueryInterface(ITfSource *iface, REFIID iid, LPVOID *ppvOut) { ThreadMgr *This = impl_from_ITfSource(iface); @@ -1351,6 +1526,7 @@ HRESULT ThreadMgr_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) return E_OUTOFMEMORY; This->ITfThreadMgrEx_iface.lpVtbl = &ThreadMgrExVtbl; + This->ITfThreadMgr2_iface.lpVtbl = &ThreadMgr2Vtbl; This->ITfSource_iface.lpVtbl = &ThreadMgrSourceVtbl; This->ITfKeystrokeMgr_iface.lpVtbl = &KeystrokeMgrVtbl; This->ITfMessagePump_iface.lpVtbl = &MessagePumpVtbl; diff --git a/include/msctf.idl b/include/msctf.idl index 5ef33119fd..8de62d0add 100644 --- a/include/msctf.idl +++ b/include/msctf.idl @@ -228,6 +228,29 @@ interface ITfThreadMgrEx : ITfThreadMgr [out] DWORD *flags); } +[ + object, + uuid(0ab198ef-6477-4ee8-8812-6780edb82d5e), + pointer_default(unique) +] +interface ITfThreadMgr2 : IUnknown +{ + HRESULT Activate([out] TfClientId *id); + HRESULT Deactivate(); + HRESULT CreateDocumentMgr([out] ITfDocumentMgr **manager); + HRESULT EnumDocumentMgrs([out] IEnumTfDocumentMgrs **managers); + HRESULT GetFocus([out] ITfDocumentMgr **focus); + HRESULT SetFocus([in] ITfDocumentMgr *focus); + HRESULT IsThreadFocus([out] BOOL *focus); + HRESULT GetFunctionProvider([in] REFCLSID clsid, [out] ITfFunctionProvider **provider); + HRESULT EnumFunctionProviders([out] IEnumTfFunctionProviders **providers); + HRESULT GetGlobalCompartment([out] ITfCompartmentMgr **compartment); + HRESULT ActivateEx([out] TfClientId *id, [in] DWORD flags); + HRESULT GetActiveFlags([out] DWORD *flags); + HRESULT SuspendKeystrokeHandling(); + HRESULT ResumeKeystrokeHandling(); +} + [ object, uuid(d7540241-f9a1-4364-befc-dbcd2c4395b7), -- 2.23.0

1 0

[PATCH 3/3] msscript.ocx: Fix VARIANT access.
by Jacek Caban 25 Sep '19

25 Sep '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/msscript.ocx/tests/msscript.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)

1 0

[PATCH 2/3] msscript.ocx/tests: Add tests for IScriptControl::ExecuteStatement.
by Jacek Caban 25 Sep '19

25 Sep '19

From: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/msscript.ocx/tests/msscript.c | 87 ++++++++++++++++++++++++++++++ 1 file changed, 87 insertions(+)

1 0

[PATCH 1/3] msscript.ocx: Partially implement IScriptControl::ExecuteStatement.
by Jacek Caban 25 Sep '19

25 Sep '19

From: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/msscript.ocx/msscript.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)

1 0

[PATCH] include: Add threadpoolapiset.h file.
by Jacek Caban 25 Sep '19

25 Sep '19

Based on patch by Hans Leidekker. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/threadpoolapiset.h | 65 ++++++++++++++++++++++++++++++++++++++ include/winbase.h | 29 +---------------- include/winnt.h | 1 - 3 files changed, 66 insertions(+), 29 deletions(-) create mode 100644 include/threadpoolapiset.h

1 0

[PATCH 3/3] webservices: Add support for mapped HTTP headers.
by Hans Leidekker 25 Sep '19

25 Sep '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/webservices/channel.c | 141 ++++++++++-- dlls/webservices/msg.c | 297 +++++++++++++++++++++---- dlls/webservices/proxy.c | 2 +- dlls/webservices/tests/proxy.c | 118 +++++++++- dlls/webservices/webservices.spec | 2 +- dlls/webservices/webservices_private.h | 3 +- 6 files changed, 501 insertions(+), 62 deletions(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index 4afa884820..71207bee6b 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -330,6 +330,26 @@ static void reset_channel( struct channel *channel ) } } +static void free_header_mappings( WS_HTTP_HEADER_MAPPING **mappings, ULONG count ) +{ + ULONG i; + for (i = 0; i < count; i++) heap_free( mappings[i] ); + heap_free( mappings ); +} + +static void free_message_mapping( const WS_HTTP_MESSAGE_MAPPING *mapping ) +{ + free_header_mappings( mapping->requestHeaderMappings, mapping->requestHeaderMappingCount ); + free_header_mappings( mapping->responseHeaderMappings, mapping->responseHeaderMappingCount ); +} + +static void free_props( struct channel *channel ) +{ + struct prop *prop = &channel->prop[WS_CHANNEL_PROPERTY_HTTP_MESSAGE_MAPPING]; + WS_HTTP_MESSAGE_MAPPING *mapping = (WS_HTTP_MESSAGE_MAPPING *)prop->value; + free_message_mapping( mapping ); +} + static void free_channel( struct channel *channel ) { reset_channel( channel ); @@ -338,6 +358,7 @@ static void free_channel( struct channel *channel ) WsFreeReader( channel->reader ); heap_free( channel->read_buf ); + free_props( channel ); channel->send_q.cs.DebugInfo->Spare[0] = 0; channel->recv_q.cs.DebugInfo->Spare[0] = 0; @@ -348,6 +369,58 @@ static void free_channel( struct channel *channel ) heap_free( channel ); } +static WS_HTTP_HEADER_MAPPING *dup_header_mapping( const WS_HTTP_HEADER_MAPPING *src ) +{ + WS_HTTP_HEADER_MAPPING *dst; + + if (!(dst = heap_alloc( sizeof(*dst) + src->headerName.length ))) return NULL; + + dst->headerName.bytes = (BYTE *)(dst + 1); + memcpy( dst->headerName.bytes, src->headerName.bytes, src->headerName.length ); + dst->headerName.length = src->headerName.length; + dst->headerMappingOptions = src->headerMappingOptions; + return dst; +} + +static HRESULT dup_message_mapping( const WS_HTTP_MESSAGE_MAPPING *src, WS_HTTP_MESSAGE_MAPPING *dst ) +{ + ULONG i, size; + + size = src->requestHeaderMappingCount * sizeof(*dst->responseHeaderMappings); + if (!(dst->requestHeaderMappings = heap_alloc( size ))) return E_OUTOFMEMORY; + + for (i = 0; i < src->requestHeaderMappingCount; i++) + { + if (!(dst->requestHeaderMappings[i] = dup_header_mapping( src->requestHeaderMappings[i] ))) + { + free_header_mappings( dst->requestHeaderMappings, i ); + return E_OUTOFMEMORY; + } + } + + size = src->responseHeaderMappingCount * sizeof(*dst->responseHeaderMappings); + if (!(dst->responseHeaderMappings = heap_alloc( size ))) + { + heap_free( dst->responseHeaderMappings ); + return E_OUTOFMEMORY; + } + + for (i = 0; i < src->responseHeaderMappingCount; i++) + { + if (!(dst->responseHeaderMappings[i] = dup_header_mapping( src->responseHeaderMappings[i] ))) + { + free_header_mappings( dst->responseHeaderMappings, i ); + return E_OUTOFMEMORY; + } + } + + dst->requestMappingOptions = src->requestMappingOptions; + dst->responseMappingOptions = src->responseMappingOptions; + dst->requestHeaderMappingCount = src->requestHeaderMappingCount; + dst->responseHeaderMappingCount = src->responseHeaderMappingCount; + return S_OK; +} + static HRESULT create_channel( WS_CHANNEL_TYPE type, WS_CHANNEL_BINDING binding, const WS_CHANNEL_PROPERTY *properties, ULONG count, struct channel **ret ) { @@ -390,25 +463,47 @@ static HRESULT create_channel( WS_CHANNEL_TYPE type, WS_CHANNEL_BINDING binding, for (i = 0; i < count; i++) { - TRACE( "property id %u value ptr %p size %u\n", properties[i].id, properties[i].value, - properties[i].valueSize ); - if (properties[i].valueSize == sizeof(ULONG) && properties[i].value) - TRACE( " value %08x\n", *(ULONG *)properties[i].value ); + const WS_CHANNEL_PROPERTY *prop = &properties[i]; + + TRACE( "property id %u value %p size %u\n", prop->id, prop->value, prop->valueSize ); + if (prop->valueSize == sizeof(ULONG) && prop->value) TRACE( " value %08x\n", *(ULONG *)prop->value ); - switch (properties[i].id) + switch (prop->id) { case WS_CHANNEL_PROPERTY_ENCODING: - if (!properties[i].value || properties[i].valueSize != sizeof(channel->encoding)) + if (!prop->value || prop->valueSize != sizeof(channel->encoding)) + { + free_channel( channel ); + return E_INVALIDARG; + } + channel->encoding = *(WS_ENCODING *)prop->value; + break; + + case WS_CHANNEL_PROPERTY_HTTP_MESSAGE_MAPPING: + { + const WS_HTTP_MESSAGE_MAPPING *src = (WS_HTTP_MESSAGE_MAPPING *)prop->value; + WS_HTTP_MESSAGE_MAPPING dst; + + if (!prop->value || prop->valueSize != sizeof(*src)) { free_channel( channel ); return E_INVALIDARG; } - channel->encoding = *(WS_ENCODING *)properties[i].value; + + if ((hr = dup_message_mapping( src, &dst )) != S_OK) return hr; + + if ((hr = prop_set( channel->prop, channel->prop_count, WS_CHANNEL_PROPERTY_HTTP_MESSAGE_MAPPING, &dst, + sizeof(dst) )) != S_OK) + { + free_message_mapping( &dst ); + free_channel( channel ); + return hr; + } break; + } default: - if ((hr = prop_set( channel->prop, channel->prop_count, properties[i].id, properties[i].value, - properties[i].valueSize )) != S_OK) + if ((hr = prop_set( channel->prop, channel->prop_count, prop->id, prop->value, prop->valueSize )) != S_OK) { free_channel( channel ); return hr; @@ -1517,13 +1612,27 @@ static HRESULT init_reader( struct channel *channel ) return WsSetInput( channel->reader, encoding, input, NULL, 0, NULL ); } +static const WS_HTTP_MESSAGE_MAPPING *get_http_message_mapping( struct channel *channel ) +{ + const struct prop *prop = &channel->prop[WS_CHANNEL_PROPERTY_HTTP_MESSAGE_MAPPING]; + return (const WS_HTTP_MESSAGE_MAPPING *)prop->value; +} + +static HRESULT map_http_response_headers( struct channel *channel, WS_MESSAGE *msg ) +{ + const WS_HTTP_MESSAGE_MAPPING *mapping = get_http_message_mapping( channel ); + return message_map_http_response_headers( msg, channel->u.http.request, mapping ); +} + #define INITIAL_READ_BUFFER_SIZE 4096 -static HRESULT receive_message_http( struct channel *channel ) +static HRESULT receive_message_http( struct channel *channel, WS_MESSAGE *msg ) { DWORD len, bytes_read, offset = 0, size = INITIAL_READ_BUFFER_SIZE; ULONG max_len; HRESULT hr; + if ((hr = map_http_response_headers( channel, msg )) != S_OK) return hr; + prop_get( channel->prop, channel->prop_count, WS_CHANNEL_PROPERTY_MAX_BUFFERED_MESSAGE_SIZE, &max_len, sizeof(max_len) ); @@ -1814,7 +1923,7 @@ static HRESULT receive_message_session( struct channel *channel ) return S_OK; } -static HRESULT receive_message_bytes( struct channel *channel ) +static HRESULT receive_message_bytes( struct channel *channel, WS_MESSAGE *msg ) { HRESULT hr; if ((hr = connect_channel( channel )) != S_OK) return hr; @@ -1822,7 +1931,7 @@ static HRESULT receive_message_bytes( struct channel *channel ) switch (channel->binding) { case WS_HTTP_CHANNEL_BINDING: - return receive_message_http( channel ); + return receive_message_http( channel, msg ); case WS_TCP_CHANNEL_BINDING: if (channel->type & WS_CHANNEL_TYPE_SESSION) @@ -1853,7 +1962,7 @@ static HRESULT receive_message_bytes( struct channel *channel ) } } -HRESULT channel_receive_message( WS_CHANNEL *handle ) +HRESULT channel_receive_message( WS_CHANNEL *handle, WS_MESSAGE *msg ) { struct channel *channel = (struct channel *)handle; HRESULT hr; @@ -1866,7 +1975,7 @@ HRESULT channel_receive_message( WS_CHANNEL *handle ) return E_INVALIDARG; } - if ((hr = receive_message_bytes( channel )) == S_OK) hr = init_reader( channel ); + if ((hr = receive_message_bytes( channel, msg )) == S_OK) hr = init_reader( channel ); LeaveCriticalSection( &channel->cs ); return hr; @@ -1906,7 +2015,7 @@ static HRESULT receive_message( struct channel *channel, WS_MESSAGE *msg, const HRESULT hr; ULONG i; - if ((hr = receive_message_bytes( channel )) != S_OK) return hr; + if ((hr = receive_message_bytes( channel, msg )) != S_OK) return hr; if ((hr = init_reader( channel )) != S_OK) return hr; for (i = 0; i < count; i++) @@ -2148,7 +2257,7 @@ HRESULT WINAPI WsReadMessageStart( WS_CHANNEL *handle, WS_MESSAGE *msg, const WS return E_INVALIDARG; } - if ((hr = receive_message_bytes( channel )) == S_OK) + if ((hr = receive_message_bytes( channel, msg )) == S_OK) { if ((hr = init_reader( channel )) == S_OK) hr = WsReadEnvelopeStart( msg, channel->reader, NULL, NULL, NULL ); diff --git a/dlls/webservices/msg.c b/dlls/webservices/msg.c index d6906cb5de..a006841be6 100644 --- a/dlls/webservices/msg.c +++ b/dlls/webservices/msg.c @@ -652,6 +652,16 @@ static HRESULT write_headers( struct msg *msg, WS_XML_WRITER *writer, const WS_X return WsWriteEndElement( writer, NULL ); /* </s:Header> */ } +static ULONG count_envelope_headers( struct msg *msg ) +{ + ULONG i, ret = 0; + for (i = 0; i < msg->header_count; i++) + { + if (!msg->header[i]->mapped) ret++; + } + return ret; +} + static HRESULT write_headers_transport( struct msg *msg, WS_XML_WRITER *writer, const WS_XML_STRING *prefix, const WS_XML_STRING *ns ) { @@ -659,16 +669,19 @@ static HRESULT write_headers_transport( struct msg *msg, WS_XML_WRITER *writer, HRESULT hr = S_OK; ULONG i; - if ((msg->header_count || !msg->action) && - (hr = WsWriteStartElement( writer, prefix, &header, ns, NULL )) != S_OK) return hr; - - for (i = 0; i < msg->header_count; i++) + if (count_envelope_headers( msg ) || !msg->action) { - if (msg->header[i]->mapped) continue; - if ((hr = WsWriteXmlBuffer( writer, msg->header[i]->u.buf, NULL )) != S_OK) return hr; + if ((hr = WsWriteStartElement( writer, prefix, &header, ns, NULL )) != S_OK) return hr; + + for (i = 0; i < msg->header_count; i++) + { + if (msg->header[i]->mapped) continue; + if ((hr = WsWriteXmlBuffer( writer, msg->header[i]->u.buf, NULL )) != S_OK) return hr; + } + + hr = WsWriteEndElement( writer, NULL ); /* </s:Header> */ } - if (msg->header_count || !msg->action) hr = WsWriteEndElement( writer, NULL ); /* </s:Header> */ return hr; } @@ -1435,37 +1448,14 @@ static HRESULT build_mapped_header( const WS_XML_STRING *name, WS_TYPE type, WS_ return S_OK; } -/************************************************************************** - * WsAddMappedHeader [webservices.@] - */ -HRESULT WINAPI WsAddMappedHeader( WS_MESSAGE *handle, const WS_XML_STRING *name, WS_TYPE type, - WS_WRITE_OPTION option, const void *value, ULONG size, WS_ERROR *error ) +static HRESULT add_mapped_header( struct msg *msg, const WS_XML_STRING *name, WS_TYPE type, + WS_WRITE_OPTION option, const void *value, ULONG size ) { - struct msg *msg = (struct msg *)handle; struct header *header; BOOL found = FALSE; HRESULT hr; ULONG i; - TRACE( "%p %s %u %08x %p %u %p\n", handle, debugstr_xmlstr(name), type, option, value, size, error ); - if (error) FIXME( "ignoring error parameter\n" ); - - if (!msg || !name) return E_INVALIDARG; - - EnterCriticalSection( &msg->cs ); - - if (msg->magic != MSG_MAGIC) - { - LeaveCriticalSection( &msg->cs ); - return E_INVALIDARG; - } - - if (msg->state < WS_MESSAGE_STATE_INITIALIZED) - { - hr = WS_E_INVALID_OPERATION; - goto done; - } - for (i = 0; i < msg->header_count; i++) { if (msg->header[i]->type || !msg->header[i]->mapped) continue; @@ -1478,18 +1468,44 @@ HRESULT WINAPI WsAddMappedHeader( WS_MESSAGE *handle, const WS_XML_STRING *name, if (!found) { - if ((hr = grow_header_array( msg, msg->header_count + 1 )) != S_OK) goto done; + if ((hr = grow_header_array( msg, msg->header_count + 1 )) != S_OK) return hr; i = msg->header_count; } - if ((hr = build_mapped_header( name, type, option, value, size, &header )) != S_OK) goto done; + if ((hr = build_mapped_header( name, type, option, value, size, &header )) != S_OK) return hr; if (!found) msg->header_count++; else free_header( msg->header[i] ); msg->header[i] = header; + return S_OK; +} + +/************************************************************************** + * WsAddMappedHeader [webservices.@] + */ +HRESULT WINAPI WsAddMappedHeader( WS_MESSAGE *handle, const WS_XML_STRING *name, WS_TYPE type, + WS_WRITE_OPTION option, const void *value, ULONG size, WS_ERROR *error ) +{ + struct msg *msg = (struct msg *)handle; + HRESULT hr; + + TRACE( "%p %s %u %08x %p %u %p\n", handle, debugstr_xmlstr(name), type, option, value, size, error ); + if (error) FIXME( "ignoring error parameter\n" ); + + if (!msg || !name) return E_INVALIDARG; + + EnterCriticalSection( &msg->cs ); + + if (msg->magic != MSG_MAGIC) + { + LeaveCriticalSection( &msg->cs ); + return E_INVALIDARG; + } + + if (msg->state < WS_MESSAGE_STATE_INITIALIZED) hr = WS_E_INVALID_OPERATION; + else hr = add_mapped_header( msg, name, type, option, value, size ); -done: LeaveCriticalSection( &msg->cs ); TRACE( "returning %08x\n", hr ); return hr; @@ -1536,6 +1552,111 @@ HRESULT WINAPI WsRemoveMappedHeader( WS_MESSAGE *handle, const WS_XML_STRING *na return hr; } +static HRESULT xmlstring_to_wsz( const WS_XML_STRING *str, WS_HEAP *heap, WCHAR **ret ) +{ + int len = MultiByteToWideChar( CP_UTF8, 0, (char *)str->bytes, str->length, NULL, 0 ); + if (!(*ret = ws_alloc( heap, (len + 1) * sizeof(WCHAR) ))) return WS_E_QUOTA_EXCEEDED; + MultiByteToWideChar( CP_UTF8, 0, (char *)str->bytes, str->length, *ret, len ); + (*ret)[len] = 0; + return S_OK; +} + +static HRESULT get_header_value_wsz( struct header *header, WS_READ_OPTION option, WS_HEAP *heap, WCHAR **ret, + ULONG size ) +{ + WCHAR *str = NULL; + HRESULT hr; + + if (header && (hr = xmlstring_to_wsz( header->u.text, heap, &str )) != S_OK) return hr; + + switch (option) + { + case WS_READ_REQUIRED_POINTER: + if (!str && !(str = ws_alloc_zero( heap, sizeof(*str) ))) return WS_E_QUOTA_EXCEEDED; + /* fall through */ + + case WS_READ_OPTIONAL_POINTER: + case WS_READ_NILLABLE_POINTER: + if (size != sizeof(str)) return E_INVALIDARG; + *ret = str; + break; + + default: + FIXME( "read option %u not supported\n", option ); + return E_NOTIMPL; + } + + return S_OK; +} + +static HRESULT get_mapped_header( struct msg *msg, const WS_XML_STRING *name, WS_TYPE type, WS_READ_OPTION option, + WS_HEAP *heap, void *value, ULONG size ) +{ + struct header *header = NULL; + HRESULT hr; + ULONG i; + + for (i = 0; i < msg->header_count; i++) + { + if (msg->header[i]->type || !msg->header[i]->mapped) continue; + if (WsXmlStringEquals( name, &msg->header[i]->name, NULL ) == S_OK) + { + header = msg->header[i]; + break; + } + } + + switch (type) + { + case WS_WSZ_TYPE: + hr = get_header_value_wsz( header, option, heap, value, size ); + break; + + default: + FIXME( "type %u not supported\n", option ); + return WS_E_NOT_SUPPORTED; + } + + return hr; +} + +/************************************************************************** + * WsGetMappedHeader [webservices.@] + */ +HRESULT WINAPI WsGetMappedHeader( WS_MESSAGE *handle, const WS_XML_STRING *name, WS_REPEATING_HEADER_OPTION option, + ULONG index, WS_TYPE type, WS_READ_OPTION read_option, WS_HEAP *heap, void *value, + ULONG size, WS_ERROR *error ) +{ + struct msg *msg = (struct msg *)handle; + HRESULT hr; + + TRACE( "%p %s %u %u %u %u %p %p %u %p\n", handle, debugstr_xmlstr(name), option, index, type, read_option, + heap, value, size, error ); + if (error) FIXME( "ignoring error parameter\n" ); + if (option != WS_SINGLETON_HEADER) + { + FIXME( "option %u not supported\n", option ); + return E_NOTIMPL; + } + + if (!msg || !name) return E_INVALIDARG; + + EnterCriticalSection( &msg->cs ); + + if (msg->magic != MSG_MAGIC) + { + LeaveCriticalSection( &msg->cs ); + return E_INVALIDARG; + } + + if (msg->state < WS_MESSAGE_STATE_INITIALIZED) hr = WS_E_INVALID_OPERATION; + else hr = get_mapped_header( msg, name, type, read_option, heap, value, size ); + + LeaveCriticalSection( &msg->cs ); + TRACE( "returning %08x\n", hr ); + return hr; +} + static HRESULT write_custom_header( WS_XML_WRITER *writer, const WS_XML_STRING *name, const WS_XML_STRING *ns, WS_TYPE type, const void *desc, WS_WRITE_OPTION option, const void *value, ULONG size ) @@ -1717,10 +1838,12 @@ HRESULT WINAPI WsRemoveCustomHeader( WS_MESSAGE *handle, const WS_XML_STRING *na static WCHAR *build_http_header( const WCHAR *name, const WCHAR *value, ULONG *ret_len ) { int len_name = lstrlenW( name ), len_value = lstrlenW( value ); - WCHAR *ret = heap_alloc( (len_name + len_value) * sizeof(WCHAR) ); + WCHAR *ret = heap_alloc( (len_name + len_value + 2) * sizeof(WCHAR) ); if (!ret) return NULL; memcpy( ret, name, len_name * sizeof(WCHAR) ); + ret[len_name++] = ':'; + ret[len_name++] = ' '; memcpy( ret + len_name, value, len_value * sizeof(WCHAR) ); *ret_len = len_name + len_value; return ret; @@ -1732,10 +1855,48 @@ static inline HRESULT insert_http_header( HINTERNET req, const WCHAR *header, UL return HRESULT_FROM_WIN32( GetLastError() ); } +static WCHAR *from_xml_string( const WS_XML_STRING *str ) +{ + WCHAR *ret; + int len = MultiByteToWideChar( CP_UTF8, 0, (char *)str->bytes, str->length, NULL, 0 ); + if (!(ret = heap_alloc( (len + 1) * sizeof(*ret) ))) return NULL; + MultiByteToWideChar( CP_UTF8, 0, (char *)str->bytes, str->length, ret, len ); + ret[len] = 0; + return ret; +} + +static HRESULT insert_mapped_headers( struct msg *msg, HINTERNET req ) +{ + WCHAR *name, *value, *header; + ULONG i, len; + HRESULT hr; + + for (i = 0; i < msg->header_count; i++) + { + if (!msg->header[i]->mapped) continue; + + if (!(name = from_xml_string( &msg->header[i]->name ))) return E_OUTOFMEMORY; + if (!(value = from_xml_string( msg->header[i]->u.text ))) + { + heap_free( name ); + return E_OUTOFMEMORY; + } + header = build_http_header( name, value, &len ); + heap_free( name ); + heap_free( value ); + if (!header) return E_OUTOFMEMORY; + + hr = insert_http_header( req, header, len, WINHTTP_ADDREQ_FLAG_ADD|WINHTTP_ADDREQ_FLAG_REPLACE ); + heap_free( header ); + if (hr != S_OK) return hr; + } + return S_OK; +} + HRESULT message_insert_http_headers( WS_MESSAGE *handle, HINTERNET req ) { static const WCHAR contenttypeW[] = - {'C','o','n','t','e','n','t','-','T','y','p','e',':',' ',0}; + {'C','o','n','t','e','n','t','-','T','y','p','e',0}; static const WCHAR soapxmlW[] = {'a','p','p','l','i','c','a','t','i','o','n','/','s','o','a','p','+','x','m','l',0}; static const WCHAR textxmlW[] = @@ -1785,7 +1946,7 @@ HRESULT message_insert_http_headers( WS_MESSAGE *handle, HINTERNET req ) { case WS_ENVELOPE_VERSION_SOAP_1_1: { - static const WCHAR soapactionW[] = {'S','O','A','P','A','c','t','i','o','n',':',' ',0}; + static const WCHAR soapactionW[] = {'S','O','A','P','A','c','t','i','o','n',0}; if (!(len = MultiByteToWideChar( CP_UTF8, 0, (char *)msg->action->bytes, msg->action->length, NULL, 0 ))) break; @@ -1832,6 +1993,8 @@ HRESULT message_insert_http_headers( WS_MESSAGE *handle, HINTERNET req ) hr = E_NOTIMPL; } + if (hr == S_OK) hr = insert_mapped_headers( msg, req ); + done: heap_free( header ); LeaveCriticalSection( &msg->cs ); @@ -1839,6 +2002,64 @@ done: return hr; } +static HRESULT map_http_response_headers( struct msg *msg, HINTERNET req, const WS_HTTP_MESSAGE_MAPPING *mapping ) +{ + ULONG i; + for (i = 0; i < mapping->responseHeaderMappingCount; i++) + { + WCHAR *name, *value; + DWORD size; + + if (!(name = from_xml_string( &mapping->responseHeaderMappings[i]->headerName ))) return E_OUTOFMEMORY; + + if (!WinHttpQueryHeaders( req, WINHTTP_QUERY_CUSTOM, name, NULL, &size, NULL ) && + GetLastError() == ERROR_INSUFFICIENT_BUFFER) + { + HRESULT hr; + if (!(value = heap_alloc( size ))) + { + heap_free( name ); + return E_OUTOFMEMORY; + } + if (!WinHttpQueryHeaders( req, WINHTTP_QUERY_CUSTOM, name, value, &size, NULL )) + { + heap_free( name ); + return HRESULT_FROM_WIN32( GetLastError() ); + } + hr = add_mapped_header( msg, &mapping->responseHeaderMappings[i]->headerName, WS_WSZ_TYPE, + WS_WRITE_REQUIRED_POINTER, &value, sizeof(value) ); + heap_free( value ); + if (hr != S_OK) + { + heap_free( name ); + return hr; + } + } + heap_free( name ); + } + return S_OK; +} + +HRESULT message_map_http_response_headers( WS_MESSAGE *handle, HINTERNET req, const WS_HTTP_MESSAGE_MAPPING *mapping ) +{ + struct msg *msg = (struct msg *)handle; + HRESULT hr; + + EnterCriticalSection( &msg->cs ); + + if (msg->magic != MSG_MAGIC) + { + LeaveCriticalSection( &msg->cs ); + return E_INVALIDARG; + } + + hr = map_http_response_headers( msg, req, mapping ); + + LeaveCriticalSection( &msg->cs ); + TRACE( "returning %08x\n", hr ); + return hr; +} + void message_set_send_context( WS_MESSAGE *handle, const WS_PROXY_MESSAGE_CALLBACK_CONTEXT *ctx ) { struct msg *msg = (struct msg *)handle; diff --git a/dlls/webservices/proxy.c b/dlls/webservices/proxy.c index b07b3c7a26..b6278a6354 100644 --- a/dlls/webservices/proxy.c +++ b/dlls/webservices/proxy.c @@ -455,7 +455,7 @@ static HRESULT receive_message( WS_CHANNEL *channel, WS_MESSAGE *msg, WS_MESSAGE HRESULT hr; if ((hr = message_set_action( msg, desc->action )) != S_OK) return hr; - if ((hr = channel_receive_message( channel )) != S_OK) return hr; + if ((hr = channel_receive_message( channel, msg )) != S_OK) return hr; if ((hr = channel_get_reader( channel, &reader )) != S_OK) return hr; return read_message( msg, reader, heap, desc->bodyElementDescription, params, count, args ); } diff --git a/dlls/webservices/tests/proxy.c b/dlls/webservices/tests/proxy.c index 3fe92367e9..07610ac70e 100644 --- a/dlls/webservices/tests/proxy.c +++ b/dlls/webservices/tests/proxy.c @@ -361,13 +361,34 @@ static void test_WsReceiveMessage( int port ) WsFreeMessage( msg ); } +static WS_HTTP_HEADER_MAPPING mapped_request_header = +{ + {19, (BYTE *)"MappedRequestHeader"} +}; + +static WS_HTTP_HEADER_MAPPING *request_header_mappings[] = +{ + &mapped_request_header +}; + +static WS_HTTP_HEADER_MAPPING mapped_response_header = +{ + {20, (BYTE *)"MappedResponseHeader"} +}; + +static WS_HTTP_HEADER_MAPPING *response_header_mappings[] = +{ + &mapped_response_header +}; + static HRESULT create_proxy( int port, WS_SERVICE_PROXY **ret ) { static const WCHAR fmt[] = {'h','t','t','p',':','/','/','1','2','7','.','0','.','0','.','1',':','%','u','/',0}; WS_ENVELOPE_VERSION env_version; WS_ADDRESSING_VERSION addr_version; - WS_CHANNEL_PROPERTY prop[2]; + WS_HTTP_MESSAGE_MAPPING mapping; + WS_CHANNEL_PROPERTY prop[3]; WS_ENDPOINT_ADDRESS addr; WS_SERVICE_PROXY *proxy; WCHAR url[64]; @@ -383,6 +404,17 @@ static HRESULT create_proxy( int port, WS_SERVICE_PROXY **ret ) prop[1].value = &addr_version; prop[1].valueSize = sizeof(addr_version); + mapping.requestMappingOptions = 0; + mapping.responseMappingOptions = 0; + mapping.requestHeaderMappings = request_header_mappings; + mapping.requestHeaderMappingCount = ARRAY_SIZE(request_header_mappings); + mapping.responseHeaderMappings = response_header_mappings; + mapping.responseHeaderMappingCount = ARRAY_SIZE(response_header_mappings); + + prop[2].id = WS_CHANNEL_PROPERTY_HTTP_MESSAGE_MAPPING; + prop[2].value = &mapping; + prop[2].valueSize = sizeof(mapping); + *ret = NULL; hr = WsCreateServiceProxy( WS_CHANNEL_TYPE_REQUEST, WS_HTTP_CHANNEL_BINDING, NULL, NULL, 0, prop, ARRAY_SIZE( prop ), &proxy, NULL ); @@ -397,6 +429,38 @@ static HRESULT create_proxy( int port, WS_SERVICE_PROXY **ret ) return hr; } +static HRESULT set_output( WS_XML_WRITER *writer ) +{ + WS_XML_WRITER_TEXT_ENCODING text = {{ WS_XML_WRITER_ENCODING_TYPE_TEXT }, WS_CHARSET_UTF8 }; + WS_XML_WRITER_BUFFER_OUTPUT buf = {{ WS_XML_WRITER_OUTPUT_TYPE_BUFFER }}; + return WsSetOutput( writer, &text.encoding, &buf.output, NULL, 0, NULL ); +} + +static void check_output_headers( WS_MESSAGE *msg ) +{ + WS_XML_WRITER *writer; + WS_XML_BUFFER *buf; + WS_BYTES bytes; + HRESULT hr; + + hr = WsCreateWriter( NULL, 0, &writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsGetMessageProperty( msg, WS_MESSAGE_PROPERTY_HEADER_BUFFER, &buf, sizeof(buf), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteXmlBuffer( writer, buf, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + memset( &bytes, 0, sizeof(bytes) ); + hr = WsGetWriterProperty( writer, WS_XML_WRITER_PROPERTY_BYTES, &bytes, sizeof(bytes), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + WsFreeWriter( writer ); +} + static const char req_test2[] = "<s:Envelope xmlns:s=\"http://schemas.xmlsoap.org/soap/envelope/\"><s:Body>" "<req_test2 xmlns=\"ns\"><val>1</val><str>test</str><str>test2</str></req_test2>" @@ -407,6 +471,32 @@ static const char resp_test2[] = "<resp_test2 xmlns=\"ns\"><str>test</str><val>1</val><val>2</val></resp_test2>" "</s:Body></s:Envelope>"; +static HRESULT CALLBACK send_callback( WS_MESSAGE *msg, WS_HEAP *heap, void *state, WS_ERROR *error ) +{ + static const WS_XML_STRING header = {19, (BYTE *)"MappedRequestHeader"}, value = {5, (BYTE *)"value"}; + HRESULT hr; + + hr = WsAddMappedHeader( msg, &header, WS_XML_STRING_TYPE, WS_WRITE_REQUIRED_VALUE, &value, sizeof(value), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output_headers( msg ); + return S_OK; +} + +static HRESULT CALLBACK recv_callback( WS_MESSAGE *msg, WS_HEAP *heap, void *state, WS_ERROR *error ) +{ + static const WS_XML_STRING header = {20, (BYTE *)"MappedResponseHeader"}; + static const WCHAR valueW[] = {'v','a','l','u','e',0}; + WCHAR *str; + HRESULT hr; + + check_output_headers( msg ); + hr = WsGetMappedHeader( msg, &header, WS_SINGLETON_HEADER, 0, WS_WSZ_TYPE, WS_READ_OPTIONAL_POINTER, heap, + &str, sizeof(str), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !lstrcmpW(str, valueW), "wrong value %s\n", wine_dbgstr_w(str) ); + return S_OK; +} + static void test_WsCall( int port ) { static const WCHAR testW[] = {'t','e','s','t',0}, test2W[] = {'t','e','s','t','2',0}; @@ -421,6 +511,9 @@ static void test_WsCall( int port ) WS_XML_STRING ns = {2, (BYTE *)"ns"}; HRESULT hr; WS_SERVICE_PROXY *proxy; + WS_PROXY_MESSAGE_CALLBACK_CONTEXT ctx_send; + WS_PROXY_MESSAGE_CALLBACK_CONTEXT ctx_recv; + WS_CALL_PROPERTY prop[2]; WS_OPERATION_DESCRIPTION op; WS_MESSAGE_DESCRIPTION input_msg, output_msg; WS_ELEMENT_DESCRIPTION input_elem, output_elem; @@ -511,7 +604,21 @@ static void test_WsCall( int port ) args[4] = &val_ptr; args[5] = &count_ptr; - hr = WsCall( proxy, &op, args, heap, NULL, 0, NULL, NULL ); + ctx_send.callback = send_callback; + ctx_send.state = NULL; + + prop[0].id = WS_CALL_PROPERTY_SEND_MESSAGE_CONTEXT; + prop[0].value = &ctx_send; + prop[0].valueSize = sizeof(ctx_send); + + ctx_recv.callback = recv_callback; + ctx_recv.state = NULL; + + prop[1].id = WS_CALL_PROPERTY_RECEIVE_MESSAGE_CONTEXT; + prop[1].value = &ctx_recv; + prop[1].valueSize = sizeof(ctx_recv); + + hr = WsCall( proxy, &op, args, heap, prop, ARRAY_SIZE(prop), NULL, NULL ); ok( hr == S_OK, "got %08x\n", hr ); ok( !lstrcmpW( out.str, testW ), "wrong data\n" ); ok( out.count == 2, "got %u\n", out.count ); @@ -616,7 +723,7 @@ tests[] = static void send_response( int c, const char *status, const char *data, unsigned int len ) { static const char headers[] = - "Content-Type: text/xml; charset=utf-8\r\nConnection: close\r\n"; + "Content-Type: text/xml; charset=utf-8\r\nConnection: close\r\nMappedResponseHeader: value\r\n"; static const char fmt[] = "Content-Length: %u\r\n\r\n"; char buf[128]; @@ -694,10 +801,11 @@ static DWORD CALLBACK server_proc( void *arg ) if (tests[j].req_data) { int data_len = strlen( buf ); - ok( tests[j].req_len == data_len, "%u: unexpected data length %u %u\n", + ok( tests[j].req_len == data_len, "%u: got data length %u expected %u\n", j, data_len, tests[j].req_len ); if (tests[j].req_len == data_len) - ok( !memcmp( tests[j].req_data, buf, tests[j].req_len ), "%u: unexpected data %s\n", j, buf ); + ok( !memcmp( tests[j].req_data, buf, tests[j].req_len ), + "%u: got data '%s' expected '%s'\n", j, buf, tests[j].req_data ); } send_response( c, tests[j].resp_status, tests[j].resp_data, tests[j].resp_len ); break; diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index c8db3a0375..3fe1f4d427 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -70,7 +70,7 @@ @ stub WsGetHeaderAttributes @ stdcall WsGetHeapProperty(ptr long ptr long ptr) @ stdcall WsGetListenerProperty(ptr long ptr long ptr) -@ stub WsGetMappedHeader +@ stdcall WsGetMappedHeader(ptr ptr long long long long ptr ptr long ptr) @ stdcall WsGetMessageProperty(ptr long ptr long ptr) @ stub WsGetMetadataEndpoints @ stub WsGetMetadataProperty diff --git a/dlls/webservices/webservices_private.h b/dlls/webservices/webservices_private.h index 6a6f65dbec..9ca470c82b 100644 --- a/dlls/webservices/webservices_private.h +++ b/dlls/webservices/webservices_private.h @@ -161,9 +161,10 @@ void message_set_receive_context( WS_MESSAGE *, const WS_PROXY_MESSAGE_CALLBACK_ void message_do_send_callback( WS_MESSAGE * ) DECLSPEC_HIDDEN; void message_do_receive_callback( WS_MESSAGE * ) DECLSPEC_HIDDEN; HRESULT message_insert_http_headers( WS_MESSAGE *, HINTERNET ) DECLSPEC_HIDDEN; +HRESULT message_map_http_response_headers( WS_MESSAGE *, HINTERNET, const WS_HTTP_MESSAGE_MAPPING * ) DECLSPEC_HIDDEN; HRESULT channel_send_message( WS_CHANNEL *, WS_MESSAGE * ) DECLSPEC_HIDDEN; -HRESULT channel_receive_message( WS_CHANNEL * ) DECLSPEC_HIDDEN; +HRESULT channel_receive_message( WS_CHANNEL *, WS_MESSAGE * ) DECLSPEC_HIDDEN; HRESULT channel_get_reader( WS_CHANNEL *, WS_XML_READER ** ) DECLSPEC_HIDDEN; HRESULT parse_url( const WS_STRING *, WS_URL_SCHEME_TYPE *, WCHAR **, USHORT * ) DECLSPEC_HIDDEN; -- 2.20.1

1 0

[PATCH 2/3] webservices: Add support for writing WS_ENUM_TYPE values.
by Hans Leidekker 25 Sep '19

25 Sep '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/webservices/tests/writer.c | 35 +++++++++++++++++++++++++++++++++ dlls/webservices/writer.c | 32 ++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+) diff --git a/dlls/webservices/tests/writer.c b/dlls/webservices/tests/writer.c index 905f397b64..18c4b7e284 100644 --- a/dlls/webservices/tests/writer.c +++ b/dlls/webservices/tests/writer.c @@ -553,6 +553,11 @@ static void test_WsWriteType(void) WS_XML_WRITER *writer; WS_XML_STRING prefix = {1, (BYTE*)"p"}, localname = {3, (BYTE *)"str"}, ns = {2, (BYTE *)"ns"}; const WCHAR *val_str; + enum {ONE = 1, TWO = 2}; + WS_XML_STRING one = {3, (BYTE *)"ONE" }, two = {3, (BYTE *)"TWO"}; + WS_ENUM_VALUE enum_values[] = {{ONE, &one}, {TWO, &two}}; + WS_ENUM_DESCRIPTION enum_desc; + int val_enum; hr = WsCreateWriter( NULL, 0, &writer, NULL ); ok( hr == S_OK, "got %08x\n", hr ); @@ -637,6 +642,36 @@ static void test_WsWriteType(void) ok( hr == S_OK, "got %08x\n", hr ); check_output( writer, "<p:str xmlns:p=\"ns\">test</p:str>", __LINE__ ); + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteStartElement( writer, &prefix, &localname, &ns, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + enum_desc.values = enum_values; + enum_desc.valueCount = ARRAY_SIZE(enum_values); + enum_desc.maxByteCount = 3; + enum_desc.nameIndices = NULL; + + val_enum = 0; + hr = WsWriteType( writer, WS_ELEMENT_TYPE_MAPPING, WS_ENUM_TYPE, &enum_desc, + WS_WRITE_REQUIRED_VALUE, &val_enum, sizeof(val_enum), NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + val_enum = 3; + hr = WsWriteType( writer, WS_ELEMENT_TYPE_MAPPING, WS_ENUM_TYPE, &enum_desc, + WS_WRITE_REQUIRED_VALUE, &val_enum, sizeof(val_enum), NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + val_enum = ONE; + hr = WsWriteType( writer, WS_ELEMENT_TYPE_MAPPING, WS_ENUM_TYPE, &enum_desc, + WS_WRITE_REQUIRED_VALUE, &val_enum, sizeof(val_enum), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteEndElement( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, "<p:str xmlns:p=\"ns\">ONE</p:str>", __LINE__ ); + WsFreeWriter( writer ); } diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 4d75e859d0..f750859fbc 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -3876,6 +3876,35 @@ static HRESULT write_type_struct( struct writer *writer, WS_TYPE_MAPPING mapping return S_OK; } +static const WS_XML_STRING *get_enum_value_name( const WS_ENUM_DESCRIPTION *desc, int value ) +{ + ULONG i; + for (i = 0; i < desc->valueCount; i++) + { + if (desc->values[i].value == value) return desc->values[i].name; + } + return NULL; +} + +static HRESULT write_type_enum( struct writer *writer, WS_TYPE_MAPPING mapping, + const WS_ENUM_DESCRIPTION *desc, WS_WRITE_OPTION option, + const void *value, ULONG size ) +{ + const WS_XML_STRING *name; + WS_XML_UTF8_TEXT utf8; + const int *ptr; + HRESULT hr; + + if (!desc) return E_INVALIDARG; + if ((hr = get_value_ptr( option, value, size, sizeof(*ptr), (const void **)&ptr )) != S_OK) return hr; + if (!(name = get_enum_value_name( desc, *ptr ))) return E_INVALIDARG; + + utf8.text.textType = WS_XML_TEXT_TYPE_UTF8; + utf8.value.bytes = name->bytes; + utf8.value.length = name->length; + return write_type_text( writer, mapping, &utf8.text ); +} + static HRESULT write_type( struct writer *writer, WS_TYPE_MAPPING mapping, WS_TYPE type, const void *desc, WS_WRITE_OPTION option, const void *value, ULONG size ) @@ -3939,6 +3968,9 @@ static HRESULT write_type( struct writer *writer, WS_TYPE_MAPPING mapping, WS_TY case WS_STRUCT_TYPE: return write_type_struct( writer, mapping, desc, option, value, size ); + case WS_ENUM_TYPE: + return write_type_enum( writer, mapping, desc, option, value, size ); + default: FIXME( "type %u not supported\n", type ); return E_NOTIMPL; -- 2.20.1

1 0