Merge to XFA: Remove typdefs for pointer types in fx_system.h.
[pdfium.git] / xfa / include / fxfa / fxfa_basic.h
index dcf1ac2..b157fff 100644 (file)
@@ -77,9 +77,9 @@ enum XFA_XDPPACKET_FLAGS {
 };\r
 typedef struct _XFA_PACKETINFO {\r
     uint32_t                                   uHash;\r
-    FX_LPCWSTR                                 pName;\r
+    const FX_WCHAR*                                    pName;\r
     XFA_XDPPACKET                              eName;\r
-    FX_LPCWSTR                                 pURI;\r
+    const FX_WCHAR*                                    pURI;\r
     FX_DWORD                                   eFlags;\r
 } XFA_PACKETINFO, * XFA_LPPACKETINFO;\r
 typedef XFA_PACKETINFO const * XFA_LPCPACKETINFO;\r
@@ -920,7 +920,7 @@ enum XFA_ELEMENT {
 #define XFA_ELEMENT_UNKNOWN ((XFA_ELEMENT)-1)\r
 typedef struct _XFA_ELEMENTINFO {\r
     uint32_t                                   uHash;\r
-    FX_LPCWSTR                                 pName;\r
+    const FX_WCHAR*                                    pName;\r
     XFA_ELEMENT                                        eName;\r
     FX_DWORD                                   dwPackets;\r
     FX_DWORD                                   eObjectType;\r
@@ -939,17 +939,17 @@ enum XFA_ATTRIBUTETYPE {
 };\r
 typedef struct _XFA_ATTRIBUTEINFO {\r
     uint32_t                                   uHash;\r
-    FX_LPCWSTR                                 pName;\r
+    const FX_WCHAR*                                    pName;\r
     XFA_ATTRIBUTE                              eName;\r
     XFA_ATTRIBUTETYPE                  eType;\r
     FX_DWORD                                   dwPackets;\r
-    FX_LPVOID                                  pDefValue;\r
+    void*                                      pDefValue;\r
 } XFA_ATTRIBUTEINFO, * XFA_LPATTRIBUTEINFO;\r
 typedef XFA_ATTRIBUTEINFO const * XFA_LPCATTRIBUTEINFO;\r
 int32_t XFA_GetAttributeCount();\r
 XFA_LPCATTRIBUTEINFO XFA_GetAttributeByName(FX_WSTR wsName);\r
 XFA_LPCATTRIBUTEINFO XFA_GetAttributeByID(XFA_ATTRIBUTE eName);\r
-FX_BOOL XFA_GetAttributeDefaultValue(FX_LPVOID &pValue, XFA_ELEMENT eElement, XFA_ATTRIBUTE eAttribute, XFA_ATTRIBUTETYPE eType, FX_DWORD dwPacket);\r
+FX_BOOL XFA_GetAttributeDefaultValue(void* &pValue, XFA_ELEMENT eElement, XFA_ATTRIBUTE eAttribute, XFA_ATTRIBUTETYPE eType, FX_DWORD dwPacket);\r
 XFA_ATTRIBUTEENUM      XFA_GetAttributeDefaultValue_Enum(XFA_ELEMENT eElement, XFA_ATTRIBUTE eAttribute, FX_DWORD dwPacket);\r
 CFX_WideStringC                XFA_GetAttributeDefaultValue_Cdata(XFA_ELEMENT eElement, XFA_ATTRIBUTE eAttribute, FX_DWORD dwPacket);\r
 FX_BOOL                                XFA_GetAttributeDefaultValue_Boolean(XFA_ELEMENT eElement, XFA_ATTRIBUTE eAttribute, FX_DWORD dwPacket);\r
@@ -969,8 +969,8 @@ typedef struct _XFA_SCRIPTHIERARCHY {
     int16_t                                    wParentIndex;\r
 } XFA_SCRIPTHIERARCHY, * XFA_LPSCRIPTHIERARCHY;\r
 typedef XFA_SCRIPTHIERARCHY const * XFA_LPCSCRIPTHIERARCHY;\r
-FX_LPCWORD XFA_GetElementChildren(XFA_ELEMENT eElement, int32_t &iCount);\r
-FX_LPCBYTE XFA_GetElementAttributes(XFA_ELEMENT eElement, int32_t &iCount);\r
+const FX_WORD* XFA_GetElementChildren(XFA_ELEMENT eElement, int32_t &iCount);\r
+const uint8_t* XFA_GetElementAttributes(XFA_ELEMENT eElement, int32_t &iCount);\r
 XFA_LPCELEMENTINFO XFA_GetChildOfElement(XFA_ELEMENT eElement, XFA_ELEMENT eChild, FX_DWORD dwPacket);\r
 XFA_LPCATTRIBUTEINFO XFA_GetAttributeOfElement(XFA_ELEMENT eElement, XFA_ATTRIBUTE eAttribute, FX_DWORD dwPacket);\r
 #define XFA_PROPERTYFLAG_OneOf                 0x01\r
@@ -985,7 +985,7 @@ XFA_LPCPROPERTY XFA_GetElementProperties(XFA_ELEMENT eElement, int32_t &iCount);
 XFA_LPCPROPERTY XFA_GetPropertyOfElement(XFA_ELEMENT eElement, XFA_ELEMENT eProperty, FX_DWORD dwPacket);\r
 typedef struct _XFA_ATTRIBUTEENUMINFO {\r
     uint32_t                                   uHash;\r
-    FX_LPCWSTR                                 pName;\r
+    const FX_WCHAR*                                    pName;\r
     XFA_ATTRIBUTEENUM                  eName;\r
 } XFA_ATTRIBUTEENUMINFO, * XFA_LPATTRIBUTEENUMINFO;\r
 typedef XFA_ATTRIBUTEENUMINFO const * XFA_LPCATTRIBUTEENUMINFO;\r
@@ -1050,7 +1050,7 @@ class CXFA_Object;
 typedef void (CXFA_Object::*XFA_METHOD_CALLBACK) (CFXJSE_Arguments* pArguments);\r
 typedef struct _XFA_METHODINFO {\r
     uint32_t                                   uHash;\r
-    FX_LPCWSTR                                 pName;\r
+    const FX_WCHAR*                                    pName;\r
     XFA_METHOD_CALLBACK                        lpfnCallback;\r
 } XFA_METHODINFO, * XFA_LPMETHODINFO;\r
 typedef XFA_METHODINFO const * XFA_LPCMETHODINFO;\r
@@ -1063,7 +1063,7 @@ enum XFA_SCRIPT_TYPE {
 };\r
 typedef struct _XFA_SCRIPTATTRIBUTEINFO {\r
     uint32_t                                           uHash;\r
-    FX_LPCWSTR                                         pName;\r
+    const FX_WCHAR*                                            pName;\r
     XFA_ATTRIBUTE_CALLBACK                     lpfnCallback;\r
     int32_t                                            eAttribute;\r
     FX_WORD                                                    eValueType;\r