Rebase against git, as the api-ms-win-core-winrt-error-l1-1-* no longer exist.
Signed-off-by: Alistair Leslie-Hughes leslie_alistair@hotmail.com --- dlls/combase/combase.spec | 2 +- dlls/combase/roapi.c | 10 ++++++++++ include/roerrorapi.h | 10 ++++++++++ 3 files changed, 21 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..6dd714a8275 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("%d\n", flags); + return S_OK; +} + diff --git a/include/roerrorapi.h b/include/roerrorapi.h index 454e1a6c2e9..b7d2322d1ae 100644 --- a/include/roerrorapi.h +++ b/include/roerrorapi.h @@ -23,8 +23,18 @@ #include <restrictederrorinfo.h> #include <rpc.h>
+typedef enum +{ + None, + SuppressExceptions, + ForceExceptions, + UseSetErrorInfo, + SuppressSetErrorInfo +} RoErrorReportingFlags; + 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 */
On Fri, Feb 25, 2022 at 07:19:46PM +1100, Alistair Leslie-Hughes wrote:
diff --git a/dlls/combase/roapi.c b/dlls/combase/roapi.c index 0a17f02b776..6dd714a8275 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("%d\n", flags);
- return S_OK;
+}
Note, you're adding a blank line at EOF here.
diff --git a/include/roerrorapi.h b/include/roerrorapi.h index 454e1a6c2e9..b7d2322d1ae 100644 --- a/include/roerrorapi.h +++ b/include/roerrorapi.h @@ -23,8 +23,18 @@ #include <restrictederrorinfo.h> #include <rpc.h>
+typedef enum +{
- None,
- SuppressExceptions,
- ForceExceptions,
- UseSetErrorInfo,
- SuppressSetErrorInfo
+} RoErrorReportingFlags;
This isn't what I have in my SDK.
I have the RO_ERROR_REPORTING_FLAGS enum. The RoErrorReportingFlags typedef in enclosed in namespaces - I'd leave that out for now. Also note the values here are incorrect.
Huw.
On Fri, Feb 25, 2022 at 07:19:46PM +1100, Alistair Leslie-Hughes wrote:
diff --git a/dlls/combase/roapi.c b/dlls/combase/roapi.c index 0a17f02b776..6dd714a8275 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("%d\n", flags);
- return S_OK;
+}
Oh, and since they're flags, let's print them as %08x .
Huw.