summaryrefslogtreecommitdiff
path: root/core/src/fxcrt
diff options
context:
space:
mode:
authorTom Sepez <tsepez@chromium.org>2015-04-27 13:22:54 -0700
committerTom Sepez <tsepez@chromium.org>2015-04-27 13:22:54 -0700
commit6714cd8dd3327c0352f3d1fd03433692ff83b07f (patch)
tree0f05b09c56f7017ef2bba93ff94b768272285a63 /core/src/fxcrt
parent4f7bc04ed64edbf72f49b2189f85bb88f0b547c7 (diff)
downloadpdfium-6714cd8dd3327c0352f3d1fd03433692ff83b07f.tar.xz
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
Diffstat (limited to 'core/src/fxcrt')
-rw-r--r--core/src/fxcrt/fx_basic_util.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/src/fxcrt/fx_basic_util.cpp b/core/src/fxcrt/fx_basic_util.cpp
index 272d43eef7..be736f1b21 100644
--- a/core/src/fxcrt/fx_basic_util.cpp
+++ b/core/src/fxcrt/fx_basic_util.cpp
@@ -353,9 +353,9 @@ void* FX_OpenFolder(FX_LPCWSTR path)
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;