Merge to XFA: Make FPDF_WIDESTRING work regardless of endianness.
Original Review URL: https://codereview.chromium.org/1554363002 .
(cherry picked from commit ed34cdf99d5a4b33e57f81f9244a311f6fb86db3)
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/1559373002 .
diff --git a/testing/test_support.cpp b/testing/test_support.cpp
index f71f6f8..c7ab10e 100644
--- a/testing/test_support.cpp
+++ b/testing/test_support.cpp
@@ -98,7 +98,7 @@
return buffer;
}
-std::wstring GetWideString(FPDF_WIDESTRING wstr) {
+std::wstring GetPlatformWString(FPDF_WIDESTRING wstr) {
if (!wstr)
return nullptr;
@@ -114,6 +114,19 @@
return platform_string;
}
+FPDF_WIDESTRING GetFPDFWideString(const std::wstring& wstr) {
+ size_t length = sizeof(uint16_t) * (wstr.length() + 1);
+ unsigned char* ptr = static_cast<unsigned char*>(malloc(length));
+ size_t i = 0;
+ for (wchar_t w : wstr) {
+ ptr[i++] = w & 0xff;
+ ptr[i++] = (w >> 8) & 0xff;
+ }
+ ptr[i++] = 0;
+ ptr[i] = 0;
+ return reinterpret_cast<FPDF_WIDESTRING>(ptr);
+}
+
#ifdef PDF_ENABLE_V8
#ifdef V8_USE_EXTERNAL_STARTUP_DATA
bool InitializeV8ForPDFium(const std::string& exe_path,