Fix cross-plat build failures

Author: Thomas Moore (CHAKRA)

bin/ch/ChakraRtInterface.cpp

@@ -160,9 +160,9 @@ bool ChakraRTInterface::LoadChakraDll(ArgInfo* argInfo, HINSTANCE *outLibrary)
     m_jsApiHooks.pfJsrtSerializeParserState = (JsAPIHooks::JsrtSerializeParserState)GetChakraCoreSymbol(library, "JsSerializeParserState");
     m_jsApiHooks.pfJsrtRunScriptWithParserState = (JsAPIHooks::JsrtRunScriptWithParserState)GetChakraCoreSymbol(library, "JsRunScriptWithParserState");
 
-    m_jsApiHooks.pfJsrtQueueBackgroundParse = (JsAPIHooks::JsrtQueueBackgroundParse)GetChakraCoreSymbol(library, "JsQueueBackgroundParse_Experimental");
-    m_jsApiHooks.pfJsrtDiscardBackgroundParse = (JsAPIHooks::JsrtDiscardBackgroundParse)GetChakraCoreSymbol(library, "JsDiscardBackgroundParse_Experimental");
-    m_jsApiHooks.pfJsrtExecuteBackgroundParse = (JsAPIHooks::JsrtExecuteBackgroundParse)GetChakraCoreSymbol(library, "JsExecuteBackgroundParse_Experimental");
+    m_jsApiHooks.pfJsrtQueueBackgroundParse_Experimental = (JsAPIHooks::JsrtQueueBackgroundParse_Experimental)GetChakraCoreSymbol(library, "JsQueueBackgroundParse_Experimental");
+    m_jsApiHooks.pfJsrtDiscardBackgroundParse_Experimental = (JsAPIHooks::JsrtDiscardBackgroundParse_Experimental)GetChakraCoreSymbol(library, "JsDiscardBackgroundParse_Experimental");
+    m_jsApiHooks.pfJsrtExecuteBackgroundParse_Experimental = (JsAPIHooks::JsrtExecuteBackgroundParse_Experimental)GetChakraCoreSymbol(library, "JsExecuteBackgroundParse_Experimental");
 
     m_jsApiHooks.pfJsrtTTDCreateRecordRuntime = (JsAPIHooks::JsrtTTDCreateRecordRuntimePtr)GetChakraCoreSymbol(library, "JsTTDCreateRecordRuntime");
     m_jsApiHooks.pfJsrtTTDCreateReplayRuntime = (JsAPIHooks::JsrtTTDCreateReplayRuntimePtr)GetChakraCoreSymbol(library, "JsTTDCreateReplayRuntime");

bin/ch/ChakraRtInterface.h

@@ -93,9 +93,9 @@ struct JsAPIHooks
     typedef JsErrorCode(WINAPI *JsrtSerializeParserState)(JsValueRef script, JsValueRef *buffer, JsParseScriptAttributes parseAttributes);
     typedef JsErrorCode(WINAPI *JsrtRunScriptWithParserState)(JsValueRef script, JsSourceContext sourceContext, JsValueRef sourceUrl, JsParseScriptAttributes parseAttributes, JsValueRef parserState, JsValueRef *result);
 
-    typedef JsErrorCode(WINAPI *JsrtQueueBackgroundParse)(JsScriptContents* contents, DWORD* dwBgParseCookie);
-    typedef JsErrorCode(WINAPI *JsrtDiscardBackgroundParse)(DWORD dwBgParseCookie, void* buffer, bool* callerOwnsBuffer);
-    typedef JsErrorCode(WINAPI *JsrtExecuteBackgroundParse)(DWORD dwBgParseCookie, JsValueRef script, JsSourceContext sourceContext, WCHAR *url, JsParseScriptAttributes parseAttributes, JsValueRef parserState, JsValueRef *result);
+    typedef JsErrorCode(WINAPI *JsrtQueueBackgroundParse_Experimental)(JsScriptContents* contents, DWORD* dwBgParseCookie);
+    typedef JsErrorCode(WINAPI *JsrtDiscardBackgroundParse_Experimental)(DWORD dwBgParseCookie, void* buffer, bool* callerOwnsBuffer);
+    typedef JsErrorCode(WINAPI *JsrtExecuteBackgroundParse_Experimental)(DWORD dwBgParseCookie, JsValueRef script, JsSourceContext sourceContext, WCHAR *url, JsParseScriptAttributes parseAttributes, JsValueRef parserState, JsValueRef *result);
 
     typedef JsErrorCode(WINAPI *JsrtTTDCreateRecordRuntimePtr)(JsRuntimeAttributes attributes, bool enableDebugging, size_t snapInterval, size_t snapHistoryLength, TTDOpenResourceStreamCallback openResourceStream, JsTTDWriteBytesToStreamCallback writeBytesToStream, JsTTDFlushAndCloseStreamCallback flushAndCloseStream, JsThreadServiceCallback threadService, JsRuntimeHandle *runtime);
     typedef JsErrorCode(WINAPI *JsrtTTDCreateReplayRuntimePtr)(JsRuntimeAttributes attributes, const char* infoUri, size_t infoUriCount, bool enableDebugging, TTDOpenResourceStreamCallback openResourceStream, JsTTDReadBytesFromStreamCallback readBytesFromStream, JsTTDFlushAndCloseStreamCallback flushAndCloseStream, JsThreadServiceCallback threadService, JsRuntimeHandle *runtime);
@@ -199,9 +199,9 @@ struct JsAPIHooks
     JsrtSerializeParserState pfJsrtSerializeParserState;
     JsrtRunScriptWithParserState pfJsrtRunScriptWithParserState;
 
-    JsrtQueueBackgroundParse pfJsrtQueueBackgroundParse;
-    JsrtDiscardBackgroundParse pfJsrtDiscardBackgroundParse;
-    JsrtExecuteBackgroundParse pfJsrtExecuteBackgroundParse;
+    JsrtQueueBackgroundParse_Experimental pfJsrtQueueBackgroundParse_Experimental;
+    JsrtDiscardBackgroundParse_Experimental pfJsrtDiscardBackgroundParse_Experimental;
+    JsrtExecuteBackgroundParse_Experimental pfJsrtExecuteBackgroundParse_Experimental;
 
     JsrtTTDCreateRecordRuntimePtr pfJsrtTTDCreateRecordRuntime;
     JsrtTTDCreateReplayRuntimePtr pfJsrtTTDCreateReplayRuntime;
@@ -439,9 +439,9 @@ class ChakraRTInterface
     static JsErrorCode WINAPI JsSerializeParserState(JsValueRef script, JsValueRef *buffer, JsParseScriptAttributes parseAttributes) { return HOOK_JS_API(SerializeParserState(script, buffer, parseAttributes)); }
     static JsErrorCode WINAPI JsRunScriptWithParserState(JsValueRef script, JsSourceContext sourceContext, JsValueRef sourceUrl, JsParseScriptAttributes parseAttributes, JsValueRef parserState, JsValueRef * result) { return HOOK_JS_API(RunScriptWithParserState(script, sourceContext, sourceUrl, parseAttributes, parserState, result)); }
 
-    static JsErrorCode WINAPI JsQueueBackgroundParse(JsScriptContents* contents, DWORD* dwBgParseCookie) { return HOOK_JS_API(QueueBackgroundParse(contents, dwBgParseCookie));  }
-    static JsErrorCode WINAPI JsDiscardBackgroundParse(DWORD dwBgParseCookie, void* buffer, bool* callerOwnsBuffer) { return HOOK_JS_API(DiscardBackgroundParse(dwBgParseCookie, buffer, callerOwnsBuffer)); }
-    static JsErrorCode WINAPI JsExecuteBackgroundParse(DWORD dwBgParseCookie, JsValueRef script, JsSourceContext sourceContext, WCHAR *url, JsParseScriptAttributes parseAttributes, JsValueRef parserState, JsValueRef *result) { return HOOK_JS_API(ExecuteBackgroundParse(dwBgParseCookie, script, sourceContext, url, parseAttributes, parserState, result)); }
+    static JsErrorCode WINAPI JsQueueBackgroundParse_Experimental(JsScriptContents* contents, DWORD* dwBgParseCookie) { return HOOK_JS_API(QueueBackgroundParse_Experimental)(contents, dwBgParseCookie);  }
+    static JsErrorCode WINAPI JsDiscardBackgroundParse_Experimental(DWORD dwBgParseCookie, void* buffer, bool* callerOwnsBuffer) { return HOOK_JS_API(DiscardBackgroundParse_Experimental(dwBgParseCookie, buffer, callerOwnsBuffer)); }
+    static JsErrorCode WINAPI JsExecuteBackgroundParse_Experimental(DWORD dwBgParseCookie, JsValueRef script, JsSourceContext sourceContext, WCHAR *url, JsParseScriptAttributes parseAttributes, JsValueRef parserState, JsValueRef *result) { return HOOK_JS_API(ExecuteBackgroundParse_Experimental(dwBgParseCookie, script, sourceContext, url, parseAttributes, parserState, result)); }
 };
 
 class AutoRestoreContext

bin/ch/ch.cpp

@@ -787,11 +787,11 @@ HRESULT RunBgParseSync(LPCSTR fileContents, UINT lengthBytes, const char* fileNa
     scriptContents.fullPath = fileNameWide;
 
     DWORD cookie = 0;
-    e = ChakraRTInterface::JsQueueBackgroundParse(&scriptContents, &cookie);
+    e = ChakraRTInterface::JsQueueBackgroundParse_Experimental(&scriptContents, &cookie);
     Assert(e == JsErrorCode::JsNoError);
 
     JsValueRef bgResult = nullptr;
-    e = ChakraRTInterface::JsExecuteBackgroundParse(
+    e = ChakraRTInterface::JsExecuteBackgroundParse_Experimental(
         cookie,
         scriptSource,
         WScriptJsrt::GetNextSourceContext(),

lib/Jsrt/ChakraCommon.h

@@ -638,12 +638,12 @@ typedef unsigned short uint16_t;
 
     typedef struct _JsScriptContents
     {
-        LPVOID container;
+        void * container;
         JsScriptEncodingType encodingType;
         JsScriptContainerType containerType;
-        DWORD_PTR sourceContext;
+        JsSourceContext sourceContext;
         size_t contentLengthInBytes;
-        LPCWSTR fullPath;
+        WCHAR * fullPath;
     } JsScriptContents;
 
     /// <summary>

lib/Jsrt/Jsrt.cpp

@@ -5839,7 +5839,9 @@ CHAKRA_API JsRunScriptWithParserState(
 }
 
 CHAKRA_API
-JsQueueBackgroundParse_Experimental(JsScriptContents* contents, DWORD* dwBgParseCookie)
+JsQueueBackgroundParse_Experimental(
+    _In_ JsScriptContents* contents,
+    _Out_ DWORD* dwBgParseCookie)
 {
     HRESULT hr;
     if (Js::Configuration::Global.flags.BgParse && !CONFIG_FLAG(ForceDiagnosticsMode)
@@ -5862,7 +5864,10 @@ JsQueueBackgroundParse_Experimental(JsScriptContents* contents, DWORD* dwBgParse
 }
 
 CHAKRA_API
-JsDiscardBackgroundParse_Experimental(DWORD dwBgParseCookie, void* buffer, bool* callerOwnsBuffer)
+JsDiscardBackgroundParse_Experimental(
+    _In_ DWORD dwBgParseCookie,
+    _In_ void* buffer,
+    _Out_ bool* callerOwnsBuffer)
 {
     (*callerOwnsBuffer) = BGParseManager::GetBGParseManager()->DiscardParseResults(dwBgParseCookie, buffer);
     return JsNoError;
@@ -5873,11 +5878,10 @@ JsExecuteBackgroundParse_Experimental(
     _In_ DWORD dwBgParseCookie,
     _In_ JsValueRef script,
     _In_ JsSourceContext sourceContext,
-    _In_ WCHAR *url, // remove
+    _In_ WCHAR *url,
     _In_ JsParseScriptAttributes parseAttributes,
     _In_ JsValueRef parserState,
-    _Out_ JsValueRef *result
-)
+    _Out_ JsValueRef *result)
 {
     HRESULT hr = BGParseManager::GetBGParseManager()->GetInputFromCookie(dwBgParseCookie, nullptr, nullptr, &url);
     if (hr == S_OK)