core/src/fxcrt/fx_basic_util.cpp - Issue 1103343002: Fix windows-specific usage of CFX_WideStr::operator LPCWSTR().

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: core/src/fxcrt/fx_basic_util.cpp

Issue 1103343002: Fix windows-specific usage of CFX_WideStr::operator LPCWSTR(). (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master

Patch Set: Rebase from linux side. Created 5 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: 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 98839b44c01744d2aa3410187b101f4800820a3e..fd411919f1bd3bedaedbab587ce01bbb85a835f0 100644

--- a/core/src/fxcrt/fx_basic_util.cpp

+++ b/core/src/fxcrt/fx_basic_util.cpp

@@ -344,9 +344,9 @@ void* FX_OpenFolder(FX_LPCWSTR path)

#if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_

CFindFileDataW* pData = new CFindFileDataW;

#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;

« no previous file with comments | « core/src/fpdfdoc/doc_form.cpp ('k') | fpdfsdk/src/fsdk_baseform.cpp » ('j') | no next file with comments »