Signed-off-by: Alistair Leslie-Hughes leslie_alistair@hotmail.com --- dlls/combase/combase.spec | 2 +- dlls/combase/roapi.c | 10 ++++++++++ include/roerrorapi.h | 1 + 3 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index c2fafacdea3..b3f4d25b42c 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -312,7 +312,7 @@ @ stub RoReportUnhandledError @ stub RoResolveRestrictedErrorInfoReference @ stub RoRevokeActivationFactories -@ stub RoSetErrorReportingFlags +@ stdcall RoSetErrorReportingFlags(long) @ stub RoTransformError @ stub RoTransformErrorW @ stdcall RoUninitialize() diff --git a/dlls/combase/roapi.c b/dlls/combase/roapi.c index 0a17f02b776..d764137e512 100644 --- a/dlls/combase/roapi.c +++ b/dlls/combase/roapi.c @@ -316,3 +316,13 @@ HRESULT WINAPI DllGetActivationFactory(HSTRING classid, IActivationFactory **fac
return REGDB_E_CLASSNOTREG; } + +/*********************************************************************** + * RoSetErrorReportingFlags (combase.@) + */ +HRESULT WINAPI RoSetErrorReportingFlags(UINT32 flags) +{ + FIXME("%x\n", flags); + return S_OK; +} + diff --git a/include/roerrorapi.h b/include/roerrorapi.h index 454e1a6c2e9..de23537fd9b 100644 --- a/include/roerrorapi.h +++ b/include/roerrorapi.h @@ -26,5 +26,6 @@ HRESULT WINAPI GetRestrictedErrorInfo(IRestrictedErrorInfo **info); BOOL WINAPI RoOriginateError(HRESULT error, HSTRING message); BOOL WINAPI RoOriginateLanguageException(HRESULT error, HSTRING message, IUnknown *language_exception); +HRESULT WINAPI RoSetErrorReportingFlags(UINT32 flags);
#endif /* _ROERROR_H */
Hi Alistair,
Shouldn't this include the flags? I added _RO_ERROR_REPORTING_FLAGS for copyright reasons.
typedef enum _RO_ERROR_REPORTING_FLAGS { RO_ERROR_REPORTING_NONE = 0x00000000, RO_ERROR_REPORTING_SUPPRESSEXCEPTIONS = 0x00000001, RO_ERROR_REPORTING_FORCEEXCEPTIONS = 0x00000002, RO_ERROR_REPORTING_USESETERRORINFO = 0x00000004, RO_ERROR_REPORTING_SUPPRESSSETERRORINFO = 0x00000008, } RO_ERROR_REPORTING_FLAGS;
cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(RO_ERROR_REPORTING_FLAGS);")
The semicolon at the end of the above line might not be needed.
In the roerrorapi.h file there are 2 (+1 duplicate) enums for the error flags, one of which is enclosed in namespaces. I think Huw meant you should add the enum preceding the namespace. -- Kind regards, Mohamad
Hi Mohamad,
The ones I had where incorrect, so where removed. Nothing is going to use the flags in the short term, so there is no need to have them right away.
If you want to submit a patch for these flags, feel free as I only need the stub.
Regards Alistair
On 1/3/22 11:34, Mohamad Al-Jaf wrote:
Hi Alistair,
Shouldn't this include the flags? I added _RO_ERROR_REPORTING_FLAGS for copyright reasons.
typedef enum _RO_ERROR_REPORTING_FLAGS { RO_ERROR_REPORTING_NONE = 0x00000000, RO_ERROR_REPORTING_SUPPRESSEXCEPTIONS = 0x00000001, RO_ERROR_REPORTING_FORCEEXCEPTIONS = 0x00000002, RO_ERROR_REPORTING_USESETERRORINFO = 0x00000004, RO_ERROR_REPORTING_SUPPRESSSETERRORINFO = 0x00000008, } RO_ERROR_REPORTING_FLAGS;
cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(RO_ERROR_REPORTING_FLAGS);")
The semicolon at the end of the above line might not be needed.
In the roerrorapi.h file there are 2 (+1 duplicate) enums for the error flags, one of which is enclosed in namespaces. I think Huw meant you should add the enum preceding the namespace. -- Kind regards, Mohamad
-
Alistair Leslie-Hughes -
Mohamad Al-Jaf