July 2007 - Wine-commits - list.winehq.org

Chris Robinson : winemp3: Check the right macro when defining TRUE.
by Alexandre Julliard 11 Jul '07

11 Jul '07

Module: wine Branch: master Commit: 23d3302e381d0e6b6d06d929cf0fa5aa3ea74db1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23d3302e381d0e6b6d06d929c… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Tue Jul 10 09:05:38 2007 -0700 winemp3: Check the right macro when defining TRUE. --- dlls/winemp3.acm/mpg123.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winemp3.acm/mpg123.h b/dlls/winemp3.acm/mpg123.h index 23f1a66..b397641 100644 --- a/dlls/winemp3.acm/mpg123.h +++ b/dlls/winemp3.acm/mpg123.h @@ -61,7 +61,7 @@ #ifndef FALSE #define FALSE 0 #endif -#ifndef FALSE +#ifndef TRUE #define TRUE 1 #endif

1 0

Chris Robinson : winemp3: Use head_check to check for valid headers.
by Alexandre Julliard 11 Jul '07

11 Jul '07

Module: wine Branch: master Commit: 22e94d0ba6aaec37b899437dcfc8880c32b31fa3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22e94d0ba6aaec37b899437dc… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Tue Jul 10 09:08:56 2007 -0700 winemp3: Use head_check to check for valid headers. --- dlls/winemp3.acm/common.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/winemp3.acm/common.c b/dlls/winemp3.acm/common.c index 4e28e2e..de329f1 100644 --- a/dlls/winemp3.acm/common.c +++ b/dlls/winemp3.acm/common.c @@ -53,7 +53,6 @@ int pcm_point = 0; #define HDRCMPMASK 0xfffffd00 -#if 0 int head_check(unsigned long head) { if( (head & 0xffe00000) != 0xffe00000) @@ -66,7 +65,6 @@ int head_check(unsigned long head) return FALSE; return TRUE; } -#endif /* @@ -75,6 +73,9 @@ int head_check(unsigned long head) */ int decode_header(struct frame *fr,unsigned long newhead) { + if(head_check(newhead) == FALSE) + return (0); + if( newhead & (1<<20) ) { fr->lsf = (newhead & (1<<19)) ? 0x0 : 0x1; fr->mpeg25 = 0; @@ -85,10 +86,6 @@ int decode_header(struct frame *fr,unsigned long newhead) } fr->lay = 4-((newhead>>17)&3); - if( ((newhead>>10)&0x3) == 0x3) { - fprintf(stderr,"Stream error\n"); - return (0); - } if(fr->mpeg25) { fr->sampling_frequency = 6 + ((newhead>>10)&0x3); }

1 0

appdb/. application.css apidb.css
by WineHQ 11 Jul '07

11 Jul '07

ChangeSet ID: 31248 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/07/10 23:45:12 Modified files: . : application.css apidb.css Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Make the background color for platinum a little bit darker for people with bright displays. Switch to using the name for 'gold' instead of a hex rgb color value. Patch: http://cvs.winehq.org/patch.py?id=31248 Old revision New revision Changes Path 1.9 1.10 +4 -4 appdb/application.css 1.20 1.21 +3 -3 appdb/apidb.css Index: appdb/application.css diff -u -p appdb/application.css:1.9 appdb/application.css:1.10 --- appdb/application.css:1.9 11 Jul 2007 4:45:12 -0000 +++ appdb/application.css 11 Jul 2007 4:45:12 -0000 @@ -43,14 +43,14 @@ table.historyTable { border: 1px; font-family: "bitstream vera sans", "verdana", "arial", "helvetica", sans-serif; font-size: 12px; } -td.platinum { background-color: #EFEFEF; } -td.gold { background-color: #fff600; } +td.platinum { background-color: #ECECEC; } +td.gold { background-color: gold; } td.silver { background-color: silver; } td.bronze { background-color: #fcba0a; } td.garbage { background-color: #999966; } -td.platinum { background-color: #EFEFEF; } -tr.gold { background-color: #fff600; } +td.platinum { background-color: #ECECEC; } +tr.gold { background-color: gold; } tr.silver { background-color: silver; } tr.bronze { background-color: #fcba0a; } tr.garbage { background-color: #999966; } Index: appdb/apidb.css diff -u -p appdb/apidb.css:1.20 appdb/apidb.css:1.21 --- appdb/apidb.css:1.20 11 Jul 2007 4:45:12 -0000 +++ appdb/apidb.css 11 Jul 2007 4:45:12 -0000 @@ -133,9 +133,9 @@ p.indent { padding-left: 1em; .committed { font-style: italic; color: gray; } /* App Support status */ -.platinum { background-color: #EFEFEF; } -.gold { background-color: #fff600; } -.silver { background-color: silver; } +.platinum { background-color: #ECECEC; } +.gold { background-color: gold; } +.silver { background-color: silver; } .bronze { background-color: #fcba0a; } .Garbage { background-color: #999966; }

1 0

appdb/. index.php
by WineHQ 11 Jul '07

11 Jul '07

ChangeSet ID: 31247 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/07/10 23:35:46 Modified files: . : index.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Make the browse by 'silver' link the same as the rest of the browse by links Patch: http://cvs.winehq.org/patch.py?id=31247 Old revision New revision Changes Path 1.50 1.51 +1 -1 appdb/index.php Index: appdb/index.php diff -u -p appdb/index.php:1.50 appdb/index.php:1.51 --- appdb/index.php:1.50 11 Jul 2007 4:35:46 -0000 +++ appdb/index.php 11 Jul 2007 4:35:46 -0000 @@ -124,7 +124,7 @@ if(!$_SESSION['current']->isLoggedIn()) <div class="topx_style silver"> <div class="rating_header"> <div class="rating_title"> - Top-10 <a href="browse_by_rating.php?sRating=Silver">Silver List</a> + Top-10 <a href="browse_by_rating.php?sRating=Silver">Silver</a> List </div> Applications with minor issues that do not affect typical usage </div>

1 0

appdb/. apidb.css
by WineHQ 11 Jul '07

11 Jul '07

ChangeSet ID: 31246 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/07/10 23:28:21 Modified files: . : apidb.css Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Add some padding to the application name cells in the top-X tables so the text isn't right against the left hand side of the table. Patch: http://cvs.winehq.org/patch.py?id=31246 Old revision New revision Changes Path 1.19 1.20 +1 -1 appdb/apidb.css Index: appdb/apidb.css diff -u -p appdb/apidb.css:1.19 appdb/apidb.css:1.20 --- appdb/apidb.css:1.19 11 Jul 2007 4:28:21 -0000 +++ appdb/apidb.css 11 Jul 2007 4:28:21 -0000 @@ -197,7 +197,7 @@ TD.no { color: #B10000; font-style: ita TD.stub { color: #0000B1; font-style: italic; text-align: center } /* width of the application column in the top 'X' lists on the main page */ -TD.app_name { width: 150px } +TD.app_name { padding:10px; width: 150px } /* Rating Number */ .rating { font-family: Helvetica, Arial; font-size: 6pt; color: #333333; }

1 0

appdb/. application.css index.php
by WineHQ 11 Jul '07

11 Jul '07

ChangeSet ID: 31245 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/07/10 23:17:02 Modified files: . : application.css index.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Clean up the appdb main page. Update top-X lists to be inside of colored DIVs so the sections can be easily distinguished. Remove unnecessary text to make the page easier to read. Patch: http://cvs.winehq.org/patch.py?id=31245 Old revision New revision Changes Path 1.8 1.9 +5 -0 appdb/application.css 1.49 1.50 +54 -37 appdb/index.php Index: appdb/application.css diff -u -p appdb/application.css:1.8 appdb/application.css:1.9 --- appdb/application.css:1.8 11 Jul 2007 4:17: 2 -0000 +++ appdb/application.css 11 Jul 2007 4:17: 2 -0000 @@ -62,3 +62,8 @@ div.info_container { margin:6px; border: div.info_contents { padding:10px; background-color: #eee; } div.title_class { font-weight: bold; border-bottom: 1px solid; padding: 4px; font-size: 140%; background-color: #ddd; } + +/* classes for the main page */ +div.rating_header { padding: 8px; } +div.rating_title { padding-bottom: 4px; font-weight: bold; font-size: 160%; } +div.topx_style { padding:7px; margin:6px; border:2px solid; } Index: appdb/index.php diff -u -p appdb/index.php:1.49 appdb/index.php:1.50 --- appdb/index.php:1.49 11 Jul 2007 4:17: 2 -0000 +++ appdb/index.php 11 Jul 2007 4:17: 2 -0000 @@ -54,9 +54,6 @@ if(!$_SESSION['current']->isLoggedIn()) } ?> -<p> -If you have screenshots or links to contribute, please browse the database and use the AppDB interface to send us your contributions (any member can send screenshots; if you want to send how-to's or other information, you can either enroll to be a maintainer or post this information as a comment for the application of interest). -</p> <?php $iNumApps = version::objectGetEntriesCount(false, false); @@ -84,44 +81,64 @@ If you have screenshots or links to cont <br /><br /> -<h2>Top Voted Applications</h2> - -<p>This is a list of applications that are known to be working well and for which many users have voted.</p> - -<h3>The Top-10 <a href="browse_by_rating.php?sRating=Platinum">Platinum</a> List</h3> -<p>Only applications which install and run flawlessly on an out-of-the-box Wine installation make it to the Platinum list.</p> -<table class="platinum"> - <tr class="rowtitle"> - <th>Application</th><th>Description</th><th>Screenshot</th> - </tr> -<?php - outputTopXRowAppsFromRating('Platinum', 10); -?> -</table> +<div class="topx_style platinum"> + <div class="rating_header"> + <div class="rating_title"> + Top-10 <a href="browse_by_rating.php?sRating=Platinum">Platinum</a> List + </div> + Applications which install and run flawlessly on an out-of-the-box Wine installation + </div> + <div> + <table class="platinum"> + <tr class="rowtitle"> + <th>Application</th><th>Description</th><th>Screenshot</th> + </tr> + <?php + outputTopXRowAppsFromRating('Platinum', 10); + ?> + </table> + </div> +</div> <br /> -<h3>The Top-10 <a href="browse_by_rating.php?sRating=Gold">Gold</a> List</h3> -<p>Applications that work flawlessly with some DLL overrides or other settings, crack etc. make it to the Gold list.</p> -<table class="gold"> - <tr class="rowtitle"> - <th>Application</th><th>Description</th><th>Screenshot</th> - </tr> -<?php - outputTopXRowAppsFromRating('Gold', 10); -?> -</table> +<div class="topx_style gold"> + <div class="rating_header"> + <div class="rating_title"> + Top-10 <a href="browse_by_rating.php?sRating=Gold">Gold</a> List + </div> + Applications that work flawlessly with some special configuration + </div> + <div> + <table class="gold"> + <tr class="rowtitle"> + <th>Application</th><th>Description</th><th>Screenshot</th> + </tr> + <?php + outputTopXRowAppsFromRating('Gold', 10); + ?> + </table> + </div> +</div> <br /> -<h3>The Top-10 <a href="browse_by_rating.php?sRating=Silver">Silver List</a></h3> -<p>The Silver list contains apps which we hope we can easily fix so they make it to Gold status.</p> -<table class=silver> - <tr class=rowtitle> - <th>Application</th><th>Description</th><th>Screenshot</th> - </tr> -<?php - outputTopXRowAppsFromRating('Silver', 10); -?> -</table> +<div class="topx_style silver"> + <div class="rating_header"> + <div class="rating_title"> + Top-10 <a href="browse_by_rating.php?sRating=Silver">Silver List</a> + </div> + Applications with minor issues that do not affect typical usage + </div> + <div> + <table class="silver"> + <tr class="rowtitle"> + <th>Application</th><th>Description</th><th>Screenshot</th> + </tr> + <?php + outputTopXRowAppsFromRating('Silver', 10); + ?> + </table> + </div> +</div> <br /><br />

1 0

appdb/include sidebar.php
by WineHQ 11 Jul '07

11 Jul '07

ChangeSet ID: 31244 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/07/10 21:41:58 Modified files: include : sidebar.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Place the 'AppDB' link at the top of the global menu, users may use it to return back to the main page of the AppDB and having it be the second link makes it more difficult to locate Patch: http://cvs.winehq.org/patch.py?id=31244 Old revision New revision Changes Path 1.32 1.33 +1 -1 appdb/include/sidebar.php Index: appdb/include/sidebar.php diff -u -p appdb/include/sidebar.php:1.32 appdb/include/sidebar.php:1.33 --- appdb/include/sidebar.php:1.32 11 Jul 2007 2:41:58 -0000 +++ appdb/include/sidebar.php 11 Jul 2007 2:41:58 -0000 @@ -11,8 +11,8 @@ function global_sidebar_menu() global $aClean; $g = new htmlmenu(APPDB_OWNER." Menu"); - $g->add(APPDB_OWNER, APPDB_OWNER_URL); $g->add("AppDB", BASE); + $g->add(APPDB_OWNER, APPDB_OWNER_URL); $g->add("Bugzilla", BUGZILLA_ROOT); $g->add("Wine Wiki", "http://wiki.winehq.org"); $g->done();

1 0

appdb/include testData.php version.php
by WineHQ 11 Jul '07

11 Jul '07

ChangeSet ID: 31243 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/07/10 21:38:09 Modified files: include : testData.php version.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Application view should list the number of test results for each version, this lets the appdb user see which versions have the most feedback Patch: http://cvs.winehq.org/patch.py?id=31243 Old revision New revision Changes Path 1.64 1.65 +15 -0 appdb/include/testData.php 1.134 1.135 +2 -0 appdb/include/version.php Index: appdb/include/testData.php diff -u -p appdb/include/testData.php:1.64 appdb/include/testData.php:1.65 --- appdb/include/testData.php:1.64 11 Jul 2007 2:38: 9 -0000 +++ appdb/include/testData.php 11 Jul 2007 2:38: 9 -0000 @@ -777,6 +777,21 @@ class testData{ return $sReturn; } + // return the number of test data entries for a particular version id + function get_testdata_count_for_versionid($iVersionId) + { + $sQuery = "SELECT count(*) as cnt + FROM testResults + WHERE versionId = '?' + AND + queued = '?';"; + + $hResult = query_parameters($sQuery, $iVersionId, 'false'); + + $oRow = mysql_fetch_object($hResult); + return $oRow->cnt; + } + function objectGetEntriesCount($bQueued, $bRejected) { $oTest = new testData(); Index: appdb/include/version.php diff -u -p appdb/include/version.php:1.134 appdb/include/version.php:1.135 --- appdb/include/version.php:1.134 11 Jul 2007 2:38:10 -0000 +++ appdb/include/version.php 11 Jul 2007 2:38:10 -0000 @@ -1010,6 +1010,7 @@ class version { echo " <td>Description</td>\n"; echo " <td width=\"80\">Rating</td>\n"; echo " <td width=\"80\">Wine version</td>\n"; + echo " <td width=\"80\">Test results</td>\n"; echo " <td width=\"40\">Comments</td>\n"; echo "</tr>\n\n"; @@ -1033,6 +1034,7 @@ class version { echo " <td>".util_trim_description($oVersion->sDescription)."</td>\n"; echo " <td $sRatingColor align=center>".$oVersion->sTestedRating."</td>\n"; echo " <td $sRatingColor align=center>".$oVersion->sTestedRelease."</td>\n"; + echo " <td align=center>".testData::get_testdata_count_for_versionid($oVersion->iVersionId)."</td>\n"; echo " <td align=center>".Comment::get_comment_count_for_versionid($oVersion->iVersionId)."</td>\n"; echo "</tr>\n\n";

1 0

Alexandre Julliard : aclocal: Add macros for logging messages about missing features.
by Alexandre Julliard 10 Jul '07

10 Jul '07

Module: wine Branch: master Commit: 8d8c5c60a6c46ef193f140d4bf02ecba502e4d11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d8c5c60a6c46ef193f140d4b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 10 15:05:40 2007 +0200 aclocal: Add macros for logging messages about missing features. --- aclocal.m4 | 31 +++++++++++++++++++++++++++++++ 1 files changed, 31 insertions(+), 0 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index ff071f5..1799ff0 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -153,6 +153,37 @@ dnl AC_DEFUN([WINE_CONFIG_EXTRA_DIR], [AC_CONFIG_COMMANDS([$1],[test -d "$1" || (AC_MSG_NOTICE([creating $1]) && mkdir "$1")])]) +dnl **** Add a message to the list displayed at the end **** +dnl +dnl Usage: WINE_NOTICE(notice) +dnl Usage: WINE_NOTICE_IF(test, notice) +dnl Usage: WINE_WARNING(warning) +dnl Usage: WINE_WARNING_IF(test, warning) +dnl Usage: WINE_PRINT_MESSAGES +dnl +AC_DEFUN([WINE_NOTICE],[wine_notices="$wine_notices|$1"]) +AC_DEFUN([WINE_NOTICE_IF],[AS_IF([$1],[WINE_NOTICE([$2],[$3])])]) +AC_DEFUN([WINE_WARNING],[wine_warnings="$wine_warnings|$1"]) +AC_DEFUN([WINE_WARNING_IF],[AS_IF([$1],[WINE_WARNING([$2],[$3])])]) + +AC_DEFUN([WINE_PRINT_MESSAGES],[ac_save_IFS="$IFS" +IFS="|" +if test "$verbose" = "yes"; then + for msg in $wine_notices; do + if test -n "$msg"; then + echo >&2 + AC_MSG_NOTICE([$msg]) + fi + done +fi +for msg in $wine_warnings; do + if test -n "$msg"; then + echo >&2 + AC_MSG_WARN([$msg]) + fi +done +IFS="$ac_save_IFS"]) + dnl Local Variables: dnl compile-command: "autoreconf --warnings=all" dnl End:

1 0

Alexandre Julliard : configure: Move notices about missing features next to the corresponding checks.
by Alexandre Julliard 10 Jul '07

10 Jul '07

Module: wine Branch: master Commit: f9dec94f9f4c59dd79f91e781ed8d840bb2f3940 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9dec94f9f4c59dd79f91e781… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 10 15:14:15 2007 +0200 configure: Move notices about missing features next to the corresponding checks. --- configure | 413 +++++++++++++++++++++------------------------------------- configure.ac | 314 +++++++++++--------------------------------- 2 files changed, 228 insertions(+), 499 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f9dec94f9f4c59dd79f91…

1 0