fpdfsdk/src/javascript/JS_GlobalData.cpp - Issue 1108903002: Merge to XFA: Reduce usage of operator LPCWSTR from CFX_WideString().

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: fpdfsdk/src/javascript/JS_GlobalData.cpp

Issue 1108903002: Merge to XFA: Reduce usage of operator LPCWSTR from CFX_WideString(). (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@xfa

Patch Set: 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: fpdfsdk/src/javascript/JS_GlobalData.cpp

diff --git a/fpdfsdk/src/javascript/JS_GlobalData.cpp b/fpdfsdk/src/javascript/JS_GlobalData.cpp

index 22077268900ad14392e8c9624fa7a2d552f3c517..b242ae8031167abd7203c9a0f50fc4a41d3af610 100644

--- a/fpdfsdk/src/javascript/JS_GlobalData.cpp

+++ b/fpdfsdk/src/javascript/JS_GlobalData.cpp

@@ -353,8 +353,7 @@ void CJS_GlobalData::LoadGlobalPersistentVariables()

FX_LPBYTE pBuffer = NULL;

FX_INT32 nLength = 0;

- LoadFileBuffer(m_sFilePath, pBuffer, nLength);

+ LoadFileBuffer(m_sFilePath.c_str(), pBuffer, nLength);

CRYPT_ArcFourCryptBlock(pBuffer, nLength, JS_RC4KEY, sizeof(JS_RC4KEY));

if (pBuffer)

@@ -509,7 +508,7 @@ void CJS_GlobalData::SaveGlobalPersisitentVariables()

sFile.AppendBlock(sData.GetBuffer(), sData.GetSize());

CRYPT_ArcFourCryptBlock(sFile.GetBuffer(), sFile.GetSize(), JS_RC4KEY, sizeof(JS_RC4KEY));

- WriteFileBuffer(m_sFilePath, (FX_LPCSTR)sFile.GetBuffer(), sFile.GetSize());

+ WriteFileBuffer(m_sFilePath.c_str(), (FX_LPCSTR)sFile.GetBuffer(), sFile.GetSize());

}

void CJS_GlobalData::LoadFileBuffer(FX_LPCWSTR sFilePath, FX_LPBYTE& pBuffer, FX_INT32& nLength)

« no previous file with comments | « fpdfsdk/src/javascript/JS_Context.cpp ('k') | fpdfsdk/src/javascript/JS_Value.cpp » ('j') | no next file with comments »