December 2007 - Wine-commits

Stefan Dösinger : winex11: Remove an unused variable.
by Alexandre Julliard 12 Dec '07

12 Dec '07

Module: wine Branch: master Commit: ab8deb275ed7fbf51206e166b1aafc25ad17fc61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab8deb275ed7fbf51206e166b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Dec 7 15:06:39 2007 +0100 winex11: Remove an unused variable. --- dlls/winex11.drv/xvidmode.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/xvidmode.c b/dlls/winex11.drv/xvidmode.c index 7951373..be05ac4 100644 --- a/dlls/winex11.drv/xvidmode.c +++ b/dlls/winex11.drv/xvidmode.c @@ -143,8 +143,6 @@ void X11DRV_XF86VM_Init(void) Bool ok; int nmodes; unsigned int i; - DWORD dwBpp = screen_depth; - if (dwBpp == 24) dwBpp = 32; if (xf86vm_major) return; /* already initialized? */

1 0

Stefan Dösinger : gdi32, winex11drv: Add a test for compatible bitmap depths.
by Alexandre Julliard 12 Dec '07

12 Dec '07

Module: wine Branch: master Commit: aa390e840b025c41524439093fb268f259b1190c URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa390e840b025c41524439093… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Dec 7 16:12:26 2007 +0100 gdi32, winex11drv: Add a test for compatible bitmap depths. --- dlls/gdi32/tests/bitmap.c | 36 +++++++++++++++++++++++++----------- dlls/winex11.drv/bitmap.c | 8 ++++---- 2 files changed, 29 insertions(+), 15 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index 6f87e29..49dbb4e 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -1555,7 +1555,8 @@ static void test_select_object(void) { HDC hdc; HBITMAP hbm, hbm_old; - INT planes, bpp; + INT planes, bpp, i; + DWORD depths[] = {8, 15, 16, 24, 32}; hdc = GetDC(0); ok(hdc != 0, "GetDC(0) failed\n"); @@ -1594,17 +1595,30 @@ static void test_select_object(void) DeleteObject(hbm); - /* test a color bitmap that doesn't match the dc's bpp */ - planes = GetDeviceCaps(hdc, PLANES); - bpp = GetDeviceCaps(hdc, BITSPIXEL) == 24 ? 8 : 24; - - hbm = CreateBitmap(10, 10, planes, bpp, NULL); - ok(hbm != 0, "CreateBitmap failed\n"); - - hbm_old = SelectObject(hdc, hbm); - ok(hbm_old == 0, "SelectObject should fail\n"); + for(i = 0; i < sizeof(depths)/sizeof(depths[0]); i++) { + /* test a color bitmap to dc bpp matching */ + planes = GetDeviceCaps(hdc, PLANES); + bpp = GetDeviceCaps(hdc, BITSPIXEL); + + hbm = CreateBitmap(10, 10, planes, depths[i], NULL); + ok(hbm != 0, "CreateBitmap failed\n"); + + hbm_old = SelectObject(hdc, hbm); + if(depths[i] == bpp || + (bpp == 16 && depths[i] == 15) /* 16 and 15 bpp are compatible */ + ) { + ok(hbm_old != 0, "SelectObject failed, BITSPIXEL: %d, created depth: %d\n", bpp, depths[i]); + SelectObject(hdc, hbm_old); + } else { + if(bpp == 24 && depths[i] == 32) { + todo_wine ok(hbm_old == 0, "SelectObject should fail. BITSPIXELS: %d, created depth: %d\n", bpp, depths[i]); + } else { + ok(hbm_old == 0, "SelectObject should fail. BITSPIXELS: %d, created depth: %d\n", bpp, depths[i]); + } + } - DeleteObject(hbm); + DeleteObject(hbm); + } DeleteDC(hdc); } diff --git a/dlls/winex11.drv/bitmap.c b/dlls/winex11.drv/bitmap.c index 6d4180b..e1a26d4 100644 --- a/dlls/winex11.drv/bitmap.c +++ b/dlls/winex11.drv/bitmap.c @@ -124,10 +124,10 @@ BOOL X11DRV_CreateBitmap( X11DRV_PDEVICE *physDev, HBITMAP hbitmap, LPVOID bmBit /* check if bpp is compatible with screen depth */ if (!((bitmap.bmBitsPixel == 1) || (bitmap.bmBitsPixel == screen_depth) || - (bitmap.bmBitsPixel == 24 && screen_depth == 32) || - (bitmap.bmBitsPixel == 32 && screen_depth == 24) || - (bitmap.bmBitsPixel == 15 && screen_depth == 16) || - (bitmap.bmBitsPixel == 16 && screen_depth == 15))) + (bitmap.bmBitsPixel == 24 && screen_depth == 32) || /* FIXME: Not compatible */ + (bitmap.bmBitsPixel == 32 && screen_depth == 24) || /* FIXME: Not compatible */ + (bitmap.bmBitsPixel == 15 && screen_depth == 16) || /* Confirmed by tests */ + (bitmap.bmBitsPixel == 16 && screen_depth == 15))) /* TODO: Confirm this */ { ERR("Trying to make bitmap with planes=%d, bpp=%d\n", bitmap.bmPlanes, bitmap.bmBitsPixel);

1 0

Stefan Dösinger : wined3d: Remove 24/32 bit hacks.
by Alexandre Julliard 12 Dec '07

12 Dec '07

Module: wine Branch: master Commit: 51adbf5bbfa32991d8c18070b553908fb926f510 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51adbf5bbfa32991d8c18070b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Dec 11 16:38:18 2007 +0100 wined3d: Remove 24/32 bit hacks. --- dlls/wined3d/device.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 798f310..d09b94d 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1520,7 +1520,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateAdditionalSwapChain(IWineD3DDevic memset(&devmode, 0, sizeof(devmode)); devmode.dmSize = sizeof(devmode); devmode.dmFields = DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT; - devmode.dmBitsPerPel = (bpp >= 24) ? 32 : bpp; /* Stupid XVidMode cannot change bpp */ + devmode.dmBitsPerPel = bpp; devmode.dmPelsWidth = pPresentationParameters->BackBufferWidth; devmode.dmPelsHeight = pPresentationParameters->BackBufferHeight; ChangeDisplaySettingsExW(This->adapter->DeviceName, &devmode, NULL, CDS_FULLSCREEN, NULL); @@ -1650,7 +1650,7 @@ error: memset(&devmode, 0, sizeof(devmode)); devmode.dmSize = sizeof(devmode); devmode.dmFields = DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT; - devmode.dmBitsPerPel = (formatDesc->bpp >= 3) ? 32 : formatDesc->bpp * 8; /* Stupid XVidMode cannot change bpp */ + devmode.dmBitsPerPel = formatDesc->bpp * 8; devmode.dmPelsWidth = object->orig_width; devmode.dmPelsHeight = object->orig_height; ChangeDisplaySettingsExW(This->adapter->DeviceName, &devmode, NULL, CDS_FULLSCREEN, NULL); @@ -2327,7 +2327,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetDisplayMode(IWineD3DDevice *iface, U devmode.dmSize = sizeof(devmode); devmode.dmFields = DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT; devmode.dmBitsPerPel = formatDesc->bpp * 8; - if(devmode.dmBitsPerPel == 24) devmode.dmBitsPerPel = 32; devmode.dmPelsWidth = pMode->Width; devmode.dmPelsHeight = pMode->Height;

1 0

Marco Schuster : wined3d: Fixed a bug that the 8600M GT could not be detected.
by Alexandre Julliard 12 Dec '07

12 Dec '07

Module: wine Branch: master Commit: 96504632de3f6da2dda0e727e97417c9793b1c7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=96504632de3f6da2dda0e727e… Author: Marco Schuster <marco(a)harddisk.is-a-geek.org> Date: Tue Dec 11 17:18:23 2007 +0100 wined3d: Fixed a bug that the 8600M GT could not be detected. --- dlls/wined3d/directx.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 71525a0..31f2d63 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -976,6 +976,11 @@ BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) { gl_info->gl_card = CARD_NVIDIA_GEFORCE_8800GTS; vidmem = 320; /* The 8800GTS uses 320MB, a 8800GTX can have 768MB */ } + /* Geforce8 - midend mobile */ + else if(strstr(gl_info->gl_renderer, "8600 M")) { + gl_info->gl_card = CARD_NVIDIA_GEFORCE_8600MGT; + vidmem = 512; + } /* Geforce8 - midend */ else if(strstr(gl_info->gl_renderer, "8600") || strstr(gl_info->gl_renderer, "8700")) @@ -983,11 +988,6 @@ BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) { gl_info->gl_card = CARD_NVIDIA_GEFORCE_8600GT; vidmem = 256; } - /* Geforce8 - midend mobile */ - else if(strstr(gl_info->gl_renderer, "8600 M")) { - gl_info->gl_card = CARD_NVIDIA_GEFORCE_8600MGT; - vidmem = 512; - } /* Geforce8 - lowend */ else if(strstr(gl_info->gl_renderer, "8300") || strstr(gl_info->gl_renderer, "8400") ||

1 0

Alexander Nicolaysen Sørnes : testData_queue: Fix references to renamed member
by Chris Morgan 12 Dec '07

12 Dec '07

Module: appdb Branch: master Commit: 5d0269506bafe16126a9aca83e31c48bee20c7ec URL: http://source.winehq.org/git/appdb.git/?a=commit;h=5d0269506bafe16126a9aca8… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Dec 12 01:37:31 2007 +0100 testData_queue: Fix references to renamed member --- include/testData_queue.php | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/testData_queue.php b/include/testData_queue.php index 9e492bc..4ef5ab6 100644 --- a/include/testData_queue.php +++ b/include/testData_queue.php @@ -49,7 +49,7 @@ class testData_queue $this->oTestData->unQueue(); /* Avoid a misguiding message about the distribution being unqueued */ - if($this->oDistribution->sQueued != "false") + if($this->oDistribution->sStatus != 'accepted') $this->oDistribution->unQueue(); } @@ -77,7 +77,7 @@ class testData_queue /* If we are processing queued test results with a queued distribution, we display some additional help here */ if($this->oDistribution->iDistributionId && - $this->oDistribution->sQueued != "false" && $this->canEdit()) + $this->oDistribution->sStatus != 'accepted' && $this->canEdit()) { echo "The user submitted a new distribution, which will be un-queued ". "together with the test data unless you select an existing one ". @@ -88,7 +88,7 @@ class testData_queue distribution is un-queued, there is no need to display the distribution form here */ if(!$this->oTestData->iDistributionId or - $this->oDistribution->sQueued != "false") + $this->oDistribution->sStatus != 'accepted') { echo html_frame_start("New Distribution", "90%"); $this->oDistribution->outputEditor();

1 0

Alexander Nicolaysen Sørnes : distribution: Change 'queued' to 'state'
by Chris Morgan 11 Dec '07

11 Dec '07

Module: appdb Branch: master Commit: 7de721672414381fcc0b7b1ed01346422be97160 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=7de721672414381fcc0b7b1e… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Mon Dec 10 22:35:45 2007 +0100 distribution: Change 'queued' to 'state' --- include/distribution.php | 40 ++++++++++++++++++++-------------------- tables/distributions.sql | 2 +- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/include/distribution.php b/include/distribution.php index ef2c5be..16fc41b 100644 --- a/include/distribution.php +++ b/include/distribution.php @@ -13,7 +13,7 @@ class distribution { var $sUrl; var $sSubmitTime; var $iSubmitterId; - var $sQueued; + var $sState; var $aTestingIds; // constructor, fetches the data. @@ -41,7 +41,7 @@ class distribution { $this->sUrl = $oRow->url; $this->sSubmitTime = $oRow->submitTime; $this->iSubmitterId = $oRow->submitterId; - $this->sQueued = $oRow->queued; + $this->sState = $oRow->state; } /* @@ -101,12 +101,12 @@ class distribution { } $hResult = query_parameters("INSERT INTO distributions (name, url, submitTime, ". - "submitterId, queued) ". + "submitterId, state) ". "VALUES ('?', '?', ?, '?', '?')", $this->sName, $this->sUrl, "NOW()", $_SESSION['current']->iUserId, - $this->mustBeQueued() ? "true" : "false"); + $this->mustBeQueued() ? 'queued' : 'accepted'); if($hResult) { $this->iDistributionId = query_appdb_insert_id(); @@ -149,7 +149,7 @@ class distribution { everyone to delete a queued, empty distribution, because it should be deleted along with the last testData associated with it */ if(!($this->canEdit() || (!sizeof($this->aTestingIds) && - $this->sQueued != "false"))) + $this->sState != 'accepted'))) return false; // if the distribution has test results only enable an admin to delete @@ -184,13 +184,13 @@ class distribution { return FALSE; // If we are not in the queue, we can't move the Distribution out of the queue. - if(!$this->sQueued == 'true') + if($this->sState != 'queued') return false; - if(query_parameters("UPDATE distributions SET queued = '?' WHERE distributionId = '?'", - "false", $this->iDistributionId)) + if(query_parameters("UPDATE distributions SET state = '?' WHERE distributionId = '?'", + 'accepted', $this->iDistributionId)) { - $this->sQueued = 'false'; + $this->sState = 'accepted'; // we send an e-mail to interested people $this->mailSubmitter("add"); $this->SendNotificationMail(); @@ -211,7 +211,7 @@ class distribution { } // If we are not in the queue, we can't move the Distribution out of the queue. - if(!$this->sQueued == 'true') + if($this->sState != 'queued') return false; return $this->delete(); @@ -254,10 +254,10 @@ class distribution { if(query_parameters("UPDATE testResults SET queued = '?' WHERE testingId = '?'", "true", $this->iTestingId)) { - if(query_parameters("UPDATE distribution SET queued = '?' WHERE distributionId = '?'", - "true", $this->iDistributionId)) + if(query_parameters("UPDATE distribution SET state = '?' WHERE distributionId = '?'", + 'queued', $this->iDistributionId)) { - $this->sQueued = 'true'; + $this->sState = 'queued'; // we send an e-mail to interested people $this->SendNotificationMail(); @@ -351,7 +351,7 @@ class distribution { switch($sAction) { case "add": - if($this->sQueued == "false") + if($this->sState == 'accepted') { $sSubject = "Distribution ".$this->sName." added by ". $_SESSION['current']->sRealname; @@ -458,8 +458,8 @@ class distribution { return FALSE; $hResult = query_parameters("SELECT count(distributionId) as num_dists FROM - distributions WHERE queued='?'", - $bQueued ? "true" : "false"); + distributions WHERE state='?'", + $bQueued ? 'queued' : 'accepted'); if($hResult) { @@ -473,7 +473,7 @@ class distribution { function make_distribution_list($varname, $cvalue) { $sQuery = "SELECT name, distributionId FROM distributions - WHERE queued = 'false' + WHERE state = 'accepted' ORDER BY name"; $hResult = query_parameters($sQuery); if(!$hResult) return; @@ -528,9 +528,9 @@ class distribution { $iRows = distribution::objectGetEntriesCount($bQueued, $bRejected); $sQuery = "SELECT * FROM distributions - WHERE queued = '?' ORDER BY $sOrderBy $sOrder LIMIT ?,?"; + WHERE state = '?' ORDER BY $sOrderBy $sOrder LIMIT ?,?"; - return query_parameters($sQuery, $bQueued ? "true" : "false", + return query_parameters($sQuery, $bQueued ? 'queued' : 'accepted', $iStart, $iRows); } @@ -564,7 +564,7 @@ class distribution { /* Maintainers are allowed to process queued test results and therefore also queued distributions */ - if(is_object($this) && $this->sQueued != "false" && + if(is_object($this) && $this->sState != 'accepted' && maintainer::isUserMaintainer($_SESSION['current'])) return TRUE; diff --git a/tables/distributions.sql b/tables/distributions.sql index ab0ef31..d628eae 100644 --- a/tables/distributions.sql +++ b/tables/distributions.sql @@ -11,7 +11,7 @@ create table distributions ( url varchar(255) default NULL, submitTime datetime NOT NULL, submitterId int(11) NOT NULL default '0', - queued enum('true','false','rejected') NOT NULL default 'false', + state enum('accepted','queued') NOT NULL default 'accepted', key(distributionId), index(name) );

1 0

Jacek Caban : mshtml: Added more IHTMLStyle implementation.
by Alexandre Julliard 11 Dec '07

11 Dec '07

Module: wine Branch: master Commit: 141ffa7dd9031f691f8b98cc8ff1600ddd34604d URL: http://source.winehq.org/git/wine.git/?a=commit;h=141ffa7dd9031f691f8b98cc8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 10 20:11:58 2007 +0100 mshtml: Added more IHTMLStyle implementation. --- dlls/mshtml/htmlstyle.c | 74 +++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 69 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 4ac853a..7aab330 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -48,6 +48,8 @@ typedef struct { static const WCHAR attrBackgroundColor[] = {'b','a','c','k','g','r','o','u','n','d','-','c','o','l','o','r',0}; +static const WCHAR attrBorderLeft[] = + {'b','o','r','d','e','r','-','l','e','f','t',0}; static const WCHAR attrColor[] = {'c','o','l','o','r',0}; static const WCHAR attrDisplay[] = @@ -60,6 +62,12 @@ static const WCHAR attrFontStyle[] = {'f','o','n','t','-','s','t','y','l','e',0}; static const WCHAR attrFontWeight[] = {'f','o','n','t','-','w','e','i','g','h','t',0}; +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 attrPaddingLeft[] = + {'p','a','d','d','i','n','g','-','l','e','f','t',0}; static const WCHAR attrTextDecoration[] = {'t','e','x','t','-','d','e','c','o','r','a','t','i','o','n',0}; static const WCHAR attrVisibility[] = @@ -70,6 +78,9 @@ static const WCHAR valLineThrough[] = static const WCHAR valUnderline[] = {'u','n','d','e','r','l','i','n','e',0}; +static const WCHAR px_formatW[] = {'%','d','p','x',0}; +static const WCHAR emptyW[] = {0}; + static HRESULT set_style_attr(HTMLStyle *This, LPCWSTR name, LPCWSTR value) { nsAString str_name, str_value, str_empty; @@ -687,7 +698,24 @@ static HRESULT WINAPI HTMLStyle_get_marginTop(IHTMLStyle *iface, VARIANT *p) static HRESULT WINAPI HTMLStyle_put_marginRight(IHTMLStyle *iface, VARIANT v) { HTMLStyle *This = HTMLSTYLE_THIS(iface); - FIXME("(%p)->(v%d)\n", This, V_VT(&v)); + + TRACE("(%p)->(v(%d))\n", This, V_VT(&v)); + + switch(V_VT(&v)) { + case VT_NULL: + return set_style_attr(This, attrMarginRight, emptyW); + case VT_I4: { + WCHAR buf[14]; + + wsprintfW(buf, px_formatW, V_I4(&v)); + return set_style_attr(This, attrMarginRight, buf); + } + case VT_BSTR: + return set_style_attr(This, attrMarginRight, V_BSTR(&v)); + default: + FIXME("Unsupported vt=%d\n", V_VT(&v)); + } + return E_NOTIMPL; } @@ -715,7 +743,26 @@ static HRESULT WINAPI HTMLStyle_get_marginBottom(IHTMLStyle *iface, VARIANT *p) static HRESULT WINAPI HTMLStyle_put_marginLeft(IHTMLStyle *iface, VARIANT v) { HTMLStyle *This = HTMLSTYLE_THIS(iface); - FIXME("(%p)->(v%d)\n", This, V_VT(&v)); + + switch(V_VT(&v)) { + case VT_NULL: + TRACE("(%p)->(NULL)\n", This); + return set_style_attr(This, attrMarginLeft, emptyW); + case VT_I4: { + WCHAR buf[14]; + + TRACE("(%p)->(%d)\n", This, V_I4(&v)); + + wsprintfW(buf, px_formatW, V_I4(&v)); + return set_style_attr(This, attrMarginLeft, buf); + } + case VT_BSTR: + TRACE("(%p)->(%s)\n", This, debugstr_w(V_BSTR(&v))); + return set_style_attr(This, attrMarginLeft, V_BSTR(&v)); + default: + FIXME("Unsupported vt=%d\n", V_VT(&v)); + } + return E_NOTIMPL; } @@ -785,7 +832,22 @@ static HRESULT WINAPI HTMLStyle_get_paddingBottom(IHTMLStyle *iface, VARIANT *p) static HRESULT WINAPI HTMLStyle_put_paddingLeft(IHTMLStyle *iface, VARIANT v) { HTMLStyle *This = HTMLSTYLE_THIS(iface); - FIXME("(%p)->(v%d)\n", This, V_VT(&v)); + + TRACE("(%p)->(vt=%d)\n", This, V_VT(&v)); + + switch(V_VT(&v)) { + case VT_I4: { + WCHAR buf[14]; + + wsprintfW(buf, px_formatW, V_I4(&v)); + return set_style_attr(This, attrPaddingLeft, buf); + } + case VT_BSTR: + return set_style_attr(This, attrPaddingLeft, V_BSTR(&v)); + default: + FIXME("unsupported vt=%d\n", V_VT(&v)); + } + return E_NOTIMPL; } @@ -869,8 +931,10 @@ static HRESULT WINAPI HTMLStyle_get_borderBottom(IHTMLStyle *iface, BSTR *p) static HRESULT WINAPI HTMLStyle_put_borderLeft(IHTMLStyle *iface, BSTR v) { HTMLStyle *This = HTMLSTYLE_THIS(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + return set_style_attr(This, attrBorderLeft, v); } static HRESULT WINAPI HTMLStyle_get_borderLeft(IHTMLStyle *iface, BSTR *p)

1 0

Jacek Caban : mshtml: Fix CSS px unit handling differences between Gecko and IE.
by Alexandre Julliard 11 Dec '07

11 Dec '07

Module: wine Branch: master Commit: a95420a07e65fbdffac09d573c1cb6e67533506e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a95420a07e65fbdffac09d573… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 10 20:12:40 2007 +0100 mshtml: Fix CSS px unit handling differences between Gecko and IE. --- dlls/mshtml/htmlstyle.c | 77 ++++++++++++++++++++++++++++++++++++---------- 1 files changed, 60 insertions(+), 17 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 7aab330..2461821 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -81,18 +81,61 @@ static const WCHAR valUnderline[] = static const WCHAR px_formatW[] = {'%','d','p','x',0}; static const WCHAR emptyW[] = {0}; -static HRESULT set_style_attr(HTMLStyle *This, LPCWSTR name, LPCWSTR value) +static LPWSTR fix_px_value(LPCWSTR val) +{ + LPCWSTR ptr = val; + + while(*ptr) { + while(*ptr && isspaceW(*ptr)) + ptr++; + if(!*ptr) + break; + + while(*ptr && isdigitW(*ptr)) + ptr++; + + if(!*ptr || isspaceW(*ptr)) { + LPWSTR ret, p; + int len = strlenW(val)+1; + + ret = heap_alloc((len+2)*sizeof(WCHAR)); + memcpy(ret, val, (ptr-val)*sizeof(WCHAR)); + p = ret + (ptr-val); + *p++ = 'p'; + *p++ = 'x'; + strcpyW(p, ptr); + + TRACE("fixed %s -> %s\n", debugstr_w(val), debugstr_w(ret)); + + return ret; + } + + while(*ptr && !isspaceW(*ptr)) + ptr++; + } + + return NULL; +} + +#define ATTR_FIX_PX 1 + +static HRESULT set_style_attr(HTMLStyle *This, LPCWSTR name, LPCWSTR value, DWORD flags) { nsAString str_name, str_value, str_empty; + LPWSTR val = NULL; nsresult nsres; static const PRUnichar wszEmpty[] = {0}; TRACE("(%p)->(%s %s)\n", This, debugstr_w(name), debugstr_w(value)); + if(flags & ATTR_FIX_PX) + val = fix_px_value(value); + nsAString_Init(&str_name, name); - nsAString_Init(&str_value, value); + nsAString_Init(&str_value, val ? val : value); nsAString_Init(&str_empty, wszEmpty); + heap_free(val); nsres = nsIDOMCSSStyleDeclaration_SetProperty(This->nsstyle, &str_name, &str_value, &str_empty); if(NS_FAILED(nsres)) @@ -250,7 +293,7 @@ static HRESULT WINAPI HTMLStyle_put_fontFamily(IHTMLStyle *iface, BSTR v) TRACE("(%p)->(%s)\n", This, debugstr_w(v)); - return set_style_attr(This, attrFontFamily, v); + return set_style_attr(This, attrFontFamily, v, 0); } static HRESULT WINAPI HTMLStyle_get_fontFamily(IHTMLStyle *iface, BSTR *p) @@ -316,7 +359,7 @@ static HRESULT WINAPI HTMLStyle_put_fontSize(IHTMLStyle *iface, VARIANT v) switch(V_VT(&v)) { case VT_BSTR: - return set_style_attr(This, attrFontSize, V_BSTR(&v)); + return set_style_attr(This, attrFontSize, V_BSTR(&v), 0); default: FIXME("not supported vt %d\n", V_VT(&v)); } @@ -387,13 +430,13 @@ static HRESULT WINAPI HTMLStyle_put_backgroundColor(IHTMLStyle *iface, VARIANT v switch(V_VT(&v)) { case VT_BSTR: - return set_style_attr(This, attrBackgroundColor, V_BSTR(&v)); + return set_style_attr(This, attrBackgroundColor, V_BSTR(&v), 0); case VT_I4: { WCHAR value[10]; static const WCHAR format[] = {'#','%','0','6','x',0}; wsprintfW(value, format, V_I4(&v)); - return set_style_attr(This, attrBackgroundColor, value); + return set_style_attr(This, attrBackgroundColor, value, 0); } default: FIXME("unsupported vt %d\n", V_VT(&v)); @@ -703,15 +746,15 @@ static HRESULT WINAPI HTMLStyle_put_marginRight(IHTMLStyle *iface, VARIANT v) switch(V_VT(&v)) { case VT_NULL: - return set_style_attr(This, attrMarginRight, emptyW); + return set_style_attr(This, attrMarginRight, emptyW, 0); case VT_I4: { WCHAR buf[14]; wsprintfW(buf, px_formatW, V_I4(&v)); - return set_style_attr(This, attrMarginRight, buf); + return set_style_attr(This, attrMarginRight, buf, 0); } case VT_BSTR: - return set_style_attr(This, attrMarginRight, V_BSTR(&v)); + return set_style_attr(This, attrMarginRight, V_BSTR(&v), 0); default: FIXME("Unsupported vt=%d\n", V_VT(&v)); } @@ -747,18 +790,18 @@ static HRESULT WINAPI HTMLStyle_put_marginLeft(IHTMLStyle *iface, VARIANT v) switch(V_VT(&v)) { case VT_NULL: TRACE("(%p)->(NULL)\n", This); - return set_style_attr(This, attrMarginLeft, emptyW); + return set_style_attr(This, attrMarginLeft, emptyW, 0); case VT_I4: { WCHAR buf[14]; TRACE("(%p)->(%d)\n", This, V_I4(&v)); wsprintfW(buf, px_formatW, V_I4(&v)); - return set_style_attr(This, attrMarginLeft, buf); + return set_style_attr(This, attrMarginLeft, buf, 0); } case VT_BSTR: TRACE("(%p)->(%s)\n", This, debugstr_w(V_BSTR(&v))); - return set_style_attr(This, attrMarginLeft, V_BSTR(&v)); + return set_style_attr(This, attrMarginLeft, V_BSTR(&v), 0); default: FIXME("Unsupported vt=%d\n", V_VT(&v)); } @@ -840,10 +883,10 @@ static HRESULT WINAPI HTMLStyle_put_paddingLeft(IHTMLStyle *iface, VARIANT v) WCHAR buf[14]; wsprintfW(buf, px_formatW, V_I4(&v)); - return set_style_attr(This, attrPaddingLeft, buf); + return set_style_attr(This, attrPaddingLeft, buf, 0); } case VT_BSTR: - return set_style_attr(This, attrPaddingLeft, V_BSTR(&v)); + return set_style_attr(This, attrPaddingLeft, V_BSTR(&v), 0); default: FIXME("unsupported vt=%d\n", V_VT(&v)); } @@ -934,7 +977,7 @@ static HRESULT WINAPI HTMLStyle_put_borderLeft(IHTMLStyle *iface, BSTR v) TRACE("(%p)->(%s)\n", This, debugstr_w(v)); - return set_style_attr(This, attrBorderLeft, v); + return set_style_attr(This, attrBorderLeft, v, ATTR_FIX_PX); } static HRESULT WINAPI HTMLStyle_get_borderLeft(IHTMLStyle *iface, BSTR *p) @@ -1216,7 +1259,7 @@ static HRESULT WINAPI HTMLStyle_put_display(IHTMLStyle *iface, BSTR v) TRACE("(%p)->(%s)\n", This, debugstr_w(v)); - return set_style_attr(This, attrDisplay, v); + return set_style_attr(This, attrDisplay, v, 0); } static HRESULT WINAPI HTMLStyle_get_display(IHTMLStyle *iface, BSTR *p) @@ -1234,7 +1277,7 @@ static HRESULT WINAPI HTMLStyle_put_visibility(IHTMLStyle *iface, BSTR v) TRACE("(%p)->(%s)\n", This, debugstr_w(v)); - return set_style_attr(This, attrVisibility, v); + return set_style_attr(This, attrVisibility, v, 0); } static HRESULT WINAPI HTMLStyle_get_visibility(IHTMLStyle *iface, BSTR *p)

1 0

Rob Shearman : widl: Add support for non-basetype return types.
by Alexandre Julliard 11 Dec '07

11 Dec '07

Module: wine Branch: master Commit: d458a599eb8efa192004e0a0bea745be0d1cc0be URL: http://source.winehq.org/git/wine.git/?a=commit;h=d458a599eb8efa192004e0a0b… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Dec 10 14:24:11 2007 +0000 widl: Add support for non-basetype return types. --- dlls/rpcrt4/tests/server.c | 10 + dlls/rpcrt4/tests/server.idl | 2 + tools/widl/client.c | 13 ++- tools/widl/proxy.c | 13 ++- tools/widl/server.c | 8 +- tools/widl/typegen.c | 439 ++++++++++++++++++++++-------------------- 6 files changed, 272 insertions(+), 213 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d458a599eb8efa192004e…

1 0

Rob Shearman : rsaenh: Fix some memory leaks in the tests.
by Alexandre Julliard 11 Dec '07

11 Dec '07

Module: wine Branch: master Commit: 0768dc3bebcc08ab2d908fc0aae22a3d42729749 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0768dc3bebcc08ab2d908fc0a… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Dec 10 14:25:32 2007 +0000 rsaenh: Fix some memory leaks in the tests. Remove an incorrect CryptProviderRelease call. --- dlls/rsaenh/tests/rsaenh.c | 20 +++++++++++++++++++- 1 files changed, 19 insertions(+), 1 deletions(-) diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index 4b3176c..9fdd926 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -477,6 +477,8 @@ static void test_block_cipher_modes(void) dwLen = 23; result = CryptEncrypt(hKey, (HCRYPTHASH)NULL, TRUE, 0, abData, &dwLen, 24); ok(!result && GetLastError() == NTE_BAD_ALGID, "%08x\n", GetLastError()); + + CryptDestroyKey(hKey); } static void test_3des112(void) @@ -1133,18 +1135,23 @@ static void test_import_private(void) result = CryptDecrypt(hSessionKey, 0, TRUE, 0, abEncryptedMessage, &dwLen); ok(result && dwLen == 12 && !memcmp(abEncryptedMessage, "Wine rocks!",12), "%08x, len: %d\n", GetLastError(), dwLen); + CryptDestroyKey(hSessionKey); if (!derive_key(CALG_RC4, &hSessionKey, 56)) return; dwLen = (DWORD)sizeof(abSessionKey); result = CryptExportKey(hSessionKey, hKeyExchangeKey, SIMPLEBLOB, 0, abSessionKey, &dwLen); ok(result, "%08x\n", GetLastError()); + CryptDestroyKey(hSessionKey); if (!result) return; dwLen = (DWORD)sizeof(abSessionKey); result = CryptImportKey(hProv, abSessionKey, dwLen, hKeyExchangeKey, 0, &hSessionKey); ok(result, "%08x\n", GetLastError()); if (!result) return; + + CryptDestroyKey(hSessionKey); + CryptDestroyKey(hKeyExchangeKey); } static void test_verify_signature(void) { @@ -1364,6 +1371,8 @@ static void test_verify_signature(void) { ok(!result && GetLastError()==NTE_BAD_SIGNATURE, "%08lx\n", GetLastError()); if (result) return;*/ + CryptDestroyHash(hHash); + result = CryptCreateHash(hProv, CALG_MD4, 0, 0, &hHash); ok(result, "%08x\n", GetLastError()); if (!result) return; @@ -1380,6 +1389,8 @@ static void test_verify_signature(void) { ok(result, "%08x\n", GetLastError()); if (!result) return; + CryptDestroyHash(hHash); + result = CryptCreateHash(hProv, CALG_MD5, 0, 0, &hHash); ok(result, "%08x\n", GetLastError()); if (!result) return; @@ -1396,6 +1407,8 @@ static void test_verify_signature(void) { ok(result, "%08x\n", GetLastError()); if (!result) return; + CryptDestroyHash(hHash); + result = CryptCreateHash(hProv, CALG_SHA, 0, 0, &hHash); ok(result, "%08x\n", GetLastError()); if (!result) return; @@ -1411,6 +1424,9 @@ static void test_verify_signature(void) { result = CryptVerifySignature(hHash, abSignatureSHANoOID, 128, hPubSignKey, NULL, CRYPT_NOHASHOID); ok(result, "%08x\n", GetLastError()); if (!result) return; + + CryptDestroyHash(hHash); + CryptDestroyKey(hPubSignKey); } static void test_rsa_encrypt(void) @@ -1485,6 +1501,8 @@ static void test_import_export(void) ok(result, "failed to export the fresh imported public key\n"); ok(dwLen == 84, "Expected exported key to be 84 bytes long but got %d bytes.\n",dwLen); ok(!memcmp(emptyKey, abPlainPublicKey, dwLen), "exported key is different from the imported key\n"); + + CryptDestroyKey(hPublicKey); } static void test_schannel_provider(void) @@ -1929,6 +1947,7 @@ static void test_null_provider(void) if (!result) return; result = CryptImportKey(prov, signBlob, sizeof(signBlob), 0, 0, &key); ok(result, "CryptGenKey failed: %08x\n", GetLastError()); + CryptDestroyKey(key); /* doesn't allow access to the key exchange key.. */ result = CryptGetUserKey(prov, AT_KEYEXCHANGE, &key); ok(!result && GetLastError() == NTE_NO_KEY, @@ -1961,7 +1980,6 @@ static void test_null_provider(void) CryptAcquireContext(&prov, szContainer, NULL, PROV_RSA_FULL, CRYPT_DELETEKEYSET); - CryptReleaseContext(prov, 0); /* test the machine key set */ CryptAcquireContext(&prov, szContainer, NULL, PROV_RSA_FULL,

1 0