Merge to XFA: Remove FX_BSTR and FX_WSTR typedefs.
[pdfium.git] / xfa / src / fxfa / src / common / xfa_script.h
index 5be9077..c7f1807 100644 (file)
@@ -72,7 +72,7 @@ typedef struct _XFA_RESOLVENODE_RS {
 } XFA_RESOLVENODE_RS, * XFA_LPRESOLVENODE_RS;\r
 typedef struct _XFA_JSBUILTININFO {\r
     uint32_t                                           uUnicodeHash;\r
-    FX_LPCSTR                                          pName;\r
+    const FX_CHAR*                                             pName;\r
 } XFA_JSBUILTININFO, * XFA_LPJSBUILTININFO;\r
 typedef XFA_JSBUILTININFO const * XFA_LPCJSBUILTININFO;\r
 XFA_LPCJSBUILTININFO XFA_GetJSBuiltinByHash(uint32_t uHashCode);\r
@@ -84,8 +84,8 @@ public:
 \r
     virtual void                               SetEventParam(CXFA_EventParam* pEventParam) = 0;\r
     virtual CXFA_EventParam*   GetEventParam() = 0;\r
-    virtual FX_BOOL            RunScript(XFA_SCRIPTLANGTYPE eScriptType, FX_WSTR wsScript, FXJSE_HVALUE hRetValue, CXFA_Object* pThisObject = NULL) = 0;\r
-    virtual int32_t    ResolveObjects(CXFA_Object* refNode, FX_WSTR wsExpression, XFA_RESOLVENODE_RS& resolveNodeRS, FX_DWORD dwStyles = XFA_RESOLVENODE_Children, CXFA_Node* bindNode = NULL) = 0;\r
+    virtual FX_BOOL            RunScript(XFA_SCRIPTLANGTYPE eScriptType, const CFX_WideStringC& wsScript, FXJSE_HVALUE hRetValue, CXFA_Object* pThisObject = NULL) = 0;\r
+    virtual int32_t    ResolveObjects(CXFA_Object* refNode, const CFX_WideStringC& wsExpression, XFA_RESOLVENODE_RS& resolveNodeRS, FX_DWORD dwStyles = XFA_RESOLVENODE_Children, CXFA_Node* bindNode = NULL) = 0;\r
     virtual FXJSE_HVALUE               GetJSValueFromMap(CXFA_Object* pObject) = 0;\r
     virtual void                               CacheList(CXFA_NodeList* pList) = 0;\r
     virtual CXFA_Object*               GetThisObject() const = 0;\r