wine-commits February 2009

wine-commits@winehq.org

2 participants
965 discussions

Huw Davies : inetcomm/tests: Object is a static singleton on win95.
by Alexandre Julliard 18 Feb '09

18 Feb '09

Module: wine Branch: master Commit: a6d584cec9f3e22942c964e5c99e234a213bb7a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6d584cec9f3e22942c964e5c… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Feb 17 15:42:09 2009 +0000 inetcomm/tests: Object is a static singleton on win95. --- dlls/inetcomm/tests/mimeintl.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/inetcomm/tests/mimeintl.c b/dlls/inetcomm/tests/mimeintl.c index e49567d..563943f 100644 --- a/dlls/inetcomm/tests/mimeintl.c +++ b/dlls/inetcomm/tests/mimeintl.c @@ -52,7 +52,9 @@ static void test_create(void) /* test to show that the object is a singleton with a reference held by the dll. */ ref = IMimeInternational_Release(internat2); - ok(ref == 2, "got %d\n", ref); + ok(ref == 2 || + ref == 1, /* win95 - object is a static singleton */ + "got %d\n", ref); ref = IMimeInternational_Release(internat); ok(ref == 1, "got %d\n", ref);

1 0

Huw Davies : gdi32/tests: Allow the first char code to point to glyph 0 ( the .notdef glyph).
by Alexandre Julliard 17 Feb '09

17 Feb '09

Module: wine Branch: master Commit: bd69c2e95a0c16fea8846fea11262e70e2dc29be URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd69c2e95a0c16fea8846fea1… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Feb 17 11:52:55 2009 +0000 gdi32/tests: Allow the first char code to point to glyph 0 (the .notdef glyph). --- dlls/gdi32/tests/font.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index e244027..89a7225 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -2147,11 +2147,10 @@ static BOOL get_first_last_from_cmap4(void *ptr, DWORD *first, DWORD *last) index = GET_BE_WORD(glyph_ids[index]); if(index) index += seg.id_delta; } - if(index) - { + if(*first == 0x10000) + *last = *first = code; + else if(index) *last = code; - if(*first == 0x10000) *first = code; - } } }

1 0

Huw Davies : gdi32: In a Baltic locale the last char of a symbol font is reported as 0xf8fd rather than 0xf0ff .
by Alexandre Julliard 17 Feb '09

17 Feb '09

Module: wine Branch: master Commit: 24c9a37aaf0689d298d52d4492c5183fc45154cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=24c9a37aaf0689d298d52d449… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Feb 17 11:49:02 2009 +0000 gdi32: In a Baltic locale the last char of a symbol font is reported as 0xf8fd rather than 0xf0ff. --- dlls/gdi32/freetype.c | 9 ++++++++- dlls/gdi32/tests/font.c | 9 ++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 56e6c59..409c92f 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -5399,7 +5399,14 @@ UINT WineEngGetOutlineTextMetrics(GdiFont *font, UINT cbSize, if (font->charset == SYMBOL_CHARSET || (pOS2->usFirstCharIndex >= 0xf000 && pOS2->usFirstCharIndex < 0xf100)) { TM.tmFirstChar = 0; - TM.tmLastChar = 0xf0ff; + switch(GetACP()) + { + case 1257: /* Baltic */ + TM.tmLastChar = 0xf8fd; + break; + default: + TM.tmLastChar = 0xf0ff; + } TM.tmBreakChar = 0x20; TM.tmDefaultChar = 0x1f; } diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 205c4c3..e244027 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -2277,7 +2277,14 @@ static void test_text_metrics(const LOGFONTA *lf) if (lf->lfCharSet == SYMBOL_CHARSET || (cmap_first >= 0xf000 && cmap_first < 0xf100)) { expect_first_W = 0; - expect_last_W = 0xf0ff; + switch(GetACP()) + { + case 1257: /* Baltic */ + expect_last_W = 0xf8fd; + break; + default: + expect_last_W = 0xf0ff; + } expect_break_W = 0x20; expect_default_W = expect_break_W - 1; expect_first_A = 0x1e;

1 0

Huw Davies : gdi32/tests: Win9x doesn' t ensure the facename is nul terminated. Compare the logfont one element at a time.
by Alexandre Julliard 17 Feb '09

17 Feb '09

Module: wine Branch: master Commit: aecf29ae843aa60a1a9e66178bc46a78ef06b99e URL: http://source.winehq.org/git/wine.git/?a=commit;h=aecf29ae843aa60a1a9e66178… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Feb 16 23:22:55 2009 +0000 gdi32/tests: Win9x doesn't ensure the facename is nul terminated. Compare the logfont one element at a time. --- dlls/gdi32/tests/font.c | 17 +++++++++++++++-- 1 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index e5c14dc..205c4c3 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -106,8 +106,21 @@ static void check_font(const char* test, const LOGFONTA* lf, HFONT hfont) minlen++; minlen += FIELD_OFFSET(LOGFONTA, lfFaceName) + 1; ok(ret == sizeof(LOGFONTA) || ret == minlen, "%s: GetObject returned %d\n", test, ret); - ok(!memcmp(lf, &getobj_lf, FIELD_OFFSET(LOGFONTA, lfFaceName)), "%s: fonts don't match\n", test); - ok(!lstrcmpA(lf->lfFaceName, getobj_lf.lfFaceName), + ok(lf->lfHeight == getobj_lf.lfHeight, "lfHeight: expect %08x got %08x\n", lf->lfHeight, getobj_lf.lfHeight); + ok(lf->lfWidth == getobj_lf.lfWidth, "lfWidth: expect %08x got %08x\n", lf->lfWidth, getobj_lf.lfWidth); + ok(lf->lfEscapement == getobj_lf.lfEscapement, "lfEscapement: expect %08x got %08x\n", lf->lfEscapement, getobj_lf.lfEscapement); + ok(lf->lfOrientation == getobj_lf.lfOrientation, "lfOrientation: expect %08x got %08x\n", lf->lfOrientation, getobj_lf.lfOrientation); + ok(lf->lfWeight == getobj_lf.lfWeight, "lfWeight: expect %08x got %08x\n", lf->lfWeight, getobj_lf.lfWeight); + ok(lf->lfItalic == getobj_lf.lfItalic, "lfItalic: expect %02x got %02x\n", lf->lfItalic, getobj_lf.lfItalic); + ok(lf->lfUnderline == getobj_lf.lfUnderline, "lfUnderline: expect %02x got %02x\n", lf->lfUnderline, getobj_lf.lfUnderline); + ok(lf->lfStrikeOut == getobj_lf.lfStrikeOut, "lfStrikeOut: expect %02x got %02x\n", lf->lfStrikeOut, getobj_lf.lfStrikeOut); + ok(lf->lfCharSet == getobj_lf.lfCharSet, "lfCharSet: expect %02x got %02x\n", lf->lfCharSet, getobj_lf.lfCharSet); + ok(lf->lfOutPrecision == getobj_lf.lfOutPrecision, "lfOutPrecision: expect %02x got %02x\n", lf->lfOutPrecision, getobj_lf.lfOutPrecision); + ok(lf->lfClipPrecision == getobj_lf.lfClipPrecision, "lfClipPrecision: expect %02x got %02x\n", lf->lfClipPrecision, getobj_lf.lfClipPrecision); + ok(lf->lfQuality == getobj_lf.lfQuality, "lfQuality: expect %02x got %02x\n", lf->lfQuality, getobj_lf.lfQuality); + ok(lf->lfPitchAndFamily == getobj_lf.lfPitchAndFamily, "lfPitchAndFamily: expect %02x got %02x\n", lf->lfPitchAndFamily, getobj_lf.lfPitchAndFamily); + ok(!lstrcmpA(lf->lfFaceName, getobj_lf.lfFaceName) || + broken(!memcmp(lf->lfFaceName, getobj_lf.lfFaceName, LF_FACESIZE-1)), /* win9x doesn't ensure '\0' termination */ "%s: font names don't match: %s != %s\n", test, lf->lfFaceName, getobj_lf.lfFaceName); }

1 0

Huw Davies : gdi32/tests: Win98 and WinMe actually do set error codes.
by Alexandre Julliard 17 Feb '09

17 Feb '09

Module: wine Branch: master Commit: 7cc7ad5ec45341048432c34af75ad8e118e939a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cc7ad5ec45341048432c34af… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Feb 16 22:37:25 2009 +0000 gdi32/tests: Win98 and WinMe actually do set error codes. --- dlls/gdi32/tests/font.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index dce15fc..e5c14dc 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -2767,7 +2767,9 @@ static void test_GetGlyphOutline(void) SetLastError(0xdeadbeef); ret = GetGlyphOutlineA(hdc, 'A', GGO_METRICS, &gm, 0, NULL, NULL); ok(ret == GDI_ERROR, "GetGlyphOutlineA should fail\n"); - ok(GetLastError() == 0xdeadbeef, "expected 0xdeadbeef, got %u\n", GetLastError()); + ok(GetLastError() == 0xdeadbeef || + GetLastError() == ERROR_INVALID_PARAMETER, /* win98, winMe */ + "expected 0xdeadbeef, got %u\n", GetLastError()); memset(&gm, 0, sizeof(gm)); SetLastError(0xdeadbeef);

1 0

Huw Davies : gdi32/tests: GetTextFaceA called with a NULL buffer returns 0 on win98 and winMe.
by Alexandre Julliard 17 Feb '09

17 Feb '09

Module: wine Branch: master Commit: c404d00b3dfe0d686102f225ca38a9e1afb5a4c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c404d00b3dfe0d686102f225c… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Feb 16 22:30:07 2009 +0000 gdi32/tests: GetTextFaceA called with a NULL buffer returns 0 on win98 and winMe. --- dlls/gdi32/tests/font.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index cf6d3f9..dce15fc 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -2658,7 +2658,9 @@ static void test_GetTextFace(void) ok(bufA[0] == faceA[0] && bufA[1] == '\0', "GetTextFaceA didn't copy\n"); n = GetTextFaceA(dc, 0, NULL); - ok(n == sizeof faceA, "GetTextFaceA returned %d\n", n); + ok(n == sizeof faceA || + broken(n == 0), /* win98, winMe */ + "GetTextFaceA returned %d\n", n); DeleteObject(SelectObject(dc, g)); ReleaseDC(NULL, dc);

1 0

Alexandre Julliard : ole32/tests: Don't hang forever in the child process.
by Alexandre Julliard 17 Feb '09

17 Feb '09

Module: wine Branch: master Commit: b55f6dfed5fb0e0ce085ffa9da18f03fb4d5b513 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b55f6dfed5fb0e0ce085ffa9d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 17 14:58:11 2009 +0100 ole32/tests: Don't hang forever in the child process. --- dlls/ole32/tests/marshal.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index 8f6a7cc..4082488 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -2588,7 +2588,7 @@ static void test_register_local_server(void) do { - wait = MsgWaitForMultipleObjects(1, &quit_event, FALSE, INFINITE, QS_ALLINPUT); + wait = MsgWaitForMultipleObjects(1, &quit_event, FALSE, 30000, QS_ALLINPUT); if (wait == WAIT_OBJECT_0+1) { MSG msg; @@ -2603,6 +2603,7 @@ static void test_register_local_server(void) } while (wait == WAIT_OBJECT_0+1); + ok( wait == WAIT_OBJECT_0, "quit event wait timed out\n" ); hr = CoRevokeClassObject(cookie); ok_ole_success(hr, CoRevokeClassObject); }

1 0

Alexandre Julliard : user32/tests: Skip message tests if queuing keyboard events doesn't work.
by Alexandre Julliard 17 Feb '09

17 Feb '09

Module: wine Branch: master Commit: f9e405692f3449df7a27fefe8d3045332e571d94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9e405692f3449df7a27fefe8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 17 14:57:57 2009 +0100 user32/tests: Skip message tests if queuing keyboard events doesn't work. --- dlls/user32/tests/msg.c | 25 +++++++++++++++++-------- 1 files changed, 17 insertions(+), 8 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 4824f79..584cc4f 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -6283,7 +6283,7 @@ static void test_interthread_messages(void) wnd_event.event = CreateEventW(NULL, 0, 0, NULL); if (!wnd_event.event) { - trace("skipping interthread message test under win9x\n"); + skip("skipping interthread message test under win9x\n"); return; } @@ -6653,6 +6653,11 @@ static void test_accelerators(void) keybd_event('N', 0, 0, 0); keybd_event('N', 0, KEYEVENTF_KEYUP, 0); pump_msg_loop(hwnd, hAccel); + if (!sequence_cnt) /* we didn't get any message */ + { + skip( "queuing key events not supported\n" ); + goto done; + } ok_sequence(WmVkN, "VK_N press/release", FALSE); trace("testing Shift+VK_N press/release\n"); @@ -6770,6 +6775,7 @@ static void test_accelerators(void) ret = DestroyAcceleratorTable(hAccel); ok( ret, "DestroyAcceleratorTable error %d\n", GetLastError()); + hAccel = 0; trace("testing Alt press/release\n"); flush_sequence(); @@ -6814,7 +6820,8 @@ static void test_accelerators(void) keybd_event(VK_APPS, 0, KEYEVENTF_KEYUP, 0); pump_msg_loop(hwnd, 0); ok_sequence(WmVkAppsSeq, "VK_APPS press/release", FALSE); - +done: + if (hAccel) DestroyAcceleratorTable(hAccel); DestroyWindow(hwnd); } @@ -8957,6 +8964,11 @@ static void test_PeekMessage(void) keybd_event('N', 0, 0, 0); keybd_event('N', 0, KEYEVENTF_KEYUP, 0); qstatus = GetQueueStatus(qs_all_input); + if (!(qstatus & MAKELONG(QS_KEY, QS_KEY))) + { + skip( "queuing key events not supported\n" ); + goto done; + } ok(qstatus == MAKELONG(QS_KEY, QS_KEY), "wrong qstatus %08x\n", qstatus); @@ -11354,15 +11366,14 @@ START_TEST(msg) GetModuleHandleA(0), win_event_proc, 0, GetCurrentThreadId(), WINEVENT_INCONTEXT); - assert(hEvent_hook); - - if (pIsWinEventHookInstalled) + if (pIsWinEventHookInstalled && hEvent_hook) { UINT event; for (event = EVENT_MIN; event <= EVENT_MAX; event++) ok(pIsWinEventHookInstalled(event), "IsWinEventHookInstalled(%u) failed\n", event); } } + if (!hEvent_hook) skip( "no win event hook support\n" ); cbt_hook_thread_id = GetCurrentThreadId(); hCBT_hook = SetWindowsHookExA(WH_CBT, cbt_hook_proc, 0, GetCurrentThreadId()); @@ -11427,7 +11438,7 @@ START_TEST(msg) test_SetForegroundWindow(); UnhookWindowsHookEx(hCBT_hook); - if (pUnhookWinEvent) + if (pUnhookWinEvent && hEvent_hook) { ret = pUnhookWinEvent(hEvent_hook); ok( ret, "UnhookWinEvent error %d\n", GetLastError()); @@ -11437,6 +11448,4 @@ START_TEST(msg) GetLastError() == 0xdeadbeef, /* Win9x */ "unexpected error %d\n", GetLastError()); } - else - skip("UnhookWinEvent is not available\n"); }

1 0

Alexandre Julliard : user32/tests: Test for failure to change system parameters even if getting them succeeded .
by Alexandre Julliard 17 Feb '09

17 Feb '09

Module: wine Branch: master Commit: 0aef71f8df70a7e05df3b5389ca5435510cdcb65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0aef71f8df70a7e05df3b5389… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 17 14:57:23 2009 +0100 user32/tests: Test for failure to change system parameters even if getting them succeeded. --- dlls/user32/tests/sysparams.c | 60 ++++++++++++++++++++++++++++++++-------- 1 files changed, 48 insertions(+), 12 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0aef71f8df70a7e05df3b…

1 0

Alistair Leslie-Hughes : mshtml: Implement IHTMLStyle get/put minHeight.
by Alexandre Julliard 17 Feb '09

17 Feb '09

Module: wine Branch: master Commit: 8c47530070b112eb45ca2d25299983bde668e2d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c47530070b112eb45ca2d252… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Feb 17 20:29:58 2009 +1100 mshtml: Implement IHTMLStyle get/put minHeight. --- dlls/mshtml/htmlstyle.c | 7 +++++-- dlls/mshtml/htmlstyle.h | 4 ++++ dlls/mshtml/htmlstyle3.c | 12 ++++++++---- dlls/mshtml/tests/dom.c | 33 +++++++++++++++++++++++++++++++++ 4 files changed, 50 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index b9d33f0..abe8a3f 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -83,6 +83,8 @@ static const WCHAR attrMarginLeft[] = {'m','a','r','g','i','n','-','l','e','f','t',0}; static const WCHAR attrMarginRight[] = {'m','a','r','g','i','n','-','r','i','g','h','t',0}; +static const WCHAR attrMinHeight[] = + {'m','i','n','-','h','e','i','g','h','t',0}; static const WCHAR attrOverflow[] = {'o','v','e','r','f','l','o','w',0}; static const WCHAR attrPaddingLeft[] = @@ -132,6 +134,7 @@ static const struct{ {attrMargin, DISPID_IHTMLSTYLE_MARGIN}, {attrMarginLeft, DISPID_IHTMLSTYLE_MARGINLEFT}, {attrMarginRight, DISPID_IHTMLSTYLE_MARGINRIGHT}, + {attrMinHeight, DISPID_IHTMLSTYLE4_MINHEIGHT}, {attrOverflow, DISPID_IHTMLSTYLE_OVERFLOW}, {attrPaddingLeft, DISPID_IHTMLSTYLE_PADDINGLEFT}, {attrPosition, DISPID_IHTMLSTYLE2_POSITION}, @@ -242,7 +245,7 @@ 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) +HRESULT set_nsstyle_attr_var(nsIDOMCSSStyleDeclaration *nsstyle, styleid_t sid, VARIANT *value, DWORD flags) { switch(V_VT(value)) { case VT_NULL: @@ -308,7 +311,7 @@ HRESULT get_nsstyle_attr(nsIDOMCSSStyleDeclaration *nsstyle, styleid_t sid, BSTR return S_OK; } -static HRESULT get_nsstyle_attr_var(nsIDOMCSSStyleDeclaration *nsstyle, styleid_t sid, VARIANT *p, DWORD flags) +HRESULT get_nsstyle_attr_var(nsIDOMCSSStyleDeclaration *nsstyle, styleid_t sid, VARIANT *p, DWORD flags) { nsAString str_value; const PRUnichar *value; diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index a9ff535..7cf135a 100644 --- a/dlls/mshtml/htmlstyle.h +++ b/dlls/mshtml/htmlstyle.h @@ -59,6 +59,7 @@ typedef enum { STYLEID_MARGIN, STYLEID_MARGIN_LEFT, STYLEID_MARGIN_RIGHT, + STYLEID_MIN_HEIGHT, STYLEID_OVERFLOW, STYLEID_PADDING_LEFT, STYLEID_POSITION, @@ -76,3 +77,6 @@ void HTMLStyle3_Init(HTMLStyle*); HRESULT get_nsstyle_attr(nsIDOMCSSStyleDeclaration*,styleid_t,BSTR*); HRESULT set_nsstyle_attr(nsIDOMCSSStyleDeclaration*,styleid_t,LPCWSTR,DWORD); + +HRESULT set_nsstyle_attr_var(nsIDOMCSSStyleDeclaration *nsstyle, styleid_t sid, VARIANT *value, DWORD flags); +HRESULT get_nsstyle_attr_var(nsIDOMCSSStyleDeclaration *nsstyle, styleid_t sid, VARIANT *p, DWORD flags); diff --git a/dlls/mshtml/htmlstyle3.c b/dlls/mshtml/htmlstyle3.c index f5ed8b5..ce1d56e 100644 --- a/dlls/mshtml/htmlstyle3.c +++ b/dlls/mshtml/htmlstyle3.c @@ -409,15 +409,19 @@ static HRESULT WINAPI HTMLStyle4_get_textOverflow(IHTMLStyle4 *iface, BSTR *p) static HRESULT WINAPI HTMLStyle4_put_minHeight(IHTMLStyle4 *iface, VARIANT v) { HTMLStyle *This = HTMLSTYLE4_THIS(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + + return set_nsstyle_attr_var(This->nsstyle, STYLEID_MIN_HEIGHT, &v, 0); } static HRESULT WINAPI HTMLStyle4_get_minHeight(IHTMLStyle4 *iface, VARIANT *p) { HTMLStyle *This = HTMLSTYLE4_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_MIN_HEIGHT, p, 0); } static const IHTMLStyle4Vtbl HTMLStyle4Vtbl = { diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index e52e33e..90148ea 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2403,9 +2403,35 @@ static void test_style2(IHTMLStyle2 *style2) SysFreeString(str); } +static void test_style4(IHTMLStyle4 *style4) +{ + HRESULT hres; + VARIANT v; + VARIANT vdefault; + + hres = IHTMLStyle4_get_minHeight(style4, &vdefault); + ok(hres == S_OK, "get_minHeight failed: %08x\n", hres); + + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = a2bstr("10px"); + hres = IHTMLStyle4_put_minHeight(style4, v); + ok(hres == S_OK, "put_minHeight failed: %08x\n", hres); + VariantClear(&v); + + hres = IHTMLStyle4_get_minHeight(style4, &v); + ok(hres == S_OK, "get_minHeight failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); + ok( !strcmp_wa(V_BSTR(&v), "10px"), "expect 10px got (%s)\n", dbgstr_w(V_BSTR(&v))); + + hres = IHTMLStyle4_put_minHeight(style4, vdefault); + ok(hres == S_OK, "put_minHeight failed: %08x\n", hres); + VariantClear(&vdefault); +} + static void test_default_style(IHTMLStyle *style) { IHTMLStyle2 *style2; + IHTMLStyle4 *style4; VARIANT_BOOL b; VARIANT v; BSTR str; @@ -3034,6 +3060,13 @@ static void test_default_style(IHTMLStyle *style) test_style2(style2); IHTMLStyle2_Release(style2); } + + hres = IHTMLStyle_QueryInterface(style, &IID_IHTMLStyle4, (void**)&style4); + ok(hres == S_OK, "Could not get IHTMLStyle4 iface: %08x\n", hres); + if(SUCCEEDED(hres)) { + test_style4(style4); + IHTMLStyle4_Release(style4); + } } static void test_default_selection(IHTMLDocument2 *doc)

1 0

← Newer
1
...
38
39
40
41
42
43
44
...
97
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2009