Commit Graph

282 Commits

Author SHA1 Message Date
Jacek Caban ab2bd77c08 mshtml: Use generic value checks for IHTMLStyle::put_fontVariant implementation.
Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-08-28 13:30:13 +02:00
Jacek Caban 4c59ce88fa mshtml: Support using array to check for allowed values and use it in IHTMLStyle::put_fontStyle implementation.
Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-08-28 13:30:09 +02:00
Jacek Caban a471f648ca mshtml: Pass style id instead of flags to var_to_styleval.
Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-08-27 15:16:46 +02:00
Jacek Caban 9f75fb0cef mshtml: Get rid of no longer needed argument in get_nsstyle_* implementation.
Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-08-27 15:16:46 +02:00
Jacek Caban 45e2ae4b74 mshtml: Introduce get_style_property_var helper and use it instead of get_nsstyle_attr_var in HTMLStyle implementation.
Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-08-27 15:16:45 +02:00
Jacek Caban c49d9d021f mshtml: Use get_style_property instead of get_nsstyle_attr in HTMLStyle object.
Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-08-27 15:16:45 +02:00
Jacek Caban 815370a841 mshtml: Rename get_style_attr to get_style_property.
Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-08-27 15:16:45 +02:00
Jacek Caban 5ea4f31861 mshtml: Refactor setting style property value implementation.
Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-08-27 15:16:45 +02:00
Jacek Caban d7e1b9c085 mshtml: Clean up set_style_property_var prototype.
Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-08-27 15:16:45 +02:00
Jacek Caban c5e54a1ea1 mshtml: Store style property flags in an array and use it in set_nsstyle_attr and get_nsstyle_attr_var.
Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-08-27 15:16:45 +02:00
Michael Stefaniuc 12b85004aa mshtml: Use the ARRAY_SIZE() macro.
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Jacek Caban<jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-08-24 10:28:28 +02:00
Jacek Caban fba6da7982 mshtml: Use nsIDOMElement instead of nsIDOMHTMLElement where possible.
Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-02-13 09:07:24 +01:00
Jacek Caban a0561068e3 mshtml: Return S_OK in IHTMLStyle2::put_behavior.
Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-11-28 19:08:32 +01:00
Jacek Caban eafbe884a2 mshtml: Use variant_bool helper where appropriate.
Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-11-02 19:12:08 +01:00
Jacek Caban d25684d5ae mshtml: Don't emulate legacy style filters in compatibility mode >= IE10.
Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-04-24 15:29:44 +02:00
Jacek Caban 1dedd90e8c mshtml: Added support for non-pixel style values in IHTMLStyle::get_pixel* functions.
Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-10-07 20:51:44 +02:00
Jacek Caban a6d35fdaa8 mshtml: Fixed leak in get_nsstyle_attr_nsval.
Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-10-06 21:27:45 +02:00
Nikolay Sivov 7846f0947a mshtml: Use proper constants as HRESULT return values.
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-09-14 22:24:58 +09:00
Jacek Caban fd2f645d16 mshtml: Moved dispex_data_t pointer to the end of dispex_static_data_t struct.
Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-07-06 11:53:45 +09:00
Francois Gouget 49ceec53c4 mshtml: Make some functions static.
Signed-off-by: Francois Gouget <fgouget@free.fr>
Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-22 23:51:31 +09:00
Jacek Caban f7597a6a1f mshtml: Merge htmlstyle3.c into htmlstyle.c.
Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-01-08 21:37:04 +09:00
Jacek Caban d223037034 mshtml: Merge htmlstyle2.c into htmlstyle.c.
Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-01-08 21:36:53 +09:00
Nikolay Sivov 8dd3f7d8c4 mshtml: Make it clear that ATTR_FIX_PX and ATTR_FIX_URL as exclusive (Coverity).
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2015-11-11 19:18:14 +09:00
Jacek Caban 76f7be04c7 mshtml: Added IHTMLStyle::styleFloat attribute implementation. 2014-12-15 19:16:54 +01:00
Jacek Caban 0bfe8b441a mshtml: Resolve duplicated IDispatch entries as soon as they are processed. 2014-12-15 13:40:18 +01:00
Jacek Caban 7eddb864b3 mshtml: Allow setting fontWeight to empty string. 2014-12-08 17:30:51 +01:00
Jacek Caban 5f913d5afb mshtml: Better removeAttribute implementation. 2014-11-28 17:05:58 +01:00
Chen Yuan 9c7b91336a mshtml: Add IHTMLStyle5::maxHeight property implementation. 2014-11-06 23:47:10 +09:00
Chen Yuan 94209192e7 mshtml: Add IHTMLStyle5::maxWidth property implementation. 2014-11-06 23:47:10 +09:00
Jactry Zeng e402bb5642 mshtml: Add IHTMLStyle::pixelTop property implementation. 2014-09-09 17:57:16 +02:00
Jactry Zeng 042b881b27 mshtml: Add IHTMLStyle::pixelHeight property implementation. 2014-09-09 17:57:12 +02:00
Jactry Zeng 7152077b05 mshtml: Add IHTMLStyle::get_pixelWidth implementation. 2014-09-09 17:57:09 +02:00
Jactry Zeng 387257dd2c mshtml: Return E_POINTER when p is NULL in get_nsstyle_pixel_val. 2014-09-09 17:57:00 +02:00
Jactry Zeng 47f26eb9c0 mshtml: Add IHTMLStyle5::minWidth property implementation. 2014-09-02 20:54:47 +02:00
Zhenbo Li bde260411c mshtml: Added IHTMLStyle::listStyle property implementation. 2014-08-21 18:02:26 +02:00
Zhenbo Li 87e1172953 mshtml: Added IHTMLStyle::backgroundAttachment property implementation. 2014-08-19 14:52:25 +02:00
Zhenbo Li 90014d154f mshtml: Added IHTMLStyle2::tableLayout property implementation. 2014-08-19 14:52:01 +02:00
Zhenbo Li bf463eae05 mshtml: Added IHTMLStyle::listStylePosition property implementation. 2014-08-11 23:55:32 +02:00
Zhenbo Li ed9b0f758a mshtml: Added IHTMLStyleElement::lineHeight property. 2014-08-11 23:55:29 +02:00
Zhenbo Li aa41321f49 mshtml: Added IHTMLStyle::textIndent property implementation. 2014-08-11 23:55:29 +02:00
Zhenbo Li b9f9a358e5 mshtml: Added IHTMLStyle:: textTransform property implementation. 2014-08-08 19:22:16 +02:00
Jacek Caban b54a9c662a mshtml: Use debugmsg_mshtml_guid in a few more places. 2014-05-12 13:51:30 +02:00
Jacek Caban 2010816240 mshtml: Added IHTMLStyle::listStyleType property implementation. 2014-03-24 13:58:03 +01:00
Jacek Caban ea24a5b1f4 mshtml: Added IHTMLBodyElement::scroll attribute implementation. 2013-11-11 17:06:47 +01:00
Jacek Caban 321c96574e mshtml: Added IHTMLStyle6::boxSizing property implementation. 2013-11-07 19:01:25 +01:00
Jacek Caban 6d13dd697c mshtml: Added IHTMLStyle6::outline property implementation. 2013-09-30 20:36:36 +02:00
Jacek Caban 7db2691e6f mshtml: Added IHTMLStyle::whiteSpace property implementation. 2013-08-28 20:23:46 +02:00
Jacek Caban b93e29f0ee mshtml: Added support for non-integer values in get_nsstyle_pixel_val. 2013-01-10 16:06:10 +01:00
Jacek Caban 64df55eb84 mshtml: Fixed leak in get_nsstyle_pos. 2013-01-07 17:37:53 +01:00
Jacek Caban 0f60681a5a mshtml: Added IHTMLStyle::put_pixelLeft implementation. 2013-01-07 17:37:47 +01:00
Jacek Caban 85368869e8 mshtml: Added IHTMLStyle::get_pixelLeft implementation. 2013-01-07 17:37:43 +01:00
Jacek Caban 10a832cc04 mshtml: Properly handle NULL value in set_nsstyle_attr. 2012-12-06 20:31:30 +01:00
Jacek Caban 04c97d08eb mshtml: Added IHTMLStyle::clear property implementation. 2012-10-23 17:29:10 +02:00
Jacek Caban d898f27af4 mshtml: Added IHTMLStyle::put_pixelWidth implementation. 2012-09-04 15:06:36 +02:00
Jacek Caban 9ccc5f487b mshtml: Added IHTMLElement2::get_runtimeStyle hackish implementation. 2012-07-25 16:11:21 +02:00
Jacek Caban 5b633c29b9 mshtml: Moved more logic to HTMLStyle_Create. 2012-07-25 16:11:21 +02:00
Jacek Caban b2f3144e0c mshtml: Added IHTMLStyle2::overflowY implementation. 2012-04-17 12:43:29 +02:00
Jacek Caban 5b99a4e880 mshtml: Added IHTMLStyle2::overflowX implementation. 2012-04-17 12:43:26 +02:00
Jacek Caban 0cad55aee9 mshtml: Added IHTMLStyle::removeAttribute implementation. 2012-04-16 17:49:26 +02:00
Jacek Caban a9c83385b5 mshtml: Moved style_tbl lookup to separated function. 2012-04-16 17:49:25 +02:00
Jacek Caban 6b0875a67e mshtml: Use helper for IHTMLStyle::put_zIndex implementation. 2012-04-04 17:49:03 +02:00
Jacek Caban 6e97e7e24c mshtml: Use helper for IHTMLStyle::get_left implementation. 2012-04-04 17:49:03 +02:00
Jacek Caban 73ed5b388a mshtml: Use helper for IHTMLStyle::get_top implementation. 2012-04-04 17:49:02 +02:00
Jacek Caban 9529fdb94f mshtml: Use helper for IHTMLStyle::get_height implementation. 2012-04-04 17:49:02 +02:00
Jacek Caban 3d2d9596fd mshtml: Use helpers for IHTMLStyle::put_verticalAlign property implementation. 2012-04-04 17:49:01 +02:00
Jacek Caban c6ada99b89 mshtml: Use better helper in IHTMLStyle::get_width implementation. 2012-03-30 15:36:25 +02:00
Jacek Caban 27555a52d8 mshtml: Use proper helpers in IHTMLStyle::backgroundColor implementation. 2012-03-30 15:36:23 +02:00
Jacek Caban 1cd6da2612 mshtml: Use proper helpers in IHTMLStyle::color implementation. 2012-03-30 15:36:20 +02:00
Jacek Caban 75dd422c2a mshtml: Use proper helpers to implement IHTMLSyle::fontSize property. 2012-03-30 15:36:16 +02:00
Jacek Caban 852a0d386f mshtml: Improved VARIANT debug traces in htmlstyle.c. 2012-03-28 14:55:54 +02:00
Jacek Caban 348338257b mshtml: Store filter in HTMLElement object. 2012-03-16 15:37:42 +01:00
Jacek Caban dec3a9c7b0 mshtml: Use helpers in IHTMLStyle::paddingLeft implementation. 2012-01-26 17:46:13 +01:00
Jacek Caban 9fc673f48e mshtml: Added IHTMLStyle::paddingBottom implementation. 2012-01-26 17:46:09 +01:00
Jacek Caban 2de64c8a26 mshtml: Added IHTMLStyle::paddingRight implementation. 2012-01-26 17:46:04 +01:00
Jacek Caban f015711822 mshtml: Added IHTMLStyle::paddingTop implementation. 2012-01-26 17:46:00 +01:00
Jacek Caban 7d18377ba4 mshtml: Use set_nsstyle_attr_var helper in IHTMLStyle::put_marginLeft implementation. 2012-01-26 17:45:55 +01:00
Jacek Caban 737dba7ae3 mshtml: Added IHTMLStyle::marginBottom property implementation. 2012-01-26 17:45:51 +01:00
Jacek Caban 1ea6529007 mshtml: Use ATTR_FIX_PX in IHTMLStyle::put_marginTop. 2012-01-26 17:45:47 +01:00
Jacek Caban 2858d44ed5 mshtml: Use set_nsstyle_attr_var helper in IHTMLStyle::put_marginRight. 2012-01-26 17:45:43 +01:00
Jacek Caban 6f9e67e0b4 mshtml: Use set_nsstyle_attr_var in IHTMLStyle::put_height implementation. 2011-11-14 15:25:19 +01:00
Piotr Caban 0a03ae75b0 mshtml: Populate dynamic properties table in get_dynamic_data. 2011-08-23 16:53:54 +02:00
Jacek Caban 7891fc45d3 mshtml: Removed duplicated includes. 2011-08-03 14:15:49 +02:00
Jacek Caban 256bd4532c mshtml: Added IDispatchEx support for IHTMLStyle5 and IHTMLStyle6 ifaces. 2011-07-28 18:37:40 +02:00
Jacek Caban e22b578366 mshtml: Added IHTMLSyle6 stub implementation. 2011-07-28 18:37:40 +02:00
Jacek Caban 8925638f9f mshtml: Added IHTMLStyle5 implementation. 2011-07-28 18:37:40 +02:00
Gerald Pfeifer 03cc8eea6f mshtml: Handle the failure case in get_nsstyle_attr. 2011-07-25 17:59:04 +02:00
Jacek Caban adf1310f4a mshtml: Added IHTMLStyle2::direction property implementation. 2011-07-22 13:03:28 +02:00
Jacek Caban 904f4ac843 mshtml: Added IHTMLStyle::pageBreakBefore implementation. 2011-07-21 16:27:31 +02:00
Jacek Caban dfaee0f3b1 mshtml: Added IHTMLStyle::pageBreakAfter property implementation. 2011-07-18 16:35:12 +02:00
Jacek Caban b7934f0ad1 mshtml: Added IHTMLStyle::clip property implementation. 2011-07-15 16:36:11 +02:00
Jacek Caban e063198046 mshtml: Pass flags to get_nsstyle_attr. 2011-07-15 16:36:08 +02:00
Jacek Caban 9257ab8a5c mshtml: Factor out getting style value string from Gecko value. 2011-07-15 16:36:06 +02:00
Jacek Caban f3d40454a9 mshtml: Added simple filter parser to support opacity. 2011-02-28 14:04:51 +01:00
Jacek Caban 1745abfa26 mshtml: Store style object in element object. 2011-02-28 14:04:49 +01:00
Jacek Caban 0131e0472f mshtml: Store style filter in HTMLStyle object. 2011-02-28 14:04:46 +01:00
Jacek Caban c7da163bf3 mshtml: Reimplement IHTMLStyle::get_backgroundPositionY using background-position property. 2011-02-25 15:03:33 +01:00
Jacek Caban 4cc3517107 mshtml: Reimplement IHTMLStyle::put_backgroundPositionY using background-position property. 2011-02-25 15:03:33 +01:00
Jacek Caban 2d333216ad mshtml: Reimplement IHTMLStyle::get_backgroundPositionX using background-position property. 2011-02-25 15:03:33 +01:00
Jacek Caban be29542f29 mshtml: Reimplement IHTMLStyle::put_backgroundPositionX using background-position property.
Current implementation can't work because backgroundPositionX is IE 
extension, not handled by Gecko.
2011-02-25 15:03:33 +01:00
Jacek Caban fa946c09ce mshtml: Moved VARIANT to style value string conversion to separated function. 2011-02-25 15:03:33 +01:00