commit 6714cd8dd3327c0352f3d1fd03433692ff83b07f
author Tom Sepez <tsepez@chromium.org> Mon Apr 27 13:22:54 2015 -0700
committer Tom Sepez <tsepez@chromium.org> Mon Apr 27 13:22:54 2015 -0700
tree 0f05b09c56f7017ef2bba93ff94b768272285a63
parent 4f7bc04ed64edbf72f49b2189f85bb88f0b547c7

Merge to XFA: Fix windows-specific usage of CFX_WideStr::operator LPCWSTR().

Original Review URL: https://codereview.chromium.org/1103343002

R=brucedawson@chromium.org
TBR=brucedawson@chromium.org

Review URL: https://codereview.chromium.org/1105253002

core/include/fxge/fx_ge_win32.h

diff --git a/core/include/fxge/fx_ge_win32.h b/core/include/fxge/fx_ge_win32.h
index 311d355..d39a807 100644
--- a/core/include/fxge/fx_ge_win32.h
+++ b/core/include/fxge/fx_ge_win32.h
@@ -38,7 +38,7 @@
 
     static CFX_DIBitmap* LoadFromFile(FX_LPCSTR filename)
     {
-        return LoadFromFile(CFX_WideString::FromLocal(filename));
+        return LoadFromFile(CFX_WideString::FromLocal(filename).c_str());
     }
 
     static CFX_DIBitmap* LoadDIBitmap(WINDIB_Open_Args_ args);

core/src/fpdfdoc/doc_form.cpp

diff --git a/core/src/fpdfdoc/doc_form.cpp b/core/src/fpdfdoc/doc_form.cpp
index bb2c3a1..87887d7 100644
--- a/core/src/fpdfdoc/doc_form.cpp
+++ b/core/src/fpdfdoc/doc_form.cpp
@@ -468,7 +468,7 @@
     if (iCharSet == 1) {
         iCharSet = GetNativeCharSet();
     }
-    HFONT hFont = ::CreateFontW(0, 0, 0, 0, 0, 0, 0, 0, iCharSet, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH | FF_DONTCARE, csFontName);
+    HFONT hFont = ::CreateFontW(0, 0, 0, 0, 0, 0, 0, 0, iCharSet, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH | FF_DONTCARE, csFontName.c_str());
     if (hFont != NULL) {
         LOGFONTA lf;
         memset(&lf, 0, sizeof(LOGFONTA));

core/src/fxcrt/fx_basic_util.cpp

diff --git a/core/src/fxcrt/fx_basic_util.cpp b/core/src/fxcrt/fx_basic_util.cpp
index 272d43e..be736f1 100644
--- a/core/src/fxcrt/fx_basic_util.cpp
+++ b/core/src/fxcrt/fx_basic_util.cpp
@@ -353,9 +353,9 @@
         return NULL;
     }
 #ifdef _FX_WINAPI_PARTITION_DESKTOP_
-    pData->m_Handle = FindFirstFileW(CFX_WideString(path) + L"/*.*", &pData->m_FindData);
+    pData->m_Handle = FindFirstFileW((CFX_WideString(path) + L"/*.*").c_str(), &pData->m_FindData);
 #else
-    pData->m_Handle = FindFirstFileExW(CFX_WideString(path) + L"/*.*", FindExInfoStandard, &pData->m_FindData, FindExSearchNameMatch, NULL, 0);
+    pData->m_Handle = FindFirstFileExW((CFX_WideString(path) + L"/*.*").c_str(), FindExInfoStandard, &pData->m_FindData, FindExSearchNameMatch, NULL, 0);
 #endif
     if (pData->m_Handle == INVALID_HANDLE_VALUE) {
         delete pData;

fpdfsdk/src/fsdk_baseform.cpp

diff --git a/fpdfsdk/src/fsdk_baseform.cpp b/fpdfsdk/src/fsdk_baseform.cpp
index f989394..976d276 100644
--- a/fpdfsdk/src/fsdk_baseform.cpp
+++ b/fpdfsdk/src/fsdk_baseform.cpp
@@ -2630,7 +2630,7 @@
 
 	CPDF_Stream* pRetStream = NULL;
 
-	if (CFX_DIBitmap* pBmp = CFX_WindowsDIB::LoadFromFile(sFile))
+	if (CFX_DIBitmap* pBmp = CFX_WindowsDIB::LoadFromFile(sFile.c_str()))
 	{
 		int nWidth = pBmp->GetWidth();
 		int nHeight = pBmp->GetHeight();