Replace FX_CHAR and FX_WCHAR with underlying types.
Change-Id: I96e0a20d66b9184d22f64d8e4ce0dadd5a78c1e8
Reviewed-on: https://pdfium-review.googlesource.com/2967
Commit-Queue: dsinclair <dsinclair@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
diff --git a/fpdfsdk/javascript/Consts.cpp b/fpdfsdk/javascript/Consts.cpp
index 82f9b4c..8c01ae0 100644
--- a/fpdfsdk/javascript/Consts.cpp
+++ b/fpdfsdk/javascript/Consts.cpp
@@ -139,7 +139,7 @@
#define GLOBAL_ARRAY(rt, name, ...) \
{ \
- const FX_WCHAR* values[] = {__VA_ARGS__}; \
+ const wchar_t* values[] = {__VA_ARGS__}; \
v8::Local<v8::Array> array = (rt)->NewArray(); \
for (size_t i = 0; i < FX_ArraySize(values); ++i) \
array->Set(i, (rt)->NewString(values[i])); \
diff --git a/fpdfsdk/javascript/JS_EventHandler.cpp b/fpdfsdk/javascript/JS_EventHandler.cpp
index bd1c8e2..a63b7a8 100644
--- a/fpdfsdk/javascript/JS_EventHandler.cpp
+++ b/fpdfsdk/javascript/JS_EventHandler.cpp
@@ -435,7 +435,7 @@
return m_bModifier;
}
-const FX_WCHAR* CJS_EventHandler::Name() {
+const wchar_t* CJS_EventHandler::Name() {
switch (m_eEventType) {
case JET_APP_INIT:
return L"Init";
@@ -506,7 +506,7 @@
}
}
-const FX_WCHAR* CJS_EventHandler::Type() {
+const wchar_t* CJS_EventHandler::Type() {
switch (m_eEventType) {
case JET_APP_INIT:
return L"App";
diff --git a/fpdfsdk/javascript/JS_EventHandler.h b/fpdfsdk/javascript/JS_EventHandler.h
index b9836b0..1e70a35 100644
--- a/fpdfsdk/javascript/JS_EventHandler.h
+++ b/fpdfsdk/javascript/JS_EventHandler.h
@@ -150,8 +150,8 @@
bool FieldFull();
bool KeyDown();
bool Modifier();
- const FX_WCHAR* Name();
- const FX_WCHAR* Type();
+ const wchar_t* Name();
+ const wchar_t* Type();
bool& Rc();
int& SelEnd();
int& SelStart();
diff --git a/fpdfsdk/javascript/JS_GlobalData.cpp b/fpdfsdk/javascript/JS_GlobalData.cpp
index 68d929f..048fca0 100644
--- a/fpdfsdk/javascript/JS_GlobalData.cpp
+++ b/fpdfsdk/javascript/JS_GlobalData.cpp
@@ -336,18 +336,18 @@
CRYPT_ArcFourCryptBlock(sFile.GetBuffer(), sFile.GetSize(), JS_RC4KEY,
sizeof(JS_RC4KEY));
- WriteFileBuffer(m_sFilePath.c_str(), (const FX_CHAR*)sFile.GetBuffer(),
+ WriteFileBuffer(m_sFilePath.c_str(), (const char*)sFile.GetBuffer(),
sFile.GetSize());
}
-void CJS_GlobalData::LoadFileBuffer(const FX_WCHAR* sFilePath,
+void CJS_GlobalData::LoadFileBuffer(const wchar_t* sFilePath,
uint8_t*& pBuffer,
int32_t& nLength) {
// UnSupport.
}
-void CJS_GlobalData::WriteFileBuffer(const FX_WCHAR* sFilePath,
- const FX_CHAR* pBuffer,
+void CJS_GlobalData::WriteFileBuffer(const wchar_t* sFilePath,
+ const char* pBuffer,
int32_t nLength) {
// UnSupport.
}
diff --git a/fpdfsdk/javascript/JS_GlobalData.h b/fpdfsdk/javascript/JS_GlobalData.h
index c8947cd..c4e8e48 100644
--- a/fpdfsdk/javascript/JS_GlobalData.h
+++ b/fpdfsdk/javascript/JS_GlobalData.h
@@ -59,11 +59,11 @@
iterator FindGlobalVariable(const CFX_ByteString& sPropname);
const_iterator FindGlobalVariable(const CFX_ByteString& sPropname) const;
- void LoadFileBuffer(const FX_WCHAR* sFilePath,
+ void LoadFileBuffer(const wchar_t* sFilePath,
uint8_t*& pBuffer,
int32_t& nLength);
- void WriteFileBuffer(const FX_WCHAR* sFilePath,
- const FX_CHAR* pBuffer,
+ void WriteFileBuffer(const wchar_t* sFilePath,
+ const char* pBuffer,
int32_t nLength);
void MakeByteString(const CFX_ByteString& name,
CJS_KeyValue* pData,
diff --git a/fpdfsdk/javascript/JS_Value.cpp b/fpdfsdk/javascript/JS_Value.cpp
index b058847..a0c286f 100644
--- a/fpdfsdk/javascript/JS_Value.cpp
+++ b/fpdfsdk/javascript/JS_Value.cpp
@@ -55,10 +55,10 @@
m_pValue = pObj->ToV8Object();
}
-CJS_Value::CJS_Value(CJS_Runtime* pRuntime, const FX_WCHAR* pWstr)
+CJS_Value::CJS_Value(CJS_Runtime* pRuntime, const wchar_t* pWstr)
: m_pValue(pRuntime->NewString(pWstr)) {}
-CJS_Value::CJS_Value(CJS_Runtime* pRuntime, const FX_CHAR* pStr)
+CJS_Value::CJS_Value(CJS_Runtime* pRuntime, const char* pStr)
: m_pValue(pRuntime->NewString(CFX_WideString::FromLocal(pStr).c_str())) {}
CJS_Value::CJS_Value(CJS_Runtime* pRuntime, const CJS_Array& array)
@@ -267,7 +267,7 @@
str = m_Value.ToCFXByteString(m_pJSRuntime);
}
-void CJS_PropValue::operator<<(const FX_WCHAR* str) {
+void CJS_PropValue::operator<<(const wchar_t* str) {
ASSERT(!m_bIsSetting);
m_Value = CJS_Value(m_pJSRuntime, str);
}
diff --git a/fpdfsdk/javascript/JS_Value.h b/fpdfsdk/javascript/JS_Value.h
index 313f0c3..0c19701 100644
--- a/fpdfsdk/javascript/JS_Value.h
+++ b/fpdfsdk/javascript/JS_Value.h
@@ -38,8 +38,8 @@
CJS_Value(CJS_Runtime* pRuntime, const float& fValue);
CJS_Value(CJS_Runtime* pRuntime, const bool& bValue);
CJS_Value(CJS_Runtime* pRuntime, CJS_Object* pObj);
- CJS_Value(CJS_Runtime* pRuntime, const FX_CHAR* pStr);
- CJS_Value(CJS_Runtime* pRuntime, const FX_WCHAR* pWstr);
+ CJS_Value(CJS_Runtime* pRuntime, const char* pStr);
+ CJS_Value(CJS_Runtime* pRuntime, const wchar_t* pWstr);
CJS_Value(CJS_Runtime* pRuntime, const CJS_Array& array);
CJS_Value(CJS_Runtime* pRuntime, const CJS_Date& date);
CJS_Value(CJS_Runtime* pRuntime, const CJS_Object* object);
@@ -107,7 +107,7 @@
void operator>>(CFX_ByteString&) const;
void operator<<(CFX_WideString);
void operator>>(CFX_WideString&) const;
- void operator<<(const FX_WCHAR* c_string);
+ void operator<<(const wchar_t* c_string);
void operator<<(v8::Local<v8::Object>);
void operator>>(v8::Local<v8::Object>&) const;
void operator>>(CJS_Array& array) const;
diff --git a/fpdfsdk/javascript/PublicMethods.cpp b/fpdfsdk/javascript/PublicMethods.cpp
index 3bcbc34..f479527 100644
--- a/fpdfsdk/javascript/PublicMethods.cpp
+++ b/fpdfsdk/javascript/PublicMethods.cpp
@@ -59,14 +59,14 @@
namespace {
-const FX_WCHAR* const months[] = {L"Jan", L"Feb", L"Mar", L"Apr",
- L"May", L"Jun", L"Jul", L"Aug",
- L"Sep", L"Oct", L"Nov", L"Dec"};
+const wchar_t* const months[] = {L"Jan", L"Feb", L"Mar", L"Apr",
+ L"May", L"Jun", L"Jul", L"Aug",
+ L"Sep", L"Oct", L"Nov", L"Dec"};
-const FX_WCHAR* const fullmonths[] = {L"January", L"February", L"March",
- L"April", L"May", L"June",
- L"July", L"August", L"September",
- L"October", L"November", L"December"};
+const wchar_t* const fullmonths[] = {L"January", L"February", L"March",
+ L"April", L"May", L"June",
+ L"July", L"August", L"September",
+ L"October", L"November", L"December"};
CFX_ByteString StrTrim(const CFX_ByteString& pStr) {
CFX_ByteString result(pStr);
@@ -82,7 +82,7 @@
return result;
}
-void AlertIfPossible(CJS_EventContext* pContext, const FX_WCHAR* swMsg) {
+void AlertIfPossible(CJS_EventContext* pContext, const wchar_t* swMsg) {
CPDFSDK_FormFillEnvironment* pFormFillEnv = pContext->GetFormFillEnv();
if (pFormFillEnv)
pFormFillEnv->JS_appAlert(swMsg, nullptr, 0, 3);
@@ -115,8 +115,8 @@
bool CJS_PublicMethods::IsNumber(const CFX_WideString& str) {
CFX_WideString sTrim = StrTrim(str);
- const FX_WCHAR* pTrim = sTrim.c_str();
- const FX_WCHAR* p = pTrim;
+ const wchar_t* pTrim = sTrim.c_str();
+ const wchar_t* p = pTrim;
bool bDot = false;
bool bKXJS = false;
@@ -168,7 +168,7 @@
return ch == L'9' || ch == L'A' || ch == L'O' || ch == L'X';
}
-double CJS_PublicMethods::AF_Simple(const FX_WCHAR* sFuction,
+double CJS_PublicMethods::AF_Simple(const wchar_t* sFuction,
double dValue1,
double dValue2) {
if (FXSYS_wcsicmp(sFuction, L"AVG") == 0 ||
@@ -235,7 +235,7 @@
if (i - nStart > 10)
break;
- FX_WCHAR c = str.GetAt(i);
+ wchar_t c = str.GetAt(i);
if (!FXSYS_iswdigit(c))
break;
@@ -254,7 +254,7 @@
CFX_WideString swRet;
nSkip = 0;
for (int i = nStart, sz = str.GetLength(); i < sz; i++) {
- FX_WCHAR c = str.GetAt(i);
+ wchar_t c = str.GetAt(i);
if (!FXSYS_iswdigit(c))
break;
@@ -286,7 +286,7 @@
if (nIndex > 2)
break;
- FX_WCHAR c = value.GetAt(i);
+ wchar_t c = value.GetAt(i);
if (FXSYS_iswdigit(c)) {
number[nIndex++] = ParseStringInteger(value, i, nSkip, 4);
i += nSkip;
@@ -373,7 +373,7 @@
if (bExit)
break;
- FX_WCHAR c = format.GetAt(i);
+ wchar_t c = format.GetAt(i);
switch (c) {
case ':':
case '.':
@@ -630,7 +630,7 @@
int i = 0;
while (i < format.GetLength()) {
- FX_WCHAR c = format.GetAt(i);
+ wchar_t c = format.GetAt(i);
int remaining = format.GetLength() - i - 1;
sPart = L"";
switch (c) {
@@ -946,7 +946,7 @@
int iSepStyle = params[1].ToInt(pRuntime);
if (iSepStyle < 0 || iSepStyle > 3)
iSepStyle = 0;
- const FX_WCHAR cSep = iSepStyle < 2 ? L'.' : L',';
+ const wchar_t cSep = iSepStyle < 2 ? L'.' : L',';
bool bHasSep = wstrValue.Find(cSep) != -1;
for (FX_STRSIZE i = 0; i < wstrChange.GetLength(); ++i) {
@@ -1142,7 +1142,7 @@
std::vector<CFX_WideString> wsArray;
CFX_WideString sTemp = L"";
for (int i = 0; i < strValue.GetLength(); ++i) {
- FX_WCHAR c = strValue.GetAt(i);
+ wchar_t c = strValue.GetAt(i);
if (c == L' ' || c == L':') {
wsArray.push_back(sTemp);
sTemp = L"";
@@ -1239,20 +1239,20 @@
}
int iIndex = params[0].ToInt(pRuntime);
- const FX_WCHAR* cFormats[] = {L"m/d",
- L"m/d/yy",
- L"mm/dd/yy",
- L"mm/yy",
- L"d-mmm",
- L"d-mmm-yy",
- L"dd-mmm-yy",
- L"yy-mm-dd",
- L"mmm-yy",
- L"mmmm-yy",
- L"mmm d, yyyy",
- L"mmmm d, yyyy",
- L"m/d/yy h:MM tt",
- L"m/d/yy HH:MM"};
+ const wchar_t* cFormats[] = {L"m/d",
+ L"m/d/yy",
+ L"mm/dd/yy",
+ L"mm/yy",
+ L"d-mmm",
+ L"d-mmm-yy",
+ L"dd-mmm-yy",
+ L"yy-mm-dd",
+ L"mmm-yy",
+ L"mmmm-yy",
+ L"mmm d, yyyy",
+ L"mmmm d, yyyy",
+ L"m/d/yy h:MM tt",
+ L"m/d/yy HH:MM"};
if (iIndex < 0 || (static_cast<size_t>(iIndex) >= FX_ArraySize(cFormats)))
iIndex = 0;
@@ -1273,20 +1273,20 @@
}
int iIndex = params[0].ToInt(pRuntime);
- const FX_WCHAR* cFormats[] = {L"m/d",
- L"m/d/yy",
- L"mm/dd/yy",
- L"mm/yy",
- L"d-mmm",
- L"d-mmm-yy",
- L"dd-mmm-yy",
- L"yy-mm-dd",
- L"mmm-yy",
- L"mmmm-yy",
- L"mmm d, yyyy",
- L"mmmm d, yyyy",
- L"m/d/yy h:MM tt",
- L"m/d/yy HH:MM"};
+ const wchar_t* cFormats[] = {L"m/d",
+ L"m/d/yy",
+ L"mm/dd/yy",
+ L"mm/yy",
+ L"d-mmm",
+ L"d-mmm-yy",
+ L"dd-mmm-yy",
+ L"yy-mm-dd",
+ L"mmm-yy",
+ L"mmmm-yy",
+ L"mmm d, yyyy",
+ L"mmmm d, yyyy",
+ L"m/d/yy h:MM tt",
+ L"m/d/yy HH:MM"};
if (iIndex < 0 || (static_cast<size_t>(iIndex) >= FX_ArraySize(cFormats)))
iIndex = 0;
@@ -1307,8 +1307,8 @@
}
int iIndex = params[0].ToInt(pRuntime);
- const FX_WCHAR* cFormats[] = {L"HH:MM", L"h:MM tt", L"HH:MM:ss",
- L"h:MM:ss tt"};
+ const wchar_t* cFormats[] = {L"HH:MM", L"h:MM tt", L"HH:MM:ss",
+ L"h:MM:ss tt"};
if (iIndex < 0 || (static_cast<size_t>(iIndex) >= FX_ArraySize(cFormats)))
iIndex = 0;
@@ -1328,8 +1328,8 @@
}
int iIndex = params[0].ToInt(pRuntime);
- const FX_WCHAR* cFormats[] = {L"HH:MM", L"h:MM tt", L"HH:MM:ss",
- L"h:MM:ss tt"};
+ const wchar_t* cFormats[] = {L"HH:MM", L"h:MM tt", L"HH:MM:ss",
+ L"h:MM:ss tt"};
if (iIndex < 0 || (static_cast<size_t>(iIndex) >= FX_ArraySize(cFormats)))
iIndex = 0;
@@ -1461,7 +1461,7 @@
pEvent->Rc() = false;
return true;
}
- FX_WCHAR wMask = wstrMask[iIndexMask];
+ wchar_t wMask = wstrMask[iIndexMask];
if (!isReservedMaskChar(wMask))
wChange.SetAt(i, wMask);
@@ -1776,7 +1776,7 @@
CJS_Array nums;
int nIndex = 0;
for (int i = 0, sz = str.GetLength(); i < sz; i++) {
- FX_WCHAR wc = str.GetAt(i);
+ wchar_t wc = str.GetAt(i);
if (FXSYS_iswdigit(wc)) {
sPart += wc;
} else {
diff --git a/fpdfsdk/javascript/PublicMethods.h b/fpdfsdk/javascript/PublicMethods.h
index 060c743..0f6123c 100644
--- a/fpdfsdk/javascript/PublicMethods.h
+++ b/fpdfsdk/javascript/PublicMethods.h
@@ -153,7 +153,7 @@
static bool maskSatisfied(wchar_t c_Change, wchar_t c_Mask);
static bool isReservedMaskChar(wchar_t ch);
- static double AF_Simple(const FX_WCHAR* sFuction,
+ static double AF_Simple(const wchar_t* sFuction,
double dValue1,
double dValue2);
static CJS_Array AF_MakeArrayFromList(CJS_Runtime* pRuntime, CJS_Value val);
diff --git a/fpdfsdk/javascript/cjs_runtime.cpp b/fpdfsdk/javascript/cjs_runtime.cpp
index 1ece0b6..a6da9c4 100644
--- a/fpdfsdk/javascript/cjs_runtime.cpp
+++ b/fpdfsdk/javascript/cjs_runtime.cpp
@@ -221,7 +221,7 @@
}
bool CJS_Runtime::GetValueByName(const CFX_ByteStringC& utf8Name,
CFXJSE_Value* pValue) {
- const FX_CHAR* name = utf8Name.c_str();
+ const char* name = utf8Name.c_str();
v8::Isolate::Scope isolate_scope(GetIsolate());
v8::HandleScope handle_scope(GetIsolate());
@@ -243,7 +243,7 @@
CFXJSE_Value* pValue) {
if (utf8Name.IsEmpty() || !pValue)
return false;
- const FX_CHAR* name = utf8Name.c_str();
+ const char* name = utf8Name.c_str();
v8::Isolate* pIsolate = GetIsolate();
v8::Isolate::Scope isolate_scope(pIsolate);
v8::HandleScope handle_scope(pIsolate);
diff --git a/fpdfsdk/javascript/global.cpp b/fpdfsdk/javascript/global.cpp
index a450606..92fbc9e 100644
--- a/fpdfsdk/javascript/global.cpp
+++ b/fpdfsdk/javascript/global.cpp
@@ -60,12 +60,12 @@
UpdateGlobalPersistentVariables();
}
-bool JSGlobalAlternate::QueryProperty(const FX_WCHAR* propname) {
+bool JSGlobalAlternate::QueryProperty(const wchar_t* propname) {
return CFX_WideString(propname) != L"setPersistent";
}
bool JSGlobalAlternate::DelProperty(CJS_Runtime* pRuntime,
- const FX_WCHAR* propname,
+ const wchar_t* propname,
CFX_WideString& sError) {
auto it = m_mapGlobal.find(CFX_ByteString::FromUnicode(propname));
if (it == m_mapGlobal.end())
@@ -76,7 +76,7 @@
}
bool JSGlobalAlternate::DoProperty(CJS_Runtime* pRuntime,
- const FX_WCHAR* propname,
+ const wchar_t* propname,
CJS_PropValue& vp,
CFX_WideString& sError) {
if (vp.IsSetting()) {
diff --git a/fpdfsdk/javascript/global.h b/fpdfsdk/javascript/global.h
index e313929..7c00248 100644
--- a/fpdfsdk/javascript/global.h
+++ b/fpdfsdk/javascript/global.h
@@ -39,13 +39,13 @@
const std::vector<CJS_Value>& params,
CJS_Value& vRet,
CFX_WideString& sError);
- bool QueryProperty(const FX_WCHAR* propname);
+ bool QueryProperty(const wchar_t* propname);
bool DoProperty(CJS_Runtime* pRuntime,
- const FX_WCHAR* propname,
+ const wchar_t* propname,
CJS_PropValue& vp,
CFX_WideString& sError);
bool DelProperty(CJS_Runtime* pRuntime,
- const FX_WCHAR* propname,
+ const wchar_t* propname,
CFX_WideString& sError);
void Initial(CPDFSDK_FormFillEnvironment* pFormFillEnv);
diff --git a/fpdfsdk/javascript/util.cpp b/fpdfsdk/javascript/util.cpp
index 3221cfb..32104b4 100644
--- a/fpdfsdk/javascript/util.cpp
+++ b/fpdfsdk/javascript/util.cpp
@@ -46,14 +46,14 @@
// Map PDF-style directives to equivalent wcsftime directives. Not
// all have direct equivalents, though.
struct TbConvert {
- const FX_WCHAR* lpszJSMark;
- const FX_WCHAR* lpszCppMark;
+ const wchar_t* lpszJSMark;
+ const wchar_t* lpszCppMark;
};
// Map PDF-style directives lacking direct wcsftime directives to
// the value with which they will be replaced.
struct TbConvertAdditional {
- const FX_WCHAR* lpszJSMark;
+ const wchar_t* lpszJSMark;
int iValue;
};
@@ -318,7 +318,7 @@
enum CaseMode { kPreserveCase, kUpperCase, kLowerCase };
-static FX_WCHAR TranslateCase(FX_WCHAR input, CaseMode eMode) {
+static wchar_t TranslateCase(wchar_t input, CaseMode eMode) {
if (eMode == kLowerCase && input >= 'A' && input <= 'Z')
return input | 0x20;
if (eMode == kUpperCase && input >= 'a' && input <= 'z')
@@ -456,7 +456,7 @@
return false;
}
- CFX_WideString wStr(static_cast<FX_WCHAR>(arg));
+ CFX_WideString wStr(static_cast<wchar_t>(arg));
vRet = CJS_Value(pRuntime, wStr.c_str());
return true;
}