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

Re: [PATCH 3/5] d3d9: Handle multisample depth resolve in d3d9_device_SetRenderState().

by Henri Verbeet

On Sat, 7 Dec 2019 at 19:41, Zebediah Figura <z.figura12(a)gmail.com> wrote: > +static void resolve_depth_buffer(struct d3d9_device *device) > +{ > + const struct wined3d_stateblock_state *state = wined3d_stateblock_get_state(device->state); > + struct wined3d_rendertarget_view *wined3d_dsv; > + struct wined3d_resource *dst_resource; > + struct wined3d_texture *dst_texture; > + struct wined3d_resource_desc desc; > + struct d3d9_surface *d3d9_dsv; > + > + if (!(dst_texture = state->textures[0])) > + return; > + dst_resource = wined3d_texture_get_resource(dst_texture); > + wined3d_resource_get_desc(dst_resource, &desc); > + if (desc.format != WINED3DFMT_D24_UNORM_S8_UINT > + && desc.format != WINED3DFMT_X8D24_UNORM > + && desc.format != MAKEFOURCC('D','F','1','6') > + && desc.format != MAKEFOURCC('D','F','2','4') > + && desc.format != WINED3DFMT_INTZ) > + return; > + > + if (!(wined3d_dsv = wined3d_device_get_depth_stencil_view(device->wined3d_device))) > + return; > + d3d9_dsv = wined3d_rendertarget_view_get_sub_resource_parent(wined3d_dsv); > + > + wined3d_device_resolve_sub_resource(device->wined3d_device, dst_resource, 0, > + wined3d_rendertarget_view_get_resource(wined3d_dsv), d3d9_dsv->sub_resource_idx, desc.format); > +} If we're going to implement this in d3d9 (but note that the feature is supported by d3d8 as well), it would be best to implement the corresponding feature query in d3d9 instead of wined3d as well. Note that you can't (currently) create DF16/24 resources. Checking for those isn't necessarily an issue, but in that case please just add en entry for them to the wined3d_format_id enumeration.

Dec. 10, 2019

[PATCH] mshtml: Update to Wine Gecko 2.47.1.

by Jacek Caban

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- The new release is more of a refreshment, bringing compatibility with modern build environments. The biggest change is build system port to python3 by Vincent. This involved changes across the whole build system, thanks Vincent! It's packaged slightly differently. There are archives that contain Wine Gecko build. It may be used for system-wide installations. Users may just unpack the package into /usr/share/wine/gecko/, /opt/wine/gecko, etc. and it should work without in-prefix installation as long as it has a valid dos drive (we should be able to support non-mapped locations in the future as well, but it needs Gecko fixes first). It's just like Wine Mono does it for a while. The release also brings improved compatibility with IE clipboard format. Executable files are marked as nxcompat. It also contains a number of portability fixes for recent GCC versions. It should work with both winpthread and non-winpthread toolchains now. I hoped to include a few more changes in this release, but I don't think it's worth delaying it any more. dlls/appwiz.cpl/addons.c | 8 ++++---- dlls/mshtml/nsiface.idl | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-)

Dec. 10, 2019

[PATCH 4/4] oleaut32/tests: Add some more tests for GetRefTypeInfo() in case of dual interface.

by Nikolay Sivov

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/oleaut32/tests/typelib.c | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 0b2920dfe0..4ffbaa9e2d 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -76,6 +76,15 @@ #define ARCH "none" #endif +#define EXPECT_REF(obj,ref) _expect_ref((IUnknown*)obj, ref, __LINE__) +static void _expect_ref(IUnknown* obj, ULONG ref, int line) +{ + ULONG rc; + IUnknown_AddRef(obj); + rc = IUnknown_Release(obj); + ok_(__FILE__,line)(rc == ref, "expected refcount %d, got %d\n", ref, rc); +} + static HRESULT (WINAPI *pRegisterTypeLibForUser)(ITypeLib*,OLECHAR*,OLECHAR*); static HRESULT (WINAPI *pUnRegisterTypeLibForUser)(REFGUID,WORD,WORD,LCID,SYSKIND); @@ -1846,6 +1855,7 @@ static void test_CreateTypeLib(SYSKIND sys) { static const GUID interfaceguid = {0x3b9ff02f,0x9675,0x4861,{0xb7,0x81,0xce,0xae,0xa4,0x78,0x2a,0xcc}}; static const GUID interface2guid = {0x3b9ff02f,0x9675,0x4861,{0xb7,0x81,0xce,0xae,0xa4,0x78,0x2a,0xcd}}; + ITypeInfo *interface1, *interface2, *dual, *unknown, *dispatch, *ti, *ti_2; char filename[MAX_PATH]; WCHAR filenameW[MAX_PATH]; ICreateTypeLib2 *createtl; @@ -1853,7 +1863,6 @@ static void test_CreateTypeLib(SYSKIND sys) { ICreateTypeInfo2 *createti2; ITypeLib *tl, *stdole; ITypeLib2 *tl2; - ITypeInfo *interface1, *interface2, *dual, *unknown, *dispatch, *ti; ITypeInfo *tinfos[2]; ITypeInfo2 *ti2; ITypeComp *tcomp, *tcomp2; @@ -2829,8 +2838,11 @@ static void test_CreateTypeLib(SYSKIND sys) { ok(hres == S_OK, "got %08x\n", hres); ok(hreftype == -2, "got %08x\n", hreftype); + EXPECT_REF(dual, 2); hres = ITypeInfo_GetRefTypeInfo(dual, -2, &ti); ok(hres == S_OK, "got %08x\n", hres); +todo_wine + EXPECT_REF(dual, 3); hres = ITypeInfo_GetTypeAttr(ti, &typeattr); ok(hres == S_OK, "got %08x\n", hres); @@ -2847,6 +2859,18 @@ static void test_CreateTypeLib(SYSKIND sys) { ITypeInfo_ReleaseTypeAttr(ti, typeattr); + hres = ITypeInfo_GetRefTypeInfo(dual, -2, &ti_2); + ok(hres == S_OK, "Failed to get reference typeinfo, hr %#x.\n", hres); +todo_wine { + ok(ti == ti_2, "Unexpected typeinfo instance.\n"); + EXPECT_REF(dual, 4); +} + ITypeInfo_AddRef(ti_2); +todo_wine + EXPECT_REF(dual, 5); + ITypeInfo_Release(ti_2); + + ITypeInfo_Release(ti_2); ITypeInfo_Release(ti); hres = ICreateTypeInfo_SetTypeDescAlias(createti, &typedesc1); -- 2.24.0

Dec. 10, 2019

[PATCH 3/4] oleaut32/tests: Use TYPEKIND values.

by Nikolay Sivov

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/oleaut32/tests/typelib.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 053011d4be..0b2920dfe0 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -2813,7 +2813,7 @@ static void test_CreateTypeLib(SYSKIND sys) { hres = ITypeInfo_GetTypeAttr(dual, &typeattr); ok(hres == S_OK, "got %08x\n", hres); ok(typeattr->cbSizeInstance == ptr_size, "cbSizeInstance = %d\n", typeattr->cbSizeInstance); - ok(typeattr->typekind == 3, "typekind = %d\n", typeattr->typekind); + ok(typeattr->typekind == TKIND_INTERFACE, "typekind = %d\n", typeattr->typekind); ok(typeattr->cFuncs == 1, "cFuncs = %d\n", typeattr->cFuncs); ok(typeattr->cVars == 0, "cVars = %d\n", typeattr->cVars); ok(typeattr->cImplTypes == 1, "cImplTypes = %d\n", typeattr->cImplTypes); @@ -2835,7 +2835,7 @@ static void test_CreateTypeLib(SYSKIND sys) { hres = ITypeInfo_GetTypeAttr(ti, &typeattr); ok(hres == S_OK, "got %08x\n", hres); ok(typeattr->cbSizeInstance == ptr_size, "cbSizeInstance = %d\n", typeattr->cbSizeInstance); - ok(typeattr->typekind == 4, "typekind = %d\n", typeattr->typekind); + ok(typeattr->typekind == TKIND_DISPATCH, "typekind = %d\n", typeattr->typekind); ok(typeattr->cFuncs == 8, "cFuncs = %d\n", typeattr->cFuncs); ok(typeattr->cVars == 0, "cVars = %d\n", typeattr->cVars); ok(typeattr->cImplTypes == 1, "cImplTypes = %d\n", typeattr->cImplTypes); @@ -2857,7 +2857,7 @@ static void test_CreateTypeLib(SYSKIND sys) { hres = ITypeInfo_GetTypeAttr(interface1, &typeattr); ok(hres == S_OK, "got %08x\n", hres); ok(typeattr->cbSizeInstance == ptr_size, "cbSizeInstance = %d\n", typeattr->cbSizeInstance); - ok(typeattr->typekind == 3, "typekind = %d\n", typeattr->typekind); + ok(typeattr->typekind == TKIND_INTERFACE, "typekind = %d\n", typeattr->typekind); ok(typeattr->cFuncs == 13, "cFuncs = %d\n", typeattr->cFuncs); ok(typeattr->cVars == 0, "cVars = %d\n", typeattr->cVars); ok(typeattr->cImplTypes == 1, "cImplTypes = %d\n", typeattr->cImplTypes); @@ -2872,7 +2872,7 @@ static void test_CreateTypeLib(SYSKIND sys) { hres = ITypeInfo_GetTypeAttr(interface2, &typeattr); ok(hres == S_OK, "got %08x\n", hres); ok(typeattr->cbSizeInstance == ptr_size, "cbSizeInstance = %d\n", typeattr->cbSizeInstance); - ok(typeattr->typekind == 3, "typekind = %d\n", typeattr->typekind); + ok(typeattr->typekind == TKIND_INTERFACE, "typekind = %d\n", typeattr->typekind); ok(typeattr->cFuncs == 2, "cFuncs = %d\n", typeattr->cFuncs); ok(typeattr->cVars == 0, "cVars = %d\n", typeattr->cVars); ok(typeattr->cImplTypes == 1, "cImplTypes = %d\n", typeattr->cImplTypes); -- 2.24.0

Dec. 10, 2019

[PATCH 2/4] oleaut32/typelib: Simplify variable and function description lookup helpers.

by Nikolay Sivov

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/oleaut32/typelib.c | 67 +++++++++++++++++++++-------------------- 1 file changed, 35 insertions(+), 32 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index f490795cc7..528fe6372c 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -1679,39 +1679,42 @@ static BSTR TLB_MultiByteToBSTR(const char *ptr) return ret; } -static inline TLBFuncDesc *TLB_get_funcdesc_by_memberid(TLBFuncDesc *funcdescs, - UINT n, MEMBERID memid) +static inline TLBFuncDesc *TLB_get_funcdesc_by_memberid(ITypeInfoImpl *typeinfo, MEMBERID memid) { - while(n){ - if(funcdescs->funcdesc.memid == memid) - return funcdescs; - ++funcdescs; - --n; + int i; + + for (i = 0; i < typeinfo->typeattr.cFuncs; ++i) + { + if (typeinfo->funcdescs[i].funcdesc.memid == memid) + return &typeinfo->funcdescs[i]; } + return NULL; } -static inline TLBVarDesc *TLB_get_vardesc_by_memberid(TLBVarDesc *vardescs, - UINT n, MEMBERID memid) +static inline TLBVarDesc *TLB_get_vardesc_by_memberid(ITypeInfoImpl *typeinfo, MEMBERID memid) { - while(n){ - if(vardescs->vardesc.memid == memid) - return vardescs; - ++vardescs; - --n; + int i; + + for (i = 0; i < typeinfo->typeattr.cVars; ++i) + { + if (typeinfo->vardescs[i].vardesc.memid == memid) + return &typeinfo->vardescs[i]; } + return NULL; } -static inline TLBVarDesc *TLB_get_vardesc_by_name(TLBVarDesc *vardescs, - UINT n, const OLECHAR *name) +static inline TLBVarDesc *TLB_get_vardesc_by_name(ITypeInfoImpl *typeinfo, const OLECHAR *name) { - while(n){ - if(!lstrcmpiW(TLB_get_bstr(vardescs->Name), name)) - return vardescs; - ++vardescs; - --n; + int i; + + for (i = 0; i < typeinfo->typeattr.cVars; ++i) + { + if (!lstrcmpiW(TLB_get_bstr(typeinfo->vardescs[i].Name), name)) + return &typeinfo->vardescs[i]; } + return NULL; } @@ -5128,7 +5131,7 @@ static HRESULT WINAPI ITypeLib2_fnFindName( } } - var = TLB_get_vardesc_by_name(pTInfo->vardescs, pTInfo->typeattr.cVars, name); + var = TLB_get_vardesc_by_name(pTInfo, name); if (var) { memid[count] = var->vardesc.memid; goto ITypeLib2_fnFindName_exit; @@ -6117,7 +6120,7 @@ static HRESULT WINAPI ITypeInfo_fnGetNames( ITypeInfo2 *iface, MEMBERID memid, *pcNames = 0; - pFDesc = TLB_get_funcdesc_by_memberid(This->funcdescs, This->typeattr.cFuncs, memid); + pFDesc = TLB_get_funcdesc_by_memberid(This, memid); if(pFDesc) { if(!cMaxNames || !pFDesc->Name) @@ -6135,7 +6138,7 @@ static HRESULT WINAPI ITypeInfo_fnGetNames( ITypeInfo2 *iface, MEMBERID memid, return S_OK; } - pVDesc = TLB_get_vardesc_by_memberid(This->vardescs, This->typeattr.cVars, memid); + pVDesc = TLB_get_vardesc_by_memberid(This, memid); if(pVDesc) { *rgBstrNames=SysAllocString(TLB_get_bstr(pVDesc->Name)); @@ -6294,7 +6297,7 @@ static HRESULT WINAPI ITypeInfo_fnGetIDsOfNames( ITypeInfo2 *iface, return ret; } } - pVDesc = TLB_get_vardesc_by_name(This->vardescs, This->typeattr.cVars, *rgszNames); + pVDesc = TLB_get_vardesc_by_name(This, *rgszNames); if(pVDesc){ if(cNames) *pMemId = pVDesc->vardesc.memid; @@ -7743,7 +7746,7 @@ static HRESULT WINAPI ITypeInfo_fnGetDocumentation( ITypeInfo2 *iface, *pBstrHelpFile=SysAllocString(TLB_get_bstr(This->pTypeLib->HelpFile)); return S_OK; }else {/* for a member */ - pFDesc = TLB_get_funcdesc_by_memberid(This->funcdescs, This->typeattr.cFuncs, memid); + pFDesc = TLB_get_funcdesc_by_memberid(This, memid); if(pFDesc){ if(pBstrName) *pBstrName = SysAllocString(TLB_get_bstr(pFDesc->Name)); @@ -7755,7 +7758,7 @@ static HRESULT WINAPI ITypeInfo_fnGetDocumentation( ITypeInfo2 *iface, *pBstrHelpFile = SysAllocString(TLB_get_bstr(This->pTypeLib->HelpFile)); return S_OK; } - pVDesc = TLB_get_vardesc_by_memberid(This->vardescs, This->typeattr.cVars, memid); + pVDesc = TLB_get_vardesc_by_memberid(This, memid); if(pVDesc){ if(pBstrName) *pBstrName = SysAllocString(TLB_get_bstr(pVDesc->Name)); @@ -7809,7 +7812,7 @@ static HRESULT WINAPI ITypeInfo_fnGetDllEntry( ITypeInfo2 *iface, MEMBERID memid if (This->typeattr.typekind != TKIND_MODULE) return TYPE_E_BADMODULEKIND; - pFDesc = TLB_get_funcdesc_by_memberid(This->funcdescs, This->typeattr.cFuncs, memid); + pFDesc = TLB_get_funcdesc_by_memberid(This, memid); if(pFDesc){ dump_TypeInfo(This); if (TRACE_ON(ole)) @@ -8317,7 +8320,7 @@ static HRESULT WINAPI ITypeInfo2_fnGetVarIndexOfMemId( ITypeInfo2 * iface, TRACE("%p %d %p\n", iface, memid, pVarIndex); - pVarInfo = TLB_get_vardesc_by_memberid(This->vardescs, This->typeattr.cVars, memid); + pVarInfo = TLB_get_vardesc_by_memberid(This, memid); if(!pVarInfo) return TYPE_E_ELEMENTNOTFOUND; @@ -8510,7 +8513,7 @@ static HRESULT WINAPI ITypeInfo2_fnGetDocumentation2( SysAllocString(TLB_get_bstr(This->pTypeLib->HelpStringDll));/* FIXME */ return S_OK; }else {/* for a member */ - pFDesc = TLB_get_funcdesc_by_memberid(This->funcdescs, This->typeattr.cFuncs, memid); + pFDesc = TLB_get_funcdesc_by_memberid(This, memid); if(pFDesc){ if(pbstrHelpString) *pbstrHelpString=SysAllocString(TLB_get_bstr(pFDesc->HelpString)); @@ -8521,7 +8524,7 @@ static HRESULT WINAPI ITypeInfo2_fnGetDocumentation2( SysAllocString(TLB_get_bstr(This->pTypeLib->HelpStringDll));/* FIXME */ return S_OK; } - pVDesc = TLB_get_vardesc_by_memberid(This->vardescs, This->typeattr.cVars, memid); + pVDesc = TLB_get_vardesc_by_memberid(This, memid); if(pVDesc){ if(pbstrHelpString) *pbstrHelpString=SysAllocString(TLB_get_bstr(pVDesc->HelpString)); @@ -8868,7 +8871,7 @@ static HRESULT WINAPI ITypeComp_fnBind( ITypeInfo_AddRef(*ppTInfo); return S_OK; } else { - pVDesc = TLB_get_vardesc_by_name(This->vardescs, This->typeattr.cVars, szName); + pVDesc = TLB_get_vardesc_by_name(This, szName); if(pVDesc){ HRESULT hr = TLB_AllocAndInitVarDesc(&pVDesc->vardesc, &pBindPtr->lpvardesc); if (FAILED(hr)) -- 2.24.0

Dec. 10, 2019

[PATCH 1/4] oleaut32/typelib: Get rid of redundant argument in typeinfo lookup helper.

by Nikolay Sivov

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/oleaut32/typelib.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 668ad8d582..f490795cc7 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -1724,15 +1724,16 @@ static inline TLBCustData *TLB_get_custdata_by_guid(struct list *custdata_list, return NULL; } -static inline ITypeInfoImpl *TLB_get_typeinfo_by_name(ITypeInfoImpl **typeinfos, - UINT n, const OLECHAR *name) +static inline ITypeInfoImpl *TLB_get_typeinfo_by_name(ITypeLibImpl *typelib, const OLECHAR *name) { - while(n){ - if(!lstrcmpiW(TLB_get_bstr((*typeinfos)->Name), name)) - return *typeinfos; - ++typeinfos; - --n; + int i; + + for (i = 0; i < typelib->TypeInfoCount; ++i) + { + if (!lstrcmpiW(TLB_get_bstr(typelib->typeinfos[i]->Name), name)) + return typelib->typeinfos[i]; } + return NULL; } @@ -5507,7 +5508,7 @@ static HRESULT WINAPI ITypeLibComp_fnBindType( if(!szName || !ppTInfo || !ppTComp) return E_INVALIDARG; - info = TLB_get_typeinfo_by_name(This->typeinfos, This->TypeInfoCount, szName); + info = TLB_get_typeinfo_by_name(This, szName); if(!info){ *ppTInfo = NULL; *ppTComp = NULL; @@ -9007,7 +9008,7 @@ static HRESULT WINAPI ICreateTypeLib2_fnCreateTypeInfo(ICreateTypeLib2 *iface, if (!ctinfo || !name) return E_INVALIDARG; - info = TLB_get_typeinfo_by_name(This->typeinfos, This->TypeInfoCount, name); + info = TLB_get_typeinfo_by_name(This, name); if (info) return TYPE_E_NAMECONFLICT; -- 2.24.0

Dec. 10, 2019

[PATCH] vbscript: Remove unused field.

by Gabriel Ivăncescu

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/vbscript/compile.c | 3 --- dlls/vbscript/vbscript.h | 1 - 2 files changed, 4 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index d8ae0fc..c76ba73 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -1980,9 +1980,6 @@ HRESULT compile_procedure(script_ctx_t *script, const WCHAR *src, const WCHAR *d desc->func_cnt = 1; desc->funcs->entries[VBDISP_CALLGET] = &code->main_code; - desc->next = script->script_obj->procs; - script->script_obj->procs = desc; - *ret = desc; return S_OK; } diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index d79be9e..19431e2 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -141,7 +141,6 @@ typedef struct { size_t global_funcs_size; class_desc_t *classes; - class_desc_t *procs; script_ctx_t *ctx; heap_pool_t heap; -- 2.21.0

Dec. 10, 2019

[PATCH] ieframe: implement COM aggregation in WebBrowser

by Jacek Caban

From: Damjan Jovanovic <damjan.jov(a)gmail.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=12406 Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ieframe/classinfo.c | 6 +-- dlls/ieframe/ieframe.h | 1 + dlls/ieframe/oleobject.c | 30 ++++++------- dlls/ieframe/persist.c | 18 ++++---- dlls/ieframe/tests/webbrowser.c | 60 +++++++++++++++++++++++++ dlls/ieframe/view.c | 12 ++--- dlls/ieframe/webbrowser.c | 78 ++++++++++++++++++++++++--------- 7 files changed, 151 insertions(+), 54 deletions(-)

Dec. 10, 2019

Re: [PATCH 5/5] msado15: Implement _Stream_ReadText and _Stream_WriteText.

by Hans Leidekker

On Tue, 2019-12-10 at 04:59 -0600, Marvin wrote: > While running your changed tests, I think I found new failures. > Being a bot and all I'm not very good at pattern recognition, so I might be > wrong, but could you please double-check? > > Full results can be found at: > https://testbot.winehq.org/JobDetails.pl?Key=61781 > > Your paranoid android. > > > === build (build log) === > > error: patch failed: dlls/msado15/stream.c:400 > Task: Patch failed to apply It should apply after 175416.

Dec. 10, 2019

[PATCH] winhttp/tests: Show that WINHTTP_OPTION_SECURE_PROTOCOLS can't be set on connection handles.

by Hans Leidekker

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48254 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/tests/winhttp.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index e4c614cb10..3e0e8baeb9 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -1070,6 +1070,13 @@ static void test_secure_connection(void) con = WinHttpConnect(ses, test_winehq, 443, 0); ok(con != NULL, "failed to open a connection %u\n", GetLastError()); + SetLastError( 0xdeadbeef ); + protocols = WINHTTP_FLAG_SECURE_PROTOCOL_TLS1_2; + ret = WinHttpSetOption(con, WINHTTP_OPTION_SECURE_PROTOCOLS, &protocols, sizeof(protocols)); + err = GetLastError(); + ok(!ret, "unexpected success\n"); + ok(err == ERROR_WINHTTP_INCORRECT_HANDLE_TYPE, "got %u\n", err); + /* try without setting WINHTTP_FLAG_SECURE */ req = WinHttpOpenRequest(con, NULL, NULL, NULL, NULL, NULL, 0); ok(req != NULL, "failed to open a request %u\n", GetLastError()); -- 2.20.1

Dec. 10, 2019

Re: [PATCH 5/5] msado15: Implement _Stream_ReadText and _Stream_WriteText.

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=61781 Your paranoid android. === build (build log) === error: patch failed: dlls/msado15/stream.c:400 Task: Patch failed to apply === debian10 (build log) === error: patch failed: dlls/msado15/stream.c:400 Task: Patch failed to apply === debian10 (build log) === error: patch failed: dlls/msado15/stream.c:400 Task: Patch failed to apply

Dec. 10, 2019

Re: [PATCH 2/5] msado15: Implement _Stream_get_LineSeparator and _Stream_put_LineSeparator.

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=61778 Your paranoid android. === w864 (task log) === Task errors: TestBot process got stuck or died unexpectedly The previous 1 run(s) terminated abnormally

Dec. 10, 2019

[PATCH 2/2] msado15: Implement Connection get/put CommandTimeout

by Alistair Leslie-Hughes

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msado15/connection.c | 14 ++++++++++---- dlls/msado15/tests/msado15.c | 13 ++++++++++++- 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/dlls/msado15/connection.c b/dlls/msado15/connection.c index dbf0b03149..ef589ecb7d 100644 --- a/dlls/msado15/connection.c +++ b/dlls/msado15/connection.c @@ -36,6 +36,7 @@ struct connection LONG refs; ObjectStateEnum state; + LONG timeout; }; static inline struct connection *impl_from_Connection( _Connection *iface ) @@ -126,14 +127,18 @@ static HRESULT WINAPI connection_put_ConnectionString( _Connection *iface, BSTR static HRESULT WINAPI connection_get_CommandTimeout( _Connection *iface, LONG *timeout ) { - FIXME( "%p, %p\n", iface, timeout ); - return E_NOTIMPL; + struct connection *connection = impl_from_Connection( iface ); + TRACE( "%p, %p\n", connection, timeout ); + *timeout = connection->timeout; + return S_OK; } static HRESULT WINAPI connection_put_CommandTimeout( _Connection *iface, LONG timeout ) { - FIXME( "%p, %d\n", iface, timeout ); - return E_NOTIMPL; + struct connection *connection = impl_from_Connection( iface ); + TRACE( "%p, %d\n", connection, timeout ); + connection->timeout = timeout; + return S_OK; } static HRESULT WINAPI connection_get_ConnectionTimeout( _Connection *iface, LONG *timeout ) @@ -342,6 +347,7 @@ HRESULT Connection_create( void **obj ) connection->Connection_iface.lpVtbl = &connection_vtbl; connection->refs = 1; connection->state = adStateClosed; + connection->timeout = 30; *obj = &connection->Connection_iface; TRACE( "returning iface %p\n", *obj ); diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index f2c9789576..bb356ae5a8 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -197,7 +197,7 @@ static void test_connection(void) _Connection *connection; IRunnableObject *runtime; ISupportErrorInfo *errorinfo; - LONG state; + LONG state, timeout; hr = CoCreateInstance(&CLSID_Connection, NULL, CLSCTX_INPROC_SERVER, &IID__Connection, (void**)&connection); ok( hr == S_OK, "got %08x\n", hr ); @@ -220,6 +220,17 @@ if (0) /* Crashes on windows */ ok(hr == S_OK, "Failed to get state, hr 0x%08x\n", hr); ok(state == adStateClosed, "Unexpected state value 0x%08x\n", state); + hr = _Connection_get_CommandTimeout(connection, &timeout); + ok(hr == S_OK, "Failed to get state, hr 0x%08x\n", hr); + ok(timeout == 30, "Unexpected timeout value %d\n", timeout); + + hr = _Connection_put_CommandTimeout(connection, 300); + ok(hr == S_OK, "Failed to get state, hr 0x%08x\n", hr); + + hr = _Connection_get_CommandTimeout(connection, &timeout); + ok(hr == S_OK, "Failed to get state, hr 0x%08x\n", hr); + ok(timeout == 300, "Unexpected timeout value %d\n", timeout); + _Connection_Release(connection); } -- 2.24.0

Dec. 10, 2019

[PATCH 1/2] msado15: Implement Connection.get_state

by Alistair Leslie-Hughes

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msado15/connection.c | 9 +++++++-- dlls/msado15/tests/msado15.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 2 deletions(-) diff --git a/dlls/msado15/connection.c b/dlls/msado15/connection.c index f33bc89a1a..dbf0b03149 100644 --- a/dlls/msado15/connection.c +++ b/dlls/msado15/connection.c @@ -34,6 +34,8 @@ struct connection { _Connection Connection_iface; LONG refs; + + ObjectStateEnum state; }; static inline struct connection *impl_from_Connection( _Connection *iface ) @@ -271,8 +273,10 @@ static HRESULT WINAPI connection_put_Provider( _Connection *iface, BSTR str ) static HRESULT WINAPI connection_get_State( _Connection *iface, LONG *state ) { - FIXME( "%p, %p\n", iface, state ); - return E_NOTIMPL; + struct connection *connection = impl_from_Connection( iface ); + TRACE( "%p, %p\n", connection, state ); + *state = connection->state; + return S_OK; } static HRESULT WINAPI connection_OpenSchema( _Connection *iface, SchemaEnum schema, VARIANT restrictions, @@ -337,6 +341,7 @@ HRESULT Connection_create( void **obj ) if (!(connection = heap_alloc( sizeof(*connection) ))) return E_OUTOFMEMORY; connection->Connection_iface.lpVtbl = &connection_vtbl; connection->refs = 1; + connection->state = adStateClosed; *obj = &connection->Connection_iface; TRACE( "returning iface %p\n", *obj ); diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index 1755a7f3da..f2c9789576 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -191,9 +191,43 @@ static void test_Stream(void) ok( !refs, "got %d\n", refs ); } +static void test_connection(void) +{ + HRESULT hr; + _Connection *connection; + IRunnableObject *runtime; + ISupportErrorInfo *errorinfo; + LONG state; + + hr = CoCreateInstance(&CLSID_Connection, NULL, CLSCTX_INPROC_SERVER, &IID__Connection, (void**)&connection); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = _Connection_QueryInterface(connection, &IID_IRunnableObject, (void**)&runtime); + ok(hr == E_NOINTERFACE, "Unexpected IRunnableObject interface\n"); + + hr = _Connection_QueryInterface(connection, &IID_ISupportErrorInfo, (void**)&errorinfo); + todo_wine ok(hr == S_OK, "Failed to get ISupportErrorInfo interface\n"); + if (hr == S_OK) + ISupportErrorInfo_Release(errorinfo); + +if (0) /* Crashes on windows */ +{ + hr = _Connection_get_State(connection, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr 0x%08x\n", hr); +} + + hr = _Connection_get_State(connection, &state); + ok(hr == S_OK, "Failed to get state, hr 0x%08x\n", hr); + ok(state == adStateClosed, "Unexpected state value 0x%08x\n", state); + + _Connection_Release(connection); +} + START_TEST(msado15) { CoInitialize( NULL ); test_Stream(); + test_connection(); + CoUninitialize(); } -- 2.24.0

Dec. 10, 2019

[PATCH 5/5] msado15: Implement _Stream_ReadText and _Stream_WriteText.

by Hans Leidekker

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msado15/stream.c | 58 +++++++++++++++++++++++++++++++++--- dlls/msado15/tests/msado15.c | 51 +++++++++++++++++++++++++++++++ 2 files changed, 105 insertions(+), 4 deletions(-) diff --git a/dlls/msado15/stream.c b/dlls/msado15/stream.c index e2e404a620..52f35afe3c 100644 --- a/dlls/msado15/stream.c +++ b/dlls/msado15/stream.c @@ -400,14 +400,64 @@ static HRESULT WINAPI stream_LoadFromFile( _Stream *iface, BSTR filename ) static HRESULT WINAPI stream_ReadText( _Stream *iface, LONG len, BSTR *ret ) { - FIXME( "%p, %d, %p\n", iface, len, ret ); - return E_NOTIMPL; + struct stream *stream = impl_from_Stream( iface ); + BSTR str; + + TRACE( "%p, %d, %p\n", stream, len, ret ); + if (len == adReadLine) + { + FIXME( "adReadLine not supported\n" ); + return E_NOTIMPL; + } + if (stream->charset && wcscmp( stream->charset, L"Unicode" )) + { + FIXME( "charset %s not supported\n", debugstr_w(stream->charset) ); + return E_NOTIMPL; + } + + if (stream->type != adTypeText) return MAKE_ADO_HRESULT( adErrIllegalOperation ); + if (len < adReadLine) return MAKE_ADO_HRESULT( adErrInvalidArgument ); + + if (len == adReadAll) len = (stream->size - stream->pos) / sizeof(WCHAR); + else len = min( len, stream->size - stream->pos / sizeof(WCHAR) ); + + if (!(str = SysAllocStringLen( NULL, len ))) return E_OUTOFMEMORY; + memcpy( str, stream->buf + stream->pos, len * sizeof(WCHAR) ); + str[len] = 0; + + stream->pos += len * sizeof(WCHAR); + + *ret = str; + return S_OK; } static HRESULT WINAPI stream_WriteText( _Stream *iface, BSTR data, StreamWriteEnum options ) { - FIXME( "%p, %s, %u\n", iface, debugstr_w(data), options ); - return E_NOTIMPL; + struct stream *stream = impl_from_Stream( iface ); + HRESULT hr; + LONG size; + + TRACE( "%p, %s, %u\n", stream, debugstr_w(data), options ); + if (options != adWriteChar) + { + FIXME( "options %u not supported\n", options ); + return E_NOTIMPL; + } + if (stream->charset && wcscmp( stream->charset, L"Unicode" )) + { + FIXME( "charset %s not supported\n", debugstr_w(stream->charset) ); + return E_NOTIMPL; + } + + if (stream->type != adTypeText) return MAKE_ADO_HRESULT( adErrIllegalOperation ); + + size = (lstrlenW( data ) + 1) * sizeof(WCHAR); + if ((hr = resize_buffer( stream, stream->size + size )) != S_OK) return hr; + + memcpy( stream->buf + stream->pos, data, size ); + stream->pos += size; + + return S_OK; } static HRESULT WINAPI stream_Cancel( _Stream *iface ) diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index 2c75904837..079da0a103 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -162,11 +162,54 @@ static void test_Stream(void) hr = _Stream_Read( stream, 2, &val ); ok( hr == MAKE_ADO_HRESULT( adErrIllegalOperation ), "got %08x\n", hr ); + hr = _Stream_ReadText( stream, 2, &str ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !str[0], "got %s\n", wine_dbgstr_w(str) ); + SysFreeString( str ); + pos = -1; hr = _Stream_get_Position( stream, &pos ); ok( hr == S_OK, "got %08x\n", hr ); ok( !pos, "got %d\n", pos ); + str = SysAllocString( L"test" ); + hr = _Stream_WriteText( stream, str, adWriteChar ); + ok( hr == S_OK, "got %08x\n", hr ); + SysFreeString( str ); + + hr = _Stream_ReadText( stream, adReadAll, &str ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !str[0], "got %s\n", wine_dbgstr_w(str) ); + SysFreeString( str ); + + hr = _Stream_put_Position( stream, 0 ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = _Stream_ReadText( stream, adReadAll, &str ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !lstrcmpW( str, L"test" ), "got %s\n", wine_dbgstr_w(str) ); + SysFreeString( str ); + + pos = -1; + hr = _Stream_get_Position( stream, &pos ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( pos == 10, "got %d\n", pos ); + + eos = VARIANT_FALSE; + hr = _Stream_get_EOS( stream, &eos ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( eos == VARIANT_TRUE, "got %04x\n", eos ); + + hr = _Stream_put_Position( stream, 6 ); + ok( hr == S_OK, "got %08x\n", hr ); + + size = -1; + hr = _Stream_get_Size( stream, &size ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( size == 10, "got %d\n", size ); + + hr = _Stream_put_Position( stream, 2 ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = _Stream_Close( stream ); ok( hr == S_OK, "got %08x\n", hr ); @@ -191,6 +234,14 @@ static void test_Stream(void) hr = _Stream_Open( stream, missing, adModeUnknown, adOpenStreamUnspecified, NULL, NULL ); ok( hr == S_OK, "got %08x\n", hr ); + hr = _Stream_ReadText( stream, adReadAll, &str ); + ok( hr == MAKE_ADO_HRESULT( adErrIllegalOperation ), "got %08x\n", hr ); + + str = SysAllocString( L"test" ); + hr = _Stream_WriteText( stream, str, adWriteChar ); + ok( hr == MAKE_ADO_HRESULT( adErrIllegalOperation ), "got %08x\n", hr ); + SysFreeString( str ); + VariantInit( &val ); hr = _Stream_Read( stream, 1, &val ); ok( hr == S_OK, "got %08x\n", hr ); -- 2.20.1

Dec. 10, 2019

[PATCH 4/5] msado15: Implement _Stream_get_Charset and _Stream_put_Charset.

by Hans Leidekker

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msado15/msado15_private.h | 8 ++++++++ dlls/msado15/stream.c | 24 ++++++++++++++++++++---- dlls/msado15/tests/msado15.c | 11 +++++++++++ 3 files changed, 39 insertions(+), 4 deletions(-) diff --git a/dlls/msado15/msado15_private.h b/dlls/msado15/msado15_private.h index 1078cbf64e..7239e48b53 100644 --- a/dlls/msado15/msado15_private.h +++ b/dlls/msado15/msado15_private.h @@ -31,4 +31,12 @@ static inline void *heap_realloc_zero( void *mem, SIZE_T len ) return HeapReAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, mem, len ); } +static inline WCHAR *strdupW( const WCHAR *src ) +{ + WCHAR *dst; + if (!src) return NULL; + if ((dst = heap_alloc( (lstrlenW( src ) + 1) * sizeof(*dst) ))) lstrcpyW( dst, src ); + return dst; +} + #endif /* _WINE_MSADO15_PRIVATE_H_ */ diff --git a/dlls/msado15/stream.c b/dlls/msado15/stream.c index 9aa35d5831..e2e404a620 100644 --- a/dlls/msado15/stream.c +++ b/dlls/msado15/stream.c @@ -38,6 +38,7 @@ struct stream ConnectModeEnum mode; StreamTypeEnum type; LineSeparatorEnum sep; + WCHAR *charset; LONG size; LONG allocated; LONG pos; @@ -62,6 +63,7 @@ static ULONG WINAPI stream_Release( _Stream *iface ) if (!refs) { TRACE( "destroying %p\n", stream ); + heap_free( stream->charset ); heap_free( stream->buf ); heap_free( stream ); } @@ -240,14 +242,28 @@ static HRESULT WINAPI stream_put_Mode( _Stream *iface, ConnectModeEnum mode ) static HRESULT WINAPI stream_get_Charset( _Stream *iface, BSTR *charset ) { - FIXME( "%p, %p\n", iface, charset ); - return E_NOTIMPL; + struct stream *stream = impl_from_Stream( iface ); + const WCHAR *src = stream->charset ? stream->charset : L"Unicode"; + BSTR dst; + + TRACE( "%p, %p\n", stream, charset ); + + if (!(dst = SysAllocString( src ))) return E_OUTOFMEMORY; + *charset = dst; + return S_OK; } static HRESULT WINAPI stream_put_Charset( _Stream *iface, BSTR charset ) { - FIXME( "%p, %s\n", iface, debugstr_w(charset) ); - return E_NOTIMPL; + struct stream *stream = impl_from_Stream( iface ); + WCHAR *str; + + TRACE( "%p, %s\n", stream, debugstr_w(charset) ); + + if (!(str = strdupW( charset ))) return E_OUTOFMEMORY; + heap_free( stream->charset ); + stream->charset = str; + return S_OK; } static HRESULT create_byte_array( BYTE *data, LONG len, VARIANT *ret ) diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index 6aab518da9..2c75904837 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -55,6 +55,7 @@ static void test_Stream(void) LONG refs, size, pos; ObjectStateEnum state; ConnectModeEnum mode; + BSTR charset, str; VARIANT missing, val; HRESULT hr; @@ -112,6 +113,16 @@ static void test_Stream(void) hr = _Stream_put_Mode( stream, adModeReadWrite ); ok( hr == S_OK, "got %08x\n", hr ); + hr = _Stream_get_Charset( stream, &charset ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !lstrcmpW( charset, L"Unicode" ), "got %s\n", wine_dbgstr_w(charset) ); + SysFreeString( charset ); + + str = SysAllocString( L"Unicode" ); + hr = _Stream_put_Charset( stream, str ); + ok( hr == S_OK, "got %08x\n", hr ); + SysFreeString( str ); + hr = _Stream_Read( stream, 2, &val ); ok( hr == MAKE_ADO_HRESULT( adErrObjectClosed ), "got %08x\n", hr ); -- 2.20.1

Dec. 10, 2019

[PATCH 3/5] msado15: Implement _Stream_get_Mode and _Stream_put_Mode.

by Hans Leidekker

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msado15/stream.c | 15 +++++++++++---- dlls/msado15/tests/msado15.c | 9 +++++++++ 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/dlls/msado15/stream.c b/dlls/msado15/stream.c index 07027f3829..9aa35d5831 100644 --- a/dlls/msado15/stream.c +++ b/dlls/msado15/stream.c @@ -35,6 +35,7 @@ struct stream _Stream Stream_iface; LONG refs; ObjectStateEnum state; + ConnectModeEnum mode; StreamTypeEnum type; LineSeparatorEnum sep; LONG size; @@ -221,14 +222,20 @@ static HRESULT WINAPI stream_get_State( _Stream *iface, ObjectStateEnum *state ) static HRESULT WINAPI stream_get_Mode( _Stream *iface, ConnectModeEnum *mode ) { - FIXME( "%p, %p\n", iface, mode ); - return E_NOTIMPL; + struct stream *stream = impl_from_Stream( iface ); + TRACE( "%p, %p\n", stream, mode ); + + *mode = stream->mode; + return S_OK; } static HRESULT WINAPI stream_put_Mode( _Stream *iface, ConnectModeEnum mode ) { - FIXME( "%p, %u\n", iface, mode ); - return E_NOTIMPL; + struct stream *stream = impl_from_Stream( iface ); + TRACE( "%p, %u\n", stream, mode ); + + stream->mode = mode; + return S_OK; } static HRESULT WINAPI stream_get_Charset( _Stream *iface, BSTR *charset ) diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index a4de15932d..6aab518da9 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -54,6 +54,7 @@ static void test_Stream(void) LineSeparatorEnum sep; LONG refs, size, pos; ObjectStateEnum state; + ConnectModeEnum mode; VARIANT missing, val; HRESULT hr; @@ -103,6 +104,14 @@ static void test_Stream(void) ok( hr == S_OK, "got %08x\n", hr ); ok( state == adStateClosed, "got %u\n", state ); + mode = 0xdeadbeef; + hr = _Stream_get_Mode( stream, &mode ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( mode == adModeUnknown, "got %u\n", mode ); + + hr = _Stream_put_Mode( stream, adModeReadWrite ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = _Stream_Read( stream, 2, &val ); ok( hr == MAKE_ADO_HRESULT( adErrObjectClosed ), "got %08x\n", hr ); -- 2.20.1

Dec. 10, 2019

[PATCH 2/5] msado15: Implement _Stream_get_LineSeparator and _Stream_put_LineSeparator.

by Hans Leidekker

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msado15/stream.c | 32 ++++++++++++++++++++------------ dlls/msado15/tests/msado15.c | 9 +++++++++ 2 files changed, 29 insertions(+), 12 deletions(-) diff --git a/dlls/msado15/stream.c b/dlls/msado15/stream.c index 9fb6007b57..07027f3829 100644 --- a/dlls/msado15/stream.c +++ b/dlls/msado15/stream.c @@ -32,14 +32,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(msado15); struct stream { - _Stream Stream_iface; - LONG refs; - ObjectStateEnum state; - StreamTypeEnum type; - LONG size; - LONG allocated; - LONG pos; - BYTE *buf; + _Stream Stream_iface; + LONG refs; + ObjectStateEnum state; + StreamTypeEnum type; + LineSeparatorEnum sep; + LONG size; + LONG allocated; + LONG pos; + BYTE *buf; }; static inline struct stream *impl_from_Stream( _Stream *iface ) @@ -193,14 +194,20 @@ static HRESULT WINAPI stream_put_Type( _Stream *iface, StreamTypeEnum type ) static HRESULT WINAPI stream_get_LineSeparator( _Stream *iface, LineSeparatorEnum *sep ) { - FIXME( "%p, %p\n", iface, sep ); - return E_NOTIMPL; + struct stream *stream = impl_from_Stream( iface ); + TRACE( "%p, %p\n", stream, sep ); + + *sep = stream->sep; + return S_OK; } static HRESULT WINAPI stream_put_LineSeparator( _Stream *iface, LineSeparatorEnum sep ) { - FIXME( "%p, %d\n", iface, sep ); - return E_NOTIMPL; + struct stream *stream = impl_from_Stream( iface ); + TRACE( "%p, %d\n", stream, sep ); + + stream->sep = sep; + return S_OK; } static HRESULT WINAPI stream_get_State( _Stream *iface, ObjectStateEnum *state ) @@ -431,6 +438,7 @@ HRESULT Stream_create( void **obj ) stream->Stream_iface.lpVtbl = &stream_vtbl; stream->refs = 1; stream->type = adTypeText; + stream->sep = adCRLF; *obj = &stream->Stream_iface; TRACE( "returning iface %p\n", *obj ); diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index 0b10579905..a4de15932d 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -51,6 +51,7 @@ static void test_Stream(void) _Stream *stream; VARIANT_BOOL eos; StreamTypeEnum type; + LineSeparatorEnum sep; LONG refs, size, pos; ObjectStateEnum state; VARIANT missing, val; @@ -89,6 +90,14 @@ static void test_Stream(void) hr = _Stream_put_Type( stream, adTypeText ); ok( hr == S_OK, "got %08x\n", hr ); + sep = 0; + hr = _Stream_get_LineSeparator( stream, &sep ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( sep == adCRLF, "got %d\n", sep ); + + hr = _Stream_put_LineSeparator( stream, adLF ); + ok( hr == S_OK, "got %08x\n", hr ); + state = 0xdeadbeef; hr = _Stream_get_State( stream, &state ); ok( hr == S_OK, "got %08x\n", hr ); -- 2.20.1

Dec. 10, 2019

[PATCH 1/5] msado15: Implement _Stream_get_EOS.

by Hans Leidekker

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msado15/stream.c | 9 +++++++-- dlls/msado15/tests/msado15.c | 9 +++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/msado15/stream.c b/dlls/msado15/stream.c index 169be7319e..9fb6007b57 100644 --- a/dlls/msado15/stream.c +++ b/dlls/msado15/stream.c @@ -124,8 +124,13 @@ static HRESULT WINAPI stream_get_Size( _Stream *iface, LONG *size ) static HRESULT WINAPI stream_get_EOS( _Stream *iface, VARIANT_BOOL *eos ) { - FIXME( "%p, %p\n", iface, eos ); - return E_NOTIMPL; + struct stream *stream = impl_from_Stream( iface ); + TRACE( "%p, %p\n", stream, eos ); + + if (stream->state == adStateClosed) return MAKE_ADO_HRESULT( adErrObjectClosed ); + + *eos = (stream->pos >= stream->size) ? VARIANT_TRUE : VARIANT_FALSE; + return S_OK; } static HRESULT WINAPI stream_get_Position( _Stream *iface, LONG *pos ) diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index 1755a7f3da..0b10579905 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -49,6 +49,7 @@ static HRESULT str_to_byte_array( const char *data, VARIANT *ret ) static void test_Stream(void) { _Stream *stream; + VARIANT_BOOL eos; StreamTypeEnum type; LONG refs, size, pos; ObjectStateEnum state; @@ -61,6 +62,9 @@ static void test_Stream(void) hr = _Stream_get_Size( stream, &size ); ok( hr == MAKE_ADO_HRESULT( adErrObjectClosed ), "got %08x\n", hr ); + hr = _Stream_get_EOS( stream, &eos ); + 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 ); @@ -111,6 +115,11 @@ static void test_Stream(void) ok( hr == S_OK, "got %08x\n", hr ); ok( !size, "got %d\n", size ); + eos = VARIANT_FALSE; + hr = _Stream_get_EOS( stream, &eos ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( eos == VARIANT_TRUE, "got %04x\n", eos ); + pos = -1; hr = _Stream_get_Position( stream, &pos ); ok( hr == S_OK, "got %08x\n", hr ); -- 2.20.1

Dec. 10, 2019

Re: [PATCH] ws2_32/tests: Fix the spelling of a couple of ok() messages.

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=61772 Your paranoid android. === wvistau64 (32 bit report) === ws2_32: sock.c:11456: Test failed: got 0 sock.c:11457: Test failed: got 00000000 sock.c:11458: Test failed: got 0000 sock.c:11459: Test failed: got 00000000 sock.c:11460: Test failed: got 00000000 sock.c:11531: Test failed: got 00000002 === w864 (32 bit report) === ws2_32: sock.c:8704: Test failed: The wrong first client was accepted by acceptex: 2 != 1 === w1064v1809 (64 bit report) === ws2_32: sock.c:8743: Test failed: bytesReturned isn't supposed to be 1 sock.c:8767: Test failed: GetOverlappedResult failed, error 0 === debian10 (32 bit WoW report) === ws2_32: sock.c:3052: Test failed: Test[1]: expected 2, got 0 sock.c:3052: Test failed: Test[2]: expected 2, got 0 sock.c:3052: Test failed: Test[1]: expected 2, got 0 sock.c:3052: Test failed: Test[2]: expected 2, got 0

Dec. 10, 2019

[PATCH] testbot/WineSendLog: Skip checking for new errors if there are no errors.

by Francois Gouget

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineSendLog.pl | 3 +++ 1 file changed, 3 insertions(+) diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index 95cc036c9..98bfc4c0f 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -287,6 +287,9 @@ EOF foreach my $LogName (@{$JobErrors->{$Key}->{LogNames}}) { my $LogErrors = $JobErrors->{$Key}->{$LogName}; + # Skip if there are no errors + next if (!$LogErrors->{Groups}); + my $RefFileName = $StepTask->GetFullFileName($StepTask->VM->Name ."_$LogName"); my ($NewGroups, $NewErrors, $_NewIndices) = GetNewLogErrors($RefFileName, $LogErrors->{Groups}, $LogErrors->{Errors}); if (!$NewGroups) -- 2.20.1

Dec. 10, 2019

[PATCH] testbot: Keep the StepTask methods in sync with the Step/Task ones.

by Francois Gouget

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/StepsTasks.pm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/StepsTasks.pm b/testbot/lib/WineTestBot/StepsTasks.pm index 19bedaaf4..463f15078 100644 --- a/testbot/lib/WineTestBot/StepsTasks.pm +++ b/testbot/lib/WineTestBot/StepsTasks.pm @@ -33,6 +33,7 @@ use WineTestBot::Config; use WineTestBot::Missions; +# Keep in sync with WineTestBot::Step::GetDir() sub GetStepDir($) { my ($self) = @_; @@ -40,7 +41,7 @@ sub GetStepDir($) return "$DataDir/jobs/$JobId/". $self->StepNo; } -# See WineTestBot::Step::GetFullFileName() +# Keep in sync with WineTestBot::Step::GetFullFileName() sub GetFullFileName($;$) { my ($self, $FileName) = @_; @@ -59,6 +60,7 @@ sub GetFullFileName($;$) return $Path . $FileName; } +# Keep in sync with WineTestBot::Task::GetDir() sub GetTaskDir($) { my ($self) = @_; -- 2.20.1

Dec. 10, 2019

Re: [PATCH] wineqtdecoder: Fix macos compile error

by Matteo Bruni

On Sun, Dec 8, 2019 at 4:22 AM Mathew Hodson <mathew.hodson(a)gmail.com> wrote: > > On Sat, Dec 7, 2019 at 1:03 AM Alistair Leslie-Hughes > <leslie_alistair(a)hotmail.com> wrote: > > > > Regression of 498179b4482026091bf7376c0d2ac9a036e7ca0e > > > > Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> > > --- > > dlls/wineqtdecoder/qtsplitter.c | 10 ++++------ > > 1 file changed, 4 insertions(+), 6 deletions(-) > > > > diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c > > index 5b1e82ebc9b..956dd0a7d0d 100644 > > --- a/dlls/wineqtdecoder/qtsplitter.c > > +++ b/dlls/wineqtdecoder/qtsplitter.c > > @@ -285,7 +285,7 @@ static HRESULT qt_splitter_start_stream(struct strmbase_filter *iface, REFERENCE > > QTSplitter *filter = impl_from_strmbase_filter(iface); > > HRESULT hr = VFW_E_NOT_CONNECTED, pin_hr; > > > > - EnterCriticalSection(&This->csReceive); > > + EnterCriticalSection(&filter->csReceive); > > Wouldn't the original commit have failed to compile on all platforms? > > Where is the This variable defined? wineqtdecoder is only built and used on macOS.

Dec. 10, 2019

Re: [PATCH] msado15: Fix the name of the GetString() delimiter parameters.

by Hans Leidekker

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com>

Dec. 10, 2019

[PATCH v2] msado15: Print the debug strings and not the pointers to them

by Hans Leidekker

From: Michael Stefaniuc <mstefani(a)winehq.org> v2: Don't trace the password. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msado15/connection.c | 2 +- dlls/msado15/stream.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msado15/connection.c b/dlls/msado15/connection.c index f33bc89a1a..43497636a8 100644 --- a/dlls/msado15/connection.c +++ b/dlls/msado15/connection.c @@ -187,7 +187,7 @@ static HRESULT WINAPI connection_Open( _Connection *iface, BSTR connect_str, BST LONG options ) { FIXME( "%p, %s, %s, %p, %08x\n", iface, debugstr_w(connect_str), debugstr_w(userid), - debugstr_w(password), options ); + password, options ); return E_NOTIMPL; } diff --git a/dlls/msado15/stream.c b/dlls/msado15/stream.c index 0c4d9ea425..169be7319e 100644 --- a/dlls/msado15/stream.c +++ b/dlls/msado15/stream.c @@ -371,7 +371,7 @@ static HRESULT WINAPI stream_ReadText( _Stream *iface, LONG len, BSTR *ret ) static HRESULT WINAPI stream_WriteText( _Stream *iface, BSTR data, StreamWriteEnum options ) { - FIXME( "%p, %p, %u\n", iface, debugstr_w(data), options ); + FIXME( "%p, %s, %u\n", iface, debugstr_w(data), options ); return E_NOTIMPL; } -- 2.20.1

Dec. 10, 2019