February 2009 - Wine-commits

Alexandre Julliard : user32/tests: Remove an unreliable pixel test.
by Alexandre Julliard 20 Feb '09

20 Feb '09

Module: wine Branch: master Commit: 9120ce53f14391dcdfb76eccf87e64b1436d5023 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9120ce53f14391dcdfb76eccf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 20 16:56:27 2009 +0100 user32/tests: Remove an unreliable pixel test. --- dlls/user32/tests/win.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index a79bd34..b40887a 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -3440,8 +3440,6 @@ static void test_scrolldc( HWND parent) SetRectRgn( tmprgn, 25, 35, 35, 75); CombineRgn(exprgn, exprgn, tmprgn, RGN_OR); ok(EqualRgn(exprgn, hrgn), "wrong update region\n"); - colr = GetPixel( hdc, 80, 80); - ok ( colr == 0, "pixel should be black, color is %08x\n", colr); trace("update rect: %d,%d - %d,%d\n", rcu.left, rcu.top, rcu.right, rcu.bottom); if (winetest_debug > 0) dump_region(hrgn); @@ -3651,7 +3649,8 @@ static void test_redrawnow(void) ShowWindow(hwndMain, SW_SHOW); ok( WMPAINT_count == 0, "Multiple unexpected WM_PAINT calls %d\n", WMPAINT_count); RedrawWindow(hwndMain, NULL,NULL,RDW_UPDATENOW | RDW_ALLCHILDREN); - ok( WMPAINT_count == 1, "Multiple unexpected WM_PAINT calls %d\n", WMPAINT_count); + ok( WMPAINT_count == 1 || broken(WMPAINT_count == 0), /* sometimes on win9x */ + "Multiple unexpected WM_PAINT calls %d\n", WMPAINT_count); redrawComplete = TRUE; ok( WMPAINT_count < 10, "RedrawWindow (RDW_UPDATENOW) never completed (%d)\n", WMPAINT_count);

1 0

Huw Davies : lz32/tests: Display filename on failure.
by Alexandre Julliard 20 Feb '09

20 Feb '09

Module: wine Branch: master Commit: 79cc4163fa4867ce0b28ce83111dc6bc18d3df15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79cc4163fa4867ce0b28ce831… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Feb 20 16:19:32 2009 +0000 lz32/tests: Display filename on failure. --- dlls/lz32/tests/lzexpand_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/lz32/tests/lzexpand_main.c b/dlls/lz32/tests/lzexpand_main.c index 187aa80..9c95d07 100644 --- a/dlls/lz32/tests/lzexpand_main.c +++ b/dlls/lz32/tests/lzexpand_main.c @@ -391,7 +391,7 @@ static void test_LZOpenFileA(void) ok(file >= 0, "LZOpenFileA failed on read\n"); ok(test.cBytes == sizeof(OFSTRUCT) || broken(test.cBytes == 40), /* win95 */ - "LZOpenFileA set test.cBytes to %d\n", test.cBytes); + "LZOpenFileA set test.cBytes to %d '%s'('%s')\n", test.cBytes, expected, short_expected); ok(test.nErrCode == ERROR_SUCCESS, "LZOpenFileA set test.nErrCode to %d\n", test.nErrCode); ok(lstrcmpA(test.szPathName, expected) == 0 ||

1 0

Alexandre Julliard : user32/tests: Skip some message tests if we fail to queue events.
by Alexandre Julliard 20 Feb '09

20 Feb '09

Module: wine Branch: master Commit: 07d9d1fc1f80641a9bce3139a15c1de5c1b5ea06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07d9d1fc1f80641a9bce3139a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 20 16:56:16 2009 +0100 user32/tests: Skip some message tests if we fail to queue events. --- dlls/user32/tests/msg.c | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 147f5b7..c3ac46d 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -9403,8 +9403,13 @@ static void test_PeekMessage2(void) wait_move_event(hwnd, 100-STEP, 100-STEP); ret = PeekMessageA(&msg, hwnd, WM_MOUSEMOVE, WM_MOUSEMOVE, PM_NOREMOVE); - ok(ret, "no message available\n"); - if (ret) { + if (!ret) + { + skip( "queuing mouse events not supported\n" ); + goto done; + } + else + { trace("1st move event: %04x %x %d %d\n", msg.message, msg.time, msg.pt.x, msg.pt.y); message = msg.message; time1 = msg.time; @@ -9453,6 +9458,7 @@ static void test_PeekMessage2(void) ok(x3 != x2 && y3 != y2, "coords not changed: (%d %d) (%d %d)\n", x2, y2, x3, y3); } +done: DestroyWindow(hwnd); SetCursorPos(pos.x, pos.y); flush_events(); @@ -11269,6 +11275,11 @@ static void test_menu_messages(void) TranslateMessage(&msg); DispatchMessage(&msg); } + if (!sequence_cnt) /* we didn't get any message */ + { + skip( "queuing key events not supported\n" ); + goto done; + } ok_sequence(wm_popup_menu_1, "popup menu command", FALSE); /* Alt+F, Right, Enter */ @@ -11322,6 +11333,7 @@ static void test_menu_messages(void) } ok_sequence(wm_popup_menu_3, "submenu of a popup menu command", FALSE); +done: DestroyWindow(hwnd); DestroyMenu(hmenu); }

1 0

Alexandre Julliard : user32/tests: Skip some input tests if we fail to queue keyboard events.
by Alexandre Julliard 20 Feb '09

20 Feb '09

Module: wine Branch: master Commit: 9783f67625703f8fd49a033f38c8c888fac61b1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9783f67625703f8fd49a033f3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 20 16:56:07 2009 +0100 user32/tests: Skip some input tests if we fail to queue keyboard events. --- dlls/user32/tests/input.c | 23 ++++++++++++++--------- 1 files changed, 14 insertions(+), 9 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 584c23a..f025db7 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -203,7 +203,7 @@ static int KbdMessage( KEV kev, WPARAM *pwParam, LPARAM *plParam ) * . retrieve the messages from the input queue * . verify */ -static void do_test( HWND hwnd, int seqnr, const KEV td[] ) +static BOOL do_test( HWND hwnd, int seqnr, const KEV td[] ) { INPUT inputs[MAXKEYEVENTS]; KMSG expmsg[MAXKEYEVENTS]; @@ -238,20 +238,25 @@ static void do_test( HWND hwnd, int seqnr, const KEV td[] ) ok( msg.message == expmsg[i].message && msg.wParam == expmsg[i].wParam && msg.lParam == expmsg[i].lParam, - "wrong message! expected:\n" - "message[%d] %-15s wParam %04lx lParam %08lx\n",i, - MSGNAME[(expmsg[i]).message - WM_KEYFIRST], + "%u: wrong message %x expected %s wParam %04lx lParam %08lx\n", + i, msg.message, MSGNAME[(expmsg[i]).message - WM_KEYFIRST], expmsg[i].wParam, expmsg[i].lParam ); } i++; } if (winetest_debug > 1) trace("%d messages retrieved\n", i); + if (!i && kmctr) + { + skip( "simulated keyboard input doesn't work\n" ); + return FALSE; + } ok( i == kmctr, "message count is wrong: got %d expected: %d\n", i, kmctr); + return TRUE; } /* test all combinations of the specified key events */ -static void TestASet( HWND hWnd, int nrkev, const KEV kevdwn[], const KEV kevup[] ) +static BOOL TestASet( HWND hWnd, int nrkev, const KEV kevdwn[], const KEV kevup[] ) { int i,j,k,l,m,n; static int count=0; @@ -266,7 +271,7 @@ static void TestASet( HWND hWnd, int nrkev, const KEV kevdwn[], const KEV kevup[ kbuf[1] = kevdwn[1-i]; kbuf[2] = kevup[j]; kbuf[3] = kevup[1-j]; - do_test( hWnd, count++, kbuf); + if (!do_test( hWnd, count++, kbuf)) return FALSE; } } } @@ -288,7 +293,7 @@ static void TestASet( HWND hWnd, int nrkev, const KEV kevdwn[], const KEV kevup[ kbuf[3] = kevup[l]; kbuf[4] = kevup[m]; kbuf[5] = kevup[n]; - do_test( hWnd, count++, kbuf); + if (!do_test( hWnd, count++, kbuf)) return FALSE; } } } @@ -296,6 +301,7 @@ static void TestASet( HWND hWnd, int nrkev, const KEV kevdwn[], const KEV kevup[ } } } + return TRUE; } /* test each set specified in the global testkeyset array */ @@ -303,8 +309,7 @@ static void TestSysKeys( HWND hWnd) { int i; for(i=0; testkeyset[i].nrkev;i++) - TestASet( hWnd, testkeyset[i].nrkev, testkeyset[i].keydwn, - testkeyset[i].keyup); + if (!TestASet( hWnd, testkeyset[i].nrkev, testkeyset[i].keydwn, testkeyset[i].keyup)) break; } static LRESULT CALLBACK WndProc( HWND hWnd, UINT msg, WPARAM wParam,

1 0

Alistair Leslie-Hughes : mshtml: Implement IHTMLCurrentStyle_get_cursor.
by Alexandre Julliard 20 Feb '09

20 Feb '09

Module: wine Branch: master Commit: 4c65a3c2786d09860c459c108dbb1b91def2c9ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c65a3c2786d09860c459c108… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Feb 20 21:05:21 2009 +1100 mshtml: Implement IHTMLCurrentStyle_get_cursor. --- 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 b89b447..e376056 100644 --- a/dlls/mshtml/htmlcurstyle.c +++ b/dlls/mshtml/htmlcurstyle.c @@ -540,8 +540,8 @@ static HRESULT WINAPI HTMLCurrentStyle_get_pageBreakAfter(IHTMLCurrentStyle *ifa static HRESULT WINAPI HTMLCurrentStyle_get_cursor(IHTMLCurrentStyle *iface, BSTR *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(This->nsstyle, STYLEID_CURSOR, p); } static HRESULT WINAPI HTMLCurrentStyle_get_tableLayout(IHTMLCurrentStyle *iface, BSTR *p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index dc9c289..c2f51b7 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2433,6 +2433,11 @@ static void test_current_style(IHTMLCurrentStyle *current_style) ok(hres == S_OK, "get_textDecoration failed: %08x\n", hres); ok(!strcmp_wa(str, "none"), "get_textDecoration returned %s\n", dbgstr_w(str)); SysFreeString(str); + + hres = IHTMLCurrentStyle_get_cursor(current_style, &str); + ok(hres == S_OK, "get_cursor failed: %08x\n", hres); + ok(!strcmp_wa(str, "default"), "get_cursor returned %s\n", dbgstr_w(str)); + SysFreeString(str); } static void test_style2(IHTMLStyle2 *style2)

1 0

Alistair Leslie-Hughes : mshtml: Implement IHTMLCurrentStyle_get_borderLeftStyle.
by Alexandre Julliard 20 Feb '09

20 Feb '09

Module: wine Branch: master Commit: b3ec56d0c23c68e074ba13c428a842c70d27d714 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3ec56d0c23c68e074ba13c42… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Feb 20 20:45:29 2009 +1100 mshtml: Implement IHTMLCurrentStyle_get_borderLeftStyle. --- 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 6e4d165..0972a7d 100644 --- a/dlls/mshtml/htmlcurstyle.c +++ b/dlls/mshtml/htmlcurstyle.c @@ -272,8 +272,8 @@ static HRESULT WINAPI HTMLCurrentStyle_get_borderBottomStyle(IHTMLCurrentStyle * static HRESULT WINAPI HTMLCurrentStyle_get_borderLeftStyle(IHTMLCurrentStyle *iface, BSTR *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(This->nsstyle, STYLEID_BORDER_LEFT_STYLE, p); } static HRESULT WINAPI HTMLCurrentStyle_get_borderTopWidth(IHTMLCurrentStyle *iface, VARIANT *p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index a43c672..cb299ee 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2418,6 +2418,11 @@ static void test_current_style(IHTMLCurrentStyle *current_style) ok(hres == S_OK, "get_borderBottomStyle failed: %08x\n", hres); ok(!strcmp_wa(str, "none"), "get_borderBottomStyle returned %s\n", dbgstr_w(str)); SysFreeString(str); + + hres = IHTMLCurrentStyle_get_borderLeftStyle(current_style, &str); + ok(hres == S_OK, "get_borderLeftStyle failed: %08x\n", hres); + ok(!strcmp_wa(str, "none"), "get_borderLeftStyle returned %s\n", dbgstr_w(str)); + SysFreeString(str); } static void test_style2(IHTMLStyle2 *style2)

1 0

Alistair Leslie-Hughes : mshtml: Implement IHTMLCurrentStyle_get_textAlign.
by Alexandre Julliard 20 Feb '09

20 Feb '09

Module: wine Branch: master Commit: 34fcf04a74a98bebf2a94d33f35f07ad82f65f9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=34fcf04a74a98bebf2a94d33f… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Feb 20 20:48:42 2009 +1100 mshtml: Implement IHTMLCurrentStyle_get_textAlign. --- 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 0972a7d..980c7a3 100644 --- a/dlls/mshtml/htmlcurstyle.c +++ b/dlls/mshtml/htmlcurstyle.c @@ -363,8 +363,8 @@ static HRESULT WINAPI HTMLCurrentStyle_get_paddingBottom(IHTMLCurrentStyle *ifac static HRESULT WINAPI HTMLCurrentStyle_get_textAlign(IHTMLCurrentStyle *iface, BSTR *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(This->nsstyle, STYLEID_TEXT_ALIGN, p); } static HRESULT WINAPI HTMLCurrentStyle_get_textDecoration(IHTMLCurrentStyle *iface, BSTR *p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index cb299ee..247c905 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2423,6 +2423,11 @@ static void test_current_style(IHTMLCurrentStyle *current_style) ok(hres == S_OK, "get_borderLeftStyle failed: %08x\n", hres); ok(!strcmp_wa(str, "none"), "get_borderLeftStyle returned %s\n", dbgstr_w(str)); SysFreeString(str); + + hres = IHTMLCurrentStyle_get_textAlign(current_style, &str); + ok(hres == S_OK, "get_textAlign failed: %08x\n", hres); + ok(!strcmp_wa(str, "center"), "get_textAlign returned %s\n", dbgstr_w(str)); + SysFreeString(str); } static void test_style2(IHTMLStyle2 *style2)

1 0

Alistair Leslie-Hughes : mshtml: Implement IHTMLCurrentStyle_get_textDecoration.
by Alexandre Julliard 20 Feb '09

20 Feb '09

Module: wine Branch: master Commit: 00a5a722a9d352569982e62919ec8d6971f32842 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00a5a722a9d352569982e6291… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Feb 20 21:04:19 2009 +1100 mshtml: Implement IHTMLCurrentStyle_get_textDecoration. --- 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 980c7a3..b89b447 100644 --- a/dlls/mshtml/htmlcurstyle.c +++ b/dlls/mshtml/htmlcurstyle.c @@ -370,8 +370,8 @@ static HRESULT WINAPI HTMLCurrentStyle_get_textAlign(IHTMLCurrentStyle *iface, B static HRESULT WINAPI HTMLCurrentStyle_get_textDecoration(IHTMLCurrentStyle *iface, BSTR *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(This->nsstyle, STYLEID_TEXT_DECORATION, p); } static HRESULT WINAPI HTMLCurrentStyle_get_display(IHTMLCurrentStyle *iface, BSTR *p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 247c905..dc9c289 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2428,6 +2428,11 @@ static void test_current_style(IHTMLCurrentStyle *current_style) ok(hres == S_OK, "get_textAlign failed: %08x\n", hres); ok(!strcmp_wa(str, "center"), "get_textAlign returned %s\n", dbgstr_w(str)); SysFreeString(str); + + hres = IHTMLCurrentStyle_get_textDecoration(current_style, &str); + ok(hres == S_OK, "get_textDecoration failed: %08x\n", hres); + ok(!strcmp_wa(str, "none"), "get_textDecoration returned %s\n", dbgstr_w(str)); + SysFreeString(str); } static void test_style2(IHTMLStyle2 *style2)

1 0

Alistair Leslie-Hughes : mshtml: Implement IHTMLCurrentStyle_get_borderBottomStyle.
by Alexandre Julliard 20 Feb '09

20 Feb '09

Module: wine Branch: master Commit: 724ba42e88d2caf9aeb6a07fcf63ac9d08dcda69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=724ba42e88d2caf9aeb6a07fc… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Feb 20 20:43:10 2009 +1100 mshtml: Implement IHTMLCurrentStyle_get_borderBottomStyle. --- 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 c2d426d..6e4d165 100644 --- a/dlls/mshtml/htmlcurstyle.c +++ b/dlls/mshtml/htmlcurstyle.c @@ -265,8 +265,8 @@ static HRESULT WINAPI HTMLCurrentStyle_get_borderRightStyle(IHTMLCurrentStyle *i static HRESULT WINAPI HTMLCurrentStyle_get_borderBottomStyle(IHTMLCurrentStyle *iface, BSTR *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(This->nsstyle, STYLEID_BORDER_BOTTOM_STYLE, p); } static HRESULT WINAPI HTMLCurrentStyle_get_borderLeftStyle(IHTMLCurrentStyle *iface, BSTR *p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 3a058d9..a43c672 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2413,6 +2413,11 @@ static void test_current_style(IHTMLCurrentStyle *current_style) ok(hres == S_OK, "get_borderRightStyle failed: %08x\n", hres); ok(!strcmp_wa(str, "none"), "get_borderRightStyle returned %s\n", dbgstr_w(str)); SysFreeString(str); + + hres = IHTMLCurrentStyle_get_borderBottomStyle(current_style, &str); + ok(hres == S_OK, "get_borderBottomStyle failed: %08x\n", hres); + ok(!strcmp_wa(str, "none"), "get_borderBottomStyle returned %s\n", dbgstr_w(str)); + SysFreeString(str); } static void test_style2(IHTMLStyle2 *style2)

1 0

Alistair Leslie-Hughes : mshtml: Implement IHTMLCurrentStyle_get_borderTopStyle.
by Alexandre Julliard 20 Feb '09

20 Feb '09

Module: wine Branch: master Commit: 88be0330f9ffb186a576174f5944714c1d161c0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=88be0330f9ffb186a576174f5… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Feb 20 20:37:48 2009 +1100 mshtml: Implement IHTMLCurrentStyle_get_borderTopStyle. --- 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 65266b6..f167630 100644 --- a/dlls/mshtml/htmlcurstyle.c +++ b/dlls/mshtml/htmlcurstyle.c @@ -251,8 +251,8 @@ static HRESULT WINAPI HTMLCurrentStyle_get_borderBottomColor(IHTMLCurrentStyle * static HRESULT WINAPI HTMLCurrentStyle_get_borderTopStyle(IHTMLCurrentStyle *iface, BSTR *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(This->nsstyle, STYLEID_BORDER_TOP_STYLE, p); } static HRESULT WINAPI HTMLCurrentStyle_get_borderRightStyle(IHTMLCurrentStyle *iface, BSTR *p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 2d7d8ee..1fb54a3 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2403,6 +2403,11 @@ static void test_current_style(IHTMLCurrentStyle *current_style) ok(hres == S_OK, "get_fontVariant failed: %08x\n", hres); ok(!strcmp_wa(str, "normal"), "get_fontVariant returned %s\n", dbgstr_w(str)); SysFreeString(str); + + hres = IHTMLCurrentStyle_get_borderTopStyle(current_style, &str); + ok(hres == S_OK, "get_borderTopStyle failed: %08x\n", hres); + ok(!strcmp_wa(str, "none"), "get_borderTopStyle returned %s\n", dbgstr_w(str)); + SysFreeString(str); } static void test_style2(IHTMLStyle2 *style2)

1 0