Merge to XFA: Remove FX_BSTR and FX_WSTR typedefs.

Nearly automatic merge + re-run script on new files.

Original Review URL: https://codereview.chromium.org/1180593004.
TBR=thestig@chromium.org

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

24 files changed, 105 insertions, 105 deletions

diff --git a/xfa/include/fwl/adapter/fwl_adapterclipboardmgr.h b/xfa/include/fwl/adapter/fwl_adapterclipboardmgr.h
index 1ad09eda96..943d7caa12 100644
--- a/xfa/include/fwl/adapter/fwl_adapterclipboardmgr.h
+++ b/xfa/include/fwl/adapter/fwl_adapterclipboardmgr.h
@@ -26,11 +26,11 @@ public:
     virtual int32_t	GetDataSize(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;

+    virtual FWL_ERR		SetStringData(const CFX_WideStringC& ws) = 0;

+    virtual FWL_ERR		SetStringData(const CFX_ByteStringC& bs) = 0;

     virtual FWL_ERR		GetStringData(CFX_WideString &ws) = 0;

     virtual FWL_ERR		GetStringData(CFX_ByteString &bs) = 0;

     virtual FWL_ERR		EnumFormats(CFX_DWordArray &formats) = 0;

-    virtual FX_DWORD	RegisterFormat(FX_WSTR wsFormat) = 0;

+    virtual FX_DWORD	RegisterFormat(const CFX_WideStringC& wsFormat) = 0;

 };

 #endif

diff --git a/xfa/include/fwl/adapter/fwl_adapterwidgetmgr.h b/xfa/include/fwl/adapter/fwl_adapterwidgetmgr.h
index bff8e8a885..603e931084 100644
--- a/xfa/include/fwl/adapter/fwl_adapterwidgetmgr.h
+++ b/xfa/include/fwl/adapter/fwl_adapterwidgetmgr.h
@@ -24,7 +24,7 @@ public:
     virtual FWL_ERR SetWidgetPosition(IFWL_Widget *pWidget, FX_FLOAT fx, FX_FLOAT fy) = 0;

     virtual FWL_ERR SetParentWidget(IFWL_Widget *pWidget, IFWL_Widget *pParent) = 0;

     virtual FWL_ERR SetWidgetIcon(IFWL_Widget *pWidget, const CFX_DIBitmap *pIcon, FX_BOOL bBig) = 0;

-    virtual FWL_ERR SetWidgetCaption(IFWL_Widget *pWidget, FX_WSTR wsCaption) = 0;

+    virtual FWL_ERR SetWidgetCaption(IFWL_Widget *pWidget, const CFX_WideStringC& wsCaption) = 0;

     virtual	FWL_ERR	SetBorderRegion(IFWL_Widget *pWidget, CFX_Path *pPath) = 0;

     virtual FWL_ERR SetTransparent(IFWL_Widget *pWidget, FX_DWORD dwAlpha) = 0;

     virtual FWL_ERR ShowWidget(IFWL_Widget *pWidget) = 0;

diff --git a/xfa/include/fwl/adapter/fwl_sdadapterimp.h b/xfa/include/fwl/adapter/fwl_sdadapterimp.h
index ba14ae66c6..733a14da33 100644
--- a/xfa/include/fwl/adapter/fwl_sdadapterimp.h
+++ b/xfa/include/fwl/adapter/fwl_sdadapterimp.h
@@ -37,7 +37,7 @@ public:
 public:

     virtual FWL_ERR GetWidgetRect(IFWL_Widget *pWidget, CFX_RectF &rect);

     virtual FWL_ERR SetWidgetIcon(IFWL_Widget *pWidget, const CFX_DIBitmap *pIcon, FX_BOOL bBig);

-    virtual FWL_ERR SetWidgetCaption(IFWL_Widget *pWidget, FX_WSTR wsCaption);

+    virtual FWL_ERR SetWidgetCaption(IFWL_Widget *pWidget, const CFX_WideStringC& wsCaption);

     virtual	FWL_ERR	SetBorderRegion(IFWL_Widget *pWidget, CFX_Path *pPath);

     virtual FWL_ERR SetTransparent(IFWL_Widget *pWidget, FX_DWORD dwAlpha);

     virtual FWL_ERR SetFullScreen(IFWL_Widget *pWidget, FX_BOOL bFullScreen);

diff --git a/xfa/include/fwl/basewidget/fwl_combobox.h b/xfa/include/fwl/basewidget/fwl_combobox.h
index 950189bbba..ddccd6bea3 100644
--- a/xfa/include/fwl/basewidget/fwl_combobox.h
+++ b/xfa/include/fwl/basewidget/fwl_combobox.h
@@ -112,8 +112,8 @@ public:
     int32_t	GetEditLimit();

     FWL_ERR		SetEditLimit(int32_t nLimit);

     FWL_ERR		EditDoClipboard(int32_t iCmd);

-    FX_BOOL		EditRedo(FX_BSTR bsRecord);

-    FX_BOOL		EditUndo(FX_BSTR bsRecord);

+    FX_BOOL		EditRedo(const CFX_ByteStringC& bsRecord);

+    FX_BOOL		EditUndo(const CFX_ByteStringC& bsRecord);

     IFWL_ListBox*	GetListBoxt();

     FX_BOOL		AfterFocusShowDropList();

     FX_ERR		OpenDropDownList(FX_BOOL bActivate);

diff --git a/xfa/include/fwl/basewidget/fwl_edit.h b/xfa/include/fwl/basewidget/fwl_edit.h
index ae8aea0bd3..82b0055322 100644
--- a/xfa/include/fwl/basewidget/fwl_edit.h
+++ b/xfa/include/fwl/basewidget/fwl_edit.h
@@ -144,8 +144,8 @@ public:
     FX_BOOL	Cut(CFX_WideString &wsCut);

     FX_BOOL	Paste(const CFX_WideString &wsPaste);

     FX_BOOL	Delete();

-    FX_BOOL	Redo(FX_BSTR bsRecord);

-    FX_BOOL	Undo(FX_BSTR bsRecord);

+    FX_BOOL	Redo(const CFX_ByteStringC& bsRecord);

+    FX_BOOL	Undo(const CFX_ByteStringC& bsRecord);

     FX_BOOL	Undo();

     FX_BOOL	Redo();

     FX_BOOL	CanUndo();

@@ -157,7 +157,7 @@ public:
     FWL_ERR SetFont(const CFX_WideString &wsFont, FX_FLOAT fSize);

     void	SetScrollOffset(FX_FLOAT fScrollOffset);

     FX_BOOL GetSuggestWords(CFX_PointF pointf, CFX_ByteStringArray &sSuggest);

-    FX_BOOL ReplaceSpellCheckWord(CFX_PointF pointf, FX_BSTR bsReplace);

+    FX_BOOL ReplaceSpellCheckWord(CFX_PointF pointf, const CFX_ByteStringC& bsReplace);

 protected:

     IFWL_Edit();

     virtual ~IFWL_Edit();

diff --git a/xfa/include/fwl/basewidget/fxmath_barcode.h b/xfa/include/fwl/basewidget/fxmath_barcode.h
index 3fcd341892..15babc8253 100644
--- a/xfa/include/fwl/basewidget/fxmath_barcode.h
+++ b/xfa/include/fwl/basewidget/fxmath_barcode.h
@@ -11,7 +11,7 @@ class IFX_Barcode
 public:

     virtual void			Release() = 0;

     virtual BC_TYPE			GetType() = 0;

-    virtual FX_BOOL			Encode(FX_WSTR contents, FX_BOOL isDevice, int32_t &e) = 0;

+    virtual FX_BOOL			Encode(const CFX_WideStringC& contents, FX_BOOL isDevice, int32_t &e) = 0;

     virtual FX_BOOL			RenderDevice(CFX_RenderDevice* device, const CFX_Matrix* matirx, int32_t &e) = 0;

     virtual FX_BOOL			RenderBitmap(CFX_DIBitmap *&pOutBitmap, int32_t &e) = 0;

     virtual CFX_WideString	Decode(uint8_t* buf, int32_t width, int32_t height, int32_t &errorCode) = 0;

@@ -21,7 +21,7 @@ public:
     virtual FX_BOOL			SetModuleWidth(int32_t moduleWidth) = 0;

     virtual FX_BOOL			SetHeight(int32_t height) = 0;

     virtual FX_BOOL			SetWidth(int32_t width) = 0;

-    virtual FX_BOOL			CheckContentValidity(FX_WSTR contents) = 0;

+    virtual FX_BOOL			CheckContentValidity(const CFX_WideStringC& contents) = 0;

     virtual FX_BOOL			SetPrintChecksum(FX_BOOL checksum) = 0;

     virtual FX_BOOL			SetDataLength(int32_t length) = 0;

     virtual FX_BOOL			SetCalChecksum(int32_t state) = 0;

diff --git a/xfa/include/fwl/core/fwl_app.h b/xfa/include/fwl/core/fwl_app.h
index b0cb1857e4..bc38db0854 100644
--- a/xfa/include/fwl/core/fwl_app.h
+++ b/xfa/include/fwl/core/fwl_app.h
@@ -29,7 +29,7 @@ void FWL_SetApp(IFWL_App *pApp);
 IFWL_AdapterNative*	FWL_GetAdapterNative();

 IFWL_AdapterWidgetMgr* FWL_GetAdapterWidgetMgr();

 IFWL_ThemeProvider*	FWL_GetThemeProvider();

-extern FWL_ERR FWL_Execute(FX_WSTR wsExecutable, FX_WSTR wsParameters);

+extern FWL_ERR FWL_Execute(const CFX_WideStringC& wsExecutable, const CFX_WideStringC& wsParameters);

 FWL_ERR FWL_SetFullScreen(IFWL_Widget *pWidget, FX_BOOL bFullScreen);

 FX_BOOL FWL_AppIsActived();

 #endif

diff --git a/xfa/include/fwl/core/fwl_note.h b/xfa/include/fwl/core/fwl_note.h
index c3dcead1e4..ea8328fffb 100644
--- a/xfa/include/fwl/core/fwl_note.h
+++ b/xfa/include/fwl/core/fwl_note.h
@@ -146,7 +146,7 @@ public:
     {

         return 0;

     }

-    virtual FX_BOOL			IsInstance(FX_WSTR wsClass) const

+    virtual FX_BOOL			IsInstance(const CFX_WideStringC& wsClass) const

     {

         return TRUE;

     }

diff --git a/xfa/include/fwl/core/fwl_target.h b/xfa/include/fwl/core/fwl_target.h
index d04a1f9c75..7ba7bf7cda 100644
--- a/xfa/include/fwl/core/fwl_target.h
+++ b/xfa/include/fwl/core/fwl_target.h
@@ -15,7 +15,7 @@ public:
     FX_DWORD		GetRefCount() const;

     FWL_ERR			GetClassName(CFX_WideString &wsClass) const;

     FX_DWORD		GetClassID() const;

-    FX_BOOL			IsInstance(FX_WSTR wsClass) const;

+    FX_BOOL			IsInstance(const CFX_WideStringC& wsClass) const;

     FWL_ERR			Initialize();

     FWL_ERR			Finalize();

 protected:

diff --git a/xfa/include/fwl/lightwidget/checkbox.h b/xfa/include/fwl/lightwidget/checkbox.h
index ebad96fd8e..f06750821f 100644
--- a/xfa/include/fwl/lightwidget/checkbox.h
+++ b/xfa/include/fwl/lightwidget/checkbox.h
@@ -18,7 +18,7 @@ public:
 

     FWL_ERR		Initialize(const CFWL_WidgetProperties *pProperties = NULL);

     FWL_ERR		GetCaption(CFX_WideString &wsCaption);

-    FWL_ERR		SetCaption(FX_WSTR wsCaption);

+    FWL_ERR		SetCaption(const CFX_WideStringC& wsCaption);

     FWL_ERR		SetBoxSize(FX_FLOAT fHeight);

     int32_t	GetCheckState();

     FWL_ERR		SetCheckState(int32_t iCheck);

diff --git a/xfa/include/fwl/lightwidget/combobox.h b/xfa/include/fwl/lightwidget/combobox.h
index fe1b5c4f25..fc09f63af0 100644
--- a/xfa/include/fwl/lightwidget/combobox.h
+++ b/xfa/include/fwl/lightwidget/combobox.h
@@ -17,15 +17,15 @@ class CFWL_ComboBox : public CFWL_Widget
 public:

     static CFWL_ComboBox* Create();

     FWL_ERR		Initialize(const CFWL_WidgetProperties *pProperties = NULL);

-    int32_t	AddString(FX_WSTR wsText);

-    int32_t	AddString(FX_WSTR wsText, CFX_DIBitmap *pIcon);

+    int32_t	AddString(const CFX_WideStringC& wsText);

+    int32_t	AddString(const CFX_WideStringC& wsText, CFX_DIBitmap *pIcon);

     int32_t	RemoveAt(int32_t iIndex);

     int32_t    RemoveAll();

     int32_t	CountItems();

     FWL_ERR		GetTextByIndex(int32_t iIndex, CFX_WideString &wsText);

     int32_t	GetCurSel();

     FWL_ERR		SetCurSel(int32_t iSel);

-    FWL_ERR		SetEditText(FX_WSTR wsText);

+    FWL_ERR		SetEditText(const CFX_WideStringC& wsText);

     int32_t	GetEditTextLength() const;

     FWL_ERR		GetEditText(CFX_WideString &wsText, int32_t nStart = 0, int32_t nCount = -1) const ;

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

@@ -33,8 +33,8 @@ public:
     int32_t	GetEditLimit();

     FWL_ERR		SetEditLimit(int32_t nLimit);

     FWL_ERR		EditDoClipboard(int32_t iCmd);

-    FX_BOOL		EditRedo(FX_BSTR bsRecord);

-    FX_BOOL		EditUndo(FX_BSTR bsRecord);

+    FX_BOOL		EditRedo(const CFX_ByteStringC& bsRecord);

+    FX_BOOL		EditUndo(const CFX_ByteStringC& bsRecord);

     FWL_ERR		SetMaxListHeight(FX_FLOAT fMaxHeight);

     FWL_ERR		SetItemData(int32_t iIndex, void* pData);

     void*	GetItemData(int32_t iIndex);

diff --git a/xfa/include/fwl/lightwidget/datetimepicker.h b/xfa/include/fwl/lightwidget/datetimepicker.h
index 4af07a99bc..13d223cf8e 100644
--- a/xfa/include/fwl/lightwidget/datetimepicker.h
+++ b/xfa/include/fwl/lightwidget/datetimepicker.h
@@ -18,7 +18,7 @@ public:
     FWL_ERR	Initialize(const CFWL_WidgetProperties *pProperties = NULL);

     FWL_ERR SetToday(int32_t iYear, int32_t iMonth, int32_t iDay);

     FWL_ERR	GetEditText(CFX_WideString &wsText);

-    FWL_ERR	SetEditText(FX_WSTR wsText);

+    FWL_ERR	SetEditText(const CFX_WideStringC& wsText);

     int32_t CountSelRanges();

     int32_t GetSelRange(int32_t nIndex, int32_t &nStart);

     FWL_ERR GetCurSel(int32_t &iYear, int32_t &iMonth, int32_t &iDay);

diff --git a/xfa/include/fwl/lightwidget/edit.h b/xfa/include/fwl/lightwidget/edit.h
index 94a4ac48e4..06c10728b0 100644
--- a/xfa/include/fwl/lightwidget/edit.h
+++ b/xfa/include/fwl/lightwidget/edit.h
@@ -34,8 +34,8 @@ public:
     FWL_ERR		ReplaceSelections(const CFX_WideStringC &wsReplace);

     FWL_ERR		Replace(int32_t nStart, int32_t nLen, const CFX_WideStringC &wsReplace);

     FWL_ERR		DoClipboard(int32_t iCmd);

-    FX_BOOL		Redo(FX_BSTR bsRecord);

-    FX_BOOL		Undo(FX_BSTR bsRecord);

+    FX_BOOL		Redo(const CFX_ByteStringC& bsRecord);

+    FX_BOOL		Undo(const CFX_ByteStringC& bsRecord);

     FWL_ERR		SetTabWidth(FX_FLOAT fTabWidth, FX_BOOL bEquidistant);

     FWL_ERR		SetNumberRange(int32_t iMin, int32_t iMax);

     FWL_ERR     SetBackColor(FX_DWORD dwColor);

@@ -50,7 +50,7 @@ public:
     FX_BOOL		Delete();

     void		SetScrollOffset(FX_FLOAT fScrollOffset);

     FX_BOOL		GetSuggestWords(CFX_PointF pointf, CFX_ByteStringArray &sSuggest);

-    FX_BOOL		ReplaceSpellCheckWord(CFX_PointF pointf, FX_BSTR bsReplace);

+    FX_BOOL		ReplaceSpellCheckWord(CFX_PointF pointf, const CFX_ByteStringC& bsReplace);

     CFWL_Edit();

     virtual ~CFWL_Edit();

 };

diff --git a/xfa/include/fwl/lightwidget/listbox.h b/xfa/include/fwl/lightwidget/listbox.h
index 839bc18a9a..d095e0e5e3 100644
--- a/xfa/include/fwl/lightwidget/listbox.h
+++ b/xfa/include/fwl/lightwidget/listbox.h
@@ -17,7 +17,7 @@ public:
     static CFWL_ListBox* Create();

     FWL_ERR		Initialize(const CFWL_WidgetProperties *pProperties = NULL);

     FWL_ERR		AddDIBitmap(CFX_DIBitmap * pDIB, FWL_HLISTITEM hItem);

-    FWL_HLISTITEM	AddString(FX_WSTR wsAdd, FX_BOOL bSelect = FALSE);

+    FWL_HLISTITEM	AddString(const CFX_WideStringC& wsAdd, FX_BOOL bSelect = FALSE);

     FX_BOOL		DeleteString(FWL_HLISTITEM hItem);

     FX_BOOL		DeleteAll();

     int32_t	CountSelItems();

@@ -32,7 +32,7 @@ public:
     FWL_ERR*	Sort(IFWL_ListBoxCompare *pCom);

     int32_t	CountItems();

     FWL_HLISTITEM	GetItem(int32_t nIndex);

-    FWL_ERR		SetItemString(FWL_HLISTITEM hItem, FX_WSTR wsText);

+    FWL_ERR		SetItemString(FWL_HLISTITEM hItem, const CFX_WideStringC& wsText);

     FWL_ERR		GetItemString(FWL_HLISTITEM hItem, CFX_WideString &wsText);

     FWL_ERR		SetItemData(FWL_HLISTITEM hItem, void* pData);

     void*	GetItemData(FWL_HLISTITEM hItem);

diff --git a/xfa/include/fwl/lightwidget/pushbutton.h b/xfa/include/fwl/lightwidget/pushbutton.h
index a7c2a13cfa..feb9450951 100644
--- a/xfa/include/fwl/lightwidget/pushbutton.h
+++ b/xfa/include/fwl/lightwidget/pushbutton.h
@@ -17,7 +17,7 @@ public:
     static CFWL_PushButton* Create();

     FWL_ERR Initialize(const CFWL_WidgetProperties *pProperties = NULL);

     FWL_ERR	GetCaption(CFX_WideString &wsCaption);

-    FWL_ERR SetCaption(FX_WSTR wsCaption);

+    FWL_ERR SetCaption(const CFX_WideStringC& wsCaption);

     CFX_DIBitmap*	GetPicture();

     FWL_ERR			SetPicture(CFX_DIBitmap *pBitmap);

     CFWL_PushButton();

diff --git a/xfa/include/fwl/lightwidget/tooltipctrl.h b/xfa/include/fwl/lightwidget/tooltipctrl.h
index 821e042533..703283963b 100644
--- a/xfa/include/fwl/lightwidget/tooltipctrl.h
+++ b/xfa/include/fwl/lightwidget/tooltipctrl.h
@@ -17,7 +17,7 @@ public:
     static CFWL_ToolTip* Create();

     FWL_ERR Initialize(const CFWL_WidgetProperties *pProperties = NULL);

     FWL_ERR			GetCaption(CFX_WideString &wsCaption);

-    FWL_ERR			SetCaption(FX_WSTR wsCaption);

+    FWL_ERR			SetCaption(const CFX_WideStringC& wsCaption);

     int32_t	 	GetInitialDelay();

     int32_t	 	SetInitialDelay(int32_t nDelayTime);

     int32_t	 	GetAutoPopDelay();

diff --git a/xfa/include/fwl/lightwidget/widget.h b/xfa/include/fwl/lightwidget/widget.h
index b6bd62bb2a..8f1246ba41 100644
--- a/xfa/include/fwl/lightwidget/widget.h
+++ b/xfa/include/fwl/lightwidget/widget.h
@@ -44,7 +44,7 @@ public:
     FX_DWORD		GetRefCount() const;

     FWL_ERR			GetClassName(CFX_WideString &wsClass) const;

     FX_DWORD		GetClassID() const;

-    virtual FX_BOOL	IsInstance(FX_WSTR wsClass) const;

+    virtual FX_BOOL	IsInstance(const CFX_WideStringC& wsClass) const;

 protected:

     FWL_ERR			Initialize(const CFWL_WidgetProperties *pProperties = NULL);

 public:

diff --git a/xfa/include/fwl/theme/widgettp.h b/xfa/include/fwl/theme/widgettp.h
index 9d0578478e..6460b2bd57 100644
--- a/xfa/include/fwl/theme/widgettp.h
+++ b/xfa/include/fwl/theme/widgettp.h
@@ -96,8 +96,8 @@ class CFWL_FontData
 public:

     CFWL_FontData();

     virtual ~CFWL_FontData();

-    FX_BOOL Equal(FX_WSTR wsFontFamily, FX_DWORD dwFontStyles, FX_WORD wCodePage);

-    FX_BOOL LoadFont(FX_WSTR wsFontFamily, FX_DWORD dwFontStyles, FX_WORD wCodePage);

+    FX_BOOL Equal(const CFX_WideStringC& wsFontFamily, FX_DWORD dwFontStyles, FX_WORD wCodePage);

+    FX_BOOL LoadFont(const CFX_WideStringC& wsFontFamily, FX_DWORD dwFontStyles, FX_WORD wCodePage);

     IFX_Font*  GetFont() const

     {

         return m_pFont;

@@ -117,7 +117,7 @@ class CFWL_FontManager
 public:

     CFWL_FontManager();

     virtual ~CFWL_FontManager();

-    IFX_Font* FindFont(FX_WSTR wsFontFamily, FX_DWORD dwFontStyles, FX_WORD dwCodePage);

+    IFX_Font* FindFont(const CFX_WideStringC& wsFontFamily, FX_DWORD dwFontStyles, FX_WORD dwCodePage);

 protected:

     CFX_PtrArray    m_arrFonts;

 };

diff --git a/xfa/include/fxbarcode/BC_BarCode.h b/xfa/include/fxbarcode/BC_BarCode.h
index 29820c7ce7..a67653ee60 100644
--- a/xfa/include/fxbarcode/BC_BarCode.h
+++ b/xfa/include/fxbarcode/BC_BarCode.h
@@ -42,7 +42,7 @@ public:
     CBC_CodeBase();

     virtual ~CBC_CodeBase();

     virtual BC_TYPE	 GetType() = 0;

-    virtual FX_BOOL  Encode(FX_WSTR contents, FX_BOOL isDevice, int32_t &e) = 0;

+    virtual FX_BOOL  Encode(const CFX_WideStringC& contents, FX_BOOL isDevice, int32_t &e) = 0;

     virtual FX_BOOL	 RenderDevice(CFX_RenderDevice* device, const CFX_Matrix* matirx, int32_t &e) = 0;

     virtual FX_BOOL	 RenderBitmap(CFX_DIBitmap *&pOutBitmap, int32_t &e) = 0;

     virtual CFX_WideString Decode(uint8_t* buf, int32_t width, int32_t hight, int32_t &e) = 0;

@@ -66,13 +66,13 @@ public:
     CBC_OneCode();

     virtual ~CBC_OneCode();

     virtual BC_TYPE	 GetType() = 0;

-    virtual FX_BOOL  Encode(FX_WSTR contents, FX_BOOL isDevice, int32_t &e) = 0;

+    virtual FX_BOOL  Encode(const CFX_WideStringC& contents, FX_BOOL isDevice, int32_t &e) = 0;

     virtual FX_BOOL	 RenderDevice(CFX_RenderDevice* device, const CFX_Matrix* matirx, int32_t &e) = 0;

     virtual FX_BOOL	 RenderBitmap(CFX_DIBitmap *&pOutBitmap, int32_t &e) = 0;

     virtual CFX_WideString Decode(uint8_t* buf, int32_t width, int32_t hight, int32_t &e) = 0;

     virtual CFX_WideString Decode(CFX_DIBitmap *pBitmap, int32_t &e) = 0;

-    virtual FX_BOOL			CheckContentValidity(FX_WSTR contents);

-    virtual CFX_WideString	FilterContents(FX_WSTR contents);

+    virtual FX_BOOL			CheckContentValidity(const CFX_WideStringC& contents);

+    virtual CFX_WideString	FilterContents(const CFX_WideStringC& contents);

     virtual void			SetPrintChecksum(FX_BOOL checksum);

     virtual void			SetDataLength(int32_t length);

     virtual void			SetCalChecksum(FX_BOOL calc);

@@ -88,7 +88,7 @@ public:
     CBC_Code39(FX_BOOL usingCheckDigit);

     CBC_Code39(FX_BOOL usingCheckDigit, FX_BOOL extendedMode);

     virtual ~CBC_Code39();

-    FX_BOOL 		Encode(FX_WSTR contents, FX_BOOL isDevice, int32_t &e);

+    FX_BOOL 		Encode(const CFX_WideStringC& contents, FX_BOOL isDevice, int32_t &e);

     FX_BOOL			RenderDevice(CFX_RenderDevice* device, const CFX_Matrix* matirx, int32_t &e);

     FX_BOOL			RenderBitmap(CFX_DIBitmap *&pOutBitmap, int32_t &e);

     CFX_WideString	Decode(uint8_t* buf, int32_t width, int32_t hight, int32_t &e);

@@ -107,7 +107,7 @@ class CBC_Codabar : public CBC_OneCode
 public:

     CBC_Codabar();

     virtual ~CBC_Codabar();

-    FX_BOOL		    Encode(FX_WSTR contents, FX_BOOL isDevice, int32_t &e);

+    FX_BOOL		    Encode(const CFX_WideStringC& contents, FX_BOOL isDevice, int32_t &e);

     FX_BOOL			RenderDevice(CFX_RenderDevice* device, const CFX_Matrix* matirx, int32_t &e);

     FX_BOOL			RenderBitmap(CFX_DIBitmap *&pOutBitmap, int32_t &e);

     CFX_WideString	Decode(uint8_t* buf, int32_t width, int32_t hight, int32_t &e);

@@ -130,7 +130,7 @@ private:
 public:

     CBC_Code128(BC_TYPE type);

     virtual ~CBC_Code128();

-    FX_BOOL			Encode(FX_WSTR contents, FX_BOOL isDevice, int32_t &e);

+    FX_BOOL			Encode(const CFX_WideStringC& contents, FX_BOOL isDevice, int32_t &e);

     FX_BOOL			RenderDevice(CFX_RenderDevice* device, const CFX_Matrix* matirx, int32_t &e);

     FX_BOOL			RenderBitmap(CFX_DIBitmap *&pOutBitmap, int32_t &e);

     CFX_WideString	Decode(uint8_t* buf, int32_t width, int32_t hight, int32_t &e);

@@ -148,7 +148,7 @@ class CBC_EAN8 : public CBC_OneCode
 public:

     CBC_EAN8();

     virtual ~CBC_EAN8();

-    FX_BOOL			Encode(FX_WSTR contents, FX_BOOL isDevice, int32_t &e);

+    FX_BOOL			Encode(const CFX_WideStringC& contents, FX_BOOL isDevice, int32_t &e);

     FX_BOOL			RenderDevice(CFX_RenderDevice* device, const CFX_Matrix* matirx, int32_t &e);

     FX_BOOL			RenderBitmap(CFX_DIBitmap *&pOutBitmap, int32_t &e);

     CFX_WideString	Decode(uint8_t* buf, int32_t width, int32_t hight, int32_t &e);

@@ -158,7 +158,7 @@ public:
         return BC_EAN8;

     }

 private:

-    CFX_WideString	Preprocess(FX_WSTR contents);

+    CFX_WideString	Preprocess(const CFX_WideStringC& contents);

     CFX_WideString  m_renderContents;

 };

 class CBC_EAN13 : public CBC_OneCode

@@ -166,7 +166,7 @@ class CBC_EAN13 : public CBC_OneCode
 public:

     CBC_EAN13();

     virtual ~CBC_EAN13();

-    FX_BOOL 		Encode(FX_WSTR contents, FX_BOOL isDevice, int32_t &e);

+    FX_BOOL 		Encode(const CFX_WideStringC& contents, FX_BOOL isDevice, int32_t &e);

     FX_BOOL			RenderDevice(CFX_RenderDevice* device, const CFX_Matrix* matirx, int32_t &e);

     FX_BOOL			RenderBitmap(CFX_DIBitmap *&pOutBitmap, int32_t &e);

     CFX_WideString	Decode(uint8_t* buf, int32_t width, int32_t hight, int32_t &e);

@@ -176,7 +176,7 @@ public:
         return BC_EAN13;

     }

 private:

-    CFX_WideString	Preprocess(FX_WSTR contents);

+    CFX_WideString	Preprocess(const CFX_WideStringC& contents);

     CFX_WideString  m_renderContents;

 };

 class CBC_UPCA : public CBC_OneCode

@@ -184,7 +184,7 @@ class CBC_UPCA : public CBC_OneCode
 public:

     CBC_UPCA();

     virtual ~CBC_UPCA();

-    FX_BOOL 		Encode(FX_WSTR contents, FX_BOOL isDevice, int32_t &e);

+    FX_BOOL 		Encode(const CFX_WideStringC& contents, FX_BOOL isDevice, int32_t &e);

     FX_BOOL			RenderDevice(CFX_RenderDevice* device, const CFX_Matrix* matirx, int32_t &e);

     FX_BOOL			RenderBitmap(CFX_DIBitmap *&pOutBitmap, int32_t &e);

     CFX_WideString	Decode(uint8_t* buf, int32_t width, int32_t hight, int32_t &e);

@@ -194,7 +194,7 @@ public:
         return BC_UPCA;

     }

 private:

-    CFX_WideString	Preprocess(FX_WSTR contents);

+    CFX_WideString	Preprocess(const CFX_WideStringC& contents);

     CFX_WideString  m_renderContents;

 };

 class CBC_QRCode : public CBC_CodeBase

@@ -202,7 +202,7 @@ class CBC_QRCode : public CBC_CodeBase
 public:

     CBC_QRCode();

     virtual ~CBC_QRCode();

-    FX_BOOL 		Encode(FX_WSTR contents, FX_BOOL isDevice, int32_t &e);

+    FX_BOOL 		Encode(const CFX_WideStringC& contents, FX_BOOL isDevice, int32_t &e);

     FX_BOOL			RenderDevice(CFX_RenderDevice* device, const CFX_Matrix* matirx, int32_t &e);

     FX_BOOL			RenderBitmap(CFX_DIBitmap *&pOutBitmap, int32_t &e);

     CFX_WideString	Decode(uint8_t* buf, int32_t width, int32_t hight, int32_t &e);

@@ -219,7 +219,7 @@ class CBC_PDF417I : public CBC_CodeBase
 public:

     CBC_PDF417I();

     virtual ~CBC_PDF417I();

-    FX_BOOL			Encode(FX_WSTR contents, FX_BOOL isDevice, int32_t &e);

+    FX_BOOL			Encode(const CFX_WideStringC& contents, FX_BOOL isDevice, int32_t &e);

     FX_BOOL			RenderDevice(CFX_RenderDevice* device, const CFX_Matrix* matirx, int32_t &e);

     FX_BOOL			RenderBitmap(CFX_DIBitmap *&pOutBitmap, int32_t &e);

     CFX_WideString	Decode(uint8_t* buf, int32_t width, int32_t hight, int32_t &e);

@@ -236,7 +236,7 @@ class CBC_DataMatrix : public CBC_CodeBase
 public:

     CBC_DataMatrix();

     virtual ~CBC_DataMatrix();

-    FX_BOOL 		Encode(FX_WSTR contents, FX_BOOL isDevice, int32_t &e);

+    FX_BOOL 		Encode(const CFX_WideStringC& contents, FX_BOOL isDevice, int32_t &e);

     FX_BOOL			RenderDevice(CFX_RenderDevice* device, const CFX_Matrix* matirx, int32_t &e);

     FX_BOOL			RenderBitmap(CFX_DIBitmap *&pOutBitmap, int32_t &e);

     CFX_WideString	Decode(uint8_t* buf, int32_t width, int32_t hight, int32_t &e);

diff --git a/xfa/include/fxfa/fxfa.h b/xfa/include/fxfa/fxfa.h
index a6cc5e1484..648b042c6f 100644
--- a/xfa/include/fxfa/fxfa.h
+++ b/xfa/include/fxfa/fxfa.h
@@ -217,15 +217,15 @@ public:
      * @param[in] dwButtonType  Button type, refer to XFA_MESSAGEBUTTON.

      * @return A valid integer representing the value of the button pressed by the user, refer to XFA_ID.

      */

-    virtual int32_t MsgBox(FX_WSTR wsMessage, FX_WSTR wsTitle = FX_WSTRC(L""),

+    virtual int32_t MsgBox(const CFX_WideStringC& wsMessage, const CFX_WideStringC& wsTitle = FX_WSTRC(L""),

                             FX_DWORD dwIconType = 0, FX_DWORD dwButtonType = 0) = 0;

 

     /**

      * Get a response from the user.

      * @param[in] bMark - Mask the user input with * (asterisks) when true,

      */

-    virtual void Response(CFX_WideString &wsAnswer, FX_WSTR wsQuestion, FX_WSTR wsTitle = FX_WSTRC(L""),

-                          FX_WSTR wsDefaultAnswer = FX_WSTRC(L""), FX_BOOL bMark = TRUE) = 0;

+    virtual void Response(CFX_WideString &wsAnswer, const CFX_WideStringC& wsQuestion, const CFX_WideStringC& wsTitle = FX_WSTRC(L""),

+                          const CFX_WideStringC& wsDefaultAnswer = FX_WSTRC(L""), FX_BOOL bMark = TRUE) = 0;

 

     virtual int32_t GetDocumentCountInBatch() = 0;

     virtual int32_t GetCurDocumentInBatch() = 0;

@@ -234,7 +234,7 @@ public:
      * Download something from somewhere.

      * @param[in] wsURL - http, ftp, such as "http://www.w3.org/TR/REC-xml-names/".

      */

-    virtual IFX_FileRead* DownloadURL(FX_WSTR wsURL) = 0;

+    virtual IFX_FileRead* DownloadURL(const CFX_WideStringC& wsURL) = 0;

 

     /**

      * POST data to the given url.

@@ -247,8 +247,8 @@ public:
      * @param[out] wsResponse   decoded response from server.

      * @return TRUE Server permitted the post request, FALSE otherwise.

      */

-    virtual FX_BOOL PostRequestURL(FX_WSTR wsURL, FX_WSTR wsData, FX_WSTR wsContentType,

-                                   FX_WSTR wsEncode, FX_WSTR wsHeader, CFX_WideString &wsResponse) = 0;

+    virtual FX_BOOL PostRequestURL(const CFX_WideStringC& wsURL, const CFX_WideStringC& wsData, const CFX_WideStringC& wsContentType,

+                                   const CFX_WideStringC& wsEncode, const CFX_WideStringC& wsHeader, CFX_WideString &wsResponse) = 0;

 

     /**

      * PUT data to the given url.

@@ -257,10 +257,10 @@ public:
      * @param[in] wsEncode      the encode of data including UTF-8, UTF-16, ISO8859-1, any recognized [IANA]character encoding

      * @return TRUE Server permitted the post request, FALSE otherwise.

      */

-    virtual FX_BOOL     PutRequestURL(FX_WSTR wsURL, FX_WSTR wsData, FX_WSTR wsEncode) = 0;

+    virtual FX_BOOL     PutRequestURL(const CFX_WideStringC& wsURL, const CFX_WideStringC& wsData, const CFX_WideStringC& wsEncode) = 0;

 

     virtual void LoadString(int32_t iStringID, CFX_WideString &wsString) = 0;

-    virtual FX_BOOL ShowFileDialog(FX_WSTR wsTitle, FX_WSTR wsFilter, CFX_WideStringArray &wsPathArr, FX_BOOL bOpen = TRUE) = 0;

+    virtual FX_BOOL ShowFileDialog(const CFX_WideStringC& wsTitle, const CFX_WideStringC& wsFilter, CFX_WideStringArray &wsPathArr, FX_BOOL bOpen = TRUE) = 0;

     virtual IFWL_AdapterTimerMgr* GetTimerMgr() = 0;

 };

 class IXFA_FontMgr

@@ -269,8 +269,8 @@ public:
     static IXFA_FontMgr* CreateDefault();

     virtual ~IXFA_FontMgr();

 

-    virtual IFX_Font*	GetFont(IXFA_Doc* hDoc, FX_WSTR wsFontFamily, FX_DWORD dwFontStyles, FX_WORD wCodePage = 0xFFFF) = 0;

-    virtual IFX_Font*	GetDefaultFont(IXFA_Doc* hDoc, FX_WSTR wsFontFamily, FX_DWORD dwFontStyles, FX_WORD wCodePage = 0xFFFF) = 0;

+    virtual IFX_Font*	GetFont(IXFA_Doc* hDoc, const CFX_WideStringC& wsFontFamily, FX_DWORD dwFontStyles, FX_WORD wCodePage = 0xFFFF) = 0;

+    virtual IFX_Font*	GetDefaultFont(IXFA_Doc* hDoc, const CFX_WideStringC& wsFontFamily, FX_DWORD dwFontStyles, FX_WORD wCodePage = 0xFFFF) = 0;

 };

 class IXFA_App

 {

@@ -307,7 +307,7 @@ public:
     virtual FX_BOOL		Undo(IXFA_Widget* hWidget) = 0;

     virtual FX_BOOL		Redo(IXFA_Widget* hWidget) = 0;

     virtual FX_BOOL		GetSuggestWords(IXFA_Widget* hWidget, CFX_PointF pointf, CFX_ByteStringArray &sSuggest) = 0;

-    virtual FX_BOOL		ReplaceSpellCheckWord(IXFA_Widget* hWidget, CFX_PointF pointf, FX_BSTR bsReplace) = 0;

+    virtual FX_BOOL		ReplaceSpellCheckWord(IXFA_Widget* hWidget, CFX_PointF pointf, const CFX_ByteStringC& bsReplace) = 0;

 };

 #define XFA_INVALIDATE_AllPages		0x00000000

 #define XFA_INVALIDATE_CurrentPage	0x00000001

@@ -348,10 +348,10 @@ public:
     virtual FX_BOOL		IsCalculationsEnabled(IXFA_Doc* hDoc) = 0;

     virtual void		SetCalculationsEnabled(IXFA_Doc* hDoc, FX_BOOL bEnabled) = 0;

     virtual void		GetTitle(IXFA_Doc* hDoc, CFX_WideString &wsTitle) = 0;

-    virtual void		SetTitle(IXFA_Doc* hDoc, FX_WSTR wsTitle) = 0;

-    virtual void		ExportData(IXFA_Doc* hDoc, FX_WSTR wsFilePath, FX_BOOL bXDP = TRUE) = 0;

-    virtual void		ImportData(IXFA_Doc* hDoc, FX_WSTR wsFilePath) = 0;

-    virtual void		GotoURL(IXFA_Doc* hDoc, FX_WSTR bsURL, FX_BOOL bAppend = TRUE) = 0;

+    virtual void		SetTitle(IXFA_Doc* hDoc, const CFX_WideStringC& wsTitle) = 0;

+    virtual void		ExportData(IXFA_Doc* hDoc, const CFX_WideStringC& wsFilePath, FX_BOOL bXDP = TRUE) = 0;

+    virtual void		ImportData(IXFA_Doc* hDoc, const CFX_WideStringC& wsFilePath) = 0;

+    virtual void		GotoURL(IXFA_Doc* hDoc, const CFX_WideStringC& bsURL, FX_BOOL bAppend = TRUE) = 0;

     virtual FX_BOOL		IsValidationsEnabled(IXFA_Doc* hDoc) = 0;

     virtual void		SetValidationsEnabled(IXFA_Doc* hDoc, FX_BOOL bEnabled) = 0;

     virtual void		SetFocusWidget(IXFA_Doc* hDoc, IXFA_Widget* hWidget) = 0;

@@ -364,7 +364,7 @@ public:
     {

         return 0;

     }

-    virtual FX_BOOL				Sign(IXFA_Doc* hDoc, CXFA_NodeList* pNodeList, FX_WSTR wsExpression, FX_WSTR wsXMLIdent, FX_WSTR wsValue = FX_WSTRC(L"open"), FX_BOOL bUsed = TRUE)

+    virtual FX_BOOL				Sign(IXFA_Doc* hDoc, CXFA_NodeList* pNodeList, const CFX_WideStringC& wsExpression, const CFX_WideStringC& wsXMLIdent, const CFX_WideStringC& wsValue = FX_WSTRC(L"open"), FX_BOOL bUsed = TRUE)

     {

         return 0;

     }

@@ -381,11 +381,11 @@ public:
     virtual void		AddDoRecord(IXFA_Widget* hWidget) = 0;

 

     virtual FX_BOOL		SubmitData(IXFA_Doc* hDoc, CXFA_Submit submit) = 0;

-    virtual FX_BOOL		CheckWord(IXFA_Doc* hDoc, FX_BSTR sWord) = 0;

-    virtual FX_BOOL		GetSuggestWords(IXFA_Doc* hDoc, FX_BSTR sWord, CFX_ByteStringArray& sSuggest) = 0;

-    virtual FX_BOOL		GetPDFScriptObject(IXFA_Doc* hDoc, FX_BSTR utf8Name, FXJSE_HVALUE hValue) = 0;

-    virtual FX_BOOL		GetGlobalProperty(IXFA_Doc* hDoc, FX_BSTR szPropName, FXJSE_HVALUE hValue) = 0;

-    virtual FX_BOOL		SetGlobalProperty(IXFA_Doc* hDoc, FX_BSTR szPropName, FXJSE_HVALUE hValue) = 0;

+    virtual FX_BOOL		CheckWord(IXFA_Doc* hDoc, const CFX_ByteStringC& sWord) = 0;

+    virtual FX_BOOL		GetSuggestWords(IXFA_Doc* hDoc, const CFX_ByteStringC& sWord, CFX_ByteStringArray& sSuggest) = 0;

+    virtual FX_BOOL		GetPDFScriptObject(IXFA_Doc* hDoc, const CFX_ByteStringC& utf8Name, FXJSE_HVALUE hValue) = 0;

+    virtual FX_BOOL		GetGlobalProperty(IXFA_Doc* hDoc, const CFX_ByteStringC& szPropName, FXJSE_HVALUE hValue) = 0;

+    virtual FX_BOOL		SetGlobalProperty(IXFA_Doc* hDoc, const CFX_ByteStringC& szPropName, FXJSE_HVALUE hValue) = 0;

     virtual CPDF_Document*  OpenPDF(IXFA_Doc* hDoc, IFX_FileRead* pFile, FX_BOOL bTakeOverFile) = 0;

     virtual IFX_FileRead*	OpenLinkedFile(IXFA_Doc* hDoc, const CFX_WideString& wsLink) = 0;

 };

@@ -418,14 +418,14 @@ public:
     virtual int32_t			CountPackages(IXFA_Doc* hDoc) = 0;

     virtual	void				GetPackageName(IXFA_Doc* hDoc, int32_t iPackage, CFX_WideStringC &wsPackage) = 0;

 

-    virtual FX_BOOL				SavePackage(IXFA_Doc* hDoc, FX_WSTR wsPackage, IFX_FileWrite* pFile, IXFA_ChecksumContext *pCSContext = NULL) = 0;

+    virtual FX_BOOL				SavePackage(IXFA_Doc* hDoc, const CFX_WideStringC& wsPackage, IFX_FileWrite* pFile, IXFA_ChecksumContext *pCSContext = NULL) = 0;

     virtual FX_BOOL				CloseDoc(IXFA_Doc* hDoc) = 0;

 

     virtual FX_BOOL				ImportData(IXFA_Doc* hDoc, IFX_FileRead* pStream, FX_BOOL bXDP = TRUE) = 0;

     virtual	void				SetJSERuntime(IXFA_Doc* hDoc, FXJSE_HRUNTIME hRuntime) = 0;

     virtual FXJSE_HVALUE		GetXFAScriptObject(IXFA_Doc* hDoc) = 0;

     virtual XFA_ATTRIBUTEENUM	GetRestoreState(IXFA_Doc* hDoc) = 0;

-    virtual FX_BOOL				RunDocScript(IXFA_Doc* hDoc, XFA_SCRIPTTYPE eScriptType, FX_WSTR wsScript, FXJSE_HVALUE hRetValue, FXJSE_HVALUE hThisObject) = 0;

+    virtual FX_BOOL				RunDocScript(IXFA_Doc* hDoc, XFA_SCRIPTTYPE eScriptType, const CFX_WideStringC& wsScript, FXJSE_HVALUE hRetValue, FXJSE_HVALUE hThisObject) = 0;

 };

 enum XFA_EVENTTYPE {

     XFA_EVENT_Click,

@@ -537,8 +537,8 @@ public:
     virtual	void				UpdateDocView() = 0;

     virtual int32_t			CountPageViews() = 0;

     virtual IXFA_PageView*		GetPageView(int32_t nIndex) = 0;

-    virtual IXFA_Widget*			GetWidgetByName(FX_WSTR wsName) = 0;

-    virtual CXFA_WidgetAcc*		GetWidgetAccByName(FX_WSTR wsName) = 0;

+    virtual IXFA_Widget*			GetWidgetByName(const CFX_WideStringC& wsName) = 0;

+    virtual CXFA_WidgetAcc*		GetWidgetAccByName(const CFX_WideStringC& wsName) = 0;

     virtual void				ResetWidgetData(CXFA_WidgetAcc* pWidgetAcc = NULL) = 0;

     virtual int32_t			ProcessWidgetEvent(CXFA_EventParam* pParam, CXFA_WidgetAcc* pWidgetAcc = NULL) = 0;

     virtual IXFA_WidgetHandler*	GetWidgetHandler() = 0;

diff --git a/xfa/include/fxfa/fxfa_basic.h b/xfa/include/fxfa/fxfa_basic.h
index b157fff24c..7b635e01e4 100644
--- a/xfa/include/fxfa/fxfa_basic.h
+++ b/xfa/include/fxfa/fxfa_basic.h
@@ -83,7 +83,7 @@ typedef struct _XFA_PACKETINFO {
     FX_DWORD					eFlags;

 } XFA_PACKETINFO, * XFA_LPPACKETINFO;

 typedef XFA_PACKETINFO const * XFA_LPCPACKETINFO;

-XFA_LPCPACKETINFO XFA_GetPacketByName(FX_WSTR wsName);

+XFA_LPCPACKETINFO XFA_GetPacketByName(const CFX_WideStringC& wsName);

 XFA_LPCPACKETINFO XFA_GetPacketByID(FX_DWORD dwPacket);

 extern const XFA_PACKETINFO g_XFAPacketData[];

 inline XFA_LPCPACKETINFO XFA_GetPacketByIndex(XFA_PACKET ePacket)

@@ -927,7 +927,7 @@ typedef struct _XFA_ELEMENTINFO {
 } XFA_ELEMENTINFO, * XFA_LPELEMENTINFO;

 typedef XFA_ELEMENTINFO const * XFA_LPCELEMENTINFO;

 int32_t XFA_GetElementCount();

-XFA_LPCELEMENTINFO XFA_GetElementByName(FX_WSTR wsName);

+XFA_LPCELEMENTINFO XFA_GetElementByName(const CFX_WideStringC& wsName);

 XFA_LPCELEMENTINFO XFA_GetElementByID(XFA_ELEMENT eName);

 enum XFA_ATTRIBUTETYPE {

     XFA_ATTRIBUTETYPE_NOTSURE,

@@ -947,7 +947,7 @@ typedef struct _XFA_ATTRIBUTEINFO {
 } XFA_ATTRIBUTEINFO, * XFA_LPATTRIBUTEINFO;

 typedef XFA_ATTRIBUTEINFO const * XFA_LPCATTRIBUTEINFO;

 int32_t XFA_GetAttributeCount();

-XFA_LPCATTRIBUTEINFO XFA_GetAttributeByName(FX_WSTR wsName);

+XFA_LPCATTRIBUTEINFO XFA_GetAttributeByName(const CFX_WideStringC& wsName);

 XFA_LPCATTRIBUTEINFO XFA_GetAttributeByID(XFA_ATTRIBUTE eName);

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

@@ -989,7 +989,7 @@ typedef struct _XFA_ATTRIBUTEENUMINFO {
     XFA_ATTRIBUTEENUM			eName;

 } XFA_ATTRIBUTEENUMINFO, * XFA_LPATTRIBUTEENUMINFO;

 typedef XFA_ATTRIBUTEENUMINFO const * XFA_LPCATTRIBUTEENUMINFO;

-XFA_LPCATTRIBUTEENUMINFO XFA_GetAttributeEnumByName(FX_WSTR wsName);

+XFA_LPCATTRIBUTEENUMINFO XFA_GetAttributeEnumByName(const CFX_WideStringC& wsName);

 XFA_LPCATTRIBUTEENUMINFO XFA_GetAttributeEnumByID(XFA_ATTRIBUTEENUM eName);

 enum XFA_UNIT {

     XFA_UNIT_Unknown,

@@ -1006,7 +1006,7 @@ enum XFA_UNIT {
 class CXFA_Measurement

 {

 public:

-    void						Set(FX_WSTR wsMeasure);

+    void						Set(const CFX_WideStringC& wsMeasure);

     void						Set(FX_FLOAT fValue, XFA_UNIT eUnit)

     {

         m_fValue = fValue;

@@ -1032,7 +1032,7 @@ public:
     {

         Set(-1, XFA_UNIT_Unknown);

     }

-    CXFA_Measurement(FX_WSTR wsMeasure)

+    CXFA_Measurement(const CFX_WideStringC& wsMeasure)

     {

         Set(wsMeasure);

     }

@@ -1040,7 +1040,7 @@ public:
     {

         Set(fValue, eUnit);

     }

-    static XFA_UNIT				GetUnit(FX_WSTR wsUnit);

+    static XFA_UNIT				GetUnit(const CFX_WideStringC& wsUnit);

 protected:

     FX_FLOAT					m_fValue;

     XFA_UNIT					m_eUnit;

@@ -1055,7 +1055,7 @@ typedef struct _XFA_METHODINFO {
 } XFA_METHODINFO, * XFA_LPMETHODINFO;

 typedef XFA_METHODINFO const * XFA_LPCMETHODINFO;

 int32_t XFA_GetMethodCount();

-XFA_LPCMETHODINFO XFA_GetMethodByName(XFA_ELEMENT eElement,	FX_WSTR wsMethodName);

+XFA_LPCMETHODINFO XFA_GetMethodByName(XFA_ELEMENT eElement,	const CFX_WideStringC& wsMethodName);

 typedef void (CXFA_Object::*XFA_ATTRIBUTE_CALLBACK) (FXJSE_HVALUE hValue, FX_BOOL bSetting, XFA_ATTRIBUTE eAttribute);

 enum XFA_SCRIPT_TYPE {

     XFA_SCRIPT_Basic,

@@ -1069,5 +1069,5 @@ typedef struct _XFA_SCRIPTATTRIBUTEINFO {
     FX_WORD							eValueType;

 } XFA_SCRIPTATTRIBUTEINFO, * XFA_LPSCRIPTATTRIBUTEINFO;

 typedef XFA_SCRIPTATTRIBUTEINFO const * XFA_LPCSCRIPTATTRIBUTEINFO;

-XFA_LPCSCRIPTATTRIBUTEINFO XFA_GetScriptAttributeByName(XFA_ELEMENT eElement, FX_WSTR wsAttributeName);

+XFA_LPCSCRIPTATTRIBUTEINFO XFA_GetScriptAttributeByName(XFA_ELEMENT eElement, const CFX_WideStringC& wsAttributeName);

 #endif

diff --git a/xfa/include/fxfa/fxfa_objectacc.h b/xfa/include/fxfa/fxfa_objectacc.h
index 888000805f..b09e37097b 100644
--- a/xfa/include/fxfa/fxfa_objectacc.h
+++ b/xfa/include/fxfa/fxfa_objectacc.h
@@ -421,8 +421,8 @@ public:
     void			GetPicture(CFX_WideString &wsPicture);

     CXFA_Script		GetScript();

 protected:

-    void		GetMessageText(CFX_WideString &wsMessage, FX_WSTR wsMessageType);

-    void		SetMessageText(CFX_WideString &wsMessage, FX_WSTR wsMessageType);

+    void		GetMessageText(CFX_WideString &wsMessage, const CFX_WideStringC& wsMessageType);

+    void		SetMessageText(CFX_WideString &wsMessage, const CFX_WideStringC& wsMessageType);

     FX_BOOL		SetTestValue(int32_t iType, CFX_WideString &wsValue, XFA_ATTRIBUTEENUM eName);

 };

 class CXFA_Variables : public CXFA_Data

@@ -696,8 +696,8 @@ public:
     void                SetCheckState(XFA_CHECKSTATE eCheckState, FX_BOOL bNotify = TRUE);

     CXFA_Node*          GetExclGroupNode();

     CXFA_Node*          GetSelectedMember();

-    CXFA_Node*          SetSelectedMember(FX_WSTR wsName, FX_BOOL bNotify = TRUE);

-    void                SetSelectedMemberByValue(FX_WSTR wsValue, 

+    CXFA_Node*          SetSelectedMember(const CFX_WideStringC& wsName, FX_BOOL bNotify = TRUE);

+    void                SetSelectedMemberByValue(const CFX_WideStringC& wsValue, 

                                                  FX_BOOL bNotify = TRUE,

                                                  FX_BOOL bScriptModify = FALSE,

                                                  FX_BOOL bSyncData = TRUE);

@@ -723,8 +723,8 @@ public:
     void                ClearAllSelections();

     void                InsertItem(const CFX_WideString &wsLabel, const CFX_WideString &wsValue,

                                    int32_t nIndex = -1, FX_BOOL bNotify = FALSE);

-    void                GetItemLabel(FX_WSTR wsValue, CFX_WideString &wsLabel);

-    void                GetItemValue(FX_WSTR wsLabel, CFX_WideString &wsValue);

+    void                GetItemLabel(const CFX_WideStringC& wsValue, CFX_WideString &wsLabel);

+    void                GetItemValue(const CFX_WideStringC& wsLabel, CFX_WideString &wsValue);

     FX_BOOL             DeleteItem(int32_t nIndex, FX_BOOL bNotify = FALSE,

                                    FX_BOOL bScriptModify = FALSE, FX_BOOL bSyncData = TRUE);

     int32_t            GetHorizontalScrollPolicy();

@@ -734,8 +734,8 @@ public:
     FX_BOOL             GetPictureContent(CFX_WideString &wsPicture, XFA_VALUEPICTURE ePicture);

     IFX_Locale*         GetLocal();

     FX_BOOL             GetValue(CFX_WideString &wsValue, XFA_VALUEPICTURE eValueType);

-    FX_BOOL             GetNormalizeDataValue(FX_WSTR wsValue, CFX_WideString &wsNormalizeValue);

-    FX_BOOL             GetFormatDataValue(FX_WSTR wsValue, CFX_WideString &wsFormatedValue);

+    FX_BOOL             GetNormalizeDataValue(const CFX_WideStringC& wsValue, CFX_WideString &wsNormalizeValue);

+    FX_BOOL             GetFormatDataValue(const CFX_WideStringC& wsValue, CFX_WideString &wsFormatedValue);

     void                NormalizeNumStr(const CFX_WideString& wsValue, CFX_WideString& wsOutput);

     CFX_WideString      GetBarcodeType();

     FX_BOOL             GetBarcodeAttribute_CharEncoding(int32_t& val);

@@ -764,7 +764,7 @@ public:
     FX_BOOL             m_bPreNull;

 protected:

     void                SyncValue(const CFX_WideString& wsValue, FX_BOOL bNotify);

-    void                InsertListTextItem(CXFA_Node* pItems, FX_WSTR wsText, int32_t nIndex = -1);

+    void                InsertListTextItem(CXFA_Node* pItems, const CFX_WideStringC& wsText, int32_t nIndex = -1);

     void                FormatNumStr(const CFX_WideString& wsValue, IFX_Locale* pLocale, CFX_WideString& wsOutput);

 

     CXFA_Node*          m_pUiChildNode;

diff --git a/xfa/include/fxfa/fxfa_widget.h b/xfa/include/fxfa/fxfa_widget.h
index 21d007d7f1..72581ae232 100644
--- a/xfa/include/fxfa/fxfa_widget.h
+++ b/xfa/include/fxfa/fxfa_widget.h
@@ -33,7 +33,7 @@ public:
     void			ResetData();

 

 

-    void			SetImageEdit(FX_WSTR wsContentType, FX_WSTR wsHref, FX_WSTR wsData);

+    void			SetImageEdit(const CFX_WideStringC& wsContentType, const CFX_WideStringC& wsHref, const CFX_WideStringC& wsData);

 

     CXFA_WidgetAcc*	GetExclGroup();

     CXFA_FFDocView*		GetDocView();

diff --git a/xfa/include/fxjse/fxjse.h b/xfa/include/fxjse/fxjse.h
index 56187158d5..368acd18ad 100644
--- a/xfa/include/fxjse/fxjse.h
+++ b/xfa/include/fxjse/fxjse.h
@@ -50,10 +50,10 @@ public:
     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);

-typedef void	(*FXJSE_PropAccessor)	(FXJSE_HOBJECT hObject, FX_BSTR szPropName, FXJSE_HVALUE hValue);

-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 void	(*FXJSE_FuncCallback)	(FXJSE_HOBJECT hThis,	const CFX_ByteStringC& szFuncName, CFXJSE_Arguments &args);

+typedef void	(*FXJSE_PropAccessor)	(FXJSE_HOBJECT hObject, const CFX_ByteStringC& szPropName, FXJSE_HVALUE hValue);

+typedef int32_t(*FXJSE_PropTypeGetter)	(FXJSE_HOBJECT hObject, const CFX_ByteStringC& szPropName, FX_BOOL bQueryIn);

+typedef FX_BOOL (*FXJSE_PropDeleter)	(FXJSE_HOBJECT hObject, const CFX_ByteStringC& szPropName);

 typedef struct _FXJSE_FUNCTION {

     const FX_CHAR*				name;

     FXJSE_FuncCallback		callbackProc;

@@ -84,7 +84,7 @@ typedef struct _FXJSE_CLASS {
     FXJSE_FuncCallback		dynMethodCall;

 } FXJSE_CLASS;

 FXJSE_HCLASS	FXJSE_DefineClass(FXJSE_HCONTEXT hContext, const FXJSE_CLASS* lpClass);

-FXJSE_HCLASS	FXJSE_GetClass(FXJSE_HCONTEXT hContext, FX_BSTR szName);

+FXJSE_HCLASS	FXJSE_GetClass(FXJSE_HCONTEXT hContext, const CFX_ByteStringC& szName);

 FXJSE_HVALUE	FXJSE_Value_Create(FXJSE_HRUNTIME hRuntime);

 void			FXJSE_Value_Release(FXJSE_HVALUE hValue);

 FXJSE_HRUNTIME	FXJSE_Value_GetRuntime(FXJSE_HVALUE hValue);

@@ -107,7 +107,7 @@ 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);

-void			FXJSE_Value_SetUTF8String	(FXJSE_HVALUE hValue, FX_BSTR	   szString);

+void			FXJSE_Value_SetUTF8String	(FXJSE_HVALUE hValue, const CFX_ByteStringC&	   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);

@@ -115,17 +115,17 @@ void			FXJSE_Value_SetObject		(FXJSE_HVALUE hValue, void* lpObject, FXJSE_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);

-FX_BOOL			FXJSE_Value_GetObjectProp		(FXJSE_HVALUE hValue, FX_BSTR	szPropName,	FXJSE_HVALUE hPropValue);

-FX_BOOL			FXJSE_Value_SetObjectProp		(FXJSE_HVALUE hValue, FX_BSTR	szPropName,	FXJSE_HVALUE hPropValue);

+FX_BOOL			FXJSE_Value_GetObjectProp		(FXJSE_HVALUE hValue, const CFX_ByteStringC&	szPropName,	FXJSE_HVALUE hPropValue);

+FX_BOOL			FXJSE_Value_SetObjectProp		(FXJSE_HVALUE hValue, const CFX_ByteStringC&	szPropName,	FXJSE_HVALUE hPropValue);

 FX_BOOL			FXJSE_Value_GetObjectPropByIdx	(FXJSE_HVALUE hValue, uint32_t	uPropIdx,	FXJSE_HVALUE hPropValue);

 FX_BOOL			FXJSE_Value_SetObjectPropByIdx	(FXJSE_HVALUE hValue, uint32_t	uPropIdx,	FXJSE_HVALUE hPropValue);

-FX_BOOL			FXJSE_Value_DeleteObjectProp	(FXJSE_HVALUE hValue, FX_BSTR	szPropName);

-FX_BOOL			FXJSE_Value_ObjectHasOwnProp	(FXJSE_HVALUE hValue, FX_BSTR	szPropName, FX_BOOL	bUseTypeGetter);

-FX_BOOL			FXJSE_Value_SetObjectOwnProp	(FXJSE_HVALUE hValue, FX_BSTR	szPropName, FXJSE_HVALUE hPropValue);

+FX_BOOL			FXJSE_Value_DeleteObjectProp	(FXJSE_HVALUE hValue, const CFX_ByteStringC&	szPropName);

+FX_BOOL			FXJSE_Value_ObjectHasOwnProp	(FXJSE_HVALUE hValue, const CFX_ByteStringC&	szPropName, FX_BOOL	bUseTypeGetter);

+FX_BOOL			FXJSE_Value_SetObjectOwnProp	(FXJSE_HVALUE hValue, const CFX_ByteStringC&	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, const FX_CHAR* szScript, FXJSE_HVALUE hRetValue, FXJSE_HVALUE hNewThisObject = NULL);

-void			FXJSE_ThrowMessage(FX_BSTR utf8Name, FX_BSTR utf8Message);

+void			FXJSE_ThrowMessage(const CFX_ByteStringC& utf8Name, const CFX_ByteStringC& 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);

 #endif