From d7e5cc754a937605d1f73db5e7967c58ddd80742 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Wed, 10 Jun 2015 14:33:37 -0700 Subject: 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. --- xfa/src/fdp/include/fde_css.h | 22 +- xfa/src/fdp/include/fde_psr.h | 2 +- xfa/src/fdp/include/fde_rdv.h | 2 +- xfa/src/fdp/include/fde_tto.h | 24 +- xfa/src/fdp/include/fde_xml.h | 32 +- xfa/src/fdp/src/css/fde_csscache.cpp | 10 +- xfa/src/fdp/src/css/fde_cssdatatable.cpp | 22 +- xfa/src/fdp/src/css/fde_cssdatatable.h | 46 +- xfa/src/fdp/src/css/fde_cssdeclaration.cpp | 52 +- xfa/src/fdp/src/css/fde_cssdeclaration.h | 44 +- xfa/src/fdp/src/css/fde_cssstyleselector.cpp | 12 +- xfa/src/fdp/src/css/fde_cssstyleselector.h | 40 +- xfa/src/fdp/src/css/fde_cssstylesheet.cpp | 26 +- xfa/src/fdp/src/css/fde_cssstylesheet.h | 8 +- xfa/src/fdp/src/css/fde_csssyntax.cpp | 14 +- xfa/src/fdp/src/css/fde_csssyntax.h | 10 +- xfa/src/fdp/src/fde/fde_gdidevice.h | 2 +- xfa/src/fdp/src/fde/fde_gedevice.cpp | 2 +- xfa/src/fdp/src/tto/fde_textout.cpp | 40 +- xfa/src/fdp/src/tto/fde_textout.h | 30 +- xfa/src/fdp/src/xml/fde_xml.cpp | 83 +-- xfa/src/fdp/src/xml/fde_xml.h | 42 +- xfa/src/fee/include/ifde_txtedtbuf.h | 2 +- xfa/src/fee/include/ifde_txtedtengine.h | 4 +- xfa/src/fee/src/fee/fde_txtedtblock.cpp | 28 +- xfa/src/fee/src/fee/fde_txtedtbuf.cpp | 8 +- xfa/src/fee/src/fee/fde_txtedtbuf.h | 2 +- xfa/src/fee/src/fee/fde_txtedtengine.cpp | 100 ++-- xfa/src/fee/src/fee/fde_txtedtengine.h | 14 +- xfa/src/fee/src/fee/fde_txtedtpage.cpp | 12 +- xfa/src/fee/src/fee/fde_txtedtpage.h | 4 +- xfa/src/fee/src/fee/fde_txtedtparag.h | 2 +- xfa/src/fee/src/fx_wordbreak/fx_wordbreak_impl.cpp | 2 +- xfa/src/fgas/include/fx_alg.h | 8 +- xfa/src/fgas/include/fx_cpg.h | 24 +- xfa/src/fgas/include/fx_fnt.h | 66 +-- xfa/src/fgas/include/fx_lbk.h | 4 +- xfa/src/fgas/include/fx_locale.h | 2 +- xfa/src/fgas/include/fx_rbk.h | 6 +- xfa/src/fgas/include/fx_sax.h | 14 +- xfa/src/fgas/include/fx_stm.h | 12 +- xfa/src/fgas/include/fx_sys.h | 14 +- xfa/src/fgas/include/fx_tbk.h | 16 +- xfa/src/fgas/include/fx_utl.h | 38 +- xfa/src/fgas/src/crt/fx_algorithm.cpp | 46 +- xfa/src/fgas/src/crt/fx_codepage.cpp | 6 +- xfa/src/fgas/src/crt/fx_encode.cpp | 24 +- xfa/src/fgas/src/crt/fx_memory.cpp | 13 +- xfa/src/fgas/src/crt/fx_memory.h | 18 +- xfa/src/fgas/src/crt/fx_stream.cpp | 98 ++-- xfa/src/fgas/src/crt/fx_stream.h | 76 +-- xfa/src/fgas/src/crt/fx_system.cpp | 22 +- xfa/src/fgas/src/crt/fx_utils.cpp | 66 +-- xfa/src/fgas/src/crt/fx_utils.h | 6 +- xfa/src/fgas/src/font/fx_fontutils.cpp | 4 +- xfa/src/fgas/src/font/fx_fontutils.h | 2 +- xfa/src/fgas/src/font/fx_gdifont.cpp | 34 +- xfa/src/fgas/src/font/fx_gdifont.h | 14 +- xfa/src/fgas/src/font/fx_gefont.cpp | 18 +- xfa/src/fgas/src/font/fx_gefont.h | 6 +- xfa/src/fgas/src/font/fx_stdfontmgr.cpp | 98 ++-- xfa/src/fgas/src/font/fx_stdfontmgr.h | 54 +- xfa/src/fgas/src/layout/fx_linebreak.cpp | 4 +- xfa/src/fgas/src/layout/fx_rtfbreak.cpp | 4 +- xfa/src/fgas/src/layout/fx_textbreak.cpp | 10 +- xfa/src/fgas/src/layout/fx_textbreak.h | 6 +- xfa/src/fgas/src/localization/fx_locale.cpp | 192 +++---- xfa/src/fgas/src/localization/fx_localemgr.cpp | 16 +- xfa/src/fgas/src/xml/fx_sax_imp.cpp | 10 +- xfa/src/fgas/src/xml/fx_sax_imp.h | 8 +- xfa/src/fwl/src/basewidget/fwl_comboboximp.cpp | 4 +- .../fwl/src/basewidget/fwl_datetimepickerimp.cpp | 4 +- xfa/src/fwl/src/basewidget/fwl_editimp.cpp | 12 +- .../fwl/src/basewidget/fwl_monthcalendarimp.cpp | 34 +- xfa/src/fwl/src/basewidget/include/fwl_editimp.h | 2 +- xfa/src/fwl/src/core/fwl_noteimp.cpp | 20 +- xfa/src/fwl/src/core/fwl_sdadapterimp.cpp | 8 +- xfa/src/fwl/src/core/fwl_targetimp.cpp | 4 +- xfa/src/fwl/src/core/fwl_widgetimp.cpp | 12 +- xfa/src/fwl/src/core/fwl_widgetmgrimp.cpp | 8 +- xfa/src/fwl/src/core/include/fwl_noteimp.h | 6 +- xfa/src/fwl/src/core/include/fwl_targetimp.h | 4 +- xfa/src/fwl/src/core/include/fwl_widgetimp.h | 6 +- xfa/src/fwl/src/core/include/fwl_widgetmgrimp.h | 2 +- xfa/src/fwl/src/lightwidget/combobox.cpp | 8 +- xfa/src/fwl/src/lightwidget/edit.cpp | 2 +- xfa/src/fwl/src/lightwidget/listbox.cpp | 8 +- xfa/src/fwl/src/lightwidget/theme.cpp | 4 +- xfa/src/fwl/src/lightwidget/widget.cpp | 6 +- xfa/src/fwl/src/theme/comboboxtp.cpp | 2 +- xfa/src/fwl/src/theme/formtp.cpp | 2 +- xfa/src/fwl/src/theme/listboxtp.cpp | 2 +- xfa/src/fwl/src/theme/monthcalendartp.cpp | 2 +- xfa/src/fwl/src/theme/pushbuttontp.cpp | 2 +- xfa/src/fwl/src/theme/scrollbartp.cpp | 2 +- xfa/src/fwl/src/theme/widgettp.cpp | 4 +- .../fxbarcode/datamatrix/BC_DataMatrixDetector.cpp | 2 +- xfa/src/fxbarcode/datamatrix/BC_EdifactEncoder.cpp | 2 +- .../fxbarcode/datamatrix/BC_ErrorCorrection.cpp | 8 +- .../fxbarcode/datamatrix/BC_HighLevelEncoder.cpp | 6 +- xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.cpp | 18 +- xfa/src/fxbarcode/oned/BC_OnedCodaBarReader.cpp | 2 +- xfa/src/fxbarcode/oned/BC_OnedCodaBarReader.h | 2 +- xfa/src/fxbarcode/oned/BC_OnedCode39Reader.cpp | 4 +- xfa/src/fxbarcode/oned/BC_OnedCode39Reader.h | 4 +- .../fxbarcode/pdf417/BC_PDF417HighLevelEncoder.cpp | 2 +- .../qrcode/BC_QRDecodedBitStreamParser.cpp | 2 +- .../fxbarcode/qrcode/BC_QRDecodedBitStreamParser.h | 2 +- .../fxbarcode/qrcode/BC_QRFinderPatternFinder.cpp | 2 +- xfa/src/fxbarcode/utils.h | 4 +- xfa/src/fxfa/src/app/xfa_checksum.cpp | 18 +- xfa/src/fxfa/src/app/xfa_checksum.h | 16 +- xfa/src/fxfa/src/app/xfa_ffapp.cpp | 10 +- xfa/src/fxfa/src/app/xfa_ffbarcode.h | 2 +- xfa/src/fxfa/src/app/xfa_ffdoc.cpp | 22 +- xfa/src/fxfa/src/app/xfa_ffdocview.cpp | 6 +- xfa/src/fxfa/src/app/xfa_ffimageedit.cpp | 4 +- xfa/src/fxfa/src/app/xfa_ffnotify.cpp | 30 +- xfa/src/fxfa/src/app/xfa_ffnotify.h | 24 +- xfa/src/fxfa/src/app/xfa_ffpageview.cpp | 2 +- xfa/src/fxfa/src/app/xfa_fftext.cpp | 10 +- xfa/src/fxfa/src/app/xfa_fftext.h | 2 +- xfa/src/fxfa/src/app/xfa_fftextedit.cpp | 2 +- xfa/src/fxfa/src/app/xfa_ffwidget.cpp | 24 +- xfa/src/fxfa/src/app/xfa_ffwidget.h | 2 +- xfa/src/fxfa/src/app/xfa_ffwidgetacc.cpp | 14 +- xfa/src/fxfa/src/app/xfa_ffwidgethandler.cpp | 4 +- xfa/src/fxfa/src/app/xfa_ffwidgethandler.h | 4 +- xfa/src/fxfa/src/app/xfa_fontmgr.cpp | 24 +- xfa/src/fxfa/src/app/xfa_fontmgr.h | 4 +- xfa/src/fxfa/src/app/xfa_fwltheme.cpp | 6 +- xfa/src/fxfa/src/app/xfa_fwltheme.h | 2 +- xfa/src/fxfa/src/app/xfa_textlayout.cpp | 19 +- xfa/src/fxfa/src/app/xfa_textlayout.h | 6 +- xfa/src/fxfa/src/common/xfa_docdata.h | 2 +- xfa/src/fxfa/src/common/xfa_document.h | 8 +- xfa/src/fxfa/src/common/xfa_fm2jsapi.h | 2 +- xfa/src/fxfa/src/common/xfa_object.h | 74 +-- xfa/src/fxfa/src/common/xfa_script.h | 2 +- xfa/src/fxfa/src/common/xfa_utils.h | 4 +- xfa/src/fxfa/src/fm2js/xfa_error.cpp | 4 +- xfa/src/fxfa/src/fm2js/xfa_error.h | 2 +- xfa/src/fxfa/src/fm2js/xfa_fm2jscontext.cpp | 60 +-- xfa/src/fxfa/src/fm2js/xfa_fm2jscontext.h | 6 +- xfa/src/fxfa/src/fm2js/xfa_fmparse.cpp | 45 +- xfa/src/fxfa/src/fm2js/xfa_fmparse.h | 2 +- xfa/src/fxfa/src/fm2js/xfa_lexer.cpp | 56 +- xfa/src/fxfa/src/fm2js/xfa_lexer.h | 20 +- xfa/src/fxfa/src/fm2js/xfa_simpleexpression.h | 4 +- xfa/src/fxfa/src/parser/xfa_basic_data.cpp | 582 ++++++++++----------- xfa/src/fxfa/src/parser/xfa_basic_imp.cpp | 26 +- xfa/src/fxfa/src/parser/xfa_basic_imp.h | 10 +- xfa/src/fxfa/src/parser/xfa_document_imp.cpp | 12 +- xfa/src/fxfa/src/parser/xfa_document_serialize.cpp | 34 +- xfa/src/fxfa/src/parser/xfa_document_serialize.h | 4 +- xfa/src/fxfa/src/parser/xfa_layout_itemlayout.cpp | 2 +- xfa/src/fxfa/src/parser/xfa_layout_pagemgr_new.cpp | 10 +- xfa/src/fxfa/src/parser/xfa_locale.cpp | 10 +- xfa/src/fxfa/src/parser/xfa_localemgr.cpp | 4 +- xfa/src/fxfa/src/parser/xfa_localevalue.cpp | 14 +- xfa/src/fxfa/src/parser/xfa_object_imp.cpp | 150 +++--- xfa/src/fxfa/src/parser/xfa_objectacc_imp.cpp | 14 +- .../fxfa/src/parser/xfa_script_hostpseudomodel.cpp | 4 +- xfa/src/fxfa/src/parser/xfa_script_imp.cpp | 18 +- .../src/parser/xfa_script_layoutpseudomodel.cpp | 4 +- xfa/src/fxfa/src/parser/xfa_script_nodehelper.cpp | 6 +- xfa/src/fxfa/src/parser/xfa_script_nodehelper.h | 2 +- .../src/parser/xfa_script_resolveprocessor.cpp | 8 +- xfa/src/fxfa/src/parser/xfa_utils_imp.cpp | 2 +- xfa/src/fxgraphics/src/fx_graphics.cpp | 10 +- xfa/src/fxjse/src/class.cpp | 4 +- xfa/src/fxjse/src/context.cpp | 10 +- xfa/src/fxjse/src/context.h | 4 +- xfa/src/fxjse/src/runtime.cpp | 2 +- xfa/src/fxjse/src/util_inline.h | 4 +- xfa/src/fxjse/src/value.cpp | 10 +- xfa/src/fxjse/src/value.h | 4 +- 177 files changed, 1773 insertions(+), 1771 deletions(-) (limited to 'xfa/src') diff --git a/xfa/src/fdp/include/fde_css.h b/xfa/src/fdp/include/fde_css.h index 0c9b323954..c55f6c471e 100644 --- a/xfa/src/fdp/include/fde_css.h +++ b/xfa/src/fdp/include/fde_css.h @@ -242,9 +242,9 @@ public: virtual FDE_CSSPRIMITIVETYPE GetPrimitiveType() const = 0; virtual FX_ARGB GetRGBColor() const = 0; virtual FX_FLOAT GetFloat() const = 0; - virtual FX_LPCWSTR GetString(int32_t &iLength) const = 0; + virtual const FX_WCHAR* GetString(int32_t &iLength) const = 0; virtual FDE_CSSPROPERTYVALUE GetEnum() const = 0; - virtual FX_LPCWSTR GetFuncName() const = 0; + virtual const FX_WCHAR* GetFuncName() const = 0; virtual int32_t CountArgs() const = 0; virtual IFDE_CSSValue* GetArgs(int32_t index) const = 0; }; @@ -458,7 +458,7 @@ class IFDE_CSSStyleSheet : public IFX_Unknown public: static IFDE_CSSStyleSheet* LoadHTMLStandardStyleSheet(); static IFDE_CSSStyleSheet* LoadFromStream(const CFX_WideString &szUrl, IFX_Stream *pStream, FX_WORD wCodePage, FX_DWORD dwMediaList = FDE_CSSMEDIATYPE_ALL); - static IFDE_CSSStyleSheet* LoadFromBuffer(const CFX_WideString &szUrl, FX_LPCWSTR pBuffer, int32_t iBufSize, FX_WORD wCodePage, FX_DWORD dwMediaList = FDE_CSSMEDIATYPE_ALL); + static IFDE_CSSStyleSheet* LoadFromBuffer(const CFX_WideString &szUrl, const FX_WCHAR* pBuffer, int32_t iBufSize, FX_WORD wCodePage, FX_DWORD dwMediaList = FDE_CSSMEDIATYPE_ALL); virtual FX_BOOL GetUrl(CFX_WideString &szUrl) = 0; virtual FX_DWORD GetMediaList() const = 0; virtual FX_WORD GetCodePage() const = 0; @@ -504,10 +504,10 @@ public: static IFDE_CSSSyntaxParser* Create(); virtual void Release() = 0; virtual FX_BOOL Init(IFX_Stream *pStream, int32_t iCSSPlaneSize, int32_t iTextDataSize = 32, FX_BOOL bOnlyDeclaration = FALSE) = 0; - virtual FX_BOOL Init(FX_LPCWSTR pBuffer, int32_t iBufferSize, int32_t iTextDatSize = 32, FX_BOOL bOnlyDeclaration = FALSE) = 0; + virtual FX_BOOL Init(const FX_WCHAR* pBuffer, int32_t iBufferSize, int32_t iTextDatSize = 32, FX_BOOL bOnlyDeclaration = FALSE) = 0; virtual FDE_CSSSYNTAXSTATUS DoSyntaxParse() = 0; - virtual FX_LPCWSTR GetCurrentString(int32_t &iLength) const = 0; + virtual const FX_WCHAR* GetCurrentString(int32_t &iLength) const = 0; }; enum FDE_CSSLENGTHUNIT { FDE_CSSLENGTHUNIT_Auto, @@ -868,18 +868,18 @@ class IFDE_CSSGeneratedContentStyle { public: virtual int32_t CountCounters() = 0; - virtual FX_LPCWSTR GetCounterIdentifier(int32_t index) = 0; + virtual const FX_WCHAR* GetCounterIdentifier(int32_t index) = 0; virtual FX_BOOL GetCounterReset(int32_t index, int32_t &iValue) = 0; virtual FX_BOOL GetCounterIncrement(int32_t index, int32_t &iValue) = 0; virtual IFDE_CSSValueList* GetContent() const = 0; virtual int32_t CountQuotes() const = 0; - virtual FX_LPCWSTR GetQuotes(int32_t index) const = 0; + virtual const FX_WCHAR* GetQuotes(int32_t index) const = 0; }; class IFDE_CSSFontStyle { public: virtual int32_t CountFontFamilies() const = 0; - virtual FX_LPCWSTR GetFontFamily(int32_t index) const = 0; + virtual const FX_WCHAR* GetFontFamily(int32_t index) const = 0; virtual FX_WORD GetFontWeight() const = 0; virtual FDE_CSSFONTVARIANT GetFontVariant() const = 0; virtual FDE_CSSFONTSTYLE GetFontStyle() const = 0; @@ -964,7 +964,7 @@ public: virtual FDE_CSSLINEBREAK GetLineBreak() const = 0; virtual FDE_CSSTEXTEMPHASISMARK GetTextEmphasisMark() const = 0; virtual FDE_CSSTEXTEMPHASISFILL GetTextEmphasisFill() const = 0; - virtual FX_LPCWSTR GetTextEmphasisCustom() const = 0; + virtual const FX_WCHAR* GetTextEmphasisCustom() const = 0; virtual FDE_CSSTEXTCOMBINE GetTextCombineType() const = 0; virtual FX_BOOL HasTextCombineNumber() const = 0; virtual FX_FLOAT GetTextCombineNumber() const = 0; @@ -992,7 +992,7 @@ class IFDE_CSSBackgroundStyle { public: virtual FX_ARGB GetBKGColor() const = 0; - virtual FX_LPCWSTR GetBKGImage() const = 0; + virtual const FX_WCHAR* GetBKGImage() const = 0; virtual FDE_CSSBKGREPEAT GetBKGRepeat() const = 0; virtual FDE_CSSBKGATTACHMENT GetBKGAttachment() const = 0; virtual const FDE_CSSPOINT& GetBKGPosition() const = 0; @@ -1004,7 +1004,7 @@ class IFDE_CSSListStyle public: virtual FDE_CSSLISTSTYLETYPE GetListStyleType() const = 0; virtual FDE_CSSLISTSTYLEPOSITION GetListStylePosition() const = 0; - virtual FX_LPCWSTR GetListStyleImage() const = 0; + virtual const FX_WCHAR* GetListStyleImage() const = 0; virtual void SetListStyleType(FDE_CSSLISTSTYLETYPE eListStyleType) = 0; virtual void SetListStylePosition(FDE_CSSLISTSTYLEPOSITION eListStylePosition) = 0; }; diff --git a/xfa/src/fdp/include/fde_psr.h b/xfa/src/fdp/include/fde_psr.h index 974f4cc879..9934cfae09 100644 --- a/xfa/src/fdp/include/fde_psr.h +++ b/xfa/src/fdp/include/fde_psr.h @@ -14,7 +14,7 @@ enum FDE_VISUALOBJTYPE { FDE_VISUALOBJ_Widget = 0x08 , }; typedef struct _FDE_HVISUALOBJ { - FX_LPVOID pData; + void* pData; } const * FDE_HVISUALOBJ; class IFDE_VisualSet { diff --git a/xfa/src/fdp/include/fde_rdv.h b/xfa/src/fdp/include/fde_rdv.h index eb79a81c9b..41e8d5c43d 100644 --- a/xfa/src/fdp/include/fde_rdv.h +++ b/xfa/src/fdp/include/fde_rdv.h @@ -13,7 +13,7 @@ class CFX_DIBitmap; class CFX_DIBSource; class IFDE_RenderDevice; typedef struct _FDE_HDEVICESTATE { - FX_LPVOID pData; + void* pData; } * FDE_HDEVICESTATE; class IFDE_RenderDevice { diff --git a/xfa/src/fdp/include/fde_tto.h b/xfa/src/fdp/include/fde_tto.h index 8b4d1d4787..ec27490cfd 100644 --- a/xfa/src/fdp/include/fde_tto.h +++ b/xfa/src/fdp/include/fde_tto.h @@ -51,19 +51,19 @@ public: virtual void SetClipRect(const CFX_RectF &rtClip) = 0; virtual void SetMatrix(const CFX_Matrix &matrix) = 0; virtual void SetLineBreakTolerance(FX_FLOAT fTolerance) = 0; - virtual void CalcSize(FX_LPCWSTR pwsStr, int32_t iLength, CFX_Size &size) = 0; - virtual void CalcSize(FX_LPCWSTR pwsStr, int32_t iLength, CFX_SizeF &size) = 0; - virtual void CalcSize(FX_LPCWSTR pwsStr, int32_t iLength, CFX_Rect &rect) = 0; - virtual void CalcSize(FX_LPCWSTR pwsStr, int32_t iLength, CFX_RectF &rect) = 0; - virtual void DrawText(FX_LPCWSTR pwsStr, int32_t iLength, int32_t x, int32_t y) = 0; - virtual void DrawText(FX_LPCWSTR pwsStr, int32_t iLength, FX_FLOAT x, FX_FLOAT y) = 0; - virtual void DrawText(FX_LPCWSTR pwsStr, int32_t iLength, const CFX_Rect &rect) = 0; - virtual void DrawText(FX_LPCWSTR pwsStr, int32_t iLength, const CFX_RectF &rect) = 0; + virtual void CalcSize(const FX_WCHAR* pwsStr, int32_t iLength, CFX_Size &size) = 0; + virtual void CalcSize(const FX_WCHAR* pwsStr, int32_t iLength, CFX_SizeF &size) = 0; + virtual void CalcSize(const FX_WCHAR* pwsStr, int32_t iLength, CFX_Rect &rect) = 0; + virtual void CalcSize(const FX_WCHAR* pwsStr, int32_t iLength, CFX_RectF &rect) = 0; + virtual void DrawText(const FX_WCHAR* pwsStr, int32_t iLength, int32_t x, int32_t y) = 0; + virtual void DrawText(const FX_WCHAR* pwsStr, int32_t iLength, FX_FLOAT x, FX_FLOAT y) = 0; + virtual void DrawText(const FX_WCHAR* pwsStr, int32_t iLength, const CFX_Rect &rect) = 0; + virtual void DrawText(const FX_WCHAR* pwsStr, int32_t iLength, const CFX_RectF &rect) = 0; virtual void SetLogicClipRect(const CFX_RectF &rtClip) = 0; - virtual void CalcLogicSize(FX_LPCWSTR pwsStr, int32_t iLength, CFX_SizeF &size) = 0; - virtual void CalcLogicSize(FX_LPCWSTR pwsStr, int32_t iLength, CFX_RectF &rect) = 0; - virtual void DrawLogicText(FX_LPCWSTR pwsStr, int32_t iLength, FX_FLOAT x, FX_FLOAT y) = 0; - virtual void DrawLogicText(FX_LPCWSTR pwsStr, int32_t iLength, const CFX_RectF &rect) = 0; + virtual void CalcLogicSize(const FX_WCHAR* pwsStr, int32_t iLength, CFX_SizeF &size) = 0; + virtual void CalcLogicSize(const FX_WCHAR* pwsStr, int32_t iLength, CFX_RectF &rect) = 0; + virtual void DrawLogicText(const FX_WCHAR* pwsStr, int32_t iLength, FX_FLOAT x, FX_FLOAT y) = 0; + virtual void DrawLogicText(const FX_WCHAR* pwsStr, int32_t iLength, const CFX_RectF &rect) = 0; virtual int32_t GetTotalLines() = 0; }; #endif diff --git a/xfa/src/fdp/include/fde_xml.h b/xfa/src/fdp/include/fde_xml.h index eddb9a1835..2ffa30c0fd 100644 --- a/xfa/src/fdp/include/fde_xml.h +++ b/xfa/src/fdp/include/fde_xml.h @@ -51,7 +51,7 @@ public: virtual int32_t CountChildNodes() const = 0; virtual IFDE_XMLNode* GetChildNode(int32_t index) const = 0; virtual int32_t GetChildNodeIndex(IFDE_XMLNode *pNode) const = 0; - virtual IFDE_XMLNode* GetPath(FX_LPCWSTR pPath, int32_t iLength = -1, FX_BOOL bQualifiedName = TRUE) const = 0; + virtual IFDE_XMLNode* GetPath(const FX_WCHAR* pPath, int32_t iLength = -1, FX_BOOL bQualifiedName = TRUE) const = 0; virtual int32_t InsertChildNode(IFDE_XMLNode *pNode, int32_t index = -1) = 0; virtual void RemoveChildNode(IFDE_XMLNode *pNode) = 0; virtual void DeleteChildren() = 0; @@ -70,14 +70,14 @@ public: virtual void GetTargetName(CFX_WideString &wsTarget) const = 0; virtual int32_t CountAttributes() const = 0; virtual FX_BOOL GetAttribute(int32_t index, CFX_WideString &wsAttriName, CFX_WideString &wsAttriValue) const = 0; - virtual FX_BOOL HasAttribute(FX_LPCWSTR pwsAttriName) const = 0; - virtual void GetString(FX_LPCWSTR pwsAttriName, CFX_WideString &wsAttriValue, FX_LPCWSTR pwsDefValue = NULL) const = 0; + virtual FX_BOOL HasAttribute(const FX_WCHAR* pwsAttriName) const = 0; + virtual void GetString(const FX_WCHAR* pwsAttriName, CFX_WideString &wsAttriValue, const FX_WCHAR* pwsDefValue = NULL) const = 0; virtual void SetString(const CFX_WideString &wsAttriName, const CFX_WideString &wsAttriValue) = 0; - virtual int32_t GetInteger(FX_LPCWSTR pwsAttriName, int32_t iDefValue = 0) const = 0; - virtual void SetInteger(FX_LPCWSTR pwsAttriName, int32_t iAttriValue) = 0; - virtual FX_FLOAT GetFloat(FX_LPCWSTR pwsAttriName, FX_FLOAT fDefValue = 0) const = 0; - virtual void SetFloat(FX_LPCWSTR pwsAttriName, FX_FLOAT fAttriValue) = 0; - virtual void RemoveAttribute(FX_LPCWSTR pwsAttriName) = 0; + virtual int32_t GetInteger(const FX_WCHAR* pwsAttriName, int32_t iDefValue = 0) const = 0; + virtual void SetInteger(const FX_WCHAR* pwsAttriName, int32_t iAttriValue) = 0; + virtual FX_FLOAT GetFloat(const FX_WCHAR* pwsAttriName, FX_FLOAT fDefValue = 0) const = 0; + virtual void SetFloat(const FX_WCHAR* pwsAttriName, FX_FLOAT fAttriValue) = 0; + virtual void RemoveAttribute(const FX_WCHAR* pwsAttriName) = 0; virtual int32_t CountData() const = 0; virtual FX_BOOL GetData(int32_t index, CFX_WideString &wsData) const = 0; virtual void AppendData(const CFX_WideString &wsData) = 0; @@ -93,14 +93,14 @@ public: virtual void GetNamespaceURI(CFX_WideString &wsNamespace) const = 0; virtual int32_t CountAttributes() const = 0; virtual FX_BOOL GetAttribute(int32_t index, CFX_WideString &wsAttriName, CFX_WideString &wsAttriValue) const = 0; - virtual FX_BOOL HasAttribute(FX_LPCWSTR pwsAttriName) const = 0; - virtual void GetString(FX_LPCWSTR pwsAttriName, CFX_WideString &wsAttriValue, FX_LPCWSTR pwsDefValue = NULL) const = 0; + virtual FX_BOOL HasAttribute(const FX_WCHAR* pwsAttriName) const = 0; + virtual void GetString(const FX_WCHAR* pwsAttriName, CFX_WideString &wsAttriValue, const FX_WCHAR* pwsDefValue = NULL) const = 0; virtual void SetString(const CFX_WideString &wsAttriName, const CFX_WideString &wsAttriValue) = 0; - virtual int32_t GetInteger(FX_LPCWSTR pwsAttriName, int32_t iDefValue = 0) const = 0; - virtual void SetInteger(FX_LPCWSTR pwsAttriName, int32_t iAttriValue) = 0; - virtual FX_FLOAT GetFloat(FX_LPCWSTR pwsAttriName, FX_FLOAT fDefValue = 0) const = 0; - virtual void SetFloat(FX_LPCWSTR pwsAttriName, FX_FLOAT fAttriValue) = 0; - virtual void RemoveAttribute(FX_LPCWSTR pwsAttriName) = 0; + virtual int32_t GetInteger(const FX_WCHAR* pwsAttriName, int32_t iDefValue = 0) const = 0; + virtual void SetInteger(const FX_WCHAR* pwsAttriName, int32_t iAttriValue) = 0; + virtual FX_FLOAT GetFloat(const FX_WCHAR* pwsAttriName, FX_FLOAT fDefValue = 0) const = 0; + virtual void SetFloat(const FX_WCHAR* pwsAttriName, FX_FLOAT fAttriValue) = 0; + virtual void RemoveAttribute(const FX_WCHAR* pwsAttriName) = 0; virtual void GetTextData(CFX_WideString &wsText) const = 0; virtual void SetTextData(const CFX_WideString &wsText) = 0; }; @@ -124,7 +124,7 @@ public: virtual void SetCharData(const CFX_WideString &wsCData) = 0; }; typedef struct _FDE_XMLREADERHANDLER { - FX_LPVOID pData; + void* pData; void (*OnTagEnter)(_FDE_XMLREADERHANDLER *pThis, FDE_XMLNODETYPE eType, const CFX_WideString &wsTagName); void (*OnTagBreak)(_FDE_XMLREADERHANDLER *pThis, const CFX_WideString &wsTagName); diff --git a/xfa/src/fdp/src/css/fde_csscache.cpp b/xfa/src/fdp/src/css/fde_csscache.cpp index 7b91401ac5..3c061082e2 100644 --- a/xfa/src/fdp/src/css/fde_csscache.cpp +++ b/xfa/src/fdp/src/css/fde_csscache.cpp @@ -31,7 +31,7 @@ CFDE_CSSStyleSheetCache::~CFDE_CSSStyleSheetCache() FX_POSITION pos = m_Stylesheets.GetStartPosition(); if (pos != NULL) { CFX_ByteString szKey; - FX_LPVOID pValue; + void* pValue; while (pos != NULL) { m_Stylesheets.GetNextAssoc(pos, szKey, pValue); FDE_DeleteWith(FDE_CSSCACHEITEM, m_pFixedStore, (FDE_LPCSSCACHEITEM)pValue); @@ -49,7 +49,7 @@ void CFDE_CSSStyleSheetCache::AddStyleSheet(FX_BSTR szKey, IFDE_CSSStyleSheet *p m_pFixedStore = FX_CreateAllocator(FX_ALLOCTYPE_Fixed, FX_MAX(10, m_iMaxItems), sizeof(FDE_CSSCACHEITEM)); FXSYS_assert(m_pFixedStore != NULL); } - FX_LPVOID pValue = NULL; + void* pValue = NULL; if (m_Stylesheets.Lookup(szKey, pValue)) { FDE_LPCSSCACHEITEM pItem = (FDE_LPCSSCACHEITEM)pValue; if (pItem->pStylesheet != pStyleSheet) { @@ -69,7 +69,7 @@ void CFDE_CSSStyleSheetCache::AddStyleSheet(FX_BSTR szKey, IFDE_CSSStyleSheet *p } IFDE_CSSStyleSheet* CFDE_CSSStyleSheetCache::GetStyleSheet(FX_BSTR szKey) const { - FX_LPVOID pValue = NULL; + void* pValue = NULL; if (m_Stylesheets.Lookup(szKey, pValue)) { FDE_LPCSSCACHEITEM pItem = (FDE_LPCSSCACHEITEM)pValue; pItem->dwActivity++; @@ -80,7 +80,7 @@ IFDE_CSSStyleSheet* CFDE_CSSStyleSheetCache::GetStyleSheet(FX_BSTR szKey) const } void CFDE_CSSStyleSheetCache::RemoveStyleSheet(FX_BSTR szKey) { - FX_LPVOID pValue = NULL; + void* pValue = NULL; if (!m_Stylesheets.Lookup(szKey, pValue)) { return; } @@ -91,7 +91,7 @@ void CFDE_CSSStyleSheetCache::RemoveLowestActivityItem() { FX_POSITION pos = m_Stylesheets.GetStartPosition(); CFX_ByteString szKey; - FX_LPVOID pValue; + void* pValue; FDE_LPCSSCACHEITEM pItem = NULL; CFX_ByteString szItem; while (pos != NULL) { diff --git a/xfa/src/fdp/src/css/fde_cssdatatable.cpp b/xfa/src/fdp/src/css/fde_cssdatatable.cpp index 7f42d10ad0..126a3748dd 100644 --- a/xfa/src/fdp/src/css/fde_cssdatatable.cpp +++ b/xfa/src/fdp/src/css/fde_cssdatatable.cpp @@ -417,7 +417,7 @@ extern "C" { { return (ePersudo < FDE_CSSPERSUDO_NONE) ? (g_FDE_CSSPersudoType + ePersudo) : NULL; } - FDE_LPCCSSPROPERTYTABLE FDE_GetCSSPropertyByName(FX_LPCWSTR pszName, int32_t iLength) + FDE_LPCCSSPROPERTYTABLE FDE_GetCSSPropertyByName(const FX_WCHAR* pszName, int32_t iLength) { FXSYS_assert(pszName != NULL && iLength > 0); FX_DWORD dwHash = FX_HashCode_String_GetW(pszName, iLength, TRUE); @@ -441,7 +441,7 @@ extern "C" { { return (eName < FDE_CSSPROPERTY_MAX) ? (g_FDE_CSSProperties + eName) : NULL; } - FDE_LPCCSSPROPERTYVALUETABLE FDE_GetCSSPropertyValueByName(FX_LPCWSTR pszName, int32_t iLength) + FDE_LPCCSSPROPERTYVALUETABLE FDE_GetCSSPropertyValueByName(const FX_WCHAR* pszName, int32_t iLength) { FXSYS_assert(pszName != NULL && iLength > 0); FX_DWORD dwHash = FX_HashCode_String_GetW(pszName, iLength, TRUE); @@ -465,7 +465,7 @@ extern "C" { { return (eName < FDE_CSSPROPERTYVALUE_MAX) ? (g_FDE_CSSPropertyValues + eName) : NULL; } - FDE_LPCCSSMEDIATYPETABLE FDE_GetCSSMediaTypeByName(FX_LPCWSTR pszName, int32_t iLength) + FDE_LPCCSSMEDIATYPETABLE FDE_GetCSSMediaTypeByName(const FX_WCHAR* pszName, int32_t iLength) { FXSYS_assert(pszName != NULL && iLength > 0); FX_WORD wHash = (FX_WORD)FX_HashCode_String_GetW(pszName, iLength, TRUE); @@ -485,7 +485,7 @@ extern "C" { } while (iStart <= iEnd); return NULL; } - FDE_LPCCSSLENGTHUNITTABLE FDE_GetCSSLengthUnitByName(FX_LPCWSTR pszName, int32_t iLength) + FDE_LPCCSSLENGTHUNITTABLE FDE_GetCSSLengthUnitByName(const FX_WCHAR* pszName, int32_t iLength) { FXSYS_assert(pszName != NULL && iLength > 0); FX_WORD wHash = (FX_WORD)FX_HashCode_String_GetW(pszName, iLength, TRUE); @@ -505,7 +505,7 @@ extern "C" { } while (iStart <= iEnd); return NULL; } - FDE_LPCCSSCOLORTABLE FDE_GetCSSColorByName(FX_LPCWSTR pszName, int32_t iLength) + FDE_LPCCSSCOLORTABLE FDE_GetCSSColorByName(const FX_WCHAR* pszName, int32_t iLength) { FXSYS_assert(pszName != NULL && iLength > 0); FX_DWORD dwHash = FX_HashCode_String_GetW(pszName, iLength, TRUE); @@ -525,7 +525,7 @@ extern "C" { } while (iStart <= iEnd); return NULL; } - FX_BOOL FDE_ParseCSSNumber(FX_LPCWSTR pszValue, int32_t iValueLen, FX_FLOAT &fValue, FDE_CSSPRIMITIVETYPE &eUnit) + FX_BOOL FDE_ParseCSSNumber(const FX_WCHAR* pszValue, int32_t iValueLen, FX_FLOAT &fValue, FDE_CSSPRIMITIVETYPE &eUnit) { FXSYS_assert(pszValue != NULL && iValueLen > 0); int32_t iUsedLen = 0; @@ -547,7 +547,7 @@ extern "C" { return TRUE; } - FX_BOOL FDE_ParseCSSString(FX_LPCWSTR pszValue, int32_t iValueLen, int32_t &iOffset, int32_t &iLength) + FX_BOOL FDE_ParseCSSString(const FX_WCHAR* pszValue, int32_t iValueLen, int32_t &iOffset, int32_t &iLength) { FXSYS_assert(pszValue != NULL && iValueLen > 0); iOffset = 0; @@ -561,7 +561,7 @@ extern "C" { return iValueLen > 0; } - FX_BOOL FDE_ParseCSSURI(FX_LPCWSTR pszValue, int32_t iValueLen, int32_t &iOffset, int32_t &iLength) + FX_BOOL FDE_ParseCSSURI(const FX_WCHAR* pszValue, int32_t iValueLen, int32_t &iOffset, int32_t &iLength) { FXSYS_assert(pszValue != NULL && iValueLen > 0); if (iValueLen < 6 || pszValue[iValueLen - 1] != ')' || FX_wcsnicmp(L"url(", pszValue, 4)) { @@ -574,7 +574,7 @@ extern "C" { return FALSE; } - FX_BOOL FDE_ParseCSSColor(FX_LPCWSTR pszValue, int32_t iValueLen, FX_ARGB &dwColor) + FX_BOOL FDE_ParseCSSColor(const FX_WCHAR* pszValue, int32_t iValueLen, FX_ARGB &dwColor) { FXSYS_assert(pszValue != NULL && iValueLen > 0); if (*pszValue == '#') { @@ -635,7 +635,7 @@ CFDE_CSSValueList::CFDE_CSSValueList(IFX_MEMAllocator *pStaticStore, const CFDE_ m_ppList = (IFDE_CSSValue**)pStaticStore->Alloc(iByteCount); FXSYS_memcpy(m_ppList, list.GetData(), iByteCount); } -FX_BOOL CFDE_CSSValueListParser::NextValue(FDE_CSSPRIMITIVETYPE &eType, FX_LPCWSTR &pStart, int32_t &iLength) +FX_BOOL CFDE_CSSValueListParser::NextValue(FDE_CSSPRIMITIVETYPE &eType, const FX_WCHAR* &pStart, int32_t &iLength) { while (m_pCur < m_pEnd && (*m_pCur <= ' ' || *m_pCur == m_Separator)) { ++m_pCur; @@ -691,7 +691,7 @@ FX_BOOL CFDE_CSSValueListParser::NextValue(FDE_CSSPRIMITIVETYPE &eType, FX_LPCWS } int32_t CFDE_CSSValueListParser::SkipTo(FX_WCHAR wch, FX_BOOL bWSSeparator , FX_BOOL bBrContinue ) { - FX_LPCWSTR pStart = m_pCur; + const FX_WCHAR* pStart = m_pCur; if (!bBrContinue) { if (bWSSeparator) while (++m_pCur < m_pEnd && *m_pCur != wch && *m_pCur > ' ') ; diff --git a/xfa/src/fdp/src/css/fde_cssdatatable.h b/xfa/src/fdp/src/css/fde_cssdatatable.h index ef8e0fb04e..05cd2ae00c 100644 --- a/xfa/src/fdp/src/css/fde_cssdatatable.h +++ b/xfa/src/fdp/src/css/fde_cssdatatable.h @@ -9,7 +9,7 @@ class CFDE_CSSFunction: public CFX_Target { public: - CFDE_CSSFunction(FX_LPCWSTR pszFuncName, IFDE_CSSValueList *pArgList): m_pszFuncName(pszFuncName), m_pArgList(pArgList) + CFDE_CSSFunction(const FX_WCHAR* pszFuncName, IFDE_CSSValueList *pArgList): m_pszFuncName(pszFuncName), m_pArgList(pArgList) { FXSYS_assert(pArgList != NULL); } @@ -21,14 +21,14 @@ public: { return m_pArgList->GetValue(index); } - FX_LPCWSTR GetFuncName() const + const FX_WCHAR* GetFuncName() const { return m_pszFuncName; }; protected: IFDE_CSSValueList *m_pArgList; - FX_LPCWSTR m_pszFuncName; + const FX_WCHAR* m_pszFuncName; }; class CFDE_CSSPrimitiveValue : public IFDE_CSSPrimitiveValue, public CFX_Target { @@ -40,7 +40,7 @@ public: CFDE_CSSPrimitiveValue(FX_ARGB color) : m_eType(FDE_CSSPRIMITIVETYPE_RGB), m_dwColor(color) { } CFDE_CSSPrimitiveValue(FDE_CSSPROPERTYVALUE eValue) : m_eType(FDE_CSSPRIMITIVETYPE_Enum) , m_eEnum(eValue) { } CFDE_CSSPrimitiveValue(FDE_CSSPRIMITIVETYPE eType, FX_FLOAT fValue) : m_eType(eType), m_fNumber(fValue) { } - CFDE_CSSPrimitiveValue(FDE_CSSPRIMITIVETYPE eType, FX_LPCWSTR pValue) : m_eType(eType), m_pString(pValue) + CFDE_CSSPrimitiveValue(FDE_CSSPRIMITIVETYPE eType, const FX_WCHAR* pValue) : m_eType(eType), m_pString(pValue) { FXSYS_assert(m_pString != NULL); } @@ -61,7 +61,7 @@ public: FXSYS_assert(m_eType >= FDE_CSSPRIMITIVETYPE_Number && m_eType <= FDE_CSSPRIMITIVETYPE_PC); return m_fNumber; } - virtual FX_LPCWSTR GetString(int32_t &iLength) const + virtual const FX_WCHAR* GetString(int32_t &iLength) const { FXSYS_assert(m_eType >= FDE_CSSPRIMITIVETYPE_String && m_eType <= FDE_CSSPRIMITIVETYPE_URI); iLength = FXSYS_wcslen(m_pString); @@ -72,7 +72,7 @@ public: FXSYS_assert(m_eType == FDE_CSSPRIMITIVETYPE_Enum); return m_eEnum; } - virtual FX_LPCWSTR GetFuncName() const + virtual const FX_WCHAR* GetFuncName() const { FXSYS_assert(m_eType == FDE_CSSPRIMITIVETYPE_Function); return m_pFunction->GetFuncName(); @@ -92,7 +92,7 @@ public: union { FX_ARGB m_dwColor; FX_FLOAT m_fNumber; - FX_LPCWSTR m_pString; + const FX_WCHAR* m_pString; FDE_CSSPROPERTYVALUE m_eEnum; CFDE_CSSFunction *m_pFunction; }; @@ -118,17 +118,17 @@ protected: class CFDE_CSSValueListParser : public CFX_Target { public: - CFDE_CSSValueListParser(FX_LPCWSTR psz, int32_t iLen, FX_WCHAR separator) + CFDE_CSSValueListParser(const FX_WCHAR* psz, int32_t iLen, FX_WCHAR separator) : m_Separator(separator), m_pCur(psz), m_pEnd(psz + iLen) { FXSYS_assert(psz != NULL && iLen > 0); } - FX_BOOL NextValue(FDE_CSSPRIMITIVETYPE &eType, FX_LPCWSTR &pStart, int32_t &iLength); + FX_BOOL NextValue(FDE_CSSPRIMITIVETYPE &eType, const FX_WCHAR* &pStart, int32_t &iLength); FX_WCHAR m_Separator; protected: int32_t SkipTo(FX_WCHAR wch, FX_BOOL bWSSeparator = FALSE, FX_BOOL bBrContinue = FALSE); - FX_LPCWSTR m_pCur; - FX_LPCWSTR m_pEnd; + const FX_WCHAR* m_pCur; + const FX_WCHAR* m_pEnd; }; #ifdef _cplusplus extern "C" { @@ -142,53 +142,53 @@ extern "C" { #define FDE_IsOnlyValue(type,enum) (((type) & ~(enum)) == FDE_CSSVALUETYPE_Primitive) struct FDE_CSSPROPERTYTABLE { FDE_CSSPROPERTY eName; - FX_LPCWSTR pszName; + const FX_WCHAR* pszName; FX_DWORD dwHash; FX_DWORD dwType; }; typedef FDE_CSSPROPERTYTABLE const * FDE_LPCCSSPROPERTYTABLE; - FDE_LPCCSSPROPERTYTABLE FDE_GetCSSPropertyByName(FX_LPCWSTR pszName, int32_t iLength); + FDE_LPCCSSPROPERTYTABLE FDE_GetCSSPropertyByName(const FX_WCHAR* pszName, int32_t iLength); FDE_LPCCSSPROPERTYTABLE FDE_GetCSSPropertyByEnum(FDE_CSSPROPERTY eName); struct FDE_CSSPROPERTYVALUETABLE { FDE_CSSPROPERTYVALUE eName; - FX_LPCWSTR pszName; + const FX_WCHAR* pszName; FX_DWORD dwHash; }; typedef FDE_CSSPROPERTYVALUETABLE const * FDE_LPCCSSPROPERTYVALUETABLE; - FDE_LPCCSSPROPERTYVALUETABLE FDE_GetCSSPropertyValueByName(FX_LPCWSTR pszName, int32_t iLength); + FDE_LPCCSSPROPERTYVALUETABLE FDE_GetCSSPropertyValueByName(const FX_WCHAR* pszName, int32_t iLength); FDE_LPCCSSPROPERTYVALUETABLE FDE_GetCSSPropertyValueByEnum(FDE_CSSPROPERTYVALUE eName); struct FDE_CSSMEDIATYPETABLE { FX_WORD wHash; FX_WORD wValue; }; typedef FDE_CSSMEDIATYPETABLE const * FDE_LPCCSSMEDIATYPETABLE; - FDE_LPCCSSMEDIATYPETABLE FDE_GetCSSMediaTypeByName(FX_LPCWSTR pszName, int32_t iLength); + FDE_LPCCSSMEDIATYPETABLE FDE_GetCSSMediaTypeByName(const FX_WCHAR* pszName, int32_t iLength); struct FDE_CSSLENGTHUNITTABLE { FX_WORD wHash; FX_WORD wValue; }; typedef FDE_CSSLENGTHUNITTABLE const * FDE_LPCCSSLENGTHUNITTABLE; - FDE_LPCCSSLENGTHUNITTABLE FDE_GetCSSLengthUnitByName(FX_LPCWSTR pszName, int32_t iLength); + FDE_LPCCSSLENGTHUNITTABLE FDE_GetCSSLengthUnitByName(const FX_WCHAR* pszName, int32_t iLength); struct FDE_CSSCOLORTABLE { FX_DWORD dwHash; FX_ARGB dwValue; }; typedef FDE_CSSCOLORTABLE const * FDE_LPCCSSCOLORTABLE; - FDE_LPCCSSCOLORTABLE FDE_GetCSSColorByName(FX_LPCWSTR pszName, int32_t iLength); + FDE_LPCCSSCOLORTABLE FDE_GetCSSColorByName(const FX_WCHAR* pszName, int32_t iLength); struct FDE_CSSPERSUDOTABLE { FDE_CSSPERSUDO eName; - FX_LPCWSTR pszName; + const FX_WCHAR* pszName; FX_DWORD dwHash; }; typedef FDE_CSSPERSUDOTABLE const * FDE_LPCCSSPERSUDOTABLE; FDE_LPCCSSPERSUDOTABLE FDE_GetCSSPersudoByEnum(FDE_CSSPERSUDO ePersudo); - FX_BOOL FDE_ParseCSSNumber(FX_LPCWSTR pszValue, int32_t iValueLen, FX_FLOAT &fValue, FDE_CSSPRIMITIVETYPE &eUnit); - FX_BOOL FDE_ParseCSSString(FX_LPCWSTR pszValue, int32_t iValueLen, int32_t &iOffset, int32_t &iLength); - FX_BOOL FDE_ParseCSSColor(FX_LPCWSTR pszValue, int32_t iValueLen, FX_ARGB &dwColor); - FX_BOOL FDE_ParseCSSURI(FX_LPCWSTR pszValue, int32_t iValueLen, int32_t &iOffset, int32_t &iLength); + FX_BOOL FDE_ParseCSSNumber(const FX_WCHAR* pszValue, int32_t iValueLen, FX_FLOAT &fValue, FDE_CSSPRIMITIVETYPE &eUnit); + FX_BOOL FDE_ParseCSSString(const FX_WCHAR* pszValue, int32_t iValueLen, int32_t &iOffset, int32_t &iLength); + FX_BOOL FDE_ParseCSSColor(const FX_WCHAR* pszValue, int32_t iValueLen, FX_ARGB &dwColor); + FX_BOOL FDE_ParseCSSURI(const FX_WCHAR* pszValue, int32_t iValueLen, int32_t &iOffset, int32_t &iLength); #ifdef _cplusplus }; #endif diff --git a/xfa/src/fdp/src/css/fde_cssdeclaration.cpp b/xfa/src/fdp/src/css/fde_cssdeclaration.cpp index 9898708539..297357850e 100644 --- a/xfa/src/fdp/src/css/fde_cssdeclaration.cpp +++ b/xfa/src/fdp/src/css/fde_cssdeclaration.cpp @@ -43,19 +43,19 @@ void CFDE_CSSDeclaration::GetNextCustom(FX_POSITION &pos, CFX_WideString &wsName wsValue = pProperty->pwsValue; pos = (FX_POSITION)pProperty->pNext; } -FX_LPCWSTR CFDE_CSSDeclaration::CopyToLocal(FDE_LPCCSSPROPERTYARGS pArgs, FX_LPCWSTR pszValue, int32_t iValueLen) +const FX_WCHAR* CFDE_CSSDeclaration::CopyToLocal(FDE_LPCCSSPROPERTYARGS pArgs, const FX_WCHAR* pszValue, int32_t iValueLen) { FXSYS_assert(iValueLen > 0); CFX_MapPtrToPtr *pCache = pArgs->pStringCache; - FX_LPVOID pKey = NULL; + void* pKey = NULL; if (pCache) { - FX_LPVOID pszCached = NULL; - pKey = (FX_LPVOID)(uintptr_t)FX_HashCode_String_GetW(pszValue, iValueLen, FALSE); + void* pszCached = NULL; + pKey = (void*)(uintptr_t)FX_HashCode_String_GetW(pszValue, iValueLen, FALSE); if (pCache->Lookup(pKey, pszCached)) { - return (FX_LPCWSTR)pszCached; + return (const FX_WCHAR*)pszCached; } } - FX_LPWSTR psz = (FX_LPWSTR)pArgs->pStaticStore->Alloc((iValueLen + 1) * sizeof(FX_WCHAR)); + FX_WCHAR* psz = (FX_WCHAR*)pArgs->pStaticStore->Alloc((iValueLen + 1) * sizeof(FX_WCHAR)); if (psz == NULL) { return NULL; } @@ -92,7 +92,7 @@ void CFDE_CSSDeclaration::AddPropertyHolder(IFX_MEMAllocator *pStaticStore, FDE_ m_pLastProperty = pHolder; } } -FX_BOOL CFDE_CSSDeclaration::AddProperty(FDE_LPCCSSPROPERTYARGS pArgs, FX_LPCWSTR pszValue, int32_t iValueLen) +FX_BOOL CFDE_CSSDeclaration::AddProperty(FDE_LPCCSSPROPERTYARGS pArgs, const FX_WCHAR* pszValue, int32_t iValueLen) { FXSYS_assert(iValueLen > 0); FX_BOOL bImportant = FALSE; @@ -229,7 +229,7 @@ FX_BOOL CFDE_CSSDeclaration::AddProperty(FDE_LPCCSSPROPERTYARGS pArgs, FX_LPCWST } return FALSE; } -FX_BOOL CFDE_CSSDeclaration::AddProperty(FDE_LPCCSSPROPERTYARGS pArgs, FX_LPCWSTR pszName, int32_t iNameLen, FX_LPCWSTR pszValue, int32_t iValueLen) +FX_BOOL CFDE_CSSDeclaration::AddProperty(FDE_LPCCSSPROPERTYARGS pArgs, const FX_WCHAR* pszName, int32_t iNameLen, const FX_WCHAR* pszValue, int32_t iValueLen) { FDE_LPCSSCUSTOMPROPERTY pProperty = FDE_NewWith(pArgs->pStaticStore) FDE_CSSCUSTOMPROPERTY; pProperty->pwsName = CopyToLocal(pArgs, pszName, iNameLen); @@ -243,7 +243,7 @@ FX_BOOL CFDE_CSSDeclaration::AddProperty(FDE_LPCCSSPROPERTYARGS pArgs, FX_LPCWST } return TRUE; } -IFDE_CSSValue* CFDE_CSSDeclaration::ParseNumber(FDE_LPCCSSPROPERTYARGS pArgs, FX_LPCWSTR pszValue, int32_t iValueLen) +IFDE_CSSValue* CFDE_CSSDeclaration::ParseNumber(FDE_LPCCSSPROPERTYARGS pArgs, const FX_WCHAR* pszValue, int32_t iValueLen) { FX_FLOAT fValue; FDE_CSSPRIMITIVETYPE eUnit; @@ -252,12 +252,12 @@ IFDE_CSSValue* CFDE_CSSDeclaration::ParseNumber(FDE_LPCCSSPROPERTYARGS pArgs, FX } return NewNumberValue(pArgs->pStaticStore, eUnit, fValue); } -IFDE_CSSValue* CFDE_CSSDeclaration::ParseEnum(FDE_LPCCSSPROPERTYARGS pArgs, FX_LPCWSTR pszValue, int32_t iValueLen) +IFDE_CSSValue* CFDE_CSSDeclaration::ParseEnum(FDE_LPCCSSPROPERTYARGS pArgs, const FX_WCHAR* pszValue, int32_t iValueLen) { FDE_LPCCSSPROPERTYVALUETABLE pValue = FDE_GetCSSPropertyValueByName(pszValue, iValueLen); return pValue ? NewEnumValue(pArgs->pStaticStore, pValue->eName) : NULL; } -IFDE_CSSValue* CFDE_CSSDeclaration::ParseColor(FDE_LPCCSSPROPERTYARGS pArgs, FX_LPCWSTR pszValue, int32_t iValueLen) +IFDE_CSSValue* CFDE_CSSDeclaration::ParseColor(FDE_LPCCSSPROPERTYARGS pArgs, const FX_WCHAR* pszValue, int32_t iValueLen) { FX_ARGB dwColor; if (!FDE_ParseCSSColor(pszValue, iValueLen, dwColor)) { @@ -265,7 +265,7 @@ IFDE_CSSValue* CFDE_CSSDeclaration::ParseColor(FDE_LPCCSSPROPERTYARGS pArgs, FX_ } return FDE_NewWith(pArgs->pStaticStore) CFDE_CSSPrimitiveValue(dwColor); } -IFDE_CSSValue* CFDE_CSSDeclaration::ParseURI(FDE_LPCCSSPROPERTYARGS pArgs, FX_LPCWSTR pszValue, int32_t iValueLen) +IFDE_CSSValue* CFDE_CSSDeclaration::ParseURI(FDE_LPCCSSPROPERTYARGS pArgs, const FX_WCHAR* pszValue, int32_t iValueLen) { int32_t iOffset; if (!FDE_ParseCSSURI(pszValue, iValueLen, iOffset, iValueLen)) { @@ -277,7 +277,7 @@ IFDE_CSSValue* CFDE_CSSDeclaration::ParseURI(FDE_LPCCSSPROPERTYARGS pArgs, FX_LP pszValue = CopyToLocal(pArgs, pszValue + iOffset, iValueLen); return pszValue ? FDE_NewWith(pArgs->pStaticStore) CFDE_CSSPrimitiveValue(FDE_CSSPRIMITIVETYPE_URI, pszValue) : NULL; } -IFDE_CSSValue* CFDE_CSSDeclaration::ParseString(FDE_LPCCSSPROPERTYARGS pArgs, FX_LPCWSTR pszValue, int32_t iValueLen) +IFDE_CSSValue* CFDE_CSSDeclaration::ParseString(FDE_LPCCSSPROPERTYARGS pArgs, const FX_WCHAR* pszValue, int32_t iValueLen) { int32_t iOffset; if (!FDE_ParseCSSString(pszValue, iValueLen, iOffset, iValueLen)) { @@ -289,7 +289,7 @@ IFDE_CSSValue* CFDE_CSSDeclaration::ParseString(FDE_LPCCSSPROPERTYARGS pArgs, FX pszValue = CopyToLocal(pArgs, pszValue + iOffset, iValueLen); return pszValue ? FDE_NewWith(pArgs->pStaticStore) CFDE_CSSPrimitiveValue(FDE_CSSPRIMITIVETYPE_String, pszValue) : NULL; } -IFDE_CSSValue* CFDE_CSSDeclaration::ParseFunction(FDE_LPCCSSPROPERTYARGS pArgs, FX_LPCWSTR pszValue, int32_t iValueLen) +IFDE_CSSValue* CFDE_CSSDeclaration::ParseFunction(FDE_LPCCSSPROPERTYARGS pArgs, const FX_WCHAR* pszValue, int32_t iValueLen) { if (pszValue[iValueLen - 1] != ')') { return NULL; @@ -305,7 +305,7 @@ IFDE_CSSValue* CFDE_CSSDeclaration::ParseFunction(FDE_LPCCSSPROPERTYARGS pArgs, if (iStartBracket == 0) { return NULL; } - FX_LPCWSTR pszFuncName = CopyToLocal(pArgs, pszValue, iStartBracket); + const FX_WCHAR* pszFuncName = CopyToLocal(pArgs, pszValue, iStartBracket); pszValue += (iStartBracket + 1); iValueLen -= (iStartBracket + 2); CFDE_CSSValueArray argumentArr; @@ -343,7 +343,7 @@ IFDE_CSSValue* CFDE_CSSDeclaration::ParseFunction(FDE_LPCCSSPROPERTYARGS pArgs, CFDE_CSSFunction *pFunction = FDE_NewWith(pArgs->pStaticStore) CFDE_CSSFunction(pszFuncName, pArgumentList); return FDE_NewWith(pArgs->pStaticStore) CFDE_CSSPrimitiveValue(pFunction); } -FX_BOOL CFDE_CSSDeclaration::ParseContentProperty(FDE_LPCCSSPROPERTYARGS pArgs, FX_LPCWSTR pszValue, int32_t iValueLen, FX_BOOL bImportant) +FX_BOOL CFDE_CSSDeclaration::ParseContentProperty(FDE_LPCCSSPROPERTYARGS pArgs, const FX_WCHAR* pszValue, int32_t iValueLen, FX_BOOL bImportant) { IFX_MEMAllocator* pStaticStore = (IFX_MEMAllocator*)pArgs->pStaticStore; CFDE_CSSValueListParser parser(pszValue, iValueLen, ' '); @@ -400,7 +400,7 @@ FX_BOOL CFDE_CSSDeclaration::ParseContentProperty(FDE_LPCCSSPROPERTYARGS pArgs, AddPropertyHolder(pStaticStore, pArgs->pProperty->eName, FDE_NewWith(pStaticStore) CFDE_CSSValueList(pStaticStore, list), bImportant); return TRUE; } -FX_BOOL CFDE_CSSDeclaration::ParseCounterProperty(FDE_LPCCSSPROPERTYARGS pArgs, FX_LPCWSTR pszValue, int32_t iValueLen, FX_BOOL bImportant) +FX_BOOL CFDE_CSSDeclaration::ParseCounterProperty(FDE_LPCCSSPROPERTYARGS pArgs, const FX_WCHAR* pszValue, int32_t iValueLen, FX_BOOL bImportant) { IFX_MEMAllocator *pStaticStore = pArgs->pStaticStore; CFDE_CSSValueListParser parser(pszValue, iValueLen, ' '); @@ -447,7 +447,7 @@ FX_BOOL CFDE_CSSDeclaration::ParseCounterProperty(FDE_LPCCSSPROPERTYARGS pArgs, AddPropertyHolder(pStaticStore, pArgs->pProperty->eName, FDE_NewWith(pStaticStore) CFDE_CSSValueList(pStaticStore, listFull), bImportant); return TRUE; } -FX_BOOL CFDE_CSSDeclaration::ParseValueListProperty(FDE_LPCCSSPROPERTYARGS pArgs, FX_LPCWSTR pszValue, int32_t iValueLen, FX_BOOL bImportant) +FX_BOOL CFDE_CSSDeclaration::ParseValueListProperty(FDE_LPCCSSPROPERTYARGS pArgs, const FX_WCHAR* pszValue, int32_t iValueLen, FX_BOOL bImportant) { IFX_MEMAllocator *pStaticStore = pArgs->pStaticStore; FX_WCHAR separator = (pArgs->pProperty->eName == FDE_CSSPROPERTY_FontFamily) ? ',' : ' '; @@ -557,7 +557,7 @@ FX_BOOL CFDE_CSSDeclaration::Add4ValuesProperty(IFX_MEMAllocator *pStaticStore, } return FALSE; } -FX_BOOL CFDE_CSSDeclaration::ParseBorderPropoerty(IFX_MEMAllocator *pStaticStore, FX_LPCWSTR pszValue, int32_t iValueLen, IFDE_CSSValue *&pColor, IFDE_CSSValue *&pStyle, IFDE_CSSValue *&pWidth) const +FX_BOOL CFDE_CSSDeclaration::ParseBorderPropoerty(IFX_MEMAllocator *pStaticStore, const FX_WCHAR* pszValue, int32_t iValueLen, IFDE_CSSValue *&pColor, IFDE_CSSValue *&pStyle, IFDE_CSSValue *&pWidth) const { pColor = pStyle = pWidth = NULL; CFDE_CSSValueListParser parser(pszValue, iValueLen, ' '); @@ -645,7 +645,7 @@ void CFDE_CSSDeclaration::AddBorderProperty(IFX_MEMAllocator *pStaticStore, IFDE AddPropertyHolder(pStaticStore, eWidth, pWidth, bImportant); AddPropertyHolder(pStaticStore, eColor, pColor, bImportant); } -FX_BOOL CFDE_CSSDeclaration::ParseListStyleProperty(FDE_LPCCSSPROPERTYARGS pArgs, FX_LPCWSTR pszValue, int32_t iValueLen, FX_BOOL bImportant) +FX_BOOL CFDE_CSSDeclaration::ParseListStyleProperty(FDE_LPCCSSPROPERTYARGS pArgs, const FX_WCHAR* pszValue, int32_t iValueLen, FX_BOOL bImportant) { IFX_MEMAllocator *pStaticStore = pArgs->pStaticStore; CFDE_CSSValueListParser parser(pszValue, iValueLen, ' '); @@ -718,7 +718,7 @@ FX_BOOL CFDE_CSSDeclaration::ParseListStyleProperty(FDE_LPCCSSPROPERTYARGS pArgs AddPropertyHolder(pStaticStore, FDE_CSSPROPERTY_ListStyleType, pType, bImportant); return TRUE; } -FX_BOOL CFDE_CSSDeclaration::ParseBackgroundProperty(FDE_LPCCSSPROPERTYARGS pArgs, FX_LPCWSTR pszValue, int32_t iValueLen, FX_BOOL bImportant) +FX_BOOL CFDE_CSSDeclaration::ParseBackgroundProperty(FDE_LPCCSSPROPERTYARGS pArgs, const FX_WCHAR* pszValue, int32_t iValueLen, FX_BOOL bImportant) { IFX_MEMAllocator *pStaticStore = pArgs->pStaticStore; CFDE_CSSValueListParser parser(pszValue, iValueLen, ' '); @@ -844,7 +844,7 @@ FX_BOOL CFDE_CSSDeclaration::ParseBackgroundProperty(FDE_LPCCSSPROPERTYARGS pArg AddPropertyHolder(pStaticStore, FDE_CSSPROPERTY_BackgroundAttachment, pAttachment, bImportant); return TRUE; } -FX_BOOL CFDE_CSSDeclaration::ParseFontProperty(FDE_LPCCSSPROPERTYARGS pArgs, FX_LPCWSTR pszValue, int32_t iValueLen, FX_BOOL bImportant) +FX_BOOL CFDE_CSSDeclaration::ParseFontProperty(FDE_LPCCSSPROPERTYARGS pArgs, const FX_WCHAR* pszValue, int32_t iValueLen, FX_BOOL bImportant) { IFX_MEMAllocator *pStaticStore = pArgs->pStaticStore; CFDE_CSSValueListParser parser(pszValue, iValueLen, '/'); @@ -971,7 +971,7 @@ FX_BOOL CFDE_CSSDeclaration::ParseFontProperty(FDE_LPCCSSPROPERTYARGS pArgs, FX_ } return TRUE; } -FX_BOOL CFDE_CSSDeclaration::ParseColumnRuleProperty(FDE_LPCCSSPROPERTYARGS pArgs, FX_LPCWSTR pszValue, int32_t iValueLen, FX_BOOL bImportant) +FX_BOOL CFDE_CSSDeclaration::ParseColumnRuleProperty(FDE_LPCCSSPROPERTYARGS pArgs, const FX_WCHAR* pszValue, int32_t iValueLen, FX_BOOL bImportant) { IFX_MEMAllocator *pStaticStore = pArgs->pStaticStore; CFDE_CSSValueListParser parser(pszValue, iValueLen, ' '); @@ -1058,7 +1058,7 @@ FX_BOOL CFDE_CSSDeclaration::ParseColumnRuleProperty(FDE_LPCCSSPROPERTYARGS pArg AddPropertyHolder(pStaticStore, FDE_CSSPROPERTY_ColumnRuleColor, pColumnRuleColor, bImportant); return TRUE; } -FX_BOOL CFDE_CSSDeclaration::ParseTextEmphasisProperty(FDE_LPCCSSPROPERTYARGS pArgs, FX_LPCWSTR pszValue, int32_t iValueLen, FX_BOOL bImportant) +FX_BOOL CFDE_CSSDeclaration::ParseTextEmphasisProperty(FDE_LPCCSSPROPERTYARGS pArgs, const FX_WCHAR* pszValue, int32_t iValueLen, FX_BOOL bImportant) { IFX_MEMAllocator *pStaticStore = pArgs->pStaticStore; CFDE_CSSValueListParser parser(pszValue, iValueLen, ' '); @@ -1101,7 +1101,7 @@ FX_BOOL CFDE_CSSDeclaration::ParseTextEmphasisProperty(FDE_LPCCSSPROPERTYARGS pA } return TRUE; } -FX_BOOL CFDE_CSSDeclaration::ParseColumnsProperty(FDE_LPCCSSPROPERTYARGS pArgs, FX_LPCWSTR pszValue, int32_t iValueLen, FX_BOOL bImportant) +FX_BOOL CFDE_CSSDeclaration::ParseColumnsProperty(FDE_LPCCSSPROPERTYARGS pArgs, const FX_WCHAR* pszValue, int32_t iValueLen, FX_BOOL bImportant) { IFX_MEMAllocator *pStaticStore = pArgs->pStaticStore; CFDE_CSSValueListParser parser(pszValue, iValueLen, ' '); @@ -1150,7 +1150,7 @@ FX_BOOL CFDE_CSSDeclaration::ParseColumnsProperty(FDE_LPCCSSPROPERTYARGS pArgs, AddPropertyHolder(pStaticStore, FDE_CSSPROPERTY_ColumnCount, pColumnCount, bImportant); return TRUE; } -FX_BOOL CFDE_CSSDeclaration::ParseOverflowProperty(FDE_LPCCSSPROPERTYARGS pArgs, FX_LPCWSTR pszValue, int32_t iValueLen, FX_BOOL bImportant) +FX_BOOL CFDE_CSSDeclaration::ParseOverflowProperty(FDE_LPCCSSPROPERTYARGS pArgs, const FX_WCHAR* pszValue, int32_t iValueLen, FX_BOOL bImportant) { IFX_MEMAllocator *pStaticStore = pArgs->pStaticStore; CFDE_CSSValueListParser parser(pszValue, iValueLen, ' '); diff --git a/xfa/src/fdp/src/css/fde_cssdeclaration.h b/xfa/src/fdp/src/css/fde_cssdeclaration.h index 91595d21d9..c8c80cce2f 100644 --- a/xfa/src/fdp/src/css/fde_cssdeclaration.h +++ b/xfa/src/fdp/src/css/fde_cssdeclaration.h @@ -14,8 +14,8 @@ typedef struct _FDE_CSSPROPERTYHOLDER : public CFX_Target { _FDE_CSSPROPERTYHOLDER *pNext; } FDE_CSSPROPERTYHOLDER, *FDE_LPCSSPROPERTYHOLDER; typedef struct _FDE_CSSCUSTOMPROPERTY : public CFX_Target { - FX_LPCWSTR pwsName; - FX_LPCWSTR pwsValue; + const FX_WCHAR* pwsName; + const FX_WCHAR* pwsValue; _FDE_CSSCUSTOMPROPERTY *pNext; } FDE_CSSCUSTOMPROPERTY, * FDE_LPCSSCUSTOMPROPERTY; typedef struct _FDE_CSSPROPERTYARGS : public CFX_Target { @@ -33,32 +33,32 @@ public: virtual void GetNextProperty(FX_POSITION &pos, FDE_CSSPROPERTY &eProperty, IFDE_CSSValue *&pValue, FX_BOOL &bImportant) const; virtual FX_POSITION GetStartCustom() const; virtual void GetNextCustom(FX_POSITION &pos, CFX_WideString &wsName, CFX_WideString &wsValue) const; - FX_BOOL AddProperty(FDE_LPCCSSPROPERTYARGS pArgs, FX_LPCWSTR pszValue, int32_t iValueLen); - FX_BOOL AddProperty(FDE_LPCCSSPROPERTYARGS pArgs, FX_LPCWSTR pszName, int32_t iNameLen, FX_LPCWSTR pszValue, int32_t iValueLen); + FX_BOOL AddProperty(FDE_LPCCSSPROPERTYARGS pArgs, const FX_WCHAR* pszValue, int32_t iValueLen); + FX_BOOL AddProperty(FDE_LPCCSSPROPERTYARGS pArgs, const FX_WCHAR* pszName, int32_t iNameLen, const FX_WCHAR* pszValue, int32_t iValueLen); protected: - FX_BOOL ParseTextEmphasisProperty(FDE_LPCCSSPROPERTYARGS pArgs, FX_LPCWSTR pszValue, int32_t iValueLen, FX_BOOL bImportant); - FX_BOOL ParseColumnsProperty(FDE_LPCCSSPROPERTYARGS pArgs, FX_LPCWSTR pszValue, int32_t iValueLen, FX_BOOL bImportant); - FX_BOOL ParseColumnRuleProperty(FDE_LPCCSSPROPERTYARGS pArgs, FX_LPCWSTR pszValue, int32_t iValueLen, FX_BOOL bImportant); - FX_BOOL ParseOverflowProperty(FDE_LPCCSSPROPERTYARGS pArgs, FX_LPCWSTR pszValue, int32_t iValueLen, FX_BOOL bImportant); - FX_BOOL ParseFontProperty(FDE_LPCCSSPROPERTYARGS pArgs, FX_LPCWSTR pszValue, int32_t iValueLen, FX_BOOL bImportant); - FX_BOOL ParseBackgroundProperty(FDE_LPCCSSPROPERTYARGS pArgs, FX_LPCWSTR pszValue, int32_t iValueLen, FX_BOOL bImportant); - FX_BOOL ParseListStyleProperty(FDE_LPCCSSPROPERTYARGS pArgs, FX_LPCWSTR pszValue, int32_t iValueLen, FX_BOOL bImportant); - FX_BOOL ParseBorderPropoerty(IFX_MEMAllocator *pStaticStore, FX_LPCWSTR pszValue, int32_t iValueLen, + FX_BOOL ParseTextEmphasisProperty(FDE_LPCCSSPROPERTYARGS pArgs, const FX_WCHAR* pszValue, int32_t iValueLen, FX_BOOL bImportant); + FX_BOOL ParseColumnsProperty(FDE_LPCCSSPROPERTYARGS pArgs, const FX_WCHAR* pszValue, int32_t iValueLen, FX_BOOL bImportant); + FX_BOOL ParseColumnRuleProperty(FDE_LPCCSSPROPERTYARGS pArgs, const FX_WCHAR* pszValue, int32_t iValueLen, FX_BOOL bImportant); + FX_BOOL ParseOverflowProperty(FDE_LPCCSSPROPERTYARGS pArgs, const FX_WCHAR* pszValue, int32_t iValueLen, FX_BOOL bImportant); + FX_BOOL ParseFontProperty(FDE_LPCCSSPROPERTYARGS pArgs, const FX_WCHAR* pszValue, int32_t iValueLen, FX_BOOL bImportant); + FX_BOOL ParseBackgroundProperty(FDE_LPCCSSPROPERTYARGS pArgs, const FX_WCHAR* pszValue, int32_t iValueLen, FX_BOOL bImportant); + FX_BOOL ParseListStyleProperty(FDE_LPCCSSPROPERTYARGS pArgs, const FX_WCHAR* pszValue, int32_t iValueLen, FX_BOOL bImportant); + FX_BOOL ParseBorderPropoerty(IFX_MEMAllocator *pStaticStore, const FX_WCHAR* pszValue, int32_t iValueLen, IFDE_CSSValue *&pColor, IFDE_CSSValue *&pStyle, IFDE_CSSValue *&pWidth) const; void AddBorderProperty(IFX_MEMAllocator *pStaticStore, IFDE_CSSValue *pColor, IFDE_CSSValue *pStyle, IFDE_CSSValue *pWidth, FX_BOOL bImportant, FDE_CSSPROPERTY eColor, FDE_CSSPROPERTY eStyle, FDE_CSSPROPERTY eWidth); - FX_BOOL ParseContentProperty(FDE_LPCCSSPROPERTYARGS pArgs, FX_LPCWSTR pszValue, int32_t iValueLen, FX_BOOL bImportant); - FX_BOOL ParseCounterProperty(FDE_LPCCSSPROPERTYARGS pArgs, FX_LPCWSTR pszValue, int32_t iValueLen, FX_BOOL bImportant); - FX_BOOL ParseValueListProperty(FDE_LPCCSSPROPERTYARGS pArgs, FX_LPCWSTR pszValue, int32_t iValueLen, FX_BOOL bImportant); + FX_BOOL ParseContentProperty(FDE_LPCCSSPROPERTYARGS pArgs, const FX_WCHAR* pszValue, int32_t iValueLen, FX_BOOL bImportant); + FX_BOOL ParseCounterProperty(FDE_LPCCSSPROPERTYARGS pArgs, const FX_WCHAR* pszValue, int32_t iValueLen, FX_BOOL bImportant); + FX_BOOL ParseValueListProperty(FDE_LPCCSSPROPERTYARGS pArgs, const FX_WCHAR* pszValue, int32_t iValueLen, FX_BOOL bImportant); FX_BOOL Add4ValuesProperty(IFX_MEMAllocator *pStaticStore, const CFDE_CSSValueArray &list, FX_BOOL bImportant, FDE_CSSPROPERTY eLeft, FDE_CSSPROPERTY eTop, FDE_CSSPROPERTY eRight, FDE_CSSPROPERTY eBottom); - IFDE_CSSValue* ParseNumber(FDE_LPCCSSPROPERTYARGS pArgs, FX_LPCWSTR pszValue, int32_t iValueLen); - IFDE_CSSValue* ParseEnum(FDE_LPCCSSPROPERTYARGS pArgs, FX_LPCWSTR pszValue, int32_t iValueLen); - IFDE_CSSValue* ParseColor(FDE_LPCCSSPROPERTYARGS pArgs, FX_LPCWSTR pszValue, int32_t iValueLen); - IFDE_CSSValue* ParseURI(FDE_LPCCSSPROPERTYARGS pArgs, FX_LPCWSTR pszValue, int32_t iValueLen); - IFDE_CSSValue* ParseString(FDE_LPCCSSPROPERTYARGS pArgs, FX_LPCWSTR pszValue, int32_t iValueLen); - IFDE_CSSValue* ParseFunction(FDE_LPCCSSPROPERTYARGS pArgs, FX_LPCWSTR pszValue, int32_t iValueLen); - FX_LPCWSTR CopyToLocal(FDE_LPCCSSPROPERTYARGS pArgs, FX_LPCWSTR pszValue, int32_t iValueLen); + IFDE_CSSValue* ParseNumber(FDE_LPCCSSPROPERTYARGS pArgs, const FX_WCHAR* pszValue, int32_t iValueLen); + IFDE_CSSValue* ParseEnum(FDE_LPCCSSPROPERTYARGS pArgs, const FX_WCHAR* pszValue, int32_t iValueLen); + IFDE_CSSValue* ParseColor(FDE_LPCCSSPROPERTYARGS pArgs, const FX_WCHAR* pszValue, int32_t iValueLen); + IFDE_CSSValue* ParseURI(FDE_LPCCSSPROPERTYARGS pArgs, const FX_WCHAR* pszValue, int32_t iValueLen); + IFDE_CSSValue* ParseString(FDE_LPCCSSPROPERTYARGS pArgs, const FX_WCHAR* pszValue, int32_t iValueLen); + IFDE_CSSValue* ParseFunction(FDE_LPCCSSPROPERTYARGS pArgs, const FX_WCHAR* pszValue, int32_t iValueLen); + const FX_WCHAR* CopyToLocal(FDE_LPCCSSPROPERTYARGS pArgs, const FX_WCHAR* pszValue, int32_t iValueLen); void AddPropertyHolder(IFX_MEMAllocator *pStaticStore, FDE_CSSPROPERTY eProperty, IFDE_CSSValue *pValue, FX_BOOL bImportant); IFDE_CSSPrimitiveValue* NewNumberValue(IFX_MEMAllocator *pStaticStore, FDE_CSSPRIMITIVETYPE eUnit, FX_FLOAT fValue) const; IFDE_CSSPrimitiveValue* NewEnumValue(IFX_MEMAllocator *pStaticStore, FDE_CSSPROPERTYVALUE eValue) const; diff --git a/xfa/src/fdp/src/css/fde_cssstyleselector.cpp b/xfa/src/fdp/src/css/fde_cssstyleselector.cpp index e4c8be6409..6cb024cbf8 100644 --- a/xfa/src/fdp/src/css/fde_cssstyleselector.cpp +++ b/xfa/src/fdp/src/css/fde_cssstyleselector.cpp @@ -8,7 +8,7 @@ #include "fde_csscache.h" #include "fde_cssdeclaration.h" #include "fde_cssstyleselector.h" -int32_t CFDE_CSSCounterStyle::FindIndex(FX_LPCWSTR pszIdentifier) +int32_t CFDE_CSSCounterStyle::FindIndex(const FX_WCHAR* pszIdentifier) { int32_t iCount = m_arrCounterData.GetSize(); for (int32_t i = 0; i < iCount; i++) { @@ -33,7 +33,7 @@ void CFDE_CSSCounterStyle::DoUpdateIndex(IFDE_CSSValueList *pList) for (int32_t i = 0; i < iCount; i++) { IFDE_CSSValueList *pCounter = (IFDE_CSSValueList*)pList->GetValue(i); int32_t iLen; - FX_LPCWSTR pszIdentifier = ((IFDE_CSSPrimitiveValue*)(pCounter->GetValue(0)))->GetString(iLen); + const FX_WCHAR* pszIdentifier = ((IFDE_CSSPrimitiveValue*)(pCounter->GetValue(0)))->GetString(iLen); FX_FLOAT fValue = fDefValue; if (pCounter->CountValues() > 1) { fValue = ((IFDE_CSSPrimitiveValue*)(pCounter->GetValue(1)))->GetFloat(); @@ -176,10 +176,10 @@ void CFDE_CSSRuleCollection::AddRulesFrom(IFDE_CSSStyleSheet *pStyleSheet, IFDE_ } void CFDE_CSSRuleCollection::AddRuleTo(CFX_MapPtrToPtr &map, FX_DWORD dwKey, IFDE_CSSSelector *pSel, IFDE_CSSDeclaration *pDecl) { - FX_LPVOID pKey = (FX_LPVOID)(uintptr_t)dwKey; + void* pKey = (void*)(uintptr_t)dwKey; FDE_LPCSSRULEDATA pData = NewRuleData(pSel, pDecl); FDE_LPCSSRULEDATA pList = NULL; - if (!map.Lookup(pKey, (FX_LPVOID&)pList)) { + if (!map.Lookup(pKey, (void*&)pList)) { map.SetAt(pKey, pData); } else if (AddRuleTo(pList, pData)) { map.SetAt(pKey, pList); @@ -525,7 +525,7 @@ void CFDE_CSSStyleSelector::ApplyDeclarations(FX_BOOL bPriority, const IFDE_CSSD } } } -void CFDE_CSSStyleSelector::AppendInlineStyle(CFDE_CSSDeclaration *pDecl, FX_LPCWSTR psz, int32_t iLen) +void CFDE_CSSStyleSelector::AppendInlineStyle(CFDE_CSSDeclaration *pDecl, const FX_WCHAR* psz, int32_t iLen) { FXSYS_assert(pDecl != NULL && psz != NULL && iLen > 0); IFDE_CSSSyntaxParser *pSyntax = IFDE_CSSSyntaxParser::Create(); @@ -534,7 +534,7 @@ void CFDE_CSSStyleSelector::AppendInlineStyle(CFDE_CSSDeclaration *pDecl, FX_LPC } if (pSyntax->Init(psz, iLen, 32, TRUE)) { int32_t iLen; - FX_LPCWSTR psz; + const FX_WCHAR* psz; FDE_CSSPROPERTYARGS args; args.pStringCache = NULL; args.pStaticStore = m_pInlineStyleStore; diff --git a/xfa/src/fdp/src/css/fde_cssstyleselector.h b/xfa/src/fdp/src/css/fde_cssstyleselector.h index 803522bfb4..36bf3f179d 100644 --- a/xfa/src/fdp/src/css/fde_cssstyleselector.h +++ b/xfa/src/fdp/src/css/fde_cssstyleselector.h @@ -33,18 +33,18 @@ public: } FDE_LPCSSRULEDATA GetIDRuleData(FX_DWORD dwIDHash) { - FX_LPVOID pData; - return m_IDRules.Lookup((FX_LPVOID)(uintptr_t)dwIDHash, pData) ? (FDE_LPCSSRULEDATA)pData : NULL; + void* pData; + return m_IDRules.Lookup((void*)(uintptr_t)dwIDHash, pData) ? (FDE_LPCSSRULEDATA)pData : NULL; } FDE_LPCSSRULEDATA GetTagRuleData(FX_DWORD dwTagHasn) { - FX_LPVOID pData; - return m_TagRules.Lookup((FX_LPVOID)(uintptr_t)dwTagHasn, pData) ? (FDE_LPCSSRULEDATA)pData : NULL; + void* pData; + return m_TagRules.Lookup((void*)(uintptr_t)dwTagHasn, pData) ? (FDE_LPCSSRULEDATA)pData : NULL; } FDE_LPCSSRULEDATA GetClassRuleData(FX_DWORD dwIDHash) { - FX_LPVOID pData; - return m_ClassRules.Lookup((FX_LPVOID)(uintptr_t)dwIDHash, pData) ? (FDE_LPCSSRULEDATA)pData : NULL; + void* pData; + return m_ClassRules.Lookup((void*)(uintptr_t)dwIDHash, pData) ? (FDE_LPCSSRULEDATA)pData : NULL; } FDE_LPCSSRULEDATA GetUniversalRuleData() { @@ -95,7 +95,7 @@ protected: void MatchRules(FDE_LPCSSTAGCACHE pCache, FDE_LPCSSRULEDATA pList, FDE_CSSPERSUDO ePersudoType); void SortRulesTo(CFDE_CSSDeclarationArray &matchDecls); FX_BOOL MatchSelector(FDE_LPCSSTAGCACHE pCache, IFDE_CSSSelector *pSel, FDE_CSSPERSUDO ePersudoType); - void AppendInlineStyle(CFDE_CSSDeclaration *pDecl, FX_LPCWSTR psz, int32_t iLen); + void AppendInlineStyle(CFDE_CSSDeclaration *pDecl, const FX_WCHAR* psz, int32_t iLen); void ApplyDeclarations(FX_BOOL bPriority, const IFDE_CSSDeclaration **ppDeclArray, int32_t iDeclCount, IFDE_CSSComputedStyle *pDestStyle); void ApplyProperty(FDE_CSSPROPERTY eProperty, IFDE_CSSValue *pValue, CFDE_CSSComputedStyle *pComputedStyle); @@ -161,7 +161,7 @@ public: iValue = m_iResetVal; return m_bReset; } - FX_LPCWSTR m_pszIdent; + const FX_WCHAR* m_pszIdent; FX_BOOL m_bIncrement; FX_BOOL m_bReset; int32_t m_iIncVal; @@ -196,7 +196,7 @@ public: UpdateIndex(); return m_arrCounterData.ElementAt(index).GetCounterReset(iValue); } - FX_LPCWSTR GetCounterIdentifier(int32_t index) + const FX_WCHAR* GetCounterIdentifier(int32_t index) { UpdateIndex(); return m_arrCounterData.ElementAt(index).m_pszIdent; @@ -204,7 +204,7 @@ public: protected: void UpdateIndex(); void DoUpdateIndex(IFDE_CSSValueList *pList); - int32_t FindIndex(FX_LPCWSTR pszIdentifier); + int32_t FindIndex(const FX_WCHAR* pszIdentifier); IFDE_CSSValueList *m_pCounterInc; IFDE_CSSValueList *m_pCounterReset; CFX_ArrayTemplate m_arrCounterData; @@ -227,7 +227,7 @@ public: m_bTextEmphasisColorCurrent = TRUE; m_iOrphans = 2; } - FX_LPCWSTR m_pszListStyleImage; + const FX_WCHAR* m_pszListStyleImage; FDE_CSSLENGTH m_LetterSpacing; FDE_CSSLENGTH m_WordSpacing; FDE_CSSLENGTH m_TextIndent; @@ -242,7 +242,7 @@ public: FX_WORD m_wFontWeight; int32_t m_iWidows; int32_t m_iOrphans; - FX_LPCWSTR m_pszTextEmphasisCustomMark; + const FX_WCHAR* m_pszTextEmphasisCustomMark; FX_WORD m_eFontVariant : 1; FX_WORD m_eFontStyle : 1; FX_WORD m_bTextEmphasisColorCurrent: 1; @@ -289,7 +289,7 @@ public: FDE_CSSSIZE m_MinBoxSize; FDE_CSSSIZE m_MaxBoxSize; FDE_CSSPOINT m_BKGPosition; - FX_LPCWSTR m_pszBKGImage; + const FX_WCHAR* m_pszBKGImage; FX_ARGB m_dwBKGColor; FX_ARGB m_dwBDRLeftColor; FX_ARGB m_dwBDRTopColor; @@ -449,7 +449,7 @@ public: { return (m_NonInheritedData.m_pCounterStyle == NULL) ? 0 : m_NonInheritedData.m_pCounterStyle->CountCounters(); } - virtual FX_LPCWSTR GetCounterIdentifier(int32_t index) + virtual const FX_WCHAR* GetCounterIdentifier(int32_t index) { return m_NonInheritedData.m_pCounterStyle->GetCounterIdentifier(index); } @@ -469,7 +469,7 @@ public: { return m_InheritedData.m_pQuotes == NULL ? 0 : m_InheritedData.m_pQuotes->CountValues(); } - virtual FX_LPCWSTR GetQuotes(int32_t index) const + virtual const FX_WCHAR* GetQuotes(int32_t index) const { FXSYS_assert(m_InheritedData.m_pQuotes != NULL && m_InheritedData.m_pQuotes->CountValues() > index); return ((IFDE_CSSPrimitiveValue*)(m_InheritedData.m_pQuotes->GetValue(index)))->GetString(index); @@ -526,7 +526,7 @@ public: { return m_InheritedData.m_pFontFamily ? m_InheritedData.m_pFontFamily->CountValues() : 0; } - virtual FX_LPCWSTR GetFontFamily(int32_t index) const + virtual const FX_WCHAR* GetFontFamily(int32_t index) const { return ((IFDE_CSSPrimitiveValue*)(m_InheritedData.m_pFontFamily->GetValue(index)))->GetString(index); } @@ -815,7 +815,7 @@ public: { return (FDE_CSSTEXTEMPHASISFILL)m_InheritedData.m_eTextEmphasisFill; } - virtual FX_LPCWSTR GetTextEmphasisCustom() const + virtual const FX_WCHAR* GetTextEmphasisCustom() const { FXSYS_assert(m_InheritedData.m_eTextEmphasisMark == FDE_CSSTEXTEMPHASISMARK_Custom); return m_InheritedData.m_pszTextEmphasisCustomMark; @@ -913,7 +913,7 @@ public: { return m_NonInheritedData.m_dwBKGColor; } - virtual FX_LPCWSTR GetBKGImage() const + virtual const FX_WCHAR* GetBKGImage() const { return m_NonInheritedData.m_pszBKGImage; } @@ -953,7 +953,7 @@ public: { return m_InheritedData.m_pCursorUris == NULL ? 0 : m_InheritedData.m_pCursorUris->CountValues(); } - virtual FX_LPCWSTR GetCursorUrl(int32_t index) const + virtual const FX_WCHAR* GetCursorUrl(int32_t index) const { FXSYS_assert(m_InheritedData.m_pCursorUris != NULL); return ((IFDE_CSSPrimitiveValue*)(m_InheritedData.m_pCursorUris->GetValue(index)))->GetString(index); @@ -974,7 +974,7 @@ public: { return (FDE_CSSLISTSTYLEPOSITION)m_NonInheritedData.m_eListStylePosition; } - virtual FX_LPCWSTR GetListStyleImage() const + virtual const FX_WCHAR* GetListStyleImage() const { return m_InheritedData.m_pszListStyleImage; } diff --git a/xfa/src/fdp/src/css/fde_cssstylesheet.cpp b/xfa/src/fdp/src/css/fde_cssstylesheet.cpp index 006995a754..dd692ec718 100644 --- a/xfa/src/fdp/src/css/fde_cssstylesheet.cpp +++ b/xfa/src/fdp/src/css/fde_cssstylesheet.cpp @@ -10,7 +10,7 @@ #include "fde_cssstylesheet.h" IFDE_CSSStyleSheet* IFDE_CSSStyleSheet::LoadHTMLStandardStyleSheet() { - static const FX_LPCWSTR s_pStyle = L"html,address,blockquote,body,dd,div,dl,dt,fieldset,form,frame,frameset,h1,h2,h3,h4,h5,h6,noframes,ol,p,ul,center,dir,hr,menu,pre{display:block}" + static const FX_WCHAR* s_pStyle = L"html,address,blockquote,body,dd,div,dl,dt,fieldset,form,frame,frameset,h1,h2,h3,h4,h5,h6,noframes,ol,p,ul,center,dir,hr,menu,pre{display:block}" L"li{display:list-item}head{display:none}table{display:table}tr{display:table-row}thead{display:table-header-group}tbody{display:table-row-group}tfoot{display:table-footer-group}" L"col{display:table-column}colgroup{display:table-column-group}td,th{display:table-cell}caption{display:table-caption}th{font-weight:bolder;text-align:center}caption{text-align:center}" L"body{margin:0}h1{font-size:2em;margin:.67em 0}h2{font-size:1.5em;margin:.75em 0}h3{font-size:1.17em;margin:.83em 0}h4,p,blockquote,ul,fieldset,form,ol,dl,dir,menu{margin:1.12em 0}" @@ -35,7 +35,7 @@ IFDE_CSSStyleSheet* IFDE_CSSStyleSheet::LoadFromStream(const CFX_WideString &szU } return pStyleSheet; } -IFDE_CSSStyleSheet* IFDE_CSSStyleSheet::LoadFromBuffer(const CFX_WideString &szUrl, FX_LPCWSTR pBuffer, int32_t iBufSize, FX_WORD wCodePage, FX_DWORD dwMediaList ) +IFDE_CSSStyleSheet* IFDE_CSSStyleSheet::LoadFromBuffer(const CFX_WideString &szUrl, const FX_WCHAR* pBuffer, int32_t iBufSize, FX_WORD wCodePage, FX_DWORD dwMediaList ) { CFDE_CSSStyleSheet *pStyleSheet = FDE_New CFDE_CSSStyleSheet(dwMediaList); if (pStyleSheet == NULL) { @@ -122,7 +122,7 @@ FX_BOOL CFDE_CSSStyleSheet::LoadFromStream(const CFX_WideString &szUrl, IFX_Stre m_szUrl = szUrl; return bRet; } -FX_BOOL CFDE_CSSStyleSheet::LoadFromBuffer(const CFX_WideString &szUrl, FX_LPCWSTR pBuffer, int32_t iBufSize, FX_WORD wCodePage) +FX_BOOL CFDE_CSSStyleSheet::LoadFromBuffer(const CFX_WideString &szUrl, const FX_WCHAR* pBuffer, int32_t iBufSize, FX_WORD wCodePage) { FXSYS_assert(pBuffer != NULL && iBufSize > 0); IFDE_CSSSyntaxParser *pSyntax = IFDE_CSSSyntaxParser::Create(); @@ -176,7 +176,7 @@ FDE_CSSSYNTAXSTATUS CFDE_CSSStyleSheet::LoadMediaRule(IFDE_CSSSyntaxParser *pSyn switch (pSyntax->DoSyntaxParse()) { case FDE_CSSSYNTAXSTATUS_MediaType: { int32_t iLen; - FX_LPCWSTR psz = pSyntax->GetCurrentString(iLen); + const FX_WCHAR* psz = pSyntax->GetCurrentString(iLen); FDE_LPCCSSMEDIATYPETABLE pMediaType = FDE_GetCSSMediaTypeByName(psz, iLen); if (pMediaType != NULL) { dwMediaList |= pMediaType->wValue; @@ -209,7 +209,7 @@ FDE_CSSSYNTAXSTATUS CFDE_CSSStyleSheet::LoadStyleRule(IFDE_CSSSyntaxParser *pSyn { m_Selectors.RemoveAt(0, m_Selectors.GetSize()); CFDE_CSSStyleRule *pStyleRule = NULL; - FX_LPCWSTR pszValue = NULL; + const FX_WCHAR* pszValue = NULL; int32_t iValueLen = 0; FDE_CSSPROPERTYARGS propertyArgs; propertyArgs.pStaticStore = m_pAllocator; @@ -269,7 +269,7 @@ FDE_CSSSYNTAXSTATUS CFDE_CSSStyleSheet::LoadStyleRule(IFDE_CSSSyntaxParser *pSyn FDE_CSSSYNTAXSTATUS CFDE_CSSStyleSheet::LoadFontFaceRule(IFDE_CSSSyntaxParser *pSyntax, CFDE_CSSRuleArray &ruleArray) { CFDE_CSSFontFaceRule *pFontFaceRule = NULL; - FX_LPCWSTR pszValue = NULL; + const FX_WCHAR* pszValue = NULL; int32_t iValueLen = 0; FDE_CSSPROPERTYARGS propertyArgs; propertyArgs.pStaticStore = m_pAllocator; @@ -361,10 +361,10 @@ inline FX_BOOL FDE_IsCSSChar(FX_WCHAR wch) { return (wch >= 'a' && wch <= 'z') || (wch >= 'A' && wch <= 'Z'); } -int32_t FDE_GetCSSPersudoLen(FX_LPCWSTR psz, FX_LPCWSTR pEnd) +int32_t FDE_GetCSSPersudoLen(const FX_WCHAR* psz, const FX_WCHAR* pEnd) { FXSYS_assert(*psz == ':'); - FX_LPCWSTR pStart = psz; + const FX_WCHAR* pStart = psz; while (psz < pEnd) { FX_WCHAR wch = *psz; if (FDE_IsCSSChar(wch) || wch == ':') { @@ -375,9 +375,9 @@ int32_t FDE_GetCSSPersudoLen(FX_LPCWSTR psz, FX_LPCWSTR pEnd) } return psz - pStart; } -int32_t FDE_GetCSSNameLen(FX_LPCWSTR psz, FX_LPCWSTR pEnd) +int32_t FDE_GetCSSNameLen(const FX_WCHAR* psz, const FX_WCHAR* pEnd) { - FX_LPCWSTR pStart = psz; + const FX_WCHAR* pStart = psz; while (psz < pEnd) { FX_WCHAR wch = *psz; if (FDE_IsCSSChar(wch) @@ -390,11 +390,11 @@ int32_t FDE_GetCSSNameLen(FX_LPCWSTR psz, FX_LPCWSTR pEnd) } return psz - pStart; } -IFDE_CSSSelector* CFDE_CSSSelector::FromString(IFX_MEMAllocator *pStaticStore, FX_LPCWSTR psz, int32_t iLen) +IFDE_CSSSelector* CFDE_CSSSelector::FromString(IFX_MEMAllocator *pStaticStore, const FX_WCHAR* psz, int32_t iLen) { FXSYS_assert(pStaticStore != NULL && psz != NULL && iLen > 0); - FX_LPCWSTR pStart = psz; - FX_LPCWSTR pEnd = psz + iLen; + const FX_WCHAR* pStart = psz; + const FX_WCHAR* pEnd = psz + iLen; for (; psz < pEnd; ++psz) { switch (*psz) { case '>': diff --git a/xfa/src/fdp/src/css/fde_cssstylesheet.h b/xfa/src/fdp/src/css/fde_cssstylesheet.h index fea4176171..435998f017 100644 --- a/xfa/src/fdp/src/css/fde_cssstylesheet.h +++ b/xfa/src/fdp/src/css/fde_cssstylesheet.h @@ -10,7 +10,7 @@ class CFDE_CSSSelector : public IFDE_CSSSelector, public CFX_Target { public: - CFDE_CSSSelector(FDE_CSSSELECTORTYPE eType, FX_LPCWSTR psz, int32_t iLen, FX_BOOL bIgnoreCase) + CFDE_CSSSelector(FDE_CSSSELECTORTYPE eType, const FX_WCHAR* psz, int32_t iLen, FX_BOOL bIgnoreCase) : m_eType(eType), m_dwHash(FX_HashCode_String_GetW(psz, iLen, bIgnoreCase)), m_pNext(NULL) { } @@ -28,13 +28,13 @@ public: { return m_pNext; } - static IFDE_CSSSelector* FromString(IFX_MEMAllocator *pStaticStore, FX_LPCWSTR psz, int32_t iLen); + static IFDE_CSSSelector* FromString(IFX_MEMAllocator *pStaticStore, const FX_WCHAR* psz, int32_t iLen); void SetNext(IFDE_CSSSelector *pNext) { m_pNext = pNext; } protected: - static CFDE_CSSSelector* ParseSelector(IFX_MEMAllocator *pStaticStore, FX_LPCWSTR psz, int32_t &iOff, int32_t iLen, FDE_CSSSELECTORTYPE eType); + static CFDE_CSSSelector* ParseSelector(IFX_MEMAllocator *pStaticStore, const FX_WCHAR* psz, int32_t &iOff, int32_t iLen, FDE_CSSSELECTORTYPE eType); void SetType(FDE_CSSSELECTORTYPE eType) { m_eType = eType; @@ -141,7 +141,7 @@ public: virtual int32_t CountRules() const; virtual IFDE_CSSRule* GetRule(int32_t index); FX_BOOL LoadFromStream(const CFX_WideString &szUrl, IFX_Stream *pStream, FX_WORD wCodePage); - FX_BOOL LoadFromBuffer(const CFX_WideString &szUrl, FX_LPCWSTR pBuffer, int32_t iBufSize, FX_WORD wCodePage); + FX_BOOL LoadFromBuffer(const CFX_WideString &szUrl, const FX_WCHAR* pBuffer, int32_t iBufSize, FX_WORD wCodePage); protected: void Reset(); FX_BOOL LoadFromSyntax(IFDE_CSSSyntaxParser *pSyntax); diff --git a/xfa/src/fdp/src/css/fde_csssyntax.cpp b/xfa/src/fdp/src/css/fde_csssyntax.cpp index f1cb877b32..058c7c0a3c 100644 --- a/xfa/src/fdp/src/css/fde_csssyntax.cpp +++ b/xfa/src/fdp/src/css/fde_csssyntax.cpp @@ -51,7 +51,7 @@ FX_BOOL CFDE_CSSSyntaxParser::Init(IFX_Stream *pStream, int32_t iCSSPlaneSize, i m_iPlaneSize = iCSSPlaneSize; return TRUE; } -FX_BOOL CFDE_CSSSyntaxParser::Init(FX_LPCWSTR pBuffer, int32_t iBufferSize, int32_t iTextDatSize , FX_BOOL bOnlyDeclaration ) +FX_BOOL CFDE_CSSSyntaxParser::Init(const FX_WCHAR* pBuffer, int32_t iBufferSize, int32_t iTextDatSize , FX_BOOL bOnlyDeclaration ) { FXSYS_assert(pBuffer != NULL && iBufferSize > 0 && iTextDatSize > 0); Reset(bOnlyDeclaration); @@ -299,7 +299,7 @@ FDE_CSSSYNTAXSTATUS CFDE_CSSSyntaxParser::DoSyntaxParse() AppendChar(wch); } else { int32_t iLen = m_TextData.GetLength(); - FX_LPCWSTR psz = m_TextData.GetBuffer(); + const FX_WCHAR* psz = m_TextData.GetBuffer(); if (FXSYS_wcsncmp(L"charset", psz, iLen) == 0) { SwitchMode(FDE_CSSSYNTAXMODE_Charset); } else if (FXSYS_wcsncmp(L"import", psz, iLen) == 0) { @@ -406,7 +406,7 @@ inline FX_BOOL CFDE_CSSSyntaxParser::RestoreMode() m_ModeStack.Pop(); return TRUE; } -FX_LPCWSTR CFDE_CSSSyntaxParser::GetCurrentString(int32_t &iLength) const +const FX_WCHAR* CFDE_CSSSyntaxParser::GetCurrentString(int32_t &iLength) const { iLength = m_iTextDatLen; return m_TextData.GetBuffer(); @@ -431,10 +431,10 @@ void CFDE_CSSTextBuf::Reset() } m_iDatPos = m_iDatLen = m_iBufLen; } -FX_BOOL CFDE_CSSTextBuf::AttachBuffer(FX_LPCWSTR pBuffer, int32_t iBufLen) +FX_BOOL CFDE_CSSTextBuf::AttachBuffer(const FX_WCHAR* pBuffer, int32_t iBufLen) { Reset(); - m_pBuffer = (FX_LPWSTR)pBuffer; + m_pBuffer = (FX_WCHAR*)pBuffer; m_iDatLen = m_iBufLen = iBufLen; return m_bExtBuf = TRUE; } @@ -466,9 +466,9 @@ FX_BOOL CFDE_CSSTextBuf::ExpandBuf(int32_t iDesiredSize) if (m_bExtBuf) { return FALSE; } else if (m_pBuffer == NULL) { - m_pBuffer = (FX_LPWSTR)FDE_Alloc(iDesiredSize * sizeof(FX_WCHAR)); + m_pBuffer = (FX_WCHAR*)FDE_Alloc(iDesiredSize * sizeof(FX_WCHAR)); } else if (m_iBufLen != iDesiredSize) { - m_pBuffer = (FX_LPWSTR)FDE_Realloc(m_pBuffer, iDesiredSize * sizeof(FX_WCHAR)); + m_pBuffer = (FX_WCHAR*)FDE_Realloc(m_pBuffer, iDesiredSize * sizeof(FX_WCHAR)); } else { return TRUE; } diff --git a/xfa/src/fdp/src/css/fde_csssyntax.h b/xfa/src/fdp/src/css/fde_csssyntax.h index 4ab132d2c8..6071b76910 100644 --- a/xfa/src/fdp/src/css/fde_csssyntax.h +++ b/xfa/src/fdp/src/css/fde_csssyntax.h @@ -11,7 +11,7 @@ class CFDE_CSSTextBuf : public CFX_Target public: CFDE_CSSTextBuf(); ~CFDE_CSSTextBuf(); - FX_BOOL AttachBuffer(FX_LPCWSTR pBuffer, int32_t iBufLen); + FX_BOOL AttachBuffer(const FX_WCHAR* pBuffer, int32_t iBufLen); FX_BOOL EstimateSize(int32_t iAllocSize); int32_t LoadFromStream(IFX_Stream *pTxtStream, int32_t iStreamOffset, int32_t iMaxChars, FX_BOOL &bEOS); FX_BOOL AppendChar(FX_WCHAR wch) @@ -59,14 +59,14 @@ public: { return m_iDatLen; } - FX_LPCWSTR GetBuffer() const + const FX_WCHAR* GetBuffer() const { return m_pBuffer; } protected: FX_BOOL ExpandBuf(int32_t iDesiredSize); FX_BOOL m_bExtBuf; - FX_LPWSTR m_pBuffer; + FX_WCHAR* m_pBuffer; int32_t m_iBufLen; int32_t m_iDatLen; int32_t m_iDatPos; @@ -97,9 +97,9 @@ public: FDE_Delete this; } virtual FX_BOOL Init(IFX_Stream *pStream, int32_t iCSSPlaneSize, int32_t iTextDataSize = 32, FX_BOOL bOnlyDeclaration = FALSE); - virtual FX_BOOL Init(FX_LPCWSTR pBuffer, int32_t iBufferSize, int32_t iTextDatSize = 32, FX_BOOL bOnlyDeclaration = FALSE); + virtual FX_BOOL Init(const FX_WCHAR* pBuffer, int32_t iBufferSize, int32_t iTextDatSize = 32, FX_BOOL bOnlyDeclaration = FALSE); virtual FDE_CSSSYNTAXSTATUS DoSyntaxParse(); - virtual FX_LPCWSTR GetCurrentString(int32_t &iLength) const; + virtual const FX_WCHAR* GetCurrentString(int32_t &iLength) const; protected: void Reset(FX_BOOL bOnlyDeclaration); void SwitchMode(FDE_CSSSYNTAXMODE eMode); diff --git a/xfa/src/fdp/src/fde/fde_gdidevice.h b/xfa/src/fdp/src/fde/fde_gdidevice.h index 86f7bac176..f7336c9b0a 100644 --- a/xfa/src/fdp/src/fde/fde_gdidevice.h +++ b/xfa/src/fdp/src/fde/fde_gdidevice.h @@ -66,7 +66,7 @@ protected: Gdiplus::GraphicsState m_GraphicsState; Gdiplus::Graphics *m_pGraphics; Gdiplus::Bitmap *m_pBitmap; - FX_LPBYTE m_pGlyphBuf; + uint8_t* m_pGlyphBuf; FX_DWORD m_dwGlyphLen; CFX_RectF m_rtClipRect; CFDE_GdiPath *m_pClipPath; diff --git a/xfa/src/fdp/src/fde/fde_gedevice.cpp b/xfa/src/fdp/src/fde/fde_gedevice.cpp index 1ecbb1434b..9e475cdb67 100644 --- a/xfa/src/fdp/src/fde/fde_gedevice.cpp +++ b/xfa/src/fdp/src/fde/fde_gedevice.cpp @@ -134,7 +134,7 @@ FX_BOOL CFDE_FxgeDevice::DrawImage(CFX_DIBSource *pDib, const CFX_RectF *pSrcRec if (pDevMatrix) { dib2fxdev.Concat(*pDevMatrix); } - FX_LPVOID handle = NULL; + void* handle = NULL; m_pDevice->StartDIBits(pDib, 255, 0, (const CFX_AffineMatrix*)&dib2fxdev, 0, handle); while (m_pDevice->ContinueDIBits(handle, NULL)) { } m_pDevice->CancelDIBits(handle); diff --git a/xfa/src/fdp/src/tto/fde_textout.cpp b/xfa/src/fdp/src/tto/fde_textout.cpp index fa45b3e4d0..7b7ea1c63b 100644 --- a/xfa/src/fdp/src/tto/fde_textout.cpp +++ b/xfa/src/fdp/src/tto/fde_textout.cpp @@ -182,7 +182,7 @@ int32_t CFDE_TextOut::GetTotalLines() { return m_iTotalLines; } -void CFDE_TextOut::CalcSize(FX_LPCWSTR pwsStr, int32_t iLength, CFX_Size &size) +void CFDE_TextOut::CalcSize(const FX_WCHAR* pwsStr, int32_t iLength, CFX_Size &size) { CFX_RectF rtText; rtText.Set(0.0f, 0.0f, (FX_FLOAT)size.x, (FX_FLOAT)size.y); @@ -190,7 +190,7 @@ void CFDE_TextOut::CalcSize(FX_LPCWSTR pwsStr, int32_t iLength, CFX_Size &size) size.x = (int32_t)rtText.Width(); size.y = (int32_t)rtText.Height(); } -void CFDE_TextOut::CalcSize(FX_LPCWSTR pwsStr, int32_t iLength, CFX_SizeF &size) +void CFDE_TextOut::CalcSize(const FX_WCHAR* pwsStr, int32_t iLength, CFX_SizeF &size) { CFX_RectF rtText; rtText.Set(0.0f, 0.0f, size.x, size.y); @@ -198,14 +198,14 @@ void CFDE_TextOut::CalcSize(FX_LPCWSTR pwsStr, int32_t iLength, CFX_SizeF &size) size.x = rtText.Width(); size.y = rtText.Height(); } -void CFDE_TextOut::CalcSize(FX_LPCWSTR pwsStr, int32_t iLength, CFX_Rect &rect) +void CFDE_TextOut::CalcSize(const FX_WCHAR* pwsStr, int32_t iLength, CFX_Rect &rect) { CFX_RectF rtText; rtText.Set((FX_FLOAT)rect.left, (FX_FLOAT)rect.top, (FX_FLOAT)rect.Width(), (FX_FLOAT)rect.Height()); CalcSize(pwsStr, iLength, rtText); rect.Set((int32_t)rtText.left, (int32_t)rtText.top, (int32_t)rtText.Width(), (int32_t)rtText.Height()); } -void CFDE_TextOut::CalcSize(FX_LPCWSTR pwsStr, int32_t iLength, CFX_RectF &rect) +void CFDE_TextOut::CalcSize(const FX_WCHAR* pwsStr, int32_t iLength, CFX_RectF &rect) { if (pwsStr == NULL || iLength < 1) { rect.width = 0.0f; @@ -218,7 +218,7 @@ void CFDE_TextOut::CalcSize(FX_LPCWSTR pwsStr, int32_t iLength, CFX_RectF &rect) m_Matrix.TransformRect(rect); } } -void CFDE_TextOut::CalcLogicSize(FX_LPCWSTR pwsStr, int32_t iLength, CFX_SizeF &size) +void CFDE_TextOut::CalcLogicSize(const FX_WCHAR* pwsStr, int32_t iLength, CFX_SizeF &size) { CFX_RectF rtText; rtText.Set(0.0f, 0.0f, size.x, size.y); @@ -226,7 +226,7 @@ void CFDE_TextOut::CalcLogicSize(FX_LPCWSTR pwsStr, int32_t iLength, CFX_SizeF & size.x = rtText.Width(); size.y = rtText.Height(); } -void CFDE_TextOut::CalcLogicSize(FX_LPCWSTR pwsStr, int32_t iLength, CFX_RectF &rect) +void CFDE_TextOut::CalcLogicSize(const FX_WCHAR* pwsStr, int32_t iLength, CFX_RectF &rect) { if (pwsStr == NULL || iLength < 1) { rect.width = 0.0f; @@ -235,12 +235,12 @@ void CFDE_TextOut::CalcLogicSize(FX_LPCWSTR pwsStr, int32_t iLength, CFX_RectF & CalcTextSize(pwsStr, iLength, rect); } } -void CFDE_TextOut::CalcTextSize(FX_LPCWSTR pwsStr, int32_t iLength, CFX_RectF &rect) +void CFDE_TextOut::CalcTextSize(const FX_WCHAR* pwsStr, int32_t iLength, CFX_RectF &rect) { FXSYS_assert(m_pFont != NULL && m_fFontSize >= 1.0f); SetLineWidth(rect); m_iTotalLines = 0; - FX_LPCWSTR pStr = pwsStr; + const FX_WCHAR* pStr = pwsStr; FX_BOOL bHotKey = (m_dwStyles & FDE_TTOSTYLE_HotKey) ? TRUE : FALSE; FX_BOOL bVertical = (m_dwStyles & FDE_TTOSTYLE_VerticalLayout) ? TRUE : FALSE; FX_FLOAT fWidth = 0.0f; @@ -340,25 +340,25 @@ FX_BOOL CFDE_TextOut::RetrieveLineWidth(FX_DWORD dwBreakStatus, FX_FLOAT &fStart m_iTotalLines++; return TRUE; } -void CFDE_TextOut::DrawText(FX_LPCWSTR pwsStr, int32_t iLength, int32_t x, int32_t y) +void CFDE_TextOut::DrawText(const FX_WCHAR* pwsStr, int32_t iLength, int32_t x, int32_t y) { CFX_RectF rtText; rtText.Set((FX_FLOAT)x, (FX_FLOAT)y, m_fFontSize * 1000.0f, m_fFontSize * 1000.0f); DrawText(pwsStr, iLength, rtText); } -void CFDE_TextOut::DrawText(FX_LPCWSTR pwsStr, int32_t iLength, FX_FLOAT x, FX_FLOAT y) +void CFDE_TextOut::DrawText(const FX_WCHAR* pwsStr, int32_t iLength, FX_FLOAT x, FX_FLOAT y) { CFX_RectF rtText; rtText.Set(x, y, m_fFontSize * 1000.0f, m_fFontSize * 1000.0f); DrawText(pwsStr, iLength, rtText); } -void CFDE_TextOut::DrawText(FX_LPCWSTR pwsStr, int32_t iLength, const CFX_Rect &rect) +void CFDE_TextOut::DrawText(const FX_WCHAR* pwsStr, int32_t iLength, const CFX_Rect &rect) { CFX_RectF rtText; rtText.Set((FX_FLOAT)rect.left, (FX_FLOAT)rect.top, (FX_FLOAT)rect.width, (FX_FLOAT)rect.height); DrawText(pwsStr, iLength, rtText); } -void CFDE_TextOut::DrawText(FX_LPCWSTR pwsStr, int32_t iLength, const CFX_RectF &rect) +void CFDE_TextOut::DrawText(const FX_WCHAR* pwsStr, int32_t iLength, const CFX_RectF &rect) { CFX_RectF rtText; rtText.Set(rect.left, rect.top, rect.width, rect.height); @@ -367,20 +367,20 @@ void CFDE_TextOut::DrawText(FX_LPCWSTR pwsStr, int32_t iLength, const CFX_RectF rm.TransformRect(rtText); DrawText(pwsStr, iLength, rtText, m_rtClip); } -void CFDE_TextOut::DrawLogicText(FX_LPCWSTR pwsStr, int32_t iLength, FX_FLOAT x, FX_FLOAT y) +void CFDE_TextOut::DrawLogicText(const FX_WCHAR* pwsStr, int32_t iLength, FX_FLOAT x, FX_FLOAT y) { CFX_RectF rtText; rtText.Set(x, y, m_fFontSize * 1000.0f, m_fFontSize * 1000.0f); DrawLogicText(pwsStr, iLength, rtText); } -void CFDE_TextOut::DrawLogicText(FX_LPCWSTR pwsStr, int32_t iLength, const CFX_RectF &rect) +void CFDE_TextOut::DrawLogicText(const FX_WCHAR* pwsStr, int32_t iLength, const CFX_RectF &rect) { CFX_RectF rtClip; rtClip.Set(m_rtLogicClip.left, m_rtLogicClip.top, m_rtLogicClip.width, m_rtLogicClip.height); m_Matrix.TransformRect(rtClip); DrawText(pwsStr, iLength, rect, rtClip); } -void CFDE_TextOut::DrawText(FX_LPCWSTR pwsStr, int32_t iLength, const CFX_RectF &rect, const CFX_RectF &rtClip) +void CFDE_TextOut::DrawText(const FX_WCHAR* pwsStr, int32_t iLength, const CFX_RectF &rect, const CFX_RectF &rtClip) { FXSYS_assert(m_pFont != NULL && m_fFontSize >= 1.0f); if (pwsStr == NULL || iLength < 1) { @@ -450,7 +450,7 @@ void CFDE_TextOut::LoadEllipsis() return; } ExpandBuffer(iLength, 1); - FX_LPCWSTR pStr = (FX_LPCWSTR)m_wsEllipsis; + const FX_WCHAR* pStr = (const FX_WCHAR*)m_wsEllipsis; int32_t *pCharWidths = m_pEllCharWidths; FX_DWORD dwBreakStatus; FX_WCHAR wch; @@ -487,9 +487,9 @@ void CFDE_TextOut::RetrieveEllPieces(int32_t *&pCharWidths) } m_pTxtBreak->ClearBreakPieces(); } -void CFDE_TextOut::LoadText(FX_LPCWSTR pwsStr, int32_t iLength, const CFX_RectF &rect) +void CFDE_TextOut::LoadText(const FX_WCHAR* pwsStr, int32_t iLength, const CFX_RectF &rect) { - FX_LPWSTR pStr = m_wsText.GetBuffer(iLength); + FX_WCHAR* pStr = m_wsText.GetBuffer(iLength); int32_t iTxtLength = iLength; ExpandBuffer(iTxtLength, 0); FX_BOOL bHotKey = (m_dwStyles & FDE_TTOSTYLE_HotKey) ? TRUE : FALSE; @@ -693,7 +693,7 @@ void CFDE_TextOut::Reload(const CFX_RectF &rect) } void CFDE_TextOut::ReloadLinePiece(CFDE_TTOLine *pLine, const CFX_RectF &rect) { - FX_LPCWSTR pwsStr = (FX_LPCWSTR)m_wsText; + const FX_WCHAR* pwsStr = (const FX_WCHAR*)m_wsText; FX_BOOL bVertical = (m_dwStyles & FDE_TTOSTYLE_VerticalLayout) ? TRUE : FALSE; int32_t iPieceWidths = 0; FDE_LPTTOPIECE pPiece = pLine->GetPtrAt(0); @@ -816,7 +816,7 @@ void CFDE_TextOut::ToTextRun(const FDE_LPTTOPIECE pPiece, FX_TXTRUN &tr) { tr.pAccess = NULL; tr.pIdentity = NULL; - tr.pStr = (FX_LPCWSTR)m_wsText + pPiece->iStartChar; + tr.pStr = (const FX_WCHAR*)m_wsText + pPiece->iStartChar; tr.pWidths = m_pCharWidths + pPiece->iStartChar; tr.iLength = pPiece->iChars; tr.pFont = m_pFont; diff --git a/xfa/src/fdp/src/tto/fde_textout.h b/xfa/src/fdp/src/tto/fde_textout.h index 38bc8ebcec..c7a46e3d73 100644 --- a/xfa/src/fdp/src/tto/fde_textout.h +++ b/xfa/src/fdp/src/tto/fde_textout.h @@ -56,28 +56,28 @@ public: virtual void SetClipRect(const CFX_RectF &rtClip); virtual void SetMatrix(const CFX_Matrix &matrix); virtual void SetLineBreakTolerance(FX_FLOAT fTolerance); - virtual void CalcSize(FX_LPCWSTR pwsStr, int32_t iLength, CFX_Size &size); - virtual void CalcSize(FX_LPCWSTR pwsStr, int32_t iLength, CFX_SizeF &size); - virtual void CalcSize(FX_LPCWSTR pwsStr, int32_t iLength, CFX_Rect &rect); - virtual void CalcSize(FX_LPCWSTR pwsStr, int32_t iLength, CFX_RectF &rect); + virtual void CalcSize(const FX_WCHAR* pwsStr, int32_t iLength, CFX_Size &size); + virtual void CalcSize(const FX_WCHAR* pwsStr, int32_t iLength, CFX_SizeF &size); + virtual void CalcSize(const FX_WCHAR* pwsStr, int32_t iLength, CFX_Rect &rect); + virtual void CalcSize(const FX_WCHAR* pwsStr, int32_t iLength, CFX_RectF &rect); - virtual void DrawText(FX_LPCWSTR pwsStr, int32_t iLength, int32_t x, int32_t y); - virtual void DrawText(FX_LPCWSTR pwsStr, int32_t iLength, FX_FLOAT x, FX_FLOAT y); - virtual void DrawText(FX_LPCWSTR pwsStr, int32_t iLength, const CFX_Rect &rect); - virtual void DrawText(FX_LPCWSTR pwsStr, int32_t iLength, const CFX_RectF &rect); + virtual void DrawText(const FX_WCHAR* pwsStr, int32_t iLength, int32_t x, int32_t y); + virtual void DrawText(const FX_WCHAR* pwsStr, int32_t iLength, FX_FLOAT x, FX_FLOAT y); + virtual void DrawText(const FX_WCHAR* pwsStr, int32_t iLength, const CFX_Rect &rect); + virtual void DrawText(const FX_WCHAR* pwsStr, int32_t iLength, const CFX_RectF &rect); virtual void SetLogicClipRect(const CFX_RectF &rtClip); - virtual void CalcLogicSize(FX_LPCWSTR pwsStr, int32_t iLength, CFX_SizeF &size); - virtual void CalcLogicSize(FX_LPCWSTR pwsStr, int32_t iLength, CFX_RectF &rect); - virtual void DrawLogicText(FX_LPCWSTR pwsStr, int32_t iLength, FX_FLOAT x, FX_FLOAT y); - virtual void DrawLogicText(FX_LPCWSTR pwsStr, int32_t iLength, const CFX_RectF &rect); + virtual void CalcLogicSize(const FX_WCHAR* pwsStr, int32_t iLength, CFX_SizeF &size); + virtual void CalcLogicSize(const FX_WCHAR* pwsStr, int32_t iLength, CFX_RectF &rect); + virtual void DrawLogicText(const FX_WCHAR* pwsStr, int32_t iLength, FX_FLOAT x, FX_FLOAT y); + virtual void DrawLogicText(const FX_WCHAR* pwsStr, int32_t iLength, const CFX_RectF &rect); virtual int32_t GetTotalLines(); protected: - void CalcTextSize(FX_LPCWSTR pwsStr, int32_t iLength, CFX_RectF &rect); + void CalcTextSize(const FX_WCHAR* pwsStr, int32_t iLength, CFX_RectF &rect); FX_BOOL RetrieveLineWidth(FX_DWORD dwBreakStatus, FX_FLOAT &fStartPos, FX_FLOAT &fWidth, FX_FLOAT &fHeight); void SetLineWidth(CFX_RectF &rect); - void DrawText(FX_LPCWSTR pwsStr, int32_t iLength, const CFX_RectF &rect, const CFX_RectF &rtClip); - void LoadText(FX_LPCWSTR pwsStr, int32_t iLength, const CFX_RectF &rect); + void DrawText(const FX_WCHAR* pwsStr, int32_t iLength, const CFX_RectF &rect, const CFX_RectF &rtClip); + void LoadText(const FX_WCHAR* pwsStr, int32_t iLength, const CFX_RectF &rect); void LoadEllipsis(); void ExpandBuffer(int32_t iSize, int32_t iType); void RetrieveEllPieces(int32_t *&pCharWidths); diff --git a/xfa/src/fdp/src/xml/fde_xml.cpp b/xfa/src/fdp/src/xml/fde_xml.cpp index ab7906b1bc..989969633b 100644 --- a/xfa/src/fdp/src/xml/fde_xml.cpp +++ b/xfa/src/fdp/src/xml/fde_xml.cpp @@ -120,7 +120,7 @@ int32_t CFDE_XMLNode::GetChildNodeIndex(CFDE_XMLNode *pNode) const } return -1; } -CFDE_XMLNode* CFDE_XMLNode::GetPath(FX_LPCWSTR pPath, int32_t iLength, FX_BOOL bQualifiedName) const +CFDE_XMLNode* CFDE_XMLNode::GetPath(const FX_WCHAR* pPath, int32_t iLength, FX_BOOL bQualifiedName) const { FXSYS_assert(pPath != NULL); if (iLength < 0) { @@ -130,7 +130,8 @@ CFDE_XMLNode* CFDE_XMLNode::GetPath(FX_LPCWSTR pPath, int32_t iLength, FX_BOOL b return NULL; } CFX_WideString csPath; - FX_LPCWSTR pStart = pPath, pEnd = pPath + iLength; + const FX_WCHAR* pStart = pPath; + const FX_WCHAR* pEnd = pPath + iLength; FX_WCHAR ch; while (pStart < pEnd) { ch = *pStart ++; @@ -406,7 +407,7 @@ void CFDE_XMLNode::SaveXMLNode(IFX_Stream *pXMLStream) ws += L"\"?>"; pXMLStream->WriteString(ws, ws.GetLength()); } else { - ws.Format(L"m_wsTarget); + ws.Format(L"m_wsTarget); pXMLStream->WriteString(ws, ws.GetLength()); CFX_WideStringArray &attributes = pInstruction->m_Attributes; int32_t i, iCount = attributes.GetSize(); @@ -560,7 +561,7 @@ FX_BOOL CFDE_XMLInstruction::GetAttribute(int32_t index, CFX_WideString &wsAttri } return FALSE; } -FX_BOOL CFDE_XMLInstruction::HasAttribute(FX_LPCWSTR pwsAttriName) const +FX_BOOL CFDE_XMLInstruction::HasAttribute(const FX_WCHAR* pwsAttriName) const { int32_t iCount = m_Attributes.GetSize(); for (int32_t i = 0; i < iCount; i += 2) { @@ -570,7 +571,7 @@ FX_BOOL CFDE_XMLInstruction::HasAttribute(FX_LPCWSTR pwsAttriName) const } return FALSE; } -void CFDE_XMLInstruction::GetString(FX_LPCWSTR pwsAttriName, CFX_WideString &wsAttriValue, FX_LPCWSTR pwsDefValue) const +void CFDE_XMLInstruction::GetString(const FX_WCHAR* pwsAttriName, CFX_WideString &wsAttriValue, const FX_WCHAR* pwsDefValue) const { int32_t iCount = m_Attributes.GetSize(); for (int32_t i = 0; i < iCount; i += 2) { @@ -595,39 +596,39 @@ void CFDE_XMLInstruction::SetString(const CFX_WideString &wsAttriName, const CFX m_Attributes.Add(wsAttriName); m_Attributes.Add(wsAttriValue); } -int32_t CFDE_XMLInstruction::GetInteger(FX_LPCWSTR pwsAttriName, int32_t iDefValue) const +int32_t CFDE_XMLInstruction::GetInteger(const FX_WCHAR* pwsAttriName, int32_t iDefValue) const { int32_t iCount = m_Attributes.GetSize(); for (int32_t i = 0; i < iCount; i += 2) { if (m_Attributes[i].Compare(pwsAttriName) == 0) { - return FXSYS_wtoi((FX_LPCWSTR)m_Attributes[i + 1]); + return FXSYS_wtoi((const FX_WCHAR*)m_Attributes[i + 1]); } } return iDefValue; } -void CFDE_XMLInstruction::SetInteger(FX_LPCWSTR pwsAttriName, int32_t iAttriValue) +void CFDE_XMLInstruction::SetInteger(const FX_WCHAR* pwsAttriName, int32_t iAttriValue) { CFX_WideString wsValue; wsValue.Format(L"%d", iAttriValue); SetString(pwsAttriName, wsValue); } -FX_FLOAT CFDE_XMLInstruction::GetFloat(FX_LPCWSTR pwsAttriName, FX_FLOAT fDefValue) const +FX_FLOAT CFDE_XMLInstruction::GetFloat(const FX_WCHAR* pwsAttriName, FX_FLOAT fDefValue) const { int32_t iCount = m_Attributes.GetSize(); for (int32_t i = 0; i < iCount; i += 2) { if (m_Attributes[i].Compare(pwsAttriName) == 0) { - return FX_wcstof((FX_LPCWSTR)m_Attributes[i + 1]); + return FX_wcstof((const FX_WCHAR*)m_Attributes[i + 1]); } } return fDefValue; } -void CFDE_XMLInstruction::SetFloat(FX_LPCWSTR pwsAttriName, FX_FLOAT fAttriValue) +void CFDE_XMLInstruction::SetFloat(const FX_WCHAR* pwsAttriName, FX_FLOAT fAttriValue) { CFX_WideString wsValue; wsValue.Format(L"%f", fAttriValue); SetString(pwsAttriName, wsValue); } -void CFDE_XMLInstruction::RemoveAttribute(FX_LPCWSTR pwsAttriName) +void CFDE_XMLInstruction::RemoveAttribute(const FX_WCHAR* pwsAttriName) { int32_t iCount = m_Attributes.GetSize(); for (int32_t i = 0; i < iCount; i += 2) { @@ -762,7 +763,7 @@ FX_BOOL CFDE_XMLElement::GetAttribute(int32_t index, CFX_WideString &wsAttriName } return FALSE; } -FX_BOOL CFDE_XMLElement::HasAttribute(FX_LPCWSTR pwsAttriName) const +FX_BOOL CFDE_XMLElement::HasAttribute(const FX_WCHAR* pwsAttriName) const { int32_t iCount = m_Attributes.GetSize(); for (int32_t i = 0; i < iCount; i += 2) { @@ -772,7 +773,7 @@ FX_BOOL CFDE_XMLElement::HasAttribute(FX_LPCWSTR pwsAttriName) const } return FALSE; } -void CFDE_XMLElement::GetString(FX_LPCWSTR pwsAttriName, CFX_WideString &wsAttriValue, FX_LPCWSTR pwsDefValue) const +void CFDE_XMLElement::GetString(const FX_WCHAR* pwsAttriName, CFX_WideString &wsAttriValue, const FX_WCHAR* pwsDefValue) const { int32_t iCount = m_Attributes.GetSize(); for (int32_t i = 0; i < iCount; i += 2) { @@ -797,39 +798,39 @@ void CFDE_XMLElement::SetString(const CFX_WideString &wsAttriName, const CFX_Wid m_Attributes.Add(wsAttriName); m_Attributes.Add(wsAttriValue); } -int32_t CFDE_XMLElement::GetInteger(FX_LPCWSTR pwsAttriName, int32_t iDefValue) const +int32_t CFDE_XMLElement::GetInteger(const FX_WCHAR* pwsAttriName, int32_t iDefValue) const { int32_t iCount = m_Attributes.GetSize(); for (int32_t i = 0; i < iCount; i += 2) { if (m_Attributes[i].Compare(pwsAttriName) == 0) { - return FXSYS_wtoi((FX_LPCWSTR)m_Attributes[i + 1]); + return FXSYS_wtoi((const FX_WCHAR*)m_Attributes[i + 1]); } } return iDefValue; } -void CFDE_XMLElement::SetInteger(FX_LPCWSTR pwsAttriName, int32_t iAttriValue) +void CFDE_XMLElement::SetInteger(const FX_WCHAR* pwsAttriName, int32_t iAttriValue) { CFX_WideString wsValue; wsValue.Format(L"%d", iAttriValue); SetString(pwsAttriName, wsValue); } -FX_FLOAT CFDE_XMLElement::GetFloat(FX_LPCWSTR pwsAttriName, FX_FLOAT fDefValue) const +FX_FLOAT CFDE_XMLElement::GetFloat(const FX_WCHAR* pwsAttriName, FX_FLOAT fDefValue) const { int32_t iCount = m_Attributes.GetSize(); for (int32_t i = 0; i < iCount; i += 2) { if (m_Attributes[i].Compare(pwsAttriName) == 0) { - return FX_wcstof((FX_LPCWSTR)m_Attributes[i + 1]); + return FX_wcstof((const FX_WCHAR*)m_Attributes[i + 1]); } } return fDefValue; } -void CFDE_XMLElement::SetFloat(FX_LPCWSTR pwsAttriName, FX_FLOAT fAttriValue) +void CFDE_XMLElement::SetFloat(const FX_WCHAR* pwsAttriName, FX_FLOAT fAttriValue) { CFX_WideString wsValue; wsValue.Format(L"%f", fAttriValue); SetString(pwsAttriName, wsValue); } -void CFDE_XMLElement::RemoveAttribute(FX_LPCWSTR pwsAttriName) +void CFDE_XMLElement::RemoveAttribute(const FX_WCHAR* pwsAttriName) { int32_t iCount = m_Attributes.GetSize(); for (int32_t i = 0; i < iCount; i += 2) { @@ -1021,7 +1022,7 @@ void CFDE_XMLDoc::SaveXMLNode(IFX_Stream *pXMLStream, IFDE_XMLNode *pINode) ws += L"\"?>"; pXMLStream->WriteString(ws, ws.GetLength()); } else { - ws.Format(L"m_wsTarget); + ws.Format(L"m_wsTarget); pXMLStream->WriteString(ws, ws.GetLength()); CFX_WideStringArray &attributes = pInstruction->m_Attributes; int32_t i, iCount = attributes.GetSize(); @@ -1390,7 +1391,7 @@ CFDE_BlockBuffer::~CFDE_BlockBuffer() { ClearBuffer(); } -FX_LPWSTR CFDE_BlockBuffer::GetAvailableBlock(int32_t& iIndexInBlock) +FX_WCHAR* CFDE_BlockBuffer::GetAvailableBlock(int32_t& iIndexInBlock) { iIndexInBlock = 0; int32_t iBlockNum = m_BlockArray.GetSize(); @@ -1398,9 +1399,9 @@ FX_LPWSTR CFDE_BlockBuffer::GetAvailableBlock(int32_t& iIndexInBlock) return NULL; } int32_t iRealIndex = m_iStartPosition + m_iDataLength; - FX_LPWSTR pDataBlock = NULL; + FX_WCHAR* pDataBlock = NULL; if(iRealIndex == m_iBufferSize) { - FX_LPWSTR pBlock = (FX_LPWSTR)FDE_Alloc(m_iAllocStep * sizeof(FX_WCHAR)); + FX_WCHAR* pBlock = (FX_WCHAR*)FDE_Alloc(m_iAllocStep * sizeof(FX_WCHAR)); if (pBlock) { m_BlockArray.Add(pBlock); m_iBufferSize += m_iAllocStep; @@ -1411,7 +1412,7 @@ FX_LPWSTR CFDE_BlockBuffer::GetAvailableBlock(int32_t& iIndexInBlock) int32_t iBlockIndex = iRealIndex / m_iAllocStep; int32_t iInnerIndex = iRealIndex % m_iAllocStep; iIndexInBlock = iInnerIndex; - pDataBlock = (FX_LPWSTR)m_BlockArray[iBlockIndex]; + pDataBlock = (FX_WCHAR*)m_BlockArray[iBlockIndex]; } return pDataBlock; } @@ -1420,7 +1421,7 @@ FX_BOOL CFDE_BlockBuffer::InitBuffer(int32_t iBufferSize) ClearBuffer(); int32_t iNumOfBlock = (iBufferSize - 1) / m_iAllocStep + 1; for (int32_t i = 0; i < iNumOfBlock; i++) { - FX_LPWSTR pBlockBuffer = (FX_LPWSTR)FDE_Alloc(m_iAllocStep * sizeof(FX_WCHAR)); + FX_WCHAR* pBlockBuffer = (FX_WCHAR*)FDE_Alloc(m_iAllocStep * sizeof(FX_WCHAR)); if (pBlockBuffer == NULL) { ClearBuffer(); return FALSE; @@ -1442,7 +1443,7 @@ void CFDE_BlockBuffer::SetTextChar(int32_t iIndex, FX_WCHAR ch) if (iBlockIndex >= iBlockSize) { int32_t iNewBlocks = iBlockIndex - iBlockSize + 1; do { - FX_LPWSTR pBlock = (FX_LPWSTR)FDE_Alloc(m_iAllocStep * sizeof(FX_WCHAR)); + FX_WCHAR* pBlock = (FX_WCHAR*)FDE_Alloc(m_iAllocStep * sizeof(FX_WCHAR)); if (!pBlock) { return; } @@ -1450,7 +1451,7 @@ void CFDE_BlockBuffer::SetTextChar(int32_t iIndex, FX_WCHAR ch) m_iBufferSize += m_iAllocStep; } while (--iNewBlocks); } - FX_LPWSTR pTextData = (FX_LPWSTR)m_BlockArray[iBlockIndex]; + FX_WCHAR* pTextData = (FX_WCHAR*)m_BlockArray[iBlockIndex]; *(pTextData + iInnerIndex) = ch; if (m_iDataLength <= iIndex) { m_iDataLength = iIndex + 1; @@ -1486,7 +1487,7 @@ void CFDE_BlockBuffer::GetTextData(CFX_WideString& wsTextData, int32_t iStart, if (iLength <= 0) { return; } - FX_LPWSTR pBuf = wsTextData.GetBuffer(iLength); + FX_WCHAR* pBuf = wsTextData.GetBuffer(iLength); if (!pBuf) { return; } @@ -1507,7 +1508,7 @@ void CFDE_BlockBuffer::GetTextData(CFX_WideString& wsTextData, int32_t iStart, if (i == iEndBlockIndex) { iCopyLength -= ((m_iAllocStep - 1) - iEndInnerIndex); } - FX_LPWSTR pBlockBuf = (FX_LPWSTR)m_BlockArray[i]; + FX_WCHAR* pBlockBuf = (FX_WCHAR*)m_BlockArray[i]; FXSYS_memcpy(pBuf + iPointer, pBlockBuf + iBufferPointer, iCopyLength * sizeof(FX_WCHAR)); iPointer += iCopyLength; } @@ -1576,7 +1577,7 @@ void CFDE_XMLSyntaxParser::Init(IFX_Stream *pStream, int32_t iXMLPlaneSize, int3 uint8_t bom[4]; m_iCurrentPos = m_pStream->GetBOM(bom); FXSYS_assert(m_pBuffer == NULL); - m_pBuffer = (FX_LPWSTR)FDE_Alloc(m_iXMLPlaneSize * sizeof(FX_WCHAR)); + m_pBuffer = (FX_WCHAR*)FDE_Alloc(m_iXMLPlaneSize * sizeof(FX_WCHAR)); m_pStart = m_pEnd = m_pBuffer; FXSYS_assert(!m_BlockBuffer.IsInitialized()); m_BlockBuffer.InitBuffer(); @@ -1892,7 +1893,7 @@ FX_DWORD CFDE_XMLSyntaxParser::DoSyntaxParse() break; } m_SkipStack.Pop(); - FX_LPDWORD pDWord = m_SkipStack.GetTopElement(); + FX_DWORD* pDWord = m_SkipStack.GetTopElement(); if (pDWord == NULL) { m_dwMode = FDE_XMLSYNTAXMODE_Text; } else { @@ -1923,7 +1924,7 @@ FX_DWORD CFDE_XMLSyntaxParser::DoSyntaxParse() default: if (ch == m_SkipChar) { m_SkipStack.Pop(); - FX_LPDWORD pDWord = m_SkipStack.GetTopElement(); + FX_DWORD* pDWord = m_SkipStack.GetTopElement(); if (pDWord == NULL) { if (m_iDataLength >= 9) { CFX_WideString wsHeader; @@ -2078,10 +2079,10 @@ void CFDE_XMLSyntaxParser::Init(IFX_Stream *pStream, int32_t iXMLPlaneSize, int3 uint8_t bom[4]; m_iCurrentPos = m_pStream->GetBOM(bom); FXSYS_assert(m_pBuffer == NULL); - m_pBuffer = (FX_LPWSTR)FDE_Alloc(m_iXMLPlaneSize * sizeof(FX_WCHAR)); + m_pBuffer = (FX_WCHAR*)FDE_Alloc(m_iXMLPlaneSize * sizeof(FX_WCHAR)); m_pStart = m_pEnd = m_pBuffer; FXSYS_assert(m_pwsTextData == NULL); - m_pwsTextData = (FX_LPWSTR)FDE_Alloc(m_iTextDataSize * sizeof(FX_WCHAR)); + m_pwsTextData = (FX_WCHAR*)FDE_Alloc(m_iTextDataSize * sizeof(FX_WCHAR)); m_iParsedBytes = m_iParsedChars = 0; m_iBufferChars = 0; } @@ -2370,7 +2371,7 @@ FX_DWORD CFDE_XMLSyntaxParser::DoSyntaxParse() break; } m_SkipStack.Pop(); - FX_LPDWORD pDWord = m_SkipStack.GetTopElement(); + FX_DWORD* pDWord = m_SkipStack.GetTopElement(); if (pDWord == NULL) { m_dwMode = FDE_XMLSYNTAXMODE_Text; } else { @@ -2401,7 +2402,7 @@ FX_DWORD CFDE_XMLSyntaxParser::DoSyntaxParse() default: if (ch == m_SkipChar) { m_SkipStack.Pop(); - FX_LPDWORD pDWord = m_SkipStack.GetTopElement(); + FX_DWORD* pDWord = m_SkipStack.GetTopElement(); if (pDWord == NULL) { m_iTextDataLength = m_iDataPos; m_iDataPos = 0; @@ -2523,7 +2524,7 @@ int32_t CFDE_XMLSyntaxParser::GetStatus() const } return m_iParsedBytes * 100 / iStreamLength; } -static int32_t FX_GetUTF8EncodeLength(FX_LPCWSTR pSrc, int32_t iSrcLen) +static int32_t FX_GetUTF8EncodeLength(const FX_WCHAR* pSrc, int32_t iSrcLen) { FX_DWORD unicode = 0; int32_t iDstNum = 0; @@ -2701,11 +2702,11 @@ void CFDE_XMLSyntaxParser::ReallocTextDataBuffer() } else { m_iTextDataSize += 1024 * 1024; } - m_pwsTextData = (FX_LPWSTR)FDE_Realloc(m_pwsTextData, m_iTextDataSize * sizeof(FX_WCHAR)); + m_pwsTextData = (FX_WCHAR*)FDE_Realloc(m_pwsTextData, m_iTextDataSize * sizeof(FX_WCHAR)); } void CFDE_XMLSyntaxParser::GetData(CFX_WideString &wsData) const { - FX_LPWSTR pBuf = wsData.GetBuffer(m_iTextDataLength); + FX_WCHAR* pBuf = wsData.GetBuffer(m_iTextDataLength); FXSYS_memcpy(pBuf, m_pwsTextData, m_iTextDataLength * sizeof(FX_WCHAR)); wsData.ReleaseBuffer(m_iTextDataLength); } diff --git a/xfa/src/fdp/src/xml/fde_xml.h b/xfa/src/fdp/src/xml/fde_xml.h index 9353561264..b158e0d80c 100644 --- a/xfa/src/fdp/src/xml/fde_xml.h +++ b/xfa/src/fdp/src/xml/fde_xml.h @@ -34,7 +34,7 @@ public: virtual int32_t CountChildNodes() const; virtual CFDE_XMLNode* GetChildNode(int32_t index) const; virtual int32_t GetChildNodeIndex(CFDE_XMLNode *pNode) const; - virtual CFDE_XMLNode* GetPath(FX_LPCWSTR pPath, int32_t iLength = -1, FX_BOOL bQualifiedName = TRUE) const; + virtual CFDE_XMLNode* GetPath(const FX_WCHAR* pPath, int32_t iLength = -1, FX_BOOL bQualifiedName = TRUE) const; virtual int32_t InsertChildNode(CFDE_XMLNode *pNode, int32_t index = -1); virtual void RemoveChildNode(CFDE_XMLNode *pNode); virtual void DeleteChildren(); @@ -71,14 +71,14 @@ public: } virtual int32_t CountAttributes() const; virtual FX_BOOL GetAttribute(int32_t index, CFX_WideString &wsAttriName, CFX_WideString &wsAttriValue) const; - virtual FX_BOOL HasAttribute(FX_LPCWSTR pwsAttriName) const; - virtual void GetString(FX_LPCWSTR pwsAttriName, CFX_WideString &wsAttriValue, FX_LPCWSTR pwsDefValue = NULL) const; + virtual FX_BOOL HasAttribute(const FX_WCHAR* pwsAttriName) const; + virtual void GetString(const FX_WCHAR* pwsAttriName, CFX_WideString &wsAttriValue, const FX_WCHAR* pwsDefValue = NULL) const; virtual void SetString(const CFX_WideString &wsAttriName, const CFX_WideString &wsAttriValue); - virtual int32_t GetInteger(FX_LPCWSTR pwsAttriName, int32_t iDefValue = 0) const; - virtual void SetInteger(FX_LPCWSTR pwsAttriName, int32_t iAttriValue); - virtual FX_FLOAT GetFloat(FX_LPCWSTR pwsAttriName, FX_FLOAT fDefValue = 0) const; - virtual void SetFloat(FX_LPCWSTR pwsAttriName, FX_FLOAT fAttriValue); - virtual void RemoveAttribute(FX_LPCWSTR pwsAttriName); + virtual int32_t GetInteger(const FX_WCHAR* pwsAttriName, int32_t iDefValue = 0) const; + virtual void SetInteger(const FX_WCHAR* pwsAttriName, int32_t iAttriValue); + virtual FX_FLOAT GetFloat(const FX_WCHAR* pwsAttriName, FX_FLOAT fDefValue = 0) const; + virtual void SetFloat(const FX_WCHAR* pwsAttriName, FX_FLOAT fAttriValue); + virtual void RemoveAttribute(const FX_WCHAR* pwsAttriName); virtual int32_t CountData() const; virtual FX_BOOL GetData(int32_t index, CFX_WideString &wsData) const; virtual void AppendData(const CFX_WideString &wsData); @@ -108,14 +108,14 @@ public: virtual void GetNamespaceURI(CFX_WideString &wsNamespace) const; virtual int32_t CountAttributes() const; virtual FX_BOOL GetAttribute(int32_t index, CFX_WideString &wsAttriName, CFX_WideString &wsAttriValue) const; - virtual FX_BOOL HasAttribute(FX_LPCWSTR pwsAttriName) const; - virtual void GetString(FX_LPCWSTR pwsAttriName, CFX_WideString &wsAttriValue, FX_LPCWSTR pwsDefValue = NULL) const; + virtual FX_BOOL HasAttribute(const FX_WCHAR* pwsAttriName) const; + virtual void GetString(const FX_WCHAR* pwsAttriName, CFX_WideString &wsAttriValue, const FX_WCHAR* pwsDefValue = NULL) const; virtual void SetString(const CFX_WideString &wsAttriName, const CFX_WideString &wsAttriValue); - virtual int32_t GetInteger(FX_LPCWSTR pwsAttriName, int32_t iDefValue = 0) const; - virtual void SetInteger(FX_LPCWSTR pwsAttriName, int32_t iAttriValue); - virtual FX_FLOAT GetFloat(FX_LPCWSTR pwsAttriName, FX_FLOAT fDefValue = 0) const; - virtual void SetFloat(FX_LPCWSTR pwsAttriName, FX_FLOAT fAttriValue); - virtual void RemoveAttribute(FX_LPCWSTR pwsAttriName); + virtual int32_t GetInteger(const FX_WCHAR* pwsAttriName, int32_t iDefValue = 0) const; + virtual void SetInteger(const FX_WCHAR* pwsAttriName, int32_t iAttriValue); + virtual FX_FLOAT GetFloat(const FX_WCHAR* pwsAttriName, FX_FLOAT fDefValue = 0) const; + virtual void SetFloat(const FX_WCHAR* pwsAttriName, FX_FLOAT fAttriValue); + virtual void RemoveAttribute(const FX_WCHAR* pwsAttriName); virtual void GetTextData(CFX_WideString &wsText) const; virtual void SetTextData(const CFX_WideString &wsText); public: @@ -276,7 +276,7 @@ public: { FDE_Delete this; } - FX_LPWSTR GetAvailableBlock(int32_t& iIndexInBlock); + FX_WCHAR* GetAvailableBlock(int32_t& iIndexInBlock); inline int32_t GetAllocStep() const { return m_iAllocStep; @@ -409,22 +409,22 @@ protected: int32_t m_iLastNodeNum; int32_t m_iParsedChars; int32_t m_iParsedBytes; - FX_LPWSTR m_pBuffer; + FX_WCHAR* m_pBuffer; int32_t m_iBufferChars; FX_BOOL m_bEOS; - FX_LPWSTR m_pStart; - FX_LPWSTR m_pEnd; + FX_WCHAR* m_pStart; + FX_WCHAR* m_pEnd; FDE_XMLNODE m_CurNode; CFDE_XMLNodeStack m_XMLNodeStack; #ifdef _FDE_BLOCK_BUFFER CFDE_BlockBuffer m_BlockBuffer; int32_t m_iAllocStep; int32_t& m_iDataLength; - FX_LPWSTR m_pCurrentBlock; + FX_WCHAR* m_pCurrentBlock; int32_t m_iIndexInBlock; #else int32_t m_iTextDataSize; - FX_LPWSTR m_pwsTextData; + FX_WCHAR* m_pwsTextData; int32_t m_iDataPos; #endif int32_t m_iTextDataLength; diff --git a/xfa/src/fee/include/ifde_txtedtbuf.h b/xfa/src/fee/include/ifde_txtedtbuf.h index 921b17a518..3aa24ffe69 100644 --- a/xfa/src/fee/include/ifde_txtedtbuf.h +++ b/xfa/src/fee/include/ifde_txtedtbuf.h @@ -21,7 +21,7 @@ public: virtual FX_WCHAR GetCharByIndex(int32_t nIndex) const = 0; virtual void GetRange(CFX_WideString &wsText, int32_t nBegin, int32_t nCount = - 1) const = 0; - virtual void Insert(int32_t nPos, FX_LPCWSTR lpText, int32_t nLength = 1) = 0; + virtual void Insert(int32_t nPos, const FX_WCHAR* lpText, int32_t nLength = 1) = 0; virtual void Delete(int32_t nIndex, int32_t nLength = 1) = 0; virtual void Clear(FX_BOOL bRelease = TRUE) = 0; diff --git a/xfa/src/fee/include/ifde_txtedtengine.h b/xfa/src/fee/include/ifde_txtedtengine.h index 10f90881bd..4dcfa69cc8 100644 --- a/xfa/src/fee/include/ifde_txtedtengine.h +++ b/xfa/src/fee/include/ifde_txtedtengine.h @@ -16,7 +16,7 @@ class IFDE_TxtEdtParag; #define FDE_TXTEDT_FIND_FLAGS_WholeWord (1L << 1) #define FDE_TXTEDT_FIND_FLAGS_NoCase (1L << 2) typedef struct _FDE_HTXTEDTFIND { - FX_LPVOID pData; + void* pData; } * FDE_HTXTEDTFIND; #define FDE_TEXTEDITMODE_MultiLines (1L << 0) #define FDE_TEXTEDITMODE_AutoLineWrap (1L << 1) @@ -192,7 +192,7 @@ public: virtual void Unlock() = 0; virtual FX_BOOL IsLocked() const = 0; - virtual int32_t Insert(int32_t nStart, FX_LPCWSTR lpText, int32_t nLength) = 0; + virtual int32_t Insert(int32_t nStart, const FX_WCHAR* lpText, int32_t nLength) = 0; virtual int32_t Delete(int32_t nStart, FX_BOOL bBackspace = FALSE) = 0; virtual int32_t DeleteRange(int32_t nStart, int32_t nCount = -1) = 0; virtual int32_t Replace(int32_t nStart, int32_t nLength, const CFX_WideString &wsReplace) = 0; diff --git a/xfa/src/fee/src/fee/fde_txtedtblock.cpp b/xfa/src/fee/src/fee/fde_txtedtblock.cpp index 2d71cd3a99..7b8ecf4f1f 100644 --- a/xfa/src/fee/src/fee/fde_txtedtblock.cpp +++ b/xfa/src/fee/src/fee/fde_txtedtblock.cpp @@ -18,7 +18,7 @@ CFDE_TxtEdtBlock::CFDE_TxtEdtBlock(CFDE_TxtEdtEngine * pEngine, const CFX_WideSt , m_nIndex(0) , m_nPosition(nPosition) { - FX_LPCWSTR lpBuf = FX_LPCWSTR(wsBlock); + const FX_WCHAR* lpBuf = const FX_WCHAR*(wsBlock); int32_t nCount = wsBlock.GetLength(); int32_t i = 0; CFX_WideString wsFix; @@ -166,7 +166,7 @@ CFDE_TxtEdtFieldFormatParser::~CFDE_TxtEdtFieldFormatParser() FX_BOOL CFDE_TxtEdtFieldFormatParser::Parse(const CFX_WideString &wsFormat) { m_wsFormat = wsFormat; - FX_LPCWSTR pBuf = FX_LPCWSTR(m_wsFormat); + const FX_WCHAR* pBuf = const FX_WCHAR*(m_wsFormat); int32_t nCount = m_wsFormat.GetLength(); nCount -= 2; int32_t i = 0; @@ -206,8 +206,8 @@ int32_t CFDE_TxtEdtFieldFormatParser::CountItems() const void CFDE_TxtEdtFieldFormatParser::GetItem(int32_t nIndex, CFX_WideString &wsKey, CFX_WideString &wsValue) const { FDE_LPTXTEDTFORMATITEM lpItem = m_ItemArr[nIndex]; - FX_LPCWSTR lpSrcBuf = FX_LPCWSTR(m_wsFormat); - FX_LPWSTR lpDstBuf = wsKey.GetBuffer(lpItem->nKeyCount); + const FX_WCHAR* lpSrcBuf = const FX_WCHAR*(m_wsFormat); + FX_WCHAR* lpDstBuf = wsKey.GetBuffer(lpItem->nKeyCount); FXSYS_memcpy(lpDstBuf, lpSrcBuf + lpItem->nKeyStart, lpItem->nKeyCount * sizeof(FX_WCHAR)); wsKey.ReleaseBuffer(lpItem->nKeyCount); lpDstBuf = wsValue.GetBuffer(lpItem->nValCount); @@ -300,8 +300,8 @@ int32_t CFDE_TxtEdtField::Delete(int32_t nIndex, int32_t nCount, default: break; } - FX_LPWSTR lpBuf = wsDel.GetBuffer(nCount); - FXSYS_memcpy(lpBuf, FX_LPCWSTR(m_wsField) + nInnerIndex, nCount * sizeof(FX_WCHAR)); + FX_WCHAR* lpBuf = wsDel.GetBuffer(nCount); + FXSYS_memcpy(lpBuf, const FX_WCHAR*(m_wsField) + nInnerIndex, nCount * sizeof(FX_WCHAR)); wsDel.ReleaseBuffer(nCount); m_wsField = wsTemp; nCaret = nIndex + (m_bReserveSpace && !m_bLeftAlignment) ? nCount : 0; @@ -336,8 +336,8 @@ int32_t CFDE_TxtEdtField::Replace(int32_t nIndex, int32_t nCount, const CFX_Wide default: break; } - FX_LPWSTR lpBuffer = wsDel.GetBuffer(nCount); - FX_LPCWSTR lpSrcBuf = FX_LPCWSTR(m_wsField); + FX_WCHAR* lpBuffer = wsDel.GetBuffer(nCount); + const FX_WCHAR* lpSrcBuf = const FX_WCHAR*(m_wsField); FXSYS_memcpy(lpBuffer, lpSrcBuf + nInnerIndexBK, nCount * sizeof(FX_WCHAR)); wsDel.ReleaseBuffer(nCount); m_wsField = wsTemp; @@ -349,12 +349,12 @@ void CFDE_TxtEdtField::GetDisplayText(CFX_WideString &wsDisplay) CFX_WideString wsField; GetNormalizedFieldText(wsField); int32_t nLength = wsField.GetLength() + FDE_FORMAT_EDIT_FIELD_HADERSIZE + FDE_FORMAT_EDIT_FIELD_TAILSIZE; - FX_LPWSTR lpBuffer = wsDisplay.GetBuffer(nLength); + FX_WCHAR* lpBuffer = wsDisplay.GetBuffer(nLength); lpBuffer[0] = FDE_TXTEDT_FORMATBLOCK_BGN; lpBuffer[nLength - 1] = FDE_TXTEDT_FORMATBLOCK_END; FX_DWORD nAddress = (FX_DWORD)this; FXSYS_memcpy(lpBuffer + 1, &nAddress, sizeof(FX_DWORD)); - FXSYS_memcpy(lpBuffer + 3, FX_LPCWSTR(wsField), (nLength - 4) * sizeof(FX_WCHAR)); + FXSYS_memcpy(lpBuffer + 3, const FX_WCHAR*(wsField), (nLength - 4) * sizeof(FX_WCHAR)); wsDisplay.ReleaseBuffer(nLength); } int32_t CFDE_TxtEdtField::GetDisplayLength() @@ -548,7 +548,7 @@ int32_t CFDE_TxtEdtField_Float::Validate(const CFX_WideString & wsText) const if (m_nLength != -1 && (nLength > m_nLength)) { return FDE_FORMAT_FIELD_VALIDATE_F_FULL; } - FX_LPCWSTR lpBuf = FX_LPCWSTR(wsText); + const FX_WCHAR* lpBuf = const FX_WCHAR*(wsText); int32_t i = 0; if (m_bSigned) { FX_WCHAR wcTemp = lpBuf[0]; @@ -613,7 +613,7 @@ void CFDE_TxtEdtField_Password::GetNormalizedFieldText(CFX_WideString &wsField) { int32_t nFiledLength = m_wsField.GetLength(); int32_t nLength = m_bReserveSpace ? m_nLength : nFiledLength; - FX_LPWSTR lpBuf = wsField.GetBuffer(nLength); + FX_WCHAR* lpBuf = wsField.GetBuffer(nLength); int32_t nSpaceLength = nLength - nFiledLength; int32_t nFirstPart = m_bLeftAlignment ? nFiledLength : nSpaceLength; FX_WCHAR wFirstChar = m_bLeftAlignment ? m_wcAlias : L' '; @@ -655,12 +655,12 @@ CFDE_TxtEdtField_Fixed::CFDE_TxtEdtField_Fixed(const CFX_WideString &wsField, in void CFDE_TxtEdtField_Fixed::GetDisplayText(CFX_WideString &wsDisplay) { int32_t nLength = m_wsField.GetLength() + FDE_FORMAT_EDIT_FIELD_HADERSIZE + FDE_FORMAT_EDIT_FIELD_TAILSIZE; - FX_LPWSTR lpBuffer = wsDisplay.GetBuffer(nLength); + FX_WCHAR* lpBuffer = wsDisplay.GetBuffer(nLength); lpBuffer[0] = FDE_TXTEDT_FORMATBLOCK_BGN; lpBuffer[nLength - 1] = FDE_TXTEDT_FORMATBLOCK_END; FX_DWORD nAddress = (FX_DWORD)this; FXSYS_memcpy(lpBuffer + 1, &nAddress, sizeof(FX_DWORD)); - FXSYS_memcpy(lpBuffer + 3, FX_LPCWSTR(m_wsField), (nLength - 4) * sizeof(FX_WCHAR)); + FXSYS_memcpy(lpBuffer + 3, const FX_WCHAR*(m_wsField), (nLength - 4) * sizeof(FX_WCHAR)); wsDisplay.ReleaseBuffer(nLength); } int32_t CFDE_TxtEdtField_Fixed::NormalizeCaretPos(int32_t nIndex, FDE_FORMAT_CARET_DIRECTION eDirection ) const diff --git a/xfa/src/fee/src/fee/fde_txtedtbuf.cpp b/xfa/src/fee/src/fee/fde_txtedtbuf.cpp index 1b2c01d3da..b1d3927c8a 100644 --- a/xfa/src/fee/src/fee/fde_txtedtbuf.cpp +++ b/xfa/src/fee/src/fee/fde_txtedtbuf.cpp @@ -190,7 +190,7 @@ void CFDE_TxtEdtBuf::SetText(const CFX_WideString &wsText) m_Chunks.Add(lpChunk); } int32_t nTotalCount = m_Chunks.GetSize(); - FX_LPCWSTR lpSrcBuf = FX_LPCWSTR(wsText); + const FX_WCHAR* lpSrcBuf = wsText.c_str(); int32_t nLeave = nTextLength; int32_t nCopyedLength = m_nChunkSize; for (i = 0; i < nTotalCount && nLeave > 0; i ++) { @@ -233,11 +233,11 @@ void CFDE_TxtEdtBuf::GetRange(CFX_WideString &wsText, int32_t nBegin, int32_t nL Index2CP(nBegin, cp); int32_t nLeave = nLength; int32_t nCount = m_Chunks.GetSize(); - FX_LPWSTR lpDstBuf = wsText.GetBuffer(nLength); + FX_WCHAR* lpDstBuf = wsText.GetBuffer(nLength); int32_t nChunkIndex = cp.nChunkIndex; FDE_LPCHUNKHEADER lpChunkHeader = (FDE_LPCHUNKHEADER)m_Chunks[nChunkIndex]; int32_t nCopyLength = lpChunkHeader->nUsed - cp.nCharIndex; - FX_LPWSTR lpSrcBuf = lpChunkHeader->wChars + cp.nCharIndex; + FX_WCHAR* lpSrcBuf = lpChunkHeader->wChars + cp.nCharIndex; while (nLeave > 0) { if (nLeave <= nCopyLength) { nCopyLength = nLeave; @@ -255,7 +255,7 @@ void CFDE_TxtEdtBuf::GetRange(CFX_WideString &wsText, int32_t nBegin, int32_t nL } wsText.ReleaseBuffer(); } -void CFDE_TxtEdtBuf::Insert(int32_t nPos, FX_LPCWSTR lpText, int32_t nLength ) +void CFDE_TxtEdtBuf::Insert(int32_t nPos, const FX_WCHAR* lpText, int32_t nLength ) { FXSYS_assert(nPos >= 0 && nPos <= m_nTotal); FDE_CHUNKPLACE cp; diff --git a/xfa/src/fee/src/fee/fde_txtedtbuf.h b/xfa/src/fee/src/fee/fde_txtedtbuf.h index 9e54a0d2f3..67e3cae942 100644 --- a/xfa/src/fee/src/fee/fde_txtedtbuf.h +++ b/xfa/src/fee/src/fee/fde_txtedtbuf.h @@ -67,7 +67,7 @@ public: virtual FX_WCHAR GetCharByIndex(int32_t nIndex) const; virtual void GetRange(CFX_WideString &wsText, int32_t nBegine, int32_t nCount = -1) const; - virtual void Insert(int32_t nPos, FX_LPCWSTR lpText, int32_t nLength = 1); + virtual void Insert(int32_t nPos, const FX_WCHAR* lpText, int32_t nLength = 1); virtual void Delete(int32_t nIndex, int32_t nLength = 1); virtual void Clear(FX_BOOL bRelease = TRUE); diff --git a/xfa/src/fee/src/fee/fde_txtedtengine.cpp b/xfa/src/fee/src/fee/fde_txtedtengine.cpp index 78486835ac..9546a2b270 100644 --- a/xfa/src/fee/src/fee/fde_txtedtengine.cpp +++ b/xfa/src/fee/src/fee/fde_txtedtengine.cpp @@ -135,7 +135,7 @@ void CFDE_TxtEdtEngine::SetTextByStream(IFX_Stream *pStream) pStream->Seek(FX_STREAMSEEK_Begin, nPos); int32_t bEos = FALSE; int32_t nPlateSize = FX_MIN(nStreamLength, m_pTxtBuf->GetChunkSize()); - FX_LPWSTR lpwstr = (FX_LPWSTR)FDE_Alloc(nPlateSize * sizeof(FX_WCHAR)); + FX_WCHAR* lpwstr = (FX_WCHAR*)FDE_Alloc(nPlateSize * sizeof(FX_WCHAR)); FXSYS_assert(lpwstr); int32_t nRead = 0; while (!bEos) { @@ -156,8 +156,8 @@ void CFDE_TxtEdtEngine::SetText(const CFX_WideString &wsText) int32_t nLength = wsText.GetLength(); if (nLength > 0) { CFX_WideString wsTemp; - FX_LPWSTR lpBuffer = wsTemp.GetBuffer(nLength); - FXSYS_memcpy(lpBuffer, FX_LPCWSTR(wsText), nLength * sizeof(FX_WCHAR)); + FX_WCHAR* lpBuffer = wsTemp.GetBuffer(nLength); + FXSYS_memcpy(lpBuffer, wsText.c_str(), nLength * sizeof(FX_WCHAR)); ReplaceParagEnd(lpBuffer, nLength, FALSE); wsTemp.ReleaseBuffer(nLength); if (m_nLimit > 0 && nLength > m_nLimit) { @@ -186,8 +186,8 @@ void CFDE_TxtEdtEngine::GetText(CFX_WideString &wsText, int32_t nStart, int32_t return; } CFX_WideString wsTemp; - FX_LPCWSTR lpFixBuffer = FX_LPCWSTR(m_wsFixText); - FX_LPWSTR lpBuffer = wsTemp.GetBuffer(nTextBufLength); + const FX_WCHAR* lpFixBuffer = const FX_WCHAR*(m_wsFixText); + FX_WCHAR* lpBuffer = wsTemp.GetBuffer(nTextBufLength); int32_t nRealLength = 0; int32_t nPrePos = 0; for (int32_t i = 0; i < nBlockCount; i ++) { @@ -200,7 +200,7 @@ void CFDE_TxtEdtEngine::GetText(CFX_WideString &wsText, int32_t nStart, int32_t CFX_WideString wsBlock; pBlock->GetRealText(wsBlock); nCopyLength = wsBlock.GetLength(); - FXSYS_memcpy(lpBuffer + nRealLength, FX_LPCWSTR(wsBlock), nCopyLength * sizeof(FX_WCHAR)); + FXSYS_memcpy(lpBuffer + nRealLength, const FX_WCHAR*(wsBlock), nCopyLength * sizeof(FX_WCHAR)); nRealLength += nCopyLength; } int32_t nLeftLength = m_wsFixText.GetLength() - nPrePos; @@ -212,8 +212,8 @@ void CFDE_TxtEdtEngine::GetText(CFX_WideString &wsText, int32_t nStart, int32_t int32_t nRealBgn = GetRealIndex(nStart); int32_t nRealEnd = GetRealIndex(nStart + nCount - 1); int32_t nRealCount = nRealEnd - nRealBgn; - FX_LPWSTR lpDestBuf = wsText.GetBuffer(nRealCount); - FXSYS_memcpy(lpDestBuf, FX_LPCWSTR(wsTemp) + nRealBgn, nRealCount * sizeof(FX_WCHAR)); + FX_WCHAR* lpDestBuf = wsText.GetBuffer(nRealCount); + FXSYS_memcpy(lpDestBuf, const FX_WCHAR*(wsTemp) + nRealBgn, nRealCount * sizeof(FX_WCHAR)); wsText.ReleaseBuffer(); #else m_pTxtBuf->GetRange(wsText, nStart, nCount); @@ -427,7 +427,7 @@ FX_BOOL CFDE_TxtEdtEngine::IsLocked() const { return m_bLock; } -int32_t CFDE_TxtEdtEngine::Insert(int32_t nStart, FX_LPCWSTR lpText, int32_t nLength) +int32_t CFDE_TxtEdtEngine::Insert(int32_t nStart, const FX_WCHAR* lpText, int32_t nLength) { if (IsLocked()) { return FDE_TXTEDT_MODIFY_RET_F_Locked; @@ -482,7 +482,7 @@ int32_t CFDE_TxtEdtEngine::Insert(int32_t nStart, FX_LPCWSTR lpText, int32_t nLe pField->GetDisplayText(wsDisplay); if ((m_Param.dwMode & FDE_TEXTEDITMODE_LimitArea_Vert) || (m_Param.dwMode & FDE_TEXTEDITMODE_LimitArea_Horz)) { CFX_WideString wsText; - GetPreReplaceText(wsText, nBgn, nEnd - nBgn + 1, FX_LPCWSTR(wsDisplay), wsDisplay.GetLength()); + GetPreReplaceText(wsText, nBgn, nEnd - nBgn + 1, const FX_WCHAR*(wsDisplay), wsDisplay.GetLength()); if (!IsFitArea(wsText)) { pField->Restore(); return FDE_TXTEDT_MODIFY_RET_F_Full; @@ -537,7 +537,7 @@ int32_t CFDE_TxtEdtEngine::Insert(int32_t nStart, FX_LPCWSTR lpText, int32_t nLe pField->GetDisplayText(wsDisplay); if ((m_Param.dwMode & FDE_TEXTEDITMODE_LimitArea_Vert) || (m_Param.dwMode & FDE_TEXTEDITMODE_LimitArea_Horz)) { CFX_WideString wsText; - GetPreReplaceText(wsText, nBgn, nEnd - nBgn + 1, FX_LPCWSTR(wsDisplay), wsDisplay.GetLength()); + GetPreReplaceText(wsText, nBgn, nEnd - nBgn + 1, const FX_WCHAR*(wsDisplay), wsDisplay.GetLength()); if (!IsFitArea(wsText)) { pField->Restore(); return FDE_TXTEDT_MODIFY_RET_F_Full; @@ -568,7 +568,7 @@ int32_t CFDE_TxtEdtEngine::Insert(int32_t nStart, FX_LPCWSTR lpText, int32_t nLe } #endif CFX_WideString wsTemp; - FX_LPWSTR lpBuffer = wsTemp.GetBuffer(nLength); + FX_WCHAR* lpBuffer = wsTemp.GetBuffer(nLength); FXSYS_memcpy(lpBuffer, lpText, nLength * sizeof(FX_WCHAR)); ReplaceParagEnd(lpBuffer, nLength, FALSE); wsTemp.ReleaseBuffer(nLength); @@ -597,7 +597,7 @@ int32_t CFDE_TxtEdtEngine::Insert(int32_t nStart, FX_LPCWSTR lpText, int32_t nLe while (nLength > 0) { GetPreInsertText(wsText, m_nCaret, lpBuffer, nLength); int32_t nTotal = wsText.GetLength(); - FX_LPWSTR lpBuf = wsText.GetBuffer(nTotal); + FX_WCHAR* lpBuf = wsText.GetBuffer(nTotal); for (int32_t i = 0; i < nTotal; i ++) { lpBuf[i] = m_wcAliasChar; } @@ -795,7 +795,7 @@ int32_t CFDE_TxtEdtEngine::Replace(int32_t nStart, int32_t nLength, const CFX_Wi } if (m_Param.dwMode & FDE_TEXTEDITMODE_Validate) { CFX_WideString wsText; - GetPreReplaceText(wsText, nStart, nLength, FX_LPCWSTR(wsReplace), wsReplace.GetLength()); + GetPreReplaceText(wsText, nStart, nLength, wsReplace.c_str(), wsReplace.GetLength()); if (!m_Param.pEventSink->On_Validate(this, wsText)) { return FDE_TXTEDT_MODIFY_RET_F_Invalidate; } @@ -810,9 +810,9 @@ int32_t CFDE_TxtEdtEngine::Replace(int32_t nStart, int32_t nLength, const CFX_Wi } int32_t nTextLength = wsReplace.GetLength(); if (nTextLength > 0) { - Inner_Insert(nStart, FX_LPCWSTR(wsReplace), nTextLength); + Inner_Insert(nStart, wsReplace.c_str(), nTextLength); } - m_ChangeInfo.wsInsert = CFX_WideString(FX_LPCWSTR(wsReplace), nTextLength); + m_ChangeInfo.wsInsert = CFX_WideString(wsReplace.c_str(), nTextLength); nStart += nTextLength; FX_WCHAR wChar = m_pTxtBuf->GetCharByIndex(nStart - 1); FX_BOOL bBefore = TRUE; @@ -877,7 +877,7 @@ void CFDE_TxtEdtEngine::SetFormatBlock(int32_t nIndex, const CFX_WideString &wsB pEditBlock->GetDisplayText(wsDisplay); m_nCaret = nBlockPos; if (wsDisplay.GetLength() > 0) { - RawInsert(nBlockPos, FX_LPCWSTR(wsDisplay), wsDisplay.GetLength()); + RawInsert(nBlockPos, const FX_WCHAR*(wsDisplay), wsDisplay.GetLength()); } #endif } @@ -1167,7 +1167,7 @@ void CFDE_TxtEdtEngine::GetPreDeleteText(CFX_WideString &wsText, int32_t nIndex, GetText(wsText, 0, GetTextBufLength()); wsText.Delete(nIndex, nLength); } -void CFDE_TxtEdtEngine::GetPreInsertText(CFX_WideString &wsText, int32_t nIndex, FX_LPCWSTR lpText, int32_t nLength) +void CFDE_TxtEdtEngine::GetPreInsertText(CFX_WideString &wsText, int32_t nIndex, const FX_WCHAR* lpText, int32_t nLength) { GetText(wsText, 0, GetTextBufLength()); int32_t nSelIndex = 0; @@ -1180,15 +1180,15 @@ void CFDE_TxtEdtEngine::GetPreInsertText(CFX_WideString &wsText, int32_t nIndex, } CFX_WideString wsTemp; int32_t nOldLength = wsText.GetLength(); - FX_LPCWSTR pOldBuffer = FX_LPCWSTR(wsText); - FX_LPWSTR lpBuffer = wsTemp.GetBuffer(nOldLength + nLength); + const FX_WCHAR* pOldBuffer = wsText.c_str(); + FX_WCHAR* lpBuffer = wsTemp.GetBuffer(nOldLength + nLength); FXSYS_memcpy(lpBuffer, pOldBuffer, (nIndex) * sizeof(FX_WCHAR)); FXSYS_memcpy(lpBuffer + nIndex, lpText, nLength * sizeof(FX_WCHAR)); FXSYS_memcpy(lpBuffer + nIndex + nLength, pOldBuffer + nIndex, (nOldLength - nIndex) * sizeof(FX_WCHAR)); wsTemp.ReleaseBuffer(nOldLength + nLength); wsText = wsTemp; } -void CFDE_TxtEdtEngine::GetPreReplaceText(CFX_WideString &wsText, int32_t nIndex, int32_t nOriginLength, FX_LPCWSTR lpText, int32_t nLength) +void CFDE_TxtEdtEngine::GetPreReplaceText(CFX_WideString &wsText, int32_t nIndex, int32_t nOriginLength, const FX_WCHAR* lpText, int32_t nLength) { GetText(wsText, 0, GetTextBufLength()); int32_t nSelIndex = 0; @@ -1204,7 +1204,7 @@ void CFDE_TxtEdtEngine::GetPreReplaceText(CFX_WideString &wsText, int32_t nIndex wsText.Insert(nIndex ++, lpText[i]); } } -void CFDE_TxtEdtEngine::Inner_Insert(int32_t nStart, FX_LPCWSTR lpText, int32_t nLength) +void CFDE_TxtEdtEngine::Inner_Insert(int32_t nStart, const FX_WCHAR* lpText, int32_t nLength) { FXSYS_assert(nLength > 0); FDE_TXTEDTPARAGPOS ParagPos; @@ -1222,7 +1222,7 @@ void CFDE_TxtEdtEngine::Inner_Insert(int32_t nStart, FX_LPCWSTR lpText, int32_t int32_t nCutPart = pParag->m_nCharCount - ParagPos.nCharIndex; int32_t nTextStart = 0; FX_WCHAR wCurChar = L' '; - FX_LPCWSTR lpPos = lpText; + const FX_WCHAR* lpPos = lpText; FX_BOOL bFirst = TRUE; int32_t nParagIndex = ParagPos.nParagIndex; for (i = 0; i < nLength; i ++, lpPos ++) { @@ -1267,7 +1267,7 @@ void CFDE_TxtEdtEngine::Inner_Insert(int32_t nStart, FX_LPCWSTR lpText, int32_t UpdatePages(); } #ifdef FDE_USEFORMATBLOCK -void CFDE_TxtEdtEngine::RawInsert(int32_t nStart, FX_LPCWSTR lpText, int32_t nLength) +void CFDE_TxtEdtEngine::RawInsert(int32_t nStart, const FX_WCHAR* lpText, int32_t nLength) { FXSYS_assert(nLength > 0); FDE_TXTEDTPARAGPOS ParagPos; @@ -1284,7 +1284,7 @@ void CFDE_TxtEdtEngine::RawInsert(int32_t nStart, FX_LPCWSTR lpText, int32_t nLe int32_t nCutPart = pParag->m_nCharCount - ParagPos.nCharIndex; int32_t nTextStart = 0; FX_WCHAR wCurChar = L' '; - FX_LPCWSTR lpPos = lpText; + const FX_WCHAR* lpPos = lpText; FX_BOOL bFirst = TRUE; int32_t nParagIndex = ParagPos.nParagIndex; for (i = 0; i < nLength; i ++, lpPos ++) { @@ -1605,7 +1605,7 @@ void CFDE_TxtEdtEngine::UpdateTxtBreak() m_pTextBreak->SetHorizontalScale(m_Param.nHorzScale); m_pTextBreak->SetCharSpace(m_Param.fCharSpace); } -FX_BOOL CFDE_TxtEdtEngine::ReplaceParagEnd(FX_LPWSTR &lpText, int32_t &nLength, FX_BOOL bPreIsCR ) +FX_BOOL CFDE_TxtEdtEngine::ReplaceParagEnd(FX_WCHAR* &lpText, int32_t &nLength, FX_BOOL bPreIsCR ) { for (int32_t i = 0; i < nLength; i ++) { FX_WCHAR wc = lpText[i]; @@ -1656,17 +1656,17 @@ void CFDE_TxtEdtEngine::RecoverParagEnd(CFX_WideString &wsText) CFX_ArrayTemplate PosArr; int32_t nLength = wsText.GetLength(); int32_t i = 0; - FX_LPWSTR lpPos = (FX_LPWSTR)(FX_LPCWSTR)wsText; + FX_WCHAR* lpPos = (FX_WCHAR*)(const FX_WCHAR*)wsText; for (i = 0; i < nLength; i ++, lpPos ++) { if (*lpPos == m_wLineEnd) { *lpPos = wc; PosArr.Add(i); } } - FX_LPCWSTR lpSrcBuf = FX_LPCWSTR(wsText); + const FX_WCHAR* lpSrcBuf = wsText.c_str(); CFX_WideString wsTemp; int32_t nCount = PosArr.GetSize(); - FX_LPWSTR lpDstBuf = wsTemp.GetBuffer(nLength + nCount); + FX_WCHAR* lpDstBuf = wsTemp.GetBuffer(nLength + nCount); int32_t nDstPos = 0; int32_t nSrcPos = 0; for (i = 0; i < nCount; i ++) { @@ -1685,7 +1685,7 @@ void CFDE_TxtEdtEngine::RecoverParagEnd(CFX_WideString &wsText) wsText = wsTemp; } else { int32_t nLength = wsText.GetLength(); - FX_LPWSTR lpBuf = (FX_LPWSTR)(FX_LPCWSTR)wsText; + FX_WCHAR* lpBuf = (FX_WCHAR*)(const FX_WCHAR*)wsText; for (int32_t i = 0; i < nLength; i ++, lpBuf++) { if (*lpBuf == m_wLineEnd) { *lpBuf = wc; @@ -2398,7 +2398,7 @@ void CFDE_TxtEdtEngine::DeleteSelect() } IFDE_TxtEdtDoRecord * IFDE_TxtEdtDoRecord::Create(FX_BSTR bsDoRecord) { - FX_LPCSTR lpBuf = bsDoRecord.GetCStr(); + const FX_CHAR* lpBuf = bsDoRecord.GetCStr(); int32_t nType = *((int32_t*)lpBuf); switch(nType) { case FDE_TXTEDT_DORECORD_INS: @@ -2424,13 +2424,13 @@ CFDE_TxtEdtDoRecord_Insert::CFDE_TxtEdtDoRecord_Insert(FX_BSTR bsDoRecord) } CFDE_TxtEdtDoRecord_Insert::CFDE_TxtEdtDoRecord_Insert(CFDE_TxtEdtEngine * pEngine, int32_t nCaret, - FX_LPCWSTR lpText, + const FX_WCHAR* lpText, int32_t nLength) : m_pEngine(pEngine) , m_nCaret(nCaret) { FXSYS_assert(pEngine); - FX_LPWSTR lpBuffer = m_wsInsert.GetBuffer(nLength); + FX_WCHAR* lpBuffer = m_wsInsert.GetBuffer(nLength); FXSYS_memcpy(lpBuffer, lpText, nLength * sizeof(FX_WCHAR)); m_wsInsert.ReleaseBuffer(); } @@ -2456,7 +2456,7 @@ FX_BOOL CFDE_TxtEdtDoRecord_Insert::Undo() } FX_BOOL CFDE_TxtEdtDoRecord_Insert::Redo() { - m_pEngine->Inner_Insert(m_nCaret, FX_LPCWSTR(m_wsInsert), m_wsInsert.GetLength()); + m_pEngine->Inner_Insert(m_nCaret, m_wsInsert.c_str(), m_wsInsert.GetLength()); FDE_TXTEDTPARAMS& Param = m_pEngine->m_Param; m_pEngine->m_ChangeInfo.nChangeType = FDE_TXTEDT_TEXTCHANGE_TYPE_Insert; m_pEngine->m_ChangeInfo.wsDelete = m_wsInsert; @@ -2472,14 +2472,14 @@ void CFDE_TxtEdtDoRecord_Insert::Serialize(CFX_ByteString &bsDoRecord) const ArchiveSaver << m_nCaret; ArchiveSaver << m_wsInsert; int32_t nLength = ArchiveSaver.GetLength(); - FX_LPCBYTE lpSrcBuf = ArchiveSaver.GetBuffer(); - FX_LPSTR lpDstBuf = bsDoRecord.GetBuffer(nLength); + const uint8_t* lpSrcBuf = ArchiveSaver.GetBuffer(); + FX_CHAR* lpDstBuf = bsDoRecord.GetBuffer(nLength); FXSYS_memcpy(lpDstBuf, lpSrcBuf, nLength); bsDoRecord.ReleaseBuffer(nLength); } void CFDE_TxtEdtDoRecord_Insert::Deserialize(FX_BSTR bsDoRecord) { - CFX_ArchiveLoader ArchiveLoader((FX_LPCBYTE)bsDoRecord.GetCStr(), bsDoRecord.GetLength()); + CFX_ArchiveLoader ArchiveLoader((const uint8_t*)bsDoRecord.GetCStr(), bsDoRecord.GetLength()); int32_t nType = 0; ArchiveLoader >> nType; FXSYS_assert(nType == FDE_TXTEDT_DORECORD_INS); @@ -2518,7 +2518,7 @@ FX_BOOL CFDE_TxtEdtDoRecord_DeleteRange::Undo() if (m_pEngine->IsSelect()) { m_pEngine->ClearSelection(); } - m_pEngine->Inner_Insert(m_nIndex, FX_LPCWSTR(m_wsRange), m_wsRange.GetLength()); + m_pEngine->Inner_Insert(m_nIndex, m_wsRange.c_str(), m_wsRange.GetLength()); if (m_bSel) { m_pEngine->AddSelRange(m_nIndex, m_wsRange.GetLength()); } @@ -2552,14 +2552,14 @@ void CFDE_TxtEdtDoRecord_DeleteRange::Serialize(CFX_ByteString &bsDoRecord) cons ArchiveSaver << m_nCaret; ArchiveSaver << m_wsRange; int32_t nLength = ArchiveSaver.GetLength(); - FX_LPCBYTE lpSrcBuf = ArchiveSaver.GetBuffer(); - FX_LPSTR lpDstBuf = bsDoRecord.GetBuffer(nLength); + const uint8_t* lpSrcBuf = ArchiveSaver.GetBuffer(); + FX_CHAR* lpDstBuf = bsDoRecord.GetBuffer(nLength); FXSYS_memcpy(lpDstBuf, lpSrcBuf, nLength); bsDoRecord.ReleaseBuffer(nLength); } void CFDE_TxtEdtDoRecord_DeleteRange::Deserialize(FX_BSTR bsDoRecord) { - CFX_ArchiveLoader ArchiveLoader((FX_LPCBYTE)bsDoRecord.GetCStr(), bsDoRecord.GetLength()); + CFX_ArchiveLoader ArchiveLoader((const uint8_t*)bsDoRecord.GetCStr(), bsDoRecord.GetLength()); int32_t nType = 0; ArchiveLoader >> nType; FXSYS_assert(nType == FDE_TXTEDT_DORECORD_DEL); @@ -2644,14 +2644,14 @@ void CFDE_TxtEdtDoRecord_FieldInsert::Serialize(CFX_ByteString &bsDoRecord) cons ArchiveSaver << m_wsIns; ArchiveSaver << m_bSel; int32_t nLength = ArchiveSaver.GetLength(); - FX_LPCBYTE lpSrcBuf = ArchiveSaver.GetBuffer(); - FX_LPSTR lpDstBuf = bsDoRecord.GetBuffer(nLength); + const uint8_t* lpSrcBuf = ArchiveSaver.GetBuffer(); + FX_CHAR* lpDstBuf = bsDoRecord.GetBuffer(nLength); FXSYS_memcpy(lpDstBuf, lpSrcBuf, nLength); bsDoRecord.ReleaseBuffer(nLength); } void CFDE_TxtEdtDoRecord_FieldInsert::Deserialize(FX_BSTR bsDoRecord) { - CFX_ArchiveLoader ArchiveLoader((FX_LPCBYTE)bsDoRecord.GetCStr(), bsDoRecord.GetLength()); + CFX_ArchiveLoader ArchiveLoader((const uint8_t*)bsDoRecord.GetCStr(), bsDoRecord.GetLength()); int32_t nType = 0; ArchiveLoader >> nType; FXSYS_assert(nType == FDE_TXTEDT_DORECORD_FORMATINS); @@ -2741,14 +2741,14 @@ void CFDE_TxtEdtDoRecord_FieldDelete::Serialize(CFX_ByteString &bsDoRecord) cons ArchiveSaver << m_wsDel; ArchiveSaver << m_bSel; int32_t nLength = ArchiveSaver.GetLength(); - FX_LPCBYTE lpSrcBuf = ArchiveSaver.GetBuffer(); - FX_LPSTR lpDstBuf = bsDoRecord.GetBuffer(nLength); + const uint8_t* lpSrcBuf = ArchiveSaver.GetBuffer(); + FX_CHAR* lpDstBuf = bsDoRecord.GetBuffer(nLength); FXSYS_memcpy(lpDstBuf, lpSrcBuf, nLength); bsDoRecord.ReleaseBuffer(nLength); } void CFDE_TxtEdtDoRecord_FieldDelete::Deserialize(FX_BSTR bsDoRecord) { - CFX_ArchiveLoader ArchiveLoader((FX_LPCBYTE)bsDoRecord.GetCStr(), bsDoRecord.GetLength()); + CFX_ArchiveLoader ArchiveLoader((const uint8_t*)bsDoRecord.GetCStr(), bsDoRecord.GetLength()); int32_t nType = 0; ArchiveLoader >> nType; FXSYS_assert(nType == FDE_TXTEDT_DORECORD_FORMATDEL); @@ -2842,14 +2842,14 @@ void CFDE_TxtEdtDoRecord_FieldReplace::Serialize(CFX_ByteString &bsDoRecord) con ArchiveSaver << m_wsIns; ArchiveSaver << m_bSel; int32_t nLength = ArchiveSaver.GetLength(); - FX_LPCBYTE lpSrcBuf = ArchiveSaver.GetBuffer(); - FX_LPSTR lpDstBuf = bsDoRecord.GetBuffer(nLength); + const uint8_t* lpSrcBuf = ArchiveSaver.GetBuffer(); + FX_CHAR* lpDstBuf = bsDoRecord.GetBuffer(nLength); FXSYS_memcpy(lpDstBuf, lpSrcBuf, nLength); bsDoRecord.ReleaseBuffer(nLength); } void CFDE_TxtEdtDoRecord_FieldReplace::Deserialize(FX_BSTR bsDoRecord) { - CFX_ArchiveLoader ArchiveLoader((FX_LPCBYTE)bsDoRecord.GetCStr(), bsDoRecord.GetLength()); + CFX_ArchiveLoader ArchiveLoader((const uint8_t*)bsDoRecord.GetCStr(), bsDoRecord.GetLength()); int32_t nType = 0; ArchiveLoader >> nType; FXSYS_assert(nType == FDE_TXTEDT_DORECORD_FORMATREP); diff --git a/xfa/src/fee/src/fee/fde_txtedtengine.h b/xfa/src/fee/src/fee/fde_txtedtengine.h index 43a98fa7db..9b555131f6 100644 --- a/xfa/src/fee/src/fee/fde_txtedtengine.h +++ b/xfa/src/fee/src/fee/fde_txtedtengine.h @@ -83,7 +83,7 @@ public: virtual void Unlock(); virtual FX_BOOL IsLocked() const; - virtual int32_t Insert(int32_t nStart, FX_LPCWSTR lpText, int32_t nLength); + virtual int32_t Insert(int32_t nStart, const FX_WCHAR* lpText, int32_t nLength); virtual int32_t Delete(int32_t nStart, FX_BOOL bBackspace = FALSE); virtual int32_t DeleteRange(int32_t nStart, int32_t nCount = -1); virtual int32_t Replace(int32_t nStart, int32_t nLength, const CFX_WideString &wsReplace); @@ -132,13 +132,13 @@ public: protected: virtual ~CFDE_TxtEdtEngine(); private: - void Inner_Insert(int32_t nStart, FX_LPCWSTR lpText, int32_t nLength); + void Inner_Insert(int32_t nStart, const FX_WCHAR* lpText, int32_t nLength); #ifdef FDE_USEFORMATBLOCK - void RawInsert(int32_t nStart, FX_LPCWSTR lpText, int32_t nLength); + void RawInsert(int32_t nStart, const FX_WCHAR* lpText, int32_t nLength); #endif void GetPreDeleteText(CFX_WideString &wsText, int32_t nIndex, int32_t nLength); - void GetPreInsertText(CFX_WideString &wsText, int32_t nIndex, FX_LPCWSTR lpText, int32_t nLength); - void GetPreReplaceText(CFX_WideString &wsText, int32_t nIndex, int32_t nOriginLength, FX_LPCWSTR lpText, int32_t nLength); + void GetPreInsertText(CFX_WideString &wsText, int32_t nIndex, const FX_WCHAR* lpText, int32_t nLength); + void GetPreReplaceText(CFX_WideString &wsText, int32_t nIndex, int32_t nOriginLength, const FX_WCHAR* lpText, int32_t nLength); void Inner_DeleteRange(int32_t nStart, int32_t nCount = -1); void DeleteRange_DoRecord(int32_t nStart, int32_t nCount, FX_BOOL bSel = FALSE); @@ -150,7 +150,7 @@ private: void UpdatePages(); void UpdateTxtBreak(); - FX_BOOL ReplaceParagEnd(FX_LPWSTR &lpText, int32_t &nLength, FX_BOOL bPreIsCR = FALSE); + FX_BOOL ReplaceParagEnd(FX_WCHAR* &lpText, int32_t &nLength, FX_BOOL bPreIsCR = FALSE); void RecoverParagEnd(CFX_WideString &wsText); int32_t MovePage2Char(int32_t nIndex); void TextPos2ParagPos(int32_t nIndex, FDE_TXTEDTPARAGPOS &ParagPos) const; @@ -203,7 +203,7 @@ public: CFDE_TxtEdtDoRecord_Insert(FX_BSTR bsDoRecord); CFDE_TxtEdtDoRecord_Insert( CFDE_TxtEdtEngine * pEngine, int32_t nCaret, - FX_LPCWSTR lpText, + const FX_WCHAR* lpText, int32_t nLength); virtual void Release(); virtual FX_BOOL Undo(); diff --git a/xfa/src/fee/src/fee/fde_txtedtpage.cpp b/xfa/src/fee/src/fee/fde_txtedtpage.cpp index 30b4d1bf3e..894245d615 100644 --- a/xfa/src/fee/src/fee/fde_txtedtpage.cpp +++ b/xfa/src/fee/src/fee/fde_txtedtpage.cpp @@ -49,9 +49,9 @@ FX_BOOL CFDE_TxtEdtTextSet::GetClip(FDE_HVISUALOBJ hVisualObj, CFX_RectF &rt) int32_t CFDE_TxtEdtTextSet::GetString(FDE_HVISUALOBJ hText, CFX_WideString &wsText) { FDE_LPTEXTEDITPIECE pPiece = (FDE_LPTEXTEDITPIECE)hText; - FX_LPWSTR pBuffer = wsText.GetBuffer(pPiece->nCount); + FX_WCHAR* pBuffer = wsText.GetBuffer(pPiece->nCount); for (int32_t i = 0; i < pPiece->nCount; i++) { - pBuffer[i] = m_pPage->GetChar((FX_LPVOID)hText, i); + pBuffer[i] = m_pPage->GetChar((void*)hText, i); } wsText.ReleaseBuffer(pPiece->nCount); return pPiece->nCount; @@ -84,7 +84,7 @@ int32_t CFDE_TxtEdtTextSet::GetDisplayPos(FDE_HVISUALOBJ hText, FXTEXT_CHARPOS * FX_DWORD dwLayoutStyle = pBreak->GetLayoutStyles(); FX_TXTRUN tr; tr.pAccess = m_pPage; - tr.pIdentity = (FX_LPVOID)hText; + tr.pIdentity = (void*)hText; tr.pStr = NULL; tr.pWidths = NULL; tr.iLength = nLength; @@ -116,7 +116,7 @@ int32_t CFDE_TxtEdtTextSet::GetCharRects_Impl(FDE_HVISUALOBJ hText, CFX_RectFArr FX_DWORD dwLayoutStyle = pEngine->GetTextBreak()->GetLayoutStyles(); FX_TXTRUN tr; tr.pAccess = m_pPage; - tr.pIdentity = (FX_LPVOID)hText; + tr.pIdentity = (void*)hText; tr.pStr = NULL; tr.pWidths = NULL; tr.iLength = nLength; @@ -614,7 +614,7 @@ FDE_HVISUALOBJ CFDE_TxtEdtPage::GetParentCanvas(FDE_HVISUALOBJ hCanvas, IFDE_Vis { return NULL; } -FX_WCHAR CFDE_TxtEdtPage::GetChar(FX_LPVOID pIdentity, int32_t index) const +FX_WCHAR CFDE_TxtEdtPage::GetChar(void* pIdentity, int32_t index) const { int32_t nIndex = m_nPageStart + ((FDE_LPTEXTEDITPIECE)pIdentity)->nStart + index; if (nIndex != m_pIter->GetAt()) { @@ -624,7 +624,7 @@ FX_WCHAR CFDE_TxtEdtPage::GetChar(FX_LPVOID pIdentity, int32_t index) const m_pIter->Next(); return wChar; } -int32_t CFDE_TxtEdtPage::GetWidth(FX_LPVOID pIdentity, int32_t index) const +int32_t CFDE_TxtEdtPage::GetWidth(void* pIdentity, int32_t index) const { int32_t nWidth = m_pCharWidth[((FDE_LPTEXTEDITPIECE)pIdentity)->nStart + index]; return nWidth; diff --git a/xfa/src/fee/src/fee/fde_txtedtpage.h b/xfa/src/fee/src/fee/fde_txtedtpage.h index b2854d4afb..1f5cae2153 100644 --- a/xfa/src/fee/src/fee/fde_txtedtpage.h +++ b/xfa/src/fee/src/fee/fde_txtedtpage.h @@ -102,8 +102,8 @@ public: virtual FX_POSITION GetFirstPosition(FDE_HVISUALOBJ hCanvas); virtual FDE_HVISUALOBJ GetNext(FDE_HVISUALOBJ hCanvas, FX_POSITION &pos, IFDE_VisualSet *&pVisualSet); virtual FDE_HVISUALOBJ GetParentCanvas(FDE_HVISUALOBJ hCanvas, IFDE_VisualSet *&pVisualSet); - virtual FX_WCHAR GetChar(FX_LPVOID pIdentity, int32_t index) const; - virtual int32_t GetWidth(FX_LPVOID pIdentity, int32_t index) const; + virtual FX_WCHAR GetChar(void* pIdentity, int32_t index) const; + virtual int32_t GetWidth(void* pIdentity, int32_t index) const; protected: virtual ~CFDE_TxtEdtPage(); private: diff --git a/xfa/src/fee/src/fee/fde_txtedtparag.h b/xfa/src/fee/src/fee/fde_txtedtparag.h index aca5d8febc..934dd5405d 100644 --- a/xfa/src/fee/src/fee/fde_txtedtparag.h +++ b/xfa/src/fee/src/fee/fde_txtedtparag.h @@ -33,7 +33,7 @@ public: int32_t m_nCharCount; int32_t m_nLineCount; private: - FX_LPVOID m_lpData; + void* m_lpData; CFDE_TxtEdtEngine* m_pEngine; }; #endif diff --git a/xfa/src/fee/src/fx_wordbreak/fx_wordbreak_impl.cpp b/xfa/src/fee/src/fx_wordbreak/fx_wordbreak_impl.cpp index ff8dafcf0f..1fad023bbf 100644 --- a/xfa/src/fee/src/fx_wordbreak/fx_wordbreak_impl.cpp +++ b/xfa/src/fee/src/fx_wordbreak/fx_wordbreak_impl.cpp @@ -144,7 +144,7 @@ void CFX_WordBreak::GetWord(CFX_WideString &wsWord) const if (nWordLength <= 0) { return; } - FX_LPWSTR lpBuf = wsWord.GetBuffer(nWordLength); + FX_WCHAR* lpBuf = wsWord.GetBuffer(nWordLength); IFX_CharIter * pTempIter = m_pPreIter->Clone(); int32_t i = 0; while (pTempIter->GetAt() <= m_pCurIter->GetAt()) { diff --git a/xfa/src/fgas/include/fx_alg.h b/xfa/src/fgas/include/fx_alg.h index 0ee8508083..65403ec7da 100644 --- a/xfa/src/fgas/include/fx_alg.h +++ b/xfa/src/fgas/include/fx_alg.h @@ -10,11 +10,11 @@ #ifdef __cplusplus extern "C" { #endif -int32_t FX_Base64EncodeA(FX_LPCBYTE pSrc, int32_t iSrcLen, FX_LPSTR pDst); -int32_t FX_Base64DecodeA(FX_LPCSTR pSrc, int32_t iSrcLen, FX_LPBYTE pDst); -int32_t FX_Base64DecodeW(FX_LPCWSTR pSrc, int32_t iSrcLen, FX_LPBYTE pDst); +int32_t FX_Base64EncodeA(const uint8_t* pSrc, int32_t iSrcLen, FX_CHAR* pDst); +int32_t FX_Base64DecodeA(const FX_CHAR* pSrc, int32_t iSrcLen, uint8_t* pDst); +int32_t FX_Base64DecodeW(const FX_WCHAR* pSrc, int32_t iSrcLen, uint8_t* pDst); uint8_t FX_Hex2Dec(uint8_t hexHigh, uint8_t hexLow); -int32_t FX_SeparateStringW(FX_LPCWSTR pStr, int32_t iStrLen, FX_WCHAR delimiter, CFX_WideStringArray &pieces); +int32_t FX_SeparateStringW(const FX_WCHAR* pStr, int32_t iStrLen, FX_WCHAR delimiter, CFX_WideStringArray &pieces); #ifdef __cplusplus }; #endif diff --git a/xfa/src/fgas/include/fx_cpg.h b/xfa/src/fgas/include/fx_cpg.h index 2556426dbc..0b58727fa3 100644 --- a/xfa/src/fgas/include/fx_cpg.h +++ b/xfa/src/fgas/include/fx_cpg.h @@ -132,17 +132,17 @@ class IFX_CodePage; #define FX_CHARSET_OEM 255 FX_WORD FX_GetCodePageFromCharset(uint8_t charset); FX_WORD FX_GetCharsetFromCodePage(FX_WORD codepage); -FX_WORD FX_GetCodePageFromStringA(FX_LPCSTR pStr, int32_t iLength); -FX_WORD FX_GetCodePageFormStringW(FX_LPCWSTR pStr, int32_t iLength); +FX_WORD FX_GetCodePageFromStringA(const FX_CHAR* pStr, int32_t iLength); +FX_WORD FX_GetCodePageFormStringW(const FX_WCHAR* pStr, int32_t iLength); FX_WORD FX_GetDefCodePageByLanguage(FX_WORD wLanguage); -void FX_SwapByteOrder(FX_LPWSTR pStr, int32_t iLength); -void FX_SwapByteOrderCopy(FX_LPCWSTR pSrc, FX_LPWSTR pDst, int32_t iLength); -void FX_UTF16ToWChar(FX_LPVOID pBuffer, int32_t iLength); -void FX_UTF16ToWCharCopy(const FX_WORD *pUTF16, FX_LPWSTR pWChar, int32_t iLength); -void FX_WCharToUTF16(FX_LPVOID pBuffer, int32_t iLength); -void FX_WCharToUTF16Copy(FX_LPCWSTR pWChar, FX_WORD *pUTF16, int32_t iLength); -int32_t FX_DecodeString(FX_WORD wCodePage, FX_LPCSTR pSrc, int32_t *pSrcLen, FX_LPWSTR pDst, int32_t *pDstLen, FX_BOOL bErrBreak = FALSE); -int32_t FX_UTF8Decode(FX_LPCSTR pSrc, int32_t *pSrcLen, FX_LPWSTR pDst, int32_t *pDstLen); +void FX_SwapByteOrder(FX_WCHAR* pStr, int32_t iLength); +void FX_SwapByteOrderCopy(const FX_WCHAR* pSrc, FX_WCHAR* pDst, int32_t iLength); +void FX_UTF16ToWChar(void* pBuffer, int32_t iLength); +void FX_UTF16ToWCharCopy(const FX_WORD *pUTF16, FX_WCHAR* pWChar, int32_t iLength); +void FX_WCharToUTF16(void* pBuffer, int32_t iLength); +void FX_WCharToUTF16Copy(const FX_WCHAR* pWChar, FX_WORD *pUTF16, int32_t iLength); +int32_t FX_DecodeString(FX_WORD wCodePage, const FX_CHAR* pSrc, int32_t *pSrcLen, FX_WCHAR* pDst, int32_t *pDstLen, FX_BOOL bErrBreak = FALSE); +int32_t FX_UTF8Decode(const FX_CHAR* pSrc, int32_t *pSrcLen, FX_WCHAR* pDst, int32_t *pDstLen); enum FX_CODESYSTEM { FX_MBCS = 0, FX_SBCS , @@ -177,7 +177,7 @@ typedef struct _FX_CPCU_MAPTABLE2 { typedef struct _FX_CPCU_MAPINFO { FX_CPCU_MAPTABLE1 *pMapTable1; FX_CPCU_MAPTABLE2 *pMapTable2; - FX_LPCBYTE pMapData; + const uint8_t* pMapData; } FX_CPCU_MAPINFO; typedef struct _FX_CPUC_MAPTABLE { uint16_t uStartUnicode; @@ -188,7 +188,7 @@ typedef struct _FX_CPUC_MAPTABLE { typedef struct _FX_CPUC_MAPINFO { uint32_t uMapCount; FX_CPUC_MAPTABLE *pMapTable; - FX_LPCBYTE pMapData; + const uint8_t* pMapData; } FX_CPUC_MAPINFO; typedef struct _FX_CODEPAGE { FX_CODEPAGE_HEADER const *pCPHeader; diff --git a/xfa/src/fgas/include/fx_fnt.h b/xfa/src/fgas/include/fx_fnt.h index 85d6e3edff..6b328d9741 100644 --- a/xfa/src/fgas/include/fx_fnt.h +++ b/xfa/src/fgas/include/fx_fnt.h @@ -45,9 +45,9 @@ public: class IFX_Font { public: - static IFX_Font* LoadFont(FX_LPCWSTR pszFontFamily, FX_DWORD dwFontStyles, FX_WORD wCodePage, IFX_FontMgr *pFontMgr); - static IFX_Font* LoadFont(FX_LPCBYTE pBuffer, int32_t iLength, IFX_FontMgr *pFontMgr); - static IFX_Font* LoadFont(FX_LPCWSTR pszFileName, IFX_FontMgr *pFontMgr); + static IFX_Font* LoadFont(const FX_WCHAR* pszFontFamily, FX_DWORD dwFontStyles, FX_WORD wCodePage, IFX_FontMgr *pFontMgr); + static IFX_Font* LoadFont(const uint8_t* pBuffer, int32_t iLength, IFX_FontMgr *pFontMgr); + static IFX_Font* LoadFont(const FX_WCHAR* pszFileName, IFX_FontMgr *pFontMgr); static IFX_Font* LoadFont(IFX_Stream *pFontStream, IFX_FontMgr *pFontMgr, FX_BOOL bSaveStream = FALSE); static IFX_Font* LoadFont(CFX_Font *pExtFont, IFX_FontMgr *pFontMgr, FX_BOOL bTakeOver = FALSE); virtual void Release() = 0; @@ -74,7 +74,7 @@ public: }; #if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_ typedef struct _FX_FONTMATCHPARAMS { - FX_LPCWSTR pwsFamily; + const FX_WCHAR* pwsFamily; FX_DWORD dwFontStyles; FX_DWORD dwUSB; FX_DWORD dwMatchFlags; @@ -104,23 +104,23 @@ inline FX_BOOL operator == (const FX_FONTDESCRIPTOR &left, const FX_FONTDESCRIPT #define FX_FONTMATCHPARA_MacthStyle 0x01 #define FX_FONTMATCHPARA_MacthFamily 0x02 #define FX_FONTMATCHPARA_MacthUnicode 0x04 -typedef void (*FX_LPEnumAllFonts)(CFX_FontDescriptors &fonts, FX_LPVOID pUserData, FX_LPCWSTR pwsFaceName, FX_WCHAR wUnicode); +typedef void (*FX_LPEnumAllFonts)(CFX_FontDescriptors &fonts, void* pUserData, const FX_WCHAR* pwsFaceName, FX_WCHAR wUnicode); FX_LPEnumAllFonts FX_GetDefFontEnumerator(); -typedef FX_LPCFONTDESCRIPTOR (*FX_LPMatchFont)(FX_LPFONTMATCHPARAMS pParams, const CFX_FontDescriptors &fonts, FX_LPVOID pUserData); +typedef FX_LPCFONTDESCRIPTOR (*FX_LPMatchFont)(FX_LPFONTMATCHPARAMS pParams, const CFX_FontDescriptors &fonts, void* pUserData); FX_LPMatchFont FX_GetDefFontMatchor(); class IFX_FontMgr { public: - static IFX_FontMgr* Create(FX_LPEnumAllFonts pEnumerator, FX_LPMatchFont pMatcher = NULL, FX_LPVOID pUserData = NULL); + static IFX_FontMgr* Create(FX_LPEnumAllFonts pEnumerator, FX_LPMatchFont pMatcher = NULL, void* pUserData = NULL); virtual void Release() = 0; - virtual IFX_Font* GetDefFontByCodePage(FX_WORD wCodePage, FX_DWORD dwFontStyles, FX_LPCWSTR pszFontFamily = NULL) = 0; - virtual IFX_Font* GetDefFontByCharset(uint8_t nCharset, FX_DWORD dwFontStyles, FX_LPCWSTR pszFontFamily = NULL) = 0; - virtual IFX_Font* GetDefFontByUnicode(FX_WCHAR wUnicode, FX_DWORD dwFontStyles, FX_LPCWSTR pszFontFamily = NULL) = 0; - virtual IFX_Font* GetDefFontByLanguage(FX_WORD wLanguage, FX_DWORD dwFontStyles, FX_LPCWSTR pszFontFamily = NULL) = 0; - virtual IFX_Font* LoadFont(FX_LPCWSTR pszFontFamily, FX_DWORD dwFontStyles, FX_WORD wCodePage = 0xFFFF) = 0; - virtual IFX_Font* LoadFont(FX_LPCBYTE pBuffer, int32_t iLength) = 0; - virtual IFX_Font* LoadFont(FX_LPCWSTR pszFileName) = 0; - virtual IFX_Font* LoadFont(IFX_Stream *pFontStream, FX_LPCWSTR pszFontAlias = NULL, FX_DWORD dwFontStyles = 0, FX_WORD wCodePage = 0, FX_BOOL bSaveStream = FALSE) = 0; + virtual IFX_Font* GetDefFontByCodePage(FX_WORD wCodePage, FX_DWORD dwFontStyles, const FX_WCHAR* pszFontFamily = NULL) = 0; + virtual IFX_Font* GetDefFontByCharset(uint8_t nCharset, FX_DWORD dwFontStyles, const FX_WCHAR* pszFontFamily = NULL) = 0; + virtual IFX_Font* GetDefFontByUnicode(FX_WCHAR wUnicode, FX_DWORD dwFontStyles, const FX_WCHAR* pszFontFamily = NULL) = 0; + virtual IFX_Font* GetDefFontByLanguage(FX_WORD wLanguage, FX_DWORD dwFontStyles, const FX_WCHAR* pszFontFamily = NULL) = 0; + virtual IFX_Font* LoadFont(const FX_WCHAR* pszFontFamily, FX_DWORD dwFontStyles, FX_WORD wCodePage = 0xFFFF) = 0; + virtual IFX_Font* LoadFont(const uint8_t* pBuffer, int32_t iLength) = 0; + virtual IFX_Font* LoadFont(const FX_WCHAR* pszFileName) = 0; + virtual IFX_Font* LoadFont(IFX_Stream *pFontStream, const FX_WCHAR* pszFontAlias = NULL, FX_DWORD dwFontStyles = 0, FX_WORD wCodePage = 0, FX_BOOL bSaveStream = FALSE) = 0; virtual IFX_Font* LoadFont(IFX_Font *pSrcFont, FX_DWORD dwFontStyles, FX_WORD wCodePage = 0xFFFF) = 0; virtual void ClearFontCache() = 0; virtual void RemoveFont(IFX_Font *pFont) = 0; @@ -129,38 +129,38 @@ public: class IFX_FontMgrDelegate { public: - virtual IFX_Font* GetDefFontByCodePage(IFX_FontMgr* pFontMgr, FX_WORD wCodePage, FX_DWORD dwFontStyles, FX_LPCWSTR pszFontFamily = NULL) = 0; - virtual IFX_Font* GetDefFontByCharset(IFX_FontMgr* pFontMgr, uint8_t nCharset, FX_DWORD dwFontStyles, FX_LPCWSTR pszFontFamily = NULL) = 0; - virtual IFX_Font* GetDefFontByUnicode(IFX_FontMgr* pFontMgr, FX_WCHAR wUnicode, FX_DWORD dwFontStyles, FX_LPCWSTR pszFontFamily = NULL) = 0; - virtual IFX_Font* GetDefFontByLanguage(IFX_FontMgr* pFontMgr, FX_WORD wLanguage, FX_DWORD dwFontStyles, FX_LPCWSTR pszFontFamily = NULL) = 0; + virtual IFX_Font* GetDefFontByCodePage(IFX_FontMgr* pFontMgr, FX_WORD wCodePage, FX_DWORD dwFontStyles, const FX_WCHAR* pszFontFamily = NULL) = 0; + virtual IFX_Font* GetDefFontByCharset(IFX_FontMgr* pFontMgr, uint8_t nCharset, FX_DWORD dwFontStyles, const FX_WCHAR* pszFontFamily = NULL) = 0; + virtual IFX_Font* GetDefFontByUnicode(IFX_FontMgr* pFontMgr, FX_WCHAR wUnicode, FX_DWORD dwFontStyles, const FX_WCHAR* pszFontFamily = NULL) = 0; + virtual IFX_Font* GetDefFontByLanguage(IFX_FontMgr* pFontMgr, FX_WORD wLanguage, FX_DWORD dwFontStyles, const FX_WCHAR* pszFontFamily = NULL) = 0; }; class IFX_FontSourceEnum { public: virtual void Release() = 0; - virtual FX_POSITION GetStartPosition(FX_LPVOID pUserData = NULL) = 0; - virtual IFX_FileAccess* GetNext(FX_POSITION& pos, FX_LPVOID pUserData = NULL) = 0; + virtual FX_POSITION GetStartPosition(void* pUserData = NULL) = 0; + virtual IFX_FileAccess* GetNext(FX_POSITION& pos, void* pUserData = NULL) = 0; }; IFX_FontSourceEnum* FX_CreateDefaultFontSourceEnum(); class IFX_FontMgr { public: - static IFX_FontMgr* Create(IFX_FontSourceEnum* pFontEnum, IFX_FontMgrDelegate* pDelegate = NULL, FX_LPVOID pUserData = NULL); + static IFX_FontMgr* Create(IFX_FontSourceEnum* pFontEnum, IFX_FontMgrDelegate* pDelegate = NULL, void* pUserData = NULL); virtual void Release() = 0; - virtual IFX_Font* GetDefFontByCodePage(FX_WORD wCodePage, FX_DWORD dwFontStyles, FX_LPCWSTR pszFontFamily = NULL) = 0; - virtual IFX_Font* GetDefFontByCharset(uint8_t nCharset, FX_DWORD dwFontStyles, FX_LPCWSTR pszFontFamily = NULL) = 0; - virtual IFX_Font* GetDefFontByUnicode(FX_WCHAR wUnicode, FX_DWORD dwFontStyles, FX_LPCWSTR pszFontFamily = NULL) = 0; - virtual IFX_Font* GetDefFontByLanguage(FX_WORD wLanguage, FX_DWORD dwFontStyles, FX_LPCWSTR pszFontFamily = NULL) = 0; - virtual IFX_Font* GetFontByCodePage(FX_WORD wCodePage, FX_DWORD dwFontStyles, FX_LPCWSTR pszFontFamily = NULL) = 0; - inline IFX_Font* LoadFont(FX_LPCWSTR pszFontFamily, FX_DWORD dwFontStyles, FX_WORD wCodePage) + virtual IFX_Font* GetDefFontByCodePage(FX_WORD wCodePage, FX_DWORD dwFontStyles, const FX_WCHAR* pszFontFamily = NULL) = 0; + virtual IFX_Font* GetDefFontByCharset(uint8_t nCharset, FX_DWORD dwFontStyles, const FX_WCHAR* pszFontFamily = NULL) = 0; + virtual IFX_Font* GetDefFontByUnicode(FX_WCHAR wUnicode, FX_DWORD dwFontStyles, const FX_WCHAR* pszFontFamily = NULL) = 0; + virtual IFX_Font* GetDefFontByLanguage(FX_WORD wLanguage, FX_DWORD dwFontStyles, const FX_WCHAR* pszFontFamily = NULL) = 0; + virtual IFX_Font* GetFontByCodePage(FX_WORD wCodePage, FX_DWORD dwFontStyles, const FX_WCHAR* pszFontFamily = NULL) = 0; + inline IFX_Font* LoadFont(const FX_WCHAR* pszFontFamily, FX_DWORD dwFontStyles, FX_WORD wCodePage) { return GetFontByCodePage(wCodePage, dwFontStyles, pszFontFamily); } - virtual IFX_Font* GetFontByCharset(uint8_t nCharset, FX_DWORD dwFontStyles, FX_LPCWSTR pszFontFamily = NULL) = 0; - virtual IFX_Font* GetFontByUnicode(FX_WCHAR wUnicode, FX_DWORD dwFontStyles, FX_LPCWSTR pszFontFamily = NULL) = 0; - virtual IFX_Font* GetFontByLanguage(FX_WORD wLanguage, FX_DWORD dwFontStyles, FX_LPCWSTR pszFontFamily = NULL) = 0; - virtual IFX_Font* LoadFont(FX_LPCBYTE pBuffer, int32_t iLength, int32_t iFaceIndex, int32_t* pFaceCount = NULL) = 0; - virtual IFX_Font* LoadFont(FX_LPCWSTR pszFileName, int32_t iFaceIndex, int32_t* pFaceCount = NULL) = 0; + virtual IFX_Font* GetFontByCharset(uint8_t nCharset, FX_DWORD dwFontStyles, const FX_WCHAR* pszFontFamily = NULL) = 0; + virtual IFX_Font* GetFontByUnicode(FX_WCHAR wUnicode, FX_DWORD dwFontStyles, const FX_WCHAR* pszFontFamily = NULL) = 0; + virtual IFX_Font* GetFontByLanguage(FX_WORD wLanguage, FX_DWORD dwFontStyles, const FX_WCHAR* pszFontFamily = NULL) = 0; + virtual IFX_Font* LoadFont(const uint8_t* pBuffer, int32_t iLength, int32_t iFaceIndex, int32_t* pFaceCount = NULL) = 0; + virtual IFX_Font* LoadFont(const FX_WCHAR* pszFileName, int32_t iFaceIndex, int32_t* pFaceCount = NULL) = 0; virtual IFX_Font* LoadFont(IFX_Stream *pFontStream, int32_t iFaceIndex, int32_t* pFaceCount = NULL, FX_BOOL bSaveStream = FALSE) = 0; virtual void ClearFontCache() = 0; diff --git a/xfa/src/fgas/include/fx_lbk.h b/xfa/src/fgas/include/fx_lbk.h index f161bb4355..27a072a3b8 100644 --- a/xfa/src/fgas/include/fx_lbk.h +++ b/xfa/src/fgas/include/fx_lbk.h @@ -22,6 +22,6 @@ enum FX_LINEBREAKTYPE { #define FX_LBCP FX_LBT_COM_PROHIBITED_BRK #define FX_LBPB FX_LBT_PROHIBITED_BRK #define FX_LBHS FX_LBT_HANGUL_SPACE_BRK -void FX_GetLineBreakPositions(FX_LPCWSTR pwsText, FX_LINEBREAKTYPE *pBrkType, int32_t iLength); -void FX_GetLineBreakPositions(FX_LPCWSTR pwsText, int32_t iLength, CFX_Int32MassArray &bp); +void FX_GetLineBreakPositions(const FX_WCHAR* pwsText, FX_LINEBREAKTYPE *pBrkType, int32_t iLength); +void FX_GetLineBreakPositions(const FX_WCHAR* pwsText, int32_t iLength, CFX_Int32MassArray &bp); #endif diff --git a/xfa/src/fgas/include/fx_locale.h b/xfa/src/fgas/include/fx_locale.h index 7f4cce5776..ef6b910b00 100644 --- a/xfa/src/fgas/include/fx_locale.h +++ b/xfa/src/fgas/include/fx_locale.h @@ -79,7 +79,7 @@ public: virtual IFX_Locale* GetLocale(FX_WORD lcid) = 0; virtual IFX_Locale* GetLocaleByName(FX_WSTR wsLocaleName) = 0; }; -IFX_LocaleMgr* FX_LocaleMgr_Create(FX_LPCWSTR pszLocalPath, FX_WORD wDefaultLCID); +IFX_LocaleMgr* FX_LocaleMgr_Create(const FX_WCHAR* pszLocalPath, FX_WORD wDefaultLCID); void FX_ParseNumString(const CFX_WideString& wsNum, CFX_WideString& wsResult); FX_BOOL FX_DateFromCanonical(const CFX_WideString& wsDate, CFX_Unitime& datetime); FX_BOOL FX_TimeFromCanonical(FX_WSTR wsTime, CFX_Unitime& datetime, IFX_Locale* pLocale); diff --git a/xfa/src/fgas/include/fx_rbk.h b/xfa/src/fgas/include/fx_rbk.h index cff63ee490..282b6e37db 100644 --- a/xfa/src/fgas/include/fx_rbk.h +++ b/xfa/src/fgas/include/fx_rbk.h @@ -68,7 +68,7 @@ typedef struct _FX_RTFTEXTOBJ { iHorizontalScale = 100; iVerticalScale = 100; } - FX_LPCWSTR pStr; + const FX_WCHAR* pStr; int32_t *pWidths; int32_t iLength; IFX_Font *pFont; @@ -139,7 +139,7 @@ public: FXSYS_assert(index > -1 && index < m_iChars && m_pChars != NULL); return m_pChars->GetDataPtr(m_iStartChar + index); } - void GetString (FX_LPWSTR pText) const + void GetString (FX_WCHAR* pText) const { FXSYS_assert(pText != NULL); int32_t iEndChar = m_iStartChar + m_iChars; @@ -151,7 +151,7 @@ public: } void GetString(CFX_WideString &wsText) const { - FX_LPWSTR pText = wsText.GetBuffer(m_iChars); + FX_WCHAR* pText = wsText.GetBuffer(m_iChars); GetString(pText); wsText.ReleaseBuffer(m_iChars); } diff --git a/xfa/src/fgas/include/fx_sax.h b/xfa/src/fgas/include/fx_sax.h index e45ca4e6d8..a6122c48e5 100644 --- a/xfa/src/fgas/include/fx_sax.h +++ b/xfa/src/fgas/include/fx_sax.h @@ -27,13 +27,13 @@ enum FX_SAXNODE { class IFX_SAXReaderHandler { public: - virtual FX_LPVOID OnTagEnter(FX_BSTR bsTagName, FX_SAXNODE eType, FX_DWORD dwStartPos) = 0; - virtual void OnTagAttribute(FX_LPVOID pTag, FX_BSTR bsAttri, FX_BSTR bsValue) = 0; - virtual void OnTagBreak(FX_LPVOID pTag) = 0; - virtual void OnTagData(FX_LPVOID pTag, FX_SAXNODE eType, FX_BSTR bsData, FX_DWORD dwStartPos) = 0; - virtual void OnTagClose(FX_LPVOID pTag, FX_DWORD dwEndPos) = 0; - virtual void OnTagEnd(FX_LPVOID pTag, FX_BSTR bsTagName, FX_DWORD dwEndPos) = 0; - virtual void OnTargetData(FX_LPVOID pTag, FX_SAXNODE eType, FX_BSTR bsData, FX_DWORD dwStartPos) = 0; + virtual void* OnTagEnter(FX_BSTR bsTagName, FX_SAXNODE eType, FX_DWORD dwStartPos) = 0; + virtual void OnTagAttribute(void* pTag, FX_BSTR bsAttri, FX_BSTR bsValue) = 0; + virtual void OnTagBreak(void* pTag) = 0; + virtual void OnTagData(void* pTag, FX_SAXNODE eType, FX_BSTR bsData, FX_DWORD dwStartPos) = 0; + virtual void OnTagClose(void* pTag, FX_DWORD dwEndPos) = 0; + virtual void OnTagEnd(void* pTag, FX_BSTR bsTagName, FX_DWORD dwEndPos) = 0; + virtual void OnTargetData(void* pTag, FX_SAXNODE eType, FX_BSTR bsData, FX_DWORD dwStartPos) = 0; }; class IFX_SAXReader { diff --git a/xfa/src/fgas/include/fx_stm.h b/xfa/src/fgas/include/fx_stm.h index e6094d445c..b10b06a830 100644 --- a/xfa/src/fgas/include/fx_stm.h +++ b/xfa/src/fgas/include/fx_stm.h @@ -33,8 +33,8 @@ class IFX_Stream public: static IFX_Stream* CreateStream(IFX_FileRead *pFileRead, FX_DWORD dwAccess); static IFX_Stream* CreateStream(IFX_FileWrite *pFileWrite, FX_DWORD dwAccess); - static IFX_Stream* CreateStream(FX_LPCWSTR pszFileName, FX_DWORD dwAccess); - static IFX_Stream* CreateStream(FX_LPBYTE pData, int32_t length, FX_DWORD dwAccess); + static IFX_Stream* CreateStream(const FX_WCHAR* pszFileName, FX_DWORD dwAccess); + static IFX_Stream* CreateStream(uint8_t* pData, int32_t length, FX_DWORD dwAccess); static IFX_Stream* CreateStream(IFX_BufferRead *pBufferRead, FX_DWORD dwAccess, int32_t iFileSize = -1, FX_BOOL bReleaseBufferRead = TRUE); static IFX_Stream* CreateTextStream(IFX_Stream *pBaseStream, FX_BOOL bDeleteOnRelease); virtual void Release() = 0; @@ -44,10 +44,10 @@ public: virtual int32_t Seek(FX_STREAMSEEK eSeek, int32_t iOffset) = 0; virtual int32_t GetPosition() = 0; virtual FX_BOOL IsEOF() const = 0; - virtual int32_t ReadData(FX_LPBYTE pBuffer, int32_t iBufferSize) = 0; - virtual int32_t ReadString(FX_LPWSTR pStr, int32_t iMaxLength, FX_BOOL &bEOS, int32_t const *pByteSize = NULL) = 0; - virtual int32_t WriteData(FX_LPCBYTE pBuffer, int32_t iBufferSize) = 0; - virtual int32_t WriteString(FX_LPCWSTR pStr, int32_t iLength) = 0; + virtual int32_t ReadData(uint8_t* pBuffer, int32_t iBufferSize) = 0; + virtual int32_t ReadString(FX_WCHAR* pStr, int32_t iMaxLength, FX_BOOL &bEOS, int32_t const *pByteSize = NULL) = 0; + virtual int32_t WriteData(const uint8_t* pBuffer, int32_t iBufferSize) = 0; + virtual int32_t WriteString(const FX_WCHAR* pStr, int32_t iLength) = 0; virtual void Flush() = 0; virtual FX_BOOL SetLength(int32_t iLength) = 0; virtual int32_t GetBOM(uint8_t bom[4]) const = 0; diff --git a/xfa/src/fgas/include/fx_sys.h b/xfa/src/fgas/include/fx_sys.h index 8e099bce05..3982e0d285 100644 --- a/xfa/src/fgas/include/fx_sys.h +++ b/xfa/src/fgas/include/fx_sys.h @@ -24,11 +24,11 @@ typedef FX_DOUBLE * FX_LPDOUBLE; typedef FX_DOUBLE const * FX_LPCDOUBLE; FX_FLOAT FX_tan(FX_FLOAT a); FX_FLOAT FX_log(FX_FLOAT b, FX_FLOAT x); -FX_FLOAT FX_strtof(FX_LPCSTR pcsStr, int32_t iLength = -1, int32_t *pUsedLen = NULL); -FX_FLOAT FX_wcstof(FX_LPCWSTR pwsStr, int32_t iLength = -1, int32_t *pUsedLen = NULL); -FX_LPWSTR FX_wcsncpy(FX_LPWSTR dstStr, FX_LPCWSTR srcStr, size_t count); -int32_t FX_wcsnicmp(FX_LPCWSTR s1, FX_LPCWSTR s2, size_t count); -int32_t FX_strnicmp(FX_LPCSTR s1, FX_LPCSTR s2, size_t count); +FX_FLOAT FX_strtof(const FX_CHAR* pcsStr, int32_t iLength = -1, int32_t *pUsedLen = NULL); +FX_FLOAT FX_wcstof(const FX_WCHAR* pwsStr, int32_t iLength = -1, int32_t *pUsedLen = NULL); +FX_WCHAR* FX_wcsncpy(FX_WCHAR* dstStr, const FX_WCHAR* srcStr, size_t count); +int32_t FX_wcsnicmp(const FX_WCHAR* s1, const FX_WCHAR* s2, size_t count); +int32_t FX_strnicmp(const FX_CHAR* s1, const FX_CHAR* s2, size_t count); inline FX_BOOL FX_islower(int32_t ch) { return ch >= 'a' && ch <= 'z'; @@ -47,8 +47,8 @@ inline int32_t FX_toupper(int32_t ch) } int32_t FX_filelength(FXSYS_FILE *file); FX_BOOL FX_fsetsize(FXSYS_FILE *file, int32_t size); -void FX_memset(FX_LPVOID pBuf, int32_t iValue, size_t size); -void FX_memcpy(FX_LPVOID pDst, FX_LPCVOID pSrc, size_t size); +void FX_memset(void* pBuf, int32_t iValue, size_t size); +void FX_memcpy(void* pDst, const void* pSrc, size_t size); FX_BOOL FX_IsRelativePath(const CFX_WideStringC &wsPath); FX_BOOL FX_JoinPath(const CFX_WideStringC &wsBasePath, const CFX_WideStringC &wsRelativePath, CFX_WideString &wsAbsolutePath); typedef struct _FX_VERSION { diff --git a/xfa/src/fgas/include/fx_tbk.h b/xfa/src/fgas/include/fx_tbk.h index 69b42f1fd7..e48e2eedf4 100644 --- a/xfa/src/fgas/include/fx_tbk.h +++ b/xfa/src/fgas/include/fx_tbk.h @@ -60,8 +60,8 @@ class IFX_TxtBreak; class IFX_TxtAccess { public: - virtual FX_WCHAR GetChar(FX_LPVOID pIdentity, int32_t index) const = 0; - virtual int32_t GetWidth(FX_LPVOID pIdentity, int32_t index) const = 0; + virtual FX_WCHAR GetChar(void* pIdentity, int32_t index) const = 0; + virtual int32_t GetWidth(void* pIdentity, int32_t index) const = 0; }; typedef struct _FX_TXTRUN { _FX_TXTRUN() @@ -83,8 +83,8 @@ typedef struct _FX_TXTRUN { bSkipSpace = TRUE; } IFX_TxtAccess *pAccess; - FX_LPVOID pIdentity; - FX_LPCWSTR pStr; + void* pIdentity; + const FX_WCHAR* pStr; int32_t *pWidths; int32_t iLength; IFX_Font *pFont; @@ -133,7 +133,7 @@ public: FXSYS_assert(index > -1 && index < m_iChars && m_pChars != NULL); return m_pChars->GetDataPtr(m_iStartChar + index); } - void GetString(FX_LPWSTR pText) const + void GetString(FX_WCHAR* pText) const { FXSYS_assert(pText != NULL); int32_t iEndChar = m_iStartChar + m_iChars; @@ -146,7 +146,7 @@ public: void GetString(CFX_WideString &wsText) const { - FX_LPWSTR pText = wsText.GetBuffer(m_iChars); + FX_WCHAR* pText = wsText.GetBuffer(m_iChars); GetString(pText); wsText.ReleaseBuffer(m_iChars); } @@ -171,7 +171,7 @@ public: int32_t m_iVerticalScale; FX_DWORD m_dwCharStyles; CFX_TxtCharArray *m_pChars; - FX_LPVOID m_pUserData; + void* m_pUserData; }; typedef CFX_BaseArrayTemplate CFX_TxtPieceArray; class IFX_TxtBreak @@ -197,7 +197,7 @@ public: virtual FX_DWORD GetContextCharStyles() const = 0; virtual void SetContextCharStyles(FX_DWORD dwCharStyles) = 0; virtual void SetCombWidth(FX_FLOAT fCombWidth) = 0; - virtual void SetUserData(FX_LPVOID pUserData) = 0; + virtual void SetUserData(void* pUserData) = 0; virtual FX_DWORD AppendChar(FX_WCHAR wch) = 0; virtual FX_DWORD EndBreak(FX_DWORD dwStatus = FX_TXTBREAK_PieceBreak) = 0; virtual int32_t CountBreakChars() const = 0; diff --git a/xfa/src/fgas/include/fx_utl.h b/xfa/src/fgas/include/fx_utl.h index 35b676f41e..38342a8cc8 100644 --- a/xfa/src/fgas/include/fx_utl.h +++ b/xfa/src/fgas/include/fx_utl.h @@ -29,7 +29,7 @@ public: void Lock(); void Unlock(); private: - FX_LPVOID m_pData; + void* m_pData; }; class CFX_BaseArray : public CFX_Target { @@ -38,14 +38,14 @@ protected: ~CFX_BaseArray(); int32_t GetSize() const; int32_t GetBlockSize() const; - FX_LPBYTE AddSpaceTo(int32_t index); - FX_LPBYTE GetAt(int32_t index) const; - FX_LPBYTE GetBuffer() const; + uint8_t* AddSpaceTo(int32_t index); + uint8_t* GetAt(int32_t index) const; + uint8_t* GetBuffer() const; int32_t Append(const CFX_BaseArray &src, int32_t iStart = 0, int32_t iCount = -1); int32_t Copy(const CFX_BaseArray &src, int32_t iStart = 0, int32_t iCount = -1); int32_t RemoveLast(int32_t iCount = -1); void RemoveAll(FX_BOOL bLeaveMemory = FALSE); - FX_LPVOID m_pData; + void* m_pData; }; template class CFX_BaseArrayTemplate : public CFX_BaseArray @@ -108,7 +108,7 @@ public: CFX_BaseArray::RemoveAll(bLeaveMemory); } }; -typedef CFX_BaseArrayTemplate CFDE_PtrArray; +typedef CFX_BaseArrayTemplate CFDE_PtrArray; typedef CFX_BaseArrayTemplate CFDE_DWordArray; typedef CFX_BaseArrayTemplate CFDE_WordArray; template @@ -162,7 +162,7 @@ public: } iSize = CFX_BaseArray::GetSize(); CFX_BaseArray::AddSpaceTo(iSize + iCount - 1); - FX_LPBYTE *pStart = CFX_BaseArray::GetAt(iSize); + uint8_t* *pStart = CFX_BaseArray::GetAt(iSize); int32_t iBlockSize = CFX_BaseArray::GetBlockSize(); iSize = iStart + iCount; for (int32_t i = iStart; i < iSize; i ++) { @@ -190,7 +190,7 @@ public: } RemoveAll(TRUE); CFX_BaseArray::AddSpaceTo(iCount - 1); - FX_LPBYTE *pStart = CFX_BaseArray::GetAt(0); + uint8_t* *pStart = CFX_BaseArray::GetAt(0); int32_t iBlockSize = CFX_BaseArray::GetBlockSize(); iSize = iStart + iCount; for (int32_t i = iStart; i < iSize; i ++) { @@ -228,8 +228,8 @@ protected: CFX_BaseMassArray(int32_t iChunkSize, int32_t iBlockSize); ~CFX_BaseMassArray(); int32_t GetSize() const; - FX_LPBYTE AddSpaceTo(int32_t index); - FX_LPBYTE GetAt(int32_t index) const; + uint8_t* AddSpaceTo(int32_t index); + uint8_t* GetAt(int32_t index) const; int32_t Append(const CFX_BaseMassArray &src, int32_t iStart = 0, int32_t iCount = -1); int32_t Copy(const CFX_BaseMassArray &src, int32_t iStart = 0, int32_t iCount = -1); int32_t RemoveLast(int32_t iCount = -1); @@ -289,7 +289,7 @@ public: CFX_BaseMassArray::RemoveAll(bLeaveMemory); } }; -typedef CFX_MassArrayTemplate CFX_PtrMassArray; +typedef CFX_MassArrayTemplate CFX_PtrMassArray; typedef CFX_MassArrayTemplate CFX_Int32MassArray; typedef CFX_MassArrayTemplate CFX_DWordMassArray; typedef CFX_MassArrayTemplate CFX_WordMassArray; @@ -390,10 +390,10 @@ class CFX_BaseDiscreteArray : public CFX_Target protected: CFX_BaseDiscreteArray(int32_t iChunkSize, int32_t iBlockSize); ~CFX_BaseDiscreteArray(); - FX_LPBYTE AddSpaceTo(int32_t index); - FX_LPBYTE GetAt(int32_t index) const; + uint8_t* AddSpaceTo(int32_t index); + uint8_t* GetAt(int32_t index) const; void RemoveAll(); - FX_LPVOID m_pData; + void* m_pData; }; template class CFX_DiscreteArrayTemplate : public CFX_BaseDiscreteArray @@ -418,7 +418,7 @@ public: CFX_BaseDiscreteArray::RemoveAll(); } }; -typedef CFX_DiscreteArrayTemplate CFX_PtrDiscreteArray; +typedef CFX_DiscreteArrayTemplate CFX_PtrDiscreteArray; typedef CFX_DiscreteArrayTemplate CFX_DWordDiscreteArray; typedef CFX_DiscreteArrayTemplate CFX_WordDiscreteArray; class CFX_BaseStack : public CFX_Target @@ -426,11 +426,11 @@ class CFX_BaseStack : public CFX_Target protected: CFX_BaseStack(int32_t iChunkSize, int32_t iBlockSize); ~CFX_BaseStack(); - FX_LPBYTE Push(); + uint8_t* Push(); void Pop(); - FX_LPBYTE GetTopElement() const; + uint8_t* GetTopElement() const; int32_t GetSize() const; - FX_LPBYTE GetAt(int32_t index) const; + uint8_t* GetAt(int32_t index) const; void RemoveAll(FX_BOOL bLeaveMemory = FALSE); CFX_BaseMassArrayImp* m_pData; }; @@ -466,7 +466,7 @@ public: CFX_BaseStack::RemoveAll(bLeaveMemory); } }; -typedef CFX_StackTemplate CFX_PtrStack; +typedef CFX_StackTemplate CFX_PtrStack; typedef CFX_StackTemplate CFX_DWordStack; typedef CFX_StackTemplate CFX_WordStack; typedef CFX_StackTemplate CFX_Int32Stack; diff --git a/xfa/src/fgas/src/crt/fx_algorithm.cpp b/xfa/src/fgas/src/crt/fx_algorithm.cpp index 86a6095d45..eb133a3a62 100644 --- a/xfa/src/fgas/src/crt/fx_algorithm.cpp +++ b/xfa/src/fgas/src/crt/fx_algorithm.cpp @@ -52,7 +52,7 @@ static void FX_Base64EncodePiece(const FX_BASE64DATA &src, int32_t iBytes, FX_CH dst[2] = dst[3] = '='; } } -int32_t FX_Base64EncodeA(FX_LPCBYTE pSrc, int32_t iSrcLen, FX_LPSTR pDst) +int32_t FX_Base64EncodeA(const uint8_t* pSrc, int32_t iSrcLen, FX_CHAR* pDst) { FXSYS_assert(pSrc != NULL); if (iSrcLen < 1) { @@ -67,18 +67,18 @@ int32_t FX_Base64EncodeA(FX_LPCBYTE pSrc, int32_t iSrcLen, FX_LPSTR pDst) } FX_BASE64DATA srcData; int32_t iBytes = 3; - FX_LPSTR pDstEnd = pDst; + FX_CHAR* pDstEnd = pDst; while (iSrcLen > 0) { if (iSrcLen > 2) { - ((FX_LPBYTE)&srcData)[0] = *pSrc ++; - ((FX_LPBYTE)&srcData)[1] = *pSrc ++; - ((FX_LPBYTE)&srcData)[2] = *pSrc ++; + ((uint8_t*)&srcData)[0] = *pSrc ++; + ((uint8_t*)&srcData)[1] = *pSrc ++; + ((uint8_t*)&srcData)[2] = *pSrc ++; iSrcLen -= 3; } else { - *((FX_LPDWORD)&srcData) = 0; - ((FX_LPBYTE)&srcData)[0] = *pSrc ++; + *((FX_DWORD*)&srcData) = 0; + ((uint8_t*)&srcData)[0] = *pSrc ++; if (iSrcLen > 1) { - ((FX_LPBYTE)&srcData)[1] = *pSrc ++; + ((uint8_t*)&srcData)[1] = *pSrc ++; } iBytes = iSrcLen; iSrcLen = 0; @@ -149,7 +149,7 @@ static void FX_Base64DecodePiece(const FX_CHAR src[4], int32_t iChars, FX_BASE64 dst.data1 = 0; } } -int32_t FX_Base64DecodeA(FX_LPCSTR pSrc, int32_t iSrcLen, FX_LPBYTE pDst) +int32_t FX_Base64DecodeA(const FX_CHAR* pSrc, int32_t iSrcLen, uint8_t* pDst) { FXSYS_assert(pSrc != NULL); if (iSrcLen < 1) { @@ -176,14 +176,14 @@ int32_t FX_Base64DecodeA(FX_LPCSTR pSrc, int32_t iSrcLen, FX_LPBYTE pDst) FX_CHAR srcData[4]; FX_BASE64DATA dstData; int32_t iChars = 4, iBytes; - FX_LPBYTE pDstEnd = pDst; + uint8_t* pDstEnd = pDst; while (iSrcLen > 0) { if (iSrcLen > 3) { *((FX_DWORD*)srcData) = *((FX_DWORD*)pSrc); pSrc += 4; iSrcLen -= 4; } else { - *((FX_LPDWORD)&dstData) = 0; + *((FX_DWORD*)&dstData) = 0; *((FX_DWORD*)srcData) = 0; srcData[0] = *pSrc ++; if (iSrcLen > 1) { @@ -196,17 +196,17 @@ int32_t FX_Base64DecodeA(FX_LPCSTR pSrc, int32_t iSrcLen, FX_LPBYTE pDst) iSrcLen = 0; } FX_Base64DecodePiece(srcData, iChars, dstData, iBytes); - *pDstEnd ++ = ((FX_LPBYTE)&dstData)[0]; + *pDstEnd ++ = ((uint8_t*)&dstData)[0]; if (iBytes > 1) { - *pDstEnd ++ = ((FX_LPBYTE)&dstData)[1]; + *pDstEnd ++ = ((uint8_t*)&dstData)[1]; } if (iBytes > 2) { - *pDstEnd ++ = ((FX_LPBYTE)&dstData)[2]; + *pDstEnd ++ = ((uint8_t*)&dstData)[2]; } } return pDstEnd - pDst; } -int32_t FX_Base64DecodeW(FX_LPCWSTR pSrc, int32_t iSrcLen, FX_LPBYTE pDst) +int32_t FX_Base64DecodeW(const FX_WCHAR* pSrc, int32_t iSrcLen, uint8_t* pDst) { FXSYS_assert(pSrc != NULL); if (iSrcLen < 1) { @@ -233,7 +233,7 @@ int32_t FX_Base64DecodeW(FX_LPCWSTR pSrc, int32_t iSrcLen, FX_LPBYTE pDst) FX_CHAR srcData[4]; FX_BASE64DATA dstData; int32_t iChars = 4, iBytes; - FX_LPBYTE pDstEnd = pDst; + uint8_t* pDstEnd = pDst; while (iSrcLen > 0) { if (iSrcLen > 3) { srcData[0] = (FX_CHAR) * pSrc ++; @@ -242,7 +242,7 @@ int32_t FX_Base64DecodeW(FX_LPCWSTR pSrc, int32_t iSrcLen, FX_LPBYTE pDst) srcData[3] = (FX_CHAR) * pSrc ++; iSrcLen -= 4; } else { - *((FX_LPDWORD)&dstData) = 0; + *((FX_DWORD*)&dstData) = 0; *((FX_DWORD*)srcData) = 0; srcData[0] = (FX_CHAR) * pSrc ++; if (iSrcLen > 1) { @@ -255,12 +255,12 @@ int32_t FX_Base64DecodeW(FX_LPCWSTR pSrc, int32_t iSrcLen, FX_LPBYTE pDst) iSrcLen = 0; } FX_Base64DecodePiece(srcData, iChars, dstData, iBytes); - *pDstEnd ++ = ((FX_LPBYTE)&dstData)[0]; + *pDstEnd ++ = ((uint8_t*)&dstData)[0]; if (iBytes > 1) { - *pDstEnd ++ = ((FX_LPBYTE)&dstData)[1]; + *pDstEnd ++ = ((uint8_t*)&dstData)[1]; } if (iBytes > 2) { - *pDstEnd ++ = ((FX_LPBYTE)&dstData)[2]; + *pDstEnd ++ = ((uint8_t*)&dstData)[2]; } } return pDstEnd - pDst; @@ -287,7 +287,7 @@ uint8_t FX_Hex2Dec(uint8_t hexHigh, uint8_t hexLow) { return (g_FXHex2DecMap[hexHigh] << 4) + g_FXHex2DecMap[hexLow]; } -int32_t FX_SeparateStringW(FX_LPCWSTR pStr, int32_t iStrLen, FX_WCHAR delimiter, CFX_WideStringArray &pieces) +int32_t FX_SeparateStringW(const FX_WCHAR* pStr, int32_t iStrLen, FX_WCHAR delimiter, CFX_WideStringArray &pieces) { if (pStr == NULL) { return 0; @@ -295,8 +295,8 @@ int32_t FX_SeparateStringW(FX_LPCWSTR pStr, int32_t iStrLen, FX_WCHAR delimiter, if (iStrLen < 0) { iStrLen = FXSYS_wcslen(pStr); } - FX_LPCWSTR pToken = pStr; - FX_LPCWSTR pEnd = pStr + iStrLen; + const FX_WCHAR* pToken = pStr; + const FX_WCHAR* pEnd = pStr + iStrLen; while (TRUE) { if (pStr >= pEnd || delimiter == *pStr) { CFX_WideString sub(pToken, pStr - pToken); diff --git a/xfa/src/fgas/src/crt/fx_codepage.cpp b/xfa/src/fgas/src/crt/fx_codepage.cpp index 239fa8874c..86d8b45c82 100644 --- a/xfa/src/fgas/src/crt/fx_codepage.cpp +++ b/xfa/src/fgas/src/crt/fx_codepage.cpp @@ -329,7 +329,7 @@ static const FX_STR2CPHASH g_FXCPHashTable[] = { { 0xf2a9730b, 0x3a8 }, { 0xf3d463c2, 0x3a4 }, { 0xf52a70a3, 0xc42e }, { 0xf5693147, 0x6fb3 }, { 0xf637e157, 0x478 }, { 0xfc213f3a, 0x2717 }, { 0xff654d14, 0x3b5 }, }; -FX_WORD FX_GetCodePageFromStringA(FX_LPCSTR pStr, int32_t iLength) +FX_WORD FX_GetCodePageFromStringA(const FX_CHAR* pStr, int32_t iLength) { FXSYS_assert(pStr != NULL); if (iLength < 0) { @@ -355,7 +355,7 @@ FX_WORD FX_GetCodePageFromStringA(FX_LPCSTR pStr, int32_t iLength) } while (iStart <= iEnd); return 0xFFFF; } -FX_WORD FX_GetCodePageFormStringW(FX_LPCWSTR pStr, int32_t iLength) +FX_WORD FX_GetCodePageFormStringW(const FX_WCHAR* pStr, int32_t iLength) { if (iLength < 0) { iLength = FXSYS_wcslen(pStr); @@ -364,7 +364,7 @@ FX_WORD FX_GetCodePageFormStringW(FX_LPCWSTR pStr, int32_t iLength) return 0xFFFF; } CFX_ByteString csStr; - FX_LPSTR pBuf = csStr.GetBuffer(iLength + 1); + FX_CHAR* pBuf = csStr.GetBuffer(iLength + 1); for (int32_t i = 0; i < iLength; ++i) { *pBuf ++ = (FX_CHAR) * pStr ++; } diff --git a/xfa/src/fgas/src/crt/fx_encode.cpp b/xfa/src/fgas/src/crt/fx_encode.cpp index 9de79e3649..0f9bb1a5ce 100644 --- a/xfa/src/fgas/src/crt/fx_encode.cpp +++ b/xfa/src/fgas/src/crt/fx_encode.cpp @@ -6,7 +6,7 @@ #include "../fgas_base.h" #include "fx_codepage.h" -void FX_SwapByteOrder(FX_LPWSTR pStr, int32_t iLength) +void FX_SwapByteOrder(FX_WCHAR* pStr, int32_t iLength) { FXSYS_assert(pStr != NULL); if (iLength < 0) { @@ -28,7 +28,7 @@ void FX_SwapByteOrder(FX_LPWSTR pStr, int32_t iLength) } } } -void FX_SwapByteOrderCopy(FX_LPCWSTR pSrc, FX_LPWSTR pDst, int32_t iLength) +void FX_SwapByteOrderCopy(const FX_WCHAR* pSrc, FX_WCHAR* pDst, int32_t iLength) { FXSYS_assert(pSrc != NULL && pDst != NULL); if (iLength < 0) { @@ -50,19 +50,19 @@ void FX_SwapByteOrderCopy(FX_LPCWSTR pSrc, FX_LPWSTR pDst, int32_t iLength) } } } -void FX_UTF16ToWChar(FX_LPVOID pBuffer, int32_t iLength) +void FX_UTF16ToWChar(void* pBuffer, int32_t iLength) { FXSYS_assert(pBuffer != NULL && iLength > 0); if (sizeof(FX_WCHAR) == 2) { return; } FX_WORD *pSrc = (FX_WORD*)pBuffer; - FX_LPWSTR pDst = (FX_LPWSTR)pBuffer; + FX_WCHAR* pDst = (FX_WCHAR*)pBuffer; while (--iLength >= 0) { pDst[iLength] = (FX_WCHAR)pSrc[iLength]; } } -void FX_UTF16ToWCharCopy(const FX_WORD *pUTF16, FX_LPWSTR pWChar, int32_t iLength) +void FX_UTF16ToWCharCopy(const FX_WORD *pUTF16, FX_WCHAR* pWChar, int32_t iLength) { FXSYS_assert(pUTF16 != NULL && pWChar != NULL && iLength > 0); if (sizeof(FX_WCHAR) == 2) { @@ -73,19 +73,19 @@ void FX_UTF16ToWCharCopy(const FX_WORD *pUTF16, FX_LPWSTR pWChar, int32_t iLengt } } } -void FX_WCharToUTF16(FX_LPVOID pBuffer, int32_t iLength) +void FX_WCharToUTF16(void* pBuffer, int32_t iLength) { FXSYS_assert(pBuffer != NULL && iLength > 0); if (sizeof(FX_WCHAR) == 2) { return; } - FX_LPCWSTR pSrc = (FX_LPCWSTR)pBuffer; + const FX_WCHAR* pSrc = (const FX_WCHAR*)pBuffer; FX_WORD *pDst = (FX_WORD*)pBuffer; while (--iLength >= 0) { *pDst++ = (FX_WORD) * pSrc++; } } -void FX_WCharToUTF16Copy(FX_LPCWSTR pWChar, FX_WORD *pUTF16, int32_t iLength) +void FX_WCharToUTF16Copy(const FX_WCHAR* pWChar, FX_WORD *pUTF16, int32_t iLength) { FXSYS_assert(pWChar != NULL && pUTF16 != NULL && iLength > 0); if (sizeof(FX_WCHAR) == 2) { @@ -96,22 +96,22 @@ void FX_WCharToUTF16Copy(FX_LPCWSTR pWChar, FX_WORD *pUTF16, int32_t iLength) } } } -inline FX_DWORD FX_DWordFromBytes(FX_LPCBYTE pStr) +inline FX_DWORD FX_DWordFromBytes(const uint8_t* pStr) { return FXBSTR_ID(pStr[3], pStr[2], pStr[1], pStr[0]); } -inline FX_WORD FX_WordFromBytes(FX_LPCBYTE pStr) +inline FX_WORD FX_WordFromBytes(const uint8_t* pStr) { return (pStr[1] << 8 | pStr[0]); } -int32_t FX_DecodeString(FX_WORD wCodePage, FX_LPCSTR pSrc, int32_t *pSrcLen, FX_LPWSTR pDst, int32_t *pDstLen, FX_BOOL bErrBreak) +int32_t FX_DecodeString(FX_WORD wCodePage, const FX_CHAR* pSrc, int32_t *pSrcLen, FX_WCHAR* pDst, int32_t *pDstLen, FX_BOOL bErrBreak) { if (wCodePage == FX_CODEPAGE_UTF8) { return FX_UTF8Decode(pSrc, pSrcLen, pDst, pDstLen); } return -1; } -int32_t FX_UTF8Decode(FX_LPCSTR pSrc, int32_t *pSrcLen, FX_LPWSTR pDst, int32_t *pDstLen) +int32_t FX_UTF8Decode(const FX_CHAR* pSrc, int32_t *pSrcLen, FX_WCHAR* pDst, int32_t *pDstLen) { if (pSrcLen == NULL || pDstLen == NULL) { return -1; diff --git a/xfa/src/fgas/src/crt/fx_memory.cpp b/xfa/src/fgas/src/crt/fx_memory.cpp index 9645852cb7..6d34a03e0c 100644 --- a/xfa/src/fgas/src/crt/fx_memory.cpp +++ b/xfa/src/fgas/src/crt/fx_memory.cpp @@ -74,7 +74,7 @@ void* CFX_StaticStore::Alloc(size_t size) FXSYS_assert(size != 0); register FX_LPSTATICSTORECHUNK pChunk = FindChunk(size); FXSYS_assert(pChunk != NULL && pChunk->iFreeSize >= size); - register FX_LPBYTE p = (FX_LPBYTE)pChunk; + register uint8_t* p = (uint8_t*)pChunk; p += sizeof(FX_STATICSTORECHUNK) + pChunk->iChunkSize - pChunk->iFreeSize; pChunk->iFreeSize -= size; m_iAllocatedSize += size; @@ -134,7 +134,7 @@ void* CFX_FixedStore::Alloc(size_t size) pChunk = AllocChunk(); } FXSYS_assert(pChunk != NULL); - register FX_LPBYTE pFlags = pChunk->FirstFlag(); + register uint8_t* pFlags = pChunk->FirstFlag(); register size_t i = 0; for (; i < pChunk->iChunkSize; i ++) if (pFlags[i] == 0) { @@ -150,7 +150,8 @@ void CFX_FixedStore::Free(void* pBlock) FXSYS_assert(pBlock != NULL); register FX_LPFIXEDSTORECHUNK pPrior, pChunk; pPrior = NULL, pChunk = m_pChunk; - register FX_LPBYTE pStart = NULL, pEnd; + uint8_t* pStart = NULL; + uint8_t* pEnd; while (pChunk != NULL) { pStart = pChunk->FirstBlock(); if (pBlock >= pStart) { @@ -162,9 +163,9 @@ void CFX_FixedStore::Free(void* pBlock) pPrior = pChunk, pChunk = pChunk->pNextChunk; } FXSYS_assert(pChunk != NULL); - register size_t iPos = ((FX_LPBYTE)pBlock - pStart) / m_iBlockSize; + register size_t iPos = ((uint8_t*)pBlock - pStart) / m_iBlockSize; FXSYS_assert(iPos < pChunk->iChunkSize); - register FX_LPBYTE pFlags = pChunk->FirstFlag(); + register uint8_t* pFlags = pChunk->FirstFlag(); if (pFlags[iPos] == 0) { return; } @@ -279,7 +280,7 @@ void CFX_DynamicStore::Free(void* pBlock) register FX_LPDYNAMICSTORECHUNK pPriorChunk, pChunk; pPriorChunk = NULL, pChunk = m_pChunk; while (pChunk != NULL) { - if (pBlock > pChunk && pBlock <= ((FX_LPBYTE)pChunk + sizeof(FX_DYNAMICSTORECHUNK) + pChunk->iChunkSize)) { + if (pBlock > pChunk && pBlock <= ((uint8_t*)pChunk + sizeof(FX_DYNAMICSTORECHUNK) + pChunk->iChunkSize)) { break; } pPriorChunk = pChunk, pChunk = pChunk->pNextChunk; diff --git a/xfa/src/fgas/src/crt/fx_memory.h b/xfa/src/fgas/src/crt/fx_memory.h index fa58429107..9ce8d2f11c 100644 --- a/xfa/src/fgas/src/crt/fx_memory.h +++ b/xfa/src/fgas/src/crt/fx_memory.h @@ -66,7 +66,7 @@ public: FXTARGET_Delete this; } virtual void* Alloc(size_t size); - virtual void Free(FX_LPVOID pBlock) {} + virtual void Free(void* pBlock) {} virtual size_t GetBlockSize() const { return 0; @@ -92,11 +92,11 @@ protected: #pragma pack(push, 1) #endif typedef struct _FX_FIXEDSTORECHUNK { - FX_LPBYTE FirstFlag() const + uint8_t* FirstFlag() const { - return (FX_LPBYTE)this + sizeof(_FX_FIXEDSTORECHUNK); + return (uint8_t*)this + sizeof(_FX_FIXEDSTORECHUNK); } - FX_LPBYTE FirstBlock() const + uint8_t* FirstBlock() const { return FirstFlag() + iChunkSize; } @@ -118,7 +118,7 @@ public: FXTARGET_Delete this; } virtual void* Alloc(size_t size); - virtual void Free(FX_LPVOID pBlock); + virtual void Free(void* pBlock); virtual size_t GetBlockSize() const { return m_iBlockSize; @@ -146,9 +146,9 @@ typedef struct _FX_DYNAMICSTOREBLOCK { { return (_FX_DYNAMICSTOREBLOCK*)(Data() + iBlockSize); } - FX_LPBYTE Data() const + uint8_t* Data() const { - return (FX_LPBYTE)this + sizeof(_FX_DYNAMICSTOREBLOCK); + return (uint8_t*)this + sizeof(_FX_DYNAMICSTOREBLOCK); } size_t iBlockSize; FX_BOOL bUsed; @@ -157,7 +157,7 @@ typedef FX_DYNAMICSTOREBLOCK const * FX_LPCDYNAMICSTOREBLOCK; typedef struct _FX_DYNAMICSTORECHUNK { FX_LPDYNAMICSTOREBLOCK FirstBlock() const { - return (FX_LPDYNAMICSTOREBLOCK)((FX_LPBYTE)this + sizeof(_FX_DYNAMICSTORECHUNK)); + return (FX_LPDYNAMICSTOREBLOCK)((uint8_t*)this + sizeof(_FX_DYNAMICSTORECHUNK)); } _FX_DYNAMICSTORECHUNK* pNextChunk; size_t iChunkSize; @@ -177,7 +177,7 @@ public: FXTARGET_Delete this; } virtual void* Alloc(size_t size); - virtual void Free(FX_LPVOID pBlock); + virtual void Free(void* pBlock); virtual size_t GetBlockSize() const { return 0; diff --git a/xfa/src/fgas/src/crt/fx_stream.cpp b/xfa/src/fgas/src/crt/fx_stream.cpp index 009cb41f5a..a70fbb6819 100644 --- a/xfa/src/fgas/src/crt/fx_stream.cpp +++ b/xfa/src/fgas/src/crt/fx_stream.cpp @@ -66,7 +66,7 @@ IFX_Stream* IFX_Stream::CreateStream(IFX_FileWrite *pFileWrite, FX_DWORD dwAcces } return pSR; } -IFX_Stream* IFX_Stream::CreateStream(FX_LPCWSTR pszFileName, FX_DWORD dwAccess) +IFX_Stream* IFX_Stream::CreateStream(const FX_WCHAR* pszFileName, FX_DWORD dwAccess) { CFX_Stream *pSR = FX_NEW CFX_Stream; if (pSR == NULL) { @@ -86,7 +86,7 @@ IFX_Stream* IFX_Stream::CreateStream(FX_LPCWSTR pszFileName, FX_DWORD dwAccess) } return pSR; } -IFX_Stream* IFX_Stream::CreateStream(FX_LPBYTE pData, int32_t length, FX_DWORD dwAccess) +IFX_Stream* IFX_Stream::CreateStream(uint8_t* pData, int32_t length, FX_DWORD dwAccess) { CFX_Stream *pSR = FX_NEW CFX_Stream; if (pSR == NULL) { @@ -123,7 +123,7 @@ CFX_FileStreamImp::~CFX_FileStreamImp() FXSYS_fclose(m_hFile); } } -FX_BOOL CFX_FileStreamImp::LoadFile(FX_LPCWSTR pszSrcFileName, FX_DWORD dwAccess) +FX_BOOL CFX_FileStreamImp::LoadFile(const FX_WCHAR* pszSrcFileName, FX_DWORD dwAccess) { FXSYS_assert(m_hFile == NULL); FXSYS_assert(pszSrcFileName != NULL && FXSYS_wcslen(pszSrcFileName) > 0); @@ -237,13 +237,13 @@ FX_BOOL CFX_FileStreamImp::IsEOF() const FXSYS_assert(m_hFile != NULL); return FXSYS_ftell(m_hFile) >= m_iLength; } -int32_t CFX_FileStreamImp::ReadData(FX_LPBYTE pBuffer, int32_t iBufferSize) +int32_t CFX_FileStreamImp::ReadData(uint8_t* pBuffer, int32_t iBufferSize) { FXSYS_assert(m_hFile != NULL); FXSYS_assert(pBuffer != NULL && iBufferSize > 0); return FXSYS_fread(pBuffer, 1, iBufferSize, m_hFile); } -int32_t CFX_FileStreamImp::ReadString(FX_LPWSTR pStr, int32_t iMaxLength, FX_BOOL &bEOS) +int32_t CFX_FileStreamImp::ReadString(FX_WCHAR* pStr, int32_t iMaxLength, FX_BOOL &bEOS) { FXSYS_assert(m_hFile != NULL); FXSYS_assert(pStr != NULL && iMaxLength > 0); @@ -267,7 +267,7 @@ int32_t CFX_FileStreamImp::ReadString(FX_LPWSTR pStr, int32_t iMaxLength, FX_BOO bEOS = (iPosition >= m_iLength); return iCount; } -int32_t CFX_FileStreamImp::WriteData(FX_LPCBYTE pBuffer, int32_t iBufferSize) +int32_t CFX_FileStreamImp::WriteData(const uint8_t* pBuffer, int32_t iBufferSize) { FXSYS_assert(m_hFile != NULL && (m_dwAccess & FX_STREAMACCESS_Write) != 0); FXSYS_assert(pBuffer != NULL && iBufferSize > 0); @@ -280,7 +280,7 @@ int32_t CFX_FileStreamImp::WriteData(FX_LPCBYTE pBuffer, int32_t iBufferSize) } return iRet; } -int32_t CFX_FileStreamImp::WriteString(FX_LPCWSTR pStr, int32_t iLength) +int32_t CFX_FileStreamImp::WriteString(const FX_WCHAR* pStr, int32_t iLength) { FXSYS_assert(m_hFile != NULL && (m_dwAccess & FX_STREAMACCESS_Write) != 0); FXSYS_assert(pStr != NULL && iLength > 0); @@ -349,7 +349,7 @@ FX_BOOL CFX_FileReadStreamImp::IsEOF() const { return m_iPosition >= m_iLength; } -int32_t CFX_FileReadStreamImp::ReadData(FX_LPBYTE pBuffer, int32_t iBufferSize) +int32_t CFX_FileReadStreamImp::ReadData(uint8_t* pBuffer, int32_t iBufferSize) { FXSYS_assert(m_pFileRead != NULL); FXSYS_assert(pBuffer != NULL && iBufferSize > 0); @@ -362,11 +362,11 @@ int32_t CFX_FileReadStreamImp::ReadData(FX_LPBYTE pBuffer, int32_t iBufferSize) } return 0; } -int32_t CFX_FileReadStreamImp::ReadString(FX_LPWSTR pStr, int32_t iMaxLength, FX_BOOL &bEOS) +int32_t CFX_FileReadStreamImp::ReadString(FX_WCHAR* pStr, int32_t iMaxLength, FX_BOOL &bEOS) { FXSYS_assert(m_pFileRead != NULL); FXSYS_assert(pStr != NULL && iMaxLength > 0); - iMaxLength = ReadData((FX_LPBYTE)pStr, iMaxLength * 2) / 2; + iMaxLength = ReadData((uint8_t*)pStr, iMaxLength * 2) / 2; if (iMaxLength <= 0) { return 0; } @@ -441,7 +441,7 @@ FX_BOOL CFX_BufferReadStreamImp::IsEOF() const { return m_pBufferRead ? m_pBufferRead->IsEOF() : TRUE; } -int32_t CFX_BufferReadStreamImp::ReadData(FX_LPBYTE pBuffer, int32_t iBufferSize) +int32_t CFX_BufferReadStreamImp::ReadData(uint8_t* pBuffer, int32_t iBufferSize) { FXSYS_assert(m_pBufferRead != NULL); FXSYS_assert(pBuffer != NULL && iBufferSize > 0); @@ -471,7 +471,7 @@ int32_t CFX_BufferReadStreamImp::ReadData(FX_LPBYTE pBuffer, int32_t iBufferSize if (m_iPosition < (int32_t)dwBlockOffset || m_iPosition >= (int32_t)(dwBlockOffset + dwBlockSize)) { return 0; } - FX_LPCBYTE pBufferTmp = m_pBufferRead->GetBlockBuffer(); + const uint8_t* pBufferTmp = m_pBufferRead->GetBlockBuffer(); FX_DWORD dwOffsetTmp = m_iPosition - dwBlockOffset; FX_DWORD dwCopySize = FX_MIN(iBufferSize, (int32_t)(dwBlockSize - dwOffsetTmp)); FXSYS_memcpy(pBuffer, pBufferTmp + dwOffsetTmp, dwCopySize); @@ -492,11 +492,11 @@ int32_t CFX_BufferReadStreamImp::ReadData(FX_LPBYTE pBuffer, int32_t iBufferSize m_iPosition += dwOffsetTmp; return dwOffsetTmp; } -int32_t CFX_BufferReadStreamImp::ReadString(FX_LPWSTR pStr, int32_t iMaxLength, FX_BOOL &bEOS) +int32_t CFX_BufferReadStreamImp::ReadString(FX_WCHAR* pStr, int32_t iMaxLength, FX_BOOL &bEOS) { FXSYS_assert(m_pBufferRead != NULL); FXSYS_assert(pStr != NULL && iMaxLength > 0); - iMaxLength = ReadData((FX_LPBYTE)pStr, iMaxLength * 2) / 2; + iMaxLength = ReadData((uint8_t*)pStr, iMaxLength * 2) / 2; if (iMaxLength <= 0) { return 0; } @@ -556,7 +556,7 @@ FX_BOOL CFX_FileWriteStreamImp::IsEOF() const { return m_iPosition >= GetLength(); } -int32_t CFX_FileWriteStreamImp::WriteData(FX_LPCBYTE pBuffer, int32_t iBufferSize) +int32_t CFX_FileWriteStreamImp::WriteData(const uint8_t* pBuffer, int32_t iBufferSize) { if (!m_pFileWrite) { return 0; @@ -566,9 +566,9 @@ int32_t CFX_FileWriteStreamImp::WriteData(FX_LPCBYTE pBuffer, int32_t iBufferSiz } return iBufferSize; } -int32_t CFX_FileWriteStreamImp::WriteString(FX_LPCWSTR pStr, int32_t iLength) +int32_t CFX_FileWriteStreamImp::WriteString(const FX_WCHAR* pStr, int32_t iLength) { - return WriteData((FX_LPCBYTE)pStr, iLength * sizeof(FX_WCHAR)); + return WriteData((const uint8_t*)pStr, iLength * sizeof(FX_WCHAR)); } void CFX_FileWriteStreamImp::Flush() { @@ -584,7 +584,7 @@ CFX_BufferStreamImp::CFX_BufferStreamImp() , m_iLength(0) { } -FX_BOOL CFX_BufferStreamImp::LoadBuffer(FX_LPBYTE pData, int32_t iTotalSize, FX_DWORD dwAccess) +FX_BOOL CFX_BufferStreamImp::LoadBuffer(uint8_t* pData, int32_t iTotalSize, FX_DWORD dwAccess) { FXSYS_assert(m_pData == NULL); FXSYS_assert(pData != NULL && iTotalSize > 0); @@ -628,7 +628,7 @@ FX_BOOL CFX_BufferStreamImp::IsEOF() const FXSYS_assert(m_pData != NULL); return m_iPosition >= m_iLength; } -int32_t CFX_BufferStreamImp::ReadData(FX_LPBYTE pBuffer, int32_t iBufferSize) +int32_t CFX_BufferStreamImp::ReadData(uint8_t* pBuffer, int32_t iBufferSize) { FXSYS_assert(m_pData != NULL); FXSYS_assert(pBuffer != NULL && iBufferSize > 0); @@ -640,7 +640,7 @@ int32_t CFX_BufferStreamImp::ReadData(FX_LPBYTE pBuffer, int32_t iBufferSize) m_iPosition += iLen; return iLen; } -int32_t CFX_BufferStreamImp::ReadString(FX_LPWSTR pStr, int32_t iMaxLength, FX_BOOL &bEOS) +int32_t CFX_BufferStreamImp::ReadString(FX_WCHAR* pStr, int32_t iMaxLength, FX_BOOL &bEOS) { FXSYS_assert(m_pData != NULL); FXSYS_assert(pStr != NULL && iMaxLength > 0); @@ -648,7 +648,7 @@ int32_t CFX_BufferStreamImp::ReadString(FX_LPWSTR pStr, int32_t iMaxLength, FX_B if (iLen <= 0) { return 0; } - FX_LPCWSTR pSrc = (FX_LPCWSTR)(FX_LPSTR)(m_pData + m_iPosition); + const FX_WCHAR* pSrc = (const FX_WCHAR*)(FX_CHAR*)(m_pData + m_iPosition); int32_t iCount = 0; while (*pSrc != L'\0' && iCount < iLen) { *pStr ++ = *pSrc ++, iCount ++; @@ -657,7 +657,7 @@ int32_t CFX_BufferStreamImp::ReadString(FX_LPWSTR pStr, int32_t iMaxLength, FX_B bEOS = (*pSrc == L'\0') || (m_iPosition >= m_iLength); return iCount; } -int32_t CFX_BufferStreamImp::WriteData(FX_LPCBYTE pBuffer, int32_t iBufferSize) +int32_t CFX_BufferStreamImp::WriteData(const uint8_t* pBuffer, int32_t iBufferSize) { FXSYS_assert(m_pData != NULL && (m_dwAccess & FX_STREAMACCESS_Write) != 0); FXSYS_assert(pBuffer != NULL && iBufferSize > 0); @@ -672,7 +672,7 @@ int32_t CFX_BufferStreamImp::WriteData(FX_LPCBYTE pBuffer, int32_t iBufferSize) } return iLen; } -int32_t CFX_BufferStreamImp::WriteString(FX_LPCWSTR pStr, int32_t iLength) +int32_t CFX_BufferStreamImp::WriteString(const FX_WCHAR* pStr, int32_t iLength) { FXSYS_assert(m_pData != NULL && (m_dwAccess & FX_STREAMACCESS_Write) != 0); FXSYS_assert(pStr != NULL && iLength > 0); @@ -720,7 +720,7 @@ void CFX_TextStream::InitStream() { int32_t iPosition = m_pStreamImp->GetPosition(); m_pStreamImp->Seek(FX_STREAMSEEK_Begin, 0); - m_pStreamImp->ReadData((FX_LPBYTE)&m_dwBOM, 3); + m_pStreamImp->ReadData((uint8_t*)&m_dwBOM, 3); #if _FX_ENDIAN_ == _FX_LITTLE_ENDIAN_ m_dwBOM &= 0x00FFFFFF; if (m_dwBOM == 0x00BFBBEF) { @@ -793,11 +793,11 @@ FX_BOOL CFX_TextStream::IsEOF() const { return m_pStreamImp->IsEOF(); } -int32_t CFX_TextStream::ReadData(FX_LPBYTE pBuffer, int32_t iBufferSize) +int32_t CFX_TextStream::ReadData(uint8_t* pBuffer, int32_t iBufferSize) { return m_pStreamImp->ReadData(pBuffer, iBufferSize); } -int32_t CFX_TextStream::WriteData(FX_LPCBYTE pBuffer, int32_t iBufferSize) +int32_t CFX_TextStream::WriteData(const uint8_t* pBuffer, int32_t iBufferSize) { return m_pStreamImp->WriteData(pBuffer, iBufferSize); } @@ -846,7 +846,7 @@ FX_WORD CFX_TextStream::SetCodePage(FX_WORD wCodePage) m_wCodePage = wCodePage; return v; } -int32_t CFX_TextStream::ReadString(FX_LPWSTR pStr, int32_t iMaxLength, FX_BOOL &bEOS, int32_t const *pByteSize) +int32_t CFX_TextStream::ReadString(FX_WCHAR* pStr, int32_t iMaxLength, FX_BOOL &bEOS, int32_t const *pByteSize) { FXSYS_assert(pStr != NULL && iMaxLength > 0); if (m_pStreamImp == NULL) { @@ -856,7 +856,7 @@ int32_t CFX_TextStream::ReadString(FX_LPWSTR pStr, int32_t iMaxLength, FX_BOOL & if (m_wCodePage == FX_CODEPAGE_UTF16LE || m_wCodePage == FX_CODEPAGE_UTF16BE) { int32_t iBytes = pByteSize == NULL ? iMaxLength * 2 : *pByteSize; m_pStreamImp->Lock(); - iLen = m_pStreamImp->ReadData((FX_LPBYTE)pStr, iBytes); + iLen = m_pStreamImp->ReadData((uint8_t*)pStr, iBytes); m_pStreamImp->Unlock(); iMaxLength = iLen / 2; if (sizeof(FX_WCHAR) > 2) { @@ -877,16 +877,16 @@ int32_t CFX_TextStream::ReadString(FX_LPWSTR pStr, int32_t iMaxLength, FX_BOOL & iBytes = FX_MIN(iBytes, m_pStreamImp->GetLength() - pos); if (iBytes > 0) { if (m_pBuf == NULL) { - m_pBuf = (FX_LPBYTE)FX_Alloc(uint8_t, iBytes); + m_pBuf = (uint8_t*)FX_Alloc(uint8_t, iBytes); m_iBufSize = iBytes; } else if (iBytes > m_iBufSize) { - m_pBuf = (FX_LPBYTE)FX_Realloc(uint8_t, m_pBuf, iBytes); + m_pBuf = (uint8_t*)FX_Realloc(uint8_t, m_pBuf, iBytes); m_iBufSize = iBytes; } m_pStreamImp->Lock(); iLen = m_pStreamImp->ReadData(m_pBuf, iBytes); int32_t iSrc = iLen; - int32_t iDecode = FX_DecodeString(m_wCodePage, (FX_LPCSTR)m_pBuf, &iSrc, pStr, &iMaxLength, TRUE); + int32_t iDecode = FX_DecodeString(m_wCodePage, (const FX_CHAR*)m_pBuf, &iSrc, pStr, &iMaxLength, TRUE); m_pStreamImp->Seek(FX_STREAMSEEK_Current, iSrc - iLen); m_pStreamImp->Unlock(); if (iDecode < 1) { @@ -899,7 +899,7 @@ int32_t CFX_TextStream::ReadString(FX_LPWSTR pStr, int32_t iMaxLength, FX_BOOL & bEOS = m_pStreamImp->IsEOF(); return iMaxLength; } -int32_t CFX_TextStream::WriteString(FX_LPCWSTR pStr, int32_t iLength) +int32_t CFX_TextStream::WriteString(const FX_WCHAR* pStr, int32_t iLength) { FXSYS_assert(pStr != NULL && iLength > 0); if ((m_pStreamImp->GetAccessModes() & FX_STREAMACCESS_Write) == 0) { @@ -913,7 +913,7 @@ int32_t CFX_TextStream::WriteString(FX_LPCWSTR pStr, int32_t iLength) } CFX_ByteStringC bsResult = encoder.GetResult(); m_pStreamImp->Lock(); - m_pStreamImp->WriteData((FX_LPCBYTE)bsResult.GetCStr(), bsResult.GetLength()); + m_pStreamImp->WriteData((const uint8_t*)bsResult.GetCStr(), bsResult.GetLength()); m_pStreamImp->Unlock(); } return iLength; @@ -935,7 +935,7 @@ CFX_Stream::~CFX_Stream() m_pStreamImp->Release(); } } -FX_BOOL CFX_Stream::LoadFile(FX_LPCWSTR pszSrcFileName, FX_DWORD dwAccess) +FX_BOOL CFX_Stream::LoadFile(const FX_WCHAR* pszSrcFileName, FX_DWORD dwAccess) { if (m_eStreamType != FX_SREAMTYPE_Unknown || m_pStreamImp != NULL) { return FALSE; @@ -1004,7 +1004,7 @@ FX_BOOL CFX_Stream::LoadFileWrite(IFX_FileWrite *pFileWrite, FX_DWORD dwAccess) } return bRet; } -FX_BOOL CFX_Stream::LoadBuffer(FX_LPBYTE pData, int32_t iTotalSize, FX_DWORD dwAccess) +FX_BOOL CFX_Stream::LoadBuffer(uint8_t* pData, int32_t iTotalSize, FX_DWORD dwAccess) { if (m_eStreamType != FX_SREAMTYPE_Unknown || m_pStreamImp != NULL) { return FALSE; @@ -1116,7 +1116,7 @@ FX_BOOL CFX_Stream::IsEOF() const } return m_iPosition >= m_iStart + m_iLength; } -int32_t CFX_Stream::ReadData(FX_LPBYTE pBuffer, int32_t iBufferSize) +int32_t CFX_Stream::ReadData(uint8_t* pBuffer, int32_t iBufferSize) { FXSYS_assert(pBuffer != NULL && iBufferSize > 0); if (m_pStreamImp == NULL) { @@ -1135,7 +1135,7 @@ int32_t CFX_Stream::ReadData(FX_LPBYTE pBuffer, int32_t iBufferSize) m_pStreamImp->Unlock(); return iLen; } -int32_t CFX_Stream::ReadString(FX_LPWSTR pStr, int32_t iMaxLength, FX_BOOL &bEOS, int32_t const *pByteSize) +int32_t CFX_Stream::ReadString(FX_WCHAR* pStr, int32_t iMaxLength, FX_BOOL &bEOS, int32_t const *pByteSize) { FXSYS_assert(pStr != NULL && iMaxLength > 0); if (m_pStreamImp == NULL) { @@ -1162,7 +1162,7 @@ int32_t CFX_Stream::ReadString(FX_LPWSTR pStr, int32_t iMaxLength, FX_BOOL &bEOS m_pStreamImp->Unlock(); return iLen; } -int32_t CFX_Stream::WriteData(FX_LPCBYTE pBuffer, int32_t iBufferSize) +int32_t CFX_Stream::WriteData(const uint8_t* pBuffer, int32_t iBufferSize) { FXSYS_assert(pBuffer != NULL && iBufferSize > 0); if (m_pStreamImp == NULL) { @@ -1191,7 +1191,7 @@ int32_t CFX_Stream::WriteData(FX_LPCBYTE pBuffer, int32_t iBufferSize) m_pStreamImp->Unlock(); return iLen; } -int32_t CFX_Stream::WriteString(FX_LPCWSTR pStr, int32_t iLength) +int32_t CFX_Stream::WriteString(const FX_WCHAR* pStr, int32_t iLength) { FXSYS_assert(pStr != NULL && iLength > 0); if (m_pStreamImp == NULL) { @@ -1326,7 +1326,7 @@ FX_BOOL CFGAS_FileRead::ReadBlock(void* buffer, FX_FILESIZE offset, size_t size) { m_pStream->Lock(); m_pStream->Seek(FX_STREAMSEEK_Begin, (int32_t)offset); - int32_t iLen = m_pStream->ReadData((FX_LPBYTE)buffer, (int32_t)size); + int32_t iLen = m_pStream->ReadData((uint8_t*)buffer, (int32_t)size); m_pStream->Unlock(); return iLen == (int32_t)size; } @@ -1351,7 +1351,7 @@ FX_BOOL CFGAS_FileRead::ReadBlock(void* buffer, FX_DWORD offset, FX_DWORD size) { m_pStream->Lock(); m_pStream->Seek(FX_STREAMSEEK_Begin, (int32_t)offset); - int32_t iLen = m_pStream->ReadData((FX_LPBYTE)buffer, (int32_t)size); + int32_t iLen = m_pStream->ReadData((uint8_t*)buffer, (int32_t)size); m_pStream->Unlock(); return iLen == (int32_t)size; } @@ -1426,7 +1426,7 @@ FX_BOOL CFX_BufferAccImp::ReadBlock(void* buffer, FX_FILESIZE offset, size_t siz if (offset < dwBlockOffset || offset >= (FX_FILESIZE)(dwBlockOffset + dwBlockSize)) { return FALSE; } - FX_LPCBYTE pBuffer = m_pBufferRead->GetBlockBuffer(); + const uint8_t* pBuffer = m_pBufferRead->GetBlockBuffer(); FX_FILESIZE dwOffset = offset - dwBlockOffset; size_t dwCopySize = FX_MIN(size, dwBlockSize - dwOffset); FXSYS_memcpy(buffer, pBuffer + dwOffset, dwCopySize); @@ -1440,7 +1440,7 @@ FX_BOOL CFX_BufferAccImp::ReadBlock(void* buffer, FX_FILESIZE offset, size_t siz dwBlockSize = m_pBufferRead->GetBlockSize(); pBuffer = m_pBufferRead->GetBlockBuffer(); dwCopySize = FX_MIN(size, dwBlockSize); - FXSYS_memcpy(((FX_LPBYTE)buffer) + offset, pBuffer, dwCopySize); + FXSYS_memcpy(((uint8_t*)buffer) + offset, pBuffer, dwCopySize); offset += dwCopySize; size -= dwCopySize; } @@ -1516,7 +1516,7 @@ FX_BOOL CFX_BufferAccImp::ReadBlock(void* buffer, FX_DWORD offset, FX_DWORD size if (offset < dwBlockOffset || offset >= (FX_DWORD)(dwBlockOffset + dwBlockSize)) { return FALSE; } - FX_LPCBYTE pBuffer = m_pBufferRead->GetBlockBuffer(); + const uint8_t* pBuffer = m_pBufferRead->GetBlockBuffer(); FX_DWORD dwOffset = offset - dwBlockOffset; FX_DWORD dwCopySize = FX_MIN(size, dwBlockSize - dwOffset); FXSYS_memcpy(buffer, pBuffer + dwOffset, dwCopySize); @@ -1530,7 +1530,7 @@ FX_BOOL CFX_BufferAccImp::ReadBlock(void* buffer, FX_DWORD offset, FX_DWORD size dwBlockSize = m_pBufferRead->GetBlockSize(); pBuffer = m_pBufferRead->GetBlockBuffer(); dwCopySize = FX_MIN(size, dwBlockSize); - FXSYS_memcpy(((FX_LPBYTE)buffer) + offset, pBuffer, dwCopySize); + FXSYS_memcpy(((uint8_t*)buffer) + offset, pBuffer, dwCopySize); offset += dwCopySize; size -= dwCopySize; } @@ -1566,13 +1566,13 @@ FX_BOOL CFGAS_FileWrite::Flush() } FX_BOOL CFGAS_FileWrite::WriteBlock(const void* pData, size_t size) { - return m_pStream->WriteData((FX_LPCBYTE)pData, (int32_t)size) == (int32_t)size; + return m_pStream->WriteData((const uint8_t*)pData, (int32_t)size) == (int32_t)size; } FX_BOOL CFGAS_FileWrite::WriteBlock(const void* pData, FX_FILESIZE offset, size_t size) { m_pStream->Lock(); m_pStream->Seek(FX_STREAMSEEK_Begin, offset); - int32_t iLen = m_pStream->WriteData((FX_LPBYTE)pData, (int32_t)size); + int32_t iLen = m_pStream->WriteData((uint8_t*)pData, (int32_t)size); m_pStream->Unlock(); return iLen == (int32_t)size; } @@ -1600,13 +1600,13 @@ FX_DWORD CFGAS_FileWrite::Flush() } FX_BOOL CFGAS_FileWrite::WriteBlock(const void* pData, FX_DWORD size) { - return m_pStream->WriteData((FX_LPCBYTE)pData, (int32_t)size) == (int32_t)size; + return m_pStream->WriteData((const uint8_t*)pData, (int32_t)size) == (int32_t)size; } FX_BOOL CFGAS_FileWrite::WriteBlock(const void* pData, FX_DWORD offset, FX_DWORD size) { m_pStream->Lock(); m_pStream->Seek(FX_STREAMSEEK_Begin, offset); - int32_t iLen = m_pStream->WriteData((FX_LPBYTE)pData, (int32_t)size); + int32_t iLen = m_pStream->WriteData((uint8_t*)pData, (int32_t)size); m_pStream->Unlock(); return iLen == (int32_t)size; } diff --git a/xfa/src/fgas/src/crt/fx_stream.h b/xfa/src/fgas/src/crt/fx_stream.h index 2273ab1d9b..d89731b4ec 100644 --- a/xfa/src/fgas/src/crt/fx_stream.h +++ b/xfa/src/fgas/src/crt/fx_stream.h @@ -32,10 +32,10 @@ public: virtual int32_t Seek(FX_STREAMSEEK eSeek, int32_t iOffset) = 0; virtual int32_t GetPosition() = 0; virtual FX_BOOL IsEOF() const = 0; - virtual int32_t ReadData(FX_LPBYTE pBuffer, int32_t iBufferSize) = 0; - virtual int32_t ReadString(FX_LPWSTR pStr, int32_t iMaxLength, FX_BOOL &bEOS) = 0; - virtual int32_t WriteData(FX_LPCBYTE pBuffer, int32_t iBufferSize) = 0; - virtual int32_t WriteString(FX_LPCWSTR pStr, int32_t iLength) = 0; + virtual int32_t ReadData(uint8_t* pBuffer, int32_t iBufferSize) = 0; + virtual int32_t ReadString(FX_WCHAR* pStr, int32_t iMaxLength, FX_BOOL &bEOS) = 0; + virtual int32_t WriteData(const uint8_t* pBuffer, int32_t iBufferSize) = 0; + virtual int32_t WriteString(const FX_WCHAR* pStr, int32_t iLength) = 0; virtual void Flush() = 0; virtual FX_BOOL SetLength(int32_t iLength) = 0; protected: @@ -48,15 +48,15 @@ class CFX_FileStreamImp : public CFX_StreamImp public: CFX_FileStreamImp(); virtual ~CFX_FileStreamImp(); - FX_BOOL LoadFile(FX_LPCWSTR pszSrcFileName, FX_DWORD dwAccess); + FX_BOOL LoadFile(const FX_WCHAR* pszSrcFileName, FX_DWORD dwAccess); virtual int32_t GetLength() const; virtual int32_t Seek(FX_STREAMSEEK eSeek, int32_t iOffset); virtual int32_t GetPosition(); virtual FX_BOOL IsEOF() const; - virtual int32_t ReadData(FX_LPBYTE pBuffer, int32_t iBufferSize); - virtual int32_t ReadString(FX_LPWSTR pStr, int32_t iMaxLength, FX_BOOL &bEOS); - virtual int32_t WriteData(FX_LPCBYTE pBuffer, int32_t iBufferSize); - virtual int32_t WriteString(FX_LPCWSTR pStr, int32_t iLength); + virtual int32_t ReadData(uint8_t* pBuffer, int32_t iBufferSize); + virtual int32_t ReadString(FX_WCHAR* pStr, int32_t iMaxLength, FX_BOOL &bEOS); + virtual int32_t WriteData(const uint8_t* pBuffer, int32_t iBufferSize); + virtual int32_t WriteString(const FX_WCHAR* pStr, int32_t iLength); virtual void Flush(); virtual FX_BOOL SetLength(int32_t iLength); protected: @@ -68,22 +68,22 @@ class CFX_BufferStreamImp : public CFX_StreamImp public: CFX_BufferStreamImp(); virtual ~CFX_BufferStreamImp() {} - FX_BOOL LoadBuffer(FX_LPBYTE pData, int32_t iTotalSize, FX_DWORD dwAccess); + FX_BOOL LoadBuffer(uint8_t* pData, int32_t iTotalSize, FX_DWORD dwAccess); virtual int32_t GetLength() const; virtual int32_t Seek(FX_STREAMSEEK eSeek, int32_t iOffset); virtual int32_t GetPosition(); virtual FX_BOOL IsEOF() const; - virtual int32_t ReadData(FX_LPBYTE pBuffer, int32_t iBufferSize); - virtual int32_t ReadString(FX_LPWSTR pStr, int32_t iMaxLength, FX_BOOL &bEOS); - virtual int32_t WriteData(FX_LPCBYTE pBuffer, int32_t iBufferSize); - virtual int32_t WriteString(FX_LPCWSTR pStr, int32_t iLength); + virtual int32_t ReadData(uint8_t* pBuffer, int32_t iBufferSize); + virtual int32_t ReadString(FX_WCHAR* pStr, int32_t iMaxLength, FX_BOOL &bEOS); + virtual int32_t WriteData(const uint8_t* pBuffer, int32_t iBufferSize); + virtual int32_t WriteString(const FX_WCHAR* pStr, int32_t iLength); virtual void Flush() {} virtual FX_BOOL SetLength(int32_t iLength) { return FALSE; } protected: - FX_LPBYTE m_pData; + uint8_t* m_pData; int32_t m_iTotalSize; int32_t m_iPosition; int32_t m_iLength; @@ -102,13 +102,13 @@ public: } virtual FX_BOOL IsEOF() const; - virtual int32_t ReadData(FX_LPBYTE pBuffer, int32_t iBufferSize); - virtual int32_t ReadString(FX_LPWSTR pStr, int32_t iMaxLength, FX_BOOL &bEOS); - virtual int32_t WriteData(FX_LPCBYTE pBuffer, int32_t iBufferSize) + virtual int32_t ReadData(uint8_t* pBuffer, int32_t iBufferSize); + virtual int32_t ReadString(FX_WCHAR* pStr, int32_t iMaxLength, FX_BOOL &bEOS); + virtual int32_t WriteData(const uint8_t* pBuffer, int32_t iBufferSize) { return 0; } - virtual int32_t WriteString(FX_LPCWSTR pStr, int32_t iLength) + virtual int32_t WriteString(const FX_WCHAR* pStr, int32_t iLength) { return 0; } @@ -137,13 +137,13 @@ public: } virtual FX_BOOL IsEOF() const; - virtual int32_t ReadData(FX_LPBYTE pBuffer, int32_t iBufferSize); - virtual int32_t ReadString(FX_LPWSTR pStr, int32_t iMaxLength, FX_BOOL &bEOS); - virtual int32_t WriteData(FX_LPCBYTE pBuffer, int32_t iBufferSize) + virtual int32_t ReadData(uint8_t* pBuffer, int32_t iBufferSize); + virtual int32_t ReadString(FX_WCHAR* pStr, int32_t iMaxLength, FX_BOOL &bEOS); + virtual int32_t WriteData(const uint8_t* pBuffer, int32_t iBufferSize) { return 0; } - virtual int32_t WriteString(FX_LPCWSTR pStr, int32_t iLength) + virtual int32_t WriteString(const FX_WCHAR* pStr, int32_t iLength) { return 0; } @@ -171,16 +171,16 @@ public: return m_iPosition; } virtual FX_BOOL IsEOF() const; - virtual int32_t ReadData(FX_LPBYTE pBuffer, int32_t iBufferSize) + virtual int32_t ReadData(uint8_t* pBuffer, int32_t iBufferSize) { return 0; } - virtual int32_t ReadString(FX_LPWSTR pStr, int32_t iMaxLength, FX_BOOL &bEOS) + virtual int32_t ReadString(FX_WCHAR* pStr, int32_t iMaxLength, FX_BOOL &bEOS) { return 0; } - virtual int32_t WriteData(FX_LPCBYTE pBuffer, int32_t iBufferSize); - virtual int32_t WriteString(FX_LPCWSTR pStr, int32_t iLength); + virtual int32_t WriteData(const uint8_t* pBuffer, int32_t iBufferSize); + virtual int32_t WriteString(const FX_WCHAR* pStr, int32_t iLength); virtual void Flush(); virtual FX_BOOL SetLength(int32_t iLength) { @@ -202,8 +202,8 @@ class CFX_Stream : public IFX_Stream, public CFX_ThreadLock public: CFX_Stream(); ~CFX_Stream(); - FX_BOOL LoadFile(FX_LPCWSTR pszSrcFileName, FX_DWORD dwAccess); - FX_BOOL LoadBuffer(FX_LPBYTE pData, int32_t iTotalSize, FX_DWORD dwAccess); + FX_BOOL LoadFile(const FX_WCHAR* pszSrcFileName, FX_DWORD dwAccess); + FX_BOOL LoadBuffer(uint8_t* pData, int32_t iTotalSize, FX_DWORD dwAccess); FX_BOOL LoadFileRead(IFX_FileRead *pFileRead, FX_DWORD dwAccess); FX_BOOL LoadFileWrite(IFX_FileWrite *pFileWrite, FX_DWORD dwAccess); FX_BOOL LoadBufferRead(IFX_BufferRead *pBufferRead, int32_t iFileSize, FX_DWORD dwAccess, FX_BOOL bReleaseBufferRead); @@ -217,10 +217,10 @@ public: virtual int32_t Seek(FX_STREAMSEEK eSeek, int32_t iOffset); virtual int32_t GetPosition(); virtual FX_BOOL IsEOF() const; - virtual int32_t ReadData(FX_LPBYTE pBuffer, int32_t iBufferSize); - virtual int32_t ReadString(FX_LPWSTR pStr, int32_t iMaxLength, FX_BOOL &bEOS, int32_t const *pByteSize = NULL); - virtual int32_t WriteData(FX_LPCBYTE pBuffer, int32_t iBufferSize); - virtual int32_t WriteString(FX_LPCWSTR pStr, int32_t iLength); + virtual int32_t ReadData(uint8_t* pBuffer, int32_t iBufferSize); + virtual int32_t ReadString(FX_WCHAR* pStr, int32_t iMaxLength, FX_BOOL &bEOS, int32_t const *pByteSize = NULL); + virtual int32_t WriteData(const uint8_t* pBuffer, int32_t iBufferSize); + virtual int32_t WriteString(const FX_WCHAR* pStr, int32_t iLength); virtual void Flush(); virtual FX_BOOL SetLength(int32_t iLength); virtual int32_t GetBOM(uint8_t bom[4]) const; @@ -259,10 +259,10 @@ public: virtual int32_t GetPosition(); virtual FX_BOOL IsEOF() const; - virtual int32_t ReadData(FX_LPBYTE pBuffer, int32_t iBufferSize); - virtual int32_t ReadString(FX_LPWSTR pStr, int32_t iMaxLength, FX_BOOL &bEOS, int32_t const *pByteSize = NULL); - virtual int32_t WriteData(FX_LPCBYTE pBuffer, int32_t iBufferSize); - virtual int32_t WriteString(FX_LPCWSTR pStr, int32_t iLength); + virtual int32_t ReadData(uint8_t* pBuffer, int32_t iBufferSize); + virtual int32_t ReadString(FX_WCHAR* pStr, int32_t iMaxLength, FX_BOOL &bEOS, int32_t const *pByteSize = NULL); + virtual int32_t WriteData(const uint8_t* pBuffer, int32_t iBufferSize); + virtual int32_t WriteString(const FX_WCHAR* pStr, int32_t iLength); virtual void Flush(); virtual FX_BOOL SetLength(int32_t iLength); @@ -284,7 +284,7 @@ protected: FX_WORD m_wCodePage; FX_WORD m_wBOMLength; FX_DWORD m_dwBOM; - FX_LPBYTE m_pBuf; + uint8_t* m_pBuf; int32_t m_iBufSize; FX_BOOL m_bDelStream; IFX_Stream *m_pStreamImp; diff --git a/xfa/src/fgas/src/crt/fx_system.cpp b/xfa/src/fgas/src/crt/fx_system.cpp index 88f1631b7f..843e29c447 100644 --- a/xfa/src/fgas/src/crt/fx_system.cpp +++ b/xfa/src/fgas/src/crt/fx_system.cpp @@ -21,7 +21,7 @@ FX_FLOAT FX_log(FX_FLOAT b, FX_FLOAT x) { return FXSYS_log(x) / FXSYS_log(b); } -FX_LPWSTR FX_wcsncpy(FX_LPWSTR dstStr, FX_LPCWSTR srcStr, size_t count) +FX_WCHAR* FX_wcsncpy(FX_WCHAR* dstStr, const FX_WCHAR* srcStr, size_t count) { FXSYS_assert(dstStr != NULL && srcStr != NULL && count > 0); for (size_t i = 0; i < count; ++i) @@ -30,7 +30,7 @@ FX_LPWSTR FX_wcsncpy(FX_LPWSTR dstStr, FX_LPCWSTR srcStr, size_t count) } return dstStr; } -int32_t FX_wcsnicmp(FX_LPCWSTR s1, FX_LPCWSTR s2, size_t count) +int32_t FX_wcsnicmp(const FX_WCHAR* s1, const FX_WCHAR* s2, size_t count) { FXSYS_assert(s1 != NULL && s2 != NULL && count > 0); FX_WCHAR wch1 = 0, wch2 = 0; @@ -43,7 +43,7 @@ int32_t FX_wcsnicmp(FX_LPCWSTR s1, FX_LPCWSTR s2, size_t count) } return wch1 - wch2; } -int32_t FX_strnicmp(FX_LPCSTR s1, FX_LPCSTR s2, size_t count) +int32_t FX_strnicmp(const FX_CHAR* s1, const FX_CHAR* s2, size_t count) { FXSYS_assert(s1 != NULL && s2 != NULL && count > 0); FX_CHAR ch1 = 0, ch2 = 0; @@ -85,7 +85,7 @@ FX_BOOL FX_fsetsize(FXSYS_FILE *file, int32_t size) return FALSE; #endif } -FX_FLOAT FX_strtof(FX_LPCSTR pcsStr, int32_t iLength , int32_t *pUsedLen ) +FX_FLOAT FX_strtof(const FX_CHAR* pcsStr, int32_t iLength , int32_t *pUsedLen ) { FXSYS_assert(pcsStr != NULL); if (iLength < 0) { @@ -93,7 +93,7 @@ FX_FLOAT FX_strtof(FX_LPCSTR pcsStr, int32_t iLength , int32_t *pUsedLen ) } return FX_wcstof(CFX_WideString::FromLocal(pcsStr, iLength), iLength, pUsedLen); } -FX_FLOAT FX_wcstof(FX_LPCWSTR pwsStr, int32_t iLength , int32_t *pUsedLen ) +FX_FLOAT FX_wcstof(const FX_WCHAR* pwsStr, int32_t iLength , int32_t *pUsedLen ) { FXSYS_assert(pwsStr != NULL); if (iLength < 0) { @@ -138,7 +138,7 @@ FX_FLOAT FX_wcstof(FX_LPCWSTR pwsStr, int32_t iLength , int32_t *pUsedLen ) } return bNegtive ? -fValue : fValue; } -void FX_memset(FX_LPVOID pBuf, int32_t iValue, size_t size) +void FX_memset(void* pBuf, int32_t iValue, size_t size) { FXSYS_assert(pBuf != NULL && size > 0 && (size & 0x03) == 0); FXSYS_assert((((size_t)pBuf) & 0x03) == 0); @@ -148,7 +148,7 @@ void FX_memset(FX_LPVOID pBuf, int32_t iValue, size_t size) *pStart ++ = iValue; } } -void FX_memcpy(FX_LPVOID pDst, FX_LPCVOID pSrc, size_t size) +void FX_memcpy(void* pDst, const void* pSrc, size_t size) { FXSYS_assert(pDst != NULL && pSrc != NULL && size > 0 && (size & 0x03) == 0); FXSYS_assert((((size_t)pDst) & 0x03) == 0 && (((size_t)pSrc) & 0x03) == 0); @@ -177,8 +177,8 @@ FX_BOOL FX_JoinPath(const CFX_WideStringC &wsBasePath, const CFX_WideStringC &ws wsAbsolutePath = wsRelativePath; return TRUE; } - FX_LPCWSTR pRelStart = wsRelativePath.GetPtr(); - FX_LPCWSTR pRelEnd = pRelStart + wsRelativePath.GetLength(); + const FX_WCHAR* pRelStart = wsRelativePath.GetPtr(); + const FX_WCHAR* pRelEnd = pRelStart + wsRelativePath.GetLength(); if (pRelStart < pRelEnd) { switch (*pRelStart) { case '#': @@ -211,8 +211,8 @@ FX_BOOL FX_JoinPath(const CFX_WideStringC &wsBasePath, const CFX_WideStringC &ws return FALSE; } } - FX_LPCWSTR pBaseStart = wsBasePath.GetPtr(); - FX_LPCWSTR pBaseEnd = pBaseStart + wsBasePath.GetLength(); + const FX_WCHAR* pBaseStart = wsBasePath.GetPtr(); + const FX_WCHAR* pBaseEnd = pBaseStart + wsBasePath.GetLength(); while(pBaseStart < (--pBaseEnd) && *pBaseEnd != '/' && *pBaseEnd != '\\') ; if (pBaseStart == pBaseEnd) { diff --git a/xfa/src/fgas/src/crt/fx_utils.cpp b/xfa/src/fgas/src/crt/fx_utils.cpp index 55d97f0ea6..85f650b1d1 100644 --- a/xfa/src/fgas/src/crt/fx_utils.cpp +++ b/xfa/src/fgas/src/crt/fx_utils.cpp @@ -24,7 +24,7 @@ typedef struct _FX_BASEARRAYDATA : public CFX_Target { int32_t iBlockSize; int32_t iTotalCount; int32_t iBlockCount; - FX_LPBYTE pBuffer; + uint8_t* pBuffer; } FX_BASEARRAYDATA, * FX_LPBASEARRAYDATA; typedef FX_BASEARRAYDATA const * FX_LPCBASEARRAYDATA; CFX_BaseArray::CFX_BaseArray(int32_t iGrowSize, int32_t iBlockSize) @@ -51,10 +51,10 @@ int32_t CFX_BaseArray::GetBlockSize() const { return ((FX_LPBASEARRAYDATA)m_pData)->iBlockSize; } -FX_LPBYTE CFX_BaseArray::AddSpaceTo(int32_t index) +uint8_t* CFX_BaseArray::AddSpaceTo(int32_t index) { FXSYS_assert(index > -1); - FX_LPBYTE &pBuffer = ((FX_LPBASEARRAYDATA)m_pData)->pBuffer; + uint8_t* &pBuffer = ((FX_LPBASEARRAYDATA)m_pData)->pBuffer; int32_t &iTotalCount = ((FX_LPBASEARRAYDATA)m_pData)->iTotalCount; int32_t iBlockSize = ((FX_LPBASEARRAYDATA)m_pData)->iBlockSize; if (index >= iTotalCount) { @@ -62,9 +62,9 @@ FX_LPBYTE CFX_BaseArray::AddSpaceTo(int32_t index) iTotalCount = (index / iGrowSize + 1) * iGrowSize; int32_t iNewSize = iTotalCount * iBlockSize; if (pBuffer == NULL) { - pBuffer = (FX_LPBYTE)FX_Alloc(uint8_t, iNewSize); + pBuffer = (uint8_t*)FX_Alloc(uint8_t, iNewSize); } else { - pBuffer = (FX_LPBYTE)FX_Realloc(uint8_t, pBuffer, iNewSize); + pBuffer = (uint8_t*)FX_Realloc(uint8_t, pBuffer, iNewSize); } } FXSYS_assert(pBuffer != NULL); @@ -74,12 +74,12 @@ FX_LPBYTE CFX_BaseArray::AddSpaceTo(int32_t index) } return pBuffer + index * iBlockSize; } -FX_LPBYTE CFX_BaseArray::GetAt(int32_t index) const +uint8_t* CFX_BaseArray::GetAt(int32_t index) const { FXSYS_assert(index > -1 && index < ((FX_LPBASEARRAYDATA)m_pData)->iBlockCount); return ((FX_LPBASEARRAYDATA)m_pData)->pBuffer + index * ((FX_LPBASEARRAYDATA)m_pData)->iBlockSize; } -FX_LPBYTE CFX_BaseArray::GetBuffer() const +uint8_t* CFX_BaseArray::GetBuffer() const { return ((FX_LPBASEARRAYDATA)m_pData)->pBuffer; } @@ -99,7 +99,7 @@ int32_t CFX_BaseArray::Append(const CFX_BaseArray &src, int32_t iStart, int32_t if (iCount < 1) { return 0; } - FX_LPBYTE pDst = ((FX_LPBASEARRAYDATA)m_pData)->pBuffer + iBlockCount * iBlockSize; + uint8_t* pDst = ((FX_LPBASEARRAYDATA)m_pData)->pBuffer + iBlockCount * iBlockSize; AddSpaceTo(iBlockCount + iCount - 1); FX_memcpy(pDst, ((FX_LPBASEARRAYDATA)src.m_pData)->pBuffer + iStart * iBlockSize, iCount * iBlockSize); return iCount; @@ -138,7 +138,7 @@ int32_t CFX_BaseArray::RemoveLast(int32_t iCount) void CFX_BaseArray::RemoveAll(FX_BOOL bLeaveMemory) { if (!bLeaveMemory) { - FX_LPBYTE &pBuffer = ((FX_LPBASEARRAYDATA)m_pData)->pBuffer; + uint8_t* &pBuffer = ((FX_LPBASEARRAYDATA)m_pData)->pBuffer; if (pBuffer != NULL) { FX_Free(pBuffer); pBuffer = NULL; @@ -162,20 +162,20 @@ CFX_BaseMassArrayImp::~CFX_BaseMassArrayImp() RemoveAll(); delete m_pData; } -FX_LPBYTE CFX_BaseMassArrayImp::AddSpaceTo(int32_t index) +uint8_t* CFX_BaseMassArrayImp::AddSpaceTo(int32_t index) { FXSYS_assert(index > -1); - FX_LPBYTE pChunk; + uint8_t* pChunk; if (index < m_iBlockCount) { - pChunk = (FX_LPBYTE)m_pData->GetAt(index / m_iChunkSize); + pChunk = (uint8_t*)m_pData->GetAt(index / m_iChunkSize); } else { int32_t iMemSize = m_iChunkSize * m_iBlockSize; while (TRUE) { if (index < m_iChunkCount * m_iChunkSize) { - pChunk = (FX_LPBYTE)m_pData->GetAt(index / m_iChunkSize); + pChunk = (uint8_t*)m_pData->GetAt(index / m_iChunkSize); break; } else { - pChunk = (FX_LPBYTE)FX_Alloc(uint8_t, iMemSize); + pChunk = (uint8_t*)FX_Alloc(uint8_t, iMemSize); if (m_iChunkCount < m_pData->GetSize()) { m_pData->SetAt(m_iChunkCount, pChunk); } else { @@ -189,10 +189,10 @@ FX_LPBYTE CFX_BaseMassArrayImp::AddSpaceTo(int32_t index) m_iBlockCount = index + 1; return pChunk + (index % m_iChunkSize) * m_iBlockSize; } -FX_LPBYTE CFX_BaseMassArrayImp::GetAt(int32_t index) const +uint8_t* CFX_BaseMassArrayImp::GetAt(int32_t index) const { FXSYS_assert(index > -1 && index < m_iBlockCount); - FX_LPBYTE pChunk = (FX_LPBYTE)m_pData->GetAt(index / m_iChunkSize); + uint8_t* pChunk = (uint8_t*)m_pData->GetAt(index / m_iChunkSize); FXSYS_assert(pChunk != NULL); return pChunk + (index % m_iChunkSize) * m_iBlockSize; } @@ -248,8 +248,8 @@ void CFX_BaseMassArrayImp::Append(int32_t iDstStart, const CFX_BaseMassArrayImp FXSYS_assert(iSrcStart > -1 && iSrcStart < iSrcTotal && iSrcCount > 0 && iSrcStart + iSrcCount <= iSrcTotal); int32_t iDstChunkIndex = iDstStart / m_iChunkSize; int32_t iSrcChunkIndex = iSrcStart / src.m_iChunkSize; - FX_LPBYTE pDstChunk = (FX_LPBYTE)GetAt(iDstStart); - FX_LPBYTE pSrcChunk = (FX_LPBYTE)src.GetAt(iSrcStart); + uint8_t* pDstChunk = (uint8_t*)GetAt(iDstStart); + uint8_t* pSrcChunk = (uint8_t*)src.GetAt(iSrcStart); int32_t iDstChunkSize = m_iChunkSize - (iDstStart % m_iChunkSize); int32_t iSrcChunkSize = src.m_iChunkSize - (iSrcStart % src.m_iChunkSize); int32_t iCopySize = FX_MIN(iSrcCount, FX_MIN(iSrcChunkSize, iDstChunkSize)); @@ -262,7 +262,7 @@ void CFX_BaseMassArrayImp::Append(int32_t iDstStart, const CFX_BaseMassArrayImp if (iSrcChunkSize < 1) { iSrcChunkSize = src.m_iChunkSize; iSrcChunkIndex ++; - pSrcChunk = (FX_LPBYTE)src.m_pData->GetAt(iSrcChunkIndex); + pSrcChunk = (uint8_t*)src.m_pData->GetAt(iSrcChunkIndex); } else { pSrcChunk += iCopyBytes; } @@ -270,7 +270,7 @@ void CFX_BaseMassArrayImp::Append(int32_t iDstStart, const CFX_BaseMassArrayImp if (iDstChunkSize < 1) { iDstChunkSize = m_iChunkSize; iDstChunkIndex ++; - pDstChunk = (FX_LPBYTE)m_pData->GetAt(iDstChunkIndex); + pDstChunk = (uint8_t*)m_pData->GetAt(iDstChunkIndex); } else { pDstChunk += iCopyBytes; } @@ -294,7 +294,7 @@ void CFX_BaseMassArrayImp::RemoveAll(FX_BOOL bLeaveMemory) return; } for (int32_t i = 0; i < m_iChunkCount; i ++) { - FX_LPVOID p = m_pData->GetAt(i); + void* p = m_pData->GetAt(i); if (p == NULL) { continue; } @@ -316,11 +316,11 @@ int32_t CFX_BaseMassArray::GetSize() const { return m_pData->m_iBlockCount; } -FX_LPBYTE CFX_BaseMassArray::AddSpaceTo(int32_t index) +uint8_t* CFX_BaseMassArray::AddSpaceTo(int32_t index) { return m_pData->AddSpaceTo(index); } -FX_LPBYTE CFX_BaseMassArray::GetAt(int32_t index) const +uint8_t* CFX_BaseMassArray::GetAt(int32_t index) const { return m_pData->GetAt(index); } @@ -362,20 +362,20 @@ CFX_BaseDiscreteArray::~CFX_BaseDiscreteArray() RemoveAll(); delete (FX_LPBASEDISCRETEARRAYDATA)m_pData; } -FX_LPBYTE CFX_BaseDiscreteArray::AddSpaceTo(int32_t index) +uint8_t* CFX_BaseDiscreteArray::AddSpaceTo(int32_t index) { FXSYS_assert(index > -1); FX_LPBASEDISCRETEARRAYDATA pData = (FX_LPBASEDISCRETEARRAYDATA)m_pData; int32_t &iChunkCount = pData->iChunkCount; int32_t iChunkSize = pData->iChunkSize; - FX_LPBYTE pChunk = NULL; + uint8_t* pChunk = NULL; int32_t iChunk = index / iChunkSize; if (iChunk < iChunkCount) { - pChunk = (FX_LPBYTE)pData->ChunkBuffer.GetAt(iChunk); + pChunk = (uint8_t*)pData->ChunkBuffer.GetAt(iChunk); } if (pChunk == NULL) { int32_t iMemSize = iChunkSize * pData->iBlockSize; - pChunk = (FX_LPBYTE)FX_Alloc(uint8_t, iMemSize); + pChunk = (uint8_t*)FX_Alloc(uint8_t, iMemSize); FXSYS_memset(pChunk, 0, iMemSize); pData->ChunkBuffer.SetAtGrow(iChunk, pChunk); if (iChunkCount <= iChunk) { @@ -384,7 +384,7 @@ FX_LPBYTE CFX_BaseDiscreteArray::AddSpaceTo(int32_t index) } return pChunk + (index % iChunkSize) * pData->iBlockSize; } -FX_LPBYTE CFX_BaseDiscreteArray::GetAt(int32_t index) const +uint8_t* CFX_BaseDiscreteArray::GetAt(int32_t index) const { FXSYS_assert(index > -1); FX_LPBASEDISCRETEARRAYDATA pData = (FX_LPBASEDISCRETEARRAYDATA)m_pData; @@ -393,7 +393,7 @@ FX_LPBYTE CFX_BaseDiscreteArray::GetAt(int32_t index) const if (iChunk >= pData->iChunkCount) { return NULL; } - FX_LPBYTE pChunk = (FX_LPBYTE)pData->ChunkBuffer.GetAt(iChunk); + uint8_t* pChunk = (uint8_t*)pData->ChunkBuffer.GetAt(iChunk); if (pChunk == NULL) { return NULL; } @@ -405,7 +405,7 @@ void CFX_BaseDiscreteArray::RemoveAll() CFX_PtrArray &ChunkBuffer = pData->ChunkBuffer; int32_t &iChunkCount = pData->iChunkCount; for (int32_t i = 0; i < iChunkCount; i++) { - FX_LPVOID p = ChunkBuffer.GetAt(i); + void* p = ChunkBuffer.GetAt(i); if (p == NULL) { continue; } @@ -422,7 +422,7 @@ CFX_BaseStack::~CFX_BaseStack() { FXTARGET_Delete (CFX_BaseMassArrayImp*)m_pData; } -FX_LPBYTE CFX_BaseStack::Push() +uint8_t* CFX_BaseStack::Push() { return m_pData->AddSpace(); } @@ -434,7 +434,7 @@ void CFX_BaseStack::Pop() } iBlockCount --; } -FX_LPBYTE CFX_BaseStack::GetTopElement() const +uint8_t* CFX_BaseStack::GetTopElement() const { int32_t iSize = m_pData->m_iBlockCount; if (iSize < 1) { @@ -446,7 +446,7 @@ int32_t CFX_BaseStack::GetSize() const { return m_pData->m_iBlockCount; } -FX_LPBYTE CFX_BaseStack::GetAt(int32_t index) const +uint8_t* CFX_BaseStack::GetAt(int32_t index) const { return m_pData->GetAt(index); } diff --git a/xfa/src/fgas/src/crt/fx_utils.h b/xfa/src/fgas/src/crt/fx_utils.h index 92c2bcb198..42326570f0 100644 --- a/xfa/src/fgas/src/crt/fx_utils.h +++ b/xfa/src/fgas/src/crt/fx_utils.h @@ -11,12 +11,12 @@ class CFX_BaseMassArrayImp : public CFX_Target public: CFX_BaseMassArrayImp(int32_t iChunkSize, int32_t iBlockSize); ~CFX_BaseMassArrayImp(); - FX_LPBYTE AddSpace() + uint8_t* AddSpace() { return AddSpaceTo(m_iBlockCount); } - FX_LPBYTE AddSpaceTo(int32_t index); - FX_LPBYTE GetAt(int32_t index) const; + uint8_t* AddSpaceTo(int32_t index); + uint8_t* GetAt(int32_t index) const; int32_t Append(const CFX_BaseMassArrayImp &src, int32_t iStart = 0, int32_t iCount = -1); int32_t Copy(const CFX_BaseMassArrayImp &src, int32_t iStart = 0, int32_t iCount = -1); int32_t RemoveLast(int32_t iCount = -1); diff --git a/xfa/src/fgas/src/font/fx_fontutils.cpp b/xfa/src/fgas/src/font/fx_fontutils.cpp index 24e77c1c93..f6fe9c66e7 100644 --- a/xfa/src/fgas/src/font/fx_fontutils.cpp +++ b/xfa/src/fgas/src/font/fx_fontutils.cpp @@ -29,7 +29,7 @@ FX_DWORD FGAS_GetFontHashCode(FX_WORD wCodePage, FX_DWORD dwFontStyles) } return dwHash; } -FX_DWORD FGAS_GetFontFamilyHash(FX_LPCWSTR pszFontFamily, FX_DWORD dwFontStyles, FX_WORD wCodePage) +FX_DWORD FGAS_GetFontFamilyHash(const FX_WCHAR* pszFontFamily, FX_DWORD dwFontStyles, FX_WORD wCodePage) { CFX_WideString wsFont(pszFontFamily); if (dwFontStyles & FX_FONTSTYLE_Bold) { @@ -39,7 +39,7 @@ FX_DWORD FGAS_GetFontFamilyHash(FX_LPCWSTR pszFontFamily, FX_DWORD dwFontStyles, wsFont += L"Italic"; } wsFont += wCodePage; - return FX_HashCode_String_GetW((FX_LPCWSTR)wsFont, wsFont.GetLength()); + return FX_HashCode_String_GetW((const FX_WCHAR*)wsFont, wsFont.GetLength()); } static const FGAS_FONTUSB g_FXGdiFontUSBTable[] = { {0x0000 , 0x007F , 0 , 1252 }, diff --git a/xfa/src/fgas/src/font/fx_fontutils.h b/xfa/src/fgas/src/font/fx_fontutils.h index 1e3088fde8..2f13e7d1c2 100644 --- a/xfa/src/fgas/src/font/fx_fontutils.h +++ b/xfa/src/fgas/src/font/fx_fontutils.h @@ -14,6 +14,6 @@ typedef struct _FGAS_FONTUSB { } FGAS_FONTUSB, * FGAS_LPFONTUSB; typedef FGAS_FONTUSB const * FGAS_LPCFONTUSB; FX_DWORD FGAS_GetFontHashCode(FX_WORD wCodePage, FX_DWORD dwFontStyles); -FX_DWORD FGAS_GetFontFamilyHash(FX_LPCWSTR pszFontFamily, FX_DWORD dwFontStyles, FX_WORD wCodePage); +FX_DWORD FGAS_GetFontFamilyHash(const FX_WCHAR* pszFontFamily, FX_DWORD dwFontStyles, FX_WORD wCodePage); FGAS_LPCFONTUSB FGAS_GetUnicodeBitField(FX_WCHAR wUnicode); #endif diff --git a/xfa/src/fgas/src/font/fx_gdifont.cpp b/xfa/src/fgas/src/font/fx_gdifont.cpp index 437a25c7e4..729af40e06 100644 --- a/xfa/src/fgas/src/font/fx_gdifont.cpp +++ b/xfa/src/fgas/src/font/fx_gdifont.cpp @@ -28,7 +28,7 @@ CFX_GdiFontCache::~CFX_GdiFontCache() } m_GlyphMap.RemoveAll(); } -void CFX_GdiFontCache::SetCachedGlyphOutline(FX_DWORD dwGlyph, const GLYPHMETRICS &gm, FX_LPBYTE pOutline) +void CFX_GdiFontCache::SetCachedGlyphOutline(FX_DWORD dwGlyph, const GLYPHMETRICS &gm, uint8_t* pOutline) { FXSYS_assert(pOutline != NULL); FX_LPGDIGOCACHE pGlyph = (FX_LPGDIGOCACHE)FDE_Alloc(sizeof(FX_GDIGOCACHE)); @@ -44,7 +44,7 @@ FX_LPCGDIGOCACHE CFX_GdiFontCache::GetCachedGlyphOutline(FX_DWORD dwGlyph) const } return pGlyph; } -IFX_Font* IFX_Font::LoadFont(FX_LPCWSTR pszFontFamily, FX_DWORD dwFontStyles, FX_WORD wCodePage, IFX_FontMgr *pFontMgr) +IFX_Font* IFX_Font::LoadFont(const FX_WCHAR* pszFontFamily, FX_DWORD dwFontStyles, FX_WORD wCodePage, IFX_FontMgr *pFontMgr) { CFX_GdiFont *pFont = FX_NEW CFX_GdiFont(pFontMgr); if (!pFont->LoadFont(pszFontFamily, dwFontStyles, wCodePage)) { @@ -53,7 +53,7 @@ IFX_Font* IFX_Font::LoadFont(FX_LPCWSTR pszFontFamily, FX_DWORD dwFontStyles, FX } return pFont; } -IFX_Font* IFX_Font::LoadFont(FX_LPCBYTE pBuffer, int32_t iLength, IFX_FontMgr *pFontMgr) +IFX_Font* IFX_Font::LoadFont(const uint8_t* pBuffer, int32_t iLength, IFX_FontMgr *pFontMgr) { CFX_GdiFont *pFont = FX_NEW CFX_GdiFont(pFontMgr); if (!pFont->LoadFont(pBuffer, iLength)) { @@ -62,7 +62,7 @@ IFX_Font* IFX_Font::LoadFont(FX_LPCBYTE pBuffer, int32_t iLength, IFX_FontMgr *p } return pFont; } -IFX_Font* IFX_Font::LoadFont(FX_LPCWSTR pszFileName, IFX_FontMgr *pFontMgr) +IFX_Font* IFX_Font::LoadFont(const FX_WCHAR* pszFileName, IFX_FontMgr *pFontMgr) { CFX_GdiFont *pFont = FX_NEW CFX_GdiFont(pFontMgr); if (!pFont->LoadFont(pszFileName)) { @@ -121,7 +121,7 @@ CFX_GdiFont::~CFX_GdiFont() ::DeleteDC(m_hDC); if (m_hRes != NULL) { if (m_wsFontFileName.GetLength() > 0) { - ::RemoveFontResourceW((FX_LPCWSTR)m_wsFontFileName); + ::RemoveFontResourceW((const FX_WCHAR*)m_wsFontFileName); } else { ::RemoveFontMemResourceEx(m_hRes); } @@ -162,7 +162,7 @@ IFX_Font* CFX_GdiFont::Retain() ++ m_iRefCount; return this; } -FX_BOOL CFX_GdiFont::LoadFont(FX_LPCWSTR pszFontFamily, FX_DWORD dwFontStyles, FX_WORD wCodePage) +FX_BOOL CFX_GdiFont::LoadFont(const FX_WCHAR* pszFontFamily, FX_DWORD dwFontStyles, FX_WORD wCodePage) { FXSYS_assert(m_hFont == NULL); LOGFONTW lf; @@ -190,7 +190,7 @@ FX_BOOL CFX_GdiFont::LoadFont(FX_LPCWSTR pszFontFamily, FX_DWORD dwFontStyles, F } return LoadFont(lf); } -FX_BOOL CFX_GdiFont::LoadFont(FX_LPCBYTE pBuffer, int32_t iLength) +FX_BOOL CFX_GdiFont::LoadFont(const uint8_t* pBuffer, int32_t iLength) { FXSYS_assert(m_hFont == NULL && pBuffer != NULL && iLength > 0); Gdiplus::PrivateFontCollection pfc; @@ -206,7 +206,7 @@ FX_BOOL CFX_GdiFont::LoadFont(FX_LPCBYTE pBuffer, int32_t iLength) return FALSE; } CFX_WideString wsFamily = m_FontFamilies[0]; - m_hFont = ::CreateFontW(-1000, 0, 0, 0, FW_NORMAL, FALSE, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 0, (FX_LPCWSTR)wsFamily); + m_hFont = ::CreateFontW(-1000, 0, 0, 0, FW_NORMAL, FALSE, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 0, (const FX_WCHAR*)wsFamily); if (m_hFont == NULL) { ::RemoveFontMemResourceEx(m_hRes); m_hRes = NULL; @@ -217,7 +217,7 @@ FX_BOOL CFX_GdiFont::LoadFont(FX_LPCBYTE pBuffer, int32_t iLength) ::GetOutlineTextMetricsW(m_hDC, sizeof(m_OutlineTM), &m_OutlineTM); return TRUE; } -FX_BOOL CFX_GdiFont::LoadFont(FX_LPCWSTR pszFileName) +FX_BOOL CFX_GdiFont::LoadFont(const FX_WCHAR* pszFileName) { FXSYS_assert(m_hFont == NULL && pszFileName != NULL); Gdiplus::PrivateFontCollection pfc; @@ -233,7 +233,7 @@ FX_BOOL CFX_GdiFont::LoadFont(FX_LPCWSTR pszFileName) return FALSE; } CFX_WideString wsFamily = m_FontFamilies[0]; - m_hFont = ::CreateFontW(-1000, 0, 0, 0, FW_NORMAL, FALSE, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 0, (FX_LPCWSTR)wsFamily); + m_hFont = ::CreateFontW(-1000, 0, 0, 0, FW_NORMAL, FALSE, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 0, (const FX_WCHAR*)wsFamily); if (m_hFont == NULL) { ::RemoveFontResourceW(pszFileName); m_hRes = NULL; @@ -251,7 +251,7 @@ FX_BOOL CFX_GdiFont::LoadFont(IFX_Stream *pFontStream) if (iLength < 1) { return FALSE; } - FX_LPBYTE pBuf = (FX_LPBYTE)FDE_Alloc(iLength); + uint8_t* pBuf = (uint8_t*)FDE_Alloc(iLength); if (pBuf == NULL) { return FALSE; } @@ -286,7 +286,7 @@ int32_t CFX_GdiFont::GetFontFamilies(Gdiplus::FontCollection &fc) fc.GetFamilies(iCount, pFontFamilies, &iFind); for (int32_t i = 0; i < iCount; i ++) { CFX_WideString wsFamilyName; - FX_LPWSTR pName = wsFamilyName.GetBuffer(LF_FACESIZE); + FX_WCHAR* pName = wsFamilyName.GetBuffer(LF_FACESIZE); pFontFamilies[i].GetFamilyName(pName); wsFamilyName.ReleaseBuffer(); m_FontFamilies.Add(wsFamilyName); @@ -451,7 +451,7 @@ IFX_Font* CFX_GdiFont::GetSubstFont(int32_t iGlyphIndex) const } return (IFX_Font*)m_SubstFonts[iHigher - 1]; } -FX_DWORD CFX_GdiFont::GetGlyphDIBits(int32_t iGlyphIndex, FX_ARGB argb, const MAT2 *pMatrix, GLYPHMETRICS &gm, FX_LPVOID pBuffer, FX_DWORD bufSize) +FX_DWORD CFX_GdiFont::GetGlyphDIBits(int32_t iGlyphIndex, FX_ARGB argb, const MAT2 *pMatrix, GLYPHMETRICS &gm, void* pBuffer, FX_DWORD bufSize) { static const UINT uFormat = GGO_GLYPH_INDEX | GGO_GRAY8_BITMAP; IFX_Font *pFont = GetSubstFont(iGlyphIndex); @@ -461,7 +461,7 @@ FX_DWORD CFX_GdiFont::GetGlyphDIBits(int32_t iGlyphIndex, FX_ARGB argb, const MA if (pFont != (IFX_Font*)this) { return ((CFX_GdiFont*)pFont)->GetGlyphDIBits(iGlyphIndex & 0x00FFFFFF, argb, pMatrix, gm, pBuffer, bufSize); } - FX_LPBYTE pGlyphOutline = NULL; + uint8_t* pGlyphOutline = NULL; FXSYS_assert(pMatrix != NULL); FX_DWORD dwMAT2 = GetMAT2HashCode((const FIXED*)pMatrix); CFX_GdiFontCache *pCache = NULL; @@ -477,7 +477,7 @@ FX_DWORD CFX_GdiFont::GetGlyphDIBits(int32_t iGlyphIndex, FX_ARGB argb, const MA if (dwGlyphSize == 0 || dwGlyphSize == GDI_ERROR) { return 0; } - pGlyphOutline = (FX_LPBYTE)FX_Alloc(dwGlyphSize); + pGlyphOutline = (uint8_t*)FX_Alloc(dwGlyphSize); ::GetGlyphOutlineW(m_hDC, iGlyphIndex, uFormat, &gm, dwGlyphSize, pGlyphOutline, pMatrix); if (pCache == NULL) { pCache = FX_NEW CFX_GdiFontCache; @@ -492,7 +492,7 @@ FX_DWORD CFX_GdiFont::GetGlyphDIBits(int32_t iGlyphIndex, FX_ARGB argb, const MA if (pBuffer == NULL || bufSize < dwDibSize) { return dwDibSize; } - CreateGlyphBitmap(gm.gmBlackBoxX, gm.gmBlackBoxY, pGlyphOutline, (FX_LPDWORD)pBuffer, argb); + CreateGlyphBitmap(gm.gmBlackBoxX, gm.gmBlackBoxY, pGlyphOutline, (FX_DWORD*)pBuffer, argb); return dwDibSize; } FX_DWORD CFX_GdiFont::GetHashCode() const @@ -511,7 +511,7 @@ FX_DWORD CFX_GdiFont::GetMAT2HashCode(const FIXED *pFixed) } return ((dwHash1 & 0x0000FFFF) << 16) | (dwHash2 & 0x0000FFFF); } -void CFX_GdiFont::CreateGlyphBitmap(int32_t iWidth, int32_t iHeight, FX_LPBYTE pOutline, FX_LPDWORD pDIB, FX_ARGB argb) +void CFX_GdiFont::CreateGlyphBitmap(int32_t iWidth, int32_t iHeight, uint8_t* pOutline, FX_DWORD* pDIB, FX_ARGB argb) { int32_t padding = ((iWidth + 3) / 4) * 4 - iWidth; FX_DWORD alpha; diff --git a/xfa/src/fgas/src/font/fx_gdifont.h b/xfa/src/fgas/src/font/fx_gdifont.h index b9143602e6..85af1c9685 100644 --- a/xfa/src/fgas/src/font/fx_gdifont.h +++ b/xfa/src/fgas/src/font/fx_gdifont.h @@ -10,7 +10,7 @@ #if _FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN32_MOBILE_ || _FX_OS_ == _FX_WIN64_ typedef struct _FX_GDIGOCACHE { GLYPHMETRICS gm; - FX_LPBYTE pOutline; + uint8_t* pOutline; } FX_GDIGOCACHE, * FX_LPGDIGOCACHE; typedef FX_GDIGOCACHE const * FX_LPCGDIGOCACHE; class CFX_GdiFontCache @@ -18,7 +18,7 @@ class CFX_GdiFontCache public: CFX_GdiFontCache(); ~CFX_GdiFontCache(); - void SetCachedGlyphOutline(FX_DWORD dwGlyph, const GLYPHMETRICS &gm, FX_LPBYTE pOutline); + void SetCachedGlyphOutline(FX_DWORD dwGlyph, const GLYPHMETRICS &gm, uint8_t* pOutline); FX_LPCGDIGOCACHE GetCachedGlyphOutline(FX_DWORD dwGlyph) const; protected: CFX_MapPtrToPtr m_GlyphMap; @@ -30,9 +30,9 @@ public: ~CFX_GdiFont(); virtual void Release(); virtual IFX_Font* Retain(); - FX_BOOL LoadFont(FX_LPCWSTR pszFontFamily, FX_DWORD dwFontStyles, FX_WORD wCodePage); - FX_BOOL LoadFont(FX_LPCBYTE pBuffer, int32_t iLength); - FX_BOOL LoadFont(FX_LPCWSTR pszFileName); + FX_BOOL LoadFont(const FX_WCHAR* pszFontFamily, FX_DWORD dwFontStyles, FX_WORD wCodePage); + FX_BOOL LoadFont(const uint8_t* pBuffer, int32_t iLength); + FX_BOOL LoadFont(const FX_WCHAR* pszFileName); FX_BOOL LoadFont(IFX_Stream *pFontStream); FX_BOOL LoadFont(const LOGFONTW &lf); virtual IFX_Font* Derive(FX_DWORD dwFontStyles, FX_WORD wCodePage = 0) @@ -56,7 +56,7 @@ public: virtual FX_BOOL GetBBox(CFX_Rect &bbox); virtual int32_t GetItalicAngle() const; virtual void Reset(); - FX_DWORD GetGlyphDIBits(int32_t iGlyphIndex, FX_ARGB argb, const MAT2 *pMatrix, GLYPHMETRICS &gm, FX_LPVOID pBuffer, FX_DWORD bufSize); + FX_DWORD GetGlyphDIBits(int32_t iGlyphIndex, FX_ARGB argb, const MAT2 *pMatrix, GLYPHMETRICS &gm, void* pBuffer, FX_DWORD bufSize); FX_DWORD GetHashCode() const; protected: IFX_FontMgr *m_pFontMgr; @@ -81,7 +81,7 @@ protected: FX_BOOL GetCharWidth(FX_WCHAR wUnicode, int32_t &iWidth, FX_BOOL bRecursive, FX_BOOL bCharCode = FALSE); int32_t GetGlyphIndex(FX_WCHAR wUnicode, FX_BOOL bRecursive, IFX_Font **ppFont, FX_BOOL bCharCode = FALSE); FX_DWORD GetMAT2HashCode(const FIXED *pFixed); - void CreateGlyphBitmap(int32_t iWidth, int32_t iHeight, FX_LPBYTE pOutline, FX_LPDWORD pDIB, FX_ARGB argb); + void CreateGlyphBitmap(int32_t iWidth, int32_t iHeight, uint8_t* pOutline, FX_DWORD* pDIB, FX_ARGB argb); friend class CFX_GdiFontMgr; }; #endif diff --git a/xfa/src/fgas/src/font/fx_gefont.cpp b/xfa/src/fgas/src/font/fx_gefont.cpp index a67b7b47bb..c9948cfa4f 100644 --- a/xfa/src/fgas/src/font/fx_gefont.cpp +++ b/xfa/src/fgas/src/font/fx_gefont.cpp @@ -8,7 +8,7 @@ #include "fx_gefont.h" #include "fx_fontutils.h" #ifndef _FXPLUS -IFX_Font* IFX_Font::LoadFont(FX_LPCWSTR pszFontFamily, FX_DWORD dwFontStyles, FX_WORD wCodePage, IFX_FontMgr *pFontMgr) +IFX_Font* IFX_Font::LoadFont(const FX_WCHAR* pszFontFamily, FX_DWORD dwFontStyles, FX_WORD wCodePage, IFX_FontMgr *pFontMgr) { #if _FXM_PLATFORM_ != _FXM_PLATFORM_WINDOWS_ if (NULL != pFontMgr) { @@ -24,7 +24,7 @@ IFX_Font* IFX_Font::LoadFont(FX_LPCWSTR pszFontFamily, FX_DWORD dwFontStyles, FX return pFont; #endif } -IFX_Font* IFX_Font::LoadFont(FX_LPCBYTE pBuffer, int32_t iLength, IFX_FontMgr *pFontMgr) +IFX_Font* IFX_Font::LoadFont(const uint8_t* pBuffer, int32_t iLength, IFX_FontMgr *pFontMgr) { #if _FXM_PLATFORM_ != _FXM_PLATFORM_WINDOWS_ if (NULL != pFontMgr) { @@ -40,7 +40,7 @@ IFX_Font* IFX_Font::LoadFont(FX_LPCBYTE pBuffer, int32_t iLength, IFX_FontMgr *p return pFont; #endif } -IFX_Font* IFX_Font::LoadFont(FX_LPCWSTR pszFileName, IFX_FontMgr *pFontMgr) +IFX_Font* IFX_Font::LoadFont(const FX_WCHAR* pszFileName, IFX_FontMgr *pFontMgr) { #if _FXM_PLATFORM_ != _FXM_PLATFORM_WINDOWS_ if (NULL != pFontMgr) { @@ -181,7 +181,7 @@ IFX_Font* CFX_GEFont::Retain() ++ m_iRefCount; return this; } -FX_BOOL CFX_GEFont::LoadFont(FX_LPCWSTR pszFontFamily, FX_DWORD dwFontStyles, FX_WORD wCodePage) +FX_BOOL CFX_GEFont::LoadFont(const FX_WCHAR* pszFontFamily, FX_DWORD dwFontStyles, FX_WORD wCodePage) { if (m_pFont != NULL) { return FALSE; @@ -235,7 +235,7 @@ FX_BOOL CFX_GEFont::LoadFont(FX_LPCWSTR pszFontFamily, FX_DWORD dwFontStyles, FX Unlock(); return bRet; } -FX_BOOL CFX_GEFont::LoadFont(FX_LPCBYTE pBuffer, int32_t length) +FX_BOOL CFX_GEFont::LoadFont(const uint8_t* pBuffer, int32_t length) { if (m_pFont != NULL) { return FALSE; @@ -250,7 +250,7 @@ FX_BOOL CFX_GEFont::LoadFont(FX_LPCBYTE pBuffer, int32_t length) Unlock(); return bRet; } -FX_BOOL CFX_GEFont::LoadFont(FX_LPCWSTR pszFileName) +FX_BOOL CFX_GEFont::LoadFont(const FX_WCHAR* pszFileName) { if (m_pFont != NULL) { return FALSE; @@ -446,7 +446,7 @@ FX_BOOL CFX_GEFont::GetCharBBox(FX_WCHAR wUnicode, CFX_Rect &bbox, FX_BOOL bRecu { FXSYS_assert(m_pRectArray != NULL); FXSYS_assert(m_pBBoxMap != NULL); - FX_LPVOID pRect = NULL; + void* pRect = NULL; if (!m_pBBoxMap->Lookup((void*)(uintptr_t)wUnicode, pRect)) { IFX_Font *pFont = NULL; int32_t iGlyph = GetGlyphIndex(wUnicode, TRUE, &pFont, bCharCode); @@ -533,9 +533,9 @@ int32_t CFX_GEFont::GetGlyphIndex(FX_WCHAR wUnicode, FX_BOOL bRecursive, IFX_Fon CFX_WideString wsFamily; GetFamilyName(wsFamily); #if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_ - IFX_Font *pFont = m_pFontMgr->GetDefFontByUnicode(wUnicode, GetFontStyles(), (FX_LPCWSTR)wsFamily); + IFX_Font *pFont = m_pFontMgr->GetDefFontByUnicode(wUnicode, GetFontStyles(), (const FX_WCHAR*)wsFamily); #else - IFX_Font *pFont = m_pFontMgr->GetFontByUnicode(wUnicode, GetFontStyles(), (FX_LPCWSTR)wsFamily); + IFX_Font *pFont = m_pFontMgr->GetFontByUnicode(wUnicode, GetFontStyles(), (const FX_WCHAR*)wsFamily); if (NULL == pFont) { pFont = m_pFontMgr->GetFontByUnicode(wUnicode, GetFontStyles(), NULL); } diff --git a/xfa/src/fgas/src/font/fx_gefont.h b/xfa/src/fgas/src/font/fx_gefont.h index e03fd8844e..7c4aa754db 100644 --- a/xfa/src/fgas/src/font/fx_gefont.h +++ b/xfa/src/fgas/src/font/fx_gefont.h @@ -19,9 +19,9 @@ public: ~CFX_GEFont(); virtual void Release(); virtual IFX_Font* Retain(); - FX_BOOL LoadFont(FX_LPCWSTR pszFontFamily, FX_DWORD dwFontStyles, FX_WORD wCodePage); - FX_BOOL LoadFont(FX_LPCBYTE pBuffer, int32_t length); - FX_BOOL LoadFont(FX_LPCWSTR pszFileName); + FX_BOOL LoadFont(const FX_WCHAR* pszFontFamily, FX_DWORD dwFontStyles, FX_WORD wCodePage); + FX_BOOL LoadFont(const uint8_t* pBuffer, int32_t length); + FX_BOOL LoadFont(const FX_WCHAR* pszFileName); FX_BOOL LoadFont(IFX_Stream *pFontStream, FX_BOOL bSaveStream); FX_BOOL LoadFont(CFX_Font *pExtFont, FX_BOOL bTakeOver = FALSE); virtual IFX_Font* Derive(FX_DWORD dwFontStyles, FX_WORD wCodePage = 0); diff --git a/xfa/src/fgas/src/font/fx_stdfontmgr.cpp b/xfa/src/fgas/src/font/fx_stdfontmgr.cpp index 2f4ef2038f..3569f78b11 100644 --- a/xfa/src/fgas/src/font/fx_stdfontmgr.cpp +++ b/xfa/src/fgas/src/font/fx_stdfontmgr.cpp @@ -8,11 +8,11 @@ #include "fx_stdfontmgr.h" #include "fx_fontutils.h" #if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_ -IFX_FontMgr* IFX_FontMgr::Create(FX_LPEnumAllFonts pEnumerator, FX_LPMatchFont pMatcher , FX_LPVOID pUserData ) +IFX_FontMgr* IFX_FontMgr::Create(FX_LPEnumAllFonts pEnumerator, FX_LPMatchFont pMatcher , void* pUserData ) { return FX_NEW CFX_StdFontMgrImp(pEnumerator, pMatcher, pUserData); } -CFX_StdFontMgrImp::CFX_StdFontMgrImp(FX_LPEnumAllFonts pEnumerator, FX_LPMatchFont pMatcher, FX_LPVOID pUserData) +CFX_StdFontMgrImp::CFX_StdFontMgrImp(FX_LPEnumAllFonts pEnumerator, FX_LPMatchFont pMatcher, void* pUserData) : m_pMatcher(pMatcher) , m_pEnumerator(pEnumerator) , m_FontFaces() @@ -52,7 +52,7 @@ CFX_StdFontMgrImp::~CFX_StdFontMgrImp() } m_Fonts.RemoveAll(); } -IFX_Font* CFX_StdFontMgrImp::GetDefFontByCodePage(FX_WORD wCodePage, FX_DWORD dwFontStyles, FX_LPCWSTR pszFontFamily) +IFX_Font* CFX_StdFontMgrImp::GetDefFontByCodePage(FX_WORD wCodePage, FX_DWORD dwFontStyles, const FX_WCHAR* pszFontFamily) { FX_DWORD dwHash = FGAS_GetFontHashCode(wCodePage, dwFontStyles); IFX_Font *pFont = NULL; @@ -76,12 +76,12 @@ IFX_Font* CFX_StdFontMgrImp::GetDefFontByCodePage(FX_WORD wCodePage, FX_DWORD dw } return NULL; } -IFX_Font* CFX_StdFontMgrImp::GetDefFontByCharset(uint8_t nCharset, FX_DWORD dwFontStyles, FX_LPCWSTR pszFontFamily) +IFX_Font* CFX_StdFontMgrImp::GetDefFontByCharset(uint8_t nCharset, FX_DWORD dwFontStyles, const FX_WCHAR* pszFontFamily) { return GetDefFontByCodePage(FX_GetCodePageFromCharset(nCharset), dwFontStyles, pszFontFamily); } #define _FX_USEGASFONTMGR_ -IFX_Font* CFX_StdFontMgrImp::GetDefFontByUnicode(FX_WCHAR wUnicode, FX_DWORD dwFontStyles, FX_LPCWSTR pszFontFamily) +IFX_Font* CFX_StdFontMgrImp::GetDefFontByUnicode(FX_WCHAR wUnicode, FX_DWORD dwFontStyles, const FX_WCHAR* pszFontFamily) { FGAS_LPCFONTUSB pRet = FGAS_GetUnicodeBitField(wUnicode); if (pRet->wBitField == 999) { @@ -102,7 +102,7 @@ IFX_Font* CFX_StdFontMgrImp::GetDefFontByUnicode(FX_WCHAR wUnicode, FX_DWORD dwF } FXSYS_assert(pFD); FX_WORD wCodePage = FX_GetCodePageFromCharset(pFD->uCharSet); - FX_LPCWSTR pFontFace = pFD->wsFontFace; + const FX_WCHAR* pFontFace = pFD->wsFontFace; pFont = IFX_Font::LoadFont(pFontFace, dwFontStyles, wCodePage, this); #else CFX_FontMapper* pBuiltinMapper = CFX_GEModule::Get()->GetFontMgr()->m_pBuiltinMapper; @@ -125,7 +125,7 @@ IFX_Font* CFX_StdFontMgrImp::GetDefFontByUnicode(FX_WCHAR wUnicode, FX_DWORD dwF pFont = IFX_Font::LoadFont(pFXFont, this); FX_WORD wCodePage = pRet->wCodePage; CFX_WideString wsPsName = pFXFont->GetPsName(); - FX_LPCWSTR pFontFace = wsPsName; + const FX_WCHAR* pFontFace = wsPsName; #endif if (pFont != NULL) { m_Fonts.Add(pFont); @@ -138,11 +138,11 @@ IFX_Font* CFX_StdFontMgrImp::GetDefFontByUnicode(FX_WCHAR wUnicode, FX_DWORD dwF } return NULL; } -IFX_Font* CFX_StdFontMgrImp::GetDefFontByLanguage(FX_WORD wLanguage, FX_DWORD dwFontStyles, FX_LPCWSTR pszFontFamily) +IFX_Font* CFX_StdFontMgrImp::GetDefFontByLanguage(FX_WORD wLanguage, FX_DWORD dwFontStyles, const FX_WCHAR* pszFontFamily) { return GetDefFontByCodePage(FX_GetDefCodePageByLanguage(wLanguage), dwFontStyles, pszFontFamily); } -IFX_Font* CFX_StdFontMgrImp::LoadFont(FX_LPCWSTR pszFontFamily, FX_DWORD dwFontStyles, FX_WORD wCodePage) +IFX_Font* CFX_StdFontMgrImp::LoadFont(const FX_WCHAR* pszFontFamily, FX_DWORD dwFontStyles, FX_WORD wCodePage) { FX_DWORD dwHash = FGAS_GetFontFamilyHash(pszFontFamily, dwFontStyles, wCodePage); IFX_Font *pFont = NULL; @@ -168,7 +168,7 @@ IFX_Font* CFX_StdFontMgrImp::LoadFont(FX_LPCWSTR pszFontFamily, FX_DWORD dwFontS } return NULL; } -IFX_Font* CFX_StdFontMgrImp::LoadFont(FX_LPCBYTE pBuffer, int32_t iLength) +IFX_Font* CFX_StdFontMgrImp::LoadFont(const uint8_t* pBuffer, int32_t iLength) { FXSYS_assert(pBuffer != NULL && iLength > 0); IFX_Font *pFont = NULL; @@ -185,7 +185,7 @@ IFX_Font* CFX_StdFontMgrImp::LoadFont(FX_LPCBYTE pBuffer, int32_t iLength) } return NULL; } -IFX_Font* CFX_StdFontMgrImp::LoadFont(FX_LPCWSTR pszFileName) +IFX_Font* CFX_StdFontMgrImp::LoadFont(const FX_WCHAR* pszFileName) { FXSYS_assert(pszFileName != NULL); FX_DWORD dwHash = FX_HashCode_String_GetW(pszFileName, -1); @@ -203,7 +203,7 @@ IFX_Font* CFX_StdFontMgrImp::LoadFont(FX_LPCWSTR pszFileName) } return NULL; } -IFX_Font* CFX_StdFontMgrImp::LoadFont(IFX_Stream *pFontStream, FX_LPCWSTR pszFontAlias , FX_DWORD dwFontStyles , FX_WORD wCodePage , FX_BOOL bSaveStream ) +IFX_Font* CFX_StdFontMgrImp::LoadFont(IFX_Stream *pFontStream, const FX_WCHAR* pszFontAlias , FX_DWORD dwFontStyles , FX_WORD wCodePage , FX_BOOL bSaveStream ) { FXSYS_assert(pFontStream != NULL && pFontStream->GetLength() > 0); IFX_Font *pFont = NULL; @@ -235,7 +235,7 @@ IFX_Font* CFX_StdFontMgrImp::LoadFont(IFX_Font *pSrcFont, FX_DWORD dwFontStyles, return pSrcFont->Retain(); } void* buffer[3] = {pSrcFont, (void*)(uintptr_t)dwFontStyles, (void*)(uintptr_t)wCodePage}; - FX_DWORD dwHash = FX_HashCode_String_GetA((FX_LPCSTR)buffer, 3 * sizeof(void*)); + FX_DWORD dwHash = FX_HashCode_String_GetA((const FX_CHAR*)buffer, 3 * sizeof(void*)); IFX_Font *pFont = NULL; if (m_DeriveFonts.GetCount() > 0) { m_DeriveFonts.Lookup((void*)(uintptr_t)dwHash, (void*&)pFont); @@ -268,8 +268,8 @@ void CFX_StdFontMgrImp::ClearFontCache() void CFX_StdFontMgrImp::RemoveFont(CFX_MapPtrToPtr &fontMap, IFX_Font *pFont) { FX_POSITION pos = fontMap.GetStartPosition(); - FX_LPVOID pKey; - FX_LPVOID pFind; + void* pKey; + void* pFind; while (pos != NULL) { pFind = NULL; fontMap.GetNextAssoc(pos, pKey, pFind); @@ -294,7 +294,7 @@ void CFX_StdFontMgrImp::RemoveFont(IFX_Font *pFont) m_Fonts.RemoveAt(iFind, 1); } } -FX_LPCFONTDESCRIPTOR CFX_StdFontMgrImp::FindFont(FX_LPCWSTR pszFontFamily, FX_DWORD dwFontStyles, FX_DWORD dwMatchFlags, FX_WORD wCodePage, FX_DWORD dwUSB , FX_WCHAR wUnicode ) +FX_LPCFONTDESCRIPTOR CFX_StdFontMgrImp::FindFont(const FX_WCHAR* pszFontFamily, FX_DWORD dwFontStyles, FX_DWORD dwMatchFlags, FX_WORD wCodePage, FX_DWORD dwUSB , FX_WCHAR wUnicode ) { if (m_pMatcher == NULL) { return NULL; @@ -330,7 +330,7 @@ FX_LPCFONTDESCRIPTOR CFX_StdFontMgrImp::FindFont(FX_LPCWSTR pszFontFamily, FX_DW } return NULL; } -FX_LPCFONTDESCRIPTOR FX_DefFontMatcher(FX_LPFONTMATCHPARAMS pParams, const CFX_FontDescriptors &fonts, FX_LPVOID pUserData) +FX_LPCFONTDESCRIPTOR FX_DefFontMatcher(FX_LPFONTMATCHPARAMS pParams, const CFX_FontDescriptors &fonts, void* pUserData) { FX_LPCFONTDESCRIPTOR pBestFont = NULL; int32_t iBestSimilar = 0; @@ -440,21 +440,21 @@ static int32_t CALLBACK FX_GdiFontEnumProc(ENUMLOGFONTEX *lpelfe, NEWTEXTMETRICE FXSYS_memset(pFont, 0, sizeof(FX_FONTDESCRIPTOR)); pFont->uCharSet = lf.lfCharSet; pFont->dwFontStyles = FX_GetGdiFontStyles(lf); - FXSYS_wcsncpy(pFont->wsFontFace, (FX_LPCWSTR)lf.lfFaceName, 31); + FXSYS_wcsncpy(pFont->wsFontFace, (const FX_WCHAR*)lf.lfFaceName, 31); pFont->wsFontFace[31] = 0; FX_memcpy(&pFont->FontSignature, &lpntme->ntmFontSig, sizeof(lpntme->ntmFontSig)); ((CFX_FontDescriptors*)lParam)->Add(*pFont); FX_Free(pFont); return 1; } -static void FX_EnumGdiFonts(CFX_FontDescriptors &fonts, FX_LPVOID pUserData, FX_LPCWSTR pwsFaceName, FX_WCHAR wUnicode) +static void FX_EnumGdiFonts(CFX_FontDescriptors &fonts, void* pUserData, const FX_WCHAR* pwsFaceName, FX_WCHAR wUnicode) { HDC hDC = ::GetDC(NULL); LOGFONTW lfFind; FX_memset(&lfFind, 0, sizeof(lfFind)); lfFind.lfCharSet = DEFAULT_CHARSET; if (pwsFaceName) { - FXSYS_wcsncpy((FX_LPWSTR)lfFind.lfFaceName, pwsFaceName, 31); + FXSYS_wcsncpy((FX_WCHAR*)lfFind.lfFaceName, pwsFaceName, 31); lfFind.lfFaceName[31] = 0; } EnumFontFamiliesExW(hDC, (LPLOGFONTW)&lfFind, (FONTENUMPROCW)FX_GdiFontEnumProc, (LPARAM)&fonts, 0); @@ -465,7 +465,7 @@ FX_LPEnumAllFonts FX_GetDefFontEnumerator() return FX_EnumGdiFonts; } #else -FX_LPCSTR g_FontFolders[] = { +const FX_CHAR* g_FontFolders[] = { #if _FXM_PLATFORM_ == _FXM_PLATFORM_LINUX_ "/usr/share/fonts", "/usr/share/X11/fonts/Type1", @@ -481,14 +481,14 @@ FX_LPCSTR g_FontFolders[] = { }; CFX_FontSourceEnum_File::CFX_FontSourceEnum_File() { - for (int32_t i = 0; i < sizeof(g_FontFolders) / sizeof(FX_LPCSTR); i++) { + for (int32_t i = 0; i < sizeof(g_FontFolders) / sizeof(const FX_CHAR*); i++) { m_FolderPaths.Add(g_FontFolders[i]); } } CFX_ByteString CFX_FontSourceEnum_File::GetNextFile() { Restart: - FX_LPVOID pCurHandle = m_FolderQueue.GetSize() == 0 ? NULL : m_FolderQueue.GetDataPtr(m_FolderQueue.GetSize() - 1)->pFileHandle; + void* pCurHandle = m_FolderQueue.GetSize() == 0 ? NULL : m_FolderQueue.GetDataPtr(m_FolderQueue.GetSize() - 1)->pFileHandle; if (NULL == pCurHandle) { if (m_FolderPaths.GetSize() < 1) { return ""; @@ -536,7 +536,7 @@ Restart: } return bsName; } -FX_POSITION CFX_FontSourceEnum_File::GetStartPosition( FX_LPVOID pUserData ) +FX_POSITION CFX_FontSourceEnum_File::GetStartPosition( void* pUserData ) { m_wsNext = GetNextFile().UTF8Decode(); if (0 == m_wsNext.GetLength()) { @@ -544,7 +544,7 @@ FX_POSITION CFX_FontSourceEnum_File::GetStartPosition( FX_LPVOID pUserData ) } return (FX_POSITION) - 1; } -IFX_FileAccess* CFX_FontSourceEnum_File::GetNext( FX_POSITION& pos, FX_LPVOID pUserData ) +IFX_FileAccess* CFX_FontSourceEnum_File::GetNext( FX_POSITION& pos, void* pUserData ) { IFX_FileAccess* pAccess = FX_CreateDefaultFileAccess(m_wsNext); m_wsNext = GetNextFile().UTF8Decode(); @@ -555,7 +555,7 @@ IFX_FontSourceEnum* FX_CreateDefaultFontSourceEnum() { return (IFX_FontSourceEnum*)FX_NEW CFX_FontSourceEnum_File; } -IFX_FontMgr* IFX_FontMgr::Create(IFX_FontSourceEnum* pFontEnum, IFX_FontMgrDelegate* pDelegate, FX_LPVOID pUserData) +IFX_FontMgr* IFX_FontMgr::Create(IFX_FontSourceEnum* pFontEnum, IFX_FontMgrDelegate* pDelegate, void* pUserData) { if (NULL == pFontEnum) { return NULL; @@ -570,7 +570,7 @@ IFX_FontMgr* IFX_FontMgr::Create(IFX_FontSourceEnum* pFontEnum, IFX_FontMgrDeleg delete pFontMgr; return NULL; } -CFX_FontMgrImp::CFX_FontMgrImp( IFX_FontSourceEnum* pFontEnum, IFX_FontMgrDelegate* pDelegate , FX_LPVOID pUserData ) +CFX_FontMgrImp::CFX_FontMgrImp( IFX_FontSourceEnum* pFontEnum, IFX_FontMgrDelegate* pDelegate , void* pUserData ) : m_pFontSource(pFontEnum) , m_pDelegate(pDelegate) , m_pUserData(pUserData) @@ -673,23 +673,23 @@ void CFX_FontMgrImp::Release() } delete this; } -IFX_Font* CFX_FontMgrImp::GetDefFontByCodePage( FX_WORD wCodePage, FX_DWORD dwFontStyles, FX_LPCWSTR pszFontFamily ) +IFX_Font* CFX_FontMgrImp::GetDefFontByCodePage( FX_WORD wCodePage, FX_DWORD dwFontStyles, const FX_WCHAR* pszFontFamily ) { return NULL == m_pDelegate ? NULL : m_pDelegate->GetDefFontByCodePage(this, wCodePage, dwFontStyles, pszFontFamily); } -IFX_Font* CFX_FontMgrImp::GetDefFontByCharset( uint8_t nCharset, FX_DWORD dwFontStyles, FX_LPCWSTR pszFontFamily ) +IFX_Font* CFX_FontMgrImp::GetDefFontByCharset( uint8_t nCharset, FX_DWORD dwFontStyles, const FX_WCHAR* pszFontFamily ) { return NULL == m_pDelegate ? NULL : m_pDelegate->GetDefFontByCharset(this, nCharset, dwFontStyles, pszFontFamily); } -IFX_Font* CFX_FontMgrImp::GetDefFontByUnicode( FX_WCHAR wUnicode, FX_DWORD dwFontStyles, FX_LPCWSTR pszFontFamily ) +IFX_Font* CFX_FontMgrImp::GetDefFontByUnicode( FX_WCHAR wUnicode, FX_DWORD dwFontStyles, const FX_WCHAR* pszFontFamily ) { return NULL == m_pDelegate ? NULL : m_pDelegate->GetDefFontByUnicode(this, wUnicode, dwFontStyles, pszFontFamily); } -IFX_Font* CFX_FontMgrImp::GetDefFontByLanguage( FX_WORD wLanguage, FX_DWORD dwFontStyles, FX_LPCWSTR pszFontFamily ) +IFX_Font* CFX_FontMgrImp::GetDefFontByLanguage( FX_WORD wLanguage, FX_DWORD dwFontStyles, const FX_WCHAR* pszFontFamily ) { return NULL == m_pDelegate ? NULL : m_pDelegate->GetDefFontByLanguage(this, wLanguage, dwFontStyles, pszFontFamily); } -IFX_Font* CFX_FontMgrImp::GetFontByCodePage( FX_WORD wCodePage, FX_DWORD dwFontStyles, FX_LPCWSTR pszFontFamily ) +IFX_Font* CFX_FontMgrImp::GetFontByCodePage( FX_WORD wCodePage, FX_DWORD dwFontStyles, const FX_WCHAR* pszFontFamily ) { CFX_ByteString bsHash; bsHash.Format("%d, %d", wCodePage, dwFontStyles); @@ -729,11 +729,11 @@ IFX_Font* CFX_FontMgrImp::GetFontByCodePage( FX_WORD wCodePage, FX_DWORD dwFontS pFonts->Add(pFont); return pFont; } -IFX_Font* CFX_FontMgrImp::GetFontByCharset( uint8_t nCharset, FX_DWORD dwFontStyles, FX_LPCWSTR pszFontFamily ) +IFX_Font* CFX_FontMgrImp::GetFontByCharset( uint8_t nCharset, FX_DWORD dwFontStyles, const FX_WCHAR* pszFontFamily ) { return GetFontByCodePage(FX_GetCodePageFromCharset(nCharset), dwFontStyles, pszFontFamily); } -IFX_Font* CFX_FontMgrImp::GetFontByUnicode( FX_WCHAR wUnicode, FX_DWORD dwFontStyles, FX_LPCWSTR pszFontFamily ) +IFX_Font* CFX_FontMgrImp::GetFontByUnicode( FX_WCHAR wUnicode, FX_DWORD dwFontStyles, const FX_WCHAR* pszFontFamily ) { IFX_Font* pFont = NULL; if (m_FailedUnicodes2NULL.Lookup(wUnicode, pFont)) { @@ -842,14 +842,14 @@ FX_BOOL CFX_FontMgrImp::VerifyUnicode( IFX_Font* pFont, FX_WCHAR wcUnicode ) } return TRUE; } -IFX_Font* CFX_FontMgrImp::GetFontByLanguage( FX_WORD wLanguage, FX_DWORD dwFontStyles, FX_LPCWSTR pszFontFamily ) +IFX_Font* CFX_FontMgrImp::GetFontByLanguage( FX_WORD wLanguage, FX_DWORD dwFontStyles, const FX_WCHAR* pszFontFamily ) { return GetFontByCodePage(FX_GetDefCodePageByLanguage(wLanguage), dwFontStyles, pszFontFamily); } -IFX_Font* CFX_FontMgrImp::LoadFont( FX_LPCBYTE pBuffer, int32_t iLength, int32_t iFaceIndex, int32_t* pFaceCount ) +IFX_Font* CFX_FontMgrImp::LoadFont( const uint8_t* pBuffer, int32_t iLength, int32_t iFaceIndex, int32_t* pFaceCount ) { - FX_LPVOID Hash[2] = {(FX_LPVOID)(uintptr_t)pBuffer, (FX_LPVOID)(uintptr_t)iLength}; - FX_DWORD dwHash = FX_HashCode_String_GetA((FX_LPCSTR)Hash, 2 * sizeof (FX_LPVOID)); + void* Hash[2] = {(void*)(uintptr_t)pBuffer, (void*)(uintptr_t)iLength}; + FX_DWORD dwHash = FX_HashCode_String_GetA((const FX_CHAR*)Hash, 2 * sizeof (void*)); IFX_FileAccess* pFontAccess = NULL; if (!m_Hash2FileAccess.Lookup(dwHash, pFontAccess)) { } @@ -859,11 +859,11 @@ IFX_Font* CFX_FontMgrImp::LoadFont( FX_LPCBYTE pBuffer, int32_t iLength, int32_t return NULL; } } -IFX_Font* CFX_FontMgrImp::LoadFont( FX_LPCWSTR pszFileName, int32_t iFaceIndex, int32_t* pFaceCount ) +IFX_Font* CFX_FontMgrImp::LoadFont( const FX_WCHAR* pszFileName, int32_t iFaceIndex, int32_t* pFaceCount ) { CFX_ByteString bsHash; bsHash += CFX_WideString(pszFileName).UTF8Encode(); - FX_DWORD dwHash = FX_HashCode_String_GetA((FX_LPCSTR)bsHash, bsHash.GetLength()); + FX_DWORD dwHash = FX_HashCode_String_GetA((const FX_CHAR*)bsHash, bsHash.GetLength()); IFX_FileAccess* pFontAccess = NULL; if (!m_Hash2FileAccess.Lookup(dwHash, pFontAccess)) { pFontAccess = FX_CreateDefaultFileAccess(pszFileName); @@ -877,8 +877,8 @@ IFX_Font* CFX_FontMgrImp::LoadFont( FX_LPCWSTR pszFileName, int32_t iFaceIndex, } IFX_Font* CFX_FontMgrImp::LoadFont( IFX_Stream* pFontStream, int32_t iFaceIndex, int32_t* pFaceCount, FX_BOOL bSaveStream ) { - FX_LPVOID Hash[1] = {(FX_LPVOID)(uintptr_t)pFontStream}; - FX_DWORD dwHash = FX_HashCode_String_GetA((FX_LPCSTR)Hash, 1 * sizeof (FX_LPVOID)); + void* Hash[1] = {(void*)(uintptr_t)pFontStream}; + FX_DWORD dwHash = FX_HashCode_String_GetA((const FX_CHAR*)Hash, 1 * sizeof (void*)); IFX_FileAccess* pFontAccess = NULL; if (!m_Hash2FileAccess.Lookup(dwHash, pFontAccess)) { } @@ -1263,7 +1263,7 @@ void CFX_FontMgrImp::ReportFace( FXFT_Face pFace, CFX_FontDescriptors& Fonts, IF GetUSBCSB(pFace, pFont->m_dwUsb, pFont->m_dwCsb); unsigned long nLength = 0; FT_ULong dwTag; - FX_LPBYTE pTable = NULL; + uint8_t* pTable = NULL; FT_ENC_TAG(dwTag, 'n', 'a', 'm', 'e'); unsigned int error = FXFT_Load_Sfnt_Table(pFace, dwTag, 0, NULL, &nLength); if (0 == error && 0 != nLength) { @@ -1314,17 +1314,17 @@ FX_DWORD CFX_FontMgrImp::GetFlags(FXFT_Face pFace) #define GetUInt8(p) ((uint8_t)((p)[0])) #define GetUInt16(p) ((uint16_t)((p)[0] << 8 | (p)[1])) #define GetUInt32(p) ((uint32_t)((p)[0] << 24 | (p)[1] << 16 | (p)[2] << 8 | (p)[3])) -void CFX_FontMgrImp::GetNames(FX_LPCBYTE name_table, CFX_WideStringArray& Names) +void CFX_FontMgrImp::GetNames(const uint8_t* name_table, CFX_WideStringArray& Names) { if (NULL == name_table) { return; } - FX_LPBYTE lpTable = (FX_LPBYTE)name_table; + uint8_t* lpTable = (uint8_t*)name_table; CFX_WideString wsFamily; - FX_LPBYTE sp = lpTable + 2; - FX_LPBYTE lpNameRecord = lpTable + 6; + uint8_t* sp = lpTable + 2; + uint8_t* lpNameRecord = lpTable + 6; uint16_t nNameCount = GetUInt16(sp); - FX_LPBYTE lpStr = lpTable + GetUInt16(sp + 2); + uint8_t* lpStr = lpTable + GetUInt16(sp + 2); for (uint16_t j = 0; j < nNameCount; j++) { uint16_t nNameID = GetUInt16(lpNameRecord + j * 12 + 6); if (nNameID != 1) { @@ -1482,7 +1482,7 @@ void CFX_FontMgrImp::NormalizeFontName( CFX_WideString& FontName ) } int32_t CFX_FontMgrImp::IsPartName( const CFX_WideString& Name1, const CFX_WideString& Name2 ) { - if (Name1.Find((FX_LPCWSTR)Name2) != -1) { + if (Name1.Find((const FX_WCHAR*)Name2) != -1) { return 1; } return 0; diff --git a/xfa/src/fgas/src/font/fx_stdfontmgr.h b/xfa/src/fgas/src/font/fx_stdfontmgr.h index 37b0b63da0..3377995b70 100644 --- a/xfa/src/fgas/src/font/fx_stdfontmgr.h +++ b/xfa/src/fgas/src/font/fx_stdfontmgr.h @@ -8,24 +8,24 @@ #define _FX_FONTMGR_IMP #if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_ int32_t FX_GetSimilarValue(FX_LPCFONTDESCRIPTOR pFont, FX_DWORD dwFontStyles); -FX_LPCFONTDESCRIPTOR FX_DefFontMatcher(FX_LPFONTMATCHPARAMS pParams, const CFX_FontDescriptors &fonts, FX_LPVOID pUserData); +FX_LPCFONTDESCRIPTOR FX_DefFontMatcher(FX_LPFONTMATCHPARAMS pParams, const CFX_FontDescriptors &fonts, void* pUserData); class CFX_StdFontMgrImp : public IFX_FontMgr { public: - CFX_StdFontMgrImp(FX_LPEnumAllFonts pEnumerator, FX_LPMatchFont pMatcher, FX_LPVOID pUserData); + CFX_StdFontMgrImp(FX_LPEnumAllFonts pEnumerator, FX_LPMatchFont pMatcher, void* pUserData); ~CFX_StdFontMgrImp(); virtual void Release() { delete this; } - virtual IFX_Font* GetDefFontByCodePage(FX_WORD wCodePage, FX_DWORD dwFontStyles, FX_LPCWSTR pszFontFamily = NULL); - virtual IFX_Font* GetDefFontByCharset(uint8_t nCharset, FX_DWORD dwFontStyles, FX_LPCWSTR pszFontFamily = NULL); - virtual IFX_Font* GetDefFontByUnicode(FX_WCHAR wUnicode, FX_DWORD dwFontStyles, FX_LPCWSTR pszFontFamily = NULL); - virtual IFX_Font* GetDefFontByLanguage(FX_WORD wLanguage, FX_DWORD dwFontStyles, FX_LPCWSTR pszFontFamily = NULL); - virtual IFX_Font* LoadFont(FX_LPCWSTR pszFontFamily, FX_DWORD dwFontStyles, FX_WORD wCodePage = 0xFFFF); - virtual IFX_Font* LoadFont(FX_LPCBYTE pBuffer, int32_t iLength); - virtual IFX_Font* LoadFont(FX_LPCWSTR pszFileName); - virtual IFX_Font* LoadFont(IFX_Stream *pFontStream, FX_LPCWSTR pszFontAlias = NULL, FX_DWORD dwFontStyles = 0, FX_WORD wCodePage = 0, FX_BOOL bSaveStream = FALSE); + virtual IFX_Font* GetDefFontByCodePage(FX_WORD wCodePage, FX_DWORD dwFontStyles, const FX_WCHAR* pszFontFamily = NULL); + virtual IFX_Font* GetDefFontByCharset(uint8_t nCharset, FX_DWORD dwFontStyles, const FX_WCHAR* pszFontFamily = NULL); + virtual IFX_Font* GetDefFontByUnicode(FX_WCHAR wUnicode, FX_DWORD dwFontStyles, const FX_WCHAR* pszFontFamily = NULL); + virtual IFX_Font* GetDefFontByLanguage(FX_WORD wLanguage, FX_DWORD dwFontStyles, const FX_WCHAR* pszFontFamily = NULL); + virtual IFX_Font* LoadFont(const FX_WCHAR* pszFontFamily, FX_DWORD dwFontStyles, FX_WORD wCodePage = 0xFFFF); + virtual IFX_Font* LoadFont(const uint8_t* pBuffer, int32_t iLength); + virtual IFX_Font* LoadFont(const FX_WCHAR* pszFileName); + virtual IFX_Font* LoadFont(IFX_Stream *pFontStream, const FX_WCHAR* pszFontAlias = NULL, FX_DWORD dwFontStyles = 0, FX_WORD wCodePage = 0, FX_BOOL bSaveStream = FALSE); virtual IFX_Font* LoadFont(IFX_Font *pSrcFont, FX_DWORD dwFontStyles, FX_WORD wCodePage = 0xFFFF); virtual void ClearFontCache(); virtual void RemoveFont(IFX_Font *pFont); @@ -41,9 +41,9 @@ protected: CFX_MapPtrToPtr m_FileFonts; CFX_MapPtrToPtr m_StreamFonts; CFX_MapPtrToPtr m_DeriveFonts; - FX_LPVOID m_pUserData; + void* m_pUserData; void RemoveFont(CFX_MapPtrToPtr &fontMap, IFX_Font *pFont); - FX_LPCFONTDESCRIPTOR FindFont(FX_LPCWSTR pszFontFamily, FX_DWORD dwFontStyles, FX_DWORD dwMatchFlags, FX_WORD wCodePage, FX_DWORD dwUSB = 999, FX_WCHAR wUnicode = 0); + FX_LPCFONTDESCRIPTOR FindFont(const FX_WCHAR* pszFontFamily, FX_DWORD dwFontStyles, FX_DWORD dwMatchFlags, FX_WORD wCodePage, FX_DWORD dwUSB = 999, FX_WCHAR wUnicode = 0); IFX_Font* GetFont(FX_LPCFONTDESCRIPTOR pFD, FX_DWORD dwFontStyles); }; FX_DWORD FX_GetGdiFontStyles(const LOGFONTW &lf); @@ -112,8 +112,8 @@ public: { delete this; }; - virtual FX_POSITION GetStartPosition(FX_LPVOID pUserData = NULL); - virtual IFX_FileAccess* GetNext(FX_POSITION& pos, FX_LPVOID pUserData = NULL); + virtual FX_POSITION GetStartPosition(void* pUserData = NULL); + virtual IFX_FileAccess* GetNext(FX_POSITION& pos, void* pUserData = NULL); private: CFX_ByteString GetNextFile(); CFX_WideString m_wsNext; @@ -130,25 +130,25 @@ typedef CFX_MapPtrTemplate CFX_FonStreamtMap; class CFX_FontMgrImp : public IFX_FontMgr { public: - CFX_FontMgrImp(IFX_FontSourceEnum* pFontEnum, IFX_FontMgrDelegate* pDelegate = NULL, FX_LPVOID pUserData = NULL); + CFX_FontMgrImp(IFX_FontSourceEnum* pFontEnum, IFX_FontMgrDelegate* pDelegate = NULL, void* pUserData = NULL); virtual void Release(); - virtual IFX_Font* GetDefFontByCodePage(FX_WORD wCodePage, FX_DWORD dwFontStyles, FX_LPCWSTR pszFontFamily = NULL); - virtual IFX_Font* GetDefFontByCharset(uint8_t nCharset, FX_DWORD dwFontStyles, FX_LPCWSTR pszFontFamily = NULL); - virtual IFX_Font* GetDefFontByUnicode(FX_WCHAR wUnicode, FX_DWORD dwFontStyles, FX_LPCWSTR pszFontFamily = NULL); - virtual IFX_Font* GetDefFontByLanguage(FX_WORD wLanguage, FX_DWORD dwFontStyles, FX_LPCWSTR pszFontFamily = NULL); - virtual IFX_Font* GetFontByCodePage(FX_WORD wCodePage, FX_DWORD dwFontStyles, FX_LPCWSTR pszFontFamily = NULL); - virtual IFX_Font* GetFontByCharset(uint8_t nCharset, FX_DWORD dwFontStyles, FX_LPCWSTR pszFontFamily = NULL); - virtual IFX_Font* GetFontByUnicode(FX_WCHAR wUnicode, FX_DWORD dwFontStyles, FX_LPCWSTR pszFontFamily = NULL); - virtual IFX_Font* GetFontByLanguage(FX_WORD wLanguage, FX_DWORD dwFontStyles, FX_LPCWSTR pszFontFamily = NULL); - virtual IFX_Font* LoadFont(FX_LPCBYTE pBuffer, int32_t iLength, int32_t iFaceIndex, int32_t* pFaceCount); - virtual IFX_Font* LoadFont(FX_LPCWSTR pszFileName, int32_t iFaceIndex, int32_t* pFaceCount); + virtual IFX_Font* GetDefFontByCodePage(FX_WORD wCodePage, FX_DWORD dwFontStyles, const FX_WCHAR* pszFontFamily = NULL); + virtual IFX_Font* GetDefFontByCharset(uint8_t nCharset, FX_DWORD dwFontStyles, const FX_WCHAR* pszFontFamily = NULL); + virtual IFX_Font* GetDefFontByUnicode(FX_WCHAR wUnicode, FX_DWORD dwFontStyles, const FX_WCHAR* pszFontFamily = NULL); + virtual IFX_Font* GetDefFontByLanguage(FX_WORD wLanguage, FX_DWORD dwFontStyles, const FX_WCHAR* pszFontFamily = NULL); + virtual IFX_Font* GetFontByCodePage(FX_WORD wCodePage, FX_DWORD dwFontStyles, const FX_WCHAR* pszFontFamily = NULL); + virtual IFX_Font* GetFontByCharset(uint8_t nCharset, FX_DWORD dwFontStyles, const FX_WCHAR* pszFontFamily = NULL); + virtual IFX_Font* GetFontByUnicode(FX_WCHAR wUnicode, FX_DWORD dwFontStyles, const FX_WCHAR* pszFontFamily = NULL); + virtual IFX_Font* GetFontByLanguage(FX_WORD wLanguage, FX_DWORD dwFontStyles, const FX_WCHAR* pszFontFamily = NULL); + virtual IFX_Font* LoadFont(const uint8_t* pBuffer, int32_t iLength, int32_t iFaceIndex, int32_t* pFaceCount); + virtual IFX_Font* LoadFont(const FX_WCHAR* pszFileName, int32_t iFaceIndex, int32_t* pFaceCount); virtual IFX_Font* LoadFont(IFX_Stream* pFontStream, int32_t iFaceIndex, int32_t* pFaceCount, FX_BOOL bSaveStream = FALSE); virtual void ClearFontCache(); virtual void RemoveFont(IFX_Font* pFont); FX_BOOL EnumFonts(); protected: void ReportFace(FXFT_Face pFace, CFX_FontDescriptors& Fonts, IFX_FileAccess* pFontAccess); - void GetNames(FX_LPCBYTE name_table, CFX_WideStringArray& Names); + void GetNames(const uint8_t* name_table, CFX_WideStringArray& Names); void GetCharsets(FXFT_Face pFace, CFX_WordArray& Charsets); void GetUSBCSB(FXFT_Face pFace, FX_DWORD* USB, FX_DWORD* CSB); FX_DWORD GetFlags(FXFT_Face pFace); @@ -169,7 +169,7 @@ protected: CFX_UnicodeFontMap m_FailedUnicodes2NULL; IFX_FontSourceEnum* m_pFontSource; IFX_FontMgrDelegate* m_pDelegate; - FX_LPVOID m_pUserData; + void* m_pUserData; }; #endif #endif diff --git a/xfa/src/fgas/src/layout/fx_linebreak.cpp b/xfa/src/fgas/src/layout/fx_linebreak.cpp index dde8b8cc61..e4a0987fd7 100644 --- a/xfa/src/fgas/src/layout/fx_linebreak.cpp +++ b/xfa/src/fgas/src/layout/fx_linebreak.cpp @@ -72,7 +72,7 @@ extern const FX_LINEBREAKTYPE gs_FX_LineBreak_PairTable[64][32] = { {FX_LBUN, FX_LBUN, FX_LBUN, FX_LBUN, FX_LBUN, FX_LBUN, FX_LBUN, FX_LBUN, FX_LBUN, FX_LBUN, FX_LBUN, FX_LBUN, FX_LBUN, FX_LBUN, FX_LBUN, FX_LBUN, FX_LBUN, FX_LBUN, FX_LBUN, FX_LBUN, FX_LBUN, FX_LBUN, FX_LBUN, FX_LBUN, FX_LBUN, FX_LBUN, FX_LBUN, FX_LBUN, FX_LBUN, FX_LBUN, FX_LBUN, FX_LBUN}, {FX_LBUN, FX_LBUN, FX_LBUN, FX_LBUN, FX_LBUN, FX_LBUN, FX_LBUN, FX_LBUN, FX_LBUN, FX_LBUN, FX_LBUN, FX_LBUN, FX_LBUN, FX_LBUN, FX_LBUN, FX_LBUN, FX_LBUN, FX_LBUN, FX_LBUN, FX_LBUN, FX_LBUN, FX_LBUN, FX_LBUN, FX_LBUN, FX_LBUN, FX_LBUN, FX_LBUN, FX_LBUN, FX_LBUN, FX_LBUN, FX_LBUN, FX_LBUN}, }; -void FX_GetLineBreakPositions(FX_LPCWSTR pwsText, FX_LINEBREAKTYPE *pBrkType, int32_t iLength) +void FX_GetLineBreakPositions(const FX_WCHAR* pwsText, FX_LINEBREAKTYPE *pBrkType, int32_t iLength) { if (iLength < 2) { return; @@ -94,7 +94,7 @@ void FX_GetLineBreakPositions(FX_LPCWSTR pwsText, FX_LINEBREAKTYPE *pBrkType, in } pBrkType[iLength] = FX_LBT_INDIRECT_BRK; } -void FX_GetLineBreakPositions(FX_LPCWSTR pwsText, int32_t iLength, CFX_Int32MassArray &bp) +void FX_GetLineBreakPositions(const FX_WCHAR* pwsText, int32_t iLength, CFX_Int32MassArray &bp) { if (iLength < 2) { return; diff --git a/xfa/src/fgas/src/layout/fx_rtfbreak.cpp b/xfa/src/fgas/src/layout/fx_rtfbreak.cpp index 95c9118f90..44b0dc8fdd 100644 --- a/xfa/src/fgas/src/layout/fx_rtfbreak.cpp +++ b/xfa/src/fgas/src/layout/fx_rtfbreak.cpp @@ -1190,7 +1190,7 @@ int32_t CFX_RTFBreak::GetDisplayPos(FX_LPCRTFTEXTOBJ pText, FXTEXT_CHARPOS *pCha return 0; } FXSYS_assert(pText->pStr != NULL && pText->pWidths != NULL && pText->pFont != NULL && pText->pRect != NULL); - FX_LPCWSTR pStr = pText->pStr; + const FX_WCHAR* pStr = pText->pStr; int32_t *pWidths = pText->pWidths; int32_t iLength = pText->iLength - 1; IFX_Font *pFont = pText->pFont; @@ -1423,7 +1423,7 @@ int32_t CFX_RTFBreak::GetCharRects(FX_LPCRTFTEXTOBJ pText, CFX_RectFArray &rtArr return 0; } FXSYS_assert(pText->pStr != NULL && pText->pWidths != NULL && pText->pFont != NULL && pText->pRect != NULL); - FX_LPCWSTR pStr = pText->pStr; + const FX_WCHAR* pStr = pText->pStr; int32_t *pWidths = pText->pWidths; int32_t iLength = pText->iLength; CFX_RectF rect(*pText->pRect); diff --git a/xfa/src/fgas/src/layout/fx_textbreak.cpp b/xfa/src/fgas/src/layout/fx_textbreak.cpp index 80d56c7191..7a740f5212 100644 --- a/xfa/src/fgas/src/layout/fx_textbreak.cpp +++ b/xfa/src/fgas/src/layout/fx_textbreak.cpp @@ -216,7 +216,7 @@ void CFX_TxtBreak::SetCombWidth(FX_FLOAT fCombWidth) { m_iCombWidth = FXSYS_round(fCombWidth * 20000.0f); } -void CFX_TxtBreak::SetUserData(FX_LPVOID pUserData) +void CFX_TxtBreak::SetUserData(void* pUserData) { if (m_pUserData == pUserData) { return; @@ -1183,8 +1183,8 @@ int32_t CFX_TxtBreak::GetDisplayPos(FX_LPCTXTRUN pTxtRun, FXTEXT_CHARPOS *pCharP return 0; } IFX_TxtAccess *pAccess = pTxtRun->pAccess; - FX_LPVOID pIdentity = pTxtRun->pIdentity; - FX_LPCWSTR pStr = pTxtRun->pStr; + void* pIdentity = pTxtRun->pIdentity; + const FX_WCHAR* pStr = pTxtRun->pStr; int32_t *pWidths = pTxtRun->pWidths; int32_t iLength = pTxtRun->iLength - 1; IFX_Font *pFont = pTxtRun->pFont; @@ -1550,8 +1550,8 @@ int32_t CFX_TxtBreak::GetCharRects(FX_LPCTXTRUN pTxtRun, CFX_RectFArray &rtArray return 0; } IFX_TxtAccess *pAccess = pTxtRun->pAccess; - FX_LPVOID pIdentity = pTxtRun->pIdentity; - FX_LPCWSTR pStr = pTxtRun->pStr; + void* pIdentity = pTxtRun->pIdentity; + const FX_WCHAR* pStr = pTxtRun->pStr; int32_t *pWidths = pTxtRun->pWidths; int32_t iLength = pTxtRun->iLength; CFX_RectF rect(*pTxtRun->pRect); diff --git a/xfa/src/fgas/src/layout/fx_textbreak.h b/xfa/src/fgas/src/layout/fx_textbreak.h index c38fc0b1ba..13e79dae60 100644 --- a/xfa/src/fgas/src/layout/fx_textbreak.h +++ b/xfa/src/fgas/src/layout/fx_textbreak.h @@ -45,7 +45,7 @@ public: void GetString(CFX_WideString &wsStr) const { int32_t iCount = m_pLineChars->GetSize(); - FX_LPWSTR pBuf = wsStr.GetBuffer(iCount); + FX_WCHAR* pBuf = wsStr.GetBuffer(iCount); CFX_Char *pChar; for (int32_t i = 0; i < iCount; i ++) { pChar = m_pLineChars->GetDataPtr(i); @@ -96,7 +96,7 @@ public: virtual FX_DWORD GetContextCharStyles() const; virtual void SetContextCharStyles(FX_DWORD dwCharStyles); virtual void SetCombWidth(FX_FLOAT fCombWidth); - virtual void SetUserData(FX_LPVOID pUserData); + virtual void SetUserData(void* pUserData); virtual FX_DWORD AppendChar(FX_WCHAR wch); virtual FX_DWORD EndBreak(FX_DWORD dwStatus = FX_TXTBREAK_PieceBreak); virtual int32_t CountBreakChars() const; @@ -139,7 +139,7 @@ protected: int32_t m_iAlignment; FX_DWORD m_dwContextCharStyles; int32_t m_iCombWidth; - FX_LPVOID m_pUserData; + void* m_pUserData; FX_DWORD m_dwCharType; FX_BOOL m_bCurRTL; int32_t m_iCurAlignment; diff --git a/xfa/src/fgas/src/localization/fx_locale.cpp b/xfa/src/fgas/src/localization/fx_locale.cpp index 4f046df119..8e564354a7 100644 --- a/xfa/src/fgas/src/localization/fx_locale.cpp +++ b/xfa/src/fgas/src/localization/fx_locale.cpp @@ -15,7 +15,7 @@ #define FX_LOCALECATEGORY_NullHash 0x052931bb typedef struct _FX_LOCALESUBCATEGORYINFO { uint32_t uHash; - FX_LPCWSTR pName; + const FX_WCHAR* pName; int32_t eSubCategory; } FX_LOCALESUBCATEGORYINFO, * FX_LPLOCALESUBCATEGORYINFO; typedef FX_LOCALESUBCATEGORYINFO const * FX_LPCLOCALESUBCATEGORYINFO; @@ -57,10 +57,10 @@ static FX_STRSIZE FX_Local_Find(FX_WSTR wsSymbols, FX_WCHAR ch, FX_STRSIZE nStar if (nLength < 1 || nStart > nLength) { return -1; } - FX_LPCWSTR lpsz = (FX_LPCWSTR)FXSYS_wcschr(wsSymbols.GetPtr() + nStart, ch); + const FX_WCHAR* lpsz = (const FX_WCHAR*)FXSYS_wcschr(wsSymbols.GetPtr() + nStart, ch); return (lpsz == NULL) ? -1 : (FX_STRSIZE)(lpsz - wsSymbols.GetPtr()); } -const static FX_LPCWSTR gs_LocalNumberSymbols[] = { +static const FX_WCHAR* const gs_LocalNumberSymbols[] = { L"decimal", L"grouping", L"percent", L"minus", L"zero", L"currencySymbol", L"currencyName", }; @@ -163,7 +163,7 @@ void CFX_Locale::GetMeridiemName(CFX_WideString& wsMeridiemName, FX_BOOL bAM ) c } FX_GetCalendarSymbol(m_pElement, "meridiem", bAM ? 0 : 1, FALSE, wsMeridiemName); } -static int32_t FX_ParseTimeZone(FX_LPCWSTR pStr, int32_t iLen, FX_TIMEZONE& tz) +static int32_t FX_ParseTimeZone(const FX_WCHAR* pStr, int32_t iLen, FX_TIMEZONE& tz) { tz.tzHour = 0; tz.tzMinute = 0; @@ -293,7 +293,7 @@ static FX_BOOL FX_WStringToNumeric(const CFX_WideString& wsValue, CFX_LCNumeric& const int32_t nIntegralMaxLen = 17; int32_t cc = 0; FX_BOOL bNegative = FALSE, bExpSign = FALSE; - FX_LPCWSTR str = (FX_LPCWSTR)wsValue; + const FX_WCHAR* str = (const FX_WCHAR*)wsValue; int32_t len = wsValue.GetLength(); while (cc < len && FX_IsSpace(str[cc])) { cc++; @@ -436,7 +436,7 @@ CFX_WideString CFX_LCNumeric::ToString(int32_t nTreading, FX_BOOL bTrimTailZeros const int32_t nIntegralMaxLen = 17; int32_t cc = 0; FX_BOOL bNegative = FALSE, bExpSign = FALSE; - FX_LPCWSTR str = (FX_LPCWSTR)m_wsValue; + const FX_WCHAR* str = (const FX_WCHAR*)m_wsValue; int32_t len = m_wsValue.GetLength(); while (cc < len && FX_IsSpace(str[cc])) { cc++; @@ -504,8 +504,8 @@ CFX_WideString CFX_LCNumeric::ToString(int32_t nTreading, FX_BOOL bTrimTailZeros wsFormat.Format(L"%%.%dG", nTreading); double dblMantissa = (dbValeu > 0) ? (dbValeu - iInte) : (iInte - dbValeu); CFX_WideString wsFrac; - wsFrac.Format((FX_LPCWSTR)wsFormat, dblMantissa); - wsResult += CFX_WideStringC((FX_LPCWSTR)wsFrac + 1, wsFrac.GetLength() - 1); + wsFrac.Format((const FX_WCHAR*)wsFormat, dblMantissa); + wsResult += CFX_WideStringC((const FX_WCHAR*)wsFrac + 1, wsFrac.GetLength() - 1); if (bTrimTailZeros && nTreading > 0) { wsResult.TrimRight(L"0"); wsResult.TrimRight(L"."); @@ -515,7 +515,7 @@ CFX_WideString CFX_LCNumeric::ToString(int32_t nTreading, FX_BOOL bTrimTailZeros CFX_WideString wsFormat; wsFormat.Format(L"%%.%df", nTreading); CFX_WideString wsResult; - wsResult.Format(FX_LPCWSTR(wsFormat), GetDouble()); + wsResult.Format(wsFormat.c_str(), GetDouble()); if (bTrimTailZeros && nTreading > 0) { wsResult.TrimRight(L"0"); wsResult.TrimRight(L"."); @@ -540,9 +540,9 @@ CFX_FormatString::~CFX_FormatString() void CFX_FormatString::SplitFormatString(const CFX_WideString& wsFormatString, CFX_WideStringArray& wsPatterns) { int32_t iStrLen = wsFormatString.GetLength(); - FX_LPCWSTR pStr = (FX_LPCWSTR)wsFormatString; - FX_LPCWSTR pToken = pStr; - FX_LPCWSTR pEnd = pStr + iStrLen; + const FX_WCHAR* pStr = (const FX_WCHAR*)wsFormatString; + const FX_WCHAR* pToken = pStr; + const FX_WCHAR* pEnd = pStr + iStrLen; FX_BOOL iQuote = FALSE; while (TRUE) { if (pStr >= pEnd) { @@ -559,7 +559,7 @@ void CFX_FormatString::SplitFormatString(const CFX_WideString& wsFormatString, C pStr ++; } } -static CFX_WideString FX_GetLiteralText(FX_LPCWSTR pStrPattern, int32_t &iPattern, int32_t iLenPattern) +static CFX_WideString FX_GetLiteralText(const FX_WCHAR* pStrPattern, int32_t &iPattern, int32_t iLenPattern) { CFX_WideString wsOutput; if (pStrPattern[iPattern] != '\'') { @@ -599,7 +599,7 @@ static CFX_WideString FX_GetLiteralText(FX_LPCWSTR pStrPattern, int32_t &iPatter } return wsOutput; } -static CFX_WideString FX_GetLiteralTextReverse(FX_LPCWSTR pStrPattern, int32_t &iPattern) +static CFX_WideString FX_GetLiteralTextReverse(const FX_WCHAR* pStrPattern, int32_t &iPattern) { CFX_WideString wsOutput; if (pStrPattern[iPattern] != '\'') { @@ -646,7 +646,7 @@ FX_LOCALECATEGORY CFX_FormatString::GetCategory(const CFX_WideString& wsPattern) FX_LOCALECATEGORY eCategory = FX_LOCALECATEGORY_Unknown; int32_t ccf = 0; int32_t iLenf = wsPattern.GetLength(); - FX_LPCWSTR pStr = (FX_LPCWSTR)wsPattern; + const FX_WCHAR* pStr = (const FX_WCHAR*)wsPattern; FX_BOOL bBraceOpen = FALSE; while (ccf < iLenf) { if (pStr[ccf] == '\'') { @@ -697,7 +697,7 @@ FX_LOCALECATEGORY CFX_FormatString::GetCategory(const CFX_WideString& wsPattern) } return eCategory; } -static FX_WORD FX_WStringToLCID(FX_LPCWSTR pstrLCID) +static FX_WORD FX_WStringToLCID(const FX_WCHAR* pstrLCID) { if (!pstrLCID) { return 0; @@ -713,7 +713,7 @@ CFX_WideString CFX_FormatString::GetLocaleName(const CFX_WideString& wsPattern) { int32_t ccf = 0; int32_t iLenf = wsPattern.GetLength(); - FX_LPCWSTR pStr = (FX_LPCWSTR)wsPattern; + const FX_WCHAR* pStr = (const FX_WCHAR*)wsPattern; while (ccf < iLenf) { if (pStr[ccf] == '\'') { FX_GetLiteralText(pStr, ccf, iLenf); @@ -734,7 +734,7 @@ IFX_Locale* CFX_FormatString::GetTextFormat(const CFX_WideString &wsPattern, FX_ IFX_Locale* pLocale = NULL; int32_t ccf = 0; int32_t iLenf = wsPattern.GetLength(); - FX_LPCWSTR pStr = (FX_LPCWSTR)wsPattern; + const FX_WCHAR* pStr = (const FX_WCHAR*)wsPattern; FX_BOOL bBrackOpen = FALSE; while (ccf < iLenf) { if (pStr[ccf] == '\'') { @@ -787,7 +787,7 @@ IFX_Locale* CFX_FormatString::GetNumericFormat(const CFX_WideString& wsPattern, IFX_Locale* pLocale = NULL; int32_t ccf = 0; int32_t iLenf = wsPattern.GetLength(); - FX_LPCWSTR pStr = (FX_LPCWSTR)wsPattern; + const FX_WCHAR* pStr = (const FX_WCHAR*)wsPattern; FX_BOOL bFindDot = FALSE; FX_BOOL bBrackOpen = FALSE; while (ccf < iLenf) { @@ -882,12 +882,12 @@ static FX_BOOL FX_GetNumericDotIndex(const CFX_WideString& wsNum, const CFX_Wide { int32_t ccf = 0; int32_t iLenf = wsNum.GetLength(); - FX_LPCWSTR pStr = (FX_LPCWSTR)wsNum; + const FX_WCHAR* pStr = (const FX_WCHAR*)wsNum; int32_t iLenDot = wsDotSymbol.GetLength(); while (ccf < iLenf) { if (pStr[ccf] == '\'') { FX_GetLiteralText(pStr, ccf, iLenf); - } else if (ccf + iLenDot <= iLenf && !FXSYS_wcsncmp(pStr + ccf, (FX_LPCWSTR)wsDotSymbol, iLenDot)) { + } else if (ccf + iLenDot <= iLenf && !FXSYS_wcsncmp(pStr + ccf, (const FX_WCHAR*)wsDotSymbol, iLenDot)) { iDotIndex = ccf; return TRUE; } @@ -912,16 +912,16 @@ FX_BOOL CFX_FormatString::ParseText(const CFX_WideString& wsSrcText, const CFX_W return FALSE; } int32_t iText = 0, iPattern = 0; - FX_LPCWSTR pStrText = (FX_LPCWSTR)wsSrcText; + const FX_WCHAR* pStrText = (const FX_WCHAR*)wsSrcText; int32_t iLenText = wsSrcText.GetLength(); - FX_LPCWSTR pStrPattern = (FX_LPCWSTR)wsTextFormat; + const FX_WCHAR* pStrPattern = (const FX_WCHAR*)wsTextFormat; int32_t iLenPattern = wsTextFormat.GetLength(); while (iPattern < iLenPattern && iText < iLenText) { switch (pStrPattern[iPattern]) { case '\'': { CFX_WideString wsLiteral = FX_GetLiteralText(pStrPattern, iPattern, iLenPattern); int32_t iLiteralLen = wsLiteral.GetLength(); - if (iText + iLiteralLen > iLenText || FXSYS_wcsncmp(pStrText + iText, (FX_LPCWSTR)wsLiteral, iLiteralLen)) { + if (iText + iLiteralLen > iLenText || FXSYS_wcsncmp(pStrText + iText, (const FX_WCHAR*)wsLiteral, iLiteralLen)) { wsValue = wsSrcText; return FALSE; } @@ -992,9 +992,9 @@ FX_BOOL CFX_FormatString::ParseNum(const CFX_WideString& wsSrcNum, const CFX_Wid pLocale->GetNumbericSymbol(FX_LOCALENUMSYMBOL_Minus, wsMinus); int32_t iMinusLen = wsMinus.GetLength(); int cc = 0, ccf = 0; - FX_LPCWSTR str = (FX_LPCWSTR)wsSrcNum; + const FX_WCHAR* str = (const FX_WCHAR*)wsSrcNum; int len = wsSrcNum.GetLength(); - FX_LPCWSTR strf = (FX_LPCWSTR)wsNumFormat; + const FX_WCHAR* strf = (const FX_WCHAR*)wsNumFormat; int lenf = wsNumFormat.GetLength(); double dbRetValue = 0; double coeff = 1; @@ -1015,7 +1015,7 @@ FX_BOOL CFX_FormatString::ParseNum(const CFX_WideString& wsSrcNum, const CFX_Wid CFX_WideString wsLiteral = FX_GetLiteralTextReverse(strf, ccf); int32_t iLiteralLen = wsLiteral.GetLength(); cc -= iLiteralLen - 1; - if (cc < 0 || FXSYS_wcsncmp(str + cc, (FX_LPCWSTR)wsLiteral, iLiteralLen)) { + if (cc < 0 || FXSYS_wcsncmp(str + cc, (const FX_WCHAR*)wsLiteral, iLiteralLen)) { return FALSE; } cc--; @@ -1052,7 +1052,7 @@ FX_BOOL CFX_FormatString::ParseNum(const CFX_WideString& wsSrcNum, const CFX_Wid cc--; } else { cc -= iMinusLen - 1; - if (cc < 0 || FXSYS_wcsncmp(str + cc, (FX_LPCWSTR)wsMinus, iMinusLen)) { + if (cc < 0 || FXSYS_wcsncmp(str + cc, (const FX_WCHAR*)wsMinus, iMinusLen)) { return FALSE; } cc--; @@ -1065,7 +1065,7 @@ FX_BOOL CFX_FormatString::ParseNum(const CFX_WideString& wsSrcNum, const CFX_Wid cc--; } else { cc -= iMinusLen - 1; - if (cc < 0 || FXSYS_wcsncmp(str + cc, (FX_LPCWSTR)wsMinus, iMinusLen)) { + if (cc < 0 || FXSYS_wcsncmp(str + cc, (const FX_WCHAR*)wsMinus, iMinusLen)) { return FALSE; } cc--; @@ -1089,7 +1089,7 @@ FX_BOOL CFX_FormatString::ParseNum(const CFX_WideString& wsSrcNum, const CFX_Wid } else if (str[cc] == '+') { cc--; continue; - } else if (cc - iMinusLen + 1 > 0 && !FXSYS_wcsncmp(str + (cc - iMinusLen + 1), (FX_LPCWSTR)wsMinus, iMinusLen)) { + } else if (cc - iMinusLen + 1 > 0 && !FXSYS_wcsncmp(str + (cc - iMinusLen + 1), (const FX_WCHAR*)wsMinus, iMinusLen)) { bExpSign = TRUE; cc -= iMinusLen; } else { @@ -1106,7 +1106,7 @@ FX_BOOL CFX_FormatString::ParseNum(const CFX_WideString& wsSrcNum, const CFX_Wid pLocale->GetNumbericSymbol(FX_LOCALENUMSYMBOL_CurrencySymbol, wsSymbol); int32_t iSymbolLen = wsSymbol.GetLength(); cc -= iSymbolLen - 1; - if (cc < 0 || FXSYS_wcsncmp(str + cc, (FX_LPCWSTR)wsSymbol, iSymbolLen)) { + if (cc < 0 || FXSYS_wcsncmp(str + cc, (const FX_WCHAR*)wsSymbol, iSymbolLen)) { return FALSE; } cc--; @@ -1170,7 +1170,7 @@ FX_BOOL CFX_FormatString::ParseNum(const CFX_WideString& wsSrcNum, const CFX_Wid pLocale->GetNumbericSymbol(FX_LOCALENUMSYMBOL_Percent, wsSymbol); int32_t iSysmbolLen = wsSymbol.GetLength(); cc -= iSysmbolLen - 1; - if (cc < 0 || FXSYS_wcsncmp(str + cc, (FX_LPCWSTR)wsSymbol, iSysmbolLen)) { + if (cc < 0 || FXSYS_wcsncmp(str + cc, (const FX_WCHAR*)wsSymbol, iSysmbolLen)) { return FALSE; } cc--; @@ -1191,7 +1191,7 @@ FX_BOOL CFX_FormatString::ParseNum(const CFX_WideString& wsSrcNum, const CFX_Wid case ',': { if (cc >= 0) { cc -= iGroupLen - 1; - if (cc >= 0 && FXSYS_wcsncmp(str + cc, (FX_LPCWSTR)wsGroupSymbol, iGroupLen) == 0) { + if (cc >= 0 && FXSYS_wcsncmp(str + cc, (const FX_WCHAR*)wsGroupSymbol, iGroupLen) == 0) { cc--; } else { cc += iGroupLen - 1; @@ -1237,7 +1237,7 @@ FX_BOOL CFX_FormatString::ParseNum(const CFX_WideString& wsSrcNum, const CFX_Wid CFX_WideString wsLiteral = FX_GetLiteralTextReverse(strf, ccf); int32_t iLiteralLen = wsLiteral.GetLength(); cc -= iLiteralLen - 1; - if (cc < 0 || FXSYS_wcsncmp(str + cc, (FX_LPCWSTR)wsLiteral, iLiteralLen)) { + if (cc < 0 || FXSYS_wcsncmp(str + cc, (const FX_WCHAR*)wsLiteral, iLiteralLen)) { return FALSE; } cc--; @@ -1278,7 +1278,7 @@ FX_BOOL CFX_FormatString::ParseNum(const CFX_WideString& wsSrcNum, const CFX_Wid cc--; } else { cc -= iMinusLen - 1; - if (cc < 0 || FXSYS_wcsncmp(str + cc, (FX_LPCWSTR)wsMinus, iMinusLen)) { + if (cc < 0 || FXSYS_wcsncmp(str + cc, (const FX_WCHAR*)wsMinus, iMinusLen)) { return FALSE; } cc--; @@ -1291,7 +1291,7 @@ FX_BOOL CFX_FormatString::ParseNum(const CFX_WideString& wsSrcNum, const CFX_Wid cc--; } else { cc -= iMinusLen - 1; - if (cc < 0 || FXSYS_wcsncmp(str + cc, (FX_LPCWSTR)wsMinus, iMinusLen)) { + if (cc < 0 || FXSYS_wcsncmp(str + cc, (const FX_WCHAR*)wsMinus, iMinusLen)) { return FALSE; } cc--; @@ -1315,7 +1315,7 @@ FX_BOOL CFX_FormatString::ParseNum(const CFX_WideString& wsSrcNum, const CFX_Wid } else if (str[cc] == '+') { cc--; continue; - } else if (cc - iMinusLen + 1 > 0 && !FXSYS_wcsncmp(str + (cc - iMinusLen + 1), (FX_LPCWSTR)wsMinus, iMinusLen)) { + } else if (cc - iMinusLen + 1 > 0 && !FXSYS_wcsncmp(str + (cc - iMinusLen + 1), (const FX_WCHAR*)wsMinus, iMinusLen)) { bExpSign = TRUE; cc -= iMinusLen; } else { @@ -1332,7 +1332,7 @@ FX_BOOL CFX_FormatString::ParseNum(const CFX_WideString& wsSrcNum, const CFX_Wid pLocale->GetNumbericSymbol(FX_LOCALENUMSYMBOL_CurrencySymbol, wsSymbol); int32_t iSymbolLen = wsSymbol.GetLength(); cc -= iSymbolLen - 1; - if (cc < 0 || FXSYS_wcsncmp(str + cc, (FX_LPCWSTR)wsSymbol, iSymbolLen)) { + if (cc < 0 || FXSYS_wcsncmp(str + cc, (const FX_WCHAR*)wsSymbol, iSymbolLen)) { return FALSE; } cc--; @@ -1396,7 +1396,7 @@ FX_BOOL CFX_FormatString::ParseNum(const CFX_WideString& wsSrcNum, const CFX_Wid pLocale->GetNumbericSymbol(FX_LOCALENUMSYMBOL_Percent, wsSymbol); int32_t iSysmbolLen = wsSymbol.GetLength(); cc -= iSysmbolLen - 1; - if (cc < 0 || FXSYS_wcsncmp(str + cc, (FX_LPCWSTR)wsSymbol, iSysmbolLen)) { + if (cc < 0 || FXSYS_wcsncmp(str + cc, (const FX_WCHAR*)wsSymbol, iSysmbolLen)) { return FALSE; } cc--; @@ -1409,7 +1409,7 @@ FX_BOOL CFX_FormatString::ParseNum(const CFX_WideString& wsSrcNum, const CFX_Wid case ',': { if (cc >= 0) { cc -= iGroupLen - 1; - if (cc >= 0 && FXSYS_wcsncmp(str + cc, (FX_LPCWSTR)wsGroupSymbol, iGroupLen) == 0) { + if (cc >= 0 && FXSYS_wcsncmp(str + cc, (const FX_WCHAR*)wsGroupSymbol, iGroupLen) == 0) { cc--; } else { cc += iGroupLen - 1; @@ -1456,7 +1456,7 @@ FX_BOOL CFX_FormatString::ParseNum(const CFX_WideString& wsSrcNum, const CFX_Wid case '\'': { CFX_WideString wsLiteral = FX_GetLiteralText(strf, ccf, lenf); int32_t iLiteralLen = wsLiteral.GetLength(); - if (cc + iLiteralLen > len || FXSYS_wcsncmp(str + cc, (FX_LPCWSTR)wsLiteral, iLiteralLen)) { + if (cc + iLiteralLen > len || FXSYS_wcsncmp(str + cc, (const FX_WCHAR*)wsLiteral, iLiteralLen)) { return FALSE; } cc += iLiteralLen; @@ -1498,7 +1498,7 @@ FX_BOOL CFX_FormatString::ParseNum(const CFX_WideString& wsSrcNum, const CFX_Wid if (str[cc] == '+' || str[cc] == ' ') { cc++; } else { - if (cc + iMinusLen > len || FXSYS_wcsncmp(str + cc, (FX_LPCWSTR)wsMinus, iMinusLen)) { + if (cc + iMinusLen > len || FXSYS_wcsncmp(str + cc, (const FX_WCHAR*)wsMinus, iMinusLen)) { return FALSE; } bNeg = TRUE; @@ -1510,7 +1510,7 @@ FX_BOOL CFX_FormatString::ParseNum(const CFX_WideString& wsSrcNum, const CFX_Wid if (str[cc] == '+') { cc++; } else { - if (cc + iMinusLen > len || FXSYS_wcsncmp(str + cc, (FX_LPCWSTR)wsMinus, iMinusLen)) { + if (cc + iMinusLen > len || FXSYS_wcsncmp(str + cc, (const FX_WCHAR*)wsMinus, iMinusLen)) { return FALSE; } bNeg = TRUE; @@ -1547,7 +1547,7 @@ FX_BOOL CFX_FormatString::ParseNum(const CFX_WideString& wsSrcNum, const CFX_Wid CFX_WideString wsSymbol; pLocale->GetNumbericSymbol(FX_LOCALENUMSYMBOL_CurrencySymbol, wsSymbol); int32_t iSymbolLen = wsSymbol.GetLength(); - if (cc + iSymbolLen > len || FXSYS_wcsncmp(str + cc, (FX_LPCWSTR)wsSymbol, iSymbolLen)) { + if (cc + iSymbolLen > len || FXSYS_wcsncmp(str + cc, (const FX_WCHAR*)wsSymbol, iSymbolLen)) { return FALSE; } cc += iSymbolLen; @@ -1602,7 +1602,7 @@ FX_BOOL CFX_FormatString::ParseNum(const CFX_WideString& wsSrcNum, const CFX_Wid CFX_WideString wsSymbol; pLocale->GetNumbericSymbol(FX_LOCALENUMSYMBOL_Percent, wsSymbol); int32_t iSysmbolLen = wsSymbol.GetLength(); - if (cc + iSysmbolLen <= len && !FXSYS_wcsncmp(str + cc, (FX_LPCWSTR)wsSymbol, iSysmbolLen)) { + if (cc + iSysmbolLen <= len && !FXSYS_wcsncmp(str + cc, (const FX_WCHAR*)wsSymbol, iSysmbolLen)) { cc += iSysmbolLen; } ccf++; @@ -1621,7 +1621,7 @@ FX_BOOL CFX_FormatString::ParseNum(const CFX_WideString& wsSrcNum, const CFX_Wid } break; case ',': { - if (cc + iGroupLen <= len && FXSYS_wcsncmp(str + cc, (FX_LPCWSTR)wsGroupSymbol, iGroupLen) == 0) { + if (cc + iGroupLen <= len && FXSYS_wcsncmp(str + cc, (const FX_WCHAR*)wsGroupSymbol, iGroupLen) == 0) { cc += iGroupLen; } ccf++; @@ -1672,8 +1672,8 @@ FX_BOOL CFX_FormatString::ParseNum(const CFX_WideString& wsSrcNum, const CFX_Wid void FX_ParseNumString(const CFX_WideString& wsNum, CFX_WideString& wsResult) { int32_t iCount = wsNum.GetLength(); - FX_LPCWSTR pStr = (FX_LPCWSTR)wsNum; - FX_LPWSTR pDst = wsResult.GetBuffer(iCount); + const FX_WCHAR* pStr = (const FX_WCHAR*)wsNum; + FX_WCHAR* pDst = wsResult.GetBuffer(iCount); int32_t nIndex = 0; FX_BOOL bMinus = FALSE; int32_t i = 0; @@ -1741,9 +1741,9 @@ FX_BOOL CFX_FormatString::ParseNum(const CFX_WideString& wsSrcNum, const CFX_Wid pLocale->GetNumbericSymbol(FX_LOCALENUMSYMBOL_Minus, wsMinus); int32_t iMinusLen = wsMinus.GetLength(); int cc = 0, ccf = 0; - FX_LPCWSTR str = (FX_LPCWSTR)wsSrcNum; + const FX_WCHAR* str = (const FX_WCHAR*)wsSrcNum; int len = wsSrcNum.GetLength(); - FX_LPCWSTR strf = (FX_LPCWSTR)wsNumFormat; + const FX_WCHAR* strf = (const FX_WCHAR*)wsNumFormat; int lenf = wsNumFormat.GetLength(); FX_BOOL bHavePercentSymbol = FALSE; FX_BOOL bNeg = FALSE; @@ -1761,7 +1761,7 @@ FX_BOOL CFX_FormatString::ParseNum(const CFX_WideString& wsSrcNum, const CFX_Wid CFX_WideString wsLiteral = FX_GetLiteralTextReverse(strf, ccf); int32_t iLiteralLen = wsLiteral.GetLength(); cc -= iLiteralLen - 1; - if (cc < 0 || FXSYS_wcsncmp(str + cc, (FX_LPCWSTR)wsLiteral, iLiteralLen)) { + if (cc < 0 || FXSYS_wcsncmp(str + cc, (const FX_WCHAR*)wsLiteral, iLiteralLen)) { return FALSE; } cc--; @@ -1799,7 +1799,7 @@ FX_BOOL CFX_FormatString::ParseNum(const CFX_WideString& wsSrcNum, const CFX_Wid cc--; } else { cc -= iMinusLen - 1; - if (cc < 0 || FXSYS_wcsncmp(str + cc, (FX_LPCWSTR)wsMinus, iMinusLen)) { + if (cc < 0 || FXSYS_wcsncmp(str + cc, (const FX_WCHAR*)wsMinus, iMinusLen)) { return FALSE; } cc--; @@ -1812,7 +1812,7 @@ FX_BOOL CFX_FormatString::ParseNum(const CFX_WideString& wsSrcNum, const CFX_Wid cc--; } else { cc -= iMinusLen - 1; - if (cc < 0 || FXSYS_wcsncmp(str + cc, (FX_LPCWSTR)wsMinus, iMinusLen)) { + if (cc < 0 || FXSYS_wcsncmp(str + cc, (const FX_WCHAR*)wsMinus, iMinusLen)) { return FALSE; } cc--; @@ -1836,7 +1836,7 @@ FX_BOOL CFX_FormatString::ParseNum(const CFX_WideString& wsSrcNum, const CFX_Wid } else if (str[cc] == '+') { cc--; continue; - } else if (cc - iMinusLen + 1 > 0 && !FXSYS_wcsncmp(str + (cc - iMinusLen + 1), (FX_LPCWSTR)wsMinus, iMinusLen)) { + } else if (cc - iMinusLen + 1 > 0 && !FXSYS_wcsncmp(str + (cc - iMinusLen + 1), (const FX_WCHAR*)wsMinus, iMinusLen)) { bExpSign = TRUE; cc -= iMinusLen; } else { @@ -1853,7 +1853,7 @@ FX_BOOL CFX_FormatString::ParseNum(const CFX_WideString& wsSrcNum, const CFX_Wid pLocale->GetNumbericSymbol(FX_LOCALENUMSYMBOL_CurrencySymbol, wsSymbol); int32_t iSymbolLen = wsSymbol.GetLength(); cc -= iSymbolLen - 1; - if (cc < 0 || FXSYS_wcsncmp(str + cc, (FX_LPCWSTR)wsSymbol, iSymbolLen)) { + if (cc < 0 || FXSYS_wcsncmp(str + cc, (const FX_WCHAR*)wsSymbol, iSymbolLen)) { return FALSE; } cc--; @@ -1917,7 +1917,7 @@ FX_BOOL CFX_FormatString::ParseNum(const CFX_WideString& wsSrcNum, const CFX_Wid pLocale->GetNumbericSymbol(FX_LOCALENUMSYMBOL_Percent, wsSymbol); int32_t iSysmbolLen = wsSymbol.GetLength(); cc -= iSysmbolLen - 1; - if (cc < 0 || FXSYS_wcsncmp(str + cc, (FX_LPCWSTR)wsSymbol, iSysmbolLen)) { + if (cc < 0 || FXSYS_wcsncmp(str + cc, (const FX_WCHAR*)wsSymbol, iSysmbolLen)) { return FALSE; } cc--; @@ -1930,7 +1930,7 @@ FX_BOOL CFX_FormatString::ParseNum(const CFX_WideString& wsSrcNum, const CFX_Wid case ',': { if (cc >= 0) { cc -= iGroupLen - 1; - if (cc >= 0 && FXSYS_wcsncmp(str + cc, (FX_LPCWSTR)wsGroupSymbol, iGroupLen) == 0) { + if (cc >= 0 && FXSYS_wcsncmp(str + cc, (const FX_WCHAR*)wsGroupSymbol, iGroupLen) == 0) { cc--; } else { cc += iGroupLen - 1; @@ -1985,7 +1985,7 @@ FX_BOOL CFX_FormatString::ParseNum(const CFX_WideString& wsSrcNum, const CFX_Wid case '\'': { CFX_WideString wsLiteral = FX_GetLiteralText(strf, ccf, lenf); int32_t iLiteralLen = wsLiteral.GetLength(); - if (cc + iLiteralLen > len || FXSYS_wcsncmp(str + cc, (FX_LPCWSTR)wsLiteral, iLiteralLen)) { + if (cc + iLiteralLen > len || FXSYS_wcsncmp(str + cc, (const FX_WCHAR*)wsLiteral, iLiteralLen)) { return FALSE; } cc += iLiteralLen; @@ -2024,7 +2024,7 @@ FX_BOOL CFX_FormatString::ParseNum(const CFX_WideString& wsSrcNum, const CFX_Wid if (str[cc] == '+' || str[cc] == ' ') { cc++; } else { - if (cc + iMinusLen > len || FXSYS_wcsncmp(str + cc, (FX_LPCWSTR)wsMinus, iMinusLen)) { + if (cc + iMinusLen > len || FXSYS_wcsncmp(str + cc, (const FX_WCHAR*)wsMinus, iMinusLen)) { return FALSE; } bNeg = TRUE; @@ -2036,7 +2036,7 @@ FX_BOOL CFX_FormatString::ParseNum(const CFX_WideString& wsSrcNum, const CFX_Wid if (str[cc] == '+') { cc++; } else { - if (cc + iMinusLen > len || FXSYS_wcsncmp(str + cc, (FX_LPCWSTR)wsMinus, iMinusLen)) { + if (cc + iMinusLen > len || FXSYS_wcsncmp(str + cc, (const FX_WCHAR*)wsMinus, iMinusLen)) { return FALSE; } bNeg = TRUE; @@ -2073,7 +2073,7 @@ FX_BOOL CFX_FormatString::ParseNum(const CFX_WideString& wsSrcNum, const CFX_Wid CFX_WideString wsSymbol; pLocale->GetNumbericSymbol(FX_LOCALENUMSYMBOL_CurrencySymbol, wsSymbol); int32_t iSymbolLen = wsSymbol.GetLength(); - if (cc + iSymbolLen > len || FXSYS_wcsncmp(str + cc, (FX_LPCWSTR)wsSymbol, iSymbolLen)) { + if (cc + iSymbolLen > len || FXSYS_wcsncmp(str + cc, (const FX_WCHAR*)wsSymbol, iSymbolLen)) { return FALSE; } cc += iSymbolLen; @@ -2128,7 +2128,7 @@ FX_BOOL CFX_FormatString::ParseNum(const CFX_WideString& wsSrcNum, const CFX_Wid CFX_WideString wsSymbol; pLocale->GetNumbericSymbol(FX_LOCALENUMSYMBOL_Percent, wsSymbol); int32_t iSysmbolLen = wsSymbol.GetLength(); - if (cc + iSysmbolLen <= len && !FXSYS_wcsncmp(str + cc, (FX_LPCWSTR)wsSymbol, iSysmbolLen)) { + if (cc + iSysmbolLen <= len && !FXSYS_wcsncmp(str + cc, (const FX_WCHAR*)wsSymbol, iSysmbolLen)) { cc += iSysmbolLen; } ccf++; @@ -2146,7 +2146,7 @@ FX_BOOL CFX_FormatString::ParseNum(const CFX_WideString& wsSrcNum, const CFX_Wid } break; case ',': { - if (cc + iGroupLen <= len && FXSYS_wcsncmp(str + cc, (FX_LPCWSTR)wsGroupSymbol, iGroupLen) == 0) { + if (cc + iGroupLen <= len && FXSYS_wcsncmp(str + cc, (const FX_WCHAR*)wsGroupSymbol, iGroupLen) == 0) { cc += iGroupLen; } ccf++; @@ -2204,7 +2204,7 @@ FX_DATETIMETYPE CFX_FormatString::GetDateTimeFormat(const CFX_WideString& wsPatt FX_LOCALECATEGORY eCategory = FX_LOCALECATEGORY_Unknown; int32_t ccf = 0; int32_t iLenf = wsPattern.GetLength(); - FX_LPCWSTR pStr = (FX_LPCWSTR)wsPattern; + const FX_WCHAR* pStr = (const FX_WCHAR*)wsPattern; int32_t iFindCategory = 0; FX_BOOL bBraceOpen = FALSE; while (ccf < iLenf) { @@ -2331,15 +2331,15 @@ static FX_BOOL FX_ParseLocaleDate(const CFX_WideString& wsDate, const CFX_WideSt int32_t month = 1; int32_t day = 1; int32_t ccf = 0; - FX_LPCWSTR str = (FX_LPCWSTR)wsDate; + const FX_WCHAR* str = (const FX_WCHAR*)wsDate; int32_t len = wsDate.GetLength(); - FX_LPCWSTR strf = (FX_LPCWSTR)wsDatePattern; + const FX_WCHAR* strf = (const FX_WCHAR*)wsDatePattern; int32_t lenf = wsDatePattern.GetLength(); while (cc < len && ccf < lenf) { if (strf[ccf] == '\'') { CFX_WideString wsLiteral = FX_GetLiteralText(strf, ccf, lenf); int32_t iLiteralLen = wsLiteral.GetLength(); - if (cc + iLiteralLen > len || FXSYS_wcsncmp(str + cc, (FX_LPCWSTR)wsLiteral, iLiteralLen)) { + if (cc + iLiteralLen > len || FXSYS_wcsncmp(str + cc, (const FX_WCHAR*)wsLiteral, iLiteralLen)) { return FALSE; } cc += iLiteralLen; @@ -2408,7 +2408,7 @@ static FX_BOOL FX_ParseLocaleDate(const CFX_WideString& wsDate, const CFX_WideSt if (wsMonthNameAbbr.IsEmpty()) { continue; } - if (!FXSYS_wcsncmp((FX_LPCWSTR)wsMonthNameAbbr, str + cc, wsMonthNameAbbr.GetLength())) { + if (!FXSYS_wcsncmp((const FX_WCHAR*)wsMonthNameAbbr, str + cc, wsMonthNameAbbr.GetLength())) { break; } } @@ -2424,7 +2424,7 @@ static FX_BOOL FX_ParseLocaleDate(const CFX_WideString& wsDate, const CFX_WideSt if (wsMonthName.IsEmpty()) { continue; } - if (!FXSYS_wcsncmp((FX_LPCWSTR)wsMonthName, str + cc, wsMonthName.GetLength())) { + if (!FXSYS_wcsncmp((const FX_WCHAR*)wsMonthName, str + cc, wsMonthName.GetLength())) { break; } } @@ -2442,7 +2442,7 @@ static FX_BOOL FX_ParseLocaleDate(const CFX_WideString& wsDate, const CFX_WideSt if (wsDayNameAbbr.IsEmpty()) { continue; } - if (!FXSYS_wcsncmp((FX_LPCWSTR)wsDayNameAbbr, str + cc, wsDayNameAbbr.GetLength())) { + if (!FXSYS_wcsncmp((const FX_WCHAR*)wsDayNameAbbr, str + cc, wsDayNameAbbr.GetLength())) { break; } } @@ -2457,7 +2457,7 @@ static FX_BOOL FX_ParseLocaleDate(const CFX_WideString& wsDate, const CFX_WideSt if (wsDayName == L"") { continue; } - if (!FXSYS_wcsncmp((FX_LPCWSTR)wsDayName, str + cc, wsDayName.GetLength())) { + if (!FXSYS_wcsncmp((const FX_WCHAR*)wsDayName, str + cc, wsDayName.GetLength())) { break; } } @@ -2536,9 +2536,9 @@ static FX_BOOL FX_ParseLocaleTime(const CFX_WideString& wsTime, const CFX_WideSt uint8_t second = 0; FX_WORD millisecond = 0; int32_t ccf = 0; - FX_LPCWSTR str = (FX_LPCWSTR)wsTime; + const FX_WCHAR* str = (const FX_WCHAR*)wsTime; int len = wsTime.GetLength(); - FX_LPCWSTR strf = (FX_LPCWSTR)wsTimePattern; + const FX_WCHAR* strf = (const FX_WCHAR*)wsTimePattern; int lenf = wsTimePattern.GetLength(); FX_BOOL bHasA = FALSE; FX_BOOL bPM = FALSE; @@ -2546,7 +2546,7 @@ static FX_BOOL FX_ParseLocaleTime(const CFX_WideString& wsTime, const CFX_WideSt if (strf[ccf] == '\'') { CFX_WideString wsLiteral = FX_GetLiteralText(strf, ccf, lenf); int32_t iLiteralLen = wsLiteral.GetLength(); - if (cc + iLiteralLen > len || FXSYS_wcsncmp(str + cc, (FX_LPCWSTR)wsLiteral, iLiteralLen)) { + if (cc + iLiteralLen > len || FXSYS_wcsncmp(str + cc, (const FX_WCHAR*)wsLiteral, iLiteralLen)) { return FALSE; } cc += iLiteralLen; @@ -2762,15 +2762,15 @@ FX_BOOL CFX_FormatString::ParseZero(const CFX_WideString& wsSrcText, const CFX_W CFX_WideString wsTextFormat; IFX_Locale* pLocale = GetTextFormat(wsPattern, FX_WSTRC(L"zero"), wsTextFormat); int32_t iText = 0, iPattern = 0; - FX_LPCWSTR pStrText = (FX_LPCWSTR)wsSrcText; + const FX_WCHAR* pStrText = (const FX_WCHAR*)wsSrcText; int32_t iLenText = wsSrcText.GetLength(); - FX_LPCWSTR pStrPattern = (FX_LPCWSTR)wsTextFormat; + const FX_WCHAR* pStrPattern = (const FX_WCHAR*)wsTextFormat; int32_t iLenPattern = wsTextFormat.GetLength(); while (iPattern < iLenPattern && iText < iLenText) { if (pStrPattern[iPattern] == '\'') { CFX_WideString wsLiteral = FX_GetLiteralText(pStrPattern, iPattern, iLenPattern); int32_t iLiteralLen = wsLiteral.GetLength(); - if (iText + iLiteralLen > iLenText || FXSYS_wcsncmp(pStrText + iText, (FX_LPCWSTR)wsLiteral, iLiteralLen)) { + if (iText + iLiteralLen > iLenText || FXSYS_wcsncmp(pStrText + iText, (const FX_WCHAR*)wsLiteral, iLiteralLen)) { return FALSE; } iText += iLiteralLen; @@ -2790,15 +2790,15 @@ FX_BOOL CFX_FormatString::ParseNull(const CFX_WideString& wsSrcText, const CFX_W CFX_WideString wsTextFormat; IFX_Locale* pLocale = GetTextFormat(wsPattern, FX_WSTRC(L"null"), wsTextFormat); int32_t iText = 0, iPattern = 0; - FX_LPCWSTR pStrText = (FX_LPCWSTR)wsSrcText; + const FX_WCHAR* pStrText = (const FX_WCHAR*)wsSrcText; int32_t iLenText = wsSrcText.GetLength(); - FX_LPCWSTR pStrPattern = (FX_LPCWSTR)wsTextFormat; + const FX_WCHAR* pStrPattern = (const FX_WCHAR*)wsTextFormat; int32_t iLenPattern = wsTextFormat.GetLength(); while (iPattern < iLenPattern && iText < iLenText) { if (pStrPattern[iPattern] == '\'') { CFX_WideString wsLiteral = FX_GetLiteralText(pStrPattern, iPattern, iLenPattern); int32_t iLiteralLen = wsLiteral.GetLength(); - if (iText + iLiteralLen > iLenText || FXSYS_wcsncmp(pStrText + iText, (FX_LPCWSTR)wsLiteral, iLiteralLen)) { + if (iText + iLiteralLen > iLenText || FXSYS_wcsncmp(pStrText + iText, (const FX_WCHAR*)wsLiteral, iLiteralLen)) { return FALSE; } iText += iLiteralLen; @@ -2825,8 +2825,8 @@ FX_BOOL CFX_FormatString::FormatText(const CFX_WideString& wsSrcText, const CFX_ CFX_WideString wsTextFormat; IFX_Locale* pLocale = GetTextFormat(wsPattern, FX_WSTRC(L"text"), wsTextFormat); int32_t iText = 0, iPattern = 0; - FX_LPCWSTR pStrText = (FX_LPCWSTR)wsSrcText; - FX_LPCWSTR pStrPattern = (FX_LPCWSTR)wsTextFormat; + const FX_WCHAR* pStrText = (const FX_WCHAR*)wsSrcText; + const FX_WCHAR* pStrPattern = (const FX_WCHAR*)wsTextFormat; int32_t iLenPattern = wsTextFormat.GetLength(); while (iPattern < iLenPattern) { switch (pStrPattern[iPattern]) { @@ -2900,7 +2900,7 @@ FX_BOOL CFX_FormatString::FormatStrNum(FX_WSTR wsInputNum, const CFX_WideString& return FALSE; } int32_t cc = 0, ccf = 0; - FX_LPCWSTR strf = (FX_LPCWSTR)wsNumFormat; + const FX_WCHAR* strf = (const FX_WCHAR*)wsNumFormat; int lenf = wsNumFormat.GetLength(); CFX_WideString wsSrcNum = wsInputNum; wsSrcNum.TrimLeft('0'); @@ -2969,7 +2969,7 @@ FX_BOOL CFX_FormatString::FormatStrNum(FX_WSTR wsInputNum, const CFX_WideString& wsSrcNum.Delete(0, 1); } FX_BOOL bAddNeg = FALSE; - FX_LPCWSTR str = (FX_LPCWSTR)wsSrcNum; + const FX_WCHAR* str = (const FX_WCHAR*)wsSrcNum; int len = wsSrcNum.GetLength(); int dot_index = wsSrcNum.Find('.'); if (dot_index == -1) { @@ -3330,7 +3330,7 @@ FX_BOOL CFX_FormatString::FormatLCNumeric(CFX_LCNumeric& lcNum, const CFX_WideSt return FALSE; } int32_t cc = 0, ccf = 0; - FX_LPCWSTR strf = (FX_LPCWSTR)wsNumFormat; + const FX_WCHAR* strf = (const FX_WCHAR*)wsNumFormat; int lenf = wsNumFormat.GetLength(); double dbOrgRaw = lcNum.GetDouble(); double dbRetValue = dbOrgRaw; @@ -3392,7 +3392,7 @@ FX_BOOL CFX_FormatString::FormatLCNumeric(CFX_LCNumeric& lcNum, const CFX_WideSt wsNumeric.Delete(0, 1); } FX_BOOL bAddNeg = FALSE; - FX_LPCWSTR str = (FX_LPCWSTR)wsNumeric; + const FX_WCHAR* str = (const FX_WCHAR*)wsNumeric; int len = wsNumeric.GetLength(); int dot_index = wsNumeric.Find('.'); if (dot_index == -1) { @@ -3747,7 +3747,7 @@ FX_BOOL FX_DateFromCanonical(const CFX_WideString& wsDate, CFX_Unitime& datetime int32_t day = 1; FX_WORD wYear = 0; int cc_start = 0, cc = 0; - FX_LPCWSTR str = (FX_LPCWSTR)wsDate; + const FX_WCHAR* str = (const FX_WCHAR*)wsDate; int len = wsDate.GetLength(); if(len > 10) { return FALSE; @@ -3826,7 +3826,7 @@ FX_BOOL FX_TimeFromCanonical(FX_WSTR wsTime, CFX_Unitime& datetime, IFX_Locale* uint8_t second = 0; FX_WORD millisecond = 0; int cc_start = 0, cc = cc_start; - FX_LPCWSTR str = (FX_LPCWSTR)wsTime.GetPtr(); + const FX_WCHAR* str = (const FX_WCHAR*)wsTime.GetPtr(); int len = wsTime.GetLength(); while (cc < len && cc < 2) { if (!FX_IsDigit(str[cc])) { @@ -3949,7 +3949,7 @@ static FX_BOOL FX_DateFormat(const CFX_WideString& wsDatePattern, IFX_Locale *pL uint8_t month = datetime.GetMonth(); uint8_t day = datetime.GetDay(); int32_t ccf = 0; - FX_LPCWSTR strf = (FX_LPCWSTR)wsDatePattern; + const FX_WCHAR* strf = (const FX_WCHAR*)wsDatePattern; int32_t lenf = wsDatePattern.GetLength(); while (ccf < lenf) { if (strf[ccf] == '\'') { @@ -4066,7 +4066,7 @@ static FX_BOOL FX_TimeFormat(const CFX_WideString& wsTimePattern, IFX_Locale *pL uint8_t second = datetime.GetSecond(); FX_WORD millisecond = datetime.GetMillisecond(); int32_t ccf = 0; - FX_LPCWSTR strf = (FX_LPCWSTR)wsTimePattern; + const FX_WCHAR* strf = (const FX_WCHAR*)wsTimePattern; int32_t lenf = wsTimePattern.GetLength(); FX_WORD wHour = hour; FX_BOOL bPM = FALSE; @@ -4259,8 +4259,8 @@ FX_BOOL CFX_FormatString::FormatDateTime(const CFX_WideString& wsSrcDateTime, co return FX_FormatDateTime(dt, wsDatePattern, wsTimePattern, TRUE, pLocale, wsOutput); } } else { - CFX_WideStringC wsSrcDate((FX_LPCWSTR)wsSrcDateTime, iT); - CFX_WideStringC wsSrcTime((FX_LPCWSTR)wsSrcDateTime + iT + 1, wsSrcDateTime.GetLength() - iT - 1); + CFX_WideStringC wsSrcDate((const FX_WCHAR*)wsSrcDateTime, iT); + CFX_WideStringC wsSrcTime((const FX_WCHAR*)wsSrcDateTime + iT + 1, wsSrcDateTime.GetLength() - iT - 1); if(wsSrcDate.IsEmpty() || wsSrcTime.IsEmpty()) { return FALSE; } @@ -4291,7 +4291,7 @@ FX_BOOL CFX_FormatString::FormatZero(const CFX_WideString& wsPattern, CFX_WideSt CFX_WideString wsTextFormat; IFX_Locale* pLocale = GetTextFormat(wsPattern, FX_WSTRC(L"zero"), wsTextFormat); int32_t iPattern = 0; - FX_LPCWSTR pStrPattern = (FX_LPCWSTR)wsTextFormat; + const FX_WCHAR* pStrPattern = (const FX_WCHAR*)wsTextFormat; int32_t iLenPattern = wsTextFormat.GetLength(); while (iPattern < iLenPattern) { if (pStrPattern[iPattern] == '\'') { @@ -4313,7 +4313,7 @@ FX_BOOL CFX_FormatString::FormatNull(const CFX_WideString& wsPattern, CFX_WideSt CFX_WideString wsTextFormat; IFX_Locale* pLocale = GetTextFormat(wsPattern, FX_WSTRC(L"null"), wsTextFormat); int32_t iPattern = 0; - FX_LPCWSTR pStrPattern = (FX_LPCWSTR)wsTextFormat; + const FX_WCHAR* pStrPattern = (const FX_WCHAR*)wsTextFormat; int32_t iLenPattern = wsTextFormat.GetLength(); while (iPattern < iLenPattern) { if (pStrPattern[iPattern] == '\'') { @@ -4625,8 +4625,8 @@ CFX_Decimal::CFX_Decimal(FX_FLOAT val, uint8_t scale ) } CFX_Decimal::CFX_Decimal(FX_WSTR strObj) { - FX_LPCWSTR str = strObj.GetPtr(); - FX_LPCWSTR strBound = str + strObj.GetLength(); + const FX_WCHAR* str = strObj.GetPtr(); + const FX_WCHAR* strBound = str + strObj.GetLength(); FX_BOOL pointmet = 0; FX_BOOL negmet = 0; uint8_t scale = 0; diff --git a/xfa/src/fgas/src/localization/fx_localemgr.cpp b/xfa/src/fgas/src/localization/fx_localemgr.cpp index b3f0e80d7a..0623fe1789 100644 --- a/xfa/src/fgas/src/localization/fx_localemgr.cpp +++ b/xfa/src/fgas/src/localization/fx_localemgr.cpp @@ -6,7 +6,7 @@ #include "../fgas_base.h" #include "fx_localemgr.h" -IFX_LocaleMgr* FX_LocaleMgr_Create(FX_LPCWSTR pszLocalPath, FX_WORD wDefaultLCID) +IFX_LocaleMgr* FX_LocaleMgr_Create(const FX_WCHAR* pszLocalPath, FX_WORD wDefaultLCID) { void* pPathHandle = FX_OpenFolder(pszLocalPath); if (!pPathHandle) { @@ -38,10 +38,10 @@ IFX_LocaleMgr* FX_LocaleMgr_Create(FX_LPCWSTR pszLocalPath, FX_WORD wDefaultLCID CFX_WideString wsLCID = pXmlLocale->GetAttrValue("", "lcid"); wchar_t* pEnd = NULL; FX_DWORD dwLCID = wcstol(wsLCID, &pEnd, 16); - if (pLocaleMgr->m_lcid2xml.GetValueAt((FX_LPVOID)(uintptr_t)dwLCID)) { + if (pLocaleMgr->m_lcid2xml.GetValueAt((void*)(uintptr_t)dwLCID)) { delete pXmlLocale; } else { - pLocaleMgr->m_lcid2xml.SetAt((FX_LPVOID)(uintptr_t)dwLCID, pXmlLocale); + pLocaleMgr->m_lcid2xml.SetAt((void*)(uintptr_t)dwLCID, pXmlLocale); } } else { delete pXmlLocale; @@ -59,7 +59,7 @@ CFX_LocaleMgr::~CFX_LocaleMgr() { FX_POSITION ps = m_lcid2locale.GetStartPosition(); while (ps) { - FX_LPVOID plcid; + void* plcid; IFX_Locale* pLocale = NULL; m_lcid2locale.GetNextAssoc(ps, plcid, (void*&)pLocale); pLocale->Release(); @@ -67,7 +67,7 @@ CFX_LocaleMgr::~CFX_LocaleMgr() m_lcid2locale.RemoveAll(); ps = m_lcid2xml.GetStartPosition(); while (ps) { - FX_LPVOID plcid; + void* plcid; CXML_Element* pxml = NULL; m_lcid2xml.GetNextAssoc(ps, plcid, (void*&)pxml); delete pxml; @@ -84,12 +84,12 @@ IFX_Locale* CFX_LocaleMgr::GetDefLocale() } IFX_Locale* CFX_LocaleMgr::GetLocale(FX_WORD lcid) { - IFX_Locale* pLocale = (IFX_Locale*)m_lcid2locale.GetValueAt((FX_LPVOID)(uintptr_t)lcid); + IFX_Locale* pLocale = (IFX_Locale*)m_lcid2locale.GetValueAt((void*)(uintptr_t)lcid); if (!pLocale) { - CXML_Element* pxml = (CXML_Element*)m_lcid2xml.GetValueAt((FX_LPVOID)(uintptr_t)lcid); + CXML_Element* pxml = (CXML_Element*)m_lcid2xml.GetValueAt((void*)(uintptr_t)lcid); if (pxml) { pLocale = IFX_Locale::Create(pxml); - m_lcid2locale.SetAt((FX_LPVOID)(uintptr_t)lcid, pLocale); + m_lcid2locale.SetAt((void*)(uintptr_t)lcid, pLocale); } } return pLocale; diff --git a/xfa/src/fgas/src/xml/fx_sax_imp.cpp b/xfa/src/fgas/src/xml/fx_sax_imp.cpp index fedf89f9f9..0e47ce53d4 100644 --- a/xfa/src/fgas/src/xml/fx_sax_imp.cpp +++ b/xfa/src/fgas/src/xml/fx_sax_imp.cpp @@ -102,8 +102,8 @@ CFX_SAXReader::CFX_SAXReader() , m_pCommentContext(NULL) , m_dwParseMode(0) { - m_pszData = (FX_LPBYTE)FX_Alloc(uint8_t, m_iDataSize); - m_pszName = (FX_LPBYTE)FX_Alloc(uint8_t, m_iNameSize); + m_pszData = (uint8_t*)FX_Alloc(uint8_t, m_iDataSize); + m_pszName = (uint8_t*)FX_Alloc(uint8_t, m_iNameSize); } CFX_SAXReader::~CFX_SAXReader() { @@ -179,7 +179,7 @@ void CFX_SAXReader::ReallocDataBuffer() } else { m_iDataSize += 1024 * 1024; } - m_pszData = (FX_LPBYTE)FX_Realloc(uint8_t, m_pszData, m_iDataSize); + m_pszData = (uint8_t*)FX_Realloc(uint8_t, m_pszData, m_iDataSize); } void CFX_SAXReader::ReallocNameBuffer() { @@ -191,7 +191,7 @@ void CFX_SAXReader::ReallocNameBuffer() } else { m_iNameSize += 1024 * 1024; } - m_pszName = (FX_LPBYTE)FX_Realloc(uint8_t, m_pszName, m_iNameSize); + m_pszName = (uint8_t*)FX_Realloc(uint8_t, m_pszName, m_iNameSize); } inline FX_BOOL CFX_SAXReader::SkipSpace(uint8_t ch) { @@ -239,7 +239,7 @@ int32_t CFX_SAXReader::ContinueParse(IFX_Pause *pPause ) while(m_File.m_dwCur < m_File.m_dwEnd) { FX_DWORD &index = m_File.m_dwBufIndex; FX_DWORD size = m_File.m_dwBufSize; - FX_LPCBYTE pBuf = m_File.m_pBuf; + const uint8_t* pBuf = m_File.m_pBuf; while (index < size) { m_CurByte = pBuf[index]; (this->*g_FX_SAXReader_LPFParse[m_eMode])(); diff --git a/xfa/src/fgas/src/xml/fx_sax_imp.h b/xfa/src/fgas/src/xml/fx_sax_imp.h index a2f7259235..6e95c81fae 100644 --- a/xfa/src/fgas/src/xml/fx_sax_imp.h +++ b/xfa/src/fgas/src/xml/fx_sax_imp.h @@ -18,7 +18,7 @@ public: FX_DWORD m_dwStart; FX_DWORD m_dwEnd; FX_DWORD m_dwCur; - FX_LPBYTE m_pBuf; + uint8_t* m_pBuf; FX_DWORD m_dwBufSize; FX_DWORD m_dwBufIndex; }; @@ -49,7 +49,7 @@ public: , m_pPrev(NULL) , m_pNext(NULL) {} - FX_LPVOID m_pNode; + void* m_pNode; FX_SAXNODE m_eNode; FX_DWORD m_dwID; FX_BOOL m_bSkip; @@ -111,12 +111,12 @@ protected: CFX_ByteArray m_SkipStack; uint8_t m_SkipChar; FX_DWORD m_dwNodePos; - FX_LPBYTE m_pszData; + uint8_t* m_pszData; int32_t m_iDataSize; int32_t m_iDataLength; int32_t m_iEntityStart; int32_t m_iDataPos; - FX_LPBYTE m_pszName; + uint8_t* m_pszName; int32_t m_iNameSize; int32_t m_iNameLength; FX_DWORD m_dwParseMode; diff --git a/xfa/src/fwl/src/basewidget/fwl_comboboximp.cpp b/xfa/src/fwl/src/basewidget/fwl_comboboximp.cpp index 5658f87e13..7c489d2dee 100644 --- a/xfa/src/fwl/src/basewidget/fwl_comboboximp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_comboboximp.cpp @@ -288,7 +288,7 @@ int32_t CFWL_ComboList::MatchItem(const CFX_WideString &wsMatch) FWL_HLISTITEM hItem = pData->GetItem(m_pInterface, i); CFX_WideString wsText; pData->GetItemText(m_pInterface, hItem, wsText); - FX_STRSIZE pos = wsText.Find((FX_LPCWSTR)wsMatch); + FX_STRSIZE pos = wsText.Find((const FX_WCHAR*)wsMatch); if (!pos) { return i; } @@ -726,7 +726,7 @@ FWL_ERR CFWL_ComboBoxImp::DrawWidget(CFX_Graphics *pGraphics, const CFX_Matrix * param.m_rtPart = rtTextBk; if (m_iCurSel >= 0) { IFWL_ListBoxDP* pData = (IFWL_ListBoxDP*)((CFWL_ComboList*)((IFWL_TargetData*)m_pListBox)->GetData())->m_pProperties->m_pDataProvider; - FX_LPVOID p = pData->GetItemData(m_pListBox, pData->GetItem(m_pListBox, m_iCurSel)); + void* p = pData->GetItemData(m_pListBox, pData->GetItem(m_pListBox, m_iCurSel)); if (p != NULL) { param.m_pData = p; } diff --git a/xfa/src/fwl/src/basewidget/fwl_datetimepickerimp.cpp b/xfa/src/fwl/src/basewidget/fwl_datetimepickerimp.cpp index c9f3367114..4c30244410 100644 --- a/xfa/src/fwl/src/basewidget/fwl_datetimepickerimp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_datetimepickerimp.cpp @@ -738,9 +738,9 @@ void CFWL_DateTimePickerImp::DrawDropDownButton(CFX_Graphics *pGraphics, IFWL_Th void CFWL_DateTimePickerImp::FormatDateString(int32_t iYear, int32_t iMonth, int32_t iDay, CFX_WideString &wsText) { if ((m_pProperties->m_dwStyleExes & FWL_STYLEEXT_DTP_ShortDateFormat) == FWL_STYLEEXT_DTP_ShortDateFormat) { - wsText.Format(FX_LPCWSTR(L"%d-%d-%d"), iYear, iMonth, iDay); + wsText.Format(L"%d-%d-%d", iYear, iMonth, iDay); } else if ((m_pProperties->m_dwStyleExes & FWL_STYLEEXT_DTP_LongDateFormat) == FWL_STYLEEXT_DTP_LongDateFormat) { - wsText.Format(FX_LPCWSTR(L"%d Year %d Month %d Day"), iYear, iMonth, iDay); + wsText.Format(L"%d Year %d Month %d Day", iYear, iMonth, iDay); } else if ((m_pProperties->m_dwStyleExes & FWL_STYLEEXT_DTP_TimeFormat) == FWL_STYLEEXT_DTP_TimeFormat) { } } diff --git a/xfa/src/fwl/src/basewidget/fwl_editimp.cpp b/xfa/src/fwl/src/basewidget/fwl_editimp.cpp index 0afa1d5467..a8c1655ec8 100644 --- a/xfa/src/fwl/src/basewidget/fwl_editimp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_editimp.cpp @@ -97,7 +97,7 @@ FWL_ERR IFWL_Edit::SetFormatString(const CFX_WideString &wsFormat) { return ((CFWL_EditImp*)m_pData)->SetFormatString(wsFormat); } -FWL_ERR IFWL_Edit::Insert(int32_t nStart, FX_LPCWSTR lpText, int32_t nLen) +FWL_ERR IFWL_Edit::Insert(int32_t nStart, const FX_WCHAR* lpText, int32_t nLen) { return ((CFWL_EditImp*)m_pData)->Insert(nStart, lpText, nLen); } @@ -480,7 +480,7 @@ FX_BOOL CFWL_EditImp::ReplaceSpellCheckWord(CFX_PointF pointf, FX_BSTR bsReplace } int32_t nDestLen = bsReplace.GetLength(); CFX_WideString wsDest; - FX_LPWSTR pBuffer = wsDest.GetBuffer(nDestLen); + FX_WCHAR* pBuffer = wsDest.GetBuffer(nDestLen); for (int32_t i = 0; i < nDestLen; i++) { pBuffer[i] = bsReplace[i]; } @@ -663,7 +663,7 @@ FWL_ERR CFWL_EditImp::SetFormatString(const CFX_WideString &wsFormat) m_pEdtEngine->SetFormatBlock(0, wsFormat); return FWL_ERR_Succeeded; } -FWL_ERR CFWL_EditImp::Insert(int32_t nStart, FX_LPCWSTR lpText, int32_t nLen) +FWL_ERR CFWL_EditImp::Insert(int32_t nStart, const FX_WCHAR* lpText, int32_t nLen) { _FWL_RETURN_VALUE_IF_FAIL(m_pEdtEngine, FWL_ERR_Succeeded); if ( (m_pProperties->m_dwStyleExes & FWL_STYLEEXT_EDT_ReadOnly) @@ -803,7 +803,7 @@ FX_BOOL CFWL_EditImp::Paste(const CFX_WideString &wsPaste) { _FWL_RETURN_VALUE_IF_FAIL(m_pEdtEngine, FALSE); int32_t nCaret = m_pEdtEngine->GetCaretPos(); - int32_t iError = m_pEdtEngine->Insert(nCaret, FX_LPCWSTR(wsPaste), wsPaste.GetLength()); + int32_t iError = m_pEdtEngine->Insert(nCaret, wsPaste.c_str(), wsPaste.GetLength()); if (iError < 0) { ProcessInsertError(iError); return FALSE; @@ -2126,12 +2126,12 @@ void CFWL_EditImpDelegate::OnChar(CFWL_MsgKey *pMsg) break; } case FWL_VKEY_Tab: { - iError = m_pOwner->m_pEdtEngine->Insert(nCaret, FX_LPCWSTR(L"\t"), 1); + iError = m_pOwner->m_pEdtEngine->Insert(nCaret, L"\t", 1); break; } case FWL_VKEY_Return: { if (m_pOwner->m_pProperties->m_dwStyleExes & FWL_STYLEEXT_EDT_WantReturn) { - iError = m_pOwner->m_pEdtEngine->Insert(nCaret, FX_LPCWSTR(L"\n"), 1); + iError = m_pOwner->m_pEdtEngine->Insert(nCaret, L"\n", 1); } break; } diff --git a/xfa/src/fwl/src/basewidget/fwl_monthcalendarimp.cpp b/xfa/src/fwl/src/basewidget/fwl_monthcalendarimp.cpp index aed47639b2..c99b5c6002 100644 --- a/xfa/src/fwl/src/basewidget/fwl_monthcalendarimp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_monthcalendarimp.cpp @@ -398,7 +398,7 @@ void CFWL_MonthCalendarImp::DrawWeekNumber(CFX_Graphics *pGraphics, IFWL_ThemePr iTemp ++; iWeekNum = CalWeekNumber(m_iCurYear, iMonthNum, i); m_rtWeekNum.Set(fHStartPos, fVStartPos + m_fDateCellHei * iTemp, m_fWeekNumWid, m_fDateCellHei); - wsWeekNum.Format(FX_LPCWSTR(L"%d"), iWeekNum); + wsWeekNum.Format(L"%d", iWeekNum); params.m_wsText = wsWeekNum; params.m_rtPart = m_rtWeekNum; pTheme->DrawText(¶ms); @@ -765,7 +765,7 @@ void CFWL_MonthCalendarImp::ReSetDateItem() iDayOfWeek = 0; } CFX_WideString wsDay; - wsDay.Format(FX_LPCWSTR(L"%d"), i + 1); + wsDay.Format(L"%d", i + 1); FX_DWORD dwStates = 0; if (m_iYear == m_iCurYear && m_iMonth == m_iCurMonth && m_iDay == (i + 1)) { dwStates |= FWL_ITEMSTATE_MCD_Flag; @@ -888,25 +888,25 @@ FX_BOOL CFWL_MonthCalendarImp::JumpToToday() void CFWL_MonthCalendarImp::GetHeadText(int32_t iYear, int32_t iMonth, CFX_WideString &wsHead) { FXSYS_assert(iMonth > 0 && iMonth < 13); - static FX_LPWSTR pMonth[] = { - FX_LPWSTR(L"January"), - FX_LPWSTR(L"February"), - FX_LPWSTR(L"March"), - FX_LPWSTR(L"April"), - FX_LPWSTR(L"May"), - FX_LPWSTR(L"June"), - FX_LPWSTR(L"July"), - FX_LPWSTR(L"August"), - FX_LPWSTR(L"September"), - FX_LPWSTR(L"October"), - FX_LPWSTR(L"November"), - FX_LPWSTR(L"December") + static const FX_WCHAR* const pMonth[] = { + L"January", + L"February", + L"March", + L"April", + L"May", + L"June", + L"July", + L"August", + L"September", + L"October", + L"November", + L"December" }; - wsHead.Format(FX_LPCWSTR(L"%s, %d"), pMonth[iMonth - 1], iYear); + wsHead.Format(L"%s, %d", pMonth[iMonth - 1], iYear); } void CFWL_MonthCalendarImp::GetTodayText(int32_t iYear, int32_t iMonth, int32_t iDay, CFX_WideString &wsToday) { - wsToday.Format(FX_LPCWSTR(L", %d/%d/%d"), iDay, iMonth, iYear); + wsToday.Format(L", %d/%d/%d", iDay, iMonth, iYear); } int32_t CFWL_MonthCalendarImp::GetDayAtPoint(FX_FLOAT x, FX_FLOAT y) { diff --git a/xfa/src/fwl/src/basewidget/include/fwl_editimp.h b/xfa/src/fwl/src/basewidget/include/fwl_editimp.h index db9e25fb5c..e06cfa8d67 100644 --- a/xfa/src/fwl/src/basewidget/include/fwl_editimp.h +++ b/xfa/src/fwl/src/basewidget/include/fwl_editimp.h @@ -45,7 +45,7 @@ public: virtual FWL_ERR SetLimit(int32_t nLimit); virtual FWL_ERR SetAliasChar(FX_WCHAR wAlias); virtual FWL_ERR SetFormatString(const CFX_WideString &wsFormat); - virtual FWL_ERR Insert(int32_t nStart, FX_LPCWSTR lpText, int32_t nLen); + virtual FWL_ERR Insert(int32_t nStart, const FX_WCHAR* lpText, int32_t nLen); virtual FWL_ERR DeleteSelections(); virtual FWL_ERR DeleteRange(int32_t nStart, int32_t nCount = -1); virtual FWL_ERR ReplaceSelections(const CFX_WideStringC &wsReplace); diff --git a/xfa/src/fwl/src/core/fwl_noteimp.cpp b/xfa/src/fwl/src/core/fwl_noteimp.cpp index 4a9c138d86..0ea8975adc 100644 --- a/xfa/src/fwl/src/core/fwl_noteimp.cpp +++ b/xfa/src/fwl/src/core/fwl_noteimp.cpp @@ -143,7 +143,7 @@ FX_BOOL CFWL_NoteDriver::SendNote(CFWL_Note *pNote) m_sendEventCalled ++; FX_POSITION pos = m_eventTargets.GetStartPosition(); while (pos) { - FX_LPVOID key = NULL; + void* key = NULL; CFWL_EventTarget *pEventTarget; m_eventTargets.GetNextAssoc(pos, key, (void*&)pEventTarget); if (pEventTarget && !pEventTarget->IsInvalid()) { @@ -169,15 +169,15 @@ FX_BOOL CFWL_NoteDriver::PostMessage(CFWL_Message *pMessage) #define FWL_NoteDriver_EventKey 1100 FWL_ERR CFWL_NoteDriver::RegisterEventTarget(IFWL_Widget *pListener, IFWL_Widget *pEventSource , FX_DWORD dwFilter ) { - FX_DWORD dwkey = (FX_DWORD)(uintptr_t)pListener->GetPrivateData((FX_LPVOID)(uintptr_t)FWL_NoteDriver_EventKey); + FX_DWORD dwkey = (FX_DWORD)(uintptr_t)pListener->GetPrivateData((void*)(uintptr_t)FWL_NoteDriver_EventKey); if (dwkey == 0) { - FX_LPVOID random = FX_Random_MT_Start(0); + void* random = FX_Random_MT_Start(0); dwkey = rand(); FX_Random_MT_Close(random); - pListener->SetPrivateData((FX_LPVOID)(uintptr_t)FWL_NoteDriver_EventKey, (FX_LPVOID)(uintptr_t)dwkey, NULL); + pListener->SetPrivateData((void*)(uintptr_t)FWL_NoteDriver_EventKey, (void*)(uintptr_t)dwkey, NULL); } CFWL_EventTarget *value = NULL; - if (!m_eventTargets.Lookup((void*)(uintptr_t)dwkey, (FX_LPVOID&)value)) { + if (!m_eventTargets.Lookup((void*)(uintptr_t)dwkey, (void*&)value)) { value = FX_NEW CFWL_EventTarget(this, pListener); m_eventTargets.SetAt((void*)(uintptr_t)dwkey, value); } @@ -186,12 +186,12 @@ FWL_ERR CFWL_NoteDriver::RegisterEventTarget(IFWL_Widget *pListener, IFWL_Widget } FWL_ERR CFWL_NoteDriver::UnregisterEventTarget(IFWL_Widget *pListener) { - FX_DWORD dwkey = (FX_DWORD)(uintptr_t)pListener->GetPrivateData((FX_LPVOID)(uintptr_t)FWL_NoteDriver_EventKey); + FX_DWORD dwkey = (FX_DWORD)(uintptr_t)pListener->GetPrivateData((void*)(uintptr_t)FWL_NoteDriver_EventKey); if (dwkey == 0) { return FWL_ERR_Indefinite; } CFWL_EventTarget *value = NULL; - if (m_eventTargets.Lookup((void*)(uintptr_t)dwkey, (FX_LPVOID&)value)) { + if (m_eventTargets.Lookup((void*)(uintptr_t)dwkey, (void*&)value)) { value->FlagInvalid(); } return FWL_ERR_Succeeded; @@ -442,7 +442,7 @@ int32_t CFWL_NoteDriver::CountLoop() { return m_noteLoopQueue.GetSize(); } -void CFWL_NoteDriver::SetHook(FWLMessageHookCallback callback, FX_LPVOID info) +void CFWL_NoteDriver::SetHook(FWLMessageHookCallback callback, void* info) { m_hook = callback; m_hookInfo = info; @@ -799,7 +799,7 @@ void CFWL_NoteDriver::ClearInvalidEventTargets(FX_BOOL bRemoveAll) { FX_POSITION pos = m_eventTargets.GetStartPosition(); while (pos) { - FX_LPVOID key = NULL; + void* key = NULL; CFWL_EventTarget *pEventTarget = NULL; m_eventTargets.GetNextAssoc(pos, key, (void*&)pEventTarget); if (pEventTarget && (bRemoveAll || pEventTarget->IsInvalid())) { @@ -1119,7 +1119,7 @@ IFWL_Widget* FWL_GetCurrentThreadModalWidget(IFWL_NoteThread *pNoteThread) _FWL_RETURN_VALUE_IF_FAIL(widget, NULL); return widget->GetInterface(); } -FWL_ERR FWL_SetHook(IFWL_NoteDriver *driver, FWLMessageHookCallback callback, FX_LPVOID info) +FWL_ERR FWL_SetHook(IFWL_NoteDriver *driver, FWLMessageHookCallback callback, void* info) { CFWL_NoteDriver *noteDriver = (CFWL_NoteDriver*)driver; noteDriver->SetHook(callback, info); diff --git a/xfa/src/fwl/src/core/fwl_sdadapterimp.cpp b/xfa/src/fwl/src/core/fwl_sdadapterimp.cpp index 25636ea582..2fdaee126e 100644 --- a/xfa/src/fwl/src/core/fwl_sdadapterimp.cpp +++ b/xfa/src/fwl/src/core/fwl_sdadapterimp.cpp @@ -107,15 +107,15 @@ FWL_ERR CFWL_SDAdapterWidgetMgr::DispatchMessage() { return FWL_ERR_Succeeded; } -FWL_ERR CFWL_SDAdapterWidgetMgr::GetWidgetDC(IFWL_Widget *pWidget, FX_LPVOID &pDC) +FWL_ERR CFWL_SDAdapterWidgetMgr::GetWidgetDC(IFWL_Widget *pWidget, void* &pDC) { return FWL_ERR_Succeeded; } -FWL_ERR CFWL_SDAdapterWidgetMgr::ReleaseWidgetDC(IFWL_Widget *pWidget, FX_LPVOID pDC, CFX_RectF *pClip) +FWL_ERR CFWL_SDAdapterWidgetMgr::ReleaseWidgetDC(IFWL_Widget *pWidget, void* pDC, CFX_RectF *pClip) { return FWL_ERR_Succeeded; } -FX_LPVOID CFWL_SDAdapterWidgetMgr::GetWindow(IFWL_Widget *pWidget) +void* CFWL_SDAdapterWidgetMgr::GetWindow(IFWL_Widget *pWidget) { return NULL; } @@ -135,7 +135,7 @@ FWL_ERR CFWL_SDAdapterWidgetMgr::InitMenu(IFWL_Menu *pMenu, IFWL_MenuDP *pMenuD { return FWL_ERR_Succeeded; } -FWL_ERR CFWL_SDAdapterWidgetMgr::UpdateMenu(IFWL_Menu *pMenu, FX_LPCVOID hItem, int32_t iType) +FWL_ERR CFWL_SDAdapterWidgetMgr::UpdateMenu(IFWL_Menu *pMenu, const void* hItem, int32_t iType) { return FWL_ERR_Succeeded; } diff --git a/xfa/src/fwl/src/core/fwl_targetimp.cpp b/xfa/src/fwl/src/core/fwl_targetimp.cpp index 75e40db15a..c09b8ee447 100644 --- a/xfa/src/fwl/src/core/fwl_targetimp.cpp +++ b/xfa/src/fwl/src/core/fwl_targetimp.cpp @@ -91,11 +91,11 @@ FWL_ERR CFWL_Target::Finalize() { return FWL_ERR_Succeeded; } -FX_LPVOID IFWL_TargetData::GetData() +void* IFWL_TargetData::GetData() { return m_pData; } -void IFWL_TargetData::SetData(FX_LPVOID pData) +void IFWL_TargetData::SetData(void* pData) { m_pData = pData; } diff --git a/xfa/src/fwl/src/core/fwl_widgetimp.cpp b/xfa/src/fwl/src/core/fwl_widgetimp.cpp index 4659e6bc9e..d966296f95 100644 --- a/xfa/src/fwl/src/core/fwl_widgetimp.cpp +++ b/xfa/src/fwl/src/core/fwl_widgetimp.cpp @@ -71,11 +71,11 @@ FWL_ERR IFWL_Widget::SetStates(FX_DWORD dwStates, FX_BOOL bSet ) { return ((CFWL_WidgetImp*)m_pData)->SetStates(dwStates, bSet); } -FWL_ERR IFWL_Widget::SetPrivateData(FX_LPVOID module_id, FX_LPVOID pData, PD_CALLBACK_FREEDATA callback) +FWL_ERR IFWL_Widget::SetPrivateData(void* module_id, void* pData, PD_CALLBACK_FREEDATA callback) { return ((CFWL_WidgetImp*)m_pData)->SetPrivateData(module_id, pData, callback); } -FX_LPVOID IFWL_Widget::GetPrivateData(FX_LPVOID module_id) +void* IFWL_Widget::GetPrivateData(void* module_id) { return ((CFWL_WidgetImp*)m_pData)->GetPrivateData(module_id); } @@ -309,7 +309,7 @@ FWL_ERR CFWL_WidgetImp::SetStates(FX_DWORD dwStates, FX_BOOL bSet ) } return ret; } -FWL_ERR CFWL_WidgetImp::SetPrivateData(FX_LPVOID module_id, FX_LPVOID pData, PD_CALLBACK_FREEDATA callback) +FWL_ERR CFWL_WidgetImp::SetPrivateData(void* module_id, void* pData, PD_CALLBACK_FREEDATA callback) { if (!m_pPrivateData) { m_pPrivateData = new CFX_PrivateData; @@ -317,7 +317,7 @@ FWL_ERR CFWL_WidgetImp::SetPrivateData(FX_LPVOID module_id, FX_LPVOID pData, PD_ m_pPrivateData->SetPrivateData(module_id, pData, callback); return FWL_ERR_Succeeded; } -FX_LPVOID CFWL_WidgetImp::GetPrivateData(FX_LPVOID module_id) +void* CFWL_WidgetImp::GetPrivateData(void* module_id) { _FWL_RETURN_VALUE_IF_FAIL(m_pPrivateData, NULL); return m_pPrivateData->GetPrivateData(module_id); @@ -657,7 +657,7 @@ void CFWL_WidgetImp::GetRelativeRect(CFX_RectF &rect) rect = m_pProperties->m_rtWidget; rect.left = rect.top = 0; } -FX_LPVOID CFWL_WidgetImp::GetThemeCapacity(FX_DWORD dwCapacity) +void* CFWL_WidgetImp::GetThemeCapacity(FX_DWORD dwCapacity) { IFWL_ThemeProvider *pTheme = GetAvailableTheme(); _FWL_RETURN_VALUE_IF_FAIL(pTheme, NULL); @@ -709,7 +709,7 @@ CFWL_WidgetImp* CFWL_WidgetImp::GetSameAncestor(CFWL_WidgetImp *pWidget) relation = pAncestor->IsPopup() ? FWL_WGTRELATION_Owner : FWL_WGTRELATION_Parent; } while ((pAncestor = (CFWL_WidgetImp*)m_pWidgetMgr->GetWidget(pAncestor->m_pInterface, relation)) != NULL); for (int32_t i = 0; i < arr1.GetSize(); i ++) { - FX_LPVOID pVoid = arr1[i]; + void* pVoid = arr1[i]; if (arr2.Find(pVoid) < 0) { continue; } else { diff --git a/xfa/src/fwl/src/core/fwl_widgetmgrimp.cpp b/xfa/src/fwl/src/core/fwl_widgetmgrimp.cpp index a1e1d45718..4a89951d7d 100644 --- a/xfa/src/fwl/src/core/fwl_widgetmgrimp.cpp +++ b/xfa/src/fwl/src/core/fwl_widgetmgrimp.cpp @@ -48,7 +48,7 @@ CFWL_WidgetMgr::~CFWL_WidgetMgr() { FX_POSITION ps = m_mapWidgetItem.GetStartPosition(); while (ps) { - FX_LPVOID pWidget; + void* pWidget; CFWL_WidgetMgrItem *pItem; m_mapWidgetItem.GetNextAssoc(ps, pWidget, (void*&)pItem); delete pItem; @@ -213,7 +213,7 @@ FX_BOOL CFWL_WidgetMgr::SetWidgetIndex(IFWL_Widget *pWidget, int32_t nIndex) } return TRUE; } -FX_BOOL CFWL_WidgetMgr::IsWidget(FX_LPVOID pObj) +FX_BOOL CFWL_WidgetMgr::IsWidget(void* pObj) { _FWL_RETURN_VALUE_IF_FAIL(pObj, FALSE); return GetWidgetMgrItem((IFWL_Widget*)pObj) != NULL; @@ -985,7 +985,7 @@ FX_BOOL CFWL_WidgetMgrDelegate::bUseOffscreenDirect(IFWL_Widget *pWidget) #endif return pItem->iRedrawCounter == 0; } -static void FWL_WriteBMP(CFX_DIBitmap* pBitmap, FX_LPCSTR filename) +static void FWL_WriteBMP(CFX_DIBitmap* pBitmap, const FX_CHAR* filename) { FILE* file = fopen(filename, "wb"); if (file == NULL) { @@ -1017,7 +1017,7 @@ static void FWL_WriteBMP(CFX_DIBitmap* pBitmap, FX_LPCSTR filename) buffer[14] = pBitmap->GetBPP(); fwrite(buffer, 40, 1, file); for (int row = 0; row < pBitmap->GetHeight(); row ++) { - FX_LPBYTE scan_line = pBitmap->GetBuffer() + row * pBitmap->GetPitch(); + uint8_t* scan_line = pBitmap->GetBuffer() + row * pBitmap->GetPitch(); fwrite(scan_line, pBitmap->GetPitch(), 1, file); } fclose(file); diff --git a/xfa/src/fwl/src/core/include/fwl_noteimp.h b/xfa/src/fwl/src/core/include/fwl_noteimp.h index 699840d27e..78afc35313 100644 --- a/xfa/src/fwl/src/core/include/fwl_noteimp.h +++ b/xfa/src/fwl/src/core/include/fwl_noteimp.h @@ -63,7 +63,7 @@ public: FX_BOOL UnqueueMessage(CFWL_NoteLoop *pNoteLoop); CFWL_NoteLoop* GetTopLoop(); int32_t CountLoop(); - void SetHook(FWLMessageHookCallback callback, FX_LPVOID info); + void SetHook(FWLMessageHookCallback callback, void* info); FX_BOOL ProcessMessage(CFWL_Message *pMessage); protected: FX_BOOL DispatchMessage(CFWL_Message *pMessage, IFWL_Widget *pMessageForm); @@ -94,9 +94,9 @@ protected: IFWL_Widget *m_pGrab; CFWL_NoteLoop *m_pNoteLoop; FWLMessageHookCallback m_hook; - FX_LPVOID m_hookInfo; + void* m_hookInfo; }; -typedef CFX_MapPtrTemplate CFWL_EventSource; +typedef CFX_MapPtrTemplate CFWL_EventSource; class CFWL_EventTarget { public: diff --git a/xfa/src/fwl/src/core/include/fwl_targetimp.h b/xfa/src/fwl/src/core/include/fwl_targetimp.h index 2fa2bf7322..1287a63870 100644 --- a/xfa/src/fwl/src/core/include/fwl_targetimp.h +++ b/xfa/src/fwl/src/core/include/fwl_targetimp.h @@ -26,7 +26,7 @@ protected: class IFWL_TargetData : public IFWL_Target { public: - FX_LPVOID GetData(); - void SetData(FX_LPVOID pData); + void* GetData(); + void SetData(void* pData); }; #endif diff --git a/xfa/src/fwl/src/core/include/fwl_widgetimp.h b/xfa/src/fwl/src/core/include/fwl_widgetimp.h index 4d28722576..af4ceced95 100644 --- a/xfa/src/fwl/src/core/include/fwl_widgetimp.h +++ b/xfa/src/fwl/src/core/include/fwl_widgetimp.h @@ -36,8 +36,8 @@ public: virtual FWL_ERR ModifyStylesEx(FX_DWORD dwStylesExAdded, FX_DWORD dwStylesExRemoved); virtual FX_DWORD GetStates(); virtual FWL_ERR SetStates(FX_DWORD dwStates, FX_BOOL bSet = TRUE); - virtual FWL_ERR SetPrivateData(FX_LPVOID module_id, FX_LPVOID pData, PD_CALLBACK_FREEDATA callback); - virtual FX_LPVOID GetPrivateData(FX_LPVOID module_id); + virtual FWL_ERR SetPrivateData(void* module_id, void* pData, PD_CALLBACK_FREEDATA callback); + virtual void* GetPrivateData(void* module_id); virtual FWL_ERR Update(); virtual FWL_ERR LockUpdate(); virtual FWL_ERR UnlockUpdate(); @@ -76,7 +76,7 @@ protected: FX_FLOAT GetBorderSize(FX_BOOL bCX = TRUE); FX_FLOAT GetEdgeWidth(); void GetRelativeRect(CFX_RectF &rect); - FX_LPVOID GetThemeCapacity(FX_DWORD dwCapacity); + void* GetThemeCapacity(FX_DWORD dwCapacity); IFWL_ThemeProvider* GetAvailableTheme(); CFWL_WidgetImp* GetRootOuter(); CFWL_WidgetImp* GetSameAncestor(CFWL_WidgetImp *pWidget); diff --git a/xfa/src/fwl/src/core/include/fwl_widgetmgrimp.h b/xfa/src/fwl/src/core/include/fwl_widgetmgrimp.h index f730f5b33d..12b629ff06 100644 --- a/xfa/src/fwl/src/core/include/fwl_widgetmgrimp.h +++ b/xfa/src/fwl/src/core/include/fwl_widgetmgrimp.h @@ -59,7 +59,7 @@ public: virtual IFWL_Widget* GetWidget(IFWL_Widget *pWidget, FWL_WGTRELATION eRelation); virtual int32_t GetWidgetIndex(IFWL_Widget *pWidget); virtual FX_BOOL SetWidgetIndex(IFWL_Widget *pWidget, int32_t nIndex); - virtual FX_BOOL IsWidget(FX_LPVOID pObj); + virtual FX_BOOL IsWidget(void* pObj); virtual FWL_ERR RepaintWidget(IFWL_Widget *pWidget, const CFX_RectF *pRect = NULL); virtual FX_DWORD GetCapability() { diff --git a/xfa/src/fwl/src/lightwidget/combobox.cpp b/xfa/src/fwl/src/lightwidget/combobox.cpp index c443dfbcb3..c0806ef15b 100644 --- a/xfa/src/fwl/src/lightwidget/combobox.cpp +++ b/xfa/src/fwl/src/lightwidget/combobox.cpp @@ -135,14 +135,14 @@ FWL_ERR CFWL_ComboBox::SetMaxListHeight(FX_FLOAT fMaxHeight) m_comboBoxData.m_fMaxListHeight = fMaxHeight; return FWL_ERR_Succeeded; } -FWL_ERR CFWL_ComboBox::SetItemData(int32_t iIndex, FX_LPVOID pData) +FWL_ERR CFWL_ComboBox::SetItemData(int32_t iIndex, void* pData) { CFWL_ComboBoxItem *pItem = (CFWL_ComboBoxItem*)(m_comboBoxData.GetItem((IFWL_Widget *)this, iIndex)); _FWL_RETURN_VALUE_IF_FAIL(pItem, FWL_ERR_Indefinite); pItem->m_pData = pData; return FWL_ERR_Succeeded; } -FX_LPVOID CFWL_ComboBox::GetItemData(int32_t iIndex) +void* CFWL_ComboBox::GetItemData(int32_t iIndex) { CFWL_ComboBoxItem *pItem = (CFWL_ComboBoxItem*)(m_comboBoxData.GetItem((IFWL_Widget *)this, iIndex)); _FWL_RETURN_VALUE_IF_FAIL(pItem, NULL); @@ -299,7 +299,7 @@ FWL_ERR CFWL_ComboBox::CFWL_ComboBoxDP::GetItemRect(IFWL_Widget *pWidget, FWL_HL pItem->m_rtItem.height); return FWL_ERR_Succeeded; } -FX_LPVOID CFWL_ComboBox::CFWL_ComboBoxDP::GetItemData(IFWL_Widget *pWidget, FWL_HLISTITEM hItem) +void* CFWL_ComboBox::CFWL_ComboBoxDP::GetItemData(IFWL_Widget *pWidget, FWL_HLISTITEM hItem) { _FWL_RETURN_VALUE_IF_FAIL(hItem, NULL); CFWL_ComboBoxItem *pItem = (CFWL_ComboBoxItem*)hItem; @@ -311,7 +311,7 @@ FWL_ERR CFWL_ComboBox::CFWL_ComboBoxDP::SetItemStyles(IFWL_Widget *pWidget, FWL_ ((CFWL_ComboBoxItem*)hItem)->m_dwStyles = dwStyle; return FWL_ERR_Succeeded; } -FWL_ERR CFWL_ComboBox::CFWL_ComboBoxDP::SetItemText(IFWL_Widget *pWidget, FWL_HLISTITEM hItem, FX_LPCWSTR pszText) +FWL_ERR CFWL_ComboBox::CFWL_ComboBoxDP::SetItemText(IFWL_Widget *pWidget, FWL_HLISTITEM hItem, const FX_WCHAR* pszText) { _FWL_RETURN_VALUE_IF_FAIL(hItem, FWL_ERR_Indefinite); ((CFWL_ComboBoxItem*)hItem)->m_wsText = pszText; diff --git a/xfa/src/fwl/src/lightwidget/edit.cpp b/xfa/src/fwl/src/lightwidget/edit.cpp index 8bace71d74..1ee1066793 100644 --- a/xfa/src/fwl/src/lightwidget/edit.cpp +++ b/xfa/src/fwl/src/lightwidget/edit.cpp @@ -112,7 +112,7 @@ FWL_ERR CFWL_Edit::SetFormatString(const CFX_WideString &wsFormat) _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite); return ((IFWL_Edit*)m_pImp)->SetFormatString(wsFormat); } -FWL_ERR CFWL_Edit::Insert(int32_t nStart, FX_LPCWSTR lpText, int32_t nLen) +FWL_ERR CFWL_Edit::Insert(int32_t nStart, const FX_WCHAR* lpText, int32_t nLen) { _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite); return ((IFWL_Edit*)m_pImp)->Insert(nStart, lpText, nLen); diff --git a/xfa/src/fwl/src/lightwidget/listbox.cpp b/xfa/src/fwl/src/lightwidget/listbox.cpp index f3278df1f9..a9890bd283 100644 --- a/xfa/src/fwl/src/lightwidget/listbox.cpp +++ b/xfa/src/fwl/src/lightwidget/listbox.cpp @@ -163,14 +163,14 @@ FWL_ERR CFWL_ListBox::GetItemString(FWL_HLISTITEM hItem, CFX_WideString &wsText) wsText = pItem->m_wsText; return FWL_ERR_Succeeded; } -FWL_ERR CFWL_ListBox::SetItemData(FWL_HLISTITEM hItem, FX_LPVOID pData) +FWL_ERR CFWL_ListBox::SetItemData(FWL_HLISTITEM hItem, void* pData) { _FWL_RETURN_VALUE_IF_FAIL(hItem, FWL_ERR_Indefinite); CFWL_ListItem *pItem = (CFWL_ListItem*)hItem; pItem->m_pData = pData; return FWL_ERR_Succeeded; } -FX_LPVOID CFWL_ListBox::GetItemData(FWL_HLISTITEM hItem) +void* CFWL_ListBox::GetItemData(FWL_HLISTITEM hItem) { _FWL_RETURN_VALUE_IF_FAIL(hItem, NULL); CFWL_ListItem *pItem = (CFWL_ListItem*)hItem; @@ -270,7 +270,7 @@ FWL_ERR CFWL_ListBox::CFWL_ListBoxDP::GetItemRect(IFWL_Widget *pWidget, FWL_HLIS rtItem = pItem->m_rtItem; return FWL_ERR_Succeeded; } -FX_LPVOID CFWL_ListBox::CFWL_ListBoxDP::GetItemData(IFWL_Widget *pWidget, FWL_HLISTITEM hItem) +void* CFWL_ListBox::CFWL_ListBoxDP::GetItemData(IFWL_Widget *pWidget, FWL_HLISTITEM hItem) { _FWL_RETURN_VALUE_IF_FAIL(hItem, NULL); CFWL_ListItem *pItem = (CFWL_ListItem*)hItem; @@ -282,7 +282,7 @@ FWL_ERR CFWL_ListBox::CFWL_ListBoxDP::SetItemStyles(IFWL_Widget *pWidget, FWL_HL ((CFWL_ListItem*)hItem)->m_dwStates = dwStyle; return FWL_ERR_Succeeded; } -FWL_ERR CFWL_ListBox::CFWL_ListBoxDP::SetItemText(IFWL_Widget *pWidget, FWL_HLISTITEM hItem, FX_LPCWSTR pszText) +FWL_ERR CFWL_ListBox::CFWL_ListBoxDP::SetItemText(IFWL_Widget *pWidget, FWL_HLISTITEM hItem, const FX_WCHAR* pszText) { _FWL_RETURN_VALUE_IF_FAIL(hItem, FWL_ERR_Indefinite); ((CFWL_ListItem*)hItem)->m_wsText = pszText; diff --git a/xfa/src/fwl/src/lightwidget/theme.cpp b/xfa/src/fwl/src/lightwidget/theme.cpp index 84925f562e..f9a2bab6a2 100644 --- a/xfa/src/fwl/src/lightwidget/theme.cpp +++ b/xfa/src/fwl/src/lightwidget/theme.cpp @@ -47,7 +47,7 @@ FX_BOOL CFWL_Theme::DrawText(CFWL_ThemeText *pParams) FXSYS_assert(pTheme); return pTheme->DrawText(pParams); } -FX_LPVOID CFWL_Theme::GetCapacity(CFWL_ThemePart *pThemePart, FX_DWORD dwCapacity) +void* CFWL_Theme::GetCapacity(CFWL_ThemePart *pThemePart, FX_DWORD dwCapacity) { CFWL_WidgetTP *pTheme = GetTheme(pThemePart->m_pWidget); FXSYS_assert(pTheme); @@ -133,7 +133,7 @@ CFWL_Theme::~CFWL_Theme() } m_arrThemes.RemoveAll(); } -FWL_ERR CFWL_Theme::SetFont(IFWL_Widget *pWidget, FX_LPCWSTR strFont, FX_FLOAT fFontSize, FX_ARGB rgbFont) +FWL_ERR CFWL_Theme::SetFont(IFWL_Widget *pWidget, const FX_WCHAR* strFont, FX_FLOAT fFontSize, FX_ARGB rgbFont) { int32_t iCount = m_arrThemes.GetSize(); for (int32_t i = 0; i < iCount; i ++) { diff --git a/xfa/src/fwl/src/lightwidget/widget.cpp b/xfa/src/fwl/src/lightwidget/widget.cpp index 6171eecf31..b1cbd9ae9e 100644 --- a/xfa/src/fwl/src/lightwidget/widget.cpp +++ b/xfa/src/fwl/src/lightwidget/widget.cpp @@ -54,7 +54,7 @@ FX_BOOL CFWL_Widget::IsInstance(FX_WSTR wsClass) const _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FALSE); return m_pImp->IsInstance(wsClass); } -static FX_LPVOID gs_pFWLWidget = (FX_LPVOID)FXBSTR_ID('l', 'i', 'g', 't'); +static void* gs_pFWLWidget = (void*)FXBSTR_ID('l', 'i', 'g', 't'); FWL_ERR CFWL_Widget::Initialize(const CFWL_WidgetProperties *pProperties ) { _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite); @@ -133,12 +133,12 @@ FWL_ERR CFWL_Widget::SetStates(FX_DWORD dwStates, FX_BOOL bSet ) _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite); return m_pImp->SetStates(dwStates, bSet); } -FWL_ERR CFWL_Widget::SetPrivateData(FX_LPVOID module_id, FX_LPVOID pData, PD_CALLBACK_FREEDATA callback) +FWL_ERR CFWL_Widget::SetPrivateData(void* module_id, void* pData, PD_CALLBACK_FREEDATA callback) { _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite); return m_pImp->SetPrivateData(module_id, pData, callback); } -FX_LPVOID CFWL_Widget::GetPrivateData(FX_LPVOID module_id) +void* CFWL_Widget::GetPrivateData(void* module_id) { _FWL_RETURN_VALUE_IF_FAIL(m_pImp, NULL); return m_pImp->GetPrivateData(module_id); diff --git a/xfa/src/fwl/src/theme/comboboxtp.cpp b/xfa/src/fwl/src/theme/comboboxtp.cpp index c7218955c9..28a1958f58 100644 --- a/xfa/src/fwl/src/theme/comboboxtp.cpp +++ b/xfa/src/fwl/src/theme/comboboxtp.cpp @@ -78,7 +78,7 @@ void CFWL_ComboBoxTP::DrawStrethHandler(CFWL_ThemeBackground *pParams, FX_DWORD pParams->m_pGraphics->SetFillColor(&cr); pParams->m_pGraphics->FillPath(&path, FXFILL_WINDING, &pParams->m_matrix); } -FX_LPVOID CFWL_ComboBoxTP::GetCapacity(CFWL_ThemePart *pThemePart, FX_DWORD dwCapacity) +void* CFWL_ComboBoxTP::GetCapacity(CFWL_ThemePart *pThemePart, FX_DWORD dwCapacity) { if (dwCapacity == FWL_WGTCAPACITY_CMB_ComboFormHandler) { m_fValue = FWLTHEME_CAPACITY_ComboFormHandler; diff --git a/xfa/src/fwl/src/theme/formtp.cpp b/xfa/src/fwl/src/theme/formtp.cpp index ce12c15e78..db152edea5 100644 --- a/xfa/src/fwl/src/theme/formtp.cpp +++ b/xfa/src/fwl/src/theme/formtp.cpp @@ -144,7 +144,7 @@ FX_BOOL CFWL_FormTP::DrawText(CFWL_ThemeText *pParams) } return CFWL_WidgetTP::DrawText(pParams); } -FX_LPVOID CFWL_FormTP::GetCapacity(CFWL_ThemePart *pThemePart, FX_DWORD dwCapacity) +void* CFWL_FormTP::GetCapacity(CFWL_ThemePart *pThemePart, FX_DWORD dwCapacity) { FX_BOOL bDefPro = FALSE; FX_BOOL bDwordVal = FALSE; diff --git a/xfa/src/fwl/src/theme/listboxtp.cpp b/xfa/src/fwl/src/theme/listboxtp.cpp index a623509973..c16df585d9 100644 --- a/xfa/src/fwl/src/theme/listboxtp.cpp +++ b/xfa/src/fwl/src/theme/listboxtp.cpp @@ -67,7 +67,7 @@ FWL_ERR CFWL_ListBoxTP::Finalize() FinalizeTTO(); return CFWL_WidgetTP::Finalize(); } -void CFWL_ListBoxTP::DrawListBoxItem(CFX_Graphics *pGraphics, FX_DWORD dwStates, const CFX_RectF *prtItem, FX_LPVOID pData , CFX_Matrix *pMatrix ) +void CFWL_ListBoxTP::DrawListBoxItem(CFX_Graphics *pGraphics, FX_DWORD dwStates, const CFX_RectF *prtItem, void* pData , CFX_Matrix *pMatrix ) { if (dwStates & FWL_PARTSTATE_LTB_Selected) { pGraphics->SaveGraphState(); diff --git a/xfa/src/fwl/src/theme/monthcalendartp.cpp b/xfa/src/fwl/src/theme/monthcalendartp.cpp index 2104d873f3..de7f3a847b 100644 --- a/xfa/src/fwl/src/theme/monthcalendartp.cpp +++ b/xfa/src/fwl/src/theme/monthcalendartp.cpp @@ -130,7 +130,7 @@ FX_BOOL CFWL_MonthCalendarTP::DrawText(CFWL_ThemeText *pParams) } return CFWL_WidgetTP::DrawText(pParams); } -FX_LPVOID CFWL_MonthCalendarTP::GetCapacity(CFWL_ThemePart *pThemePart, FX_DWORD dwCapacity) +void* CFWL_MonthCalendarTP::GetCapacity(CFWL_ThemePart *pThemePart, FX_DWORD dwCapacity) { FX_BOOL bDefPro = FALSE; FX_BOOL bDwordVal = FALSE; diff --git a/xfa/src/fwl/src/theme/pushbuttontp.cpp b/xfa/src/fwl/src/theme/pushbuttontp.cpp index 8194b249be..9f3127f5b7 100644 --- a/xfa/src/fwl/src/theme/pushbuttontp.cpp +++ b/xfa/src/fwl/src/theme/pushbuttontp.cpp @@ -94,7 +94,7 @@ FX_BOOL CFWL_PushButtonTP::DrawBackground(CFWL_ThemeBackground *pParams) } return TRUE; } -FX_LPVOID CFWL_PushButtonTP::GetCapacity(CFWL_ThemePart *pThemePart, FX_DWORD dwCapacity) +void* CFWL_PushButtonTP::GetCapacity(CFWL_ThemePart *pThemePart, FX_DWORD dwCapacity) { if (dwCapacity == FWL_WGTCAPACITY_PSB_Margin) { m_fValue = 0; diff --git a/xfa/src/fwl/src/theme/scrollbartp.cpp b/xfa/src/fwl/src/theme/scrollbartp.cpp index a90dafa17e..c10507a57e 100644 --- a/xfa/src/fwl/src/theme/scrollbartp.cpp +++ b/xfa/src/fwl/src/theme/scrollbartp.cpp @@ -23,7 +23,7 @@ FX_BOOL CFWL_ScrollBarTP::IsValidWidget(IFWL_Widget *pWidget) _FWL_RETURN_VALUE_IF_FAIL(pWidget, FALSE); return pWidget->GetClassID() == FWL_CLASSHASH_ScrollBar; } -FX_LPVOID CFWL_ScrollBarTP::GetCapacity(CFWL_ThemePart *pThemePart, FX_DWORD dwCapacity) +void* CFWL_ScrollBarTP::GetCapacity(CFWL_ThemePart *pThemePart, FX_DWORD dwCapacity) { if (dwCapacity == FWL_CAPACITY_SCB_Size) { m_fValue = 5; diff --git a/xfa/src/fwl/src/theme/widgettp.cpp b/xfa/src/fwl/src/theme/widgettp.cpp index aac6516799..a4c876956d 100644 --- a/xfa/src/fwl/src/theme/widgettp.cpp +++ b/xfa/src/fwl/src/theme/widgettp.cpp @@ -69,7 +69,7 @@ FX_BOOL CFWL_WidgetTP::DrawText(CFWL_ThemeText *pParams) m_pTextOut->DrawLogicText(pParams->m_wsText, iLen, pParams->m_rtPart); return TRUE; } -FX_LPVOID CFWL_WidgetTP::GetCapacity(CFWL_ThemePart *pThemePart, FX_DWORD dwCapacity) +void* CFWL_WidgetTP::GetCapacity(CFWL_ThemePart *pThemePart, FX_DWORD dwCapacity) { switch(dwCapacity) { case FWL_WGTCAPACITY_CXBorder: { @@ -162,7 +162,7 @@ FWL_ERR CFWL_WidgetTP::Finalize() CFWL_WidgetTP::~CFWL_WidgetTP() { } -FWL_ERR CFWL_WidgetTP::SetFont(IFWL_Widget *pWidget, FX_LPCWSTR strFont, FX_FLOAT fFontSize, FX_ARGB rgbFont) +FWL_ERR CFWL_WidgetTP::SetFont(IFWL_Widget *pWidget, const FX_WCHAR* strFont, FX_FLOAT fFontSize, FX_ARGB rgbFont) { if (!m_pTextOut) { return FWL_ERR_Succeeded; diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDetector.cpp b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDetector.cpp index bdcbc4c418..5a4a2066fc 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDetector.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDetector.cpp @@ -46,7 +46,7 @@ CBC_DataMatrixDetector::~CBC_DataMatrixDetector() } m_rectangleDetector = NULL; } -inline FX_BOOL ResultPointsAndTransitionsComparator(FX_LPVOID a, FX_LPVOID b) +inline FX_BOOL ResultPointsAndTransitionsComparator(void* a, void* b) { return ((CBC_ResultPointsAndTransitions *)b)->GetTransitions() > ((CBC_ResultPointsAndTransitions *)a)->GetTransitions(); } diff --git a/xfa/src/fxbarcode/datamatrix/BC_EdifactEncoder.cpp b/xfa/src/fxbarcode/datamatrix/BC_EdifactEncoder.cpp index 8a0271f1a0..cc46b8156d 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_EdifactEncoder.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_EdifactEncoder.cpp @@ -131,7 +131,7 @@ CFX_WideString CBC_EdifactEncoder::encodeToCodewords(CFX_WideString sb, int32_t int32_t len = sb.GetLength() - startPos; if (len == 0) { e = BCExceptionNoContents; - return (FX_LPWSTR)""; + return (FX_WCHAR*)""; } FX_WCHAR c1 = sb.GetAt(startPos); FX_WCHAR c2 = len >= 2 ? sb.GetAt(startPos + 1) : 0; diff --git a/xfa/src/fxbarcode/datamatrix/BC_ErrorCorrection.cpp b/xfa/src/fxbarcode/datamatrix/BC_ErrorCorrection.cpp index e574742b54..89b920825f 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_ErrorCorrection.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_ErrorCorrection.cpp @@ -106,14 +106,14 @@ CFX_WideString CBC_ErrorCorrection::encodeECC200(CFX_WideString codewords, CBC_S { if (codewords.GetLength() != symbolInfo->m_dataCapacity) { e = BCExceptionIllegalArgument; - return (FX_LPWSTR)""; + return (FX_WCHAR*)""; } CFX_WideString sb; sb += codewords; int32_t blockCount = symbolInfo->getInterleavedBlockCount(); if (blockCount == 1) { CFX_WideString ecc = createECCBlock(codewords, symbolInfo->m_errorCodewords, e); - BC_EXCEPTION_CHECK_ReturnValue(e, (FX_LPWSTR)""); + BC_EXCEPTION_CHECK_ReturnValue(e, (FX_WCHAR*)""); sb += ecc; } else { CFX_Int32Array dataSizes; @@ -136,7 +136,7 @@ CFX_WideString CBC_ErrorCorrection::encodeECC200(CFX_WideString codewords, CBC_S temp += (FX_WCHAR)codewords.GetAt(d); } CFX_WideString ecc = createECCBlock(temp, errorSizes[block], e); - BC_EXCEPTION_CHECK_ReturnValue(e, (FX_LPWSTR)""); + BC_EXCEPTION_CHECK_ReturnValue(e, (FX_WCHAR*)""); int32_t pos = 0; for (int32_t l = block; l < errorSizes[block] * blockCount; l += blockCount) { sb.SetAt(symbolInfo->m_dataCapacity + l, ecc.GetAt(pos++)); @@ -160,7 +160,7 @@ CFX_WideString CBC_ErrorCorrection::createECCBlock(CFX_WideString codewords, int } if (table < 0) { e = BCExceptionIllegalArgument; - return (FX_LPWSTR)""; + return (FX_WCHAR*)""; } FX_WORD* ecc = FX_Alloc(FX_WORD, numECWords); FXSYS_memset32(ecc, 0, numECWords * sizeof(FX_WORD)); diff --git a/xfa/src/fxbarcode/datamatrix/BC_HighLevelEncoder.cpp b/xfa/src/fxbarcode/datamatrix/BC_HighLevelEncoder.cpp index 3866f45a5e..3aded2d349 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_HighLevelEncoder.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_HighLevelEncoder.cpp @@ -72,7 +72,7 @@ CFX_WideString CBC_HighLevelEncoder::encodeHighLevel(CFX_WideString msg, CFX_Wid CFX_WideString CBC_HighLevelEncoder::encodeHighLevel(CFX_WideString msg, CFX_WideString ecLevel, SymbolShapeHint shape, CBC_Dimension* minSize, CBC_Dimension* maxSize, int32_t &e) { CBC_EncoderContext context(msg, ecLevel, e); - BC_EXCEPTION_CHECK_ReturnValue(e, (FX_LPWSTR)""); + BC_EXCEPTION_CHECK_ReturnValue(e, (FX_WCHAR*)""); context.setSymbolShape(shape); context.setSizeConstraints(minSize, maxSize); if ((msg.Mid(0, 6) == MACRO_05_HEADER) && (msg.Mid(msg.GetLength() - 1, 1) == MACRO_TRAILER)) { @@ -99,7 +99,7 @@ CFX_WideString CBC_HighLevelEncoder::encodeHighLevel(CFX_WideString msg, CFX_Wi delete (CBC_Encoder*)encoders.GetAt(i); } encoders.RemoveAll(); - return (FX_LPWSTR)""; + return (FX_WCHAR*)""; } if (context.m_newEncoding >= 0) { encodingMode = context.m_newEncoding; @@ -113,7 +113,7 @@ CFX_WideString CBC_HighLevelEncoder::encodeHighLevel(CFX_WideString msg, CFX_Wi delete (CBC_Encoder*)encoders.GetAt(i); } encoders.RemoveAll(); - return (FX_LPWSTR)""; + return (FX_WCHAR*)""; } int32_t capacity = context.m_symbolInfo->m_dataCapacity; if (len < capacity) { diff --git a/xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.cpp b/xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.cpp index 0044683a5c..587bdd3128 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.cpp @@ -217,24 +217,24 @@ int32_t CBC_SymbolInfo::getErrorLengthForInterleavedBlock(int32_t index) CFX_WideString CBC_SymbolInfo::toString(int32_t &e) { CFX_WideString sb; - sb += (FX_LPWSTR)(m_rectangular ? "Rectangular Symbol:" : "Square Symbol:"); - sb += (FX_LPWSTR)" data region "; + sb += (FX_WCHAR*)(m_rectangular ? "Rectangular Symbol:" : "Square Symbol:"); + sb += (FX_WCHAR*)" data region "; sb += m_matrixWidth; sb += (FX_WCHAR)'x'; sb += m_matrixHeight; - sb += (FX_LPWSTR)", symbol size "; + sb += (FX_WCHAR*)", symbol size "; sb += getSymbolWidth(e); - BC_EXCEPTION_CHECK_ReturnValue(e, (FX_LPWSTR)""); + BC_EXCEPTION_CHECK_ReturnValue(e, (FX_WCHAR*)""); sb += (FX_WCHAR)'x'; sb += getSymbolHeight(e); - BC_EXCEPTION_CHECK_ReturnValue(e, (FX_LPWSTR)""); - sb += (FX_LPWSTR)", symbol data size "; + BC_EXCEPTION_CHECK_ReturnValue(e, (FX_WCHAR*)""); + sb += (FX_WCHAR*)", symbol data size "; sb += getSymbolDataWidth(e); - BC_EXCEPTION_CHECK_ReturnValue(e, (FX_LPWSTR)""); + BC_EXCEPTION_CHECK_ReturnValue(e, (FX_WCHAR*)""); sb += (FX_WCHAR)'x'; sb += getSymbolDataHeight(e); - BC_EXCEPTION_CHECK_ReturnValue(e, (FX_LPWSTR)""); - sb += (FX_LPWSTR)", codewords "; + BC_EXCEPTION_CHECK_ReturnValue(e, (FX_WCHAR*)""); + sb += (FX_WCHAR*)", codewords "; sb += m_dataCapacity; sb += (FX_WCHAR)'+'; sb += m_errorCodewords; diff --git a/xfa/src/fxbarcode/oned/BC_OnedCodaBarReader.cpp b/xfa/src/fxbarcode/oned/BC_OnedCodaBarReader.cpp index ca115391ef..7f7a69c1b7 100644 --- a/xfa/src/fxbarcode/oned/BC_OnedCodaBarReader.cpp +++ b/xfa/src/fxbarcode/oned/BC_OnedCodaBarReader.cpp @@ -26,7 +26,7 @@ #include "../oned/BC_OneDReader.h" #include "../oned/BC_OnedCode39Reader.h" #include "../oned/BC_OnedCodaBarReader.h" -FX_LPCSTR CBC_OnedCodaBarReader::ALPHABET_STRING = "0123456789-$:/.+ABCDTN"; +const FX_CHAR* CBC_OnedCodaBarReader::ALPHABET_STRING = "0123456789-$:/.+ABCDTN"; const int32_t CBC_OnedCodaBarReader::CHARACTER_ENCODINGS[22] = { 0x003, 0x006, 0x009, 0x060, 0x012, 0x042, 0x021, 0x024, 0x030, 0x048, 0x00c, 0x018, 0x045, 0x051, 0x054, 0x015, 0x01A, 0x029, 0x00B, 0x00E, diff --git a/xfa/src/fxbarcode/oned/BC_OnedCodaBarReader.h b/xfa/src/fxbarcode/oned/BC_OnedCodaBarReader.h index 18aab8ba8d..dbd2559dc6 100644 --- a/xfa/src/fxbarcode/oned/BC_OnedCodaBarReader.h +++ b/xfa/src/fxbarcode/oned/BC_OnedCodaBarReader.h @@ -18,7 +18,7 @@ public: CFX_Int32Array *FindAsteriskPattern(CBC_CommonBitArray *row, int32_t &e); FX_BOOL ArrayContains(const FX_CHAR array[], FX_CHAR key); FX_CHAR ToNarrowWidePattern(CFX_Int32Array *counter); - static FX_LPCSTR ALPHABET_STRING; + static const FX_CHAR* ALPHABET_STRING; const static int32_t CHARACTER_ENCODINGS[22]; diff --git a/xfa/src/fxbarcode/oned/BC_OnedCode39Reader.cpp b/xfa/src/fxbarcode/oned/BC_OnedCode39Reader.cpp index e5e6392c17..a678338894 100644 --- a/xfa/src/fxbarcode/oned/BC_OnedCode39Reader.cpp +++ b/xfa/src/fxbarcode/oned/BC_OnedCode39Reader.cpp @@ -25,8 +25,8 @@ #include "../common/BC_CommonBitArray.h" #include "BC_OneDReader.h" #include "BC_OnedCode39Reader.h" -FX_LPCSTR CBC_OnedCode39Reader::ALPHABET_STRING = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ-. *$/+%"; -FX_LPCSTR CBC_OnedCode39Reader::CHECKSUM_STRING = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ-. $/+%"; +const FX_CHAR* CBC_OnedCode39Reader::ALPHABET_STRING = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ-. *$/+%"; +const FX_CHAR* CBC_OnedCode39Reader::CHECKSUM_STRING = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ-. $/+%"; const int32_t CBC_OnedCode39Reader::CHARACTER_ENCODINGS[44] = { 0x034, 0x121, 0x061, 0x160, 0x031, 0x130, 0x070, 0x025, 0x124, 0x064, 0x109, 0x049, 0x148, 0x019, 0x118, 0x058, 0x00D, 0x10C, 0x04C, 0x01C, diff --git a/xfa/src/fxbarcode/oned/BC_OnedCode39Reader.h b/xfa/src/fxbarcode/oned/BC_OnedCode39Reader.h index 3e7db70f95..fa1e2e2dd6 100644 --- a/xfa/src/fxbarcode/oned/BC_OnedCode39Reader.h +++ b/xfa/src/fxbarcode/oned/BC_OnedCode39Reader.h @@ -12,8 +12,8 @@ class CBC_OnedCoda39Reader; class CBC_OnedCode39Reader : public CBC_OneDReader { public: - static FX_LPCSTR ALPHABET_STRING; - static FX_LPCSTR CHECKSUM_STRING; + static const FX_CHAR* ALPHABET_STRING; + static const FX_CHAR* CHECKSUM_STRING; const static int32_t CHARACTER_ENCODINGS[44]; const static int32_t ASTERISK_ENCODING; CBC_OnedCode39Reader(); diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.cpp index 85c01d60b0..38efe93339 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.cpp @@ -62,7 +62,7 @@ CFX_WideString CBC_PDF417HighLevelEncoder::encodeHighLevel(CFX_WideString wideMs FX_WCHAR ch = (FX_WCHAR)(bytes.GetAt(i) & 0xff); if (ch == '?' && bytes.GetAt(i) != '?') { e = BCExceptionCharactersOutsideISO88591Encoding; - return (FX_LPWSTR)""; + return (FX_WCHAR*)""; } msg += ch; } diff --git a/xfa/src/fxbarcode/qrcode/BC_QRDecodedBitStreamParser.cpp b/xfa/src/fxbarcode/qrcode/BC_QRDecodedBitStreamParser.cpp index b521222f00..ab2702e343 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRDecodedBitStreamParser.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRDecodedBitStreamParser.cpp @@ -28,7 +28,7 @@ #include "../common/BC_CommonDecoderResult.h" #include "BC_QRCoderMode.h" #include "BC_QRDecodedBitStreamParser.h" -FX_LPCSTR CBC_QRDecodedBitStreamParser::UTF_8 = "utf8"; +const FX_CHAR* CBC_QRDecodedBitStreamParser::UTF_8 = "utf8"; const FX_CHAR CBC_QRDecodedBitStreamParser::ALPHANUMERIC_CHARS[45] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', diff --git a/xfa/src/fxbarcode/qrcode/BC_QRDecodedBitStreamParser.h b/xfa/src/fxbarcode/qrcode/BC_QRDecodedBitStreamParser.h index d607e72da8..e6b556e1e1 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRDecodedBitStreamParser.h +++ b/xfa/src/fxbarcode/qrcode/BC_QRDecodedBitStreamParser.h @@ -15,7 +15,7 @@ class CBC_QRDecodedBitStreamParser { private: const static FX_CHAR ALPHANUMERIC_CHARS[45]; - static FX_LPCSTR UTF_8; + static const FX_CHAR* UTF_8; CBC_QRDecodedBitStreamParser(); public: virtual ~CBC_QRDecodedBitStreamParser(); diff --git a/xfa/src/fxbarcode/qrcode/BC_QRFinderPatternFinder.cpp b/xfa/src/fxbarcode/qrcode/BC_QRFinderPatternFinder.cpp index 975776db3f..0ff22c77dd 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRFinderPatternFinder.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRFinderPatternFinder.cpp @@ -412,7 +412,7 @@ FX_BOOL CBC_QRFinderPatternFinder::HaveMultiplyConfirmedCenters() } return totalDeviation <= 0.05f * totalModuleSize; } -inline FX_BOOL centerComparator(FX_LPVOID a, FX_LPVOID b) +inline FX_BOOL centerComparator(void* a, void* b) { return ((CBC_QRFinderPattern*)b)->GetCount() < ((CBC_QRFinderPattern*)a)->GetCount(); } diff --git a/xfa/src/fxbarcode/utils.h b/xfa/src/fxbarcode/utils.h index 9639ba8504..95b5ff05e6 100644 --- a/xfa/src/fxbarcode/utils.h +++ b/xfa/src/fxbarcode/utils.h @@ -6,11 +6,11 @@ #ifndef _BC_UTILS_H_ #define _BC_UTILS_H_ -typedef CFX_MapPtrTemplate CFX_PtrToInt32; +typedef CFX_MapPtrTemplate CFX_PtrToInt32; FX_BOOL BC_FX_ByteString_Replace(CFX_ByteString &dst, FX_DWORD first, FX_DWORD last, int32_t count, FX_CHAR c); void BC_FX_ByteString_Append(CFX_ByteString &dst, int32_t count, FX_CHAR c); void BC_FX_ByteString_Append(CFX_ByteString &dst, const CFX_ByteArray &ba); -typedef FX_BOOL (*BC_PtrArrayCompareCallback)(FX_LPVOID l, FX_LPVOID r); +typedef FX_BOOL (*BC_PtrArrayCompareCallback)(void* l, void* r); void BC_FX_PtrArray_Sort(CFX_PtrArray &src, BC_PtrArrayCompareCallback fun); template class CBC_AutoPtr diff --git a/xfa/src/fxfa/src/app/xfa_checksum.cpp b/xfa/src/fxfa/src/app/xfa_checksum.cpp index 9f4345f408..0bb63ce79a 100644 --- a/xfa/src/fxfa/src/app/xfa_checksum.cpp +++ b/xfa/src/fxfa/src/app/xfa_checksum.cpp @@ -15,7 +15,7 @@ CXFA_SAXReaderHandler::CXFA_SAXReaderHandler(CXFA_ChecksumContext *pContext) CXFA_SAXReaderHandler::~CXFA_SAXReaderHandler() { } -FX_LPVOID CXFA_SAXReaderHandler::OnTagEnter(FX_BSTR bsTagName, FX_SAXNODE eType, FX_DWORD dwStartPos) +void* CXFA_SAXReaderHandler::OnTagEnter(FX_BSTR bsTagName, FX_SAXNODE eType, FX_DWORD dwStartPos) { UpdateChecksum(TRUE); if (eType != FX_SAXNODE_Tag && eType != FX_SAXNODE_Instruction) { @@ -31,7 +31,7 @@ FX_LPVOID CXFA_SAXReaderHandler::OnTagEnter(FX_BSTR bsTagName, FX_SAXNODE eType, m_SAXContext.m_bsTagName = bsTagName; return &m_SAXContext; } -void CXFA_SAXReaderHandler::OnTagAttribute(FX_LPVOID pTag, FX_BSTR bsAttri, FX_BSTR bsValue) +void CXFA_SAXReaderHandler::OnTagAttribute(void* pTag, FX_BSTR bsAttri, FX_BSTR bsValue) { if (pTag == NULL) { return; @@ -43,7 +43,7 @@ void CXFA_SAXReaderHandler::OnTagAttribute(FX_LPVOID pTag, FX_BSTR bsAttri, FX_B textBuf << bsValue; textBuf << FX_BSTRC("\""); } -void CXFA_SAXReaderHandler::OnTagBreak(FX_LPVOID pTag) +void CXFA_SAXReaderHandler::OnTagBreak(void* pTag) { if (pTag == NULL) { return; @@ -52,7 +52,7 @@ void CXFA_SAXReaderHandler::OnTagBreak(FX_LPVOID pTag) textBuf << FX_BSTRC(">"); UpdateChecksum(FALSE); } -void CXFA_SAXReaderHandler::OnTagData(FX_LPVOID pTag, FX_SAXNODE eType, FX_BSTR bsData, FX_DWORD dwStartPos) +void CXFA_SAXReaderHandler::OnTagData(void* pTag, FX_SAXNODE eType, FX_BSTR bsData, FX_DWORD dwStartPos) { if (pTag == NULL) { return; @@ -66,7 +66,7 @@ void CXFA_SAXReaderHandler::OnTagData(FX_LPVOID pTag, FX_SAXNODE eType, FX_BSTR textBuf << FX_BSTRC("]]>"); } } -void CXFA_SAXReaderHandler::OnTagClose(FX_LPVOID pTag, FX_DWORD dwEndPos) +void CXFA_SAXReaderHandler::OnTagClose(void* pTag, FX_DWORD dwEndPos) { if (pTag == NULL) { return; @@ -82,7 +82,7 @@ void CXFA_SAXReaderHandler::OnTagClose(FX_LPVOID pTag, FX_DWORD dwEndPos) } UpdateChecksum(FALSE); } -void CXFA_SAXReaderHandler::OnTagEnd(FX_LPVOID pTag, FX_BSTR bsTagName, FX_DWORD dwEndPos) +void CXFA_SAXReaderHandler::OnTagEnd(void* pTag, FX_BSTR bsTagName, FX_DWORD dwEndPos) { if (pTag == NULL) { return; @@ -93,7 +93,7 @@ void CXFA_SAXReaderHandler::OnTagEnd(FX_LPVOID pTag, FX_BSTR bsTagName, FX_DWORD textBuf << FX_BSTRC(">"); UpdateChecksum(FALSE); } -void CXFA_SAXReaderHandler::OnTargetData(FX_LPVOID pTag, FX_SAXNODE eType, FX_BSTR bsData, FX_DWORD dwStartPos) +void CXFA_SAXReaderHandler::OnTargetData(void* pTag, FX_SAXNODE eType, FX_BSTR bsData, FX_DWORD dwStartPos) { if (pTag == NULL && eType != FX_SAXNODE_Comment) { return; @@ -116,7 +116,7 @@ void CXFA_SAXReaderHandler::UpdateChecksum(FX_BOOL bCheckSpace) if (iLength < 1) { return; } - FX_LPBYTE pBuffer = m_SAXContext.m_TextBuf.GetBuffer(); + uint8_t* pBuffer = m_SAXContext.m_TextBuf.GetBuffer(); FX_BOOL bUpdata = TRUE; if (bCheckSpace) { bUpdata = FALSE; @@ -184,7 +184,7 @@ void CXFA_ChecksumContext::FinishChecksum() FXSYS_memset(digest, 0, 20); CRYPT_SHA1Finish(m_pByteContext, digest); int32_t nLen = FX_Base64EncodeA(digest, 20, NULL); - FX_LPSTR pBuffer = m_bsChecksum.GetBuffer(nLen); + FX_CHAR* pBuffer = m_bsChecksum.GetBuffer(nLen); FX_Base64EncodeA(digest, 20, pBuffer); m_bsChecksum.ReleaseBuffer(nLen); FX_Free(m_pByteContext); diff --git a/xfa/src/fxfa/src/app/xfa_checksum.h b/xfa/src/fxfa/src/app/xfa_checksum.h index dc080096bd..8b6ecb56a6 100644 --- a/xfa/src/fxfa/src/app/xfa_checksum.h +++ b/xfa/src/fxfa/src/app/xfa_checksum.h @@ -23,14 +23,14 @@ class CXFA_SAXReaderHandler : public IFX_SAXReaderHandler public: CXFA_SAXReaderHandler(CXFA_ChecksumContext *pContext); virtual ~CXFA_SAXReaderHandler(); - virtual FX_LPVOID OnTagEnter(FX_BSTR bsTagName, FX_SAXNODE eType, FX_DWORD dwStartPos); - virtual void OnTagAttribute(FX_LPVOID pTag, FX_BSTR bsAttri, FX_BSTR bsValue); - virtual void OnTagBreak(FX_LPVOID pTag); - virtual void OnTagData(FX_LPVOID pTag, FX_SAXNODE eType, FX_BSTR bsData, FX_DWORD dwStartPos); - virtual void OnTagClose(FX_LPVOID pTag, FX_DWORD dwEndPos); - virtual void OnTagEnd(FX_LPVOID pTag, FX_BSTR bsTagName, FX_DWORD dwEndPos); + virtual void* OnTagEnter(FX_BSTR bsTagName, FX_SAXNODE eType, FX_DWORD dwStartPos); + virtual void OnTagAttribute(void* pTag, FX_BSTR bsAttri, FX_BSTR bsValue); + virtual void OnTagBreak(void* pTag); + virtual void OnTagData(void* pTag, FX_SAXNODE eType, FX_BSTR bsData, FX_DWORD dwStartPos); + virtual void OnTagClose(void* pTag, FX_DWORD dwEndPos); + virtual void OnTagEnd(void* pTag, FX_BSTR bsTagName, FX_DWORD dwEndPos); - virtual void OnTargetData(FX_LPVOID pTag, FX_SAXNODE eType, FX_BSTR bsData, FX_DWORD dwStartPos); + virtual void OnTargetData(void* pTag, FX_SAXNODE eType, FX_BSTR bsData, FX_DWORD dwStartPos); protected: void UpdateChecksum(FX_BOOL bCheckSpace); CXFA_ChecksumContext *m_pContext; @@ -52,7 +52,7 @@ public: void Update(FX_BSTR bsText); protected: IFX_SAXReader *m_pSAXReader; - FX_LPBYTE m_pByteContext; + uint8_t* m_pByteContext; CFX_ByteString m_bsChecksum; }; #endif diff --git a/xfa/src/fxfa/src/app/xfa_ffapp.cpp b/xfa/src/fxfa/src/app/xfa_ffapp.cpp index 2fc52722ef..bea64daf5f 100644 --- a/xfa/src/fxfa/src/app/xfa_ffapp.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffapp.cpp @@ -30,7 +30,7 @@ FX_FILESIZE CXFA_FileRead::GetSize() } int32_t iCount = m_Streams.GetSize(); FX_DWORD iBufferSize = 4096; - FX_LPBYTE pBuf = FX_Alloc(uint8_t, iBufferSize); + uint8_t* pBuf = FX_Alloc(uint8_t, iBufferSize); for (int32_t i = 0; i < iCount; i++) { CPDF_StreamFilter* pStreamFilter = m_Streams[i]->GetStreamFilter(FALSE); FX_DWORD dwCurSize = 0; @@ -65,11 +65,11 @@ FX_BOOL CXFA_FileRead::ReadBlock(void* buffer, FX_FILESIZE offset, size_t size) } CPDF_StreamFilter* pStreamFilter = m_Streams[i]->GetStreamFilter(FALSE); if ((offset -= dwLen) > 0) { - FX_LPBYTE pBuf = FX_Alloc(uint8_t, offset); + uint8_t* pBuf = FX_Alloc(uint8_t, offset); FX_DWORD dwRead = pStreamFilter->ReadBlock(pBuf, offset); FX_Free(pBuf); } - FX_DWORD dwHadRead = pStreamFilter->ReadBlock((FX_LPBYTE)buffer, size); + FX_DWORD dwHadRead = pStreamFilter->ReadBlock((uint8_t*)buffer, size); delete pStreamFilter; size -= dwHadRead; if (size <= 0) { @@ -78,7 +78,7 @@ FX_BOOL CXFA_FileRead::ReadBlock(void* buffer, FX_FILESIZE offset, size_t size) FX_DWORD dwReadSize = dwHadRead; for (int32_t iStart = i + 1; iStart < iCount; iStart++) { CPDF_StreamFilter* pStreamFilter = m_Streams[iStart]->GetStreamFilter(FALSE); - FX_DWORD dwHadRead = pStreamFilter->ReadBlock(((FX_LPBYTE)buffer) + dwReadSize, size); + FX_DWORD dwHadRead = pStreamFilter->ReadBlock(((uint8_t*)buffer) + dwReadSize, size); delete pStreamFilter; size -= dwHadRead; if (size <= 0) { @@ -128,7 +128,7 @@ FX_BOOL CXFA_FileRead2::ReadBlock(void* buffer, FX_FILESIZE offset, size_t size) if (size == 0) { return TRUE; } - buffer = (FX_LPBYTE)buffer + dwRead; + buffer = (uint8_t*)buffer + dwRead; offset = 0; index++; } diff --git a/xfa/src/fxfa/src/app/xfa_ffbarcode.h b/xfa/src/fxfa/src/app/xfa_ffbarcode.h index d6589c090a..20ae9c278e 100644 --- a/xfa/src/fxfa/src/app/xfa_ffbarcode.h +++ b/xfa/src/fxfa/src/app/xfa_ffbarcode.h @@ -84,7 +84,7 @@ enum XFA_BARCODETYPEENUM { }; struct XFA_BARCODETYPEENUMINFO { uint32_t uHash; - FX_LPCWSTR pName; + const FX_WCHAR* pName; XFA_BARCODETYPEENUM eName; BC_TYPE eBCType; }; diff --git a/xfa/src/fxfa/src/app/xfa_ffdoc.cpp b/xfa/src/fxfa/src/app/xfa_ffdoc.cpp index 10ed9d85bc..97514c83ae 100644 --- a/xfa/src/fxfa/src/app/xfa_ffdoc.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffdoc.cpp @@ -39,7 +39,7 @@ int32_t CXFA_FFDoc::StartLoad() m_pDocument = pDocParser->GetDocument(); return iStatus; } -FX_BOOL XFA_GetPDFContentsFromPDFXML(IFDE_XMLNode *pPDFElement, FX_LPBYTE &pByteBuffer, int32_t& iBufferSize) +FX_BOOL XFA_GetPDFContentsFromPDFXML(IFDE_XMLNode *pPDFElement, uint8_t* &pByteBuffer, int32_t& iBufferSize) { IFDE_XMLElement* pDocumentElement = NULL; for (IFDE_XMLNode *pXMLNode = pPDFElement->GetNodeItem(IFDE_XMLNode::FirstChild); pXMLNode; pXMLNode = pXMLNode->GetNodeItem(IFDE_XMLNode::NextSibling)) { @@ -111,7 +111,7 @@ int32_t CXFA_FFDoc::DoLoad(IFX_Pause *pPause ) return XFA_PARSESTATUS_SyntaxErr; } int32_t iBufferSize = 0; - FX_LPBYTE pByteBuffer = NULL; + uint8_t* pByteBuffer = NULL; IFX_FileRead* pXFAReader = NULL; if (XFA_GetPDFContentsFromPDFXML(pPDFXML, pByteBuffer, iBufferSize)) { pXFAReader = FX_CreateMemoryStream(pByteBuffer, iBufferSize, TRUE); @@ -183,10 +183,10 @@ void CXFA_FFDoc::StopLoad() } IXFA_DocView* CXFA_FFDoc::CreateDocView(FX_DWORD dwView ) { - CXFA_FFDocView* pDocView = (CXFA_FFDocView*)m_mapTypeToDocView.GetValueAt((FX_LPVOID)(uintptr_t)dwView); + CXFA_FFDocView* pDocView = (CXFA_FFDocView*)m_mapTypeToDocView.GetValueAt((void*)(uintptr_t)dwView); if (!pDocView) { pDocView = FX_NEW CXFA_FFDocView(this); - m_mapTypeToDocView.SetAt((FX_LPVOID)(uintptr_t)dwView, pDocView); + m_mapTypeToDocView.SetAt((void*)(uintptr_t)dwView, pDocView); } return pDocView; } @@ -194,7 +194,7 @@ CXFA_FFDocView* CXFA_FFDoc::GetDocView(IXFA_DocLayout* pLayout) { FX_POSITION ps = m_mapTypeToDocView.GetStartPosition(); while (ps) { - FX_LPVOID pType; + void* pType; CXFA_FFDocView* pDocView; m_mapTypeToDocView.GetNextAssoc(ps, pType, (void*&)pDocView); if (pDocView->GetXFALayout() == pLayout) { @@ -207,7 +207,7 @@ CXFA_FFDocView* CXFA_FFDoc::GetDocView() { FX_POSITION ps = m_mapTypeToDocView.GetStartPosition(); if (ps) { - FX_LPVOID pType; + void* pType; CXFA_FFDocView* pDocView; m_mapTypeToDocView.GetNextAssoc(ps, pType, (void*&)pDocView); return pDocView; @@ -271,7 +271,7 @@ FX_BOOL CXFA_FFDoc::CloseDoc() { FX_POSITION psClose = m_mapTypeToDocView.GetStartPosition(); while (psClose) { - FX_LPVOID pType; + void* pType; CXFA_FFDocView* pDocView; m_mapTypeToDocView.GetNextAssoc(psClose, pType, (void*&)pDocView); pDocView->RunDocClose(); @@ -281,7 +281,7 @@ FX_BOOL CXFA_FFDoc::CloseDoc() } FX_POSITION ps = m_mapTypeToDocView.GetStartPosition(); while (ps) { - FX_LPVOID pType; + void* pType; CXFA_FFDocView* pDocView; m_mapTypeToDocView.GetNextAssoc(ps, pType, (void*&)pDocView); delete pDocView; @@ -303,7 +303,7 @@ FX_BOOL CXFA_FFDoc::CloseDoc() } ps = m_mapNamedImages.GetStartPosition(); while (ps) { - FX_LPVOID pName; + void* pName; FX_IMAGEDIB_AND_DPI* pImage = NULL; m_mapNamedImages.GetNextAssoc(ps, pName, (void*&)pImage); if (pImage) { @@ -390,7 +390,7 @@ CFX_DIBitmap* CXFA_FFDoc::GetPDFNamedImage(FX_WSTR wsName, int32_t &iImageXDpi, imageDIBDpi->iImageYDpi = 0; CPDF_StreamAcc streamAcc; streamAcc.LoadAllData((CPDF_Stream*)pObject); - IFX_FileRead* pImageFileRead = FX_CreateMemoryStream((FX_LPBYTE)streamAcc.GetData(), streamAcc.GetSize()); + IFX_FileRead* pImageFileRead = FX_CreateMemoryStream((uint8_t*)streamAcc.GetData(), streamAcc.GetSize()); imageDIBDpi->pDibSource = XFA_LoadImageFromBuffer(pImageFileRead, FXCODEC_IMAGE_UNKNOWN, iImageXDpi, iImageYDpi); imageDIBDpi->iImageXDpi = iImageXDpi; imageDIBDpi->iImageYDpi = iImageYDpi; @@ -430,7 +430,7 @@ FX_BOOL CXFA_FFDoc::SavePackage(FX_WSTR wsPackage, IFX_FileWrite* pFile, IXFA_Ch if (pCSContext) { pCSContext->GetChecksum(bsChecksum); } - bFlags = pExport->Export(pFile, pNode, 0, bsChecksum.GetLength() ? (FX_LPCSTR)bsChecksum : NULL); + bFlags = pExport->Export(pFile, pNode, 0, bsChecksum.GetLength() ? (const FX_CHAR*)bsChecksum : NULL); } else { bFlags = pExport->Export(pFile); } diff --git a/xfa/src/fxfa/src/app/xfa_ffdocview.cpp b/xfa/src/fxfa/src/app/xfa_ffdocview.cpp index dcf6c28816..1532e28607 100644 --- a/xfa/src/fxfa/src/app/xfa_ffdocview.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffdocview.cpp @@ -171,7 +171,7 @@ void CXFA_FFDocView::ShowNullTestMsg() pAppProvider->LoadString(XFA_IDS_ValidateLimit, wsLimit); if (!wsLimit.IsEmpty()) { CFX_WideString wsTemp; - wsTemp.Format((FX_LPCWSTR)wsLimit, iRemain); + wsTemp.Format((const FX_WCHAR*)wsLimit, iRemain); wsMsg += FX_WSTRC(L"\n") + wsTemp; } } @@ -696,7 +696,7 @@ void CXFA_FFDocView::RunCalculateRecursive(int32_t& iIndex) AddCalculateNodeNotify(pCurAcc->GetNode()); int32_t iRefCount = (int32_t)(uintptr_t)pCurAcc->GetNode()->GetUserData(XFA_CalcRefCount); iRefCount++; - pCurAcc->GetNode()->SetUserData(XFA_CalcRefCount, (FX_LPVOID)(uintptr_t)iRefCount); + pCurAcc->GetNode()->SetUserData(XFA_CalcRefCount, (void*)(uintptr_t)iRefCount); if (iRefCount > 11) { break; } @@ -719,7 +719,7 @@ int32_t CXFA_FFDocView::RunCalculateWidgets() } for (int32_t i = 0; i < m_CalculateAccs.GetSize(); i++) { CXFA_WidgetAcc* pCurAcc = (CXFA_WidgetAcc*)m_CalculateAccs[i]; - pCurAcc->GetNode()->SetUserData(XFA_CalcRefCount, (FX_LPVOID)(uintptr_t)0); + pCurAcc->GetNode()->SetUserData(XFA_CalcRefCount, (void*)(uintptr_t)0); } m_CalculateAccs.RemoveAll(); return XFA_EVENTERROR_Sucess; diff --git a/xfa/src/fxfa/src/app/xfa_ffimageedit.cpp b/xfa/src/fxfa/src/app/xfa_ffimageedit.cpp index 0174ee71c5..21bd95895a 100644 --- a/xfa/src/fxfa/src/app/xfa_ffimageedit.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffimageedit.cpp @@ -132,11 +132,11 @@ FX_BOOL CXFA_FFImageEdit::OnLButtonDown(FX_DWORD dwFlags, FX_FLOAT fx, FX_FLOAT int32_t nDataSize = pFileRead->GetSize(); if (nDataSize > 0) { CFX_ByteString bsBuf; - FX_LPSTR pImageBuffer = bsBuf.GetBuffer(nDataSize); + FX_CHAR* pImageBuffer = bsBuf.GetBuffer(nDataSize); pFileRead->ReadBlock(pImageBuffer, 0, nDataSize); bsBuf.ReleaseBuffer(); if (!bsBuf.IsEmpty()) { - FX_LPSTR pData = XFA_Base64Encode(bsBuf, nDataSize); + FX_CHAR* pData = XFA_Base64Encode(bsBuf, nDataSize); wsImage = CFX_WideString::FromLocal(pData); if (pData != NULL) { FX_Free(pData); diff --git a/xfa/src/fxfa/src/app/xfa_ffnotify.cpp b/xfa/src/fxfa/src/app/xfa_ffnotify.cpp index d42e7e611c..3f96278e24 100644 --- a/xfa/src/fxfa/src/app/xfa_ffnotify.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffnotify.cpp @@ -30,7 +30,7 @@ #include "xfa_textlayout.h" #include "xfa_ffwidgetacc.h" #include "xfa_ffnotify.h" -static void XFA_FFDeleteWidgetAcc(FX_LPVOID pData) +static void XFA_FFDeleteWidgetAcc(void* pData) { if (pData) { delete (CXFA_WidgetAcc*)pData; @@ -44,7 +44,7 @@ CXFA_FFNotify::CXFA_FFNotify(CXFA_FFDoc* pDoc) CXFA_FFNotify::~CXFA_FFNotify() { } -void CXFA_FFNotify::OnPageEvent(IXFA_LayoutPage *pSender, XFA_PAGEEVENT eEvent, FX_LPVOID pParam) +void CXFA_FFNotify::OnPageEvent(IXFA_LayoutPage *pSender, XFA_PAGEEVENT eEvent, void* pParam) { CXFA_FFDocView* pDocView = m_pDoc->GetDocView(pSender->GetLayout()); if (!pDocView) { @@ -52,7 +52,7 @@ void CXFA_FFNotify::OnPageEvent(IXFA_LayoutPage *pSender, XFA_PAGEEVENT eEvent, } pDocView->OnPageEvent(pSender, eEvent, (int32_t)(uintptr_t)pParam); } -void CXFA_FFNotify::OnNodeEvent(CXFA_Node *pSender, XFA_NODEEVENT eEvent, FX_LPVOID pParam , FX_LPVOID pParam2 , FX_LPVOID pParam3, FX_LPVOID pParam4) +void CXFA_FFNotify::OnNodeEvent(CXFA_Node *pSender, XFA_NODEEVENT eEvent, void* pParam , void* pParam2 , void* pParam3, void* pParam4) { switch (eEvent) { case XFA_NODEEVENT_Ready: @@ -72,7 +72,7 @@ void CXFA_FFNotify::OnNodeEvent(CXFA_Node *pSender, XFA_NODEEVENT eEvent, FX_LPV break; } } -void CXFA_FFNotify::OnWidgetDataEvent(CXFA_WidgetData* pSender, FX_DWORD dwEvent, FX_LPVOID pParam , FX_LPVOID pAdditional , FX_LPVOID pAdditional2 ) +void CXFA_FFNotify::OnWidgetDataEvent(CXFA_WidgetData* pSender, FX_DWORD dwEvent, void* pParam , void* pAdditional , void* pAdditional2 ) { CXFA_WidgetAcc* pWidgetAcc = (CXFA_WidgetAcc*)pSender; switch (dwEvent) { @@ -91,9 +91,9 @@ void CXFA_FFNotify::OnWidgetDataEvent(CXFA_WidgetData* pSender, FX_DWORD dwEvent while (pWidget) { if (pWidget->IsLoaded()) { if (pWidgetAcc->IsListBox()) { - ((CXFA_FFListBox*)pWidget)->InsertItem((FX_WSTR)(FX_LPCWSTR)pParam, (int32_t)(uintptr_t)pAdditional2); + ((CXFA_FFListBox*)pWidget)->InsertItem((FX_WSTR)(const FX_WCHAR*)pParam, (int32_t)(uintptr_t)pAdditional2); } else { - ((CXFA_FFComboBox*)pWidget)->InsertItem((FX_WSTR)(FX_LPCWSTR)pParam, (int32_t)(uintptr_t)pAdditional2); + ((CXFA_FFComboBox*)pWidget)->InsertItem((FX_WSTR)(const FX_WCHAR*)pParam, (int32_t)(uintptr_t)pAdditional2); } } if (bStaticNotify) { @@ -219,7 +219,7 @@ CXFA_LayoutItem* CXFA_FFNotify::OnCreateLayoutItem(CXFA_Node* pNode) pWidget->SetDocView(pDocView); return pWidget->GetLayoutItem(); } -void CXFA_FFNotify::OnLayoutEvent(IXFA_DocLayout *pLayout, CXFA_LayoutItem *pSender, XFA_LAYOUTEVENT eEvent, FX_LPVOID pParam , FX_LPVOID pParam2 ) +void CXFA_FFNotify::OnLayoutEvent(IXFA_DocLayout *pLayout, CXFA_LayoutItem *pSender, XFA_LAYOUTEVENT eEvent, void* pParam , void* pParam2 ) { CXFA_FFDocView* pDocView = m_pDoc->GetDocView(pLayout); if (!pDocView || !XFA_GetWidgetFromLayoutItem(pSender)) { @@ -410,7 +410,7 @@ void CXFA_FFNotify::OnNodeReady(CXFA_Node *pNode) break; } } -void CXFA_FFNotify::OnValueChanging(CXFA_Node *pSender, FX_LPVOID pParam, FX_LPVOID pParam2) +void CXFA_FFNotify::OnValueChanging(CXFA_Node *pSender, void* pParam, void* pParam2) { CXFA_FFDocView* pDocView = m_pDoc->GetDocView(); if (!pDocView) { @@ -437,7 +437,7 @@ void CXFA_FFNotify::OnValueChanging(CXFA_Node *pSender, FX_LPVOID pParam, FX_LPV } } } -void CXFA_FFNotify::OnValueChanged(CXFA_Node *pSender, FX_LPVOID pParam, FX_LPVOID pParam2, FX_LPVOID pParam3, FX_LPVOID pParam4) +void CXFA_FFNotify::OnValueChanged(CXFA_Node *pSender, void* pParam, void* pParam2, void* pParam3, void* pParam4) { CXFA_FFDocView* pDocView = m_pDoc->GetDocView(); if (!pDocView) { @@ -518,7 +518,7 @@ void CXFA_FFNotify::OnValueChanged(CXFA_Node *pSender, FX_LPVOID pParam, FX_LPVO } } } -void CXFA_FFNotify::OnChildAdded(CXFA_Node *pSender, FX_LPVOID pParam, FX_LPVOID pParam2) +void CXFA_FFNotify::OnChildAdded(CXFA_Node *pSender, void* pParam, void* pParam2) { if (!pSender->IsFormContainer()) { return; @@ -532,7 +532,7 @@ void CXFA_FFNotify::OnChildAdded(CXFA_Node *pSender, FX_LPVOID pParam, FX_LPVOID m_pDoc->GetDocProvider()->SetChangeMark(m_pDoc); } } -void CXFA_FFNotify::OnChildRemoved(CXFA_Node *pSender, FX_LPVOID pParam, FX_LPVOID pParam2) +void CXFA_FFNotify::OnChildRemoved(CXFA_Node *pSender, void* pParam, void* pParam2) { if (CXFA_FFDocView* pDocView = m_pDoc->GetDocView()) { FX_BOOL bLayoutReady = !(pDocView->m_bInLayoutStatus) && (pDocView->GetLayoutStatus() >= XFA_DOCVIEW_LAYOUTSTATUS_End); @@ -541,7 +541,7 @@ void CXFA_FFNotify::OnChildRemoved(CXFA_Node *pSender, FX_LPVOID pParam, FX_LPVO } } } -void CXFA_FFNotify::OnLayoutItemAdd(CXFA_FFDocView* pDocView, IXFA_DocLayout *pLayout, CXFA_LayoutItem *pSender, FX_LPVOID pParam, FX_LPVOID pParam2) +void CXFA_FFNotify::OnLayoutItemAdd(CXFA_FFDocView* pDocView, IXFA_DocLayout *pLayout, CXFA_LayoutItem *pSender, void* pParam, void* pParam2) { CXFA_FFWidget* pWidget = (CXFA_FFWidget*)(CXFA_ContentLayoutItemImpl*)pSender; int32_t iPageIdx = (int32_t)(uintptr_t)pParam; @@ -573,7 +573,7 @@ void CXFA_FFNotify::OnLayoutItemAdd(CXFA_FFDocView* pDocView, IXFA_DocLayout *pL pWidget->SetPageView(pNewPageView); } } -void CXFA_FFNotify::OnLayoutItemRemoving(CXFA_FFDocView* pDocView, IXFA_DocLayout *pLayout, CXFA_LayoutItem *pSender, FX_LPVOID pParam, FX_LPVOID pParam2) +void CXFA_FFNotify::OnLayoutItemRemoving(CXFA_FFDocView* pDocView, IXFA_DocLayout *pLayout, CXFA_LayoutItem *pSender, void* pParam, void* pParam2) { CXFA_FFWidget* pWidget = (CXFA_FFWidget*)pSender; pDocView->DeleteLayoutItem(pWidget); @@ -583,10 +583,10 @@ void CXFA_FFNotify::OnLayoutItemRemoving(CXFA_FFDocView* pDocView, IXFA_DocLayou m_pDoc->GetDocProvider()->WidgetEvent(pWidget, pWidget->GetDataAcc(), XFA_WIDGETEVENT_PreRemoved, NULL, NULL); pWidget->AddInvalidateRect(NULL); } -void CXFA_FFNotify::OnLayoutItemRectChanged(CXFA_FFDocView* pDocView, IXFA_DocLayout *pLayout, CXFA_LayoutItem *pSender, FX_LPVOID pParam, FX_LPVOID pParam2) +void CXFA_FFNotify::OnLayoutItemRectChanged(CXFA_FFDocView* pDocView, IXFA_DocLayout *pLayout, CXFA_LayoutItem *pSender, void* pParam, void* pParam2) { } -void CXFA_FFNotify::OnLayoutItemStatustChanged(CXFA_FFDocView* pDocView, IXFA_DocLayout *pLayout, CXFA_LayoutItem *pSender, FX_LPVOID pParam, FX_LPVOID pParam2) +void CXFA_FFNotify::OnLayoutItemStatustChanged(CXFA_FFDocView* pDocView, IXFA_DocLayout *pLayout, CXFA_LayoutItem *pSender, void* pParam, void* pParam2) { CXFA_FFWidget* pWidget = (CXFA_FFWidget*)(CXFA_ContentLayoutItemImpl*)pSender; if (!pWidget) { diff --git a/xfa/src/fxfa/src/app/xfa_ffnotify.h b/xfa/src/fxfa/src/app/xfa_ffnotify.h index d289a1074a..7dd594d1b5 100644 --- a/xfa/src/fxfa/src/app/xfa_ffnotify.h +++ b/xfa/src/fxfa/src/app/xfa_ffnotify.h @@ -12,12 +12,12 @@ public: CXFA_FFNotify(CXFA_FFDoc* pDoc); ~CXFA_FFNotify(); - virtual void OnPageEvent(IXFA_LayoutPage *pSender, XFA_PAGEEVENT eEvent, FX_LPVOID pParam = NULL); + virtual void OnPageEvent(IXFA_LayoutPage *pSender, XFA_PAGEEVENT eEvent, void* pParam = NULL); - virtual void OnNodeEvent(CXFA_Node *pSender, XFA_NODEEVENT eEvent, FX_LPVOID pParam = NULL, FX_LPVOID pParam2 = NULL, FX_LPVOID pParam3 = NULL, FX_LPVOID pParam4 = NULL); - virtual void OnWidgetDataEvent(CXFA_WidgetData* pSender, FX_DWORD dwEvent, FX_LPVOID pParam = NULL, FX_LPVOID pAdditional = NULL, FX_LPVOID pAdditional2 = NULL); + virtual void OnNodeEvent(CXFA_Node *pSender, XFA_NODEEVENT eEvent, void* pParam = NULL, void* pParam2 = NULL, void* pParam3 = NULL, void* pParam4 = NULL); + virtual void OnWidgetDataEvent(CXFA_WidgetData* pSender, FX_DWORD dwEvent, void* pParam = NULL, void* pAdditional = NULL, void* pAdditional2 = NULL); virtual CXFA_LayoutItem* OnCreateLayoutItem(CXFA_Node *pNode); - virtual void OnLayoutEvent(IXFA_DocLayout *pLayout, CXFA_LayoutItem *pSender, XFA_LAYOUTEVENT eEvent, FX_LPVOID pParam = NULL, FX_LPVOID pParam2 = NULL); + virtual void OnLayoutEvent(IXFA_DocLayout *pLayout, CXFA_LayoutItem *pSender, XFA_LAYOUTEVENT eEvent, void* pParam = NULL, void* pParam2 = NULL); virtual void StartFieldDrawLayout(CXFA_Node *pItem, FX_FLOAT &fCalcWidth, FX_FLOAT &fCalcHeight); virtual FX_BOOL FindSplitPos(CXFA_Node *pItem, int32_t iBlockIndex, FX_FLOAT &fCalcHeightPos); @@ -39,14 +39,14 @@ public: virtual void SetFocusWidgetNode(CXFA_Node* pNode); protected: void OnNodeReady(CXFA_Node *pNode); - void OnValueChanging(CXFA_Node *pSender, FX_LPVOID pParam, FX_LPVOID pParam2); - void OnValueChanged(CXFA_Node *pSender, FX_LPVOID pParam, FX_LPVOID pParam2, FX_LPVOID pParam3, FX_LPVOID pParam4); - void OnChildAdded(CXFA_Node *pSender, FX_LPVOID pParam, FX_LPVOID pParam2); - void OnChildRemoved(CXFA_Node *pSender, FX_LPVOID pParam, FX_LPVOID pParam2); - void OnLayoutItemAdd(CXFA_FFDocView* pDocView, IXFA_DocLayout *pLayout, CXFA_LayoutItem *pSender, FX_LPVOID pParam, FX_LPVOID pParam2); - void OnLayoutItemRemoving(CXFA_FFDocView* pDocView, IXFA_DocLayout *pLayout, CXFA_LayoutItem *pSender, FX_LPVOID pParam, FX_LPVOID pParam2); - void OnLayoutItemRectChanged(CXFA_FFDocView* pDocView, IXFA_DocLayout *pLayout, CXFA_LayoutItem *pSender, FX_LPVOID pParam, FX_LPVOID pParam2); - void OnLayoutItemStatustChanged(CXFA_FFDocView* pDocView, IXFA_DocLayout *pLayout, CXFA_LayoutItem *pSender, FX_LPVOID pParam, FX_LPVOID pParam2); + void OnValueChanging(CXFA_Node *pSender, void* pParam, void* pParam2); + void OnValueChanged(CXFA_Node *pSender, void* pParam, void* pParam2, void* pParam3, void* pParam4); + void OnChildAdded(CXFA_Node *pSender, void* pParam, void* pParam2); + void OnChildRemoved(CXFA_Node *pSender, void* pParam, void* pParam2); + void OnLayoutItemAdd(CXFA_FFDocView* pDocView, IXFA_DocLayout *pLayout, CXFA_LayoutItem *pSender, void* pParam, void* pParam2); + void OnLayoutItemRemoving(CXFA_FFDocView* pDocView, IXFA_DocLayout *pLayout, CXFA_LayoutItem *pSender, void* pParam, void* pParam2); + void OnLayoutItemRectChanged(CXFA_FFDocView* pDocView, IXFA_DocLayout *pLayout, CXFA_LayoutItem *pSender, void* pParam, void* pParam2); + void OnLayoutItemStatustChanged(CXFA_FFDocView* pDocView, IXFA_DocLayout *pLayout, CXFA_LayoutItem *pSender, void* pParam, void* pParam2); CXFA_FFDoc* m_pDoc; }; #endif diff --git a/xfa/src/fxfa/src/app/xfa_ffpageview.cpp b/xfa/src/fxfa/src/app/xfa_ffpageview.cpp index 11384b141e..ccc5d07d1a 100644 --- a/xfa/src/fxfa/src/app/xfa_ffpageview.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffpageview.cpp @@ -383,7 +383,7 @@ void CXFA_FFTabOrderPageWidgetIterator::OrderContainer(CXFA_LayoutItemIterator* } int32_t iChildren = tabParams.GetSize(); if (iChildren > 1) { - FXSYS_qsort(tabParams.GetData(), iChildren, sizeof(FX_LPVOID), XFA_TabOrderWidgetComparator); + FXSYS_qsort(tabParams.GetData(), iChildren, sizeof(void*), XFA_TabOrderWidgetComparator); } for (int32_t iStart = 0; iStart < iChildren; iStart++) { CXFA_TabParam* pParam = (CXFA_TabParam*)tabParams[iStart]; diff --git a/xfa/src/fxfa/src/app/xfa_fftext.cpp b/xfa/src/fxfa/src/app/xfa_fftext.cpp index 2d153c2968..b6cb5b79d3 100644 --- a/xfa/src/fxfa/src/app/xfa_fftext.cpp +++ b/xfa/src/fxfa/src/app/xfa_fftext.cpp @@ -110,7 +110,7 @@ FX_BOOL CXFA_FFText::OnLButtonDown(FX_DWORD dwFlags, FX_FLOAT fx, FX_FLOAT fy) if (!rtBox.Contains(fx, fy)) { return FALSE; } - FX_LPCWSTR wsURLContent = GetLinkURLAtPoint(fx, fy); + const FX_WCHAR* wsURLContent = GetLinkURLAtPoint(fx, fy); if (NULL == wsURLContent) { return FALSE; } @@ -124,7 +124,7 @@ FX_BOOL CXFA_FFText::OnMouseMove(FX_DWORD dwFlags, FX_FLOAT fx, FX_FLOAT fy) if (!rtBox.Contains(fx, fy)) { return FALSE; } - FX_LPCWSTR wsURLContent = GetLinkURLAtPoint(fx, fy); + const FX_WCHAR* wsURLContent = GetLinkURLAtPoint(fx, fy); if (NULL == wsURLContent) { return FALSE; } @@ -136,7 +136,7 @@ FX_BOOL CXFA_FFText::OnLButtonUp(FX_DWORD dwFlags, FX_FLOAT fx, FX_FLOAT fy) return FALSE; } SetButtonDown(FALSE); - FX_LPCWSTR wsURLContent = GetLinkURLAtPoint(fx, fy); + const FX_WCHAR* wsURLContent = GetLinkURLAtPoint(fx, fy); if (NULL == wsURLContent) { return FALSE; } @@ -151,13 +151,13 @@ FX_DWORD CXFA_FFText::OnHitTest(FX_FLOAT fx, FX_FLOAT fy) if (!rtBox.Contains(fx, fy)) { return FWL_WGTHITTEST_Unknown; } - FX_LPCWSTR wsURLContent = GetLinkURLAtPoint(fx, fy); + const FX_WCHAR* wsURLContent = GetLinkURLAtPoint(fx, fy); if (NULL == wsURLContent) { return FWL_WGTHITTEST_Unknown; } return FWL_WGTHITTEST_Transparent; } -FX_LPCWSTR CXFA_FFText::GetLinkURLAtPoint(FX_FLOAT fx, FX_FLOAT fy) +const FX_WCHAR* CXFA_FFText::GetLinkURLAtPoint(FX_FLOAT fx, FX_FLOAT fy) { CXFA_TextLayout* pTextLayout = m_pDataAcc->GetTextLayout(); if ( NULL == pTextLayout) { diff --git a/xfa/src/fxfa/src/app/xfa_fftext.h b/xfa/src/fxfa/src/app/xfa_fftext.h index 0210b55610..c74998a94e 100644 --- a/xfa/src/fxfa/src/app/xfa_fftext.h +++ b/xfa/src/fxfa/src/app/xfa_fftext.h @@ -20,7 +20,7 @@ public: virtual FX_BOOL IsLoaded(); virtual FX_BOOL LayoutWidget(); private: - virtual FX_LPCWSTR GetLinkURLAtPoint(FX_FLOAT fx, FX_FLOAT fy); + virtual const FX_WCHAR* GetLinkURLAtPoint(FX_FLOAT fx, FX_FLOAT fy); void FWLToClient(FX_FLOAT &fx, FX_FLOAT &fy); }; #endif diff --git a/xfa/src/fxfa/src/app/xfa_fftextedit.cpp b/xfa/src/fxfa/src/app/xfa_fftextedit.cpp index afdfd1fee8..d04a561b4c 100644 --- a/xfa/src/fxfa/src/app/xfa_fftextedit.cpp +++ b/xfa/src/fxfa/src/app/xfa_fftextedit.cpp @@ -195,7 +195,7 @@ void CXFA_FFTextEdit::ValidateNumberField(const CFX_WideString& wsText) pAppProvider->LoadString(XFA_IDS_ValidateNumberError, wsError); CFX_WideString wsSomField; pAcc->GetNode()->GetSOMExpression(wsSomField); - wsMessage.Format(wsError, (FX_LPCWSTR)wsText, (FX_LPCWSTR)wsSomField); + wsMessage.Format(wsError, (const FX_WCHAR*)wsText, (const FX_WCHAR*)wsSomField); pAppProvider->MsgBox(wsMessage, wsTitle, XFA_MBICON_Error, XFA_MB_OK); } } diff --git a/xfa/src/fxfa/src/app/xfa_ffwidget.cpp b/xfa/src/fxfa/src/app/xfa_ffwidget.cpp index f747bdd2f9..be1418169f 100644 --- a/xfa/src/fxfa/src/app/xfa_ffwidget.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffwidget.cpp @@ -514,7 +514,7 @@ protected: FX_ARGB m_FillArgb; FX_DWORD m_Flags; CFX_ImageTransformer* m_pTransformer; - FX_LPVOID m_DeviceHandle; + void* m_DeviceHandle; int32_t m_BlendType; FX_BOOL m_Result; FX_BOOL m_bPrint; @@ -835,14 +835,14 @@ const static uint8_t g_inv_base64[128] = { 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 255, 255, 255, 255, 255, }; -static FX_LPBYTE XFA_RemoveBase64Whitespace(FX_LPCBYTE pStr, int32_t iLen) +static uint8_t* XFA_RemoveBase64Whitespace(const uint8_t* pStr, int32_t iLen) { - FX_LPBYTE pCP; + uint8_t* pCP; int32_t i = 0, j = 0; if (iLen == 0) { iLen = FXSYS_strlen((FX_CHAR*)pStr); } - pCP = (FX_LPBYTE)FDE_Alloc(iLen + 1); + pCP = (uint8_t*)FDE_Alloc(iLen + 1); for (; i < iLen; i++) { if ((pStr[i] & 128) == 0) { if (g_inv_base64[pStr[i]] != 0xFF || pStr[i] == '=') { @@ -853,12 +853,12 @@ static FX_LPBYTE XFA_RemoveBase64Whitespace(FX_LPCBYTE pStr, int32_t iLen) pCP[j] = '\0'; return pCP; } -static int32_t XFA_Base64Decode(FX_LPCSTR pStr, FX_LPBYTE pOutBuffer) +static int32_t XFA_Base64Decode(const FX_CHAR* pStr, uint8_t* pOutBuffer) { if (pStr == NULL) { return 0; } - FX_LPBYTE pBuffer = XFA_RemoveBase64Whitespace((FX_LPBYTE)pStr, FXSYS_strlen((FX_CHAR*)pStr)); + uint8_t* pBuffer = XFA_RemoveBase64Whitespace((uint8_t*)pStr, FXSYS_strlen((FX_CHAR*)pStr)); if (pBuffer == NULL) { return 0; } @@ -899,12 +899,12 @@ static int32_t XFA_Base64Decode(FX_LPCSTR pStr, FX_LPBYTE pOutBuffer) return j; } static FX_CHAR g_base64_chars[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; -FX_LPSTR XFA_Base64Encode(FX_LPCBYTE buf, int32_t buf_len) +FX_CHAR* XFA_Base64Encode(const uint8_t* buf, int32_t buf_len) { - FX_LPSTR out = NULL; + FX_CHAR* out = NULL; int i, j; FX_DWORD limb; - out = (FX_LPSTR)FX_Alloc(FX_CHAR, ((buf_len * 8 + 5) / 6) + 5); + out = (FX_CHAR*)FX_Alloc(FX_CHAR, ((buf_len * 8 + 5) / 6) + 5); for (i = 0, j = 0, limb = 0; i + 2 < buf_len; i += 3, j += 4) { limb = ((FX_DWORD)buf[i] << 16) | @@ -972,7 +972,7 @@ CFX_DIBitmap* XFA_LoadImageData(CXFA_FFDoc *pDoc, CXFA_Image *pImage, FX_BOOL &b pImage->GetContentType(wsContentType); FXCODEC_IMAGE_TYPE type = XFA_GetImageType(wsContentType); CFX_ByteString bsContent; - FX_LPBYTE pImageBuffer = NULL; + uint8_t* pImageBuffer = NULL; IFX_FileRead* pImageFileRead = NULL; if (wsImage.GetLength() > 0) { XFA_ATTRIBUTEENUM iEncoding = (XFA_ATTRIBUTEENUM)pImage->GetTransferEncoding(); @@ -980,13 +980,13 @@ CFX_DIBitmap* XFA_LoadImageData(CXFA_FFDoc *pDoc, CXFA_Image *pImage, FX_BOOL &b CFX_ByteString bsData = wsImage.UTF8Encode(); int32_t iLength = bsData.GetLength(); pImageBuffer = FDE_Alloc(iLength); - int32_t iRead = XFA_Base64Decode((FX_LPCSTR)bsData, pImageBuffer); + int32_t iRead = XFA_Base64Decode((const FX_CHAR*)bsData, pImageBuffer); if (iRead > 0) { pImageFileRead = FX_CreateMemoryStream(pImageBuffer, iRead); } } else { bsContent = CFX_ByteString::FromUnicode(wsImage); - pImageFileRead = FX_CreateMemoryStream((FX_LPBYTE)(FX_LPCBYTE)bsContent, bsContent.GetLength()); + pImageFileRead = FX_CreateMemoryStream((uint8_t*)(const uint8_t*)bsContent, bsContent.GetLength()); } } else { CFX_WideString wsURL = wsHref; diff --git a/xfa/src/fxfa/src/app/xfa_ffwidget.h b/xfa/src/fxfa/src/app/xfa_ffwidget.h index 80f4be4d30..b1d33bb94b 100644 --- a/xfa/src/fxfa/src/app/xfa_ffwidget.h +++ b/xfa/src/fxfa/src/app/xfa_ffwidget.h @@ -194,7 +194,7 @@ void XFA_DrawImage(CFX_Graphics* pGS, const CFX_RectF &rtImage, CFX_Matrix* pM CFX_DIBitmap* XFA_LoadImageData(CXFA_FFDoc *pDoc, CXFA_Image *pImage, FX_BOOL &bNameImage, int32_t &iImageXDpi, int32_t &iImageYDpi); CFX_DIBitmap* XFA_LoadImageFromBuffer(IFX_FileRead* pImageFileRead, FXCODEC_IMAGE_TYPE type, int32_t &iImageXDpi, int32_t &iImageYDpi); FXCODEC_IMAGE_TYPE XFA_GetImageType(FX_WSTR wsType); -FX_LPSTR XFA_Base64Encode(FX_LPCBYTE buf, int32_t buf_len); +FX_CHAR* XFA_Base64Encode(const uint8_t* buf, int32_t buf_len); void XFA_RectWidthoutMargin(CFX_RectF &rt, const CXFA_Margin &mg, FX_BOOL bUI = FALSE); FX_FLOAT XFA_GetEdgeThickness(const CXFA_StrokeArray &strokes, FX_BOOL b3DStyle, int32_t nIndex); CXFA_FFWidget* XFA_GetWidgetFromLayoutItem(CXFA_LayoutItem* pLayoutItem); diff --git a/xfa/src/fxfa/src/app/xfa_ffwidgetacc.cpp b/xfa/src/fxfa/src/app/xfa_ffwidgetacc.cpp index 3f105d98d6..e12a50e8e5 100644 --- a/xfa/src/fxfa/src/app/xfa_ffwidgetacc.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffwidgetacc.cpp @@ -18,7 +18,7 @@ #include "xfa_ffcheckbutton.h" #include "xfa_ffwidgetacc.h" #include "xfa_fontmgr.h" -static void XFA_FFDeleteCalcData(FX_LPVOID pData) +static void XFA_FFDeleteCalcData(void* pData) { if (pData) { delete ((CXFA_CalcData*)pData); @@ -546,7 +546,7 @@ int32_t CXFA_WidgetAcc::ProcessNullTestValidate(CXFA_Validate validate, int32_t GetValidateCaptionName(wsCaptionName, bVersionFlag); CFX_WideString wsError; pAppProvider->LoadString(XFA_IDS_ValidateNullError, wsError); - wsNullMsg.Format(wsError, (FX_LPCWSTR)wsCaptionName); + wsNullMsg.Format(wsError, (const FX_WCHAR*)wsCaptionName); } pAppProvider->MsgBox(wsNullMsg, wsTitle, XFA_MBICON_Status, XFA_MB_OK); return XFA_EVENTERROR_Error; @@ -559,7 +559,7 @@ int32_t CXFA_WidgetAcc::ProcessNullTestValidate(CXFA_Validate validate, int32_t GetValidateCaptionName(wsCaptionName, bVersionFlag); CFX_WideString wsWarning; pAppProvider->LoadString(XFA_IDS_ValidateNullWarning, wsWarning); - wsNullMsg.Format(wsWarning, (FX_LPCWSTR)wsCaptionName, (FX_LPCWSTR)wsCaptionName); + wsNullMsg.Format(wsWarning, (const FX_WCHAR*)wsCaptionName, (const FX_WCHAR*)wsCaptionName); } if (pAppProvider->MsgBox(wsNullMsg, wsTitle, XFA_MBICON_Warning, XFA_MB_YesNo) == XFA_IDYes) { this->GetNode()->SetFlag(XFA_NODEFLAG_UserInteractive, TRUE, FALSE); @@ -597,17 +597,17 @@ void CXFA_WidgetAcc::GetValidateMessage(IXFA_AppProvider* pAppProvider, CFX_Wide CFX_WideString wsError; if (bVersionFlag) { pAppProvider->LoadString(XFA_IDS_ValidateFailed, wsError); - wsMessage.Format(wsError, (FX_LPCWSTR)wsCaptionName); + wsMessage.Format(wsError, (const FX_WCHAR*)wsCaptionName); return; } if (bError) { pAppProvider->LoadString(XFA_IDS_ValidateError, wsError); - wsMessage.Format(wsError, (FX_LPCWSTR)wsCaptionName); + wsMessage.Format(wsError, (const FX_WCHAR*)wsCaptionName); return; } CFX_WideString wsWarning; pAppProvider->LoadString(XFA_IDS_ValidateWarning, wsWarning); - wsMessage.Format(wsWarning, (FX_LPCWSTR)wsCaptionName, (FX_LPCWSTR)wsCaptionName); + wsMessage.Format(wsWarning, (const FX_WCHAR*)wsCaptionName, (const FX_WCHAR*)wsCaptionName); } int32_t CXFA_WidgetAcc::ProcessValidate(int32_t iFlags) { @@ -748,7 +748,7 @@ void CXFA_WidgetAcc::UpdateUIDisplay(CXFA_FFWidget* pExcept ) pWidget->AddInvalidateRect(); } } -void CXFA_WidgetAcc::NotifyEvent(FX_DWORD dwEvent, CXFA_FFWidget* pWidget , FX_LPVOID pParam , FX_LPVOID pAdditional ) +void CXFA_WidgetAcc::NotifyEvent(FX_DWORD dwEvent, CXFA_FFWidget* pWidget , void* pParam , void* pAdditional ) { IXFA_DocProvider* pDocProvider = GetDoc()->GetDocProvider(); if (pWidget) { diff --git a/xfa/src/fxfa/src/app/xfa_ffwidgethandler.cpp b/xfa/src/fxfa/src/app/xfa_ffwidgethandler.cpp index d43c5a6312..cdaaeccd6e 100644 --- a/xfa/src/fxfa/src/app/xfa_ffwidgethandler.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffwidgethandler.cpp @@ -48,11 +48,11 @@ FX_BOOL CXFA_FFWidgetHandler::GetToolTip(IXFA_Widget* hWidget, CFX_WideString &w { return static_cast(hWidget)->GetToolTip(wsToolTip); } -void CXFA_FFWidgetHandler::SetPrivateData(IXFA_Widget* hWidget, FX_LPVOID module_id, FX_LPVOID pData, PD_CALLBACK_FREEDATA callback) +void CXFA_FFWidgetHandler::SetPrivateData(IXFA_Widget* hWidget, void* module_id, void* pData, PD_CALLBACK_FREEDATA callback) { static_cast(hWidget)->SetPrivateData(module_id, pData, callback); } -FX_LPVOID CXFA_FFWidgetHandler::GetPrivateData(IXFA_Widget* hWidget, FX_LPVOID module_id) +void* CXFA_FFWidgetHandler::GetPrivateData(IXFA_Widget* hWidget, void* module_id) { return static_cast(hWidget)->GetPrivateData(module_id); } diff --git a/xfa/src/fxfa/src/app/xfa_ffwidgethandler.h b/xfa/src/fxfa/src/app/xfa_ffwidgethandler.h index 7c47b8d1a1..bc4afce02d 100644 --- a/xfa/src/fxfa/src/app/xfa_ffwidgethandler.h +++ b/xfa/src/fxfa/src/app/xfa_ffwidgethandler.h @@ -20,8 +20,8 @@ public: virtual CXFA_WidgetAcc* GetDataAcc(IXFA_Widget* hWidget); virtual void GetName(IXFA_Widget* hWidget, CFX_WideString &wsName, int32_t iNameType = 0); virtual FX_BOOL GetToolTip(IXFA_Widget* hWidget, CFX_WideString &wsToolTip); - virtual void SetPrivateData(IXFA_Widget* hWidget, FX_LPVOID module_id, FX_LPVOID pData, PD_CALLBACK_FREEDATA callback); - virtual FX_LPVOID GetPrivateData(IXFA_Widget* hWidget, FX_LPVOID module_id); + virtual void SetPrivateData(IXFA_Widget* hWidget, void* module_id, void* pData, PD_CALLBACK_FREEDATA callback); + virtual void* GetPrivateData(IXFA_Widget* hWidget, void* module_id); virtual FX_BOOL OnMouseEnter(IXFA_Widget* hWidget); virtual FX_BOOL OnMouseExit(IXFA_Widget* hWidget); virtual FX_BOOL OnLButtonDown(IXFA_Widget* hWidget, FX_DWORD dwFlags, FX_FLOAT fx, FX_FLOAT fy); diff --git a/xfa/src/fxfa/src/app/xfa_fontmgr.cpp b/xfa/src/fxfa/src/app/xfa_fontmgr.cpp index 127278fb46..db1742b788 100644 --- a/xfa/src/fxfa/src/app/xfa_fontmgr.cpp +++ b/xfa/src/fxfa/src/app/xfa_fontmgr.cpp @@ -1035,11 +1035,11 @@ IFX_Font* CXFA_DefFontMgr::GetFont(IXFA_Doc* hDoc, FX_WSTR wsFontFamily, FX_DWOR #ifdef _FXFA_USEGASFONTMGR_ const XFA_FONTINFO *pCurFont = NULL; FX_BOOL bGetFontInfo = TRUE; - IFX_Font* pFont = pFDEFontMgr->LoadFont((FX_LPCWSTR)wsFontName, dwFontStyles, wCodePage); + IFX_Font* pFont = pFDEFontMgr->LoadFont((const FX_WCHAR*)wsFontName, dwFontStyles, wCodePage); #else const XFA_FONTINFO *pCurFont = XFA_GetFontINFOByFontName(wsFontName); FX_BOOL bGetFontInfo = FALSE; - IFX_Font* pFont = IFX_Font::LoadFont((FX_LPCWSTR)wsFontName, dwFontStyles | FX_FONTSTYLE_ExactMatch, pCurFont ? pCurFont->wCodePage : wCodePage, pFDEFontMgr); + IFX_Font* pFont = IFX_Font::LoadFont((const FX_WCHAR*)wsFontName, dwFontStyles | FX_FONTSTYLE_ExactMatch, pCurFont ? pCurFont->wCodePage : wCodePage, pFDEFontMgr); #endif if (!pFont && hDoc) { if (bGetFontInfo) { @@ -1053,10 +1053,10 @@ IFX_Font* CXFA_DefFontMgr::GetFont(IXFA_Doc* hDoc, FX_WSTR wsFontFamily, FX_DWOR if (dwFontStyles & FX_FONTSTYLE_Italic) { dwStyle |= FX_FONTSTYLE_Italic; } - FX_LPCWSTR pReplace = pCurFont->pReplaceFont; + const FX_WCHAR* pReplace = pCurFont->pReplaceFont; int32_t iLength = FXSYS_wcslen(pReplace); while (iLength > 0) { - FX_LPCWSTR pNameText = pReplace; + const FX_WCHAR* pNameText = pReplace; while (*pNameText != L',' && iLength > 0) { pNameText++; iLength--; @@ -1065,7 +1065,7 @@ IFX_Font* CXFA_DefFontMgr::GetFont(IXFA_Doc* hDoc, FX_WSTR wsFontFamily, FX_DWOR #ifdef _FXFA_USEGASFONTMGR_ pFont = pFDEFontMgr->LoadFont(wsReplace, dwStyle, wCodePage); #else - pFont = IFX_Font::LoadFont((FX_LPCWSTR)wsReplace, dwStyle | FX_FONTSTYLE_ExactMatch, pCurFont->wCodePage, pFDEFontMgr); + pFont = IFX_Font::LoadFont((const FX_WCHAR*)wsReplace, dwStyle | FX_FONTSTYLE_ExactMatch, pCurFont->wCodePage, pFDEFontMgr); #endif if (pFont != NULL) { break; @@ -1092,9 +1092,9 @@ IFX_Font* CXFA_DefFontMgr::GetDefaultFont(IXFA_Doc* hDoc, FX_WSTR wsFontFamily, #endif if (!pFont) #ifdef _FXFA_USEGASFONTMGR_ - pFont = pFDEFontMgr->LoadFont((FX_LPCWSTR)NULL, dwFontStyles, wCodePage); + pFont = pFDEFontMgr->LoadFont((const FX_WCHAR*)NULL, dwFontStyles, wCodePage); #else - pFont = IFX_Font::LoadFont((FX_LPCWSTR)NULL, dwFontStyles, pCurFont ? pCurFont->wCodePage : 1252, pFDEFontMgr); + pFont = IFX_Font::LoadFont((const FX_WCHAR*)NULL, dwFontStyles, pCurFont ? pCurFont->wCodePage : 1252, pFDEFontMgr); #endif FXSYS_assert(pFont != NULL); if (pFont) { @@ -1103,11 +1103,11 @@ IFX_Font* CXFA_DefFontMgr::GetDefaultFont(IXFA_Doc* hDoc, FX_WSTR wsFontFamily, return pFont; } struct XFA_PDFFONTNAME { - FX_LPCSTR lpPsName; - FX_LPCSTR lpNormal; - FX_LPCSTR lpBold; - FX_LPCSTR lpItalic; - FX_LPCSTR lpBoldItalic; + const FX_CHAR* lpPsName; + const FX_CHAR* lpNormal; + const FX_CHAR* lpBold; + const FX_CHAR* lpItalic; + const FX_CHAR* lpBoldItalic; }; const XFA_PDFFONTNAME g_XFAPDFFontName[] = { {"Adobe PI Std", "AdobePIStd", "AdobePIStd", "AdobePIStd", "AdobePIStd"}, diff --git a/xfa/src/fxfa/src/app/xfa_fontmgr.h b/xfa/src/fxfa/src/app/xfa_fontmgr.h index f612664644..3a41cea913 100644 --- a/xfa/src/fxfa/src/app/xfa_fontmgr.h +++ b/xfa/src/fxfa/src/app/xfa_fontmgr.h @@ -8,8 +8,8 @@ #define _FXFA_FORMFILLER_FONTMGR_IMP_H struct XFA_FONTINFO { FX_DWORD dwFontNameHash; - FX_LPCWSTR pPsName; - FX_LPCWSTR pReplaceFont; + const FX_WCHAR* pPsName; + const FX_WCHAR* pReplaceFont; FX_WORD dwStyles; FX_WORD wCodePage; }; diff --git a/xfa/src/fxfa/src/app/xfa_fwltheme.cpp b/xfa/src/fxfa/src/app/xfa_fwltheme.cpp index ca9bf5e890..e080757f3b 100644 --- a/xfa/src/fxfa/src/app/xfa_fwltheme.cpp +++ b/xfa/src/fxfa/src/app/xfa_fwltheme.cpp @@ -57,7 +57,7 @@ CXFA_FWLTheme::~CXFA_FWLTheme() delete m_pCaretTP; delete m_pBarcodeTP; } -static FX_LPCWSTR g_FWLTheme_CalFonts[] = { +static const FX_WCHAR* g_FWLTheme_CalFonts[] = { L"Arial", L"Courier New", L"DejaVu Sans", @@ -65,7 +65,7 @@ static FX_LPCWSTR g_FWLTheme_CalFonts[] = { FWL_ERR CXFA_FWLTheme::Initialize() { m_pTextOut = IFDE_TextOut::Create(); - for (int32_t i = 0; NULL == m_pCalendarFont && i < sizeof(g_FWLTheme_CalFonts) / sizeof(FX_LPCWSTR); i++) { + for (int32_t i = 0; NULL == m_pCalendarFont && i < sizeof(g_FWLTheme_CalFonts) / sizeof(const FX_WCHAR*); i++) { m_pCalendarFont = IFX_Font::LoadFont(g_FWLTheme_CalFonts[i], 0, 0, m_pApp->GetFDEFontMgr()); } if (NULL == m_pCalendarFont) @@ -169,7 +169,7 @@ FX_BOOL CXFA_FWLTheme::DrawText(CFWL_ThemeText *pParams) m_pTextOut->DrawLogicText(pParams->m_wsText, pParams->m_wsText.GetLength(), pParams->m_rtPart); return TRUE; } -FX_LPVOID CXFA_FWLTheme::GetCapacity(CFWL_ThemePart *pThemePart, FX_DWORD dwCapacity) +void* CXFA_FWLTheme::GetCapacity(CFWL_ThemePart *pThemePart, FX_DWORD dwCapacity) { switch(dwCapacity) { case FWL_WGTCAPACITY_Font: { diff --git a/xfa/src/fxfa/src/app/xfa_fwltheme.h b/xfa/src/fxfa/src/app/xfa_fwltheme.h index 37b8d1336a..5ce70aa2e4 100644 --- a/xfa/src/fxfa/src/app/xfa_fwltheme.h +++ b/xfa/src/fxfa/src/app/xfa_fwltheme.h @@ -35,7 +35,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 FX_BOOL IsCustomizedLayout(IFWL_Widget *pWidget); virtual FWL_ERR GetPartRect(CFWL_ThemePart* pThemePart); virtual FX_BOOL IsInPart(CFWL_ThemePart* pThemePart, FX_FLOAT fx, FX_FLOAT fy); diff --git a/xfa/src/fxfa/src/app/xfa_textlayout.cpp b/xfa/src/fxfa/src/app/xfa_textlayout.cpp index 3043b772b8..75b6d3c2ca 100644 --- a/xfa/src/fxfa/src/app/xfa_textlayout.cpp +++ b/xfa/src/fxfa/src/app/xfa_textlayout.cpp @@ -118,11 +118,12 @@ void CXFA_TextParser::InitCSSData(IXFA_TextProvider *pTextProvider) } IFDE_CSSStyleSheet* CXFA_TextParser::LoadDefaultSheetStyle() { - static const FX_LPCWSTR s_pStyle = L"html,body,ol,p,ul{display:block}" - L"li{display:list-item}" - L"ol,ul{padding-left:33px}ol{list-style-type:decimal}ol,ul{margin-top:0;margin-bottom:0}ul,ol{margin:1.12em 0}" - L"a{color:#0000ff;text-decoration:underline}b{font-weight:bolder}i{font-style:italic}" - L"sup{vertical-align:+15em;font-size:.66em}sub{vertical-align:-15em;font-size:.66em}"; + static const FX_WCHAR s_pStyle[] = + L"html,body,ol,p,ul{display:block}" + L"li{display:list-item}" + L"ol,ul{padding-left:33px}ol{list-style-type:decimal}ol,ul{margin-top:0;margin-bottom:0}ul,ol{margin:1.12em 0}" + L"a{color:#0000ff;text-decoration:underline}b{font-weight:bolder}i{font-style:italic}" + L"sup{vertical-align:+15em;font-size:.66em}sub{vertical-align:-15em;font-size:.66em}"; return IFDE_CSSStyleSheet::LoadFromBuffer(CFX_WideString(), s_pStyle, FXSYS_wcslen(s_pStyle), FX_CODEPAGE_UTF8); } IFDE_CSSComputedStyle* CXFA_TextParser::CreateRootStyle(IXFA_TextProvider *pTextProvider) @@ -573,7 +574,7 @@ FX_BOOL CXFA_TextParser::GetTabstops(IFDE_CSSComputedStyle *pStyle, CXFA_TextTab return FALSE; } int32_t iLength = wsValue.GetLength(); - FX_LPCWSTR pTabStops = wsValue; + const FX_WCHAR* pTabStops = wsValue; int32_t iCur = 0; int32_t iLast = 0; CFX_WideString wsAlign; @@ -1408,7 +1409,7 @@ FX_BOOL CXFA_TextLayout::LoadRichText(IFDE_XMLNode *pXMLNode, const CFX_SizeF & } else if (wsName == FX_WSTRC(L"li")) { bCurLi = TRUE; if (bIsOl) { - wsText.Format(FX_LPCWSTR(L"%d. "), iLiCount); + wsText.Format(L"%d. ", iLiCount); } else { wsText = 0x00B7 + FX_WSTRC(L" "); } @@ -1571,7 +1572,7 @@ void CXFA_TextLayout::ProcessText(CFX_WideString &wsText) if (iLen == 0) { return; } - FX_LPWSTR psz = wsText.GetBuffer(iLen); + FX_WCHAR* psz = wsText.GetBuffer(iLen); int32_t iTrimLeft = 0; FX_WCHAR wch = 0, wPrev = 0; for (int32_t i = 0; i < iLen; i++) { @@ -1671,7 +1672,7 @@ void CXFA_TextLayout::AppendTextLine(FX_DWORD dwStatus, FX_FLOAT &fLinePos, FX_B } FX_FLOAT fVerScale = pPiece->m_iVerticalScale / 100.0f; XFA_LPTEXTPIECE pTP = (XFA_LPTEXTPIECE)m_pAllocator->Alloc(sizeof(XFA_TEXTPIECE)); - pTP->pszText = (FX_LPWSTR)m_pAllocator->Alloc(pPiece->m_iChars * sizeof(FX_WCHAR)); + pTP->pszText = (FX_WCHAR*)m_pAllocator->Alloc(pPiece->m_iChars * sizeof(FX_WCHAR)); pTP->pWidths = (int32_t*)m_pAllocator->Alloc(pPiece->m_iChars * sizeof(int32_t)); pTP->iChars = pPiece->m_iChars; pPiece->GetString(pTP->pszText); diff --git a/xfa/src/fxfa/src/app/xfa_textlayout.h b/xfa/src/fxfa/src/app/xfa_textlayout.h index 96d94956d6..bb8b4b528d 100644 --- a/xfa/src/fxfa/src/app/xfa_textlayout.h +++ b/xfa/src/fxfa/src/app/xfa_textlayout.h @@ -153,7 +153,7 @@ public: class CXFA_LinkUserData : public IFX_Unknown, public CFX_Target { public: - CXFA_LinkUserData(IFX_MEMAllocator *pAllocator, FX_LPWSTR pszText) + CXFA_LinkUserData(IFX_MEMAllocator *pAllocator, FX_WCHAR* pszText) : m_pAllocator(pAllocator) , m_dwRefCount(1) { @@ -173,7 +173,7 @@ public: return ++m_dwRefCount; } public: - FX_LPCWSTR GetLinkURL() + const FX_WCHAR* GetLinkURL() { return m_pszURLContent; }; @@ -236,7 +236,7 @@ protected: FX_DWORD m_dwRefCount; }; typedef struct _XFA_TEXTPIECE : public CFX_Target { - FX_LPWSTR pszText; + FX_WCHAR* pszText; int32_t iChars; int32_t *pWidths; int32_t iHorScale; diff --git a/xfa/src/fxfa/src/common/xfa_docdata.h b/xfa/src/fxfa/src/common/xfa_docdata.h index 9e9c8d1a12..7befa23d7f 100644 --- a/xfa/src/fxfa/src/common/xfa_docdata.h +++ b/xfa/src/fxfa/src/common/xfa_docdata.h @@ -15,7 +15,7 @@ public: static IXFA_PacketExport* Create(CXFA_Document *pDocument, XFA_DATAFORMAT eFormat = XFA_DATAFORMAT_XDP); virtual void Release() = 0; virtual FX_BOOL Export(IFX_FileWrite *pWrite) = 0; - virtual FX_BOOL Export(IFX_FileWrite *pWrite, CXFA_Node *pNode, FX_DWORD dwFlag = 0, FX_LPCSTR pChecksum = NULL) = 0; + virtual FX_BOOL Export(IFX_FileWrite *pWrite, CXFA_Node *pNode, FX_DWORD dwFlag = 0, const FX_CHAR* pChecksum = NULL) = 0; }; class IXFA_PacketImport { diff --git a/xfa/src/fxfa/src/common/xfa_document.h b/xfa/src/fxfa/src/common/xfa_document.h index 1a45bd4126..6ef3fd776c 100644 --- a/xfa/src/fxfa/src/common/xfa_document.h +++ b/xfa/src/fxfa/src/common/xfa_document.h @@ -64,13 +64,13 @@ enum XFA_LAYOUTRESULT { class IXFA_Notify { public: - virtual void OnPageEvent(IXFA_LayoutPage *pSender, XFA_PAGEEVENT eEvent, FX_LPVOID pParam = NULL) = 0; + virtual void OnPageEvent(IXFA_LayoutPage *pSender, XFA_PAGEEVENT eEvent, void* pParam = NULL) = 0; - virtual void OnNodeEvent(CXFA_Node *pSender, XFA_NODEEVENT eEvent, FX_LPVOID pParam = NULL, FX_LPVOID pParam2 = NULL, FX_LPVOID pParam3 = NULL, FX_LPVOID pParam4 = NULL) = 0; - virtual void OnWidgetDataEvent(CXFA_WidgetData* pSender, FX_DWORD dwEvent, FX_LPVOID pParam = NULL, FX_LPVOID pAdditional = NULL, FX_LPVOID pAdditional2 = NULL) = 0; + virtual void OnNodeEvent(CXFA_Node *pSender, XFA_NODEEVENT eEvent, void* pParam = NULL, void* pParam2 = NULL, void* pParam3 = NULL, void* pParam4 = NULL) = 0; + virtual void OnWidgetDataEvent(CXFA_WidgetData* pSender, FX_DWORD dwEvent, void* pParam = NULL, void* pAdditional = NULL, void* pAdditional2 = NULL) = 0; virtual CXFA_LayoutItem* OnCreateLayoutItem(CXFA_Node *pNode) = 0; - virtual void OnLayoutEvent(IXFA_DocLayout *pLayout, CXFA_LayoutItem *pSender, XFA_LAYOUTEVENT eEvent, FX_LPVOID pParam = NULL, FX_LPVOID pParam2 = NULL) = 0; + virtual void OnLayoutEvent(IXFA_DocLayout *pLayout, CXFA_LayoutItem *pSender, XFA_LAYOUTEVENT eEvent, void* pParam = NULL, void* pParam2 = NULL) = 0; virtual void StartFieldDrawLayout(CXFA_Node *pItem, FX_FLOAT &fCalcWidth, FX_FLOAT &fCalcHeight) = 0; virtual FX_BOOL FindSplitPos(CXFA_Node *pItem, int32_t iBlockIndex, FX_FLOAT &fCalcHeightPos) = 0; virtual FX_BOOL RunScript(CXFA_Node* pScript, CXFA_Node* pFormItem) = 0; diff --git a/xfa/src/fxfa/src/common/xfa_fm2jsapi.h b/xfa/src/fxfa/src/common/xfa_fm2jsapi.h index 10b96dd44e..511b1b7a1a 100644 --- a/xfa/src/fxfa/src/common/xfa_fm2jsapi.h +++ b/xfa/src/fxfa/src/common/xfa_fm2jsapi.h @@ -12,7 +12,7 @@ extern "C" { #endif typedef struct XFA_HFM2JSCONTEXT_ { - FX_LPVOID* pData; + void** pData; }* XFA_HFM2JSCONTEXT; int32_t XFA_FM2JS_Translate(FX_WSTR wsFormcalc, CFX_WideTextBuf& wsJavascript, CFX_WideString& wsError); XFA_HFM2JSCONTEXT XFA_FM2JS_ContextCreate(); diff --git a/xfa/src/fxfa/src/common/xfa_object.h b/xfa/src/fxfa/src/common/xfa_object.h index 7c4acd4105..4d2c764457 100644 --- a/xfa/src/fxfa/src/common/xfa_object.h +++ b/xfa/src/fxfa/src/common/xfa_object.h @@ -104,26 +104,26 @@ enum XFA_SOM_MESSAGETYPE { }; typedef CFX_StackTemplate CXFA_NodeStack; typedef CXFA_PtrSetTemplate CXFA_NodeSet; -typedef void (*PD_CALLBACK_DUPLICATEDATA)(FX_LPVOID& pData); +typedef void (*PD_CALLBACK_DUPLICATEDATA)(void*& pData); typedef struct _XFA_MAPDATABLOCKCALLBACKINFO { PD_CALLBACK_FREEDATA pFree; PD_CALLBACK_DUPLICATEDATA pCopy; } XFA_MAPDATABLOCKCALLBACKINFO; typedef struct _XFA_MAPDATABLOCK { - FX_LPBYTE GetData() const + uint8_t* GetData() const { - return (FX_LPBYTE)this + sizeof(_XFA_MAPDATABLOCK); + return (uint8_t*)this + sizeof(_XFA_MAPDATABLOCK); } XFA_MAPDATABLOCKCALLBACKINFO* pCallbackInfo; int32_t iBytes; } XFA_MAPDATABLOCK, * XFA_LPMAPDATABLOCK; typedef struct _XFA_MAPMODULEDATA { CFX_MapPtrToPtr m_ValueMap; - CFX_MapPtrTemplate m_BufferMap; + CFX_MapPtrTemplate m_BufferMap; } XFA_MAPMODULEDATA, * XFA_LPMAPMODULEDATA; -#define XFA_CalcRefCount (FX_LPVOID)(uintptr_t)FXBSTR_ID('X', 'F', 'A', 'R') -#define XFA_CalcData (FX_LPVOID)(uintptr_t)FXBSTR_ID('X', 'F', 'A', 'C') -#define XFA_LAYOUTITEMKEY (FX_LPVOID)(uintptr_t)FXBSTR_ID('L', 'Y', 'I', 'M') +#define XFA_CalcRefCount (void*)(uintptr_t)FXBSTR_ID('X', 'F', 'A', 'R') +#define XFA_CalcData (void*)(uintptr_t)FXBSTR_ID('X', 'F', 'A', 'C') +#define XFA_LAYOUTITEMKEY (void*)(uintptr_t)FXBSTR_ID('L', 'Y', 'I', 'M') class CXFA_Node : public CXFA_Object { public: @@ -176,7 +176,7 @@ public: FX_BOOL SetBoolean(XFA_ATTRIBUTE eAttr, FX_BOOL bValue, FX_BOOL bNotify = FALSE) { - return SetValue(eAttr, XFA_ATTRIBUTETYPE_Boolean, (FX_LPVOID)(uintptr_t)bValue, bNotify); + return SetValue(eAttr, XFA_ATTRIBUTETYPE_Boolean, (void*)(uintptr_t)bValue, bNotify); } FX_BOOL TryBoolean(XFA_ATTRIBUTE eAttr, FX_BOOL &bValue, FX_BOOL bUseDefault = TRUE); FX_BOOL GetBoolean(XFA_ATTRIBUTE eAttr) @@ -186,7 +186,7 @@ public: } FX_BOOL SetInteger(XFA_ATTRIBUTE eAttr, int32_t iValue, FX_BOOL bNotify = FALSE) { - return SetValue(eAttr, XFA_ATTRIBUTETYPE_Integer, (FX_LPVOID)(uintptr_t)iValue, bNotify); + return SetValue(eAttr, XFA_ATTRIBUTETYPE_Integer, (void*)(uintptr_t)iValue, bNotify); } FX_BOOL TryInteger(XFA_ATTRIBUTE eAttr, int32_t &iValue, FX_BOOL bUseDefault = TRUE); int32_t GetInteger(XFA_ATTRIBUTE eAttr) @@ -196,7 +196,7 @@ public: } FX_BOOL SetEnum(XFA_ATTRIBUTE eAttr, XFA_ATTRIBUTEENUM eValue, FX_BOOL bNotify = FALSE) { - return SetValue(eAttr, XFA_ATTRIBUTETYPE_Enum, (FX_LPVOID)(uintptr_t)eValue, bNotify); + return SetValue(eAttr, XFA_ATTRIBUTETYPE_Enum, (void*)(uintptr_t)eValue, bNotify); } FX_BOOL TryEnum(XFA_ATTRIBUTE eAttr, XFA_ATTRIBUTEENUM &eValue, FX_BOOL bUseDefault = TRUE); XFA_ATTRIBUTEENUM GetEnum(XFA_ATTRIBUTE eAttr) @@ -220,18 +220,18 @@ public: CXFA_Measurement mValue; return TryMeasure(eAttr, mValue, TRUE) ? mValue : CXFA_Measurement(); } - FX_BOOL SetObject(XFA_ATTRIBUTE eAttr, FX_LPVOID pData, XFA_MAPDATABLOCKCALLBACKINFO* pCallbackInfo = NULL); - FX_BOOL TryObject(XFA_ATTRIBUTE eAttr, FX_LPVOID &pData); - FX_LPVOID GetObject(XFA_ATTRIBUTE eAttr) + FX_BOOL SetObject(XFA_ATTRIBUTE eAttr, void* pData, XFA_MAPDATABLOCKCALLBACKINFO* pCallbackInfo = NULL); + FX_BOOL TryObject(XFA_ATTRIBUTE eAttr, void* &pData); + void* GetObject(XFA_ATTRIBUTE eAttr) { - FX_LPVOID pData; + void* pData; return TryObject(eAttr, pData) ? pData : NULL; } - FX_BOOL SetUserData(FX_LPVOID pKey, FX_LPVOID pData, XFA_MAPDATABLOCKCALLBACKINFO* pCallbackInfo = NULL); - FX_BOOL TryUserData(FX_LPVOID pKey, FX_LPVOID &pData, FX_BOOL bProtoAlso = FALSE); - FX_LPVOID GetUserData(FX_LPVOID pKey, FX_BOOL bProtoAlso = FALSE) + FX_BOOL SetUserData(void* pKey, void* pData, XFA_MAPDATABLOCKCALLBACKINFO* pCallbackInfo = NULL); + FX_BOOL TryUserData(void* pKey, void* &pData, FX_BOOL bProtoAlso = FALSE); + void* GetUserData(void* pKey, FX_BOOL bProtoAlso = FALSE) { - FX_LPVOID pData; + void* pData; return TryUserData(pKey, pData, bProtoAlso) ? pData : NULL; } CXFA_Node* GetProperty(int32_t index, XFA_ELEMENT eProperty, FX_BOOL bCreateProperty = TRUE); @@ -310,7 +310,7 @@ public: void Script_Delta_CurrentValue(FXJSE_HVALUE hValue, FX_BOOL bSetting, XFA_ATTRIBUTE eAttribute); void Script_Delta_SavedValue(FXJSE_HVALUE hValue, FX_BOOL bSetting, XFA_ATTRIBUTE eAttribute); void Script_Delta_Target(FXJSE_HVALUE hValue, FX_BOOL bSetting, XFA_ATTRIBUTE eAttribute); - void Script_Attribute_SendAttributeChangeMessage(FX_LPVOID eAttribute, FX_LPVOID eValue, FX_BOOL bScriptModify); + void Script_Attribute_SendAttributeChangeMessage(void* eAttribute, void* eValue, FX_BOOL bScriptModify); void Script_Attribute_Integer(FXJSE_HVALUE hValue, FX_BOOL bSetting, XFA_ATTRIBUTE eAttribute); void Script_Attribute_IntegerRead(FXJSE_HVALUE hValue, FX_BOOL bSetting, XFA_ATTRIBUTE eAttribute); void Script_Attribute_BOOL(FXJSE_HVALUE hValue, FX_BOOL bSetting, XFA_ATTRIBUTE eAttribute); @@ -429,26 +429,26 @@ protected: ~CXFA_Node(); friend class CXFA_Document; CXFA_Node* Deprecated_GetPrevSibling(); - FX_BOOL SetValue(XFA_ATTRIBUTE eAttr, XFA_ATTRIBUTETYPE eType, FX_LPVOID pValue, FX_BOOL bNotify); - FX_BOOL GetValue(XFA_ATTRIBUTE eAttr, XFA_ATTRIBUTETYPE eType, FX_BOOL bUseDefault, FX_LPVOID &pValue); + FX_BOOL SetValue(XFA_ATTRIBUTE eAttr, XFA_ATTRIBUTETYPE eType, void* pValue, FX_BOOL bNotify); + FX_BOOL GetValue(XFA_ATTRIBUTE eAttr, XFA_ATTRIBUTETYPE eType, FX_BOOL bUseDefault, void* &pValue); void OnRemoved(CXFA_Node *pParent, CXFA_Node *pRemoved, FX_BOOL bNotify); - void OnChanging(XFA_ATTRIBUTE eAttr, FX_LPVOID pNewValue, FX_BOOL bNotify); - void OnChanged(XFA_ATTRIBUTE eAttr, FX_LPVOID pNewValue, FX_BOOL bNotify, FX_BOOL bScriptModify = FALSE); + void OnChanging(XFA_ATTRIBUTE eAttr, void* pNewValue, FX_BOOL bNotify); + void OnChanged(XFA_ATTRIBUTE eAttr, void* pNewValue, FX_BOOL bNotify, FX_BOOL bScriptModify = FALSE); int32_t execSingleEventByName(FX_WSTR wsEventName, XFA_ELEMENT eElementType); FX_BOOL SetScriptContent(const CFX_WideString& wsContent, const CFX_WideString& wsXMLValue, FX_BOOL bNotify = TRUE, FX_BOOL bScriptModify = FALSE, FX_BOOL bSyncData = TRUE); CFX_WideString GetScriptContent(FX_BOOL bScriptModify = FALSE); XFA_LPMAPMODULEDATA GetMapModuleData(FX_BOOL bCreateNew); - void SetMapModuleValue(FX_LPVOID pKey, FX_LPVOID pValue); - FX_BOOL GetMapModuleValue(FX_LPVOID pKey, FX_LPVOID &pValue); - void SetMapModuleString(FX_LPVOID pKey, FX_WSTR wsValue); - FX_BOOL GetMapModuleString(FX_LPVOID pKey, CFX_WideStringC &wsValue); - void SetMapModuleBuffer(FX_LPVOID pKey, FX_LPVOID pValue, int32_t iBytes, XFA_MAPDATABLOCKCALLBACKINFO* pCallbackInfo = NULL); - FX_BOOL GetMapModuleBuffer(FX_LPVOID pKey, FX_LPVOID &pValue, int32_t &iBytes, FX_BOOL bProtoAlso = TRUE); - FX_BOOL HasMapModuleKey(FX_LPVOID pKey, FX_BOOL bProtoAlso = FALSE); - void RemoveMapModuleKey(FX_LPVOID pKey = NULL); - void MergeAllData(FX_LPVOID pDstModule, FX_BOOL bUseSrcAttr = TRUE); - void MoveBufferMapData(CXFA_Node* pDstModule, FX_LPVOID pKey); - void MoveBufferMapData(CXFA_Node* pSrcModule, CXFA_Node* pDstModule, FX_LPVOID pKey, FX_BOOL bRecursive = FALSE); + void SetMapModuleValue(void* pKey, void* pValue); + FX_BOOL GetMapModuleValue(void* pKey, void* &pValue); + void SetMapModuleString(void* pKey, FX_WSTR wsValue); + FX_BOOL GetMapModuleString(void* pKey, CFX_WideStringC &wsValue); + void SetMapModuleBuffer(void* pKey, void* pValue, int32_t iBytes, XFA_MAPDATABLOCKCALLBACKINFO* pCallbackInfo = NULL); + FX_BOOL GetMapModuleBuffer(void* pKey, void* &pValue, int32_t &iBytes, FX_BOOL bProtoAlso = TRUE); + FX_BOOL HasMapModuleKey(void* pKey, FX_BOOL bProtoAlso = FALSE); + void RemoveMapModuleKey(void* pKey = NULL); + void MergeAllData(void* pDstModule, FX_BOOL bUseSrcAttr = TRUE); + void MoveBufferMapData(CXFA_Node* pDstModule, void* pKey); + void MoveBufferMapData(CXFA_Node* pSrcModule, CXFA_Node* pDstModule, void* pKey, FX_BOOL bRecursive = FALSE); protected: CXFA_Node *m_pNext; CXFA_Node *m_pChild; @@ -554,15 +554,15 @@ protected: class CXFA_TraverseStrategy_XFAContainerNode { public: - static CXFA_Node* GetFirstChild(CXFA_Node* pTemplateNode, FX_LPVOID pUserData = NULL) + static CXFA_Node* GetFirstChild(CXFA_Node* pTemplateNode, void* pUserData = NULL) { return pTemplateNode->GetNodeItem(XFA_NODEITEM_FirstChild, XFA_OBJECTTYPE_ContainerNode); } - static CXFA_Node* GetNextSibling(CXFA_Node* pTemplateNode, FX_LPVOID pUserData = NULL) + static CXFA_Node* GetNextSibling(CXFA_Node* pTemplateNode, void* pUserData = NULL) { return pTemplateNode->GetNodeItem(XFA_NODEITEM_NextSibling, XFA_OBJECTTYPE_ContainerNode); } - static CXFA_Node* GetParent(CXFA_Node* pTemplateNode, FX_LPVOID pUserData = NULL) + static CXFA_Node* GetParent(CXFA_Node* pTemplateNode, void* pUserData = NULL) { return pTemplateNode->GetNodeItem(XFA_NODEITEM_Parent, XFA_OBJECTTYPE_ContainerNode); } diff --git a/xfa/src/fxfa/src/common/xfa_script.h b/xfa/src/fxfa/src/common/xfa_script.h index 5be9077083..d4c867aa31 100644 --- a/xfa/src/fxfa/src/common/xfa_script.h +++ b/xfa/src/fxfa/src/common/xfa_script.h @@ -72,7 +72,7 @@ typedef struct _XFA_RESOLVENODE_RS { } XFA_RESOLVENODE_RS, * XFA_LPRESOLVENODE_RS; typedef struct _XFA_JSBUILTININFO { uint32_t uUnicodeHash; - FX_LPCSTR pName; + const FX_CHAR* pName; } XFA_JSBUILTININFO, * XFA_LPJSBUILTININFO; typedef XFA_JSBUILTININFO const * XFA_LPCJSBUILTININFO; XFA_LPCJSBUILTININFO XFA_GetJSBuiltinByHash(uint32_t uHashCode); diff --git a/xfa/src/fxfa/src/common/xfa_utils.h b/xfa/src/fxfa/src/common/xfa_utils.h index abb9dd208a..191fcf2bbb 100644 --- a/xfa/src/fxfa/src/common/xfa_utils.h +++ b/xfa/src/fxfa/src/common/xfa_utils.h @@ -176,7 +176,7 @@ public: FX_BOOL Lookup(KeyType key) const { - FX_LPVOID pValue = NULL; + void* pValue = NULL; return CFX_MapPtrToPtr::Lookup((void*)key, pValue); } @@ -235,5 +235,5 @@ FX_BOOL XFA_IsFlowingLayout(XFA_ATTRIBUTEENUM eLayout); FX_BOOL XFA_IsHorizontalFlow(XFA_ATTRIBUTEENUM eLayout); void XFA_DataExporter_DealWithDataGroupNode(CXFA_Node *pDataNode); void XFA_DataExporter_RegenerateFormFile(CXFA_Node* pNode, IFX_Stream* pStream, - FX_LPCSTR pChecksum = NULL, FX_BOOL bSaveXML = FALSE); + const FX_CHAR* pChecksum = NULL, FX_BOOL bSaveXML = FALSE); #endif diff --git a/xfa/src/fxfa/src/fm2js/xfa_error.cpp b/xfa/src/fxfa/src/fm2js/xfa_error.cpp index ec6e69590a..a24641917c 100644 --- a/xfa/src/fxfa/src/fm2js/xfa_error.cpp +++ b/xfa/src/fxfa/src/fm2js/xfa_error.cpp @@ -5,7 +5,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa_fm2js.h" -static FX_LPCWSTR gs_lpStrErrorMsgInfo[] = { +static const FX_WCHAR* gs_lpStrErrorMsgInfo[] = { L"unsupported char '%c'", L"bad suffix on number", L"invalidate char '%c'", @@ -15,7 +15,7 @@ static FX_LPCWSTR gs_lpStrErrorMsgInfo[] = { L"unexpected expression '%s'", L"expected operator '%s' instead of '%s'", }; -FX_LPCWSTR XFA_FM_ErrorMsg(XFA_FM_ERRMSG msg) +const FX_WCHAR* XFA_FM_ErrorMsg(XFA_FM_ERRMSG msg) { if(msg < FMERR_MAXIMUM) { return gs_lpStrErrorMsgInfo[msg]; diff --git a/xfa/src/fxfa/src/fm2js/xfa_error.h b/xfa/src/fxfa/src/fm2js/xfa_error.h index 84f3917c94..6b9fc92d9e 100644 --- a/xfa/src/fxfa/src/fm2js/xfa_error.h +++ b/xfa/src/fxfa/src/fm2js/xfa_error.h @@ -25,5 +25,5 @@ public: FX_DWORD linenum; CFX_WideString message; }; -FX_LPCWSTR XFA_FM_ErrorMsg( XFA_FM_ERRMSG msg); +const FX_WCHAR* XFA_FM_ErrorMsg( XFA_FM_ERRMSG msg); #endif diff --git a/xfa/src/fxfa/src/fm2js/xfa_fm2jscontext.cpp b/xfa/src/fxfa/src/fm2js/xfa_fm2jscontext.cpp index 84a7747e7a..466aaeefbd 100644 --- a/xfa/src/fxfa/src/fm2js/xfa_fm2jscontext.cpp +++ b/xfa/src/fxfa/src/fm2js/xfa_fm2jscontext.cpp @@ -9,11 +9,11 @@ #define FINANCIAL_PRECISION 0.00000001 struct XFA_FMHtmlReserveCode { uint32_t m_uCode; - FX_LPCWSTR m_htmlReserve; + const FX_WCHAR* m_htmlReserve; }; struct XFA_FMHtmlHashedReserveCode { uint32_t m_uHash; - FX_LPCWSTR m_htmlReserve; + const FX_WCHAR* m_htmlReserve; uint32_t m_uCode; }; static XFA_FMHtmlHashedReserveCode reservesForDecode [] = { @@ -1866,7 +1866,7 @@ void CXFA_FM2JSContext::TimeFmt(FXJSE_HOBJECT hThis, FX_BSTR szFuncName, CFXJSE_ pContext->ThrowScriptErrorMessage(XFA_IDS_INCORRECT_NUMBER_OF_METHOD, L"TimeFmt"); } } -FX_BOOL CXFA_FM2JSContext::IsIsoDateFormat(FX_LPCSTR pData, int32_t iLength, int32_t &iStyle, int32_t &iYear, int32_t &iMonth, int32_t &iDay) +FX_BOOL CXFA_FM2JSContext::IsIsoDateFormat(const FX_CHAR* pData, int32_t iLength, int32_t &iStyle, int32_t &iYear, int32_t &iMonth, int32_t &iDay) { iYear = 0; iMonth = 1; @@ -1979,7 +1979,7 @@ FX_BOOL CXFA_FM2JSContext::IsIsoDateFormat(FX_LPCSTR pData, int32_t iLength, int iRet = TRUE; return iRet; } -FX_BOOL CXFA_FM2JSContext::IsIsoTimeFormat(FX_LPCSTR pData, int32_t iLength, int32_t &iHour, int32_t &iMinute, int32_t &iSecond, int32_t &iMilliSecond, int32_t &iZoneHour, int32_t &iZoneMinute) +FX_BOOL CXFA_FM2JSContext::IsIsoTimeFormat(const FX_CHAR* pData, int32_t iLength, int32_t &iHour, int32_t &iMinute, int32_t &iSecond, int32_t &iMilliSecond, int32_t &iZoneHour, int32_t &iZoneMinute) { iHour = 0; iMinute = 0; @@ -2121,7 +2121,7 @@ FX_BOOL CXFA_FM2JSContext::IsIsoTimeFormat(FX_LPCSTR pData, int32_t iLength, int iRet = TRUE; return iRet; } -FX_BOOL CXFA_FM2JSContext::IsIsoDateTimeFormat(FX_LPCSTR pData, int32_t iLength, int32_t &iYear, int32_t &iMonth, int32_t &iDay, int32_t &iHour, int32_t &iMinute, int32_t &iSecond, int32_t &iMillionSecond, int32_t &iZoneHour, int32_t &iZoneMinute) +FX_BOOL CXFA_FM2JSContext::IsIsoDateTimeFormat(const FX_CHAR* pData, int32_t iLength, int32_t &iYear, int32_t &iMonth, int32_t &iDay, int32_t &iHour, int32_t &iMinute, int32_t &iSecond, int32_t &iMillionSecond, int32_t &iZoneHour, int32_t &iZoneMinute) { iYear = 0; iMonth = 0; @@ -3359,7 +3359,7 @@ void CXFA_FM2JSContext::UnitType(FXJSE_HOBJECT hThis, FX_BSTR szFuncName, CFXJSE }; unitspanString.MakeLower(); CFX_WideString wsTypeString = CFX_WideString::FromUTF8(unitspanString, unitspanString.GetLength()); - FX_LPCWSTR pData = wsTypeString; + const FX_WCHAR* pData = wsTypeString; int32_t u = 0; int32_t uLen = wsTypeString.GetLength(); while (*(pData + u) == 0x20 || *(pData + u) == 0x09 || *(pData + u) == 0x0B || *(pData + u) == 0x0C || *(pData + u) == 0x0A || *(pData + u) == 0x0D) { @@ -3447,7 +3447,7 @@ void CXFA_FM2JSContext::UnitValue(FXJSE_HOBJECT hThis, FX_BSTR szFuncName, CFXJS FXJSE_Value_SetNull(args.GetReturnValue()); } else { HValueToUTF8String(unitspanValue, unitspanString); - FX_LPCSTR pData = unitspanString; + const FX_CHAR* pData = unitspanString; if (pData) { int32_t u = 0; while (*(pData + u) == 0x20 || *(pData + u) == 0x09 || *(pData + u) == 0x0B || *(pData + u) == 0x0C || *(pData + u) == 0x0A || *(pData + u) == 0x0D) { @@ -3479,7 +3479,7 @@ void CXFA_FM2JSContext::UnitValue(FXJSE_HOBJECT hThis, FX_BSTR szFuncName, CFXJS unitValue = GetSimpleHValue(hThis, args, 1); CFX_ByteString unitTempString; HValueToUTF8String(unitValue, unitTempString); - FX_LPCSTR pData = unitTempString; + const FX_CHAR* pData = unitTempString; int32_t u = 0; while (*(pData + u) == ' ' || *(pData + u) == 0x09 || *(pData + u) == 0x0B || *(pData + u) == 0x0C || *(pData + u) == 0x0A || *(pData + u) == 0x0D) { ++u; @@ -3685,7 +3685,7 @@ void CXFA_FM2JSContext::Decode(FXJSE_HOBJECT hThis, FX_BSTR szFuncName, CFXJSE_A void CXFA_FM2JSContext::DecodeURL (FX_BSTR szURLString, CFX_ByteTextBuf &szResultString) { CFX_WideString wsURLString = CFX_WideString::FromUTF8(szURLString.GetCStr(), szURLString.GetLength()); - FX_LPCWSTR pData = wsURLString; + const FX_WCHAR* pData = wsURLString; int32_t iLen = wsURLString.GetLength(); int32_t i = 0; FX_WCHAR ch = 0; @@ -3743,7 +3743,7 @@ void CXFA_FM2JSContext::DecodeHTML(FX_BSTR szHTMLString, CFX_ByteTextBuf &szResu int32_t i = 0; int32_t iCode = 0; FX_WCHAR ch = 0; - FX_LPCWSTR pData = wsHTMLString; + const FX_WCHAR* pData = wsHTMLString; CFX_WideTextBuf wsResultBuf; while (i < iLen) { ch = *(pData + i); @@ -3813,7 +3813,7 @@ void CXFA_FM2JSContext::DecodeXML (FX_BSTR szXMLString, CFX_ByteTextBuf &szResu int32_t i = 0; int32_t iCode = 0; FX_WCHAR ch = 0; - FX_LPCWSTR pData = wsXMLString; + const FX_WCHAR* pData = wsXMLString; CFX_WideTextBuf wsXMLBuf; while (i < iLen) { ch = *(pData + i); @@ -3861,7 +3861,7 @@ void CXFA_FM2JSContext::DecodeXML (FX_BSTR szXMLString, CFX_ByteTextBuf &szResu ++i; continue; } - FX_LPCWSTR const strName[] = { + const FX_WCHAR* const strName[] = { L"quot", L"amp", L"apos", @@ -3958,7 +3958,7 @@ void CXFA_FM2JSContext::EncodeURL (FX_BSTR szURLString, CFX_ByteTextBuf &szResu FX_WCHAR strUnsafe[] = { ' ', '<', '>', '"', '#', '%', '{', '}', '|', '\\', '^', '~', '[', ']', '`' }; FX_WCHAR strReserved[] = {';', '/', '?', ':', '@', '=', '&'}; FX_WCHAR strSpecial[] = {'$', '-', '+', '!', '*', '\'', '(', ')', ','}; - const FX_LPCWSTR strCode = L"0123456789abcdef"; + const FX_WCHAR* strCode = L"0123456789abcdef"; for (int32_t u = 0; u < iLength; ++u) { ch = wsURLString.GetAt(u); int32_t i = 0; @@ -4054,7 +4054,7 @@ void CXFA_FM2JSContext::EncodeHTML(FX_BSTR szHTMLString, CFX_ByteTextBuf &szResu { CFX_ByteString str = szHTMLString.GetCStr(); CFX_WideString wsHTMLString = CFX_WideString::FromUTF8(str, str.GetLength()); - FX_LPCWSTR strCode = L"0123456789abcdef"; + const FX_WCHAR* strCode = L"0123456789abcdef"; FX_WCHAR strEncode[9]; strEncode[0] = '&'; strEncode[1] = '#'; @@ -4067,7 +4067,7 @@ void CXFA_FM2JSContext::EncodeHTML(FX_BSTR szHTMLString, CFX_ByteTextBuf &szResu uint32_t ch = 0; int32_t iLen = wsHTMLString.GetLength(); int32_t i = 0; - FX_LPCWSTR pData = wsHTMLString; + const FX_WCHAR* pData = wsHTMLString; int32_t iIndex = 0; CFX_WideString htmlReserve; while (i < iLen) { @@ -4121,19 +4121,19 @@ void CXFA_FM2JSContext::EncodeXML (FX_BSTR szXMLString, CFX_ByteTextBuf &szResu strEncode[6] = 0; strEncode[7] = ';'; strEncode[8] = 0; - FX_LPCWSTR const strName[] = { + const FX_WCHAR* const strName[] = { L"quot", L"amp", L"apos", L"lt", L"gt" }; - const FX_LPCWSTR strCode = L"0123456789abcdef"; + const FX_WCHAR* strCode = L"0123456789abcdef"; FX_WCHAR ch = 0; int32_t iLength = wsXMLString.GetLength(); int32_t iIndex = 0; int32_t u = 0; - FX_LPCWSTR pData = wsXMLString; + const FX_WCHAR* pData = wsXMLString; for (u = 0; u < iLength; ++u) { ch = *(pData + u); switch (ch) { @@ -4259,7 +4259,7 @@ static FX_BOOL XFA_PATTERN_STRING_Type(FX_BSTR szPattern, FX_DWORD& patternType) } patternType = XFA_VT_NULL; wsPattern.MakeLower(); - FX_LPCWSTR pData = wsPattern; + const FX_WCHAR* pData = wsPattern; int32_t iLength = wsPattern.GetLength(); int32_t iIndex = 0; FX_BOOL bSingleQuotation = FALSE; @@ -4452,7 +4452,7 @@ void CXFA_FM2JSContext::Lower(FXJSE_HOBJECT hThis, FX_BSTR szFuncName, CFXJSE_Ar HValueToUTF8String(argOne, argString); CFX_WideTextBuf lowStringBuf; CFX_WideString wsArgString = CFX_WideString::FromUTF8(argString, argString.GetLength()); - FX_LPCWSTR pData = wsArgString; + const FX_WCHAR* pData = wsArgString; int32_t iLen = argString.GetLength(); int32_t i = 0; int32_t ch = 0; @@ -4801,7 +4801,7 @@ void CXFA_FM2JSContext::Str(FXJSE_HOBJECT hThis, FX_BSTR szFuncName, CFXJSE_Argu } formatStr += "f"; numberString.Format(formatStr, fNumber); - FX_LPCSTR pData = numberString; + const FX_CHAR* pData = numberString; int32_t iLength = numberString.GetLength(); int32_t u = 0; while (u < iLength) { @@ -5029,7 +5029,7 @@ void CXFA_FM2JSContext::Upper(FXJSE_HOBJECT hThis, FX_BSTR szFuncName, CFXJSE_Ar HValueToUTF8String(argOne, argString); CFX_WideTextBuf upperStringBuf; CFX_WideString wsArgString = CFX_WideString::FromUTF8(argString, argString.GetLength()); - FX_LPCWSTR pData = wsArgString; + const FX_WCHAR* pData = wsArgString; int32_t iLen = wsArgString.GetLength(); int32_t i = 0; int32_t ch = 0; @@ -5122,7 +5122,7 @@ void CXFA_FM2JSContext::TrillionUS(FX_BSTR szData, CFX_ByteTextBuf &strBuf) CFX_ByteStringC pLastTens[] = {"Twenty", "Thirty", "Forty", "Fifty", "Sixty", "Seventy", "Eighty", "Ninety"}; CFX_ByteStringC pComm[] = {" Hundred ", " Thousand ", " Million ", " Billion ", "Trillion"}; int32_t iComm = 0; - FX_LPCSTR pData = szData.GetCStr(); + const FX_CHAR* pData = szData.GetCStr(); int32_t iLength = szData.GetLength(); if (iLength > 12) { iComm = 4; @@ -5207,7 +5207,7 @@ void CXFA_FM2JSContext::TrillionUS(FX_BSTR szData, CFX_ByteTextBuf &strBuf) } void CXFA_FM2JSContext::WordUS(FX_BSTR szData, int32_t iStyle, CFX_ByteTextBuf &strBuf) { - FX_LPCSTR pData = szData.GetCStr(); + const FX_CHAR* pData = szData.GetCStr(); int32_t iLength = szData.GetLength(); switch (iStyle) { case 0: { @@ -5324,7 +5324,7 @@ void CXFA_FM2JSContext::Get(FXJSE_HOBJECT hThis, FX_BSTR szFuncName, CFXJSE_Argu IFX_FileRead* pFile = pAppProvider->DownloadURL(CFX_WideString::FromUTF8(urlString, urlString.GetLength())); if (pFile) { int32_t size = pFile->GetSize(); - FX_LPBYTE pData = FX_Alloc(uint8_t, size); + uint8_t* pData = FX_Alloc(uint8_t, size); if(pData) { pFile->ReadBlock(pData, size); FXJSE_Value_SetUTF8String(args.GetReturnValue(), CFX_ByteStringC(pData, size)); @@ -5915,7 +5915,7 @@ void CXFA_FM2JSContext::dot_accessor(FXJSE_HOBJECT hThis, FX_BSTR szFuncName, CF } else { CFX_WideString wsPropertyName = CFX_WideString::FromUTF8(szName, szName.GetLength()); CFX_WideString wsSomExpression = CFX_WideString::FromUTF8(szSomExp, szSomExp.GetLength()); - pContext->ThrowScriptErrorMessage(XFA_IDS_ACCESS_PROPERTY_IN_NOT_OBJECT, (FX_LPCWSTR)wsPropertyName, (FX_LPCWSTR)wsSomExpression); + pContext->ThrowScriptErrorMessage(XFA_IDS_ACCESS_PROPERTY_IN_NOT_OBJECT, (const FX_WCHAR*)wsPropertyName, (const FX_WCHAR*)wsSomExpression); } for(int32_t i = 0; i < iLength - 2; i++) { for(int32_t j = 0; j < iSizes[i]; j++) { @@ -5968,7 +5968,7 @@ void CXFA_FM2JSContext::dot_accessor(FXJSE_HOBJECT hThis, FX_BSTR szFuncName, CF } else { CFX_WideString wsPropertyName = CFX_WideString::FromUTF8(szName, szName.GetLength()); CFX_WideString wsSomExpression = CFX_WideString::FromUTF8(szSomExp, szSomExp.GetLength()); - pContext->ThrowScriptErrorMessage(XFA_IDS_ACCESS_PROPERTY_IN_NOT_OBJECT, (FX_LPCWSTR)wsPropertyName, (FX_LPCWSTR)wsSomExpression); + pContext->ThrowScriptErrorMessage(XFA_IDS_ACCESS_PROPERTY_IN_NOT_OBJECT, (const FX_WCHAR*)wsPropertyName, (const FX_WCHAR*)wsSomExpression); } } if(argc == 5) { @@ -6044,7 +6044,7 @@ void CXFA_FM2JSContext::dotdot_accessor(FXJSE_HOBJECT hThis, FX_BSTR szFuncName, } else { CFX_WideString wsPropertyName = CFX_WideString::FromUTF8(szName, szName.GetLength()); CFX_WideString wsSomExpression = CFX_WideString::FromUTF8(szSomExp, szSomExp.GetLength()); - pContext->ThrowScriptErrorMessage(XFA_IDS_ACCESS_PROPERTY_IN_NOT_OBJECT, (FX_LPCWSTR)wsPropertyName, (FX_LPCWSTR)wsSomExpression); + pContext->ThrowScriptErrorMessage(XFA_IDS_ACCESS_PROPERTY_IN_NOT_OBJECT, (const FX_WCHAR*)wsPropertyName, (const FX_WCHAR*)wsSomExpression); } for(int32_t i = 0; i < iLength - 2; i++) { for(int32_t j = 0; j < iSizes[i]; j++) { @@ -6096,7 +6096,7 @@ void CXFA_FM2JSContext::dotdot_accessor(FXJSE_HOBJECT hThis, FX_BSTR szFuncName, } else { CFX_WideString wsPropertyName = CFX_WideString::FromUTF8(szName, szName.GetLength()); CFX_WideString wsSomExpression = CFX_WideString::FromUTF8(szSomExp, szSomExp.GetLength()); - pContext->ThrowScriptErrorMessage(XFA_IDS_ACCESS_PROPERTY_IN_NOT_OBJECT, (FX_LPCWSTR)wsPropertyName, (FX_LPCWSTR)wsSomExpression); + pContext->ThrowScriptErrorMessage(XFA_IDS_ACCESS_PROPERTY_IN_NOT_OBJECT, (const FX_WCHAR*)wsPropertyName, (const FX_WCHAR*)wsSomExpression); } } if(argc == 5) { @@ -7179,7 +7179,7 @@ void CXFA_FM2JSContext::ThrowScriptErrorMessage(int32_t iStringID, ...) CFX_WideString wsMessage; va_list arg_ptr; va_start(arg_ptr, iStringID); - wsMessage.FormatV((FX_LPCWSTR)wsFormat, arg_ptr); + wsMessage.FormatV((const FX_WCHAR*)wsFormat, arg_ptr); va_end(arg_ptr); FXJSE_ThrowMessage(FX_BSTRC(""), FX_UTF8Encode(wsMessage, wsMessage.GetLength())); } diff --git a/xfa/src/fxfa/src/fm2js/xfa_fm2jscontext.h b/xfa/src/fxfa/src/fm2js/xfa_fm2jscontext.h index 923401b901..b947bfa740 100644 --- a/xfa/src/fxfa/src/fm2js/xfa_fm2jscontext.h +++ b/xfa/src/fxfa/src/fm2js/xfa_fm2jscontext.h @@ -33,9 +33,9 @@ public: static void Time2Num (FXJSE_HOBJECT hThis, FX_BSTR szFuncName, CFXJSE_Arguments &args); static void TimeFmt (FXJSE_HOBJECT hThis, FX_BSTR szFuncName, CFXJSE_Arguments &args); - static FX_BOOL IsIsoDateFormat (FX_LPCSTR pData, int32_t iLength, int32_t &iStyle, int32_t &iYear, int32_t &iMonth, int32_t &iDay); - static FX_BOOL IsIsoTimeFormat (FX_LPCSTR pData, int32_t iLength, int32_t &iHour, int32_t &iMinute, int32_t &iSecond, int32_t &iMilliSecond, int32_t &iZoneHour, int32_t &iZoneMinute); - static FX_BOOL IsIsoDateTimeFormat (FX_LPCSTR pData, int32_t iLength, int32_t &iYear, int32_t &iMonth, int32_t &iDay, int32_t &iHour, int32_t &iMinute, int32_t &iSecond, int32_t &iMillionSecond, int32_t &iZoneHour, int32_t &iZoneMinute); + static FX_BOOL IsIsoDateFormat (const FX_CHAR* pData, int32_t iLength, int32_t &iStyle, int32_t &iYear, int32_t &iMonth, int32_t &iDay); + static FX_BOOL IsIsoTimeFormat (const FX_CHAR* pData, int32_t iLength, int32_t &iHour, int32_t &iMinute, int32_t &iSecond, int32_t &iMilliSecond, int32_t &iZoneHour, int32_t &iZoneMinute); + static FX_BOOL IsIsoDateTimeFormat (const FX_CHAR* pData, int32_t iLength, int32_t &iYear, int32_t &iMonth, int32_t &iDay, int32_t &iHour, int32_t &iMinute, int32_t &iSecond, int32_t &iMillionSecond, int32_t &iZoneHour, int32_t &iZoneMinute); static FX_BOOL Local2IsoDate (FXJSE_HOBJECT hThis, FX_BSTR szDate, FX_BSTR szFormat, FX_BSTR szLocale, CFX_ByteString &strIsoDate); static FX_BOOL Local2IsoTime (FXJSE_HOBJECT hThis, FX_BSTR szTime, FX_BSTR szFormat, FX_BSTR szLocale, CFX_ByteString &strIsoTime); static FX_BOOL IsoDate2Local (FXJSE_HOBJECT hThis, FX_BSTR szDate, FX_BSTR szFormat, FX_BSTR szLocale, CFX_ByteString &strLocalDate); diff --git a/xfa/src/fxfa/src/fm2js/xfa_fmparse.cpp b/xfa/src/fxfa/src/fm2js/xfa_fmparse.cpp index a3e127f3c6..590fa3fd76 100644 --- a/xfa/src/fxfa/src/fm2js/xfa_fmparse.cpp +++ b/xfa/src/fxfa/src/fm2js/xfa_fmparse.cpp @@ -48,14 +48,14 @@ void CXFA_FMParse::Check( XFA_FM_TOKEN op ) { if (m_pToken->m_type != op) { CFX_WideString ws_TempString = m_pToken->m_wstring; - Error(m_pToken->m_uLinenum, FMERR_EXPECTED_TOKEN, XFA_FM_KeywordToString(op), FX_LPCWSTR(ws_TempString)); + Error(m_pToken->m_uLinenum, FMERR_EXPECTED_TOKEN, XFA_FM_KeywordToString(op), ws_TempString.c_str()); } NextToken(); } void CXFA_FMParse::Error(FX_DWORD lineNum, XFA_FM_ERRMSG msg, ...) { m_pErrorInfo->linenum = lineNum; - FX_LPCWSTR lpMessageInfo = XFA_FM_ErrorMsg(msg); + const FX_WCHAR* lpMessageInfo = XFA_FM_ErrorMsg(msg); va_list ap; va_start(ap, msg); m_pErrorInfo->message.FormatV(lpMessageInfo, ap); @@ -109,7 +109,7 @@ CXFA_FMExpression * CXFA_FMParse::ParseFunction() NextToken(); if (m_pToken->m_type != TOKidentifier) { CFX_WideString ws_TempString = m_pToken->m_wstring; - Error(m_pToken->m_uLinenum, FMERR_EXPECTED_IDENTIFIER, FX_LPCWSTR(ws_TempString)); + Error(m_pToken->m_uLinenum, FMERR_EXPECTED_IDENTIFIER, ws_TempString.c_str()); } else { ident = m_pToken->m_wstring; NextToken(); @@ -137,7 +137,7 @@ CXFA_FMExpression * CXFA_FMParse::ParseFunction() } } else { CFX_WideString ws_TempString = m_pToken->m_wstring; - Error(m_pToken->m_uLinenum, FMERR_EXPECTED_IDENTIFIER, FX_LPCWSTR(ws_TempString)); + Error(m_pToken->m_uLinenum, FMERR_EXPECTED_IDENTIFIER, ws_TempString.c_str()); NextToken(); break; } @@ -219,7 +219,7 @@ CXFA_FMExpression * CXFA_FMParse::ParseExpression() break; default: CFX_WideString ws_TempString = m_pToken->m_wstring; - Error(m_pToken->m_uLinenum, FMERR_UNEXPECTED_EXPRESSION, FX_LPCWSTR(ws_TempString)); + Error(m_pToken->m_uLinenum, FMERR_UNEXPECTED_EXPRESSION, ws_TempString.c_str()); NextToken(); break; } @@ -233,7 +233,7 @@ CXFA_FMExpression * CXFA_FMParse::ParseVarExpression() NextToken(); if (m_pToken->m_type != TOKidentifier) { CFX_WideString ws_TempString = m_pToken->m_wstring; - Error(m_pToken->m_uLinenum, FMERR_EXPECTED_IDENTIFIER, FX_LPCWSTR(ws_TempString)); + Error(m_pToken->m_uLinenum, FMERR_EXPECTED_IDENTIFIER, ws_TempString.c_str()); } else { ident = m_pToken->m_wstring; NextToken(); @@ -571,7 +571,7 @@ CXFA_FMSimpleExpression * CXFA_FMParse::ParsePrimaryExpression() break; default: CFX_WideString ws_TempString = m_pToken->m_wstring; - Error(m_pToken->m_uLinenum, FMERR_UNEXPECTED_EXPRESSION, FX_LPCWSTR(ws_TempString)); + Error(m_pToken->m_uLinenum, FMERR_UNEXPECTED_EXPRESSION, ws_TempString.c_str()); NextToken(); break; } @@ -605,7 +605,7 @@ CXFA_FMSimpleExpression *CXFA_FMParse::ParsePostExpression(CXFA_FMSimpleExpressi } if (m_pToken->m_type != TOKrparen) { CFX_WideString ws_TempString = m_pToken->m_wstring; - Error(m_pToken->m_uLinenum, FMERR_EXPECTED_TOKEN, XFA_FM_KeywordToString(TOKrparen), FX_LPCWSTR(ws_TempString)); + Error(m_pToken->m_uLinenum, FMERR_EXPECTED_TOKEN, XFA_FM_KeywordToString(TOKrparen), ws_TempString.c_str()); } } if (m_pErrorInfo->message.IsEmpty()) { @@ -658,7 +658,7 @@ CXFA_FMSimpleExpression *CXFA_FMParse::ParsePostExpression(CXFA_FMSimpleExpressi } if (m_pToken->m_type != TOKrparen) { CFX_WideString ws_TempString = m_pToken->m_wstring; - Error(m_pToken->m_uLinenum, FMERR_EXPECTED_TOKEN, XFA_FM_KeywordToString(TOKrparen), FX_LPCWSTR(ws_TempString)); + Error(m_pToken->m_uLinenum, FMERR_EXPECTED_TOKEN, XFA_FM_KeywordToString(TOKrparen), ws_TempString.c_str()); } } if (m_pErrorInfo->message.IsEmpty()) { @@ -707,7 +707,7 @@ CXFA_FMSimpleExpression *CXFA_FMParse::ParsePostExpression(CXFA_FMSimpleExpressi } } else { CFX_WideString ws_TempString = m_pToken->m_wstring; - Error(m_pToken->m_uLinenum, FMERR_EXPECTED_IDENTIFIER, FX_LPCWSTR(ws_TempString)); + Error(m_pToken->m_uLinenum, FMERR_EXPECTED_IDENTIFIER, ws_TempString.c_str()); return e; } break; @@ -738,7 +738,7 @@ CXFA_FMSimpleExpression *CXFA_FMParse::ParsePostExpression(CXFA_FMSimpleExpressi } } else { CFX_WideString ws_TempString = m_pToken->m_wstring; - Error(m_pToken->m_uLinenum, FMERR_EXPECTED_IDENTIFIER, FX_LPCWSTR(ws_TempString)); + Error(m_pToken->m_uLinenum, FMERR_EXPECTED_IDENTIFIER, ws_TempString.c_str()); return e; } break; @@ -769,7 +769,7 @@ CXFA_FMSimpleExpression *CXFA_FMParse::ParsePostExpression(CXFA_FMSimpleExpressi } } else { CFX_WideString ws_TempString = m_pToken->m_wstring; - Error(m_pToken->m_uLinenum, FMERR_EXPECTED_IDENTIFIER, FX_LPCWSTR(ws_TempString)); + Error(m_pToken->m_uLinenum, FMERR_EXPECTED_IDENTIFIER, ws_TempString.c_str()); return e; } break; @@ -797,7 +797,7 @@ CXFA_FMSimpleExpression *CXFA_FMParse::ParseIndexExpression() NextToken(); if (m_pToken->m_type != TOKrbracket) { CFX_WideString ws_TempString = m_pToken->m_wstring; - Error(m_pToken->m_uLinenum, FMERR_EXPECTED_TOKEN, XFA_FM_KeywordToString(TOKrparen), FX_LPCWSTR(ws_TempString)); + Error(m_pToken->m_uLinenum, FMERR_EXPECTED_TOKEN, XFA_FM_KeywordToString(TOKrparen), ws_TempString.c_str()); if (pExp) { delete pExp; pExp = 0; @@ -815,7 +815,7 @@ CXFA_FMSimpleExpression *CXFA_FMParse::ParseIndexExpression() s = ParseSimpleExpression(); if (m_pToken->m_type != TOKrbracket) { CFX_WideString ws_TempString = m_pToken->m_wstring; - Error(m_pToken->m_uLinenum, FMERR_EXPECTED_TOKEN, XFA_FM_KeywordToString(TOKrparen), FX_LPCWSTR(ws_TempString)); + Error(m_pToken->m_uLinenum, FMERR_EXPECTED_TOKEN, XFA_FM_KeywordToString(TOKrparen), ws_TempString.c_str()); if (s) { delete s; } @@ -901,7 +901,7 @@ CXFA_FMExpression * CXFA_FMParse::ParseIfExpression() CXFA_FMExpression *pIfExpression = 0; CXFA_FMExpression *pElseExpression = 0; FX_DWORD line = m_pToken->m_uLinenum; - FX_LPCWSTR pStartPos = m_lexer->SavePos(); + const FX_WCHAR* pStartPos = m_lexer->SavePos(); NextToken(); Check(TOKlparen); while (m_pToken->m_type != TOKrparen) { @@ -949,7 +949,7 @@ CXFA_FMExpression * CXFA_FMParse::ParseIfExpression() break; default: CFX_WideString ws_TempString = m_pToken->m_wstring; - Error(m_pToken->m_uLinenum, FMERR_EXPECTED_IFEND, FX_LPCWSTR(ws_TempString)); + Error(m_pToken->m_uLinenum, FMERR_EXPECTED_IFEND, ws_TempString.c_str()); NextToken(); break; } @@ -997,14 +997,13 @@ CXFA_FMExpression * CXFA_FMParse::ParseWhileExpression() CXFA_FMSimpleExpression * CXFA_FMParse::ParseSubassignmentInForExpression() { CXFA_FMSimpleExpression *e = 0; - FX_DWORD line = m_pToken->m_uLinenum; switch (m_pToken->m_type) { case TOKidentifier: e = ParseSimpleExpression(); break; default: CFX_WideString ws_TempString = m_pToken->m_wstring; - Error(m_pToken->m_uLinenum, FMERR_UNEXPECTED_EXPRESSION, FX_LPCWSTR(ws_TempString)); + Error(m_pToken->m_uLinenum, FMERR_UNEXPECTED_EXPRESSION, ws_TempString.c_str()); NextToken(); break; } @@ -1022,7 +1021,7 @@ CXFA_FMExpression * CXFA_FMParse::ParseForExpression() NextToken(); if (m_pToken->m_type != TOKidentifier) { CFX_WideString ws_TempString = m_pToken->m_wstring; - Error(m_pToken->m_uLinenum, FMERR_EXPECTED_TOKEN, XFA_FM_KeywordToString(m_pToken->m_type), FX_LPCWSTR(ws_TempString)); + Error(m_pToken->m_uLinenum, FMERR_EXPECTED_TOKEN, XFA_FM_KeywordToString(m_pToken->m_type), ws_TempString.c_str()); } wsVariant = m_pToken->m_wstring; NextToken(); @@ -1031,7 +1030,7 @@ CXFA_FMExpression * CXFA_FMParse::ParseForExpression() pAssignment = ParseSimpleExpression(); } else { CFX_WideString ws_TempString = m_pToken->m_wstring; - Error(m_pToken->m_uLinenum, FMERR_EXPECTED_TOKEN, XFA_FM_KeywordToString(m_pToken->m_type), FX_LPCWSTR(ws_TempString)); + Error(m_pToken->m_uLinenum, FMERR_EXPECTED_TOKEN, XFA_FM_KeywordToString(m_pToken->m_type), ws_TempString.c_str()); } int32_t iDirection = 0; if (m_pToken->m_type == TOKupto) { @@ -1040,7 +1039,7 @@ CXFA_FMExpression * CXFA_FMParse::ParseForExpression() iDirection = -1; } else { CFX_WideString ws_TempString = m_pToken->m_wstring; - Error(m_pToken->m_uLinenum, FMERR_EXPECTED_TOKEN, L"upto or downto", (FX_LPCWSTR)ws_TempString); + Error(m_pToken->m_uLinenum, FMERR_EXPECTED_TOKEN, L"upto or downto", (const FX_WCHAR*)ws_TempString); } NextToken(); pAccessor = ParseSimpleExpression(); @@ -1079,7 +1078,7 @@ CXFA_FMExpression * CXFA_FMParse::ParseForeachExpression() NextToken(); if (m_pToken->m_type != TOKidentifier) { CFX_WideString ws_TempString = m_pToken->m_wstring; - Error(m_pToken->m_uLinenum, FMERR_EXPECTED_TOKEN, XFA_FM_KeywordToString(m_pToken->m_type), FX_LPCWSTR(ws_TempString)); + Error(m_pToken->m_uLinenum, FMERR_EXPECTED_TOKEN, XFA_FM_KeywordToString(m_pToken->m_type), ws_TempString.c_str()); } wsIdentifier = m_pToken->m_wstring; NextToken(); @@ -1087,7 +1086,7 @@ CXFA_FMExpression * CXFA_FMParse::ParseForeachExpression() Check(TOKlparen); if (m_pToken->m_type == TOKrparen) { CFX_WideString ws_TempString = m_pToken->m_wstring; - Error(m_pToken->m_uLinenum, FMERR_UNEXPECTED_EXPRESSION, FX_LPCWSTR(ws_TempString)); + Error(m_pToken->m_uLinenum, FMERR_UNEXPECTED_EXPRESSION, ws_TempString.c_str()); NextToken(); } else { pAccessors = FX_NEW CFX_PtrArray(); diff --git a/xfa/src/fxfa/src/fm2js/xfa_fmparse.h b/xfa/src/fxfa/src/fm2js/xfa_fmparse.h index 496a3dfa6e..e610ab56ef 100644 --- a/xfa/src/fxfa/src/fm2js/xfa_fmparse.h +++ b/xfa/src/fxfa/src/fm2js/xfa_fmparse.h @@ -40,7 +40,7 @@ public: CXFA_FMSimpleExpression *ParsePostExpression(CXFA_FMSimpleExpression *e); CXFA_FMSimpleExpression *ParseIndexExpression(); private: - FX_LPCWSTR m_pScript; + const FX_WCHAR* m_pScript; FX_STRSIZE m_uLength; CXFA_FMLexer *m_lexer; CXFA_FMToken *m_pToken; diff --git a/xfa/src/fxfa/src/fm2js/xfa_lexer.cpp b/xfa/src/fxfa/src/fm2js/xfa_lexer.cpp index 7ce3355861..4c24f78b1d 100644 --- a/xfa/src/fxfa/src/fm2js/xfa_lexer.cpp +++ b/xfa/src/fxfa/src/fm2js/xfa_lexer.cpp @@ -6,53 +6,53 @@ #include "xfa_fm2js.h" struct XFA_FMDChar { - static FX_LPCWSTR inc(FX_LPCWSTR &p) + static const FX_WCHAR* inc(const FX_WCHAR* &p) { ++p; return p; } - static FX_LPCWSTR dec(FX_LPCWSTR &p) + static const FX_WCHAR* dec(const FX_WCHAR* &p) { --p; return p; } - static uint16_t get(FX_LPCWSTR p) + static uint16_t get(const FX_WCHAR* p) { return *p; } - static FX_BOOL isWhiteSpace(FX_LPCWSTR p) + static FX_BOOL isWhiteSpace(const FX_WCHAR* p) { return (*p) == 0x09 || (*p) == 0x0b || (*p) == 0x0c || (*p) == 0x20; } - static FX_BOOL isLineTerminator(FX_LPCWSTR p) + static FX_BOOL isLineTerminator(const FX_WCHAR* p) { return *p == 0x0A || *p == 0x0D; } - static FX_BOOL isBinary(FX_LPCWSTR p) + static FX_BOOL isBinary(const FX_WCHAR* p) { return (*p) >= '0' && (*p) <= '1'; } - static FX_BOOL isOctal(FX_LPCWSTR p) + static FX_BOOL isOctal(const FX_WCHAR* p) { return (*p) >= '0' && (*p) <= '7'; } - static FX_BOOL isDigital(FX_LPCWSTR p) + static FX_BOOL isDigital(const FX_WCHAR* p) { return (*p) >= '0' && (*p) <= '9'; } - static FX_BOOL isHex(FX_LPCWSTR p) + static FX_BOOL isHex(const FX_WCHAR* p) { return isDigital(p) || ((*p) >= 'a' && (*p) <= 'f') || ((*p) >= 'A' && (*p) <= 'F'); } - static FX_BOOL isAlpha(FX_LPCWSTR p) + static FX_BOOL isAlpha(const FX_WCHAR* p) { return ((*p) <= 'z' && (*p) >= 'a') || ((*p) <= 'Z' && (*p) >= 'A'); } - static FX_BOOL isAvalid(FX_LPCWSTR p, FX_BOOL flag = 0); - static FX_BOOL string2number(FX_LPCWSTR s, FX_DOUBLE *pValue, FX_LPCWSTR &pEnd); + static FX_BOOL isAvalid(const FX_WCHAR* p, FX_BOOL flag = 0); + static FX_BOOL string2number(const FX_WCHAR* s, FX_DOUBLE *pValue, const FX_WCHAR* &pEnd); static FX_BOOL isUnicodeAlpha(uint16_t ch); }; -inline FX_BOOL XFA_FMDChar::isAvalid(FX_LPCWSTR p, FX_BOOL flag) +inline FX_BOOL XFA_FMDChar::isAvalid(const FX_WCHAR* p, FX_BOOL flag) { if (*p == 0) { return 1; @@ -67,7 +67,7 @@ inline FX_BOOL XFA_FMDChar::isAvalid(FX_LPCWSTR p, FX_BOOL flag) } return 0; } -inline FX_BOOL XFA_FMDChar::string2number(FX_LPCWSTR s, FX_DOUBLE *pValue, FX_LPCWSTR &pEnd) +inline FX_BOOL XFA_FMDChar::string2number(const FX_WCHAR* s, FX_DOUBLE *pValue, const FX_WCHAR* &pEnd) { if (s) { *pValue = wcstod((wchar_t *)s, (wchar_t **)&pEnd); @@ -147,7 +147,7 @@ static XFA_FMKeyword keyWords[] = { }; static const FX_WORD KEYWORD_START = TOKdo; static const FX_WORD KEYWORD_END = TOKendif; -FX_LPCWSTR XFA_FM_KeywordToString(XFA_FM_TOKEN op) +const FX_WCHAR* XFA_FM_KeywordToString(XFA_FM_TOKEN op) { return keyWords[op].m_keword; } @@ -223,13 +223,13 @@ CXFA_FMToken * CXFA_FMLexer::Scan() XFA_FMDChar::inc(m_ptr); break; case ';': { - FX_LPCWSTR pTemp = 0; + const FX_WCHAR* pTemp = 0; Comment(m_ptr, pTemp); m_ptr = pTemp; } break; case '"': { - FX_LPCWSTR pTemp = 0; + const FX_WCHAR* pTemp = 0; p->m_type = TOKstring; iRet = String(p, m_ptr, pTemp); if (iRet) { @@ -249,7 +249,7 @@ CXFA_FMToken * CXFA_FMLexer::Scan() case '8': case '9': { p->m_type = TOKnumber; - FX_LPCWSTR pTemp = 0; + const FX_WCHAR* pTemp = 0; iRet = Number(p, m_ptr, pTemp); m_ptr = pTemp; if (iRet) { @@ -361,7 +361,7 @@ CXFA_FMToken * CXFA_FMLexer::Scan() if (XFA_FMDChar::isAvalid(m_ptr)) { ch = XFA_FMDChar::get(m_ptr); if (ch == '/') { - FX_LPCWSTR pTemp = 0; + const FX_WCHAR* pTemp = 0; Comment(m_ptr, pTemp); m_ptr = pTemp; break; @@ -393,7 +393,7 @@ CXFA_FMToken * CXFA_FMLexer::Scan() return p; } else if (ch <= '9' && ch >= '0') { p->m_type = TOKnumber; - FX_LPCWSTR pTemp = 0; + const FX_WCHAR* pTemp = 0; XFA_FMDChar::dec(m_ptr); iRet = Number(p, m_ptr, pTemp); m_ptr = pTemp; @@ -417,7 +417,7 @@ CXFA_FMToken * CXFA_FMLexer::Scan() XFA_FMDChar::inc(m_ptr); break; default: { - FX_LPCWSTR pTemp = 0; + const FX_WCHAR* pTemp = 0; iRet = Identifiers(p, m_ptr, pTemp); m_ptr = pTemp; if (iRet) { @@ -429,7 +429,7 @@ CXFA_FMToken * CXFA_FMLexer::Scan() } } } -FX_DWORD CXFA_FMLexer::Number(CXFA_FMToken *t, FX_LPCWSTR p, FX_LPCWSTR &pEnd) +FX_DWORD CXFA_FMLexer::Number(CXFA_FMToken *t, const FX_WCHAR* p, const FX_WCHAR* &pEnd) { FX_DOUBLE number = 0; if (XFA_FMDChar::string2number(p, &number, pEnd)) { @@ -441,9 +441,9 @@ FX_DWORD CXFA_FMLexer::Number(CXFA_FMToken *t, FX_LPCWSTR p, FX_LPCWSTR &pEnd) t->m_wstring = CFX_WideStringC(p, (pEnd - p)); return 0; } -FX_DWORD CXFA_FMLexer::String(CXFA_FMToken *t, FX_LPCWSTR p, FX_LPCWSTR &pEnd) +FX_DWORD CXFA_FMLexer::String(CXFA_FMToken *t, const FX_WCHAR* p, const FX_WCHAR* &pEnd) { - FX_LPCWSTR pStart = p; + const FX_WCHAR* pStart = p; uint16_t ch = 0; XFA_FMDChar::inc(p); ch = XFA_FMDChar::get(p); @@ -479,9 +479,9 @@ NEXT: t->m_wstring = CFX_WideStringC(pStart, (pEnd - pStart)); return 0; } -FX_DWORD CXFA_FMLexer::Identifiers(CXFA_FMToken *t, FX_LPCWSTR p, FX_LPCWSTR &pEnd) +FX_DWORD CXFA_FMLexer::Identifiers(CXFA_FMToken *t, const FX_WCHAR* p, const FX_WCHAR* &pEnd) { - FX_LPCWSTR pStart = p; + const FX_WCHAR* pStart = p; uint16_t ch = 0; ch = XFA_FMDChar::get(p); XFA_FMDChar::inc(p); @@ -512,7 +512,7 @@ FX_DWORD CXFA_FMLexer::Identifiers(CXFA_FMToken *t, FX_LPCWSTR p, FX_LPCWSTR &pE t->m_wstring = CFX_WideStringC(pStart, (pEnd - pStart)); return 0; } -void CXFA_FMLexer::Comment( FX_LPCWSTR p, FX_LPCWSTR &pEnd ) +void CXFA_FMLexer::Comment( const FX_WCHAR* p, const FX_WCHAR* &pEnd ) { unsigned ch = 0; XFA_FMDChar::inc(p); @@ -574,7 +574,7 @@ CXFA_FMLexer::~CXFA_FMLexer() void CXFA_FMLexer::Error(XFA_FM_ERRMSG msg, ...) { m_pErrorInfo->linenum = m_uCurrentLine; - FX_LPCWSTR lpMessageInfo = XFA_FM_ErrorMsg(msg); + const FX_WCHAR* lpMessageInfo = XFA_FM_ErrorMsg(msg); va_list ap; va_start(ap, msg); m_pErrorInfo->message.FormatV(lpMessageInfo, ap); diff --git a/xfa/src/fxfa/src/fm2js/xfa_lexer.h b/xfa/src/fxfa/src/fm2js/xfa_lexer.h index 709307046b..2850ce5f75 100644 --- a/xfa/src/fxfa/src/fm2js/xfa_lexer.h +++ b/xfa/src/fxfa/src/fm2js/xfa_lexer.h @@ -24,9 +24,9 @@ enum XFA_FM_TOKEN { struct XFA_FMKeyword { XFA_FM_TOKEN m_type; uint32_t m_uHash; - FX_LPCWSTR m_keword; + const FX_WCHAR* m_keword; }; -FX_LPCWSTR XFA_FM_KeywordToString(XFA_FM_TOKEN op); +const FX_WCHAR* XFA_FM_KeywordToString(XFA_FM_TOKEN op); class CXFA_FMToken { public: @@ -44,10 +44,10 @@ public: CXFA_FMLexer(FX_WSTR wsFormcalc, CXFA_FMErrorInfo *pErrorInfo); ~CXFA_FMLexer(); CXFA_FMToken* NextToken(); - FX_DWORD Number(CXFA_FMToken *t, FX_LPCWSTR p, FX_LPCWSTR &pEnd); - FX_DWORD String(CXFA_FMToken *t, FX_LPCWSTR p, FX_LPCWSTR &pEnd); - FX_DWORD Identifiers(CXFA_FMToken *t, FX_LPCWSTR p, FX_LPCWSTR &pEnd); - void Comment(FX_LPCWSTR p, FX_LPCWSTR &pEnd); + FX_DWORD Number(CXFA_FMToken *t, const FX_WCHAR* p, const FX_WCHAR* &pEnd); + FX_DWORD String(CXFA_FMToken *t, const FX_WCHAR* p, const FX_WCHAR* &pEnd); + FX_DWORD Identifiers(CXFA_FMToken *t, const FX_WCHAR* p, const FX_WCHAR* &pEnd); + void Comment(const FX_WCHAR* p, const FX_WCHAR* &pEnd); XFA_FM_TOKEN IsKeyword(FX_WSTR p); void SetCurrentLine(FX_DWORD line) { @@ -60,11 +60,11 @@ public: } m_pToken = pToken; } - FX_LPCWSTR SavePos() + const FX_WCHAR* SavePos() { return m_ptr; } - void RestorePos(FX_LPCWSTR pPos) + void RestorePos(const FX_WCHAR* pPos) { m_ptr = pPos; } @@ -72,8 +72,8 @@ public: FX_BOOL HasError() const; protected: CXFA_FMToken* Scan(); - FX_LPCWSTR m_pScript; - FX_LPCWSTR m_ptr; + const FX_WCHAR* m_pScript; + const FX_WCHAR* m_ptr; FX_STRSIZE m_uLength; FX_DWORD m_uCurrentLine; CXFA_FMToken* m_pToken; diff --git a/xfa/src/fxfa/src/fm2js/xfa_simpleexpression.h b/xfa/src/fxfa/src/fm2js/xfa_simpleexpression.h index 7d9f9d5f79..bacd1d3c38 100644 --- a/xfa/src/fxfa/src/fm2js/xfa_simpleexpression.h +++ b/xfa/src/fxfa/src/fm2js/xfa_simpleexpression.h @@ -36,11 +36,11 @@ enum XFA_FM_SimpleExpressionType { CFX_WideStringC XFA_FM_EXPTypeToString(XFA_FM_SimpleExpressionType simpleExpType); struct XFA_FMBuildInFunc { uint32_t m_uHash; - FX_LPCWSTR m_buildinfunc; + const FX_WCHAR* m_buildinfunc; }; struct XFA_FMSOMMethod { uint32_t m_uHash; - FX_LPCWSTR m_wsSomMethodName; + const FX_WCHAR* m_wsSomMethodName; FX_DWORD m_dParameters; }; enum XFA_FM_AccessorIndex { diff --git a/xfa/src/fxfa/src/parser/xfa_basic_data.cpp b/xfa/src/fxfa/src/parser/xfa_basic_data.cpp index c061b80a34..a53041e26d 100644 --- a/xfa/src/fxfa/src/parser/xfa_basic_data.cpp +++ b/xfa/src/fxfa/src/parser/xfa_basic_data.cpp @@ -304,300 +304,300 @@ static const CXFA_Measurement g_XFAMeasurementData[] = { CXFA_Measurement(0.5, XFA_UNIT_Pt), }; extern const XFA_ATTRIBUTEINFO g_XFAAttributeData[] = { - {0x68, L"h", XFA_ATTRIBUTE_H, XFA_ATTRIBUTETYPE_Measure, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)(g_XFAMeasurementData + 0)}, - {0x77, L"w", XFA_ATTRIBUTE_W, XFA_ATTRIBUTETYPE_Measure, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)(g_XFAMeasurementData + 0)}, - {0x78, L"x", XFA_ATTRIBUTE_X, XFA_ATTRIBUTETYPE_Measure, XFA_XDPPACKET_Config | XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)(g_XFAMeasurementData + 0)}, - {0x79, L"y", XFA_ATTRIBUTE_Y, XFA_ATTRIBUTETYPE_Measure, XFA_XDPPACKET_Config | XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)(g_XFAMeasurementData + 0)}, - {0x21aed, L"id", XFA_ATTRIBUTE_Id, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, (FX_LPVOID)NULL}, - {0x25363, L"to", XFA_ATTRIBUTE_To, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Config, (FX_LPVOID)NULL}, - {0xcb0ac9, L"lineThrough", XFA_ATTRIBUTE_LineThrough, XFA_ATTRIBUTETYPE_Integer, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)0}, - {0x2282c73, L"hAlign", XFA_ATTRIBUTE_HAlign, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)XFA_ATTRIBUTEENUM_Left}, - {0x2c1c7f1, L"typeface", XFA_ATTRIBUTE_Typeface, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Config | XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)L"Courier"}, - {0x3106c3a, L"beforeTarget", XFA_ATTRIBUTE_BeforeTarget, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)NULL}, - {0x31b19c1, L"name", XFA_ATTRIBUTE_Name, XFA_ATTRIBUTETYPE_NOTSURE, XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet | XFA_XDPPACKET_Template | XFA_XDPPACKET_Datasets | XFA_XDPPACKET_Form | XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, (FX_LPVOID)NULL}, - {0x3848b3f, L"next", XFA_ATTRIBUTE_Next, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)XFA_ATTRIBUTEENUM_None}, - {0x43e349b, L"dataRowCount", XFA_ATTRIBUTE_DataRowCount, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)NULL}, - {0x5518c25, L"break", XFA_ATTRIBUTE_Break, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)XFA_ATTRIBUTEENUM_Close}, - {0x5ce6195, L"vScrollPolicy", XFA_ATTRIBUTE_VScrollPolicy, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)XFA_ATTRIBUTEENUM_Auto}, - {0x8c74ae9, L"fontHorizontalScale", XFA_ATTRIBUTE_FontHorizontalScale, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)L"100%"}, - {0x8d4f1c7, L"textIndent", XFA_ATTRIBUTE_TextIndent, XFA_ATTRIBUTETYPE_Measure, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)(g_XFAMeasurementData + 0)}, - {0x97c1c65, L"context", XFA_ATTRIBUTE_Context, XFA_ATTRIBUTETYPE_Integer, XFA_XDPPACKET_UNKNOWN, (FX_LPVOID)0}, - {0x9876578, L"trayOut", XFA_ATTRIBUTE_TrayOut, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)XFA_ATTRIBUTEENUM_Auto}, - {0xa2e3514, L"cap", XFA_ATTRIBUTE_Cap, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)XFA_ATTRIBUTEENUM_Square}, - {0xb3543a6, L"max", XFA_ATTRIBUTE_Max, XFA_ATTRIBUTETYPE_NOTSURE, XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)NULL}, - {0xb356ca4, L"min", XFA_ATTRIBUTE_Min, XFA_ATTRIBUTETYPE_Integer, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)1}, - {0xbb8df5d, L"ref", XFA_ATTRIBUTE_Ref, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Config | XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)NULL}, - {0xbb8f3df, L"rid", XFA_ATTRIBUTE_Rid, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)NULL}, - {0xc080cd3, L"url", XFA_ATTRIBUTE_Url, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)NULL}, - {0xc0811ed, L"use", XFA_ATTRIBUTE_Use, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, (FX_LPVOID)NULL}, - {0xcfea02e, L"leftInset", XFA_ATTRIBUTE_LeftInset, XFA_ATTRIBUTETYPE_Measure, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)(g_XFAMeasurementData + 0)}, - {0x1026c59d, L"widows", XFA_ATTRIBUTE_Widows, XFA_ATTRIBUTETYPE_Integer, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)0}, - {0x1059ec18, L"level", XFA_ATTRIBUTE_Level, XFA_ATTRIBUTETYPE_Integer, XFA_XDPPACKET_Config, (FX_LPVOID)0}, - {0x1356caf8, L"bottomInset", XFA_ATTRIBUTE_BottomInset, XFA_ATTRIBUTETYPE_Measure, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)(g_XFAMeasurementData + 0)}, - {0x13a08bdb, L"overflowTarget", XFA_ATTRIBUTE_OverflowTarget, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)NULL}, - {0x1414d431, L"allowMacro", XFA_ATTRIBUTE_AllowMacro, XFA_ATTRIBUTETYPE_Boolean, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)0}, - {0x14a32d52, L"pagePosition", XFA_ATTRIBUTE_PagePosition, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)XFA_ATTRIBUTEENUM_Any}, - {0x1517dfa1, L"columnWidths", XFA_ATTRIBUTE_ColumnWidths, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)NULL}, - {0x169134a1, L"overflowLeader", XFA_ATTRIBUTE_OverflowLeader, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)NULL}, - {0x1b8dce3e, L"action", XFA_ATTRIBUTE_Action, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)XFA_ATTRIBUTEENUM_Include}, - {0x1e459b8f, L"nonRepudiation", XFA_ATTRIBUTE_NonRepudiation, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)NULL}, - {0x1ec8ab2c, L"rate", XFA_ATTRIBUTE_Rate, XFA_ATTRIBUTETYPE_Integer, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)50}, - {0x1ef3a64a, L"allowRichText", XFA_ATTRIBUTE_AllowRichText, XFA_ATTRIBUTETYPE_Boolean, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)0}, - {0x2038c9b2, L"role", XFA_ATTRIBUTE_Role, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)NULL}, - {0x20914367, L"overflowTrailer", XFA_ATTRIBUTE_OverflowTrailer, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)NULL}, - {0x226ca8f1, L"operation", XFA_ATTRIBUTE_Operation, XFA_ATTRIBUTETYPE_NOTSURE, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)NULL}, - {0x24d85167, L"timeout", XFA_ATTRIBUTE_Timeout, XFA_ATTRIBUTETYPE_NOTSURE, XFA_XDPPACKET_SourceSet, (FX_LPVOID)NULL}, - {0x25764436, L"topInset", XFA_ATTRIBUTE_TopInset, XFA_ATTRIBUTETYPE_Measure, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)(g_XFAMeasurementData + 0)}, - {0x25839852, L"access", XFA_ATTRIBUTE_Access, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)XFA_ATTRIBUTEENUM_Open}, - {0x268b7ec1, L"commandType", XFA_ATTRIBUTE_CommandType, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_SourceSet, (FX_LPVOID)XFA_ATTRIBUTEENUM_Unknown}, - {0x28dee6e9, L"format", XFA_ATTRIBUTE_Format, XFA_ATTRIBUTETYPE_NOTSURE, XFA_XDPPACKET_Config | XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)NULL}, - {0x28e17e91, L"dataPrep", XFA_ATTRIBUTE_DataPrep, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)XFA_ATTRIBUTEENUM_None}, - {0x292b88fe, L"widgetData", XFA_ATTRIBUTE_WidgetData, XFA_ATTRIBUTETYPE_Integer, XFA_XDPPACKET_UNKNOWN, (FX_LPVOID)0}, - {0x29418bb7, L"abbr", XFA_ATTRIBUTE_Abbr, XFA_ATTRIBUTETYPE_Boolean, XFA_XDPPACKET_LocaleSet, (FX_LPVOID)0}, - {0x2a82d99c, L"marginRight", XFA_ATTRIBUTE_MarginRight, XFA_ATTRIBUTETYPE_Measure, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)(g_XFAMeasurementData + 0)}, - {0x2b5df51e, L"dataDescription", XFA_ATTRIBUTE_DataDescription, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_ConnectionSet, (FX_LPVOID)NULL}, - {0x2bb3f470, L"encipherOnly", XFA_ATTRIBUTE_EncipherOnly, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)NULL}, - {0x2cd79033, L"kerningMode", XFA_ATTRIBUTE_KerningMode, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)XFA_ATTRIBUTEENUM_None}, - {0x2ee7678f, L"rotate", XFA_ATTRIBUTE_Rotate, XFA_ATTRIBUTETYPE_Measure, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)(g_XFAMeasurementData + 5)}, - {0x2f105f72, L"wordCharacterCount", XFA_ATTRIBUTE_WordCharacterCount, XFA_ATTRIBUTETYPE_Integer, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)7}, - {0x2f16a382, L"type", XFA_ATTRIBUTE_Type, XFA_ATTRIBUTETYPE_NOTSURE, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)NULL}, - {0x34ae103c, L"reserve", XFA_ATTRIBUTE_Reserve, XFA_ATTRIBUTETYPE_Measure, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)(g_XFAMeasurementData + 4)}, - {0x3650557e, L"textLocation", XFA_ATTRIBUTE_TextLocation, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)XFA_ATTRIBUTEENUM_Below}, - {0x39cdb0a2, L"priority", XFA_ATTRIBUTE_Priority, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)XFA_ATTRIBUTEENUM_Custom}, - {0x3a0273a6, L"underline", XFA_ATTRIBUTE_Underline, XFA_ATTRIBUTETYPE_Integer, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)0}, - {0x3b582286, L"moduleWidth", XFA_ATTRIBUTE_ModuleWidth, XFA_ATTRIBUTETYPE_Measure, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)(g_XFAMeasurementData + 3)}, - {0x3d123c26, L"hyphenate", XFA_ATTRIBUTE_Hyphenate, XFA_ATTRIBUTETYPE_Boolean, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)0}, - {0x3e7af94f, L"listen", XFA_ATTRIBUTE_Listen, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)XFA_ATTRIBUTEENUM_RefOnly}, - {0x4156ee3f, L"delimiter", XFA_ATTRIBUTE_Delimiter, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)NULL}, - {0x42fed1fd, L"contentType", XFA_ATTRIBUTE_ContentType, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | XFA_XDPPACKET_Datasets | XFA_XDPPACKET_Form, (FX_LPVOID)NULL}, - {0x453eaf38, L"startNew", XFA_ATTRIBUTE_StartNew, XFA_ATTRIBUTETYPE_Boolean, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)0}, - {0x45a6daf8, L"eofAction", XFA_ATTRIBUTE_EofAction, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_SourceSet, (FX_LPVOID)XFA_ATTRIBUTEENUM_MoveLast}, - {0x47cfa43a, L"allowNeutral", XFA_ATTRIBUTE_AllowNeutral, XFA_ATTRIBUTETYPE_Boolean, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)0}, - {0x47d03490, L"connection", XFA_ATTRIBUTE_Connection, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)NULL}, - {0x4873c601, L"baselineShift", XFA_ATTRIBUTE_BaselineShift, XFA_ATTRIBUTETYPE_Measure, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)(g_XFAMeasurementData + 0)}, - {0x4b319767, L"overlinePeriod", XFA_ATTRIBUTE_OverlinePeriod, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)XFA_ATTRIBUTEENUM_All}, - {0x4b8bc840, L"fracDigits", XFA_ATTRIBUTE_FracDigits, XFA_ATTRIBUTETYPE_Integer, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)2}, - {0x4ef3d02c, L"orientation", XFA_ATTRIBUTE_Orientation, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)XFA_ATTRIBUTEENUM_Portrait}, - {0x4fdc3454, L"timeStamp", XFA_ATTRIBUTE_TimeStamp, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_XDP, (FX_LPVOID)NULL}, - {0x52666f1c, L"printCheckDigit", XFA_ATTRIBUTE_PrintCheckDigit, XFA_ATTRIBUTETYPE_Boolean, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)0}, - {0x534729c9, L"marginLeft", XFA_ATTRIBUTE_MarginLeft, XFA_ATTRIBUTETYPE_Measure, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)(g_XFAMeasurementData + 0)}, - {0x5392ea58, L"stroke", XFA_ATTRIBUTE_Stroke, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)XFA_ATTRIBUTEENUM_Solid}, - {0x5404d6df, L"moduleHeight", XFA_ATTRIBUTE_ModuleHeight, XFA_ATTRIBUTETYPE_Measure, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)(g_XFAMeasurementData + 2)}, - {0x54fa722c, L"transferEncoding", XFA_ATTRIBUTE_TransferEncoding, XFA_ATTRIBUTETYPE_NOTSURE, XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)NULL}, - {0x552d9ad5, L"usage", XFA_ATTRIBUTE_Usage, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)XFA_ATTRIBUTEENUM_ExportAndImport}, - {0x570ce835, L"presence", XFA_ATTRIBUTE_Presence, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)XFA_ATTRIBUTEENUM_Visible}, - {0x5739d1ff, L"radixOffset", XFA_ATTRIBUTE_RadixOffset, XFA_ATTRIBUTETYPE_Measure, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)(g_XFAMeasurementData + 0)}, - {0x577682ac, L"preserve", XFA_ATTRIBUTE_Preserve, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)NULL}, - {0x58be2870, L"aliasNode", XFA_ATTRIBUTE_AliasNode, XFA_ATTRIBUTETYPE_Integer, XFA_XDPPACKET_UNKNOWN, (FX_LPVOID)0}, - {0x5a32e493, L"multiLine", XFA_ATTRIBUTE_MultiLine, XFA_ATTRIBUTETYPE_Boolean, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)0}, - {0x5a50e9e6, L"version", XFA_ATTRIBUTE_Version, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)NULL}, - {0x5ab23b6c, L"startChar", XFA_ATTRIBUTE_StartChar, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)NULL}, - {0x5b707a35, L"scriptTest", XFA_ATTRIBUTE_ScriptTest, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)XFA_ATTRIBUTEENUM_Error}, - {0x5c054755, L"startAngle", XFA_ATTRIBUTE_StartAngle, XFA_ATTRIBUTETYPE_Measure, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)(g_XFAMeasurementData + 5)}, - {0x5ec958c0, L"cursorType", XFA_ATTRIBUTE_CursorType, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_SourceSet, (FX_LPVOID)XFA_ATTRIBUTEENUM_ForwardOnly}, - {0x5f760b50, L"digitalSignature", XFA_ATTRIBUTE_DigitalSignature, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)NULL}, - {0x60a61edd, L"codeType", XFA_ATTRIBUTE_CodeType, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)NULL}, - {0x60d4c8b1, L"output", XFA_ATTRIBUTE_Output, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_ConnectionSet, (FX_LPVOID)NULL}, - {0x64110ab5, L"bookendTrailer", XFA_ATTRIBUTE_BookendTrailer, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)NULL}, - {0x65e30c67, L"imagingBBox", XFA_ATTRIBUTE_ImagingBBox, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)L"none"}, - {0x66539c48, L"excludeInitialCap", XFA_ATTRIBUTE_ExcludeInitialCap, XFA_ATTRIBUTETYPE_Boolean, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)0}, - {0x66642f8f, L"force", XFA_ATTRIBUTE_Force, XFA_ATTRIBUTETYPE_Boolean, XFA_XDPPACKET_Config, (FX_LPVOID)NULL}, - {0x69aa2292, L"crlSign", XFA_ATTRIBUTE_CrlSign, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)NULL}, - {0x6a3405dd, L"previous", XFA_ATTRIBUTE_Previous, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)XFA_ATTRIBUTEENUM_None}, - {0x6a95c976, L"pushCharacterCount", XFA_ATTRIBUTE_PushCharacterCount, XFA_ATTRIBUTETYPE_Integer, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)3}, - {0x6b6ddcfb, L"nullTest", XFA_ATTRIBUTE_NullTest, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)XFA_ATTRIBUTEENUM_Disabled}, - {0x6cfa828a, L"runAt", XFA_ATTRIBUTE_RunAt, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)XFA_ATTRIBUTEENUM_Client}, - {0x731e0665, L"spaceBelow", XFA_ATTRIBUTE_SpaceBelow, XFA_ATTRIBUTETYPE_Measure, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)(g_XFAMeasurementData + 0)}, - {0x74788f8b, L"sweepAngle", XFA_ATTRIBUTE_SweepAngle, XFA_ATTRIBUTETYPE_Measure, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)(g_XFAMeasurementData + 7)}, - {0x78bff531, L"numberOfCells", XFA_ATTRIBUTE_NumberOfCells, XFA_ATTRIBUTETYPE_Integer, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)0}, - {0x79543055, L"letterSpacing", XFA_ATTRIBUTE_LetterSpacing, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)NULL}, - {0x79975f2b, L"lockType", XFA_ATTRIBUTE_LockType, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_SourceSet, (FX_LPVOID)XFA_ATTRIBUTEENUM_ReadOnly}, - {0x7a0cc471, L"passwordChar", XFA_ATTRIBUTE_PasswordChar, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)L"*"}, - {0x7a7cc341, L"vAlign", XFA_ATTRIBUTE_VAlign, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)XFA_ATTRIBUTEENUM_Top}, - {0x7b29630a, L"sourceBelow", XFA_ATTRIBUTE_SourceBelow, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Config, (FX_LPVOID)XFA_ATTRIBUTEENUM_Update}, - {0x7b95e661, L"inverted", XFA_ATTRIBUTE_Inverted, XFA_ATTRIBUTETYPE_Boolean, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)0}, - {0x7c2fd80b, L"mark", XFA_ATTRIBUTE_Mark, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)XFA_ATTRIBUTEENUM_Default}, - {0x7c2ff6ae, L"maxH", XFA_ATTRIBUTE_MaxH, XFA_ATTRIBUTETYPE_Measure, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)(g_XFAMeasurementData + 0)}, - {0x7c2ff6bd, L"maxW", XFA_ATTRIBUTE_MaxW, XFA_ATTRIBUTETYPE_Measure, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)(g_XFAMeasurementData + 0)}, - {0x7c732a66, L"truncate", XFA_ATTRIBUTE_Truncate, XFA_ATTRIBUTETYPE_Boolean, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)0}, - {0x7d02356c, L"minH", XFA_ATTRIBUTE_MinH, XFA_ATTRIBUTETYPE_Measure, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)(g_XFAMeasurementData + 0)}, - {0x7d02357b, L"minW", XFA_ATTRIBUTE_MinW, XFA_ATTRIBUTETYPE_Measure, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)(g_XFAMeasurementData + 0)}, - {0x7d0b5fca, L"initial", XFA_ATTRIBUTE_Initial, XFA_ATTRIBUTETYPE_Integer, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)1}, - {0x7d9fd7c5, L"mode", XFA_ATTRIBUTE_Mode, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Config, (FX_LPVOID)XFA_ATTRIBUTEENUM_UsePrinterSetting}, - {0x7e7e845e, L"layout", XFA_ATTRIBUTE_Layout, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)XFA_ATTRIBUTEENUM_Position}, - {0x7f6fd3d7, L"server", XFA_ATTRIBUTE_Server, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)NULL}, - {0x824f21b7, L"embedPDF", XFA_ATTRIBUTE_EmbedPDF, XFA_ATTRIBUTETYPE_Boolean, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)0}, - {0x8340ea66, L"oddOrEven", XFA_ATTRIBUTE_OddOrEven, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)XFA_ATTRIBUTEENUM_Any}, - {0x836d4d7c, L"tabDefault", XFA_ATTRIBUTE_TabDefault, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)NULL}, - {0x8855805f, L"contains", XFA_ATTRIBUTE_Contains, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Datasets, (FX_LPVOID)XFA_ATTRIBUTEENUM_Data}, - {0x8a692521, L"rightInset", XFA_ATTRIBUTE_RightInset, XFA_ATTRIBUTETYPE_Measure, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)(g_XFAMeasurementData + 0)}, - {0x8af2e657, L"maxChars", XFA_ATTRIBUTE_MaxChars, XFA_ATTRIBUTETYPE_Integer, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)0}, - {0x8b90e1f2, L"open", XFA_ATTRIBUTE_Open, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)XFA_ATTRIBUTEENUM_UserControl}, - {0x8c99377e, L"relation", XFA_ATTRIBUTE_Relation, XFA_ATTRIBUTETYPE_NOTSURE, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)NULL}, - {0x8d181d61, L"wideNarrowRatio", XFA_ATTRIBUTE_WideNarrowRatio, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)L"3:1"}, - {0x8e1c2921, L"relevant", XFA_ATTRIBUTE_Relevant, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)NULL}, - {0x8e29d794, L"signatureType", XFA_ATTRIBUTE_SignatureType, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)XFA_ATTRIBUTEENUM_Filter}, - {0x8ec6204c, L"lineThroughPeriod", XFA_ATTRIBUTE_LineThroughPeriod, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)XFA_ATTRIBUTEENUM_All}, - {0x8ed182d1, L"shape", XFA_ATTRIBUTE_Shape, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)XFA_ATTRIBUTEENUM_Square}, - {0x8fa01790, L"tabStops", XFA_ATTRIBUTE_TabStops, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)NULL}, - {0x8fc36c0a, L"outputBelow", XFA_ATTRIBUTE_OutputBelow, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Config, (FX_LPVOID)XFA_ATTRIBUTEENUM_Warn}, - {0x9041d4b0, L"short", XFA_ATTRIBUTE_Short, XFA_ATTRIBUTETYPE_Measure, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)(g_XFAMeasurementData + 0)}, - {0x907c7719, L"fontVerticalScale", XFA_ATTRIBUTE_FontVerticalScale, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)L"100%"}, - {0x94446dcc, L"thickness", XFA_ATTRIBUTE_Thickness, XFA_ATTRIBUTETYPE_Measure, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)(g_XFAMeasurementData + 8)}, - {0x957fa006, L"commitOn", XFA_ATTRIBUTE_CommitOn, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)XFA_ATTRIBUTEENUM_Select}, - {0x982bd892, L"remainCharacterCount", XFA_ATTRIBUTE_RemainCharacterCount, XFA_ATTRIBUTETYPE_Integer, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)3}, - {0x98fd4d81, L"keyAgreement", XFA_ATTRIBUTE_KeyAgreement, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)NULL}, - {0x99800d7a, L"errorCorrectionLevel", XFA_ATTRIBUTE_ErrorCorrectionLevel, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)NULL}, - {0x9a63da3d, L"upsMode", XFA_ATTRIBUTE_UpsMode, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)XFA_ATTRIBUTEENUM_UsCarrier}, - {0x9cc17d75, L"mergeMode", XFA_ATTRIBUTE_MergeMode, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)XFA_ATTRIBUTEENUM_ConsumeData}, - {0x9d833d75, L"circular", XFA_ATTRIBUTE_Circular, XFA_ATTRIBUTETYPE_Boolean, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)0}, - {0x9d8ee204, L"psName", XFA_ATTRIBUTE_PsName, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Config, (FX_LPVOID)NULL}, - {0x9dcc3ab3, L"trailer", XFA_ATTRIBUTE_Trailer, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)NULL}, - {0xa0933954, L"unicodeRange", XFA_ATTRIBUTE_UnicodeRange, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Config, (FX_LPVOID)NULL}, - {0xa1b0d2f5, L"executeType", XFA_ATTRIBUTE_ExecuteType, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)XFA_ATTRIBUTEENUM_Import}, - {0xa25a883d, L"duplexImposition", XFA_ATTRIBUTE_DuplexImposition, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)XFA_ATTRIBUTEENUM_LongEdge}, - {0xa42ca1b7, L"trayIn", XFA_ATTRIBUTE_TrayIn, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)XFA_ATTRIBUTEENUM_Auto}, - {0xa433f001, L"bindingNode", XFA_ATTRIBUTE_BindingNode, XFA_ATTRIBUTETYPE_Integer, XFA_XDPPACKET_UNKNOWN, (FX_LPVOID)0}, - {0xa5340ff5, L"bofAction", XFA_ATTRIBUTE_BofAction, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_SourceSet, (FX_LPVOID)XFA_ATTRIBUTEENUM_MoveFirst}, - {0xa5b410cf, L"save", XFA_ATTRIBUTE_Save, XFA_ATTRIBUTETYPE_Boolean, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)0}, - {0xa6118c89, L"targetType", XFA_ATTRIBUTE_TargetType, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)XFA_ATTRIBUTEENUM_Auto}, - {0xa66404cb, L"keyEncipherment", XFA_ATTRIBUTE_KeyEncipherment, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)NULL}, - {0xa6710262, L"credentialServerPolicy", XFA_ATTRIBUTE_CredentialServerPolicy, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)XFA_ATTRIBUTEENUM_Optional}, - {0xa686975b, L"size", XFA_ATTRIBUTE_Size, XFA_ATTRIBUTETYPE_Measure, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)(g_XFAMeasurementData + 6)}, - {0xa85e74f3, L"initialNumber", XFA_ATTRIBUTE_InitialNumber, XFA_ATTRIBUTETYPE_Integer, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)1}, - {0xabef37e3, L"slope", XFA_ATTRIBUTE_Slope, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)XFA_ATTRIBUTEENUM_Backslash}, - {0xabfa6c4f, L"cSpace", XFA_ATTRIBUTE_CSpace, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)L"SRGB"}, - {0xac06e2b0, L"colSpan", XFA_ATTRIBUTE_ColSpan, XFA_ATTRIBUTETYPE_Integer, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)1}, - {0xadc4c77b, L"binding", XFA_ATTRIBUTE_Binding, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)NULL}, - {0xaf754613, L"checksum", XFA_ATTRIBUTE_Checksum, XFA_ATTRIBUTETYPE_NOTSURE, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form | XFA_XDPPACKET_Form, (FX_LPVOID)NULL}, - {0xb045fbc5, L"charEncoding", XFA_ATTRIBUTE_CharEncoding, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)L"UTF-8"}, - {0xb0e5485d, L"bind", XFA_ATTRIBUTE_Bind, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_SourceSet, (FX_LPVOID)NULL}, - {0xb12128b7, L"textEntry", XFA_ATTRIBUTE_TextEntry, XFA_ATTRIBUTETYPE_Boolean, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)0}, - {0xb373a862, L"archive", XFA_ATTRIBUTE_Archive, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)NULL}, - {0xb598a1f7, L"uuid", XFA_ATTRIBUTE_Uuid, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_XDP, (FX_LPVOID)NULL}, - {0xb5e49bf2, L"posture", XFA_ATTRIBUTE_Posture, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Config | XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)XFA_ATTRIBUTEENUM_Normal}, - {0xb6b44172, L"after", XFA_ATTRIBUTE_After, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)XFA_ATTRIBUTEENUM_Auto}, - {0xb716467b, L"orphans", XFA_ATTRIBUTE_Orphans, XFA_ATTRIBUTETYPE_Integer, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)0}, - {0xbc0c4695, L"qualifiedName", XFA_ATTRIBUTE_QualifiedName, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_UNKNOWN, (FX_LPVOID)NULL}, - {0xbc254332, L"usehref", XFA_ATTRIBUTE_Usehref, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, (FX_LPVOID)NULL}, - {0xbc8fa350, L"locale", XFA_ATTRIBUTE_Locale, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)NULL}, - {0xbd6e1d88, L"weight", XFA_ATTRIBUTE_Weight, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Config | XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)XFA_ATTRIBUTEENUM_Normal}, - {0xbd96a0e9, L"underlinePeriod", XFA_ATTRIBUTE_UnderlinePeriod, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)XFA_ATTRIBUTEENUM_All}, - {0xbde9abda, L"data", XFA_ATTRIBUTE_Data, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)XFA_ATTRIBUTEENUM_Link}, - {0xbe52dfbf, L"desc", XFA_ATTRIBUTE_Desc, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, (FX_LPVOID)NULL}, - {0xbe9ba472, L"numbered", XFA_ATTRIBUTE_Numbered, XFA_ATTRIBUTETYPE_Integer, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)1}, - {0xc035c6b1, L"dataColumnCount", XFA_ATTRIBUTE_DataColumnCount, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)NULL}, - {0xc0ec9fa4, L"overline", XFA_ATTRIBUTE_Overline, XFA_ATTRIBUTETYPE_Integer, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)0}, - {0xc2ba0923, L"urlPolicy", XFA_ATTRIBUTE_UrlPolicy, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)NULL}, - {0xc2bd40fd, L"anchorType", XFA_ATTRIBUTE_AnchorType, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)XFA_ATTRIBUTEENUM_TopLeft}, - {0xc39a88bd, L"labelRef", XFA_ATTRIBUTE_LabelRef, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)NULL}, - {0xc3c1442f, L"bookendLeader", XFA_ATTRIBUTE_BookendLeader, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)NULL}, - {0xc4547a08, L"maxLength", XFA_ATTRIBUTE_MaxLength, XFA_ATTRIBUTETYPE_Integer, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID) - 1}, - {0xc4fed09b, L"accessKey", XFA_ATTRIBUTE_AccessKey, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)NULL}, - {0xc5762157, L"cursorLocation", XFA_ATTRIBUTE_CursorLocation, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_SourceSet, (FX_LPVOID)XFA_ATTRIBUTEENUM_Client}, - {0xc860f30a, L"delayedOpen", XFA_ATTRIBUTE_DelayedOpen, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_SourceSet, (FX_LPVOID)NULL}, - {0xc8da4da7, L"target", XFA_ATTRIBUTE_Target, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)NULL}, - {0xca5dc27c, L"dataEncipherment", XFA_ATTRIBUTE_DataEncipherment, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)NULL}, - {0xcb150479, L"afterTarget", XFA_ATTRIBUTE_AfterTarget, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)NULL}, - {0xcbcaf66d, L"leader", XFA_ATTRIBUTE_Leader, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)NULL}, - {0xcca7897e, L"picker", XFA_ATTRIBUTE_Picker, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)XFA_ATTRIBUTEENUM_Host}, - {0xcd7f7b54, L"from", XFA_ATTRIBUTE_From, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Config, (FX_LPVOID)NULL}, - {0xcea5e62c, L"baseProfile", XFA_ATTRIBUTE_BaseProfile, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)XFA_ATTRIBUTEENUM_Full}, - {0xd171b240, L"aspect", XFA_ATTRIBUTE_Aspect, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)XFA_ATTRIBUTEENUM_Fit}, - {0xd3c84d25, L"rowColumnRatio", XFA_ATTRIBUTE_RowColumnRatio, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)NULL}, - {0xd4b01921, L"lineHeight", XFA_ATTRIBUTE_LineHeight, XFA_ATTRIBUTETYPE_Measure, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)(g_XFAMeasurementData + 1)}, - {0xd4cc53f8, L"highlight", XFA_ATTRIBUTE_Highlight, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)XFA_ATTRIBUTEENUM_Inverted}, - {0xd50f903a, L"valueRef", XFA_ATTRIBUTE_ValueRef, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)NULL}, - {0xd52482e0, L"maxEntries", XFA_ATTRIBUTE_MaxEntries, XFA_ATTRIBUTETYPE_Integer, XFA_XDPPACKET_Config, (FX_LPVOID)5}, - {0xd57c513c, L"dataLength", XFA_ATTRIBUTE_DataLength, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)NULL}, - {0xd6128d8d, L"activity", XFA_ATTRIBUTE_Activity, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)XFA_ATTRIBUTEENUM_Click}, - {0xd6a39990, L"input", XFA_ATTRIBUTE_Input, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_ConnectionSet, (FX_LPVOID)NULL}, - {0xd6e27f1d, L"value", XFA_ATTRIBUTE_Value, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet | XFA_XDPPACKET_Template | XFA_XDPPACKET_Datasets | XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, (FX_LPVOID)NULL}, - {0xd70798c2, L"blankOrNotBlank", XFA_ATTRIBUTE_BlankOrNotBlank, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)XFA_ATTRIBUTEENUM_Any}, - {0xd861f8af, L"addRevocationInfo", XFA_ATTRIBUTE_AddRevocationInfo, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)NULL}, - {0xd8f982bf, L"genericFamily", XFA_ATTRIBUTE_GenericFamily, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Config, (FX_LPVOID)XFA_ATTRIBUTEENUM_Serif}, - {0xd996fa9b, L"hand", XFA_ATTRIBUTE_Hand, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)XFA_ATTRIBUTEENUM_Even}, - {0xdb55fec5, L"href", XFA_ATTRIBUTE_Href, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)NULL}, - {0xdc75676c, L"textEncoding", XFA_ATTRIBUTE_TextEncoding, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)NULL}, - {0xde7f92ba, L"leadDigits", XFA_ATTRIBUTE_LeadDigits, XFA_ATTRIBUTETYPE_Integer, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID) - 1}, - {0xe11a2cbc, L"permissions", XFA_ATTRIBUTE_Permissions, XFA_ATTRIBUTETYPE_Integer, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)2}, - {0xe18b5659, L"spaceAbove", XFA_ATTRIBUTE_SpaceAbove, XFA_ATTRIBUTETYPE_Measure, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)(g_XFAMeasurementData + 0)}, - {0xe1a26b56, L"codeBase", XFA_ATTRIBUTE_CodeBase, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)NULL}, - {0xe349d044, L"stock", XFA_ATTRIBUTE_Stock, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)NULL}, - {0xe372ae97, L"isNull", XFA_ATTRIBUTE_IsNull, XFA_ATTRIBUTETYPE_Boolean, XFA_XDPPACKET_Datasets, (FX_LPVOID)0}, - {0xe4c3a5e5, L"restoreState", XFA_ATTRIBUTE_RestoreState, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)XFA_ATTRIBUTEENUM_Manual}, - {0xe5c96d6a, L"excludeAllCaps", XFA_ATTRIBUTE_ExcludeAllCaps, XFA_ATTRIBUTETYPE_Boolean, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)0}, - {0xe64b1129, L"formatTest", XFA_ATTRIBUTE_FormatTest, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)XFA_ATTRIBUTEENUM_Warning}, - {0xe6f99487, L"hScrollPolicy", XFA_ATTRIBUTE_HScrollPolicy, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)XFA_ATTRIBUTEENUM_Auto}, - {0xe8dddf50, L"join", XFA_ATTRIBUTE_Join, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)XFA_ATTRIBUTEENUM_Square}, - {0xe8f118a8, L"keyCertSign", XFA_ATTRIBUTE_KeyCertSign, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)NULL}, - {0xe948b9a8, L"radius", XFA_ATTRIBUTE_Radius, XFA_ATTRIBUTETYPE_Measure, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)(g_XFAMeasurementData + 0)}, - {0xe996b2fe, L"sourceAbove", XFA_ATTRIBUTE_SourceAbove, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Config, (FX_LPVOID)XFA_ATTRIBUTEENUM_Warn}, - {0xea7090a0, L"override", XFA_ATTRIBUTE_Override, XFA_ATTRIBUTETYPE_NOTSURE, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)NULL}, - {0xeb091003, L"classId", XFA_ATTRIBUTE_ClassId, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)NULL}, - {0xeb511b54, L"disable", XFA_ATTRIBUTE_Disable, XFA_ATTRIBUTETYPE_Boolean, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)0}, - {0xeda9017a, L"scope", XFA_ATTRIBUTE_Scope, XFA_ATTRIBUTETYPE_NOTSURE, XFA_XDPPACKET_Config | XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)NULL}, - {0xf197844d, L"match", XFA_ATTRIBUTE_Match, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)XFA_ATTRIBUTEENUM_Once}, - {0xf2009339, L"placement", XFA_ATTRIBUTE_Placement, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)XFA_ATTRIBUTEENUM_Left}, - {0xf4ffce73, L"before", XFA_ATTRIBUTE_Before, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)XFA_ATTRIBUTEENUM_Auto}, - {0xf531b059, L"writingScript", XFA_ATTRIBUTE_WritingScript, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Config, (FX_LPVOID)XFA_ATTRIBUTEENUM_Asterisk}, - {0xf575ca75, L"endChar", XFA_ATTRIBUTE_EndChar, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)NULL}, - {0xf6b47749, L"lock", XFA_ATTRIBUTE_Lock, XFA_ATTRIBUTETYPE_Integer, XFA_XDPPACKET_Config, (FX_LPVOID)0}, - {0xf6b4afb0, L"long", XFA_ATTRIBUTE_Long, XFA_ATTRIBUTETYPE_Measure, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)(g_XFAMeasurementData + 0)}, - {0xf6b59543, L"intact", XFA_ATTRIBUTE_Intact, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)XFA_ATTRIBUTEENUM_None}, - {0xf889e747, L"xdpContent", XFA_ATTRIBUTE_XdpContent, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)NULL}, - {0xfea53ec6, L"decipherOnly", XFA_ATTRIBUTE_DecipherOnly, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (FX_LPVOID)NULL}, + {0x68, L"h", XFA_ATTRIBUTE_H, XFA_ATTRIBUTETYPE_Measure, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)(g_XFAMeasurementData + 0)}, + {0x77, L"w", XFA_ATTRIBUTE_W, XFA_ATTRIBUTETYPE_Measure, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)(g_XFAMeasurementData + 0)}, + {0x78, L"x", XFA_ATTRIBUTE_X, XFA_ATTRIBUTETYPE_Measure, XFA_XDPPACKET_Config | XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)(g_XFAMeasurementData + 0)}, + {0x79, L"y", XFA_ATTRIBUTE_Y, XFA_ATTRIBUTETYPE_Measure, XFA_XDPPACKET_Config | XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)(g_XFAMeasurementData + 0)}, + {0x21aed, L"id", XFA_ATTRIBUTE_Id, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, (void*)NULL}, + {0x25363, L"to", XFA_ATTRIBUTE_To, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Config, (void*)NULL}, + {0xcb0ac9, L"lineThrough", XFA_ATTRIBUTE_LineThrough, XFA_ATTRIBUTETYPE_Integer, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)0}, + {0x2282c73, L"hAlign", XFA_ATTRIBUTE_HAlign, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Left}, + {0x2c1c7f1, L"typeface", XFA_ATTRIBUTE_Typeface, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Config | XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)L"Courier"}, + {0x3106c3a, L"beforeTarget", XFA_ATTRIBUTE_BeforeTarget, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)NULL}, + {0x31b19c1, L"name", XFA_ATTRIBUTE_Name, XFA_ATTRIBUTETYPE_NOTSURE, XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet | XFA_XDPPACKET_Template | XFA_XDPPACKET_Datasets | XFA_XDPPACKET_Form | XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, (void*)NULL}, + {0x3848b3f, L"next", XFA_ATTRIBUTE_Next, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_None}, + {0x43e349b, L"dataRowCount", XFA_ATTRIBUTE_DataRowCount, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)NULL}, + {0x5518c25, L"break", XFA_ATTRIBUTE_Break, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Close}, + {0x5ce6195, L"vScrollPolicy", XFA_ATTRIBUTE_VScrollPolicy, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Auto}, + {0x8c74ae9, L"fontHorizontalScale", XFA_ATTRIBUTE_FontHorizontalScale, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)L"100%"}, + {0x8d4f1c7, L"textIndent", XFA_ATTRIBUTE_TextIndent, XFA_ATTRIBUTETYPE_Measure, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)(g_XFAMeasurementData + 0)}, + {0x97c1c65, L"context", XFA_ATTRIBUTE_Context, XFA_ATTRIBUTETYPE_Integer, XFA_XDPPACKET_UNKNOWN, (void*)0}, + {0x9876578, L"trayOut", XFA_ATTRIBUTE_TrayOut, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Auto}, + {0xa2e3514, L"cap", XFA_ATTRIBUTE_Cap, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Square}, + {0xb3543a6, L"max", XFA_ATTRIBUTE_Max, XFA_ATTRIBUTETYPE_NOTSURE, XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)NULL}, + {0xb356ca4, L"min", XFA_ATTRIBUTE_Min, XFA_ATTRIBUTETYPE_Integer, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)1}, + {0xbb8df5d, L"ref", XFA_ATTRIBUTE_Ref, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Config | XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)NULL}, + {0xbb8f3df, L"rid", XFA_ATTRIBUTE_Rid, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)NULL}, + {0xc080cd3, L"url", XFA_ATTRIBUTE_Url, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)NULL}, + {0xc0811ed, L"use", XFA_ATTRIBUTE_Use, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, (void*)NULL}, + {0xcfea02e, L"leftInset", XFA_ATTRIBUTE_LeftInset, XFA_ATTRIBUTETYPE_Measure, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)(g_XFAMeasurementData + 0)}, + {0x1026c59d, L"widows", XFA_ATTRIBUTE_Widows, XFA_ATTRIBUTETYPE_Integer, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)0}, + {0x1059ec18, L"level", XFA_ATTRIBUTE_Level, XFA_ATTRIBUTETYPE_Integer, XFA_XDPPACKET_Config, (void*)0}, + {0x1356caf8, L"bottomInset", XFA_ATTRIBUTE_BottomInset, XFA_ATTRIBUTETYPE_Measure, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)(g_XFAMeasurementData + 0)}, + {0x13a08bdb, L"overflowTarget", XFA_ATTRIBUTE_OverflowTarget, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)NULL}, + {0x1414d431, L"allowMacro", XFA_ATTRIBUTE_AllowMacro, XFA_ATTRIBUTETYPE_Boolean, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)0}, + {0x14a32d52, L"pagePosition", XFA_ATTRIBUTE_PagePosition, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Any}, + {0x1517dfa1, L"columnWidths", XFA_ATTRIBUTE_ColumnWidths, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)NULL}, + {0x169134a1, L"overflowLeader", XFA_ATTRIBUTE_OverflowLeader, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)NULL}, + {0x1b8dce3e, L"action", XFA_ATTRIBUTE_Action, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Include}, + {0x1e459b8f, L"nonRepudiation", XFA_ATTRIBUTE_NonRepudiation, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)NULL}, + {0x1ec8ab2c, L"rate", XFA_ATTRIBUTE_Rate, XFA_ATTRIBUTETYPE_Integer, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)50}, + {0x1ef3a64a, L"allowRichText", XFA_ATTRIBUTE_AllowRichText, XFA_ATTRIBUTETYPE_Boolean, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)0}, + {0x2038c9b2, L"role", XFA_ATTRIBUTE_Role, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)NULL}, + {0x20914367, L"overflowTrailer", XFA_ATTRIBUTE_OverflowTrailer, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)NULL}, + {0x226ca8f1, L"operation", XFA_ATTRIBUTE_Operation, XFA_ATTRIBUTETYPE_NOTSURE, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)NULL}, + {0x24d85167, L"timeout", XFA_ATTRIBUTE_Timeout, XFA_ATTRIBUTETYPE_NOTSURE, XFA_XDPPACKET_SourceSet, (void*)NULL}, + {0x25764436, L"topInset", XFA_ATTRIBUTE_TopInset, XFA_ATTRIBUTETYPE_Measure, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)(g_XFAMeasurementData + 0)}, + {0x25839852, L"access", XFA_ATTRIBUTE_Access, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Open}, + {0x268b7ec1, L"commandType", XFA_ATTRIBUTE_CommandType, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_SourceSet, (void*)XFA_ATTRIBUTEENUM_Unknown}, + {0x28dee6e9, L"format", XFA_ATTRIBUTE_Format, XFA_ATTRIBUTETYPE_NOTSURE, XFA_XDPPACKET_Config | XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)NULL}, + {0x28e17e91, L"dataPrep", XFA_ATTRIBUTE_DataPrep, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_None}, + {0x292b88fe, L"widgetData", XFA_ATTRIBUTE_WidgetData, XFA_ATTRIBUTETYPE_Integer, XFA_XDPPACKET_UNKNOWN, (void*)0}, + {0x29418bb7, L"abbr", XFA_ATTRIBUTE_Abbr, XFA_ATTRIBUTETYPE_Boolean, XFA_XDPPACKET_LocaleSet, (void*)0}, + {0x2a82d99c, L"marginRight", XFA_ATTRIBUTE_MarginRight, XFA_ATTRIBUTETYPE_Measure, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)(g_XFAMeasurementData + 0)}, + {0x2b5df51e, L"dataDescription", XFA_ATTRIBUTE_DataDescription, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_ConnectionSet, (void*)NULL}, + {0x2bb3f470, L"encipherOnly", XFA_ATTRIBUTE_EncipherOnly, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)NULL}, + {0x2cd79033, L"kerningMode", XFA_ATTRIBUTE_KerningMode, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_None}, + {0x2ee7678f, L"rotate", XFA_ATTRIBUTE_Rotate, XFA_ATTRIBUTETYPE_Measure, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)(g_XFAMeasurementData + 5)}, + {0x2f105f72, L"wordCharacterCount", XFA_ATTRIBUTE_WordCharacterCount, XFA_ATTRIBUTETYPE_Integer, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)7}, + {0x2f16a382, L"type", XFA_ATTRIBUTE_Type, XFA_ATTRIBUTETYPE_NOTSURE, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)NULL}, + {0x34ae103c, L"reserve", XFA_ATTRIBUTE_Reserve, XFA_ATTRIBUTETYPE_Measure, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)(g_XFAMeasurementData + 4)}, + {0x3650557e, L"textLocation", XFA_ATTRIBUTE_TextLocation, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Below}, + {0x39cdb0a2, L"priority", XFA_ATTRIBUTE_Priority, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Custom}, + {0x3a0273a6, L"underline", XFA_ATTRIBUTE_Underline, XFA_ATTRIBUTETYPE_Integer, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)0}, + {0x3b582286, L"moduleWidth", XFA_ATTRIBUTE_ModuleWidth, XFA_ATTRIBUTETYPE_Measure, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)(g_XFAMeasurementData + 3)}, + {0x3d123c26, L"hyphenate", XFA_ATTRIBUTE_Hyphenate, XFA_ATTRIBUTETYPE_Boolean, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)0}, + {0x3e7af94f, L"listen", XFA_ATTRIBUTE_Listen, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_RefOnly}, + {0x4156ee3f, L"delimiter", XFA_ATTRIBUTE_Delimiter, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)NULL}, + {0x42fed1fd, L"contentType", XFA_ATTRIBUTE_ContentType, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | XFA_XDPPACKET_Datasets | XFA_XDPPACKET_Form, (void*)NULL}, + {0x453eaf38, L"startNew", XFA_ATTRIBUTE_StartNew, XFA_ATTRIBUTETYPE_Boolean, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)0}, + {0x45a6daf8, L"eofAction", XFA_ATTRIBUTE_EofAction, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_SourceSet, (void*)XFA_ATTRIBUTEENUM_MoveLast}, + {0x47cfa43a, L"allowNeutral", XFA_ATTRIBUTE_AllowNeutral, XFA_ATTRIBUTETYPE_Boolean, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)0}, + {0x47d03490, L"connection", XFA_ATTRIBUTE_Connection, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)NULL}, + {0x4873c601, L"baselineShift", XFA_ATTRIBUTE_BaselineShift, XFA_ATTRIBUTETYPE_Measure, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)(g_XFAMeasurementData + 0)}, + {0x4b319767, L"overlinePeriod", XFA_ATTRIBUTE_OverlinePeriod, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_All}, + {0x4b8bc840, L"fracDigits", XFA_ATTRIBUTE_FracDigits, XFA_ATTRIBUTETYPE_Integer, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)2}, + {0x4ef3d02c, L"orientation", XFA_ATTRIBUTE_Orientation, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Portrait}, + {0x4fdc3454, L"timeStamp", XFA_ATTRIBUTE_TimeStamp, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_XDP, (void*)NULL}, + {0x52666f1c, L"printCheckDigit", XFA_ATTRIBUTE_PrintCheckDigit, XFA_ATTRIBUTETYPE_Boolean, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)0}, + {0x534729c9, L"marginLeft", XFA_ATTRIBUTE_MarginLeft, XFA_ATTRIBUTETYPE_Measure, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)(g_XFAMeasurementData + 0)}, + {0x5392ea58, L"stroke", XFA_ATTRIBUTE_Stroke, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Solid}, + {0x5404d6df, L"moduleHeight", XFA_ATTRIBUTE_ModuleHeight, XFA_ATTRIBUTETYPE_Measure, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)(g_XFAMeasurementData + 2)}, + {0x54fa722c, L"transferEncoding", XFA_ATTRIBUTE_TransferEncoding, XFA_ATTRIBUTETYPE_NOTSURE, XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)NULL}, + {0x552d9ad5, L"usage", XFA_ATTRIBUTE_Usage, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_ExportAndImport}, + {0x570ce835, L"presence", XFA_ATTRIBUTE_Presence, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Visible}, + {0x5739d1ff, L"radixOffset", XFA_ATTRIBUTE_RadixOffset, XFA_ATTRIBUTETYPE_Measure, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)(g_XFAMeasurementData + 0)}, + {0x577682ac, L"preserve", XFA_ATTRIBUTE_Preserve, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)NULL}, + {0x58be2870, L"aliasNode", XFA_ATTRIBUTE_AliasNode, XFA_ATTRIBUTETYPE_Integer, XFA_XDPPACKET_UNKNOWN, (void*)0}, + {0x5a32e493, L"multiLine", XFA_ATTRIBUTE_MultiLine, XFA_ATTRIBUTETYPE_Boolean, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)0}, + {0x5a50e9e6, L"version", XFA_ATTRIBUTE_Version, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)NULL}, + {0x5ab23b6c, L"startChar", XFA_ATTRIBUTE_StartChar, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)NULL}, + {0x5b707a35, L"scriptTest", XFA_ATTRIBUTE_ScriptTest, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Error}, + {0x5c054755, L"startAngle", XFA_ATTRIBUTE_StartAngle, XFA_ATTRIBUTETYPE_Measure, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)(g_XFAMeasurementData + 5)}, + {0x5ec958c0, L"cursorType", XFA_ATTRIBUTE_CursorType, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_SourceSet, (void*)XFA_ATTRIBUTEENUM_ForwardOnly}, + {0x5f760b50, L"digitalSignature", XFA_ATTRIBUTE_DigitalSignature, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)NULL}, + {0x60a61edd, L"codeType", XFA_ATTRIBUTE_CodeType, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)NULL}, + {0x60d4c8b1, L"output", XFA_ATTRIBUTE_Output, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_ConnectionSet, (void*)NULL}, + {0x64110ab5, L"bookendTrailer", XFA_ATTRIBUTE_BookendTrailer, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)NULL}, + {0x65e30c67, L"imagingBBox", XFA_ATTRIBUTE_ImagingBBox, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)L"none"}, + {0x66539c48, L"excludeInitialCap", XFA_ATTRIBUTE_ExcludeInitialCap, XFA_ATTRIBUTETYPE_Boolean, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)0}, + {0x66642f8f, L"force", XFA_ATTRIBUTE_Force, XFA_ATTRIBUTETYPE_Boolean, XFA_XDPPACKET_Config, (void*)NULL}, + {0x69aa2292, L"crlSign", XFA_ATTRIBUTE_CrlSign, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)NULL}, + {0x6a3405dd, L"previous", XFA_ATTRIBUTE_Previous, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_None}, + {0x6a95c976, L"pushCharacterCount", XFA_ATTRIBUTE_PushCharacterCount, XFA_ATTRIBUTETYPE_Integer, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)3}, + {0x6b6ddcfb, L"nullTest", XFA_ATTRIBUTE_NullTest, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Disabled}, + {0x6cfa828a, L"runAt", XFA_ATTRIBUTE_RunAt, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Client}, + {0x731e0665, L"spaceBelow", XFA_ATTRIBUTE_SpaceBelow, XFA_ATTRIBUTETYPE_Measure, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)(g_XFAMeasurementData + 0)}, + {0x74788f8b, L"sweepAngle", XFA_ATTRIBUTE_SweepAngle, XFA_ATTRIBUTETYPE_Measure, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)(g_XFAMeasurementData + 7)}, + {0x78bff531, L"numberOfCells", XFA_ATTRIBUTE_NumberOfCells, XFA_ATTRIBUTETYPE_Integer, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)0}, + {0x79543055, L"letterSpacing", XFA_ATTRIBUTE_LetterSpacing, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)NULL}, + {0x79975f2b, L"lockType", XFA_ATTRIBUTE_LockType, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_SourceSet, (void*)XFA_ATTRIBUTEENUM_ReadOnly}, + {0x7a0cc471, L"passwordChar", XFA_ATTRIBUTE_PasswordChar, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)L"*"}, + {0x7a7cc341, L"vAlign", XFA_ATTRIBUTE_VAlign, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Top}, + {0x7b29630a, L"sourceBelow", XFA_ATTRIBUTE_SourceBelow, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Config, (void*)XFA_ATTRIBUTEENUM_Update}, + {0x7b95e661, L"inverted", XFA_ATTRIBUTE_Inverted, XFA_ATTRIBUTETYPE_Boolean, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)0}, + {0x7c2fd80b, L"mark", XFA_ATTRIBUTE_Mark, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Default}, + {0x7c2ff6ae, L"maxH", XFA_ATTRIBUTE_MaxH, XFA_ATTRIBUTETYPE_Measure, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)(g_XFAMeasurementData + 0)}, + {0x7c2ff6bd, L"maxW", XFA_ATTRIBUTE_MaxW, XFA_ATTRIBUTETYPE_Measure, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)(g_XFAMeasurementData + 0)}, + {0x7c732a66, L"truncate", XFA_ATTRIBUTE_Truncate, XFA_ATTRIBUTETYPE_Boolean, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)0}, + {0x7d02356c, L"minH", XFA_ATTRIBUTE_MinH, XFA_ATTRIBUTETYPE_Measure, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)(g_XFAMeasurementData + 0)}, + {0x7d02357b, L"minW", XFA_ATTRIBUTE_MinW, XFA_ATTRIBUTETYPE_Measure, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)(g_XFAMeasurementData + 0)}, + {0x7d0b5fca, L"initial", XFA_ATTRIBUTE_Initial, XFA_ATTRIBUTETYPE_Integer, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)1}, + {0x7d9fd7c5, L"mode", XFA_ATTRIBUTE_Mode, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Config, (void*)XFA_ATTRIBUTEENUM_UsePrinterSetting}, + {0x7e7e845e, L"layout", XFA_ATTRIBUTE_Layout, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Position}, + {0x7f6fd3d7, L"server", XFA_ATTRIBUTE_Server, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)NULL}, + {0x824f21b7, L"embedPDF", XFA_ATTRIBUTE_EmbedPDF, XFA_ATTRIBUTETYPE_Boolean, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)0}, + {0x8340ea66, L"oddOrEven", XFA_ATTRIBUTE_OddOrEven, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Any}, + {0x836d4d7c, L"tabDefault", XFA_ATTRIBUTE_TabDefault, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)NULL}, + {0x8855805f, L"contains", XFA_ATTRIBUTE_Contains, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Datasets, (void*)XFA_ATTRIBUTEENUM_Data}, + {0x8a692521, L"rightInset", XFA_ATTRIBUTE_RightInset, XFA_ATTRIBUTETYPE_Measure, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)(g_XFAMeasurementData + 0)}, + {0x8af2e657, L"maxChars", XFA_ATTRIBUTE_MaxChars, XFA_ATTRIBUTETYPE_Integer, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)0}, + {0x8b90e1f2, L"open", XFA_ATTRIBUTE_Open, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_UserControl}, + {0x8c99377e, L"relation", XFA_ATTRIBUTE_Relation, XFA_ATTRIBUTETYPE_NOTSURE, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)NULL}, + {0x8d181d61, L"wideNarrowRatio", XFA_ATTRIBUTE_WideNarrowRatio, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)L"3:1"}, + {0x8e1c2921, L"relevant", XFA_ATTRIBUTE_Relevant, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)NULL}, + {0x8e29d794, L"signatureType", XFA_ATTRIBUTE_SignatureType, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Filter}, + {0x8ec6204c, L"lineThroughPeriod", XFA_ATTRIBUTE_LineThroughPeriod, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_All}, + {0x8ed182d1, L"shape", XFA_ATTRIBUTE_Shape, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Square}, + {0x8fa01790, L"tabStops", XFA_ATTRIBUTE_TabStops, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)NULL}, + {0x8fc36c0a, L"outputBelow", XFA_ATTRIBUTE_OutputBelow, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Config, (void*)XFA_ATTRIBUTEENUM_Warn}, + {0x9041d4b0, L"short", XFA_ATTRIBUTE_Short, XFA_ATTRIBUTETYPE_Measure, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)(g_XFAMeasurementData + 0)}, + {0x907c7719, L"fontVerticalScale", XFA_ATTRIBUTE_FontVerticalScale, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)L"100%"}, + {0x94446dcc, L"thickness", XFA_ATTRIBUTE_Thickness, XFA_ATTRIBUTETYPE_Measure, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)(g_XFAMeasurementData + 8)}, + {0x957fa006, L"commitOn", XFA_ATTRIBUTE_CommitOn, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Select}, + {0x982bd892, L"remainCharacterCount", XFA_ATTRIBUTE_RemainCharacterCount, XFA_ATTRIBUTETYPE_Integer, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)3}, + {0x98fd4d81, L"keyAgreement", XFA_ATTRIBUTE_KeyAgreement, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)NULL}, + {0x99800d7a, L"errorCorrectionLevel", XFA_ATTRIBUTE_ErrorCorrectionLevel, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)NULL}, + {0x9a63da3d, L"upsMode", XFA_ATTRIBUTE_UpsMode, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_UsCarrier}, + {0x9cc17d75, L"mergeMode", XFA_ATTRIBUTE_MergeMode, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_ConsumeData}, + {0x9d833d75, L"circular", XFA_ATTRIBUTE_Circular, XFA_ATTRIBUTETYPE_Boolean, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)0}, + {0x9d8ee204, L"psName", XFA_ATTRIBUTE_PsName, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Config, (void*)NULL}, + {0x9dcc3ab3, L"trailer", XFA_ATTRIBUTE_Trailer, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)NULL}, + {0xa0933954, L"unicodeRange", XFA_ATTRIBUTE_UnicodeRange, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Config, (void*)NULL}, + {0xa1b0d2f5, L"executeType", XFA_ATTRIBUTE_ExecuteType, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Import}, + {0xa25a883d, L"duplexImposition", XFA_ATTRIBUTE_DuplexImposition, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_LongEdge}, + {0xa42ca1b7, L"trayIn", XFA_ATTRIBUTE_TrayIn, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Auto}, + {0xa433f001, L"bindingNode", XFA_ATTRIBUTE_BindingNode, XFA_ATTRIBUTETYPE_Integer, XFA_XDPPACKET_UNKNOWN, (void*)0}, + {0xa5340ff5, L"bofAction", XFA_ATTRIBUTE_BofAction, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_SourceSet, (void*)XFA_ATTRIBUTEENUM_MoveFirst}, + {0xa5b410cf, L"save", XFA_ATTRIBUTE_Save, XFA_ATTRIBUTETYPE_Boolean, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)0}, + {0xa6118c89, L"targetType", XFA_ATTRIBUTE_TargetType, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Auto}, + {0xa66404cb, L"keyEncipherment", XFA_ATTRIBUTE_KeyEncipherment, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)NULL}, + {0xa6710262, L"credentialServerPolicy", XFA_ATTRIBUTE_CredentialServerPolicy, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Optional}, + {0xa686975b, L"size", XFA_ATTRIBUTE_Size, XFA_ATTRIBUTETYPE_Measure, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)(g_XFAMeasurementData + 6)}, + {0xa85e74f3, L"initialNumber", XFA_ATTRIBUTE_InitialNumber, XFA_ATTRIBUTETYPE_Integer, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)1}, + {0xabef37e3, L"slope", XFA_ATTRIBUTE_Slope, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Backslash}, + {0xabfa6c4f, L"cSpace", XFA_ATTRIBUTE_CSpace, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)L"SRGB"}, + {0xac06e2b0, L"colSpan", XFA_ATTRIBUTE_ColSpan, XFA_ATTRIBUTETYPE_Integer, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)1}, + {0xadc4c77b, L"binding", XFA_ATTRIBUTE_Binding, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)NULL}, + {0xaf754613, L"checksum", XFA_ATTRIBUTE_Checksum, XFA_ATTRIBUTETYPE_NOTSURE, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form | XFA_XDPPACKET_Form, (void*)NULL}, + {0xb045fbc5, L"charEncoding", XFA_ATTRIBUTE_CharEncoding, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)L"UTF-8"}, + {0xb0e5485d, L"bind", XFA_ATTRIBUTE_Bind, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_SourceSet, (void*)NULL}, + {0xb12128b7, L"textEntry", XFA_ATTRIBUTE_TextEntry, XFA_ATTRIBUTETYPE_Boolean, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)0}, + {0xb373a862, L"archive", XFA_ATTRIBUTE_Archive, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)NULL}, + {0xb598a1f7, L"uuid", XFA_ATTRIBUTE_Uuid, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_XDP, (void*)NULL}, + {0xb5e49bf2, L"posture", XFA_ATTRIBUTE_Posture, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Config | XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Normal}, + {0xb6b44172, L"after", XFA_ATTRIBUTE_After, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Auto}, + {0xb716467b, L"orphans", XFA_ATTRIBUTE_Orphans, XFA_ATTRIBUTETYPE_Integer, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)0}, + {0xbc0c4695, L"qualifiedName", XFA_ATTRIBUTE_QualifiedName, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_UNKNOWN, (void*)NULL}, + {0xbc254332, L"usehref", XFA_ATTRIBUTE_Usehref, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, (void*)NULL}, + {0xbc8fa350, L"locale", XFA_ATTRIBUTE_Locale, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)NULL}, + {0xbd6e1d88, L"weight", XFA_ATTRIBUTE_Weight, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Config | XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Normal}, + {0xbd96a0e9, L"underlinePeriod", XFA_ATTRIBUTE_UnderlinePeriod, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_All}, + {0xbde9abda, L"data", XFA_ATTRIBUTE_Data, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Link}, + {0xbe52dfbf, L"desc", XFA_ATTRIBUTE_Desc, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, (void*)NULL}, + {0xbe9ba472, L"numbered", XFA_ATTRIBUTE_Numbered, XFA_ATTRIBUTETYPE_Integer, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)1}, + {0xc035c6b1, L"dataColumnCount", XFA_ATTRIBUTE_DataColumnCount, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)NULL}, + {0xc0ec9fa4, L"overline", XFA_ATTRIBUTE_Overline, XFA_ATTRIBUTETYPE_Integer, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)0}, + {0xc2ba0923, L"urlPolicy", XFA_ATTRIBUTE_UrlPolicy, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)NULL}, + {0xc2bd40fd, L"anchorType", XFA_ATTRIBUTE_AnchorType, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_TopLeft}, + {0xc39a88bd, L"labelRef", XFA_ATTRIBUTE_LabelRef, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)NULL}, + {0xc3c1442f, L"bookendLeader", XFA_ATTRIBUTE_BookendLeader, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)NULL}, + {0xc4547a08, L"maxLength", XFA_ATTRIBUTE_MaxLength, XFA_ATTRIBUTETYPE_Integer, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*) - 1}, + {0xc4fed09b, L"accessKey", XFA_ATTRIBUTE_AccessKey, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)NULL}, + {0xc5762157, L"cursorLocation", XFA_ATTRIBUTE_CursorLocation, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_SourceSet, (void*)XFA_ATTRIBUTEENUM_Client}, + {0xc860f30a, L"delayedOpen", XFA_ATTRIBUTE_DelayedOpen, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_SourceSet, (void*)NULL}, + {0xc8da4da7, L"target", XFA_ATTRIBUTE_Target, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)NULL}, + {0xca5dc27c, L"dataEncipherment", XFA_ATTRIBUTE_DataEncipherment, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)NULL}, + {0xcb150479, L"afterTarget", XFA_ATTRIBUTE_AfterTarget, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)NULL}, + {0xcbcaf66d, L"leader", XFA_ATTRIBUTE_Leader, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)NULL}, + {0xcca7897e, L"picker", XFA_ATTRIBUTE_Picker, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Host}, + {0xcd7f7b54, L"from", XFA_ATTRIBUTE_From, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Config, (void*)NULL}, + {0xcea5e62c, L"baseProfile", XFA_ATTRIBUTE_BaseProfile, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Full}, + {0xd171b240, L"aspect", XFA_ATTRIBUTE_Aspect, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Fit}, + {0xd3c84d25, L"rowColumnRatio", XFA_ATTRIBUTE_RowColumnRatio, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)NULL}, + {0xd4b01921, L"lineHeight", XFA_ATTRIBUTE_LineHeight, XFA_ATTRIBUTETYPE_Measure, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)(g_XFAMeasurementData + 1)}, + {0xd4cc53f8, L"highlight", XFA_ATTRIBUTE_Highlight, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Inverted}, + {0xd50f903a, L"valueRef", XFA_ATTRIBUTE_ValueRef, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)NULL}, + {0xd52482e0, L"maxEntries", XFA_ATTRIBUTE_MaxEntries, XFA_ATTRIBUTETYPE_Integer, XFA_XDPPACKET_Config, (void*)5}, + {0xd57c513c, L"dataLength", XFA_ATTRIBUTE_DataLength, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)NULL}, + {0xd6128d8d, L"activity", XFA_ATTRIBUTE_Activity, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Click}, + {0xd6a39990, L"input", XFA_ATTRIBUTE_Input, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_ConnectionSet, (void*)NULL}, + {0xd6e27f1d, L"value", XFA_ATTRIBUTE_Value, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet | XFA_XDPPACKET_Template | XFA_XDPPACKET_Datasets | XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, (void*)NULL}, + {0xd70798c2, L"blankOrNotBlank", XFA_ATTRIBUTE_BlankOrNotBlank, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Any}, + {0xd861f8af, L"addRevocationInfo", XFA_ATTRIBUTE_AddRevocationInfo, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)NULL}, + {0xd8f982bf, L"genericFamily", XFA_ATTRIBUTE_GenericFamily, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Config, (void*)XFA_ATTRIBUTEENUM_Serif}, + {0xd996fa9b, L"hand", XFA_ATTRIBUTE_Hand, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Even}, + {0xdb55fec5, L"href", XFA_ATTRIBUTE_Href, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)NULL}, + {0xdc75676c, L"textEncoding", XFA_ATTRIBUTE_TextEncoding, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)NULL}, + {0xde7f92ba, L"leadDigits", XFA_ATTRIBUTE_LeadDigits, XFA_ATTRIBUTETYPE_Integer, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*) - 1}, + {0xe11a2cbc, L"permissions", XFA_ATTRIBUTE_Permissions, XFA_ATTRIBUTETYPE_Integer, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)2}, + {0xe18b5659, L"spaceAbove", XFA_ATTRIBUTE_SpaceAbove, XFA_ATTRIBUTETYPE_Measure, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)(g_XFAMeasurementData + 0)}, + {0xe1a26b56, L"codeBase", XFA_ATTRIBUTE_CodeBase, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)NULL}, + {0xe349d044, L"stock", XFA_ATTRIBUTE_Stock, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)NULL}, + {0xe372ae97, L"isNull", XFA_ATTRIBUTE_IsNull, XFA_ATTRIBUTETYPE_Boolean, XFA_XDPPACKET_Datasets, (void*)0}, + {0xe4c3a5e5, L"restoreState", XFA_ATTRIBUTE_RestoreState, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Manual}, + {0xe5c96d6a, L"excludeAllCaps", XFA_ATTRIBUTE_ExcludeAllCaps, XFA_ATTRIBUTETYPE_Boolean, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)0}, + {0xe64b1129, L"formatTest", XFA_ATTRIBUTE_FormatTest, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Warning}, + {0xe6f99487, L"hScrollPolicy", XFA_ATTRIBUTE_HScrollPolicy, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Auto}, + {0xe8dddf50, L"join", XFA_ATTRIBUTE_Join, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Square}, + {0xe8f118a8, L"keyCertSign", XFA_ATTRIBUTE_KeyCertSign, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)NULL}, + {0xe948b9a8, L"radius", XFA_ATTRIBUTE_Radius, XFA_ATTRIBUTETYPE_Measure, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)(g_XFAMeasurementData + 0)}, + {0xe996b2fe, L"sourceAbove", XFA_ATTRIBUTE_SourceAbove, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Config, (void*)XFA_ATTRIBUTEENUM_Warn}, + {0xea7090a0, L"override", XFA_ATTRIBUTE_Override, XFA_ATTRIBUTETYPE_NOTSURE, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)NULL}, + {0xeb091003, L"classId", XFA_ATTRIBUTE_ClassId, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)NULL}, + {0xeb511b54, L"disable", XFA_ATTRIBUTE_Disable, XFA_ATTRIBUTETYPE_Boolean, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)0}, + {0xeda9017a, L"scope", XFA_ATTRIBUTE_Scope, XFA_ATTRIBUTETYPE_NOTSURE, XFA_XDPPACKET_Config | XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)NULL}, + {0xf197844d, L"match", XFA_ATTRIBUTE_Match, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Once}, + {0xf2009339, L"placement", XFA_ATTRIBUTE_Placement, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Left}, + {0xf4ffce73, L"before", XFA_ATTRIBUTE_Before, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Auto}, + {0xf531b059, L"writingScript", XFA_ATTRIBUTE_WritingScript, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Config, (void*)XFA_ATTRIBUTEENUM_Asterisk}, + {0xf575ca75, L"endChar", XFA_ATTRIBUTE_EndChar, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)NULL}, + {0xf6b47749, L"lock", XFA_ATTRIBUTE_Lock, XFA_ATTRIBUTETYPE_Integer, XFA_XDPPACKET_Config, (void*)0}, + {0xf6b4afb0, L"long", XFA_ATTRIBUTE_Long, XFA_ATTRIBUTETYPE_Measure, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)(g_XFAMeasurementData + 0)}, + {0xf6b59543, L"intact", XFA_ATTRIBUTE_Intact, XFA_ATTRIBUTETYPE_Enum, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_None}, + {0xf889e747, L"xdpContent", XFA_ATTRIBUTE_XdpContent, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)NULL}, + {0xfea53ec6, L"decipherOnly", XFA_ATTRIBUTE_DecipherOnly, XFA_ATTRIBUTETYPE_Cdata, XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)NULL}, }; extern const int32_t g_iXFAAttributeCount = sizeof(g_XFAAttributeData) / sizeof(XFA_ATTRIBUTEINFO); extern const XFA_NOTSUREATTRIBUTE g_XFANotsureAttributes[] = { - {XFA_ELEMENT_SubformSet, XFA_ATTRIBUTE_Relation, XFA_ATTRIBUTETYPE_Enum, (FX_LPVOID)XFA_ATTRIBUTEENUM_Ordered}, - {XFA_ELEMENT_NumberPattern, XFA_ATTRIBUTE_Name, XFA_ATTRIBUTETYPE_Enum, (FX_LPVOID)XFA_ATTRIBUTEENUM_Numeric}, - {XFA_ELEMENT_KeyUsage, XFA_ATTRIBUTE_Type, XFA_ATTRIBUTETYPE_Enum, (FX_LPVOID)XFA_ATTRIBUTEENUM_Optional}, - {XFA_ELEMENT_LabelPrinter, XFA_ATTRIBUTE_Name, XFA_ATTRIBUTETYPE_Enum, (FX_LPVOID)XFA_ATTRIBUTEENUM_Zpl}, - {XFA_ELEMENT_CalendarSymbols, XFA_ATTRIBUTE_Name, XFA_ATTRIBUTETYPE_Enum, (FX_LPVOID)XFA_ATTRIBUTEENUM_Gregorian}, - {XFA_ELEMENT_Barcode, XFA_ATTRIBUTE_Type, XFA_ATTRIBUTETYPE_Cdata, (FX_LPVOID)NULL}, - {XFA_ELEMENT_Barcode, XFA_ATTRIBUTE_Checksum, XFA_ATTRIBUTETYPE_Enum, (FX_LPVOID)XFA_ATTRIBUTEENUM_None}, - {XFA_ELEMENT_TimePattern, XFA_ATTRIBUTE_Name, XFA_ATTRIBUTETYPE_Enum, (FX_LPVOID)XFA_ATTRIBUTEENUM_Med}, - {XFA_ELEMENT_BatchOutput, XFA_ATTRIBUTE_Format, XFA_ATTRIBUTETYPE_Enum, (FX_LPVOID)XFA_ATTRIBUTEENUM_None}, - {XFA_ELEMENT_SubjectDNs, XFA_ATTRIBUTE_Type, XFA_ATTRIBUTETYPE_Enum, (FX_LPVOID)XFA_ATTRIBUTEENUM_Optional}, - {XFA_ELEMENT_Issuers, XFA_ATTRIBUTE_Type, XFA_ATTRIBUTETYPE_Enum, (FX_LPVOID)XFA_ATTRIBUTEENUM_Optional}, - {XFA_ELEMENT_EncryptionMethods, XFA_ATTRIBUTE_Type, XFA_ATTRIBUTETYPE_Enum, (FX_LPVOID)XFA_ATTRIBUTEENUM_Optional}, - {XFA_ELEMENT_Pattern, XFA_ATTRIBUTE_Type, XFA_ATTRIBUTETYPE_Enum, (FX_LPVOID)XFA_ATTRIBUTEENUM_CrossHatch}, - {XFA_ELEMENT_Compress, XFA_ATTRIBUTE_Scope, XFA_ATTRIBUTETYPE_Enum, (FX_LPVOID)XFA_ATTRIBUTEENUM_ImageOnly}, - {XFA_ELEMENT_Image, XFA_ATTRIBUTE_TransferEncoding, XFA_ATTRIBUTETYPE_Enum, (FX_LPVOID)XFA_ATTRIBUTEENUM_Base64}, - {XFA_ELEMENT_TimeStamp, XFA_ATTRIBUTE_Type, XFA_ATTRIBUTETYPE_Enum, (FX_LPVOID)XFA_ATTRIBUTEENUM_Optional}, - {XFA_ELEMENT_Subform, XFA_ATTRIBUTE_Scope, XFA_ATTRIBUTETYPE_Enum, (FX_LPVOID)XFA_ATTRIBUTEENUM_Name}, - {XFA_ELEMENT_Handler, XFA_ATTRIBUTE_Type, XFA_ATTRIBUTETYPE_Enum, (FX_LPVOID)XFA_ATTRIBUTEENUM_Optional}, - {XFA_ELEMENT_Record, XFA_ATTRIBUTE_Max, XFA_ATTRIBUTETYPE_Integer, (FX_LPVOID)0}, - {XFA_ELEMENT_Command, XFA_ATTRIBUTE_Timeout, XFA_ATTRIBUTETYPE_Integer, (FX_LPVOID)30}, - {XFA_ELEMENT_DigestMethods, XFA_ATTRIBUTE_Type, XFA_ATTRIBUTETYPE_Enum, (FX_LPVOID)XFA_ATTRIBUTEENUM_Optional}, - {XFA_ELEMENT_PageSet, XFA_ATTRIBUTE_Relation, XFA_ATTRIBUTETYPE_Enum, (FX_LPVOID)XFA_ATTRIBUTEENUM_OrderedOccurrence}, - {XFA_ELEMENT_Equate, XFA_ATTRIBUTE_From, XFA_ATTRIBUTETYPE_Cdata, (FX_LPVOID)NULL}, - {XFA_ELEMENT_Equate, XFA_ATTRIBUTE_To, XFA_ATTRIBUTETYPE_Cdata, (FX_LPVOID)NULL}, - {XFA_ELEMENT_Traverse, XFA_ATTRIBUTE_Operation, XFA_ATTRIBUTETYPE_Enum, (FX_LPVOID)XFA_ATTRIBUTEENUM_Next}, - {XFA_ELEMENT_Encodings, XFA_ATTRIBUTE_Type, XFA_ATTRIBUTETYPE_Enum, (FX_LPVOID)XFA_ATTRIBUTEENUM_Optional}, - {XFA_ELEMENT_Signing, XFA_ATTRIBUTE_Type, XFA_ATTRIBUTETYPE_Enum, (FX_LPVOID)XFA_ATTRIBUTEENUM_Optional}, - {XFA_ELEMENT_Oids, XFA_ATTRIBUTE_Type, XFA_ATTRIBUTETYPE_Enum, (FX_LPVOID)XFA_ATTRIBUTEENUM_Optional}, - {XFA_ELEMENT_Signature, XFA_ATTRIBUTE_Type, XFA_ATTRIBUTETYPE_Enum, (FX_LPVOID)XFA_ATTRIBUTEENUM_PDF1_3}, - {XFA_ELEMENT_ExData, XFA_ATTRIBUTE_TransferEncoding, XFA_ATTRIBUTETYPE_Enum, (FX_LPVOID)XFA_ATTRIBUTEENUM_None}, - {XFA_ELEMENT_Linear, XFA_ATTRIBUTE_Type, XFA_ATTRIBUTETYPE_Enum, (FX_LPVOID)XFA_ATTRIBUTEENUM_ToRight}, - {XFA_ELEMENT_CurrencySymbol, XFA_ATTRIBUTE_Name, XFA_ATTRIBUTETYPE_Enum, (FX_LPVOID)XFA_ATTRIBUTEENUM_Symbol}, - {XFA_ELEMENT_EquateRange, XFA_ATTRIBUTE_From, XFA_ATTRIBUTETYPE_Cdata, (FX_LPVOID)NULL}, - {XFA_ELEMENT_EquateRange, XFA_ATTRIBUTE_To, XFA_ATTRIBUTETYPE_Cdata, (FX_LPVOID)NULL}, - {XFA_ELEMENT_SignData, XFA_ATTRIBUTE_Operation, XFA_ATTRIBUTETYPE_Enum, (FX_LPVOID)XFA_ATTRIBUTEENUM_Sign}, - {XFA_ELEMENT_DatePattern, XFA_ATTRIBUTE_Name, XFA_ATTRIBUTETYPE_Enum, (FX_LPVOID)XFA_ATTRIBUTEENUM_Med}, - {XFA_ELEMENT_Bind, XFA_ATTRIBUTE_TransferEncoding, XFA_ATTRIBUTETYPE_Enum, (FX_LPVOID)XFA_ATTRIBUTEENUM_None}, - {XFA_ELEMENT_Reasons, XFA_ATTRIBUTE_Type, XFA_ATTRIBUTETYPE_Enum, (FX_LPVOID)XFA_ATTRIBUTEENUM_Optional}, - {XFA_ELEMENT_AppearanceFilter, XFA_ATTRIBUTE_Type, XFA_ATTRIBUTETYPE_Enum, (FX_LPVOID)XFA_ATTRIBUTEENUM_Optional}, - {XFA_ELEMENT_Form, XFA_ATTRIBUTE_Checksum, XFA_ATTRIBUTETYPE_Cdata, (FX_LPVOID)NULL}, - {XFA_ELEMENT_Value, XFA_ATTRIBUTE_Override, XFA_ATTRIBUTETYPE_Boolean, (FX_LPVOID)0}, - {XFA_ELEMENT_Calculate, XFA_ATTRIBUTE_Override, XFA_ATTRIBUTETYPE_Enum, (FX_LPVOID)XFA_ATTRIBUTEENUM_Error}, - {XFA_ELEMENT_Connect, XFA_ATTRIBUTE_Timeout, XFA_ATTRIBUTETYPE_Integer, (FX_LPVOID)15}, - {XFA_ELEMENT_Submit, XFA_ATTRIBUTE_Format, XFA_ATTRIBUTETYPE_Enum, (FX_LPVOID)XFA_ATTRIBUTEENUM_Xdp}, - {XFA_ELEMENT_Radial, XFA_ATTRIBUTE_Type, XFA_ATTRIBUTETYPE_Enum, (FX_LPVOID)XFA_ATTRIBUTEENUM_ToEdge}, - {XFA_ELEMENT_LockDocument, XFA_ATTRIBUTE_Type, XFA_ATTRIBUTETYPE_Enum, (FX_LPVOID)XFA_ATTRIBUTEENUM_Optional}, - {XFA_ELEMENT_Occur, XFA_ATTRIBUTE_Max, XFA_ATTRIBUTETYPE_Integer, (FX_LPVOID)1}, - {XFA_ELEMENT_NumberSymbol, XFA_ATTRIBUTE_Name, XFA_ATTRIBUTETYPE_Enum, (FX_LPVOID)XFA_ATTRIBUTEENUM_Decimal}, + {XFA_ELEMENT_SubformSet, XFA_ATTRIBUTE_Relation, XFA_ATTRIBUTETYPE_Enum, (void*)XFA_ATTRIBUTEENUM_Ordered}, + {XFA_ELEMENT_NumberPattern, XFA_ATTRIBUTE_Name, XFA_ATTRIBUTETYPE_Enum, (void*)XFA_ATTRIBUTEENUM_Numeric}, + {XFA_ELEMENT_KeyUsage, XFA_ATTRIBUTE_Type, XFA_ATTRIBUTETYPE_Enum, (void*)XFA_ATTRIBUTEENUM_Optional}, + {XFA_ELEMENT_LabelPrinter, XFA_ATTRIBUTE_Name, XFA_ATTRIBUTETYPE_Enum, (void*)XFA_ATTRIBUTEENUM_Zpl}, + {XFA_ELEMENT_CalendarSymbols, XFA_ATTRIBUTE_Name, XFA_ATTRIBUTETYPE_Enum, (void*)XFA_ATTRIBUTEENUM_Gregorian}, + {XFA_ELEMENT_Barcode, XFA_ATTRIBUTE_Type, XFA_ATTRIBUTETYPE_Cdata, (void*)NULL}, + {XFA_ELEMENT_Barcode, XFA_ATTRIBUTE_Checksum, XFA_ATTRIBUTETYPE_Enum, (void*)XFA_ATTRIBUTEENUM_None}, + {XFA_ELEMENT_TimePattern, XFA_ATTRIBUTE_Name, XFA_ATTRIBUTETYPE_Enum, (void*)XFA_ATTRIBUTEENUM_Med}, + {XFA_ELEMENT_BatchOutput, XFA_ATTRIBUTE_Format, XFA_ATTRIBUTETYPE_Enum, (void*)XFA_ATTRIBUTEENUM_None}, + {XFA_ELEMENT_SubjectDNs, XFA_ATTRIBUTE_Type, XFA_ATTRIBUTETYPE_Enum, (void*)XFA_ATTRIBUTEENUM_Optional}, + {XFA_ELEMENT_Issuers, XFA_ATTRIBUTE_Type, XFA_ATTRIBUTETYPE_Enum, (void*)XFA_ATTRIBUTEENUM_Optional}, + {XFA_ELEMENT_EncryptionMethods, XFA_ATTRIBUTE_Type, XFA_ATTRIBUTETYPE_Enum, (void*)XFA_ATTRIBUTEENUM_Optional}, + {XFA_ELEMENT_Pattern, XFA_ATTRIBUTE_Type, XFA_ATTRIBUTETYPE_Enum, (void*)XFA_ATTRIBUTEENUM_CrossHatch}, + {XFA_ELEMENT_Compress, XFA_ATTRIBUTE_Scope, XFA_ATTRIBUTETYPE_Enum, (void*)XFA_ATTRIBUTEENUM_ImageOnly}, + {XFA_ELEMENT_Image, XFA_ATTRIBUTE_TransferEncoding, XFA_ATTRIBUTETYPE_Enum, (void*)XFA_ATTRIBUTEENUM_Base64}, + {XFA_ELEMENT_TimeStamp, XFA_ATTRIBUTE_Type, XFA_ATTRIBUTETYPE_Enum, (void*)XFA_ATTRIBUTEENUM_Optional}, + {XFA_ELEMENT_Subform, XFA_ATTRIBUTE_Scope, XFA_ATTRIBUTETYPE_Enum, (void*)XFA_ATTRIBUTEENUM_Name}, + {XFA_ELEMENT_Handler, XFA_ATTRIBUTE_Type, XFA_ATTRIBUTETYPE_Enum, (void*)XFA_ATTRIBUTEENUM_Optional}, + {XFA_ELEMENT_Record, XFA_ATTRIBUTE_Max, XFA_ATTRIBUTETYPE_Integer, (void*)0}, + {XFA_ELEMENT_Command, XFA_ATTRIBUTE_Timeout, XFA_ATTRIBUTETYPE_Integer, (void*)30}, + {XFA_ELEMENT_DigestMethods, XFA_ATTRIBUTE_Type, XFA_ATTRIBUTETYPE_Enum, (void*)XFA_ATTRIBUTEENUM_Optional}, + {XFA_ELEMENT_PageSet, XFA_ATTRIBUTE_Relation, XFA_ATTRIBUTETYPE_Enum, (void*)XFA_ATTRIBUTEENUM_OrderedOccurrence}, + {XFA_ELEMENT_Equate, XFA_ATTRIBUTE_From, XFA_ATTRIBUTETYPE_Cdata, (void*)NULL}, + {XFA_ELEMENT_Equate, XFA_ATTRIBUTE_To, XFA_ATTRIBUTETYPE_Cdata, (void*)NULL}, + {XFA_ELEMENT_Traverse, XFA_ATTRIBUTE_Operation, XFA_ATTRIBUTETYPE_Enum, (void*)XFA_ATTRIBUTEENUM_Next}, + {XFA_ELEMENT_Encodings, XFA_ATTRIBUTE_Type, XFA_ATTRIBUTETYPE_Enum, (void*)XFA_ATTRIBUTEENUM_Optional}, + {XFA_ELEMENT_Signing, XFA_ATTRIBUTE_Type, XFA_ATTRIBUTETYPE_Enum, (void*)XFA_ATTRIBUTEENUM_Optional}, + {XFA_ELEMENT_Oids, XFA_ATTRIBUTE_Type, XFA_ATTRIBUTETYPE_Enum, (void*)XFA_ATTRIBUTEENUM_Optional}, + {XFA_ELEMENT_Signature, XFA_ATTRIBUTE_Type, XFA_ATTRIBUTETYPE_Enum, (void*)XFA_ATTRIBUTEENUM_PDF1_3}, + {XFA_ELEMENT_ExData, XFA_ATTRIBUTE_TransferEncoding, XFA_ATTRIBUTETYPE_Enum, (void*)XFA_ATTRIBUTEENUM_None}, + {XFA_ELEMENT_Linear, XFA_ATTRIBUTE_Type, XFA_ATTRIBUTETYPE_Enum, (void*)XFA_ATTRIBUTEENUM_ToRight}, + {XFA_ELEMENT_CurrencySymbol, XFA_ATTRIBUTE_Name, XFA_ATTRIBUTETYPE_Enum, (void*)XFA_ATTRIBUTEENUM_Symbol}, + {XFA_ELEMENT_EquateRange, XFA_ATTRIBUTE_From, XFA_ATTRIBUTETYPE_Cdata, (void*)NULL}, + {XFA_ELEMENT_EquateRange, XFA_ATTRIBUTE_To, XFA_ATTRIBUTETYPE_Cdata, (void*)NULL}, + {XFA_ELEMENT_SignData, XFA_ATTRIBUTE_Operation, XFA_ATTRIBUTETYPE_Enum, (void*)XFA_ATTRIBUTEENUM_Sign}, + {XFA_ELEMENT_DatePattern, XFA_ATTRIBUTE_Name, XFA_ATTRIBUTETYPE_Enum, (void*)XFA_ATTRIBUTEENUM_Med}, + {XFA_ELEMENT_Bind, XFA_ATTRIBUTE_TransferEncoding, XFA_ATTRIBUTETYPE_Enum, (void*)XFA_ATTRIBUTEENUM_None}, + {XFA_ELEMENT_Reasons, XFA_ATTRIBUTE_Type, XFA_ATTRIBUTETYPE_Enum, (void*)XFA_ATTRIBUTEENUM_Optional}, + {XFA_ELEMENT_AppearanceFilter, XFA_ATTRIBUTE_Type, XFA_ATTRIBUTETYPE_Enum, (void*)XFA_ATTRIBUTEENUM_Optional}, + {XFA_ELEMENT_Form, XFA_ATTRIBUTE_Checksum, XFA_ATTRIBUTETYPE_Cdata, (void*)NULL}, + {XFA_ELEMENT_Value, XFA_ATTRIBUTE_Override, XFA_ATTRIBUTETYPE_Boolean, (void*)0}, + {XFA_ELEMENT_Calculate, XFA_ATTRIBUTE_Override, XFA_ATTRIBUTETYPE_Enum, (void*)XFA_ATTRIBUTEENUM_Error}, + {XFA_ELEMENT_Connect, XFA_ATTRIBUTE_Timeout, XFA_ATTRIBUTETYPE_Integer, (void*)15}, + {XFA_ELEMENT_Submit, XFA_ATTRIBUTE_Format, XFA_ATTRIBUTETYPE_Enum, (void*)XFA_ATTRIBUTEENUM_Xdp}, + {XFA_ELEMENT_Radial, XFA_ATTRIBUTE_Type, XFA_ATTRIBUTETYPE_Enum, (void*)XFA_ATTRIBUTEENUM_ToEdge}, + {XFA_ELEMENT_LockDocument, XFA_ATTRIBUTE_Type, XFA_ATTRIBUTETYPE_Enum, (void*)XFA_ATTRIBUTEENUM_Optional}, + {XFA_ELEMENT_Occur, XFA_ATTRIBUTE_Max, XFA_ATTRIBUTETYPE_Integer, (void*)1}, + {XFA_ELEMENT_NumberSymbol, XFA_ATTRIBUTE_Name, XFA_ATTRIBUTETYPE_Enum, (void*)XFA_ATTRIBUTEENUM_Decimal}, }; extern const int32_t g_iXFANotsureCount = sizeof(g_XFANotsureAttributes) / sizeof(XFA_NOTSUREATTRIBUTE); extern const XFA_ELEMENTINFO g_XFAElementData[] = { diff --git a/xfa/src/fxfa/src/parser/xfa_basic_imp.cpp b/xfa/src/fxfa/src/parser/xfa_basic_imp.cpp index 618b7a2945..151147b4dc 100644 --- a/xfa/src/fxfa/src/parser/xfa_basic_imp.cpp +++ b/xfa/src/fxfa/src/parser/xfa_basic_imp.cpp @@ -129,7 +129,7 @@ XFA_LPCATTRIBUTEINFO XFA_GetAttributeByID(XFA_ATTRIBUTE eName) { return (eName < g_iXFAAttributeCount) ? (g_XFAAttributeData + eName) : NULL; } -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_LPCATTRIBUTEINFO pInfo = XFA_GetAttributeByID(eAttribute); if (pInfo == NULL) { @@ -152,7 +152,7 @@ FX_BOOL XFA_GetAttributeDefaultValue(FX_LPVOID &pValue, XFA_ELEMENT eElement, XF } XFA_ATTRIBUTEENUM XFA_GetAttributeDefaultValue_Enum(XFA_ELEMENT eElement, XFA_ATTRIBUTE eAttribute, FX_DWORD dwPacket) { - FX_LPVOID pValue; + void* pValue; if (XFA_GetAttributeDefaultValue(pValue, eElement, eAttribute, XFA_ATTRIBUTETYPE_Enum, dwPacket)) { return (XFA_ATTRIBUTEENUM)(uintptr_t)pValue; } @@ -160,15 +160,15 @@ XFA_ATTRIBUTEENUM XFA_GetAttributeDefaultValue_Enum(XFA_ELEMENT eElement, XFA_AT } CFX_WideStringC XFA_GetAttributeDefaultValue_Cdata(XFA_ELEMENT eElement, XFA_ATTRIBUTE eAttribute, FX_DWORD dwPacket) { - FX_LPVOID pValue; + void* pValue; if (XFA_GetAttributeDefaultValue(pValue, eElement, eAttribute, XFA_ATTRIBUTETYPE_Cdata, dwPacket)) { - return (FX_LPCWSTR)pValue; + return (const FX_WCHAR*)pValue; } return NULL; } FX_BOOL XFA_GetAttributeDefaultValue_Boolean(XFA_ELEMENT eElement, XFA_ATTRIBUTE eAttribute, FX_DWORD dwPacket) { - FX_LPVOID pValue; + void* pValue; if (XFA_GetAttributeDefaultValue(pValue, eElement, eAttribute, XFA_ATTRIBUTETYPE_Boolean, dwPacket)) { return (FX_BOOL)(uintptr_t)pValue; } @@ -176,7 +176,7 @@ FX_BOOL XFA_GetAttributeDefaultValue_Boolean(XFA_ELEMENT eElement, XFA_ATTRIBUTE } int32_t XFA_GetAttributeDefaultValue_Integer(XFA_ELEMENT eElement, XFA_ATTRIBUTE eAttribute, FX_DWORD dwPacket) { - FX_LPVOID pValue; + void* pValue; if (XFA_GetAttributeDefaultValue(pValue, eElement, eAttribute, XFA_ATTRIBUTETYPE_Integer, dwPacket)) { return (int32_t)(uintptr_t)pValue; } @@ -184,7 +184,7 @@ int32_t XFA_GetAttributeDefaultValue_Integer(XFA_ELEMENT eElement, XFA_ATTRIBUTE } CXFA_Measurement XFA_GetAttributeDefaultValue_Measure(XFA_ELEMENT eElement, XFA_ATTRIBUTE eAttribute, FX_DWORD dwPacket) { - FX_LPVOID pValue; + void* pValue; if (XFA_GetAttributeDefaultValue(pValue, eElement, eAttribute, XFA_ATTRIBUTETYPE_Measure, dwPacket)) { return *(CXFA_Measurement*)pValue; } @@ -219,7 +219,7 @@ XFA_LPCELEMENTINFO XFA_GetElementByID(XFA_ELEMENT eName) { return (eName < g_iXFAElementCount) ? (g_XFAElementData + eName) : NULL; } -FX_LPCWORD XFA_GetElementChildren(XFA_ELEMENT eElement, int32_t &iCount) +const FX_WORD* XFA_GetElementChildren(XFA_ELEMENT eElement, int32_t &iCount) { if (eElement >= g_iXFAElementCount) { return NULL; @@ -228,7 +228,7 @@ FX_LPCWORD XFA_GetElementChildren(XFA_ELEMENT eElement, int32_t &iCount) iCount = pElement->wCount; return g_XFAElementChildrenData + pElement->wStart; } -FX_LPCBYTE XFA_GetElementAttributes(XFA_ELEMENT eElement, int32_t &iCount) +const uint8_t* XFA_GetElementAttributes(XFA_ELEMENT eElement, int32_t &iCount) { if (eElement >= g_iXFAElementCount) { return NULL; @@ -240,7 +240,7 @@ FX_LPCBYTE XFA_GetElementAttributes(XFA_ELEMENT eElement, int32_t &iCount) XFA_LPCATTRIBUTEINFO XFA_GetAttributeOfElement(XFA_ELEMENT eElement, XFA_ATTRIBUTE eAttribute, FX_DWORD dwPacket) { int32_t iCount = 0; - FX_LPCBYTE pAttr = XFA_GetElementAttributes(eElement, iCount); + const uint8_t* pAttr = XFA_GetElementAttributes(eElement, iCount); if (pAttr == NULL || iCount < 1) { return NULL; } @@ -259,7 +259,7 @@ XFA_LPCATTRIBUTEINFO XFA_GetAttributeOfElement(XFA_ELEMENT eElement, XFA_ATTRIBU XFA_LPCELEMENTINFO XFA_GetChildOfElement(XFA_ELEMENT eElement, XFA_ELEMENT eChild, FX_DWORD dwPacket) { int32_t iCount = 0; - FX_LPCWORD pChild = XFA_GetElementChildren(eElement, iCount); + const FX_WORD* pChild = XFA_GetElementChildren(eElement, iCount); if (pChild == NULL || iCount < 1) { return NULL; } @@ -614,12 +614,12 @@ FX_BOOL CXFA_WideTextRead::IsEOF() const { return m_iPosition >= m_wsBuffer.GetLength(); } -int32_t CXFA_WideTextRead::ReadString(FX_LPWSTR pStr, int32_t iMaxLength, FX_BOOL &bEOS, int32_t const *pByteSize ) +int32_t CXFA_WideTextRead::ReadString(FX_WCHAR* pStr, int32_t iMaxLength, FX_BOOL &bEOS, int32_t const *pByteSize ) { if (iMaxLength > m_wsBuffer.GetLength() - m_iPosition) { iMaxLength = m_wsBuffer.GetLength() - m_iPosition; } - FXSYS_wcsncpy(pStr, (FX_LPCWSTR)m_wsBuffer + m_iPosition, iMaxLength); + FXSYS_wcsncpy(pStr, (const FX_WCHAR*)m_wsBuffer + m_iPosition, iMaxLength); m_iPosition += iMaxLength; bEOS = IsEOF(); return iMaxLength; diff --git a/xfa/src/fxfa/src/parser/xfa_basic_imp.h b/xfa/src/fxfa/src/parser/xfa_basic_imp.h index cbffe4e635..1e8e64e6cb 100644 --- a/xfa/src/fxfa/src/parser/xfa_basic_imp.h +++ b/xfa/src/fxfa/src/parser/xfa_basic_imp.h @@ -10,7 +10,7 @@ typedef struct _XFA_NOTSUREATTRIBUTE { XFA_ELEMENT eElement; XFA_ATTRIBUTE eAttribute; XFA_ATTRIBUTETYPE eType; - FX_LPVOID pValue; + void* pValue; } XFA_NOTSUREATTRIBUTE, * XFA_LPNOTSUREATTRIBUTE; typedef XFA_NOTSUREATTRIBUTE const * XFA_LPCNOTSUREATTRIBUTE; XFA_LPCNOTSUREATTRIBUTE XFA_GetNotsureAttribute(XFA_ELEMENT eElement, XFA_ATTRIBUTE eAttribute, XFA_ATTRIBUTETYPE eType = XFA_ATTRIBUTETYPE_NOTSURE); @@ -27,16 +27,16 @@ public: virtual int32_t GetPosition(); virtual FX_BOOL IsEOF() const; - virtual int32_t ReadData(FX_LPBYTE pBuffer, int32_t iBufferSize) + virtual int32_t ReadData(uint8_t* pBuffer, int32_t iBufferSize) { return 0; } - virtual int32_t ReadString(FX_LPWSTR pStr, int32_t iMaxLength, FX_BOOL &bEOS, int32_t const *pByteSize = NULL); - virtual int32_t WriteData(FX_LPCBYTE pBuffer, int32_t iBufferSize) + virtual int32_t ReadString(FX_WCHAR* pStr, int32_t iMaxLength, FX_BOOL &bEOS, int32_t const *pByteSize = NULL); + virtual int32_t WriteData(const uint8_t* pBuffer, int32_t iBufferSize) { return 0; } - virtual int32_t WriteString(FX_LPCWSTR pStr, int32_t iLength) + virtual int32_t WriteString(const FX_WCHAR* pStr, int32_t iLength) { return 0; } diff --git a/xfa/src/fxfa/src/parser/xfa_document_imp.cpp b/xfa/src/fxfa/src/parser/xfa_document_imp.cpp index d634079f58..690ed2960e 100644 --- a/xfa/src/fxfa/src/parser/xfa_document_imp.cpp +++ b/xfa/src/fxfa/src/parser/xfa_document_imp.cpp @@ -379,19 +379,19 @@ void CXFA_Document::DoProtoMerge() if(uSharpPos < 0) { wsURI = wsUseVal; } else { - wsURI = CFX_WideStringC((FX_LPCWSTR)wsUseVal, uSharpPos); + wsURI = CFX_WideStringC((const FX_WCHAR*)wsUseVal, uSharpPos); FX_STRSIZE uLen = wsUseVal.GetLength(); - if(uLen >= uSharpPos + 5 && CFX_WideStringC((FX_LPCWSTR)wsUseVal + uSharpPos, 5) == FX_WSTRC(L"#som(") && wsUseVal[uLen - 1] == ')') { - wsSOM = CFX_WideStringC((FX_LPCWSTR)wsUseVal + uSharpPos + 5, uLen - 1 - uSharpPos - 5); + if(uLen >= uSharpPos + 5 && CFX_WideStringC((const FX_WCHAR*)wsUseVal + uSharpPos, 5) == FX_WSTRC(L"#som(") && wsUseVal[uLen - 1] == ')') { + wsSOM = CFX_WideStringC((const FX_WCHAR*)wsUseVal + uSharpPos + 5, uLen - 1 - uSharpPos - 5); } else { - wsID = CFX_WideStringC((FX_LPCWSTR)wsUseVal + uSharpPos + 1, uLen - uSharpPos - 1); + wsID = CFX_WideStringC((const FX_WCHAR*)wsUseVal + uSharpPos + 1, uLen - uSharpPos - 1); } } } else if(pUseHrefNode->TryCData(XFA_ATTRIBUTE_Use, wsUseVal) && !wsUseVal.IsEmpty()) { if(wsUseVal[0] == '#') { - wsID = CFX_WideStringC((FX_LPCWSTR)wsUseVal + 1, wsUseVal.GetLength() - 1); + wsID = CFX_WideStringC((const FX_WCHAR*)wsUseVal + 1, wsUseVal.GetLength() - 1); } else { - wsSOM = CFX_WideStringC((FX_LPCWSTR)wsUseVal, wsUseVal.GetLength()); + wsSOM = CFX_WideStringC((const FX_WCHAR*)wsUseVal, wsUseVal.GetLength()); } } if (!wsURI.IsEmpty() && wsURI != FX_WSTRC(L".")) { diff --git a/xfa/src/fxfa/src/parser/xfa_document_serialize.cpp b/xfa/src/fxfa/src/parser/xfa_document_serialize.cpp index f9c22e8149..c8412873d2 100644 --- a/xfa/src/fxfa/src/parser/xfa_document_serialize.cpp +++ b/xfa/src/fxfa/src/parser/xfa_document_serialize.cpp @@ -203,7 +203,7 @@ static void XFA_DataExporter_RegenerateFormFile_Changed(CXFA_Node* pNode, CFX_Wi { CFX_WideString wsAttrs; int32_t iAttrs = 0; - FX_LPCBYTE pAttrs = XFA_GetElementAttributes(pNode->GetClassID(), iAttrs); + const uint8_t* pAttrs = XFA_GetElementAttributes(pNode->GetClassID(), iAttrs); while (iAttrs--) { XFA_LPCATTRIBUTEINFO pAttr = XFA_GetAttributeByID((XFA_ATTRIBUTE)pAttrs[iAttrs]); if (pAttr->eName == XFA_ATTRIBUTE_Name || (XFA_DataExporter_AttributeSaveInDataModel(pNode, pAttr->eName) && !bSaveXML)) { @@ -241,7 +241,7 @@ static void XFA_DataExporter_RegenerateFormFile_Changed(CXFA_Node* pNode, CFX_Wi IFX_Stream *pTempStream = IFX_Stream::CreateStream((IFX_FileWrite*)pMemStream, FX_STREAMACCESS_Text | FX_STREAMACCESS_Write | FX_STREAMACCESS_Append); pTempStream->SetCodePage(FX_CODEPAGE_UTF8); pRichTextXML->SaveXMLNode(pTempStream); - wsChildren += CFX_WideString::FromUTF8((FX_LPCSTR)pMemStream->GetBuffer(), pMemStream->GetSize()); + wsChildren += CFX_WideString::FromUTF8((const FX_CHAR*)pMemStream->GetBuffer(), pMemStream->GetSize()); pTempStream->Release(); pMemStream->Release(); } else if (pRawValueNode->GetClassID() == XFA_ELEMENT_Sharpxml && wsContentType.Equal(FX_WSTRC(L"text/xml"))) { @@ -353,7 +353,7 @@ static void XFA_DataExporter_RegenerateFormFile_Container(CXFA_Node* pNode, IFX_ XFA_DataExporter_RegenerateFormFile_Changed(pNode, buf, bSaveXML); FX_STRSIZE nLen = buf.GetLength(); if (nLen > 0) { - pStream->WriteString((FX_LPCWSTR)buf.GetBuffer(), nLen); + pStream->WriteString((const FX_WCHAR*)buf.GetBuffer(), nLen); } return; } @@ -365,7 +365,7 @@ static void XFA_DataExporter_RegenerateFormFile_Container(CXFA_Node* pNode, IFX_ XFA_SaveAttribute(pNode, XFA_ATTRIBUTE_Name, FX_WSTRC(L"name"), TRUE, wsOutput); CFX_WideString wsAttrs; int32_t iAttrs = 0; - FX_LPCBYTE pAttrs = XFA_GetElementAttributes(pNode->GetClassID(), iAttrs); + const uint8_t* pAttrs = XFA_GetElementAttributes(pNode->GetClassID(), iAttrs); while (iAttrs--) { XFA_LPCATTRIBUTEINFO pAttr = XFA_GetAttributeByID((XFA_ATTRIBUTE)pAttrs[iAttrs]); if (pAttr->eName == XFA_ATTRIBUTE_Name) { @@ -376,7 +376,7 @@ static void XFA_DataExporter_RegenerateFormFile_Container(CXFA_Node* pNode, IFX_ wsOutput += wsAttr; } if (!wsOutput.IsEmpty()) { - pStream->WriteString((FX_LPCWSTR)wsOutput, wsOutput.GetLength()); + pStream->WriteString((const FX_WCHAR*)wsOutput, wsOutput.GetLength()); } CXFA_Node* pChildNode = pNode->GetNodeItem(XFA_NODEITEM_FirstChild); if (pChildNode) { @@ -392,21 +392,21 @@ static void XFA_DataExporter_RegenerateFormFile_Container(CXFA_Node* pNode, IFX_ pStream->WriteString(L"\n/>", 3); } } -void XFA_DataExporter_RegenerateFormFile(CXFA_Node* pNode, IFX_Stream* pStream, FX_LPCSTR pChecksum , FX_BOOL bSaveXML) +void XFA_DataExporter_RegenerateFormFile(CXFA_Node* pNode, IFX_Stream* pStream, const FX_CHAR* pChecksum , FX_BOOL bSaveXML) { if(pNode->GetObjectType() == XFA_OBJECTTYPE_ModelNode) { - static FX_LPCWSTR s_pwsTagName = L""; + static const FX_WCHAR* s_pwsTagName = L""; pStream->WriteString(s_pwsTagName, FXSYS_wcslen(s_pwsTagName)); if (pChecksum != NULL) { - static FX_LPCWSTR s_pwChecksum = L" checksum=\""; + static const FX_WCHAR* s_pwChecksum = L" checksum=\""; CFX_WideString wsChecksum = CFX_WideString::FromUTF8(pChecksum, FXSYS_strlen(pChecksum)); pStream->WriteString(s_pwChecksum, FXSYS_wcslen(s_pwChecksum)); - pStream->WriteString((FX_LPCWSTR)wsChecksum, wsChecksum.GetLength()); + pStream->WriteString((const FX_WCHAR*)wsChecksum, wsChecksum.GetLength()); pStream->WriteString(L"\"", 1); } pStream->WriteString(L" xmlns=\"", FXSYS_wcslen(L" xmlns=\"")); - FX_LPCWSTR pURI = XFA_GetPacketByIndex(XFA_PACKET_Form)->pURI; + const FX_WCHAR* pURI = XFA_GetPacketByIndex(XFA_PACKET_Form)->pURI; pStream->WriteString(pURI, FXSYS_wcslen(pURI)); CFX_WideString wsVersionNumber; XFA_DataExporter_RecognizeXFAVersionNumber((CXFA_Node*)pNode->GetDocument()->GetXFANode(XFA_XDPPACKET_Template), wsVersionNumber); @@ -414,7 +414,7 @@ void XFA_DataExporter_RegenerateFormFile(CXFA_Node* pNode, IFX_Stream* pStream, wsVersionNumber = FX_WSTRC(L"2.8"); } wsVersionNumber += FX_WSTRC(L"/\"\n>"); - pStream->WriteString((FX_LPCWSTR)wsVersionNumber, wsVersionNumber.GetLength()); + pStream->WriteString((const FX_WCHAR*)wsVersionNumber, wsVersionNumber.GetLength()); CXFA_Node* pChildNode = pNode->GetNodeItem(XFA_NODEITEM_FirstChild); while (pChildNode) { XFA_DataExporter_RegenerateFormFile_Container(pChildNode, pStream); @@ -438,7 +438,7 @@ FX_BOOL CXFA_DataExporter::Export(IFX_FileWrite *pWrite) { return Export(pWrite, m_pDocument->GetRoot()); } -FX_BOOL CXFA_DataExporter::Export(IFX_FileWrite *pWrite, CXFA_Node *pNode, FX_DWORD dwFlag , FX_LPCSTR pChecksum ) +FX_BOOL CXFA_DataExporter::Export(IFX_FileWrite *pWrite, CXFA_Node *pNode, FX_DWORD dwFlag , const FX_CHAR* pChecksum ) { ASSERT(pWrite != NULL); if (pWrite == NULL) { @@ -453,18 +453,18 @@ FX_BOOL CXFA_DataExporter::Export(IFX_FileWrite *pWrite, CXFA_Node *pNode, FX_DW pStream->Release(); return bRet; } -FX_BOOL CXFA_DataExporter::Export(IFX_Stream *pStream, CXFA_Node *pNode, FX_DWORD dwFlag, FX_LPCSTR pChecksum) +FX_BOOL CXFA_DataExporter::Export(IFX_Stream *pStream, CXFA_Node *pNode, FX_DWORD dwFlag, const FX_CHAR* pChecksum) { IFDE_XMLDoc* pXMLDoc = m_pDocument->GetParser()->GetXMLDoc(); if(pNode->GetObjectType() == XFA_OBJECTTYPE_ModelNode) { switch (pNode->GetPacketID()) { case XFA_XDPPACKET_XDP: { - static FX_LPCWSTR s_pwsPreamble = L""; + static const FX_WCHAR* s_pwsPreamble = L""; pStream->WriteString(s_pwsPreamble, FXSYS_wcslen(s_pwsPreamble)); for(CXFA_Node *pChild = pNode->GetNodeItem(XFA_NODEITEM_FirstChild); pChild; pChild = pChild->GetNodeItem(XFA_NODEITEM_NextSibling)) { Export(pStream, pChild, dwFlag, pChecksum); } - static FX_LPCWSTR s_pwsPostamble = L""; + static const FX_WCHAR* s_pwsPostamble = L""; pStream->WriteString(s_pwsPostamble, FXSYS_wcslen(s_pwsPostamble)); } break; @@ -509,7 +509,7 @@ FX_BOOL CXFA_DataExporter::Export(IFX_Stream *pStream, CXFA_Node *pNode, FX_DWOR XFA_DataExporter_DealWithDataGroupNode(pExportNode); pElement->SetString(FX_WSTRC(L"xmlns:xfa"), FX_WSTRC(L"http://www.xfa.org/schema/xfa-data/1.0/")); pXMLDoc->SaveXMLNode(pStream, pElement); - pElement->RemoveAttribute(FX_LPCWSTR(L"xmlns:xfa")); + pElement->RemoveAttribute(L"xmlns:xfa"); } return TRUE; } diff --git a/xfa/src/fxfa/src/parser/xfa_document_serialize.h b/xfa/src/fxfa/src/parser/xfa_document_serialize.h index b4548de07c..e2a3ce6a1a 100644 --- a/xfa/src/fxfa/src/parser/xfa_document_serialize.h +++ b/xfa/src/fxfa/src/parser/xfa_document_serialize.h @@ -27,9 +27,9 @@ public: delete this; } virtual FX_BOOL Export(IFX_FileWrite *pWrite); - virtual FX_BOOL Export(IFX_FileWrite *pWrite, CXFA_Node *pNode, FX_DWORD dwFlag = 0, FX_LPCSTR pChecksum = NULL); + virtual FX_BOOL Export(IFX_FileWrite *pWrite, CXFA_Node *pNode, FX_DWORD dwFlag = 0, const FX_CHAR* pChecksum = NULL); protected: - FX_BOOL Export(IFX_Stream *pStream, CXFA_Node *pNode, FX_DWORD dwFlag, FX_LPCSTR pChecksum); + FX_BOOL Export(IFX_Stream *pStream, CXFA_Node *pNode, FX_DWORD dwFlag, const FX_CHAR* pChecksum); CXFA_Document *m_pDocument; }; #endif diff --git a/xfa/src/fxfa/src/parser/xfa_layout_itemlayout.cpp b/xfa/src/fxfa/src/parser/xfa_layout_itemlayout.cpp index 4ebc248ec2..fc6ec20f40 100644 --- a/xfa/src/fxfa/src/parser/xfa_layout_itemlayout.cpp +++ b/xfa/src/fxfa/src/parser/xfa_layout_itemlayout.cpp @@ -2388,7 +2388,7 @@ FX_BOOL CXFA_ItemLayoutProcessor::JudgeLeaderOrTrailerForOccur(CXFA_Node* pFormN return FALSE; } iCount++; - m_PendingNodesCount.SetAt(pTemplate, (FX_LPVOID)(uintptr_t)(iCount)); + m_PendingNodesCount.SetAt(pTemplate, (void*)(uintptr_t)(iCount)); return TRUE; } return TRUE; diff --git a/xfa/src/fxfa/src/parser/xfa_layout_pagemgr_new.cpp b/xfa/src/fxfa/src/parser/xfa_layout_pagemgr_new.cpp index d5814b921b..699500ddde 100644 --- a/xfa/src/fxfa/src/parser/xfa_layout_pagemgr_new.cpp +++ b/xfa/src/fxfa/src/parser/xfa_layout_pagemgr_new.cpp @@ -62,7 +62,7 @@ FX_BOOL CXFA_LayoutPageMgr::InitLayoutPage(CXFA_Node* pFormNode) m_pPageSetLayoutItemRoot = FX_NEW CXFA_ContainerLayoutItemImpl(m_pTemplatePageSetRoot); } m_pPageSetCurRoot = m_pPageSetLayoutItemRoot; - m_pTemplatePageSetRoot->SetUserData(XFA_LAYOUTITEMKEY, (FX_LPVOID)m_pPageSetLayoutItemRoot); + m_pTemplatePageSetRoot->SetUserData(XFA_LAYOUTITEMKEY, (void*)m_pPageSetLayoutItemRoot); XFA_ATTRIBUTEENUM eRelation = m_pTemplatePageSetRoot->GetEnum(XFA_ATTRIBUTE_Relation); if(eRelation != XFA_ATTRIBUTEENUM_Unknown) { m_ePageSetMode = eRelation; @@ -324,7 +324,7 @@ CXFA_ContainerRecord* CXFA_LayoutPageMgr::CreateContainerRecord(CXFA_Node* pPage pParentPageSetLayout = (CXFA_ContainerLayoutItemImpl*)pPageSet->GetNodeItem(XFA_NODEITEM_Parent)->GetUserData(XFA_LAYOUTITEMKEY); } CXFA_ContainerLayoutItemImpl* pPageSetLayoutItem = FX_NEW CXFA_ContainerLayoutItemImpl(pPageSet); - pPageSet->SetUserData(XFA_LAYOUTITEMKEY, (FX_LPVOID)pPageSetLayoutItem); + pPageSet->SetUserData(XFA_LAYOUTITEMKEY, (void*)pPageSetLayoutItem); if(pParentPageSetLayout == NULL) { CXFA_ContainerLayoutItemImpl* pPrePageSet = m_pPageSetLayoutItemRoot; while(pPrePageSet->m_pNextSibling) { @@ -344,7 +344,7 @@ CXFA_ContainerRecord* CXFA_LayoutPageMgr::CreateContainerRecord(CXFA_Node* pPage pNewRecord->pCurPageSet = m_pPageSetLayoutItemRoot; } else { CXFA_ContainerLayoutItemImpl* pPageSetLayoutItem = FX_NEW CXFA_ContainerLayoutItemImpl(pPageSet); - pPageSet->SetUserData(XFA_LAYOUTITEMKEY, (FX_LPVOID)pPageSetLayoutItem); + pPageSet->SetUserData(XFA_LAYOUTITEMKEY, (void*)pPageSetLayoutItem); m_pPageSetLayoutItemRoot->AddChild(pPageSetLayoutItem); pNewRecord->pCurPageSet = pPageSetLayoutItem; } @@ -368,7 +368,7 @@ void CXFA_LayoutPageMgr::AddPageAreaLayoutItem(CXFA_ContainerRecord* pNewRecord, CXFA_ContainerLayoutItemImpl* pContainerItem = (CXFA_ContainerLayoutItemImpl*)pNotify->OnCreateLayoutItem(pNewPageArea); m_PageArray.Add(pContainerItem); m_nAvailPages++; - pNotify->OnPageEvent((IXFA_LayoutPage*)pContainerItem, XFA_PAGEEVENT_PageAdded, (FX_LPVOID)(uintptr_t)m_nAvailPages); + pNotify->OnPageEvent((IXFA_LayoutPage*)pContainerItem, XFA_PAGEEVENT_PageAdded, (void*)(uintptr_t)m_nAvailPages); pNewPageAreaLayoutItem = pContainerItem; } pNewRecord->pCurPageSet->AddChild(pNewPageAreaLayoutItem); @@ -1548,7 +1548,7 @@ void XFA_SyncContainer(IXFA_Notify* pNotify, IXFA_DocLayout* pDocLayout, CXFA_La dwRelevantContainer = XFA_GetRelevant(pContainerItem->m_pFormNode, dwRelevant); dwStatus = (bVisibleItem ? XFA_LAYOUTSTATUS_Visible : 0) | dwRelevantContainer; } - pNotify->OnLayoutEvent(pDocLayout, (CXFA_LayoutItem*)pContainerItem, XFA_LAYOUTEVENT_ItemAdded, (FX_LPVOID)(uintptr_t)nPageIndex, (FX_LPVOID)(uintptr_t)dwStatus); + pNotify->OnLayoutEvent(pDocLayout, (CXFA_LayoutItem*)pContainerItem, XFA_LAYOUTEVENT_ItemAdded, (void*)(uintptr_t)nPageIndex, (void*)(uintptr_t)dwStatus); CXFA_LayoutItemImpl *pChild = pContainerItem->m_pFirstChild; while (pChild) { if (!pChild->IsContentLayoutItem()) { diff --git a/xfa/src/fxfa/src/parser/xfa_locale.cpp b/xfa/src/fxfa/src/parser/xfa_locale.cpp index 83c61d1a72..56a55cd4c3 100644 --- a/xfa/src/fxfa/src/parser/xfa_locale.cpp +++ b/xfa/src/fxfa/src/parser/xfa_locale.cpp @@ -17,10 +17,10 @@ #include "../common/xfa_fm2jsapi.h" #include "xfa_debug_parser.h" #include "xfa_locale.h" -const static FX_LPCWSTR g_FX_Percent = L"z,zzz,zzz,zzz,zzz,zzz%"; -const static FX_LPCWSTR g_FX_Currency = L"$z,zzz,zzz,zzz,zzz,zz9.99"; -const static FX_LPCWSTR g_FX_Decimal = L"z,zzz,zzz,zzz,zzz,zz9.zzz"; -const static FX_LPCWSTR g_FX_Integer = L"z,zzz,zzz,zzz,zzz,zzz"; +static const FX_WCHAR* g_FX_Percent = L"z,zzz,zzz,zzz,zzz,zzz%"; +static const FX_WCHAR* g_FX_Currency = L"$z,zzz,zzz,zzz,zzz,zz9.99"; +static const FX_WCHAR* g_FX_Decimal = L"z,zzz,zzz,zzz,zzz,zz9.zzz"; +static const FX_WCHAR* g_FX_Integer = L"z,zzz,zzz,zzz,zzz,zzz"; CXFA_XMLLocale::CXFA_XMLLocale(CXML_Element* pLocaleData) { m_pLocaleData = pLocaleData; @@ -79,7 +79,7 @@ void CXFA_XMLLocale::GetNumbericSymbol(FX_LOCALENUMSYMBOL eType, CFX_WideString& if (!pElement) { return; } - GetPattern(pElement, CFX_ByteStringC((FX_LPCSTR)bsSymbols, bsSymbols.GetLength() - 1), wsName, wsNumSymbol); + GetPattern(pElement, CFX_ByteStringC((const FX_CHAR*)bsSymbols, bsSymbols.GetLength() - 1), wsName, wsNumSymbol); } void CXFA_XMLLocale::GetDateTimeSymbols(CFX_WideString& wsDtSymbol) const { diff --git a/xfa/src/fxfa/src/parser/xfa_localemgr.cpp b/xfa/src/fxfa/src/parser/xfa_localemgr.cpp index cc136ae2ac..69b34993b9 100644 --- a/xfa/src/fxfa/src/parser/xfa_localemgr.cpp +++ b/xfa/src/fxfa/src/parser/xfa_localemgr.cpp @@ -648,7 +648,7 @@ const uint8_t g_ruRU_Locale[] = { 0xB9, 0xB4, 0x0A, 0x19, 0x89, 0x26, 0xB5, 0x2C, 0xA3, 0xB6, 0x4E, 0x5C, 0xA6, 0x17, 0xA4, 0x7B, 0xB3, 0x85, 0xFA, 0x59, 0x2A, 0x7A, 0xFF, 0x3D, 0xC4, 0x3F, 0xDE, 0xCB, 0x8B, 0xC4 }; -static IFX_Locale* XFA_GetLocaleFromBuffer(FX_LPCBYTE pBuf, int nBufLen) +static IFX_Locale* XFA_GetLocaleFromBuffer(const uint8_t* pBuf, int nBufLen) { if (pBuf == NULL || nBufLen <= 0) { return NULL; @@ -662,7 +662,7 @@ static IFX_Locale* XFA_GetLocaleFromBuffer(FX_LPCBYTE pBuf, int nBufLen) return NULL; } CXML_Element* pLocale = NULL; - FX_LPBYTE pOut = NULL; + uint8_t* pOut = NULL; FX_DWORD dwSize; pCodecMgr->GetFlateModule()->FlateOrLZWDecode(FALSE, pBuf, nBufLen, TRUE, 0, 0, 0, 0, 0, pOut, dwSize); diff --git a/xfa/src/fxfa/src/parser/xfa_localevalue.cpp b/xfa/src/fxfa/src/parser/xfa_localevalue.cpp index 3f9d066122..b8d1526998 100644 --- a/xfa/src/fxfa/src/parser/xfa_localevalue.cpp +++ b/xfa/src/fxfa/src/parser/xfa_localevalue.cpp @@ -204,7 +204,7 @@ FX_FLOAT CXFA_LocaleValue::GetNum() const int32_t nExponent = 0; int cc = 0; FX_BOOL bNegative = FALSE, bExpSign = FALSE; - FX_LPCWSTR str = (FX_LPCWSTR)m_wsValue; + const FX_WCHAR* str = (const FX_WCHAR*)m_wsValue; int len = m_wsValue.GetLength(); while (XFA_IsSpace(str[cc]) && cc < len) { cc++; @@ -280,7 +280,7 @@ FX_DOUBLE CXFA_LocaleValue::GetDoubleNum() const int32_t nExponent = 0; int32_t cc = 0; FX_BOOL bNegative = FALSE, bExpSign = FALSE; - FX_LPCWSTR str = (FX_LPCWSTR)m_wsValue; + const FX_WCHAR* str = (const FX_WCHAR*)m_wsValue; int len = m_wsValue.GetLength(); while (XFA_IsSpace(str[cc]) && cc < len) { cc++; @@ -581,7 +581,7 @@ FX_BOOL CXFA_LocaleValue::ValidateCanonicalDate(const CFX_WideString& wsDate, CF } FX_BOOL bSymbol = (wsDate.Find(0x2D) == -1) ? FALSE : TRUE; FX_WORD wYear = 0, wMonth = 0, wDay = 0; - FX_LPCWSTR pDate = (FX_LPCWSTR)wsDate; + const FX_WCHAR* pDate = (const FX_WCHAR*)wsDate; int nIndex = 0, nStart = 0; while (pDate[nIndex] != '\0' && nIndex < wCountY) { if (!XFA_IsDigit(pDate[nIndex])) { @@ -663,7 +663,7 @@ FX_BOOL CXFA_LocaleValue::ValidateCanonicalTime(const CFX_WideString& wsTime) const FX_WORD wCountH = 2, wCountM = 2, wCountS = 2, wCountF = 3; FX_BOOL bSymbol = (wsTime.Find(':') == -1) ? FALSE : TRUE; FX_WORD wHour = 0, wMinute = 0, wSecond = 0, wFraction = 0; - FX_LPCWSTR pTime = (FX_LPCWSTR)wsTime; + const FX_WCHAR* pTime = (const FX_WCHAR*)wsTime; int nIndex = 0, nStart = 0; while (pTime[nIndex] != '\0' && nIndex - nStart < wCountH) { if (!XFA_IsDigit(pTime[nIndex])) { @@ -876,7 +876,7 @@ void CXFA_LocaleValue::GetNumbericFormat(CFX_WideString &wsFormat, int32_t nIntL + (bSign ? 1 : 0) \ + (nDecLen >= 0 ? nDecLen : 2) \ + (nDecLen == 0 ? 0 : 1); - FX_LPWSTR lpBuf = wsFormat.GetBuffer(nTotalLen); + FX_WCHAR* lpBuf = wsFormat.GetBuffer(nTotalLen); int32_t nPos = 0; if (bSign) { lpBuf[nPos++] = L's'; @@ -909,8 +909,8 @@ FX_BOOL CXFA_LocaleValue::ValidateNumericTemp(CFX_WideString& wsNumeric, CFX_Wid if (wsFormat.IsEmpty() || wsNumeric.IsEmpty()) { return TRUE; } - FX_LPCWSTR pNum = FX_LPCWSTR(wsNumeric); - FX_LPCWSTR pFmt = FX_LPCWSTR(wsFormat); + const FX_WCHAR* pNum = wsNumeric.c_str(); + const FX_WCHAR* pFmt = wsFormat.c_str(); int32_t n = 0, nf = 0; FX_WCHAR c = pNum[n]; FX_WCHAR cf = pFmt[nf]; diff --git a/xfa/src/fxfa/src/parser/xfa_object_imp.cpp b/xfa/src/fxfa/src/parser/xfa_object_imp.cpp index 153110492f..c1d09fdbdc 100644 --- a/xfa/src/fxfa/src/parser/xfa_object_imp.cpp +++ b/xfa/src/fxfa/src/parser/xfa_object_imp.cpp @@ -68,17 +68,17 @@ void CXFA_Object::ThrowScriptErrorMessage(int32_t iStringID, ...) CFX_WideString wsMessage; va_list arg_ptr; va_start(arg_ptr, iStringID); - wsMessage.FormatV((FX_LPCWSTR)wsFormat, arg_ptr); + wsMessage.FormatV((const FX_WCHAR*)wsFormat, arg_ptr); va_end(arg_ptr); FXJSE_ThrowMessage(FX_BSTRC(""), FX_UTF8Encode(wsMessage, wsMessage.GetLength())); } -static void XFA_DeleteWideString(FX_LPVOID pData) +static void XFA_DeleteWideString(void* pData) { if (pData) { delete (CFX_WideString*)pData; } } -static void XFA_CopyWideString(FX_LPVOID& pData) +static void XFA_CopyWideString(void*& pData) { if (pData) { CFX_WideString* pNewData = FX_NEW CFX_WideString(*(CFX_WideString*)pData); @@ -339,7 +339,7 @@ int32_t CXFA_Node::GetBindItems(CXFA_NodeArray& formItems) { if (m_uFlags & XFA_NODEFLAG_BindFormItems) { CXFA_NodeArray* pItems = NULL; - TryObject(XFA_ATTRIBUTE_BindingNode, (FX_LPVOID&)pItems); + TryObject(XFA_ATTRIBUTE_BindingNode, (void*&)pItems); formItems.Copy(*pItems); return formItems.GetSize(); } @@ -349,7 +349,7 @@ int32_t CXFA_Node::GetBindItems(CXFA_NodeArray& formItems) } return formItems.GetSize(); } -static void XFA_DataNodeDeleteBindItem(FX_LPVOID pData) +static void XFA_DataNodeDeleteBindItem(void* pData) { if (pData) { delete ((CXFA_NodeArray*)pData); @@ -361,7 +361,7 @@ int32_t CXFA_Node::AddBindItem(CXFA_Node* pFormNode) ASSERT(pFormNode); if (m_uFlags & XFA_NODEFLAG_BindFormItems) { CXFA_NodeArray* pItems = NULL; - TryObject(XFA_ATTRIBUTE_BindingNode, (FX_LPVOID&)pItems); + TryObject(XFA_ATTRIBUTE_BindingNode, (void*&)pItems); ASSERT(pItems); if (pItems->Find(pFormNode) < 0) { pItems->Add(pFormNode); @@ -386,7 +386,7 @@ int32_t CXFA_Node::RemoveBindItem(CXFA_Node* pFormNode) { if (m_uFlags & XFA_NODEFLAG_BindFormItems) { CXFA_NodeArray* pItems = NULL; - TryObject(XFA_ATTRIBUTE_BindingNode, (FX_LPVOID&)pItems); + TryObject(XFA_ATTRIBUTE_BindingNode, (void*&)pItems); ASSERT(pItems); int32_t iIndex = pItems->Find(pFormNode); int32_t iCount = pItems->GetSize(); @@ -1243,7 +1243,7 @@ void CXFA_Node::Script_Attribute_BOOLRead(FXJSE_HVALUE hValue, FX_BOOL bSetting, ThrowScriptErrorMessage(XFA_IDS_INVAlID_PROP_SET); } } -void CXFA_Node::Script_Attribute_SendAttributeChangeMessage(FX_LPVOID eAttribute, FX_LPVOID eValue, FX_BOOL bScriptModify) +void CXFA_Node::Script_Attribute_SendAttributeChangeMessage(void* eAttribute, void* eValue, FX_BOOL bScriptModify) { CXFA_LayoutProcessor* pLayoutPro = m_pDocument->GetLayoutProcessor(); if (!pLayoutPro) { @@ -1403,9 +1403,9 @@ void CXFA_Node::Script_Attribute_String(FXJSE_HVALUE hValue, FX_BOOL bSetting, X CXFA_Node* pProtoRoot = pTemplateNode->GetFirstChildByClass(XFA_ELEMENT_Subform)->GetFirstChildByClass(XFA_ELEMENT_Proto); if(!wsUseVal.IsEmpty()) { if(wsUseVal[0] == '#') { - wsID = CFX_WideString((FX_LPCWSTR)wsUseVal + 1, wsUseVal.GetLength() - 1); + wsID = CFX_WideString((const FX_WCHAR*)wsUseVal + 1, wsUseVal.GetLength() - 1); } else { - wsSOM = CFX_WideString((FX_LPCWSTR)wsUseVal, wsUseVal.GetLength()); + wsSOM = CFX_WideString((const FX_WCHAR*)wsUseVal, wsUseVal.GetLength()); } } CXFA_Node* pProtoNode = NULL; @@ -1646,7 +1646,7 @@ void CXFA_Node::Script_Boolean_Value(FXJSE_HVALUE hValue, FX_BOOL bSetting, XFA_ struct XFA_ExecEventParaInfo { public: uint32_t m_uHash; - FX_LPCWSTR m_lpcEventName; + const FX_WCHAR* m_lpcEventName; XFA_EVENTTYPE m_eventType; uint32_t m_validFlags; }; @@ -2581,7 +2581,7 @@ void CXFA_Node::Script_Template_CreateNode(CFXJSE_Arguments* pArguments) } FXJSE_Value_Set(pArguments->GetReturnValue(), m_pDocument->GetScriptContext()->GetJSValueFromMap(pNewNode)); } else { - ThrowScriptErrorMessage(XFA_IDS_NOT_HAVE_PROPERTY, (FX_LPCWSTR)strTagName, L"name"); + ThrowScriptErrorMessage(XFA_IDS_NOT_HAVE_PROPERTY, (const FX_WCHAR*)strTagName, L"name"); } } else { FXJSE_Value_Set(pArguments->GetReturnValue(), m_pDocument->GetScriptContext()->GetJSValueFromMap(pNewNode)); @@ -3504,23 +3504,23 @@ enum XFA_KEYTYPE { XFA_KEYTYPE_Custom, XFA_KEYTYPE_Element, }; -FX_LPVOID XFA_GetMapKey_Custom(FX_WSTR wsKey) +void* XFA_GetMapKey_Custom(FX_WSTR wsKey) { FX_DWORD dwKey = FX_HashCode_String_GetW(wsKey.GetPtr(), wsKey.GetLength()); - return (FX_LPVOID)(uintptr_t)((dwKey << 1) | XFA_KEYTYPE_Custom); + return (void*)(uintptr_t)((dwKey << 1) | XFA_KEYTYPE_Custom); } -FX_LPVOID XFA_GetMapKey_Element(XFA_ELEMENT eElement, XFA_ATTRIBUTE eAttribute) +void* XFA_GetMapKey_Element(XFA_ELEMENT eElement, XFA_ATTRIBUTE eAttribute) { - return (FX_LPVOID)(uintptr_t)((eElement << 16) | (eAttribute << 8) | XFA_KEYTYPE_Element); + return (void*)(uintptr_t)((eElement << 16) | (eAttribute << 8) | XFA_KEYTYPE_Element); } -static inline FX_BOOL XFA_NodeData_PrepareKey(XFA_ELEMENT eElem, XFA_ATTRIBUTE eAttr, FX_LPVOID &pKey) +static inline FX_BOOL XFA_NodeData_PrepareKey(XFA_ELEMENT eElem, XFA_ATTRIBUTE eAttr, void* &pKey) { pKey = XFA_GetMapKey_Element(eElem, eAttr); return TRUE; } FX_BOOL CXFA_Node::HasAttribute(XFA_ATTRIBUTE eAttr, FX_BOOL bCanInherit ) { - FX_LPVOID pKey = NULL; + void* pKey = NULL; if (!XFA_NodeData_PrepareKey(GetClassID(), eAttr, pKey)) { return FALSE; } @@ -3624,7 +3624,7 @@ FX_BOOL CXFA_Node::SetAttribute(FX_WSTR wsAttr, FX_WSTR wsValue, FX_BOOL bNotify if (pAttributeInfo) { return SetAttribute(pAttributeInfo->eName, wsValue, bNotify); } - FX_LPVOID pKey = XFA_GetMapKey_Custom(wsAttr); + void* pKey = XFA_GetMapKey_Custom(wsAttr); SetMapModuleString(pKey, wsValue); return TRUE; } @@ -3634,7 +3634,7 @@ FX_BOOL CXFA_Node::GetAttribute(FX_WSTR wsAttr, CFX_WideString &wsValue, FX_BOOL if (pAttributeInfo) { return GetAttribute(pAttributeInfo->eName, wsValue, bUseDefault); } - FX_LPVOID pKey = XFA_GetMapKey_Custom(wsAttr); + void* pKey = XFA_GetMapKey_Custom(wsAttr); CFX_WideStringC wsValueC; if (GetMapModuleString(pKey, wsValueC)) { wsValue = wsValueC; @@ -3643,13 +3643,13 @@ FX_BOOL CXFA_Node::GetAttribute(FX_WSTR wsAttr, CFX_WideString &wsValue, FX_BOOL } FX_BOOL CXFA_Node::RemoveAttribute(FX_WSTR wsAttr) { - FX_LPVOID pKey = XFA_GetMapKey_Custom(wsAttr); + void* pKey = XFA_GetMapKey_Custom(wsAttr); RemoveMapModuleKey(pKey); return TRUE; } FX_BOOL CXFA_Node::TryBoolean(XFA_ATTRIBUTE eAttr, FX_BOOL &bValue, FX_BOOL bUseDefault ) { - FX_LPVOID pValue = NULL; + void* pValue = NULL; if (!GetValue(eAttr, XFA_ATTRIBUTETYPE_Boolean, bUseDefault, pValue)) { return FALSE; } @@ -3658,7 +3658,7 @@ FX_BOOL CXFA_Node::TryBoolean(XFA_ATTRIBUTE eAttr, FX_BOOL &bValue, FX_BOOL bUse } FX_BOOL CXFA_Node::TryInteger(XFA_ATTRIBUTE eAttr, int32_t &iValue, FX_BOOL bUseDefault) { - FX_LPVOID pValue = NULL; + void* pValue = NULL; if (!GetValue(eAttr, XFA_ATTRIBUTETYPE_Integer, bUseDefault, pValue)) { return FALSE; } @@ -3667,7 +3667,7 @@ FX_BOOL CXFA_Node::TryInteger(XFA_ATTRIBUTE eAttr, int32_t &iValue, FX_BOOL bUse } FX_BOOL CXFA_Node::TryEnum(XFA_ATTRIBUTE eAttr, XFA_ATTRIBUTEENUM &eValue, FX_BOOL bUseDefault) { - FX_LPVOID pValue = NULL; + void* pValue = NULL; if (!GetValue(eAttr, XFA_ATTRIBUTETYPE_Enum, bUseDefault, pValue)) { return FALSE; } @@ -3676,7 +3676,7 @@ FX_BOOL CXFA_Node::TryEnum(XFA_ATTRIBUTE eAttr, XFA_ATTRIBUTEENUM &eValue, FX_BO } FX_BOOL CXFA_Node::SetMeasure(XFA_ATTRIBUTE eAttr, CXFA_Measurement mValue, FX_BOOL bNotify ) { - FX_LPVOID pKey = NULL; + void* pKey = NULL; if (!XFA_NodeData_PrepareKey(GetClassID(), eAttr, pKey)) { return FALSE; } @@ -3687,11 +3687,11 @@ FX_BOOL CXFA_Node::SetMeasure(XFA_ATTRIBUTE eAttr, CXFA_Measurement mValue, FX_B } FX_BOOL CXFA_Node::TryMeasure(XFA_ATTRIBUTE eAttr, CXFA_Measurement &mValue, FX_BOOL bUseDefault) { - FX_LPVOID pKey = NULL; + void* pKey = NULL; if (!XFA_NodeData_PrepareKey(GetClassID(), eAttr, pKey)) { return FALSE; } - FX_LPVOID pValue; + void* pValue; int32_t iBytes; if(GetMapModuleBuffer(pKey, pValue, iBytes) && iBytes == sizeof(mValue)) { FX_memcpy(&mValue, pValue, sizeof(mValue)); @@ -3705,11 +3705,11 @@ FX_BOOL CXFA_Node::TryMeasure(XFA_ATTRIBUTE eAttr, CXFA_Measurement &mValue, FX_ } FX_BOOL CXFA_Node::SetCData(XFA_ATTRIBUTE eAttr, const CFX_WideString& wsValue, FX_BOOL bNotify, FX_BOOL bScriptModify) { - FX_LPVOID pKey = NULL; + void* pKey = NULL; if (!XFA_NodeData_PrepareKey(GetClassID(), eAttr, pKey)) { return FALSE; } - OnChanging(eAttr, (FX_LPVOID)(FX_LPCWSTR)wsValue, bNotify); + OnChanging(eAttr, (void*)(const FX_WCHAR*)wsValue, bNotify); if (eAttr == XFA_ATTRIBUTE_Value) { CFX_WideString *pClone = FX_NEW CFX_WideString(wsValue); if (pClone == NULL) { @@ -3725,7 +3725,7 @@ FX_BOOL CXFA_Node::SetCData(XFA_ATTRIBUTE eAttr, const CFX_WideString& wsValue, } } } - OnChanged(eAttr, (FX_LPVOID)(FX_LPCWSTR)wsValue, bNotify, bScriptModify); + OnChanged(eAttr, (void*)(const FX_WCHAR*)wsValue, bNotify, bScriptModify); if (IsNeedSavingXMLNode() && eAttr != XFA_ATTRIBUTE_QualifiedName && eAttr != XFA_ATTRIBUTE_BindingNode) { if (eAttr == XFA_ATTRIBUTE_Name && (m_eNodeClass == XFA_ELEMENT_DataValue || m_eNodeClass == XFA_ELEMENT_DataGroup)) { return TRUE; @@ -3775,17 +3775,17 @@ FX_BOOL CXFA_Node::SetCData(XFA_ATTRIBUTE eAttr, const CFX_WideString& wsValue, } FX_BOOL CXFA_Node::SetAttributeValue(const CFX_WideString& wsValue, const CFX_WideString& wsXMLValue, FX_BOOL bNotify, FX_BOOL bScriptModify) { - FX_LPVOID pKey = NULL; + void* pKey = NULL; if (!XFA_NodeData_PrepareKey(GetClassID(), XFA_ATTRIBUTE_Value, pKey)) { return FALSE; } - OnChanging(XFA_ATTRIBUTE_Value, (FX_LPVOID)(FX_LPCWSTR)wsValue, bNotify); + OnChanging(XFA_ATTRIBUTE_Value, (void*)(const FX_WCHAR*)wsValue, bNotify); CFX_WideString *pClone = FX_NEW CFX_WideString(wsValue); if (pClone == NULL) { return FALSE; } SetUserData(pKey, pClone, &deleteWideStringCallBack); - OnChanged(XFA_ATTRIBUTE_Value, (FX_LPVOID)(FX_LPCWSTR)wsValue, bNotify, bScriptModify); + OnChanged(XFA_ATTRIBUTE_Value, (void*)(const FX_WCHAR*)wsValue, bNotify, bScriptModify); if (IsNeedSavingXMLNode()) { FDE_XMLNODETYPE eXMLType = m_pXMLNode->GetType(); switch (eXMLType) { @@ -3820,7 +3820,7 @@ FX_BOOL CXFA_Node::SetAttributeValue(const CFX_WideString& wsValue, const CFX_Wi } FX_BOOL CXFA_Node::TryCData(XFA_ATTRIBUTE eAttr, CFX_WideString &wsValue, FX_BOOL bUseDefault, FX_BOOL bProto) { - FX_LPVOID pKey = NULL; + void* pKey = NULL; if (!XFA_NodeData_PrepareKey(GetClassID(), eAttr, pKey)) { return FALSE; } @@ -3840,16 +3840,16 @@ FX_BOOL CXFA_Node::TryCData(XFA_ATTRIBUTE eAttr, CFX_WideString &wsValue, FX_BOO if (!bUseDefault) { return FALSE; } - FX_LPVOID pValue = NULL; + void* pValue = NULL; if (XFA_GetAttributeDefaultValue(pValue, GetClassID(), eAttr, XFA_ATTRIBUTETYPE_Cdata, m_ePacket)) { - wsValue = (FX_LPCWSTR)pValue; + wsValue = (const FX_WCHAR*)pValue; return TRUE; } return FALSE; } FX_BOOL CXFA_Node::TryCData(XFA_ATTRIBUTE eAttr, CFX_WideStringC &wsValue, FX_BOOL bUseDefault, FX_BOOL bProto) { - FX_LPVOID pKey = NULL; + void* pKey = NULL; if (!XFA_NodeData_PrepareKey(GetClassID(), eAttr, pKey)) { return FALSE; } @@ -3867,33 +3867,33 @@ FX_BOOL CXFA_Node::TryCData(XFA_ATTRIBUTE eAttr, CFX_WideStringC &wsValue, FX_BO if (!bUseDefault) { return FALSE; } - FX_LPVOID pValue = NULL; + void* pValue = NULL; if (XFA_GetAttributeDefaultValue(pValue, GetClassID(), eAttr, XFA_ATTRIBUTETYPE_Cdata, m_ePacket)) { - wsValue = (CFX_WideStringC)(FX_LPCWSTR)pValue; + wsValue = (CFX_WideStringC)(const FX_WCHAR*)pValue; return TRUE; } return FALSE; } -FX_BOOL CXFA_Node::SetObject(XFA_ATTRIBUTE eAttr, FX_LPVOID pData, XFA_MAPDATABLOCKCALLBACKINFO* pCallbackInfo ) +FX_BOOL CXFA_Node::SetObject(XFA_ATTRIBUTE eAttr, void* pData, XFA_MAPDATABLOCKCALLBACKINFO* pCallbackInfo ) { - FX_LPVOID pKey = NULL; + void* pKey = NULL; if (!XFA_NodeData_PrepareKey(GetClassID(), eAttr, pKey)) { return FALSE; } return SetUserData(pKey, pData, pCallbackInfo); } -FX_BOOL CXFA_Node::TryObject(XFA_ATTRIBUTE eAttr, FX_LPVOID &pData) +FX_BOOL CXFA_Node::TryObject(XFA_ATTRIBUTE eAttr, void* &pData) { - FX_LPVOID pKey = NULL; + void* pKey = NULL; if (!XFA_NodeData_PrepareKey(GetClassID(), eAttr, pKey)) { return FALSE; } pData = GetUserData(pKey); return pData != NULL; } -FX_BOOL CXFA_Node::SetValue(XFA_ATTRIBUTE eAttr, XFA_ATTRIBUTETYPE eType, FX_LPVOID pValue, FX_BOOL bNotify) +FX_BOOL CXFA_Node::SetValue(XFA_ATTRIBUTE eAttr, XFA_ATTRIBUTETYPE eType, void* pValue, FX_BOOL bNotify) { - FX_LPVOID pKey = NULL; + void* pKey = NULL; if (!XFA_NodeData_PrepareKey(GetClassID(), eAttr, pKey)) { return FALSE; } @@ -3921,9 +3921,9 @@ FX_BOOL CXFA_Node::SetValue(XFA_ATTRIBUTE eAttr, XFA_ATTRIBUTETYPE eType, FX_LPV } return TRUE; } -FX_BOOL CXFA_Node::GetValue(XFA_ATTRIBUTE eAttr, XFA_ATTRIBUTETYPE eType, FX_BOOL bUseDefault, FX_LPVOID &pValue) +FX_BOOL CXFA_Node::GetValue(XFA_ATTRIBUTE eAttr, XFA_ATTRIBUTETYPE eType, FX_BOOL bUseDefault, void* &pValue) { - FX_LPVOID pKey = NULL; + void* pKey = NULL; if (!XFA_NodeData_PrepareKey(GetClassID(), eAttr, pKey)) { return FALSE; } @@ -3935,22 +3935,22 @@ FX_BOOL CXFA_Node::GetValue(XFA_ATTRIBUTE eAttr, XFA_ATTRIBUTETYPE eType, FX_BOO } return XFA_GetAttributeDefaultValue(pValue, GetClassID(), eAttr, eType, m_ePacket); } -static void XFA_DefaultFreeData(FX_LPVOID pData) +static void XFA_DefaultFreeData(void* pData) { } static XFA_MAPDATABLOCKCALLBACKINFO gs_XFADefaultFreeData = {XFA_DefaultFreeData, NULL}; -FX_BOOL CXFA_Node::SetUserData(FX_LPVOID pKey, FX_LPVOID pData, XFA_MAPDATABLOCKCALLBACKINFO* pCallbackInfo ) +FX_BOOL CXFA_Node::SetUserData(void* pKey, void* pData, XFA_MAPDATABLOCKCALLBACKINFO* pCallbackInfo ) { - SetMapModuleBuffer(pKey, &pData, sizeof(FX_LPVOID), pCallbackInfo ? pCallbackInfo : &gs_XFADefaultFreeData); + SetMapModuleBuffer(pKey, &pData, sizeof(void*), pCallbackInfo ? pCallbackInfo : &gs_XFADefaultFreeData); return TRUE; } -FX_BOOL CXFA_Node::TryUserData(FX_LPVOID pKey, FX_LPVOID &pData, FX_BOOL bProtoAlso) +FX_BOOL CXFA_Node::TryUserData(void* pKey, void* &pData, FX_BOOL bProtoAlso) { int32_t iBytes = 0; if (!GetMapModuleBuffer(pKey, pData, iBytes, bProtoAlso)) { return FALSE; } - return iBytes == sizeof(FX_LPVOID) && FXSYS_memcpy(&pData, pData, iBytes); + return iBytes == sizeof(void*) && FXSYS_memcpy(&pData, pData, iBytes); } FX_BOOL CXFA_Node::SetScriptContent(const CFX_WideString& wsContent, const CFX_WideString& wsXMLValue, FX_BOOL bNotify, FX_BOOL bScriptModify, FX_BOOL bSyncData) { @@ -4607,19 +4607,19 @@ void CXFA_Node::OnRemoved(CXFA_Node *pParent, CXFA_Node *pRemoved, FX_BOOL bNoti } } } -void CXFA_Node::OnChanging(XFA_ATTRIBUTE eAttr, FX_LPVOID pNewValue, FX_BOOL bNotify) +void CXFA_Node::OnChanging(XFA_ATTRIBUTE eAttr, void* pNewValue, FX_BOOL bNotify) { if (bNotify && HasFlag(XFA_NODEFLAG_Initialized)) { IXFA_Notify *pNotify = m_pDocument->GetParser()->GetNotify(); if (pNotify) { - pNotify->OnNodeEvent(this, XFA_NODEEVENT_ValueChanging, (FX_LPVOID)(uintptr_t)eAttr, pNewValue); + pNotify->OnNodeEvent(this, XFA_NODEEVENT_ValueChanging, (void*)(uintptr_t)eAttr, pNewValue); } } } -void CXFA_Node::OnChanged(XFA_ATTRIBUTE eAttr, FX_LPVOID pNewValue, FX_BOOL bNotify, FX_BOOL bScriptModify) +void CXFA_Node::OnChanged(XFA_ATTRIBUTE eAttr, void* pNewValue, FX_BOOL bNotify, FX_BOOL bScriptModify) { if (bNotify && HasFlag(XFA_NODEFLAG_Initialized)) { - Script_Attribute_SendAttributeChangeMessage((FX_LPVOID)(uintptr_t)eAttr, pNewValue, bScriptModify); + Script_Attribute_SendAttributeChangeMessage((void*)(uintptr_t)eAttr, pNewValue, bScriptModify); } } int32_t CXFA_Node::execSingleEventByName(FX_WSTR wsEventName, XFA_ELEMENT eElementType) @@ -4703,7 +4703,7 @@ XFA_LPMAPMODULEDATA CXFA_Node::GetMapModuleData(FX_BOOL bCreateNew) } return m_pMapModuleData; } -void CXFA_Node::SetMapModuleValue(FX_LPVOID pKey, FX_LPVOID pValue) +void CXFA_Node::SetMapModuleValue(void* pKey, void* pValue) { XFA_LPMAPMODULEDATA pMoudle = this->GetMapModuleData(TRUE); if (!pMoudle) { @@ -4711,7 +4711,7 @@ void CXFA_Node::SetMapModuleValue(FX_LPVOID pKey, FX_LPVOID pValue) } pMoudle->m_ValueMap.SetAt(pKey, pValue); } -FX_BOOL CXFA_Node::GetMapModuleValue(FX_LPVOID pKey, FX_LPVOID &pValue) +FX_BOOL CXFA_Node::GetMapModuleValue(void* pKey, void* &pValue) { CXFA_Node* pNode = this; while (pNode) { @@ -4723,21 +4723,21 @@ FX_BOOL CXFA_Node::GetMapModuleValue(FX_LPVOID pKey, FX_LPVOID &pValue) } return FALSE; } -void CXFA_Node::SetMapModuleString(FX_LPVOID pKey, FX_WSTR wsValue) +void CXFA_Node::SetMapModuleString(void* pKey, FX_WSTR wsValue) { - SetMapModuleBuffer(pKey, (FX_LPVOID)wsValue.GetPtr(), wsValue.GetLength() * sizeof(FX_WCHAR)); + SetMapModuleBuffer(pKey, (void*)wsValue.GetPtr(), wsValue.GetLength() * sizeof(FX_WCHAR)); } -FX_BOOL CXFA_Node::GetMapModuleString(FX_LPVOID pKey, CFX_WideStringC &wsValue) +FX_BOOL CXFA_Node::GetMapModuleString(void* pKey, CFX_WideStringC &wsValue) { - FX_LPVOID pValue; + void* pValue; int32_t iBytes; if (!GetMapModuleBuffer(pKey, pValue, iBytes)) { return FALSE; } - wsValue = CFX_WideStringC((FX_LPCWSTR)pValue, iBytes / sizeof(FX_WCHAR)); + wsValue = CFX_WideStringC((const FX_WCHAR*)pValue, iBytes / sizeof(FX_WCHAR)); return TRUE; } -void CXFA_Node::SetMapModuleBuffer(FX_LPVOID pKey, FX_LPVOID pValue, int32_t iBytes, XFA_MAPDATABLOCKCALLBACKINFO* pCallbackInfo ) +void CXFA_Node::SetMapModuleBuffer(void* pKey, void* pValue, int32_t iBytes, XFA_MAPDATABLOCKCALLBACKINFO* pCallbackInfo ) { XFA_LPMAPMODULEDATA pMoudle = this->GetMapModuleData(TRUE); if (!pMoudle) { @@ -4761,7 +4761,7 @@ void CXFA_Node::SetMapModuleBuffer(FX_LPVOID pKey, FX_LPVOID pValue, int32_t iBy pBuffer->iBytes = iBytes; FXSYS_memcpy(pBuffer->GetData(), pValue, iBytes); } -FX_BOOL CXFA_Node::GetMapModuleBuffer(FX_LPVOID pKey, FX_LPVOID &pValue, int32_t &iBytes, FX_BOOL bProtoAlso) +FX_BOOL CXFA_Node::GetMapModuleBuffer(void* pKey, void* &pValue, int32_t &iBytes, FX_BOOL bProtoAlso) { XFA_LPMAPDATABLOCK pBuffer = NULL; CXFA_Node* pNode = this; @@ -4779,11 +4779,11 @@ FX_BOOL CXFA_Node::GetMapModuleBuffer(FX_LPVOID pKey, FX_LPVOID &pValue, int32_t iBytes = pBuffer->iBytes; return TRUE; } -FX_BOOL CXFA_Node::HasMapModuleKey(FX_LPVOID pKey, FX_BOOL bProtoAlso) +FX_BOOL CXFA_Node::HasMapModuleKey(void* pKey, FX_BOOL bProtoAlso) { CXFA_Node* pNode = this; while (pNode) { - FX_LPVOID pVal; + void* pVal; XFA_LPMAPMODULEDATA pMoudle = pNode->GetMapModuleData(FALSE); if (pMoudle && (pMoudle->m_ValueMap.Lookup(pKey, pVal) || pMoudle->m_BufferMap.Lookup(pKey, (XFA_LPMAPDATABLOCK&)pVal))) { return TRUE; @@ -4792,7 +4792,7 @@ FX_BOOL CXFA_Node::HasMapModuleKey(FX_LPVOID pKey, FX_BOOL bProtoAlso) } return FALSE; } -void CXFA_Node::RemoveMapModuleKey(FX_LPVOID pKey ) +void CXFA_Node::RemoveMapModuleKey(void* pKey ) { XFA_LPMAPMODULEDATA pMoudle = this->GetMapModuleData(FALSE); if (!pMoudle) { @@ -4829,7 +4829,7 @@ void CXFA_Node::RemoveMapModuleKey(FX_LPVOID pKey ) } } } -void CXFA_Node::MergeAllData(FX_LPVOID pDstModule, FX_BOOL bUseSrcAttr ) +void CXFA_Node::MergeAllData(void* pDstModule, FX_BOOL bUseSrcAttr ) { XFA_LPMAPMODULEDATA pDstModuleData = ((CXFA_Node*)pDstModule)->GetMapModuleData(TRUE); if (!pDstModuleData) { @@ -4841,8 +4841,8 @@ void CXFA_Node::MergeAllData(FX_LPVOID pDstModule, FX_BOOL bUseSrcAttr ) } FX_POSITION psValue = pSrcModuleData->m_ValueMap.GetStartPosition(); while (psValue) { - FX_LPVOID pKey; - FX_LPVOID pValue; + void* pKey; + void* pValue; pSrcModuleData->m_ValueMap.GetNextAssoc(psValue, pKey, pValue); if (bUseSrcAttr || !pDstModuleData->m_ValueMap.GetValueAt(pKey)) { pDstModuleData->m_ValueMap.SetAt(pKey, pValue); @@ -4850,7 +4850,7 @@ void CXFA_Node::MergeAllData(FX_LPVOID pDstModule, FX_BOOL bUseSrcAttr ) } FX_POSITION psBuffer = pSrcModuleData->m_BufferMap.GetStartPosition(); while (psBuffer) { - FX_LPVOID pKey; + void* pKey; XFA_LPMAPDATABLOCK pSrcBuffer; pSrcModuleData->m_BufferMap.GetNextAssoc(psBuffer, pKey, pSrcBuffer); XFA_LPMAPDATABLOCK &pBuffer = pDstModuleData->m_BufferMap[pKey]; @@ -4885,7 +4885,7 @@ void CXFA_Node::MergeAllData(FX_LPVOID pDstModule, FX_BOOL bUseSrcAttr ) } } } -void CXFA_Node::MoveBufferMapData(CXFA_Node* pDstModule, FX_LPVOID pKey) +void CXFA_Node::MoveBufferMapData(CXFA_Node* pDstModule, void* pKey) { if (!pDstModule) { return; @@ -4910,7 +4910,7 @@ void CXFA_Node::MoveBufferMapData(CXFA_Node* pDstModule, FX_LPVOID pKey) } } if (bNeedMove) { - FX_LPVOID pBufferBlockData = pSrcModuleData->m_BufferMap.GetValueAt(pKey); + void* pBufferBlockData = pSrcModuleData->m_BufferMap.GetValueAt(pKey); if (pBufferBlockData) { pSrcModuleData->m_BufferMap.RemoveKey(pKey); pDstModuleData->m_BufferMap.RemoveKey(pKey); @@ -4927,7 +4927,7 @@ void CXFA_Node::MoveBufferMapData(CXFA_Node* pDstModule, FX_LPVOID pKey) pDstModule->SetScriptContent(wsValue, wsFormatValue, TRUE, TRUE); } } -void CXFA_Node::MoveBufferMapData(CXFA_Node* pSrcModule, CXFA_Node* pDstModule, FX_LPVOID pKey, FX_BOOL bRecursive ) +void CXFA_Node::MoveBufferMapData(CXFA_Node* pSrcModule, CXFA_Node* pDstModule, void* pKey, FX_BOOL bRecursive ) { if (!pSrcModule || !pDstModule || !pKey) { return; diff --git a/xfa/src/fxfa/src/parser/xfa_objectacc_imp.cpp b/xfa/src/fxfa/src/parser/xfa_objectacc_imp.cpp index 1cc9d4aa03..b00b29700f 100644 --- a/xfa/src/fxfa/src/parser/xfa_objectacc_imp.cpp +++ b/xfa/src/fxfa/src/parser/xfa_objectacc_imp.cpp @@ -23,7 +23,7 @@ static FX_ARGB XFA_WStringToColor(FX_WSTR wsValue) return 0xff000000; } int cc = 0; - FX_LPCWSTR str = wsValue.GetPtr(); + const FX_WCHAR* str = wsValue.GetPtr(); int len = wsValue.GetLength(); while (XFA_IsSpace(str[cc]) && cc < len) { cc++; @@ -287,14 +287,14 @@ FX_FLOAT CXFA_Font::GetHorizontalScale() { CFX_WideString wsValue; m_pNode->TryCData(XFA_ATTRIBUTE_FontHorizontalScale, wsValue); - int32_t iScale = FXSYS_wtoi((FX_LPCWSTR)wsValue); + int32_t iScale = FXSYS_wtoi((const FX_WCHAR*)wsValue); return iScale > 0 ? (FX_FLOAT)iScale : 100.0f; } FX_FLOAT CXFA_Font::GetVerticalScale() { CFX_WideString wsValue; m_pNode->TryCData(XFA_ATTRIBUTE_FontVerticalScale, wsValue); - int32_t iScale = FXSYS_wtoi((FX_LPCWSTR)wsValue); + int32_t iScale = FXSYS_wtoi((const FX_WCHAR*)wsValue); return iScale > 0 ? (FX_FLOAT)iScale : 100.0f; } FX_FLOAT CXFA_Font::GetLetterSpacing() @@ -2689,7 +2689,7 @@ void CXFA_WidgetData::InsertItem(const CFX_WideString &wsLabel, const CFX_WideSt if(!bNotify) { return; } - m_pNode->GetDocument()->GetNotify()->OnWidgetDataEvent(this, XFA_WIDGETEVENT_ListItemAdded, (FX_LPVOID)(FX_LPCWSTR)wsLabel, (FX_LPVOID)(FX_LPCWSTR)wsValue, (FX_LPVOID)(uintptr_t)nIndex); + m_pNode->GetDocument()->GetNotify()->OnWidgetDataEvent(this, XFA_WIDGETEVENT_ListItemAdded, (void*)(const FX_WCHAR*)wsLabel, (void*)(const FX_WCHAR*)wsValue, (void*)(uintptr_t)nIndex); } void CXFA_WidgetData::GetItemLabel(FX_WSTR wsValue, CFX_WideString &wsLabel) { @@ -2811,7 +2811,7 @@ FX_BOOL CXFA_WidgetData::DeleteItem(int32_t nIndex, FX_BOOL bNotify, FX_BOOL bSc if(!bNotify) { return TRUE; } - m_pNode->GetDocument()->GetNotify()->OnWidgetDataEvent(this, XFA_WIDGETEVENT_ListItemRemoved, (FX_LPVOID)(uintptr_t)nIndex); + m_pNode->GetDocument()->GetNotify()->OnWidgetDataEvent(this, XFA_WIDGETEVENT_ListItemRemoved, (void*)(uintptr_t)nIndex); return TRUE; } int32_t CXFA_WidgetData::GetHorizontalScrollPolicy() @@ -3112,7 +3112,7 @@ static CFX_WideString XFA_NumericNormalize(const CFX_WideString &wsValue, IFX_Lo } int32_t iIndex = 0; CFX_WideString wsRet; - FX_LPWSTR pRetBuffer = wsRet.GetBuffer(iCount); + FX_WCHAR* pRetBuffer = wsRet.GetBuffer(iCount); int32_t iDestCount = 0; int32_t i = 0; if (wsNewValue[i] == L'-') { @@ -3126,7 +3126,7 @@ static CFX_WideString XFA_NumericNormalize(const CFX_WideString &wsValue, IFX_Lo FX_WCHAR wc = wsNewValue[i]; if (XFA_IsDigit(wc)) { if (nCharStart != -1) { - CFX_WideStringC wsChar((FX_LPCWSTR)wsNewValue + nCharStart, i - nCharStart); + CFX_WideStringC wsChar((const FX_WCHAR*)wsNewValue + nCharStart, i - nCharStart); if (wsChar == '.' || wsChar == wsDecimalSymbol) { bHasPoint = TRUE; nCharStart = -1; diff --git a/xfa/src/fxfa/src/parser/xfa_script_hostpseudomodel.cpp b/xfa/src/fxfa/src/parser/xfa_script_hostpseudomodel.cpp index 5a1eff1a4a..ffbdd6c8ba 100644 --- a/xfa/src/fxfa/src/parser/xfa_script_hostpseudomodel.cpp +++ b/xfa/src/fxfa/src/parser/xfa_script_hostpseudomodel.cpp @@ -369,9 +369,9 @@ static int32_t XFA_FilterName(FX_WSTR wsExpression, int32_t nStart, CFX_WideStri if (nStart >= iLength) { return iLength; } - FX_LPWSTR pBuf = wsFilter.GetBuffer(iLength - nStart); + FX_WCHAR* pBuf = wsFilter.GetBuffer(iLength - nStart); int32_t nCount = 0; - FX_LPCWSTR pSrc = wsExpression.GetPtr(); + const FX_WCHAR* pSrc = wsExpression.GetPtr(); FX_WCHAR wCur; while (nStart < iLength) { wCur = pSrc[nStart ++]; diff --git a/xfa/src/fxfa/src/parser/xfa_script_imp.cpp b/xfa/src/fxfa/src/parser/xfa_script_imp.cpp index be10dff62a..4dc48f75c7 100644 --- a/xfa/src/fxfa/src/parser/xfa_script_imp.cpp +++ b/xfa/src/fxfa/src/parser/xfa_script_imp.cpp @@ -138,7 +138,7 @@ void CXFA_ScriptContext::GlobalPropertySetter(FXJSE_HOBJECT hObject, FX_BSTR szP CXFA_Document* pDoc = lpOrginalNode->GetDocument(); CXFA_ScriptContext* lpScriptContext = (CXFA_ScriptContext*)pDoc->GetScriptContext(); CXFA_Object* lpCurNode = lpScriptContext->GetVariablesThis(lpOrginalNode); - CFX_WideString wsPropName = CFX_WideString::FromUTF8((FX_LPCSTR)szPropName.GetPtr(), szPropName.GetLength()); + CFX_WideString wsPropName = CFX_WideString::FromUTF8((const FX_CHAR*)szPropName.GetPtr(), szPropName.GetLength()); FX_DWORD dwFlag = XFA_RESOLVENODE_Parent | XFA_RESOLVENODE_Siblings | XFA_RESOLVENODE_Children | XFA_RESOLVENODE_Properties | XFA_RESOLVENODE_Attributes; CXFA_Node* pRefNode = (CXFA_Node*)lpScriptContext->GetThisObject(); if(lpOrginalNode->GetObjectType() == XFA_OBJECTTYPE_VariablesThis) { @@ -184,7 +184,7 @@ void CXFA_ScriptContext::GlobalPropertyGetter(FXJSE_HOBJECT hObject, FX_BSTR szP CXFA_Document* pDoc = pOrginalObject->GetDocument(); CXFA_ScriptContext* lpScriptContext = (CXFA_ScriptContext*)pDoc->GetScriptContext(); CXFA_Object* lpCurNode = lpScriptContext->GetVariablesThis(pOrginalObject); - CFX_WideString wsPropName = CFX_WideString::FromUTF8((FX_LPCSTR)szPropName.GetPtr(), szPropName.GetLength()); + CFX_WideString wsPropName = CFX_WideString::FromUTF8((const FX_CHAR*)szPropName.GetPtr(), szPropName.GetLength()); if (lpScriptContext->GetType() == XFA_SCRIPTLANGTYPE_Formcalc) { if(szPropName == FX_BSTRC(FOXIT_XFA_FM2JS_FORMCALC_RUNTIME)) { XFA_FM2JS_GlobalPropertyGetter(lpScriptContext->m_hFM2JSContext, hValue); @@ -231,7 +231,7 @@ void CXFA_ScriptContext::NormalPropertyGetter(FXJSE_HOBJECT hObject, FX_BSTR szP FXJSE_Value_SetUndefined(hValue); return; } - CFX_WideString wsPropName = CFX_WideString::FromUTF8((FX_LPCSTR)szPropName.GetPtr(), szPropName.GetLength()); + CFX_WideString wsPropName = CFX_WideString::FromUTF8((const FX_CHAR*)szPropName.GetPtr(), szPropName.GetLength()); CXFA_ScriptContext* lpScriptContext = (CXFA_ScriptContext*)pOrginalObject->GetDocument()->GetScriptContext(); CXFA_Object* pObject = lpScriptContext->GetVariablesThis(pOrginalObject); if(wsPropName == FX_WSTRC(L"xfa")) { @@ -267,7 +267,7 @@ void CXFA_ScriptContext::NormalPropertySetter(FXJSE_HOBJECT hObject, FX_BSTR szP } CXFA_ScriptContext* lpScriptContext = (CXFA_ScriptContext*)pOrginalObject->GetDocument()->GetScriptContext(); CXFA_Object* pObject = lpScriptContext->GetVariablesThis(pOrginalObject); - CFX_WideString wsPropName = CFX_WideString::FromUTF8((FX_LPCSTR)szPropName.GetPtr(), szPropName.GetLength()); + CFX_WideString wsPropName = CFX_WideString::FromUTF8((const FX_CHAR*)szPropName.GetPtr(), szPropName.GetLength()); XFA_LPCSCRIPTATTRIBUTEINFO lpAttributeInfo = XFA_GetScriptAttributeByName(pObject->GetClassID(), wsPropName); if(lpAttributeInfo) { (pObject->*(lpAttributeInfo->lpfnCallback))(hValue, TRUE, (XFA_ATTRIBUTE)lpAttributeInfo->eAttribute); @@ -308,7 +308,7 @@ int32_t CXFA_ScriptContext::NormalPropTypeGetter(FXJSE_HOBJECT hObject, FX_BSTR CXFA_ScriptContext* lpScriptContext = (CXFA_ScriptContext*)pObject->GetDocument()->GetScriptContext(); pObject = lpScriptContext->GetVariablesThis(pObject); XFA_ELEMENT objElement = pObject->GetClassID(); - CFX_WideString wsPropName = CFX_WideString::FromUTF8((FX_LPCSTR)szPropName.GetPtr(), szPropName.GetLength()); + CFX_WideString wsPropName = CFX_WideString::FromUTF8((const FX_CHAR*)szPropName.GetPtr(), szPropName.GetLength()); if(XFA_GetMethodByName(objElement, wsPropName)) { return FXJSE_ClassPropType_Method; } @@ -326,7 +326,7 @@ int32_t CXFA_ScriptContext::GlobalPropTypeGetter(FXJSE_HOBJECT hObject, FX_BSTR CXFA_ScriptContext* lpScriptContext = (CXFA_ScriptContext*)pObject->GetDocument()->GetScriptContext(); pObject = lpScriptContext->GetVariablesThis(pObject); XFA_ELEMENT objElement = pObject->GetClassID(); - CFX_WideString wsPropName = CFX_WideString::FromUTF8((FX_LPCSTR)szPropName.GetPtr(), szPropName.GetLength()); + CFX_WideString wsPropName = CFX_WideString::FromUTF8((const FX_CHAR*)szPropName.GetPtr(), szPropName.GetLength()); if(XFA_GetMethodByName(objElement, wsPropName)) { return FXJSE_ClassPropType_Method; } @@ -340,7 +340,7 @@ void CXFA_ScriptContext::NormalMethodCall(FXJSE_HOBJECT hThis, FX_BSTR szFuncNam } CXFA_ScriptContext* lpScriptContext = (CXFA_ScriptContext*)pObject->GetDocument()->GetScriptContext(); pObject = lpScriptContext->GetVariablesThis(pObject); - CFX_WideString wsFunName = CFX_WideString::FromUTF8((FX_LPCSTR)szFuncName.GetPtr(), szFuncName.GetLength()); + CFX_WideString wsFunName = CFX_WideString::FromUTF8((const FX_CHAR*)szFuncName.GetPtr(), szFuncName.GetLength()); XFA_LPCMETHODINFO lpMethodInfo = XFA_GetMethodByName(pObject->GetClassID(), wsFunName); if(NULL == lpMethodInfo) { return; @@ -446,7 +446,7 @@ FX_BOOL CXFA_ScriptContext::QueryVariableHValue(CXFA_Node* pScriptNode, FX_BSTR return FALSE; } FX_BOOL bRes = FALSE; - FX_LPVOID lpVariables = m_mapVariableToHValue.GetValueAt(pScriptNode); + void* lpVariables = m_mapVariableToHValue.GetValueAt(pScriptNode); if(lpVariables) { FXJSE_HCONTEXT hVariableContext = (FXJSE_HCONTEXT)lpVariables; FXJSE_HVALUE hObject = FXJSE_Context_GetGlobalObject(hVariableContext); @@ -677,7 +677,7 @@ FXJSE_HVALUE CXFA_ScriptContext::GetJSValueFromMap(CXFA_Object* pObject) if(pObject->IsNode()) { RunVariablesScript((CXFA_Node*)pObject); } - FX_LPVOID pValue = m_mapXFAToHValue.GetValueAt(pObject); + void* pValue = m_mapXFAToHValue.GetValueAt(pObject); if(pValue == NULL) { FXJSE_HVALUE jsHvalue = FXJSE_Value_Create(m_hJsRuntime); FXJSE_Value_SetObject(jsHvalue, pObject, m_hJsClass); diff --git a/xfa/src/fxfa/src/parser/xfa_script_layoutpseudomodel.cpp b/xfa/src/fxfa/src/parser/xfa_script_layoutpseudomodel.cpp index e28b0b7658..282dbe22b9 100644 --- a/xfa/src/fxfa/src/parser/xfa_script_layoutpseudomodel.cpp +++ b/xfa/src/fxfa/src/parser/xfa_script_layoutpseudomodel.cpp @@ -45,7 +45,7 @@ void CScript_LayoutPseudoModel::Script_LayoutPseudoModel_HWXY(CFXJSE_Arguments* { int32_t iLength = pArguments->GetLength(); if ( iLength < 1 || iLength > 3) { - FX_LPCWSTR methodName = NULL; + const FX_WCHAR* methodName = NULL; switch (layoutModel) { case XFA_LAYOUTMODEL_H: methodName = L"h"; @@ -490,7 +490,7 @@ void CScript_LayoutPseudoModel::Script_LayoutPseudoModel_PageImp(CFXJSE_Argument { int32_t iLength = pArguments->GetLength(); if (iLength != 1) { - FX_LPCWSTR methodName; + const FX_WCHAR* methodName; if (bAbsPage) { methodName = L"absPage"; } else { diff --git a/xfa/src/fxfa/src/parser/xfa_script_nodehelper.cpp b/xfa/src/fxfa/src/parser/xfa_script_nodehelper.cpp index 0c793b2692..a1562a0838 100644 --- a/xfa/src/fxfa/src/parser/xfa_script_nodehelper.cpp +++ b/xfa/src/fxfa/src/parser/xfa_script_nodehelper.cpp @@ -27,7 +27,7 @@ CXFA_NodeHelper::CXFA_NodeHelper(void) CXFA_NodeHelper::~CXFA_NodeHelper(void) { } -CXFA_Node* CXFA_NodeHelper::XFA_ResolveNodes_GetOneChild(CXFA_Node* parent, FX_LPCWSTR pwsName, FX_BOOL bIsClassName) +CXFA_Node* CXFA_NodeHelper::XFA_ResolveNodes_GetOneChild(CXFA_Node* parent, const FX_WCHAR* pwsName, FX_BOOL bIsClassName) { if(parent == NULL) { return NULL; @@ -252,12 +252,12 @@ void CXFA_NodeHelper::XFA_GetNameExpression(CXFA_Node* refNode, CFX_WideString & if (refNode->IsUnnamed() || (bIsProperty && refNode->GetClassID() != XFA_ELEMENT_PageSet)) { refNode->GetClassName(wsTagName); ws = wsTagName; - wsName.Format(L"#%s[%d]", (FX_LPCWSTR)ws, XFA_GetIndex(refNode, eLogicType, bIsProperty, TRUE)); + wsName.Format(L"#%s[%d]", (const FX_WCHAR*)ws, XFA_GetIndex(refNode, eLogicType, bIsProperty, TRUE)); return; } ws = refNode->GetCData(XFA_ATTRIBUTE_Name); ws.Replace(L".", L"\\."); - wsName.Format(L"%s[%d]", (FX_LPCWSTR)ws, XFA_GetIndex(refNode, eLogicType, bIsProperty, FALSE)); + wsName.Format(L"%s[%d]", (const FX_WCHAR*)ws, XFA_GetIndex(refNode, eLogicType, bIsProperty, FALSE)); } } FX_BOOL CXFA_NodeHelper::XFA_NodeIsTransparent(CXFA_Node* refNode) diff --git a/xfa/src/fxfa/src/parser/xfa_script_nodehelper.h b/xfa/src/fxfa/src/parser/xfa_script_nodehelper.h index ea3e180385..6ac97ab25a 100644 --- a/xfa/src/fxfa/src/parser/xfa_script_nodehelper.h +++ b/xfa/src/fxfa/src/parser/xfa_script_nodehelper.h @@ -16,7 +16,7 @@ class CXFA_NodeHelper public: CXFA_NodeHelper(void); ~CXFA_NodeHelper(void); - CXFA_Node* XFA_ResolveNodes_GetOneChild(CXFA_Node* parent, FX_LPCWSTR pwsName, FX_BOOL bIsClassName = FALSE); + CXFA_Node* XFA_ResolveNodes_GetOneChild(CXFA_Node* parent, const FX_WCHAR* pwsName, FX_BOOL bIsClassName = FALSE); CXFA_Node* XFA_ResolveNodes_GetParent(CXFA_Node* pNode, XFA_LOGIC_TYPE eLogicType = XFA_LOGIC_NoTransparent); int32_t XFA_NodeAcc_TraverseSiblings(CXFA_Node* parent, FX_DWORD dNameHash, CXFA_NodeArray* pSiblings, XFA_LOGIC_TYPE eLogicType, FX_BOOL bIsClassName = FALSE, FX_BOOL bIsFindProperty = TRUE); diff --git a/xfa/src/fxfa/src/parser/xfa_script_resolveprocessor.cpp b/xfa/src/fxfa/src/parser/xfa_script_resolveprocessor.cpp index a79a8bf9ca..841176ed69 100644 --- a/xfa/src/fxfa/src/parser/xfa_script_resolveprocessor.cpp +++ b/xfa/src/fxfa/src/parser/xfa_script_resolveprocessor.cpp @@ -119,7 +119,7 @@ int32_t CXFA_ResolveProcessor::XFA_ResolveNodes_Dollar(CXFA_ResolveNodesData &rn if (rnd.m_nLevel > 0) { return -1; } - FX_DWORD dwNameHash = FX_HashCode_String_GetW((FX_LPCWSTR)wsName + 1, iNameLen - 1); + FX_DWORD dwNameHash = FX_HashCode_String_GetW((const FX_WCHAR*)wsName + 1, iNameLen - 1); if (dwNameHash == XFA_HASHCODE_Xfa) { nodes.Add(rnd.m_pSC->GetDocument()->GetRoot()); } else { @@ -505,14 +505,14 @@ int32_t CXFA_ResolveProcessor::XFA_ResolveNodes_GetFilter(FX_WSTR wsExpression, } CFX_WideString& wsName = rnd.m_wsName; CFX_WideString& wsCondition = rnd.m_wsCondition; - FX_LPWSTR pNameBuf = wsName.GetBuffer(iLength - nStart); - FX_LPWSTR pConditionBuf = wsCondition.GetBuffer(iLength - nStart); + FX_WCHAR* pNameBuf = wsName.GetBuffer(iLength - nStart); + FX_WCHAR* pConditionBuf = wsCondition.GetBuffer(iLength - nStart); int32_t nCount = 0; int32_t nNameCount = 0; int32_t nConditionCount = 0; CFX_Int32Array stack; int32_t nType = -1; - FX_LPCWSTR pSrc = wsExpression.GetPtr(); + const FX_WCHAR* pSrc = wsExpression.GetPtr(); FX_WCHAR wPrev = 0, wCur; FX_BOOL bIsCondition = FALSE; while (nStart < iLength) { diff --git a/xfa/src/fxfa/src/parser/xfa_utils_imp.cpp b/xfa/src/fxfa/src/parser/xfa_utils_imp.cpp index a15690cdcd..f35602b4be 100644 --- a/xfa/src/fxfa/src/parser/xfa_utils_imp.cpp +++ b/xfa/src/fxfa/src/parser/xfa_utils_imp.cpp @@ -306,7 +306,7 @@ FX_DOUBLE XFA_WideStringToDouble(const CFX_WideString &wsStringVal) int32_t nExponent = 0; int32_t cc = 0; FX_BOOL bNegative = FALSE, bExpSign = FALSE; - FX_LPCWSTR str = (FX_LPCWSTR)wsValue; + const FX_WCHAR* str = (const FX_WCHAR*)wsValue; int32_t len = wsValue.GetLength(); if (str[0] == '+') { cc++; diff --git a/xfa/src/fxgraphics/src/fx_graphics.cpp b/xfa/src/fxgraphics/src/fx_graphics.cpp index ee746b7fce..a915a17065 100644 --- a/xfa/src/fxgraphics/src/fx_graphics.cpp +++ b/xfa/src/fxgraphics/src/fx_graphics.cpp @@ -755,7 +755,7 @@ FX_ERR CFX_Graphics::InverseRect(const CFX_RectF & rect) FX_ARGB c = *pLine; *pLine ++ = (c & 0xFF000000) | (0xFFFFFF - (c & 0x00FFFFFF)); } - pBuf = (FX_ARGB*)((FX_LPBYTE)pBuf + bitmap->GetPitch()); + pBuf = (FX_ARGB*)((uint8_t*)pBuf + bitmap->GetPitch()); } return FX_ERR_Succeeded; } @@ -784,8 +784,8 @@ FX_ERR CFX_Graphics::XorDIBitmap(const CFX_DIBitmap * srcBitmap, const CFX_RectF *pDstLine ++ = ArgbEncode(FXARGB_A(c), (c & 0xFFFFFF) ^ (*pSrcLine & 0xFFFFFF)); pSrcLine ++; } - pSrcBuf = (FX_ARGB*)((FX_LPBYTE)pSrcBuf + srcBitmap->GetPitch()); - pDstBuf = (FX_ARGB*)((FX_LPBYTE)pDstBuf + dst->GetPitch()); + pSrcBuf = (FX_ARGB*)((uint8_t*)pSrcBuf + srcBitmap->GetPitch()); + pDstBuf = (FX_ARGB*)((uint8_t*)pDstBuf + dst->GetPitch()); } return FX_ERR_Succeeded; } @@ -814,8 +814,8 @@ FX_ERR CFX_Graphics::EqvDIBitmap(const CFX_DIBitmap * srcBitmap, const CFX_RectF *pDstLine ++ = ArgbEncode(FXARGB_A(c), ~((c & 0xFFFFFF) ^ (*pSrcLine & 0xFFFFFF))); pSrcLine ++; } - pSrcBuf = (FX_ARGB*)((FX_LPBYTE)pSrcBuf + srcBitmap->GetPitch()); - pDstBuf = (FX_ARGB*)((FX_LPBYTE)pDstBuf + dst->GetPitch()); + pSrcBuf = (FX_ARGB*)((uint8_t*)pSrcBuf + srcBitmap->GetPitch()); + pDstBuf = (FX_ARGB*)((uint8_t*)pDstBuf + dst->GetPitch()); } return FX_ERR_Succeeded; } diff --git a/xfa/src/fxjse/src/class.cpp b/xfa/src/fxjse/src/class.cpp index 735a77f1f1..42db877fc9 100644 --- a/xfa/src/fxjse/src/class.cpp +++ b/xfa/src/fxjse/src/class.cpp @@ -168,7 +168,7 @@ CFX_ByteString CFXJSE_Arguments::GetUTF8String(int32_t index) const v8::String::Utf8Value szStringVal(hString); return CFX_ByteString(*szStringVal); } -FX_LPVOID CFXJSE_Arguments::GetObject(int32_t index, FXJSE_HCLASS hClass ) const +void* CFXJSE_Arguments::GetObject(int32_t index, FXJSE_HCLASS hClass ) const { const CFXJSE_ArgumentsImpl* lpArguments = reinterpret_cast(this); v8::Local hValue = (*lpArguments->m_pInfo)[index]; @@ -193,7 +193,7 @@ static void FXJSE_Context_GlobalObjToString(const v8::FunctionCallbackInfoname) { CFX_ByteString szStringVal; szStringVal.Format("[object %s]", lpClass->name); - info.GetReturnValue().Set(v8::String::NewFromUtf8(info.GetIsolate(), (FX_LPCSTR)szStringVal, v8::String::kNormalString, szStringVal.GetLength())); + info.GetReturnValue().Set(v8::String::NewFromUtf8(info.GetIsolate(), (const FX_CHAR*)szStringVal, v8::String::kNormalString, szStringVal.GetLength())); } else { info.GetReturnValue().Set(info.This()->ObjectProtoToString()); } diff --git a/xfa/src/fxjse/src/context.cpp b/xfa/src/fxjse/src/context.cpp index d2b10db38d..3aee73203e 100644 --- a/xfa/src/fxjse/src/context.cpp +++ b/xfa/src/fxjse/src/context.cpp @@ -11,7 +11,7 @@ #include "value.h" #include "scope_inline.h" #include "util_inline.h" -FXJSE_HCONTEXT FXJSE_Context_Create(FXJSE_HRUNTIME hRuntime, const FXJSE_CLASS* lpGlobalClass , FX_LPVOID lpGlobalObject ) +FXJSE_HCONTEXT FXJSE_Context_Create(FXJSE_HRUNTIME hRuntime, const FXJSE_CLASS* lpGlobalClass , void* lpGlobalObject ) { CFXJSE_Context* pContext = CFXJSE_Context::Create(reinterpret_cast(hRuntime), lpGlobalClass, lpGlobalObject); return reinterpret_cast(pContext); @@ -39,7 +39,7 @@ FXJSE_HRUNTIME FXJSE_Context_GetRuntime(FXJSE_HCONTEXT hContext) CFXJSE_Context* pContext = reinterpret_cast(hContext); return pContext ? reinterpret_cast(pContext->GetRuntime()) : NULL; } -static FX_LPCSTR szCompatibleModeScripts[] = { +static const FX_CHAR* szCompatibleModeScripts[] = { "(function (global, list) { 'use strict'; var objname; for (objname in list) { var globalobj = global[objname];\n\ if (globalobj) { list[objname].forEach( function (name) { if (!globalobj[name]) { Object.defineProperty(globalobj, name, {writable: true, enumerable: false, value: \n\ (function (obj) {\n\ @@ -57,7 +57,7 @@ void FXJSE_Context_EnableCompatibleMode(FXJSE_HCONTEXT hContext, FX_DWORD dwComp } } } -FX_BOOL FXJSE_ExecuteScript(FXJSE_HCONTEXT hContext, FX_LPCSTR szScript, FXJSE_HVALUE hRetValue, FXJSE_HVALUE hNewThisObject ) +FX_BOOL FXJSE_ExecuteScript(FXJSE_HCONTEXT hContext, const FX_CHAR* szScript, FXJSE_HVALUE hRetValue, FXJSE_HVALUE hNewThisObject ) { CFXJSE_Context* pContext = reinterpret_cast(hContext); ASSERT(pContext); @@ -129,7 +129,7 @@ FX_BOOL FXJSE_ReturnValue_GetLineInfo(FXJSE_HVALUE hRetValue, int32_t& nLine, in nCol = hValue.As()->Get(5)->ToInt32()->Value(); return TRUE; } -CFXJSE_Context* CFXJSE_Context::Create(v8::Isolate* pIsolate, const FXJSE_CLASS* lpGlobalClass , FX_LPVOID lpGlobalObject ) +CFXJSE_Context* CFXJSE_Context::Create(v8::Isolate* pIsolate, const FXJSE_CLASS* lpGlobalClass , void* lpGlobalObject ) { CFXJSE_ScopeUtil_IsolateHandle scope(pIsolate); CFXJSE_Context* pContext = FX_NEW CFXJSE_Context(pIsolate); @@ -179,7 +179,7 @@ void CFXJSE_Context::GetGlobalObject(CFXJSE_Value* pValue) v8::Local hGlobalObject = hContext->Global(); pValue->ForceSetValue(hGlobalObject); } -FX_BOOL CFXJSE_Context::ExecuteScript(FX_LPCSTR szScript, CFXJSE_Value* lpRetValue, CFXJSE_Value* lpNewThisObject ) +FX_BOOL CFXJSE_Context::ExecuteScript(const FX_CHAR* szScript, CFXJSE_Value* lpRetValue, CFXJSE_Value* lpNewThisObject ) { CFXJSE_ScopeUtil_IsolateHandleContext scope(this); v8::TryCatch trycatch; diff --git a/xfa/src/fxjse/src/context.h b/xfa/src/fxjse/src/context.h index 973536932b..69ee7acce5 100644 --- a/xfa/src/fxjse/src/context.h +++ b/xfa/src/fxjse/src/context.h @@ -13,14 +13,14 @@ class CFXJSE_Context protected: CFXJSE_Context(v8::Isolate* pIsolate) : m_pIsolate(pIsolate) {} public: - static CFXJSE_Context* Create(v8::Isolate* pIsolate, const FXJSE_CLASS* lpGlobalClass = NULL, FX_LPVOID lpGlobalObject = NULL); + static CFXJSE_Context* Create(v8::Isolate* pIsolate, const FXJSE_CLASS* lpGlobalClass = NULL, void* lpGlobalObject = NULL); ~CFXJSE_Context(); V8_INLINE v8::Isolate* GetRuntime(void) { return m_pIsolate; } void GetGlobalObject(CFXJSE_Value* pValue); - FX_BOOL ExecuteScript(FX_LPCSTR szScript, CFXJSE_Value* lpRetValue, CFXJSE_Value* lpNewThisObject = NULL); + FX_BOOL ExecuteScript(const FX_CHAR* szScript, CFXJSE_Value* lpRetValue, CFXJSE_Value* lpNewThisObject = NULL); protected: CFXJSE_Context(); CFXJSE_Context(const CFXJSE_Context&); diff --git a/xfa/src/fxjse/src/runtime.cpp b/xfa/src/fxjse/src/runtime.cpp index 6f0dbf7601..e47c5b1a3b 100644 --- a/xfa/src/fxjse/src/runtime.cpp +++ b/xfa/src/fxjse/src/runtime.cpp @@ -38,7 +38,7 @@ void FXJSE_Initialize() } bV8Initialized = TRUE; atexit(FXJSE_KillV8); - FX_LPCSTR szCmdFlags = + const FX_CHAR* szCmdFlags = "--harmony_proxies " "--block_concurrent_recompilation " ; diff --git a/xfa/src/fxjse/src/util_inline.h b/xfa/src/fxjse/src/util_inline.h index 517b5545e8..3425465844 100644 --- a/xfa/src/fxjse/src/util_inline.h +++ b/xfa/src/fxjse/src/util_inline.h @@ -10,13 +10,13 @@ static V8_INLINE v8::Local FXJSE_GetGlobalObjectFromContext(const v8 { return hContext->Global()->GetPrototype().As(); } -static V8_INLINE void FXJSE_UpdateObjectBinding(v8::Local& hObject, FX_LPVOID lpNewBinding) +static V8_INLINE void FXJSE_UpdateObjectBinding(v8::Local& hObject, void* lpNewBinding) { ASSERT(!hObject.IsEmpty()); ASSERT(hObject->InternalFieldCount() > 0); hObject->SetAlignedPointerInInternalField(0, lpNewBinding); } -static V8_INLINE FX_LPVOID FXJSE_RetrieveObjectBinding(const v8::Local& hJSObject, CFXJSE_Class* lpClass = NULL) +static V8_INLINE void* FXJSE_RetrieveObjectBinding(const v8::Local& hJSObject, CFXJSE_Class* lpClass = NULL) { ASSERT(!hJSObject.IsEmpty()); if(!hJSObject->IsObject()) { diff --git a/xfa/src/fxjse/src/value.cpp b/xfa/src/fxjse/src/value.cpp index 783961657a..8b5b5feb92 100644 --- a/xfa/src/fxjse/src/value.cpp +++ b/xfa/src/fxjse/src/value.cpp @@ -90,7 +90,7 @@ int32_t FXJSE_Value_ToInteger (FXJSE_HVALUE hValue) ASSERT(lpValue); return lpValue->ToInteger(); } -FX_LPVOID FXJSE_Value_ToObject (FXJSE_HVALUE hValue, FXJSE_HCLASS hClass) +void* FXJSE_Value_ToObject (FXJSE_HVALUE hValue, FXJSE_HCLASS hClass) { CFXJSE_Value* lpValue = reinterpret_cast(hValue); CFXJSE_Class* lpClass = reinterpret_cast(hClass); @@ -139,7 +139,7 @@ void FXJSE_Value_SetDouble (FXJSE_HVALUE hValue, FXJSE_DOUBLE dDouble) ASSERT(lpValue); return lpValue->SetDouble(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) { CFXJSE_Value* lpValue = reinterpret_cast(hValue); CFXJSE_Class* lpClass = reinterpret_cast(hClass); @@ -276,7 +276,7 @@ CFXJSE_Value* CFXJSE_Value::Create(v8::Isolate* pIsolate) { return FX_NEW CFXJSE_Value(pIsolate); } -FX_LPVOID CFXJSE_Value::ToObject(CFXJSE_Class* lpClass) const +void* CFXJSE_Value::ToObject(CFXJSE_Class* lpClass) const { ASSERT(!m_hValue.IsEmpty()); CFXJSE_ScopeUtil_IsolateHandleRootContext scope(m_pIsolate); @@ -330,7 +330,7 @@ void CFXJSE_Value::SetFloat(FX_FLOAT fFloat) v8::Local hValue = v8::Number::New(m_pIsolate, FXJSE_ftod(fFloat)); m_hValue.Reset(m_pIsolate, hValue); } -void CFXJSE_Value::SetHostObject(FX_LPVOID lpObject, CFXJSE_Class* lpClass) +void CFXJSE_Value::SetHostObject(void* lpObject, CFXJSE_Class* lpClass) { CFXJSE_ScopeUtil_IsolateHandleRootContext scope(m_pIsolate); ASSERT(lpClass); @@ -453,7 +453,7 @@ FX_BOOL CFXJSE_Value::SetFunctionBind(CFXJSE_Value* lpOldFunction, CFXJSE_Value* m_hValue.Reset(m_pIsolate, hBoundFunction); return TRUE; } -#define FXJSE_INVALID_PTR ((FX_LPVOID)(intptr_t)-1) +#define FXJSE_INVALID_PTR ((void*)(intptr_t)-1) FX_BOOL CFXJSE_Value::Call(CFXJSE_Value* lpReceiver, CFXJSE_Value* lpRetValue, uint32_t nArgCount, FXJSE_HVALUE* lpArgs) { CFXJSE_ScopeUtil_IsolateHandleRootContext scope(m_pIsolate); diff --git a/xfa/src/fxjse/src/value.h b/xfa/src/fxjse/src/value.h index 482015811b..db8a4faa95 100644 --- a/xfa/src/fxjse/src/value.h +++ b/xfa/src/fxjse/src/value.h @@ -144,7 +144,7 @@ public: v8::String::Utf8Value hStringVal(hString); szStrOutput = *hStringVal; } - FX_LPVOID ToObject(CFXJSE_Class* lpClass) const; + void* ToObject(CFXJSE_Class* lpClass) const; public: V8_INLINE void SetUndefined() { @@ -191,7 +191,7 @@ public: v8::Local hValue = v8::Object::New(m_pIsolate); m_hValue.Reset(m_pIsolate, hValue); } - void SetHostObject(FX_LPVOID lpObject, CFXJSE_Class* lpClass); + void SetHostObject(void* lpObject, CFXJSE_Class* lpClass); void SetArray(uint32_t uValueCount, CFXJSE_Value** rgValues); void SetDate(FXJSE_DOUBLE dDouble); public: -- cgit v1.2.3