Remove typdefs for pointer types in fx_system.h

fpdfsdk/src/jsapi/fxjs_v8.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 "../../../core/include/fxcrt/fx_basic.h"
 #include "../../../core/include/fxcrt/fx_ext.h" 
 #include "../../include/jsapi/fxjs_v8.h"
 #include "../../include/fsdk_define.h"
@@ skipping 15 matching lines @@
 {
   return *(double*)g_nan;
 }
 
 
 class CJS_PrivateData
 {
 public:
         CJS_PrivateData():ObjDefID(-1), pPrivate(NULL) {}
         int ObjDefID;
-        FX_LPVOID       pPrivate;
+        void*   pPrivate;
 };
 
 
 class CJS_ObjDefintion
 {
 public:
         CJS_ObjDefintion(v8::Isolate* isolate, const wchar_t* sObjName, FXJSOBJTYPE eObjType, LP_CONSTRUCTOR pConstructor, LP_DESTRUCTOR pDestructor, unsigned bApplyNew):
           objName(sObjName), objType(eObjType), m_pConstructor(pConstructor), m_pDestructor(pDestructor),m_bApplyNew(bApplyNew),m_bSetAsGlobalObject(FALSE)
           {
                   v8::Isolate::Scope isolate_scope(isolate);
@@ skipping 51 matching lines @@
 
         CFX_WideString ws = CFX_WideString(sMethodName);
         CFX_ByteString bsMethodName = ws.UTF8Encode();
 
         CFX_PtrArray* pArray = (CFX_PtrArray*)isolate->GetData(0);
         if(!pArray) return 0;
 
         if(nObjDefnID<0 || nObjDefnID>= pArray->GetSize()) return 0;
         CJS_ObjDefintion* pObjDef = (CJS_ObjDefintion*)pArray->GetAt(nObjDefnID);
         v8::Local<v8::ObjectTemplate> objTemp = v8::Local<v8::ObjectTemplate>::New(isolate, pObjDef->m_objTemplate);
-        objTemp->Set(v8::String::NewFromUtf8(isolate, FX_LPCSTR(bsMethodName), v8::NewStringType::kNormal).ToLocalChecked(), v8::FunctionTemplate::New(isolate, pMethodCall), v8::ReadOnly);
+        objTemp->Set(v8::String::NewFromUtf8(isolate, bsMethodName.c_str(), v8::NewStringType::kNormal).ToLocalChecked(), v8::FunctionTemplate::New(isolate, pMethodCall), v8::ReadOnly);
         pObjDef->m_objTemplate.Reset(isolate,objTemp);
         return 0;
 }
 
 int JS_DefineObjProperty(IJS_Runtime* pJSRuntime, int nObjDefnID, const wchar_t* sPropName, v8::AccessorGetterCallback pPropGet, v8::AccessorSetterCallback pPropPut)
 {
         v8::Isolate* isolate = (v8::Isolate*)pJSRuntime;
         v8::Isolate::Scope isolate_scope(isolate);
         v8::HandleScope handle_scope(isolate);
 
         CFX_WideString ws = CFX_WideString(sPropName);
         CFX_ByteString bsPropertyName = ws.UTF8Encode();
 
         CFX_PtrArray* pArray = (CFX_PtrArray*)isolate->GetData(0);
         if(!pArray) return 0;
 
         if(nObjDefnID<0 || nObjDefnID>= pArray->GetSize()) return 0;
         CJS_ObjDefintion* pObjDef = (CJS_ObjDefintion*)pArray->GetAt(nObjDefnID);
         v8::Local<v8::ObjectTemplate> objTemp = v8::Local<v8::ObjectTemplate>::New(isolate, pObjDef->m_objTemplate);
-        objTemp->SetAccessor(v8::String::NewFromUtf8(isolate, FX_LPCSTR(bsPropertyName), v8::NewStringType::kNormal).ToLocalChecked(), pPropGet, pPropPut);
+        objTemp->SetAccessor(v8::String::NewFromUtf8(isolate, bsPropertyName.c_str(), v8::NewStringType::kNormal).ToLocalChecked(), pPropGet, pPropPut);
         pObjDef->m_objTemplate.Reset(isolate,objTemp);
         return 0;
 }
 
 int     JS_DefineObjAllProperties(IJS_Runtime* pJSRuntime, int nObjDefnID, v8::NamedPropertyQueryCallback pPropQurey, v8::NamedPropertyGetterCallback pPropGet, v8::NamedPropertySetterCallback pPropPut, v8::NamedPropertyDeleterCallback pPropDel)
 {
         v8::Isolate* isolate = (v8::Isolate*)pJSRuntime;
         v8::Isolate::Scope isolate_scope(isolate);
         v8::HandleScope handle_scope(isolate);
 
@@ skipping 16 matching lines @@
 
         CFX_PtrArray* pArray = (CFX_PtrArray*)isolate->GetData(0);
         if(!pArray) return 0;
 
         CFX_WideString ws = CFX_WideString(sConstName);
         CFX_ByteString bsConstName = ws.UTF8Encode();
 
         if(nObjDefnID<0 || nObjDefnID>= pArray->GetSize()) return 0;
         CJS_ObjDefintion* pObjDef = (CJS_ObjDefintion*)pArray->GetAt(nObjDefnID);
         v8::Local<v8::ObjectTemplate> objTemp = v8::Local<v8::ObjectTemplate>::New(isolate, pObjDef->m_objTemplate);
-        objTemp->Set(isolate, FX_LPCSTR(bsConstName), pDefault);
+        objTemp->Set(isolate, bsConstName.c_str(), pDefault);
         pObjDef->m_objTemplate.Reset(isolate,objTemp);
         return 0;
 }
 
 static v8::Global<v8::ObjectTemplate>& _getGlobalObjectTemplate(IJS_Runtime* pJSRuntime)
 {
         v8::Isolate* isolate = (v8::Isolate*)pJSRuntime;
         v8::Isolate::Scope isolate_scope(isolate);
         v8::HandleScope handle_scope(isolate);
 
@@ skipping 19 matching lines @@
         CFX_ByteString bsMethodName = ws.UTF8Encode();
 
         v8::Local<v8::FunctionTemplate> funTempl = v8::FunctionTemplate::New(isolate, pMethodCall);
         v8::Local<v8::ObjectTemplate> objTemp;
 
         v8::Global<v8::ObjectTemplate>& globalObjTemp = _getGlobalObjectTemplate(pJSRuntime);
         if(globalObjTemp.IsEmpty())
                 objTemp = v8::ObjectTemplate::New(isolate);
         else
                 objTemp = v8::Local<v8::ObjectTemplate>::New(isolate, globalObjTemp);
-        objTemp->Set(v8::String::NewFromUtf8(isolate, FX_LPCSTR(bsMethodName), v8::NewStringType::kNormal).ToLocalChecked(), funTempl, v8::ReadOnly);
+        objTemp->Set(v8::String::NewFromUtf8(isolate, bsMethodName.c_str(), v8::NewStringType::kNormal).ToLocalChecked(), funTempl, v8::ReadOnly);
 
         globalObjTemp.Reset(isolate,objTemp);
 
         return 0;
 }
 
 int JS_DefineGlobalConst(IJS_Runtime* pJSRuntime, const wchar_t* sConstName, v8::Local<v8::Value> pDefault)
 {
         v8::Isolate* isolate = (v8::Isolate*)pJSRuntime;
         v8::Isolate::Scope isolate_scope(isolate);
         v8::HandleScope handle_scope(isolate);
 
         CFX_WideString ws = CFX_WideString(sConstName);
         CFX_ByteString bsConst= ws.UTF8Encode();
 
         v8::Local<v8::ObjectTemplate> objTemp;
 
         v8::Global<v8::ObjectTemplate>& globalObjTemp = _getGlobalObjectTemplate(pJSRuntime);
         if(globalObjTemp.IsEmpty())
                 objTemp = v8::ObjectTemplate::New(isolate);
         else
                 objTemp = v8::Local<v8::ObjectTemplate>::New(isolate, globalObjTemp);
-        objTemp->Set(v8::String::NewFromUtf8(isolate, FX_LPCSTR(bsConst), v8::NewStringType::kNormal).ToLocalChecked(), pDefault, v8::ReadOnly);
+        objTemp->Set(v8::String::NewFromUtf8(isolate, bsConst.c_str(), v8::NewStringType::kNormal).ToLocalChecked(), pDefault, v8::ReadOnly);
 
         globalObjTemp.Reset(isolate,objTemp);
 
         return 0;
 }
 
 
 void JS_InitialRuntime(IJS_Runtime* pJSRuntime,IFXJS_Runtime* pFXRuntime, IFXJS_Context* context, v8::Global<v8::Context>& v8PersistentContext)
 {
         v8::Isolate* isolate = (v8::Isolate*)pJSRuntime;
@@ skipping 821 matching lines @@
 {
         return d != d;
 }
 
 double JS_LocalTime(double d)
 {
         return JS_GetDateTime() + _getDaylightSavingTA(d);
 }
 
 //JavaScript time implement End.