February 2021 - Wine-Commits

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

Feb. 26, 2021

Module: wine Branch: master Commit: 6ed601ccba9ef40aeee50e48fb4dfb8142459442 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ed601ccba9ef40aeee50e48… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Feb 26 19:02:27 2021 +1100 msado15: Implement Dispatch functions in ADORecordsetConstruction. 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 | 35 +++++++++++++++++++++++++++++------ 3 files changed, 31 insertions(+), 6 deletions(-) diff --git a/dlls/msado15/main.c b/dlls/msado15/main.c index 3bfb6a1fe66..3479ceb5b02 100644 --- a/dlls/msado15/main.c +++ b/dlls/msado15/main.c @@ -179,6 +179,7 @@ static ITypeLib *typelib; static ITypeInfo *typeinfos[LAST_tid]; static REFIID tid_ids[] = { + &IID_ADORecordsetConstruction, &IID__Command, &IID__Connection, &IID_Field, diff --git a/dlls/msado15/msado15_private.h b/dlls/msado15/msado15_private.h index d1e177e1a3c..55afac3f389 100644 --- a/dlls/msado15/msado15_private.h +++ b/dlls/msado15/msado15_private.h @@ -43,6 +43,7 @@ static inline WCHAR *strdupW( const WCHAR *src ) } typedef enum tid_t { + ADORecordsetConstruction_tid, Command_tid, Connection_tid, Field_tid, diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index a4fe5b53736..0b91358f83d 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -1768,16 +1768,27 @@ static HRESULT WINAPI rsconstruction_GetTypeInfo(ADORecordsetConstruction *iface LCID lcid, ITypeInfo **ppTInfo) { struct recordset *recordset = impl_from_ADORecordsetConstruction( iface ); - FIXME( "%p %u %u %p\n", recordset, iTInfo, lcid, ppTInfo ); - return E_NOTIMPL; + TRACE( "%p %u %u %p\n", recordset, iTInfo, lcid, ppTInfo ); + return get_typeinfo(ADORecordsetConstruction_tid, ppTInfo); } static HRESULT WINAPI rsconstruction_GetIDsOfNames(ADORecordsetConstruction *iface, REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) { struct recordset *recordset = impl_from_ADORecordsetConstruction( iface ); - FIXME( "%p %s %p %u %u %p\n", recordset, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId ); - return E_NOTIMPL; + HRESULT hr; + ITypeInfo *typeinfo; + + TRACE( "%p %s %p %u %u %p\n", recordset, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId ); + + hr = get_typeinfo(ADORecordsetConstruction_tid, &typeinfo); + if(SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames(typeinfo, rgszNames, cNames, rgDispId); + ITypeInfo_Release(typeinfo); + } + + return hr; } static HRESULT WINAPI rsconstruction_Invoke(ADORecordsetConstruction *iface, DISPID dispIdMember, @@ -1785,9 +1796,21 @@ static HRESULT WINAPI rsconstruction_Invoke(ADORecordsetConstruction *iface, DIS EXCEPINFO *pExcepInfo, UINT *puArgErr) { struct recordset *recordset = impl_from_ADORecordsetConstruction( iface ); - FIXME( "%p %d %s %d %d %p %p %p %p\n", recordset, dispIdMember, debugstr_guid(riid), + HRESULT hr; + ITypeInfo *typeinfo; + + TRACE( "%p %d %s %d %d %p %p %p %p\n", recordset, dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr ); - return E_NOTIMPL; + + hr = get_typeinfo(ADORecordsetConstruction_tid, &typeinfo); + if(SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke(typeinfo, &recordset->ADORecordsetConstruction_iface, dispIdMember, wFlags, + pDispParams, pVarResult, pExcepInfo, puArgErr); + ITypeInfo_Release(typeinfo); + } + + return hr; } static HRESULT WINAPI rsconstruction_get_Rowset(ADORecordsetConstruction *iface, IUnknown **row_set)

1 0

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

Feb. 26, 2021

Module: wine Branch: master Commit: 9108ef5cfc35bc97dc430c6108adfc89b666b057 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9108ef5cfc35bc97dc430c61… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Feb 26 19:02:23 2021 +1100 msado15: Implement Dispatch functions in _Stream. 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/stream.c | 44 ++++++++++++++++++++++++++++++++++-------- 3 files changed, 38 insertions(+), 8 deletions(-) diff --git a/dlls/msado15/main.c b/dlls/msado15/main.c index 09d903fdd11..4d54999fb04 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__Stream, }; static HRESULT load_typelib(void) diff --git a/dlls/msado15/msado15_private.h b/dlls/msado15/msado15_private.h index a95a24b6dfa..b9fa01ef90d 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, + Stream_tid, LAST_tid } tid_t; diff --git a/dlls/msado15/stream.c b/dlls/msado15/stream.c index b40f664dcf1..961aed6a739 100644 --- a/dlls/msado15/stream.c +++ b/dlls/msado15/stream.c @@ -91,29 +91,57 @@ static HRESULT WINAPI stream_QueryInterface( _Stream *iface, REFIID riid, void * static HRESULT WINAPI stream_GetTypeInfoCount( _Stream *iface, UINT *count ) { - FIXME( "%p, %p\n", iface, count ); - return E_NOTIMPL; + struct stream *stream = impl_from_Stream( iface ); + TRACE( "%p, %p\n", stream, count ); + *count = 1; + return S_OK; } static HRESULT WINAPI stream_GetTypeInfo( _Stream *iface, UINT index, LCID lcid, ITypeInfo **info ) { - FIXME( "%p, %u, %u, %p\n", iface, index, lcid, info ); - return E_NOTIMPL; + struct stream *stream = impl_from_Stream( iface ); + TRACE( "%p, %u, %u, %p\n", stream, index, lcid, info ); + return get_typeinfo(Stream_tid, info); } static HRESULT WINAPI stream_GetIDsOfNames( _Stream *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 stream *stream = impl_from_Stream( iface ); + HRESULT hr; + ITypeInfo *typeinfo; + + TRACE( "%p, %s, %p, %u, %u, %p\n", stream, 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 stream_Invoke( _Stream *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 stream *stream = impl_from_Stream( iface ); + HRESULT hr; + ITypeInfo *typeinfo; + + TRACE( "%p, %d, %s, %d, %d, %p, %p, %p, %p\n", stream, member, debugstr_guid(riid), lcid, flags, params, result, excep_info, arg_err ); - return E_NOTIMPL; + + hr = get_typeinfo(Connection_tid, &typeinfo); + if(SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke(typeinfo, &stream->Stream_iface, member, flags, params, + result, excep_info, arg_err); + ITypeInfo_Release(typeinfo); + } + + return hr; } static HRESULT WINAPI stream_get_Size( _Stream *iface, LONG *size )

1 0

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

Feb. 26, 2021

Module: wine Branch: master Commit: 7beb6e85e3161c3eda04358ca2dcf7b23c2fcc73 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7beb6e85e3161c3eda04358c… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Feb 26 19:02:22 2021 +1100 msado15: Implement Dispatch functions in _Command. 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/command.c | 44 ++++++++++++++++++++++++++++++++++-------- dlls/msado15/main.c | 1 + dlls/msado15/msado15_private.h | 1 + 3 files changed, 38 insertions(+), 8 deletions(-) diff --git a/dlls/msado15/command.c b/dlls/msado15/command.c index 9a56ced25ac..aff12f6a108 100644 --- a/dlls/msado15/command.c +++ b/dlls/msado15/command.c @@ -91,29 +91,57 @@ static ULONG WINAPI command_Release( _Command *iface ) static HRESULT WINAPI command_GetTypeInfoCount( _Command *iface, UINT *count ) { - FIXME( "%p, %p\n", iface, count ); - return E_NOTIMPL; + struct command *command = impl_from_Command( iface ); + TRACE( "%p, %p\n", command, count ); + *count = 1; + return S_OK; } static HRESULT WINAPI command_GetTypeInfo( _Command *iface, UINT index, LCID lcid, ITypeInfo **info ) { - FIXME( "%p, %u, %u, %p\n", iface, index, lcid, info ); - return E_NOTIMPL; + struct command *command = impl_from_Command( iface ); + TRACE( "%p, %u, %u, %p\n", command, index, lcid, info ); + return get_typeinfo(Command_tid, info); } static HRESULT WINAPI command_GetIDsOfNames( _Command *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 command *command = impl_from_Command( iface ); + HRESULT hr; + ITypeInfo *typeinfo; + + TRACE( "%p, %s, %p, %u, %u, %p\n", command, debugstr_guid(riid), names, count, lcid, dispid ); + + hr = get_typeinfo(Command_tid, &typeinfo); + if(SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames(typeinfo, names, count, dispid); + ITypeInfo_Release(typeinfo); + } + + return hr; } static HRESULT WINAPI command_Invoke( _Command *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 command *command = impl_from_Command( iface ); + HRESULT hr; + ITypeInfo *typeinfo; + + TRACE( "%p, %d, %s, %d, %d, %p, %p, %p, %p\n", command, member, debugstr_guid(riid), lcid, flags, params, result, excep_info, arg_err ); - return E_NOTIMPL; + + hr = get_typeinfo(Connection_tid, &typeinfo); + if(SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke(typeinfo, &command->Command_iface, member, flags, params, + result, excep_info, arg_err); + ITypeInfo_Release(typeinfo); + } + + return hr; } static HRESULT WINAPI command_get_Properties( _Command *iface, Properties **props ) diff --git a/dlls/msado15/main.c b/dlls/msado15/main.c index f6b1b0fdf52..09d903fdd11 100644 --- a/dlls/msado15/main.c +++ b/dlls/msado15/main.c @@ -179,6 +179,7 @@ static ITypeLib *typelib; static ITypeInfo *typeinfos[LAST_tid]; static REFIID tid_ids[] = { + &IID__Command, &IID__Connection, }; diff --git a/dlls/msado15/msado15_private.h b/dlls/msado15/msado15_private.h index a5b22f29446..a95a24b6dfa 100644 --- a/dlls/msado15/msado15_private.h +++ b/dlls/msado15/msado15_private.h @@ -43,6 +43,7 @@ static inline WCHAR *strdupW( const WCHAR *src ) } typedef enum tid_t { + Command_tid, Connection_tid, LAST_tid } tid_t;

1 0

Alexandre Julliard : ntdll: Get rid of attach_implicitly_loaded_dlls().
by Alexandre Julliard Feb. 26, 2021

Feb. 26, 2021

Module: wine Branch: master Commit: a46515d44984a3fd571041f5d631333b30e5af83 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a46515d44984a3fd571041f5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 26 13:13:48 2021 +0100 ntdll: Get rid of attach_implicitly_loaded_dlls(). This should no longer happen. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 30 ------------------------------ 1 file changed, 30 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 8dbbb14f05d..644eee1e9d7 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1438,35 +1438,6 @@ static NTSTATUS process_attach( WINE_MODREF *wm, LPVOID lpReserved ) } -/********************************************************************** - * attach_implicitly_loaded_dlls - * - * Attach to the (builtin) dlls that have been implicitly loaded because - * of a dependency at the Unix level, but not imported at the Win32 level. - */ -static void attach_implicitly_loaded_dlls( LPVOID reserved ) -{ - for (;;) - { - PLIST_ENTRY mark, entry; - - mark = &NtCurrentTeb()->Peb->LdrData->InLoadOrderModuleList; - for (entry = mark->Flink; entry != mark; entry = entry->Flink) - { - LDR_DATA_TABLE_ENTRY *mod = CONTAINING_RECORD(entry, LDR_DATA_TABLE_ENTRY, InLoadOrderLinks); - - if (!(mod->Flags & LDR_IMAGE_IS_DLL)) continue; - if (mod->Flags & (LDR_LOAD_IN_PROGRESS | LDR_PROCESS_ATTACHED)) continue; - TRACE( "found implicitly loaded %s, attaching to it\n", - debugstr_w(mod->BaseDllName.Buffer)); - process_attach( CONTAINING_RECORD(mod, WINE_MODREF, ldr), reserved ); - break; /* restart the search from the start */ - } - if (entry == mark) break; /* nothing found */ - } -} - - /************************************************************************* * process_detach * @@ -3536,7 +3507,6 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unknown2, ULONG_PTR NtTerminateProcess( GetCurrentProcess(), status ); } } - attach_implicitly_loaded_dlls( context ); unix_funcs->virtual_release_address_space(); if (wm->ldr.TlsIndex != -1) call_tls_callbacks( wm->ldr.DllBase, DLL_PROCESS_ATTACH ); if (wm->ldr.Flags & LDR_WINE_INTERNAL) unix_funcs->init_builtin_dll( wm->ldr.DllBase );

1 0

Nikolay Sivov : wbemprox: Set iterator for spawned instances.
by Alexandre Julliard Feb. 26, 2021

Feb. 26, 2021

Module: wine Branch: master Commit: 0e6c797999c2d354a1eb65e509d4ca79a6eb8015 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e6c797999c2d354a1eb65e5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 26 10:22:14 2021 +0300 wbemprox: Set iterator for spawned instances. 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/wbemprox/class.c | 12 ++++++++++-- dlls/wbemprox/tests/query.c | 10 ++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/class.c b/dlls/wbemprox/class.c index d24d8cbb5ca..f48c815ef8d 100644 --- a/dlls/wbemprox/class.c +++ b/dlls/wbemprox/class.c @@ -674,13 +674,21 @@ static HRESULT WINAPI class_object_SpawnInstance( struct class_object *co = impl_from_IWbemClassObject( iface ); struct enum_class_object *ec = impl_from_IEnumWbemClassObject( co->iter ); struct table *table = get_view_table( ec->query->view, co->index ); + IEnumWbemClassObject *iter; struct record *record; + HRESULT hr; TRACE("%p, %08x, %p\n", iface, lFlags, ppNewInstance); if (!(record = create_record( table ))) return E_OUTOFMEMORY; - - return create_class_object( co->name, NULL, 0, record, ppNewInstance ); + if (FAILED(hr = IEnumWbemClassObject_Clone( co->iter, &iter ))) + { + destroy_record( record ); + return hr; + } + hr = create_class_object( co->name, iter, 0, record, ppNewInstance ); + IEnumWbemClassObject_Release( iter ); + return hr; } static HRESULT WINAPI class_object_CompareTo( diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index b5de00b5dec..f650418e51f 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -753,6 +753,16 @@ static void test_StdRegProv( IWbemServices *services ) hr = IWbemClassObject_SpawnInstance( sig_in, 0, &in ); ok( hr == S_OK, "failed to spawn instance %08x\n", hr ); + hr = IWbemClassObject_BeginEnumeration( in, 0 ); + ok( hr == S_OK, "failed to start enumeration %08x\n", hr ); + + hr = IWbemClassObject_Next( in, 0, &name, NULL, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + SysFreeString( name ); + + hr = IWbemClassObject_EndEnumeration( in ); + ok( hr == S_OK, "failed to end enumeration %08x\n", hr ); + V_VT( &defkey ) = VT_I4; V_I4( &defkey ) = 0x80000001; hr = IWbemClassObject_Put( in, L"hDefKey", 0, &defkey, 0 );

1 0

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

Feb. 26, 2021

Module: wine Branch: master Commit: d5113e517495886a585538ed64bbe5603adb58ad URL: https://source.winehq.org/git/wine.git/?a=commit;h=d5113e517495886a585538ed… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Feb 26 19:02:26 2021 +1100 msado15: Implement Dispatch functions in _Recordset. 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 ac92c034ff9..3bfb6a1fe66 100644 --- a/dlls/msado15/main.c +++ b/dlls/msado15/main.c @@ -183,6 +183,7 @@ static REFIID tid_ids[] = { &IID__Connection, &IID_Field, &IID_Fields, + &IID__Recordset, &IID__Stream, }; diff --git a/dlls/msado15/msado15_private.h b/dlls/msado15/msado15_private.h index 6bfe0fc91fd..d1e177e1a3c 100644 --- a/dlls/msado15/msado15_private.h +++ b/dlls/msado15/msado15_private.h @@ -47,6 +47,7 @@ typedef enum tid_t { Connection_tid, Field_tid, Fields_tid, + Recordset_tid, Stream_tid, LAST_tid } tid_t; diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index 1c550680e0d..a4fe5b53736 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -928,29 +928,57 @@ static HRESULT WINAPI recordset_QueryInterface( _Recordset *iface, REFIID riid, static HRESULT WINAPI recordset_GetTypeInfoCount( _Recordset *iface, UINT *count ) { - FIXME( "%p, %p\n", iface, count ); - return E_NOTIMPL; + struct recordset *recordset = impl_from_Recordset( iface ); + TRACE( "%p, %p\n", recordset, count ); + *count = 1; + return S_OK; } static HRESULT WINAPI recordset_GetTypeInfo( _Recordset *iface, UINT index, LCID lcid, ITypeInfo **info ) { - FIXME( "%p, %u, %u, %p\n", iface, index, lcid, info ); - return E_NOTIMPL; + struct recordset *recordset = impl_from_Recordset( iface ); + TRACE( "%p, %u, %u, %p\n", recordset, index, lcid, info ); + return get_typeinfo(Recordset_tid, info); } static HRESULT WINAPI recordset_GetIDsOfNames( _Recordset *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 recordset *recordset = impl_from_Recordset( iface ); + HRESULT hr; + ITypeInfo *typeinfo; + + TRACE( "%p, %s, %p, %u, %u, %p\n", recordset, debugstr_guid(riid), names, count, lcid, dispid ); + + hr = get_typeinfo(Recordset_tid, &typeinfo); + if(SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames(typeinfo, names, count, dispid); + ITypeInfo_Release(typeinfo); + } + + return hr; } static HRESULT WINAPI recordset_Invoke( _Recordset *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 recordset *recordset = impl_from_Recordset( iface ); + HRESULT hr; + ITypeInfo *typeinfo; + + TRACE( "%p, %d, %s, %d, %d, %p, %p, %p, %p\n", recordset, member, debugstr_guid(riid), lcid, flags, params, result, excep_info, arg_err ); - return E_NOTIMPL; + + hr = get_typeinfo(Recordset_tid, &typeinfo); + if(SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke(typeinfo, &recordset->Recordset_iface, member, flags, params, + result, excep_info, arg_err); + ITypeInfo_Release(typeinfo); + } + + return hr; } static HRESULT WINAPI recordset_get_Properties( _Recordset *iface, Properties **obj )

1 0

Jacek Caban : include: Fix __dmb declaration.
by Alexandre Julliard Feb. 26, 2021

Feb. 26, 2021

Module: wine Branch: master Commit: e3708c2c79d378ff53f2fe04d1fa9ececbd1f78c URL: https://source.winehq.org/git/wine.git/?a=commit;h=e3708c2c79d378ff53f2fe04… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 26 15:54:05 2021 +0100 include: Fix __dmb declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/intrin.h | 40 ++++++++++++++++++++++++++++++++++++++++ include/winnt.h | 13 +++++-------- 2 files changed, 45 insertions(+), 8 deletions(-) diff --git a/include/msvcrt/intrin.h b/include/msvcrt/intrin.h index 38496251d5a..781c6fac823 100644 --- a/include/msvcrt/intrin.h +++ b/include/msvcrt/intrin.h @@ -22,6 +22,46 @@ static inline void __cpuid(int info[4], int ax) } #endif +#ifdef __aarch64__ +typedef enum _tag_ARM64INTR_BARRIER_TYPE +{ + _ARM64_BARRIER_OSHLD = 0x1, + _ARM64_BARRIER_OSHST = 0x2, + _ARM64_BARRIER_OSH = 0x3, + _ARM64_BARRIER_NSHLD = 0x5, + _ARM64_BARRIER_NSHST = 0x6, + _ARM64_BARRIER_NSH = 0x7, + _ARM64_BARRIER_ISHLD = 0x9, + _ARM64_BARRIER_ISHST = 0xa, + _ARM64_BARRIER_ISH = 0xb, + _ARM64_BARRIER_LD = 0xd, + _ARM64_BARRIER_ST = 0xe, + _ARM64_BARRIER_SY = 0xf +} _ARM64INTR_BARRIER_TYPE; +#endif + +#ifdef __arm__ +typedef enum _tag_ARMINTR_BARRIER_TYPE +{ + _ARM_BARRIER_OSHST = 0x2, + _ARM_BARRIER_OSH = 0x3, + _ARM_BARRIER_NSHST = 0x6, + _ARM_BARRIER_NSH = 0x7, + _ARM_BARRIER_ISHST = 0xa, + _ARM_BARRIER_ISH = 0xb, + _ARM_BARRIER_ST = 0xe, + _ARM_BARRIER_SY = 0xf +} _ARMINTR_BARRIER_TYPE; +#endif + +#if defined(_MSC_VER) && (defined(__arm__) || defined(__aarch64__)) + +void __dmb(unsigned int); + +#pragma intrinsic(__dmb) + +#endif + #ifdef __cplusplus } #endif diff --git a/include/winnt.h b/include/winnt.h index 3a9d13b055c..e594c89419a 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -32,6 +32,11 @@ #endif +#if defined(_MSC_VER) && (defined(__arm__) || defined(__aarch64__)) +#include <intrin.h> +#endif + + #ifdef __cplusplus extern "C" { #endif @@ -7035,10 +7040,6 @@ static FORCEINLINE void MemoryBarrier(void) #elif defined(__arm__) -#pragma intrinsic(__dmb) - -void __dmb(void); - static FORCEINLINE void MemoryBarrier(void) { __dmb(_ARM_BARRIER_SY); @@ -7046,10 +7047,6 @@ static FORCEINLINE void MemoryBarrier(void) #elif defined(__aarch64__) -#pragma intrinsic(__dmb) - -void __dmb(void); - static FORCEINLINE void MemoryBarrier(void) { __dmb(_ARM64_BARRIER_SY);

1 0

Alexandre Julliard : ntdll: Don't set runtime info at all if it's empty.
by Alexandre Julliard Feb. 26, 2021

Feb. 26, 2021

Module: wine Branch: master Commit: 9e01af751ef397b93693ea6a694896a0d13477b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9e01af751ef397b93693ea6a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 26 13:34:19 2021 +0100 ntdll: Don't set runtime info at all if it's empty. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/env.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index c6037afafbc..f5979a980ea 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -1622,12 +1622,15 @@ void init_startup_info(void) copy_unicode_string( &src, &dst, &params->WindowTitle, info->title_len ); copy_unicode_string( &src, &dst, &params->Desktop, info->desktop_len ); copy_unicode_string( &src, &dst, &params->ShellInfo, info->shellinfo_len ); - /* runtime info isn't a real string */ - params->RuntimeInfo.MaximumLength = params->RuntimeInfo.Length = info->runtime_len; - params->RuntimeInfo.Buffer = dst; - memcpy( dst, src, info->runtime_len ); - src += (info->runtime_len + 1) / sizeof(WCHAR); - dst += (info->runtime_len + 1) / sizeof(WCHAR); + if (info->runtime_len) + { + /* runtime info isn't a real string */ + params->RuntimeInfo.MaximumLength = params->RuntimeInfo.Length = info->runtime_len; + params->RuntimeInfo.Buffer = dst; + memcpy( dst, src, info->runtime_len ); + src += (info->runtime_len + 1) / sizeof(WCHAR); + dst += (info->runtime_len + 1) / sizeof(WCHAR); + } assert( (char *)src == (char *)info + info_size ); params->Environment = dst;

1 0

Alexandre Julliard : sti: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard Feb. 26, 2021

Feb. 26, 2021

Module: wine Branch: master Commit: fe17d149b01ef3b6d598cdc1110b51c87ff8a672 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fe17d149b01ef3b6d598cdc1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 26 10:24:07 2021 +0100 sti: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sti/Makefile.in | 2 +- dlls/sti/sti_main.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/sti/Makefile.in b/dlls/sti/Makefile.in index 884fdbd57eb..411d8fe6728 100644 --- a/dlls/sti/Makefile.in +++ b/dlls/sti/Makefile.in @@ -2,7 +2,7 @@ MODULE = sti.dll IMPORTLIB = sti IMPORTS = uuid ole32 oleaut32 rpcrt4 advapi32 -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ sti.c \ diff --git a/dlls/sti/sti_main.c b/dlls/sti/sti_main.c index c532ffbd6ac..b37f4d3fee2 100644 --- a/dlls/sti/sti_main.c +++ b/dlls/sti/sti_main.c @@ -137,8 +137,6 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpvReserved) { TRACE("(0x%p, %d, %p)\n",hInstDLL,fdwReason,lpvReserved); - if (fdwReason == DLL_WINE_PREATTACH) - return FALSE; return STI_DllMain(hInstDLL, fdwReason, lpvReserved); }

1 0

Alexandre Julliard : snmpapi: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard Feb. 26, 2021

Feb. 26, 2021

Module: wine Branch: master Commit: b783f1db7053dd6a6fea8827679e4ef611ad482c URL: https://source.winehq.org/git/wine.git/?a=commit;h=b783f1db7053dd6a6fea8827… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 26 10:23:58 2021 +0100 snmpapi: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/snmpapi/Makefile.in | 2 +- dlls/snmpapi/main.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/snmpapi/Makefile.in b/dlls/snmpapi/Makefile.in index 90c390150c3..681215ad11b 100644 --- a/dlls/snmpapi/Makefile.in +++ b/dlls/snmpapi/Makefile.in @@ -1,7 +1,7 @@ MODULE = snmpapi.dll IMPORTLIB = snmpapi -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ main.c diff --git a/dlls/snmpapi/main.c b/dlls/snmpapi/main.c index 3c90ca20ec9..1fd98c3da8d 100644 --- a/dlls/snmpapi/main.c +++ b/dlls/snmpapi/main.c @@ -123,8 +123,6 @@ BOOL WINAPI DllMain( TRACE("(%p,%d,%p)\n", hInstDLL, fdwReason, lpvReserved); switch(fdwReason) { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hInstDLL); startTime = GetTickCount64();

1 0