[PATCH 1/2] msado15: Ignore IRunnableObject interface in recordset/connection_QueryInterface.
Signed-off-by: Gijs Vermeulen gijsvrm@gmail.com ---
This avoids a fixme in FinanceExplorer and CMS-Client.
dlls/msado15/connection.c | 7 +++++++ dlls/msado15/recordset.c | 7 +++++++ dlls/msado15/tests/msado15.c | 6 ++++++ 3 files changed, 20 insertions(+)
diff --git a/dlls/msado15/connection.c b/dlls/msado15/connection.c index 9e8c05522e..b9474e1b78 100644 --- a/dlls/msado15/connection.c +++ b/dlls/msado15/connection.c @@ -98,6 +98,8 @@ static HRESULT WINAPI connection_QueryInterface( _Connection *iface, REFIID riid struct connection *connection = impl_from_Connection( iface ); TRACE( "%p, %s, %p\n", connection, debugstr_guid(riid), obj );
+ *obj = NULL; + if (IsEqualGUID( riid, &IID__Connection ) || IsEqualGUID( riid, &IID_IDispatch ) || IsEqualGUID( riid, &IID_IUnknown )) { @@ -111,6 +113,11 @@ static HRESULT WINAPI connection_QueryInterface( _Connection *iface, REFIID riid { *obj = &connection->IConnectionPointContainer_iface; } + else if (IsEqualGUID( riid, &IID_IRunnableObject )) + { + TRACE("IID_IRunnableObject not supported returning NULL\n"); + return E_NOINTERFACE; + } else { FIXME( "interface %s not implemented\n", debugstr_guid(riid) ); diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index ffb3788531..a5096e5c4f 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -784,6 +784,8 @@ static HRESULT WINAPI recordset_QueryInterface( _Recordset *iface, REFIID riid, struct recordset *recordset = impl_from_Recordset( iface ); TRACE( "%p, %s, %p\n", iface, debugstr_guid(riid), obj );
+ *obj = NULL; + if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IDispatch) || IsEqualIID(riid, &IID__ADO) || IsEqualIID(riid, &IID_Recordset15) || IsEqualIID(riid, &IID_Recordset20) || IsEqualIID(riid, &IID_Recordset21) || @@ -795,6 +797,11 @@ static HRESULT WINAPI recordset_QueryInterface( _Recordset *iface, REFIID riid, { *obj = &recordset->ISupportErrorInfo_iface; } + else if (IsEqualGUID( riid, &IID_IRunnableObject )) + { + TRACE("IID_IRunnableObject not supported returning NULL\n"); + return E_NOINTERFACE; + } else { FIXME( "interface %s not implemented\n", debugstr_guid(riid) ); diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index a8d2afdd41..1d457a703d 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -61,6 +61,7 @@ static LONG get_refs_recordset( _Recordset *recordset ) static void test_Recordset(void) { _Recordset *recordset; + IRunnableObject *runtime; ISupportErrorInfo *errorinfo; Fields *fields, *fields2; Field *field; @@ -73,6 +74,10 @@ static void test_Recordset(void) hr = CoCreateInstance( &CLSID_Recordset, NULL, CLSCTX_INPROC_SERVER, &IID__Recordset, (void **)&recordset ); ok( hr == S_OK, "got %08x\n", hr );
+ hr = _Recordset_QueryInterface( recordset, &IID_IRunnableObject, (void**)&runtime); + ok(hr == E_NOINTERFACE, "Unexpected IRunnableObject interface\n"); + ok(runtime == NULL, "expected NULL\n"); + /* _Recordset object supports ISupportErrorInfo */ errorinfo = NULL; hr = _Recordset_QueryInterface( recordset, &IID_ISupportErrorInfo, (void **)&errorinfo ); @@ -676,6 +681,7 @@ static void test_Connection(void)
hr = _Connection_QueryInterface(connection, &IID_IRunnableObject, (void**)&runtime); ok(hr == E_NOINTERFACE, "Unexpected IRunnableObject interface\n"); + ok(runtime == NULL, "expected NULL\n");
hr = _Connection_QueryInterface(connection, &IID_ISupportErrorInfo, (void**)&errorinfo); ok(hr == S_OK, "Failed to get ISupportErrorInfo interface\n");
Signed-off-by: Gijs Vermeulen gijsvrm@gmail.com --- dlls/msado15/connection.c | 17 ++++++++++++++--- dlls/msado15/tests/msado15.c | 27 ++++++++++++++++++++++++++- include/msado15_backcompat.idl | 6 ++++++ 3 files changed, 46 insertions(+), 4 deletions(-)
diff --git a/dlls/msado15/connection.c b/dlls/msado15/connection.c index b9474e1b78..35202d14aa 100644 --- a/dlls/msado15/connection.c +++ b/dlls/msado15/connection.c @@ -221,8 +221,14 @@ static HRESULT WINAPI connection_get_Version( _Connection *iface, BSTR *str )
static HRESULT WINAPI connection_Close( _Connection *iface ) { - FIXME( "%p\n", iface ); - return E_NOTIMPL; + struct connection *connection = impl_from_Connection( iface ); + + TRACE( "%p\n", connection ); + + if (connection->state == adStateClosed) return MAKE_ADO_HRESULT( adErrObjectClosed ); + + connection->state = adStateClosed; + return S_OK; }
static HRESULT WINAPI connection_Execute( _Connection *iface, BSTR command, VARIANT *records_affected, @@ -253,9 +259,14 @@ static HRESULT WINAPI connection_RollbackTrans( _Connection *iface ) static HRESULT WINAPI connection_Open( _Connection *iface, BSTR connect_str, BSTR userid, BSTR password, LONG options ) { + struct connection *connection = impl_from_Connection( iface ); FIXME( "%p, %s, %s, %p, %08x\n", iface, debugstr_w(connect_str), debugstr_w(userid), password, options ); - return E_NOTIMPL; + + if (connection->state == adStateOpen) return MAKE_ADO_HRESULT( adErrObjectOpen ); + + connection->state = adStateOpen; + return S_OK; }
static HRESULT WINAPI connection_get_Errors( _Connection *iface, Errors **obj ) diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index 1d457a703d..59c00948c8 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -674,7 +674,7 @@ static void test_Connection(void) ISupportErrorInfo *errorinfo; IConnectionPointContainer *pointcontainer; LONG state, timeout; - BSTR str, str2; + BSTR str, str2, str3;
hr = CoCreateInstance(&CLSID_Connection, NULL, CLSCTX_INPROC_SERVER, &IID__Connection, (void**)&connection); ok( hr == S_OK, "got %08x\n", hr ); @@ -702,6 +702,9 @@ if (0) /* Crashes on windows */ ok(hr == S_OK, "Failed to get state, hr 0x%08x\n", hr); ok(state == adStateClosed, "Unexpected state value 0x%08x\n", state);
+ hr = _Connection_Close(connection); + ok(hr == MAKE_ADO_HRESULT(adErrObjectClosed), "got %08x\n", hr); + timeout = 0; hr = _Connection_get_CommandTimeout(connection, &timeout); ok(hr == S_OK, "Failed to get state, hr 0x%08x\n", hr); @@ -734,8 +737,30 @@ if (0) /* Crashes on windows */ hr = _Connection_get_ConnectionString(connection, &str2); ok(hr == S_OK, "Failed, hr 0x%08x\n", hr); ok(!wcscmp(str, str2), "wrong string %s\n", wine_dbgstr_w(str2)); + + hr = _Connection_Open(connection, NULL, NULL, NULL, 0); + todo_wine ok(hr == E_FAIL, "Failed, hr 0x%08x\n", hr); + + /* Open adds trailing ; if it's missing */ + str3 = SysAllocString(L"Provider=MSDASQL.1;Persist Security Info=False;Data Source=wine_test;"); + hr = _Connection_Open(connection, NULL, NULL, NULL, adConnectUnspecified); + todo_wine ok(hr == E_FAIL, "Failed, hr 0x%08x\n", hr); + + str2 = NULL; + hr = _Connection_get_ConnectionString(connection, &str2); + ok(hr == S_OK, "Failed, hr 0x%08x\n", hr); + todo_wine ok(!wcscmp(str3, str2) || broken(!wcscmp(str, str2)) /* XP */, "wrong string %s\n", wine_dbgstr_w(str2)); + + hr = _Connection_Open(connection, str, NULL, NULL, adConnectUnspecified); + todo_wine ok(hr == E_FAIL, "Failed, hr 0x%08x\n", hr); SysFreeString(str); + + str2 = NULL; + hr = _Connection_get_ConnectionString(connection, &str2); + ok(hr == S_OK, "Failed, hr 0x%08x\n", hr); + todo_wine ok(!wcscmp(str3, str2) || broken(!wcscmp(str, str2)) /* XP */, "wrong string %s\n", wine_dbgstr_w(str2)); SysFreeString(str2); + SysFreeString(str3);
hr = _Connection_put_ConnectionString(connection, NULL); ok(hr == S_OK, "Failed, hr 0x%08x\n", hr); diff --git a/include/msado15_backcompat.idl b/include/msado15_backcompat.idl index 68fda6ab21..5ea9f51c1f 100644 --- a/include/msado15_backcompat.idl +++ b/include/msado15_backcompat.idl @@ -512,6 +512,12 @@ typedef [uuid(00000531-0000-0010-8000-00aa006d2ea4)] enum EventReasonEnum adRsnMoveLast = 15 } EventReasonEnum;
+typedef [uuid(00000541-0000-0010-8000-00aa006d2ea4)] enum ConnectOptionEnum +{ + adConnectUnspecified = -1, + adAsyncConnect = 0x10 +} ConnectOptionEnum; + [ uuid(00000503-0000-0010-8000-00aa006d2ea4), odl,
-
Gijs Vermeulen