December 2007 - Wine-Commits

Alexander Nicolaysen Sørnes : distribution: Sort test results by Wine version as well as rating
by Chris Morgan Dec. 19, 2007

Dec. 19, 2007

Module: appdb Branch: master Commit: 66e884d65a578549824db57dc53f9ca988883b8c URL: http://source.winehq.org/git/appdb.git/?a=commit;h=66e884d65a578549824db57d… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Thu Dec 20 01:30:29 2007 +0100 distribution: Sort test results by Wine version as well as rating --- include/distribution.php | 21 +++++++++++++++------ 1 files changed, 15 insertions(+), 6 deletions(-) diff --git a/include/distribution.php b/include/distribution.php index 25526cf..1169bf5 100644 --- a/include/distribution.php +++ b/include/distribution.php @@ -51,24 +51,33 @@ class distribution { if($_SESSION['current']->hasPriv("admin")) { $sQuery = "SELECT testingId - FROM testResults - WHERE distributionId = '?' - ORDER BY testedRating;" ; + FROM testResults, ?.versions + WHERE + versions.value = testResults.testedRelease + AND + versions.product_id = '?' + AND + distributionId = '?' + ORDER BY testedRating,bugs.versions.id DESC"; } else /* only let users view test results that aren't queued and for apps that */ /* aren't queued or versions that aren't queued */ { $sQuery = "SELECT testingId - FROM testResults, appFamily, appVersion + FROM testResults, appFamily, appVersion, ?.versions WHERE testResults.state = 'accepted' AND + versions.value = testResults.testedRelease + AND + versions.product_id = '?' + AND testResults.versionId = appVersion.versionId AND appFamily.appId = appVersion.appId AND appFamily.state = 'accepted' AND appVersion.state = 'accepted' AND distributionId = '?' - ORDER BY testedRating;"; + ORDER BY testedRating,bugs.versions.id DESC"; } - if($hResult = query_parameters($sQuery, $this->iDistributionId)) + if($hResult = query_parameters($sQuery, BUGZILLA_DB, BUGZILLA_PRODUCT_ID, $this->iDistributionId)) { while($oRow = query_fetch_object($hResult)) {

1 0

Alexander Nicolaysen Sørnes : Order a version's testData table by Wine version, then date
by Chris Morgan Dec. 19, 2007

Dec. 19, 2007

Module: appdb Branch: master Commit: 42239a63789ec72285523ae24e6174c23edbaadf URL: http://source.winehq.org/git/appdb.git/?a=commit;h=42239a63789ec72285523ae2… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Thu Dec 20 01:37:48 2007 +0100 Order a version's testData table by Wine version, then date --- include/testData.php | 20 ++++++++++++++------ unit_test/test_testData.php | 2 ++ 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/include/testData.php b/include/testData.php index 81a308d..8dbf0a0 100644 --- a/include/testData.php +++ b/include/testData.php @@ -621,16 +621,20 @@ class testData{ $bShowAll = ($aClean['bShowAll'] == "true") ? true : false; $sQuery = "SELECT * - FROM testResults + FROM testResults, ?.versions WHERE versionId = '?' AND + versions.value = testResults.testedRelease + AND + versions.product_id = '?' + AND state = '?' - ORDER BY testedDate DESC"; + ORDER BY versions.id DESC,testedDate DESC"; if(!$bShowAll) $sQuery.=" LIMIT 0,".$iDisplayLimit; - $hResult = query_parameters($sQuery, $this->iVersionId, 'accepted'); + $hResult = query_parameters($sQuery, BUGZILLA_DB, $this->iVersionId, BUGZILLA_PRODUCT_ID, 'accepted'); if(!$hResult) return; @@ -682,13 +686,17 @@ class testData{ /* retrieve the latest test result for a given version id */ function getNewestTestIdFromVersionId($iVersionId, $sState = 'accepted') { - $sQuery = "SELECT testingId FROM testResults WHERE + $sQuery = "SELECT testingId FROM testResults, ?.versions WHERE + versions.value = testResults.testedRelease + AND + versions.product_id = '?' + AND versionId = '?' AND state = '?' - ORDER BY testedDate DESC limit 1"; + ORDER BY versions.id DESC,testedDate DESC limit 1"; - $hResult = query_parameters($sQuery, $iVersionId, $sState); + $hResult = query_parameters($sQuery, BUGZILLA_DB, BUGZILLA_PRODUCT_ID, $iVersionId, $sState); if(!$hResult) return 0; diff --git a/unit_test/test_testData.php b/unit_test/test_testData.php index c17fdcb..f79f23a 100644 --- a/unit_test/test_testData.php +++ b/unit_test/test_testData.php @@ -18,11 +18,13 @@ function test_testData_getNewestTestidFromVersionId() $oOldTestData = new testData(); $oOldTestData->iVersionId = $iVersionId; + $oOldTestData->sTestedRelease = '0.9.50.'; if(!$oOldTestData->create()) error("oOldTestData->create() failed"); $oNewTestData = new testData(); $oNewTestData->iVersionId = $iVersionId; + $oNewTestData->sTestedRelease = '0.9.51.'; if(!$oNewTestData->create()) error("oNewTestData->create() failed");

1 0

Alexander Nicolaysen Sørnes : tesetData_queue: Remove useless check
by Chris Morgan Dec. 19, 2007

Dec. 19, 2007

Module: appdb Branch: master Commit: f1dc4f22b1d299977dfc4302d032c0664e9a12cf URL: http://source.winehq.org/git/appdb.git/?a=commit;h=f1dc4f22b1d299977dfc4302… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Dec 12 19:07:38 2007 +0100 tesetData_queue: Remove useless check --- include/testData_queue.php | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/testData_queue.php b/include/testData_queue.php index 9447ab3..50b3caf 100644 --- a/include/testData_queue.php +++ b/include/testData_queue.php @@ -55,8 +55,8 @@ class testData_queue function reQueue() { $this->oTestData->reQueue(); - if($this->oDistribution->sQueued == "rejected") - $this->oDistribution->reQueue(); + + $this->oDistribution->reQueue(); } function unQueue()

1 0

Dmitry Timoshkov : include: Add CONTEXT86_EXTENDED_REGISTERS and CONTEXT86_ALL definitions.
by Alexandre Julliard Dec. 19, 2007

Dec. 19, 2007

Module: wine Branch: master Commit: 06ce44e9ce1cc8a352d801b3df56c3e192d0fbd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06ce44e9ce1cc8a352d801b3d… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Dec 19 11:43:38 2007 +0800 include: Add CONTEXT86_EXTENDED_REGISTERS and CONTEXT86_ALL definitions. --- include/winnt.h | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index f103c0d..7ac4703 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -789,7 +789,10 @@ typedef struct _CONTEXT86 #define CONTEXT86_SEGMENTS (CONTEXT_i386 | 0x0004) /* DS, ES, FS, GS */ #define CONTEXT86_FLOATING_POINT (CONTEXT_i386 | 0x0008L) /* 387 state */ #define CONTEXT86_DEBUG_REGISTERS (CONTEXT_i386 | 0x0010L) /* DB 0-3,6,7 */ +#define CONTEXT86_EXTENDED_REGISTERS (CONTEXT_i386 | 0x0020L) #define CONTEXT86_FULL (CONTEXT86_CONTROL | CONTEXT86_INTEGER | CONTEXT86_SEGMENTS) +#define CONTEXT86_ALL (CONTEXT86_CONTROL | CONTEXT86_INTEGER | CONTEXT86_SEGMENTS | \ + CONTEXT86_FLOATING_POINT | CONTEXT86_DEBUG_REGISTERS | CONTEXT86_EXTENDED_REGISTERS) /* i386 context definitions */ #ifdef __i386__ @@ -799,7 +802,9 @@ typedef struct _CONTEXT86 #define CONTEXT_SEGMENTS CONTEXT86_SEGMENTS #define CONTEXT_FLOATING_POINT CONTEXT86_FLOATING_POINT #define CONTEXT_DEBUG_REGISTERS CONTEXT86_DEBUG_REGISTERS +#define CONTEXT_EXTENDED_REGISTERS CONTEXT86_EXTENDED_REGISTERS #define CONTEXT_FULL CONTEXT86_FULL +#define CONTEXT_ALL CONTEXT86_ALL typedef CONTEXT86 CONTEXT;

1 0

Dmitry Timoshkov : user32: Set the edit text in a combobox only if combobox has strings.
by Alexandre Julliard Dec. 19, 2007

Dec. 19, 2007

Module: wine Branch: master Commit: 0e799c6d7bfefcce10323680ecd249286046cce4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e799c6d7bfefcce10323680e… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Dec 19 17:36:36 2007 +0800 user32: Set the edit text in a combobox only if combobox has strings. --- dlls/user32/combo.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/user32/combo.c b/dlls/user32/combo.c index b846618..6f0fd84 100644 --- a/dlls/user32/combo.c +++ b/dlls/user32/combo.c @@ -1030,9 +1030,12 @@ static void CBUpdateEdit( LPHEADCOMBO lphc , INT index ) } } - lphc->wState |= (CBF_NOEDITNOTIFY | CBF_NOLBSELECT); - SendMessageW(lphc->hWndEdit, WM_SETTEXT, 0, pText ? (LPARAM)pText : (LPARAM)empty_stringW); - lphc->wState &= ~(CBF_NOEDITNOTIFY | CBF_NOLBSELECT); + if( CB_HASSTRINGS(lphc) ) + { + lphc->wState |= (CBF_NOEDITNOTIFY | CBF_NOLBSELECT); + SendMessageW(lphc->hWndEdit, WM_SETTEXT, 0, pText ? (LPARAM)pText : (LPARAM)empty_stringW); + lphc->wState &= ~(CBF_NOEDITNOTIFY | CBF_NOLBSELECT); + } if( lphc->wState & CBF_FOCUSED ) SendMessageW(lphc->hWndEdit, EM_SETSEL, 0, (LPARAM)(-1));

1 0

Roy Shea : qmgr: Generate C file with local GUID definitions from bits.idl.
by Alexandre Julliard Dec. 19, 2007

Dec. 19, 2007

Module: wine Branch: master Commit: 6ceb8e1f31fe3d6067c5ac201449e29409f5cc7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ceb8e1f31fe3d6067c5ac201… Author: Roy Shea <roy(a)cs.hmc.edu> Date: Mon Dec 17 14:38:33 2007 -0800 qmgr: Generate C file with local GUID definitions from bits.idl. --- .gitignore | 2 ++ dlls/qmgr/Makefile.in | 2 ++ dlls/qmgr/qmgr_local.idl | 19 +++++++++++++++++++ 3 files changed, 23 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index 21e0dbe..eee1787 100644 --- a/.gitignore +++ b/.gitignore @@ -381,6 +381,8 @@ dlls/psapi/tests/*.ok dlls/psapi/tests/psapi_crosstest.exe dlls/psapi/tests/testlist.c dlls/qcap/version.res +dlls/qmgr/qmgr_local.h +dlls/qmgr/qmgr_local_i.c dlls/qmgrprxy/qmgrprxy.h dlls/qmgrprxy/qmgrprxy_i.c dlls/qmgrprxy/qmgrprxy_p.c diff --git a/dlls/qmgr/Makefile.in b/dlls/qmgr/Makefile.in index 5ac07d3..d01f2b8 100644 --- a/dlls/qmgr/Makefile.in +++ b/dlls/qmgr/Makefile.in @@ -9,6 +9,8 @@ EXTRALIBS = C_SRCS = \ qmgr_main.c +IDL_I_SRCS = qmgr_local.idl + @MAKE_DLL_RULES@ @DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/qmgr/qmgr_local.idl b/dlls/qmgr/qmgr_local.idl new file mode 100644 index 0000000..f72325f --- /dev/null +++ b/dlls/qmgr/qmgr_local.idl @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2007 Google (Roy Shea) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "bits.idl"

1 0

Dmitry Timoshkov : user32: Make sure to setup clipping before any painting is done.
by Alexandre Julliard Dec. 19, 2007

Dec. 19, 2007

Module: wine Branch: master Commit: 9e3ab87a9c2cf5219e721c122a176d5fa9cae817 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e3ab87a9c2cf5219e721c122… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Dec 19 12:56:03 2007 +0800 user32: Make sure to setup clipping before any painting is done. --- dlls/user32/button.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/user32/button.c b/dlls/user32/button.c index d6ee30c..74720a0 100644 --- a/dlls/user32/button.c +++ b/dlls/user32/button.c @@ -903,6 +903,7 @@ static void CB_Paint( HWND hwnd, HDC hDC, UINT action ) if (!hBrush) /* did the app forget to call defwindowproc ? */ hBrush = (HBRUSH)DefWindowProcW(parent, WM_CTLCOLORSTATIC, (WPARAM)hDC, (LPARAM)hwnd ); + setup_clipping( hwnd, hDC ); if (style & BS_LEFTTEXT) { @@ -916,7 +917,7 @@ static void CB_Paint( HWND hwnd, HDC hDC, UINT action ) rtext.left += checkBoxWidth + 4; rbox.right = checkBoxWidth; } - + /* Since WM_ERASEBKGND does nothing, first prepare background */ if (action == ODA_SELECT) FillRect( hDC, &rbox, hBrush ); if (action == ODA_DRAWENTIRE) FillRect( hDC, &client, hBrush ); @@ -982,8 +983,6 @@ static void CB_Paint( HWND hwnd, HDC hDC, UINT action ) if (dtFlags == (UINT)-1L) /* Noting to draw */ return; - setup_clipping( hwnd, hDC ); - if (action == ODA_DRAWENTIRE) BUTTON_DrawLabel(hwnd, hDC, dtFlags, &rtext); @@ -1044,6 +1043,7 @@ static void GB_Paint( HWND hwnd, HDC hDC, UINT action ) if (!hbr) /* did the app forget to call defwindowproc ? */ hbr = (HBRUSH)DefWindowProcW(parent, WM_CTLCOLORSTATIC, (WPARAM)hDC, (LPARAM)hwnd); + setup_clipping( hwnd, hDC ); GetClientRect( hwnd, &rc); rcFrame = rc; @@ -1058,8 +1058,6 @@ static void GB_Paint( HWND hwnd, HDC hDC, UINT action ) if (dtFlags == (UINT)-1L) return; - setup_clipping( hwnd, hDC ); - /* Because buttons have CS_PARENTDC class style, there is a chance * that label will be drawn out of client rect. * But Windows doesn't clip label's rect, so do I.

1 0

Dmitry Timoshkov : gdi32: In the calculations use a fixed dmSize, not a passed in (possibly too large) one.
by Alexandre Julliard Dec. 19, 2007

Dec. 19, 2007

Module: wine Branch: master Commit: c316c1a29fbfd77ecebc5b580acbfaaa4d198706 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c316c1a29fbfd77ecebc5b580… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Dec 19 11:43:05 2007 +0800 gdi32: In the calculations use a fixed dmSize, not a passed in (possibly too large) one. --- dlls/gdi32/driver.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 4d1aaad..a2aa033 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -411,14 +411,14 @@ BOOL DRIVER_GetDriverName( LPCWSTR device, LPWSTR driver, DWORD size ) DEVMODEW * WINAPI GdiConvertToDevmodeW(const DEVMODEA *dmA) { DEVMODEW *dmW; - WORD dmW_size; + WORD dmW_size, dmA_size; - dmW_size = dmA->dmSize; - if (dmW_size > sizeof(DEVMODEA)) - dmW_size = sizeof(DEVMODEA); + dmA_size = dmA->dmSize; + if (dmA_size > sizeof(DEVMODEA)) + dmA_size = sizeof(DEVMODEA); - dmW_size += CCHDEVICENAME; - if (dmA->dmSize >= FIELD_OFFSET(DEVMODEA, dmFormName) + CCHFORMNAME) + dmW_size = dmA_size + CCHDEVICENAME; + if (dmA_size >= FIELD_OFFSET(DEVMODEA, dmFormName) + CCHFORMNAME) dmW_size += CCHFORMNAME; dmW = HeapAlloc(GetProcessHeap(), 0, dmW_size + dmA->dmDriverExtra); @@ -427,18 +427,18 @@ DEVMODEW * WINAPI GdiConvertToDevmodeW(const DEVMODEA *dmA) MultiByteToWideChar(CP_ACP, 0, (const char*) dmA->dmDeviceName, CCHDEVICENAME, dmW->dmDeviceName, CCHDEVICENAME); /* copy slightly more, to avoid long computations */ - memcpy(&dmW->dmSpecVersion, &dmA->dmSpecVersion, dmA->dmSize - CCHDEVICENAME); + memcpy(&dmW->dmSpecVersion, &dmA->dmSpecVersion, dmA_size - CCHDEVICENAME); - if (dmA->dmSize >= FIELD_OFFSET(DEVMODEA, dmFormName) + CCHFORMNAME) + if (dmA_size >= FIELD_OFFSET(DEVMODEA, dmFormName) + CCHFORMNAME) { MultiByteToWideChar(CP_ACP, 0, (const char*) dmA->dmFormName, CCHFORMNAME, dmW->dmFormName, CCHFORMNAME); - if (dmA->dmSize > FIELD_OFFSET(DEVMODEA, dmLogPixels)) - memcpy(&dmW->dmLogPixels, &dmA->dmLogPixels, dmA->dmSize - FIELD_OFFSET(DEVMODEA, dmLogPixels)); + if (dmA_size > FIELD_OFFSET(DEVMODEA, dmLogPixels)) + memcpy(&dmW->dmLogPixels, &dmA->dmLogPixels, dmA_size - FIELD_OFFSET(DEVMODEA, dmLogPixels)); } if (dmA->dmDriverExtra) - memcpy((char *)dmW + dmW_size, (const char *)dmA + dmA->dmSize, dmA->dmDriverExtra); + memcpy((char *)dmW + dmW_size, (const char *)dmA + dmA_size, dmA->dmDriverExtra); dmW->dmSize = dmW_size;

1 0

Dmitry Timoshkov : gdi32: When compiling with PSDK headers request latest DEVMODE definition.
by Alexandre Julliard Dec. 19, 2007

Dec. 19, 2007

Module: wine Branch: master Commit: 49f1600b3f89af1f438cd1bdca6db5c4f6e8bc81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49f1600b3f89af1f438cd1bdc… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Dec 19 11:41:07 2007 +0800 gdi32: When compiling with PSDK headers request latest DEVMODE definition. --- dlls/gdi32/tests/dc.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index f292c37..60b6ad7 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WINVER 0x0501 /* request latest DEVMODE */ + #include <assert.h> #include <stdio.h>

1 0

Stefan Dösinger : wined3d: Implement texture -> swapchain blits with stretch_rect_fbo.
by Alexandre Julliard Dec. 19, 2007

Dec. 19, 2007

Module: wine Branch: master Commit: b95f30134b8df9f9b8683ce0e3913c3c5521fa92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b95f30134b8df9f9b8683ce0e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Dec 18 13:52:48 2007 +0100 wined3d: Implement texture -> swapchain blits with stretch_rect_fbo. --- dlls/wined3d/surface.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index e45dd4c..7ba5125 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3095,6 +3095,16 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, RECT * SourceRectangle.top = 0; SourceRectangle.bottom = Src->currentDesc.Height; } + if (wined3d_settings.offscreen_rendering_mode == ORM_FBO && GL_SUPPORT(EXT_FRAMEBUFFER_BLIT) && + (Flags & (WINEDDBLT_KEYSRC | WINEDDBLT_KEYSRCOVERRIDE)) == 0) { + TRACE("Using stretch_rect_fbo\n"); + /* The source is always a texture, but never the currently active render target, and the texture + * contents are never upside down + */ + stretch_rect_fbo((IWineD3DDevice *)myDevice, SrcSurface, (WINED3DRECT *) &SourceRectangle, + (IWineD3DSurface *)This, &rect, Filter, FALSE); + return WINED3D_OK; + } if(!CalculateTexRect(Src, &SourceRectangle, glTexCoord)) { /* Fall back to software */

1 0