ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msado15: Support ADOConnectionConstruction15 on _Connection interface. 

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Signed-off-by: Hans Leidekker <hans@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alistair Leslie-Hughes 2021-01-15 18:22:14 +11:00 committed by Alexandre Julliard
parent 44501a2781
commit 3289a7a2d4
2 changed files with 62 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
dlls/msado15/connection.c
View File

@ -50,6 +50,7 @@ struct connection
_Connection Connection_iface; _Connection Connection_iface;
ISupportErrorInfo ISupportErrorInfo_iface; ISupportErrorInfo ISupportErrorInfo_iface;
IConnectionPointContainer IConnectionPointContainer_iface; IConnectionPointContainer IConnectionPointContainer_iface;
ADOConnectionConstruction15 ADOConnectionConstruction15_iface;
LONG refs; LONG refs;
ObjectStateEnum state; ObjectStateEnum state;
LONG timeout; LONG timeout;
@ -76,6 +77,11 @@ static inline struct connection *impl_from_IConnectionPointContainer( IConnectio
return CONTAINING_RECORD( iface, struct connection, IConnectionPointContainer_iface ); return CONTAINING_RECORD( iface, struct connection, IConnectionPointContainer_iface );
} }
static inline struct connection *impl_from_ADOConnectionConstruction15( ADOConnectionConstruction15 *iface )
{
return CONTAINING_RECORD( iface, struct connection, ADOConnectionConstruction15_iface );
}
static inline struct connection_point *impl_from_IConnectionPoint( IConnectionPoint *iface ) static inline struct connection_point *impl_from_IConnectionPoint( IConnectionPoint *iface )
{ {
return CONTAINING_RECORD( iface, struct connection_point, IConnectionPoint_iface ); return CONTAINING_RECORD( iface, struct connection_point, IConnectionPoint_iface );
@ -129,6 +135,10 @@ static HRESULT WINAPI connection_QueryInterface( _Connection *iface, REFIID riid
{ {
*obj = &connection->IConnectionPointContainer_iface; *obj = &connection->IConnectionPointContainer_iface;
} }
else if (IsEqualGUID( riid, &IID_ADOConnectionConstruction15 ))
{
*obj = &connection->ADOConnectionConstruction15_iface;
}
else if (IsEqualGUID( riid, &IID_IRunnableObject )) else if (IsEqualGUID( riid, &IID_IRunnableObject ))
{ {
TRACE("IID_IRunnableObject not supported returning NULL\n"); TRACE("IID_IRunnableObject not supported returning NULL\n");
@ -715,6 +725,56 @@ static const IConnectionPointVtbl connpoint_vtbl =
connpoint_EnumConnections connpoint_EnumConnections
}; };
static HRESULT WINAPI adoconstruct_QueryInterface(ADOConnectionConstruction15 *iface, REFIID riid, void **obj)
{
struct connection *connection = impl_from_ADOConnectionConstruction15( iface );
return _Connection_QueryInterface( &connection->Connection_iface, riid, obj );
}
static ULONG WINAPI adoconstruct_AddRef(ADOConnectionConstruction15 *iface)
{
struct connection *connection = impl_from_ADOConnectionConstruction15( iface );
return _Connection_AddRef( &connection->Connection_iface );
}
static ULONG WINAPI adoconstruct_Release(ADOConnectionConstruction15 *iface)
{
struct connection *connection = impl_from_ADOConnectionConstruction15( iface );
return _Connection_Release( &connection->Connection_iface );
}
static HRESULT WINAPI adoconstruct_get_DSO(ADOConnectionConstruction15 *iface, IUnknown **dso)
{
struct connection *connection = impl_from_ADOConnectionConstruction15( iface );
FIXME("%p, %p\n", connection, dso);
return E_NOTIMPL;
}
static HRESULT WINAPI adoconstruct_get_Session(ADOConnectionConstruction15 *iface, IUnknown **session)
{
struct connection *connection = impl_from_ADOConnectionConstruction15( iface );
FIXME("%p, %p\n", connection, session);
return E_NOTIMPL;
}
static HRESULT WINAPI adoconstruct_WrapDSOandSession(ADOConnectionConstruction15 *iface, IUnknown *dso,
IUnknown *session)
{
struct connection *connection = impl_from_ADOConnectionConstruction15( iface );
FIXME("%p, %p, %p\n", connection, dso, session);
return E_NOTIMPL;
}
struct ADOConnectionConstruction15Vtbl ado_construct_vtbl =
{
adoconstruct_QueryInterface,
adoconstruct_AddRef,
adoconstruct_Release,
adoconstruct_get_DSO,
adoconstruct_get_Session,
adoconstruct_WrapDSOandSession
};
HRESULT Connection_create( void **obj ) HRESULT Connection_create( void **obj )
{ {
struct connection *connection; struct connection *connection;
@ -723,6 +783,7 @@ HRESULT Connection_create( void **obj )
connection->Connection_iface.lpVtbl = &connection_vtbl; connection->Connection_iface.lpVtbl = &connection_vtbl;
connection->ISupportErrorInfo_iface.lpVtbl = &support_error_vtbl; connection->ISupportErrorInfo_iface.lpVtbl = &support_error_vtbl;
connection->IConnectionPointContainer_iface.lpVtbl = &connpointcontainer_vtbl; connection->IConnectionPointContainer_iface.lpVtbl = &connpointcontainer_vtbl;
connection->ADOConnectionConstruction15_iface.lpVtbl = &ado_construct_vtbl;
connection->refs = 1; connection->refs = 1;
connection->state = adStateClosed; connection->state = adStateClosed;
connection->timeout = 30; connection->timeout = 30;

2
dlls/msado15/tests/msado15.c
View File

@ -1046,7 +1046,7 @@ static void test_Connection(void)
IConnectionPointContainer_Release(pointcontainer); IConnectionPointContainer_Release(pointcontainer);
hr = _Connection_QueryInterface(connection, &IID_ADOConnectionConstruction15, (void**)&construct); hr = _Connection_QueryInterface(connection, &IID_ADOConnectionConstruction15, (void**)&construct);
todo_wine ok(hr == S_OK, "Failed to get ADOConnectionConstruction15 interface %08x\n", hr); ok(hr == S_OK, "Failed to get ADOConnectionConstruction15 interface %08x\n", hr);
if (hr == S_OK) if (hr == S_OK)
ADOConnectionConstruction15_Release(construct); ADOConnectionConstruction15_Release(construct);