Commit 355f6b24 authored by André Hentschel's avatar André Hentschel Committed by Alexandre Julliard

ole32/tests: Don't crash if EnumFormatEtc failed.

parent 53cc1da1
...@@ -589,6 +589,11 @@ static void test_enum_fmtetc(IDataObject *src) ...@@ -589,6 +589,11 @@ static void test_enum_fmtetc(IDataObject *src)
hr = IDataObject_EnumFormatEtc(data, DATADIR_GET, &enum_fmt); hr = IDataObject_EnumFormatEtc(data, DATADIR_GET, &enum_fmt);
ok(hr == S_OK, "got %08x\n", hr); ok(hr == S_OK, "got %08x\n", hr);
ok(DataObjectImpl_EnumFormatEtc_calls == 0, "EnumFormatEtc was called\n"); ok(DataObjectImpl_EnumFormatEtc_calls == 0, "EnumFormatEtc was called\n");
if (FAILED(hr))
{
skip("EnumFormatEtc failed, skipping tests.\n");
return;
}
if(src) IDataObject_EnumFormatEtc(src, DATADIR_GET, &src_enum); if(src) IDataObject_EnumFormatEtc(src, DATADIR_GET, &src_enum);
...@@ -1422,6 +1427,11 @@ static void test_nonole_clipboard(void) ...@@ -1422,6 +1427,11 @@ static void test_nonole_clipboard(void)
ok(hr == S_OK, "got %08x\n", hr); ok(hr == S_OK, "got %08x\n", hr);
hr = IDataObject_EnumFormatEtc(get, DATADIR_GET, &enum_fmt); hr = IDataObject_EnumFormatEtc(get, DATADIR_GET, &enum_fmt);
ok(hr == S_OK, "got %08x\n", hr); ok(hr == S_OK, "got %08x\n", hr);
if (FAILED(hr))
{
skip("EnumFormatEtc failed, skipping tests.\n");
return;
}
hr = IEnumFORMATETC_Next(enum_fmt, 1, &fmt, NULL); hr = IEnumFORMATETC_Next(enum_fmt, 1, &fmt, NULL);
ok(hr == S_OK, "got %08x\n", hr); ok(hr == S_OK, "got %08x\n", hr);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment