Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
9d35d09e
Commit
9d35d09e
authored
Mar 26, 2019
by
Jacek Caban
Committed by
Alexandre Julliard
Mar 26, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mshtml: Use interface agnostic form of dispids for compat_dispid.
Signed-off-by:
Jacek Caban
<
jacek@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
edb4eca7
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
87 additions
and
87 deletions
+87
-87
htmlstyle.c
dlls/mshtml/htmlstyle.c
+87
-87
No files found.
dlls/mshtml/htmlstyle.c
View file @
9d35d09e
...
...
@@ -343,12 +343,12 @@ static const style_tbl_entry_t style_tbl[] = {
{
backgroundW
,
DISPID_IHTMLCSSSTYLEDECLARATION_BACKGROUND
,
DISPID_
IHTMLSTYLE
_BACKGROUND
DISPID_
A
_BACKGROUND
},
{
background_attachmentW
,
DISPID_IHTMLCSSSTYLEDECLARATION_BACKGROUNDATTACHMENT
,
DISPID_
IHTMLSTYLE
_BACKGROUNDATTACHMENT
DISPID_
A
_BACKGROUNDATTACHMENT
},
{
background_clipW
,
...
...
@@ -358,331 +358,331 @@ static const style_tbl_entry_t style_tbl[] = {
{
background_colorW
,
DISPID_IHTMLCSSSTYLEDECLARATION_BACKGROUNDCOLOR
,
DISPID_
IHTMLSTYLE_BACKGROUND
COLOR
,
DISPID_
BACK
COLOR
,
ATTR_HEX_INT
},
{
background_imageW
,
DISPID_IHTMLCSSSTYLEDECLARATION_BACKGROUNDIMAGE
,
DISPID_
IHTMLSTYLE
_BACKGROUNDIMAGE
,
DISPID_
A
_BACKGROUNDIMAGE
,
ATTR_FIX_URL
},
{
background_positionW
,
DISPID_IHTMLCSSSTYLEDECLARATION_BACKGROUNDPOSITION
,
DISPID_
IHTMLSTYLE
_BACKGROUNDPOSITION
DISPID_
A
_BACKGROUNDPOSITION
},
{
background_position_xW
,
DISPID_IHTMLCSSSTYLEDECLARATION_BACKGROUNDPOSITIONX
,
DISPID_
IHTMLSTYLE_BACKGROUNDPOSITION
X
,
DISPID_
A_BACKGROUNDPOS
X
,
ATTR_FIX_PX
},
{
background_position_yW
,
DISPID_IHTMLCSSSTYLEDECLARATION_BACKGROUNDPOSITIONY
,
DISPID_
IHTMLSTYLE_BACKGROUNDPOSITION
Y
,
DISPID_
A_BACKGROUNDPOS
Y
,
ATTR_FIX_PX
},
{
background_repeatW
,
DISPID_IHTMLCSSSTYLEDECLARATION_BACKGROUNDREPEAT
,
DISPID_
IHTMLSTYLE
_BACKGROUNDREPEAT
,
DISPID_
A
_BACKGROUNDREPEAT
,
0
,
background_repeat_values
},
{
borderW
,
DISPID_IHTMLCSSSTYLEDECLARATION_BORDER
,
DISPID_
IHTMLSTYLE
_BORDER
DISPID_
A
_BORDER
},
{
border_bottomW
,
DISPID_IHTMLCSSSTYLEDECLARATION_BORDERBOTTOM
,
DISPID_
IHTMLSTYLE
_BORDERBOTTOM
,
DISPID_
A
_BORDERBOTTOM
,
ATTR_FIX_PX
},
{
border_bottom_colorW
,
DISPID_IHTMLCSSSTYLEDECLARATION_BORDERBOTTOMCOLOR
,
DISPID_
IHTMLSTYLE
_BORDERBOTTOMCOLOR
,
DISPID_
A
_BORDERBOTTOMCOLOR
,
ATTR_HEX_INT
},
{
border_bottom_styleW
,
DISPID_IHTMLCSSSTYLEDECLARATION_BORDERBOTTOMSTYLE
,
DISPID_
IHTMLSTYLE
_BORDERBOTTOMSTYLE
,
DISPID_
A
_BORDERBOTTOMSTYLE
,
0
,
border_style_values
},
{
border_bottom_widthW
,
DISPID_IHTMLCSSSTYLEDECLARATION_BORDERBOTTOMWIDTH
,
DISPID_
IHTMLSTYLE
_BORDERBOTTOMWIDTH
,
DISPID_
A
_BORDERBOTTOMWIDTH
,
ATTR_FIX_PX
},
{
border_collapseW
,
DISPID_IHTMLCSSSTYLEDECLARATION_BORDERCOLLAPSE
,
DISPID_
IHTMLSTYLE2
_BORDERCOLLAPSE
DISPID_
A
_BORDERCOLLAPSE
},
{
border_colorW
,
DISPID_IHTMLCSSSTYLEDECLARATION_BORDERCOLOR
,
DISPID_
IHTMLSTYLE
_BORDERCOLOR
DISPID_
A
_BORDERCOLOR
},
{
border_leftW
,
DISPID_IHTMLCSSSTYLEDECLARATION_BORDERLEFT
,
DISPID_
IHTMLSTYLE
_BORDERLEFT
,
DISPID_
A
_BORDERLEFT
,
ATTR_FIX_PX
},
{
border_left_colorW
,
DISPID_IHTMLCSSSTYLEDECLARATION_BORDERLEFTCOLOR
,
DISPID_
IHTMLSTYLE
_BORDERLEFTCOLOR
,
DISPID_
A
_BORDERLEFTCOLOR
,
ATTR_HEX_INT
},
{
border_left_styleW
,
DISPID_IHTMLCSSSTYLEDECLARATION_BORDERLEFTSTYLE
,
DISPID_
IHTMLSTYLE
_BORDERLEFTSTYLE
,
DISPID_
A
_BORDERLEFTSTYLE
,
0
,
border_style_values
},
{
border_left_widthW
,
DISPID_IHTMLCSSSTYLEDECLARATION_BORDERLEFTWIDTH
,
DISPID_
IHTMLSTYLE
_BORDERLEFTWIDTH
,
DISPID_
A
_BORDERLEFTWIDTH
,
ATTR_FIX_PX
},
{
border_rightW
,
DISPID_IHTMLCSSSTYLEDECLARATION_BORDERRIGHT
,
DISPID_
IHTMLSTYLE
_BORDERRIGHT
,
DISPID_
A
_BORDERRIGHT
,
ATTR_FIX_PX
},
{
border_right_colorW
,
DISPID_IHTMLCSSSTYLEDECLARATION_BORDERRIGHTCOLOR
,
DISPID_
IHTMLSTYLE
_BORDERRIGHTCOLOR
,
DISPID_
A
_BORDERRIGHTCOLOR
,
ATTR_HEX_INT
},
{
border_right_styleW
,
DISPID_IHTMLCSSSTYLEDECLARATION_BORDERRIGHTSTYLE
,
DISPID_
IHTMLSTYLE
_BORDERRIGHTSTYLE
,
DISPID_
A
_BORDERRIGHTSTYLE
,
0
,
border_style_values
},
{
border_right_widthW
,
DISPID_IHTMLCSSSTYLEDECLARATION_BORDERRIGHTWIDTH
,
DISPID_
IHTMLSTYLE
_BORDERRIGHTWIDTH
,
DISPID_
A
_BORDERRIGHTWIDTH
,
ATTR_FIX_PX
},
{
border_spacingW
,
DISPID_IHTMLCSSSTYLEDECLARATION_BORDERSPACING
,
DISPID_
IHTMLSTYLE6
_BORDERSPACING
DISPID_
A
_BORDERSPACING
},
{
border_styleW
,
DISPID_IHTMLCSSSTYLEDECLARATION_BORDERSTYLE
,
DISPID_
IHTMLSTYLE
_BORDERSTYLE
DISPID_
A
_BORDERSTYLE
},
{
border_topW
,
DISPID_IHTMLCSSSTYLEDECLARATION_BORDERTOP
,
DISPID_
IHTMLSTYLE
_BORDERTOP
,
DISPID_
A
_BORDERTOP
,
ATTR_FIX_PX
},
{
border_top_colorW
,
DISPID_IHTMLCSSSTYLEDECLARATION_BORDERTOPCOLOR
,
DISPID_
IHTMLSTYLE
_BORDERTOPCOLOR
,
DISPID_
A
_BORDERTOPCOLOR
,
ATTR_HEX_INT
},
{
border_top_styleW
,
DISPID_IHTMLCSSSTYLEDECLARATION_BORDERTOPSTYLE
,
DISPID_
IHTMLSTYLE
_BORDERTOPSTYLE
,
DISPID_
A
_BORDERTOPSTYLE
,
0
,
border_style_values
},
{
border_top_widthW
,
DISPID_IHTMLCSSSTYLEDECLARATION_BORDERTOPWIDTH
,
DISPID_
IHTMLSTYLE
_BORDERTOPWIDTH
DISPID_
A
_BORDERTOPWIDTH
},
{
border_widthW
,
DISPID_IHTMLCSSSTYLEDECLARATION_BORDERWIDTH
,
DISPID_
IHTMLSTYLE
_BORDERWIDTH
DISPID_
A
_BORDERWIDTH
},
{
bottomW
,
DISPID_IHTMLCSSSTYLEDECLARATION_BOTTOM
,
DISPID_IHTMLSTYLE2
_BOTTOM
,
STDPROPID_XOBJ
_BOTTOM
,
ATTR_FIX_PX
},
{
box_sizingW
,
DISPID_IHTMLCSSSTYLEDECLARATION_BOXSIZING
,
DISPID_
IHTMLSTYLE6
_BOXSIZING
DISPID_
A
_BOXSIZING
},
{
clearW
,
DISPID_IHTMLCSSSTYLEDECLARATION_CLEAR
,
DISPID_
IHTMLSTYLE
_CLEAR
DISPID_
A
_CLEAR
},
{
clipW
,
DISPID_IHTMLCSSSTYLEDECLARATION_CLIP
,
DISPID_
IHTMLSTYLE
_CLIP
,
DISPID_
A
_CLIP
,
ATTR_REMOVE_COMMA
},
{
colorW
,
DISPID_IHTMLCSSSTYLEDECLARATION_COLOR
,
DISPID_
IHTMLSTYLE
_COLOR
,
DISPID_
A
_COLOR
,
ATTR_HEX_INT
},
{
cursorW
,
DISPID_IHTMLCSSSTYLEDECLARATION_CURSOR
,
DISPID_
IHTMLSTYLE
_CURSOR
DISPID_
A
_CURSOR
},
{
directionW
,
DISPID_IHTMLCSSSTYLEDECLARATION_DIRECTION
,
DISPID_
IHTMLSTYLE2
_DIRECTION
DISPID_
A
_DIRECTION
},
{
displayW
,
DISPID_IHTMLCSSSTYLEDECLARATION_DISPLAY
,
DISPID_
IHTMLSTYLE
_DISPLAY
DISPID_
A
_DISPLAY
},
{
filterW
,
DISPID_IHTMLCSSSTYLEDECLARATION_FILTER
,
DISPID_
IHTMLSTYLE
_FILTER
DISPID_
A
_FILTER
},
{
floatW
,
DISPID_IHTMLCSSSTYLEDECLARATION_CSSFLOAT
,
DISPID_
IHTMLSTYLE_STYLE
FLOAT
DISPID_
A_
FLOAT
},
{
font_familyW
,
DISPID_IHTMLCSSSTYLEDECLARATION_FONTFAMILY
,
DISPID_
IHTMLSTYLE_FONTFAMILY
DISPID_
A_FONTFACE
},
{
font_sizeW
,
DISPID_IHTMLCSSSTYLEDECLARATION_FONTSIZE
,
DISPID_
IHTMLSTYLE
_FONTSIZE
,
DISPID_
A
_FONTSIZE
,
ATTR_FIX_PX
},
{
font_styleW
,
DISPID_IHTMLCSSSTYLEDECLARATION_FONTSTYLE
,
DISPID_
IHTMLSTYLE
_FONTSTYLE
,
DISPID_
A
_FONTSTYLE
,
0
,
font_style_values
},
{
font_variantW
,
DISPID_IHTMLCSSSTYLEDECLARATION_FONTVARIANT
,
DISPID_
IHTMLSTYLE
_FONTVARIANT
,
DISPID_
A
_FONTVARIANT
,
0
,
font_variant_values
},
{
font_weightW
,
DISPID_IHTMLCSSSTYLEDECLARATION_FONTWEIGHT
,
DISPID_
IHTMLSTYLE
_FONTWEIGHT
,
DISPID_
A
_FONTWEIGHT
,
ATTR_STR_TO_INT
,
font_weight_values
},
{
heightW
,
DISPID_IHTMLCSSSTYLEDECLARATION_HEIGHT
,
DISPID_IHTMLSTYLE
_HEIGHT
,
STDPROPID_XOBJ
_HEIGHT
,
ATTR_FIX_PX
},
{
leftW
,
DISPID_IHTMLCSSSTYLEDECLARATION_LEFT
,
DISPID_IHTMLSTYLE
_LEFT
STDPROPID_XOBJ
_LEFT
},
{
letter_spacingW
,
DISPID_IHTMLCSSSTYLEDECLARATION_LETTERSPACING
,
DISPID_
IHTMLSTYLE
_LETTERSPACING
DISPID_
A
_LETTERSPACING
},
{
line_heightW
,
DISPID_IHTMLCSSSTYLEDECLARATION_LINEHEIGHT
,
DISPID_
IHTMLSTYLE
_LINEHEIGHT
DISPID_
A
_LINEHEIGHT
},
{
list_styleW
,
DISPID_IHTMLCSSSTYLEDECLARATION_LISTSTYLE
,
DISPID_
IHTMLSTYLE
_LISTSTYLE
DISPID_
A
_LISTSTYLE
},
{
list_style_positionW
,
DISPID_IHTMLCSSSTYLEDECLARATION_LISTSTYLEPOSITION
,
DISPID_
IHTMLSTYLE
_LISTSTYLEPOSITION
DISPID_
A
_LISTSTYLEPOSITION
},
{
list_style_typeW
,
DISPID_IHTMLCSSSTYLEDECLARATION_LISTSTYLETYPE
,
DISPID_
IHTMLSTYLE
_LISTSTYLETYPE
DISPID_
A
_LISTSTYLETYPE
},
{
marginW
,
DISPID_IHTMLCSSSTYLEDECLARATION_MARGIN
,
DISPID_
IHTMLSTYLE
_MARGIN
DISPID_
A
_MARGIN
},
{
margin_bottomW
,
DISPID_IHTMLCSSSTYLEDECLARATION_MARGINBOTTOM
,
DISPID_
IHTMLSTYLE
_MARGINBOTTOM
,
DISPID_
A
_MARGINBOTTOM
,
ATTR_FIX_PX
},
{
margin_leftW
,
DISPID_IHTMLCSSSTYLEDECLARATION_MARGINLEFT
,
DISPID_
IHTMLSTYLE
_MARGINLEFT
,
DISPID_
A
_MARGINLEFT
,
ATTR_FIX_PX
},
{
margin_rightW
,
DISPID_IHTMLCSSSTYLEDECLARATION_MARGINRIGHT
,
DISPID_
IHTMLSTYLE
_MARGINRIGHT
,
DISPID_
A
_MARGINRIGHT
,
ATTR_FIX_PX
},
{
margin_topW
,
DISPID_IHTMLCSSSTYLEDECLARATION_MARGINTOP
,
DISPID_
IHTMLSTYLE
_MARGINTOP
,
DISPID_
A
_MARGINTOP
,
ATTR_FIX_PX
},
{
max_heightW
,
DISPID_IHTMLCSSSTYLEDECLARATION_MAXHEIGHT
,
DISPID_
IHTMLSTYLE5
_MAXHEIGHT
,
DISPID_
A
_MAXHEIGHT
,
ATTR_FIX_PX
},
{
max_widthW
,
DISPID_IHTMLCSSSTYLEDECLARATION_MAXWIDTH
,
DISPID_
IHTMLSTYLE5
_MAXWIDTH
,
DISPID_
A
_MAXWIDTH
,
ATTR_FIX_PX
},
{
min_heightW
,
DISPID_IHTMLCSSSTYLEDECLARATION_MINHEIGHT
,
DISPID_
IHTMLSTYLE4
_MINHEIGHT
DISPID_
A
_MINHEIGHT
},
{
min_widthW
,
DISPID_IHTMLCSSSTYLEDECLARATION_MINWIDTH
,
DISPID_
IHTMLSTYLE5
_MINWIDTH
,
DISPID_
A
_MINWIDTH
,
ATTR_FIX_PX
},
{
...
...
@@ -693,142 +693,142 @@ static const style_tbl_entry_t style_tbl[] = {
{
outlineW
,
DISPID_IHTMLCSSSTYLEDECLARATION_OUTLINE
,
DISPID_
IHTMLSTYLE6
_OUTLINE
,
DISPID_
A
_OUTLINE
,
ATTR_NO_NULL
},
{
overflowW
,
DISPID_IHTMLCSSSTYLEDECLARATION_OVERFLOW
,
DISPID_
IHTMLSTYLE
_OVERFLOW
,
DISPID_
A
_OVERFLOW
,
0
,
overflow_values
},
{
overflow_xW
,
DISPID_IHTMLCSSSTYLEDECLARATION_OVERFLOWX
,
DISPID_
IHTMLSTYLE2
_OVERFLOWX
DISPID_
A
_OVERFLOWX
},
{
overflow_yW
,
DISPID_IHTMLCSSSTYLEDECLARATION_OVERFLOWY
,
DISPID_
IHTMLSTYLE2
_OVERFLOWY
DISPID_
A
_OVERFLOWY
},
{
paddingW
,
DISPID_IHTMLCSSSTYLEDECLARATION_PADDING
,
DISPID_
IHTMLSTYLE
_PADDING
DISPID_
A
_PADDING
},
{
padding_bottomW
,
DISPID_IHTMLCSSSTYLEDECLARATION_PADDINGBOTTOM
,
DISPID_
IHTMLSTYLE
_PADDINGBOTTOM
,
DISPID_
A
_PADDINGBOTTOM
,
ATTR_FIX_PX
},
{
padding_leftW
,
DISPID_IHTMLCSSSTYLEDECLARATION_PADDINGLEFT
,
DISPID_
IHTMLSTYLE
_PADDINGLEFT
,
DISPID_
A
_PADDINGLEFT
,
ATTR_FIX_PX
},
{
padding_rightW
,
DISPID_IHTMLCSSSTYLEDECLARATION_PADDINGRIGHT
,
DISPID_
IHTMLSTYLE
_PADDINGRIGHT
,
DISPID_
A
_PADDINGRIGHT
,
ATTR_FIX_PX
},
{
padding_topW
,
DISPID_IHTMLCSSSTYLEDECLARATION_PADDINGTOP
,
DISPID_
IHTMLSTYLE
_PADDINGTOP
,
DISPID_
A
_PADDINGTOP
,
ATTR_FIX_PX
},
{
page_break_afterW
,
DISPID_IHTMLCSSSTYLEDECLARATION_PAGEBREAKAFTER
,
DISPID_
IHTMLSTYLE
_PAGEBREAKAFTER
DISPID_
A
_PAGEBREAKAFTER
},
{
page_break_beforeW
,
DISPID_IHTMLCSSSTYLEDECLARATION_PAGEBREAKBEFORE
,
DISPID_
IHTMLSTYLE
_PAGEBREAKBEFORE
DISPID_
A
_PAGEBREAKBEFORE
},
{
positionW
,
DISPID_IHTMLCSSSTYLEDECLARATION_POSITION
,
DISPID_
IHTMLSTYLE2
_POSITION
DISPID_
A
_POSITION
},
{
rightW
,
DISPID_IHTMLCSSSTYLEDECLARATION_RIGHT
,
DISPID_IHTMLSTYLE2
_RIGHT
STDPROPID_XOBJ
_RIGHT
},
{
table_layoutW
,
DISPID_IHTMLCSSSTYLEDECLARATION_TABLELAYOUT
,
DISPID_
IHTMLSTYLE2
_TABLELAYOUT
DISPID_
A
_TABLELAYOUT
},
{
text_alignW
,
DISPID_IHTMLCSSSTYLEDECLARATION_TEXTALIGN
,
DISPID_IHTMLSTYLE_TEXT
ALIGN
STDPROPID_XOBJ_BLOCK
ALIGN
},
{
text_decorationW
,
DISPID_IHTMLCSSSTYLEDECLARATION_TEXTDECORATION
,
DISPID_
IHTMLSTYLE
_TEXTDECORATION
,
DISPID_
A
_TEXTDECORATION
,
0
,
text_decoration_values
},
{
text_indentW
,
DISPID_IHTMLCSSSTYLEDECLARATION_TEXTINDENT
,
DISPID_
IHTMLSTYLE
_TEXTINDENT
,
DISPID_
A
_TEXTINDENT
,
ATTR_FIX_PX
},
{
text_transformW
,
DISPID_IHTMLCSSSTYLEDECLARATION_TEXTTRANSFORM
,
DISPID_
IHTMLSTYLE
_TEXTTRANSFORM
DISPID_
A
_TEXTTRANSFORM
},
{
topW
,
DISPID_IHTMLCSSSTYLEDECLARATION_TOP
,
DISPID_IHTMLSTYLE
_TOP
STDPROPID_XOBJ
_TOP
},
{
vertical_alignW
,
DISPID_IHTMLCSSSTYLEDECLARATION_VERTICALALIGN
,
DISPID_
IHTMLSTYLE
_VERTICALALIGN
,
DISPID_
A
_VERTICALALIGN
,
ATTR_FIX_PX
},
{
visibilityW
,
DISPID_IHTMLCSSSTYLEDECLARATION_VISIBILITY
,
DISPID_
IHTMLSTYLE
_VISIBILITY
DISPID_
A
_VISIBILITY
},
{
white_spaceW
,
DISPID_IHTMLCSSSTYLEDECLARATION_WHITESPACE
,
DISPID_
IHTMLSTYLE
_WHITESPACE
DISPID_
A
_WHITESPACE
},
{
widthW
,
DISPID_IHTMLCSSSTYLEDECLARATION_WIDTH
,
DISPID_IHTMLSTYLE
_WIDTH
,
STDPROPID_XOBJ
_WIDTH
,
ATTR_FIX_PX
},
{
word_spacingW
,
DISPID_IHTMLCSSSTYLEDECLARATION_WORDSPACING
,
DISPID_
IHTMLSTYLE
_WORDSPACING
DISPID_
A
_WORDSPACING
},
{
word_wrapW
,
DISPID_IHTMLCSSSTYLEDECLARATION_WORDWRAP
,
DISPID_
IHTMLSTYLE3
_WORDWRAP
DISPID_
A
_WORDWRAP
},
{
z_indexW
,
DISPID_IHTMLCSSSTYLEDECLARATION_ZINDEX
,
DISPID_
IHTMLSTYLE
_ZINDEX
,
DISPID_
A
_ZINDEX
,
ATTR_STR_TO_INT
}
};
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment