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

fpdfsdk/src/javascript/util.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "../../include/javascript/JavaScript.h"
 #include "../../include/javascript/IJavaScript.h"
 #include "../../include/javascript/JS_Define.h"
 #include "../../include/javascript/JS_Object.h"
@@ skipping 164 matching lines @@
 
                 CFX_WideString strSegment;
                 if (iIndex >= iSize) {
                         c_strResult += c_strFormat;
                         continue;
                 }
 
                 switch (ParstDataType(&c_strFormat))
                 {
                         case UTIL_INT:
-                                strSegment.Format((FX_LPCWSTR)c_strFormat.c_str(),(int)params[iIndex]);
+                                strSegment.Format(c_strFormat.c_str(),(int)params[iIndex]);
                                 break;
                         case UTIL_DOUBLE:
-                                strSegment.Format((FX_LPCWSTR)c_strFormat.c_str(),(double)params[iIndex]);
+                                strSegment.Format(c_strFormat.c_str(),(double)params[iIndex]);
                                 break;
                         case UTIL_STRING:
-                                strSegment.Format((FX_LPCWSTR)c_strFormat.c_str(),(FX_LPCWSTR)params[iIndex].operator CFX_WideString());
+                                strSegment.Format(c_strFormat.c_str(),(FX_LPCWSTR)params[iIndex].operator CFX_WideString());
                                 break;
                         default:
-                                strSegment.Format(L"%S", (FX_LPCWSTR)c_strFormat.c_str());
+                                strSegment.Format(L"%S", c_strFormat.c_str());
                                 break;
                 }
-                c_strResult += (wchar_t*)strSegment.GetBuffer(strSegment.GetLength()+1);
+                c_strResult += strSegment.GetBuffer(strSegment.GetLength()+1);
         }
 
         c_strResult.erase(c_strResult.begin());
-        vRet = (FX_LPCWSTR)c_strResult.c_str();
+        vRet = c_strResult.c_str();
         return TRUE;
 }
 
 FX_BOOL util::printd(OBJ_METHOD_PARAMS)
 {
         v8::Isolate* isolate = GetIsolate(cc);
 
         int iSize = params.size();
         if (iSize < 2)
                 return FALSE;
@@ skipping 52 matching lines @@
                         break;
                 default:
                         return FALSE;
                 }
 
                 vRet = swResult;
                 return TRUE;
         }
         else if (p1.GetType() == VT_string)
         {
-                std::basic_string<wchar_t> cFormat = (wchar_t*)(FX_LPCWSTR)p1.operator CFX_WideString();                
+                std::basic_string<wchar_t> cFormat = (FX_LPCWSTR)p1.operator CFX_WideString();          
 
                 bool bXFAPicture = false;
                 if (iSize > 2)
                 {
                         //CJS_Value value;
                         bXFAPicture = params[2];
                 }
 
                 if (bXFAPicture)
                 {
@@ skipping 73 matching lines @@
                                 iStart = iEnd;
                         }
                 }
 
                 CFX_WideString strFormat;
 //              strFormat.Format(L"%d,%d,%d,%d,%d,%d",iYear, iMonth, iDay, iHour, iMin, iSec);
 //              CString strFormat = cppTm.Format(cFormat.c_str());
                 wchar_t buf[64] = {0};
                 strFormat = wcsftime(buf, 64, cFormat.c_str(), &time);
                 cFormat = buf;
-                vRet = (FX_LPCWSTR)cFormat.c_str();
+                vRet = cFormat.c_str();
                 //rtRet = strFormat.GetBuffer(strFormat.GetLength()+1);
                 return TRUE;
         }
         return FALSE;
 }
 
 void util::printd(const std::wstring &cFormat2, CJS_Date jsDate, bool bXFAPicture, std::wstring &cPurpose)
 {
         std::wstring cFormat = cFormat2;
             
@@ skipping 261 matching lines @@
         int iSize = params.size();
         if (iSize == 0)
                 return FALSE;
         int nByte = (int)params[0];
         unsigned char cByte = (unsigned char)nByte;
         CFX_WideString csValue;
         csValue.Format(L"%c", cByte);
         vRet = csValue; 
         return TRUE;
 }