[PATCH 3/3] msado15: Implement _Connection get/put ConnectionString
Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msado15/connection.c | 14 ++++++++++---- dlls/msado15/tests/msado15.c | 11 +++++++++++ 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/dlls/msado15/connection.c b/dlls/msado15/connection.c index b267fc08c0..6fecb72615 100644 --- a/dlls/msado15/connection.c +++ b/dlls/msado15/connection.c @@ -37,6 +37,7 @@ struct connection LONG refs; ObjectStateEnum state; LONG timeout; + BSTR datasource; }; static inline struct connection *impl_from_Connection( _Connection *iface ) @@ -62,6 +63,7 @@ static ULONG WINAPI connection_Release( _Connection *iface ) if (!refs) { TRACE( "destroying %p\n", connection ); + SysFreeString(connection->datasource); heap_free( connection ); } return refs; @@ -135,14 +137,18 @@ static HRESULT WINAPI connection_get_Properties( _Connection *iface, Properties static HRESULT WINAPI connection_get_ConnectionString( _Connection *iface, BSTR *str ) { - FIXME( "%p, %p\n", iface, str ); - return E_NOTIMPL; + struct connection *connection = impl_from_Connection( iface ); + TRACE( "%p, %p\n", connection, str ); + *str = SysAllocString(connection->datasource); + return S_OK; } static HRESULT WINAPI connection_put_ConnectionString( _Connection *iface, BSTR str ) { - FIXME( "%p, %s\n", iface, debugstr_w(str) ); - return E_NOTIMPL; + struct connection *connection = impl_from_Connection( iface ); + TRACE( "%p, %s\n", connection, debugstr_w(str) ); + connection->datasource = SysAllocString(str); + return S_OK; } static HRESULT WINAPI connection_get_CommandTimeout( _Connection *iface, LONG *timeout ) diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index 17be9e4f14..431566f0bf 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -663,6 +663,7 @@ static void test_Connection(void) IMarshal *marshal; IExternalConnection *external; LONG state, timeout; + BSTR connect1, connect2; hr = CoCreateInstance(&CLSID_Connection, NULL, CLSCTX_INPROC_SERVER, &IID__Connection, (void**)&connection); ok( hr == S_OK, "got %08x\n", hr ); @@ -704,6 +705,16 @@ if (0) /* Crashes on windows */ ok(hr == S_OK, "Failed to get state, hr 0x%08x\n", hr); ok(timeout == 300, "Unexpected timeout value %d\n", timeout); + connect1 = SysAllocString(L"Provider=MSDASQL.1;Persist Security Info=False;Data Source=wine_test"); + hr = _Connection_put_ConnectionString(connection, connect1); + ok(hr == S_OK, "Failed, hr 0x%08x\n", hr); + + hr = _Connection_get_ConnectionString(connection, &connect2); + ok(hr == S_OK, "Failed, hr 0x%08x\n", hr); + ok(wcscmp(connect1, connect2) == 0, "wrong string %s\n", wine_dbgstr_w(connect2)); + SysFreeString(connect1); + SysFreeString(connect2); + _Connection_Release(connection); } -- 2.24.1
Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=63763 Your paranoid android. === wxppro (32 bit report) === msado15: msado15.c:679: Test failed: Unexpected IMarshal interface === w2003std (32 bit report) === msado15: msado15.c:679: Test failed: Unexpected IMarshal interface === wvistau64 (32 bit report) === msado15: msado15.c:679: Test failed: Unexpected IMarshal interface === w2008s64 (32 bit report) === msado15: msado15.c:679: Test failed: Unexpected IMarshal interface === w7u (32 bit report) === msado15: msado15.c:679: Test failed: Unexpected IMarshal interface === w8 (32 bit report) === msado15: msado15.c:679: Test failed: Unexpected IMarshal interface === w8adm (32 bit report) === msado15: msado15.c:679: Test failed: Unexpected IMarshal interface === w864 (32 bit report) === msado15: msado15.c:679: Test failed: Unexpected IMarshal interface === w1064v1507 (32 bit report) === msado15: msado15.c:679: Test failed: Unexpected IMarshal interface === w1064v1809 (32 bit report) === msado15: msado15.c:679: Test failed: Unexpected IMarshal interface === w1064v1809_2scr (32 bit report) === msado15: msado15.c:679: Test failed: Unexpected IMarshal interface === w1064v1809_ar (32 bit report) === msado15: msado15.c:679: Test failed: Unexpected IMarshal interface === w1064v1809_he (32 bit report) === msado15: msado15.c:679: Test failed: Unexpected IMarshal interface === w1064v1809_ja (32 bit report) === msado15: msado15.c:679: Test failed: Unexpected IMarshal interface === w1064v1809_zh_CN (32 bit report) === msado15: msado15.c:679: Test failed: Unexpected IMarshal interface === wvistau64 (64 bit report) === msado15: msado15.c:679: Test failed: Unexpected IMarshal interface === w2008s64 (64 bit report) === msado15: msado15.c:679: Test failed: Unexpected IMarshal interface === w864 (64 bit report) === msado15: msado15.c:679: Test failed: Unexpected IMarshal interface === w1064v1507 (64 bit report) === msado15: msado15.c:679: Test failed: Unexpected IMarshal interface === w1064v1809 (64 bit report) === msado15: msado15.c:679: Test failed: Unexpected IMarshal interface
participants (2)
-
Alistair Leslie-Hughes -
Marvin