summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--core/fxcrt/widestring_unittest.cpp16
-rw-r--r--fxjs/cfxjse_formcalc_context.cpp11
-rw-r--r--fxjs/xfa/cjx_object.cpp2
3 files changed, 22 insertions, 7 deletions
diff --git a/core/fxcrt/widestring_unittest.cpp b/core/fxcrt/widestring_unittest.cpp
index 93f6b07e72..37d4ecd581 100644
--- a/core/fxcrt/widestring_unittest.cpp
+++ b/core/fxcrt/widestring_unittest.cpp
@@ -1381,6 +1381,22 @@ TEST(WideString, FormatOutOfRangeChar) {
EXPECT_NE(L"", WideString::Format(L"unsupported char '%c'", 0x00FF00FF));
}
+TEST(WideString, FormatString) {
+ // %ls and wide characters are the reliable combination across platforms.
+ EXPECT_EQ(L"", WideString::Format(L"%ls", L""));
+ EXPECT_EQ(L"", WideString::Format(L"%ls", WideString().c_str()));
+ EXPECT_EQ(L"clams", WideString::Format(L"%ls", L"clams"));
+ EXPECT_EQ(L"cla", WideString::Format(L"%.3ls", L"clams"));
+ EXPECT_EQ(L"\u043e\u043f", WideString(L"\u043e\u043f"));
+
+#if _FX_OS_ != _FX_OS_MACOSX_
+ // See https://bugs.chromium.org/p/pdfium/issues/detail?id=1132
+ EXPECT_EQ(L"\u043e\u043f", WideString::Format(L"\u043e\u043f"));
+ EXPECT_EQ(L"\u043e\u043f", WideString::Format(L"%ls", L"\u043e\u043f"));
+ EXPECT_EQ(L"\u043e", WideString::Format(L"%.1ls", L"\u043e\u043f"));
+#endif
+}
+
TEST(WideString, Empty) {
WideString empty_str;
EXPECT_TRUE(empty_str.IsEmpty());
diff --git a/fxjs/cfxjse_formcalc_context.cpp b/fxjs/cfxjse_formcalc_context.cpp
index cf42fb26c7..4201059c06 100644
--- a/fxjs/cfxjse_formcalc_context.cpp
+++ b/fxjs/cfxjse_formcalc_context.cpp
@@ -6199,9 +6199,8 @@ void CFXJSE_FormCalcContext::GlobalPropertyGetter(CFXJSE_Value* pValue) {
void CFXJSE_FormCalcContext::ThrowNoDefaultPropertyException(
const ByteStringView& name) const {
- // TODO(tsepez): check usage of c_str() below.
- ThrowException(L"%.16S doesn't have a default property.",
- name.unterminated_c_str());
+ ThrowException(L"%ls doesn't have a default property.",
+ WideString::FromUTF8(name).c_str());
}
void CFXJSE_FormCalcContext::ThrowCompilerErrorException() const {
@@ -6220,14 +6219,14 @@ void CFXJSE_FormCalcContext::ThrowPropertyNotInObjectException(
const WideString& name,
const WideString& exp) const {
ThrowException(
- L"An attempt was made to reference property '%.16s' of a non-object "
- L"in SOM expression %.16s.",
+ L"An attempt was made to reference property '%ls' of a non-object "
+ L"in SOM expression %ls.",
name.c_str(), exp.c_str());
}
void CFXJSE_FormCalcContext::ThrowParamCountMismatchException(
const WideString& method) const {
- ThrowException(L"Incorrect number of parameters calling method '%.16s'.",
+ ThrowException(L"Incorrect number of parameters calling method '%ls'.",
method.c_str());
}
diff --git a/fxjs/xfa/cjx_object.cpp b/fxjs/xfa/cjx_object.cpp
index 6984c3a998..23e754d4b7 100644
--- a/fxjs/xfa/cjx_object.cpp
+++ b/fxjs/xfa/cjx_object.cpp
@@ -193,7 +193,7 @@ void CJX_Object::ThrowIndexOutOfBoundsException() const {
void CJX_Object::ThrowParamCountMismatchException(
const WideString& method) const {
- ThrowException(L"Incorrect number of parameters calling method '%.16s'.",
+ ThrowException(L"Incorrect number of parameters calling method '%ls'.",
method.c_str());
}