From: Vibhav Pant vibhavp@gmail.com
--- dlls/vccorlib140/except.c | 118 ++++++++++++++++++++++-------- dlls/vccorlib140/private.h | 6 +- dlls/vccorlib140/tests/vccorlib.c | 11 +-- 3 files changed, 94 insertions(+), 41 deletions(-)
diff --git a/dlls/vccorlib140/except.c b/dlls/vccorlib140/except.c index e57b37bad32..d6864f35bb1 100644 --- a/dlls/vccorlib140/except.c +++ b/dlls/vccorlib140/except.c @@ -26,12 +26,15 @@ #define WIDL_using_Windows_Foundation #include "windows.foundation.h" #include "wine/debug.h" +#include "wine/exception.h"
#include "cxx.h" #include "private.h"
WINE_DEFAULT_DEBUG_CHANNEL(vccorlib);
+extern void WINAPI DECLSPEC_NORETURN _CxxThrowException(void *, const cxx_exception_type *); + #ifdef _WIN64 #define EXCEPTION_REF_NAME(name) ".PE$AAV" #name "Exception@Platform@@" #else @@ -77,23 +80,6 @@ struct Exception IUnknown *marshal; };
-void *__cdecl CreateExceptionWithMessage(HRESULT hr, HSTRING msg) -{ - FIXME("(%#lx, %s): stub!\n", hr, debugstr_hstring(msg)); - return NULL; -} - -void *__cdecl CreateException(HRESULT hr) -{ - FIXME("(%#lx): stub!\n", hr); - return NULL; -} - -void WINAPI __abi_WinRTraiseCOMException(HRESULT hr) -{ - FIXME("(%#lx): stub!\n", hr); -} - #define WINRT_EXCEPTIONS \ WINRT_EXCEPTION(AccessDenied, E_ACCESSDENIED) \ WINRT_EXCEPTION(ChangedState, E_CHANGED_STATE) \ @@ -160,6 +146,17 @@ static ULONG WINAPI Exception_AddRef(IInspectable *iface) return InterlockedIncrement(&impl->control_block->ref_strong); }
+static void exception_free(struct Exception *excp) +{ + SysFreeString(excp->inner.description); + SysFreeString(excp->inner.restricted_desc); + if ((ULONG_PTR)excp->marshal != UINTPTR_MAX) + IUnknown_Release((IUnknown *)excp->marshal); + /* Because Exception objects are never allocated inline, we don't need to use ReleaseTarget. */ + IWeakReference_Release(&excp->control_block->IWeakReference_iface); + FreeException(excp); +} + static ULONG WINAPI Exception_Release(IInspectable *iface) { struct Exception *impl = impl_Exception_from_IInspectable(iface); @@ -168,15 +165,7 @@ static ULONG WINAPI Exception_Release(IInspectable *iface) TRACE("(%p)\n", iface);
if (!ref) - { - SysFreeString(impl->inner.description); - SysFreeString(impl->inner.restricted_desc); - if ((ULONG_PTR)impl->marshal != UINTPTR_MAX) - IUnknown_Release((IUnknown *)impl->marshal); - /* Because Exception objects are never allocated inline, we don't need to use ReleaseTarget. */ - IWeakReference_Release(&impl->control_block->IWeakReference_iface); - FreeException(impl); - } + exception_free(impl); return ref; }
@@ -273,6 +262,8 @@ struct Exception *__cdecl Exception_ctor(struct Exception *this, HRESULT hr) this->IClosable_iface.lpVtbl = &Exception_Closable_vtable.vtable; this->IEquatable_iface = this->IPrintable_iface = NULL;
+ /* Note: All exception constructors should only throw exceptions *after* all fields have been initialized. + * This is because the cleanup code in CreateException(WithMessage) reuses free_exception. */ memset(&this->inner, 0, sizeof(this->inner)); base->exception_inner = &this->inner; this->inner.exception_type = &Exception_ref_exception_type; @@ -407,15 +398,80 @@ struct Exception *__cdecl COMException_hstring_ctor(struct Exception *this, HRES this->IClosable_iface.lpVtbl = &name##Exception_Closable_vtable.vtable; \ this->inner.exception_type = &name##Exception_ref_exception_type; \ return this; \ - } \ - \ - void WINAPI __abi_WinRTraise##name##Exception(void) \ - { \ - FIXME("(): stub!\n"); \ } WINRT_EXCEPTIONS #undef WINRT_EXCEPTION
+/* This is only executed once AllocateExceptionWithWeakRef succeeds, we can assume excp and excp->control_block are + * valid. Additionally, as excp->inner has been initialized by Exception_ctor, we can simply call exception_free. */ +static void CALLBACK create_exception_cleanup(BOOL normal, void *excp) +{ + exception_free(excp); +} + +struct Exception *__cdecl CreateExceptionWithMessage(HRESULT code, HSTRING msg) +{ + struct Exception *ret; + + TRACE("(%#lx, %s)\n", code, debugstr_hstring(msg)); + + ret = AllocateExceptionWithWeakRef(offsetof(struct Exception, control_block), sizeof(*ret)); + +#define WINRT_EXCEPTION(name, h) \ + case (h): \ + name##Exception_hstring_ctor(ret, msg); \ + break; + __TRY + { + switch (code) + { + WINRT_EXCEPTIONS; + default: + COMException_hstring_ctor(ret, code, msg); + break; + } + } + __FINALLY_CTX(create_exception_cleanup, ret) +#undef WINRT_EXCEPTION + return ret; +} + +struct Exception *__cdecl CreateException(HRESULT hr) +{ + TRACE("(%#lx)\n", hr); + return CreateExceptionWithMessage(hr, NULL); +} + +static void DECLSPEC_NORETURN throw_exception(struct Exception *excp, const cxx_exception_type *type) + { + /* Thrown exceptions have a refcount of 2. */ + IInspectable_AddRef(&excp->IInspectable_iface); + _CxxThrowException(&excp, type); +} + +#define WINRT_EXCEPTION(name, hr) \ + void WINAPI DECLSPEC_NORETURN __abi_WinRTraise##name##Exception(void) \ + { \ + FIXME("(): semi-stub!\n"); \ + throw_exception(CreateException(hr), &name##Exception_ref_exception_type); \ + } +WINRT_EXCEPTIONS +#undef WINRT_EXCEPTION + +void WINAPI DECLSPEC_NORETURN __abi_WinRTraiseCOMException(HRESULT hr) +{ + FIXME("(%#lx): semi-stub!\n", hr); + + switch (hr) + { +#define WINRT_EXCEPTION(name, code) case (code): __abi_WinRTraise##name##Exception(); + WINRT_EXCEPTIONS; +#undef WINRT_EXCEPTION + default: + throw_exception(CreateException(hr), &COMException_ref_exception_type); + } +} + HSTRING __cdecl Exception_get_Message(struct Exception *this) { HSTRING msg = NULL; diff --git a/dlls/vccorlib140/private.h b/dlls/vccorlib140/private.h index 18410955f05..f5cb3fc69fb 100644 --- a/dlls/vccorlib140/private.h +++ b/dlls/vccorlib140/private.h @@ -41,11 +41,13 @@ struct control_block #endif };
+void *__cdecl AllocateExceptionWithWeakRef(ptrdiff_t, size_t); void __cdecl FreeException(void *);
void init_exception(void *); -void WINAPI __abi_WinRTraiseInvalidArgumentException(void); -void WINAPI __abi_WinRTraiseOutOfMemoryException(void); +void WINAPI DECLSPEC_NORETURN __abi_WinRTraiseCOMException(HRESULT); +void WINAPI DECLSPEC_NORETURN __abi_WinRTraiseInvalidArgumentException(void); +void WINAPI DECLSPEC_NORETURN __abi_WinRTraiseOutOfMemoryException(void);
#define COM_VTABLE_RTTI_START(iface, type) \ static const struct \ diff --git a/dlls/vccorlib140/tests/vccorlib.c b/dlls/vccorlib140/tests/vccorlib.c index 826a55a76e8..c4f669d8190 100644 --- a/dlls/vccorlib140/tests/vccorlib.c +++ b/dlls/vccorlib140/tests/vccorlib.c @@ -1373,17 +1373,12 @@ static void test_exceptions(void)
cur_test = &test_cases[i]; obj = pCreateException(cur_test->hr); - todo_wine ok(obj != NULL, "got obj %p\n", obj); - if (!obj) - { - winetest_pop_context(); - continue; - } + ok(obj != NULL, "got obj %p\n", obj);
inspectable = (IInspectable *)obj; /* Verify that the IMarshal field is lazily-initialized. */ ok((ULONG_PTR)obj->marshal == UINTPTR_MAX, "got marshal %p\n", obj->marshal); - todo_wine check_interface(inspectable, &IID_IMarshal); + check_interface(inspectable, &IID_IMarshal); ok(obj->marshal != NULL && (ULONG_PTR)obj->marshal != UINTPTR_MAX, "got marshal %p\n", obj->marshal);
test_interface_layout(obj, &IID_IUnknown, &obj->IInspectable_iface); @@ -1514,7 +1509,7 @@ static void test_exceptions(void)
cxx_info = (cxx_type_info *)(base + type_info_table->info[j]); if (j == type_info_table->count - 1) - ok(cxx_info->flags == CLASS_IS_SIMPLE_TYPE, "got flags %u\n", cxx_info->flags); + todo_wine ok(cxx_info->flags == CLASS_IS_SIMPLE_TYPE, "got flags %u\n", cxx_info->flags); else ok(cxx_info->flags == (CLASS_IS_SIMPLE_TYPE | CLASS_IS_IUNKNOWN), "got flags %u\n", cxx_info->flags); ok(cxx_info->size == sizeof(void *), "got size %u\n", cxx_info->size);