February 2021 - Wine-Commits

Alistair Leslie-Hughes : msado15: Implement Dispatch functions in Field.
by Alexandre Julliard Feb. 26, 2021

Feb. 26, 2021

Module: wine Branch: master Commit: 5650d2b8f154337c6c958cde9423f90df98ec6b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5650d2b8f154337c6c958cde… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Feb 26 19:02:24 2021 +1100 msado15: Implement Dispatch functions in Field. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msado15/main.c | 1 + dlls/msado15/msado15_private.h | 1 + dlls/msado15/recordset.c | 44 ++++++++++++++++++++++++++++++++++-------- 3 files changed, 38 insertions(+), 8 deletions(-) diff --git a/dlls/msado15/main.c b/dlls/msado15/main.c index 4d54999fb04..2541c81b1d2 100644 --- a/dlls/msado15/main.c +++ b/dlls/msado15/main.c @@ -181,6 +181,7 @@ static ITypeInfo *typeinfos[LAST_tid]; static REFIID tid_ids[] = { &IID__Command, &IID__Connection, + &IID_Field, &IID__Stream, }; diff --git a/dlls/msado15/msado15_private.h b/dlls/msado15/msado15_private.h index b9fa01ef90d..9db82c8bd9a 100644 --- a/dlls/msado15/msado15_private.h +++ b/dlls/msado15/msado15_private.h @@ -45,6 +45,7 @@ static inline WCHAR *strdupW( const WCHAR *src ) typedef enum tid_t { Command_tid, Connection_tid, + Field_tid, Stream_tid, LAST_tid } tid_t; diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index 71df553ebb6..b79fca16705 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -126,29 +126,57 @@ static HRESULT WINAPI field_QueryInterface( Field *iface, REFIID riid, void **ob static HRESULT WINAPI field_GetTypeInfoCount( Field *iface, UINT *count ) { - FIXME( "%p, %p\n", iface, count ); - return E_NOTIMPL; + struct field *field = impl_from_Field( iface ); + TRACE( "%p, %p\n", field, count ); + *count = 1; + return S_OK; } static HRESULT WINAPI field_GetTypeInfo( Field *iface, UINT index, LCID lcid, ITypeInfo **info ) { - FIXME( "%p, %u, %u, %p\n", iface, index, lcid, info ); - return E_NOTIMPL; + struct field *field = impl_from_Field( iface ); + TRACE( "%p, %u, %u, %p\n", field, index, lcid, info ); + return get_typeinfo(Field_tid, info); } static HRESULT WINAPI field_GetIDsOfNames( Field *iface, REFIID riid, LPOLESTR *names, UINT count, LCID lcid, DISPID *dispid ) { - FIXME( "%p, %s, %p, %u, %u, %p\n", iface, debugstr_guid(riid), names, count, lcid, dispid ); - return E_NOTIMPL; + struct field *field = impl_from_Field( iface ); + HRESULT hr; + ITypeInfo *typeinfo; + + TRACE( "%p, %s, %p, %u, %u, %p\n", field, debugstr_guid(riid), names, count, lcid, dispid ); + + hr = get_typeinfo(Field_tid, &typeinfo); + if(SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames(typeinfo, names, count, dispid); + ITypeInfo_Release(typeinfo); + } + + return hr; } static HRESULT WINAPI field_Invoke( Field *iface, DISPID member, REFIID riid, LCID lcid, WORD flags, DISPPARAMS *params, VARIANT *result, EXCEPINFO *excep_info, UINT *arg_err ) { - FIXME( "%p, %d, %s, %d, %d, %p, %p, %p, %p\n", iface, member, debugstr_guid(riid), lcid, flags, params, + struct field *field = impl_from_Field( iface ); + HRESULT hr; + ITypeInfo *typeinfo; + + TRACE( "%p, %d, %s, %d, %d, %p, %p, %p, %p\n", field, member, debugstr_guid(riid), lcid, flags, params, result, excep_info, arg_err ); - return E_NOTIMPL; + + hr = get_typeinfo(Field_tid, &typeinfo); + if(SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke(typeinfo, &field->Field_iface, member, flags, params, + result, excep_info, arg_err); + ITypeInfo_Release(typeinfo); + } + + return hr; } static HRESULT WINAPI field_get_Properties( Field *iface, Properties **obj )

1 0

Nikolay Sivov : wbemdisp: Implement InParameters() property for a method object.
by Alexandre Julliard Feb. 26, 2021

Feb. 26, 2021

Module: wine Branch: master Commit: 28dc9e1e0a36be0808df56c32d6ddfee28112a98 URL: https://source.winehq.org/git/wine.git/?a=commit;h=28dc9e1e0a36be0808df56c3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 26 10:22:15 2021 +0300 wbemdisp: Implement InParameters() property for a method object. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemdisp/locator.c | 60 ++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 49 insertions(+), 11 deletions(-) diff --git a/dlls/wbemdisp/locator.c b/dlls/wbemdisp/locator.c index a73bd6e55da..d7b04e343fd 100644 --- a/dlls/wbemdisp/locator.c +++ b/dlls/wbemdisp/locator.c @@ -35,8 +35,17 @@ WINE_DEFAULT_DEBUG_CHANNEL(wbemdisp); +static WCHAR *heap_strdupW( const WCHAR *src ) +{ + WCHAR *dst; + if (!src) return NULL; + if ((dst = heap_alloc( (lstrlenW( src ) + 1) * sizeof(WCHAR) ))) lstrcpyW( dst, src ); + return dst; +} + static HRESULT EnumVARIANT_create( IEnumWbemClassObject *, IEnumVARIANT ** ); static HRESULT ISWbemSecurity_create( ISWbemSecurity ** ); +static HRESULT SWbemObject_create( IWbemClassObject *, ISWbemObject ** ); enum type_id { @@ -522,10 +531,19 @@ struct object DISPID last_dispid_method; }; +struct methodset +{ + ISWbemMethodSet ISWbemMethodSet_iface; + LONG refs; + struct object *object; +}; + struct method { ISWbemMethod ISWbemMethod_iface; LONG refs; + struct methodset *set; + WCHAR *name; }; static struct method *impl_from_ISWbemMethod( ISWbemMethod *iface ) @@ -567,6 +585,8 @@ static ULONG WINAPI method_Release( ISWbemMethod *iface ) if (!refs) { TRACE( "destroying %p\n", method ); + ISWbemMethodSet_Release( &method->set->ISWbemMethodSet_iface ); + heap_free( method->name ); heap_free( method ); } return refs; @@ -671,9 +691,27 @@ static HRESULT WINAPI method_get_InParameters( ISWbemMethod *iface, ISWbemObject **params ) { - FIXME("\n"); + struct method *method = impl_from_ISWbemMethod( iface ); + IWbemClassObject *in_sign = NULL, *instance; + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %p\n", method, params); + + *params = NULL; + + if (SUCCEEDED(hr = IWbemClassObject_GetMethod( method->set->object->object, + method->name, 0, &in_sign, NULL )) && in_sign != NULL) + { + hr = IWbemClassObject_SpawnInstance( in_sign, 0, &instance ); + IWbemClassObject_Release( in_sign ); + if (SUCCEEDED(hr)) + { + hr = SWbemObject_create( instance, params ); + IWbemClassObject_Release( instance ); + } + } + + return hr; } static HRESULT WINAPI method_get_OutParameters( @@ -710,7 +748,7 @@ static const ISWbemMethodVtbl methodvtbl = method_get_Qualifiers_, }; -static HRESULT SWbemMethod_create( ISWbemMethod **obj ) +static HRESULT SWbemMethod_create( struct methodset *set, const WCHAR *name, ISWbemMethod **obj ) { struct method *method; @@ -719,19 +757,19 @@ static HRESULT SWbemMethod_create( ISWbemMethod **obj ) method->ISWbemMethod_iface.lpVtbl = &methodvtbl; method->refs = 1; + method->set = set; + ISWbemMethodSet_AddRef( &method->set->ISWbemMethodSet_iface ); + if (!(method->name = heap_strdupW( name ))) + { + ISWbemMethod_Release( &method->ISWbemMethod_iface ); + return E_OUTOFMEMORY; + } *obj = &method->ISWbemMethod_iface; return S_OK; } -struct methodset -{ - ISWbemMethodSet ISWbemMethodSet_iface; - LONG refs; - struct object *object; -}; - static struct methodset *impl_from_ISWbemMethodSet( ISWbemMethodSet *iface ) { return CONTAINING_RECORD( iface, struct methodset, ISWbemMethodSet_iface ); @@ -884,7 +922,7 @@ static HRESULT WINAPI methodset_Item( if (out_sign) IWbemClassObject_Release( out_sign ); - return SWbemMethod_create( method ); + return SWbemMethod_create( set, name, method ); } return hr;

1 0

Nikolay Sivov : wbemdisp: Add a stub implementation of a method object.
by Alexandre Julliard Feb. 26, 2021

Feb. 26, 2021

Module: wine Branch: master Commit: 01d2ca19972cf217f7ccee21d6bd0148678e83e5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=01d2ca19972cf217f7ccee21… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 26 10:22:13 2021 +0300 wbemdisp: Add a stub implementation of a method object. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemdisp/locator.c | 270 ++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 248 insertions(+), 22 deletions(-) diff --git a/dlls/wbemdisp/locator.c b/dlls/wbemdisp/locator.c index 9cea78cdf71..a73bd6e55da 100644 --- a/dlls/wbemdisp/locator.c +++ b/dlls/wbemdisp/locator.c @@ -50,6 +50,7 @@ enum type_id ISWbemNamedValueSet_tid, ISWbemNamedValue_tid, ISWbemMethodSet_tid, + ISWbemMethod_tid, last_tid }; @@ -68,6 +69,7 @@ static REFIID wbemdisp_tid_id[] = &IID_ISWbemNamedValueSet, &IID_ISWbemNamedValue, &IID_ISWbemMethodSet, + &IID_ISWbemMethod, }; static HRESULT get_typeinfo( enum type_id tid, ITypeInfo **ret ) @@ -502,10 +504,232 @@ static HRESULT SWbemPropertySet_create( IWbemClassObject *wbem_object, ISWbemPro return S_OK; } +struct member +{ + BSTR name; + BOOL is_method; + DISPID dispid; +}; + +struct object +{ + ISWbemObject ISWbemObject_iface; + LONG refs; + IWbemClassObject *object; + struct member *members; + UINT nb_members; + DISPID last_dispid; + DISPID last_dispid_method; +}; + +struct method +{ + ISWbemMethod ISWbemMethod_iface; + LONG refs; +}; + +static struct method *impl_from_ISWbemMethod( ISWbemMethod *iface ) +{ + return CONTAINING_RECORD( iface, struct method, ISWbemMethod_iface ); +} + +static HRESULT WINAPI method_QueryInterface( ISWbemMethod *iface, REFIID riid, void **ppvObject ) +{ + struct method *method = impl_from_ISWbemMethod( iface ); + + TRACE( "%p %s %p\n", method, debugstr_guid(riid), ppvObject ); + + if (IsEqualGUID( riid, &IID_ISWbemMethod ) || + IsEqualGUID( riid, &IID_IDispatch ) || + IsEqualGUID( riid, &IID_IUnknown )) + { + *ppvObject = iface; + } + else + { + FIXME( "interface %s not implemented\n", debugstr_guid(riid) ); + return E_NOINTERFACE; + } + ISWbemMethod_AddRef( iface ); + return S_OK; +} + +static ULONG WINAPI method_AddRef( ISWbemMethod *iface ) +{ + struct method *method = impl_from_ISWbemMethod( iface ); + return InterlockedIncrement( &method->refs ); +} + +static ULONG WINAPI method_Release( ISWbemMethod *iface ) +{ + struct method *method = impl_from_ISWbemMethod( iface ); + LONG refs = InterlockedDecrement( &method->refs ); + if (!refs) + { + TRACE( "destroying %p\n", method ); + heap_free( method ); + } + return refs; +} + +static HRESULT WINAPI method_GetTypeInfoCount( + ISWbemMethod *iface, + UINT *count ) +{ + struct method *method = impl_from_ISWbemMethod( iface ); + + TRACE( "%p, %p\n", method, count ); + *count = 1; + return S_OK; +} + +static HRESULT WINAPI method_GetTypeInfo( + ISWbemMethod *iface, + UINT index, + LCID lcid, + ITypeInfo **info ) +{ + struct method *method = impl_from_ISWbemMethod( iface ); + + TRACE( "%p, %u, %u, %p\n", method, index, lcid, info ); + + return get_typeinfo( ISWbemMethod_tid, info ); +} + +static HRESULT WINAPI method_GetIDsOfNames( + ISWbemMethod *iface, + REFIID riid, + LPOLESTR *names, + UINT count, + LCID lcid, + DISPID *dispid ) +{ + struct method *method = impl_from_ISWbemMethod( iface ); + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE( "%p, %s, %p, %u, %u, %p\n", method, debugstr_guid(riid), names, count, lcid, dispid ); + + if (!names || !count || !dispid) return E_INVALIDARG; + + hr = get_typeinfo( ISWbemMethod_tid, &typeinfo ); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames( typeinfo, names, count, dispid ); + ITypeInfo_Release( typeinfo ); + } + return hr; +} + +static HRESULT WINAPI method_Invoke( + ISWbemMethod *iface, + DISPID member, + REFIID riid, + LCID lcid, + WORD flags, + DISPPARAMS *params, + VARIANT *result, + EXCEPINFO *excep_info, + UINT *arg_err ) +{ + struct method *method = impl_from_ISWbemMethod( iface ); + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE( "%p, %d, %s, %d, %d, %p, %p, %p, %p\n", method, member, debugstr_guid(riid), + lcid, flags, params, result, excep_info, arg_err ); + + hr = get_typeinfo( ISWbemMethod_tid, &typeinfo ); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke( typeinfo, &method->ISWbemMethod_iface, member, flags, + params, result, excep_info, arg_err ); + ITypeInfo_Release( typeinfo ); + } + return hr; +} + +static HRESULT WINAPI method_get_Name( + ISWbemMethod *iface, + BSTR *name ) +{ + FIXME("\n"); + + return E_NOTIMPL; +} + +static HRESULT WINAPI method_get_Origin( + ISWbemMethod *iface, + BSTR *origin ) +{ + FIXME("\n"); + + return E_NOTIMPL; +} + +static HRESULT WINAPI method_get_InParameters( + ISWbemMethod *iface, + ISWbemObject **params ) +{ + FIXME("\n"); + + return E_NOTIMPL; +} + +static HRESULT WINAPI method_get_OutParameters( + ISWbemMethod *iface, + ISWbemObject **params ) +{ + FIXME("\n"); + + return E_NOTIMPL; +} + +static HRESULT WINAPI method_get_Qualifiers_( + ISWbemMethod *iface, + ISWbemQualifierSet **qualifiers ) +{ + FIXME("\n"); + + return E_NOTIMPL; +} + +static const ISWbemMethodVtbl methodvtbl = +{ + method_QueryInterface, + method_AddRef, + method_Release, + method_GetTypeInfoCount, + method_GetTypeInfo, + method_GetIDsOfNames, + method_Invoke, + method_get_Name, + method_get_Origin, + method_get_InParameters, + method_get_OutParameters, + method_get_Qualifiers_, +}; + +static HRESULT SWbemMethod_create( ISWbemMethod **obj ) +{ + struct method *method; + + if (!(method = heap_alloc(sizeof(*method)))) + return E_OUTOFMEMORY; + + method->ISWbemMethod_iface.lpVtbl = &methodvtbl; + method->refs = 1; + + *obj = &method->ISWbemMethod_iface; + + return S_OK; +} + struct methodset { ISWbemMethodSet ISWbemMethodSet_iface; LONG refs; + struct object *object; }; static struct methodset *impl_from_ISWbemMethodSet( ISWbemMethodSet *iface ) @@ -547,6 +771,7 @@ static ULONG WINAPI methodset_Release( ISWbemMethodSet *iface ) if (!refs) { TRACE( "destroying %p\n", set ); + ISWbemObject_Release( &set->object->ISWbemObject_iface ); heap_free( set ); } return refs; @@ -643,9 +868,26 @@ static HRESULT WINAPI methodset_Item( LONG flags, ISWbemMethod **method ) { - FIXME("\n"); + struct methodset *set = impl_from_ISWbemMethodSet( iface ); + IWbemClassObject *in_sign, *out_sign; + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %s, %#x, %p\n", set, debugstr_w(name), flags, method); + + *method = NULL; + + if (SUCCEEDED(hr = IWbemClassObject_GetMethod( set->object->object, + name, flags, &in_sign, &out_sign ))) + { + if (in_sign) + IWbemClassObject_Release( in_sign ); + if (out_sign) + IWbemClassObject_Release( out_sign ); + + return SWbemMethod_create( method ); + } + + return hr; } static HRESULT WINAPI methodset_get_Count( @@ -671,7 +913,7 @@ static const ISWbemMethodSetVtbl methodsetvtbl = methodset_get_Count, }; -static HRESULT SWbemMethodSet_create( ISWbemMethodSet **obj ) +static HRESULT SWbemMethodSet_create( struct object *object, ISWbemMethodSet **obj ) { struct methodset *set; @@ -680,6 +922,8 @@ static HRESULT SWbemMethodSet_create( ISWbemMethodSet **obj ) set->ISWbemMethodSet_iface.lpVtbl = &methodsetvtbl; set->refs = 1; + set->object = object; + ISWbemObject_AddRef( &object->ISWbemObject_iface ); *obj = &set->ISWbemMethodSet_iface; @@ -689,24 +933,6 @@ static HRESULT SWbemMethodSet_create( ISWbemMethodSet **obj ) #define DISPID_BASE 0x1800000 #define DISPID_BASE_METHOD 0x1000000 -struct member -{ - BSTR name; - BOOL is_method; - DISPID dispid; -}; - -struct object -{ - ISWbemObject ISWbemObject_iface; - LONG refs; - IWbemClassObject *object; - struct member *members; - UINT nb_members; - DISPID last_dispid; - DISPID last_dispid_method; -}; - static inline struct object *impl_from_ISWbemObject( ISWbemObject *iface ) { @@ -1218,7 +1444,7 @@ static HRESULT WINAPI object_get_Methods_( struct object *object = impl_from_ISWbemObject( iface ); TRACE( "%p, %p\n", object, set ); - return SWbemMethodSet_create( set ); + return SWbemMethodSet_create( object, set ); } static HRESULT WINAPI object_get_Derivation_(

1 0

Nikolay Sivov : wbemdisp: Add Methods() collection stub.
by Alexandre Julliard Feb. 26, 2021

Feb. 26, 2021

Module: wine Branch: master Commit: 0946bf18f4d02efc3754a57ca6d8ff9af4d57a8e URL: https://source.winehq.org/git/wine.git/?a=commit;h=0946bf18f4d02efc3754a57c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 26 10:22:12 2021 +0300 wbemdisp: Add Methods() collection stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemdisp/locator.c | 194 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 191 insertions(+), 3 deletions(-) diff --git a/dlls/wbemdisp/locator.c b/dlls/wbemdisp/locator.c index 1d61c423a91..9cea78cdf71 100644 --- a/dlls/wbemdisp/locator.c +++ b/dlls/wbemdisp/locator.c @@ -49,6 +49,7 @@ enum type_id ISWbemSecurity_tid, ISWbemNamedValueSet_tid, ISWbemNamedValue_tid, + ISWbemMethodSet_tid, last_tid }; @@ -66,6 +67,7 @@ static REFIID wbemdisp_tid_id[] = &IID_ISWbemSecurity, &IID_ISWbemNamedValueSet, &IID_ISWbemNamedValue, + &IID_ISWbemMethodSet, }; static HRESULT get_typeinfo( enum type_id tid, ITypeInfo **ret ) @@ -500,6 +502,190 @@ static HRESULT SWbemPropertySet_create( IWbemClassObject *wbem_object, ISWbemPro return S_OK; } +struct methodset +{ + ISWbemMethodSet ISWbemMethodSet_iface; + LONG refs; +}; + +static struct methodset *impl_from_ISWbemMethodSet( ISWbemMethodSet *iface ) +{ + return CONTAINING_RECORD( iface, struct methodset, ISWbemMethodSet_iface ); +} + +static HRESULT WINAPI methodset_QueryInterface( ISWbemMethodSet *iface, REFIID riid, void **ppvObject ) +{ + struct methodset *set = impl_from_ISWbemMethodSet( iface ); + + TRACE( "%p %s %p\n", set, debugstr_guid(riid), ppvObject ); + + if (IsEqualGUID( riid, &IID_ISWbemMethodSet ) || + IsEqualGUID( riid, &IID_IDispatch ) || + IsEqualGUID( riid, &IID_IUnknown )) + { + *ppvObject = iface; + } + else + { + FIXME( "interface %s not implemented\n", debugstr_guid(riid) ); + return E_NOINTERFACE; + } + ISWbemMethodSet_AddRef( iface ); + return S_OK; +} + +static ULONG WINAPI methodset_AddRef( ISWbemMethodSet *iface ) +{ + struct methodset *set = impl_from_ISWbemMethodSet( iface ); + return InterlockedIncrement( &set->refs ); +} + +static ULONG WINAPI methodset_Release( ISWbemMethodSet *iface ) +{ + struct methodset *set = impl_from_ISWbemMethodSet( iface ); + LONG refs = InterlockedDecrement( &set->refs ); + if (!refs) + { + TRACE( "destroying %p\n", set ); + heap_free( set ); + } + return refs; +} + +static HRESULT WINAPI methodset_GetTypeInfoCount( + ISWbemMethodSet *iface, + UINT *count ) +{ + struct methodset *set = impl_from_ISWbemMethodSet( iface ); + + TRACE( "%p, %p\n", set, count ); + *count = 1; + return S_OK; +} + +static HRESULT WINAPI methodset_GetTypeInfo( ISWbemMethodSet *iface, + UINT index, + LCID lcid, + ITypeInfo **info ) +{ + struct methodset *set = impl_from_ISWbemMethodSet( iface ); + + TRACE( "%p, %u, %u, %p\n", set, index, lcid, info ); + + return get_typeinfo( ISWbemMethodSet_tid, info ); +} + +static HRESULT WINAPI methodset_GetIDsOfNames( + ISWbemMethodSet *iface, + REFIID riid, + LPOLESTR *names, + UINT count, + LCID lcid, + DISPID *dispid ) +{ + struct methodset *set = impl_from_ISWbemMethodSet( iface ); + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE( "%p, %s, %p, %u, %u, %p\n", set, debugstr_guid(riid), names, count, lcid, dispid ); + + if (!names || !count || !dispid) return E_INVALIDARG; + + hr = get_typeinfo( ISWbemMethodSet_tid, &typeinfo ); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames( typeinfo, names, count, dispid ); + ITypeInfo_Release( typeinfo ); + } + return hr; +} + +static HRESULT WINAPI methodset_Invoke( + ISWbemMethodSet *iface, + DISPID member, + REFIID riid, + LCID lcid, + WORD flags, + DISPPARAMS *params, + VARIANT *result, + EXCEPINFO *excep_info, + UINT *arg_err ) +{ + struct methodset *set = impl_from_ISWbemMethodSet( iface ); + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE( "%p, %d, %s, %d, %d, %p, %p, %p, %p\n", set, member, debugstr_guid(riid), + lcid, flags, params, result, excep_info, arg_err ); + + hr = get_typeinfo( ISWbemMethodSet_tid, &typeinfo ); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke( typeinfo, &set->ISWbemMethodSet_iface, member, flags, + params, result, excep_info, arg_err ); + ITypeInfo_Release( typeinfo ); + } + return hr; +} + +static HRESULT WINAPI methodset_get__NewEnum( + ISWbemMethodSet *iface, + IUnknown **unk ) +{ + FIXME("\n"); + + return E_NOTIMPL; +} + +static HRESULT WINAPI methodset_Item( + ISWbemMethodSet *iface, + BSTR name, + LONG flags, + ISWbemMethod **method ) +{ + FIXME("\n"); + + return E_NOTIMPL; +} + +static HRESULT WINAPI methodset_get_Count( + ISWbemMethodSet *iface, + LONG *count ) +{ + FIXME("\n"); + + return E_NOTIMPL; +} + +static const ISWbemMethodSetVtbl methodsetvtbl = +{ + methodset_QueryInterface, + methodset_AddRef, + methodset_Release, + methodset_GetTypeInfoCount, + methodset_GetTypeInfo, + methodset_GetIDsOfNames, + methodset_Invoke, + methodset_get__NewEnum, + methodset_Item, + methodset_get_Count, +}; + +static HRESULT SWbemMethodSet_create( ISWbemMethodSet **obj ) +{ + struct methodset *set; + + if (!(set = heap_alloc(sizeof(*set)))) + return E_OUTOFMEMORY; + + set->ISWbemMethodSet_iface.lpVtbl = &methodsetvtbl; + set->refs = 1; + + *obj = &set->ISWbemMethodSet_iface; + + return S_OK; +} + #define DISPID_BASE 0x1800000 #define DISPID_BASE_METHOD 0x1000000 @@ -1027,10 +1213,12 @@ static HRESULT WINAPI object_get_Properties_( ISWbemObject *iface, ISWbemPropert static HRESULT WINAPI object_get_Methods_( ISWbemObject *iface, - ISWbemMethodSet **objWbemMethodSet ) + ISWbemMethodSet **set ) { - FIXME( "\n" ); - return E_NOTIMPL; + struct object *object = impl_from_ISWbemObject( iface ); + + TRACE( "%p, %p\n", object, set ); + return SWbemMethodSet_create( set ); } static HRESULT WINAPI object_get_Derivation_(

1 0

Alistair Leslie-Hughes : msado15: Implement Dispatch functions in _Connection.
by Alexandre Julliard Feb. 26, 2021

Feb. 26, 2021

Module: wine Branch: master Commit: 079a963a278593131f3f299898ea60b00a254844 URL: https://source.winehq.org/git/wine.git/?a=commit;h=079a963a278593131f3f2998… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Feb 26 19:02:21 2021 +1100 msado15: Implement Dispatch functions in _Connection. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=16676 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msado15/connection.c | 46 +++++++++++++++++++++++++++++-------- dlls/msado15/main.c | 51 ++++++++++++++++++++++++++++++++++++++++++ dlls/msado15/msado15_private.h | 7 ++++++ 3 files changed, 95 insertions(+), 9 deletions(-) diff --git a/dlls/msado15/connection.c b/dlls/msado15/connection.c index d55c0d18a35..80297dcdc16 100644 --- a/dlls/msado15/connection.c +++ b/dlls/msado15/connection.c @@ -156,29 +156,57 @@ static HRESULT WINAPI connection_QueryInterface( _Connection *iface, REFIID riid static HRESULT WINAPI connection_GetTypeInfoCount( _Connection *iface, UINT *count ) { - FIXME( "%p, %p\n", iface, count ); - return E_NOTIMPL; + struct connection *connection = impl_from_Connection( iface ); + TRACE( "%p, %p\n", connection, count ); + *count = 1; + return S_OK; } static HRESULT WINAPI connection_GetTypeInfo( _Connection *iface, UINT index, LCID lcid, ITypeInfo **info ) { - FIXME( "%p, %u, %u, %p\n", iface, index, lcid, info ); - return E_NOTIMPL; + struct connection *connection = impl_from_Connection( iface ); + TRACE( "%p, %u, %u, %p\n", connection, index, lcid, info ); + return get_typeinfo(Connection_tid, info); } static HRESULT WINAPI connection_GetIDsOfNames( _Connection *iface, REFIID riid, LPOLESTR *names, UINT count, LCID lcid, DISPID *dispid ) { - FIXME( "%p, %s, %p, %u, %u, %p\n", iface, debugstr_guid(riid), names, count, lcid, dispid ); - return E_NOTIMPL; + struct connection *connection = impl_from_Connection( iface ); + HRESULT hr; + ITypeInfo *typeinfo; + + TRACE( "%p, %s, %p, %u, %u, %p\n", connection, debugstr_guid(riid), names, count, lcid, dispid ); + + hr = get_typeinfo(Connection_tid, &typeinfo); + if(SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames(typeinfo, names, count, dispid); + ITypeInfo_Release(typeinfo); + } + + return hr; } static HRESULT WINAPI connection_Invoke( _Connection *iface, DISPID member, REFIID riid, LCID lcid, WORD flags, DISPPARAMS *params, VARIANT *result, EXCEPINFO *excep_info, UINT *arg_err ) { - FIXME( "%p, %d, %s, %d, %d, %p, %p, %p, %p\n", iface, member, debugstr_guid(riid), lcid, flags, params, - result, excep_info, arg_err ); - return E_NOTIMPL; + struct connection *connection = impl_from_Connection( iface ); + HRESULT hr; + ITypeInfo *typeinfo; + + TRACE( "%p, %d, %s, %d, %d, %p, %p, %p, %p\n", connection, member, debugstr_guid(riid), lcid, flags, + params, result, excep_info, arg_err ); + + hr = get_typeinfo(Connection_tid, &typeinfo); + if(SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke(typeinfo, &connection->Connection_iface, member, flags, params, + result, excep_info, arg_err); + ITypeInfo_Release(typeinfo); + } + + return hr; } static HRESULT WINAPI connection_get_Properties( _Connection *iface, Properties **obj ) diff --git a/dlls/msado15/main.c b/dlls/msado15/main.c index 0b8de1f9117..f6b1b0fdf52 100644 --- a/dlls/msado15/main.c +++ b/dlls/msado15/main.c @@ -174,3 +174,54 @@ HRESULT WINAPI DllUnregisterServer( void ) { return __wine_unregister_resources( hinstance ); } + +static ITypeLib *typelib; +static ITypeInfo *typeinfos[LAST_tid]; + +static REFIID tid_ids[] = { + &IID__Connection, +}; + +static HRESULT load_typelib(void) +{ + HRESULT hres; + ITypeLib *tl; + + if(typelib) + return S_OK; + + hres = LoadRegTypeLib(&LIBID_ADODB, 1, 0, LOCALE_SYSTEM_DEFAULT, &tl); + if(FAILED(hres)) { + ERR("LoadRegTypeLib failed: %08x\n", hres); + return hres; + } + + if(InterlockedCompareExchangePointer((void**)&typelib, tl, NULL)) + ITypeLib_Release(tl); + return hres; +} + +HRESULT get_typeinfo(tid_t tid, ITypeInfo **typeinfo) +{ + HRESULT hres; + + if (FAILED(hres = load_typelib())) + return hres; + + if(!typeinfos[tid]) { + ITypeInfo *ti; + + hres = ITypeLib_GetTypeInfoOfGuid(typelib, tid_ids[tid], &ti); + if(FAILED(hres)) { + ERR("GetTypeInfoOfGuid(%s) failed: %08x\n", debugstr_guid(tid_ids[tid]), hres); + return hres; + } + + if(InterlockedCompareExchangePointer((void**)(typeinfos+tid), ti, NULL)) + ITypeInfo_Release(ti); + } + + *typeinfo = typeinfos[tid]; + ITypeInfo_AddRef(*typeinfo); + return S_OK; +} diff --git a/dlls/msado15/msado15_private.h b/dlls/msado15/msado15_private.h index dd98c382e2b..a5b22f29446 100644 --- a/dlls/msado15/msado15_private.h +++ b/dlls/msado15/msado15_private.h @@ -42,4 +42,11 @@ static inline WCHAR *strdupW( const WCHAR *src ) return dst; } +typedef enum tid_t { + Connection_tid, + LAST_tid +} tid_t; + +HRESULT get_typeinfo(tid_t tid, ITypeInfo **typeinfo) DECLSPEC_HIDDEN; + #endif /* _WINE_MSADO15_PRIVATE_H_ */

1 0

Nikolay Sivov : wbemdisp: Handle DISPATCH_PROPERTYPUT in scripting object Invoke().
by Alexandre Julliard Feb. 26, 2021

Feb. 26, 2021

Module: wine Branch: master Commit: 5b836d172554bec3b922958e5f4eed21bf7a1603 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5b836d172554bec3b922958e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 26 10:22:16 2021 +0300 wbemdisp: Handle DISPATCH_PROPERTYPUT in scripting object Invoke(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemdisp/locator.c | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/dlls/wbemdisp/locator.c b/dlls/wbemdisp/locator.c index d7b04e343fd..619f7e5c67f 100644 --- a/dlls/wbemdisp/locator.c +++ b/dlls/wbemdisp/locator.c @@ -1226,16 +1226,28 @@ static HRESULT WINAPI object_Invoke( return hr; } - if (flags != (DISPATCH_METHOD|DISPATCH_PROPERTYGET)) + if (!(name = get_member_name( object, member ))) + return DISP_E_MEMBERNOTFOUND; + + if (flags == (DISPATCH_METHOD|DISPATCH_PROPERTYGET)) + { + memset( params, 0, sizeof(*params) ); + return IWbemClassObject_Get( object->object, name, 0, result, NULL, NULL ); + } + else if (flags == DISPATCH_PROPERTYPUT) + { + if (!params->cArgs || !params->rgvarg) + { + WARN( "Missing put property value\n" ); + return E_INVALIDARG; + } + return IWbemClassObject_Put( object->object, name, 0, params->rgvarg, 0 ); + } + else { FIXME( "flags %x not supported\n", flags ); return E_NOTIMPL; } - if (!(name = get_member_name( object, member ))) - return DISP_E_MEMBERNOTFOUND; - - memset( params, 0, sizeof(*params) ); - return IWbemClassObject_Get( object->object, name, 0, result, NULL, NULL ); } static HRESULT WINAPI object_Put_(

1 0

Jacek Caban : include: Use GCC-style InterlockedCompareExchange128 implementation on clang in MSVC mode.
by Alexandre Julliard Feb. 26, 2021

Feb. 26, 2021

Module: wine Branch: master Commit: 894dbe835336c45a48b2e3468a478c62899d1fd8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=894dbe835336c45a48b2e346… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 26 15:56:13 2021 +0100 include: Use GCC-style InterlockedCompareExchange128 implementation on clang in MSVC mode. It's not yet supported on aarch64. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winnt.h | 60 ++++++++++++++++++++++++++++----------------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index e19f515eddb..7973960bf21 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -6918,9 +6918,6 @@ static inline BOOLEAN BitScanReverse(DWORD *index, DWORD mask) #pragma intrinsic(_InterlockedAnd) #pragma intrinsic(_InterlockedCompareExchange) #pragma intrinsic(_InterlockedCompareExchange64) -#ifdef _WIN64 -#pragma intrinsic(_InterlockedCompareExchange128) -#endif #pragma intrinsic(_InterlockedExchange) #pragma intrinsic(_InterlockedExchangeAdd) #pragma intrinsic(_InterlockedIncrement) @@ -6932,9 +6929,6 @@ static inline BOOLEAN BitScanReverse(DWORD *index, DWORD mask) long _InterlockedAnd(long volatile *,long); long _InterlockedCompareExchange(long volatile*,long,long); long long _InterlockedCompareExchange64(long long volatile*,long long,long long); -#ifdef _WIN64 -unsigned char _InterlockedCompareExchange128(volatile __int64 *, __int64, __int64, __int64 *); -#endif long _InterlockedDecrement(long volatile*); short _InterlockedDecrement16(short volatile*); long _InterlockedExchange(long volatile*,long); @@ -6958,13 +6952,6 @@ static FORCEINLINE LONGLONG WINAPI InterlockedCompareExchange64( LONGLONG volati return _InterlockedCompareExchange64( (long long volatile *)dest, xchg, compare ); } -#ifdef _WIN64 -static FORCEINLINE unsigned char WINAPI InterlockedCompareExchange128( volatile __int64 *dest, __int64 xchg_high, __int64 xchg_low, __int64 *compare ) -{ - return _InterlockedCompareExchange128( dest, xchg_high, xchg_low, compare ); -} -#endif - static FORCEINLINE LONG WINAPI InterlockedExchange( LONG volatile *dest, LONG val ) { return _InterlockedExchange( (long volatile *)dest, val ); @@ -7082,23 +7069,6 @@ static FORCEINLINE LONGLONG WINAPI InterlockedCompareExchange64( LONGLONG volati return __sync_val_compare_and_swap( dest, compare, xchg ); } -#ifdef _WIN64 -static FORCEINLINE unsigned char InterlockedCompareExchange128( volatile __int64 *dest, __int64 xchg_high, __int64 xchg_low, __int64 *compare ) -{ -#ifdef __x86_64__ - unsigned char ret; - __asm__ __volatile__( "lock cmpxchg16b %0; setz %b2" - : "=m" (dest[0]), "=m" (dest[1]), "=r" (ret), - "=a" (compare[0]), "=d" (compare[1]) - : "m" (dest[0]), "m" (dest[1]), "3" (compare[0]), "4" (compare[1]), - "c" (xchg_high), "b" (xchg_low) ); - return ret; -#else - return __sync_bool_compare_and_swap( (__int128 *)dest, *(__int128 *)compare, ((__int128)xchg_high << 64) | xchg_low ); -#endif -} -#endif - static FORCEINLINE LONG WINAPI InterlockedExchange( LONG volatile *dest, LONG val ) { LONG ret; @@ -7165,6 +7135,36 @@ static FORCEINLINE void MemoryBarrier(void) #endif /* __GNUC__ */ +#ifdef _WIN64 +#if defined(_MSC_VER) && !defined(__clang__) + +#pragma intrinsic(_InterlockedCompareExchange128) +unsigned char _InterlockedCompareExchange128(volatile __int64 *, __int64, __int64, __int64 *); +static FORCEINLINE unsigned char WINAPI InterlockedCompareExchange128( volatile __int64 *dest, __int64 xchg_high, __int64 xchg_low, __int64 *compare ) +{ + return _InterlockedCompareExchange128( dest, xchg_high, xchg_low, compare ); +} + +#else + +static FORCEINLINE unsigned char InterlockedCompareExchange128( volatile __int64 *dest, __int64 xchg_high, __int64 xchg_low, __int64 *compare ) +{ +#ifdef __x86_64__ + unsigned char ret; + __asm__ __volatile__( "lock cmpxchg16b %0; setz %b2" + : "=m" (dest[0]), "=m" (dest[1]), "=r" (ret), + "=a" (compare[0]), "=d" (compare[1]) + : "m" (dest[0]), "m" (dest[1]), "3" (compare[0]), "4" (compare[1]), + "c" (xchg_high), "b" (xchg_low) ); + return ret; +#else + return __sync_bool_compare_and_swap( (__int128 *)dest, *(__int128 *)compare, ((__int128)xchg_high << 64) | xchg_low ); +#endif +} + +#endif +#endif + static FORCEINLINE void YieldProcessor(void) { #ifdef __GNUC__

1 0

Dmitry Timoshkov : include/winnt.h: Fix arguments order for _InterlockedCompareExchange64() MSVC intrinsic.
by Alexandre Julliard Feb. 26, 2021

Feb. 26, 2021

Module: wine Branch: master Commit: 3f951cbe727fa62cb71df1e9712488c5ed12bcee URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f951cbe727fa62cb71df1e9… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Feb 26 15:53:55 2021 +0100 include/winnt.h: Fix arguments order for _InterlockedCompareExchange64() MSVC intrinsic. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winnt.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/winnt.h b/include/winnt.h index 48f1715c3b6..3a9d13b055c 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -6944,7 +6944,7 @@ static FORCEINLINE LONG WINAPI InterlockedCompareExchange( LONG volatile *dest, static FORCEINLINE LONGLONG WINAPI InterlockedCompareExchange64( LONGLONG volatile *dest, LONGLONG xchg, LONGLONG compare ) { - return _InterlockedCompareExchange64( (long long volatile *)dest, compare, xchg ); + return _InterlockedCompareExchange64( (long long volatile *)dest, xchg, compare ); } #ifdef _WIN64

1 0

Rémi Bernon : widl: Generate helper macros for WinRT implementation.
by Alexandre Julliard Feb. 26, 2021

Feb. 26, 2021

Module: wine Branch: master Commit: dc65f8865458e44c5c1f712a771565843bae923a URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc65f8865458e44c5c1f712a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Feb 26 09:43:06 2021 +0100 widl: Generate helper macros for WinRT implementation. This generates additional macros to help keeping implementation simple, guarded with WIDL_using ifdefs, like this: #ifdef WIDL_using_Windows_Foo #define IFooVtbl __x_ABI_CWindows_CFoo_CIFooVtbl #define IFoo __x_ABI_CWindows_CFoo_CIFoo #define IFoo_DoFoo __x_ABI_CWindows_CFoo_CIFoo_DoFoo #endif /* WIDL_using_Windows_Foo */ Implementation files can define the desired WIDL_using preprocessor macros before including the header, and then implement or use the interface methods with the simple non-prefixed names instead. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/header.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ tools/widl/typetree.c | 19 +++++++++++++++++++ tools/widl/widltypes.h | 1 + 3 files changed, 65 insertions(+) diff --git a/tools/widl/header.c b/tools/widl/header.c index cb0dc2f43a3..16c8b57fd6e 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -48,6 +48,8 @@ static void write_type_v(FILE *f, const decl_spec_t *t, int is_field, int declon static void write_apicontract_guard_start(FILE *header, const expr_t *expr); static void write_apicontract_guard_end(FILE *header, const expr_t *expr); +static void write_widl_using_macros(FILE *header, type_t *iface); + static void indent(FILE *h, int delta) { int c; @@ -634,6 +636,7 @@ static void write_type_definition(FILE *f, type_t *t, int declonly) fprintf(f, "#else\n"); write_type_left(f, &ds, NAME_C, declonly, TRUE); fprintf(f, ";\n"); + if (winrt_mode) write_widl_using_macros(f, t); fprintf(f, "#endif\n\n"); } if (contract) write_apicontract_guard_end(f, contract); @@ -1644,6 +1647,47 @@ static void write_com_interface_start(FILE *header, const type_t *iface) fprintf(header,"#define __%s_%sINTERFACE_DEFINED__\n\n", iface->c_name, dispinterface ? "DISP" : ""); } +static void write_widl_using_method_macros(FILE *header, const type_t *iface, const type_t *top_iface) +{ + const statement_t *stmt; + const char *name = top_iface->short_name ? top_iface->short_name : top_iface->name; + + if (type_iface_get_inherit(iface)) write_widl_using_method_macros(header, type_iface_get_inherit(iface), top_iface); + + STATEMENTS_FOR_EACH_FUNC(stmt, type_iface_get_stmts(iface)) + { + const var_t *func = stmt->u.var; + const char *func_name; + + if (is_override_method(iface, top_iface, func)) continue; + if (is_callas(func->attrs)) continue; + + func_name = get_name(func); + fprintf(header, "#define %s_%s %s_%s\n", name, func_name, top_iface->c_name, func_name); + } +} + +static void write_widl_using_macros(FILE *header, type_t *iface) +{ + const UUID *uuid = get_attrp(iface->attrs, ATTR_UUID); + const char *name = iface->short_name ? iface->short_name : iface->name; + char *macro; + + if (!strcmp(iface->name, iface->c_name)) return; + + macro = format_namespace(iface->namespace, "WIDL_using_", "_", NULL, NULL); + fprintf(header, "#ifdef %s\n", macro); + + if (uuid) fprintf(header, "#define IID_%s IID_%s\n", name, iface->c_name); + if (iface->type_type == TYPE_INTERFACE) fprintf(header, "#define %sVtbl %sVtbl\n", name, iface->c_name); + fprintf(header, "#define %s %s\n", name, iface->c_name); + + if (iface->type_type == TYPE_INTERFACE) write_widl_using_method_macros(header, iface, iface); + + fprintf(header, "#endif /* %s */\n", macro); + free(macro); +} + static void write_com_interface_end(FILE *header, type_t *iface) { int dispinterface = is_attr(iface->attrs, ATTR_DISPINTERFACE); @@ -1721,6 +1765,7 @@ static void write_com_interface_end(FILE *header, type_t *iface) fprintf(header, "#else\n"); write_inline_wrappers(header, type, type, iface->c_name); fprintf(header, "#endif\n"); + if (winrt_mode) write_widl_using_macros(header, iface); fprintf(header, "#endif\n"); fprintf(header, "\n"); fprintf(header, "#endif\n"); diff --git a/tools/widl/typetree.c b/tools/widl/typetree.c index 9220cfb50e9..a1e7abc31e5 100644 --- a/tools/widl/typetree.c +++ b/tools/widl/typetree.c @@ -53,6 +53,7 @@ type_t *make_type(enum type_type type) t->signature = NULL; t->qualified_name = NULL; t->impl_name = NULL; + t->short_name = NULL; memset(&t->details, 0, sizeof(t->details)); t->typestring_offset = 0; t->ptrdesc = 0; @@ -347,6 +348,22 @@ static char *format_parameterized_type_signature(type_t *type, typeref_list_t *p return buf; } +static char *format_parameterized_type_short_name(type_t *type, typeref_list_t *params, const char *prefix) +{ + size_t len = 0, pos = 0; + char *buf = NULL; + typeref_t *ref; + + pos += strappend(&buf, &len, pos, "%s%s", prefix, type->name); + if (params) LIST_FOR_EACH_ENTRY(ref, params, typeref_t, entry) + { + type = type_pointer_get_root_type(ref->type); + pos += strappend(&buf, &len, pos, "_%s", type->name); + } + + return buf; +} + static char *format_parameterized_type_impl_name(type_t *type, typeref_list_t *params, const char *prefix) { size_t len = 0, pos = 0; @@ -1201,11 +1218,13 @@ type_t *type_parameterized_type_specialize_declare(type_t *type, typeref_list_t new_type->name = format_parameterized_type_name(type, params); reg_type(new_type, new_type->name, new_type->namespace, 0); new_type->c_name = format_parameterized_type_c_name(type, params, ""); + new_type->short_name = format_parameterized_type_short_name(type, params, ""); if (new_type->type_type == TYPE_DELEGATE) { new_type->details.delegate.iface = duptype(tmpl->details.delegate.iface, 0); compute_delegate_iface_names(new_type, type, params); + new_type->details.delegate.iface->short_name = format_parameterized_type_short_name(type, params, "I"); } return new_type; diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index d37d732744b..0ecd8f34d6a 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -505,6 +505,7 @@ struct _type_t { const char *signature; const char *qualified_name; const char *impl_name; + const char *short_name; unsigned int typestring_offset; unsigned int ptrdesc; /* used for complex structs */ int typelib_idx;

1 0

Rémi Bernon : widl: Make WinRT nested templates C++98 compatible.
by Alexandre Julliard Feb. 26, 2021

Feb. 26, 2021

Module: wine Branch: master Commit: 31cbca5f07d8cb344ae5c7750f03c986f95efdc0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=31cbca5f07d8cb344ae5c775… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Feb 26 09:43:04 2021 +0100 widl: Make WinRT nested templates C++98 compatible. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/windows.foundation.collections.idl | 4 ++-- tools/widl/typetree.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/windows.foundation.collections.idl b/include/windows.foundation.collections.idl index cf47adfa7e4..ed05016b96d 100644 --- a/include/windows.foundation.collections.idl +++ b/include/windows.foundation.collections.idl @@ -34,8 +34,8 @@ cpp_quote("namespace ABI { namespace Windows { namespace Foundation { namespace cpp_quote("template <class T> struct GetAbiType { typedef T type; };") cpp_quote("template <class T> struct GetLogicalType { typedef T type; };") cpp_quote("template <class L, class A> struct AggregateType {};") -cpp_quote("template <class L, class A> struct GetAbiType<AggregateType<L, A>> { typedef A type; };") -cpp_quote("template <class L, class A> struct GetLogicalType<AggregateType<L, A>> { typedef L type; };") +cpp_quote("template <class L, class A> struct GetAbiType<AggregateType<L, A> > { typedef A type; };") +cpp_quote("template <class L, class A> struct GetLogicalType<AggregateType<L, A> > { typedef L type; };") cpp_quote("}}}}") cpp_quote("extern \"C\" {") cpp_quote("#endif") diff --git a/tools/widl/typetree.c b/tools/widl/typetree.c index eec98e5c23c..6522e09dacf 100644 --- a/tools/widl/typetree.c +++ b/tools/widl/typetree.c @@ -279,7 +279,7 @@ char *format_parameterized_type_name(type_t *type, typeref_list_t *params) pos += append_pointer_stars(&buf, &len, pos, ref->type); if (list_next(params, &ref->entry)) pos += strappend(&buf, &len, pos, ","); } - pos += strappend(&buf, &len, pos, ">"); + pos += strappend(&buf, &len, pos, " >"); return buf; } @@ -360,7 +360,7 @@ static char *format_parameterized_type_impl_name(type_t *type, typeref_list_t *p iface = type_runtimeclass_get_default_iface(type); pos += strappend(&buf, &len, pos, ", %s", iface->qualified_name); pos += append_pointer_stars(&buf, &len, pos, ref->type); - pos += strappend(&buf, &len, pos, ">"); + pos += strappend(&buf, &len, pos, " >"); } else { @@ -369,7 +369,7 @@ static char *format_parameterized_type_impl_name(type_t *type, typeref_list_t *p } if (list_next(params, &ref->entry)) pos += strappend(&buf, &len, pos, ", "); } - pos += strappend(&buf, &len, pos, ">"); + pos += strappend(&buf, &len, pos, " >"); return buf; }

1 0