Module: wine Branch: stable Commit: 8f9b96896cd03c98c80d1fd2d74e9fbf2bb8220a URL: https://gitlab.winehq.org/wine/wine/-/commit/8f9b96896cd03c98c80d1fd2d74e9fb...
Author: Matteo Bruni mbruni@codeweavers.com Date: Wed Mar 2 14:05:32 2022 +0100
combase: Add RoSetErrorReportingFlags() stub.
Signed-off-by: Matteo Bruni mbruni@codeweavers.com Signed-off-by: Huw Davies huw@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org (cherry picked from commit 430583893e52a46eabca5056da3b73455501369a) Signed-off-by: Michael Stefaniuc mstefani@winehq.org
---
.../api-ms-win-core-winrt-error-l1-1-0.spec | 2 +- .../api-ms-win-core-winrt-error-l1-1-1.spec | 2 +- dlls/combase/combase.spec | 2 +- dlls/combase/roapi.c | 9 +++++++++ include/roerrorapi.h | 10 ++++++++++ 5 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/dlls/api-ms-win-core-winrt-error-l1-1-0/api-ms-win-core-winrt-error-l1-1-0.spec b/dlls/api-ms-win-core-winrt-error-l1-1-0/api-ms-win-core-winrt-error-l1-1-0.spec index cf410136631..6505d8b86c4 100644 --- a/dlls/api-ms-win-core-winrt-error-l1-1-0/api-ms-win-core-winrt-error-l1-1-0.spec +++ b/dlls/api-ms-win-core-winrt-error-l1-1-0/api-ms-win-core-winrt-error-l1-1-0.spec @@ -5,7 +5,7 @@ @ stdcall RoOriginateError(long ptr) combase.RoOriginateError @ stub RoOriginateErrorW @ stub RoResolveRestrictedErrorInfoReference -@ stub RoSetErrorReportingFlags +@ stdcall RoSetErrorReportingFlags(long) combase.RoSetErrorReportingFlags @ stub RoTransformError @ stub RoTransformErrorW @ stub SetRestrictedErrorInfo diff --git a/dlls/api-ms-win-core-winrt-error-l1-1-1/api-ms-win-core-winrt-error-l1-1-1.spec b/dlls/api-ms-win-core-winrt-error-l1-1-1/api-ms-win-core-winrt-error-l1-1-1.spec index d969540e94d..856a580db70 100644 --- a/dlls/api-ms-win-core-winrt-error-l1-1-1/api-ms-win-core-winrt-error-l1-1-1.spec +++ b/dlls/api-ms-win-core-winrt-error-l1-1-1/api-ms-win-core-winrt-error-l1-1-1.spec @@ -13,7 +13,7 @@ @ stub RoReportFailedDelegate @ stub RoReportUnhandledError @ stub RoResolveRestrictedErrorInfoReference -@ stub RoSetErrorReportingFlags +@ stdcall RoSetErrorReportingFlags(long) combase.RoSetErrorReportingFlags @ stub RoTransformError @ stub RoTransformErrorW @ stub SetRestrictedErrorInfo 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 7d871fb885c..58c2cd59682 100644 --- a/dlls/combase/roapi.c +++ b/dlls/combase/roapi.c @@ -299,6 +299,15 @@ BOOL WINAPI RoOriginateError(HRESULT error, HSTRING message) return FALSE; }
+/*********************************************************************** + * RoSetErrorReportingFlags (combase.@) + */ +HRESULT WINAPI RoSetErrorReportingFlags(UINT32 flags) +{ + FIXME("(%08x): stub\n", flags); + return S_OK; +} + /*********************************************************************** * CleanupTlsOleState (combase.@) */ diff --git a/include/roerrorapi.h b/include/roerrorapi.h index 454e1a6c2e9..741347455b1 100644 --- a/include/roerrorapi.h +++ b/include/roerrorapi.h @@ -23,8 +23,18 @@ #include <restrictederrorinfo.h> #include <rpc.h>
+typedef enum +{ + RO_ERROR_REPORTING_NONE = 0x0, + RO_ERROR_REPORTING_SUPPRESSEXCEPTIONS = 0x1, + RO_ERROR_REPORTING_FORCEEXCEPTIONS = 0x2, + RO_ERROR_REPORTING_USESETERRORINFO = 0x4, + RO_ERROR_REPORTING_SUPPRESSSETERRORINFO = 0x8, +} RO_ERROR_REPORTING_FLAGS; + 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 */