From 812e96c2b4c5908a1979da5e27cdcecda0d1dfc9 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Mon, 13 Mar 2017 16:43:37 -0400 Subject: Replace FX_CHAR and FX_WCHAR with underlying types. Change-Id: I96e0a20d66b9184d22f64d8e4ce0dadd5a78c1e8 Reviewed-on: https://pdfium-review.googlesource.com/2967 Commit-Queue: dsinclair Reviewed-by: Tom Sepez --- fpdfsdk/cpdfsdk_baannot.cpp | 2 +- fpdfsdk/cpdfsdk_datetime.cpp | 2 +- fpdfsdk/cpdfsdk_formfillenvironment.cpp | 47 +++++++------- fpdfsdk/cpdfsdk_formfillenvironment.h | 46 +++++++------- fpdfsdk/cpdfsdk_widget.cpp | 2 +- fpdfsdk/fpdf_flatten.cpp | 2 +- fpdfsdk/fpdf_structtree_embeddertest.cpp | 2 +- fpdfsdk/fpdf_sysfontinfo.cpp | 4 +- fpdfsdk/fpdfdoc_embeddertest.cpp | 14 ++--- fpdfsdk/fpdfview.cpp | 2 +- fpdfsdk/fxedit/fxet_list.cpp | 4 +- fpdfsdk/fxedit/fxet_list.h | 4 +- fpdfsdk/javascript/Consts.cpp | 2 +- fpdfsdk/javascript/JS_EventHandler.cpp | 4 +- fpdfsdk/javascript/JS_EventHandler.h | 4 +- fpdfsdk/javascript/JS_GlobalData.cpp | 8 +-- fpdfsdk/javascript/JS_GlobalData.h | 6 +- fpdfsdk/javascript/JS_Value.cpp | 6 +- fpdfsdk/javascript/JS_Value.h | 6 +- fpdfsdk/javascript/PublicMethods.cpp | 104 +++++++++++++++---------------- fpdfsdk/javascript/PublicMethods.h | 2 +- fpdfsdk/javascript/cjs_runtime.cpp | 4 +- fpdfsdk/javascript/global.cpp | 6 +- fpdfsdk/javascript/global.h | 6 +- fpdfsdk/javascript/util.cpp | 10 +-- fpdfsdk/pdfwindow/PWL_Icon.cpp | 2 +- fpdfsdk/pdfwindow/PWL_Icon.h | 2 +- fpdfsdk/pdfwindow/PWL_ListBox.cpp | 2 +- fpdfsdk/pdfwindow/PWL_ListBox.h | 2 +- 29 files changed, 153 insertions(+), 154 deletions(-) (limited to 'fpdfsdk') diff --git a/fpdfsdk/cpdfsdk_baannot.cpp b/fpdfsdk/cpdfsdk_baannot.cpp index 3eedf1502c..3c96550a42 100644 --- a/fpdfsdk/cpdfsdk_baannot.cpp +++ b/fpdfsdk/cpdfsdk_baannot.cpp @@ -71,7 +71,7 @@ bool CPDFSDK_BAAnnot::IsAppearanceValid(CPDF_Annot::AppearanceMode mode) { return false; // Choose the right sub-ap - const FX_CHAR* ap_entry = "N"; + const char* ap_entry = "N"; if (mode == CPDF_Annot::Down) ap_entry = "D"; else if (mode == CPDF_Annot::Rollover) diff --git a/fpdfsdk/cpdfsdk_datetime.cpp b/fpdfsdk/cpdfsdk_datetime.cpp index 72f50a6b44..e10a223408 100644 --- a/fpdfsdk/cpdfsdk_datetime.cpp +++ b/fpdfsdk/cpdfsdk_datetime.cpp @@ -143,7 +143,7 @@ CPDFSDK_DateTime& CPDFSDK_DateTime::FromPDFDateTimeString( int j = 0; int k = 0; - FX_CHAR ch; + char ch; while (i < strLength && j < 4) { ch = dtStr[i]; k = k * 10 + FXSYS_toDecimalDigit(ch); diff --git a/fpdfsdk/cpdfsdk_formfillenvironment.cpp b/fpdfsdk/cpdfsdk_formfillenvironment.cpp index 4ef766d9f8..091ccfc42f 100644 --- a/fpdfsdk/cpdfsdk_formfillenvironment.cpp +++ b/fpdfsdk/cpdfsdk_formfillenvironment.cpp @@ -60,8 +60,8 @@ CPDFSDK_FormFillEnvironment::~CPDFSDK_FormFillEnvironment() { m_pInfo->Release(m_pInfo); } -int CPDFSDK_FormFillEnvironment::JS_appAlert(const FX_WCHAR* Msg, - const FX_WCHAR* Title, +int CPDFSDK_FormFillEnvironment::JS_appAlert(const wchar_t* Msg, + const wchar_t* Title, uint32_t Type, uint32_t Icon) { if (!m_pInfo || !m_pInfo->m_pJsPlatform || @@ -75,10 +75,10 @@ int CPDFSDK_FormFillEnvironment::JS_appAlert(const FX_WCHAR* Msg, AsFPDFWideString(&bsTitle), Type, Icon); } -int CPDFSDK_FormFillEnvironment::JS_appResponse(const FX_WCHAR* Question, - const FX_WCHAR* Title, - const FX_WCHAR* Default, - const FX_WCHAR* cLabel, +int CPDFSDK_FormFillEnvironment::JS_appResponse(const wchar_t* Question, + const wchar_t* Title, + const wchar_t* Default, + const wchar_t* cLabel, FPDF_BOOL bPassword, void* response, int length) { @@ -146,7 +146,7 @@ CFX_WideString CPDFSDK_FormFillEnvironment::JS_docGetFilePath() { void CPDFSDK_FormFillEnvironment::JS_docSubmitForm(void* formData, int length, - const FX_WCHAR* URL) { + const wchar_t* URL) { if (!m_pInfo || !m_pInfo->m_pJsPlatform || !m_pInfo->m_pJsPlatform->Doc_submitForm) { return; @@ -160,11 +160,11 @@ void CPDFSDK_FormFillEnvironment::JS_docSubmitForm(void* formData, void CPDFSDK_FormFillEnvironment::JS_docmailForm(void* mailData, int length, FPDF_BOOL bUI, - const FX_WCHAR* To, - const FX_WCHAR* Subject, - const FX_WCHAR* CC, - const FX_WCHAR* BCC, - const FX_WCHAR* Msg) { + const wchar_t* To, + const wchar_t* Subject, + const wchar_t* CC, + const wchar_t* BCC, + const wchar_t* Msg) { if (!m_pInfo || !m_pInfo->m_pJsPlatform || !m_pInfo->m_pJsPlatform->Doc_mail) { return; @@ -313,8 +313,7 @@ FPDF_PAGE CPDFSDK_FormFillEnvironment::GetCurrentPage(FPDF_DOCUMENT document) { return nullptr; } -void CPDFSDK_FormFillEnvironment::ExecuteNamedAction( - const FX_CHAR* namedAction) { +void CPDFSDK_FormFillEnvironment::ExecuteNamedAction(const char* namedAction) { if (m_pInfo && m_pInfo->FFI_ExecuteNamedAction) m_pInfo->FFI_ExecuteNamedAction(m_pInfo, namedAction); } @@ -327,7 +326,7 @@ void CPDFSDK_FormFillEnvironment::OnSetFieldInputFocus( m_pInfo->FFI_SetTextFieldFocus(m_pInfo, focusText, nTextLen, bFocus); } -void CPDFSDK_FormFillEnvironment::DoURIAction(const FX_CHAR* bsURI) { +void CPDFSDK_FormFillEnvironment::DoURIAction(const char* bsURI) { if (m_pInfo && m_pInfo->FFI_DoURIAction) m_pInfo->FFI_DoURIAction(m_pInfo, bsURI); } @@ -462,7 +461,7 @@ FPDF_FILEHANDLER* CPDFSDK_FormFillEnvironment::OpenFile(int fileType, } CFX_RetainPtr -CPDFSDK_FormFillEnvironment::DownloadFromURL(const FX_WCHAR* url) { +CPDFSDK_FormFillEnvironment::DownloadFromURL(const wchar_t* url) { if (!m_pInfo || !m_pInfo->FFI_DownloadFromURL) return nullptr; @@ -475,11 +474,11 @@ CPDFSDK_FormFillEnvironment::DownloadFromURL(const FX_WCHAR* url) { } CFX_WideString CPDFSDK_FormFillEnvironment::PostRequestURL( - const FX_WCHAR* wsURL, - const FX_WCHAR* wsData, - const FX_WCHAR* wsContentType, - const FX_WCHAR* wsEncode, - const FX_WCHAR* wsHeader) { + const wchar_t* wsURL, + const wchar_t* wsData, + const wchar_t* wsContentType, + const wchar_t* wsEncode, + const wchar_t* wsHeader) { if (!m_pInfo || !m_pInfo->FFI_PostRequestURL) return L""; @@ -513,9 +512,9 @@ CFX_WideString CPDFSDK_FormFillEnvironment::PostRequestURL( return wsRet; } -FPDF_BOOL CPDFSDK_FormFillEnvironment::PutRequestURL(const FX_WCHAR* wsURL, - const FX_WCHAR* wsData, - const FX_WCHAR* wsEncode) { +FPDF_BOOL CPDFSDK_FormFillEnvironment::PutRequestURL(const wchar_t* wsURL, + const wchar_t* wsData, + const wchar_t* wsEncode) { if (!m_pInfo || !m_pInfo->FFI_PutRequestURL) return false; diff --git a/fpdfsdk/cpdfsdk_formfillenvironment.h b/fpdfsdk/cpdfsdk_formfillenvironment.h index eead8734f1..5aead04191 100644 --- a/fpdfsdk/cpdfsdk_formfillenvironment.h +++ b/fpdfsdk/cpdfsdk_formfillenvironment.h @@ -84,11 +84,11 @@ class CPDFSDK_FormFillEnvironment FPDF_PAGE GetPage(FPDF_DOCUMENT document, int nPageIndex); FPDF_PAGE GetCurrentPage(FPDF_DOCUMENT document); - void ExecuteNamedAction(const FX_CHAR* namedAction); + void ExecuteNamedAction(const char* namedAction); void OnSetFieldInputFocus(FPDF_WIDESTRING focusText, FPDF_DWORD nTextLen, bool bFocus); - void DoURIAction(const FX_CHAR* bsURI); + void DoURIAction(const char* bsURI); void DoGoToAction(int nPageIndex, int zoomMode, float* fPosArray, @@ -141,15 +141,15 @@ class CPDFSDK_FormFillEnvironment FPDF_FILEHANDLER* OpenFile(int fileType, FPDF_WIDESTRING wsURL, const char* mode); - CFX_RetainPtr DownloadFromURL(const FX_WCHAR* url); - CFX_WideString PostRequestURL(const FX_WCHAR* wsURL, - const FX_WCHAR* wsData, - const FX_WCHAR* wsContentType, - const FX_WCHAR* wsEncode, - const FX_WCHAR* wsHeader); - FPDF_BOOL PutRequestURL(const FX_WCHAR* wsURL, - const FX_WCHAR* wsData, - const FX_WCHAR* wsEncode); + CFX_RetainPtr DownloadFromURL(const wchar_t* url); + CFX_WideString PostRequestURL(const wchar_t* wsURL, + const wchar_t* wsData, + const wchar_t* wsContentType, + const wchar_t* wsEncode, + const wchar_t* wsHeader); + FPDF_BOOL PutRequestURL(const wchar_t* wsURL, + const wchar_t* wsData, + const wchar_t* wsEncode); CFX_WideString GetLanguage(); void PageEvent(int iPageCount, uint32_t dwEventType) const; @@ -157,29 +157,29 @@ class CPDFSDK_FormFillEnvironment CPDF_Document* GetPDFDocument() const { return m_pUnderlyingDoc; } #endif // PDF_ENABLE_XFA - int JS_appAlert(const FX_WCHAR* Msg, - const FX_WCHAR* Title, + int JS_appAlert(const wchar_t* Msg, + const wchar_t* Title, uint32_t Type, uint32_t Icon); - int JS_appResponse(const FX_WCHAR* Question, - const FX_WCHAR* Title, - const FX_WCHAR* Default, - const FX_WCHAR* cLabel, + int JS_appResponse(const wchar_t* Question, + const wchar_t* Title, + const wchar_t* Default, + const wchar_t* cLabel, FPDF_BOOL bPassword, void* response, int length); void JS_appBeep(int nType); CFX_WideString JS_fieldBrowse(); CFX_WideString JS_docGetFilePath(); - void JS_docSubmitForm(void* formData, int length, const FX_WCHAR* URL); + void JS_docSubmitForm(void* formData, int length, const wchar_t* URL); void JS_docmailForm(void* mailData, int length, FPDF_BOOL bUI, - const FX_WCHAR* To, - const FX_WCHAR* Subject, - const FX_WCHAR* CC, - const FX_WCHAR* BCC, - const FX_WCHAR* Msg); + const wchar_t* To, + const wchar_t* Subject, + const wchar_t* CC, + const wchar_t* BCC, + const wchar_t* Msg); void JS_docprint(FPDF_BOOL bUI, int nStart, int nEnd, diff --git a/fpdfsdk/cpdfsdk_widget.cpp b/fpdfsdk/cpdfsdk_widget.cpp index cd86f7a0b5..e5df453d90 100644 --- a/fpdfsdk/cpdfsdk_widget.cpp +++ b/fpdfsdk/cpdfsdk_widget.cpp @@ -466,7 +466,7 @@ bool CPDFSDK_Widget::IsWidgetAppearanceValid(CPDF_Annot::AppearanceMode mode) { return false; // Choose the right sub-ap - const FX_CHAR* ap_entry = "N"; + const char* ap_entry = "N"; if (mode == CPDF_Annot::Down) ap_entry = "D"; else if (mode == CPDF_Annot::Rollover) diff --git a/fpdfsdk/fpdf_flatten.cpp b/fpdfsdk/fpdf_flatten.cpp index e649bacf49..06ea939b72 100644 --- a/fpdfsdk/fpdf_flatten.cpp +++ b/fpdfsdk/fpdf_flatten.cpp @@ -208,7 +208,7 @@ void SetPageContents(const CFX_ByteString& key, acc.LoadAllData(pContentsStream); CFX_ByteString sStream = "q\n"; CFX_ByteString sBody = - CFX_ByteString((const FX_CHAR*)acc.GetData(), acc.GetSize()); + CFX_ByteString((const char*)acc.GetData(), acc.GetSize()); sStream = sStream + sBody + "\nQ"; pContentsStream->SetData(sStream.raw_str(), sStream.GetLength()); pContentsArray->AddNew(pDocument, diff --git a/fpdfsdk/fpdf_structtree_embeddertest.cpp b/fpdfsdk/fpdf_structtree_embeddertest.cpp index 58b3172057..8ddde5317c 100644 --- a/fpdfsdk/fpdf_structtree_embeddertest.cpp +++ b/fpdfsdk/fpdf_structtree_embeddertest.cpp @@ -56,7 +56,7 @@ TEST_F(FPDFStructTreeEmbeddertest, GetAltText) { ASSERT_EQ(24U, FPDF_StructElement_GetAltText(gchild_element, buffer, sizeof(buffer))); - const FX_WCHAR kExpected[] = L"Black Image"; + const wchar_t kExpected[] = L"Black Image"; EXPECT_EQ(CFX_WideString(kExpected), CFX_WideString::FromUTF16LE(buffer, FXSYS_len(kExpected))); diff --git a/fpdfsdk/fpdf_sysfontinfo.cpp b/fpdfsdk/fpdf_sysfontinfo.cpp index 1b62dc48ac..5bce4b4cc4 100644 --- a/fpdfsdk/fpdf_sysfontinfo.cpp +++ b/fpdfsdk/fpdf_sysfontinfo.cpp @@ -35,7 +35,7 @@ class CFX_ExternalFontInfo final : public IFX_SystemFontInfo { bool bItalic, int charset, int pitch_family, - const FX_CHAR* family, + const char* family, int& iExact) override { if (!m_pInfo->MapFont) return nullptr; @@ -43,7 +43,7 @@ class CFX_ExternalFontInfo final : public IFX_SystemFontInfo { family, &iExact); } - void* GetFont(const FX_CHAR* family) override { + void* GetFont(const char* family) override { if (!m_pInfo->GetFont) return nullptr; return m_pInfo->GetFont(m_pInfo, family); diff --git a/fpdfsdk/fpdfdoc_embeddertest.cpp b/fpdfsdk/fpdfdoc_embeddertest.cpp index 3666687d4d..2472db9746 100644 --- a/fpdfsdk/fpdfdoc_embeddertest.cpp +++ b/fpdfsdk/fpdfdoc_embeddertest.cpp @@ -198,37 +198,37 @@ TEST_F(FPDFDocEmbeddertest, GetPageLabels) { EXPECT_EQ(0u, FPDF_GetPageLabel(document(), -2, buf, sizeof(buf))); EXPECT_EQ(0u, FPDF_GetPageLabel(document(), -1, buf, sizeof(buf))); - const FX_WCHAR kExpectedPageLabel0[] = L"i"; + const wchar_t kExpectedPageLabel0[] = L"i"; ASSERT_EQ(4u, FPDF_GetPageLabel(document(), 0, buf, sizeof(buf))); EXPECT_EQ(CFX_WideString(kExpectedPageLabel0), CFX_WideString::FromUTF16LE(buf, FXSYS_len(kExpectedPageLabel0))); - const FX_WCHAR kExpectedPageLabel1[] = L"ii"; + const wchar_t kExpectedPageLabel1[] = L"ii"; ASSERT_EQ(6u, FPDF_GetPageLabel(document(), 1, buf, sizeof(buf))); EXPECT_EQ(CFX_WideString(kExpectedPageLabel1), CFX_WideString::FromUTF16LE(buf, FXSYS_len(kExpectedPageLabel1))); - const FX_WCHAR kExpectedPageLabel2[] = L"1"; + const wchar_t kExpectedPageLabel2[] = L"1"; ASSERT_EQ(4u, FPDF_GetPageLabel(document(), 2, buf, sizeof(buf))); EXPECT_EQ(CFX_WideString(kExpectedPageLabel2), CFX_WideString::FromUTF16LE(buf, FXSYS_len(kExpectedPageLabel2))); - const FX_WCHAR kExpectedPageLabel3[] = L"2"; + const wchar_t kExpectedPageLabel3[] = L"2"; ASSERT_EQ(4u, FPDF_GetPageLabel(document(), 3, buf, sizeof(buf))); EXPECT_EQ(CFX_WideString(kExpectedPageLabel3), CFX_WideString::FromUTF16LE(buf, FXSYS_len(kExpectedPageLabel3))); - const FX_WCHAR kExpectedPageLabel4[] = L"zzA"; + const wchar_t kExpectedPageLabel4[] = L"zzA"; ASSERT_EQ(8u, FPDF_GetPageLabel(document(), 4, buf, sizeof(buf))); EXPECT_EQ(CFX_WideString(kExpectedPageLabel4), CFX_WideString::FromUTF16LE(buf, FXSYS_len(kExpectedPageLabel4))); - const FX_WCHAR kExpectedPageLabel5[] = L"zzB"; + const wchar_t kExpectedPageLabel5[] = L"zzB"; ASSERT_EQ(8u, FPDF_GetPageLabel(document(), 5, buf, sizeof(buf))); EXPECT_EQ(CFX_WideString(kExpectedPageLabel5), CFX_WideString::FromUTF16LE(buf, FXSYS_len(kExpectedPageLabel5))); - const FX_WCHAR kExpectedPageLabel6[] = L""; + const wchar_t kExpectedPageLabel6[] = L""; ASSERT_EQ(2u, FPDF_GetPageLabel(document(), 6, buf, sizeof(buf))); EXPECT_EQ(CFX_WideString(kExpectedPageLabel6), CFX_WideString::FromUTF16LE(buf, FXSYS_len(kExpectedPageLabel6))); diff --git a/fpdfsdk/fpdfview.cpp b/fpdfsdk/fpdfview.cpp index 1e7a651aa8..9100017bea 100644 --- a/fpdfsdk/fpdfview.cpp +++ b/fpdfsdk/fpdfview.cpp @@ -490,7 +490,7 @@ DLLEXPORT FPDF_DOCUMENT STDCALL FPDF_LoadDocument(FPDF_STRING file_path, // NOTE: the creation of the file needs to be by the embedder on the // other side of this API. CFX_RetainPtr pFileAccess = - IFX_SeekableReadStream::CreateFromFilename((const FX_CHAR*)file_path); + IFX_SeekableReadStream::CreateFromFilename((const char*)file_path); if (!pFileAccess) return nullptr; diff --git a/fpdfsdk/fxedit/fxet_list.cpp b/fpdfsdk/fxedit/fxet_list.cpp index 39877c955f..3782cf0a33 100644 --- a/fpdfsdk/fxedit/fxet_list.cpp +++ b/fpdfsdk/fxedit/fxet_list.cpp @@ -728,13 +728,13 @@ int32_t CFX_ListCtrl::GetLastSelected() const { return -1; } -FX_WCHAR CFX_ListCtrl::Toupper(FX_WCHAR c) const { +wchar_t CFX_ListCtrl::Toupper(wchar_t c) const { if ((c >= 'a') && (c <= 'z')) c = c - ('a' - 'A'); return c; } -int32_t CFX_ListCtrl::FindNext(int32_t nIndex, FX_WCHAR nChar) const { +int32_t CFX_ListCtrl::FindNext(int32_t nIndex, wchar_t nChar) const { int32_t nCircleIndex = nIndex; for (int32_t i = 0, sz = m_aListItems.GetSize(); i < sz; i++) { diff --git a/fpdfsdk/fxedit/fxet_list.h b/fpdfsdk/fxedit/fxet_list.h index 01e18bc000..9d07187560 100644 --- a/fpdfsdk/fxedit/fxet_list.h +++ b/fpdfsdk/fxedit/fxet_list.h @@ -262,7 +262,7 @@ class CFX_ListCtrl : protected CFX_ListContainer { void SetMultipleSel(bool bMultiple); bool IsMultipleSel() const; bool IsValid(int32_t nItemIndex) const; - int32_t FindNext(int32_t nIndex, FX_WCHAR nChar) const; + int32_t FindNext(int32_t nIndex, wchar_t nChar) const; int32_t GetFirstSelected() const; CFX_PointF InToOut(const CFX_PointF& point) const; @@ -285,7 +285,7 @@ class CFX_ListCtrl : protected CFX_ListContainer { CFX_WideString GetItemText(int32_t nIndex) const; void SetItemSelect(int32_t nItemIndex, bool bSelected); int32_t GetLastSelected() const; - FX_WCHAR Toupper(FX_WCHAR c) const; + wchar_t Toupper(wchar_t c) const; CPWL_List_Notify* m_pNotify; bool m_bNotifyFlag; diff --git a/fpdfsdk/javascript/Consts.cpp b/fpdfsdk/javascript/Consts.cpp index 82f9b4c945..8c01ae0d48 100644 --- a/fpdfsdk/javascript/Consts.cpp +++ b/fpdfsdk/javascript/Consts.cpp @@ -139,7 +139,7 @@ void CJS_GlobalConsts::DefineJSObjects(CJS_Runtime* pRuntime) { #define GLOBAL_ARRAY(rt, name, ...) \ { \ - const FX_WCHAR* values[] = {__VA_ARGS__}; \ + const wchar_t* values[] = {__VA_ARGS__}; \ v8::Local 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 bd1c8e29d0..a63b7a82fe 100644 --- a/fpdfsdk/javascript/JS_EventHandler.cpp +++ b/fpdfsdk/javascript/JS_EventHandler.cpp @@ -435,7 +435,7 @@ bool CJS_EventHandler::Modifier() { 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::Name() { } } -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 b9836b04e4..1e70a358bc 100644 --- a/fpdfsdk/javascript/JS_EventHandler.h +++ b/fpdfsdk/javascript/JS_EventHandler.h @@ -150,8 +150,8 @@ class CJS_EventHandler { 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 68d929fb3a..048fca0591 100644 --- a/fpdfsdk/javascript/JS_GlobalData.cpp +++ b/fpdfsdk/javascript/JS_GlobalData.cpp @@ -336,18 +336,18 @@ void CJS_GlobalData::SaveGlobalPersisitentVariables() { 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 c8947cd580..c4e8e48b36 100644 --- a/fpdfsdk/javascript/JS_GlobalData.h +++ b/fpdfsdk/javascript/JS_GlobalData.h @@ -59,11 +59,11 @@ class CJS_GlobalData { 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 b058847564..a0c286f68d 100644 --- a/fpdfsdk/javascript/JS_Value.cpp +++ b/fpdfsdk/javascript/JS_Value.cpp @@ -55,10 +55,10 @@ CJS_Value::CJS_Value(CJS_Runtime* pRuntime, CJS_Object* pObj) { 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 @@ void CJS_PropValue::operator>>(CFX_ByteString& str) const { 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 313f0c3e7b..0c19701587 100644 --- a/fpdfsdk/javascript/JS_Value.h +++ b/fpdfsdk/javascript/JS_Value.h @@ -38,8 +38,8 @@ class CJS_Value { 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 @@ class CJS_PropValue { 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); void operator>>(v8::Local&) const; void operator>>(CJS_Array& array) const; diff --git a/fpdfsdk/javascript/PublicMethods.cpp b/fpdfsdk/javascript/PublicMethods.cpp index 3bcbc341ac..f479527ef6 100644 --- a/fpdfsdk/javascript/PublicMethods.cpp +++ b/fpdfsdk/javascript/PublicMethods.cpp @@ -59,14 +59,14 @@ IMPLEMENT_JS_STATIC_GLOBAL_FUN(CJS_PublicMethods) 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 @@ CFX_WideString StrTrim(const CFX_WideString& pStr) { 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 @@ CFX_ByteString CalculateString(double dValue, 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 @@ bool CJS_PublicMethods::isReservedMaskChar(wchar_t ch) { 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 @@ int CJS_PublicMethods::ParseStringInteger(const CFX_WideString& str, 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 CJS_PublicMethods::ParseStringString(const CFX_WideString& str, 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 @@ double CJS_PublicMethods::ParseNormalDate(const CFX_WideString& value, 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 @@ double CJS_PublicMethods::MakeRegularDate(const CFX_WideString& value, if (bExit) break; - FX_WCHAR c = format.GetAt(i); + wchar_t c = format.GetAt(i); switch (c) { case ':': case '.': @@ -630,7 +630,7 @@ CFX_WideString CJS_PublicMethods::MakeFormatDate(double dDate, 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 @@ bool CJS_PublicMethods::AFNumber_Keystroke(CJS_Runtime* pRuntime, 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 @@ double CJS_PublicMethods::MakeInterDate(const CFX_WideString& strValue) { std::vector 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 @@ bool CJS_PublicMethods::AFDate_Format(CJS_Runtime* pRuntime, } 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(iIndex) >= FX_ArraySize(cFormats))) iIndex = 0; @@ -1273,20 +1273,20 @@ bool CJS_PublicMethods::AFDate_Keystroke(CJS_Runtime* pRuntime, } 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(iIndex) >= FX_ArraySize(cFormats))) iIndex = 0; @@ -1307,8 +1307,8 @@ bool CJS_PublicMethods::AFTime_Format(CJS_Runtime* pRuntime, } 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(iIndex) >= FX_ArraySize(cFormats))) iIndex = 0; @@ -1328,8 +1328,8 @@ bool CJS_PublicMethods::AFTime_Keystroke(CJS_Runtime* pRuntime, } 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(iIndex) >= FX_ArraySize(cFormats))) iIndex = 0; @@ -1461,7 +1461,7 @@ bool CJS_PublicMethods::AFSpecial_KeystrokeEx( 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 @@ bool CJS_PublicMethods::AFExtractNums(CJS_Runtime* pRuntime, 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 060c74303a..0f6123cd17 100644 --- a/fpdfsdk/javascript/PublicMethods.h +++ b/fpdfsdk/javascript/PublicMethods.h @@ -153,7 +153,7 @@ class CJS_PublicMethods : public CJS_Object { 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 1ece0b6f79..a6da9c494a 100644 --- a/fpdfsdk/javascript/cjs_runtime.cpp +++ b/fpdfsdk/javascript/cjs_runtime.cpp @@ -221,7 +221,7 @@ CFX_WideString ChangeObjName(const CFX_WideString& str) { } 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 @@ bool CJS_Runtime::SetValueByName(const CFX_ByteStringC& utf8Name, 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 a450606b1a..92fbc9eec6 100644 --- a/fpdfsdk/javascript/global.cpp +++ b/fpdfsdk/javascript/global.cpp @@ -60,12 +60,12 @@ void JSGlobalAlternate::Initial(CPDFSDK_FormFillEnvironment* pFormFillEnv) { 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::DelProperty(CJS_Runtime* pRuntime, } 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 e313929bea..7c002488d2 100644 --- a/fpdfsdk/javascript/global.h +++ b/fpdfsdk/javascript/global.h @@ -39,13 +39,13 @@ class JSGlobalAlternate : public CJS_EmbedObj { const std::vector& 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 3221cfb0cb..32104b41a6 100644 --- a/fpdfsdk/javascript/util.cpp +++ b/fpdfsdk/javascript/util.cpp @@ -46,14 +46,14 @@ namespace { // 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 @@ bool util::printx(CJS_Runtime* pRuntime, 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 @@ bool util::byteToChar(CJS_Runtime* pRuntime, return false; } - CFX_WideString wStr(static_cast(arg)); + CFX_WideString wStr(static_cast(arg)); vRet = CJS_Value(pRuntime, wStr.c_str()); return true; } diff --git a/fpdfsdk/pdfwindow/PWL_Icon.cpp b/fpdfsdk/pdfwindow/PWL_Icon.cpp index b0d0c7686d..4ce63299e4 100644 --- a/fpdfsdk/pdfwindow/PWL_Icon.cpp +++ b/fpdfsdk/pdfwindow/PWL_Icon.cpp @@ -96,7 +96,7 @@ CFX_ByteString CPWL_Image::GetImageAlias() { return CFX_ByteString(); } -void CPWL_Image::SetImageAlias(const FX_CHAR* sImageAlias) { +void CPWL_Image::SetImageAlias(const char* sImageAlias) { m_sImageAlias = sImageAlias; } diff --git a/fpdfsdk/pdfwindow/PWL_Icon.h b/fpdfsdk/pdfwindow/PWL_Icon.h index 4b62db4c99..bdcae9f7bd 100644 --- a/fpdfsdk/pdfwindow/PWL_Icon.h +++ b/fpdfsdk/pdfwindow/PWL_Icon.h @@ -26,7 +26,7 @@ class CPWL_Image : public CPWL_Wnd { void GetImageSize(FX_FLOAT& fWidth, FX_FLOAT& fHeight); CFX_Matrix GetImageMatrix(); CFX_ByteString GetImageAlias(); - void SetImageAlias(const FX_CHAR* sImageAlias); + void SetImageAlias(const char* sImageAlias); protected: CPDF_Stream* m_pPDFStream; diff --git a/fpdfsdk/pdfwindow/PWL_ListBox.cpp b/fpdfsdk/pdfwindow/PWL_ListBox.cpp index ed96e203fd..18b45b5c3f 100644 --- a/fpdfsdk/pdfwindow/PWL_ListBox.cpp +++ b/fpdfsdk/pdfwindow/PWL_ListBox.cpp @@ -428,7 +428,7 @@ int32_t CPWL_ListBox::GetCount() const { return m_pList->GetCount(); } -int32_t CPWL_ListBox::FindNext(int32_t nIndex, FX_WCHAR nChar) const { +int32_t CPWL_ListBox::FindNext(int32_t nIndex, wchar_t nChar) const { return m_pList->FindNext(nIndex, nChar); } diff --git a/fpdfsdk/pdfwindow/PWL_ListBox.h b/fpdfsdk/pdfwindow/PWL_ListBox.h index f9108a17de..fa78b37bcb 100644 --- a/fpdfsdk/pdfwindow/PWL_ListBox.h +++ b/fpdfsdk/pdfwindow/PWL_ListBox.h @@ -92,7 +92,7 @@ class CPWL_ListBox : public CPWL_Wnd { int32_t GetCurSel() const; bool IsItemSelected(int32_t nItemIndex) const; int32_t GetTopVisibleIndex() const; - int32_t FindNext(int32_t nIndex, FX_WCHAR nChar) const; + int32_t FindNext(int32_t nIndex, wchar_t nChar) const; CFX_FloatRect GetContentRect() const; FX_FLOAT GetFirstHeight() const; CFX_FloatRect GetListRect() const; -- cgit v1.2.3