oledb32: Add more database tests (try 2)
Alistair Leslie-Hughes
leslie_alistair at hotmail.com
Wed Jun 19 04:53:13 CDT 2013
Hi,
Fixed for x64
Changelog:
oledb32: Add more database tests
Best Regards
Alistair Leslie-Hughes
-------------- next part --------------
>From 4e65f3d103e0b4d772388479dd1ee52c926fbf9e Mon Sep 17 00:00:00 2001
From: Alistair Leslie-Hughes <leslie_alistair at hotmail.com>
Date: Wed, 19 Jun 2013 08:20:38 +1000
Subject: [PATCH] Add oledb database tests
To: wine-patches <wine-patches at winehq.org>
---
dlls/oledb32/tests/database.c | 66 ++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 65 insertions(+), 1 deletion(-)
diff --git a/dlls/oledb32/tests/database.c b/dlls/oledb32/tests/database.c
index 216adc6..5eaaafe 100644
--- a/dlls/oledb32/tests/database.c
+++ b/dlls/oledb32/tests/database.c
@@ -28,9 +28,14 @@
#include "msdadc.h"
#include "msdasc.h"
#include "shlobj.h"
+#include "initguid.h"
#include "wine/test.h"
+DEFINE_GUID(CSLID_MSDAER, 0xc8b522cf,0x5cf3,0x11ce,0xad,0xe5,0x00,0xaa,0x00,0x44,0x77,0x3d);
+
+static WCHAR initstring_default[] = {'D','a','t','a',' ','S','o','u','r','c','e','=','d','u','m','m','y',';',0};
+
static void test_GetDataSource(WCHAR *initstring)
{
IDataInitialize *datainit = NULL;
@@ -96,7 +101,6 @@ static void test_database(void)
'J','e','t','.','O','L','E','D','B','.','4','.','0',';',
'D','a','t','a',' ','S','o','u','r','c','e','=','d','u','m','m','y',';',
'P','e','r','s','i','s','t',' ','S','e','c','u','r','i','t','y',' ','I','n','f','o','=','F','a','l','s','e',';',0};
- static WCHAR initstring_default[] = {'D','a','t','a',' ','S','o','u','r','c','e','=','d','u','m','m','y',';',0};
static WCHAR initstring_lower[] = {'d','a','t','a',' ','s','o','u','r','c','e','=','d','u','m','m','y',';',0};
IDataInitialize *datainit = NULL;
HRESULT hr;
@@ -115,11 +119,71 @@ static void test_database(void)
test_GetDataSource(initstring_lower);
}
+static void test_errorinfo(void)
+{
+ HRESULT hr;
+ IUnknown *unk = NULL;
+
+ hr = CoCreateInstance(&CSLID_MSDAER, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown,(void**)&unk);
+ todo_wine ok(hr == S_OK, "got %08x\n", hr);
+ if(hr == S_OK)
+ {
+ IErrorInfo *errorinfo;
+
+ hr = IUnknown_QueryInterface(unk, &IID_IErrorInfo, (void**)&errorinfo);
+ ok(hr == S_OK, "got %08x\n", hr);
+ if(hr == S_OK)
+ {
+ IErrorInfo_Release(errorinfo);
+ }
+
+ IUnknown_Release(unk);
+ }
+}
+
+static void test_initializationstring(void)
+{
+ static WCHAR initstring_msdasql[] = {'P','r','o','v','i','d','e','r','=','M','S','D','A','S','Q','L','.','1',';',
+ 'D','a','t','a',' ','S','o','u','r','c','e','=','d','u','m','m','y', 0};
+ static WCHAR initstring_sqloledb[] = {'P','r','o','v','i','d','e','r','=','S','Q','L','O','L','E','D','B','.','1',';',
+ 'D','a','t','a',' ','S','o','u','r','c','e','=','d','u','m','m','y', 0};
+ IDataInitialize *datainit = NULL;
+ IDBInitialize *dbinit = NULL;
+ HRESULT hr;
+ WCHAR *initstring = NULL;
+
+ hr = CoCreateInstance(&CLSID_MSDAINITIALIZE, NULL, CLSCTX_INPROC_SERVER, &IID_IDataInitialize,(void**)&datainit);
+ ok(hr == S_OK, "got %08x\n", hr);
+ if(SUCCEEDED(hr))
+ {
+ hr = IDataInitialize_GetDataSource(datainit, NULL, CLSCTX_INPROC_SERVER, initstring_default,
+ &IID_IDBInitialize, (IUnknown**)&dbinit);
+ if(SUCCEEDED(hr))
+ {
+ hr = IDataInitialize_GetInitializationString(datainit, (IUnknown*)dbinit, 0, &initstring);
+ ok(hr == S_OK, "got %08x\n", hr);
+ if(hr == S_OK)
+ {
+ trace("Init String: %s\n", wine_dbgstr_w(initstring));
+ todo_wine ok(!lstrcmpW(initstring_msdasql, initstring) ||
+ !lstrcmpW(initstring_sqloledb, initstring), "got %s\n", wine_dbgstr_w(initstring));
+ CoTaskMemFree(initstring);
+ }
+
+ IDBInitialize_Release(dbinit);
+ }
+
+ IDataInitialize_Release(datainit);
+ }
+}
+
START_TEST(database)
{
OleInitialize(NULL);
test_database();
+ test_errorinfo();
+ test_initializationstring();
OleUninitialize();
}
--
1.8.1.2
More information about the wine-patches
mailing list