system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-14 21:39:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

msado15: Implement _Connection Get/Put Provider.

Browse source 
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 2020-10-08 14:00:35 +02:00 committed by Alexandre Julliard
parent d136c7554c
commit 2262e04827
2 changed files with 58 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
dlls/msado15/connection.c
View file

@ -53,6 +53,7 @@ struct connection
ObjectStateEnum state;
LONG timeout;
WCHAR *datasource;
WCHAR *provider;
struct connection_point cp_connev;
};
@ -96,6 +97,7 @@ static ULONG WINAPI connection_Release( _Connection *iface )
IUnknown_Release( connection->cp_connev.sinks[i] );
}
heap_free( connection->cp_connev.sinks );
heap_free( connection->provider );
heap_free( connection->datasource );
heap_free( connection );
}
@ -346,14 +348,29 @@ static HRESULT WINAPI connection_put_Mode( _Connection *iface, ConnectModeEnum m
static HRESULT WINAPI connection_get_Provider( _Connection *iface, BSTR *str )
{
FIXME( "%p, %p\n", iface, str );
return E_NOTIMPL;
struct connection *connection = impl_from_Connection( iface );
BSTR provider = NULL;
TRACE( "%p, %p\n", iface, str );
if (connection->provider && !(provider = SysAllocString( connection->provider ))) return E_OUTOFMEMORY;
*str = provider;
return S_OK;
}
static HRESULT WINAPI connection_put_Provider( _Connection *iface, BSTR str )
{
FIXME( "%p, %s\n", iface, debugstr_w(str) );
return E_NOTIMPL;
struct connection *connection = impl_from_Connection( iface );
WCHAR *provider = NULL;
TRACE( "%p, %s\n", iface, debugstr_w(str) );
if (!str) return MAKE_ADO_HRESULT(adErrInvalidArgument);
if (!(provider = strdupW( str ))) return E_OUTOFMEMORY;
heap_free( connection->provider );
connection->provider = provider;
return S_OK;
}
static HRESULT WINAPI connection_get_State( _Connection *iface, LONG *state )
@ -646,6 +663,7 @@ HRESULT Connection_create( void **obj )
connection->state = adStateClosed;
connection->timeout = 30;
connection->datasource = NULL;
connection->provider = SysAllocString(L"MSDASQL");
connection->cp_connev.conn = connection;
connection->cp_connev.riid = &DIID_ConnectionEvents;

37
dlls/msado15/tests/msado15.c
View file

@ -718,15 +718,50 @@ 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);
/* Default */
str = (BSTR)0xdeadbeef;
hr = _Connection_get_Provider(connection, &str);
ok(hr == S_OK, "Failed, hr 0x%08x\n", hr);
ok(!wcscmp(str, L"MSDASQL"), "wrong string %s\n", wine_dbgstr_w(str));
SysFreeString(str);
str = SysAllocString(L"MSDASQL.1");
hr = _Connection_put_Provider(connection, str);
ok(hr == S_OK, "Failed, hr 0x%08x\n", hr);
SysFreeString(str);
str = (BSTR)0xdeadbeef;
hr = _Connection_get_Provider(connection, &str);
ok(hr == S_OK, "Failed, hr 0x%08x\n", hr);
ok(!wcscmp(str, L"MSDASQL.1"), "wrong string %s\n", wine_dbgstr_w(str));
/* Restore default */
str = SysAllocString(L"MSDASQL");
hr = _Connection_put_Provider(connection, str);
ok(hr == S_OK, "Failed, hr 0x%08x\n", hr);
SysFreeString(str);
hr = _Connection_put_Provider(connection, NULL);
ok(hr == MAKE_ADO_HRESULT(adErrInvalidArgument), "got 0x%08x\n", hr);
SysFreeString(str);
str = (BSTR)0xdeadbeef;
hr = _Connection_get_ConnectionString(connection, &str);
ok(hr == S_OK, "Failed, hr 0x%08x\n", hr);
ok(hr == S_OK, "got 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);
/* Show put_ConnectionString effects Provider */
str3 = (BSTR)0xdeadbeef;
hr = _Connection_get_Provider(connection, &str3);
ok(hr == S_OK, "Failed, hr 0x%08x\n", hr);
ok(str3 != NULL, "Expected value got NULL\n");
todo_wine ok(!wcscmp(str3, L"MSDASQL.1"), "wrong string %s\n", wine_dbgstr_w(str3));
SysFreeString(str3);
if (0) /* Crashes on windows */
{
hr = _Connection_get_ConnectionString(connection, NULL);