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

fpdfsdk/include/javascript/JS_Define.h

 // 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
 
 #ifndef _JS_DEFINE_H_
 #define _JS_DEFINE_H_
 
 typedef v8::Value                       JSValue;
@@ skipping 323 matching lines @@
 {\
         v8::Isolate* isolate = info.GetIsolate();\
         v8::String::Utf8Value utf8_value(property);\
         CFX_WideString propname = CFX_WideString::FromUTF8(*utf8_value, utf8_value.length());\
         CJS_Object* pJSObj = (CJS_Object*)JS_GetPrivate(isolate,info.Holder());\
         ASSERT(pJSObj != NULL);\
         class_alternate* pObj = (class_alternate*)pJSObj->GetEmbedObject();\
         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);\
                 return ;\
         }\
         else\
         {\
                 info.GetReturnValue().Set(0);\
                 return ;\
         }\
@@ skipping 13 matching lines @@
         CFX_WideString propname = CFX_WideString::FromUTF8(*utf8_value, utf8_value.length());\
         CJS_PropValue value(isolate);\
         value.StartGetting();\
         CJS_Object* pJSObj = (CJS_Object*)JS_GetPrivate(isolate,info.Holder());\
         ASSERT(pJSObj != NULL);\
         class_alternate* pObj = (class_alternate*)pJSObj->GetEmbedObject();\
         ASSERT(pObj != NULL);\
         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)\
         {\
                 info.GetReturnValue().Set((v8::Handle<v8::Value>)value);\
                 return ;\
         }\
         else\
         {\
                 CFX_ByteString cbName;\
                 cbName.Format("%s.%s", #class_name, L"GetProperty");\
@@ skipping 17 matching lines @@
         CFX_WideString propname = CFX_WideString::FromUTF8(*utf8_value, utf8_value.length());\
         CJS_PropValue PropValue(CJS_Value(isolate,value,VT_unknown));\
         PropValue.StartSetting();\
         CJS_Object* pJSObj = (CJS_Object*)JS_GetPrivate(isolate,info.Holder());\
         if(!pJSObj) return;\
         class_alternate* pObj = (class_alternate*)pJSObj->GetEmbedObject();\
         ASSERT(pObj != NULL);\
         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)\
         {\
                 return ;\
         }\
         else\
         {\
                 CFX_ByteString cbName;\
                 cbName.Format("%s.%s", #class_name, "PutProperty");\
                 JS_Error(NULL,CFX_WideString::FromLocal(cbName), sError);\
@@ skipping 14 matching lines @@
         IFXJS_Context* cc = pRuntime->GetCurrentContext();\
         v8::String::Utf8Value utf8_value(property);\
         CFX_WideString propname = CFX_WideString::FromUTF8(*utf8_value, utf8_value.length());\
         CJS_Object* pJSObj = (CJS_Object*)JS_GetPrivate(isolate,info.Holder());\
         ASSERT(pJSObj != NULL);\
         class_alternate* pObj = (class_alternate*)pJSObj->GetEmbedObject();\
         ASSERT(pObj != NULL);\
         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)\
         {\
                 return ;\
         }\
         else\
         {\
                 CFX_ByteString cbName;\
                 cbName.Format("%s.%s", #class_name, "DelProperty");\
                 return ;\
@@ skipping 156 matching lines @@
 /* ======================================== GLOBAL CONSTS ============================================ */
 #define DEFINE_GLOBAL_CONST(pRuntime, const_name , const_value)\
 if (JS_DefineGlobalConst(pRuntime,JS_WIDESTRING(const_name),JS_NewString(pRuntime,JS_WIDESTRING(const_value)))) return -1
 
 /* ======================================== GLOBAL ARRAYS ============================================ */
 
 #define DEFINE_GLOBAL_ARRAY(pRuntime)\
 int size = sizeof(ArrayContent) / sizeof(FX_LPCWSTR);\
 \
 CJS_Array array(pRuntime);\
-for (int i=0; i<size; i++) array.SetElement(i,CJS_Value(pRuntime,(FX_LPCWSTR)ArrayContent[i]));\
+for (int i=0; i<size; i++) array.SetElement(i,CJS_Value(pRuntime,ArrayContent[i]));\
 \
 CJS_PropValue prop(pRuntime);\
 prop << array;\
 if (JS_DefineGlobalConst(pRuntime, (const wchar_t*)ArrayName, prop.ToJSValue()) < 0)\
         return -1
 
 /* ============================================================ */
 
 #define VALUE_NAME_STRING               L"string"
 #define VALUE_NAME_NUMBER               L"number"
@@ skipping 56 matching lines @@
                 else if (strcmp(sType,VALUE_NAME_NULL) == 0)
                         return VT_null;
                 else if (strcmp(sType,VALUE_NAME_UNDEFINED) == 0)
                         return VT_undefined;
                         */
 
         return VT_unknown;
 }
 
 #endif //_JS_DEFINE_H_