Getting rid of more (FX_LPCWSTR) casts and fixing two bugs revealed by this.

Since casts to FX_LPCWSTR have been shown to hide bugs I tried removing
more of them, targeting those places where a cast was used to force a
conversion from CFX_WideString to FX_LPCWSTR, replacing these casts with
calls to the newly added .c_str() function. This revealed two places
where the cast was hiding a bug -- where ->c_str() was required instead!

This removes ~33 FX_LPCWSTR casts and there are ~31 left, many of which
will go away in some future change.

Also includes this change:

Removing unnecessary casts from wchar_t* to wchar_t*, by various names.

Original patch from Bruce Dawson(brucedawson@chromium.org)

R=bo_xu@foxitsoftware.com, tsepez@chromium.org

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

7 files changed, 25 insertions, 25 deletions

diff --git a/fpdfsdk/include/javascript/JS_Define.h b/fpdfsdk/include/javascript/JS_Define.h
index 62a8d1417e..379af0662a 100644
--- a/fpdfsdk/include/javascript/JS_Define.h
+++ b/fpdfsdk/include/javascript/JS_Define.h
@@ -341,8 +341,8 @@ const wchar_t * js_class_name::m_pClassName = JS_WIDESTRING(class_name);\
 	ASSERT(pObj != NULL);\
 	FX_BOOL bRet = FALSE;\
 	MEMLEAKCHECK_1();\
-	bRet = pObj->QueryProperty((FX_LPCWSTR)propname);\
-	MEMLEAKCHECK_2(class_name, (FX_LPCWSTR)prop_name);\
+	bRet = pObj->QueryProperty(propname.c_str());\
+	MEMLEAKCHECK_2(class_name, prop_name.c_str());\
 	if (bRet)\
 	{\
 		info.GetReturnValue().Set(0x004);\
@@ -376,7 +376,7 @@ const wchar_t * js_class_name::m_pClassName = JS_WIDESTRING(class_name);\
 	JS_ErrorString sError;\
 	FX_BOOL bRet = FALSE;\
 	MEMLEAKCHECK_1();\
-	bRet = pObj->DoProperty(cc, (FX_LPCWSTR)propname, value, sError);\
+	bRet = pObj->DoProperty(cc, propname.c_str(), value, sError);\
 	MEMLEAKCHECK_2(class_name, L"GetProperty");\
 	if (bRet)\
 	{\
@@ -414,7 +414,7 @@ const wchar_t * js_class_name::m_pClassName = JS_WIDESTRING(class_name);\
 	JS_ErrorString sError;\
 	FX_BOOL bRet = FALSE;\
 	MEMLEAKCHECK_1();\
-	bRet = pObj->DoProperty(cc, (FX_LPCWSTR)propname, PropValue, sError);\
+	bRet = pObj->DoProperty(cc, propname.c_str(), PropValue, sError);\
 	MEMLEAKCHECK_2(class_name,L"PutProperty");\
 	if (bRet)\
 	{\
@@ -449,7 +449,7 @@ const wchar_t * js_class_name::m_pClassName = JS_WIDESTRING(class_name);\
 	JS_ErrorString sError;\
 	FX_BOOL bRet = FALSE;\
 	MEMLEAKCHECK_1();\
-	bRet = pObj->DelProperty(cc, (FX_LPCWSTR)propname, sError);\
+	bRet = pObj->DelProperty(cc, propname.c_str(), sError);\
 	MEMLEAKCHECK_2(class_name,L"DelProperty");\
 	if (bRet)\
 	{\
diff --git a/fpdfsdk/src/fsdk_baseform.cpp b/fpdfsdk/src/fsdk_baseform.cpp
index aa87dd56bb..e73bd32913 100644
--- a/fpdfsdk/src/fsdk_baseform.cpp
+++ b/fpdfsdk/src/fsdk_baseform.cpp
@@ -1074,9 +1074,9 @@ void CPDFSDK_Widget::ResetAppearance_ComboBox(FX_LPCWSTR sValue)
 			FX_INT32 nCurSel = pField->GetSelectedIndex(0);
 
 			if (nCurSel < 0)
-				pEdit->SetText((FX_LPCWSTR)pField->GetValue());
+				pEdit->SetText(pField->GetValue().c_str());
 			else
-				pEdit->SetText((FX_LPCWSTR)pField->GetOptionLabel(nCurSel));
+				pEdit->SetText(pField->GetOptionLabel(nCurSel).c_str());
 		}
 
 		CPDF_Rect rcContent = pEdit->GetContentRect();
@@ -1161,7 +1161,7 @@ void CPDFSDK_Widget::ResetAppearance_ListBox()
 				}
 			}
 
-			pEdit->SetText((FX_LPCWSTR)pField->GetOptionLabel(i));
+			pEdit->SetText(pField->GetOptionLabel(i).c_str());
 
 			CPDF_Rect rcContent = pEdit->GetContentRect();
 			FX_FLOAT fItemHeight = rcContent.Height();
@@ -1280,7 +1280,7 @@ void CPDFSDK_Widget::ResetAppearance_TextField(FX_LPCWSTR sValue)
 		if (sValue)
 			pEdit->SetText(sValue);
 		else
-			pEdit->SetText((FX_LPCWSTR)pField->GetValue());
+			pEdit->SetText(pField->GetValue().c_str());
 
 		CPDF_Rect rcContent = pEdit->GetContentRect();
 
@@ -2282,7 +2282,7 @@ FX_BOOL CPDFSDK_InterForm::SubmitFields(const CFX_WideString& csDestination, con
 			return FALSE;
 	}
 
-	pEnv->JS_docSubmitForm(pBuffer, nBufSize, (FX_LPCWSTR)csDestination);
+	pEnv->JS_docSubmitForm(pBuffer, nBufSize, csDestination.c_str());
 	
 	return TRUE;
 }
@@ -2433,7 +2433,7 @@ FX_BOOL CPDFSDK_InterForm::SubmitForm(const CFX_WideString& sDestination, FX_BOO
 			return FALSE;
 	}
 
-	pEnv->JS_docSubmitForm(pBuffer, nBufSize, (FX_LPCWSTR)sDestination);
+	pEnv->JS_docSubmitForm(pBuffer, nBufSize, sDestination.c_str());
 	
 	if (bUrlEncoded && pBuffer)
 	{
diff --git a/fpdfsdk/src/javascript/Document.cpp b/fpdfsdk/src/javascript/Document.cpp
index 933ba29f68..c10f937f5d 100644
--- a/fpdfsdk/src/javascript/Document.cpp
+++ b/fpdfsdk/src/javascript/Document.cpp
@@ -605,7 +605,7 @@ FX_BOOL Document::mailForm(OBJ_METHOD_PARAMS)
 	ASSERT(pRuntime != NULL);
 
 	pRuntime->BeginBlock();
-	pEnv->JS_docmailForm(textBuf.GetBuffer(), textBuf.GetLength(), bUI, (FX_LPCWSTR)cTo, (FX_LPCWSTR)cSubject, (FX_LPCWSTR)cCc, (FX_LPCWSTR)cBcc, (FX_LPCWSTR)cMsg);
+	pEnv->JS_docmailForm(textBuf.GetBuffer(), textBuf.GetLength(), bUI, cTo.c_str(), cSubject.c_str(), cCc.c_str(), cBcc.c_str(), cMsg.c_str());
 	pRuntime->EndBlock();
 	return TRUE;
 }
@@ -999,7 +999,7 @@ FX_BOOL Document::mailDoc(OBJ_METHOD_PARAMS)
 
 	pRuntime->BeginBlock();
 	CPDFDoc_Environment* pEnv = pRuntime->GetReaderApp();
-	pEnv->JS_docmailForm(NULL, 0, bUI, (FX_LPCWSTR)cTo, (FX_LPCWSTR)cSubject, (FX_LPCWSTR)cCc, (FX_LPCWSTR)cBcc, (FX_LPCWSTR)cMsg);
+	pEnv->JS_docmailForm(NULL, 0, bUI, cTo.c_str(), cSubject.c_str(), cCc.c_str(), cBcc.c_str(), cMsg.c_str());
 	pRuntime->EndBlock();
 
 	return TRUE;
diff --git a/fpdfsdk/src/javascript/Field.cpp b/fpdfsdk/src/javascript/Field.cpp
index a84599298e..7a9f9a0a14 100644
--- a/fpdfsdk/src/javascript/Field.cpp
+++ b/fpdfsdk/src/javascript/Field.cpp
@@ -194,7 +194,7 @@ FX_BOOL Field::AttachField(Document* pDocument, const CFX_WideString& csFieldNam
 	{
 		std::wstring strFieldName;
 		int iControlNo = -1;
-		ParseFieldName((FX_LPCWSTR)swFieldNameTemp, strFieldName, iControlNo);
+		ParseFieldName(swFieldNameTemp.c_str(), strFieldName, iControlNo);
 		if (iControlNo == -1) return FALSE;
 		
 		m_FieldName = strFieldName.c_str();
@@ -1573,7 +1573,7 @@ FX_BOOL Field::exportValues(OBJ_PROP_PARAMS)
 				CPDF_FormControl* pFormControl = pFormField->GetControl(i);
 				ASSERT(pFormControl != NULL);
 
-				ExportValusArray.SetElement(i, CJS_Value(m_isolate,(FX_LPCWSTR)pFormControl->GetExportValue()));
+				ExportValusArray.SetElement(i, CJS_Value(m_isolate,pFormControl->GetExportValue().c_str()));
 			}
 		}
 		else
@@ -1582,7 +1582,7 @@ FX_BOOL Field::exportValues(OBJ_PROP_PARAMS)
 			CPDF_FormControl* pFormControl = pFormField->GetControl(m_nFormControlIndex);
 			if (!pFormControl) return FALSE;
 
-			ExportValusArray.SetElement(0, CJS_Value(m_isolate,(FX_LPCWSTR)pFormControl->GetExportValue()));
+			ExportValusArray.SetElement(0, CJS_Value(m_isolate,pFormControl->GetExportValue().c_str()));
 		}
 
 		vp << ExportValusArray;
@@ -3322,7 +3322,7 @@ FX_BOOL Field::valueAsString(OBJ_PROP_PARAMS)
 		{
 			if (pFormField->GetControl(i)->IsChecked())
 			{
-				vp << (FX_LPCWSTR)pFormField->GetControl(i)->GetExportValue();
+				vp << pFormField->GetControl(i)->GetExportValue().c_str();
 				break;
 			}
 			else
@@ -3334,7 +3334,7 @@ FX_BOOL Field::valueAsString(OBJ_PROP_PARAMS)
 		vp << L"";
 	}
 	else
-		vp << (FX_LPCWSTR)pFormField->GetValue();
+		vp << pFormField->GetValue().c_str();
 
 	return TRUE;
 }
diff --git a/fpdfsdk/src/javascript/PublicMethods.cpp b/fpdfsdk/src/javascript/PublicMethods.cpp
index 4c51c9ae25..82bffe67bf 100644
--- a/fpdfsdk/src/javascript/PublicMethods.cpp
+++ b/fpdfsdk/src/javascript/PublicMethods.cpp
@@ -1554,7 +1554,7 @@ FX_BOOL CJS_PublicMethods::AFDate_FormatEx(OBJ_METHOD_PARAMS)
 	if (JS_PortIsNan(dDate))
 	{
 		CFX_WideString swMsg;
-		swMsg.Format(JSGetStringFromID(pContext, IDS_STRING_JSPARSEDATE), (FX_LPCWSTR)sFormat);
+		swMsg.Format(JSGetStringFromID(pContext, IDS_STRING_JSPARSEDATE), sFormat.c_str());
 		Alert(pContext, swMsg);
 		return FALSE;
 	}
@@ -1652,7 +1652,7 @@ FX_BOOL CJS_PublicMethods::AFDate_KeystrokeEx(OBJ_METHOD_PARAMS)
 		if (bWrongFormat || JS_PortIsNan(dRet))
 		{
 			CFX_WideString swMsg;
-			swMsg.Format(JSGetStringFromID(pContext, IDS_STRING_JSPARSEDATE), (FX_LPCWSTR)sFormat);
+			swMsg.Format(JSGetStringFromID(pContext, IDS_STRING_JSPARSEDATE), sFormat.c_str());
 			Alert(pContext, swMsg);
 			pEvent->Rc() = FALSE;
 			return TRUE;
@@ -2059,7 +2059,7 @@ FX_BOOL CJS_PublicMethods::AFParseDateEx(OBJ_METHOD_PARAMS)
 	if (JS_PortIsNan(dDate))
 	{
 		CFX_WideString swMsg;
-		swMsg.Format(JSGetStringFromID(pContext, IDS_STRING_JSPARSEDATE), (FX_LPCWSTR)sFormat);
+		swMsg.Format(JSGetStringFromID(pContext, IDS_STRING_JSPARSEDATE), sFormat.c_str());
 		Alert((CJS_Context *)cc, swMsg);
 		return FALSE;
 	}
@@ -2304,7 +2304,7 @@ FX_BOOL CJS_PublicMethods::AFExtractNums(OBJ_METHOD_PARAMS)
 		{
 			if (sPart.GetLength() > 0)
 			{
-				nums.SetElement(nIndex,CJS_Value(isolate,(FX_LPCWSTR)sPart));
+				nums.SetElement(nIndex,CJS_Value(isolate,sPart.c_str()));
 				sPart = L"";
 				nIndex ++;
 			}
@@ -2313,7 +2313,7 @@ FX_BOOL CJS_PublicMethods::AFExtractNums(OBJ_METHOD_PARAMS)
 
 	if (sPart.GetLength() > 0)
 	{
-		nums.SetElement(nIndex,CJS_Value(isolate,(FX_LPCWSTR)sPart));	
+		nums.SetElement(nIndex,CJS_Value(isolate,sPart.c_str()));	
 	}
 
 	if (nums.GetLength() > 0)
diff --git a/fpdfsdk/src/javascript/app.cpp b/fpdfsdk/src/javascript/app.cpp
index abba6ed15b..ebd68958b2 100644
--- a/fpdfsdk/src/javascript/app.cpp
+++ b/fpdfsdk/src/javascript/app.cpp
@@ -813,7 +813,7 @@ FX_BOOL app::mailMsg(OBJ_METHOD_PARAMS)
 	ASSERT(pApp != NULL);
 
 	pRuntime->BeginBlock();
-	pApp->JS_docmailForm(NULL, 0, bUI, (FX_LPCWSTR)cTo, (FX_LPCWSTR)cSubject, (FX_LPCWSTR)cCc, (FX_LPCWSTR)cBcc, (FX_LPCWSTR)cMsg);
+	pApp->JS_docmailForm(NULL, 0, bUI, cTo.c_str(), cSubject.c_str(), cCc.c_str(), cBcc.c_str(), cMsg.c_str());
 	///////////////////////////////////////////////////////////////////////////////////////////////
 	pRuntime->EndBlock();
 
diff --git a/fpdfsdk/src/javascript/global.cpp b/fpdfsdk/src/javascript/global.cpp
index 03bdd5b575..1d61571c8b 100644
--- a/fpdfsdk/src/javascript/global.cpp
+++ b/fpdfsdk/src/javascript/global.cpp
@@ -341,7 +341,7 @@ void global_alternate::ObjectToArray(v8::Handle<v8::Object> pObj, CJS_GlobalVari
 		CFX_WideString ws = JS_ToString(JS_GetArrayElemnet(pKeyList, i));
 		CFX_ByteString sKey = ws.UTF8Encode();
 
-		v8::Handle<v8::Value> v = JS_GetObjectElement(isolate, pObj, (FX_LPCWSTR)ws);
+		v8::Handle<v8::Value> v = JS_GetObjectElement(isolate, pObj, ws.c_str());
 		FXJSVALUETYPE vt = GET_VALUE_TYPE(v);
 		switch (vt)
 		{