Alistair Leslie-Hughes : oledb32: Correct DataLinks interface for win64.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 3d193930ab33ab521fff8028fc309d605432e2f6
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=3d193930ab33ab521fff8028fc...

Author: Alistair Leslie-Hughes 
Date:   Mon Sep 16 09:44:39 2013 +1000

oledb32: Correct DataLinks interface for win64.

---

dlls/oledb32/dslocator.c |    6 +++---
 include/msdasc.idl       |    6 ++++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/dlls/oledb32/dslocator.c b/dlls/oledb32/dslocator.c
index dcc2fe3..f8a98f5 100644
--- a/dlls/oledb32/dslocator.c
+++ b/dlls/oledb32/dslocator.c
@@ -135,7 +135,7 @@ static HRESULT WINAPI dslocator_Invoke(IDataSourceLocator *iface, DISPID dispIdM
     return E_NOTIMPL;
 }

-static HRESULT WINAPI dslocator_get_hWnd(IDataSourceLocator *iface, LONG *phwndParent)
+static HRESULT WINAPI dslocator_get_hWnd(IDataSourceLocator *iface, COMPATIBLE_LONG *phwndParent)
 {
     DSLocatorImpl *This = impl_from_IDataSourceLocator(iface);

@@ -144,11 +144,11 @@ static HRESULT WINAPI dslocator_get_hWnd(IDataSourceLocator *iface, LONG *phwndP
     return E_NOTIMPL;
 }

-static HRESULT WINAPI dslocator_put_hWnd(IDataSourceLocator *iface, LONG phwndParent)
+static HRESULT WINAPI dslocator_put_hWnd(IDataSourceLocator *iface, COMPATIBLE_LONG hwndParent)
 {
     DSLocatorImpl *This = impl_from_IDataSourceLocator(iface);

-    FIXME("(%p)->(%d)\n",This, phwndParent);
+    FIXME("(%p)->(%p)\n",This, (HWND)hwndParent);

return E_NOTIMPL;
 }
diff --git a/include/msdasc.idl b/include/msdasc.idl
index 25610e5..e3efb1d 100644
--- a/include/msdasc.idl
+++ b/include/msdasc.idl
@@ -26,6 +26,8 @@ import "oledb.idl";
 #define vi_progid(str)
 #endif

+typedef LONG_PTR COMPATIBLE_LONG;
+
 [
     uuid(2206CEB0-19C1-11D1-89E0-00C04FD7A829),
     version(1.0)
@@ -56,10 +58,10 @@ library MSDASC
     interface IDataSourceLocator : IDispatch
     {
         [id(0x60020000), propget]
-        HRESULT hWnd([out, retval] long* phwndParent);
+        HRESULT hWnd([out, retval] COMPATIBLE_LONG* phwndParent);

[id(0x60020000), propput]
-        HRESULT hWnd([in] long phwndParent);
+        HRESULT hWnd([in] COMPATIBLE_LONG hwndParent);

[id(0x60020002), helpstring("PromptNew")]
         HRESULT PromptNew([out, retval] IDispatch** ppADOConnection);