February 2009 - Wine-commits

Rob Shearman : imm32: Lazily allocated thread-local data.
by Alexandre Julliard 24 Feb '09

24 Feb '09

Module: wine Branch: master Commit: e926c62c43984a7459f3d0ce1ec6104d348bf974 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e926c62c43984a7459f3d0ce1… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Tue Feb 24 14:52:57 2009 +0000 imm32: Lazily allocated thread-local data. --- dlls/imm32/imm.c | 25 ++++++++++--------------- 1 files changed, 10 insertions(+), 15 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 82868be..c7d170c 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -220,19 +220,15 @@ static DWORD convert_candidatelist_AtoW( static IMMThreadData* IMM_GetThreadData(void) { - return TlsGetValue(tlsIndex); -} - -static BOOL IMM_InitThreadData(void) -{ - IMMThreadData* data = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - sizeof(IMMThreadData)); - if (!data) return FALSE; - - TlsSetValue(tlsIndex,data); - - TRACE("Thread Data Created\n"); - return TRUE; + IMMThreadData* data = TlsGetValue(tlsIndex); + if (!data) + { + data = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + sizeof(IMMThreadData)); + TlsSetValue(tlsIndex,data); + TRACE("Thread Data Created\n"); + } + return data; } static void IMM_FreeThreadData(void) @@ -384,11 +380,10 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpReserved) case DLL_PROCESS_ATTACH: IMM_RegisterMessages(); tlsIndex = TlsAlloc(); - if (tlsIndex == TLS_OUT_OF_INDEXES || !IMM_InitThreadData()) + if (tlsIndex == TLS_OUT_OF_INDEXES) return FALSE; break; case DLL_THREAD_ATTACH: - IMM_InitThreadData(); break; case DLL_THREAD_DETACH: IMM_FreeThreadData();

1 0

Alistair Leslie-Hughes : mshtml: Implement IHTMLCurrentStyle_get_marginRight.
by Alexandre Julliard 24 Feb '09

24 Feb '09

Module: wine Branch: master Commit: fe0da5e5288b6409d6312ed34073d21875b32ec6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe0da5e5288b6409d6312ed34… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Feb 22 20:03:22 2009 +1100 mshtml: Implement IHTMLCurrentStyle_get_marginRight. --- dlls/mshtml/htmlcurstyle.c | 4 ++-- dlls/mshtml/tests/dom.c | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlcurstyle.c b/dlls/mshtml/htmlcurstyle.c index 803e631..6d08dfb 100644 --- a/dlls/mshtml/htmlcurstyle.c +++ b/dlls/mshtml/htmlcurstyle.c @@ -442,8 +442,8 @@ static HRESULT WINAPI HTMLCurrentStyle_get_marginTop(IHTMLCurrentStyle *iface, V static HRESULT WINAPI HTMLCurrentStyle_get_marginRight(IHTMLCurrentStyle *iface, VARIANT *p) { HTMLCurrentStyle *This = HTMLCURSTYLE_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, p); + return get_nsstyle_attr_var(This->nsstyle, STYLEID_MARGIN_RIGHT, p, 0); } static HRESULT WINAPI HTMLCurrentStyle_get_marginBottom(IHTMLCurrentStyle *iface, VARIANT *p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index fdd2e4e..b488999 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2487,6 +2487,11 @@ static void test_current_style(IHTMLCurrentStyle *current_style) ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); ok(!strcmp_wa(V_BSTR(&v), "middle"), "get_verticalAlign returned %s\n", dbgstr_w(V_BSTR(&v))); VariantClear(&v); + + hres = IHTMLCurrentStyle_get_marginRight(current_style, &v); + ok(hres == S_OK, "get_marginRight failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); + VariantClear(&v); } static void test_style2(IHTMLStyle2 *style2)

1 0

Rob Shearman : imm32: Fix crash in DllMain when FreeLibrary is called from a thread which existed before the DLL was loaded .
by Alexandre Julliard 24 Feb '09

24 Feb '09

Module: wine Branch: master Commit: f970db947a1cb1aedcec4e7adb946428c7fb6e96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f970db947a1cb1aedcec4e7ad… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Tue Feb 24 14:50:55 2009 +0000 imm32: Fix crash in DllMain when FreeLibrary is called from a thread which existed before the DLL was loaded. The code in IMM_FreeThreadData shouldn't assume that thread data will always have been created, so check for NULL data. Make loading the DLL more robust against errors. --- dlls/imm32/imm.c | 19 +++++++++++++------ 1 files changed, 13 insertions(+), 6 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index bb50e5e..82868be 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -223,22 +223,28 @@ static IMMThreadData* IMM_GetThreadData(void) return TlsGetValue(tlsIndex); } -static void IMM_InitThreadData(void) +static BOOL IMM_InitThreadData(void) { IMMThreadData* data = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IMMThreadData)); + if (!data) return FALSE; + TlsSetValue(tlsIndex,data); TRACE("Thread Data Created\n"); + return TRUE; } static void IMM_FreeThreadData(void) { IMMThreadData* data = TlsGetValue(tlsIndex); - IMM_DestroyContext(data->defaultContext); - DestroyWindow(data->hwndDefault); - HeapFree(GetProcessHeap(),0,data); - TRACE("Thread Data Destroyed\n"); + if (data) + { + IMM_DestroyContext(data->defaultContext); + DestroyWindow(data->hwndDefault); + HeapFree(GetProcessHeap(),0,data); + TRACE("Thread Data Destroyed\n"); + } } static HMODULE LoadDefaultWineIME(void) @@ -378,7 +384,8 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpReserved) case DLL_PROCESS_ATTACH: IMM_RegisterMessages(); tlsIndex = TlsAlloc(); - IMM_InitThreadData(); + if (tlsIndex == TLS_OUT_OF_INDEXES || !IMM_InitThreadData()) + return FALSE; break; case DLL_THREAD_ATTACH: IMM_InitThreadData();

1 0

Alistair Leslie-Hughes : mshtml: Implement IHTMLCurrentStyle_get_verticalAlign.
by Alexandre Julliard 24 Feb '09

24 Feb '09

Module: wine Branch: master Commit: ef981a412e4e881b4917c9e59473c5845428bedc URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef981a412e4e881b4917c9e59… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Feb 22 19:57:02 2009 +1100 mshtml: Implement IHTMLCurrentStyle_get_verticalAlign. --- dlls/mshtml/htmlcurstyle.c | 4 ++-- dlls/mshtml/tests/dom.c | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlcurstyle.c b/dlls/mshtml/htmlcurstyle.c index f297b04..803e631 100644 --- a/dlls/mshtml/htmlcurstyle.c +++ b/dlls/mshtml/htmlcurstyle.c @@ -421,8 +421,8 @@ static HRESULT WINAPI HTMLCurrentStyle_get_textIndent(IHTMLCurrentStyle *iface, static HRESULT WINAPI HTMLCurrentStyle_get_verticalAlign(IHTMLCurrentStyle *iface, VARIANT *p) { HTMLCurrentStyle *This = HTMLCURSTYLE_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, p); + return get_nsstyle_attr_var(This->nsstyle, STYLEID_VERTICAL_ALIGN, p, 0); } static HRESULT WINAPI HTMLCurrentStyle_get_backgroundAttachment(IHTMLCurrentStyle *iface, BSTR *p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 222d93a..fdd2e4e 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2481,6 +2481,12 @@ static void test_current_style(IHTMLCurrentStyle *current_style) ok(V_VT(&v) == VT_I4, "V_VT(v) = %d\n", V_VT(&v)); ok( V_I4(&v) == 1, "expect 1 got (%d)\n", V_I4(&v)); VariantClear(&v); + + hres = IHTMLCurrentStyle_get_verticalAlign(current_style, &v); + ok(hres == S_OK, "get_verticalAlign failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); + ok(!strcmp_wa(V_BSTR(&v), "middle"), "get_verticalAlign returned %s\n", dbgstr_w(V_BSTR(&v))); + VariantClear(&v); } static void test_style2(IHTMLStyle2 *style2)

1 0

Alistair Leslie-Hughes : mshtml: Implement IHTMLCurrentStyle_get_zIndex.
by Alexandre Julliard 24 Feb '09

24 Feb '09

Module: wine Branch: master Commit: 18c7f48865b150984e9263bee96365724cf191dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=18c7f48865b150984e9263bee… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Feb 22 19:50:09 2009 +1100 mshtml: Implement IHTMLCurrentStyle_get_zIndex. --- dlls/mshtml/htmlcurstyle.c | 4 ++-- dlls/mshtml/tests/dom.c | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlcurstyle.c b/dlls/mshtml/htmlcurstyle.c index 01909bf..f297b04 100644 --- a/dlls/mshtml/htmlcurstyle.c +++ b/dlls/mshtml/htmlcurstyle.c @@ -393,8 +393,8 @@ static HRESULT WINAPI HTMLCurrentStyle_get_visibility(IHTMLCurrentStyle *iface, static HRESULT WINAPI HTMLCurrentStyle_get_zIndex(IHTMLCurrentStyle *iface, VARIANT *p) { HTMLCurrentStyle *This = HTMLCURSTYLE_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, p); + return get_nsstyle_attr_var(This->nsstyle, STYLEID_Z_INDEX, p, ATTR_STR_TO_INT); } static HRESULT WINAPI HTMLCurrentStyle_get_letterSpacing(IHTMLCurrentStyle *iface, VARIANT *p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 2c6cdcb..222d93a 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2475,6 +2475,12 @@ static void test_current_style(IHTMLCurrentStyle *current_style) ok(hres == S_OK, "get_paddingLeft failed: %08x\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); VariantClear(&v); + + hres = IHTMLCurrentStyle_get_zIndex(current_style, &v); + ok(hres == S_OK, "get_zIndex failed: %08x\n", hres); + ok(V_VT(&v) == VT_I4, "V_VT(v) = %d\n", V_VT(&v)); + ok( V_I4(&v) == 1, "expect 1 got (%d)\n", V_I4(&v)); + VariantClear(&v); } static void test_style2(IHTMLStyle2 *style2)

1 0

Alistair Leslie-Hughes : mshtml: Implement IHTMLCurrentStyle_get_height.
by Alexandre Julliard 24 Feb '09

24 Feb '09

Module: wine Branch: master Commit: e64b198348f6d147ff00441c1967b319908cf0ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=e64b198348f6d147ff00441c1… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Feb 22 12:49:14 2009 +1100 mshtml: Implement IHTMLCurrentStyle_get_height. --- dlls/mshtml/htmlcurstyle.c | 4 ++-- dlls/mshtml/tests/dom.c | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlcurstyle.c b/dlls/mshtml/htmlcurstyle.c index 83fc68e..82dc512 100644 --- a/dlls/mshtml/htmlcurstyle.c +++ b/dlls/mshtml/htmlcurstyle.c @@ -328,8 +328,8 @@ static HRESULT WINAPI HTMLCurrentStyle_get_width(IHTMLCurrentStyle *iface, VARIA static HRESULT WINAPI HTMLCurrentStyle_get_height(IHTMLCurrentStyle *iface, VARIANT *p) { HTMLCurrentStyle *This = HTMLCURSTYLE_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, p); + return get_nsstyle_attr_var(This->nsstyle, STYLEID_HEIGHT, p, 0); } static HRESULT WINAPI HTMLCurrentStyle_get_paddingLeft(IHTMLCurrentStyle *iface, VARIANT *p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 20aea5e..242a001 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2465,6 +2465,11 @@ static void test_current_style(IHTMLCurrentStyle *current_style) ok(hres == S_OK, "get_width failed: %08x\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); VariantClear(&v); + + hres = IHTMLCurrentStyle_get_height(current_style, &v); + ok(hres == S_OK, "get_height failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); + VariantClear(&v); } static void test_style2(IHTMLStyle2 *style2)

1 0

Alistair Leslie-Hughes : mshtml: Implement IHTMLCurrentStyle_get_paddingLeft.
by Alexandre Julliard 24 Feb '09

24 Feb '09

Module: wine Branch: master Commit: 1a6c759e1dcb28a208438bb8a371fa8aa24fa510 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a6c759e1dcb28a208438bb8a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Feb 22 12:51:12 2009 +1100 mshtml: Implement IHTMLCurrentStyle_get_paddingLeft. --- dlls/mshtml/htmlcurstyle.c | 4 ++-- dlls/mshtml/tests/dom.c | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlcurstyle.c b/dlls/mshtml/htmlcurstyle.c index 82dc512..01909bf 100644 --- a/dlls/mshtml/htmlcurstyle.c +++ b/dlls/mshtml/htmlcurstyle.c @@ -335,8 +335,8 @@ static HRESULT WINAPI HTMLCurrentStyle_get_height(IHTMLCurrentStyle *iface, VARI static HRESULT WINAPI HTMLCurrentStyle_get_paddingLeft(IHTMLCurrentStyle *iface, VARIANT *p) { HTMLCurrentStyle *This = HTMLCURSTYLE_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, p); + return get_nsstyle_attr_var(This->nsstyle, STYLEID_PADDING_LEFT, p, 0); } static HRESULT WINAPI HTMLCurrentStyle_get_paddingTop(IHTMLCurrentStyle *iface, VARIANT *p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 242a001..2c6cdcb 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2470,6 +2470,11 @@ static void test_current_style(IHTMLCurrentStyle *current_style) ok(hres == S_OK, "get_height failed: %08x\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); VariantClear(&v); + + hres = IHTMLCurrentStyle_get_paddingLeft(current_style, &v); + ok(hres == S_OK, "get_paddingLeft failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); + VariantClear(&v); } static void test_style2(IHTMLStyle2 *style2)

1 0

Alistair Leslie-Hughes : mshtml: Implement IHTMLCurrentStyle_get_left.
by Alexandre Julliard 24 Feb '09

24 Feb '09

Module: wine Branch: master Commit: 72faa19807ca91294d94c49fdfef5b9f0d660ce9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72faa19807ca91294d94c49fd… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat Feb 21 21:24:25 2009 +1100 mshtml: Implement IHTMLCurrentStyle_get_left. --- dlls/mshtml/htmlcurstyle.c | 4 ++-- dlls/mshtml/tests/dom.c | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlcurstyle.c b/dlls/mshtml/htmlcurstyle.c index ce2945d..fbe6a97 100644 --- a/dlls/mshtml/htmlcurstyle.c +++ b/dlls/mshtml/htmlcurstyle.c @@ -307,8 +307,8 @@ static HRESULT WINAPI HTMLCurrentStyle_get_borderLeftWidth(IHTMLCurrentStyle *if static HRESULT WINAPI HTMLCurrentStyle_get_left(IHTMLCurrentStyle *iface, VARIANT *p) { HTMLCurrentStyle *This = HTMLCURSTYLE_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, p); + return get_nsstyle_attr_var(This->nsstyle, STYLEID_LEFT, p, 0); } static HRESULT WINAPI HTMLCurrentStyle_get_top(IHTMLCurrentStyle *iface, VARIANT *p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index bf84cda..6476f33 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2450,6 +2450,11 @@ static void test_current_style(IHTMLCurrentStyle *current_style) ok(hres == S_OK, "get_fontSize failed: %08x\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); VariantClear(&v); + + hres = IHTMLCurrentStyle_get_left(current_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)); + VariantClear(&v); } static void test_style2(IHTMLStyle2 *style2)

1 0

Alistair Leslie-Hughes : mshtml: Implement IHTMLCurrentStyle_get_top.
by Alexandre Julliard 24 Feb '09

24 Feb '09

Module: wine Branch: master Commit: 38cad51959d2e2b4c8899918b47e64336ed125c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38cad51959d2e2b4c8899918b… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat Feb 21 21:28:33 2009 +1100 mshtml: Implement IHTMLCurrentStyle_get_top. --- dlls/mshtml/htmlcurstyle.c | 4 ++-- dlls/mshtml/tests/dom.c | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlcurstyle.c b/dlls/mshtml/htmlcurstyle.c index fbe6a97..b59c97b 100644 --- a/dlls/mshtml/htmlcurstyle.c +++ b/dlls/mshtml/htmlcurstyle.c @@ -314,8 +314,8 @@ static HRESULT WINAPI HTMLCurrentStyle_get_left(IHTMLCurrentStyle *iface, VARIAN static HRESULT WINAPI HTMLCurrentStyle_get_top(IHTMLCurrentStyle *iface, VARIANT *p) { HTMLCurrentStyle *This = HTMLCURSTYLE_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, p); + return get_nsstyle_attr_var(This->nsstyle, STYLEID_TOP, p, 0); } static HRESULT WINAPI HTMLCurrentStyle_get_width(IHTMLCurrentStyle *iface, VARIANT *p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 6476f33..d11609b 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2455,6 +2455,11 @@ static void test_current_style(IHTMLCurrentStyle *current_style) ok(hres == S_OK, "get_left failed: %08x\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); VariantClear(&v); + + hres = IHTMLCurrentStyle_get_top(current_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)); + VariantClear(&v); } static void test_style2(IHTMLStyle2 *style2)

1 0

Alistair Leslie-Hughes : mshtml: Implement IHTMLCurrentStyle_get_width.
by Alexandre Julliard 24 Feb '09

24 Feb '09

Module: wine Branch: master Commit: f5102389da4cba6de1aef5a85e5bd67ba7fde50e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5102389da4cba6de1aef5a85… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat Feb 21 22:58:57 2009 +1100 mshtml: Implement IHTMLCurrentStyle_get_width. --- dlls/mshtml/htmlcurstyle.c | 4 ++-- dlls/mshtml/tests/dom.c | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlcurstyle.c b/dlls/mshtml/htmlcurstyle.c index b59c97b..83fc68e 100644 --- a/dlls/mshtml/htmlcurstyle.c +++ b/dlls/mshtml/htmlcurstyle.c @@ -321,8 +321,8 @@ static HRESULT WINAPI HTMLCurrentStyle_get_top(IHTMLCurrentStyle *iface, VARIANT static HRESULT WINAPI HTMLCurrentStyle_get_width(IHTMLCurrentStyle *iface, VARIANT *p) { HTMLCurrentStyle *This = HTMLCURSTYLE_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, p); + return get_nsstyle_attr_var(This->nsstyle, STYLEID_WIDTH, p, 0); } static HRESULT WINAPI HTMLCurrentStyle_get_height(IHTMLCurrentStyle *iface, VARIANT *p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index d11609b..20aea5e 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2460,6 +2460,11 @@ static void test_current_style(IHTMLCurrentStyle *current_style) ok(hres == S_OK, "get_top failed: %08x\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); VariantClear(&v); + + hres = IHTMLCurrentStyle_get_width(current_style, &v); + ok(hres == S_OK, "get_width failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); + VariantClear(&v); } static void test_style2(IHTMLStyle2 *style2)

1 0