forked from Mirrors/wine-wine
oledb32: Implement IDataSourceLocator get/put hWnd.
parent
b347554937
commit
05a807af49
|
@ -42,6 +42,7 @@ typedef struct DSLocatorImpl
|
||||||
IDataSourceLocator IDataSourceLocator_iface;
|
IDataSourceLocator IDataSourceLocator_iface;
|
||||||
LONG ref;
|
LONG ref;
|
||||||
|
|
||||||
|
HWND hwnd;
|
||||||
} DSLocatorImpl;
|
} DSLocatorImpl;
|
||||||
|
|
||||||
static inline DSLocatorImpl *impl_from_IDataSourceLocator( IDataSourceLocator *iface )
|
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);
|
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)
|
static HRESULT WINAPI dslocator_put_hWnd(IDataSourceLocator *iface, COMPATIBLE_LONG hwndParent)
|
||||||
{
|
{
|
||||||
DSLocatorImpl *This = impl_from_IDataSourceLocator(iface);
|
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)
|
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->IDataSourceLocator_iface.lpVtbl = &DSLocatorVtbl;
|
||||||
This->ref = 1;
|
This->ref = 1;
|
||||||
|
This->hwnd = 0;
|
||||||
|
|
||||||
*obj = &This->IDataSourceLocator_iface;
|
*obj = &This->IDataSourceLocator_iface;
|
||||||
|
|
||||||
|
|
|
@ -547,6 +547,53 @@ static void test_rowpos_setrowposition(void)
|
||||||
IRowPosition_Release(rowpos);
|
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)
|
START_TEST(database)
|
||||||
{
|
{
|
||||||
OleInitialize(NULL);
|
OleInitialize(NULL);
|
||||||
|
@ -554,6 +601,7 @@ START_TEST(database)
|
||||||
test_database();
|
test_database();
|
||||||
test_errorinfo();
|
test_errorinfo();
|
||||||
test_initializationstring();
|
test_initializationstring();
|
||||||
|
test_dslocator();
|
||||||
|
|
||||||
/* row position */
|
/* row position */
|
||||||
test_rowposition();
|
test_rowposition();
|
||||||
|
|
Loading…
Reference in New Issue