marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

oledb32: Implement IDataSourceLocator get/put hWnd.

oldstable
Alistair Leslie-Hughes 2013-09-30 14:05:01 +10:00 committed by Alexandre Julliard
parent b347554937
commit 05a807af49
2 changed files with 58 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dlls/oledb32/dslocator.c
View File

@ -42,6 +42,7 @@ typedef struct DSLocatorImpl
IDataSourceLocator IDataSourceLocator_iface;
LONG ref;
HWND hwnd;
} DSLocatorImpl;
static inline DSLocatorImpl *impl_from_IDataSourceLocator( IDataSourceLocator *iface )
@ -139,18 +140,22 @@ static HRESULT WINAPI dslocator_get_hWnd(IDataSourceLocator *iface, COMPATIBLE_L
{
DSLocatorImpl *This = impl_from_IDataSourceLocator(iface);
FIXME("(%p)->(%p)\n",This, phwndParent);
TRACE("(%p)->(%p)\n",This, phwndParent);
return E_NOTIMPL;
*phwndParent = (COMPATIBLE_LONG)This->hwnd;
return S_OK;
}
static HRESULT WINAPI dslocator_put_hWnd(IDataSourceLocator *iface, COMPATIBLE_LONG hwndParent)
{
DSLocatorImpl *This = impl_from_IDataSourceLocator(iface);
FIXME("(%p)->(%p)\n",This, (HWND)hwndParent);
TRACE("(%p)->(%p)\n",This, (HWND)hwndParent);
return E_NOTIMPL;
This->hwnd = (HWND)hwndParent;
return S_OK;
}
static HRESULT WINAPI dslocator_PromptNew(IDataSourceLocator *iface, IDispatch **ppADOConnection)
@ -201,6 +206,7 @@ HRESULT create_dslocator(IUnknown *outer, void **obj)
This->IDataSourceLocator_iface.lpVtbl = &DSLocatorVtbl;
This->ref = 1;
This->hwnd = 0;
*obj = &This->IDataSourceLocator_iface;

48
dlls/oledb32/tests/database.c
View File

@ -547,6 +547,53 @@ static void test_rowpos_setrowposition(void)
IRowPosition_Release(rowpos);
}
static void test_dslocator(void)
{
IDataSourceLocator *dslocator = NULL;
HRESULT hr;
hr = CoCreateInstance(&CLSID_DataLinks, NULL, CLSCTX_INPROC_SERVER, &IID_IDataSourceLocator,(void**)&dslocator);
ok(hr == S_OK, "got %08x\n", hr);
if(SUCCEEDED(hr))
{
COMPATIBLE_LONG hwnd = 0;
/* Crashes under Window 7
hr = IDataSourceLocator_get_hWnd(dslocator, NULL);
ok(hr == E_INVALIDARG, "got %08x\n", hr);
*/
hr = IDataSourceLocator_get_hWnd(dslocator, &hwnd);
ok(hr == S_OK, "got %08x\n", hr);
ok(hwnd == 0, "got %p\n", (HWND)hwnd);
hwnd = 0xDEADBEEF;
hr = IDataSourceLocator_get_hWnd(dslocator, &hwnd);
ok(hr == S_OK, "got %08x\n", hr);
ok(hwnd == 0, "got %p\n", (HWND)hwnd);
hwnd = 0xDEADBEEF;
hr = IDataSourceLocator_put_hWnd(dslocator, hwnd);
ok(hr == S_OK, "got %08x\n", hr);
hwnd = 0xDEADBEEF;
hr = IDataSourceLocator_get_hWnd(dslocator, &hwnd);
ok(hr == S_OK, "got %08x\n", hr);
ok(hwnd == 0xDEADBEEF, "got %p\n", (HWND)hwnd);
hwnd = 0;
hr = IDataSourceLocator_put_hWnd(dslocator, hwnd);
ok(hr == S_OK, "got %08x\n", hr);
hwnd = 0xDEADBEEF;
hr = IDataSourceLocator_get_hWnd(dslocator, &hwnd);
ok(hr == S_OK, "got %08x\n", hr);
ok(hwnd == 0, "got %p\n", (HWND)hwnd);
IDataSourceLocator_Release(dslocator);
}
}
START_TEST(database)
{
OleInitialize(NULL);
@ -554,6 +601,7 @@ START_TEST(database)
test_database();
test_errorinfo();
test_initializationstring();
test_dslocator();
/* row position */
test_rowposition();