Rob Shearman : oledb32: Fix IDBProperties::GetProperties test on Windows.
Alexandre Julliard
julliard at winehq.org
Thu Nov 12 10:22:09 CST 2009
Module: wine
Branch: master
Commit: b81b24f9dae7639c3f795d49e15ebd622e741849
URL: http://source.winehq.org/git/wine.git/?a=commit;h=b81b24f9dae7639c3f795d49e15ebd622e741849
Author: Rob Shearman <robertshearman at gmail.com>
Date: Thu Nov 12 00:30:26 2009 +0000
oledb32: Fix IDBProperties::GetProperties test on Windows.
---
dlls/oledb32/tests/marshal.c | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/dlls/oledb32/tests/marshal.c b/dlls/oledb32/tests/marshal.c
index 45fc3bc..4ca3aac 100644
--- a/dlls/oledb32/tests/marshal.c
+++ b/dlls/oledb32/tests/marshal.c
@@ -165,7 +165,9 @@ static HRESULT WINAPI Test_DBProperties_GetProperties(
DBPROPSET **prgPropertySets)
{
ok(cPropertyIDSets == 0, "Expected cPropertyIDSets to be 0 instead of %d\n", cPropertyIDSets);
- ok(*pcPropertySets == 1, "Expected *pcPropertySets to be 1 instead of %d\n", *pcPropertySets);
+ todo_wine
+ ok(*pcPropertySets == 0, "Expected *pcPropertySets to be 0 instead of %d\n", *pcPropertySets);
+ *pcPropertySets = 1;
prgPropertySets[0] = CoTaskMemAlloc(sizeof(DBPROPSET));
prgPropertySets[0]->rgProperties = CoTaskMemAlloc(sizeof(DBPROP));
prgPropertySets[0]->rgProperties[0].dwPropertyID = TEST_PROPID;
@@ -241,7 +243,7 @@ static void test_IDBProperties(void)
propset_count = 1;
hr = IDBProperties_GetProperties(pProxy, 0, NULL, &propset_count, &propsets);
- ok_ole_success(hr, "IDBProperties_GetProperties");
+ ok(hr == S_OK, "IDBProperties_GetProperties failed with error 0x%08x", hr);
ok(propset_count == 1, "Expected propset_count of 1 but got %d\n", propset_count);
ok(propsets->rgProperties[0].dwPropertyID == TEST_PROPID, "Expected property ID of 0x%x, but got 0x%x\n", TEST_PROPID, propsets->rgProperties[0].dwPropertyID);
More information about the wine-cvs
mailing list