December 2007 - Wine-commits

Rob Shearman : include: Fix the HRESULT_FROM_WIN32 macro to not change the HRESULT if the error is already an HRESULT .
by Alexandre Julliard 03 Dec '07

03 Dec '07

Module: wine Branch: master Commit: 49a5f7cb12acb7bb8e6b8c9ebc66c7089db10592 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49a5f7cb12acb7bb8e6b8c9eb… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Nov 30 18:06:53 2007 +0000 include: Fix the HRESULT_FROM_WIN32 macro to not change the HRESULT if the error is already an HRESULT. --- include/winerror.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/winerror.h b/include/winerror.h index d19b4b0..9cf495e 100644 --- a/include/winerror.h +++ b/include/winerror.h @@ -81,7 +81,7 @@ #define HRESULT_SEVERITY(hr) (((hr) >> 31) & 0x1) #define SCODE_SEVERITY(sc) (((sc) >> 31) & 0x1) -#define __HRESULT_FROM_WIN32(x) ((x) ? ((HRESULT) (((x) & 0x0000FFFF) | (FACILITY_WIN32 << 16) | 0x80000000)) : 0 ) +#define __HRESULT_FROM_WIN32(x) ((HRESULT)(x) > 0 ? ((HRESULT) (((x) & 0x0000FFFF) | (FACILITY_WIN32 << 16) | 0x80000000)) : (HRESULT)(x) ) #ifndef _HRESULT_DEFINED #define _HRESULT_DEFINED # ifdef _MSC_VER @@ -92,7 +92,7 @@ typedef int HRESULT; #endif static inline HRESULT HRESULT_FROM_WIN32(unsigned long x) { - return x ? ((HRESULT) ((x & 0x0000FFFF) | (FACILITY_WIN32 << 16) | 0x80000000)) : 0; + return (HRESULT)x > 0 ? ((HRESULT) ((x & 0x0000FFFF) | (FACILITY_WIN32 << 16) | 0x80000000)) : (HRESULT)x; } #define FACILITY_NT_BIT 0x10000000 #define HRESULT_FROM_NT(x) ((HRESULT) ((x) | FACILITY_NT_BIT))

1 0

Alexander Nicolaysen Sørnes : Add arrow indicating sort order
by Chris Morgan 02 Dec '07

02 Dec '07

Module: appdb Branch: master Commit: ced9b16cae17a38dac5d82aff4466e7794dd7c84 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=ced9b16cae17a38dac5d82af… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sun Dec 2 21:10:47 2007 +0100 Add arrow indicating sort order --- include/table.php | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/include/table.php b/include/table.php index a2d413b..1558824 100644 --- a/include/table.php +++ b/include/table.php @@ -349,6 +349,9 @@ class TableRowSortable extends TableRow $bAscending = FALSE; else $sSortVar = ''; + + $this->aTableCells[$i]->sCellContents .= $oSortInfo->bAscending ? + ' ▲' : ' ▼'; } $sAscending = $bAscending == TRUE ? 'true': 'false';

1 0

Alexander Nicolaysen Sørnes : appData: Some cleanup in SQL code
by Chris Morgan 02 Dec '07

02 Dec '07

Module: appdb Branch: master Commit: 6d9aa68e0ee1a0ffc21a7ce2c1c4bb198e77615d URL: http://source.winehq.org/git/appdb.git/?a=commit;h=6d9aa68e0ee1a0ffc21a7ce2… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sun Dec 2 19:38:17 2007 +0100 appData: Some cleanup in SQL code --- include/appData.php | 13 ++----------- 1 files changed, 2 insertions(+), 11 deletions(-) diff --git a/include/appData.php b/include/appData.php index ac1f1f4..8265763 100644 --- a/include/appData.php +++ b/include/appData.php @@ -214,7 +214,6 @@ class appData $sQueued = "false"; $sSelectType = ""; - $sLimit = ""; if(($sQueued == "true" || $sQueued == "all") && !$_SESSION['current']->hasPriv("admin")) @@ -280,17 +279,13 @@ class appData $sSelectType = " AND type = '?'"; $sQuery = "(SELECT COUNT(DISTINCT appData.id) as count FROM appData, - appFamily, appVersion WHERE - appFamily.appId = appVersion.appId - AND + appFamily WHERE ( appData.appId = appFamily.appId AND appData.versionId = '0' ) AND - appVersion.queued = 'false' - AND appFamily.queued = 'false'$sAppDataQueued$sSelectType) UNION ( SELECT COUNT(DISTINCT appData.id) as count FROM appData, @@ -407,17 +402,13 @@ class appData $sQuery = "( SELECT DISTINCT appData.* FROM appData, - appFamily, appVersion WHERE - appFamily.appId = appVersion.appId - AND + appFamily WHERE ( appData.appId = appFamily.appId AND appData.versionId = '0' ) AND - appVersion.queued = 'false' - AND appFamily.queued = 'false' AND appData.queued = '?'

1 0

Alexander Nicolaysen Sørnes : Use objectManager to display main screenshot gallery
by Chris Morgan 02 Dec '07

02 Dec '07

Module: appdb Branch: master Commit: e52f270498698dab06f686b8e381677fa560d29b URL: http://source.winehq.org/git/appdb.git/?a=commit;h=e52f270498698dab06f686b8… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sun Dec 2 19:39:15 2007 +0100 Use objectManager to display main screenshot gallery --- include/objectManager.php | 118 +++++++++++++++++++++++++-------------------- include/screenshot.php | 60 +++++++++++++++++++++++ include/sidebar.php | 2 +- viewScreenshots.php | 95 ------------------------------------ 4 files changed, 126 insertions(+), 149 deletions(-) Diff: http://source.winehq.org/git/appdb.git/?a=commitdiff;h=e52f270498698dab06f6…

1 0