Remove FX_LPCWSTR cast to wchar_t* literals

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 45 matching lines @@
 }
 
 
 struct stru_TbConvert
 {
         FX_LPCWSTR lpszJSMark;
         FX_LPCWSTR lpszCppMark;
 };
 
 const stru_TbConvert fcTable[] = {
-        { (FX_LPCWSTR)L"mmmm", (FX_LPCWSTR)L"%B" },
-        { (FX_LPCWSTR)L"mmm", (FX_LPCWSTR)L"%b" },
-        { (FX_LPCWSTR)L"mm",  (FX_LPCWSTR)L"%m" },
+        { L"mmmm", L"%B" },
+        { L"mmm", L"%b" },
+        { L"mm",  L"%m" },
         //"m"
-        { (FX_LPCWSTR)L"dddd", (FX_LPCWSTR)L"%A" },
-        { (FX_LPCWSTR)L"ddd", (FX_LPCWSTR)L"%a" },
-        { (FX_LPCWSTR)L"dd",  (FX_LPCWSTR)L"%d" },
+        { L"dddd", L"%A" },
+        { L"ddd", L"%a" },
+        { L"dd",  L"%d" },
         //"d",   "%w",
-        { (FX_LPCWSTR)L"yyyy", (FX_LPCWSTR)L"%Y" },
-        { (FX_LPCWSTR)L"yy",  (FX_LPCWSTR)L"%y" },
-        { (FX_LPCWSTR)L"HH",  (FX_LPCWSTR)L"%H" },
+        { L"yyyy", L"%Y" },
+        { L"yy",  L"%y" },
+        { L"HH",  L"%H" },
         //"H"
-        { (FX_LPCWSTR)L"hh",  (FX_LPCWSTR)L"%I" },
+        { L"hh",  L"%I" },
         //"h"
-        { (FX_LPCWSTR)L"MM",  (FX_LPCWSTR)L"%M" },
+        { L"MM",  L"%M" },
         //"M"
-        { (FX_LPCWSTR)L"ss",  (FX_LPCWSTR)L"%S" },
+        { L"ss",  L"%S" },
         //"s
-        { (FX_LPCWSTR)L"TT",  (FX_LPCWSTR)L"%p" },
+        { L"TT",  L"%p" },
         //"t"
 #if defined(_WIN32)
-        { (FX_LPCWSTR)L"tt",  (FX_LPCWSTR)L"%p" },
-        { (FX_LPCWSTR)L"h",  (FX_LPCWSTR)L"%#I" },
+        { L"tt",  L"%p" },
+        { L"h",  L"%#I" },
 #else
-        { (FX_LPCWSTR)L"tt",  (FX_LPCWSTR)L"%P" },
-        { (FX_LPCWSTR)L"h",  (FX_LPCWSTR)L"%l" },
+        { L"tt",  L"%P" },
+        { L"h",  L"%l" },
 #endif
 };
 
 #define UTIL_INT                        0
 #define UTIL_DOUBLE                     1
 #define UTIL_STRING                     2
 
 int util::ParstDataType(std::wstring* sFormat)
 {
         size_t i = 0;
@@ skipping 82 matching lines @@
                         case UTIL_INT:
                                 strSegment.Format((FX_LPCWSTR)c_strFormat.c_str(),(int)params[iIndex]);
                                 break;
                         case UTIL_DOUBLE:
                                 strSegment.Format((FX_LPCWSTR)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());
                                 break;
                         default:
-                                strSegment.Format((FX_LPCWSTR)L"%S", (FX_LPCWSTR)c_strFormat.c_str());
+                                strSegment.Format(L"%S", (FX_LPCWSTR)c_strFormat.c_str());
                                 break;
                 }
                 c_strResult += (wchar_t*)strSegment.GetBuffer(strSegment.GetLength()+1);
         }
 
         c_strResult.erase(c_strResult.begin());
         vRet = (FX_LPCWSTR)c_strResult.c_str();
         return TRUE;
 }
 
@@ skipping 24 matching lines @@
 
         if (p1.GetType() == VT_number)
         {
                 int nFormat = p1;
 
                 CFX_WideString swResult;
 
                 switch (nFormat)
                 {
                 case 0:
-                        swResult.Format((FX_LPCWSTR)L"D:%04d%02d%02d%02d%02d%02d", 
+                        swResult.Format(L"D:%04d%02d%02d%02d%02d%02d", 
                                 jsDate.GetYear(),
                                 jsDate.GetMonth() + 1,
                                 jsDate.GetDay(),
                                 jsDate.GetHours(),
                                 jsDate.GetMinutes(),
                                 jsDate.GetSeconds());
                         break;
                 case 1:
-                        swResult.Format((FX_LPCWSTR)L"%04d.%02d.%02d %02d:%02d:%02d", 
+                        swResult.Format(L"%04d.%02d.%02d %02d:%02d:%02d", 
                                 jsDate.GetYear(),
                                 jsDate.GetMonth() + 1,
                                 jsDate.GetDay(),
                                 jsDate.GetHours(),
                                 jsDate.GetMinutes(),
                                 jsDate.GetSeconds());
                         break;
                 case 2:
-                        swResult.Format((FX_LPCWSTR)L"%04d/%02d/%02d %02d:%02d:%02d", 
+                        swResult.Format(L"%04d/%02d/%02d %02d:%02d:%02d", 
                                 jsDate.GetYear(),
                                 jsDate.GetMonth() + 1,
                                 jsDate.GetDay(),
                                 jsDate.GetHours(),
                                 jsDate.GetMinutes(),
                                 jsDate.GetSeconds());
                         break;
                 default:
                         return FALSE;
                 }
@@ skipping 47 matching lines @@
                 //COleDateTime cppTm(iYear,iMonth+1,iDay,iHour,iMin,iSec);
                 //CString strFormat = cppTm.Format(cFormat.c_str());
 
                 struct stru_TbConvertAd
                 {
                         FX_LPCWSTR lpszJSMark;
                         int     iValue;
                 };
 
                 stru_TbConvertAd cTableAd[] ={
-                        { (FX_LPCWSTR)L"m", iMonth+1 },
-                        { (FX_LPCWSTR)L"d", iDay },
-                        { (FX_LPCWSTR)L"H", iHour },
-                        { (FX_LPCWSTR)L"h", iHour>12?iHour-12:iHour },
-                        { (FX_LPCWSTR)L"M", iMin },
-                        { (FX_LPCWSTR)L"s", iSec },
+                        { L"m", iMonth+1 },
+                        { L"d", iDay },
+                        { L"H", iHour },
+                        { L"h", iHour>12?iHour-12:iHour },
+                        { L"M", iMin },
+                        { L"s", iSec },
                 };
 
                 //cFormat = strFormat.GetBuffer(strFormat.GetLength()+1);
                 for(iIndex = 0;iIndex<sizeof(cTableAd)/sizeof(stru_TbConvertAd);iIndex++)
                 {
                         wchar_t tszValue[10];
                         //_itot(cTableAd[iIndex].iValue,tszValue,10);
                         CFX_WideString sValue;
-                        sValue.Format((FX_LPCWSTR)L"%d",cTableAd[iIndex].iValue);
+                        sValue.Format(L"%d",cTableAd[iIndex].iValue);
                         memcpy(tszValue, (wchar_t *)sValue.GetBuffer(sValue.GetLength()+1),
                                (sValue.GetLength()+1)*sizeof(wchar_t));
 
                         //strFormat.Replace(cTableAd[iIndex].lpszJSMark,"%d");
                         //strFormat.Format(strFormat,cTableAd[iIndex].iValue);
                         int iStart = 0;
                         int iEnd;
                         while((iEnd = cFormat.find((CFX_WideString)cTableAd[iIndex].lpszJSMark,iStart)) != -1)
                         {
                                 if (iEnd > 0)
                                 {
                                         if (cFormat[iEnd-1] == L'%')
                                         {
                                                 iStart = iEnd+1;
                                                 continue;
                                         }
                                 }
                                 cFormat.replace(iEnd, FXSYS_wcslen(cTableAd[iIndex].lpszJSMark), tszValue);
                                 iStart = iEnd;
                         }
                 }
 
                 CFX_WideString strFormat;
-//              strFormat.Format((FX_LPCWSTR)L"%d,%d,%d,%d,%d,%d",iYear, iMonth, iDay, iHour, iMin, iSec);
+//              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();
                 //rtRet = strFormat.GetBuffer(strFormat.GetLength()+1);
                 return TRUE;
         }
         return FALSE;
 }
@@ skipping 37 matching lines @@
 //      COleDateTime cppTm(iYear,iMonth+1,iDay,iHour,iMin,iSec);
         //CString strFormat = cppTm.Format(cFormat.c_str());
 
         struct stru_TbConvertAd
         {
                 FX_LPCWSTR lpszJSMark;
                 int     iValue;
         };
 
         stru_TbConvertAd cTableAd[] ={
-                { (FX_LPCWSTR)L"m", iMonth+1 },
-                { (FX_LPCWSTR)L"d", iDay },
-                { (FX_LPCWSTR)L"H", iHour },
-                { (FX_LPCWSTR)L"h", iHour>12?iHour-12:iHour },
-                { (FX_LPCWSTR)L"M", iMin },
-                { (FX_LPCWSTR)L"s", iSec },
+                { L"m", iMonth+1 },
+                { L"d", iDay },
+                { L"H", iHour },
+                { L"h", iHour>12?iHour-12:iHour },
+                { L"M", iMin },
+                { L"s", iSec },
         };
 
         //cFormat = strFormat.GetBuffer(strFormat.GetLength()+1);
         for(iIndex = 0;iIndex<sizeof(cTableAd)/sizeof(stru_TbConvertAd);iIndex++)
         {
                 wchar_t tszValue[10];
                 //_itot(cTableAd[iIndex].iValue,tszValue,10);
                 CFX_WideString sValue;
-                sValue.Format((FX_LPCWSTR)L"%d",cTableAd[iIndex].iValue);
+                sValue.Format(L"%d",cTableAd[iIndex].iValue);
                 memcpy(tszValue, (wchar_t *)sValue.GetBuffer(sValue.GetLength()+1),sValue.GetLength()*sizeof(wchar_t));
 
 
                 //strFormat.Replace(cTableAd[iIndex].lpszJSMark,"%d");
                 //strFormat.Format(strFormat,cTableAd[iIndex].iValue);
                 int iStart = 0;
                 int iEnd;
                 while((iEnd = cFormat.find((CFX_WideString)cTableAd[iIndex].lpszJSMark,iStart)) != -1)
                 {
                         if (iEnd > 0)
                         {
                                 if (cFormat[iEnd-1] == L'%')
                                 {
                                         iStart = iEnd+1;
                                         continue;
                                 }
                         }
                         cFormat.replace(iEnd,FXSYS_wcslen(cTableAd[iIndex].lpszJSMark),tszValue);
                         iStart = iEnd;
                 }
         }
 
                 CFX_WideString strFormat;
-//              strFormat.Format((FX_LPCWSTR)L"%d,%d,%d,%d,%d,%d",iYear, iMonth, iDay, iHour, iMin, iSec);
+//              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;
                 cPurpose = cFormat;
 }
 
 FX_BOOL util::printx(OBJ_METHOD_PARAMS)
 {
         int iSize = params.size();
@@ skipping 166 matching lines @@
 }
 
 FX_BOOL util::byteToChar(OBJ_METHOD_PARAMS)
 {
         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((FX_LPCWSTR)L"%c", cByte);
+        csValue.Format(L"%c", cByte);
         vRet = csValue; 
         return TRUE;
 }