March 2009 - Wine-commits - list.winehq.org

Paul Vriens : wininet/tests: Skip some tests on IE5.
by Alexandre Julliard 09 Mar '09

09 Mar '09

Module: wine Branch: master Commit: ac07d2eb289dbe1a1aaf4f56904bab047d798dbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac07d2eb289dbe1a1aaf4f569… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sun Mar 8 13:38:25 2009 +0100 wininet/tests: Skip some tests on IE5. --- dlls/wininet/tests/internet.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index 80841a1..56a604b 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -27,6 +27,8 @@ #include "wine/test.h" +static BOOL (WINAPI *pCreateUrlCacheContainerA)(DWORD, DWORD, DWORD, DWORD, + DWORD, DWORD, DWORD, DWORD); static BOOL (WINAPI *pInternetTimeFromSystemTimeA)(CONST SYSTEMTIME *,DWORD ,LPSTR ,DWORD); static BOOL (WINAPI *pInternetTimeFromSystemTimeW)(CONST SYSTEMTIME *,DWORD ,LPWSTR ,DWORD); static BOOL (WINAPI *pInternetTimeToSystemTimeA)(LPCSTR ,SYSTEMTIME *,DWORD); @@ -770,6 +772,7 @@ START_TEST(internet) { HMODULE hdll; hdll = GetModuleHandleA("wininet.dll"); + pCreateUrlCacheContainerA = (void*)GetProcAddress(hdll, "CreateUrlCacheContainerA"); pInternetTimeFromSystemTimeA = (void*)GetProcAddress(hdll, "InternetTimeFromSystemTimeA"); pInternetTimeFromSystemTimeW = (void*)GetProcAddress(hdll, "InternetTimeFromSystemTimeW"); pInternetTimeToSystemTimeA = (void*)GetProcAddress(hdll, "InternetTimeToSystemTimeA"); @@ -784,7 +787,7 @@ START_TEST(internet) test_null(); if (!pInternetTimeFromSystemTimeA) - skip("skipping the InternetTime tests\n"); + win_skip("skipping the InternetTime tests\n"); else { InternetTimeFromSystemTimeA_test(); @@ -792,8 +795,10 @@ START_TEST(internet) InternetTimeToSystemTimeA_test(); InternetTimeToSystemTimeW_test(); } - if (!pIsDomainLegalCookieDomainW) - skip("skipping IsDomainLegalCookieDomainW tests\n"); + if (pIsDomainLegalCookieDomainW && (void*)pIsDomainLegalCookieDomainW == (void*)pCreateUrlCacheContainerA) + win_skip("IsDomainLegalCookieDomainW is not available on systems with IE5\n"); + else if (!pIsDomainLegalCookieDomainW) + win_skip("IsDomainLegalCookieDomainW (or ordinal 117) is not available\n"); else test_IsDomainLegalCookieDomainW(); }

1 0

Luke Benstead : winnt.h: Completed TOKEN_INFORMATION_CLASS enum definition.
by Alexandre Julliard 09 Mar '09

09 Mar '09

Module: wine Branch: master Commit: d2b923d58dce83b494e332b0c2d35eeb42b7cbab URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2b923d58dce83b494e332b0c… Author: Luke Benstead <kazade(a)gmail.com> Date: Sat Mar 7 08:37:34 2009 +0000 winnt.h: Completed TOKEN_INFORMATION_CLASS enum definition. --- include/winnt.h | 16 +++++++++++++++- 1 files changed, 15 insertions(+), 1 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index 69c4b10..abcc502 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -3603,7 +3603,21 @@ typedef enum _TOKEN_INFORMATION_CLASS { TokenSessionId, TokenGroupsAndPrivileges, TokenSessionReference, - TokenSandBoxInert + TokenSandBoxInert, + TokenAuditPolicy, + TokenOrigin, + TokenElevationType, + TokenLinkedToken, + TokenElevation, + TokenHasRestrictions, + TokenAccessInformation, + TokenVirtualizationAllowed, + TokenVirtualizationEnabled, + TokenIntegrityLevel, + TokenUIAccess, + TokenMandatoryPolicy, + TokenLogonSid, + MaxTokenInfoClass } TOKEN_INFORMATION_CLASS; #define TOKEN_TOKEN_ADJUST_DEFAULT 0x0080

1 0

Vincent Povirk : gdiplus: Stub GdipCloneBitmapAreaI.
by Alexandre Julliard 09 Mar '09

09 Mar '09

Module: wine Branch: master Commit: efcd0bbffa742e6fa96408a3b086f76953fc9c52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=efcd0bbffa742e6fa96408a3b… Author: Vincent Povirk <madewokherd+8cd9(a)gmail.com> Date: Sat Mar 7 11:33:55 2009 -0600 gdiplus: Stub GdipCloneBitmapAreaI. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/image.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 0037a74..17f4951 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -47,7 +47,7 @@ @ stdcall GdipBitmapUnlockBits(ptr ptr) @ stdcall GdipClearPathMarkers(ptr) @ stub GdipCloneBitmapArea -@ stub GdipCloneBitmapAreaI +@ stdcall GdipCloneBitmapAreaI(long long long long long ptr ptr) @ stdcall GdipCloneBrush(ptr ptr) @ stdcall GdipCloneCustomLineCap(ptr ptr) @ stdcall GdipCloneFont(ptr ptr) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 5dab53e..8a4dcc2 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -249,6 +249,14 @@ GpStatus WINGDIPAPI GdipBitmapUnlockBits(GpBitmap* bitmap, return Ok; } +GpStatus WINGDIPAPI GdipCloneBitmapAreaI(INT x, INT y, INT width, INT height, + PixelFormat format, GpBitmap* srcBitmap, GpBitmap** dstBitmap) +{ + FIXME("(%i,%i,%i,%i,%i,%p,%p)\n", x, y, width, height, format, srcBitmap, dstBitmap); + + return NotImplemented; +} + GpStatus WINGDIPAPI GdipCloneImage(GpImage *image, GpImage **cloneImage) { IStream* stream;

1 0

Rob Shearman : ole32: Fix a memory leak in an error path in COMPOBJ_DllList_Add.
by Alexandre Julliard 09 Mar '09

09 Mar '09

Module: wine Branch: master Commit: d974922698eb788d6ee52f134616f3c618063c42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d974922698eb788d6ee52f134… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sat Mar 7 21:54:27 2009 +0000 ole32: Fix a memory leak in an error path in COMPOBJ_DllList_Add. --- dlls/ole32/compobj.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index b8ddba8..711f341 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -934,6 +934,7 @@ static HRESULT COMPOBJ_DllList_Add(LPCWSTR library_name, OpenDll **ret) } else { + HeapFree(GetProcessHeap(), 0, entry); hr = E_OUTOFMEMORY; FreeLibrary(hLibrary); }

1 0

Rob Shearman : qmgr: Fix a memory leak.
by Alexandre Julliard 09 Mar '09

09 Mar '09

Module: wine Branch: master Commit: c376b1bfc08109a8635f65eab66e64c274b8b306 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c376b1bfc08109a8635f65eab… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sat Mar 7 21:56:00 2009 +0000 qmgr: Fix a memory leak. --- dlls/qmgr/qmgr.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/qmgr/qmgr.c b/dlls/qmgr/qmgr.c index 5fdd121..1ff6050 100644 --- a/dlls/qmgr/qmgr.c +++ b/dlls/qmgr/qmgr.c @@ -157,7 +157,14 @@ DWORD WINAPI fileTransfer(void *param) /* Check if it's the stop_event */ if (WaitForMultipleObjects(2, events, FALSE, INFINITE) == WAIT_OBJECT_0) + { + LIST_FOR_EACH_ENTRY_SAFE(job, jobCur, &qmgr->jobs, BackgroundCopyJobImpl, entryFromQmgr) + { + list_remove(&job->entryFromQmgr); + IBackgroundCopyJob_Release((IBackgroundCopyJob *) job); + } return 0; + } /* Note that other threads may add files to the job list, but only this thread ever deletes them so we don't need to worry about jobs

1 0

Juan Lang : crypt32: Fix another test on Win9x.
by Alexandre Julliard 09 Mar '09

09 Mar '09

Module: wine Branch: master Commit: b9cac1537092e0c1aa9c998cc97ec2ce1bcaa8c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9cac1537092e0c1aa9c998cc… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Mar 6 11:26:09 2009 -0800 crypt32: Fix another test on Win9x. --- dlls/crypt32/tests/msg.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index b0e5bd0..5f74aee 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -1842,7 +1842,7 @@ static void test_signed_msg_get_param(void) GetLastError()); if (!ret) { - skip("message parameters are broken, skipping tests"); + skip("message parameters are broken, skipping tests\n"); return; } size = 0; @@ -2200,7 +2200,8 @@ static void test_decode_msg_update(void) msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, 0, 0, NULL, NULL); SetLastError(0xdeadbeef); ret = CryptMsgUpdate(msg, hashEmptyContent, sizeof(hashEmptyContent), TRUE); - ok(ret, "CryptMsgUpdate failed: %08x\n", GetLastError()); + ok(ret || broken(GetLastError() == OSS_DATA_ERROR /* Win9x */), + "CryptMsgUpdate failed: %08x\n", GetLastError()); CryptMsgClose(msg); /* while with specified type it fails. */ msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, CMSG_HASHED, 0, NULL,

1 0

Dylan Smith : winhlp32: Use EM_SCROLL to scroll richedit control.
by Alexandre Julliard 09 Mar '09

09 Mar '09

Module: wine Branch: master Commit: fb63cd0c87e6db85bc4ebc31931f0eba8975a0c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb63cd0c87e6db85bc4ebc319… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Sat Mar 7 02:09:04 2009 -0500 winhlp32: Use EM_SCROLL to scroll richedit control. Previously the richedit control contents were scrolled directly using ScrollWindow. This caused the richedit control to not actually scroll, but only look like it scrolled, therefore causing plenty of glitches. --- programs/winhlp32/winhelp.c | 40 ++++++++++------------------------------ 1 files changed, 10 insertions(+), 30 deletions(-) diff --git a/programs/winhlp32/winhelp.c b/programs/winhlp32/winhelp.c index 02529ee..d62649f 100644 --- a/programs/winhlp32/winhelp.c +++ b/programs/winhlp32/winhelp.c @@ -1263,8 +1263,7 @@ static LRESULT CALLBACK WINHELP_MainWndProc(HWND hWnd, UINT msg, WPARAM wParam, { WINHELP_WINDOW *win; WINHELP_BUTTON *button; - RECT rect; - INT curPos, min, max, dy, keyDelta; + INT keyDelta; HWND hTextWnd; LRESULT ret; @@ -1379,42 +1378,23 @@ static LRESULT CALLBACK WINHELP_MainWndProc(HWND hWnd, UINT msg, WPARAM wParam, case WM_KEYDOWN: keyDelta = 0; + win = (WINHELP_WINDOW*) GetWindowLongPtr(hWnd, 0); + hTextWnd = GetDlgItem(win->hMainWnd, CTL_ID_TEXT); switch (wParam) { case VK_UP: + SendMessage(hTextWnd, EM_SCROLL, SB_LINEUP, 0); + return 0; case VK_DOWN: - keyDelta = GetSystemMetrics(SM_CXVSCROLL); - if (wParam == VK_UP) - keyDelta = -keyDelta; - + SendMessage(hTextWnd, EM_SCROLL, SB_LINEDOWN, 0); + return 0; case VK_PRIOR: + SendMessage(hTextWnd, EM_SCROLL, SB_PAGEUP, 0); + return 0; case VK_NEXT: - win = (WINHELP_WINDOW*) GetWindowLongPtr(hWnd, 0); - hTextWnd = GetDlgItem(win->hMainWnd, CTL_ID_TEXT); - curPos = GetScrollPos(hTextWnd, SB_VERT); - GetScrollRange(hTextWnd, SB_VERT, &min, &max); - - if (keyDelta == 0) - { - GetClientRect(hTextWnd, &rect); - keyDelta = (rect.bottom - rect.top) / 2; - if (wParam == VK_PRIOR) - keyDelta = -keyDelta; - } - - curPos += keyDelta; - if (curPos > max) - curPos = max; - else if (curPos < min) - curPos = min; - - dy = GetScrollPos(hTextWnd, SB_VERT) - curPos; - SetScrollPos(hTextWnd, SB_VERT, curPos, TRUE); - ScrollWindow(hTextWnd, 0, dy, NULL, NULL); - UpdateWindow(hTextWnd); + SendMessage(hTextWnd, EM_SCROLL, SB_PAGEDOWN, 0); return 0; - case VK_ESCAPE: MACRO_Exit(); return 0;

1 0

Nikolay Sivov : comctl32: Replace nonprintable characters with spaces on SB_SETTEXT.
by Alexandre Julliard 06 Mar '09

06 Mar '09

Module: wine Branch: master Commit: 74e9b904b9d3cbd892d7c26fd7ac8f6a7f7be154 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74e9b904b9d3cbd892d7c26fd… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Mar 3 16:50:55 2009 -0500 comctl32: Replace nonprintable characters with spaces on SB_SETTEXT. --- dlls/comctl32/status.c | 11 +++++++++++ dlls/comctl32/tests/status.c | 30 ++++++++++++++++++++---------- 2 files changed, 31 insertions(+), 10 deletions(-) diff --git a/dlls/comctl32/status.c b/dlls/comctl32/status.c index a56c2a0..17ba1e9 100644 --- a/dlls/comctl32/status.c +++ b/dlls/comctl32/status.c @@ -762,6 +762,7 @@ STATUSBAR_SetTextT (STATUS_INFO *infoPtr, INT nPart, WORD style, part->text = (LPWSTR)text; } else { LPWSTR ntext; + WCHAR *idx; if (text && !isW) { LPCSTR atxt = (LPCSTR)text; @@ -775,6 +776,16 @@ STATUSBAR_SetTextT (STATUS_INFO *infoPtr, INT nPart, WORD style, strcpyW (ntext, text); } else ntext = 0; + /* replace nonprintable characters with spaces */ + if (ntext) { + idx = ntext; + while (*idx) { + if(!isprintW(*idx)) + *idx = ' '; + idx++; + } + } + /* check if text is unchanged -> no need to redraw */ if (text) { if (!changed && part->text && !lstrcmpW(ntext, part->text)) { diff --git a/dlls/comctl32/tests/status.c b/dlls/comctl32/tests/status.c index 4ae663f..f1cbda4 100644 --- a/dlls/comctl32/tests/status.c +++ b/dlls/comctl32/tests/status.c @@ -258,6 +258,8 @@ static void test_status_control(void) RECT rc; CHAR charArray[20]; HICON hIcon; + char ch; + char chstr[10] = "Inval id"; hWndStatus = create_status_control(WS_VISIBLE, 0); @@ -307,7 +309,7 @@ static void test_status_control(void) /* Test resetting text with different characters */ r = SendMessage(hWndStatus, SB_SETTEXT, 0, (LPARAM)"First(a)Again"); expect(TRUE,r); - r = SendMessage(hWndStatus, SB_SETTEXT, 1, (LPARAM)"InvalidChars\\7\7"); + r = SendMessage(hWndStatus, SB_SETTEXT, 1, (LPARAM)"Invalid\tChars\\7\7"); expect(TRUE,r); r = SendMessage(hWndStatus, SB_SETTEXT, 2, (LPARAM)"InvalidChars\\n\n"); expect(TRUE,r); @@ -318,20 +320,28 @@ static void test_status_control(void) expect(11,LOWORD(r)); expect(0,HIWORD(r)); r = SendMessage(hWndStatus, SB_GETTEXT, 1, (LPARAM) charArray); - todo_wine - { - ok(strcmp(charArray,"InvalidChars\\7 ") == 0, "Expected InvalidChars\\7 , got %s\n", charArray); - } - expect(15,LOWORD(r)); + ok(strcmp(charArray,"Invalid\tChars\\7 ") == 0, "Expected Invalid\tChars\\7 , got %s\n", charArray); + + expect(16,LOWORD(r)); expect(0,HIWORD(r)); r = SendMessage(hWndStatus, SB_GETTEXT, 2, (LPARAM) charArray); - todo_wine - { - ok(strcmp(charArray,"InvalidChars\\n ") == 0, "Expected InvalidChars\\n , got %s\n", charArray); - } + ok(strcmp(charArray,"InvalidChars\\n ") == 0, "Expected InvalidChars\\n , got %s\n", charArray); + expect(15,LOWORD(r)); expect(0,HIWORD(r)); + /* test more nonprintable chars */ + for(ch = 0x00; ch < 0x7F; ch++) { + chstr[5] = ch; + r = SendMessage(hWndStatus, SB_SETTEXT, 0, (LPARAM)chstr); + expect(TRUE,r); + r = SendMessage(hWndStatus, SB_GETTEXT, 0, (LPARAM)charArray); + /* substitution with single space */ + if (ch > 0x00 && ch < 0x20 && ch != '\t') + chstr[5] = ' '; + ok(strcmp(charArray, chstr) == 0, "Expected %s, got %s\n", chstr, charArray); + } + /* Set background color */ r = SendMessage(hWndStatus, SB_SETBKCOLOR , 0, RGB(255,0,0)); ok(r == CLR_DEFAULT ||

1 0

Alistair Leslie-Hughes : mshtml: Implement IHTMLStyle get/ put borderRightWidth.
by Alexandre Julliard 06 Mar '09

06 Mar '09

Module: wine Branch: master Commit: e266672c47c2a9639758472520918b30c9c7dc28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e266672c47c2a963975847252… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Mar 5 20:35:50 2009 +1100 mshtml: Implement IHTMLStyle get/put borderRightWidth. --- dlls/mshtml/htmlstyle.c | 11 +++++++---- dlls/mshtml/htmlstyle.h | 1 + dlls/mshtml/tests/dom.c | 19 +++++++++++++++++++ 3 files changed, 27 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 7c08a5e..3b40920 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -59,6 +59,8 @@ static const WCHAR attrBorderLeftStyle[] = {'b','o','r','d','e','r','-','l','e','f','t','-','s','t','y','l','e',0}; static const WCHAR attrBorderRightStyle[] = {'b','o','r','d','e','r','-','r','i','g','h','t','-','s','t','y','l','e',0}; +static const WCHAR attrBorderRightWidth[] = + {'b','o','r','d','e','r','-','r','i','g','h','t','-','w','i','d','t','h',0}; static const WCHAR attrBorderStyle[] = {'b','o','r','d','e','r','-','s','t','y','l','e',0}; static const WCHAR attrBorderTopStyle[] = @@ -134,6 +136,7 @@ static const struct{ {attrBorderLeft, DISPID_IHTMLSTYLE_BORDERLEFT}, {attrBorderLeftStyle, DISPID_IHTMLSTYLE_BORDERLEFTSTYLE}, {attrBorderRightStyle, DISPID_IHTMLSTYLE_BORDERRIGHTSTYLE}, + {attrBorderRightWidth, DISPID_IHTMLSTYLE_BORDERRIGHTWIDTH}, {attrBorderStyle, DISPID_IHTMLSTYLE_BORDERSTYLE}, {attrBorderTopStyle, DISPID_IHTMLSTYLE_BORDERTOPSTYLE}, {attrBorderTopWidth, DISPID_IHTMLSTYLE_BORDERTOPWIDTH}, @@ -1536,15 +1539,15 @@ static HRESULT WINAPI HTMLStyle_get_borderTopWidth(IHTMLStyle *iface, VARIANT *p static HRESULT WINAPI HTMLStyle_put_borderRightWidth(IHTMLStyle *iface, VARIANT v) { HTMLStyle *This = HTMLSTYLE_THIS(iface); - FIXME("(%p)->(v%d)\n", This, V_VT(&v)); - return E_NOTIMPL; + TRACE("(%p)->(v%d)\n", This, V_VT(&v)); + return set_nsstyle_attr_var(This->nsstyle, STYLEID_BORDER_RIGHT_WIDTH, &v, 0); } static HRESULT WINAPI HTMLStyle_get_borderRightWidth(IHTMLStyle *iface, VARIANT *p) { HTMLStyle *This = HTMLSTYLE_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_BORDER_RIGHT_WIDTH, p, 0); } static HRESULT WINAPI HTMLStyle_put_borderBottomWidth(IHTMLStyle *iface, VARIANT v) diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index 92cfcbb..0a268a3 100644 --- a/dlls/mshtml/htmlstyle.h +++ b/dlls/mshtml/htmlstyle.h @@ -47,6 +47,7 @@ typedef enum { STYLEID_BORDER_LEFT, STYLEID_BORDER_LEFT_STYLE, STYLEID_BORDER_RIGHT_STYLE, + STYLEID_BORDER_RIGHT_WIDTH, STYLEID_BORDER_STYLE, STYLEID_BORDER_TOP_STYLE, STYLEID_BORDER_TOP_WIDTH, diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 5aaec99..b8d452e 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -3486,6 +3486,25 @@ static void test_default_style(IHTMLStyle *style) ok(hres == S_OK, "put_borderTopWidth: %08x\n", hres); VariantClear(&vDefault); + /* borderRightWidth */ + hres = IHTMLStyle_get_borderRightWidth(style, &vDefault); + ok(hres == S_OK, "get_borderRightWidth: %08x\n", hres); + + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = a2bstr("10"); + hres = IHTMLStyle_put_borderRightWidth(style, v); + ok(hres == S_OK, "put_borderRightWidth: %08x\n", hres); + VariantClear(&v); + + hres = IHTMLStyle_get_borderRightWidth(style, &v); + ok(hres == S_OK, "get_borderRightWidth: %08x\n", hres); + ok(!strcmp_wa(V_BSTR(&v), "10px"), "expected 10px = %s\n", dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + + hres = IHTMLStyle_put_borderRightWidth(style, vDefault); + ok(hres == S_OK, "put_borderRightWidth: %08x\n", hres); + VariantClear(&vDefault); + hres = IHTMLStyle_QueryInterface(style, &IID_IHTMLStyle2, (void**)&style2); ok(hres == S_OK, "Could not get IHTMLStyle2 iface: %08x\n", hres); if(SUCCEEDED(hres)) {

1 0

Alistair Leslie-Hughes : mshtml: Implement IHTMLStyle get/ put borderBottomWidth.
by Alexandre Julliard 06 Mar '09

06 Mar '09

Module: wine Branch: master Commit: 6655d3f78b5eb472f2426c36ee586e56e0714618 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6655d3f78b5eb472f2426c36e… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Mar 5 20:41:39 2009 +1100 mshtml: Implement IHTMLStyle get/put borderBottomWidth. --- dlls/mshtml/htmlstyle.c | 12 ++++++++---- dlls/mshtml/htmlstyle.h | 1 + dlls/mshtml/tests/dom.c | 19 +++++++++++++++++++ 3 files changed, 28 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 3b40920..3727c8e 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -51,6 +51,8 @@ static const WCHAR attrBorder[] = {'b','o','r','d','e','r',0}; static const WCHAR attrBorderBottomStyle[] = {'b','o','r','d','e','r','-','b','o','t','t','o','m','-','s','t','y','l','e',0}; +static const WCHAR attrBorderBottomWidth[] = + {'b','o','r','d','e','r','-','b','o','t','t','o','m','-','w','i','d','t','h',0}; static const WCHAR attrBorderColor[] = {'b','o','r','d','e','r','-','c','o','l','o','r',0}; static const WCHAR attrBorderLeft[] = @@ -132,6 +134,7 @@ static const struct{ {attrBackgroundRepeat, DISPID_IHTMLSTYLE_BACKGROUNDREPEAT}, {attrBorder, DISPID_IHTMLSTYLE_BORDER}, {attrBorderBottomStyle, DISPID_IHTMLSTYLE_BORDERBOTTOMSTYLE}, + {attrBorderBottomWidth, DISPID_IHTMLSTYLE_BORDERBOTTOMWIDTH}, {attrBorderColor, DISPID_IHTMLSTYLE_BORDERCOLOR}, {attrBorderLeft, DISPID_IHTMLSTYLE_BORDERLEFT}, {attrBorderLeftStyle, DISPID_IHTMLSTYLE_BORDERLEFTSTYLE}, @@ -1553,15 +1556,16 @@ static HRESULT WINAPI HTMLStyle_get_borderRightWidth(IHTMLStyle *iface, VARIANT static HRESULT WINAPI HTMLStyle_put_borderBottomWidth(IHTMLStyle *iface, VARIANT v) { HTMLStyle *This = HTMLSTYLE_THIS(iface); - FIXME("(%p)->(v%d)\n", This, V_VT(&v)); - return E_NOTIMPL; + + TRACE("(%p)->(v%d)\n", This, V_VT(&v)); + return set_nsstyle_attr_var(This->nsstyle, STYLEID_BORDER_BOTTOM_WIDTH, &v, 0); } static HRESULT WINAPI HTMLStyle_get_borderBottomWidth(IHTMLStyle *iface, VARIANT *p) { HTMLStyle *This = HTMLSTYLE_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_BORDER_BOTTOM_WIDTH, p, 0); } static HRESULT WINAPI HTMLStyle_put_borderLeftWidth(IHTMLStyle *iface, VARIANT v) diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index 0a268a3..596f579 100644 --- a/dlls/mshtml/htmlstyle.h +++ b/dlls/mshtml/htmlstyle.h @@ -43,6 +43,7 @@ typedef enum { STYLEID_BACKGROUND_REPEAT, STYLEID_BORDER, STYLEID_BORDER_BOTTOM_STYLE, + STYLEID_BORDER_BOTTOM_WIDTH, STYLEID_BORDER_COLOR, STYLEID_BORDER_LEFT, STYLEID_BORDER_LEFT_STYLE, diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index b8d452e..69ed3c0 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -3505,6 +3505,25 @@ static void test_default_style(IHTMLStyle *style) ok(hres == S_OK, "put_borderRightWidth: %08x\n", hres); VariantClear(&vDefault); + /* borderBottomWidth */ + hres = IHTMLStyle_get_borderBottomWidth(style, &vDefault); + ok(hres == S_OK, "get_borderBottomWidth: %08x\n", hres); + + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = a2bstr("10"); + hres = IHTMLStyle_put_borderBottomWidth(style, v); + ok(hres == S_OK, "put_borderBottomWidth: %08x\n", hres); + VariantClear(&v); + + hres = IHTMLStyle_get_borderBottomWidth(style, &v); + ok(hres == S_OK, "get_borderBottomWidth: %08x\n", hres); + ok(!strcmp_wa(V_BSTR(&v), "10px"), "expected 10px = %s\n", dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + + hres = IHTMLStyle_put_borderBottomWidth(style, vDefault); + ok(hres == S_OK, "put_borderBottomWidth: %08x\n", hres); + VariantClear(&vDefault); + hres = IHTMLStyle_QueryInterface(style, &IID_IHTMLStyle2, (void**)&style2); ok(hres == S_OK, "Could not get IHTMLStyle2 iface: %08x\n", hres); if(SUCCEEDED(hres)) {

1 0