Merge to XFA: Remove typdefs for pointer types in fx_system.h.

Original Review URL: https://codereview.chromium.org/1171733003

R=thestig@chromium.org

Review URL: https://codereview.chromium.org/1178613002.

31 files changed, 82 insertions, 82 deletions

diff --git a/xfa/include/fwl/adapter/fwl_adapterclipboardmgr.h b/xfa/include/fwl/adapter/fwl_adapterclipboardmgr.h
index 196e6503d9..1ad09eda96 100644
--- a/xfa/include/fwl/adapter/fwl_adapterclipboardmgr.h
+++ b/xfa/include/fwl/adapter/fwl_adapterclipboardmgr.h
@@ -14,7 +14,7 @@ enum FWL_CLIPBOARDFORMAT {
     FWL_CLIPBOARDFORMAT_UncodeText,

 };

 typedef struct _FWL_HCLIPBOARDDATA {

-    FX_LPVOID pData;

+    void* pData;

 } * FWL_HCLIPBOARDDATA;

 class IFWL_AdapterClipboardMgr

 {

@@ -24,7 +24,7 @@ public:
     virtual FWL_HCLIPBOARDDATA	GetData(FX_DWORD dwFormat) = 0;

     virtual FWL_ERR		SetData(FX_DWORD dwFormat, uint8_t *pBuf, int32_t iSize) = 0;

     virtual int32_t	GetDataSize(FWL_HCLIPBOARDDATA hData) = 0;

-    virtual FX_LPVOID	LockDataBuffer(FWL_HCLIPBOARDDATA hData) = 0;

+    virtual void*	LockDataBuffer(FWL_HCLIPBOARDDATA hData) = 0;

     virtual FX_BOOL		UnLockDataBuffer(FWL_HCLIPBOARDDATA hData) = 0;

     virtual FWL_ERR		SetStringData(FX_WSTR ws) = 0;

     virtual FWL_ERR		SetStringData(FX_BSTR bs) = 0;

diff --git a/xfa/include/fwl/adapter/fwl_adaptercursormgr.h b/xfa/include/fwl/adapter/fwl_adaptercursormgr.h
index 225a22ca2f..7b7b567be1 100644
--- a/xfa/include/fwl/adapter/fwl_adaptercursormgr.h
+++ b/xfa/include/fwl/adapter/fwl_adaptercursormgr.h
@@ -23,7 +23,7 @@ enum FWL_CURSORTYPE {
     FWL_CURSORTYPE_Help

 };

 typedef struct _FWL_HCURSOR {

-    FX_LPVOID pData;

+    void* pData;

 } *FWL_HCURSOR;

 class IFWL_AdapterCursorMgr

 {

diff --git a/xfa/include/fwl/adapter/fwl_adaptermonitormgr.h b/xfa/include/fwl/adapter/fwl_adaptermonitormgr.h
index 8830a3de81..3da0564225 100644
--- a/xfa/include/fwl/adapter/fwl_adaptermonitormgr.h
+++ b/xfa/include/fwl/adapter/fwl_adaptermonitormgr.h
@@ -8,7 +8,7 @@
 #define _FWL_ADAPTER_MONITORMGR_H

 class IFWL_AdapterMonitorMgr;

 typedef struct _FWL_HMONITOR {

-    FX_LPVOID pData;

+    void* pData;

 } *FWL_HMONITOR;

 class IFWL_AdapterMonitorMgr

 {

diff --git a/xfa/include/fwl/adapter/fwl_adapterwidgetmgr.h b/xfa/include/fwl/adapter/fwl_adapterwidgetmgr.h
index e8c3b89674..bff8e8a885 100644
--- a/xfa/include/fwl/adapter/fwl_adapterwidgetmgr.h
+++ b/xfa/include/fwl/adapter/fwl_adapterwidgetmgr.h
@@ -38,15 +38,15 @@ public:
     virtual FWL_ERR DispatchMessage() = 0;

     virtual FWL_ERR RepaintWidget(IFWL_Widget *pWidget, const CFX_RectF *pRect) = 0;

     virtual	FWL_ERR Exit(int32_t iExitCode) = 0;

-    virtual FWL_ERR CreateWidgetWithNativeId(IFWL_Widget *pWidget, FX_LPVOID UserData) = 0;

-    virtual FWL_ERR GetWidgetDC(IFWL_Widget *pWidget, FX_LPVOID &pDC) = 0;

-    virtual FWL_ERR ReleaseWidgetDC(IFWL_Widget *pWidget, FX_LPVOID pDC, CFX_RectF *pClip = 0) = 0;

-    virtual FX_LPVOID GetWindow(IFWL_Widget *pWidget) = 0;

+    virtual FWL_ERR CreateWidgetWithNativeId(IFWL_Widget *pWidget, void* UserData) = 0;

+    virtual FWL_ERR GetWidgetDC(IFWL_Widget *pWidget, void* &pDC) = 0;

+    virtual FWL_ERR ReleaseWidgetDC(IFWL_Widget *pWidget, void* pDC, CFX_RectF *pClip = 0) = 0;

+    virtual void* GetWindow(IFWL_Widget *pWidget) = 0;

     virtual	FX_DWORD GetKeyState(FX_DWORD dwVirtKey) = 0;

     virtual FWL_ERR  RunLoop(IFWL_Widget *widget) = 0;

     virtual FWL_ERR  EndLoop() = 0;

     virtual FWL_ERR  InitMenu(IFWL_Menu *pMenu, IFWL_MenuDP *pMenuData) = 0;

-    virtual FWL_ERR  UpdateMenu(IFWL_Menu *pMenu, FX_LPCVOID hItem, int32_t iType) = 0;

+    virtual FWL_ERR  UpdateMenu(IFWL_Menu *pMenu, const void* hItem, int32_t iType) = 0;

     virtual int32_t TrackPopupMenu(IFWL_Menu *pMenu, IFWL_MenuDP *pMenuData) = 0;

     virtual	FWL_ERR  SetMessageHook(IFWL_AdapterMessageHook *hook) = 0;

     virtual FWL_ERR  GetSystemBorder(FX_FLOAT &l, FX_FLOAT &t, FX_FLOAT &r, FX_FLOAT &b) = 0;

diff --git a/xfa/include/fwl/adapter/fwl_sdadapterimp.h b/xfa/include/fwl/adapter/fwl_sdadapterimp.h
index 323a0ba4fc..ba14ae66c6 100644
--- a/xfa/include/fwl/adapter/fwl_sdadapterimp.h
+++ b/xfa/include/fwl/adapter/fwl_sdadapterimp.h
@@ -44,14 +44,14 @@ public:
     virtual FX_BOOL CheckMessage();

     virtual FX_BOOL IsIdleMessage();

     virtual FWL_ERR DispatchMessage();

-    virtual FWL_ERR GetWidgetDC(IFWL_Widget *pWidget, FX_LPVOID &pDC);

-    virtual FWL_ERR ReleaseWidgetDC(IFWL_Widget *pWidget, FX_LPVOID pDC, CFX_RectF *pClip = 0);

-    virtual FX_LPVOID GetWindow(IFWL_Widget *pWidget);

+    virtual FWL_ERR GetWidgetDC(IFWL_Widget *pWidget, void* &pDC);

+    virtual FWL_ERR ReleaseWidgetDC(IFWL_Widget *pWidget, void* pDC, CFX_RectF *pClip = 0);

+    virtual void* GetWindow(IFWL_Widget *pWidget);

     virtual	FX_DWORD GetKeyState(FX_DWORD dwVirtKey);

     virtual FWL_ERR  RunLoop(IFWL_Widget *widget);

     virtual FWL_ERR  EndLoop();

     virtual FWL_ERR  InitMenu(IFWL_Menu *pMenu, IFWL_MenuDP *pMenuData);

-    virtual FWL_ERR  UpdateMenu(IFWL_Menu *pMenu, FX_LPCVOID hItem, int32_t iType);

+    virtual FWL_ERR  UpdateMenu(IFWL_Menu *pMenu, const void* hItem, int32_t iType);

     virtual int32_t TrackPopupMenu(IFWL_Menu *pMenu, IFWL_MenuDP *pMenuData);

     virtual	FWL_ERR  SetMessageHook(IFWL_AdapterMessageHook *hook);

     virtual FWL_ERR  GetSystemBorder(FX_FLOAT &l, FX_FLOAT &t, FX_FLOAT &r, FX_FLOAT &b);

diff --git a/xfa/include/fwl/basewidget/fwl_edit.h b/xfa/include/fwl/basewidget/fwl_edit.h
index 78072d0cf8..ae8aea0bd3 100644
--- a/xfa/include/fwl/basewidget/fwl_edit.h
+++ b/xfa/include/fwl/basewidget/fwl_edit.h
@@ -112,7 +112,7 @@ class IFWL_EditDP : public IFWL_DataProvider
 #define FWL_EDT_FIND_FLAGS_WholeWord	(1L << 1)

 #define FWL_EDT_FIND_FLAGS_NoCase		(1L << 2)

 typedef struct _FWL_HEDTFIND {

-    FX_LPVOID pData;

+    void* pData;

 }* FWL_HEDTFIND;

 class IFWL_Edit : public IFWL_Widget

 {

@@ -134,7 +134,7 @@ public:
     FWL_ERR		SetLimit(int32_t nLimit);

     FWL_ERR		SetAliasChar(FX_WCHAR wAlias);

     FWL_ERR		SetFormatString(const CFX_WideString &wsFormat);

-    FWL_ERR Insert(int32_t nStart, FX_LPCWSTR lpText, int32_t nLen);

+    FWL_ERR Insert(int32_t nStart, const FX_WCHAR* lpText, int32_t nLen);

     FWL_ERR DeleteSelections();

     FWL_ERR DeleteRange(int32_t nStart, int32_t nCount = -1);

     FWL_ERR ReplaceSelections(const CFX_WideStringC &wsReplace);

diff --git a/xfa/include/fwl/basewidget/fwl_listbox.h b/xfa/include/fwl/basewidget/fwl_listbox.h
index 466d919a5e..3d0fa116ce 100644
--- a/xfa/include/fwl/basewidget/fwl_listbox.h
+++ b/xfa/include/fwl/basewidget/fwl_listbox.h
@@ -58,7 +58,7 @@ int32_t m_index;
 CFX_RectF m_rect;

 END_FWL_EVENT_DEF

 typedef struct _FWL_HLISTITEM {

-    FX_LPVOID pData;

+    void* pData;

 }* FWL_HLISTITEM;

 typedef struct _FWL_ListBoxItemData {

     IFWL_ListBoxDP *pDataProvider;

@@ -74,9 +74,9 @@ public:
     virtual	FX_DWORD			GetItemStyles(IFWL_Widget *pWidget, FWL_HLISTITEM hItem) = 0;

     virtual	FWL_ERR				GetItemText(IFWL_Widget *pWidget, FWL_HLISTITEM hItem, CFX_WideString &wsText) = 0;

     virtual FWL_ERR				GetItemRect(IFWL_Widget *pWidget, FWL_HLISTITEM hItem, CFX_RectF &rtItem) = 0;

-    virtual FX_LPVOID			GetItemData(IFWL_Widget *pWidget, FWL_HLISTITEM hItem) = 0;

+    virtual void*			GetItemData(IFWL_Widget *pWidget, FWL_HLISTITEM hItem) = 0;

     virtual	FWL_ERR				SetItemStyles(IFWL_Widget *pWidget, FWL_HLISTITEM hItem, FX_DWORD dwStyle) = 0;

-    virtual FWL_ERR				SetItemText(IFWL_Widget *pWidget, FWL_HLISTITEM hItem, FX_LPCWSTR pszText) = 0;

+    virtual FWL_ERR				SetItemText(IFWL_Widget *pWidget, FWL_HLISTITEM hItem, const FX_WCHAR* pszText) = 0;

     virtual FWL_ERR				SetItemRect(IFWL_Widget *pWidget, FWL_HLISTITEM hItem, const CFX_RectF &rtItem) = 0;

     virtual FX_FLOAT			GetItemHeight(IFWL_Widget *pWidget) = 0;

     virtual CFX_DIBitmap*		GetItemIcon(IFWL_Widget *pWidget, FWL_HLISTITEM hItem) = 0;

diff --git a/xfa/include/fwl/core/fwl_grid.h b/xfa/include/fwl/core/fwl_grid.h
index 0d4e2d61f8..677bd918f5 100644
--- a/xfa/include/fwl/core/fwl_grid.h
+++ b/xfa/include/fwl/core/fwl_grid.h
@@ -37,7 +37,7 @@ enum FWL_GRIDSIZE {
     FWL_GRIDSIZE_MaxHeight,

 };

 typedef struct _FWL_HGRIDCOLROW {

-    FX_LPVOID pData;

+    void* pData;

 } * FWL_HGRIDCOLROW;

 class IFWL_Grid : public IFWL_Content

 {

diff --git a/xfa/include/fwl/core/fwl_note.h b/xfa/include/fwl/core/fwl_note.h
index 7e553a9eb2..c3dcead1e4 100644
--- a/xfa/include/fwl/core/fwl_note.h
+++ b/xfa/include/fwl/core/fwl_note.h
@@ -322,7 +322,7 @@ IFWL_Widget *m_pOwner;
 END_FWL_EVENT_DEF

 BEGIN_FWL_EVENT_DEF(CFWL_EvtMenuCommand, FWL_EVTHASH_MenuCommand)

 int32_t m_iCommand;

-FX_LPVOID m_pData;

+void* m_pData;

 END_FWL_EVENT_DEF

 BEGIN_FWL_EVENT_DEF(CFWL_EvtSizeChanged, FWL_EVTHASH_SizeChanged)

 IFWL_Widget *m_pWidget;

@@ -384,6 +384,6 @@ FWL_ERR FWL_AddToolTipTarget(IFWL_ToolTipTarget *pTarget);
 FWL_ERR FWL_RemoveToolTipTarget(IFWL_ToolTipTarget *pTarget);

 FWL_ERR	FWL_SetToolTipInitialDelay(int32_t iDelayTime);

 FWL_ERR	FWL_SetToolTipAutoPopDelay(int32_t iDelayTime);

-typedef FX_BOOL (*FWLMessageHookCallback)(CFWL_Message *msg, FX_LPVOID info);

-FWL_ERR FWL_SetHook(IFWL_NoteDriver *driver, FWLMessageHookCallback callback, FX_LPVOID info);

+typedef FX_BOOL (*FWLMessageHookCallback)(CFWL_Message *msg, void* info);

+FWL_ERR FWL_SetHook(IFWL_NoteDriver *driver, FWLMessageHookCallback callback, void* info);

 #endif

diff --git a/xfa/include/fwl/core/fwl_target.h b/xfa/include/fwl/core/fwl_target.h
index 3c8b531f24..d04a1f9c75 100644
--- a/xfa/include/fwl/core/fwl_target.h
+++ b/xfa/include/fwl/core/fwl_target.h
@@ -20,6 +20,6 @@ public:
     FWL_ERR			Finalize();

 protected:

     virtual ~IFWL_Target();

-    FX_LPVOID	m_pData;

+    void*	m_pData;

 };

 #endif

diff --git a/xfa/include/fwl/core/fwl_theme.h b/xfa/include/fwl/core/fwl_theme.h
index cc29e351d1..9ab970b47c 100644
--- a/xfa/include/fwl/core/fwl_theme.h
+++ b/xfa/include/fwl/core/fwl_theme.h
@@ -45,7 +45,7 @@ public:
     int32_t				 m_iPart;

     FX_DWORD				 m_dwStates;

     FX_DWORD				 m_dwData;

-    FX_LPVOID				 m_pData;

+    void*				 m_pData;

 };

 class CFWL_ThemeBackground : public CFWL_ThemePart

 {

@@ -82,7 +82,7 @@ public:
     virtual FWL_ERR		SetThemeMatrix(IFWL_Widget *pWidget, const CFX_Matrix &matrix) = 0;

     virtual FX_BOOL		DrawBackground(CFWL_ThemeBackground *pParams) = 0;

     virtual FX_BOOL		DrawText(CFWL_ThemeText *pParams) = 0;

-    virtual FX_LPVOID   GetCapacity(CFWL_ThemePart *pThemePart, FX_DWORD dwCapacity) = 0;

+    virtual void*   GetCapacity(CFWL_ThemePart *pThemePart, FX_DWORD dwCapacity) = 0;

     virtual FX_BOOL		IsCustomizedLayout(IFWL_Widget *pWidget) = 0;

     virtual FWL_ERR		GetPartRect(CFWL_ThemePart *pThemePart, CFX_RectF &rtPart) = 0;

     virtual FX_BOOL		IsInPart(CFWL_ThemePart *pThemePart, FX_FLOAT fx, FX_FLOAT fy) = 0;

diff --git a/xfa/include/fwl/core/fwl_thread.h b/xfa/include/fwl/core/fwl_thread.h
index 9b001f4fcb..d6bbf93f3a 100644
--- a/xfa/include/fwl/core/fwl_thread.h
+++ b/xfa/include/fwl/core/fwl_thread.h
@@ -10,7 +10,7 @@ class IFWL_NoteDriver;
 class IFWL_Thread;

 class IFWL_NoteThread;

 typedef struct _FWL_HTHREAD {

-    FX_LPVOID pData;

+    void* pData;

 } *FWL_HTHREAD;

 class IFWL_Thread

 {

@@ -36,7 +36,7 @@ public:
     virtual IFWL_NoteDriver* GetNoteDriver() = 0;

 };

 typedef struct _FWL_HMUTEX {

-    FX_LPVOID pData;

+    void* pData;

 } *FWL_HMUTEX;

 FWL_HMUTEX	FWL_CreateMutex();

 FWL_ERR		FWL_DestroyMutex(FWL_HMUTEX hMutex);

@@ -45,7 +45,7 @@ FWL_ERR		FWL_TryLockMutex(FWL_HMUTEX hMutex);
 FWL_ERR		FWL_UnlockMutex(FWL_HMUTEX hMutex);

 FWL_ERR		FWL_IsLockedMutex(FWL_HMUTEX hMutex, FX_BOOL &bLocked);

 typedef struct _FWL_HSEMAPHORE {

-    FX_LPVOID pData;

+    void* pData;

 } *FWL_HSEMAPHORE;

 FWL_HSEMAPHORE	FWL_CreateSemaphore();

 FWL_ERR		FWL_DestroySemaphore(FWL_HSEMAPHORE hSemaphore);

diff --git a/xfa/include/fwl/core/fwl_timer.h b/xfa/include/fwl/core/fwl_timer.h
index a71cff72be..a12f92a9d3 100644
--- a/xfa/include/fwl/core/fwl_timer.h
+++ b/xfa/include/fwl/core/fwl_timer.h
@@ -8,7 +8,7 @@
 #define _FWL_TIMER_H

 class IFWL_Timer;

 typedef struct _FWL_HTIMER {

-    FX_LPVOID pData;

+    void* pData;

 } *FWL_HTIMER;

 class IFWL_Timer

 {

diff --git a/xfa/include/fwl/core/fwl_widget.h b/xfa/include/fwl/core/fwl_widget.h
index c7ef2d48ca..b6377cdc9f 100644
--- a/xfa/include/fwl/core/fwl_widget.h
+++ b/xfa/include/fwl/core/fwl_widget.h
@@ -38,8 +38,8 @@ public:
     FWL_ERR			ModifyStylesEx(FX_DWORD dwStylesExAdded, FX_DWORD dwStylesExRemoved);

     FX_DWORD		GetStates();

     FWL_ERR			SetStates(FX_DWORD dwStates, FX_BOOL bSet = TRUE);

-    FWL_ERR			SetPrivateData(FX_LPVOID module_id, FX_LPVOID pData, PD_CALLBACK_FREEDATA callback);

-    FX_LPVOID		GetPrivateData(FX_LPVOID module_id);

+    FWL_ERR			SetPrivateData(void* module_id, void* pData, PD_CALLBACK_FREEDATA callback);

+    void*		GetPrivateData(void* module_id);

     FWL_ERR			Update();

     FWL_ERR			LockUpdate();

     FWL_ERR			UnlockUpdate();

diff --git a/xfa/include/fwl/core/fwl_widgetmgr.h b/xfa/include/fwl/core/fwl_widgetmgr.h
index 9fcb4b682c..95ff26a84c 100644
--- a/xfa/include/fwl/core/fwl_widgetmgr.h
+++ b/xfa/include/fwl/core/fwl_widgetmgr.h
@@ -28,7 +28,7 @@ public:
     virtual IFWL_Widget*	GetWidget(IFWL_Widget *pWidget, FWL_WGTRELATION eRelation) = 0;

     virtual int32_t		GetWidgetIndex(IFWL_Widget *pWidget) = 0;

     virtual FX_BOOL			SetWidgetIndex(IFWL_Widget *pWidget, int32_t nIndex) = 0;

-    virtual FX_BOOL			IsWidget(FX_LPVOID pObj) = 0;

+    virtual FX_BOOL			IsWidget(void* pObj) = 0;

     virtual FWL_ERR			RepaintWidget(IFWL_Widget *pWidget, const CFX_RectF *pRect = NULL) = 0;

     virtual FX_DWORD		GetCapability() = 0;

 };

diff --git a/xfa/include/fwl/lightwidget/combobox.h b/xfa/include/fwl/lightwidget/combobox.h
index 594c056e83..fe1b5c4f25 100644
--- a/xfa/include/fwl/lightwidget/combobox.h
+++ b/xfa/include/fwl/lightwidget/combobox.h
@@ -36,8 +36,8 @@ public:
     FX_BOOL		EditRedo(FX_BSTR bsRecord);

     FX_BOOL		EditUndo(FX_BSTR bsRecord);

     FWL_ERR		SetMaxListHeight(FX_FLOAT fMaxHeight);

-    FWL_ERR		SetItemData(int32_t iIndex, FX_LPVOID pData);

-    FX_LPVOID	GetItemData(int32_t iIndex);

+    FWL_ERR		SetItemData(int32_t iIndex, void* pData);

+    void*	GetItemData(int32_t iIndex);

     FWL_ERR		SetListTheme(IFWL_ThemeProvider *pTheme);

     FX_BOOL		AfterFocusShowDropList();

     FWL_ERR		OpenDropDownList(FX_BOOL bActivate);

@@ -78,9 +78,9 @@ protected:
         virtual	FX_DWORD		GetItemStyles(IFWL_Widget *pWidget, FWL_HLISTITEM hItem);

         virtual	FWL_ERR			GetItemText(IFWL_Widget *pWidget, FWL_HLISTITEM hItem, CFX_WideString &wsText);

         virtual FWL_ERR			GetItemRect(IFWL_Widget *pWidget, FWL_HLISTITEM hItem, CFX_RectF& rtItem);

-        virtual FX_LPVOID		GetItemData(IFWL_Widget *pWidget, FWL_HLISTITEM hItem);

+        virtual void*		GetItemData(IFWL_Widget *pWidget, FWL_HLISTITEM hItem);

         virtual	FWL_ERR			SetItemStyles(IFWL_Widget *pWidget, FWL_HLISTITEM hItem, FX_DWORD dwStyle);

-        virtual FWL_ERR			SetItemText(IFWL_Widget *pWidget, FWL_HLISTITEM hItem, FX_LPCWSTR pszText);

+        virtual FWL_ERR			SetItemText(IFWL_Widget *pWidget, FWL_HLISTITEM hItem, const FX_WCHAR* pszText);

         virtual FWL_ERR			SetItemRect(IFWL_Widget *pWidget, FWL_HLISTITEM hItem, const CFX_RectF& rtItem);

         virtual FX_FLOAT		GetItemHeight(IFWL_Widget *pWidget);

         virtual CFX_DIBitmap*	GetItemIcon(IFWL_Widget *pWidget, FWL_HLISTITEM hItem);

@@ -110,6 +110,6 @@ public:
     CFX_DIBitmap	*m_pDIB;

     FX_DWORD		m_dwCheckState;

     CFX_RectF		m_rtCheckBox;

-    FX_LPVOID		m_pData;

+    void*		m_pData;

 };

 #endif

diff --git a/xfa/include/fwl/lightwidget/edit.h b/xfa/include/fwl/lightwidget/edit.h
index d95baa20e1..94a4ac48e4 100644
--- a/xfa/include/fwl/lightwidget/edit.h
+++ b/xfa/include/fwl/lightwidget/edit.h
@@ -28,7 +28,7 @@ public:
     FWL_ERR		SetLimit(int32_t nLimit);

     FWL_ERR		SetAliasChar(FX_WCHAR wAlias);

     FWL_ERR		SetFormatString(const CFX_WideString &wsFormat);

-    FWL_ERR		Insert(int32_t nStart, FX_LPCWSTR lpText, int32_t nLen);

+    FWL_ERR		Insert(int32_t nStart, const FX_WCHAR* lpText, int32_t nLen);

     FWL_ERR		DeleteSelections();

     FWL_ERR		DeleteRange(int32_t nStart, int32_t nCount = -1);

     FWL_ERR		ReplaceSelections(const CFX_WideStringC &wsReplace);

diff --git a/xfa/include/fwl/lightwidget/listbox.h b/xfa/include/fwl/lightwidget/listbox.h
index a8d024abaa..839bc18a9a 100644
--- a/xfa/include/fwl/lightwidget/listbox.h
+++ b/xfa/include/fwl/lightwidget/listbox.h
@@ -34,8 +34,8 @@ public:
     FWL_HLISTITEM	GetItem(int32_t nIndex);

     FWL_ERR		SetItemString(FWL_HLISTITEM hItem, FX_WSTR wsText);

     FWL_ERR		GetItemString(FWL_HLISTITEM hItem, CFX_WideString &wsText);

-    FWL_ERR		SetItemData(FWL_HLISTITEM hItem, FX_LPVOID pData);

-    FX_LPVOID	GetItemData(FWL_HLISTITEM hItem);

+    FWL_ERR		SetItemData(FWL_HLISTITEM hItem, void* pData);

+    void*	GetItemData(FWL_HLISTITEM hItem);

     FWL_HLISTITEM	GetItemAtPoint(FX_FLOAT fx, FX_FLOAT fy);

     FX_DWORD		GetItemStates(FWL_HLISTITEM hItem);

     CFWL_ListBox();

@@ -56,10 +56,10 @@ protected:
         virtual	FX_DWORD		GetItemStyles(IFWL_Widget *pWidget, FWL_HLISTITEM hItem);

         virtual	FWL_ERR			GetItemText(IFWL_Widget *pWidget, FWL_HLISTITEM hItem, CFX_WideString &wsText);

         virtual FWL_ERR			GetItemRect(IFWL_Widget *pWidget, FWL_HLISTITEM hItem, CFX_RectF &rtItem);

-        virtual FX_LPVOID		GetItemData(IFWL_Widget *pWidget, FWL_HLISTITEM hItem);

+        virtual void*		GetItemData(IFWL_Widget *pWidget, FWL_HLISTITEM hItem);

 

         virtual	FWL_ERR			SetItemStyles(IFWL_Widget *pWidget, FWL_HLISTITEM hItem, FX_DWORD dwStyle);

-        virtual FWL_ERR			SetItemText(IFWL_Widget *pWidget, FWL_HLISTITEM hItem, FX_LPCWSTR pszText);

+        virtual FWL_ERR			SetItemText(IFWL_Widget *pWidget, FWL_HLISTITEM hItem, const FX_WCHAR* pszText);

         virtual FWL_ERR			SetItemRect(IFWL_Widget *pWidget, FWL_HLISTITEM hItem, const CFX_RectF &rtItem);

         virtual FX_FLOAT		GetItemHeight(IFWL_Widget *pWidget);

         virtual CFX_DIBitmap*	GetItemIcon(IFWL_Widget *pWidget, FWL_HLISTITEM hItem);

@@ -91,7 +91,7 @@ public:
     FX_DWORD		m_dwStates;

     CFX_WideString	m_wsText;

     CFX_DIBitmap	*m_pDIB;

-    FX_LPVOID		m_pData;

+    void*		m_pData;

     FX_DWORD		m_dwCheckState;

     CFX_RectF		m_rtCheckBox;

 };

diff --git a/xfa/include/fwl/lightwidget/theme.h b/xfa/include/fwl/lightwidget/theme.h
index 0edd9d4b3d..9c36ab5035 100644
--- a/xfa/include/fwl/lightwidget/theme.h
+++ b/xfa/include/fwl/lightwidget/theme.h
@@ -22,7 +22,7 @@ public:
     virtual FWL_ERR		SetThemeMatrix(IFWL_Widget *pWidget, const CFX_Matrix &matrix);

     virtual FX_BOOL		DrawBackground(CFWL_ThemeBackground *pParams);

     virtual FX_BOOL		DrawText(CFWL_ThemeText *pParams);

-    virtual FX_LPVOID   GetCapacity(CFWL_ThemePart *pThemePart, FX_DWORD dwCapacity);

+    virtual void*   GetCapacity(CFWL_ThemePart *pThemePart, FX_DWORD dwCapacity);

     virtual FX_BOOL		IsCustomizedLayout(IFWL_Widget *pWidget);

     virtual FWL_ERR		GetPartRect(CFWL_ThemePart* pThemePart, CFX_RectF &rtPart);

     virtual FX_BOOL		IsInPart(CFWL_ThemePart* pThemePart, FX_FLOAT fx, FX_FLOAT fy);

@@ -31,7 +31,7 @@ public:
     virtual FWL_ERR		Finalize();

     CFWL_Theme();

     virtual ~CFWL_Theme();

-    FWL_ERR		SetFont(IFWL_Widget *pWidget, FX_LPCWSTR strFont, FX_FLOAT fFontSize, FX_ARGB rgbFont);

+    FWL_ERR		SetFont(IFWL_Widget *pWidget, const FX_WCHAR* strFont, FX_FLOAT fFontSize, FX_ARGB rgbFont);

     CFWL_WidgetTP* GetTheme(IFWL_Widget* pWidget);

 protected:

     CFX_PtrArray	m_arrThemes;

diff --git a/xfa/include/fwl/lightwidget/widget.h b/xfa/include/fwl/lightwidget/widget.h
index d581c7fb40..b6bd62bb2a 100644
--- a/xfa/include/fwl/lightwidget/widget.h
+++ b/xfa/include/fwl/lightwidget/widget.h
@@ -62,8 +62,8 @@ public:
     FWL_ERR			ModifyStylesEx(FX_DWORD dwStylesExAdded, FX_DWORD dwStylesExRemoved);

     FX_DWORD		GetStates();

     FWL_ERR			SetStates(FX_DWORD dwStates, FX_BOOL bSet = TRUE);

-    FWL_ERR			SetPrivateData(FX_LPVOID module_id, FX_LPVOID pData, PD_CALLBACK_FREEDATA callback);

-    FX_LPVOID		GetPrivateData(FX_LPVOID module_id);

+    FWL_ERR			SetPrivateData(void* module_id, void* pData, PD_CALLBACK_FREEDATA callback);

+    void*		GetPrivateData(void* module_id);

     FWL_ERR			Update();

     FWL_ERR			LockUpdate();

     FWL_ERR			UnlockUpdate();

diff --git a/xfa/include/fwl/theme/comboboxtp.h b/xfa/include/fwl/theme/comboboxtp.h
index 1ed39742e6..62b378f653 100644
--- a/xfa/include/fwl/theme/comboboxtp.h
+++ b/xfa/include/fwl/theme/comboboxtp.h
@@ -15,7 +15,7 @@ public:
     virtual ~CFWL_ComboBoxTP();

     virtual	FX_BOOL		IsValidWidget(IFWL_Widget *pWidget);

     virtual FX_BOOL		DrawBackground(CFWL_ThemeBackground *pParams);

-    virtual FX_LPVOID   GetCapacity(CFWL_ThemePart *pThemePart, FX_DWORD dwCapacity);

+    virtual void*   GetCapacity(CFWL_ThemePart *pThemePart, FX_DWORD dwCapacity);

 protected:

     void	DrawDropDownButton(CFWL_ThemeBackground *pParams, FX_DWORD dwStates, CFX_Matrix *pMatrix);

     void	DrawStrethHandler(CFWL_ThemeBackground *pParams, FX_DWORD dwStates, CFX_Matrix *pMatrix);

diff --git a/xfa/include/fwl/theme/formtp.h b/xfa/include/fwl/theme/formtp.h
index e531b55a53..55449da6fd 100644
--- a/xfa/include/fwl/theme/formtp.h
+++ b/xfa/include/fwl/theme/formtp.h
@@ -20,7 +20,7 @@ public:
     virtual	FX_DWORD	SetThemeID(IFWL_Widget *pWidget, FX_DWORD dwThemeID, FX_BOOL bChildren = TRUE);

     virtual FX_BOOL		DrawBackground(CFWL_ThemeBackground *pParams);

     virtual FX_BOOL		DrawText(CFWL_ThemeText *pParams);

-    virtual FX_LPVOID   GetCapacity(CFWL_ThemePart *pThemePart, FX_DWORD dwCapacity);

+    virtual void*   GetCapacity(CFWL_ThemePart *pThemePart, FX_DWORD dwCapacity);

     virtual FWL_ERR		GetPartRect(CFWL_ThemePart *pThemePart, CFX_RectF& rtPart);

 protected:

 

diff --git a/xfa/include/fwl/theme/listboxtp.h b/xfa/include/fwl/theme/listboxtp.h
index aaae2eba38..4b82aa653a 100644
--- a/xfa/include/fwl/theme/listboxtp.h
+++ b/xfa/include/fwl/theme/listboxtp.h
@@ -19,6 +19,6 @@ public:
     virtual FWL_ERR		Initialize();

     virtual FWL_ERR		Finalize();

 protected:

-    void DrawListBoxItem(CFX_Graphics *pGraphics, FX_DWORD dwStates, const CFX_RectF *prtItem, FX_LPVOID pData = NULL, CFX_Matrix *pMatrix = NULL);

+    void DrawListBoxItem(CFX_Graphics *pGraphics, FX_DWORD dwStates, const CFX_RectF *prtItem, void* pData = NULL, CFX_Matrix *pMatrix = NULL);

 };

 #endif

diff --git a/xfa/include/fwl/theme/monthcalendartp.h b/xfa/include/fwl/theme/monthcalendartp.h
index 6f0624ae9c..f601600659 100644
--- a/xfa/include/fwl/theme/monthcalendartp.h
+++ b/xfa/include/fwl/theme/monthcalendartp.h
@@ -17,7 +17,7 @@ public:
     virtual	FX_DWORD	SetThemeID(IFWL_Widget *pWidget, FX_DWORD dwThemeID, FX_BOOL bChildren = TRUE);

     virtual FX_BOOL		DrawBackground(CFWL_ThemeBackground *pParams);

     virtual FX_BOOL		DrawText(CFWL_ThemeText *pParams);

-    virtual FX_LPVOID   GetCapacity(CFWL_ThemePart *pThemePart, FX_DWORD dwCapacity);

+    virtual void*   GetCapacity(CFWL_ThemePart *pThemePart, FX_DWORD dwCapacity);

     virtual FWL_ERR		Initialize();

     virtual FWL_ERR		Finalize();

 protected:

diff --git a/xfa/include/fwl/theme/pushbuttontp.h b/xfa/include/fwl/theme/pushbuttontp.h
index f6db37b95e..20df2037ab 100644
--- a/xfa/include/fwl/theme/pushbuttontp.h
+++ b/xfa/include/fwl/theme/pushbuttontp.h
@@ -16,7 +16,7 @@ public:
     virtual FX_BOOL		IsValidWidget(IFWL_Widget *pWidget);

     virtual FX_DWORD	SetThemeID(IFWL_Widget *pWidget, FX_DWORD dwThemeID, FX_BOOL bChildren = TRUE);

     virtual FX_BOOL		DrawBackground(CFWL_ThemeBackground *pParams);

-    virtual FX_LPVOID   GetCapacity(CFWL_ThemePart *pThemePart, FX_DWORD dwCapacity);

+    virtual void*   GetCapacity(CFWL_ThemePart *pThemePart, FX_DWORD dwCapacity);

     virtual FWL_ERR		Initialize();

     virtual FWL_ERR		Finalize();

 protected:

diff --git a/xfa/include/fwl/theme/scrollbartp.h b/xfa/include/fwl/theme/scrollbartp.h
index 3153c79ead..94002fbd11 100644
--- a/xfa/include/fwl/theme/scrollbartp.h
+++ b/xfa/include/fwl/theme/scrollbartp.h
@@ -16,7 +16,7 @@ public:
     virtual FX_BOOL		IsValidWidget(IFWL_Widget *pWidget);

     virtual FX_DWORD	SetThemeID(IFWL_Widget *pWidget, FX_DWORD dwThemeID, FX_BOOL bChildren = TRUE);

     virtual FX_BOOL		DrawBackground(CFWL_ThemeBackground *pParams);

-    virtual FX_LPVOID	GetCapacity(CFWL_ThemePart *pThemePart, FX_DWORD dwCapacity);

+    virtual void*	GetCapacity(CFWL_ThemePart *pThemePart, FX_DWORD dwCapacity);

 protected:

     void	DrawThumbBtn(CFX_Graphics *pGraphics, const CFX_RectF *pRect, FX_BOOL bVert, FWLTHEME_STATE eState, FX_BOOL bPawButton = TRUE, CFX_Matrix *pMatrix = NULL);

     void	DrawTrack(CFX_Graphics *pGraphics, const CFX_RectF *pRect, FX_BOOL bVert, FWLTHEME_STATE eState, FX_BOOL bLowerTrack, CFX_Matrix *pMatrix = NULL);

diff --git a/xfa/include/fwl/theme/widgettp.h b/xfa/include/fwl/theme/widgettp.h
index 5a07c7ea03..9d0578478e 100644
--- a/xfa/include/fwl/theme/widgettp.h
+++ b/xfa/include/fwl/theme/widgettp.h
@@ -26,7 +26,7 @@ public:
     virtual FWL_ERR		SetThemeMatrix(IFWL_Widget *pWidget, const CFX_Matrix &matrix);

     virtual FX_BOOL		DrawBackground(CFWL_ThemeBackground *pParams);

     virtual FX_BOOL		DrawText(CFWL_ThemeText *pParams);

-    virtual FX_LPVOID   GetCapacity(CFWL_ThemePart *pThemePart, FX_DWORD dwCapacity);

+    virtual void*   GetCapacity(CFWL_ThemePart *pThemePart, FX_DWORD dwCapacity);

     virtual FX_BOOL		IsCustomizedLayout(IFWL_Widget *pWidget);

     virtual FWL_ERR		GetPartRect(CFWL_ThemePart *pThemePart, CFX_RectF &rtPart);

     virtual FX_BOOL		IsInPart(CFWL_ThemePart *pThemePart, FX_FLOAT fx, FX_FLOAT fy);

@@ -34,7 +34,7 @@ public:
     virtual FWL_ERR		Initialize();

     virtual FWL_ERR		Finalize();

     virtual ~CFWL_WidgetTP();

-    FWL_ERR		SetFont(IFWL_Widget *pWidget, FX_LPCWSTR strFont, FX_FLOAT fFontSize, FX_ARGB rgbFont);

+    FWL_ERR		SetFont(IFWL_Widget *pWidget, const FX_WCHAR* strFont, FX_FLOAT fFontSize, FX_ARGB rgbFont);

     FWL_ERR		SetFont(IFWL_Widget *pWidget, IFX_Font *pFont, FX_FLOAT fFontSize, FX_ARGB rgbFont);

     IFX_Font*	GetFont(IFWL_Widget *pWidget);

 protected:

diff --git a/xfa/include/fxfa/fxfa.h b/xfa/include/fxfa/fxfa.h
index b732f98d9c..a6cc5e1484 100644
--- a/xfa/include/fxfa/fxfa.h
+++ b/xfa/include/fxfa/fxfa.h
@@ -337,7 +337,7 @@ public:
                                     const CFX_RectF &rtAnchor, CFX_RectF &rtPopup) = 0;

     virtual FX_BOOL		PopupMenu(IXFA_Widget* hWidget, CFX_PointF ptPopup, const CFX_RectF* pRectExclude = NULL) = 0;

     virtual void		PageViewEvent(IXFA_PageView* pPageView, FX_DWORD dwFlags) = 0;

-    virtual void		WidgetEvent(IXFA_Widget* hWidget, CXFA_WidgetAcc* pWidgetData, FX_DWORD dwEvent, FX_LPVOID pParam = NULL, FX_LPVOID pAdditional = NULL) = 0;

+    virtual void		WidgetEvent(IXFA_Widget* hWidget, CXFA_WidgetAcc* pWidgetData, FX_DWORD dwEvent, void* pParam = NULL, void* pAdditional = NULL) = 0;

     virtual FX_BOOL		RenderCustomWidget(IXFA_Widget* hWidget, CFX_Graphics* pGS, CFX_Matrix* pMatrix, const CFX_RectF& rtUI)

     {

         return FALSE;

@@ -640,8 +640,8 @@ public:
 

     virtual void			GetName(IXFA_Widget* hWidget, CFX_WideString &wsName, int32_t iNameType = 0) = 0;

     virtual	FX_BOOL			GetToolTip(IXFA_Widget* hWidget, CFX_WideString &wsToolTip) = 0;

-    virtual	void			SetPrivateData(IXFA_Widget* hWidget, FX_LPVOID module_id, FX_LPVOID pData, PD_CALLBACK_FREEDATA callback) = 0;

-    virtual	FX_LPVOID		GetPrivateData(IXFA_Widget* hWidget, FX_LPVOID module_id) = 0;

+    virtual	void			SetPrivateData(IXFA_Widget* hWidget, void* module_id, void* pData, PD_CALLBACK_FREEDATA callback) = 0;

+    virtual	void*		GetPrivateData(IXFA_Widget* hWidget, void* module_id) = 0;

     virtual FX_BOOL			OnMouseEnter(IXFA_Widget* hWidget) = 0;

     virtual FX_BOOL			OnMouseExit(IXFA_Widget* hWidget) = 0;

     virtual FX_BOOL			OnLButtonDown(IXFA_Widget* hWidget, FX_DWORD dwFlags, FX_FLOAT fx, FX_FLOAT fy) = 0;

diff --git a/xfa/include/fxfa/fxfa_basic.h b/xfa/include/fxfa/fxfa_basic.h
index dcf1ac2e95..b157fff24c 100644
--- a/xfa/include/fxfa/fxfa_basic.h
+++ b/xfa/include/fxfa/fxfa_basic.h
@@ -77,9 +77,9 @@ enum XFA_XDPPACKET_FLAGS {
 };

 typedef struct _XFA_PACKETINFO {

     uint32_t					uHash;

-    FX_LPCWSTR					pName;

+    const FX_WCHAR*					pName;

     XFA_XDPPACKET				eName;

-    FX_LPCWSTR					pURI;

+    const FX_WCHAR*					pURI;

     FX_DWORD					eFlags;

 } XFA_PACKETINFO, * XFA_LPPACKETINFO;

 typedef XFA_PACKETINFO const * XFA_LPCPACKETINFO;

@@ -920,7 +920,7 @@ enum XFA_ELEMENT {
 #define XFA_ELEMENT_UNKNOWN ((XFA_ELEMENT)-1)

 typedef struct _XFA_ELEMENTINFO {

     uint32_t					uHash;

-    FX_LPCWSTR					pName;

+    const FX_WCHAR*					pName;

     XFA_ELEMENT					eName;

     FX_DWORD					dwPackets;

     FX_DWORD					eObjectType;

@@ -939,17 +939,17 @@ enum XFA_ATTRIBUTETYPE {
 };

 typedef struct _XFA_ATTRIBUTEINFO {

     uint32_t					uHash;

-    FX_LPCWSTR					pName;

+    const FX_WCHAR*					pName;

     XFA_ATTRIBUTE				eName;

     XFA_ATTRIBUTETYPE			eType;

     FX_DWORD					dwPackets;

-    FX_LPVOID					pDefValue;

+    void*					pDefValue;

 } XFA_ATTRIBUTEINFO, * XFA_LPATTRIBUTEINFO;

 typedef XFA_ATTRIBUTEINFO const * XFA_LPCATTRIBUTEINFO;

 int32_t XFA_GetAttributeCount();

 XFA_LPCATTRIBUTEINFO XFA_GetAttributeByName(FX_WSTR wsName);

 XFA_LPCATTRIBUTEINFO XFA_GetAttributeByID(XFA_ATTRIBUTE eName);

-FX_BOOL XFA_GetAttributeDefaultValue(FX_LPVOID &pValue, XFA_ELEMENT eElement, XFA_ATTRIBUTE eAttribute, XFA_ATTRIBUTETYPE eType, FX_DWORD dwPacket);

+FX_BOOL XFA_GetAttributeDefaultValue(void* &pValue, XFA_ELEMENT eElement, XFA_ATTRIBUTE eAttribute, XFA_ATTRIBUTETYPE eType, FX_DWORD dwPacket);

 XFA_ATTRIBUTEENUM	XFA_GetAttributeDefaultValue_Enum(XFA_ELEMENT eElement, XFA_ATTRIBUTE eAttribute, FX_DWORD dwPacket);

 CFX_WideStringC		XFA_GetAttributeDefaultValue_Cdata(XFA_ELEMENT eElement, XFA_ATTRIBUTE eAttribute, FX_DWORD dwPacket);

 FX_BOOL				XFA_GetAttributeDefaultValue_Boolean(XFA_ELEMENT eElement, XFA_ATTRIBUTE eAttribute, FX_DWORD dwPacket);

@@ -969,8 +969,8 @@ typedef struct _XFA_SCRIPTHIERARCHY {
     int16_t					wParentIndex;

 } XFA_SCRIPTHIERARCHY, * XFA_LPSCRIPTHIERARCHY;

 typedef XFA_SCRIPTHIERARCHY const * XFA_LPCSCRIPTHIERARCHY;

-FX_LPCWORD XFA_GetElementChildren(XFA_ELEMENT eElement, int32_t &iCount);

-FX_LPCBYTE XFA_GetElementAttributes(XFA_ELEMENT eElement, int32_t &iCount);

+const FX_WORD* XFA_GetElementChildren(XFA_ELEMENT eElement, int32_t &iCount);

+const uint8_t* XFA_GetElementAttributes(XFA_ELEMENT eElement, int32_t &iCount);

 XFA_LPCELEMENTINFO XFA_GetChildOfElement(XFA_ELEMENT eElement, XFA_ELEMENT eChild, FX_DWORD dwPacket);

 XFA_LPCATTRIBUTEINFO XFA_GetAttributeOfElement(XFA_ELEMENT eElement, XFA_ATTRIBUTE eAttribute, FX_DWORD dwPacket);

 #define XFA_PROPERTYFLAG_OneOf			0x01

@@ -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);

 typedef struct _XFA_ATTRIBUTEENUMINFO {

     uint32_t					uHash;

-    FX_LPCWSTR					pName;

+    const FX_WCHAR*					pName;

     XFA_ATTRIBUTEENUM			eName;

 } XFA_ATTRIBUTEENUMINFO, * XFA_LPATTRIBUTEENUMINFO;

 typedef XFA_ATTRIBUTEENUMINFO const * XFA_LPCATTRIBUTEENUMINFO;

@@ -1050,7 +1050,7 @@ class CXFA_Object;
 typedef void (CXFA_Object::*XFA_METHOD_CALLBACK) (CFXJSE_Arguments* pArguments);

 typedef struct _XFA_METHODINFO {

     uint32_t					uHash;

-    FX_LPCWSTR					pName;

+    const FX_WCHAR*					pName;

     XFA_METHOD_CALLBACK			lpfnCallback;

 } XFA_METHODINFO, * XFA_LPMETHODINFO;

 typedef XFA_METHODINFO const * XFA_LPCMETHODINFO;

@@ -1063,7 +1063,7 @@ enum XFA_SCRIPT_TYPE {
 };

 typedef struct _XFA_SCRIPTATTRIBUTEINFO {

     uint32_t						uHash;

-    FX_LPCWSTR						pName;

+    const FX_WCHAR*						pName;

     XFA_ATTRIBUTE_CALLBACK			lpfnCallback;

     int32_t						eAttribute;

     FX_WORD							eValueType;

diff --git a/xfa/include/fxfa/fxfa_widget.h b/xfa/include/fxfa/fxfa_widget.h
index 0ec3eaaaf4..21d007d7f1 100644
--- a/xfa/include/fxfa/fxfa_widget.h
+++ b/xfa/include/fxfa/fxfa_widget.h
@@ -63,7 +63,7 @@ public:
     void				SetImageImage(CFX_DIBitmap* newImage);

     void				SetImageEditImage(CFX_DIBitmap* newImage);

     void			UpdateUIDisplay(CXFA_FFWidget* pExcept = NULL);

-    void			NotifyEvent(FX_DWORD dwEvent, CXFA_FFWidget* pWidget = NULL, FX_LPVOID pParam = NULL, FX_LPVOID pAdditional = NULL);

+    void			NotifyEvent(FX_DWORD dwEvent, CXFA_FFWidget* pWidget = NULL, void* pParam = NULL, void* pAdditional = NULL);

 

 

     CXFA_Node*		GetDatasets();

diff --git a/xfa/include/fxjse/fxjse.h b/xfa/include/fxjse/fxjse.h
index c0ec9c91d6..56187158d5 100644
--- a/xfa/include/fxjse/fxjse.h
+++ b/xfa/include/fxjse/fxjse.h
@@ -8,16 +8,16 @@
 #define _FXJSE_H_

 

 typedef struct FXJSE_HRUNTIME_ {

-    FX_LPVOID pData;

+    void* pData;

 }* FXJSE_HRUNTIME;

 typedef struct FXJSE_HCONTEXT_ {

-    FX_LPVOID pData;

+    void* pData;

 }* FXJSE_HCONTEXT;

 typedef struct FXJSE_HCLASS_ {

-    FX_LPVOID pData;

+    void* pData;

 }* FXJSE_HCLASS;

 typedef struct FXJSE_HVALUE_ {

-    FX_LPVOID pData;

+    void* pData;

 }* FXJSE_HVALUE;

 typedef struct FXJSE_HOBJECT_ : public FXJSE_HVALUE_ {

 }* FXJSE_HOBJECT;

@@ -28,7 +28,7 @@ void FXJSE_Finalize();
 FXJSE_HRUNTIME	FXJSE_Runtime_Create();

 void			FXJSE_Runtime_Release(FXJSE_HRUNTIME hRuntime);

 typedef struct _FXJSE_CLASS FXJSE_CLASS;

-FXJSE_HCONTEXT	FXJSE_Context_Create	(FXJSE_HRUNTIME hRuntime, const FXJSE_CLASS* lpGlobalClass = NULL, FX_LPVOID lpGlobalObject = NULL);

+FXJSE_HCONTEXT	FXJSE_Context_Create	(FXJSE_HRUNTIME hRuntime, const FXJSE_CLASS* lpGlobalClass = NULL, void* lpGlobalObject = NULL);

 void			FXJSE_Context_Release	(FXJSE_HCONTEXT hContext);

 FXJSE_HVALUE	FXJSE_Context_GetGlobalObject(FXJSE_HCONTEXT hContext);

 FXJSE_HRUNTIME  FXJSE_Context_GetRuntime(FXJSE_HCONTEXT hContext);

@@ -47,7 +47,7 @@ public:
     int32_t		GetInt32(int32_t index) const;

     FX_FLOAT		GetFloat(int32_t index) const;

     CFX_ByteString	GetUTF8String(int32_t index) const;

-    FX_LPVOID		GetObject(int32_t index, FXJSE_HCLASS hClass = NULL) const;

+    void*		GetObject(int32_t index, FXJSE_HCLASS hClass = NULL) const;

     FXJSE_HVALUE	GetReturnValue();

 };

 typedef void	(*FXJSE_FuncCallback)	(FXJSE_HOBJECT hThis,	FX_BSTR szFuncName, CFXJSE_Arguments &args);

@@ -55,13 +55,13 @@ typedef void	(*FXJSE_PropAccessor)	(FXJSE_HOBJECT hObject, FX_BSTR szPropName, F
 typedef int32_t(*FXJSE_PropTypeGetter)	(FXJSE_HOBJECT hObject, FX_BSTR szPropName, FX_BOOL bQueryIn);

 typedef FX_BOOL (*FXJSE_PropDeleter)	(FXJSE_HOBJECT hObject, FX_BSTR szPropName);

 typedef struct _FXJSE_FUNCTION {

-    FX_LPCSTR				name;

+    const FX_CHAR*				name;

     FXJSE_FuncCallback		callbackProc;

 } FXJSE_FUNCTION;

 #define FXJSE_DEF_FUNCTION(functionName, functionCallback) {functionName, functionCallback}

 void	FXJSE_DefineFunctions(FXJSE_HCONTEXT hContext, const FXJSE_FUNCTION* lpFunctions, int nNum);

 typedef struct _FXJSE_PROPERTY {

-    FX_LPCSTR				name;

+    const FX_CHAR*				name;

     FXJSE_PropAccessor		getProc;

     FXJSE_PropAccessor		setProc;

 } FXJSE_PROPERTY;

@@ -71,7 +71,7 @@ enum FXJSE_ClassPropTypes {
     FXJSE_ClassPropType_Method

 };

 typedef struct _FXJSE_CLASS {

-    FX_LPCSTR				name;

+    const FX_CHAR*				name;

     FXJSE_FuncCallback		constructor;

     FXJSE_PROPERTY*			properties;

     FXJSE_FUNCTION*			methods;

@@ -103,7 +103,7 @@ FX_FLOAT		FXJSE_Value_ToFloat			(FXJSE_HVALUE hValue);
 FXJSE_DOUBLE	FXJSE_Value_ToDouble		(FXJSE_HVALUE hValue);

 int32_t		FXJSE_Value_ToInteger		(FXJSE_HVALUE hValue);

 void			FXJSE_Value_ToUTF8String	(FXJSE_HVALUE hValue, CFX_ByteString& szStrOutput);

-FX_LPVOID		FXJSE_Value_ToObject		(FXJSE_HVALUE hValue, FXJSE_HCLASS hClass);

+void*		FXJSE_Value_ToObject		(FXJSE_HVALUE hValue, FXJSE_HCLASS hClass);

 void			FXJSE_Value_SetUndefined	(FXJSE_HVALUE hValue);

 void			FXJSE_Value_SetNull			(FXJSE_HVALUE hValue);

 void			FXJSE_Value_SetBoolean		(FXJSE_HVALUE hValue, FX_BOOL	   bBoolean);

@@ -111,7 +111,7 @@ void			FXJSE_Value_SetUTF8String	(FXJSE_HVALUE hValue, FX_BSTR	   szString);
 void			FXJSE_Value_SetInteger		(FXJSE_HVALUE hValue, int32_t     nInteger);

 void			FXJSE_Value_SetFloat		(FXJSE_HVALUE hValue, FX_FLOAT     fFloat);

 void			FXJSE_Value_SetDouble		(FXJSE_HVALUE hValue, FXJSE_DOUBLE dDouble);

-void			FXJSE_Value_SetObject		(FXJSE_HVALUE hValue, FX_LPVOID lpObject, FXJSE_HCLASS hClass);

+void			FXJSE_Value_SetObject		(FXJSE_HVALUE hValue, void* lpObject, FXJSE_HCLASS hClass);

 void			FXJSE_Value_SetArray		(FXJSE_HVALUE hValue, uint32_t uValueCount, FXJSE_HVALUE* rgValues);

 void			FXJSE_Value_SetDate			(FXJSE_HVALUE hValue, FXJSE_DOUBLE dDouble);

 void			FXJSE_Value_Set				(FXJSE_HVALUE hValue, FXJSE_HVALUE hOriginalValue);

@@ -124,7 +124,7 @@ FX_BOOL			FXJSE_Value_ObjectHasOwnProp	(FXJSE_HVALUE hValue, FX_BSTR	szPropName,
 FX_BOOL			FXJSE_Value_SetObjectOwnProp	(FXJSE_HVALUE hValue, FX_BSTR	szPropName, FXJSE_HVALUE hPropValue);

 FX_BOOL			FXJSE_Value_CallFunction		(FXJSE_HVALUE hFunction, FXJSE_HVALUE hThis, FXJSE_HVALUE hRetValue, uint32_t nArgCount, FXJSE_HVALUE* lpArgs);

 FX_BOOL			FXJSE_Value_SetFunctionBind	(FXJSE_HVALUE hValue, FXJSE_HVALUE hOldFunction, FXJSE_HVALUE hNewThis);

-FX_BOOL			FXJSE_ExecuteScript(FXJSE_HCONTEXT hContext, FX_LPCSTR szScript, FXJSE_HVALUE hRetValue, FXJSE_HVALUE hNewThisObject = NULL);

+FX_BOOL			FXJSE_ExecuteScript(FXJSE_HCONTEXT hContext, const FX_CHAR* szScript, FXJSE_HVALUE hRetValue, FXJSE_HVALUE hNewThisObject = NULL);

 void			FXJSE_ThrowMessage(FX_BSTR utf8Name, FX_BSTR utf8Message);

 FX_BOOL			FXJSE_ReturnValue_GetMessage(FXJSE_HVALUE hRetValue, CFX_ByteString& utf8Name, CFX_ByteString& utf8Message);

 FX_BOOL			FXJSE_ReturnValue_GetLineInfo(FXJSE_HVALUE hRetValue, int32_t& nLine, int32_t& nCol);