mirror of
git://source.winehq.org/git/wine.git
synced 2024-09-06 22:31:27 +00:00
msado15: Implement _Connection get/put ConnectionString.
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:
parent
943b6564f5
commit
765fc5cb31
|
@ -37,6 +37,7 @@ struct connection
|
|||
LONG refs;
|
||||
ObjectStateEnum state;
|
||||
LONG timeout;
|
||||
WCHAR *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 );
|
||||
heap_free( connection->datasource );
|
||||
heap_free( connection );
|
||||
}
|
||||
return refs;
|
||||
|
@ -125,14 +127,27 @@ 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 );
|
||||
BSTR source = NULL;
|
||||
|
||||
TRACE( "%p, %p\n", connection, str );
|
||||
|
||||
if (connection->datasource && !(source = SysAllocString( connection->datasource ))) return E_OUTOFMEMORY;
|
||||
*str = source;
|
||||
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 );
|
||||
WCHAR *source = NULL;
|
||||
|
||||
TRACE( "%p, %s\n", connection, debugstr_w( !wcsstr( str, L"Password" ) ? L"<hidden>" : str ) );
|
||||
|
||||
if (str && !(source = strdupW( str ))) return E_OUTOFMEMORY;
|
||||
heap_free( connection->datasource );
|
||||
connection->datasource = source;
|
||||
return S_OK;
|
||||
}
|
||||
|
||||
static HRESULT WINAPI connection_get_CommandTimeout( _Connection *iface, LONG *timeout )
|
||||
|
@ -392,6 +407,7 @@ HRESULT Connection_create( void **obj )
|
|||
connection->refs = 1;
|
||||
connection->state = adStateClosed;
|
||||
connection->timeout = 30;
|
||||
connection->datasource = NULL;
|
||||
|
||||
*obj = &connection->Connection_iface;
|
||||
TRACE( "returning iface %p\n", *obj );
|
||||
|
|
|
@ -667,6 +667,7 @@ static void test_Connection(void)
|
|||
IRunnableObject *runtime;
|
||||
ISupportErrorInfo *errorinfo;
|
||||
LONG state, timeout;
|
||||
BSTR str, str2;
|
||||
|
||||
hr = CoCreateInstance(&CLSID_Connection, NULL, CLSCTX_INPROC_SERVER, &IID__Connection, (void**)&connection);
|
||||
ok( hr == S_OK, "got %08x\n", hr );
|
||||
|
@ -702,6 +703,35 @@ 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);
|
||||
|
||||
str = (BSTR)0xdeadbeef;
|
||||
hr = _Connection_get_ConnectionString(connection, &str);
|
||||
ok(hr == S_OK, "Failed, hr 0x%08x\n", hr);
|
||||
ok(str == NULL, "got %p\n", str);
|
||||
|
||||
str = SysAllocString(L"Provider=MSDASQL.1;Persist Security Info=False;Data Source=wine_test");
|
||||
hr = _Connection_put_ConnectionString(connection, str);
|
||||
ok(hr == S_OK, "Failed, hr 0x%08x\n", hr);
|
||||
|
||||
if (0) /* Crashes on windows */
|
||||
{
|
||||
hr = _Connection_get_ConnectionString(connection, NULL);
|
||||
ok(hr == E_POINTER, "Failed, hr 0x%08x\n", hr);
|
||||
}
|
||||
|
||||
str2 = NULL;
|
||||
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));
|
||||
SysFreeString(str);
|
||||
SysFreeString(str2);
|
||||
|
||||
hr = _Connection_put_ConnectionString(connection, NULL);
|
||||
ok(hr == S_OK, "Failed, hr 0x%08x\n", hr);
|
||||
|
||||
str = (BSTR)0xdeadbeef;
|
||||
hr = _Connection_get_ConnectionString(connection, &str);
|
||||
ok(hr == S_OK, "Failed, hr 0x%08x\n", hr);
|
||||
ok(str == NULL, "got %p\n", str);
|
||||
_Connection_Release(connection);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue