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

appdb/include distribution.php
by WineHQ 13 Mar '07

13 Mar '07

ChangeSet ID: 30965 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/03/13 13:29:28 Modified files: include : distribution.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Add comment for distribution::objectGetEntries()'s LIMIT behavior Patch: http://cvs.winehq.org/patch.py?id=30965 Old revision New revision Changes Path 1.13 1.14 +2 -1 appdb/include/distribution.php Index: appdb/include/distribution.php diff -u -p appdb/include/distribution.php:1.13 appdb/include/distribution.php:1.14 --- appdb/include/distribution.php:1.13 13 Mar 2007 18:29:28 -0000 +++ appdb/include/distribution.php 13 Mar 2007 18:29:28 -0000 @@ -420,8 +420,9 @@ class distribution { if($bQueued && !distribution::canEdit()) return NULL; + /* If row limit is 0 we want to fetch all rows */ if(!$iRows) - $iRows = distribution::getNumberOfDistributions($bQueued); + $iRows = distribution::objectGetEntriesCount($bQueued); $sQuery = "SELECT * FROM distributions WHERE queued = '?' ORDER BY name LIMIT ?,?";

1 0

appdb/admin adminAppDataQueue.php
by WineHQ 13 Mar '07

13 Mar '07

ChangeSet ID: 30964 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/03/13 12:14:09 Removed files: admin : adminAppDataQueue.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Remove file made obsolete by object manager changes Patch: http://cvs.winehq.org/patch.py?id=30964 Old revision New revision Changes Path 1.32 Removed +0 -0 appdb/admin/adminAppDataQueue.php

1 0

appdb/include distribution.php sidebar.php sid ...
by WineHQ 13 Mar '07

13 Mar '07

ChangeSet ID: 30963 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/03/13 11:59:35 Modified files: include : distribution.php sidebar.php sidebar_admin.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Add distribution queue. Queued distributions are still treated like un-queued ones, since currently only 8 distributions are un-queued. 'View Distributions', however, will only show un-queued distributions. If an admin tries to remove a distribution with associated test results, an error is printed and no action is performed. This could be improved in the future by showing a 'move test data' link. Patch: http://cvs.winehq.org/patch.py?id=30963 Old revision New revision Changes Path 1.12 1.13 +19 -36 appdb/include/distribution.php 1.27 1.28 +1 -1 appdb/include/sidebar.php 1.30 1.31 +3 -0 appdb/include/sidebar_admin.php Index: appdb/include/distribution.php diff -u -p appdb/include/distribution.php:1.12 appdb/include/distribution.php:1.13 --- appdb/include/distribution.php:1.12 13 Mar 2007 16:59:35 -0000 +++ appdb/include/distribution.php 13 Mar 2007 16:59:35 -0000 @@ -145,9 +145,15 @@ class distribution { // is the current user allowed to delete this Distribution? if(!$_SESSION['current']->hasPriv("admin") && !($_SESSION['current']->iUserId == $this->iSubmitterId)) - { return; + + /* Check for associated test results */ + if(sizeof($this->aTestingIds)) + { + addmsg("This distribution still has associated test results", "red"); + return FALSE; } + // now delete the Distribution $sQuery = "DELETE FROM distributions WHERE distributionId = '?' @@ -179,7 +185,7 @@ class distribution { if(!$this->sQueued == 'true') return false; - if(query_parameters("UPDATE distribution SET queued = '?' WHERE distributionId = '?'", + if(query_parameters("UPDATE distributions SET queued = '?' WHERE distributionId = '?'", "false", $this->iDistributionId)) { $this->sQueued = 'false'; @@ -206,23 +212,7 @@ class distribution { if(!$this->sQueued == 'true') return false; - if(query_parameters("UPDATE distribution SET queued = '?' WHERE distributionId = '?'", - "rejected", $this->iDistributionId)) - { - $this->sQueued = 'rejected'; - // we send an e-mail to interested people - if(!$bSilent) - { - $this->mailSubmitter("reject"); - $this->SendNotificationMail("reject"); - } - // the Distribution data has been rejected - return true; - } else - { - addmsg("Error while rejecting Distribution", "red"); - return false; - } + return $this->delete(); } function ReQueue() @@ -271,16 +261,6 @@ class distribution { $sMsg = "The Distribution you submitted (".$this->sName.") has been accepted."; } break; - case "reject": - { - $sSubject = "Distribution rejected"; - $sMsg = "The Distribution you submitted (".$this->sName.") has been rejected."; - $sMsg .= APPDB_ROOT."testingData.php?sSub=view&iVersionId=".$this->iVersionId."\n"; - $sMsg .= "Reason given:\n"; - $sMsg .= $aClean['sReplyText']."\n"; // append the reply text, if there is any - } - - break; case "delete": { $sSubject = "Submitted Distribution deleted"; @@ -387,14 +367,12 @@ class distribution { } /* Get the total number of Distributions in the database */ - function getNumberOfDistributions($bQueued) + function objectGetEntriesCount($bQueued) { - if($bQueued) - $hResult = query_parameters("SELECT count(*) as num_dists FROM - distributions WHERE queued='true';"); - else - $hResult = query_parameters("SELECT count(*) as num_dists FROM - distributions"); + $hResult = query_parameters("SELECT count(distributionId) as num_dists FROM + distributions WHERE queued='?'", + $bQueued ? "true" : "false"); + if($hResult) { $oRow = mysql_fetch_object($hResult); @@ -490,6 +468,11 @@ class distribution { return FALSE; } + function objectHideDelete() + { + return TRUE; + } + function display() { echo "Distribution Name:"; Index: appdb/include/sidebar.php diff -u -p appdb/include/sidebar.php:1.27 appdb/include/sidebar.php:1.28 --- appdb/include/sidebar.php:1.27 13 Mar 2007 16:59:35 -0000 +++ appdb/include/sidebar.php 13 Mar 2007 16:59:35 -0000 @@ -28,7 +28,7 @@ function global_sidebar_menu() $g->add("Submit Application", BASE."appsubmit.php?sSub=view&sAppType=application"); $g->add("Help & Documentation", BASE."help/"); $g->add("AppDB Stats", BASE."appdbStats.php"); - $g->add("View Distributions (".distribution::getNumberOfDistributions(false).")", BASE."objectManager.php?sClass=distribution&bIsQueue=false&sTitle=View%20Distributions"); + $g->add("View Distributions (".distribution::objectGetEntriesCount(false).")", BASE."objectManager.php?sClass=distribution&bIsQueue=false&sTitle=View%20Distributions"); $g->add("View Vendors (".getNumberOfvendors().")", BASE."objectManager.php?sClass=vendor&bIsQueue=false&sTitle=View%20Vendors"); $g->add("Email your suggestions for improving the AppDB", "mailto:appdb(a)winehq.org"); $g->done(); Index: appdb/include/sidebar_admin.php diff -u -p appdb/include/sidebar_admin.php:1.30 appdb/include/sidebar_admin.php:1.31 --- appdb/include/sidebar_admin.php:1.30 13 Mar 2007 16:59:35 -0000 +++ appdb/include/sidebar_admin.php 13 Mar 2007 16:59:35 -0000 @@ -30,6 +30,9 @@ function global_admin_menu() { BASE."admin/adminBugs.php"); $g->add("View Test Results Queue (".testData::getNumberOfQueuedTests().")", BASE."admin/adminTestResults.php"); + $g->add("View Distribution Queue (".distribution::objectGetEntriesCount(true).")", + BASE."objectManager.php?sClass=distribution&bIsQueue=true&sTitle=". + "Distribution%20Queue"); $g->addmisc(" "); $g->add("Users Management", BASE."admin/adminUsers.php");

1 0

tools/winetest dissect
by Jeremy Newman 13 Mar '07

13 Mar '07

ChangeSet ID: 30962 CVSROOT: /opt/cvs-commit Module name: tools Changes by: jnewman(a)winehq.org 2007/03/13 11:11:28 Modified files: winetest : dissect Log message: Paul Vriens <paul.vriens.wine(a)gmail.com> Get rid of fileversion-3 checks Patch: http://cvs.winehq.org/patch.py?id=30962 Old revision New revision Changes Path 1.22 1.23 +0 -6 tools/winetest/dissect Index: tools/winetest/dissect diff -u -p tools/winetest/dissect:1.22 tools/winetest/dissect:1.23 --- tools/winetest/dissect:1.22 13 Mar 2007 16:11:28 -0000 +++ tools/winetest/dissect 13 Mar 2007 16:11:28 -0000 @@ -153,12 +153,6 @@ while (<IN>) { or mydie "no start line:$.: $_"; ($unit,$test,$source,$rev) = ($1,$2,$3,$4); open OUT, ">:raw", $tmpfile or mydie "can't open $tmpfile: $!\n"; - } elsif (s/^(.*$test.*: (\d+) tests executed, (\d+) marked as todo, (\d+) failures?\.)\r?$/$1/) { - $lines++; - $total += $2; - $todo += $3; - $failed += $4; - print OUT; } elsif (s/^(.*$test.*: (\d+) tests executed $(\d+) marked as todo, (\d+) failures?$, (\d+) skipped\.)\r?$/$1/) { $lines++; $total += $2;

1 0

tools/winetest gather
by Jeremy Newman 13 Mar '07

13 Mar '07

ChangeSet ID: 30961 CVSROOT: /opt/cvs-commit Module name: tools Changes by: jnewman(a)winehq.org 2007/03/13 11:10:47 Modified files: winetest : gather Log message: Paul Vriens <paul.vriens.wine(a)gmail.com> Show skip also in the group results Patch: http://cvs.winehq.org/patch.py?id=30961 Old revision New revision Changes Path 1.19 1.20 +1 -1 tools/winetest/gather Index: tools/winetest/gather diff -u -p tools/winetest/gather:1.19 tools/winetest/gather:1.20 --- tools/winetest/gather:1.19 13 Mar 2007 16:10:47 -0000 +++ tools/winetest/gather 13 Mar 2007 16:10:47 -0000 @@ -109,7 +109,7 @@ foreach my $file (glob "$datadir/$build/ } } my $prevdigest = \$group->{digests}->{$testname}; - $$prevdigest = ($count eq "failed" || $error || + $$prevdigest = ($count eq "failed" || $error || $skipped || ($$prevdigest && $$prevdigest ne $digest))?"differ":$digest; } close TEST;

1 0

bugzilla/template/en/default attachment/list.h ...
by Jeremy Newman 13 Mar '07

13 Mar '07

ChangeSet ID: 30960 CVSROOT: /opt/cvs-commit Module name: bugzilla Changes by: jnewman(a)winehq.org 2007/03/13 11:09:54 Modified files: template/en/default/attachment: list.html.tmpl template/en/default/bug: edit.html.tmpl template/en/default/bug/create: create.html.tmpl user-message.html.tmpl Log message: Lei Zhang <thestig(a)google.com> more clear instructions to help prevent pasting logs into bug reports Patch: http://cvs.winehq.org/patch.py?id=30960 Old revision New revision Changes Path 1.1.1.1 1.2 +1 -1 bugzilla/template/en/default/attachment/list.html.tmpl 1.3 1.4 +1 -1 bugzilla/template/en/default/bug/edit.html.tmpl 1.2 1.3 +1 -1 bugzilla/template/en/default/bug/create/create.html.tmpl 1.1.1.1 1.2 +3 -2 bugzilla/template/en/default/bug/create/user-message.html.tmpl Index: bugzilla/template/en/default/attachment/list.html.tmpl diff -u -p bugzilla/template/en/default/attachment/list.html.tmpl:1.1.1.1 bugzilla/template/en/default/attachment/list.html.tmpl:1.2 --- bugzilla/template/en/default/attachment/list.html.tmpl:1.1.1.1 13 Mar 2007 16: 9:54 -0000 +++ bugzilla/template/en/default/attachment/list.html.tmpl 13 Mar 2007 16: 9:54 -0000 @@ -83,7 +83,7 @@ <tr> <td colspan="[% show_attachment_flags ? 4 : 3 %]"> - <a href="attachment.cgi?bugid=[% bugid %]&action=enter">Create a New Attachment</a> (proposed patch, testcase, etc.) + <a href="attachment.cgi?bugid=[% bugid %]&action=enter">Create a New Attachment</a> (back traces, logs, proposed patch, testcase, etc.) </td> <td colspan="1"> <a href="attachment.cgi?bugid=[% bugid %]&action=viewall">View All</a> Index: bugzilla/template/en/default/bug/edit.html.tmpl diff -u -p bugzilla/template/en/default/bug/edit.html.tmpl:1.3 bugzilla/template/en/default/bug/edit.html.tmpl:1.4 --- bugzilla/template/en/default/bug/edit.html.tmpl:1.3 13 Mar 2007 16: 9:54 -0000 +++ bugzilla/template/en/default/bug/edit.html.tmpl 13 Mar 2007 16: 9:54 -0000 @@ -392,7 +392,7 @@ [%# *** Comments Groups *** %] - Additional Comments: Please do not PASTE logs and back traces, (attach them instead). + Additional Comments: Please do not PASTE logs and back traces, (attach them instead). [% IF Param("insidergroup") && UserInGroup(Param("insidergroup")) %] <input type="checkbox" name="commentprivacy" value="1"> Private [% END %] Index: bugzilla/template/en/default/bug/create/create.html.tmpl diff -u -p bugzilla/template/en/default/bug/create/create.html.tmpl:1.2 bugzilla/template/en/default/bug/create/create.html.tmpl:1.3 --- bugzilla/template/en/default/bug/create/create.html.tmpl:1.2 13 Mar 2007 16: 9:54 -0000 +++ bugzilla/template/en/default/bug/create/create.html.tmpl 13 Mar 2007 16: 9:54 -0000 @@ -184,7 +184,7 @@ <input name="short_desc" size="60" value="[% short_desc FILTER html %]"> </td> </tr> - <tr><td></td><td>Please do not PASTE logs and back traces (create an attachment instead)</td></tr> + <tr><td></td><td>Please do not PASTE logs and back traces (create an attachment after you submit this bug)</td></tr> <tr><td align="right" valign="top">Description:</td> <td colspan="3"> <textarea wrap="hard" name="comment" rows="10" cols="80"> Index: bugzilla/template/en/default/bug/create/user-message.html.tmpl diff -u -p bugzilla/template/en/default/bug/create/user-message.html.tmpl:1.1.1.1 bugzilla/template/en/default/bug/create/user-message.html.tmpl:1.2 --- bugzilla/template/en/default/bug/create/user-message.html.tmpl:1.1.1.1 13 Mar 2007 16: 9:54 -0000 +++ bugzilla/template/en/default/bug/create/user-message.html.tmpl 13 Mar 2007 16: 9:54 -0000 @@ -28,7 +28,8 @@ # the 'product' variable. #%] -Before reporting a bug, please read the <a href="bugwritinghelp.html"> +Before reporting a bug, please read the <a href="http://wiki.winehq.org/Bugs"> bug writing guidelines</a>, please look at the list of <a href="duplicates.cgi">most frequently reported bugs</a>, and please -<a href="query.cgi">search</a> for the bug. +<a href="query.cgi">search</a> for the bug to avoid submitting a duplicate +report.

1 0

Stefan Huehner : Mark several functions as static.
by Alexandre Julliard 13 Mar '07

13 Mar '07

Module: wine Branch: master Commit: 4d1d01f266bfff67575916cb4d0836bc2cfe7242 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d1d01f266bfff67575916cb4… Author: Stefan Huehner <stefan(a)huehner.org> Date: Mon Mar 12 16:50:54 2007 +0100 Mark several functions as static. --- dlls/browseui/tests/autocomplete.c | 6 ++-- dlls/comctl32/tests/datetime.c | 10 ++++---- dlls/kernel32/tests/resource.c | 8 +++--- dlls/msxml3/tests/schema.c | 2 +- dlls/ntdll/tests/om.c | 8 +++--- dlls/opengl32/wgl.c | 4 +- dlls/shell32/clipboard.c | 20 ------------------ dlls/user32/tests/win.c | 2 +- dlls/wined3d/device.c | 2 +- dlls/wined3d/directx.c | 2 +- dlls/wined3d/drawprim.c | 2 +- dlls/wined3d/glsl_shader.c | 6 ++-- dlls/wined3d/state.c | 2 +- dlls/wined3d/surface.c | 4 +- dlls/wined3d/utils.c | 2 +- dlls/wineesd.drv/audio.c | 2 +- dlls/winex11.drv/opengl.c | 2 +- dlls/winspool.drv/info.c | 2 +- programs/cmd/builtins.c | 2 +- programs/oleview/details.c | 6 ++-- programs/oleview/interface.c | 8 +++--- programs/oleview/oleview.c | 16 +++++++------- programs/oleview/pane.c | 4 +- programs/oleview/tree.c | 14 ++++++------ programs/oleview/typelib.c | 38 ++++++++++++++++++------------------ programs/regedit/childwnd.c | 2 +- tools/widl/header.c | 2 +- 27 files changed, 79 insertions(+), 99 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4d1d01f266bfff6757591…

1 0

Stefan Huehner : comctl32: rebar: Test the rebar style for RBBS_VARIABLEHEIGHT, not the passed in structure.
by Alexandre Julliard 13 Mar '07

13 Mar '07

Module: wine Branch: master Commit: 20223d3d2e3f687f891a10b30a5a5f5462118bad URL: http://source.winehq.org/git/wine.git/?a=commit;h=20223d3d2e3f687f891a10b30… Author: Stefan Huehner <stefan(a)huehner.org> Date: Mon Mar 12 16:50:54 2007 +0100 comctl32: rebar: Test the rebar style for RBBS_VARIABLEHEIGHT, not the passed in structure. --- dlls/comctl32/rebar.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index 2972ab2..e7a1e1b 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -1575,7 +1575,7 @@ REBAR_CommonSetupBand(HWND hwnd, LPREBARBANDINFOW lprbbi, REBAR_BAND *lpBand) lpBand->cxMinChild = lprbbi->cxMinChild; lpBand->cyMinChild = lprbbi->cyMinChild; /* These fields where added in WIN32_IE == 0x400 and are set only for RBBS_VARIABLEHEIGHT bands */ - if (lprbbi->cbSize >= sizeof (REBARBANDINFOA) && (lprbbi->fStyle & RBBS_VARIABLEHEIGHT)) { + if (lprbbi->cbSize >= sizeof (REBARBANDINFOA) && (lpBand->fStyle & RBBS_VARIABLEHEIGHT)) { lpBand->cyMaxChild = lprbbi->cyMaxChild; lpBand->cyIntegral = lprbbi->cyIntegral;

1 0

Shanren Zhou : comctl32: Added header message sequence test cases.
by Alexandre Julliard 13 Mar '07

13 Mar '07

Module: wine Branch: master Commit: df578b846968d18107450d0a6a0b0463f75661bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=df578b846968d18107450d0a6… Author: Shanren Zhou <shanren(a)ucla.edu> Date: Sun Mar 11 17:36:38 2007 -0700 comctl32: Added header message sequence test cases. --- dlls/comctl32/tests/header.c | 263 +++++++++++++++++++++++++++++++++++++++++- 1 files changed, 262 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=df578b846968d18107450…

1 0

Shanren Zhou : comctl32: Header message sequence test cases.
by Alexandre Julliard 13 Mar '07

13 Mar '07

Module: wine Branch: master Commit: 92f230c2fb9ead690dc512bf3875341ef61f0063 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92f230c2fb9ead690dc512bf3… Author: Shanren Zhou <shanren(a)ucla.edu> Date: Sun Mar 11 17:36:28 2007 -0700 comctl32: Header message sequence test cases. Added separate parent and child header controls for each test case and fixed a typo ('Data Modified' should be 'Date Modified'). --- dlls/comctl32/tests/header.c | 389 ++++++++++++++++++++++++++++++++---------- 1 files changed, 298 insertions(+), 91 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=92f230c2fb9ead690dc51…

1 0