December 2019 - Wine-Devel - list.winehq.org

[PATCH] vbscript: Don't free procs allocated in the heap pool.
by Gabriel Ivăncescu Dec. 9, 2019

Dec. 9, 2019

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- As far as I can see, these procs are allocated in compiler.c into the vbscode's heap pool, and freeing them with heap_free is obviously wrong. dlls/vbscript/vbdisp.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index 2e59051..47ecc15 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -1002,13 +1002,6 @@ static ULONG WINAPI ScriptDisp_Release(IDispatchEx *iface) if(!ref) { assert(!This->ctx); - while (This->procs) - { - class_desc_t *class_desc = This->procs; - This->procs = class_desc->next; - heap_free(class_desc); - } - for (i = 0; i < This->global_vars_cnt; i++) release_dynamic_var(This->global_vars[i]); -- 2.21.0

2 1

[PATCH 2/2] mshtml: Support loading Gecko from global location.
by Jacek Caban Dec. 9, 2019

Dec. 9, 2019

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/Makefile.in | 2 ++ dlls/mshtml/nsembed.c | 70 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 72 insertions(+)

2 1

[PATCH 1/2] mshtml: Refactor Gecko loading code.
by Jacek Caban Dec. 9, 2019

Dec. 9, 2019

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/nsembed.c | 271 ++++++++++++++++++++---------------------- 1 file changed, 132 insertions(+), 139 deletions(-)

2 1

[PATCH 01/10] jscript: Add script TypeInfo stub.
by Gabriel Ivăncescu Dec. 9, 2019

Dec. 9, 2019

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/dispex.c | 272 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 271 insertions(+), 1 deletion(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 463fd2f..68e4e1c 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -590,11 +590,273 @@ static HRESULT fill_protrefs(jsdisp_t *This) return S_OK; } +typedef struct { + ITypeInfo ITypeInfo_iface; + LONG ref; +} ScriptTypeInfo; + +static inline ScriptTypeInfo *ScriptTypeInfo_from_ITypeInfo(ITypeInfo *iface) +{ + return CONTAINING_RECORD(iface, ScriptTypeInfo, ITypeInfo_iface); +} + +static HRESULT WINAPI ScriptTypeInfo_QueryInterface(ITypeInfo *iface, REFIID riid, void **ppv) +{ + ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); + + if (IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_ITypeInfo, riid)) + *ppv = &This->ITypeInfo_iface; + else + { + WARN("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + *ppv = NULL; + return E_NOINTERFACE; + } + + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI ScriptTypeInfo_AddRef(ITypeInfo *iface) +{ + ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; +} + +static ULONG WINAPI ScriptTypeInfo_Release(ITypeInfo *iface) +{ + ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if (!ref) + { + heap_free(This); + } + return ref; +} + +static HRESULT WINAPI ScriptTypeInfo_GetTypeAttr(ITypeInfo *iface, TYPEATTR **ppTypeAttr) +{ + ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); + + FIXME("(%p)->(%p)\n", This, ppTypeAttr); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ScriptTypeInfo_GetTypeComp(ITypeInfo *iface, ITypeComp **ppTComp) +{ + ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); + + FIXME("(%p)->(%p)\n", This, ppTComp); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ScriptTypeInfo_GetFuncDesc(ITypeInfo *iface, UINT index, FUNCDESC **ppFuncDesc) +{ + ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); + + FIXME("(%p)->(%u %p)\n", This, index, ppFuncDesc); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ScriptTypeInfo_GetVarDesc(ITypeInfo *iface, UINT index, VARDESC **ppVarDesc) +{ + ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); + + FIXME("(%p)->(%u %p)\n", This, index, ppVarDesc); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ScriptTypeInfo_GetNames(ITypeInfo *iface, MEMBERID memid, BSTR *rgBstrNames, + UINT cMaxNames, UINT *pcNames) +{ + ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); + + FIXME("(%p)->(%d %p %u %p)\n", This, memid, rgBstrNames, cMaxNames, pcNames); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ScriptTypeInfo_GetRefTypeOfImplType(ITypeInfo *iface, UINT index, HREFTYPE *pRefType) +{ + ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); + + FIXME("(%p)->(%u %p)\n", This, index, pRefType); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ScriptTypeInfo_GetImplTypeFlags(ITypeInfo *iface, UINT index, INT *pImplTypeFlags) +{ + ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); + + FIXME("(%p)->(%u %p)\n", This, index, pImplTypeFlags); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ScriptTypeInfo_GetIDsOfNames(ITypeInfo *iface, LPOLESTR *rgszNames, UINT cNames, + MEMBERID *pMemId) +{ + ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); + + FIXME("(%p)->(%p %u %p)\n", This, rgszNames, cNames, pMemId); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ScriptTypeInfo_Invoke(ITypeInfo *iface, PVOID pvInstance, MEMBERID memid, WORD wFlags, + DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); + + FIXME("(%p)->(%p %d %d %p %p %p %p)\n", This, pvInstance, memid, wFlags, + pDispParams, pVarResult, pExcepInfo, puArgErr); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ScriptTypeInfo_GetDocumentation(ITypeInfo *iface, MEMBERID memid, BSTR *pBstrName, + BSTR *pBstrDocString, DWORD *pdwHelpContext, BSTR *pBstrHelpFile) +{ + ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); + + FIXME("(%p)->(%d %p %p %p %p)\n", This, memid, pBstrName, pBstrDocString, pdwHelpContext, pBstrHelpFile); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ScriptTypeInfo_GetDllEntry(ITypeInfo *iface, MEMBERID memid, INVOKEKIND invKind, + BSTR *pBstrDllName, BSTR *pBstrName, WORD *pwOrdinal) +{ + ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); + + FIXME("(%p)->(%d %d %p %p %p)\n", This, memid, invKind, pBstrDllName, pBstrName, pwOrdinal); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ScriptTypeInfo_GetRefTypeInfo(ITypeInfo *iface, HREFTYPE hRefType, ITypeInfo **ppTInfo) +{ + ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); + + FIXME("(%p)->(%x %p)\n", This, hRefType, ppTInfo); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ScriptTypeInfo_AddressOfMember(ITypeInfo *iface, MEMBERID memid, INVOKEKIND invKind, PVOID *ppv) +{ + ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); + + FIXME("(%p)->(%d %d %p)\n", This, memid, invKind, ppv); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ScriptTypeInfo_CreateInstance(ITypeInfo *iface, IUnknown *pUnkOuter, REFIID riid, PVOID *ppvObj) +{ + ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); + + FIXME("(%p)->(%p %s %p)\n", This, pUnkOuter, debugstr_guid(riid), ppvObj); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ScriptTypeInfo_GetMops(ITypeInfo *iface, MEMBERID memid, BSTR *pBstrMops) +{ + ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); + + FIXME("(%p)->(%d %p)\n", This, memid, pBstrMops); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ScriptTypeInfo_GetContainingTypeLib(ITypeInfo *iface, ITypeLib **ppTLib, UINT *pIndex) +{ + ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); + + FIXME("(%p)->(%p %p)\n", This, ppTLib, pIndex); + + return E_NOTIMPL; +} + +static void WINAPI ScriptTypeInfo_ReleaseTypeAttr(ITypeInfo *iface, TYPEATTR *pTypeAttr) +{ + ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); + + FIXME("(%p)->(%p)\n", This, pTypeAttr); +} + +static void WINAPI ScriptTypeInfo_ReleaseFuncDesc(ITypeInfo *iface, FUNCDESC *pFuncDesc) +{ + ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); + + FIXME("(%p)->(%p)\n", This, pFuncDesc); +} + +static void WINAPI ScriptTypeInfo_ReleaseVarDesc(ITypeInfo *iface, VARDESC *pVarDesc) +{ + ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); + + FIXME("(%p)->(%p)\n", This, pVarDesc); +} + +static const ITypeInfoVtbl ScriptTypeInfoVtbl = { + ScriptTypeInfo_QueryInterface, + ScriptTypeInfo_AddRef, + ScriptTypeInfo_Release, + ScriptTypeInfo_GetTypeAttr, + ScriptTypeInfo_GetTypeComp, + ScriptTypeInfo_GetFuncDesc, + ScriptTypeInfo_GetVarDesc, + ScriptTypeInfo_GetNames, + ScriptTypeInfo_GetRefTypeOfImplType, + ScriptTypeInfo_GetImplTypeFlags, + ScriptTypeInfo_GetIDsOfNames, + ScriptTypeInfo_Invoke, + ScriptTypeInfo_GetDocumentation, + ScriptTypeInfo_GetDllEntry, + ScriptTypeInfo_GetRefTypeInfo, + ScriptTypeInfo_AddressOfMember, + ScriptTypeInfo_CreateInstance, + ScriptTypeInfo_GetMops, + ScriptTypeInfo_GetContainingTypeLib, + ScriptTypeInfo_ReleaseTypeAttr, + ScriptTypeInfo_ReleaseFuncDesc, + ScriptTypeInfo_ReleaseVarDesc +}; + static inline jsdisp_t *impl_from_IDispatchEx(IDispatchEx *iface) { return CONTAINING_RECORD(iface, jsdisp_t, IDispatchEx_iface); } +static HRESULT create_script_typeinfo(jsdisp_t *jsdisp, ITypeInfo **out) +{ + ScriptTypeInfo *typeinfo; + + if (!(typeinfo = heap_alloc(sizeof(*typeinfo)))) + return E_OUTOFMEMORY; + + typeinfo->ITypeInfo_iface.lpVtbl = &ScriptTypeInfoVtbl; + typeinfo->ref = 1; + + *out = &typeinfo->ITypeInfo_iface; + return S_OK; +} + static HRESULT WINAPI DispatchEx_QueryInterface(IDispatchEx *iface, REFIID riid, void **ppv) { jsdisp_t *This = impl_from_IDispatchEx(iface); @@ -649,7 +911,15 @@ static HRESULT WINAPI DispatchEx_GetTypeInfo(IDispatchEx *iface, UINT iTInfo, LC ITypeInfo **ppTInfo) { jsdisp_t *This = impl_from_IDispatchEx(iface); - FIXME("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); + + TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); + + if (iTInfo != 0) return DISP_E_BADINDEX; + + if (This == This->ctx->global) + return create_script_typeinfo(This, ppTInfo); + + FIXME("non-global not implemented\n"); return E_NOTIMPL; } -- 2.21.0

2 14

[PATCH] comctl32/listview: Use wcsnicmp() instead of a local helper.
by Nikolay Sivov Dec. 9, 2019

Dec. 9, 2019

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/listview.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index eb42526f57..2dd25908db 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -539,12 +539,6 @@ static inline int textcmpWT(LPCWSTR aw, LPCWSTR bt, BOOL isW) return 1; } - -static inline int lstrncmpiW(LPCWSTR s1, LPCWSTR s2, int n) -{ - n = min(min(n, lstrlenW(s1)), lstrlenW(s2)); - return CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE, s1, n, s2, n) - CSTR_EQUAL; -} /******** Debugging functions *****************************************/ @@ -1953,7 +1947,7 @@ static INT LISTVIEW_ProcessLetterKeys(LISTVIEW_INFO *infoPtr, WPARAM charCode, L item.cchTextMax = MAX_PATH; if (!LISTVIEW_GetItemW(infoPtr, &item)) return 0; - if (!lstrncmpiW(item.pszText, infoPtr->szSearchParam, infoPtr->nSearchParamLength)) + if (!wcsnicmp(item.pszText, infoPtr->szSearchParam, infoPtr->nSearchParamLength)) { nItem = i; break; @@ -1961,7 +1955,7 @@ static INT LISTVIEW_ProcessLetterKeys(LISTVIEW_INFO *infoPtr, WPARAM charCode, L /* this is used to find first char match when search string is not available yet, otherwise every WM_CHAR will search to next item by first char, ignoring that we're already waiting for user to complete a string */ - else if (nItem == -1 && infoPtr->nSearchParamLength == 1 && !lstrncmpiW(item.pszText, infoPtr->szSearchParam, 1)) + else if (nItem == -1 && infoPtr->nSearchParamLength == 1 && !wcsnicmp(item.pszText, infoPtr->szSearchParam, 1)) { /* this would work but we must keep looking for a longer match */ nItem = i; -- 2.24.0

1 0

[PATCH] wbemprox: Use a terminated string in parse_resource.
by Hans Leidekker Dec. 9, 2019

Dec. 9, 2019

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48245 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wbemprox/wbemlocator.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/wbemlocator.c b/dlls/wbemprox/wbemlocator.c index 99d90c357f..18c37275ed 100644 --- a/dlls/wbemprox/wbemlocator.c +++ b/dlls/wbemprox/wbemlocator.c @@ -98,7 +98,7 @@ static BOOL is_local_machine( const WCHAR *server ) static HRESULT parse_resource( const WCHAR *resource, WCHAR **server, WCHAR **namespace ) { - static const WCHAR rootW[] = {'R','O','O','T'}; + static const WCHAR rootW[] = {'R','O','O','T',0}; static const WCHAR cimv2W[] = {'C','I','M','V','2',0}; static const WCHAR defaultW[] = {'D','E','F','A','U','L','T',0}; HRESULT hr = WBEM_E_INVALID_NAMESPACE; @@ -131,7 +131,7 @@ static HRESULT parse_resource( const WCHAR *resource, WCHAR **server, WCHAR **na p = q; while (*q && *q != '\\' && *q != '/') q++; len = q - p; - if (len >= ARRAY_SIZE( rootW ) && wcsnicmp( rootW, p, len )) goto done; + if (len >= ARRAY_SIZE( rootW ) - 1 && wcsnicmp( rootW, p, len )) goto done; if (!*q) { hr = S_OK; -- 2.20.1

1 0

[PATCH] winhttp/tests: Fix the spelling of ok() and skip() messages and a comment.
by Francois Gouget Dec. 9, 2019

Dec. 9, 2019

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/winhttp/tests/winhttp.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 6a8d4962386..e4c614cb104 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -412,7 +412,7 @@ static void test_WinHttpSendRequest (void) ok(ret, "WinHttpSetOption failed: %u\n", GetLastError()); /* writing more data than promised by the content-length header causes an error when the connection - is resued, so disable keep-alive */ + is reused, so disable keep-alive */ disable = WINHTTP_DISABLE_KEEP_ALIVE; ret = WinHttpSetOption(request, WINHTTP_OPTION_DISABLE_FEATURE, &disable, sizeof(disable)); ok(ret, "WinHttpSetOption failed: %u\n", GetLastError()); @@ -692,7 +692,7 @@ static void test_WinHttpAddHeaders(void) test_header_name, NULL, &len, &index); ok(ret == FALSE, "WinHttpQueryHeaders unexpectedly succeeded.\n"); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, - "WinHttpQueryHeaders set incorrect error: expected ERROR_INSUFFICENT_BUFFER, got %u\n", GetLastError()); + "WinHttpQueryHeaders set incorrect error: expected ERROR_INSUFFICIENT_BUFFER, got %u\n", GetLastError()); ok(len > 40, "WinHttpQueryHeaders returned invalid length: expected greater than 40, got %d\n", len); ok(index == 0, "WinHttpQueryHeaders incorrectly incremented header index.\n"); @@ -2144,7 +2144,7 @@ static void test_resolve_timeout(void) WinHttpCloseHandle(ses); } else - skip("Skipping host resolution tests, host resolution preformed by proxy\n"); + skip("Skipping host resolution tests, host resolution performed by proxy\n"); ses = WinHttpOpen(test_useragent, 0, NULL, NULL, 0); ok(ses != NULL, "failed to open session %u\n", GetLastError()); -- 2.20.1

3 2

[PATCH 5/5] msado15: Implement _Stream_get_Size.
by Hans Leidekker Dec. 9, 2019

Dec. 9, 2019

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msado15/stream.c | 9 +++++++-- dlls/msado15/tests/msado15.c | 15 ++++++++++++++- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/dlls/msado15/stream.c b/dlls/msado15/stream.c index eb384fbf94..0c4d9ea425 100644 --- a/dlls/msado15/stream.c +++ b/dlls/msado15/stream.c @@ -113,8 +113,13 @@ static HRESULT WINAPI stream_Invoke( _Stream *iface, DISPID member, REFIID riid, static HRESULT WINAPI stream_get_Size( _Stream *iface, LONG *size ) { - FIXME( "%p, %p\n", iface, size ); - return E_NOTIMPL; + struct stream *stream = impl_from_Stream( iface ); + TRACE( "%p, %p\n", stream, size ); + + if (stream->state == adStateClosed) return MAKE_ADO_HRESULT( adErrObjectClosed ); + + *size = stream->size; + return S_OK; } static HRESULT WINAPI stream_get_EOS( _Stream *iface, VARIANT_BOOL *eos ) diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index c7563228de..1755a7f3da 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -50,7 +50,7 @@ static void test_Stream(void) { _Stream *stream; StreamTypeEnum type; - LONG refs, pos; + LONG refs, size, pos; ObjectStateEnum state; VARIANT missing, val; HRESULT hr; @@ -58,6 +58,9 @@ static void test_Stream(void) hr = CoCreateInstance( &CLSID_Stream, NULL, CLSCTX_INPROC_SERVER, &IID__Stream, (void **)&stream ); ok( hr == S_OK, "got %08x\n", hr ); + hr = _Stream_get_Size( stream, &size ); + ok( hr == MAKE_ADO_HRESULT( adErrObjectClosed ), "got %08x\n", hr ); + hr = _Stream_get_Position( stream, &pos ); ok( hr == MAKE_ADO_HRESULT( adErrObjectClosed ), "got %08x\n", hr ); @@ -103,11 +106,21 @@ static void test_Stream(void) ok( hr == S_OK, "got %08x\n", hr ); ok( state == adStateOpen, "got %u\n", state ); + size = -1; + hr = _Stream_get_Size( stream, &size ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !size, "got %d\n", size ); + pos = -1; hr = _Stream_get_Position( stream, &pos ); ok( hr == S_OK, "got %08x\n", hr ); ok( !pos, "got %d\n", pos ); + size = -1; + hr = _Stream_get_Size( stream, &size ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !size, "got %d\n", size ); + hr = _Stream_Read( stream, 2, &val ); ok( hr == MAKE_ADO_HRESULT( adErrIllegalOperation ), "got %08x\n", hr ); -- 2.20.1

1 0

[PATCH 4/5] msado15: Implement _Stream_get_Position and _Stream_put_Position.
by Hans Leidekker Dec. 9, 2019

Dec. 9, 2019

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msado15/stream.c | 22 +++++++++++++++++---- dlls/msado15/tests/msado15.c | 37 +++++++++++++++++++++++++++++++++++- 2 files changed, 54 insertions(+), 5 deletions(-) diff --git a/dlls/msado15/stream.c b/dlls/msado15/stream.c index d5a129f869..eb384fbf94 100644 --- a/dlls/msado15/stream.c +++ b/dlls/msado15/stream.c @@ -125,8 +125,13 @@ static HRESULT WINAPI stream_get_EOS( _Stream *iface, VARIANT_BOOL *eos ) static HRESULT WINAPI stream_get_Position( _Stream *iface, LONG *pos ) { - FIXME( "%p, %p\n", iface, pos ); - return E_NOTIMPL; + struct stream *stream = impl_from_Stream( iface ); + TRACE( "%p, %p\n", stream, pos ); + + if (stream->state == adStateClosed) return MAKE_ADO_HRESULT( adErrObjectClosed ); + + *pos = stream->pos; + return S_OK; } static HRESULT resize_buffer( struct stream *stream, LONG size ) @@ -145,8 +150,17 @@ static HRESULT resize_buffer( struct stream *stream, LONG size ) static HRESULT WINAPI stream_put_Position( _Stream *iface, LONG pos ) { - FIXME( "%p, %d\n", iface, pos ); - return E_NOTIMPL; + struct stream *stream = impl_from_Stream( iface ); + HRESULT hr; + + TRACE( "%p, %d\n", stream, pos ); + + if (stream->state == adStateClosed) return MAKE_ADO_HRESULT( adErrObjectClosed ); + if (pos < 0) return MAKE_ADO_HRESULT( adErrInvalidArgument ); + + if ((hr = resize_buffer( stream, stream->pos )) != S_OK) return hr; + stream->pos = pos; + return S_OK; } static HRESULT WINAPI stream_get_Type( _Stream *iface, StreamTypeEnum *type ) diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index 257d1c26fa..c7563228de 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -50,7 +50,7 @@ static void test_Stream(void) { _Stream *stream; StreamTypeEnum type; - LONG refs; + LONG refs, pos; ObjectStateEnum state; VARIANT missing, val; HRESULT hr; @@ -58,6 +58,12 @@ static void test_Stream(void) hr = CoCreateInstance( &CLSID_Stream, NULL, CLSCTX_INPROC_SERVER, &IID__Stream, (void **)&stream ); ok( hr == S_OK, "got %08x\n", hr ); + hr = _Stream_get_Position( stream, &pos ); + ok( hr == MAKE_ADO_HRESULT( adErrObjectClosed ), "got %08x\n", hr ); + + hr = _Stream_put_Position( stream, 0 ); + ok( hr == MAKE_ADO_HRESULT( adErrObjectClosed ), "got %08x\n", hr ); + /* check default type */ type = 0; hr = _Stream_get_Type( stream, &type ); @@ -97,9 +103,19 @@ static void test_Stream(void) ok( hr == S_OK, "got %08x\n", hr ); ok( state == adStateOpen, "got %u\n", state ); + pos = -1; + hr = _Stream_get_Position( stream, &pos ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !pos, "got %d\n", pos ); + hr = _Stream_Read( stream, 2, &val ); ok( hr == MAKE_ADO_HRESULT( adErrIllegalOperation ), "got %08x\n", hr ); + pos = -1; + hr = _Stream_get_Position( stream, &pos ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !pos, "got %d\n", pos ); + hr = _Stream_Close( stream ); ok( hr == S_OK, "got %08x\n", hr ); @@ -139,6 +155,25 @@ static void test_Stream(void) ok( hr == S_OK, "got %08x\n", hr ); VariantClear( &val ); + pos = -1; + hr = _Stream_get_Position( stream, &pos ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( pos == 4, "got %d\n", pos ); + + hr = _Stream_put_Position( stream, 0 ); + ok( hr == S_OK, "got %08x\n", hr ); + + VariantInit( &val ); + hr = _Stream_Read( stream, adReadAll, &val ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( V_VT( &val ) == (VT_ARRAY | VT_UI1), "got %04x\n", V_VT( &val ) ); + VariantClear( &val ); + + pos = -1; + hr = _Stream_get_Position( stream, &pos ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( pos == 4, "got %d\n", pos ); + refs = _Stream_Release( stream ); ok( !refs, "got %d\n", refs ); } -- 2.20.1

1 0

[PATCH 3/5] msado15: Implement _Stream_Read and _Stream_Write.
by Hans Leidekker Dec. 9, 2019

Dec. 9, 2019

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msado15/msado15_private.h | 6 +++ dlls/msado15/stream.c | 95 +++++++++++++++++++++++++++++++--- dlls/msado15/tests/msado15.c | 57 +++++++++++++++++++- 3 files changed, 149 insertions(+), 9 deletions(-) diff --git a/dlls/msado15/msado15_private.h b/dlls/msado15/msado15_private.h index f901791ea9..1078cbf64e 100644 --- a/dlls/msado15/msado15_private.h +++ b/dlls/msado15/msado15_private.h @@ -25,4 +25,10 @@ HRESULT Connection_create( void ** ) DECLSPEC_HIDDEN; HRESULT Recordset_create( void ** ) DECLSPEC_HIDDEN; HRESULT Stream_create( void ** ) DECLSPEC_HIDDEN; +static inline void *heap_realloc_zero( void *mem, SIZE_T len ) +{ + if (!mem) return HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, len ); + return HeapReAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, mem, len ); +} + #endif /* _WINE_MSADO15_PRIVATE_H_ */ diff --git a/dlls/msado15/stream.c b/dlls/msado15/stream.c index cc67e930a4..d5a129f869 100644 --- a/dlls/msado15/stream.c +++ b/dlls/msado15/stream.c @@ -32,10 +32,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(msado15); struct stream { - _Stream Stream_iface; - LONG refs; - ObjectStateEnum state; - StreamTypeEnum type; + _Stream Stream_iface; + LONG refs; + ObjectStateEnum state; + StreamTypeEnum type; + LONG size; + LONG allocated; + LONG pos; + BYTE *buf; }; static inline struct stream *impl_from_Stream( _Stream *iface ) @@ -56,6 +60,7 @@ static ULONG WINAPI stream_Release( _Stream *iface ) if (!refs) { TRACE( "destroying %p\n", stream ); + heap_free( stream->buf ); heap_free( stream ); } return refs; @@ -124,6 +129,20 @@ static HRESULT WINAPI stream_get_Position( _Stream *iface, LONG *pos ) return E_NOTIMPL; } +static HRESULT resize_buffer( struct stream *stream, LONG size ) +{ + if (stream->allocated < size) + { + BYTE *tmp; + LONG new_size = max( size, stream->allocated * 2 ); + if (!(tmp = heap_realloc_zero( stream->buf, new_size ))) return E_OUTOFMEMORY; + stream->buf = tmp; + stream->allocated = new_size; + } + stream->size = size; + return S_OK; +} + static HRESULT WINAPI stream_put_Position( _Stream *iface, LONG pos ) { FIXME( "%p, %d\n", iface, pos ); @@ -193,10 +212,49 @@ static HRESULT WINAPI stream_put_Charset( _Stream *iface, BSTR charset ) return E_NOTIMPL; } +static HRESULT create_byte_array( BYTE *data, LONG len, VARIANT *ret ) +{ + SAFEARRAY *vector; + LONG i; + HRESULT hr; + + if (!len) + { + V_VT( ret ) = VT_NULL; + return S_OK; + } + if (!(vector = SafeArrayCreateVector( VT_UI1, 0, len ))) return E_OUTOFMEMORY; + for (i = 0; i < len; i++) + { + if ((hr = SafeArrayPutElement( vector, &i, &data[i] )) != S_OK) + { + SafeArrayDestroy( vector ); + return hr; + } + } + + V_VT( ret ) = VT_ARRAY | VT_UI1; + V_ARRAY( ret ) = vector; + return S_OK; +} + static HRESULT WINAPI stream_Read( _Stream *iface, LONG size, VARIANT *val ) { - FIXME( "%p, %d, %p\n", iface, size, val ); - return E_NOTIMPL; + struct stream *stream = impl_from_Stream( iface ); + HRESULT hr; + + TRACE( "%p, %d, %p\n", stream, size, val ); + + if (stream->state == adStateClosed) return MAKE_ADO_HRESULT( adErrObjectClosed ); + if (stream->type != adTypeBinary) return MAKE_ADO_HRESULT( adErrIllegalOperation ); + if (size < adReadAll) return MAKE_ADO_HRESULT( adErrInvalidArgument ); + + if (size == adReadAll) size = stream->size - stream->pos; + else size = min( size, stream->size - stream->pos ); + + if ((hr = create_byte_array( stream->buf + stream->pos, size, val )) != S_OK) return hr; + stream->pos += size; + return S_OK; } static HRESULT WINAPI stream_Open( _Stream *iface, VARIANT src, ConnectModeEnum mode, StreamOpenOptionsEnum options, @@ -219,6 +277,10 @@ static HRESULT WINAPI stream_Close( _Stream *iface ) if (stream->state == adStateClosed) return MAKE_ADO_HRESULT( adErrObjectClosed ); + heap_free( stream->buf ); + stream->buf = NULL; + stream->size = stream->allocated = stream->pos = 0; + stream->state = adStateClosed; return S_OK; } @@ -231,8 +293,25 @@ static HRESULT WINAPI stream_SkipLine( _Stream *iface ) static HRESULT WINAPI stream_Write( _Stream *iface, VARIANT buf ) { - FIXME( "%p, %s\n", iface, debugstr_variant(&buf) ); - return E_NOTIMPL; + struct stream *stream = impl_from_Stream( iface ); + LONG bound, i; + HRESULT hr; + + TRACE( "%p, %s\n", stream, debugstr_variant(&buf) ); + + if (stream->state == adStateClosed) return MAKE_ADO_HRESULT( adErrObjectClosed ); + if (stream->type != adTypeBinary) return MAKE_ADO_HRESULT( adErrIllegalOperation ); + if (V_VT( &buf ) != (VT_ARRAY | VT_UI1)) return MAKE_ADO_HRESULT( adErrInvalidArgument ); + + if ((hr = SafeArrayGetUBound( V_ARRAY( &buf ), 1, &bound )) != S_OK) return hr; + if ((hr = resize_buffer( stream, stream->size + bound + 1 )) != S_OK) return hr; + + for (i = 0; i <= bound; i++) + { + if ((hr = SafeArrayGetElement( V_ARRAY( &buf ), &i, &stream->buf[stream->pos++] )) != S_OK) return hr; + } + + return S_OK; } static HRESULT WINAPI stream_SetEOS( _Stream *iface ) diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index 9733116151..257d1c26fa 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -25,13 +25,34 @@ #define MAKE_ADO_HRESULT( err ) MAKE_HRESULT( SEVERITY_ERROR, FACILITY_CONTROL, err ) +static HRESULT str_to_byte_array( const char *data, VARIANT *ret ) +{ + SAFEARRAY *vector; + LONG i, len = strlen(data); + HRESULT hr; + + if (!(vector = SafeArrayCreateVector( VT_UI1, 0, len ))) return E_OUTOFMEMORY; + for (i = 0; i < len; i++) + { + if ((hr = SafeArrayPutElement( vector, &i, (void *)&data[i] )) != S_OK) + { + SafeArrayDestroy( vector ); + return hr; + } + } + + V_VT( ret ) = VT_ARRAY | VT_UI1; + V_ARRAY( ret ) = vector; + return S_OK; +} + static void test_Stream(void) { _Stream *stream; StreamTypeEnum type; LONG refs; ObjectStateEnum state; - VARIANT missing; + VARIANT missing, val; HRESULT hr; hr = CoCreateInstance( &CLSID_Stream, NULL, CLSCTX_INPROC_SERVER, &IID__Stream, (void **)&stream ); @@ -60,6 +81,9 @@ static void test_Stream(void) ok( hr == S_OK, "got %08x\n", hr ); ok( state == adStateClosed, "got %u\n", state ); + hr = _Stream_Read( stream, 2, &val ); + ok( hr == MAKE_ADO_HRESULT( adErrObjectClosed ), "got %08x\n", hr ); + V_VT( &missing ) = VT_ERROR; V_ERROR( &missing ) = DISP_E_PARAMNOTFOUND; hr = _Stream_Open( stream, missing, adModeUnknown, adOpenStreamUnspecified, NULL, NULL ); @@ -73,6 +97,9 @@ static void test_Stream(void) ok( hr == S_OK, "got %08x\n", hr ); ok( state == adStateOpen, "got %u\n", state ); + hr = _Stream_Read( stream, 2, &val ); + ok( hr == MAKE_ADO_HRESULT( adErrIllegalOperation ), "got %08x\n", hr ); + hr = _Stream_Close( stream ); ok( hr == S_OK, "got %08x\n", hr ); @@ -86,6 +113,34 @@ static void test_Stream(void) refs = _Stream_Release( stream ); ok( !refs, "got %d\n", refs ); + + /* binary type */ + hr = CoCreateInstance( &CLSID_Stream, NULL, CLSCTX_INPROC_SERVER, &IID__Stream, (void **)&stream ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = _Stream_put_Type( stream, adTypeBinary ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = _Stream_Open( stream, missing, adModeUnknown, adOpenStreamUnspecified, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + VariantInit( &val ); + hr = _Stream_Read( stream, 1, &val ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( V_VT( &val ) == VT_NULL, "got %u\n", V_VT( &val ) ); + + VariantInit( &val ); + hr = _Stream_Write( stream, val ); + ok( hr == MAKE_ADO_HRESULT( adErrInvalidArgument ), "got %08x\n", hr ); + + hr = str_to_byte_array( "data", &val ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = _Stream_Write( stream, val ); + ok( hr == S_OK, "got %08x\n", hr ); + VariantClear( &val ); + + refs = _Stream_Release( stream ); + ok( !refs, "got %d\n", refs ); } START_TEST(msado15) -- 2.20.1

1 0