Fix x86 build of ChakraICU

jackhorton · jackhorton · commit a49d3d233acf · 2018-03-12T14:07:39.000-07:00
diff --git a/deps/Chakra.ICU/Chakra.ICU.Build.props b/deps/Chakra.ICU/Chakra.ICU.Build.props
@@ -5,8 +5,13 @@
       <!-- ICU warning output is exceptionally noisy -->
       <WarningLevel>TurnOffAllWarnings</WarningLevel>
       <TreatWarningAsError>false</TreatWarningAsError>
+
+      <!-- ICU uses RTTI internally, while the rest of ChakraCore does not -->
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
 
+      <!-- Common.Build.props sets the calling convention to stdcall for x86 and chpe, while ICU just wants the default -->
+      <CallingConvention></CallingConvention>
+
       <PreprocessorDefinitions Condition="'$(ChakraICU)'!='shared'">
         U_STATIC_IMPLEMENTATION=1;
         %(PreprocessorDefinitions)
diff --git a/lib/Runtime/Library/IntlEngineInterfaceExtensionObject.cpp b/lib/Runtime/Library/IntlEngineInterfaceExtensionObject.cpp
@@ -800,8 +800,8 @@ namespace Js
     }
 
 #ifdef INTL_ICU
-    typedef const char * (*GetAvailableLocaleFunc)(int);
-    typedef int (*CountAvailableLocaleFunc)(void);
+    typedef const char * (__cdecl *GetAvailableLocaleFunc)(int);
+    typedef int (__cdecl *CountAvailableLocaleFunc)(void);
     static bool findLocale(JavascriptString *langtag, CountAvailableLocaleFunc countAvailable, GetAvailableLocaleFunc getAvailable)
     {
         char localeID[ULOC_FULLNAME_CAPACITY] = { 0 };
diff --git a/lib/Runtime/PlatformAgnostic/Platform/Common/UnicodeText.ICU.cpp b/lib/Runtime/PlatformAgnostic/Platform/Common/UnicodeText.ICU.cpp
@@ -61,12 +61,12 @@ namespace PlatformAgnostic
         // Otherwise, we treat the char before as the invalid one and return index - 1
         // This function has defined behavior only for null-terminated strings.
         // If the string is not null terminated, the behavior is undefined (likely hang)
-        static bool IsUtf16StringValid(const UChar* str, size_t length, int32* invalidIndex)
+        static bool IsUtf16StringValid(const UChar* str, size_t length, size_t* invalidIndex)
         {
             Assert(invalidIndex != nullptr);
-            *invalidIndex = -1;
+            *invalidIndex = static_cast<size_t>(-1);
 
-            int32 i = 0;
+            size_t i = 0;
             for (;;)
             {
                 // Iterate through the UTF16-LE string
@@ -172,11 +172,11 @@ namespace PlatformAgnostic
             // is a malformed utf16 string. Maintain the same behavior here.
             // Note that Windows returns this failure only if the dest buffer
             // is passed in, not in the estimation case
-            int32 invalidIndex = 0;
+            size_t invalidIndex = 0;
             if (destString != nullptr && !IsUtf16StringValid((const UChar*) sourceString, sourceLength, &invalidIndex))
             {
                 *pErrorOut = InvalidUnicodeText;
-                return -1 * invalidIndex; // mimicking the behavior of Win32 NormalizeString
+                return -1 * static_cast<int32>(invalidIndex); // mimicking the behavior of Win32 NormalizeString
             }
 
             const UNormalizer2 *normalizer = StaticUNormalizerFactory(normalizationForm);
@@ -203,7 +203,7 @@ namespace PlatformAgnostic
 
             // On Windows, IsNormalizedString returns failure if the string
             // is a malformed utf16 string. Maintain the same behavior here.
-            int32 invalidIndex = 0;
+            size_t invalidIndex = 0;
             if (!IsUtf16StringValid((const UChar*) testString, testStringLength, &invalidIndex))
             {
                 return false;

Original file line number	Diff line number	Diff line change
`@@ -800,8 +800,8 @@ namespace Js`
`800`	`800`	`}`
`801`	`801`
`802`	`802`	`#ifdef INTL_ICU`
`803`		`- typedef const char * (*GetAvailableLocaleFunc)(int);`
`804`		`- typedef int (*CountAvailableLocaleFunc)(void);`
	`803`	`+ typedef const char * (__cdecl *GetAvailableLocaleFunc)(int);`
	`804`	`+ typedef int (__cdecl *CountAvailableLocaleFunc)(void);`
`805`	`805`	`static bool findLocale(JavascriptString *langtag, CountAvailableLocaleFunc countAvailable, GetAvailableLocaleFunc getAvailable)`
`806`	`806`	`{`
`807`	`807`	`char localeID[ULOC_FULLNAME_CAPACITY] = { 0 };`