diff options
Diffstat (limited to 'xfa')
25 files changed, 274 insertions, 242 deletions
diff --git a/xfa/include/fwl/basewidget/fwl_edit.h b/xfa/include/fwl/basewidget/fwl_edit.h index 915f149c09..79a7a84230 100644 --- a/xfa/include/fwl/basewidget/fwl_edit.h +++ b/xfa/include/fwl/basewidget/fwl_edit.h @@ -110,7 +110,7 @@ class IFWL_EditDP : public IFWL_DataProvider {}; #define FWL_EDT_FIND_FLAGS_Next (1L << 0) #define FWL_EDT_FIND_FLAGS_WholeWord (1L << 1) #define FWL_EDT_FIND_FLAGS_NoCase (1L << 2) -typedef struct _FWL_HEDTFIND { void* pData; } * FWL_HEDTFIND; +typedef struct FWL_HEDTFIND_ { void* pData; } * FWL_HEDTFIND; class IFWL_Edit : public IFWL_Widget { public: diff --git a/xfa/include/fwl/basewidget/fwl_listbox.h b/xfa/include/fwl/basewidget/fwl_listbox.h index 4945ebc57f..7645c2526b 100644 --- a/xfa/include/fwl/basewidget/fwl_listbox.h +++ b/xfa/include/fwl/basewidget/fwl_listbox.h @@ -58,7 +58,7 @@ CFX_Matrix m_matrix; int32_t m_index; CFX_RectF m_rect; END_FWL_EVENT_DEF -typedef struct _FWL_HLISTITEM { void* pData; } * FWL_HLISTITEM; +typedef struct FWL_HLISTITEM_ { void* pData; } * FWL_HLISTITEM; struct FWL_ListBoxItemData { IFWL_ListBoxDP* pDataProvider; int32_t iIndex; diff --git a/xfa/include/fwl/core/fwl_grid.h b/xfa/include/fwl/core/fwl_grid.h index e7071af7b3..9e17e2c846 100644 --- a/xfa/include/fwl/core/fwl_grid.h +++ b/xfa/include/fwl/core/fwl_grid.h @@ -36,7 +36,7 @@ enum FWL_GRIDSIZE { FWL_GRIDSIZE_MaxWidth, FWL_GRIDSIZE_MaxHeight, }; -typedef struct _FWL_HGRIDCOLROW { void* pData; } * FWL_HGRIDCOLROW; +typedef struct FWL_HGRIDCOLROW_ { void* pData; } * FWL_HGRIDCOLROW; class IFWL_Grid : public IFWL_Content { public: static IFWL_Grid* Create(const CFWL_WidgetImpProperties& properties); diff --git a/xfa/include/fwl/core/fwl_thread.h b/xfa/include/fwl/core/fwl_thread.h index c10f72900c..d83c74f8c4 100644 --- a/xfa/include/fwl/core/fwl_thread.h +++ b/xfa/include/fwl/core/fwl_thread.h @@ -25,7 +25,7 @@ class CFWL_ThreadImp; class IFWL_NoteDriver; -typedef struct _FWL_HTHREAD { void* pData; } * FWL_HTHREAD; +typedef struct FWL_HTHREAD_ { void* pData; } * FWL_HTHREAD; class IFWL_Thread { public: diff --git a/xfa/include/fwl/core/fwl_timer.h b/xfa/include/fwl/core/fwl_timer.h index 27b2a48c5d..b9b4735f22 100644 --- a/xfa/include/fwl/core/fwl_timer.h +++ b/xfa/include/fwl/core/fwl_timer.h @@ -9,7 +9,7 @@ #include "core/include/fxcrt/fx_system.h" -typedef struct _FWL_HTIMER { void* pData; } * FWL_HTIMER; +typedef struct FWL_HTIMER_ { void* pData; } * FWL_HTIMER; class IFWL_Timer { public: diff --git a/xfa/include/fxjse/fxjse.h b/xfa/include/fxjse/fxjse.h index b8a2af4b8a..fea885ac09 100644 --- a/xfa/include/fxjse/fxjse.h +++ b/xfa/include/fxjse/fxjse.h @@ -13,19 +13,20 @@ class CPDFDoc_Environment; class CPDF_Page; +struct FXJSE_CLASS; typedef struct FXJSE_HRUNTIME_ { void* pData; } * FXJSE_HRUNTIME; typedef struct FXJSE_HCONTEXT_ { void* pData; } * FXJSE_HCONTEXT; typedef struct FXJSE_HCLASS_ { void* pData; } * FXJSE_HCLASS; typedef struct FXJSE_HVALUE_ { void* pData; } * FXJSE_HVALUE; typedef struct FXJSE_HOBJECT_ : public FXJSE_HVALUE_{} * FXJSE_HOBJECT; - typedef double FXJSE_DOUBLE; + void FXJSE_Initialize(); void FXJSE_Finalize(); FXJSE_HRUNTIME FXJSE_Runtime_Create(); void FXJSE_Runtime_Release(FXJSE_HRUNTIME hRuntime, bool bOwnedRuntime); -typedef struct _FXJSE_CLASS FXJSE_CLASS; + FXJSE_HCONTEXT FXJSE_Context_Create(FXJSE_HRUNTIME hRuntime, const FXJSE_CLASS* lpGlobalClass = nullptr, void* lpGlobalObject = nullptr); @@ -61,26 +62,26 @@ typedef int32_t (*FXJSE_PropTypeGetter)(FXJSE_HOBJECT hObject, FX_BOOL bQueryIn); typedef FX_BOOL (*FXJSE_PropDeleter)(FXJSE_HOBJECT hObject, const CFX_ByteStringC& szPropName); -typedef struct _FXJSE_FUNCTION { +struct FXJSE_FUNCTION { const FX_CHAR* name; FXJSE_FuncCallback callbackProc; -} FXJSE_FUNCTION; +}; #define FXJSE_DEF_FUNCTION(functionName, functionCallback) \ { functionName, functionCallback } void FXJSE_DefineFunctions(FXJSE_HCONTEXT hContext, const FXJSE_FUNCTION* lpFunctions, int nNum); -typedef struct _FXJSE_PROPERTY { +struct FXJSE_PROPERTY { const FX_CHAR* name; FXJSE_PropAccessor getProc; FXJSE_PropAccessor setProc; -} FXJSE_PROPERTY; +}; enum FXJSE_ClassPropTypes { FXJSE_ClassPropType_None, FXJSE_ClassPropType_Property, FXJSE_ClassPropType_Method }; -typedef struct _FXJSE_CLASS { +struct FXJSE_CLASS { const FX_CHAR* name; FXJSE_FuncCallback constructor; FXJSE_PROPERTY* properties; @@ -92,7 +93,7 @@ typedef struct _FXJSE_CLASS { FXJSE_PropAccessor dynPropSetter; FXJSE_PropDeleter dynPropDeleter; FXJSE_FuncCallback dynMethodCall; -} FXJSE_CLASS; +}; FXJSE_HCLASS FXJSE_DefineClass(FXJSE_HCONTEXT hContext, const FXJSE_CLASS* lpClass); FXJSE_HCLASS FXJSE_GetClass(FXJSE_HCONTEXT hContext, diff --git a/xfa/src/fdp/include/fde_brs.h b/xfa/src/fdp/include/fde_brs.h index f68da73a77..d3d9fc8610 100644 --- a/xfa/src/fdp/include/fde_brs.h +++ b/xfa/src/fdp/include/fde_brs.h @@ -25,11 +25,10 @@ class IFDE_LinearGradientBrush; #define FDE_WRAPMODE_TileFlipY 2 #define FDE_WRAPMODE_TileFlipXY 3 #define FDE_WRAPMODE_Clamp 4 -typedef struct _FDE_GRADIENTCOLOR { +struct FDE_GRADIENTCOLOR { FX_FLOAT pos; FX_ARGB color; -} FDE_GRADIENTCOLOR, *FDE_LPGRADIENTCOLOR; -typedef FDE_GRADIENTCOLOR const* FDE_LPCGRADIENTCOLOR; +}; typedef CFX_ArrayTemplate<FDE_GRADIENTCOLOR> CFDE_GradientColors; class IFDE_Brush { public: diff --git a/xfa/src/fdp/include/fde_img.h b/xfa/src/fdp/include/fde_img.h index b1612cb91f..ea501259ed 100644 --- a/xfa/src/fdp/include/fde_img.h +++ b/xfa/src/fdp/include/fde_img.h @@ -49,6 +49,7 @@ class IFDE_Image { virtual int32_t DoLoadImage(IFX_Pause* pPause = NULL) = 0; virtual void StopLoadImage() = 0; }; + #define FDE_IMAGEFILTER_Unknown -1 #define FDE_IMAGEFILTER_Opacity 0 #define FDE_IMAGEFILTER_GrayScale 1 @@ -58,34 +59,34 @@ class IFDE_Image { #define FDE_IMAGEFILTER_MaskColor 5 #define FDE_IMAGEFILTER_Brightness 6 #define FDE_IMAGEFILTER_Contrast 7 -typedef struct _FDE_IMAGEFILTERPARAMS : public CFX_Target { + +struct FDE_IMAGEFILTERPARAMS : public CFX_Target { int32_t iFilterType; -} FDE_IMAGEFILTERPARAMS, *FDE_LPIMAGEFILTERPARAMS; -typedef FDE_IMAGEFILTERPARAMS const* FDE_LPCIMAGEFILTERPARAMS; -typedef struct _FDE_OPACITYPARAMS : public FDE_IMAGEFILTERPARAMS { +}; + +struct FDE_OPACITYPARAMS : public FDE_IMAGEFILTERPARAMS { int32_t iOpacity; -} FDE_OPACITYPARAMS, *FDE_LPOPACITYPARAMS; -typedef FDE_OPACITYPARAMS const* FDE_LPCOPACITYPARAMS; -typedef struct _FDE_BLACKWHITEPARAMS : public FDE_IMAGEFILTERPARAMS { +}; + +struct FDE_BLACKWHITEPARAMS : public FDE_IMAGEFILTERPARAMS { FX_ARGB dwBlackColor; FX_ARGB dwWhiteColor; -} FDE_BLACKWHITEPARAMS, *FDE_LPBLACKWHITEPARAMS; -typedef FDE_BLACKWHITEPARAMS const* FDE_LPCBLACKWHITEPARAMS; -typedef struct _FDE_TRANSPARENTPARAMS : public FDE_IMAGEFILTERPARAMS { +}; + +struct FDE_TRANSPARENTPARAMS : public FDE_IMAGEFILTERPARAMS { FX_ARGB color; -} FDE_TRANSPARENTPARAMS, *FDE_LPTRANSPARENTPARAMS; -typedef FDE_TRANSPARENTPARAMS const* FDE_LPCTRANSPARENTPARAMS; -typedef struct _FDE_MASKCOLORPARAMS : public FDE_IMAGEFILTERPARAMS { +}; + +struct FDE_MASKCOLORPARAMS : public FDE_IMAGEFILTERPARAMS { FX_ARGB color; -} FDE_MASKCOLORPARAMS, *FDE_LPMASKCOLORPARAMS; -typedef FDE_MASKCOLORPARAMS const* FDE_LPCMASKCOLORPARAMS; -typedef struct _FDE_BRIGHTNESSPARAMS : public FDE_IMAGEFILTERPARAMS { +}; + +struct FDE_BRIGHTNESSPARAMS : public FDE_IMAGEFILTERPARAMS { int32_t iBrightness; -} FDE_BRIGHTNESSPARAMS, *FDE_LPBRIGHTNESSPARAMS; -typedef FDE_BRIGHTNESSPARAMS const* FDE_LPCBRIGHTNESSPARAMS; -typedef struct _FDE_CONTRASTPARAMS : public FDE_IMAGEFILTERPARAMS { +}; + +struct FDE_CONTRASTPARAMS : public FDE_IMAGEFILTERPARAMS { int32_t iContrast; -} FDE_CONTRASTPARAMS, *FDE_LPCONTRASTPARAMS; -typedef FDE_CONTRASTPARAMS const* FDE_LPCCONTRASTPARAMS; +}; #endif // XFA_SRC_FDP_INCLUDE_FDE_IMG_H_ diff --git a/xfa/src/fdp/include/fde_pen.h b/xfa/src/fdp/include/fde_pen.h index a335c972ee..904d7215ea 100644 --- a/xfa/src/fdp/include/fde_pen.h +++ b/xfa/src/fdp/include/fde_pen.h @@ -8,29 +8,33 @@ #define XFA_SRC_FDP_INCLUDE_FDE_PEN_H_ class IFDE_Pen; + #define FDE_PENTYPE_Unknown FDE_BRUSHTYPE_Unknown #define FDE_PENTYPE_SolidColor FDE_BRUSHTYPE_Solid #define FDE_PENTYPE_HatchBrush FDE_BRUSHTYPE_Hatch #define FDE_PENTYPE_TextureBrush FDE_BRUSHTYPE_Texture #define FDE_PENTYPE_LinearGradient FDE_BRUSHTYPE_LinearGradient #define FDE_PENTYPE_MAX FDE_BRUSHTYPE_MAX + #define FDE_DASHSTYLE_Solid 0 #define FDE_DASHSTYLE_Dash 1 #define FDE_DASHSTYLE_Dot 2 #define FDE_DASHSTYLE_DashDot 3 #define FDE_DASHSTYLE_DashDotDot 4 #define FDE_DASHSTYLE_Customized 5 + #define FDE_LINEJOIN_Miter 0 #define FDE_LINEJOIN_Round 1 #define FDE_LINEJOIN_Bevel 2 + #define FDE_LINECAP_Flat 0 #define FDE_LINECAP_Round 1 #define FDE_LINECAP_Square 2 -typedef struct _FDE_COMPOUNDPATTERN { + +struct FDE_COMPOUNDPATTERN { FX_FLOAT pos; FX_FLOAT width; -} FDE_COMPOUNDPATTERN, *FDE_LPCOMPOUNDPATTERN; -typedef FDE_COMPOUNDPATTERN const* FDE_LPCCOMPOUNDPATTERN; +}; typedef CFX_ArrayTemplate<FDE_COMPOUNDPATTERN> CFDE_CompoundPatterns; class IFDE_Pen { diff --git a/xfa/src/fdp/include/fde_psr.h b/xfa/src/fdp/include/fde_psr.h index 253eb8d903..72ff91fa87 100644 --- a/xfa/src/fdp/include/fde_psr.h +++ b/xfa/src/fdp/include/fde_psr.h @@ -25,7 +25,7 @@ enum FDE_VISUALOBJTYPE { FDE_VISUALOBJ_Widget = 0x08, }; -typedef struct _FDE_HVISUALOBJ { void* pData; } const* FDE_HVISUALOBJ; +typedef struct FDE_HVISUALOBJ_ { void* pData; } const* FDE_HVISUALOBJ; class IFDE_VisualSet { public: @@ -63,8 +63,8 @@ class IFDE_ImageSet : public IFDE_VisualSet { public: virtual IFDE_Image* GetImage(FDE_HVISUALOBJ hImage) = 0; virtual FX_POSITION GetFirstFilterPosition(FDE_HVISUALOBJ hImage) = 0; - virtual FDE_LPCIMAGEFILTERPARAMS GetNextFilter(FDE_HVISUALOBJ hImage, - FX_POSITION& pos) = 0; + virtual const FDE_IMAGEFILTERPARAMS* GetNextFilter(FDE_HVISUALOBJ hImage, + FX_POSITION& pos) = 0; }; #define FDE_FILLMODE_Alternate 1 #define FDE_FILLMODE_Winding 2 diff --git a/xfa/src/fdp/include/fde_rdv.h b/xfa/src/fdp/include/fde_rdv.h index 88e7dd4507..bfd92f5fa8 100644 --- a/xfa/src/fdp/include/fde_rdv.h +++ b/xfa/src/fdp/include/fde_rdv.h @@ -19,7 +19,7 @@ class IFDE_Image; class CFX_DIBitmap; class CFX_DIBSource; -typedef struct _FDE_HDEVICESTATE { void* pData; } * FDE_HDEVICESTATE; +typedef struct FDE_HDEVICESTATE_ { void* pData; } * FDE_HDEVICESTATE; class IFDE_RenderDevice { public: diff --git a/xfa/src/fdp/include/fde_xml.h b/xfa/src/fdp/include/fde_xml.h index a83e27e66c..cc08179270 100644 --- a/xfa/src/fdp/include/fde_xml.h +++ b/xfa/src/fdp/include/fde_xml.h @@ -26,9 +26,6 @@ class IFDE_XMLDoc; class IFDE_XMLParser; class IFDE_XMLSyntaxParser; -#ifdef __cplusplus -extern "C" { -#endif enum FDE_XMLNODETYPE { FDE_XMLNODE_Unknown = 0, FDE_XMLNODE_Instruction, @@ -36,18 +33,16 @@ enum FDE_XMLNODETYPE { FDE_XMLNODE_Text, FDE_XMLNODE_CharData, }; -typedef struct _FDE_XMLNODE { + +struct FDE_XMLNODE { int32_t iNodeNum; FDE_XMLNODETYPE eNodeType; -} FDE_XMLNODE, *FDE_LPXMLNODE; -typedef FDE_XMLNODE const* FDE_LPCXMLNODE; +}; typedef CFX_StackTemplate<FDE_XMLNODE> CFDE_XMLNodeStack; + FX_BOOL FDE_IsXMLValidChar(FX_WCHAR ch); FX_BOOL FDE_IsXMLWhiteSpace(FX_WCHAR ch); FX_BOOL FDE_IsXMLNameChar(FX_WCHAR ch, FX_BOOL bFirstChar); -#ifdef __cplusplus -} -#endif class IFDE_XMLNode { public: @@ -157,23 +152,24 @@ class IFDE_XMLCharData : public IFDE_XMLDeclaration { virtual void GetCharData(CFX_WideString& wsCData) const = 0; virtual void SetCharData(const CFX_WideString& wsCData) = 0; }; -typedef struct _FDE_XMLREADERHANDLER { - void* pData; - void (*OnTagEnter)(_FDE_XMLREADERHANDLER* pThis, +struct FDE_XMLREADERHANDLER { + void* pData; + void (*OnTagEnter)(FDE_XMLREADERHANDLER* pThis, FDE_XMLNODETYPE eType, const CFX_WideString& wsTagName); - void (*OnTagBreak)(_FDE_XMLREADERHANDLER* pThis, + void (*OnTagBreak)(FDE_XMLREADERHANDLER* pThis, const CFX_WideString& wsTagName); - void (*OnTagClose)(_FDE_XMLREADERHANDLER* pThis, + void (*OnTagClose)(FDE_XMLREADERHANDLER* pThis, const CFX_WideString& wsTagName); - void (*OnAttribute)(_FDE_XMLREADERHANDLER* pThis, + void (*OnAttribute)(FDE_XMLREADERHANDLER* pThis, const CFX_WideString& wsName, const CFX_WideString& wsValue); - void (*OnData)(_FDE_XMLREADERHANDLER* pThis, + void (*OnData)(FDE_XMLREADERHANDLER* pThis, FDE_XMLNODETYPE eType, const CFX_WideString& wsValue); -} FDE_XMLREADERHANDLER, *FDE_LPXMLREADERHANDLER; +}; + class IFDE_XMLDoc { public: static IFDE_XMLDoc* Create(); @@ -182,7 +178,7 @@ class IFDE_XMLDoc { virtual FX_BOOL LoadXML(IFX_Stream* pXMLStream, int32_t iXMLPlaneSize = 8192, int32_t iTextDataSize = 256, - FDE_LPXMLREADERHANDLER pHandler = NULL) = 0; + FDE_XMLREADERHANDLER* pHandler = NULL) = 0; virtual FX_BOOL LoadXML(IFDE_XMLParser* pXMLParser) = 0; virtual int32_t DoLoad(IFX_Pause* pPause = NULL) = 0; virtual void CloseXML() = 0; diff --git a/xfa/src/fdp/src/css/fde_csscache.cpp b/xfa/src/fdp/src/css/fde_csscache.cpp index 90fb50f121..2aedb5f9da 100644 --- a/xfa/src/fdp/src/css/fde_csscache.cpp +++ b/xfa/src/fdp/src/css/fde_csscache.cpp @@ -8,12 +8,12 @@ #include "xfa/src/fdp/src/css/fde_csscache.h" #include "xfa/src/foxitlib.h" -_FDE_CSSCACHEITEM::_FDE_CSSCACHEITEM(IFDE_CSSStyleSheet* p) +FDE_CSSCACHEITEM::FDE_CSSCACHEITEM(IFDE_CSSStyleSheet* p) : pStylesheet(p), dwActivity(0) { FXSYS_assert(pStylesheet); pStylesheet->AddRef(); } -_FDE_CSSCACHEITEM::~_FDE_CSSCACHEITEM() { +FDE_CSSCACHEITEM::~FDE_CSSCACHEITEM() { pStylesheet->Release(); } IFDE_CSSStyleSheetCache* IFDE_CSSStyleSheetCache::Create() { @@ -43,7 +43,7 @@ void CFDE_CSSStyleSheetCache::AddStyleSheet(const CFX_ByteStringC& szKey, } auto it = m_Stylesheets.find(szKey); if (it != m_Stylesheets.end()) { - FDE_LPCSSCACHEITEM pItem = it->second; + FDE_CSSCACHEITEM* pItem = it->second; if (pItem->pStylesheet != pStyleSheet) { pItem->pStylesheet->Release(); pItem->pStylesheet = pStyleSheet; @@ -64,7 +64,7 @@ IFDE_CSSStyleSheet* CFDE_CSSStyleSheetCache::GetStyleSheet( if (it == m_Stylesheets.end()) { return nullptr; } - FDE_LPCSSCACHEITEM pItem = it->second; + FDE_CSSCACHEITEM* pItem = it->second; pItem->dwActivity++; pItem->pStylesheet->AddRef(); return pItem->pStylesheet; @@ -95,8 +95,8 @@ void CFDE_CSSStyleSheetCache::RemoveLowestActivityItem() { m_Stylesheets.erase(found); } } -_FDE_CSSTAGCACHE::_FDE_CSSTAGCACHE(_FDE_CSSTAGCACHE* parent, - IFDE_CSSTagProvider* tag) +FDE_CSSTAGCACHE::FDE_CSSTAGCACHE(FDE_CSSTAGCACHE* parent, + IFDE_CSSTagProvider* tag) : pTag(tag), pParent(parent), dwIDHash(0), @@ -124,7 +124,7 @@ _FDE_CSSTAGCACHE::_FDE_CSSTAGCACHE(_FDE_CSSTAGCACHE* parent, } } } -_FDE_CSSTAGCACHE::_FDE_CSSTAGCACHE(const _FDE_CSSTAGCACHE& it) +FDE_CSSTAGCACHE::FDE_CSSTAGCACHE(const FDE_CSSTAGCACHE& it) : pTag(it.pTag), pParent(it.pParent), dwIDHash(it.dwIDHash), diff --git a/xfa/src/fdp/src/css/fde_csscache.h b/xfa/src/fdp/src/css/fde_csscache.h index 29ef417412..9e13d50087 100644 --- a/xfa/src/fdp/src/css/fde_csscache.h +++ b/xfa/src/fdp/src/css/fde_csscache.h @@ -10,12 +10,14 @@ #include "xfa/src/fdp/include/fde_css.h" #include "xfa/src/fgas/include/fx_mem.h" -typedef struct _FDE_CSSCACHEITEM : public CFX_Target { - _FDE_CSSCACHEITEM(IFDE_CSSStyleSheet* p); - ~_FDE_CSSCACHEITEM(); +struct FDE_CSSCACHEITEM : public CFX_Target { + FDE_CSSCACHEITEM(IFDE_CSSStyleSheet* p); + ~FDE_CSSCACHEITEM(); + IFDE_CSSStyleSheet* pStylesheet; FX_DWORD dwActivity; -} FDE_CSSCACHEITEM, *FDE_LPCSSCACHEITEM; +}; + class CFDE_CSSStyleSheetCache : public IFDE_CSSStyleSheetCache, public CFX_Target { public: @@ -35,15 +37,16 @@ class CFDE_CSSStyleSheetCache : public IFDE_CSSStyleSheetCache, protected: void RemoveLowestActivityItem(); - std::map<CFX_ByteString, FDE_LPCSSCACHEITEM> m_Stylesheets; + std::map<CFX_ByteString, FDE_CSSCACHEITEM*> m_Stylesheets; IFX_MEMAllocator* m_pFixedStore; int32_t m_iMaxItems; }; -typedef struct _FDE_CSSTAGCACHE : public CFX_Target { + +struct FDE_CSSTAGCACHE : public CFX_Target { public: - _FDE_CSSTAGCACHE(_FDE_CSSTAGCACHE* parent, IFDE_CSSTagProvider* tag); - _FDE_CSSTAGCACHE(const _FDE_CSSTAGCACHE& it); - _FDE_CSSTAGCACHE* GetParent() const { return pParent; } + FDE_CSSTAGCACHE(FDE_CSSTAGCACHE* parent, IFDE_CSSTagProvider* tag); + FDE_CSSTAGCACHE(const FDE_CSSTAGCACHE& it); + FDE_CSSTAGCACHE* GetParent() const { return pParent; } IFDE_CSSTagProvider* GetTag() const { return pTag; } FX_DWORD HashID() const { return dwIDHash; } FX_DWORD HashTag() const { return dwTagHash; } @@ -57,19 +60,20 @@ typedef struct _FDE_CSSTAGCACHE : public CFX_Target { protected: IFDE_CSSTagProvider* pTag; - _FDE_CSSTAGCACHE* pParent; + FDE_CSSTAGCACHE* pParent; FX_DWORD dwIDHash; FX_DWORD dwTagHash; int32_t iClassIndex; CFDE_DWordArray dwClassHashs; -} FDE_CSSTAGCACHE, *FDE_LPCSSTAGCACHE; +}; typedef CFX_ObjectStackTemplate<FDE_CSSTAGCACHE> CFDE_CSSTagStack; + class CFDE_CSSAccelerator : public IFDE_CSSAccelerator, public CFX_Target { public: virtual void OnEnterTag(IFDE_CSSTagProvider* pTag); virtual void OnLeaveTag(IFDE_CSSTagProvider* pTag); void Clear() { m_Stack.RemoveAll(); } - FDE_LPCSSTAGCACHE GetTopElement() const { return m_Stack.GetTopElement(); } + FDE_CSSTAGCACHE* GetTopElement() const { return m_Stack.GetTopElement(); } protected: CFDE_CSSTagStack m_Stack; diff --git a/xfa/src/fdp/src/css/fde_cssdeclaration.cpp b/xfa/src/fdp/src/css/fde_cssdeclaration.cpp index 6d5081317c..a83ccfb575 100644 --- a/xfa/src/fdp/src/css/fde_cssdeclaration.cpp +++ b/xfa/src/fdp/src/css/fde_cssdeclaration.cpp @@ -8,7 +8,7 @@ #include "xfa/src/foxitlib.h" IFDE_CSSValue* CFDE_CSSDeclaration::GetProperty(FDE_CSSPROPERTY eProperty, FX_BOOL& bImportant) const { - for (FDE_LPCSSPROPERTYHOLDER pHolder = m_pFirstProperty; pHolder; + for (const FDE_CSSPROPERTYHOLDER* pHolder = m_pFirstProperty; pHolder; pHolder = pHolder->pNext) { if (pHolder->eProperty == eProperty) { bImportant = pHolder->bImportant; @@ -24,7 +24,7 @@ void CFDE_CSSDeclaration::GetNextProperty(FX_POSITION& pos, FDE_CSSPROPERTY& eProperty, IFDE_CSSValue*& pValue, FX_BOOL& bImportant) const { - FDE_LPCSSPROPERTYHOLDER pHolder = (FDE_LPCSSPROPERTYHOLDER)pos; + const FDE_CSSPROPERTYHOLDER* pHolder = (const FDE_CSSPROPERTYHOLDER*)pos; FXSYS_assert(pHolder != NULL); bImportant = pHolder->bImportant; eProperty = (FDE_CSSPROPERTY)pHolder->eProperty; @@ -37,7 +37,7 @@ FX_POSITION CFDE_CSSDeclaration::GetStartCustom() const { void CFDE_CSSDeclaration::GetNextCustom(FX_POSITION& pos, CFX_WideString& wsName, CFX_WideString& wsValue) const { - FDE_LPCSSCUSTOMPROPERTY pProperty = (FDE_LPCSSCUSTOMPROPERTY)pos; + const FDE_CSSCUSTOMPROPERTY* pProperty = (const FDE_CSSCUSTOMPROPERTY*)pos; if (pProperty == NULL) { return; } @@ -45,9 +45,10 @@ void CFDE_CSSDeclaration::GetNextCustom(FX_POSITION& pos, wsValue = pProperty->pwsValue; pos = (FX_POSITION)pProperty->pNext; } -const FX_WCHAR* CFDE_CSSDeclaration::CopyToLocal(FDE_LPCCSSPROPERTYARGS pArgs, - const FX_WCHAR* pszValue, - int32_t iValueLen) { +const FX_WCHAR* CFDE_CSSDeclaration::CopyToLocal( + const FDE_CSSPROPERTYARGS* pArgs, + const FX_WCHAR* pszValue, + int32_t iValueLen) { FXSYS_assert(iValueLen > 0); CFX_MapPtrToPtr* pCache = pArgs->pStringCache; void* pKey = NULL; @@ -90,7 +91,7 @@ void CFDE_CSSDeclaration::AddPropertyHolder(IFX_MEMAllocator* pStaticStore, FDE_CSSPROPERTY eProperty, IFDE_CSSValue* pValue, FX_BOOL bImportant) { - FDE_LPCSSPROPERTYHOLDER pHolder = + FDE_CSSPROPERTYHOLDER* pHolder = FDE_NewWith(pStaticStore) FDE_CSSPROPERTYHOLDER; pHolder->bImportant = bImportant; pHolder->eProperty = eProperty; @@ -103,7 +104,7 @@ void CFDE_CSSDeclaration::AddPropertyHolder(IFX_MEMAllocator* pStaticStore, m_pLastProperty = pHolder; } } -FX_BOOL CFDE_CSSDeclaration::AddProperty(FDE_LPCCSSPROPERTYARGS pArgs, +FX_BOOL CFDE_CSSDeclaration::AddProperty(const FDE_CSSPROPERTYARGS* pArgs, const FX_WCHAR* pszValue, int32_t iValueLen) { FXSYS_assert(iValueLen > 0); @@ -261,12 +262,12 @@ FX_BOOL CFDE_CSSDeclaration::AddProperty(FDE_LPCCSSPROPERTYARGS pArgs, } return FALSE; } -FX_BOOL CFDE_CSSDeclaration::AddProperty(FDE_LPCCSSPROPERTYARGS pArgs, +FX_BOOL CFDE_CSSDeclaration::AddProperty(const FDE_CSSPROPERTYARGS* pArgs, const FX_WCHAR* pszName, int32_t iNameLen, const FX_WCHAR* pszValue, int32_t iValueLen) { - FDE_LPCSSCUSTOMPROPERTY pProperty = + FDE_CSSCUSTOMPROPERTY* pProperty = FDE_NewWith(pArgs->pStaticStore) FDE_CSSCUSTOMPROPERTY; pProperty->pwsName = CopyToLocal(pArgs, pszName, iNameLen); pProperty->pwsValue = CopyToLocal(pArgs, pszValue, iValueLen); @@ -279,9 +280,10 @@ FX_BOOL CFDE_CSSDeclaration::AddProperty(FDE_LPCCSSPROPERTYARGS pArgs, } return TRUE; } -IFDE_CSSValue* CFDE_CSSDeclaration::ParseNumber(FDE_LPCCSSPROPERTYARGS pArgs, - const FX_WCHAR* pszValue, - int32_t iValueLen) { +IFDE_CSSValue* CFDE_CSSDeclaration::ParseNumber( + const FDE_CSSPROPERTYARGS* pArgs, + const FX_WCHAR* pszValue, + int32_t iValueLen) { FX_FLOAT fValue; FDE_CSSPRIMITIVETYPE eUnit; if (!FDE_ParseCSSNumber(pszValue, iValueLen, fValue, eUnit)) { @@ -289,14 +291,14 @@ IFDE_CSSValue* CFDE_CSSDeclaration::ParseNumber(FDE_LPCCSSPROPERTYARGS pArgs, } return NewNumberValue(pArgs->pStaticStore, eUnit, fValue); } -IFDE_CSSValue* CFDE_CSSDeclaration::ParseEnum(FDE_LPCCSSPROPERTYARGS pArgs, +IFDE_CSSValue* CFDE_CSSDeclaration::ParseEnum(const FDE_CSSPROPERTYARGS* pArgs, const FX_WCHAR* pszValue, int32_t iValueLen) { - FDE_LPCCSSPROPERTYVALUETABLE pValue = + const FDE_CSSPROPERTYVALUETABLE* pValue = FDE_GetCSSPropertyValueByName(pszValue, iValueLen); return pValue ? NewEnumValue(pArgs->pStaticStore, pValue->eName) : NULL; } -IFDE_CSSValue* CFDE_CSSDeclaration::ParseColor(FDE_LPCCSSPROPERTYARGS pArgs, +IFDE_CSSValue* CFDE_CSSDeclaration::ParseColor(const FDE_CSSPROPERTYARGS* pArgs, const FX_WCHAR* pszValue, int32_t iValueLen) { FX_ARGB dwColor; @@ -305,7 +307,7 @@ IFDE_CSSValue* CFDE_CSSDeclaration::ParseColor(FDE_LPCCSSPROPERTYARGS pArgs, } return FDE_NewWith(pArgs->pStaticStore) CFDE_CSSPrimitiveValue(dwColor); } -IFDE_CSSValue* CFDE_CSSDeclaration::ParseURI(FDE_LPCCSSPROPERTYARGS pArgs, +IFDE_CSSValue* CFDE_CSSDeclaration::ParseURI(const FDE_CSSPROPERTYARGS* pArgs, const FX_WCHAR* pszValue, int32_t iValueLen) { int32_t iOffset; @@ -321,9 +323,10 @@ IFDE_CSSValue* CFDE_CSSDeclaration::ParseURI(FDE_LPCCSSPROPERTYARGS pArgs, CFDE_CSSPrimitiveValue(FDE_CSSPRIMITIVETYPE_URI, pszValue) : NULL; } -IFDE_CSSValue* CFDE_CSSDeclaration::ParseString(FDE_LPCCSSPROPERTYARGS pArgs, - const FX_WCHAR* pszValue, - int32_t iValueLen) { +IFDE_CSSValue* CFDE_CSSDeclaration::ParseString( + const FDE_CSSPROPERTYARGS* pArgs, + const FX_WCHAR* pszValue, + int32_t iValueLen) { int32_t iOffset; if (!FDE_ParseCSSString(pszValue, iValueLen, iOffset, iValueLen)) { return NULL; @@ -337,9 +340,10 @@ IFDE_CSSValue* CFDE_CSSDeclaration::ParseString(FDE_LPCCSSPROPERTYARGS pArgs, CFDE_CSSPrimitiveValue(FDE_CSSPRIMITIVETYPE_String, pszValue) : NULL; } -IFDE_CSSValue* CFDE_CSSDeclaration::ParseFunction(FDE_LPCCSSPROPERTYARGS pArgs, - const FX_WCHAR* pszValue, - int32_t iValueLen) { +IFDE_CSSValue* CFDE_CSSDeclaration::ParseFunction( + const FDE_CSSPROPERTYARGS* pArgs, + const FX_WCHAR* pszValue, + int32_t iValueLen) { if (pszValue[iValueLen - 1] != ')') { return NULL; } @@ -363,7 +367,7 @@ IFDE_CSSValue* CFDE_CSSDeclaration::ParseFunction(FDE_LPCCSSPROPERTYARGS pArgs, while (parser.NextValue(ePrimitiveType, pszValue, iValueLen)) { switch (ePrimitiveType) { case FDE_CSSPRIMITIVETYPE_String: { - FDE_LPCCSSPROPERTYVALUETABLE pPropertyValue = + const FDE_CSSPROPERTYVALUETABLE* pPropertyValue = FDE_GetCSSPropertyValueByName(pszValue, iValueLen); if (pPropertyValue != NULL) { argumentArr.Add( @@ -400,10 +404,11 @@ IFDE_CSSValue* CFDE_CSSDeclaration::ParseFunction(FDE_LPCCSSPROPERTYARGS pArgs, CFDE_CSSFunction(pszFuncName, pArgumentList); return FDE_NewWith(pArgs->pStaticStore) CFDE_CSSPrimitiveValue(pFunction); } -FX_BOOL CFDE_CSSDeclaration::ParseContentProperty(FDE_LPCCSSPROPERTYARGS pArgs, - const FX_WCHAR* pszValue, - int32_t iValueLen, - FX_BOOL bImportant) { +FX_BOOL CFDE_CSSDeclaration::ParseContentProperty( + const FDE_CSSPROPERTYARGS* pArgs, + const FX_WCHAR* pszValue, + int32_t iValueLen, + FX_BOOL bImportant) { IFX_MEMAllocator* pStaticStore = (IFX_MEMAllocator*)pArgs->pStaticStore; CFDE_CSSValueListParser parser(pszValue, iValueLen, ' '); FDE_CSSPRIMITIVETYPE eType; @@ -417,7 +422,7 @@ FX_BOOL CFDE_CSSDeclaration::ParseContentProperty(FDE_LPCCSSPROPERTYARGS pArgs, case FDE_CSSPRIMITIVETYPE_Number: return FALSE; case FDE_CSSPRIMITIVETYPE_String: { - FDE_LPCCSSPROPERTYVALUETABLE pValue = + const FDE_CSSPROPERTYVALUETABLE* pValue = FDE_GetCSSPropertyValueByName(pszValue, iValueLen); if (pValue != NULL) { switch (pValue->eName) { @@ -463,10 +468,11 @@ FX_BOOL CFDE_CSSDeclaration::ParseContentProperty(FDE_LPCCSSPROPERTYARGS pArgs, bImportant); return TRUE; } -FX_BOOL CFDE_CSSDeclaration::ParseCounterProperty(FDE_LPCCSSPROPERTYARGS pArgs, - const FX_WCHAR* pszValue, - int32_t iValueLen, - FX_BOOL bImportant) { +FX_BOOL CFDE_CSSDeclaration::ParseCounterProperty( + const FDE_CSSPROPERTYARGS* pArgs, + const FX_WCHAR* pszValue, + int32_t iValueLen, + FX_BOOL bImportant) { IFX_MEMAllocator* pStaticStore = pArgs->pStaticStore; CFDE_CSSValueListParser parser(pszValue, iValueLen, ' '); CFDE_CSSValueArray list; @@ -519,7 +525,7 @@ FX_BOOL CFDE_CSSDeclaration::ParseCounterProperty(FDE_LPCCSSPROPERTYARGS pArgs, return TRUE; } FX_BOOL CFDE_CSSDeclaration::ParseValueListProperty( - FDE_LPCCSSPROPERTYARGS pArgs, + const FDE_CSSPROPERTYARGS* pArgs, const FX_WCHAR* pszValue, int32_t iValueLen, FX_BOOL bImportant) { @@ -549,7 +555,7 @@ FX_BOOL CFDE_CSSDeclaration::ParseValueListProperty( } } if (dwType & FDE_CSSVALUETYPE_MaybeEnum) { - FDE_LPCCSSPROPERTYVALUETABLE pValue = + const FDE_CSSPROPERTYVALUETABLE* pValue = FDE_GetCSSPropertyValueByName(pszValue, iValueLen); if (pValue != NULL) { list.Add(NewEnumValue(pStaticStore, pValue->eName)); @@ -679,7 +685,7 @@ FX_BOOL CFDE_CSSDeclaration::ParseBorderPropoerty( } break; case FDE_CSSPRIMITIVETYPE_String: { - FDE_LPCCSSCOLORTABLE pColorItem = + const FDE_CSSCOLORTABLE* pColorItem = FDE_GetCSSColorByName(pszValue, iValueLen); if (pColorItem != NULL) { if (pColor == NULL) { @@ -688,7 +694,7 @@ FX_BOOL CFDE_CSSDeclaration::ParseBorderPropoerty( } continue; } - FDE_LPCCSSPROPERTYVALUETABLE pValue = + const FDE_CSSPROPERTYVALUETABLE* pValue = FDE_GetCSSPropertyValueByName(pszValue, iValueLen); if (pValue == NULL) { continue; @@ -753,7 +759,7 @@ void CFDE_CSSDeclaration::AddBorderProperty(IFX_MEMAllocator* pStaticStore, AddPropertyHolder(pStaticStore, eColor, pColor, bImportant); } FX_BOOL CFDE_CSSDeclaration::ParseListStyleProperty( - FDE_LPCCSSPROPERTYARGS pArgs, + const FDE_CSSPROPERTYARGS* pArgs, const FX_WCHAR* pszValue, int32_t iValueLen, FX_BOOL bImportant) { @@ -770,7 +776,7 @@ FX_BOOL CFDE_CSSDeclaration::ParseListStyleProperty( } break; case FDE_CSSPRIMITIVETYPE_String: { - FDE_LPCCSSPROPERTYVALUETABLE pValue = + const FDE_CSSPROPERTYVALUETABLE* pValue = FDE_GetCSSPropertyValueByName(pszValue, iValueLen); if (pValue == NULL) { break; @@ -833,7 +839,7 @@ FX_BOOL CFDE_CSSDeclaration::ParseListStyleProperty( return TRUE; } FX_BOOL CFDE_CSSDeclaration::ParseBackgroundProperty( - FDE_LPCCSSPROPERTYARGS pArgs, + const FDE_CSSPROPERTYARGS* pArgs, const FX_WCHAR* pszValue, int32_t iValueLen, FX_BOOL bImportant) { @@ -862,7 +868,7 @@ FX_BOOL CFDE_CSSDeclaration::ParseBackgroundProperty( } } break; case FDE_CSSPRIMITIVETYPE_String: { - FDE_LPCCSSPROPERTYVALUETABLE pValue = + const FDE_CSSPROPERTYVALUETABLE* pValue = FDE_GetCSSPropertyValueByName(pszValue, iValueLen); if (pValue != NULL) { switch (pValue->eName) { @@ -915,7 +921,7 @@ FX_BOOL CFDE_CSSDeclaration::ParseBackgroundProperty( } break; } - FDE_LPCCSSCOLORTABLE pColorItem = + const FDE_CSSCOLORTABLE* pColorItem = FDE_GetCSSColorByName(pszValue, iValueLen); if (pColorItem != NULL) if (pColor == NULL) { @@ -970,7 +976,7 @@ FX_BOOL CFDE_CSSDeclaration::ParseBackgroundProperty( pAttachment, bImportant); return TRUE; } -FX_BOOL CFDE_CSSDeclaration::ParseFontProperty(FDE_LPCCSSPROPERTYARGS pArgs, +FX_BOOL CFDE_CSSDeclaration::ParseFontProperty(const FDE_CSSPROPERTYARGS* pArgs, const FX_WCHAR* pszValue, int32_t iValueLen, FX_BOOL bImportant) { @@ -983,7 +989,7 @@ FX_BOOL CFDE_CSSDeclaration::ParseFontProperty(FDE_LPCCSSPROPERTYARGS pArgs, while (parser.NextValue(eType, pszValue, iValueLen)) { switch (eType) { case FDE_CSSPRIMITIVETYPE_String: { - FDE_LPCCSSPROPERTYVALUETABLE pValue = + const FDE_CSSPROPERTYVALUETABLE* pValue = FDE_GetCSSPropertyValueByName(pszValue, iValueLen); if (pValue != NULL) { switch (pValue->eName) { @@ -1108,7 +1114,7 @@ FX_BOOL CFDE_CSSDeclaration::ParseFontProperty(FDE_LPCCSSPROPERTYARGS pArgs, return TRUE; } FX_BOOL CFDE_CSSDeclaration::ParseColumnRuleProperty( - FDE_LPCCSSPROPERTYARGS pArgs, + const FDE_CSSPROPERTYARGS* pArgs, const FX_WCHAR* pszValue, int32_t iValueLen, FX_BOOL bImportant) { @@ -1121,7 +1127,7 @@ FX_BOOL CFDE_CSSDeclaration::ParseColumnRuleProperty( while (parser.NextValue(eType, pszValue, iValueLen)) { switch (eType) { case FDE_CSSPRIMITIVETYPE_String: { - FDE_LPCCSSPROPERTYVALUETABLE pValue = + const FDE_CSSPROPERTYVALUETABLE* pValue = FDE_GetCSSPropertyValueByName(pszValue, iValueLen); if (pValue != NULL) { switch (pValue->eName) { @@ -1206,7 +1212,7 @@ FX_BOOL CFDE_CSSDeclaration::ParseColumnRuleProperty( return TRUE; } FX_BOOL CFDE_CSSDeclaration::ParseTextEmphasisProperty( - FDE_LPCCSSPROPERTYARGS pArgs, + FDE_CSSPROPERTYARGS* pArgs, const FX_WCHAR* pszValue, int32_t iValueLen, FX_BOOL bImportant) { @@ -1218,7 +1224,7 @@ FX_BOOL CFDE_CSSDeclaration::ParseTextEmphasisProperty( while (parser.NextValue(eType, pszValue, iValueLen)) { switch (eType) { case FDE_CSSPRIMITIVETYPE_String: { - FDE_LPCCSSPROPERTYVALUETABLE pValue = + const FDE_CSSPROPERTYVALUETABLE* pValue = FDE_GetCSSPropertyValueByName(pszValue, iValueLen); if (pValue != NULL) { arrEmphasisStyle.Add(NewEnumValue(pStaticStore, pValue->eName)); @@ -1257,10 +1263,11 @@ FX_BOOL CFDE_CSSDeclaration::ParseTextEmphasisProperty( } return TRUE; } -FX_BOOL CFDE_CSSDeclaration::ParseColumnsProperty(FDE_LPCCSSPROPERTYARGS pArgs, - const FX_WCHAR* pszValue, - int32_t iValueLen, - FX_BOOL bImportant) { +FX_BOOL CFDE_CSSDeclaration::ParseColumnsProperty( + const FDE_CSSPROPERTYARGS* pArgs, + const FX_WCHAR* pszValue, + int32_t iValueLen, + FX_BOOL bImportant) { IFX_MEMAllocator* pStaticStore = pArgs->pStaticStore; CFDE_CSSValueListParser parser(pszValue, iValueLen, ' '); IFDE_CSSPrimitiveValue* pColumnWidth = NULL; @@ -1269,7 +1276,7 @@ FX_BOOL CFDE_CSSDeclaration::ParseColumnsProperty(FDE_LPCCSSPROPERTYARGS pArgs, while (parser.NextValue(eType, pszValue, iValueLen)) { switch (eType) { case FDE_CSSPRIMITIVETYPE_String: { - FDE_LPCCSSPROPERTYVALUETABLE pValue = + const FDE_CSSPROPERTYVALUETABLE* pValue = FDE_GetCSSPropertyValueByName(pszValue, iValueLen); if (pValue == NULL && pValue->eName == FDE_CSSPROPERTYVALUE_Auto) { pColumnWidth = NewEnumValue(pStaticStore, pValue->eName); @@ -1309,10 +1316,11 @@ FX_BOOL CFDE_CSSDeclaration::ParseColumnsProperty(FDE_LPCCSSPROPERTYARGS pArgs, bImportant); return TRUE; } -FX_BOOL CFDE_CSSDeclaration::ParseOverflowProperty(FDE_LPCCSSPROPERTYARGS pArgs, - const FX_WCHAR* pszValue, - int32_t iValueLen, - FX_BOOL bImportant) { +FX_BOOL CFDE_CSSDeclaration::ParseOverflowProperty( + const FDE_CSSPROPERTYARGS* pArgs, + const FX_WCHAR* pszValue, + int32_t iValueLen, + FX_BOOL bImportant) { IFX_MEMAllocator* pStaticStore = pArgs->pStaticStore; CFDE_CSSValueListParser parser(pszValue, iValueLen, ' '); IFDE_CSSPrimitiveValue* pOverflowX = NULL; @@ -1320,7 +1328,7 @@ FX_BOOL CFDE_CSSDeclaration::ParseOverflowProperty(FDE_LPCCSSPROPERTYARGS pArgs, FDE_CSSPRIMITIVETYPE eType; while (parser.NextValue(eType, pszValue, iValueLen)) { if (eType == FDE_CSSPRIMITIVETYPE_String) { - FDE_LPCCSSPROPERTYVALUETABLE pValue = + const FDE_CSSPROPERTYVALUETABLE* pValue = FDE_GetCSSPropertyValueByName(pszValue, iValueLen); if (pValue != NULL) { switch (pValue->eName) { diff --git a/xfa/src/fdp/src/css/fde_cssdeclaration.h b/xfa/src/fdp/src/css/fde_cssdeclaration.h index 3cb6418a32..bcc6609f3b 100644 --- a/xfa/src/fdp/src/css/fde_cssdeclaration.h +++ b/xfa/src/fdp/src/css/fde_cssdeclaration.h @@ -9,23 +9,25 @@ #include "xfa/src/fdp/src/css/fde_cssdatatable.h" -typedef struct _FDE_CSSPROPERTYHOLDER : public CFX_Target { +struct FDE_CSSPROPERTYHOLDER : public CFX_Target { int16_t eProperty; int16_t bImportant; IFDE_CSSValue* pValue; - _FDE_CSSPROPERTYHOLDER* pNext; -} FDE_CSSPROPERTYHOLDER, *FDE_LPCSSPROPERTYHOLDER; -typedef struct _FDE_CSSCUSTOMPROPERTY : public CFX_Target { + FDE_CSSPROPERTYHOLDER* pNext; +}; + +struct FDE_CSSCUSTOMPROPERTY : public CFX_Target { const FX_WCHAR* pwsName; const FX_WCHAR* pwsValue; - _FDE_CSSCUSTOMPROPERTY* pNext; -} FDE_CSSCUSTOMPROPERTY, *FDE_LPCSSCUSTOMPROPERTY; -typedef struct _FDE_CSSPROPERTYARGS : public CFX_Target { + FDE_CSSCUSTOMPROPERTY* pNext; +}; + +struct FDE_CSSPROPERTYARGS : public CFX_Target { IFX_MEMAllocator* pStaticStore; CFX_MapPtrToPtr* pStringCache; FDE_LPCCSSPROPERTYTABLE pProperty; -} FDE_CSSPROPERTYARGS; -typedef FDE_CSSPROPERTYARGS const* FDE_LPCCSSPROPERTYARGS; +}; + class CFDE_CSSDeclaration : public IFDE_CSSDeclaration, public CFX_Target { public: CFDE_CSSDeclaration() @@ -44,41 +46,41 @@ class CFDE_CSSDeclaration : public IFDE_CSSDeclaration, public CFX_Target { virtual void GetNextCustom(FX_POSITION& pos, CFX_WideString& wsName, CFX_WideString& wsValue) const; - FX_BOOL AddProperty(FDE_LPCCSSPROPERTYARGS pArgs, + FX_BOOL AddProperty(const FDE_CSSPROPERTYARGS* pArgs, const FX_WCHAR* pszValue, int32_t iValueLen); - FX_BOOL AddProperty(FDE_LPCCSSPROPERTYARGS pArgs, + FX_BOOL AddProperty(const FDE_CSSPROPERTYARGS* pArgs, const FX_WCHAR* pszName, int32_t iNameLen, const FX_WCHAR* pszValue, int32_t iValueLen); protected: - FX_BOOL ParseTextEmphasisProperty(FDE_LPCCSSPROPERTYARGS pArgs, + FX_BOOL ParseTextEmphasisProperty(FDE_CSSPROPERTYARGS* pArgs, const FX_WCHAR* pszValue, int32_t iValueLen, FX_BOOL bImportant); - FX_BOOL ParseColumnsProperty(FDE_LPCCSSPROPERTYARGS pArgs, + FX_BOOL ParseColumnsProperty(const FDE_CSSPROPERTYARGS* pArgs, const FX_WCHAR* pszValue, int32_t iValueLen, FX_BOOL bImportant); - FX_BOOL ParseColumnRuleProperty(FDE_LPCCSSPROPERTYARGS pArgs, + FX_BOOL ParseColumnRuleProperty(const FDE_CSSPROPERTYARGS* pArgs, const FX_WCHAR* pszValue, int32_t iValueLen, FX_BOOL bImportant); - FX_BOOL ParseOverflowProperty(FDE_LPCCSSPROPERTYARGS pArgs, + FX_BOOL ParseOverflowProperty(const FDE_CSSPROPERTYARGS* pArgs, const FX_WCHAR* pszValue, int32_t iValueLen, FX_BOOL bImportant); - FX_BOOL ParseFontProperty(FDE_LPCCSSPROPERTYARGS pArgs, + FX_BOOL ParseFontProperty(const FDE_CSSPROPERTYARGS* pArgs, const FX_WCHAR* pszValue, int32_t iValueLen, FX_BOOL bImportant); - FX_BOOL ParseBackgroundProperty(FDE_LPCCSSPROPERTYARGS pArgs, + FX_BOOL ParseBackgroundProperty(const FDE_CSSPROPERTYARGS* pArgs, const FX_WCHAR* pszValue, int32_t iValueLen, FX_BOOL bImportant); - FX_BOOL ParseListStyleProperty(FDE_LPCCSSPROPERTYARGS pArgs, + FX_BOOL ParseListStyleProperty(const FDE_CSSPROPERTYARGS* pArgs, const FX_WCHAR* pszValue, int32_t iValueLen, FX_BOOL bImportant); @@ -96,15 +98,15 @@ class CFDE_CSSDeclaration : public IFDE_CSSDeclaration, public CFX_Target { FDE_CSSPROPERTY eColor, FDE_CSSPROPERTY eStyle, FDE_CSSPROPERTY eWidth); - FX_BOOL ParseContentProperty(FDE_LPCCSSPROPERTYARGS pArgs, + FX_BOOL ParseContentProperty(const FDE_CSSPROPERTYARGS* pArgs, const FX_WCHAR* pszValue, int32_t iValueLen, FX_BOOL bImportant); - FX_BOOL ParseCounterProperty(FDE_LPCCSSPROPERTYARGS pArgs, + FX_BOOL ParseCounterProperty(const FDE_CSSPROPERTYARGS* pArgs, const FX_WCHAR* pszValue, int32_t iValueLen, FX_BOOL bImportant); - FX_BOOL ParseValueListProperty(FDE_LPCCSSPROPERTYARGS pArgs, + FX_BOOL ParseValueListProperty(const FDE_CSSPROPERTYARGS* pArgs, const FX_WCHAR* pszValue, int32_t iValueLen, FX_BOOL bImportant); @@ -115,25 +117,25 @@ class CFDE_CSSDeclaration : public IFDE_CSSDeclaration, public CFX_Target { FDE_CSSPROPERTY eTop, FDE_CSSPROPERTY eRight, FDE_CSSPROPERTY eBottom); - IFDE_CSSValue* ParseNumber(FDE_LPCCSSPROPERTYARGS pArgs, + IFDE_CSSValue* ParseNumber(const FDE_CSSPROPERTYARGS* pArgs, const FX_WCHAR* pszValue, int32_t iValueLen); - IFDE_CSSValue* ParseEnum(FDE_LPCCSSPROPERTYARGS pArgs, + IFDE_CSSValue* ParseEnum(const FDE_CSSPROPERTYARGS* pArgs, const FX_WCHAR* pszValue, int32_t iValueLen); - IFDE_CSSValue* ParseColor(FDE_LPCCSSPROPERTYARGS pArgs, + IFDE_CSSValue* ParseColor(const FDE_CSSPROPERTYARGS* pArgs, const FX_WCHAR* pszValue, int32_t iValueLen); - IFDE_CSSValue* ParseURI(FDE_LPCCSSPROPERTYARGS pArgs, + IFDE_CSSValue* ParseURI(const FDE_CSSPROPERTYARGS* pArgs, const FX_WCHAR* pszValue, int32_t iValueLen); - IFDE_CSSValue* ParseString(FDE_LPCCSSPROPERTYARGS pArgs, + IFDE_CSSValue* ParseString(const FDE_CSSPROPERTYARGS* pArgs, const FX_WCHAR* pszValue, int32_t iValueLen); - IFDE_CSSValue* ParseFunction(FDE_LPCCSSPROPERTYARGS pArgs, + IFDE_CSSValue* ParseFunction(const FDE_CSSPROPERTYARGS* pArgs, const FX_WCHAR* pszValue, int32_t iValueLen); - const FX_WCHAR* CopyToLocal(FDE_LPCCSSPROPERTYARGS pArgs, + const FX_WCHAR* CopyToLocal(const FDE_CSSPROPERTYARGS* pArgs, const FX_WCHAR* pszValue, int32_t iValueLen); void AddPropertyHolder(IFX_MEMAllocator* pStaticStore, @@ -145,10 +147,10 @@ class CFDE_CSSDeclaration : public IFDE_CSSDeclaration, public CFX_Target { FX_FLOAT fValue) const; IFDE_CSSPrimitiveValue* NewEnumValue(IFX_MEMAllocator* pStaticStore, FDE_CSSPROPERTYVALUE eValue) const; - FDE_LPCSSPROPERTYHOLDER m_pFirstProperty; - FDE_LPCSSPROPERTYHOLDER m_pLastProperty; - FDE_LPCSSCUSTOMPROPERTY m_pFirstCustom; - FDE_LPCSSCUSTOMPROPERTY m_pLastCustom; + FDE_CSSPROPERTYHOLDER* m_pFirstProperty; + FDE_CSSPROPERTYHOLDER* m_pLastProperty; + FDE_CSSCUSTOMPROPERTY* m_pFirstCustom; + FDE_CSSCUSTOMPROPERTY* m_pLastCustom; }; #endif // XFA_SRC_FDP_SRC_CSS_FDE_CSSDECLARATION_H_ diff --git a/xfa/src/fdp/src/css/fde_cssstyleselector.cpp b/xfa/src/fdp/src/css/fde_cssstyleselector.cpp index 6cf011ac77..6d05065e7d 100644 --- a/xfa/src/fdp/src/css/fde_cssstyleselector.cpp +++ b/xfa/src/fdp/src/css/fde_cssstyleselector.cpp @@ -80,9 +80,9 @@ FDE_CSSTEXTEMPHASISMARK CFDE_CSSComputedStyle::GetTextEmphasisMark() const { } return FDE_CSSTEXTEMPHASISMARK_Sesame; } -_FDE_CSSRULEDATA::_FDE_CSSRULEDATA(IFDE_CSSSelector* pSel, - IFDE_CSSDeclaration* pDecl, - FX_DWORD dwPos) +FDE_CSSRULEDATA::FDE_CSSRULEDATA(IFDE_CSSSelector* pSel, + IFDE_CSSDeclaration* pDecl, + FX_DWORD dwPos) : pSelector(pSel), pDeclaration(pDecl), dwPriority(dwPos), pNext(NULL) { static const FX_DWORD s_Specific[5] = {0x00010000, 0x00010000, 0x00100000, 0x00100000, 0x01000000}; @@ -128,7 +128,7 @@ void CFDE_CSSRuleCollection::AddRulesFrom(IFDE_CSSStyleSheet* pStyleSheet, for (int32_t i = 0; i < iSelectors; ++i) { IFDE_CSSSelector* pSelector = pStyleRule->GetSelectorList(i); if (pSelector->GetType() == FDE_CSSSELECTORTYPE_Persudo) { - FDE_LPCSSRULEDATA pData = NewRuleData(pSelector, pDeclaration); + FDE_CSSRULEDATA* pData = NewRuleData(pSelector, pDeclaration); AddRuleTo(m_pPersudoRules, pData); continue; } @@ -139,7 +139,7 @@ void CFDE_CSSRuleCollection::AddRulesFrom(IFDE_CSSStyleSheet* pStyleSheet, } IFDE_CSSSelector* pNext = pSelector->GetNextSelector(); if (pNext == NULL) { - FDE_LPCSSRULEDATA pData = NewRuleData(pSelector, pDeclaration); + FDE_CSSRULEDATA* pData = NewRuleData(pSelector, pDeclaration); AddRuleTo(m_pUniversalRules, pData); continue; } @@ -180,16 +180,16 @@ void CFDE_CSSRuleCollection::AddRuleTo(CFX_MapPtrToPtr& map, IFDE_CSSSelector* pSel, IFDE_CSSDeclaration* pDecl) { void* pKey = (void*)(uintptr_t)dwKey; - FDE_LPCSSRULEDATA pData = NewRuleData(pSel, pDecl); - FDE_LPCSSRULEDATA pList = NULL; + FDE_CSSRULEDATA* pData = NewRuleData(pSel, pDecl); + FDE_CSSRULEDATA* pList = NULL; if (!map.Lookup(pKey, (void*&)pList)) { map.SetAt(pKey, pData); } else if (AddRuleTo(pList, pData)) { map.SetAt(pKey, pList); } } -inline FX_BOOL CFDE_CSSRuleCollection::AddRuleTo(FDE_LPCSSRULEDATA& pList, - FDE_LPCSSRULEDATA pData) { +inline FX_BOOL CFDE_CSSRuleCollection::AddRuleTo(FDE_CSSRULEDATA*& pList, + FDE_CSSRULEDATA* pData) { if (pList == NULL) { pList = pData; return TRUE; @@ -199,7 +199,7 @@ inline FX_BOOL CFDE_CSSRuleCollection::AddRuleTo(FDE_LPCSSRULEDATA& pList, return FALSE; } } -inline FDE_LPCSSRULEDATA CFDE_CSSRuleCollection::NewRuleData( +inline FDE_CSSRULEDATA* CFDE_CSSRuleCollection::NewRuleData( IFDE_CSSSelector* pSel, IFDE_CSSDeclaration* pDecl) { return FDE_NewWith(m_pStaticStore) @@ -316,7 +316,7 @@ int32_t CFDE_CSSStyleSelector::MatchDeclarations( CFDE_CSSDeclarationArray& matchedDecls, FDE_CSSPERSUDO ePersudoType) { FXSYS_assert(m_pAccelerator != NULL && pTag != NULL); - FDE_LPCSSTAGCACHE pCache = m_pAccelerator->GetTopElement(); + FDE_CSSTAGCACHE* pCache = m_pAccelerator->GetTopElement(); FXSYS_assert(pCache != NULL && pCache->GetTag() == pTag); matchedDecls.RemoveAt(0, matchedDecls.GetSize()); for (int32_t ePriority = FDE_CSSSTYLESHEETPRIORITY_MAX - 1; ePriority >= 0; @@ -348,8 +348,8 @@ int32_t CFDE_CSSStyleSelector::MatchDeclarations( } return matchedDecls.GetSize(); } -inline void CFDE_CSSStyleSelector::MatchRules(FDE_LPCSSTAGCACHE pCache, - FDE_LPCSSRULEDATA pList, +inline void CFDE_CSSStyleSelector::MatchRules(FDE_CSSTAGCACHE* pCache, + FDE_CSSRULEDATA* pList, FDE_CSSPERSUDO ePersudoType) { while (pList != NULL) { if (MatchSelector(pCache, pList->pSelector, ePersudoType)) { @@ -358,7 +358,7 @@ inline void CFDE_CSSStyleSelector::MatchRules(FDE_LPCSSTAGCACHE pCache, pList = pList->pNext; } } -FX_BOOL CFDE_CSSStyleSelector::MatchSelector(FDE_LPCSSTAGCACHE pCache, +FX_BOOL CFDE_CSSStyleSelector::MatchSelector(FDE_CSSTAGCACHE* pCache, IFDE_CSSSelector* pSel, FDE_CSSPERSUDO ePersudoType) { FX_DWORD dwHash; @@ -409,13 +409,13 @@ FX_BOOL CFDE_CSSStyleSelector::MatchSelector(FDE_LPCSSTAGCACHE pCache, } void CFDE_CSSStyleSelector::SortRulesTo(CFDE_CSSDeclarationArray& matchDecls) { for (int32_t j = m_MatchedRules.GetUpperBound(); j >= 0; --j) { - FDE_LPCSSRULEDATA& pMin = m_MatchedRules.ElementAt(j); + FDE_CSSRULEDATA*& pMin = m_MatchedRules.ElementAt(j); FX_DWORD dwMin = pMin->dwPriority; for (int32_t i = j - 1; i >= 0; --i) { - FDE_LPCSSRULEDATA& pCur = m_MatchedRules.ElementAt(i); + FDE_CSSRULEDATA*& pCur = m_MatchedRules.ElementAt(i); if (dwMin > pCur->dwPriority) { dwMin = pCur->dwPriority; - FDE_LPCSSRULEDATA p = pMin; + FDE_CSSRULEDATA* p = pMin; pMin = pCur; pCur = p; } diff --git a/xfa/src/fdp/src/css/fde_cssstyleselector.h b/xfa/src/fdp/src/css/fde_cssstyleselector.h index aac9b1fad8..f2547136ea 100644 --- a/xfa/src/fdp/src/css/fde_cssstyleselector.h +++ b/xfa/src/fdp/src/css/fde_cssstyleselector.h @@ -11,17 +11,20 @@ #include "xfa/src/fgas/include/fx_sys.h" #define FDE_CSSUNIVERSALHASH ('*') -typedef struct _FDE_CSSRULEDATA : public CFX_Target { + +struct FDE_CSSRULEDATA : public CFX_Target { public: - _FDE_CSSRULEDATA(IFDE_CSSSelector* pSel, - IFDE_CSSDeclaration* pDecl, - FX_DWORD dwPos); + FDE_CSSRULEDATA(IFDE_CSSSelector* pSel, + IFDE_CSSDeclaration* pDecl, + FX_DWORD dwPos); + IFDE_CSSSelector* pSelector; IFDE_CSSDeclaration* pDeclaration; FX_DWORD dwPriority; - _FDE_CSSRULEDATA* pNext; -} FDE_CSSRULEDATA, *FDE_LPCSSRULEDATA; -typedef CFX_ArrayTemplate<FDE_LPCSSRULEDATA> CFDE_CSSRuleDataArray; + FDE_CSSRULEDATA* pNext; +}; +typedef CFX_ArrayTemplate<FDE_CSSRULEDATA*> CFDE_CSSRuleDataArray; + class CFDE_CSSRuleCollection : public CFX_Target { public: CFDE_CSSRuleCollection() @@ -36,26 +39,26 @@ class CFDE_CSSRuleCollection : public CFX_Target { void Clear(); int32_t CountSelectors() const { return m_iSelectors; } - FDE_LPCSSRULEDATA GetIDRuleData(FX_DWORD dwIDHash) { + FDE_CSSRULEDATA* GetIDRuleData(FX_DWORD dwIDHash) { void* pData; return m_IDRules.Lookup((void*)(uintptr_t)dwIDHash, pData) - ? (FDE_LPCSSRULEDATA)pData + ? (FDE_CSSRULEDATA*)pData : NULL; } - FDE_LPCSSRULEDATA GetTagRuleData(FX_DWORD dwTagHasn) { + FDE_CSSRULEDATA* GetTagRuleData(FX_DWORD dwTagHasn) { void* pData; return m_TagRules.Lookup((void*)(uintptr_t)dwTagHasn, pData) - ? (FDE_LPCSSRULEDATA)pData + ? (FDE_CSSRULEDATA*)pData : NULL; } - FDE_LPCSSRULEDATA GetClassRuleData(FX_DWORD dwIDHash) { + FDE_CSSRULEDATA* GetClassRuleData(FX_DWORD dwIDHash) { void* pData; return m_ClassRules.Lookup((void*)(uintptr_t)dwIDHash, pData) - ? (FDE_LPCSSRULEDATA)pData + ? (FDE_CSSRULEDATA*)pData : NULL; } - FDE_LPCSSRULEDATA GetUniversalRuleData() { return m_pUniversalRules; } - FDE_LPCSSRULEDATA GetPersudoRuleData() { return m_pPersudoRules; } + FDE_CSSRULEDATA* GetUniversalRuleData() { return m_pUniversalRules; } + FDE_CSSRULEDATA* GetPersudoRuleData() { return m_pPersudoRules; } IFX_MEMAllocator* m_pStaticStore; protected: @@ -67,14 +70,14 @@ class CFDE_CSSRuleCollection : public CFX_Target { FX_DWORD dwKey, IFDE_CSSSelector* pSel, IFDE_CSSDeclaration* pDecl); - FX_BOOL AddRuleTo(FDE_LPCSSRULEDATA& pList, FDE_LPCSSRULEDATA pData); - FDE_LPCSSRULEDATA NewRuleData(IFDE_CSSSelector* pSel, - IFDE_CSSDeclaration* pDecl); + FX_BOOL AddRuleTo(FDE_CSSRULEDATA*& pList, FDE_CSSRULEDATA* pData); + FDE_CSSRULEDATA* NewRuleData(IFDE_CSSSelector* pSel, + IFDE_CSSDeclaration* pDecl); CFX_MapPtrToPtr m_IDRules; CFX_MapPtrToPtr m_TagRules; CFX_MapPtrToPtr m_ClassRules; - FDE_LPCSSRULEDATA m_pUniversalRules; - FDE_LPCSSRULEDATA m_pPersudoRules; + FDE_CSSRULEDATA* m_pUniversalRules; + FDE_CSSRULEDATA* m_pPersudoRules; int32_t m_iSelectors; }; class CFDE_CSSAccelerator; @@ -109,11 +112,11 @@ class CFDE_CSSStyleSelector : public IFDE_CSSStyleSelector, public CFX_Target { protected: void Reset(); - void MatchRules(FDE_LPCSSTAGCACHE pCache, - FDE_LPCSSRULEDATA pList, + void MatchRules(FDE_CSSTAGCACHE* pCache, + FDE_CSSRULEDATA* pList, FDE_CSSPERSUDO ePersudoType); void SortRulesTo(CFDE_CSSDeclarationArray& matchDecls); - FX_BOOL MatchSelector(FDE_LPCSSTAGCACHE pCache, + FX_BOOL MatchSelector(FDE_CSSTAGCACHE* pCache, IFDE_CSSSelector* pSel, FDE_CSSPERSUDO ePersudoType); void AppendInlineStyle(CFDE_CSSDeclaration* pDecl, @@ -180,9 +183,10 @@ class CFDE_CSSStyleSelector : public IFDE_CSSStyleSelector, public CFX_Target { CFDE_CSSAccelerator* m_pAccelerator; CFDE_CSSRuleDataArray m_MatchedRules; }; -typedef struct _FDE_CSSCOUNTERDATA { + +struct FDE_CSSCOUNTERDATA { public: - _FDE_CSSCOUNTERDATA() { FXSYS_memset(this, 0, sizeof(_FDE_CSSCOUNTERDATA)); } + FDE_CSSCOUNTERDATA() { FXSYS_memset(this, 0, sizeof(FDE_CSSCOUNTERDATA)); } FX_BOOL GetCounterIncrement(int32_t& iValue) { iValue = m_iIncVal; return m_bIncrement; @@ -191,12 +195,14 @@ typedef struct _FDE_CSSCOUNTERDATA { iValue = m_iResetVal; return m_bReset; } + const FX_WCHAR* m_pszIdent; FX_BOOL m_bIncrement; FX_BOOL m_bReset; int32_t m_iIncVal; int32_t m_iResetVal; -} FDE_CSSCOUNTERDATA, *FDE_LPCSSCOUNTERDATA; +}; + class CFDE_CSSCounterStyle { public: CFDE_CSSCounterStyle() : m_pCounterInc(NULL), m_pCounterReset(NULL) {} diff --git a/xfa/src/fdp/src/fde/fde_iterator.cpp b/xfa/src/fdp/src/fde/fde_iterator.cpp index 932fa58ec5..e3134eb679 100644 --- a/xfa/src/fdp/src/fde/fde_iterator.cpp +++ b/xfa/src/fdp/src/fde/fde_iterator.cpp @@ -38,7 +38,7 @@ FX_BOOL CFDE_VisualSetIterator::FilterObjects(FX_DWORD dwObjects) { if (dwObjects & FDE_VISUALOBJ_Widget) { m_dwFilter |= 0xFF00; } - FDE_LPCANVASITEM pCanvas = m_CanvasStack.GetTopElement(); + FDE_CANVASITEM* pCanvas = m_CanvasStack.GetTopElement(); FXSYS_assert(pCanvas != NULL && pCanvas->pCanvas != NULL); pCanvas->hPos = pCanvas->pCanvas->GetFirstPosition(NULL); return pCanvas->hPos != NULL; @@ -50,7 +50,7 @@ FDE_HVISUALOBJ CFDE_VisualSetIterator::GetNext(IFDE_VisualSet*& pVisualSet, FDE_HVISUALOBJ* phCanvasObj, IFDE_CanvasSet** ppCanvasSet) { while (m_CanvasStack.GetSize() > 0) { - FDE_LPCANVASITEM pCanvas = m_CanvasStack.GetTopElement(); + FDE_CANVASITEM* pCanvas = m_CanvasStack.GetTopElement(); FXSYS_assert(pCanvas != NULL && pCanvas->pCanvas != NULL); if (pCanvas->hPos == NULL) { if (m_CanvasStack.GetSize() == 1) { diff --git a/xfa/src/fdp/src/fde/fde_iterator.h b/xfa/src/fdp/src/fde/fde_iterator.h index 736bac0bee..52bfdbad6a 100644 --- a/xfa/src/fdp/src/fde/fde_iterator.h +++ b/xfa/src/fdp/src/fde/fde_iterator.h @@ -10,11 +10,12 @@ #include "xfa/src/fdp/include/fde_psr.h" #include "xfa/src/fgas/include/fx_mem.h" -typedef struct _FDE_CANVASITEM : public CFX_Target { +struct FDE_CANVASITEM : public CFX_Target { IFDE_CanvasSet* pCanvas; FDE_HVISUALOBJ hCanvas; FX_POSITION hPos; -} FDE_CANVASITEM, *FDE_LPCANVASITEM; +}; + class CFDE_VisualSetIterator : public IFDE_VisualSetIterator, public CFX_Target { public: diff --git a/xfa/src/fdp/src/xml/fde_xml_imp.cpp b/xfa/src/fdp/src/xml/fde_xml_imp.cpp index 6ce52a7c6d..941d06e74e 100644 --- a/xfa/src/fdp/src/xml/fde_xml_imp.cpp +++ b/xfa/src/fdp/src/xml/fde_xml_imp.cpp @@ -33,11 +33,13 @@ FX_BOOL FDE_IsXMLValidChar(FX_WCHAR ch) { FX_BOOL FDE_IsXMLWhiteSpace(FX_WCHAR ch) { return ch == L' ' || ch == 0x0A || ch == 0x0D || ch == 0x09; } -typedef struct _FDE_XMLNAMECHAR { + +struct FDE_XMLNAMECHAR { FX_WCHAR wStart; FX_WCHAR wEnd; FX_BOOL bStartChar; -} FDE_XMLNAMECHAR; +}; + #define FDE_XMLNAMECHARSNUM 20 static FDE_XMLNAMECHAR g_XMLNameChars[FDE_XMLNAMECHARSNUM] = { {L'-', L'.', FALSE}, {L'0', L'9', FALSE}, {L':', L':', FALSE}, @@ -48,6 +50,7 @@ static FDE_XMLNAMECHAR g_XMLNameChars[FDE_XMLNAMECHARSNUM] = { {0x2070, 0x218F, TRUE}, {0x2C00, 0x2FEF, TRUE}, {0x3001, 0xD7FF, TRUE}, {0xF900, 0xFDCF, TRUE}, {0xFDF0, 0xFFFD, TRUE}, }; + FX_BOOL FDE_IsXMLNameChar(FX_WCHAR ch, FX_BOOL bFirstChar) { int32_t iStart = 0, iEnd = FDE_XMLNAMECHARSNUM - 1, iMid; while (iStart <= iEnd) { @@ -886,7 +889,7 @@ void CFDE_XMLDoc::ReleaseParser() { FX_BOOL CFDE_XMLDoc::LoadXML(IFX_Stream* pXMLStream, int32_t iXMLPlaneSize, int32_t iTextDataSize, - FDE_LPXMLREADERHANDLER pHandler) { + FDE_XMLREADERHANDLER* pHandler) { if (pXMLStream == NULL) { return FALSE; } @@ -1200,7 +1203,7 @@ int32_t CFDE_XMLDOMParser::DoParser(IFX_Pause* pPause) { } return m_pParser->GetStatus(); } -CFDE_XMLSAXParser::CFDE_XMLSAXParser(FDE_LPXMLREADERHANDLER pHandler, +CFDE_XMLSAXParser::CFDE_XMLSAXParser(FDE_XMLREADERHANDLER* pHandler, IFDE_XMLSyntaxParser* pParser) : m_pHandler(pHandler), m_pParser(pParser), @@ -1720,7 +1723,7 @@ FX_DWORD CFDE_XMLSyntaxParser::DoSyntaxParse() { dwStatus = FDE_XMLSYNTAXSTATUS_TargetData; } else { m_pStart++; - FDE_LPXMLNODE pXMLNode = m_XMLNodeStack.GetTopElement(); + FDE_XMLNODE* pXMLNode = m_XMLNodeStack.GetTopElement(); if (pXMLNode == NULL) { m_dwStatus = FDE_XMLSYNTAXSTATUS_Error; return m_dwStatus; @@ -1755,7 +1758,7 @@ FX_DWORD CFDE_XMLSyntaxParser::DoSyntaxParse() { case FDE_XMLSYNTAXMODE_CloseElement: if (!FDE_IsXMLNameChar(ch, m_iDataLength < 1)) { if (ch == L'>') { - FDE_LPXMLNODE pXMLNode = m_XMLNodeStack.GetTopElement(); + FDE_XMLNODE* pXMLNode = m_XMLNodeStack.GetTopElement(); if (pXMLNode == NULL) { m_dwStatus = FDE_XMLSYNTAXSTATUS_Error; return m_dwStatus; diff --git a/xfa/src/fdp/src/xml/fde_xml_imp.h b/xfa/src/fdp/src/xml/fde_xml_imp.h index ce7d84d760..31711df9a5 100644 --- a/xfa/src/fdp/src/xml/fde_xml_imp.h +++ b/xfa/src/fdp/src/xml/fde_xml_imp.h @@ -168,7 +168,7 @@ class CFDE_XMLDoc : public CFX_Target { virtual FX_BOOL LoadXML(IFX_Stream* pXMLStream, int32_t iXMLPlaneSize = 8192, int32_t iTextDataSize = 256, - FDE_LPXMLREADERHANDLER pHandler = NULL); + FDE_XMLREADERHANDLER* pHandler = NULL); virtual FX_BOOL LoadXML(IFDE_XMLParser* pXMLParser); virtual int32_t DoLoad(IFX_Pause* pPause = NULL); virtual void CloseXML(); @@ -213,7 +213,7 @@ class CFDE_XMLTAG : public CFX_Target { typedef CFX_ObjectStackTemplate<CFDE_XMLTAG> CFDE_XMLTagStack; class CFDE_XMLSAXParser : public IFDE_XMLParser, public CFX_Target { public: - CFDE_XMLSAXParser(FDE_LPXMLREADERHANDLER pHandler, + CFDE_XMLSAXParser(FDE_XMLREADERHANDLER* pHandler, IFDE_XMLSyntaxParser* pParser); ~CFDE_XMLSAXParser(); @@ -223,7 +223,7 @@ class CFDE_XMLSAXParser : public IFDE_XMLParser, public CFX_Target { private: void Push(const CFDE_XMLTAG& xmlTag); void Pop(); - FDE_LPXMLREADERHANDLER m_pHandler; + FDE_XMLREADERHANDLER* m_pHandler; IFDE_XMLSyntaxParser* m_pParser; CFDE_XMLTagStack m_TagStack; CFDE_XMLTAG* m_pTagTop; diff --git a/xfa/src/fee/include/ifde_txtedtengine.h b/xfa/src/fee/include/ifde_txtedtengine.h index 290d110ad6..bddad4c788 100644 --- a/xfa/src/fee/include/ifde_txtedtengine.h +++ b/xfa/src/fee/include/ifde_txtedtengine.h @@ -16,11 +16,13 @@ class IFDE_TxtEdtEngine; class IFDE_TxtEdtEventSink; class IFDE_TxtEdtParag; +typedef struct FDE_HTXTEDTFIND_ { void* pData; } * FDE_HTXTEDTFIND; + #define FDE_TXTEDT_FIND_FLAGS_Prev (0L << 0) #define FDE_TXTEDT_FIND_FLAGS_Next (1L << 0) #define FDE_TXTEDT_FIND_FLAGS_WholeWord (1L << 1) #define FDE_TXTEDT_FIND_FLAGS_NoCase (1L << 2) -typedef struct _FDE_HTXTEDTFIND { void* pData; } * FDE_HTXTEDTFIND; + #define FDE_TEXTEDITMODE_MultiLines (1L << 0) #define FDE_TEXTEDITMODE_AutoLineWrap (1L << 1) #define FDE_TEXTEDITMODE_ReadOnly (1L << 2) @@ -31,12 +33,14 @@ typedef struct _FDE_HTXTEDTFIND { void* pData; } * FDE_HTXTEDTFIND; #define FDE_TEXTEDITMODE_FIELD_AUTO (1L << 7) #define FDE_TEXTEDITMODE_Validate (1L << 8) #define FDE_TEXTEDITMODE_Password (1L << 9) + #define FDE_TEXTEDITALIGN_Left (0L << 0) #define FDE_TEXTEDITALIGN_Center (1L << 0) #define FDE_TEXTEDITALIGN_Right (2L << 0) #define FDE_TEXTEDITALIGN_Normal (1L << 3) #define FDE_TEXTEDITALIGN_Justified (1L << 4) #define FDE_TEXTEDITALIGN_Distributed (1L << 5) + #define FDE_TEXTEDITLAYOUT_DocVertical (1L << 0) #define FDE_TEXTEDITLAYOUT_CharVertial (1L << 1) #define FDE_TEXTEDITLAYOUT_LineReserve (1L << 2) @@ -46,6 +50,7 @@ typedef struct _FDE_HTXTEDTFIND { void* pData; } * FDE_HTXTEDTFIND; #define FDE_TEXTEDITLAYOUT_ArabicContext (1L << 6) #define FDE_TEXTEDITLAYOUT_ArabicShapes (1L << 7) #define FDE_TEXTEDITLAYOUT_LastLineHeight (1L << 8) + enum FDE_TXTEDTMOVECARET { MC_MoveNone = 0, MC_Left, diff --git a/xfa/src/fee/src/fee/fde_txtedtpage.cpp b/xfa/src/fee/src/fee/fde_txtedtpage.cpp index 78fb1b7e37..65cd2ab182 100644 --- a/xfa/src/fee/src/fee/fde_txtedtpage.cpp +++ b/xfa/src/fee/src/fee/fde_txtedtpage.cpp @@ -35,7 +35,7 @@ FX_BOOL CFDE_TxtEdtTextSet::GetMatrix(FDE_HVISUALOBJ hVisualObj, return FALSE; } FX_BOOL CFDE_TxtEdtTextSet::GetRect(FDE_HVISUALOBJ hVisualObj, CFX_RectF& rt) { - rt = ((FDE_LPTEXTEDITPIECE)(hVisualObj))->rtPiece; + rt = ((FDE_TEXTEDITPIECE*)(hVisualObj))->rtPiece; return TRUE; } FX_BOOL CFDE_TxtEdtTextSet::GetClip(FDE_HVISUALOBJ hVisualObj, CFX_RectF& rt) { @@ -43,7 +43,7 @@ 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; + FDE_TEXTEDITPIECE* pPiece = (FDE_TEXTEDITPIECE*)hText; FX_WCHAR* pBuffer = wsText.GetBuffer(pPiece->nCount); for (int32_t i = 0; i < pPiece->nCount; i++) { pBuffer[i] = m_pPage->GetChar((void*)hText, i); @@ -67,7 +67,7 @@ int32_t CFDE_TxtEdtTextSet::GetDisplayPos(FDE_HVISUALOBJ hText, if (hText == NULL) { return 0; } - FDE_LPTEXTEDITPIECE pPiece = (FDE_LPTEXTEDITPIECE)hText; + FDE_TEXTEDITPIECE* pPiece = (FDE_TEXTEDITPIECE*)hText; int32_t nLength = pPiece->nCount; if (nLength < 1) { return 0; @@ -101,7 +101,7 @@ int32_t CFDE_TxtEdtTextSet::GetCharRects_Impl(FDE_HVISUALOBJ hText, if (hText == NULL) { return 0; } - FDE_LPTEXTEDITPIECE pPiece = (FDE_LPTEXTEDITPIECE)hText; + FDE_TEXTEDITPIECE* pPiece = (FDE_TEXTEDITPIECE*)hText; CFDE_TxtEdtEngine* pEngine = (CFDE_TxtEdtEngine*)(m_pPage->GetEngine()); int32_t nLength = pPiece->nCount; if (nLength < 1) { @@ -188,7 +188,7 @@ int32_t CFDE_TxtEdtPage::GetCharRect(int32_t nIndex, } int32_t nCount = m_PieceMassArr.GetSize(); for (int32_t i = 0; i < nCount; i++) { - const FDE_LPTEXTEDITPIECE pPiece = m_PieceMassArr.GetPtrAt(i); + const FDE_TEXTEDITPIECE* pPiece = m_PieceMassArr.GetPtrAt(i); if (nIndex >= pPiece->nStart && nIndex < (pPiece->nStart + pPiece->nCount)) { CFX_RectFArray rectArr; @@ -217,7 +217,7 @@ int32_t CFDE_TxtEdtPage::GetCharIndex(const CFX_PointF& fPoint, FX_BOOL bInLine = FALSE; int32_t i = 0; for (i = 0; i < nCount; i++) { - const FDE_LPTEXTEDITPIECE pPiece = m_PieceMassArr.GetPtrAt(i); + const FDE_TEXTEDITPIECE* pPiece = m_PieceMassArr.GetPtrAt(i); if (!bInLine && (bVertical ? (pPiece->rtPiece.left <= ptF.x && pPiece->rtPiece.right() > ptF.x) : (pPiece->rtPiece.top <= ptF.y && @@ -239,7 +239,7 @@ int32_t CFDE_TxtEdtPage::GetCharIndex(const CFX_PointF& fPoint, } NormalizePt2Rect(ptF, rtLine, FDE_TXTEDT_TOLERANCE); int32_t nCaret = 0; - FDE_LPTEXTEDITPIECE pPiece = NULL; + FDE_TEXTEDITPIECE* pPiece = NULL; for (i = nBgn; i <= nEnd; i++) { pPiece = m_PieceMassArr.GetPtrAt(i); nCaret = m_nPageStart + pPiece->nStart; @@ -320,7 +320,7 @@ void CFDE_TxtEdtPage::CalcRangeRectArray(int32_t nStart, int32_t nEnd = nStart + nCount - 1; FX_BOOL bInRange = FALSE; for (int32_t i = 0; i < nPieceCount; i++) { - FDE_LPTEXTEDITPIECE piece = m_PieceMassArr.GetPtrAt(i); + FDE_TEXTEDITPIECE* piece = m_PieceMassArr.GetPtrAt(i); if (!bInRange) { if (nStart >= piece->nStart && nStart < (piece->nStart + piece->nCount)) { int32_t nRangeEnd = piece->nCount - 1; @@ -539,7 +539,7 @@ int32_t CFDE_TxtEdtPage::LoadPage(FX_LPCRECTF pClipBox, IFX_Pause* pPause) { FX_FLOAT fOffset = m_rtPageContents.left - fDelta; int32_t nCount = m_PieceMassArr.GetSize(); for (int32_t i = 0; i < nCount; i++) { - FDE_LPTEXTEDITPIECE pPiece = m_PieceMassArr.GetPtrAt(i); + FDE_TEXTEDITPIECE* pPiece = m_PieceMassArr.GetPtrAt(i); pPiece->rtPiece.Offset(-fOffset, 0.0f); } m_rtPageContents.Offset(-fOffset, 0.0f); @@ -548,7 +548,7 @@ int32_t CFDE_TxtEdtPage::LoadPage(FX_LPCRECTF pClipBox, IFX_Pause* pPause) { FDE_TEXTEDITLAYOUT_LastLineHeight) { m_rtPageContents.height -= pParams->fLineSpace - pParams->fFontSize; int32_t nCount = m_PieceMassArr.GetSize(); - FDE_LPTEXTEDITPIECE pPiece = m_PieceMassArr.GetPtrAt(nCount - 1); + FDE_TEXTEDITPIECE* pPiece = m_PieceMassArr.GetPtrAt(nCount - 1); pPiece->rtPiece.height = pParams->fFontSize; } pIter->Release(); @@ -615,7 +615,7 @@ FDE_HVISUALOBJ CFDE_TxtEdtPage::GetParentCanvas(FDE_HVISUALOBJ hCanvas, } FX_WCHAR CFDE_TxtEdtPage::GetChar(void* pIdentity, int32_t index) const { int32_t nIndex = - m_nPageStart + ((FDE_LPTEXTEDITPIECE)pIdentity)->nStart + index; + m_nPageStart + ((FDE_TEXTEDITPIECE*)pIdentity)->nStart + index; if (nIndex != m_pIter->GetAt()) { m_pIter->SetAt(nIndex); } @@ -625,7 +625,7 @@ FX_WCHAR CFDE_TxtEdtPage::GetChar(void* 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]; + m_pCharWidth[((FDE_TEXTEDITPIECE*)pIdentity)->nStart + index]; return nWidth; } void CFDE_TxtEdtPage::NormalizePt2Rect(CFX_PointF& ptF, diff --git a/xfa/src/fee/src/fee/fde_txtedtpage.h b/xfa/src/fee/src/fee/fde_txtedtpage.h index e27a284d63..0dc50d1b15 100644 --- a/xfa/src/fee/src/fee/fde_txtedtpage.h +++ b/xfa/src/fee/src/fee/fde_txtedtpage.h @@ -52,14 +52,16 @@ inline FDE_TXTEDT_CHARTYPE FDE_GetEditSelCharType(FX_WCHAR wChar) { return FDE_TXTEDT_CHARTYPE_Char; } } -typedef struct _FDE_TXTEDTPIECE { + +struct FDE_TEXTEDITPIECE { int32_t nStart; int32_t nCount; int32_t nBidiLevel; CFX_RectF rtPiece; FX_DWORD dwCharStyles; -} FDE_TEXTEDITPIECE, *FDE_LPTEXTEDITPIECE; +}; typedef CFX_MassArrayTemplate<FDE_TEXTEDITPIECE> CFDE_TXTEDTPieceMassArray; + class CFDE_TxtEdtTextSet : public IFDE_TextSet { public: CFDE_TxtEdtTextSet(CFDE_TxtEdtPage* pPage); |