September 2009 - Wine-commits

Jörg Höhle : wineoss: Enforce invariant about BlockAlign and nAvgBytesPerSec.
by Alexandre Julliard 16 Sep '09

16 Sep '09

Module: wine Branch: master Commit: 8870fe38b5d9a143c78c68a43c95c1be766739b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8870fe38b5d9a143c78c68a43… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Mon Sep 7 22:29:39 2009 +0200 wineoss: Enforce invariant about BlockAlign and nAvgBytesPerSec. --- dlls/wineoss.drv/audio.c | 35 ++++++++++++++++++++--------------- 1 files changed, 20 insertions(+), 15 deletions(-) diff --git a/dlls/wineoss.drv/audio.c b/dlls/wineoss.drv/audio.c index ca79cd5..ddf973f 100644 --- a/dlls/wineoss.drv/audio.c +++ b/dlls/wineoss.drv/audio.c @@ -1990,6 +1990,16 @@ static DWORD wodOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) return MMSYSERR_NOERROR; } + /* nBlockAlign and nAvgBytesPerSec are output variables for dsound */ + if (lpDesc->lpFormat->nBlockAlign != lpDesc->lpFormat->nChannels*lpDesc->lpFormat->wBitsPerSample/8) { + lpDesc->lpFormat->nBlockAlign = lpDesc->lpFormat->nChannels*lpDesc->lpFormat->wBitsPerSample/8; + WARN("Fixing nBlockAlign\n"); + } + if (lpDesc->lpFormat->nAvgBytesPerSec!= lpDesc->lpFormat->nSamplesPerSec*lpDesc->lpFormat->nBlockAlign) { + lpDesc->lpFormat->nAvgBytesPerSec = lpDesc->lpFormat->nSamplesPerSec*lpDesc->lpFormat->nBlockAlign; + WARN("Fixing nAvgBytesPerSec\n"); + } + TRACE("OSS_OpenDevice requested this format: %dx%dx%d %s\n", lpDesc->lpFormat->nSamplesPerSec, lpDesc->lpFormat->wBitsPerSample, @@ -2064,13 +2074,6 @@ static DWORD wodOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) wwo->waveDesc = *lpDesc; copy_format(lpDesc->lpFormat, &wwo->waveFormat); - if (wwo->waveFormat.Format.wBitsPerSample == 0) { - WARN("Resetting zeroed wBitsPerSample\n"); - wwo->waveFormat.Format.wBitsPerSample = 8 * - (wwo->waveFormat.Format.nAvgBytesPerSec / - wwo->waveFormat.Format.nSamplesPerSec) / - wwo->waveFormat.Format.nChannels; - } /* Read output space info for future reference */ if (ioctl(wwo->ossdev.fd, SNDCTL_DSP_GETOSPACE, &info) < 0) { ERR("ioctl(%s, SNDCTL_DSP_GETOSPACE) failed (%s)\n", wwo->ossdev.dev_name, strerror(errno)); @@ -2880,6 +2883,16 @@ static DWORD widOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) return MMSYSERR_NOERROR; } + /* nBlockAlign and nAvgBytesPerSec are output variables for dsound */ + if (lpDesc->lpFormat->nBlockAlign != lpDesc->lpFormat->nChannels*lpDesc->lpFormat->wBitsPerSample/8) { + lpDesc->lpFormat->nBlockAlign = lpDesc->lpFormat->nChannels*lpDesc->lpFormat->wBitsPerSample/8; + WARN("Fixing nBlockAlign\n"); + } + if (lpDesc->lpFormat->nAvgBytesPerSec!= lpDesc->lpFormat->nSamplesPerSec*lpDesc->lpFormat->nBlockAlign) { + lpDesc->lpFormat->nAvgBytesPerSec = lpDesc->lpFormat->nSamplesPerSec*lpDesc->lpFormat->nBlockAlign; + WARN("Fixing nAvgBytesPerSec\n"); + } + TRACE("OSS_OpenDevice requested this format: %dx%dx%d %s\n", lpDesc->lpFormat->nSamplesPerSec, lpDesc->lpFormat->wBitsPerSample, @@ -2951,14 +2964,6 @@ static DWORD widOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) wwi->waveDesc = *lpDesc; copy_format(lpDesc->lpFormat, &wwi->waveFormat); - if (wwi->waveFormat.Format.wBitsPerSample == 0) { - WARN("Resetting zeroed wBitsPerSample\n"); - wwi->waveFormat.Format.wBitsPerSample = 8 * - (wwi->waveFormat.Format.nAvgBytesPerSec / - wwi->waveFormat.Format.nSamplesPerSec) / - wwi->waveFormat.Format.nChannels; - } - if (ioctl(wwi->ossdev.fd, SNDCTL_DSP_GETISPACE, &info) < 0) { ERR("ioctl(%s, SNDCTL_DSP_GETISPACE) failed (%s)\n", wwi->ossdev.dev_name, strerror(errno));

1 0

Gerald Pfeifer : wrc: Fix eight conditions in compare_menuex_item.
by Alexandre Julliard 16 Sep '09

16 Sep '09

Module: wine Branch: master Commit: bdb73f5c72261362b0a163b0d9e35df02f582718 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdb73f5c72261362b0a163b0d… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Sep 12 20:24:16 2009 +0200 wrc: Fix eight conditions in compare_menuex_item. --- tools/wrc/translation.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tools/wrc/translation.c b/tools/wrc/translation.c index 7262a65..5932ccf 100644 --- a/tools/wrc/translation.c +++ b/tools/wrc/translation.c @@ -539,28 +539,28 @@ static int compare_menuex_item(menuex_item_t *menuex_item1, menuex_item_t *menue different = 1; } else if(!different && ((menuex_item1->gotid && !menuex_item2->gotid) || - (!menuex_item2->gotid && menuex_item2->gotid))) + (!menuex_item1->gotid && menuex_item2->gotid))) different = 1; if(!different && menuex_item1->gottype && menuex_item2->gottype) { if(menuex_item1->type != menuex_item2->type) different = 1; } else if(!different && ((menuex_item1->gottype && !menuex_item2->gottype) || - (!menuex_item2->gottype && menuex_item2->gottype))) + (!menuex_item1->gottype && menuex_item2->gottype))) different = 1; if(!different && menuex_item1->gotstate && menuex_item2->gotstate) { if(menuex_item1->state != menuex_item2->state) different = 1; } else if(!different && ((menuex_item1->gotstate && !menuex_item2->gotstate) || - (!menuex_item2->gotstate && menuex_item2->gotstate))) + (!menuex_item1->gotstate && menuex_item2->gotstate))) different = 1; if(!different && menuex_item1->gothelpid && menuex_item2->gothelpid) { if(menuex_item1->helpid != menuex_item2->helpid) different = 1; } else if(!different && ((menuex_item1->gothelpid && !menuex_item2->gothelpid) || - (!menuex_item2->gothelpid && menuex_item2->gothelpid))) + (!menuex_item1->gothelpid && menuex_item2->gothelpid))) different = 1; if(!different) different = compare_menuex_item(menuex_item1->popup, menuex_item2->popup); @@ -571,28 +571,28 @@ static int compare_menuex_item(menuex_item_t *menuex_item1, menuex_item_t *menue different = 1; } else if(!different && ((menuex_item1->gotid && !menuex_item2->gotid) || - (!menuex_item2->gotid && menuex_item2->gotid))) + (!menuex_item1->gotid && menuex_item2->gotid))) different = 1; if(!different && menuex_item1->gottype && menuex_item2->gottype) { if(menuex_item1->type != menuex_item2->type) different = 1; } else if(!different && ((menuex_item1->gottype && !menuex_item2->gottype) || - (!menuex_item2->gottype && menuex_item2->gottype))) + (!menuex_item1->gottype && menuex_item2->gottype))) different = 1; if(!different && menuex_item1->gotstate && menuex_item2->gotstate) { if(menuex_item1->state != menuex_item2->state) different = 1; } else if(!different && ((menuex_item1->gotstate && !menuex_item2->gotstate) || - (!menuex_item2->gotstate && menuex_item2->gotstate))) + (!menuex_item1->gotstate && menuex_item2->gotstate))) different = 1; if(!different && menuex_item1->gothelpid && menuex_item2->gothelpid) { if(menuex_item1->helpid != menuex_item2->helpid) different = 1; } else if(!different && ((menuex_item1->gothelpid && !menuex_item2->gothelpid) || - (!menuex_item2->gothelpid && menuex_item2->gothelpid))) + (!menuex_item1->gothelpid && menuex_item2->gothelpid))) different = 1; } else if((menuex_item1->name && !menuex_item2->name) || (!menuex_item1->name && menuex_item2->name))

1 0

Nikolay Sivov : comctl32/dpa: Check for DPA_LoadStream() presence. Merge original test function with save tests.
by Alexandre Julliard 16 Sep '09

16 Sep '09

Module: wine Branch: master Commit: 69bcb112f92f78c8db832852d338b3bbd7e56428 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69bcb112f92f78c8db832852d… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Sep 16 13:00:40 2009 +0400 comctl32/dpa: Check for DPA_LoadStream() presence. Merge original test function with save tests. --- dlls/comctl32/tests/dpa.c | 61 ++++++++++---------------------------------- 1 files changed, 14 insertions(+), 47 deletions(-) diff --git a/dlls/comctl32/tests/dpa.c b/dlls/comctl32/tests/dpa.c index 6acb55b..022460a 100644 --- a/dlls/comctl32/tests/dpa.c +++ b/dlls/comctl32/tests/dpa.c @@ -551,6 +551,12 @@ static void test_DPA_LoadStream(void) ULONG written, ret; HDPA dpa; + if(!pDPA_LoadStream) + { + win_skip("DPA_LoadStream() not available. Skipping stream tests.\n"); + return; + } + hRes = CoInitialize(NULL); if (hRes != S_OK) { @@ -655,9 +661,12 @@ static void test_DPA_SaveStream(void) static const WCHAR szStg[] = { 'S','t','g',0 }; IStorage* pStg = NULL; IStream* pStm = NULL; - DWORD dwMode; + DWORD dwMode, dw; HRESULT hRes; ULONG ret; + INT i; + BOOL rc; + LARGE_INTEGER liZero; if(!pDPA_SaveStream) { @@ -694,60 +703,19 @@ if (0) { expect(E_INVALIDARG, hRes); } - pDPA_Destroy(dpa); - - ret = IStream_Release(pStm); - ok(!ret, "ret=%d\n", ret); - - ret = IStorage_Release(pStg); - ok(!ret, "ret=%d\n", ret); - - CoUninitialize(); -} - -static void test_dpa_stream(void) -{ - HDPA dpa; - HRESULT hRes; - INT ret, i; - BOOL rc; - - static const WCHAR szStg[] = { 'S','t','g',0 }; - IStorage* pStg = NULL; - IStream* pStm = NULL; - LARGE_INTEGER liZero; - DWORD dwMode, dw; - - if(!pDPA_SaveStream) - { - win_skip("DPA_SaveStream() not available. Skipping stream tests.\n"); - return; - } - - hRes = CoInitialize(NULL); - if (hRes != S_OK) - { - ok(0, "hResult: %d\n", hRes); - return; - } - - dpa = pDPA_Create(0); - + /* saving/loading */ for (i = 0; i < 6; i++) { ret = pDPA_InsertPtr(dpa, i, (PVOID)(i+1)); ok(ret == i, "ret=%d\n", ret); } - dwMode = STGM_DIRECT|STGM_CREATE|STGM_READWRITE|STGM_SHARE_EXCLUSIVE; - hRes = StgCreateDocfile(NULL, dwMode|STGM_DELETEONRELEASE, 0, &pStg); - expect(S_OK, hRes); - - hRes = IStorage_CreateStream(pStg, szStg, dwMode, 0, 0, &pStm); + liZero.QuadPart = 0; + hRes = IStream_Seek(pStm, liZero, STREAM_SEEK_SET, NULL); expect(S_OK, hRes); hRes = pDPA_SaveStream(dpa, CB_Save, pStm, (void*)0xdeadbeef); - ok(hRes == S_OK, "hRes=0x%x\n", hRes); + expect(S_OK, hRes); pDPA_Destroy(dpa); liZero.QuadPart = 0; @@ -786,5 +754,4 @@ START_TEST(dpa) test_DPA_DestroyCallback(); test_DPA_LoadStream(); test_DPA_SaveStream(); - test_dpa_stream(); }

1 0

Aric Stewart : wininet: Ensure the ftp connections lstnSocket is set to -1 after each close.
by Alexandre Julliard 16 Sep '09

16 Sep '09

Module: wine Branch: master Commit: 51a57b7e25b9f0da17dc461b8e6ca7646fbcc425 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51a57b7e25b9f0da17dc461b8… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Sep 16 10:22:31 2009 -0500 wininet: Ensure the ftp connections lstnSocket is set to -1 after each close. --- dlls/wininet/ftp.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index dbb54cb..3766719 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -380,7 +380,10 @@ static BOOL FTP_FtpPutFileW(ftp_session_t *lpwfs, LPCWSTR lpszLocalFile, } if (lpwfs->lstnSocket != -1) + { closesocket(lpwfs->lstnSocket); + lpwfs->lstnSocket = -1; + } if (hIC->hdr.dwFlags & INTERNET_FLAG_ASYNC) { @@ -850,7 +853,10 @@ static HINTERNET FTP_FtpFindFirstFileW(ftp_session_t *lpwfs, lend: if (lpwfs->lstnSocket != -1) + { closesocket(lpwfs->lstnSocket); + lpwfs->lstnSocket = -1; + } hIC = lpwfs->lpAppInfo; if (hIC->hdr.dwFlags & INTERNET_FLAG_ASYNC) @@ -1305,7 +1311,10 @@ HINTERNET FTP_FtpOpenFileW(ftp_session_t *lpwfs, } if (lpwfs->lstnSocket != -1) + { closesocket(lpwfs->lstnSocket); + lpwfs->lstnSocket = -1; + } hIC = lpwfs->lpAppInfo; if (hIC->hdr.dwFlags & INTERNET_FLAG_ASYNC) @@ -1629,7 +1638,10 @@ static BOOL FTP_FtpGetFileW(ftp_session_t *lpwfs, LPCWSTR lpszRemoteFile, LPCWST } if (lpwfs->lstnSocket != -1) + { closesocket(lpwfs->lstnSocket); + lpwfs->lstnSocket = -1; + } CloseHandle(hFile);

1 0

Gerald Pfeifer : winedos: Make an expression in DOSVM_Int10Handler() more clear.
by Alexandre Julliard 16 Sep '09

16 Sep '09

Module: wine Branch: master Commit: deb9404bc53f4e4c810836873c3c9149f4d1612e URL: http://source.winehq.org/git/wine.git/?a=commit;h=deb9404bc53f4e4c810836873… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Tue Sep 15 22:25:07 2009 +0200 winedos: Make an expression in DOSVM_Int10Handler() more clear. --- dlls/winedos/int10.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winedos/int10.c b/dlls/winedos/int10.c index a0b82ed..e1ce312 100644 --- a/dlls/winedos/int10.c +++ b/dlls/winedos/int10.c @@ -1139,7 +1139,7 @@ void WINAPI DOSVM_Int10Handler( CONTEXT86 *context ) to I/O address 0x3d9 bit 4 */ if(data->VideoMode >= 4 && data->VideoMode <= 6) { - VGA_SetBright((BL_reg(context) & 0x10) && 1); + VGA_SetBright((BL_reg(context) & 0x10) != 0); VGA_UpdatePalette(); } else FIXME("Set Background/Border Color: %d/%d\n",

1 0

Gerald Pfeifer : winedos: Clarify three logical expressions.
by Alexandre Julliard 16 Sep '09

16 Sep '09

Module: wine Branch: master Commit: 26527b4c706f0e0fc4d159e8d4343435740f34f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26527b4c706f0e0fc4d159e8d… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Tue Sep 15 22:29:25 2009 +0200 winedos: Clarify three logical expressions. --- dlls/winedos/vga.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winedos/vga.c b/dlls/winedos/vga.c index bc3f8c3..66b6fd6 100644 --- a/dlls/winedos/vga.c +++ b/dlls/winedos/vga.c @@ -1824,7 +1824,7 @@ void VGA_ioport_out( WORD port, BYTE val ) FIXME("Unsupported value, VGA register 0x3d8: 0x%02x (bit 5) - blink is not supported.\n", val); } /* Enable Video Signal (bit 3) - Set the enabled bit */ - VGA_SetEnabled((val & 0x08) && 1); + VGA_SetEnabled((val & 0x08) != 0); /* xxx1x010 - Detect 160x200, 16 color mode (CGA composite) */ if( (val & 0x17) == 0x12 ) @@ -1885,10 +1885,10 @@ void VGA_ioport_out( WORD port, BYTE val ) /* Colour control register (CGA) */ case 0x3d9: /* Set bright */ - VGA_SetBright((val & 0x10) && 1); + VGA_SetBright((val & 0x10) != 0); /* Set palette index */ - VGA_SetPaletteIndex((val & 0x20) && 1); + VGA_SetPaletteIndex((val & 0x20) != 0); /* Now update the palette */ VGA_UpdatePalette();

1 0

Alistair Leslie-Hughes : mshtml: Implement IHTMLCurrentStyle_get_bottom.
by Alexandre Julliard 16 Sep '09

16 Sep '09

Module: wine Branch: master Commit: 8f0fd2597ab2433edfe5666c4bc60613cacf870b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f0fd2597ab2433edfe5666c4… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Sep 16 15:56:16 2009 +1000 mshtml: Implement IHTMLCurrentStyle_get_bottom. --- dlls/mshtml/htmlcurstyle.c | 4 ++-- dlls/mshtml/htmlstyle.c | 3 +++ dlls/mshtml/htmlstyle.h | 1 + dlls/mshtml/tests/dom.c | 5 +++++ 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlcurstyle.c b/dlls/mshtml/htmlcurstyle.c index d6edc3a..89f8ab8 100644 --- a/dlls/mshtml/htmlcurstyle.c +++ b/dlls/mshtml/htmlcurstyle.c @@ -600,8 +600,8 @@ static HRESULT WINAPI HTMLCurrentStyle_get_right(IHTMLCurrentStyle *iface, VARIA static HRESULT WINAPI HTMLCurrentStyle_get_bottom(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_BOTTOM, p, 0); } static HRESULT WINAPI HTMLCurrentStyle_get_imeMode(IHTMLCurrentStyle *iface, BSTR *p) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 56a38d8..4d3d9b1 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -81,6 +81,8 @@ static const WCHAR attrBorderTopWidth[] = {'b','o','r','d','e','r','-','t','o','p','-','w','i','d','t','h',0}; static const WCHAR attrBorderWidth[] = {'b','o','r','d','e','r','-','w','i','d','t','h',0}; +static const WCHAR attrBottom[] = + {'b','o','t','t','o','m',0}; static const WCHAR attrColor[] = {'c','o','l','o','r',0}; static const WCHAR attrCursor[] = @@ -177,6 +179,7 @@ static const struct{ {attrBorderTopStyle, DISPID_IHTMLSTYLE_BORDERTOPSTYLE}, {attrBorderTopWidth, DISPID_IHTMLSTYLE_BORDERTOPWIDTH}, {attrBorderWidth, DISPID_IHTMLSTYLE_BORDERWIDTH}, + {attrBottom, DISPID_IHTMLSTYLE2_BOTTOM}, {attrColor, DISPID_IHTMLSTYLE_COLOR}, {attrCursor, DISPID_IHTMLSTYLE_CURSOR}, {attrDisplay, DISPID_IHTMLSTYLE_DISPLAY}, diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index fccda1b..dbe2970 100644 --- a/dlls/mshtml/htmlstyle.h +++ b/dlls/mshtml/htmlstyle.h @@ -58,6 +58,7 @@ typedef enum { STYLEID_BORDER_TOP_STYLE, STYLEID_BORDER_TOP_WIDTH, STYLEID_BORDER_WIDTH, + STYLEID_BOTTOM, STYLEID_COLOR, STYLEID_CURSOR, STYLEID_DISPLAY, diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index abefe20..b69705d 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2791,6 +2791,11 @@ static void test_current_style(IHTMLCurrentStyle *current_style) ok(hres == S_OK, "get_Right failed: %08x\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); VariantClear(&v); + + hres = IHTMLCurrentStyle_get_bottom(current_style, &v); + ok(hres == S_OK, "get_bottom 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_right.
by Alexandre Julliard 16 Sep '09

16 Sep '09

Module: wine Branch: master Commit: 2ef9272e816178eb1e1447a67d7fc17f5e10b3f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ef9272e816178eb1e1447a67… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Sep 16 15:52:36 2009 +1000 mshtml: Implement IHTMLCurrentStyle_get_right. --- dlls/mshtml/htmlcurstyle.c | 4 ++-- dlls/mshtml/htmlstyle.c | 3 +++ dlls/mshtml/htmlstyle.h | 1 + dlls/mshtml/tests/dom.c | 5 +++++ 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlcurstyle.c b/dlls/mshtml/htmlcurstyle.c index 44f623b..d6edc3a 100644 --- a/dlls/mshtml/htmlcurstyle.c +++ b/dlls/mshtml/htmlcurstyle.c @@ -593,8 +593,8 @@ static HRESULT WINAPI HTMLCurrentStyle_get_unicodeBidi(IHTMLCurrentStyle *iface, static HRESULT WINAPI HTMLCurrentStyle_get_right(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_RIGHT, p, 0); } static HRESULT WINAPI HTMLCurrentStyle_get_bottom(IHTMLCurrentStyle *iface, VARIANT *p) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 1a6f610..56a38d8 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -129,6 +129,8 @@ static const WCHAR attrPaddingTop[] = {'p','a','d','d','i','n','g','-','t','o','p',0}; static const WCHAR attrPosition[] = {'p','o','s','i','t','i','o','n',0}; +static const WCHAR attrRight[] = + {'r','i','g','h','t',0}; static const WCHAR attrTextAlign[] = {'t','e','x','t','-','a','l','i','g','n',0}; static const WCHAR attrTextDecoration[] = @@ -199,6 +201,7 @@ static const struct{ {attrPaddingRight, DISPID_IHTMLSTYLE_PADDINGRIGHT}, {attrPaddingTop, DISPID_IHTMLSTYLE_PADDINGTOP}, {attrPosition, DISPID_IHTMLSTYLE2_POSITION}, + {attrRight, DISPID_IHTMLSTYLE2_RIGHT}, {attrTextAlign, DISPID_IHTMLSTYLE_TEXTALIGN}, {attrTextDecoration, DISPID_IHTMLSTYLE_TEXTDECORATION}, {attrTop, DISPID_IHTMLSTYLE_TOP}, diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index 08305fd..fccda1b 100644 --- a/dlls/mshtml/htmlstyle.h +++ b/dlls/mshtml/htmlstyle.h @@ -82,6 +82,7 @@ typedef enum { STYLEID_PADDING_RIGHT, STYLEID_PADDING_TOP, STYLEID_POSITION, + STYLEID_RIGHT, STYLEID_TEXT_ALIGN, STYLEID_TEXT_DECORATION, STYLEID_TOP, diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index fd8e57d..abefe20 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2786,6 +2786,11 @@ static void test_current_style(IHTMLCurrentStyle *current_style) ok(hres == S_OK, "get_marginBottom failed: %08x\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); VariantClear(&v); + + hres = IHTMLCurrentStyle_get_right(current_style, &v); + ok(hres == S_OK, "get_Right 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_marginBottom.
by Alexandre Julliard 16 Sep '09

16 Sep '09

Module: wine Branch: master Commit: d1952288b8e0c646e9676c4009677067b8dd22b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1952288b8e0c646e9676c400… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Sep 16 15:48:43 2009 +1000 mshtml: Implement IHTMLCurrentStyle_get_marginBottom. --- dlls/mshtml/htmlcurstyle.c | 4 ++-- dlls/mshtml/htmlstyle.c | 3 +++ dlls/mshtml/htmlstyle.h | 1 + dlls/mshtml/tests/dom.c | 5 +++++ 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlcurstyle.c b/dlls/mshtml/htmlcurstyle.c index 3418b22..44f623b 100644 --- a/dlls/mshtml/htmlcurstyle.c +++ b/dlls/mshtml/htmlcurstyle.c @@ -452,8 +452,8 @@ static HRESULT WINAPI HTMLCurrentStyle_get_marginRight(IHTMLCurrentStyle *iface, static HRESULT WINAPI HTMLCurrentStyle_get_marginBottom(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_BOTTOM, p, 0); } static HRESULT WINAPI HTMLCurrentStyle_get_marginLeft(IHTMLCurrentStyle *iface, VARIANT *p) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 649e4b1..1a6f610 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -107,6 +107,8 @@ static const WCHAR attrLetterSpacing[] = {'l','e','t','t','e','r','-','s','p','a','c','i','n','g',0}; static const WCHAR attrMargin[] = {'m','a','r','g','i','n',0}; +static const WCHAR attrMarginBottom[] = + {'m','a','r','g','i','n','-','b','o','t','t','o','m',0}; static const WCHAR attrMarginLeft[] = {'m','a','r','g','i','n','-','l','e','f','t',0}; static const WCHAR attrMarginRight[] = @@ -186,6 +188,7 @@ static const struct{ {attrLeft, DISPID_IHTMLSTYLE_LEFT}, {attrLetterSpacing, DISPID_IHTMLSTYLE_LETTERSPACING}, {attrMargin, DISPID_IHTMLSTYLE_MARGIN}, + {attrMarginBottom, DISPID_IHTMLSTYLE_MARGINBOTTOM}, {attrMarginLeft, DISPID_IHTMLSTYLE_MARGINLEFT}, {attrMarginRight, DISPID_IHTMLSTYLE_MARGINRIGHT}, {attrMarginTop, DISPID_IHTMLSTYLE_MARGINTOP}, diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index bb4c6c7..08305fd 100644 --- a/dlls/mshtml/htmlstyle.h +++ b/dlls/mshtml/htmlstyle.h @@ -71,6 +71,7 @@ typedef enum { STYLEID_LEFT, STYLEID_LETTER_SPACING, STYLEID_MARGIN, + STYLEID_MARGIN_BOTTOM, STYLEID_MARGIN_LEFT, STYLEID_MARGIN_RIGHT, STYLEID_MARGIN_TOP, diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index e9e246d..fd8e57d 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2781,6 +2781,11 @@ static void test_current_style(IHTMLCurrentStyle *current_style) ok(hres == S_OK, "get_marginTop failed: %08x\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); VariantClear(&v); + + hres = IHTMLCurrentStyle_get_marginBottom(current_style, &v); + ok(hres == S_OK, "get_marginBottom 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_marginTop.
by Alexandre Julliard 16 Sep '09

16 Sep '09

Module: wine Branch: master Commit: 6ec071605971c7dcbd388ce3dfb2cd1ee6bf3353 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ec071605971c7dcbd388ce3d… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Sep 16 15:46:16 2009 +1000 mshtml: Implement IHTMLCurrentStyle_get_marginTop. --- dlls/mshtml/htmlcurstyle.c | 4 ++-- dlls/mshtml/htmlstyle.c | 3 +++ dlls/mshtml/htmlstyle.h | 1 + dlls/mshtml/tests/dom.c | 5 +++++ 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlcurstyle.c b/dlls/mshtml/htmlcurstyle.c index a1483ec..3418b22 100644 --- a/dlls/mshtml/htmlcurstyle.c +++ b/dlls/mshtml/htmlcurstyle.c @@ -438,8 +438,8 @@ static HRESULT WINAPI HTMLCurrentStyle_get_backgroundAttachment(IHTMLCurrentStyl static HRESULT WINAPI HTMLCurrentStyle_get_marginTop(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_TOP, p, 0); } static HRESULT WINAPI HTMLCurrentStyle_get_marginRight(IHTMLCurrentStyle *iface, VARIANT *p) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 698dff1..649e4b1 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -111,6 +111,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 attrMarginTop[] = + {'m','a','r','g','i','n','-','t','o','p',0}; static const WCHAR attrMinHeight[] = {'m','i','n','-','h','e','i','g','h','t',0}; static const WCHAR attrOverflow[] = @@ -186,6 +188,7 @@ static const struct{ {attrMargin, DISPID_IHTMLSTYLE_MARGIN}, {attrMarginLeft, DISPID_IHTMLSTYLE_MARGINLEFT}, {attrMarginRight, DISPID_IHTMLSTYLE_MARGINRIGHT}, + {attrMarginTop, DISPID_IHTMLSTYLE_MARGINTOP}, {attrMinHeight, DISPID_IHTMLSTYLE4_MINHEIGHT}, {attrOverflow, DISPID_IHTMLSTYLE_OVERFLOW}, {attrPaddingBottom, DISPID_IHTMLSTYLE_PADDINGBOTTOM}, diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index 03ee72a..bb4c6c7 100644 --- a/dlls/mshtml/htmlstyle.h +++ b/dlls/mshtml/htmlstyle.h @@ -73,6 +73,7 @@ typedef enum { STYLEID_MARGIN, STYLEID_MARGIN_LEFT, STYLEID_MARGIN_RIGHT, + STYLEID_MARGIN_TOP, STYLEID_MIN_HEIGHT, STYLEID_OVERFLOW, STYLEID_PADDING_BOTTOM, diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 1eb950f..e9e246d 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2776,6 +2776,11 @@ static void test_current_style(IHTMLCurrentStyle *current_style) ok(hres == S_OK, "get_letterSpacing failed: %08x\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); VariantClear(&v); + + hres = IHTMLCurrentStyle_get_marginTop(current_style, &v); + ok(hres == S_OK, "get_marginTop 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