From: Vibhav Pant vibhavp@gmail.com
--- dlls/combase/roapi.c | 13 ++++++++++--- dlls/combase/tests/roapi.c | 9 +++------ 2 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/dlls/combase/roapi.c b/dlls/combase/roapi.c index a88181ada9b..5745099ae4f 100644 --- a/dlls/combase/roapi.c +++ b/dlls/combase/roapi.c @@ -547,12 +547,19 @@ HRESULT WINAPI RoReportUnhandledError(IRestrictedErrorInfo *info) return S_OK; }
+static LONG error_reporting_flags = RO_ERROR_REPORTING_USESETERRORINFO; /*********************************************************************** * RoSetErrorReportingFlags (combase.@) */ HRESULT WINAPI RoSetErrorReportingFlags(UINT32 flags) { - FIXME("(%08x): stub\n", flags); + UINT32 valid_flags = RO_ERROR_REPORTING_SUPPRESSEXCEPTIONS | RO_ERROR_REPORTING_FORCEEXCEPTIONS | + RO_ERROR_REPORTING_USESETERRORINFO | RO_ERROR_REPORTING_SUPPRESSSETERRORINFO; + + TRACE("(%08x)\n", flags); + + if (flags & ~valid_flags) return E_INVALIDARG; + WriteRelease(&error_reporting_flags, flags); return S_OK; }
@@ -561,12 +568,12 @@ HRESULT WINAPI RoSetErrorReportingFlags(UINT32 flags) */ HRESULT WINAPI RoGetErrorReportingFlags(UINT32 *flags) { - FIXME("(%p): stub\n", flags); + TRACE("(%p)\n", flags);
if (!flags) return E_POINTER;
- *flags = RO_ERROR_REPORTING_USESETERRORINFO; + *flags = ReadAcquire(&error_reporting_flags); return S_OK; }
diff --git a/dlls/combase/tests/roapi.c b/dlls/combase/tests/roapi.c index e0eab8f7431..5794096cd13 100644 --- a/dlls/combase/tests/roapi.c +++ b/dlls/combase/tests/roapi.c @@ -657,7 +657,6 @@ static void set_error_reporting_flags_(int line, UINT32 flags) ok_(__FILE__, line)(hr == S_OK, "RoSetErrorReportingFlags failed, hr %#lx.\n", hr); hr = RoGetErrorReportingFlags(&new_flags); ok_(__FILE__, line)(hr == S_OK, "RoGetErrorReportingFlags failed, hr %#lx.\n", hr); - todo_wine_if(flags != RO_ERROR_REPORTING_USESETERRORINFO) ok_(__FILE__, line)(new_flags == flags, "Got unexpected flags %#x != %#x.\n", new_flags, flags); }
@@ -695,7 +694,7 @@ static DWORD CALLBACK test_thread_RoSetErrorReportingFlags(void *param) flags = 0xdeadbeef; hr = RoGetErrorReportingFlags(&flags); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); - todo_wine ok(flags == RO_ERROR_REPORTING_NONE, "Got unexpected flags %#.x\n", flags); + ok(flags == RO_ERROR_REPORTING_NONE, "Got unexpected flags %#.x\n", flags); winetest_pop_context(); }
@@ -714,7 +713,7 @@ static void test_RoSetErrorReportingFlags(void)
/* Pass non-existent flags */ hr = RoSetErrorReportingFlags(RO_ERROR_REPORTING_USESETERRORINFO | 0x80); - todo_wine ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr);
set_error_reporting_flags(RO_ERROR_REPORTING_NONE);
@@ -740,7 +739,7 @@ static void test_RoSetErrorReportingFlags(void) flags = 0xdeadbeef; hr = RoGetErrorReportingFlags(&flags); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); - todo_wine ok(flags == RO_ERROR_REPORTING_NONE, "Got unexpected flags %#x.\n", flags); + ok(flags == RO_ERROR_REPORTING_NONE, "Got unexpected flags %#x.\n", flags);
ret = SetEvent(data.event1); ok(ret, "SetEvent failed, error %lu.\n", GetLastError()); @@ -752,7 +751,6 @@ static void test_RoSetErrorReportingFlags(void) flags = 0xdeadbeef; hr = RoGetErrorReportingFlags(&flags); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); - todo_wine_if(test_flags[i] != RO_ERROR_REPORTING_USESETERRORINFO) ok(flags == test_flags[i], "Got unexpected flags %#x\n", flags);
/* Reset flags to RO_ERROR_REPORTING_NONE */ @@ -765,7 +763,6 @@ static void test_RoSetErrorReportingFlags(void) /* Flags don't change on apartment uninitialization. */ hr = RoGetErrorReportingFlags(&flags); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); - todo_wine ok(flags == RO_ERROR_REPORTING_NONE, "Got unexpected flags %#x.\n", flags); winetest_pop_context(); }