Merge to XFA: Use stdint.h types throughout PDFium.

core/src/fxcrt/fx_extension.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "../../include/fxcrt/fx_ext.h"
 #include "extension.h"
 #if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
 #include <wincrypt.h>
@@ skipping 133 matching lines @@
 extern "C" {
 #endif
 FX_FLOAT FXSYS_tan(FX_FLOAT a)
 {
     return (FX_FLOAT)tan(a);
 }
 FX_FLOAT FXSYS_logb(FX_FLOAT b, FX_FLOAT x)
 {
     return FXSYS_log(x) / FXSYS_log(b);
 }
-FX_FLOAT FXSYS_strtof(FX_LPCSTR pcsStr, FX_INT32 iLength, FX_INT32 *pUsedLen)
+FX_FLOAT FXSYS_strtof(FX_LPCSTR pcsStr, int32_t iLength, int32_t *pUsedLen)
 {
     FXSYS_assert(pcsStr != NULL);
     if (iLength < 0) {
-        iLength = (FX_INT32)FXSYS_strlen(pcsStr);
+        iLength = (int32_t)FXSYS_strlen(pcsStr);
     }
     CFX_WideString ws = CFX_WideString::FromLocal(pcsStr, iLength);
     return FXSYS_wcstof(ws.c_str(), iLength, pUsedLen);
 }
-FX_FLOAT FXSYS_wcstof(FX_LPCWSTR pwsStr, FX_INT32 iLength, FX_INT32 *pUsedLen)
+FX_FLOAT FXSYS_wcstof(FX_LPCWSTR pwsStr, int32_t iLength, int32_t *pUsedLen)
 {
     FXSYS_assert(pwsStr != NULL);
     if (iLength < 0) {
-        iLength = (FX_INT32)FXSYS_wcslen(pwsStr);
+        iLength = (int32_t)FXSYS_wcslen(pwsStr);
     }
     if (iLength == 0) {
         return 0.0f;
     }
-    FX_INT32 iUsedLen = 0;
+    int32_t iUsedLen = 0;
     FX_BOOL bNegtive = FALSE;
     switch (pwsStr[iUsedLen]) {
         case '-':
             bNegtive = TRUE;
         case '+':
             iUsedLen++;
             break;
     }
     FX_FLOAT fValue = 0.0f;
     while (iUsedLen < iLength) {
@@ skipping 24 matching lines @@
 }
 FX_LPWSTR FXSYS_wcsncpy(FX_LPWSTR dstStr, FX_LPCWSTR srcStr, size_t count)
 {
     FXSYS_assert(dstStr != NULL && srcStr != NULL && count > 0);
     for (size_t i = 0; i < count; ++i)
         if ((dstStr[i] = srcStr[i]) == L'\0') {
             break;
         }
     return dstStr;
 }
-FX_INT32 FXSYS_wcsnicmp(FX_LPCWSTR s1, FX_LPCWSTR s2, size_t count)
+int32_t FXSYS_wcsnicmp(FX_LPCWSTR s1, FX_LPCWSTR s2, size_t count)
 {
     FXSYS_assert(s1 != NULL && s2 != NULL && count > 0);
     FX_WCHAR wch1 = 0, wch2 = 0;
     while (count-- > 0) {
         wch1 = (FX_WCHAR)FXSYS_tolower(*s1++);
         wch2 = (FX_WCHAR)FXSYS_tolower(*s2++);
         if (wch1 != wch2) {
             break;
         }
     }
     return wch1 - wch2;
 }
-FX_INT32 FXSYS_strnicmp(FX_LPCSTR s1, FX_LPCSTR s2, size_t count)
+int32_t FXSYS_strnicmp(FX_LPCSTR s1, FX_LPCSTR s2, size_t count)
 {
     FXSYS_assert(s1 != NULL && s2 != NULL && count > 0);
     FX_CHAR ch1 = 0, ch2 = 0;
     while (count-- > 0) {
         ch1 = (FX_CHAR)FXSYS_tolower(*s1++);
         ch2 = (FX_CHAR)FXSYS_tolower(*s2++);
         if (ch1 != ch2) {
             break;
         }
     }
     return ch1 - ch2;
 }
-FX_DWORD FX_HashCode_String_GetA(FX_LPCSTR pStr, FX_INT32 iLength, FX_BOOL bIgnoreCase)
+FX_DWORD FX_HashCode_String_GetA(FX_LPCSTR pStr, int32_t iLength, FX_BOOL bIgnoreCase)
 {
     FXSYS_assert(pStr != NULL);
     if (iLength < 0) {
-        iLength = (FX_INT32)FXSYS_strlen(pStr);
+        iLength = (int32_t)FXSYS_strlen(pStr);
     }
     FX_LPCSTR pStrEnd = pStr + iLength;
     FX_DWORD dwHashCode = 0;
     if (bIgnoreCase) {
         while (pStr < pStrEnd) {
             dwHashCode = 31 * dwHashCode + FXSYS_tolower(*pStr++);
         }
     } else {
         while (pStr < pStrEnd) {
             dwHashCode = 31 * dwHashCode + *pStr ++;
         }
     }
     return dwHashCode;
 }
-FX_DWORD FX_HashCode_String_GetW(FX_LPCWSTR pStr, FX_INT32 iLength, FX_BOOL bIgnoreCase)
+FX_DWORD FX_HashCode_String_GetW(FX_LPCWSTR pStr, int32_t iLength, FX_BOOL bIgnoreCase)
 {
     FXSYS_assert(pStr != NULL);
     if (iLength < 0) {
-        iLength = (FX_INT32)FXSYS_wcslen(pStr);
+        iLength = (int32_t)FXSYS_wcslen(pStr);
     }
     FX_LPCWSTR pStrEnd = pStr + iLength;
     FX_DWORD dwHashCode = 0;
     if (bIgnoreCase) {
         while (pStr < pStrEnd) {
             dwHashCode = 1313 * dwHashCode + FXSYS_tolower(*pStr++);
         }
     } else {
         while (pStr < pStrEnd) {
             dwHashCode = 1313 * dwHashCode + *pStr ++;
@@ skipping 49 matching lines @@
     v ^= (v << 7) & 0x9d2c5680UL;
     v ^= (v << 15) & 0xefc60000UL;
     v ^= (v >> 18);
     return v;
 }
 void FX_Random_MT_Close(FX_LPVOID pContext)
 {
     FXSYS_assert(pContext != NULL);
     FX_Free(pContext);
 }
-void FX_Random_GenerateMT(FX_LPDWORD pBuffer, FX_INT32 iCount)
+void FX_Random_GenerateMT(FX_LPDWORD pBuffer, int32_t iCount)
 {
     FX_DWORD dwSeed;
 #if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
     if (!FX_GenerateCryptoRandom(&dwSeed, 1)) {
         FX_Random_GenerateBase(&dwSeed, 1);
     }
 #else
     FX_Random_GenerateBase(&dwSeed, 1);
 #endif
     FX_LPVOID pContext = FX_Random_MT_Start(dwSeed);
     while (iCount -- > 0) {
         *pBuffer ++ = FX_Random_MT_Generate(pContext);
     }
     FX_Random_MT_Close(pContext);
 }
-void FX_Random_GenerateBase(FX_LPDWORD pBuffer, FX_INT32 iCount)
+void FX_Random_GenerateBase(FX_LPDWORD pBuffer, int32_t iCount)
 {
 #if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
     SYSTEMTIME st1, st2;
     ::GetSystemTime(&st1);
     do {
         ::GetSystemTime(&st2);
     } while (FXSYS_memcmp32(&st1, &st2, sizeof(SYSTEMTIME)) == 0);
     FX_DWORD dwHash1 = FX_HashCode_String_GetA((FX_LPCSTR)&st1, sizeof(st1), TRUE);
     FX_DWORD dwHash2 = FX_HashCode_String_GetA((FX_LPCSTR)&st2, sizeof(st2), TRUE);
     ::srand((dwHash1 << 16) | (FX_DWORD)dwHash2);
 #else
     time_t tmLast = time(NULL), tmCur;
     while ((tmCur = time(NULL)) == tmLast);
     ::srand((tmCur << 16) | (tmLast & 0xFFFF));
 #endif
     while (iCount -- > 0) {
         *pBuffer ++ = (FX_DWORD)((::rand() << 16) | (::rand() & 0xFFFF));
     }
 }
 #if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
-FX_BOOL FX_GenerateCryptoRandom(FX_LPDWORD pBuffer, FX_INT32 iCount)
+FX_BOOL FX_GenerateCryptoRandom(FX_LPDWORD pBuffer, int32_t iCount)
 {
     HCRYPTPROV hCP = NULL;
     if (!::CryptAcquireContext(&hCP, NULL, NULL, PROV_RSA_FULL, 0) || hCP == NULL) {
         return FALSE;
     }
     ::CryptGenRandom(hCP, iCount * sizeof(FX_DWORD), (FX_LPBYTE)pBuffer);
     ::CryptReleaseContext(hCP, 0);
     return TRUE;
 }
 #endif
-void FX_Random_GenerateCrypto(FX_LPDWORD pBuffer, FX_INT32 iCount)
+void FX_Random_GenerateCrypto(FX_LPDWORD pBuffer, int32_t iCount)
 {
 #if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
     FX_GenerateCryptoRandom(pBuffer, iCount);
 #else
     FX_Random_GenerateBase(pBuffer, iCount);
 #endif
 }
 #ifdef __cplusplus
 }
 #endif
 #ifdef __cplusplus
 extern "C" {
 #endif
 void FX_GUID_CreateV4(FX_LPGUID pGUID)
 {
 #if (_FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN32_MOBILE_ || _FX_OS_ == _FX_WIN64_)
 #ifdef _FX_WINAPI_PARTITION_DESKTOP_
     if (!FX_GenerateCryptoRandom((FX_LPDWORD)pGUID, 4)) {
         FX_Random_GenerateMT((FX_LPDWORD)pGUID, 4);
     }
 #else
     FX_Random_GenerateMT((FX_LPDWORD)pGUID, 4);
 #endif
 #else
     FX_Random_GenerateMT((FX_LPDWORD)pGUID, 4);
 #endif
-    FX_BYTE &b = ((FX_LPBYTE)pGUID)[6];
+    uint8_t &b = ((FX_LPBYTE)pGUID)[6];
     b = (b & 0x0F) | 0x40;
 }
 FX_LPCSTR gs_FX_pHexChars = "0123456789ABCDEF";
 void FX_GUID_ToString(FX_LPCGUID pGUID, CFX_ByteString &bsStr, FX_BOOL bSeparator)
 {
     FX_LPSTR pBuf = bsStr.GetBuffer(40);
-    FX_BYTE b;
-    for (FX_INT32 i = 0; i < 16; i ++) {
+    uint8_t b;
+    for (int32_t i = 0; i < 16; i ++) {
         b = ((FX_LPCBYTE)pGUID)[i];
         *pBuf ++ = gs_FX_pHexChars[b >> 4];
         *pBuf ++ = gs_FX_pHexChars[b & 0x0F];
         if (bSeparator && (i == 3 || i == 5 || i == 7 || i == 9)) {
             *pBuf ++ = L'-';
         }
     }
     bsStr.ReleaseBuffer(bSeparator ? 36 : 32);
 }
 #ifdef __cplusplus
 }
 #endif