October 2008 - Wine-Commits

Rob Shearman : jscript: Fix shift/reduce conflict caused by ArrayLiteral.
by Alexandre Julliard Oct. 14, 2008

Oct. 14, 2008

Module: wine Branch: master Commit: b06f8820723fce5074392f69d8b36690d0ce7957 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b06f8820723fce5074392f69d… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Mon Oct 13 23:35:34 2008 +0100 jscript: Fix shift/reduce conflict caused by ArrayLiteral. --- dlls/jscript/parser.y | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index 8f01028..565f08b 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -739,7 +739,7 @@ PrimaryExpression /* ECMA-262 3rd Edition 11.1.4 */ ArrayLiteral : '[' ']' { $$ = new_array_literal_expression(ctx, NULL, 0); } - | '[' Elision_opt ']' { $$ = new_array_literal_expression(ctx, NULL, $2+1); } + | '[' Elision ']' { $$ = new_array_literal_expression(ctx, NULL, $2+1); } | '[' ElementList ']' { $$ = new_array_literal_expression(ctx, $2, 0); } | '[' ElementList ',' Elision_opt ']' { $$ = new_array_literal_expression(ctx, $2, $4+1); }

1 0

Jacek Caban : jscript: Added Date.getTime() implementation.
by Alexandre Julliard Oct. 14, 2008

Oct. 14, 2008

Module: wine Branch: master Commit: 122198a24f06894115e3e6ed4d0b2207f14981e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=122198a24f06894115e3e6ed4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 13 16:28:09 2008 -0500 jscript: Added Date.getTime() implementation. --- dlls/jscript/date.c | 15 +++++++++++++-- dlls/jscript/tests/api.js | 6 ++++++ 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/date.c b/dlls/jscript/date.c index 8716751..0dac085 100644 --- a/dlls/jscript/date.c +++ b/dlls/jscript/date.c @@ -168,11 +168,22 @@ static HRESULT Date_toLocaleTimeString(DispatchEx *dispex, LCID lcid, WORD flags return E_NOTIMPL; } +/* ECMA-262 3rd Edition 15.9.5.9 */ static HRESULT Date_getTime(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + + if(!is_class(dispex, JSCLASS_DATE)) { + FIXME("throw TypeError\n"); + return E_FAIL; + } + + if(retv) { + DateInstance *date = (DateInstance*)dispex; + num_set_val(retv, date->time); + } + return S_OK; } static HRESULT Date_getFullYear(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 58847fa..42dc080 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -449,4 +449,10 @@ ok(testFuncToString.toString() === "function testFuncToString(x,y) {\n return ok("" + testFuncToString === "function testFuncToString(x,y) {\n return x+y;\n}", "'' + testFuncToString = " + testFuncToString); +var date = new Date(); + +date = new Date(100); +ok(date.getTime() === 100, "date.getTime() = " + date.getTime()); +ok(Date.prototype.getTime() === 0, "date.prototype.getTime() = " + Date.prototype.getTime()); + reportSuccess();

1 0

Jacek Caban : jscript: Added Date constructor implementation.
by Alexandre Julliard Oct. 14, 2008

Oct. 14, 2008

Module: wine Branch: master Commit: 9932f29e69a8c3fa4ffb598349cd603a98a7b075 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9932f29e69a8c3fa4ffb59834… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 13 16:28:00 2008 -0500 jscript: Added Date constructor implementation. --- dlls/jscript/date.c | 88 ++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 81 insertions(+), 7 deletions(-) diff --git a/dlls/jscript/date.c b/dlls/jscript/date.c index 3fee568..8716751 100644 --- a/dlls/jscript/date.c +++ b/dlls/jscript/date.c @@ -16,6 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <limits.h> +#include <math.h> + #include "jscript.h" #include "wine/debug.h" @@ -24,6 +27,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(jscript); typedef struct { DispatchEx dispex; + + /* ECMA-262 3rd Edition 15.9.1.1 */ + DOUBLE time; } DateInstance; static const WCHAR toStringW[] = {'t','o','S','t','r','i','n','g',0}; @@ -72,9 +78,17 @@ static const WCHAR setUTCMonthW[] = {'s','e','t','U','T','C','M','o','n','t','h' static const WCHAR setFullYearW[] = {'s','e','t','F','u','l','l','Y','e','a','r',0}; static const WCHAR setUTCFullYearW[] = {'s','e','t','U','T','C','F','u','l','l','Y','e','a','r',0}; -static inline HRESULT systime_to_time(const SYSTEMTIME *st, FILETIME *time) +/* ECMA-262 3rd Edition 15.9.1.14 */ +static inline DOUBLE time_clip(DOUBLE time) { - return SystemTimeToFileTime(st, time) ? S_OK : HRESULT_FROM_WIN32(GetLastError()); + /* FIXME: Handle inf */ + + if(8.64e15 < time || time < -8.64e15) { + FIXME("return NaN\n"); + return 0.0; + } + + return floor(time); } static HRESULT Date_toString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, @@ -448,7 +462,7 @@ static const builtin_info_t Date_info = { NULL }; -static HRESULT create_date(script_ctx_t *ctx, BOOL use_constr, DispatchEx **ret) +static HRESULT create_date(script_ctx_t *ctx, BOOL use_constr, DOUBLE time, DispatchEx **ret) { DateInstance *date; HRESULT hres; @@ -466,6 +480,8 @@ static HRESULT create_date(script_ctx_t *ctx, BOOL use_constr, DispatchEx **ret) return hres; } + date->time = time; + *ret = &date->dispex; return S_OK; } @@ -473,8 +489,67 @@ static HRESULT create_date(script_ctx_t *ctx, BOOL use_constr, DispatchEx **ret) static HRESULT DateConstr_value(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + DispatchEx *date; + HRESULT hres; + + TRACE("\n"); + + switch(flags) { + case DISPATCH_CONSTRUCT: + switch(arg_cnt(dp)) { + /* ECMA-262 3rd Edition 15.9.3.3 */ + case 0: { + FILETIME time; + + GetSystemTimeAsFileTime(&time); + + hres = create_date(dispex->ctx, TRUE, + floor((DOUBLE)(time.dwLowDateTime/1e6) + (DOUBLE)time.dwHighDateTime*((DOUBLE)UINT_MAX+1.0)/1.e6), + &date); + if(FAILED(hres)) + return hres; + break; + } + + /* ECMA-262 3rd Edition 15.9.3.2 */ + case 1: { + VARIANT prim, num; + + hres = to_primitive(dispex->ctx, get_arg(dp,0), ei, &prim); + if(FAILED(hres)) + return hres; + + if(V_VT(&prim) == VT_BSTR) { + FIXME("VT_BSTR not supported\n"); + return E_NOTIMPL; + } + + hres = to_number(dispex->ctx, &prim, ei, &num); + VariantClear(&prim); + if(FAILED(hres)) + return hres; + + hres = create_date(dispex->ctx, TRUE, time_clip(num_val(&num)), &date); + if(FAILED(hres)) + return hres; + break; + } + + default: + FIXME("unimplemented argcnt %d\n", arg_cnt(dp)); + return E_NOTIMPL; + } + + V_VT(retv) = VT_DISPATCH; + V_DISPATCH(retv) = (IDispatch*)_IDispatchEx_(date); + return S_OK; + + default: + FIXME("unimplemented flags %x\n", flags); + return E_NOTIMPL; + } + + return S_OK; } HRESULT create_date_constr(script_ctx_t *ctx, DispatchEx **ret) @@ -482,7 +557,7 @@ HRESULT create_date_constr(script_ctx_t *ctx, DispatchEx **ret) DispatchEx *date; HRESULT hres; - hres = create_date(ctx, FALSE, &date); + hres = create_date(ctx, FALSE, 0.0, &date); if(FAILED(hres)) return hres; @@ -491,4 +566,3 @@ HRESULT create_date_constr(script_ctx_t *ctx, DispatchEx **ret) jsdisp_release(date); return hres; } -

1 0

Juan Lang : crypt32: Fix more test failures on Win9x.
by Alexandre Julliard Oct. 14, 2008

Oct. 14, 2008

Module: wine Branch: master Commit: 1bde692112ca984bc8f81f5cd679904759f82044 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bde692112ca984bc8f81f5cd… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Oct 13 14:00:30 2008 -0700 crypt32: Fix more test failures on Win9x. --- dlls/crypt32/tests/encode.c | 142 +++++++++++++++++++++++++++--------------- 1 files changed, 91 insertions(+), 51 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1bde692112ca984bc8f81…

1 0

Roderick Colenbrander : opengl32/tests: Don' t call wglGetProcAddress at the start of the test.
by Alexandre Julliard Oct. 14, 2008

Oct. 14, 2008

Module: wine Branch: master Commit: eb7f85f691b36969f527dd70db3fb7b4b7d1cd52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb7f85f691b36969f527dd70d… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Mon Oct 13 21:10:23 2008 +0200 opengl32/tests: Don't call wglGetProcAddress at the start of the test. --- dlls/opengl32/tests/opengl.c | 24 ++++++++++++++++-------- 1 files changed, 16 insertions(+), 8 deletions(-) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index b931999..8b5aa4a 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -541,14 +541,6 @@ START_TEST(opengl) 0, 0, 0 /* layer masks */ }; - init_functions(); - /* The lack of wglGetExtensionsStringARB in general means broken software rendering or the lack of decent OpenGL support, skip tests in such cases */ - if (!pwglGetExtensionsStringARB) - { - skip("wglGetExtensionsStringARB is not available\n"); - return; - } - hwnd = CreateWindow("static", "Title", WS_OVERLAPPEDWINDOW, 10, 10, 200, 200, NULL, NULL, NULL, NULL); ok(hwnd != NULL, "err: %d\n", GetLastError()); @@ -585,6 +577,22 @@ START_TEST(opengl) trace("OpenGL driver version: %s\n", glGetString(GL_VERSION)); trace("OpenGL vendor: %s\n", glGetString(GL_VENDOR)); } + else + { + skip("Skipping OpenGL tests without a current context\n"); + return; + } + + /* Initialisation of WGL functions depends on an implicit WGL context. For this reason we can't load them before making + * any WGL call :( On Wine this would work but not on real Windows because there can be different implementations (software, ICD, MCD). + */ + init_functions(); + /* The lack of wglGetExtensionsStringARB in general means broken software rendering or the lack of decent OpenGL support, skip tests in such cases */ + if (!pwglGetExtensionsStringARB) + { + skip("wglGetExtensionsStringARB is not available\n"); + return; + } test_makecurrent(hdc); test_setpixelformat(hdc);

1 0

Andrew Talbot : itss: Sign-compare warnings fix.
by Alexandre Julliard Oct. 14, 2008

Oct. 14, 2008

Module: wine Branch: master Commit: 763562d38367b3cbfdd8c17e6ba849b4fdbee5a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=763562d38367b3cbfdd8c17e6… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Oct 13 20:56:13 2008 +0100 itss: Sign-compare warnings fix. --- dlls/itss/itss.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/itss/itss.c b/dlls/itss/itss.c index 47756fa..0722efa 100644 --- a/dlls/itss/itss.c +++ b/dlls/itss/itss.c @@ -396,7 +396,7 @@ static HRESULT register_server(BOOL do_register) STRTABLEA strtable; STRENTRYA pse[4]; static CLSID const *clsids[4]; - int i = 0; + DWORD i = 0; static const WCHAR wszAdvpack[] = {'a','d','v','p','a','c','k','.','d','l','l',0};

1 0

Andrew Talbot : imm32: Sign-compare warnings fix.
by Alexandre Julliard Oct. 14, 2008

Oct. 14, 2008

Module: wine Branch: master Commit: 5b598f2ec498e464ccf7c29d8a070ca3e1bf066e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b598f2ec498e464ccf7c29d8… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Oct 13 20:56:09 2008 +0100 imm32: Sign-compare warnings fix. --- dlls/imm32/imm.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 2c9489a..5e820a2 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -2349,7 +2349,7 @@ DWORD WINAPI ImmGetImeMenuItemsA( HIMC hIMC, DWORD dwFlags, DWORD dwType, } if (lpImeMenu && rc) { - int i; + unsigned int i; for (i = 0; i < rc; i++) { memcpy(&lpImeMenu[i],&lpImeMenuW[1],sizeof(IMEMENUITEMINFOA)); @@ -2412,7 +2412,7 @@ DWORD WINAPI ImmGetImeMenuItemsW( HIMC hIMC, DWORD dwFlags, DWORD dwType, } if (lpImeMenu && rc) { - int i; + unsigned int i; for (i = 0; i < rc; i++) { memcpy(&lpImeMenu[i],&lpImeMenuA[1],sizeof(IMEMENUITEMINFOA)); @@ -2559,7 +2559,7 @@ BOOL WINAPI ImmGenerateMessage(HIMC hIMC) if (data->IMC.dwNumMsgBuf > 0) { LPTRANSMSG lpTransMsg; - INT i; + DWORD i; lpTransMsg = (LPTRANSMSG)ImmLockIMCC(data->IMC.hMsgBuf); for (i = 0; i < data->IMC.dwNumMsgBuf; i++) @@ -2586,7 +2586,7 @@ BOOL WINAPI ImmTranslateMessage(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lKeyD LPVOID list = 0; UINT msg_count; UINT uVirtKey; - static const int list_count = 10; + static const DWORD list_count = 10; TRACE("%p %x %x %x\n",hwnd, msg, (UINT)wParam, (UINT)lKeyData); @@ -2621,7 +2621,7 @@ BOOL WINAPI ImmTranslateMessage(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lKeyD TRACE("%i messages generated\n",msg_count); if (msg_count && msg_count <= list_count) { - int i; + UINT i; LPTRANSMSG msgs = (LPTRANSMSG)((LPBYTE)list + sizeof(DWORD)); for (i = 0; i < msg_count; i++)

1 0

Jacek Caban : mshtml: Added IOmNavigator::get_appVersion implementation.
by Alexandre Julliard Oct. 14, 2008

Oct. 14, 2008

Module: wine Branch: master Commit: c97d498f400e3c4ef780433b2783063a363c9a7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c97d498f400e3c4ef780433b2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 13 14:51:42 2008 -0500 mshtml: Added IOmNavigator::get_appVersion implementation. --- dlls/mshtml/omnavigator.c | 17 +++++++++++++++-- dlls/mshtml/tests/dom.c | 10 +++++++++- 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/omnavigator.c b/dlls/mshtml/omnavigator.c index 32bd9bf..9ea6df8 100644 --- a/dlls/mshtml/omnavigator.c +++ b/dlls/mshtml/omnavigator.c @@ -146,8 +146,21 @@ static HRESULT WINAPI OmNavigator_get_appName(IOmNavigator *iface, BSTR *p) static HRESULT WINAPI OmNavigator_get_appVersion(IOmNavigator *iface, BSTR *p) { OmNavigator *This = OMNAVIGATOR_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + /* FIXME: Should we return something smarter? */ + static const WCHAR app_verW[] = + {'4','.','0',' ','(','c','o','m','p','a','t','i','b','l','e',';', + ' ','M','S','I','E',' ','7','.','0',';', + ' ','W','i','n','d','o','w','s',' ','N','T',' ','5','.','1',';', + ' ','M','o','z','i','l','l','a','/','4','.','0',')',0}; + + TRACE("(%p)->(%p)\n", This, p); + + *p = SysAllocString(app_verW); + if(!*p) + return E_OUTOFMEMORY; + + return S_OK; } static HRESULT WINAPI OmNavigator_get_userAgent(IOmNavigator *iface, BSTR *p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index f2252a1..4388048 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2152,6 +2152,8 @@ static void test_navigator(IHTMLDocument2 *doc) BSTR bstr; HRESULT hres; + static const WCHAR v40[] = {'4','.','0'}; + hres = IHTMLDocument2_get_parentWindow(doc, &window); ok(hres == S_OK, "parentWidnow failed: %08x\n", hres); @@ -2174,10 +2176,16 @@ static void test_navigator(IHTMLDocument2 *doc) bstr = NULL; hres = IOmNavigator_get_platform(navigator, &bstr); - ok(hres == S_OK, "get_appMinorVersion failed: %08x\n", hres); + ok(hres == S_OK, "get_platform failed: %08x\n", hres); ok(!strcmp_wa(bstr, "Win32"), "unexpected platform %s\n", dbgstr_w(bstr)); SysFreeString(bstr); + bstr = NULL; + hres = IOmNavigator_get_appVersion(navigator, &bstr); + ok(hres == S_OK, "get_appVersion failed: %08x\n", hres); + ok(!memcmp(bstr, v40, sizeof(v40)), "appVersion is %s\n", dbgstr_w(bstr)); + SysFreeString(bstr); + ref = IOmNavigator_Release(navigator); ok(!ref, "navigator should be destroyed here\n"); }

1 0

Jacek Caban : mshtml: Use set_nsstyle_attr_var in IHTMLStyle:: put_left implementation.
by Alexandre Julliard Oct. 14, 2008

Oct. 14, 2008

Module: wine Branch: master Commit: 53d6b6616e93e7aaf6ac8a31f40b3742fbdec7fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=53d6b6616e93e7aaf6ac8a31f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 13 14:51:27 2008 -0500 mshtml: Use set_nsstyle_attr_var in IHTMLStyle::put_left implementation. --- dlls/mshtml/htmlstyle.c | 10 +--------- dlls/mshtml/tests/dom.c | 11 +++++++++++ 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index baa9cce..e90d723 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -1625,15 +1625,7 @@ static HRESULT WINAPI HTMLStyle_put_left(IHTMLStyle *iface, VARIANT v) TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); - switch(V_VT(&v)) { - case VT_BSTR: - return set_style_attr(This, STYLEID_LEFT, V_BSTR(&v), 0); - default: - FIXME("unimplemented vt %d\n", V_VT(&v)); - return E_NOTIMPL; - } - - return S_OK; + return set_nsstyle_attr_var(This->nsstyle, STYLEID_LEFT, &v, 0); } static HRESULT WINAPI HTMLStyle_get_left(IHTMLStyle *iface, VARIANT *p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index a3108d4..f2252a1 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2339,6 +2339,17 @@ static void test_default_style(IHTMLStyle *style) ok(!strcmp_wa(V_BSTR(&v), "3px"), "V_BSTR(v) = %s\n", dbgstr_w(V_BSTR(&v))); VariantClear(&v); + V_VT(&v) = VT_NULL; + hres = IHTMLStyle_put_left(style, v); + ok(hres == S_OK, "put_left failed: %08x\n", hres); + + V_VT(&v) = VT_EMPTY; + hres = IHTMLStyle_get_left(style, &v); + ok(hres == S_OK, "get_left failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(v)=%d\n", V_VT(&v)); + ok(!V_BSTR(&v), "V_BSTR(v) != NULL\n"); + VariantClear(&v); + V_VT(&v) = VT_EMPTY; hres = IHTMLStyle_get_top(style, &v); ok(hres == S_OK, "get_top failed: %08x\n", hres);

1 0

Jacek Caban : mshtml: Added IHTMLStyle::put_top(VT_NULL) implementation.
by Alexandre Julliard Oct. 14, 2008

Oct. 14, 2008

Module: wine Branch: master Commit: 6cf4060aff60d0c6b9afbe612336563626285570 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cf4060aff60d0c6b9afbe612… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 13 14:51:18 2008 -0500 mshtml: Added IHTMLStyle::put_top(VT_NULL) implementation. --- dlls/mshtml/htmlstyle.c | 28 +++++++++++++++++++--------- dlls/mshtml/tests/dom.c | 11 +++++++++++ 2 files changed, 30 insertions(+), 9 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 8d6564d..baa9cce 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -221,6 +221,24 @@ HRESULT set_nsstyle_attr(nsIDOMCSSStyleDeclaration *nsstyle, styleid_t sid, LPCW return S_OK; } +static HRESULT set_nsstyle_attr_var(nsIDOMCSSStyleDeclaration *nsstyle, styleid_t sid, VARIANT *value, DWORD flags) +{ + switch(V_VT(value)) { + case VT_NULL: + return set_nsstyle_attr(nsstyle, sid, emptyW, flags); + + case VT_BSTR: + return set_nsstyle_attr(nsstyle, sid, V_BSTR(value), flags); + + default: + FIXME("not implemented vt %d\n", V_VT(value)); + return E_NOTIMPL; + + } + + return S_OK; +} + static inline HRESULT set_style_attr(HTMLStyle *This, styleid_t sid, LPCWSTR value, DWORD flags) { return set_nsstyle_attr(This->nsstyle, sid, value, flags); @@ -1581,15 +1599,7 @@ static HRESULT WINAPI HTMLStyle_put_top(IHTMLStyle *iface, VARIANT v) TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); - switch(V_VT(&v)) { - case VT_BSTR: - return set_style_attr(This, STYLEID_TOP, V_BSTR(&v), 0); - default: - FIXME("unimplemented vt %d\n", V_VT(&v)); - return E_NOTIMPL; - } - - return S_OK; + return set_nsstyle_attr_var(This->nsstyle, STYLEID_TOP, &v, 0); } static HRESULT WINAPI HTMLStyle_get_top(IHTMLStyle *iface, VARIANT *p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 58b9594..a3108d4 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2359,6 +2359,17 @@ static void test_default_style(IHTMLStyle *style) ok(!strcmp_wa(V_BSTR(&v), "3px"), "V_BSTR(v) = %s\n", dbgstr_w(V_BSTR(&v))); VariantClear(&v); + V_VT(&v) = VT_NULL; + hres = IHTMLStyle_put_top(style, v); + ok(hres == S_OK, "put_top failed: %08x\n", hres); + + V_VT(&v) = VT_EMPTY; + hres = IHTMLStyle_get_top(style, &v); + ok(hres == S_OK, "get_top failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(v)=%d\n", V_VT(&v)); + ok(!V_BSTR(&v), "V_BSTR(v) != NULL\n"); + VariantClear(&v); + V_VT(&v) = VT_EMPTY; hres = IHTMLStyle_get_height(style, &v); ok(hres == S_OK, "get_height failed: %08x\n", hres);

1 0