Merge pull request #114 from boingoing/api-prototype-chakracore-8.x

Add proper wrapping for Jsrt API calls to avoid asserts due to missing exception handling

Author: boingoing

deps/chakrashim/core/lib/Jsrt/Jsrt.cpp

@@ -3368,29 +3368,38 @@ CHAKRA_API JsCreateWeakReference(
     _In_ JsValueRef strongRef,
     _Out_ JsWeakRef* weakRef)
 {
-    VALIDATE_JSREF(strongRef);
+    return GlobalAPIWrapper_NoRecord([&]() -> JsErrorCode {
+        VALIDATE_JSREF(strongRef);
 
-    ThreadContext* threadContext = ThreadContext::GetContextForCurrentThread();
-    if (threadContext == nullptr)
-    {
-        return JsErrorNoCurrentContext;
-    }
+        ThreadContext* threadContext = ThreadContext::GetContextForCurrentThread();
+        if (threadContext == nullptr)
+        {
+            return JsErrorNoCurrentContext;
+        }
 
-    Recycler* recycler = threadContext->GetRecycler();
-    Memory::RecyclerWeakReference<char>* recyclerWeakReference = recycler->CreateWeakReferenceHandle<char>(reinterpret_cast<char*>(strongRef));
-    *weakRef = reinterpret_cast<JsWeakRef>(recyclerWeakReference);
-    return JsNoError;
+        PARAM_NOT_NULL(weakRef);
+        *weakRef = nullptr;
+
+        Recycler* recycler = threadContext->GetRecycler();
+        Memory::RecyclerWeakReference<char>* recyclerWeakReference = recycler->CreateWeakReferenceHandle<char>(reinterpret_cast<char*>(strongRef));
+        *weakRef = reinterpret_cast<JsWeakRef>(recyclerWeakReference);
+        return JsNoError;
+    });
 }
 
 CHAKRA_API JsGetWeakReferenceValue(
     _In_ JsWeakRef weakRef,
     _Out_ JsValueRef* value)
 {
-    VALIDATE_JSREF(weakRef);
+    return GlobalAPIWrapper_NoRecord([&]() -> JsErrorCode {
+        VALIDATE_JSREF(weakRef);
+        PARAM_NOT_NULL(value);
+        *value = nullptr;
 
-    Memory::RecyclerWeakReference<char>* recyclerWeakReference = reinterpret_cast<Memory::RecyclerWeakReference<char>*>(weakRef);
-    *value = reinterpret_cast<JsValueRef>(recyclerWeakReference->Get());
-    return JsNoError;
+        Memory::RecyclerWeakReference<char>* recyclerWeakReference = reinterpret_cast<Memory::RecyclerWeakReference<char>*>(weakRef);
+        *value = reinterpret_cast<JsValueRef>(recyclerWeakReference->Get());
+        return JsNoError;
+    });
 }
 
 /////////////////////