[PATCH v19 10/11] vccorlib140: Throw exceptions on error paths.

[Vibhav Pant]

From: Vibhav Pant

---
 dlls/vccorlib140/except.c   |  5 ++---
 dlls/vccorlib140/vccorlib.c | 22 ++++++----------------
 2 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/dlls/vccorlib140/except.c b/dlls/vccorlib140/except.c
index a8eac88a903..9d22876e661 100644
--- a/dlls/vccorlib140/except.c
+++ b/dlls/vccorlib140/except.c
@@ -442,9 +442,8 @@ struct Exception *__cdecl CreateException(HRESULT hr)
 }

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);
+{
+    /* TODO: figure out what native does with refcount */
     _CxxThrowException(&excp, type);
 }

diff --git a/dlls/vccorlib140/vccorlib.c b/dlls/vccorlib140/vccorlib.c
index 49b730a2914..ca3a8ee42bc 100644
--- a/dlls/vccorlib140/vccorlib.c
+++ b/dlls/vccorlib140/vccorlib.c
@@ -92,9 +92,8 @@ void *__cdecl Allocate(size_t size)
     TRACE("(%Iu)\n", size);

addr = malloc(size);
-    /* TODO: Throw a COMException on allocation failure. */
     if (!addr)
-        FIXME("allocation failure\n");
+        __abi_WinRTraiseOutOfMemoryException();
     return addr;
 }

@@ -397,8 +396,7 @@ static const char *debugstr_abi_type_descriptor(const struct __abi_type_descript
 void *WINAPI __abi_make_type_id(const struct __abi_type_descriptor *desc)
 {
     /* TODO:
-     * Implement IEquatable and IPrintable.
-     * Throw a COMException if CoCreateFreeThreadedMarshaler fails. */
+     * Implement IEquatable and IPrintable. */
     struct platform_type *obj;
     HRESULT hr;

@@ -412,9 +410,8 @@ void *WINAPI __abi_make_type_id(const struct __abi_type_descriptor *desc)
     hr = CoCreateFreeThreadedMarshaler((IUnknown *)&obj->IInspectable_iface, &obj->marshal);
     if (FAILED(hr))
     {
-        FIXME("CoCreateFreeThreadedMarshaler failed: %#lx\n", hr);
         Free(obj);
-        return NULL;
+        __abi_WinRTraiseCOMException(hr);
     }
     return &obj->IInspectable_iface;
 }
@@ -440,10 +437,9 @@ HSTRING __cdecl platform_type_ToString(struct platform_type *this)

TRACE("(%p)\n", this);

-    /* TODO: Throw a COMException if this fails */
     hr = WindowsCreateString(this->desc->name, this->desc->name ? wcslen(this->desc->name) : 0, &str);
     if (FAILED(hr))
-        FIXME("WindowsCreateString failed: %#lx\n", hr);
+        __abi_WinRTraiseCOMException(hr);
     return str;
 }

@@ -512,10 +508,7 @@ void *WINAPI CreateValue(int typecode, const void *val)
     hr = GetActivationFactoryByPCWSTR(RuntimeClass_Windows_Foundation_PropertyValue, &IID_IPropertyValueStatics,
                                       (void **)&statics);
     if (FAILED(hr))
-    {
-        FIXME("GetActivationFactoryByPCWSTR failed: %#lx\n", hr);
-        return NULL;
-    }
+        __abi_WinRTraiseCOMException(hr);
     switch (typecode)
     {
     case TYPECODE_BOOLEAN:
@@ -580,10 +573,7 @@ void *WINAPI CreateValue(int typecode, const void *val)

IPropertyValueStatics_Release(statics);
     if (FAILED(hr))
-    {
-        FIXME("Failed to create IPropertyValue object: %#lx\n", hr);
-        return NULL;
-    }
+        __abi_WinRTraiseCOMException(hr);
     return obj;
 }