[PATCH 1/2] Test for return value directly without macros
Nikolay Sivov
nsivov at codeweavers.com
Mon Jan 10 17:00:14 CST 2011
---
dlls/ole32/tests/clipboard.c | 6 +++---
dlls/ole32/tests/stg_prop.c | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dlls/ole32/tests/clipboard.c b/dlls/ole32/tests/clipboard.c
index 8a44f50..1029a68 100644
--- a/dlls/ole32/tests/clipboard.c
+++ b/dlls/ole32/tests/clipboard.c
@@ -826,15 +826,15 @@ static void test_set_clipboard(void)
cf_onemore = RegisterClipboardFormatA("one more format");
hr = DataObjectImpl_CreateText("data1", &data1);
- ok(SUCCEEDED(hr), "Failed to create data1 object: 0x%08x\n", hr);
+ ok(hr == S_OK, "Failed to create data1 object: 0x%08x\n", hr);
if(FAILED(hr))
return;
hr = DataObjectImpl_CreateText("data2", &data2);
- ok(SUCCEEDED(hr), "Failed to create data2 object: 0x%08x\n", hr);
+ ok(hr == S_OK, "Failed to create data2 object: 0x%08x\n", hr);
if(FAILED(hr))
return;
hr = DataObjectImpl_CreateComplex(&data_cmpl);
- ok(SUCCEEDED(hr), "Failed to create complex data object: 0x%08x\n", hr);
+ ok(hr == S_OK, "Failed to create complex data object: 0x%08x\n", hr);
if(FAILED(hr))
return;
diff --git a/dlls/ole32/tests/stg_prop.c b/dlls/ole32/tests/stg_prop.c
index 77f0d7c..db4c142 100644
--- a/dlls/ole32/tests/stg_prop.c
+++ b/dlls/ole32/tests/stg_prop.c
@@ -186,7 +186,7 @@ static void testProps(void)
spec.ulKind = PRSPEC_PROPID;
U(spec).propid = PIDSI_THUMBNAIL;
hr = IPropertyStorage_ReadMultiple(propertyStorage, 1, &spec, &var);
- ok(SUCCEEDED(hr), "ReadMultiple failed: 0x%08x\n", hr);
+ ok(hr == S_OK, "ReadMultiple failed: 0x%08x\n", hr);
ok(var.vt == VT_CF, "variant type wrong\n");
ok(U(var).pclipdata->ulClipFmt == CF_ENHMETAFILE,
"clipboard type wrong\n");
--
1.5.6.5
--------------020607010407020701040002--
More information about the wine-patches
mailing list