Alistair Leslie-Hughes : oledb32: Implement IDataSourceLocator get/put hWnd .
Alexandre Julliard
julliard at winehq.org
Tue Oct 1 14:54:27 CDT 2013
Module: wine
Branch: master
Commit: 05a807af49e027422afb8f9c8e39bb5e4c09494d
URL: http://source.winehq.org/git/wine.git/?a=commit;h=05a807af49e027422afb8f9c8e39bb5e4c09494d
Author: Alistair Leslie-Hughes <leslie_alistair at hotmail.com>
Date: Mon Sep 30 14:05:01 2013 +1000
oledb32: Implement IDataSourceLocator get/put hWnd.
---
dlls/oledb32/dslocator.c | 14 ++++++++---
dlls/oledb32/tests/database.c | 48 +++++++++++++++++++++++++++++++++++++++++
2 files changed, 58 insertions(+), 4 deletions(-)
diff --git a/dlls/oledb32/dslocator.c b/dlls/oledb32/dslocator.c
index f8a98f5..4af4ab4 100644
--- a/dlls/oledb32/dslocator.c
+++ b/dlls/oledb32/dslocator.c
@@ -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;
diff --git a/dlls/oledb32/tests/database.c b/dlls/oledb32/tests/database.c
index d0eb9ff..13637c1 100644
--- a/dlls/oledb32/tests/database.c
+++ b/dlls/oledb32/tests/database.c
@@ -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();
More information about the wine-cvs
mailing list