[PATCH] mshtml: Use wide-char string literals in struct initialization.
Michael Stefaniuc
mstefani at winehq.org
Fri Oct 23 04:19:59 CDT 2020
Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>
---
dlls/mshtml/htmlbody.c | 49 ++---
dlls/mshtml/htmldoc.c | 41 +---
dlls/mshtml/htmlelem.c | 92 +++-----
dlls/mshtml/htmlevent.c | 136 ++++--------
dlls/mshtml/htmlstyle.c | 463 +++++++++++-----------------------------
5 files changed, 231 insertions(+), 550 deletions(-)
diff --git a/dlls/mshtml/htmlbody.c b/dlls/mshtml/htmlbody.c
index a49f8162c08..fddc4c6da0e 100644
--- a/dlls/mshtml/htmlbody.c
+++ b/dlls/mshtml/htmlbody.c
@@ -45,43 +45,26 @@ typedef struct {
nsIDOMHTMLBodyElement *nsbody;
} HTMLBodyElement;
-static const WCHAR aquaW[] = {'a','q','u','a',0};
-static const WCHAR blackW[] = {'b','l','a','c','k',0};
-static const WCHAR blueW[] = {'b','l','u','e',0};
-static const WCHAR fuchsiaW[] = {'f','u','s','h','s','i','a',0};
-static const WCHAR grayW[] = {'g','r','a','y',0};
-static const WCHAR greenW[] = {'g','r','e','e','n',0};
-static const WCHAR limeW[] = {'l','i','m','e',0};
-static const WCHAR maroonW[] = {'m','a','r','o','o','n',0};
-static const WCHAR navyW[] = {'n','a','v','y',0};
-static const WCHAR oliveW[] = {'o','l','i','v','e',0};
-static const WCHAR purpleW[] = {'p','u','r','p','l','e',0};
-static const WCHAR redW[] = {'r','e','d',0};
-static const WCHAR silverW[] = {'s','i','l','v','e','r',0};
-static const WCHAR tealW[] = {'t','e','a','l',0};
-static const WCHAR whiteW[] = {'w','h','i','t','e',0};
-static const WCHAR yellowW[] = {'y','e','l','l','o','w',0};
-
static const struct {
LPCWSTR keyword;
DWORD rgb;
} keyword_table[] = {
- {aquaW, 0x00ffff},
- {blackW, 0x000000},
- {blueW, 0x0000ff},
- {fuchsiaW, 0xff00ff},
- {grayW, 0x808080},
- {greenW, 0x008000},
- {limeW, 0x00ff00},
- {maroonW, 0x800000},
- {navyW, 0x000080},
- {oliveW, 0x808000},
- {purpleW, 0x800080},
- {redW, 0xff0000},
- {silverW, 0xc0c0c0},
- {tealW, 0x008080},
- {whiteW, 0xffffff},
- {yellowW, 0xffff00}
+ {L"aqua", 0x00ffff},
+ {L"black", 0x000000},
+ {L"blue", 0x0000ff},
+ {L"fushsia", 0xff00ff},
+ {L"gray", 0x808080},
+ {L"green", 0x008000},
+ {L"lime", 0x00ff00},
+ {L"maroon", 0x800000},
+ {L"navy", 0x000080},
+ {L"olive", 0x808000},
+ {L"purple", 0x800080},
+ {L"red", 0xff0000},
+ {L"silver", 0xc0c0c0},
+ {L"teal", 0x008080},
+ {L"white", 0xffffff},
+ {L"yellow", 0xffff00}
};
static int comp_value(const WCHAR *ptr, int dpc)
diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c
index 0fd039bfa60..5644d92dbe5 100644
--- a/dlls/mshtml/htmldoc.c
+++ b/dlls/mshtml/htmldoc.c
@@ -1185,41 +1185,20 @@ static HRESULT WINAPI HTMLDocument_clear(IHTMLDocument2 *iface)
return S_OK;
}
-static const WCHAR copyW[] =
- {'c','o','p','y',0};
-static const WCHAR cutW[] =
- {'c','u','t',0};
-static const WCHAR fontnameW[] =
- {'f','o','n','t','n','a','m','e',0};
-static const WCHAR fontsizeW[] =
- {'f','o','n','t','s','i','z','e',0};
-static const WCHAR indentW[] =
- {'i','n','d','e','n','t',0};
-static const WCHAR insertorderedlistW[] =
- {'i','n','s','e','r','t','o','r','d','e','r','e','d','l','i','s','t',0};
-static const WCHAR insertunorderedlistW[] =
- {'i','n','s','e','r','t','u','n','o','r','d','e','r','e','d','l','i','s','t',0};
-static const WCHAR outdentW[] =
- {'o','u','t','d','e','n','t',0};
-static const WCHAR pasteW[] =
- {'p','a','s','t','e',0};
-static const WCHAR respectvisibilityindesignW[] =
- {'r','e','s','p','e','c','t','v','i','s','i','b','i','l','i','t','y','i','n','d','e','s','i','g','n',0};
-
static const struct {
const WCHAR *name;
OLECMDID id;
}command_names[] = {
- {copyW, IDM_COPY},
- {cutW, IDM_CUT},
- {fontnameW, IDM_FONTNAME},
- {fontsizeW, IDM_FONTSIZE},
- {indentW, IDM_INDENT},
- {insertorderedlistW, IDM_ORDERLIST},
- {insertunorderedlistW, IDM_UNORDERLIST},
- {outdentW, IDM_OUTDENT},
- {pasteW, IDM_PASTE},
- {respectvisibilityindesignW, IDM_RESPECTVISIBILITY_INDESIGN}
+ {L"copy", IDM_COPY},
+ {L"cut", IDM_CUT},
+ {L"fontname", IDM_FONTNAME},
+ {L"fontsize", IDM_FONTSIZE},
+ {L"indent", IDM_INDENT},
+ {L"insertorderedlist", IDM_ORDERLIST},
+ {L"insertunorderedlist", IDM_UNORDERLIST},
+ {L"outdent", IDM_OUTDENT},
+ {L"paste", IDM_PASTE},
+ {L"respectvisibilityindesign", IDM_RESPECTVISIBILITY_INDESIGN}
};
static BOOL cmdid_from_string(const WCHAR *str, OLECMDID *cmdid)
diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c
index 6578ee75109..1dcddbaa672 100644
--- a/dlls/mshtml/htmlelem.c
+++ b/dlls/mshtml/htmlelem.c
@@ -38,32 +38,6 @@
WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
-static const WCHAR aW[] = {'A',0};
-static const WCHAR areaW[] = {'A','R','E','A',0};
-static const WCHAR bodyW[] = {'B','O','D','Y',0};
-static const WCHAR buttonW[] = {'B','U','T','T','O','N',0};
-static const WCHAR embedW[] = {'E','M','B','E','D',0};
-static const WCHAR formW[] = {'F','O','R','M',0};
-static const WCHAR frameW[] = {'F','R','A','M','E',0};
-static const WCHAR headW[] = {'H','E','A','D',0};
-static const WCHAR htmlW[] = {'H','T','M','L',0};
-static const WCHAR iframeW[] = {'I','F','R','A','M','E',0};
-static const WCHAR imgW[] = {'I','M','G',0};
-static const WCHAR inputW[] = {'I','N','P','U','T',0};
-static const WCHAR labelW[] = {'L','A','B','E','L',0};
-static const WCHAR linkW[] = {'L','I','N','K',0};
-static const WCHAR metaW[] = {'M','E','T','A',0};
-static const WCHAR objectW[] = {'O','B','J','E','C','T',0};
-static const WCHAR optionW[] = {'O','P','T','I','O','N',0};
-static const WCHAR scriptW[] = {'S','C','R','I','P','T',0};
-static const WCHAR selectW[] = {'S','E','L','E','C','T',0};
-static const WCHAR styleW[] = {'S','T','Y','L','E',0};
-static const WCHAR tableW[] = {'T','A','B','L','E',0};
-static const WCHAR tdW[] = {'T','D',0};
-static const WCHAR textareaW[] = {'T','E','X','T','A','R','E','A',0};
-static const WCHAR title_tagW[]= {'T','I','T','L','E',0};
-static const WCHAR trW[] = {'T','R',0};
-
#define ATTRFLAG_CASESENSITIVE 0x0001
#define ATTRFLAG_ASSTRING 0x0002
#define ATTRFLAG_EXPANDURL 0x0004
@@ -74,31 +48,31 @@ typedef struct {
} tag_desc_t;
static const tag_desc_t tag_descs[] = {
- {aW, HTMLAnchorElement_Create},
- {areaW, HTMLAreaElement_Create},
- {bodyW, HTMLBodyElement_Create},
- {buttonW, HTMLButtonElement_Create},
- {embedW, HTMLEmbedElement_Create},
- {formW, HTMLFormElement_Create},
- {frameW, HTMLFrameElement_Create},
- {headW, HTMLHeadElement_Create},
- {htmlW, HTMLHtmlElement_Create},
- {iframeW, HTMLIFrame_Create},
- {imgW, HTMLImgElement_Create},
- {inputW, HTMLInputElement_Create},
- {labelW, HTMLLabelElement_Create},
- {linkW, HTMLLinkElement_Create},
- {metaW, HTMLMetaElement_Create},
- {objectW, HTMLObjectElement_Create},
- {optionW, HTMLOptionElement_Create},
- {scriptW, HTMLScriptElement_Create},
- {selectW, HTMLSelectElement_Create},
- {styleW, HTMLStyleElement_Create},
- {tableW, HTMLTable_Create},
- {tdW, HTMLTableCell_Create},
- {textareaW, HTMLTextAreaElement_Create},
- {title_tagW, HTMLTitleElement_Create},
- {trW, HTMLTableRow_Create}
+ {L"A", HTMLAnchorElement_Create},
+ {L"AREA", HTMLAreaElement_Create},
+ {L"BODY", HTMLBodyElement_Create},
+ {L"BUTTON", HTMLButtonElement_Create},
+ {L"EMBED", HTMLEmbedElement_Create},
+ {L"FORM", HTMLFormElement_Create},
+ {L"FRAME", HTMLFrameElement_Create},
+ {L"HEAD", HTMLHeadElement_Create},
+ {L"HTML", HTMLHtmlElement_Create},
+ {L"IFRAME", HTMLIFrame_Create},
+ {L"IMG", HTMLImgElement_Create},
+ {L"INPUT", HTMLInputElement_Create},
+ {L"LABEL", HTMLLabelElement_Create},
+ {L"LINK", HTMLLinkElement_Create},
+ {L"META", HTMLMetaElement_Create},
+ {L"OBJECT", HTMLObjectElement_Create},
+ {L"OPTION", HTMLOptionElement_Create},
+ {L"SCRIPT", HTMLScriptElement_Create},
+ {L"SELECT", HTMLSelectElement_Create},
+ {L"STYLE", HTMLStyleElement_Create},
+ {L"TABLE", HTMLTable_Create},
+ {L"TD", HTMLTableCell_Create},
+ {L"TEXTAREA", HTMLTextAreaElement_Create},
+ {L"TITLE", HTMLTitleElement_Create},
+ {L"TR", HTMLTableRow_Create}
};
static const tag_desc_t *get_tag_desc(const WCHAR *tag_name)
@@ -230,18 +204,12 @@ HRESULT elem_string_attr_setter(HTMLElement *elem, const WCHAR *name, const WCHA
HRESULT get_readystate_string(READYSTATE readystate, BSTR *p)
{
- static const WCHAR uninitializedW[] = {'u','n','i','n','i','t','i','a','l','i','z','e','d',0};
- static const WCHAR loadingW[] = {'l','o','a','d','i','n','g',0};
- static const WCHAR loadedW[] = {'l','o','a','d','e','d',0};
- static const WCHAR interactiveW[] = {'i','n','t','e','r','a','c','t','i','v','e',0};
- static const WCHAR completeW[] = {'c','o','m','p','l','e','t','e',0};
-
static const LPCWSTR readystate_strs[] = {
- uninitializedW,
- loadingW,
- loadedW,
- interactiveW,
- completeW
+ L"uninitialized",
+ L"loading",
+ L"loaded",
+ L"interactive",
+ L"complete"
};
assert(readystate <= READYSTATE_COMPLETE);
diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c
index 4cf994587fc..0f041cbae6c 100644
--- a/dlls/mshtml/htmlevent.c
+++ b/dlls/mshtml/htmlevent.c
@@ -60,50 +60,6 @@ typedef enum {
DISPATCH_LEGACY
} dispatch_mode_t;
-static const WCHAR abortW[] = {'a','b','o','r','t',0};
-static const WCHAR beforeactivateW[] = {'b','e','f','o','r','e','a','c','t','i','v','a','t','e',0};
-static const WCHAR beforeunloadW[] = {'b','e','f','o','r','e','u','n','l','o','a','d',0};
-static const WCHAR blurW[] = {'b','l','u','r',0};
-static const WCHAR changeW[] = {'c','h','a','n','g','e',0};
-static const WCHAR clickW[] = {'c','l','i','c','k',0};
-static const WCHAR contextmenuW[] = {'c','o','n','t','e','x','t','m','e','n','u',0};
-static const WCHAR dataavailableW[] = {'d','a','t','a','a','v','a','i','l','a','b','l','e',0};
-static const WCHAR dblclickW[] = {'d','b','l','c','l','i','c','k',0};
-static const WCHAR dragW[] = {'d','r','a','g',0};
-static const WCHAR dragstartW[] = {'d','r','a','g','s','t','a','r','t',0};
-static const WCHAR errorW[] = {'e','r','r','o','r',0};
-static const WCHAR focusW[] = {'f','o','c','u','s',0};
-static const WCHAR focusinW[] = {'f','o','c','u','s','i','n',0};
-static const WCHAR focusoutW[] = {'f','o','c','u','s','o','u','t',0};
-static const WCHAR helpW[] = {'h','e','l','p',0};
-static const WCHAR inputW[] = {'i','n','p','u','t',0};
-static const WCHAR keydownW[] = {'k','e','y','d','o','w','n',0};
-static const WCHAR keypressW[] = {'k','e','y','p','r','e','s','s',0};
-static const WCHAR keyupW[] = {'k','e','y','u','p',0};
-static const WCHAR loadW[] = {'l','o','a','d',0};
-static const WCHAR messageW[] = {'m','e','s','s','a','g','e',0};
-static const WCHAR mousedownW[] = {'m','o','u','s','e','d','o','w','n',0};
-static const WCHAR mousemoveW[] = {'m','o','u','s','e','m','o','v','e',0};
-static const WCHAR mouseoutW[] = {'m','o','u','s','e','o','u','t',0};
-static const WCHAR mouseoverW[] = {'m','o','u','s','e','o','v','e','r',0};
-static const WCHAR mouseupW[] = {'m','o','u','s','e','u','p',0};
-static const WCHAR mousewheelW[] = {'m','o','u','s','e','w','h','e','e','l',0};
-static const WCHAR msthumbnailclickW[] = {'m','s','t','h','u','m','b','n','a','i','l','c','l','i','c','k',0};
-static const WCHAR pasteW[] = {'p','a','s','t','e',0};
-static const WCHAR readystatechangeW[] = {'r','e','a','d','y','s','t','a','t','e','c','h','a','n','g','e',0};
-static const WCHAR resizeW[] = {'r','e','s','i','z','e',0};
-static const WCHAR scrollW[] = {'s','c','r','o','l','l',0};
-static const WCHAR selectstartW[] = {'s','e','l','e','c','t','s','t','a','r','t',0};
-static const WCHAR selectionchangeW[] = {'s','e','l','e','c','t','i','o','n','c','h','a','n','g','e',0};
-static const WCHAR submitW[] = {'s','u','b','m','i','t',0};
-static const WCHAR unloadW[] = {'u','n','l','o','a','d',0};
-static const WCHAR DOMContentLoadedW[] = {'D','O','M','C','o','n','t','e','n','t','L','o','a','d','e','d',0};
-
-static const WCHAR EventW[] = {'E','v','e','n','t',0};
-static const WCHAR UIEventW[] = {'U','I','E','v','e','n','t',0};
-static const WCHAR KeyboardEventW[] = {'K','e','y','b','o','a','r','d','E','v','e','n','t',0};
-static const WCHAR MouseEventW[] = {'M','o','u','s','e','E','v','e','n','t',0};
-
typedef enum {
EVENT_TYPE_EVENT,
EVENT_TYPE_UIEVENT,
@@ -116,14 +72,14 @@ typedef enum {
} event_type_t;
static const WCHAR *event_types[] = {
- EventW,
- UIEventW,
- KeyboardEventW,
- MouseEventW,
- EventW, /* FIXME */
- EventW, /* FIXME */
- EventW, /* FIXME */
- EventW /* FIXME */
+ L"Event",
+ L"UIEvent",
+ L"KeyboardEvent",
+ L"MouseEvent",
+ L"Event", /* FIXME */
+ L"Event", /* FIXME */
+ L"Event", /* FIXME */
+ L"Event" /* FIXME */
};
typedef struct {
@@ -151,81 +107,81 @@ typedef struct {
#define EVENT_MOUSE_FROM_RELATED 0x0200
static const event_info_t event_info[] = {
- {abortW, EVENT_TYPE_EVENT, DISPID_EVMETH_ONABORT,
+ {L"abort", EVENT_TYPE_EVENT, DISPID_EVMETH_ONABORT,
EVENT_BIND_TO_TARGET},
- {beforeactivateW, EVENT_TYPE_EVENT, DISPID_EVMETH_ONBEFOREACTIVATE,
+ {L"beforeactivate", EVENT_TYPE_EVENT, DISPID_EVMETH_ONBEFOREACTIVATE,
EVENT_FIXME | EVENT_BUBBLES | EVENT_CANCELABLE},
- {beforeunloadW, EVENT_TYPE_EVENT, DISPID_EVMETH_ONBEFOREUNLOAD,
+ {L"beforeunload", EVENT_TYPE_EVENT, DISPID_EVMETH_ONBEFOREUNLOAD,
EVENT_DEFAULTLISTENER | EVENT_CANCELABLE },
- {blurW, EVENT_TYPE_FOCUS, DISPID_EVMETH_ONBLUR,
+ {L"blur", EVENT_TYPE_FOCUS, DISPID_EVMETH_ONBLUR,
EVENT_DEFAULTLISTENER},
- {changeW, EVENT_TYPE_EVENT, DISPID_EVMETH_ONCHANGE,
+ {L"change", EVENT_TYPE_EVENT, DISPID_EVMETH_ONCHANGE,
EVENT_DEFAULTLISTENER | EVENT_BUBBLES},
- {clickW, EVENT_TYPE_MOUSE, DISPID_EVMETH_ONCLICK,
+ {L"click", EVENT_TYPE_MOUSE, DISPID_EVMETH_ONCLICK,
EVENT_DEFAULTLISTENER | EVENT_HASDEFAULTHANDLERS | EVENT_BUBBLES | EVENT_CANCELABLE },
- {contextmenuW, EVENT_TYPE_MOUSE, DISPID_EVMETH_ONCONTEXTMENU,
+ {L"contextmenu", EVENT_TYPE_MOUSE, DISPID_EVMETH_ONCONTEXTMENU,
EVENT_BUBBLES | EVENT_CANCELABLE},
- {dataavailableW, EVENT_TYPE_EVENT, DISPID_EVMETH_ONDATAAVAILABLE,
+ {L"dataavailable", EVENT_TYPE_EVENT, DISPID_EVMETH_ONDATAAVAILABLE,
EVENT_FIXME | EVENT_BUBBLES},
- {dblclickW, EVENT_TYPE_MOUSE, DISPID_EVMETH_ONDBLCLICK,
+ {L"dblclick", EVENT_TYPE_MOUSE, DISPID_EVMETH_ONDBLCLICK,
EVENT_DEFAULTLISTENER | EVENT_BUBBLES | EVENT_CANCELABLE},
- {DOMContentLoadedW, EVENT_TYPE_EVENT, 0,
+ {L"DOMContentLoaded", EVENT_TYPE_EVENT, 0,
EVENT_DEFAULTLISTENER | EVENT_BUBBLES | EVENT_CANCELABLE},
- {dragW, EVENT_TYPE_DRAG, DISPID_EVMETH_ONDRAG,
+ {L"drag", EVENT_TYPE_DRAG, DISPID_EVMETH_ONDRAG,
EVENT_FIXME | EVENT_BUBBLES | EVENT_CANCELABLE},
- {dragstartW, EVENT_TYPE_DRAG, DISPID_EVMETH_ONDRAGSTART,
+ {L"dragstart", EVENT_TYPE_DRAG, DISPID_EVMETH_ONDRAGSTART,
EVENT_FIXME | EVENT_BUBBLES | EVENT_CANCELABLE},
- {errorW, EVENT_TYPE_EVENT, DISPID_EVMETH_ONERROR,
+ {L"error", EVENT_TYPE_EVENT, DISPID_EVMETH_ONERROR,
EVENT_BIND_TO_TARGET},
- {focusW, EVENT_TYPE_FOCUS, DISPID_EVMETH_ONFOCUS,
+ {L"focus", EVENT_TYPE_FOCUS, DISPID_EVMETH_ONFOCUS,
EVENT_DEFAULTLISTENER},
- {focusinW, EVENT_TYPE_FOCUS, DISPID_EVMETH_ONFOCUSIN,
+ {L"focusin", EVENT_TYPE_FOCUS, DISPID_EVMETH_ONFOCUSIN,
EVENT_BUBBLES},
- {focusoutW, EVENT_TYPE_FOCUS, DISPID_EVMETH_ONFOCUSOUT,
+ {L"focusout", EVENT_TYPE_FOCUS, DISPID_EVMETH_ONFOCUSOUT,
EVENT_BUBBLES},
- {helpW, EVENT_TYPE_EVENT, DISPID_EVMETH_ONHELP,
+ {L"help", EVENT_TYPE_EVENT, DISPID_EVMETH_ONHELP,
EVENT_BUBBLES | EVENT_CANCELABLE},
- {inputW, EVENT_TYPE_EVENT, DISPID_UNKNOWN,
+ {L"input", EVENT_TYPE_EVENT, DISPID_UNKNOWN,
EVENT_DEFAULTLISTENER | EVENT_BUBBLES},
- {keydownW, EVENT_TYPE_KEYBOARD, DISPID_EVMETH_ONKEYDOWN,
+ {L"keydown", EVENT_TYPE_KEYBOARD, DISPID_EVMETH_ONKEYDOWN,
EVENT_DEFAULTLISTENER | EVENT_HASDEFAULTHANDLERS | EVENT_BUBBLES | EVENT_CANCELABLE },
- {keypressW, EVENT_TYPE_KEYBOARD, DISPID_EVMETH_ONKEYPRESS,
+ {L"keypress", EVENT_TYPE_KEYBOARD, DISPID_EVMETH_ONKEYPRESS,
EVENT_DEFAULTLISTENER | EVENT_BUBBLES | EVENT_CANCELABLE},
- {keyupW, EVENT_TYPE_KEYBOARD, DISPID_EVMETH_ONKEYUP,
+ {L"keyup", EVENT_TYPE_KEYBOARD, DISPID_EVMETH_ONKEYUP,
EVENT_DEFAULTLISTENER | EVENT_BUBBLES | EVENT_CANCELABLE},
- {loadW, EVENT_TYPE_UIEVENT, DISPID_EVMETH_ONLOAD,
+ {L"load", EVENT_TYPE_UIEVENT, DISPID_EVMETH_ONLOAD,
EVENT_BIND_TO_TARGET},
- {messageW, EVENT_TYPE_MESSAGE, DISPID_EVMETH_ONMESSAGE,
+ {L"message", EVENT_TYPE_MESSAGE, DISPID_EVMETH_ONMESSAGE,
0},
- {mousedownW, EVENT_TYPE_MOUSE, DISPID_EVMETH_ONMOUSEDOWN,
+ {L"mousedown", EVENT_TYPE_MOUSE, DISPID_EVMETH_ONMOUSEDOWN,
EVENT_DEFAULTLISTENER | EVENT_BUBBLES | EVENT_CANCELABLE},
- {mousemoveW, EVENT_TYPE_MOUSE, DISPID_EVMETH_ONMOUSEMOVE,
+ {L"mousemove", EVENT_TYPE_MOUSE, DISPID_EVMETH_ONMOUSEMOVE,
EVENT_DEFAULTLISTENER | EVENT_BUBBLES | EVENT_CANCELABLE | EVENT_MOUSE_FROM_RELATED},
- {mouseoutW, EVENT_TYPE_MOUSE, DISPID_EVMETH_ONMOUSEOUT,
+ {L"mouseout", EVENT_TYPE_MOUSE, DISPID_EVMETH_ONMOUSEOUT,
EVENT_DEFAULTLISTENER | EVENT_BUBBLES | EVENT_CANCELABLE | EVENT_MOUSE_TO_RELATED},
- {mouseoverW, EVENT_TYPE_MOUSE, DISPID_EVMETH_ONMOUSEOVER,
+ {L"mouseover", EVENT_TYPE_MOUSE, DISPID_EVMETH_ONMOUSEOVER,
EVENT_DEFAULTLISTENER | EVENT_BUBBLES | EVENT_CANCELABLE | EVENT_MOUSE_FROM_RELATED},
- {mouseupW, EVENT_TYPE_MOUSE, DISPID_EVMETH_ONMOUSEUP,
+ {L"mouseup", EVENT_TYPE_MOUSE, DISPID_EVMETH_ONMOUSEUP,
EVENT_DEFAULTLISTENER | EVENT_BUBBLES | EVENT_CANCELABLE},
- {mousewheelW, EVENT_TYPE_MOUSE, DISPID_EVMETH_ONMOUSEWHEEL,
+ {L"mousewheel", EVENT_TYPE_MOUSE, DISPID_EVMETH_ONMOUSEWHEEL,
EVENT_FIXME},
- {msthumbnailclickW, EVENT_TYPE_MOUSE, DISPID_EVPROP_ONMSTHUMBNAILCLICK,
+ {L"msthumbnailclick", EVENT_TYPE_MOUSE, DISPID_EVPROP_ONMSTHUMBNAILCLICK,
EVENT_FIXME},
- {pasteW, EVENT_TYPE_CLIPBOARD, DISPID_EVMETH_ONPASTE,
+ {L"paste", EVENT_TYPE_CLIPBOARD, DISPID_EVMETH_ONPASTE,
EVENT_FIXME | EVENT_BUBBLES | EVENT_CANCELABLE},
- {readystatechangeW, EVENT_TYPE_EVENT, DISPID_EVMETH_ONREADYSTATECHANGE,
+ {L"readystatechange", EVENT_TYPE_EVENT, DISPID_EVMETH_ONREADYSTATECHANGE,
0},
- {resizeW, EVENT_TYPE_UIEVENT, DISPID_EVMETH_ONRESIZE,
+ {L"resize", EVENT_TYPE_UIEVENT, DISPID_EVMETH_ONRESIZE,
EVENT_DEFAULTLISTENER},
- {scrollW, EVENT_TYPE_UIEVENT, DISPID_EVMETH_ONSCROLL,
+ {L"scroll", EVENT_TYPE_UIEVENT, DISPID_EVMETH_ONSCROLL,
EVENT_DEFAULTLISTENER | EVENT_BUBBLES /* FIXME: not for elements */},
- {selectionchangeW, EVENT_TYPE_EVENT, DISPID_EVMETH_ONSELECTIONCHANGE,
+ {L"selectionchange", EVENT_TYPE_EVENT, DISPID_EVMETH_ONSELECTIONCHANGE,
EVENT_FIXME},
- {selectstartW, EVENT_TYPE_EVENT, DISPID_EVMETH_ONSELECTSTART,
+ {L"selectstart", EVENT_TYPE_EVENT, DISPID_EVMETH_ONSELECTSTART,
EVENT_FIXME | EVENT_BUBBLES | EVENT_CANCELABLE},
- {submitW, EVENT_TYPE_EVENT, DISPID_EVMETH_ONSUBMIT,
+ {L"submit", EVENT_TYPE_EVENT, DISPID_EVMETH_ONSUBMIT,
EVENT_DEFAULTLISTENER | EVENT_HASDEFAULTHANDLERS | EVENT_BUBBLES | EVENT_CANCELABLE},
- {unloadW, EVENT_TYPE_UIEVENT, DISPID_EVMETH_ONUNLOAD,
+ {L"unload", EVENT_TYPE_UIEVENT, DISPID_EVMETH_ONUNLOAD,
EVENT_FIXME}
};
diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c
index 7128d2a58a5..dc5b136edb3 100644
--- a/dlls/mshtml/htmlstyle.c
+++ b/dlls/mshtml/htmlstyle.c
@@ -35,290 +35,85 @@
WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
-static const WCHAR backgroundW[] =
- {'b','a','c','k','g','r','o','u','n','d',0};
-static const WCHAR background_attachmentW[] =
- {'b','a','c','k','g','r','o','u','n','d','-','a','t','t','a','c','h','m','e','n','t',0};
-static const WCHAR background_clipW[] =
- {'b','a','c','k','g','r','o','u','n','d','-','c','l','i','p',0};
-static const WCHAR background_colorW[] =
- {'b','a','c','k','g','r','o','u','n','d','-','c','o','l','o','r',0};
-static const WCHAR background_imageW[] =
- {'b','a','c','k','g','r','o','u','n','d','-','i','m','a','g','e',0};
-static const WCHAR background_positionW[] =
- {'b','a','c','k','g','r','o','u','n','d','-','p','o','s','i','t','i','o','n',0};
-static const WCHAR background_position_xW[] =
- {'b','a','c','k','g','r','o','u','n','d','-','p','o','s','i','t','i','o','n','-','x',0};
-static const WCHAR background_position_yW[] =
- {'b','a','c','k','g','r','o','u','n','d','-','p','o','s','i','t','i','o','n','-','y',0};
-static const WCHAR background_repeatW[] =
- {'b','a','c','k','g','r','o','u','n','d','-','r','e','p','e','a','t',0};
-static const WCHAR borderW[] =
- {'b','o','r','d','e','r',0};
-static const WCHAR border_bottomW[] =
- {'b','o','r','d','e','r','-','b','o','t','t','o','m',0};
-static const WCHAR border_bottom_colorW[] =
- {'b','o','r','d','e','r','-','b','o','t','t','o','m','-','c','o','l','o','r',0};
-static const WCHAR border_bottom_styleW[] =
- {'b','o','r','d','e','r','-','b','o','t','t','o','m','-','s','t','y','l','e',0};
-static const WCHAR border_bottom_widthW[] =
- {'b','o','r','d','e','r','-','b','o','t','t','o','m','-','w','i','d','t','h',0};
-static const WCHAR border_collapseW[] =
- {'b','o','r','d','e','r','-','c','o','l','l','a','p','s','e',0};
-static const WCHAR border_colorW[] =
- {'b','o','r','d','e','r','-','c','o','l','o','r',0};
-static const WCHAR border_leftW[] =
- {'b','o','r','d','e','r','-','l','e','f','t',0};
-static const WCHAR border_left_colorW[] =
- {'b','o','r','d','e','r','-','l','e','f','t','-','c','o','l','o','r',0};
-static const WCHAR border_left_styleW[] =
- {'b','o','r','d','e','r','-','l','e','f','t','-','s','t','y','l','e',0};
-static const WCHAR border_left_widthW[] =
- {'b','o','r','d','e','r','-','l','e','f','t','-','w','i','d','t','h',0};
-static const WCHAR border_rightW[] =
- {'b','o','r','d','e','r','-','r','i','g','h','t',0};
-static const WCHAR border_right_colorW[] =
- {'b','o','r','d','e','r','-','r','i','g','h','t','-','c','o','l','o','r',0};
-static const WCHAR border_right_styleW[] =
- {'b','o','r','d','e','r','-','r','i','g','h','t','-','s','t','y','l','e',0};
-static const WCHAR border_right_widthW[] =
- {'b','o','r','d','e','r','-','r','i','g','h','t','-','w','i','d','t','h',0};
-static const WCHAR border_spacingW[] =
- {'b','o','r','d','e','r','-','s','p','a','c','i','n','g',0};
-static const WCHAR border_topW[] =
- {'b','o','r','d','e','r','-','t','o','p',0};
-static const WCHAR border_top_colorW[] =
- {'b','o','r','d','e','r','-','t','o','p','-','c','o','l','o','r',0};
-static const WCHAR border_styleW[] =
- {'b','o','r','d','e','r','-','s','t','y','l','e',0};
-static const WCHAR border_top_styleW[] =
- {'b','o','r','d','e','r','-','t','o','p','-','s','t','y','l','e',0};
-static const WCHAR border_top_widthW[] =
- {'b','o','r','d','e','r','-','t','o','p','-','w','i','d','t','h',0};
-static const WCHAR border_widthW[] =
- {'b','o','r','d','e','r','-','w','i','d','t','h',0};
-static const WCHAR bottomW[] =
- {'b','o','t','t','o','m',0};
-/* FIXME: Use unprefixed version (requires Gecko changes). */
-static const WCHAR box_sizingW[] =
- {'-','m','o','z','-','b','o','x','-','s','i','z','i','n','g',0};
-static const WCHAR clearW[] =
- {'c','l','e','a','r',0};
-static const WCHAR clipW[] =
- {'c','l','i','p',0};
-static const WCHAR colorW[] =
- {'c','o','l','o','r',0};
-static const WCHAR cursorW[] =
- {'c','u','r','s','o','r',0};
-static const WCHAR directionW[] =
- {'d','i','r','e','c','t','i','o','n',0};
-static const WCHAR displayW[] =
- {'d','i','s','p','l','a','y',0};
-static const WCHAR filterW[] =
- {'f','i','l','e','t','e','r',0};
-static const WCHAR floatW[] =
- {'f','l','o','a','t',0};
-static const WCHAR font_familyW[] =
- {'f','o','n','t','-','f','a','m','i','l','y',0};
-static const WCHAR font_sizeW[] =
- {'f','o','n','t','-','s','i','z','e',0};
-static const WCHAR font_styleW[] =
- {'f','o','n','t','-','s','t','y','l','e',0};
-static const WCHAR font_variantW[] =
- {'f','o','n','t','-','v','a','r','i','a','n','t',0};
-static const WCHAR font_weightW[] =
- {'f','o','n','t','-','w','e','i','g','h','t',0};
-static const WCHAR heightW[] =
- {'h','e','i','g','h','t',0};
-static const WCHAR leftW[] =
- {'l','e','f','t',0};
-static const WCHAR letter_spacingW[] =
- {'l','e','t','t','e','r','-','s','p','a','c','i','n','g',0};
-static const WCHAR line_heightW[] =
- {'l','i','n','e','-','h','e','i','g','h','t',0};
-static const WCHAR list_styleW[] =
- {'l','i','s','t','-','s','t','y','l','e',0};
-static const WCHAR list_style_typeW[] =
- {'l','i','s','t','-','s','t','y','l','e','-','t','y','p','e',0};
-static const WCHAR list_style_positionW[] =
- {'l','i','s','t','-','s','t','y','l','e','-','p','o','s','i','t','i','o','n',0};
-static const WCHAR marginW[] =
- {'m','a','r','g','i','n',0};
-static const WCHAR margin_bottomW[] =
- {'m','a','r','g','i','n','-','b','o','t','t','o','m',0};
-static const WCHAR margin_leftW[] =
- {'m','a','r','g','i','n','-','l','e','f','t',0};
-static const WCHAR margin_rightW[] =
- {'m','a','r','g','i','n','-','r','i','g','h','t',0};
-static const WCHAR margin_topW[] =
- {'m','a','r','g','i','n','-','t','o','p',0};
-static const WCHAR max_heightW[] =
- {'m','a','x','-','h','e','i','g','h','t',0};
-static const WCHAR max_widthW[] =
- {'m','a','x','-','w','i','d','t','h',0};
-static const WCHAR min_heightW[] =
- {'m','i','n','-','h','e','i','g','h','t',0};
-static const WCHAR min_widthW[] =
- {'m','i','n','-','w','i','d','t','h',0};
-static const WCHAR opacityW[] =
- {'o','p','a','c','i','t','y',0};
-static const WCHAR outlineW[] =
- {'o','u','t','l','i','n','e',0};
-static const WCHAR overflowW[] =
- {'o','v','e','r','f','l','o','w',0};
-static const WCHAR overflow_xW[] =
- {'o','v','e','r','f','l','o','w','-','x',0};
-static const WCHAR overflow_yW[] =
- {'o','v','e','r','f','l','o','w','-','y',0};
-static const WCHAR paddingW[] =
- {'p','a','d','d','i','n','g',0};
-static const WCHAR padding_bottomW[] =
- {'p','a','d','d','i','n','g','-','b','o','t','t','o','m',0};
-static const WCHAR padding_leftW[] =
- {'p','a','d','d','i','n','g','-','l','e','f','t',0};
-static const WCHAR padding_rightW[] =
- {'p','a','d','d','i','n','g','-','r','i','g','h','t',0};
-static const WCHAR padding_topW[] =
- {'p','a','d','d','i','n','g','-','t','o','p',0};
-static const WCHAR page_break_afterW[] =
- {'p','a','g','e','-','b','r','e','a','k','-','a','f','t','e','r',0};
-static const WCHAR page_break_beforeW[] =
- {'p','a','g','e','-','b','r','e','a','k','-','b','e','f','o','r','e',0};
-static const WCHAR positionW[] =
- {'p','o','s','i','t','i','o','n',0};
-static const WCHAR rightW[] =
- {'r','i','g','h','t',0};
-static const WCHAR table_layoutW[] =
- {'t','a','b','l','e','-','l','a','y','o','u','t',0};
-static const WCHAR text_alignW[] =
- {'t','e','x','t','-','a','l','i','g','n',0};
-static const WCHAR text_decorationW[] =
- {'t','e','x','t','-','d','e','c','o','r','a','t','i','o','n',0};
-static const WCHAR text_indentW[] =
- {'t','e','x','t','-','i','n','d','e','n','t',0};
-static const WCHAR text_transformW[] =
- {'t','e','x','t','-','t','r','a','n','s','f','o','r','m',0};
-static const WCHAR topW[] =
- {'t','o','p',0};
-static const WCHAR vertical_alignW[] =
- {'v','e','r','t','i','c','a','l','-','a','l','i','g','n',0};
-static const WCHAR visibilityW[] =
- {'v','i','s','i','b','i','l','i','t','y',0};
-static const WCHAR white_spaceW[] =
- {'w','h','i','t','e','-','s','p','a','c','e',0};
-static const WCHAR widthW[] =
- {'w','i','d','t','h',0};
-static const WCHAR word_spacingW[] =
- {'w','o','r','d','-','s','p','a','c','i','n','g',0};
-static const WCHAR word_wrapW[] =
- {'w','o','r','d','-','w','r','a','p',0};
-static const WCHAR z_indexW[] =
- {'z','-','i','n','d','e','x',0};
-
-static const WCHAR autoW[] = {'a','u','t','o',0};
static const WCHAR blinkW[] = {'b','l','i','n','k',0};
-static const WCHAR boldW[] = {'b','o','l','d',0};
-static const WCHAR bolderW[] = {'b','o','l','d','e','r',0};
-static const WCHAR capsW[] = {'s','m','a','l','l','-','c','a','p','s',0};
static const WCHAR dashedW[] = {'d','a','s','h','e','d',0};
static const WCHAR dottedW[] = {'d','o','t','t','e','d',0};
static const WCHAR doubleW[] = {'d','o','u','b','l','e',0};
static const WCHAR grooveW[] = {'g','r','o','o','v','e',0};
-static const WCHAR hiddenW[] = {'h','i','d','d','e','n',0};
static const WCHAR insetW[] = {'i','n','s','e','t',0};
-static const WCHAR italicW[] = {'i','t','a','l','i','c',0};
-static const WCHAR lighterW[] = {'l','i','g','h','t','e','r',0};
static const WCHAR line_throughW[] = {'l','i','n','e','-','t','h','r','o','u','g','h',0};
-static const WCHAR no_repeatW[] = {'n','o','-','r','e','p','e','a','t',0};
static const WCHAR noneW[] = {'n','o','n','e',0};
-static const WCHAR normalW[] = {'n','o','r','m','a','l',0};
-static const WCHAR obliqueW[] = {'o','b','l','i','q','u','e',0};
static const WCHAR outsetW[] = {'o','u','t','s','e','t',0};
static const WCHAR overlineW[] = {'o','v','e','r','l','i','n','e',0};
-static const WCHAR repeatW[] = {'r','e','p','e','a','t',0};
-static const WCHAR repeat_xW[] = {'r','e','p','e','a','t','-','x',0};
-static const WCHAR repeat_yW[] = {'r','e','p','e','a','t','-','y',0};
static const WCHAR ridgeW[] = {'r','i','d','g','e',0};
-static const WCHAR scrollW[] = {'s','c','r','o','l','l',0};
static const WCHAR solidW[] = {'s','o','l','i','d',0};
static const WCHAR underlineW[] = {'u','n','d','e','r','l','i','n','e',0};
-static const WCHAR visibleW[] = {'v','i','s','i','b','l','e',0};
-
-static const WCHAR style100W[] = {'1','0','0',0};
-static const WCHAR style200W[] = {'2','0','0',0};
-static const WCHAR style300W[] = {'3','0','0',0};
-static const WCHAR style400W[] = {'4','0','0',0};
-static const WCHAR style500W[] = {'5','0','0',0};
-static const WCHAR style600W[] = {'6','0','0',0};
-static const WCHAR style700W[] = {'7','0','0',0};
-static const WCHAR style800W[] = {'8','0','0',0};
-static const WCHAR style900W[] = {'9','0','0',0};
static const WCHAR *font_style_values[] = {
- italicW,
- normalW,
- obliqueW,
+ L"italic",
+ L"normal",
+ L"oblique",
NULL
};
static const WCHAR *font_variant_values[] = {
- capsW,
- normalW,
+ L"small-caps",
+ L"normal",
NULL
};
static const WCHAR *font_weight_values[] = {
- style100W,
- style200W,
- style300W,
- style400W,
- style500W,
- style600W,
- style700W,
- style800W,
- style900W,
- boldW,
- bolderW,
- lighterW,
- normalW,
+ L"100",
+ L"200",
+ L"300",
+ L"400",
+ L"500",
+ L"600",
+ L"700",
+ L"800",
+ L"900",
+ L"bold",
+ L"bolder",
+ L"lighter",
+ L"normal",
NULL
};
static const WCHAR *background_repeat_values[] = {
- no_repeatW,
- repeatW,
- repeat_xW,
- repeat_yW,
+ L"no-repeat",
+ L"repeat",
+ L"repeat-x",
+ L"repeat-y",
NULL
};
static const WCHAR *text_decoration_values[] = {
- blinkW,
- line_throughW,
- noneW,
- overlineW,
- underlineW,
+ L"blink",
+ L"line-through",
+ L"none",
+ L"overline",
+ L"underline",
NULL
};
static const WCHAR *border_style_values[] = {
- dashedW,
- dottedW,
- doubleW,
- grooveW,
- insetW,
- noneW,
- outsetW,
- ridgeW,
- solidW,
+ L"dashed",
+ L"dotted",
+ L"double",
+ L"groove",
+ L"inset",
+ L"none",
+ L"outset",
+ L"ridge",
+ L"solid",
NULL
};
static const WCHAR *overflow_values[] = {
- autoW,
- hiddenW,
- scrollW,
- visibleW,
+ L"auto",
+ L"hidden",
+ L"scroll",
+ L"visible",
NULL
};
@@ -348,204 +143,204 @@ static const style_tbl_entry_t style_tbl[] = {
ATTR_COMPAT_IE10
},
{
- backgroundW,
+ L"background",
DISPID_IHTMLCSSSTYLEDECLARATION_BACKGROUND,
DISPID_A_BACKGROUND
},
{
- background_attachmentW,
+ L"background-attachment",
DISPID_IHTMLCSSSTYLEDECLARATION_BACKGROUNDATTACHMENT,
DISPID_A_BACKGROUNDATTACHMENT
},
{
- background_clipW,
+ L"background-clip",
DISPID_IHTMLCSSSTYLEDECLARATION_BACKGROUNDCLIP,
DISPID_UNKNOWN
},
{
- background_colorW,
+ L"background-color",
DISPID_IHTMLCSSSTYLEDECLARATION_BACKGROUNDCOLOR,
DISPID_BACKCOLOR,
ATTR_HEX_INT
},
{
- background_imageW,
+ L"background-image",
DISPID_IHTMLCSSSTYLEDECLARATION_BACKGROUNDIMAGE,
DISPID_A_BACKGROUNDIMAGE,
ATTR_FIX_URL
},
{
- background_positionW,
+ L"background-position",
DISPID_IHTMLCSSSTYLEDECLARATION_BACKGROUNDPOSITION,
DISPID_A_BACKGROUNDPOSITION
},
{
- background_position_xW,
+ L"background-position-x",
DISPID_IHTMLCSSSTYLEDECLARATION_BACKGROUNDPOSITIONX,
DISPID_A_BACKGROUNDPOSX,
ATTR_FIX_PX
},
{
- background_position_yW,
+ L"background-position-y",
DISPID_IHTMLCSSSTYLEDECLARATION_BACKGROUNDPOSITIONY,
DISPID_A_BACKGROUNDPOSY,
ATTR_FIX_PX
},
{
- background_repeatW,
+ L"background-repeat",
DISPID_IHTMLCSSSTYLEDECLARATION_BACKGROUNDREPEAT,
DISPID_A_BACKGROUNDREPEAT,
0, background_repeat_values
},
{
- borderW,
+ L"border",
DISPID_IHTMLCSSSTYLEDECLARATION_BORDER,
DISPID_A_BORDER
},
{
- border_bottomW,
+ L"border-bottom",
DISPID_IHTMLCSSSTYLEDECLARATION_BORDERBOTTOM,
DISPID_A_BORDERBOTTOM,
ATTR_FIX_PX
},
{
- border_bottom_colorW,
+ L"border-bottom-color",
DISPID_IHTMLCSSSTYLEDECLARATION_BORDERBOTTOMCOLOR,
DISPID_A_BORDERBOTTOMCOLOR,
ATTR_HEX_INT
},
{
- border_bottom_styleW,
+ L"border-bottom-style",
DISPID_IHTMLCSSSTYLEDECLARATION_BORDERBOTTOMSTYLE,
DISPID_A_BORDERBOTTOMSTYLE,
0, border_style_values
},
{
- border_bottom_widthW,
+ L"border-bottom-width",
DISPID_IHTMLCSSSTYLEDECLARATION_BORDERBOTTOMWIDTH,
DISPID_A_BORDERBOTTOMWIDTH,
ATTR_FIX_PX
},
{
- border_collapseW,
+ L"border-collapse",
DISPID_IHTMLCSSSTYLEDECLARATION_BORDERCOLLAPSE,
DISPID_A_BORDERCOLLAPSE
},
{
- border_colorW,
+ L"border-color",
DISPID_IHTMLCSSSTYLEDECLARATION_BORDERCOLOR,
DISPID_A_BORDERCOLOR
},
{
- border_leftW,
+ L"border-left",
DISPID_IHTMLCSSSTYLEDECLARATION_BORDERLEFT,
DISPID_A_BORDERLEFT,
ATTR_FIX_PX
},
{
- border_left_colorW,
+ L"border-left-color",
DISPID_IHTMLCSSSTYLEDECLARATION_BORDERLEFTCOLOR,
DISPID_A_BORDERLEFTCOLOR,
ATTR_HEX_INT
},
{
- border_left_styleW,
+ L"border-left-style",
DISPID_IHTMLCSSSTYLEDECLARATION_BORDERLEFTSTYLE,
DISPID_A_BORDERLEFTSTYLE,
0, border_style_values
},
{
- border_left_widthW,
+ L"border-left-width",
DISPID_IHTMLCSSSTYLEDECLARATION_BORDERLEFTWIDTH,
DISPID_A_BORDERLEFTWIDTH,
ATTR_FIX_PX
},
{
- border_rightW,
+ L"border-right",
DISPID_IHTMLCSSSTYLEDECLARATION_BORDERRIGHT,
DISPID_A_BORDERRIGHT,
ATTR_FIX_PX
},
{
- border_right_colorW,
+ L"border-right-color",
DISPID_IHTMLCSSSTYLEDECLARATION_BORDERRIGHTCOLOR,
DISPID_A_BORDERRIGHTCOLOR,
ATTR_HEX_INT
},
{
- border_right_styleW,
+ L"border-right-style",
DISPID_IHTMLCSSSTYLEDECLARATION_BORDERRIGHTSTYLE,
DISPID_A_BORDERRIGHTSTYLE,
0, border_style_values
},
{
- border_right_widthW,
+ L"border-right-width",
DISPID_IHTMLCSSSTYLEDECLARATION_BORDERRIGHTWIDTH,
DISPID_A_BORDERRIGHTWIDTH,
ATTR_FIX_PX
},
{
- border_spacingW,
+ L"border-spacing",
DISPID_IHTMLCSSSTYLEDECLARATION_BORDERSPACING,
DISPID_A_BORDERSPACING
},
{
- border_styleW,
+ L"border-style",
DISPID_IHTMLCSSSTYLEDECLARATION_BORDERSTYLE,
DISPID_A_BORDERSTYLE
},
{
- border_topW,
+ L"border-top",
DISPID_IHTMLCSSSTYLEDECLARATION_BORDERTOP,
DISPID_A_BORDERTOP,
ATTR_FIX_PX
},
{
- border_top_colorW,
+ L"border-top-color",
DISPID_IHTMLCSSSTYLEDECLARATION_BORDERTOPCOLOR,
DISPID_A_BORDERTOPCOLOR,
ATTR_HEX_INT
},
{
- border_top_styleW,
+ L"border-top-style",
DISPID_IHTMLCSSSTYLEDECLARATION_BORDERTOPSTYLE,
DISPID_A_BORDERTOPSTYLE,
0, border_style_values
},
{
- border_top_widthW,
+ L"border-top-width",
DISPID_IHTMLCSSSTYLEDECLARATION_BORDERTOPWIDTH,
DISPID_A_BORDERTOPWIDTH
},
{
- border_widthW,
+ L"border-width",
DISPID_IHTMLCSSSTYLEDECLARATION_BORDERWIDTH,
DISPID_A_BORDERWIDTH
},
{
- bottomW,
+ L"bottom",
DISPID_IHTMLCSSSTYLEDECLARATION_BOTTOM,
STDPROPID_XOBJ_BOTTOM,
ATTR_FIX_PX
},
{
- box_sizingW,
+ L"-moz-box-sizing",
DISPID_IHTMLCSSSTYLEDECLARATION_BOXSIZING,
DISPID_A_BOXSIZING
},
{
- clearW,
+ L"clear",
DISPID_IHTMLCSSSTYLEDECLARATION_CLEAR,
DISPID_A_CLEAR
},
{
- clipW,
+ L"clip",
DISPID_IHTMLCSSSTYLEDECLARATION_CLIP,
DISPID_A_CLIP,
ATTR_REMOVE_COMMA
},
{
- colorW,
+ L"color",
DISPID_IHTMLCSSSTYLEDECLARATION_COLOR,
DISPID_A_COLOR,
ATTR_HEX_INT
@@ -605,210 +400,210 @@ static const style_tbl_entry_t style_tbl[] = {
ATTR_COMPAT_IE10
},
{
- cursorW,
+ L"cursor",
DISPID_IHTMLCSSSTYLEDECLARATION_CURSOR,
DISPID_A_CURSOR
},
{
- directionW,
+ L"direction",
DISPID_IHTMLCSSSTYLEDECLARATION_DIRECTION,
DISPID_A_DIRECTION
},
{
- displayW,
+ L"display",
DISPID_IHTMLCSSSTYLEDECLARATION_DISPLAY,
DISPID_A_DISPLAY
},
{
- filterW,
+ L"fileter",
DISPID_IHTMLCSSSTYLEDECLARATION_FILTER,
DISPID_A_FILTER
},
{
- floatW,
+ L"float",
DISPID_IHTMLCSSSTYLEDECLARATION_CSSFLOAT,
DISPID_A_FLOAT
},
{
- font_familyW,
+ L"font-family",
DISPID_IHTMLCSSSTYLEDECLARATION_FONTFAMILY,
DISPID_A_FONTFACE
},
{
- font_sizeW,
+ L"font-size",
DISPID_IHTMLCSSSTYLEDECLARATION_FONTSIZE,
DISPID_A_FONTSIZE,
ATTR_FIX_PX
},
{
- font_styleW,
+ L"font-style",
DISPID_IHTMLCSSSTYLEDECLARATION_FONTSTYLE,
DISPID_A_FONTSTYLE,
0, font_style_values
},
{
- font_variantW,
+ L"font-variant",
DISPID_IHTMLCSSSTYLEDECLARATION_FONTVARIANT,
DISPID_A_FONTVARIANT,
0, font_variant_values
},
{
- font_weightW,
+ L"font-weight",
DISPID_IHTMLCSSSTYLEDECLARATION_FONTWEIGHT,
DISPID_A_FONTWEIGHT,
ATTR_STR_TO_INT, font_weight_values
},
{
- heightW,
+ L"height",
DISPID_IHTMLCSSSTYLEDECLARATION_HEIGHT,
STDPROPID_XOBJ_HEIGHT,
ATTR_FIX_PX
},
{
- leftW,
+ L"left",
DISPID_IHTMLCSSSTYLEDECLARATION_LEFT,
STDPROPID_XOBJ_LEFT
},
{
- letter_spacingW,
+ L"letter-spacing",
DISPID_IHTMLCSSSTYLEDECLARATION_LETTERSPACING,
DISPID_A_LETTERSPACING
},
{
- line_heightW,
+ L"line-height",
DISPID_IHTMLCSSSTYLEDECLARATION_LINEHEIGHT,
DISPID_A_LINEHEIGHT
},
{
- list_styleW,
+ L"list-style",
DISPID_IHTMLCSSSTYLEDECLARATION_LISTSTYLE,
DISPID_A_LISTSTYLE
},
{
- list_style_positionW,
+ L"list-style-position",
DISPID_IHTMLCSSSTYLEDECLARATION_LISTSTYLEPOSITION,
DISPID_A_LISTSTYLEPOSITION
},
{
- list_style_typeW,
+ L"list-style-type",
DISPID_IHTMLCSSSTYLEDECLARATION_LISTSTYLETYPE,
DISPID_A_LISTSTYLETYPE
},
{
- marginW,
+ L"margin",
DISPID_IHTMLCSSSTYLEDECLARATION_MARGIN,
DISPID_A_MARGIN
},
{
- margin_bottomW,
+ L"margin-bottom",
DISPID_IHTMLCSSSTYLEDECLARATION_MARGINBOTTOM,
DISPID_A_MARGINBOTTOM,
ATTR_FIX_PX
},
{
- margin_leftW,
+ L"margin-left",
DISPID_IHTMLCSSSTYLEDECLARATION_MARGINLEFT,
DISPID_A_MARGINLEFT,
ATTR_FIX_PX
},
{
- margin_rightW,
+ L"margin-right",
DISPID_IHTMLCSSSTYLEDECLARATION_MARGINRIGHT,
DISPID_A_MARGINRIGHT,
ATTR_FIX_PX
},
{
- margin_topW,
+ L"margin-top",
DISPID_IHTMLCSSSTYLEDECLARATION_MARGINTOP,
DISPID_A_MARGINTOP,
ATTR_FIX_PX
},
{
- max_heightW,
+ L"max-height",
DISPID_IHTMLCSSSTYLEDECLARATION_MAXHEIGHT,
DISPID_A_MAXHEIGHT,
ATTR_FIX_PX
},
{
- max_widthW,
+ L"max-width",
DISPID_IHTMLCSSSTYLEDECLARATION_MAXWIDTH,
DISPID_A_MAXWIDTH,
ATTR_FIX_PX
},
{
- min_heightW,
+ L"min-height",
DISPID_IHTMLCSSSTYLEDECLARATION_MINHEIGHT,
DISPID_A_MINHEIGHT
},
{
- min_widthW,
+ L"min-width",
DISPID_IHTMLCSSSTYLEDECLARATION_MINWIDTH,
DISPID_A_MINWIDTH,
ATTR_FIX_PX
},
{
- opacityW,
+ L"opacity",
DISPID_IHTMLCSSSTYLEDECLARATION_OPACITY,
DISPID_UNKNOWN
},
{
- outlineW,
+ L"outline",
DISPID_IHTMLCSSSTYLEDECLARATION_OUTLINE,
DISPID_A_OUTLINE,
ATTR_NO_NULL
},
{
- overflowW,
+ L"overflow",
DISPID_IHTMLCSSSTYLEDECLARATION_OVERFLOW,
DISPID_A_OVERFLOW,
0, overflow_values
},
{
- overflow_xW,
+ L"overflow-x",
DISPID_IHTMLCSSSTYLEDECLARATION_OVERFLOWX,
DISPID_A_OVERFLOWX
},
{
- overflow_yW,
+ L"overflow-y",
DISPID_IHTMLCSSSTYLEDECLARATION_OVERFLOWY,
DISPID_A_OVERFLOWY
},
{
- paddingW,
+ L"padding",
DISPID_IHTMLCSSSTYLEDECLARATION_PADDING,
DISPID_A_PADDING
},
{
- padding_bottomW,
+ L"padding-bottom",
DISPID_IHTMLCSSSTYLEDECLARATION_PADDINGBOTTOM,
DISPID_A_PADDINGBOTTOM,
ATTR_FIX_PX
},
{
- padding_leftW,
+ L"padding-left",
DISPID_IHTMLCSSSTYLEDECLARATION_PADDINGLEFT,
DISPID_A_PADDINGLEFT,
ATTR_FIX_PX
},
{
- padding_rightW,
+ L"padding-right",
DISPID_IHTMLCSSSTYLEDECLARATION_PADDINGRIGHT,
DISPID_A_PADDINGRIGHT,
ATTR_FIX_PX
},
{
- padding_topW,
+ L"padding-top",
DISPID_IHTMLCSSSTYLEDECLARATION_PADDINGTOP,
DISPID_A_PADDINGTOP,
ATTR_FIX_PX
},
{
- page_break_afterW,
+ L"page-break-after",
DISPID_IHTMLCSSSTYLEDECLARATION_PAGEBREAKAFTER,
DISPID_A_PAGEBREAKAFTER
},
{
- page_break_beforeW,
+ L"page-break-before",
DISPID_IHTMLCSSSTYLEDECLARATION_PAGEBREAKBEFORE,
DISPID_A_PAGEBREAKBEFORE
},
@@ -818,44 +613,44 @@ static const style_tbl_entry_t style_tbl[] = {
DISPID_UNKNOWN
},
{
- positionW,
+ L"position",
DISPID_IHTMLCSSSTYLEDECLARATION_POSITION,
DISPID_A_POSITION
},
{
- rightW,
+ L"right",
DISPID_IHTMLCSSSTYLEDECLARATION_RIGHT,
STDPROPID_XOBJ_RIGHT
},
{
- table_layoutW,
+ L"table-layout",
DISPID_IHTMLCSSSTYLEDECLARATION_TABLELAYOUT,
DISPID_A_TABLELAYOUT
},
{
- text_alignW,
+ L"text-align",
DISPID_IHTMLCSSSTYLEDECLARATION_TEXTALIGN,
STDPROPID_XOBJ_BLOCKALIGN
},
{
- text_decorationW,
+ L"text-decoration",
DISPID_IHTMLCSSSTYLEDECLARATION_TEXTDECORATION,
DISPID_A_TEXTDECORATION,
0, text_decoration_values
},
{
- text_indentW,
+ L"text-indent",
DISPID_IHTMLCSSSTYLEDECLARATION_TEXTINDENT,
DISPID_A_TEXTINDENT,
ATTR_FIX_PX
},
{
- text_transformW,
+ L"text-transform",
DISPID_IHTMLCSSSTYLEDECLARATION_TEXTTRANSFORM,
DISPID_A_TEXTTRANSFORM
},
{
- topW,
+ L"top",
DISPID_IHTMLCSSSTYLEDECLARATION_TOP,
STDPROPID_XOBJ_TOP
},
@@ -872,39 +667,39 @@ static const style_tbl_entry_t style_tbl[] = {
ATTR_COMPAT_IE10
},
{
- vertical_alignW,
+ L"vertical-align",
DISPID_IHTMLCSSSTYLEDECLARATION_VERTICALALIGN,
DISPID_A_VERTICALALIGN,
ATTR_FIX_PX
},
{
- visibilityW,
+ L"visibility",
DISPID_IHTMLCSSSTYLEDECLARATION_VISIBILITY,
DISPID_A_VISIBILITY
},
{
- white_spaceW,
+ L"white-space",
DISPID_IHTMLCSSSTYLEDECLARATION_WHITESPACE,
DISPID_A_WHITESPACE
},
{
- widthW,
+ L"width",
DISPID_IHTMLCSSSTYLEDECLARATION_WIDTH,
STDPROPID_XOBJ_WIDTH,
ATTR_FIX_PX
},
{
- word_spacingW,
+ L"word-spacing",
DISPID_IHTMLCSSSTYLEDECLARATION_WORDSPACING,
DISPID_A_WORDSPACING
},
{
- word_wrapW,
+ L"word-wrap",
DISPID_IHTMLCSSSTYLEDECLARATION_WORDWRAP,
DISPID_A_WORDWRAP
},
{
- z_indexW,
+ L"z-index",
DISPID_IHTMLCSSSTYLEDECLARATION_ZINDEX,
DISPID_A_ZINDEX,
ATTR_STR_TO_INT
--
2.25.4
More information about the wine-devel
mailing list