April 2006 - Wine-commits - list.winehq.org

lostwages/ news/2006042801.xml wwn/wn20060428_ ...
by WineHQ 28 Apr '06

28 Apr '06

ChangeSet ID: 24442 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: wineowner(a)winehq.org 2006/04/28 01:53:31 Added files: news : 2006042801.xml wwn : wn20060428_312.xml Log message: WWN #312 Patch: http://cvs.winehq.org/patch.py?id=24442 Old revision New revision Changes Path Added 1.1 +0 -0 lostwages/news/2006042801.xml Added 1.1 +0 -0 lostwages/wwn/wn20060428_312.xml

1 0

appdb/include comment.php
by WineHQ 27 Apr '06

27 Apr '06

ChangeSet ID: 24441 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/04/27 19:53:01 Modified files: include : comment.php Log message: Tony Lambregts <tony.lambregts(a)gmail.com> Add note to use the AppDB to reply to email instead of replying to the email Patch: http://cvs.winehq.org/patch.py?id=24441 Old revision New revision Changes Path 1.14 1.15 +3 -1 appdb/include/comment.php Index: appdb/include/comment.php diff -u -p appdb/include/comment.php:1.14 appdb/include/comment.php:1.15 --- appdb/include/comment.php:1.14 28 Apr 2006 0:53: 1 -0000 +++ appdb/include/comment.php 28 Apr 2006 0:53: 1 -0000 @@ -88,7 +88,9 @@ class Comment { } $sSubject = "Comment for '".lookup_app_name($this->iAppId)." ".lookup_version_name($this->iVersionId)."' added by ".$_SESSION['current']->sRealname; - $sMsg = APPDB_ROOT."appview.php?versionId=".$this->iVersionId."&mode=nested#Comment-".$this->iCommentId."\n"; + $sMsg = "To reply to this email please use the link provided below.\n"; + $sMsg .= "DO NOT reply via your email client as it will not reach the person who wrote the comment\n"; + $sMsg .= APPDB_ROOT."appview.php?versionId=".$this->iVersionId."&mode=nested#Comment-".$this->iCommentId."\n"; $sMsg .= "\n"; $sMsg .= "Subject: ".$this->sSubject."\r\n"; $sMsg .= "\n";

1 0

lostwages/templates/en/wineconf survey06.templ ...
by Jeremy Newman 27 Apr '06

27 Apr '06

ChangeSet ID: 24440 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2006/04/27 10:16:59 Modified files: templates/en/wineconf: survey06.template survey06_done.template survey06_form.template Log message: updating the wineconf06 survey Patch: http://cvs.winehq.org/patch.py?id=24440 Old revision New revision Changes Path 1.1 1.2 +7 -3 lostwages/templates/en/wineconf/survey06.template 1.1 1.2 +1 -1 lostwages/templates/en/wineconf/survey06_done.template 1.1 1.2 +8 -29 lostwages/templates/en/wineconf/survey06_form.template Index: lostwages/templates/en/wineconf/survey06.template diff -u -p lostwages/templates/en/wineconf/survey06.template:1.1 lostwages/templates/en/wineconf/survey06.template:1.2 --- lostwages/templates/en/wineconf/survey06.template:1.1 27 Apr 2006 15:16:59 -0000 +++ lostwages/templates/en/wineconf/survey06.template 27 Apr 2006 15:16:59 -0000 @@ -1,8 +1,12 @@  -<table width="100%"><tr><td><img src="{$root}/images/wineconf/wc06_logo.jpg" width="300" height="152" alt="-LOGO-"></td> -<td align="right"><center><FONT size="+2"><b>Date: Undecided<br /> -Place: Undecided</b></font></center></td></tr></table> +<table width="100%"> +<tr> +<td><img src="{$root}/images/wineconf/wc06_logo.jpg" width="300" height="152" alt="-LOGO-"></td> +<td><FONT size="+1"><b>Date:<br />   September 16th and 17th 2006<br /> +Place:<br />   Reading, United Kingdom</b></font></td> +</tr> +</table> <hr /> Index: lostwages/templates/en/wineconf/survey06_done.template diff -u -p lostwages/templates/en/wineconf/survey06_done.template:1.1 lostwages/templates/en/wineconf/survey06_done.template:1.2 --- lostwages/templates/en/wineconf/survey06_done.template:1.1 27 Apr 2006 15:16:59 -0000 +++ lostwages/templates/en/wineconf/survey06_done.template 27 Apr 2006 15:16:59 -0000 @@ -1,5 +1,5 @@ <h3>Thanks!</h3> -<p>Your answers will help us decide where and when WineConf 2006 will happen.</p> +<p>We look forward to to seeing you at WineConf06.</p> <p> </p> Index: lostwages/templates/en/wineconf/survey06_form.template diff -u -p lostwages/templates/en/wineconf/survey06_form.template:1.1 lostwages/templates/en/wineconf/survey06_form.template:1.2 --- lostwages/templates/en/wineconf/survey06_form.template:1.1 27 Apr 2006 15:16:59 -0000 +++ lostwages/templates/en/wineconf/survey06_form.template 27 Apr 2006 15:16:59 -0000 @@ -1,10 +1,8 @@ {$error} -<p>We'd like your input as we plan Wineconf this year.</p> +<p>Please use this form to let us know if you will be attending WineConf06.</p> -<p>Please only answer this if you are planning to come -(or would come if the answers you give here are -respected).</p> +<p>Please only answer this if you are planning to come.</p> <form name="survey06" action="{$self}" method="post"> @@ -21,31 +19,12 @@ respected).</p> </tr> <tr valign="top"> - <th>Day of Week:</th> + <th>Room Preference:</th> <td> - <input type="radio" name="q[day]" value="weekdays" />Weekdays<br /> - <input type="radio" name="q[day]" value="fri-sat" />Friday - Saturday<br /> - <input type="radio" name="q[day]" value="sat-sun" />Saturday - Sunday<br /> - </td> -</tr> - -<tr valign="top"> - <th>Date:</th> - <td> - <input type="checkbox" name="q[date][]" value="05-13-2006" />May 13th, 2006<br /> - <input type="checkbox" name="q[date][]" value="07-29-2006" />July 29th, 2006<br /> - <input type="checkbox" name="q[date][]" value="09-16-2006" />September 16th, 2006<br /> - <span class="small">(check all dates you can make)</span> - </td> -</tr> - -<tr valign="top"> - <th>Location:</th> - <td> - <input type="radio" name="q[place]" value="UK" />United Kingdom<br /> - <input type="radio" name="q[place]" value="DE" />Try to see if Stuttgart would have us again<br /> - <input type="radio" name="q[place]" value="MN" />Go back to St. Paul when it's warm<br /> - <input type="radio" name="q[place]" value="OTHER" /> Other (put in comments) + <input type="radio" name="q[room]" value="none" />I do not require a room.<br /> + <input type="radio" name="q[room]" value="fri-sat" />I would like a room for Friday night and Saturday night.<br /> + <input type="radio" name="q[room]" value="fri-sun" />I would like a room for Friday night through Sunday night.<br /> + <input type="radio" name="q[room]" value="unsure" />I am not sure if I am coming, add 1/3 of a room for me. </td> </tr> @@ -58,6 +37,6 @@ respected).</p> <p><input type="submit" name="submit" value=" Submit Survey " class="button" /></p> -<input type="hidden" name="fields" value="name|email|day|date|place|comment" /> +<input type="hidden" name="fields" value="name|email|room|comment" /> </form>

1 0

lostwages/templates/en download.template
by Jeremy Newman 27 Apr '06

27 Apr '06

ChangeSet ID: 24439 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2006/04/27 09:28:27 Modified files: templates/en : download.template Log message: Marcus Meissner Adjust SUSE download entry to match what RPMs there are now. Patch: http://cvs.winehq.org/patch.py?id=24439 Old revision New revision Changes Path 1.77 1.78 +1 -1 lostwages/templates/en/download.template Index: lostwages/templates/en/download.template diff -u -p lostwages/templates/en/download.template:1.77 lostwages/templates/en/download.template:1.78 --- lostwages/templates/en/download.template:1.77 27 Apr 2006 14:28:27 -0000 +++ lostwages/templates/en/download.template 27 Apr 2006 14:28:27 -0000 @@ -34,7 +34,7 @@ for post-installation instructions.</b>< <img src="{$root}/images/distro/suse.png" width="50" height="50" alt="SUSE Linux" border="0"></a> </td> <td> <b><a href="http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=7…">SUSE</a></b> - binary and source .rpms for SUSE 9.0, 9.1, 9.2, 9.3, and 10.0</td> + binary and source .rpms for SUSE 9.1, 9.2, 9.3, 10.0, and 10.1</td> <td><a href="mailto:meissner(a)suse.de">Marcus Meissner</a></td> </tr>

1 0

lostwages/templates/en getting_help.template
by Jeremy Newman 27 Apr '06

27 Apr '06

ChangeSet ID: 24438 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2006/04/27 09:20:24 Modified files: templates/en : getting_help.template Log message: hyperlink the bug tracker and appdb text Patch: http://cvs.winehq.org/patch.py?id=24438 Old revision New revision Changes Path 1.1 1.2 +10 -6 lostwages/templates/en/getting_help.template Index: lostwages/templates/en/getting_help.template diff -u -p lostwages/templates/en/getting_help.template:1.1 lostwages/templates/en/getting_help.template:1.2 --- lostwages/templates/en/getting_help.template:1.1 27 Apr 2006 14:20:24 -0000 +++ lostwages/templates/en/getting_help.template 27 Apr 2006 14:20:24 -0000 @@ -16,7 +16,8 @@ <a href="{$root}/site/docs/wine-faq/index"><img src="{$root}/images/faq.png" /><br />FAQ</a> </td> <td valign="top"> - Most questions can be quickly answered by browsing our <a href="{$root}/site/docs/wine-faq/index">FAQ</a>. + Most questions can be quickly answered by browsing our + <a href="{$root}/site/docs/wine-faq/index">FAQ</a>. This is the first place you should check to see if your question has been answered. </td> </tr> @@ -26,8 +27,10 @@ <a href="{$root}/site/docs"><img src="{$root}/images/docs.png" /><br />Docs</a> </td> <td valign="top"> - We recommend that you read our online <a href="{$root}/site/docs">Documentation</a> to find the answer to your question. - Also of interest is our <a href="{$root}/site/howto">HowTo</a> which contains some useful information for the first time user. + We recommend that you read our online <a href="{$root}/site/docs">Documentation</a> + to find the answer to your question. Also of interest is our + <a href="{$root}/site/howto">HowTo</a> which contains some useful information for + the first time user. </td> </tr> @@ -69,7 +72,8 @@ <a href="http://appdb.winehq.org/"><img src="{$root}/images/appdb.png" /><br />AppDB</a> </td> <td valign="top"> - If you want help with a single application our Application Database is a good place to look. + If you want help with a single application our <a href="http://appdb.winehq.org/">Application Database</a> + is a good place to look. </td> </tr> @@ -78,10 +82,10 @@ <a href="http://bugs.winehq.org/"><img src="{$root}/images/bugs.png" /><br />Bugzilla</a> </td> <td valign="top"> - Our Bugzilla Bug Tracker contains all the issues we have worked on and are currently working on. + Our <a href="http://bugs.winehq.org/">Bugzilla Bug Tracker</a> contains all the issues we have + worked on and are currently working on. </td> </tr> - <tr bgcolor="#ffffff"> <td align="center" class="small">

1 0

appdb/admin adminAppQueue.php
by WineHQ 26 Apr '06

26 Apr '06

ChangeSet ID: 24437 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/04/26 20:44:57 Modified files: admin : adminAppQueue.php Log message: Tony Lambregts <tony.lambregts(a)gmail.com> Add a message to the app/version deletion email to clarify deletions due the app/version being moved Patch: http://cvs.winehq.org/patch.py?id=24437 Old revision New revision Changes Path 1.53 1.54 +2 -0 appdb/admin/adminAppQueue.php Index: appdb/admin/adminAppQueue.php diff -u -p appdb/admin/adminAppQueue.php:1.53 appdb/admin/adminAppQueue.php:1.54 --- appdb/admin/adminAppQueue.php:1.53 27 Apr 2006 1:44:57 -0000 +++ appdb/admin/adminAppQueue.php 27 Apr 2006 1:44:57 -0000 @@ -208,6 +208,7 @@ if ($_REQUEST['sub']) $oVersion->update(); /* delete the appId that is the duplicate */ + $_REQUEST['replyText'] = "Your Vesion information was moved to an existing Application"; $oAppDelete = new Application($oApp->iAppId); $oAppDelete->delete(); } @@ -224,6 +225,7 @@ if ($_REQUEST['sub']) $oTest->update(); // delete the Version entry + $_REQUEST['replyText'] = "Your Test results were moved to existing version"; $oVersion = new Version($_REQUEST['versionId']); $oVersion->delete(); }

1 0

appdb/admin adminAppQueue.php
by WineHQ 26 Apr '06

26 Apr '06

ChangeSet ID: 24436 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/04/26 10:12:55 Modified files: admin : adminAppQueue.php Log message: Tony Lambregts <tony.lambregts(a)gmail.com> Allow moving test results of a queued version to an approved version Patch: http://cvs.winehq.org/patch.py?id=24436 Old revision New revision Changes Path 1.52 1.53 +63 -0 appdb/admin/adminAppQueue.php Index: appdb/admin/adminAppQueue.php diff -u -p appdb/admin/adminAppQueue.php:1.52 appdb/admin/adminAppQueue.php:1.53 --- appdb/admin/adminAppQueue.php:1.52 26 Apr 2006 15:12:55 -0000 +++ appdb/admin/adminAppQueue.php 26 Apr 2006 15:12:55 -0000 @@ -71,6 +71,49 @@ function outputSearchTableForDuplicateFl } } +function display_move_test_to_versions_table($aVersionsIds,$icurrentVersionId) +{ + if ($aVersionsIds) + { + echo html_frame_start("","98%","",0); + echo "<table width=\"100%\" border=\"0\" cellpadding=\"3\" cellspacing=\"1\">\n\n"; + + echo "<tr class=color4>\n"; + echo " <td width=\"80\">Version</td>\n"; + echo " <td>Description</td>\n"; + echo " <td width=\"80\">Rating</td>\n"; + echo " <td width=\"80\">Wine version</td>\n"; + echo " <td width=\"40\">Comments</td>\n"; + echo "</tr>\n\n"; + + $c = 0; + foreach($aVersionsIds as $iVersionId) + { + $oVersion = new Version($iVersionId); + if ($oVersion->sQueued == 'false') + { + // set row color + $bgcolor = ($c % 2 == 0) ? "color0" : "color1"; + + //display row + echo "<tr class=$bgcolor>\n"; + echo " <td>".html_ahref($oVersion->sName,"adminAppQueue.php?sub=movetest&apptype=version&versionId=".$icurrentVersionId."&versionIdMergeTo=".$oVersion->iVersionId)."</td>\n"; + + echo " <td>".trim_description($oVersion->sDescription)."</td>\n"; + echo " <td align=center>".$oVersion->sTestedRating."</td>\n"; + echo " <td align=center>".$oVersion->sTestedRelease."</td>\n"; + echo " <td align=center>".sizeof($oVersion->aCommentsIds)."</td>\n"; + echo "</tr>\n\n"; + + $c++; + } + } + echo "</table>\n"; + echo html_frame_end("Click the Version Name to view the details of that Version"); + } +} + + //deny access if not logged in or not a super maintainer of any applications if(!$_SESSION['current']->hasPriv("admin") && !$_SESSION['current']->isSuperMaintainer()) { @@ -172,6 +215,22 @@ if ($_REQUEST['sub']) /* redirect back to the main page */ redirect(apidb_fullurl("admin/adminAppQueue.php")); } + else if ($_REQUEST['sub'] == 'movetest') + { + if(is_numeric($_REQUEST['versionIdMergeTo'])) + { + // move this Test submission under the existing version // + $oTest->iVersionId = $_REQUEST['versionIdMergeTo']; + $oTest->update(); + + // delete the Version entry + $oVersion = new Version($_REQUEST['versionId']); + $oVersion->delete(); + } + + // redirect back to the main page + redirect(apidb_fullurl("admin/adminAppQueue.php")); + } else if ($_REQUEST['sub'] == 'Delete') { @@ -229,6 +288,10 @@ if ($_REQUEST['sub']) display_approved_versions($oAppForVersion->aVersionsIds); echo html_frame_end(" "); + echo html_frame_start("Move test to version","90%","",0); + display_move_test_to_versions_table($oAppForVersion->aVersionsIds,$oVersion->iVersionId); + echo html_frame_end(" "); + //help echo "<div align=center><table width='90%' border=0 cellpadding=3 cellspacing=0><tr><td>\n\n"; echo "<p>This is the full view of the application version waiting to be approved. \n";

1 0

appdb/include version.php
by WineHQ 26 Apr '06

26 Apr '06

ChangeSet ID: 24435 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/04/26 10:11:00 Modified files: include : version.php Log message: Tony Lambregts <tony.lambregts(a)gmail.com> Fix the display-approved_versions() function by switching the use of a '=' in an if() to a '==' Patch: http://cvs.winehq.org/patch.py?id=24435 Old revision New revision Changes Path 1.50 1.51 +1 -1 appdb/include/version.php Index: appdb/include/version.php diff -u -p appdb/include/version.php:1.50 appdb/include/version.php:1.51 --- appdb/include/version.php:1.50 26 Apr 2006 15:11: 0 -0000 +++ appdb/include/version.php 26 Apr 2006 15:11: 0 -0000 @@ -898,7 +898,7 @@ function display_approved_versions($aVer foreach($aVersionsIds as $iVersionId) { $oVersion = new Version($iVersionId); - if ($oVersion->sQueued = 'false') + if ($oVersion->sQueued == 'false') { // set row color $bgcolor = ($c % 2 == 0) ? "color0" : "color1";

1 0

lostwages/ include/config.php templates/en/for ...
by Jeremy Newman 25 Apr '06

25 Apr '06

ChangeSet ID: 24434 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2006/04/25 15:56:30 Modified files: include : config.php templates/en : forums.template Added files: images : appdb.png bugs.png docs.png faq.png forum.png irc.png moinmoin.png paid.png templates/en : getting_help.template irc.template Log message: update the site nav a bit add a getting help page move mailing lists to development section add notes about Google groups as web interface to wine-devel move irc to a seperate page Patch: http://cvs.winehq.org/patch.py?id=24434 Old revision New revision Changes Path Added 1.1 +0 -0 lostwages/images/appdb.png Added 1.1 +0 -0 lostwages/images/bugs.png Added 1.1 +0 -0 lostwages/images/docs.png Added 1.1 +0 -0 lostwages/images/faq.png Added 1.1 +0 -0 lostwages/images/forum.png Added 1.1 +0 -0 lostwages/images/irc.png Added 1.1 +0 -0 lostwages/images/moinmoin.png Added 1.1 +0 -0 lostwages/images/paid.png 1.29 1.30 +10 -5 lostwages/include/config.php 1.20 1.21 +19 -30 lostwages/templates/en/forums.template Added 1.1 +0 -0 lostwages/templates/en/getting_help.template Added 1.1 +0 -0 lostwages/templates/en/irc.template

1 0

Alexandre Julliard : server: Ignore the SizeOfHeaders field and compute the correct size ourselves.
by Alexandre Julliard 21 Apr '06

21 Apr '06

Module: wine Branch: refs/heads/master Commit: d59fa772d552673f4aabf717228fe12821425c17 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d59fa772d552673f4aabf71… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 21 16:16:11 2006 +0200 server: Ignore the SizeOfHeaders field and compute the correct size ourselves. --- server/mapping.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/server/mapping.c b/server/mapping.c index e636ae8..22bf8a1 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -243,7 +243,7 @@ static int get_image_params( struct mapp mapping->size = ROUND_SIZE( nt.OptionalHeader.SizeOfImage ); mapping->base = (void *)nt.OptionalHeader.ImageBase; - mapping->header_size = nt.OptionalHeader.SizeOfHeaders; + mapping->header_size = pos + size; mapping->protect = VPROT_IMAGE; /* sanity check */

1 0