oledb32: Correct DBPROP_INIT_PROVIDERSTRING and DBPROP_INIT_HWND types

[Alistair Leslie-Hughes]

Hi,
Corrects a spelling mistake too and

Changelog:
     oledb32: Correct DBPROP_INIT_PROVIDERSTRING and DBPROP_INIT_HWND types


Best Regards
  Alistair Leslie-Hughes
-------------- next part --------------
>From a9fcdd7f49a883885c301d013b11e590cc63a913 Mon Sep 17 00:00:00 2001
From: Alistair Leslie-Hughes <leslie_alistair at hotmail.com>
Date: Thu, 6 Jun 2013 15:13:29 +1000
Subject: [PATCH] Correct DBPROP_INIT_PROVIDERSTRING type
To: wine-patches <wine-patches at winehq.org>

---
 dlls/oledb32/datainit.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/dlls/oledb32/datainit.c b/dlls/oledb32/datainit.c
index b6ba0e1..7396af5 100644
--- a/dlls/oledb32/datainit.c
+++ b/dlls/oledb32/datainit.c
@@ -306,7 +306,7 @@ static const WCHAR locationW[] = {'L','o','c','a','t','i','o','n',0};
 static const WCHAR modeW[] = {'M','o','d','e',0};
 static const WCHAR oledbservW[] = {'O','L','E',' ','D','B',' ','S','e','r','v','i','c','i','e','s',0};
 static const WCHAR passwordW[] = {'P','a','s','s','w','o','r','d',0};
-static const WCHAR persiststW[] = {'P','e','r','s','i','s','t',' ','S','e','c','u','r','i','t','y',' ','I','n','f','o',0};
+static const WCHAR persistW[]  = {'P','e','r','s','i','s','t',' ','S','e','c','u','r','i','t','y',' ','I','n','f','o',0};
 static const WCHAR promptW[] = {'P','r','o','m','p','t',0};
 static const WCHAR useridW[] = {'U','s','e','r',' ','I','D',0};
 static const WCHAR winhandleW[] = {'W','i','n','d','o','w',' ','H','a','n','d','l','e',0};
@@ -314,18 +314,22 @@ static const WCHAR winhandleW[] = {'W','i','n','d','o','w',' ','H','a','n','d','
 static const struct dbproperty dbproperties[] = {
     { conn_timeout,DBPROP_INIT_TIMEOUT,                    DBPROPOPTIONS_OPTIONAL, VT_I4 },
     { datasourceW, DBPROP_INIT_DATASOURCE,                 DBPROPOPTIONS_REQUIRED, VT_BSTR },
-    { extemdedW,   DBPROP_INIT_PROVIDERSTRING,             DBPROPOPTIONS_REQUIRED, VT_BSTR },
+    { extemdedW,   DBPROP_INIT_PROVIDERSTRING,             DBPROPOPTIONS_OPTIONAL, VT_BSTR },
     { gen_timeout, DBPROP_INIT_GENERALTIMEOUT,             DBPROPOPTIONS_OPTIONAL, VT_I4 },
-    { initcatW,    DBPROP_CATALOGLOCATION,                 DBPROPOPTIONS_OPTIONAL, VT_BSTR },
+    { initcatW,    DBPROP_CATALOGLOCATION,                 DBPROPOPTIONS_OPTIONAL, VT_I4 },
     { localeIDW,   DBPROP_INIT_LCID,                       DBPROPOPTIONS_OPTIONAL, VT_I4 },
     { locationW,   DBPROP_INIT_LOCATION,                   DBPROPOPTIONS_OPTIONAL, VT_BSTR },
     { modeW,       DBPROP_INIT_MODE,                       DBPROPOPTIONS_OPTIONAL, VT_I4 },
     { oledbservW,  DBPROP_INIT_OLEDBSERVICES,              DBPROPOPTIONS_OPTIONAL, VT_I4 },
     { passwordW,   DBPROP_AUTH_PASSWORD,                   DBPROPOPTIONS_OPTIONAL, VT_BSTR },
-    { persiststW,  DBPROP_AUTH_PERSIST_SENSITIVE_AUTHINFO, DBPROPOPTIONS_OPTIONAL, VT_BOOL },
+    { persistW,    DBPROP_AUTH_PERSIST_SENSITIVE_AUTHINFO, DBPROPOPTIONS_OPTIONAL, VT_BOOL },
     { promptW,     DBPROP_INIT_PROMPT,                     DBPROPOPTIONS_OPTIONAL, VT_I2 },
     { useridW,     DBPROP_AUTH_USERID,                     DBPROPOPTIONS_OPTIONAL, VT_BSTR },
+#ifndef _WIN64
     { winhandleW,  DBPROP_INIT_HWND,                       DBPROPOPTIONS_OPTIONAL, VT_I4 },
+#else
+    { winhandleW,  DBPROP_INIT_HWND,                       DBPROPOPTIONS_OPTIONAL, VT_I8 },
+#endif
 };
 
 static HRESULT set_dbpropset(BSTR name, BSTR value, DBPROPSET **propset)
-- 
1.8.1.2