December 2019 - Wine-Commits

Gabriel Ivăncescu : vbscript: Implement ScriptTypeInfo_GetDocumentation.
by Alexandre Julliard Dec. 11, 2019

Dec. 11, 2019

Module: wine Branch: master Commit: 0fee1c759bddf174b06537d9774953dba56803fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=0fee1c759bddf174b06537d9… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Dec 11 18:19:40 2019 +0100 vbscript: Implement ScriptTypeInfo_GetDocumentation. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/vbdisp.c | 40 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 38 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index a6436125a3..94c68733cc 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -891,10 +891,46 @@ static HRESULT WINAPI ScriptTypeInfo_GetDocumentation(ITypeInfo *iface, MEMBERID BSTR *pBstrDocString, DWORD *pdwHelpContext, BSTR *pBstrHelpFile) { ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); + ITypeInfo *disp_typeinfo; + function_t *func; + HRESULT hr; - FIXME("(%p)->(%d %p %p %p %p)\n", This, memid, pBstrName, pBstrDocString, pdwHelpContext, pBstrHelpFile); + TRACE("(%p)->(%d %p %p %p %p)\n", This, memid, pBstrName, pBstrDocString, pdwHelpContext, pBstrHelpFile); - return E_NOTIMPL; + if (pBstrDocString) *pBstrDocString = NULL; + if (pdwHelpContext) *pdwHelpContext = 0; + if (pBstrHelpFile) *pBstrHelpFile = NULL; + + if (memid == MEMBERID_NIL) + { + if (pBstrName && !(*pBstrName = SysAllocString(L"VBScriptTypeInfo"))) + return E_OUTOFMEMORY; + if (pBstrDocString && + !(*pBstrDocString = SysAllocString(L"Visual Basic Scripting Type Info"))) + { + if (pBstrName) SysFreeString(*pBstrName); + return E_OUTOFMEMORY; + } + return S_OK; + } + if (memid <= 0) return TYPE_E_ELEMENTNOTFOUND; + + func = get_func_from_memid(This, memid); + if (!func && memid > This->num_vars) + { + hr = get_dispatch_typeinfo(&disp_typeinfo); + if (FAILED(hr)) return hr; + + return ITypeInfo_GetDocumentation(disp_typeinfo, memid, pBstrName, pBstrDocString, + pdwHelpContext, pBstrHelpFile); + } + + if (pBstrName) + { + *pBstrName = SysAllocString(func ? func->name : This->disp->global_vars[memid - 1]->name); + if (!*pBstrName) return E_OUTOFMEMORY; + } + return S_OK; } static HRESULT WINAPI ScriptTypeInfo_GetDllEntry(ITypeInfo *iface, MEMBERID memid, INVOKEKIND invKind,

1 0

Gabriel Ivăncescu : vbscript: Implement ScriptTypeInfo_Invoke.
by Alexandre Julliard Dec. 11, 2019

Dec. 11, 2019

Module: wine Branch: master Commit: 5e912f28698cb3a68c6d1bd5925224af453683c0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5e912f28698cb3a68c6d1bd5… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Dec 11 18:19:33 2019 +0100 vbscript: Implement ScriptTypeInfo_Invoke. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/vbdisp.c | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index 00c48e0b48..a6436125a3 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -858,11 +858,33 @@ static HRESULT WINAPI ScriptTypeInfo_Invoke(ITypeInfo *iface, PVOID pvInstance, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); + ITypeInfo *disp_typeinfo; + IDispatch *disp; + HRESULT hr; - FIXME("(%p)->(%p %d %d %p %p %p %p)\n", This, pvInstance, memid, wFlags, + TRACE("(%p)->(%p %d %d %p %p %p %p)\n", This, pvInstance, memid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); - return E_NOTIMPL; + if (!pvInstance) return E_INVALIDARG; + if (memid <= 0) return TYPE_E_ELEMENTNOTFOUND; + + if (!get_func_from_memid(This, memid) && memid > This->num_vars) + { + hr = get_dispatch_typeinfo(&disp_typeinfo); + if (FAILED(hr)) return hr; + + return ITypeInfo_Invoke(disp_typeinfo, pvInstance, memid, wFlags, pDispParams, + pVarResult, pExcepInfo, puArgErr); + } + + hr = IUnknown_QueryInterface((IUnknown*)pvInstance, &IID_IDispatch, (void**)&disp); + if (FAILED(hr)) return hr; + + hr = IDispatch_Invoke(disp, memid, &IID_NULL, LOCALE_USER_DEFAULT, wFlags, + pDispParams, pVarResult, pExcepInfo, puArgErr); + IDispatch_Release(disp); + + return hr; } static HRESULT WINAPI ScriptTypeInfo_GetDocumentation(ITypeInfo *iface, MEMBERID memid, BSTR *pBstrName,

1 0

Ken Thomases : winemac: Only manipulate an NSOpenGLContext's view on the main thread.
by Alexandre Julliard Dec. 11, 2019

Dec. 11, 2019

Module: wine Branch: master Commit: 1261589c2cc68061d4bd9d41a387cd4979d7073c URL: https://source.winehq.org/git/wine.git/?a=commit;h=1261589c2cc68061d4bd9d41… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Dec 11 11:49:47 2019 -0600 winemac: Only manipulate an NSOpenGLContext's view on the main thread. I was seeing a crash due to an assert about manipulating it on a background thread. I can't recall where I was seeing that. I think it's new in Catalina. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_opengl.m | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/winemac.drv/cocoa_opengl.m b/dlls/winemac.drv/cocoa_opengl.m index 5a097a12d2..e60b0b388b 100644 --- a/dlls/winemac.drv/cocoa_opengl.m +++ b/dlls/winemac.drv/cocoa_opengl.m @@ -79,8 +79,10 @@ macdrv_set_view_backing_size((macdrv_view)self.view, view_backing); NSView* save = self.view; - [super clearDrawable]; - [super setView:save]; + OnMainThread(^{ + [super clearDrawable]; + [super setView:save]; + }); shouldClearToBlack = TRUE; } } @@ -122,7 +124,11 @@ - (void) setView:(NSView*)newView { NSView* oldView = [self view]; - [super setView:newView]; + if ([NSThread isMainThread]) + [super setView:newView]; + else OnMainThread(^{ + [super setView:newView]; + }); [newView retain]; [oldView release]; } @@ -130,7 +136,11 @@ - (void) clearDrawable { NSView* oldView = [self view]; - [super clearDrawable]; + if ([NSThread isMainThread]) + [super clearDrawable]; + else OnMainThread(^{ + [super clearDrawable]; + }); [oldView release]; [self wine_updateBackingSize:NULL];

1 0

Gabriel Ivăncescu : vbscript: Implement ScriptTypeInfo_GetRefTypeOfImplType.
by Alexandre Julliard Dec. 11, 2019

Dec. 11, 2019

Module: wine Branch: master Commit: 8ce98552566845a22bf4bb16b2aa1c55217e5e76 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8ce98552566845a22bf4bb16… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Dec 11 18:19:16 2019 +0100 vbscript: Implement ScriptTypeInfo_GetRefTypeOfImplType. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/vbdisp.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index 373efcc507..346ec13e32 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -780,9 +780,14 @@ static HRESULT WINAPI ScriptTypeInfo_GetRefTypeOfImplType(ITypeInfo *iface, UINT { ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); - FIXME("(%p)->(%u %p)\n", This, index, pRefType); + TRACE("(%p)->(%u %p)\n", This, index, pRefType); - return E_NOTIMPL; + /* We only inherit from IDispatch */ + if (!pRefType) return E_INVALIDARG; + if (index != 0) return TYPE_E_ELEMENTNOTFOUND; + + *pRefType = 1; + return S_OK; } static HRESULT WINAPI ScriptTypeInfo_GetImplTypeFlags(ITypeInfo *iface, UINT index, INT *pImplTypeFlags)

1 0

Gabriel Ivăncescu : vbscript: Implement ScriptTypeInfo_GetNames.
by Alexandre Julliard Dec. 11, 2019

Dec. 11, 2019

Module: wine Branch: master Commit: c4819437da1c92ec619bdac7cadf3f33879a5bf8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c4819437da1c92ec619bdac7… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Dec 11 18:19:10 2019 +0100 vbscript: Implement ScriptTypeInfo_GetNames. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/vbdisp.c | 67 ++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 65 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index 6dc34b32d9..373efcc507 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -546,6 +546,26 @@ typedef struct { ScriptDisp *disp; } ScriptTypeInfo; +static function_t *get_func_from_memid(const ScriptTypeInfo *typeinfo, MEMBERID memid) +{ + UINT a = 0, b = typeinfo->num_funcs; + + if (!(memid & DISPID_FUNCTION_MASK)) return NULL; + + while (a < b) + { + UINT i = (a + b - 1) / 2; + + if (memid == typeinfo->funcs[i].memid) + return typeinfo->funcs[i].func; + else if (memid < typeinfo->funcs[i].memid) + b = i; + else + a = i + 1; + } + return NULL; +} + static inline ScriptTypeInfo *ScriptTypeInfo_from_ITypeInfo(ITypeInfo *iface) { return CONTAINING_RECORD(iface, ScriptTypeInfo, ITypeInfo_iface); @@ -707,10 +727,53 @@ static HRESULT WINAPI ScriptTypeInfo_GetNames(ITypeInfo *iface, MEMBERID memid, UINT cMaxNames, UINT *pcNames) { ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); + ITypeInfo *disp_typeinfo; + function_t *func; + HRESULT hr; + UINT i = 0; - FIXME("(%p)->(%d %p %u %p)\n", This, memid, rgBstrNames, cMaxNames, pcNames); + TRACE("(%p)->(%d %p %u %p)\n", This, memid, rgBstrNames, cMaxNames, pcNames); - return E_NOTIMPL; + if (!rgBstrNames || !pcNames) return E_INVALIDARG; + if (memid <= 0) return TYPE_E_ELEMENTNOTFOUND; + + func = get_func_from_memid(This, memid); + if (!func && memid > This->num_vars) + { + hr = get_dispatch_typeinfo(&disp_typeinfo); + if (FAILED(hr)) return hr; + + return ITypeInfo_GetNames(disp_typeinfo, memid, rgBstrNames, cMaxNames, pcNames); + } + + *pcNames = 0; + if (!cMaxNames) return S_OK; + + if (func) + { + UINT num = min(cMaxNames, func->arg_cnt + 1); + + rgBstrNames[0] = SysAllocString(func->name); + if (!rgBstrNames[0]) return E_OUTOFMEMORY; + + for (i = 1; i < num; i++) + { + if (!(rgBstrNames[i] = SysAllocString(func->args[i - 1].name))) + { + do SysFreeString(rgBstrNames[--i]); while (i); + return E_OUTOFMEMORY; + } + } + } + else + { + rgBstrNames[0] = SysAllocString(This->disp->global_vars[memid - 1]->name); + if (!rgBstrNames[0]) return E_OUTOFMEMORY; + i++; + } + + *pcNames = i; + return S_OK; } static HRESULT WINAPI ScriptTypeInfo_GetRefTypeOfImplType(ITypeInfo *iface, UINT index, HREFTYPE *pRefType)

1 0

Gabriel Ivăncescu : jscript: Keep a pointer to the bytecode in function_code_t.
by Alexandre Julliard Dec. 11, 2019

Dec. 11, 2019

Module: wine Branch: master Commit: c70c10564a61221be5a519dbcf360e44eb18c19b URL: https://source.winehq.org/git/wine.git/?a=commit;h=c70c10564a61221be5a519db… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Dec 11 16:08:22 2019 +0200 jscript: Keep a pointer to the bytecode in function_code_t. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/compile.c | 1 + dlls/jscript/engine.h | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index db05d3c360..a530e87d8e 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -2279,6 +2279,7 @@ static HRESULT compile_function(compiler_ctx_t *ctx, source_elements_t *source, TRACE("\n"); + func->bytecode = ctx->code; ctx->func_head = ctx->func_tail = NULL; ctx->from_eval = from_eval; ctx->func = func; diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 955c315ff9..48cc9529f4 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -103,6 +103,8 @@ OP_LIST OP_LAST } jsop_t; +typedef struct _bytecode_t bytecode_t; + typedef union { BSTR bstr; LONG lng; @@ -163,11 +165,13 @@ typedef struct _function_code_t { unsigned locals_cnt; local_ref_t *locals; + + bytecode_t *bytecode; } function_code_t; local_ref_t *lookup_local(const function_code_t*,const WCHAR*) DECLSPEC_HIDDEN; -typedef struct _bytecode_t { +struct _bytecode_t { LONG ref; BOOL is_persistent; @@ -187,7 +191,7 @@ typedef struct _bytecode_t { unsigned str_cnt; struct list entry; -} bytecode_t; +}; HRESULT compile_script(script_ctx_t*,const WCHAR*,const WCHAR*,const WCHAR*,BOOL,BOOL,bytecode_t**) DECLSPEC_HIDDEN; void release_bytecode(bytecode_t*) DECLSPEC_HIDDEN;

1 0

Gabriel Ivăncescu : vbscript: Implement ScriptTypeInfo_GetRefTypeInfo.
by Alexandre Julliard Dec. 11, 2019

Dec. 11, 2019

Module: wine Branch: master Commit: 3dc54aa79d230e23b6bb5c6bfc9af7ee09627672 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3dc54aa79d230e23b6bb5c6b… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Dec 11 18:19:21 2019 +0100 vbscript: Implement ScriptTypeInfo_GetRefTypeInfo. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/vbdisp.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index 346ec13e32..b01335b3bf 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -884,10 +884,23 @@ static HRESULT WINAPI ScriptTypeInfo_GetDllEntry(ITypeInfo *iface, MEMBERID memi static HRESULT WINAPI ScriptTypeInfo_GetRefTypeInfo(ITypeInfo *iface, HREFTYPE hRefType, ITypeInfo **ppTInfo) { ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); + HRESULT hr; - FIXME("(%p)->(%x %p)\n", This, hRefType, ppTInfo); + TRACE("(%p)->(%x %p)\n", This, hRefType, ppTInfo); - return E_NOTIMPL; + if (!ppTInfo || (INT)hRefType < 0) return E_INVALIDARG; + + if (hRefType & ~3) return E_FAIL; + if (hRefType & 1) + { + hr = get_dispatch_typeinfo(ppTInfo); + if (FAILED(hr)) return hr; + } + else + *ppTInfo = iface; + + ITypeInfo_AddRef(*ppTInfo); + return S_OK; } static HRESULT WINAPI ScriptTypeInfo_AddressOfMember(ITypeInfo *iface, MEMBERID memid, INVOKEKIND invKind, PVOID *ppv)

1 0

Gabriel Ivăncescu : vbscript: Implement ScriptTypeInfo_AddressOfMember.
by Alexandre Julliard Dec. 11, 2019

Dec. 11, 2019

Module: wine Branch: master Commit: 313d6de3fbbb45074788554c110770243c138c9a URL: https://source.winehq.org/git/wine.git/?a=commit;h=313d6de3fbbb45074788554c… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Dec 11 18:19:56 2019 +0100 vbscript: Implement ScriptTypeInfo_AddressOfMember. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/vbdisp.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index edf7739a5d..319867b0ea 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -981,10 +981,22 @@ static HRESULT WINAPI ScriptTypeInfo_GetRefTypeInfo(ITypeInfo *iface, HREFTYPE h static HRESULT WINAPI ScriptTypeInfo_AddressOfMember(ITypeInfo *iface, MEMBERID memid, INVOKEKIND invKind, PVOID *ppv) { ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); + ITypeInfo *disp_typeinfo; + HRESULT hr; - FIXME("(%p)->(%d %d %p)\n", This, memid, invKind, ppv); + TRACE("(%p)->(%d %d %p)\n", This, memid, invKind, ppv); - return E_NOTIMPL; + if (!ppv) return E_INVALIDARG; + *ppv = NULL; + + if (!get_func_from_memid(This, memid) && memid > This->num_vars) + { + hr = get_dispatch_typeinfo(&disp_typeinfo); + if (FAILED(hr)) return hr; + + return ITypeInfo_AddressOfMember(disp_typeinfo, memid, invKind, ppv); + } + return TYPE_E_BADMODULEKIND; } static HRESULT WINAPI ScriptTypeInfo_CreateInstance(ITypeInfo *iface, IUnknown *pUnkOuter, REFIID riid, PVOID *ppvObj)

1 0

Hans Leidekker : msado15: Implement Field_put_Type, Field_put_DefinedSize and Field_put_Attributes.
by Alexandre Julliard Dec. 11, 2019

Dec. 11, 2019

Module: wine Branch: master Commit: c5f82e3903f172e5334dc0cdd7536ae5deb2c9c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c5f82e3903f172e5334dc0cd… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Dec 11 17:18:29 2019 +0100 msado15: Implement Field_put_Type, Field_put_DefinedSize and Field_put_Attributes. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msado15/recordset.c | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index 99d22e4db0..78d13d1577 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -54,6 +54,9 @@ struct field Field Field_iface; LONG refs; WCHAR *name; + DataTypeEnum type; + LONG defined_size; + LONG attrs; LONG index; struct recordset *recordset; }; @@ -240,20 +243,32 @@ static HRESULT WINAPI field_put_NumericScale( Field *iface, unsigned char scale static HRESULT WINAPI field_put_Type( Field *iface, DataTypeEnum type ) { - FIXME( "%p, %u\n", iface, type ); - return E_NOTIMPL; + struct field *field = impl_from_Field( iface ); + + TRACE( "%p, %u\n", field, type ); + + field->type = type; + return S_OK; } static HRESULT WINAPI field_put_DefinedSize( Field *iface, LONG size ) { - FIXME( "%p, %d\n", iface, size ); - return E_NOTIMPL; + struct field *field = impl_from_Field( iface ); + + TRACE( "%p, %d\n", field, size ); + + field->defined_size = size; + return S_OK; } static HRESULT WINAPI field_put_Attributes( Field *iface, LONG attrs ) { - FIXME( "%p, %d\n", iface, attrs ); - return E_NOTIMPL; + struct field *field = impl_from_Field( iface ); + + TRACE( "%p, %d\n", field, attrs ); + + field->attrs = attrs; + return S_OK; } static HRESULT WINAPI field_get_Status( Field *iface, LONG *status )

1 0

Hans Leidekker : msado15: Implement Fields_get_Count.
by Alexandre Julliard Dec. 11, 2019

Dec. 11, 2019

Module: wine Branch: master Commit: a5939587c92c16c5a0eb0e144c434b2ae75f8e10 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a5939587c92c16c5a0eb0e14… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Dec 11 17:18:28 2019 +0100 msado15: Implement Fields_get_Count. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msado15/recordset.c | 8 ++++++-- dlls/msado15/tests/msado15.c | 48 ++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 52 insertions(+), 4 deletions(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index ed3cdf6bbf..99d22e4db0 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -388,8 +388,12 @@ static HRESULT WINAPI fields_Invoke( Fields *iface, DISPID member, REFIID riid, static HRESULT WINAPI fields_get_Count( Fields *iface, LONG *count ) { - FIXME( "%p, %p\n", iface, count ); - return E_NOTIMPL; + struct fields *fields = impl_from_Fields( iface ); + + TRACE( "%p, %p\n", fields, count ); + + *count = fields->count; + return S_OK; } static HRESULT WINAPI fields__NewEnum( Fields *iface, IUnknown **obj ) diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index e6371b8392..4ef4762ac6 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -77,8 +77,8 @@ static void test_Recordset(void) count = -1; hr = Fields_get_Count( fields2, &count ); - todo_wine ok( hr == S_OK, "got %08x\n", hr ); - todo_wine ok( !count, "got %d\n", count ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !count, "got %d\n", count ); refs = _Recordset_Release( recordset ); ok( !refs, "got %d\n", refs ); @@ -88,6 +88,49 @@ static void test_Recordset(void) ok( refs == 1, "got %d\n", refs ); } +static void test_Fields(void) +{ + _Recordset *recordset; + Fields *fields; + VARIANT val; + BSTR name; + LONG count; + HRESULT hr; + + hr = CoCreateInstance( &CLSID_Recordset, NULL, CLSCTX_INPROC_SERVER, &IID__Recordset, (void **)&recordset ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = _Recordset_get_Fields( recordset, &fields ); + ok( hr == S_OK, "got %08x\n", hr ); + + count = -1; + hr = Fields_get_Count( fields, &count ); + ok( !count, "got %d\n", count ); + + name = SysAllocString( L"field" ); + V_VT( &val ) = VT_ERROR; + V_ERROR( &val ) = DISP_E_PARAMNOTFOUND; + hr = Fields_Append( fields, name, adInteger, 4, adFldUnspecified, val ); + ok( hr == S_OK, "got %08x\n", hr ); + SysFreeString( name ); + + count = -1; + hr = Fields_get_Count( fields, &count ); + ok( count == 1, "got %d\n", count ); + + name = SysAllocString( L"field2" ); + hr = Fields__Append( fields, name, adInteger, 4, adFldUnspecified ); + ok( hr == S_OK, "got %08x\n", hr ); + SysFreeString( name ); + + count = -1; + hr = Fields_get_Count( fields, &count ); + ok( count == 2, "got %d\n", count ); + + Fields_Release( fields ); + _Recordset_Release( recordset ); +} + static HRESULT str_to_byte_array( const char *data, VARIANT *ret ) { SAFEARRAY *vector; @@ -406,6 +449,7 @@ START_TEST(msado15) { CoInitialize( NULL ); test_Connection(); + test_Fields(); test_Recordset(); test_Stream(); CoUninitialize();

1 0