December 2006 - Wine-Commits

Eric Pouech : cmd: Fix 'copy foo bar/' which gave access denied errors.
by Alexandre Julliard Dec. 27, 2006

Dec. 27, 2006

Module: wine Branch: master Commit: b7923b42005a6b4d8bbd0176241757acae04f33d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7923b42005a6b4d8bbd01762… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Tue Dec 26 17:51:24 2006 +0100 cmd: Fix 'copy foo bar/' which gave access denied errors. --- programs/cmd/builtins.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 8a79b98..08972e5 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -126,6 +126,8 @@ char string[8], outpath[MAX_PATH], inpat } GetFullPathName (param2, sizeof(outpath), outpath, NULL); + if (outpath[strlen(outpath) - 1] == '\\') + outpath[strlen(outpath) - 1] = '\0'; hff = FindFirstFile (outpath, &fd); if (hff != INVALID_HANDLE_VALUE) { if (fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) {

1 0

Jacek Caban : mshtml: Fix failing test.
by Alexandre Julliard Dec. 27, 2006

Dec. 27, 2006

Module: wine Branch: master Commit: bad343433096b66fb577f56656efe4bac781f5f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bad343433096b66fb577f5665… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 26 23:06:35 2006 +0100 mshtml: Fix failing test. --- dlls/mshtml/tests/htmldoc.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 21bec06..ac26ca8 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -454,7 +454,8 @@ static HRESULT WINAPI Moniker_BindToStor ok(bindinfo.dwBindVerb == 0, "bindinfo.dwBindVerb=%d\n", bindinfo.dwBindVerb); ok(bindinfo.szCustomVerb == 0, "bindinfo.szCustomVerb=%p\n", bindinfo.szCustomVerb); ok(bindinfo.cbstgmedData == 0, "bindinfo.cbstgmedData=%d\n", bindinfo.cbstgmedData); - ok(bindinfo.dwOptions == 0x80000, "bindinfo.dwOptions=%x\n", bindinfo.dwOptions); + ok(bindinfo.dwOptions == 0x80000 || bindinfo.dwOptions == 0x4080000, + "bindinfo.dwOptions=%x\n", bindinfo.dwOptions); ok(bindinfo.dwOptionsFlags == 0, "bindinfo.dwOptionsFlags=%d\n", bindinfo.dwOptionsFlags); /* TODO: test dwCodePage */ /* TODO: test securityAttributes */

1 0

Jacek Caban : urlmon: Remove failing tests.
by Alexandre Julliard Dec. 27, 2006

Dec. 27, 2006

Module: wine Branch: master Commit: f89edb19afa6f417872689be711aabf695b94015 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f89edb19afa6f417872689be7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 26 22:52:19 2006 +0100 urlmon: Remove failing tests. --- dlls/urlmon/tests/protocol.c | 9 --------- 1 files changed, 0 insertions(+), 9 deletions(-) diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index 84050dc..75f167f 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -118,15 +118,6 @@ static HRESULT WINAPI HttpNegotiate_Begi CHECK_EXPECT(BeginningTransaction); ok(!lstrcmpW(szURL, http_url), "szURL != http_url\n"); - - ok(szHeaders != NULL, "szHeaders == NULL\n"); - if(szHeaders) { - static const WCHAR header[] = - {'A','c','c','e','p','t','-','E','n','c','o','d','i','n','g',':', - ' ','g','z','i','p',',',' ','d','e','f','l','a','t','e',0}; - ok(!lstrcmpW(header, szHeaders), "Unexpected szHeaders\n"); - } - ok(!dwReserved, "dwReserved=%d, expected 0\n", dwReserved); ok(pszAdditionalHeaders != NULL, "pszAdditionalHeaders == NULL\n"); if(pszAdditionalHeaders)

1 0

Alexandre Julliard : wineps.drv: Remove surious null byte in generic.ppd.
by Alexandre Julliard Dec. 27, 2006

Dec. 27, 2006

Module: wine Branch: master Commit: 755ef51127d297ac7d0c9a9bb778f498c27b3037 URL: http://source.winehq.org/git/wine.git/?a=commit;h=755ef51127d297ac7d0c9a9bb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 26 17:10:42 2006 +0100 wineps.drv: Remove surious null byte in generic.ppd. --- dlls/wineps.drv/generic.ppd | Bin 1 files changed, 0 insertions(+), 0 deletions(-) diff --git a/dlls/wineps.drv/generic.ppd b/dlls/wineps.drv/generic.ppd index dadd20f..ccc4f63 100644 Binary files a/dlls/wineps.drv/generic.ppd and b/dlls/wineps.drv/generic.ppd differ

1 0

Alexandre Julliard : makedep: Add support for magic comments in . rc files so we can generate proper dependencies for them.
by Alexandre Julliard Dec. 27, 2006

Dec. 27, 2006

Module: wine Branch: master Commit: f92ef1c543350574a79ff92d0ea2b1e3b710d6a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f92ef1c543350574a79ff92d0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 26 15:02:03 2006 +0100 makedep: Add support for magic comments in .rc files so we can generate proper dependencies for them. --- dlls/atl/Makefile.in | 2 - dlls/atl/rsrc.rc | 1 + dlls/itss/Makefile.in | 2 - dlls/itss/rsrc.rc | 1 + dlls/mshtml/Makefile.in | 2 - dlls/mshtml/rsrc.rc | 2 + dlls/urlmon/Makefile.in | 2 - dlls/urlmon/rsrc.rc | 1 + tools/makedep.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++- 9 files changed, 68 insertions(+), 9 deletions(-) diff --git a/dlls/atl/Makefile.in b/dlls/atl/Makefile.in index 4331990..d419a5d 100644 --- a/dlls/atl/Makefile.in +++ b/dlls/atl/Makefile.in @@ -19,6 +19,4 @@ IDL_H_SRCS = \ @MAKE_DLL_RULES@ -rsrc.res: atl.rgs - @DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/atl/rsrc.rc b/dlls/atl/rsrc.rc index 59cfb60..c559533 100644 --- a/dlls/atl/rsrc.rc +++ b/dlls/atl/rsrc.rc @@ -16,4 +16,5 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +/* @makedep: atl.rgs */ 101 REGISTRY atl.rgs diff --git a/dlls/itss/Makefile.in b/dlls/itss/Makefile.in index 612e419..ccde6c2 100644 --- a/dlls/itss/Makefile.in +++ b/dlls/itss/Makefile.in @@ -19,6 +19,4 @@ RC_SRCS = rsrc.rc @MAKE_DLL_RULES@ -rsrc.res: itss.inf - @DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/itss/rsrc.rc b/dlls/itss/rsrc.rc index b9f961d..2b0edd8 100644 --- a/dlls/itss/rsrc.rc +++ b/dlls/itss/rsrc.rc @@ -16,4 +16,5 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +/* @makedep: itss.inf */ REGINST REGINST itss.inf diff --git a/dlls/mshtml/Makefile.in b/dlls/mshtml/Makefile.in index 0e8f988..919e5d0 100644 --- a/dlls/mshtml/Makefile.in +++ b/dlls/mshtml/Makefile.in @@ -49,6 +49,4 @@ IDL_H_SRCS = nsiface.idl @MAKE_DLL_RULES@ -rsrc.res: mshtml.inf blank.htm - @DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/mshtml/rsrc.rc b/dlls/mshtml/rsrc.rc index 3e3daae..bbf7a81 100644 --- a/dlls/mshtml/rsrc.rc +++ b/dlls/mshtml/rsrc.rc @@ -48,6 +48,8 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL +/* @makedep: mshtml.inf */ REGINST REGINST mshtml.inf +/* @makedep: blank.htm */ blank.htm HTML "blank.htm" diff --git a/dlls/urlmon/Makefile.in b/dlls/urlmon/Makefile.in index a19a78a..be3b6a4 100644 --- a/dlls/urlmon/Makefile.in +++ b/dlls/urlmon/Makefile.in @@ -25,6 +25,4 @@ RC_SRCS = rsrc.rc @MAKE_DLL_RULES@ -rsrc.res: urlmon.inf - @DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/urlmon/rsrc.rc b/dlls/urlmon/rsrc.rc index 2fa1a30..d71b2fa 100644 --- a/dlls/urlmon/rsrc.rc +++ b/dlls/urlmon/rsrc.rc @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +/* @makedep: urlmon.inf */ REGINST REGINST urlmon.inf #include "version.rc" diff --git a/tools/makedep.c b/tools/makedep.c index 759d3bd..1d070b2 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -629,6 +629,63 @@ static void parse_c_file( INCL_FILE *pFi /******************************************************************* + * parse_rc_file + */ +static void parse_rc_file( INCL_FILE *pFile, FILE *file ) +{ + char *buffer, *include; + + input_line = 0; + while ((buffer = get_line( file ))) + { + char quote; + char *p = buffer; + while (*p && isspace(*p)) p++; + + if (p[0] == '/' && p[1] == '*') /* check for magic makedep comment */ + { + p += 2; + while (*p && isspace(*p)) p++; + if (strncmp( p, "@makedep:", 9 )) continue; + p += 9; + while (*p && isspace(*p)) p++; + quote = '"'; + if (*p == quote) + { + include = ++p; + while (*p && *p != quote) p++; + } + else + { + include = p; + while (*p && !isspace(*p) && *p != '*') p++; + } + if (!*p) + fatal_error( "%s:%d: Malformed makedep comment\n", pFile->filename, input_line ); + *p = 0; + } + else /* check for #include */ + { + if (*p++ != '#') continue; + while (*p && isspace(*p)) p++; + if (strncmp( p, "include", 7 )) continue; + p += 7; + while (*p && isspace(*p)) p++; + if (*p != '\"' && *p != '<' ) continue; + quote = *p++; + if (quote == '<') quote = '>'; + include = p; + while (*p && (*p != quote)) p++; + if (!*p) fatal_error( "%s:%d: Malformed #include directive\n", + pFile->filename, input_line ); + *p = 0; + } + add_include( pFile, include, input_line, (quote == '>') ); + } +} + + +/******************************************************************* * parse_generated_idl */ static void parse_generated_idl( INCL_FILE *source ) @@ -688,8 +745,13 @@ static void parse_file( INCL_FILE *pFile parse_idl_file( pFile, file, 1 ); else if (strendswith( pFile->filename, ".idl" )) parse_idl_file( pFile, file, 0 ); - else + else if (strendswith( pFile->filename, ".c" ) || + strendswith( pFile->filename, ".h" ) || + strendswith( pFile->filename, ".l" ) || + strendswith( pFile->filename, ".y" )) parse_c_file( pFile, file ); + else if (strendswith( pFile->filename, ".rc" )) + parse_rc_file( pFile, file ); fclose(file); }

1 0

appdb/. queueditems.php
by WineHQ Dec. 26, 2006

Dec. 26, 2006

ChangeSet ID: 30826 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/12/26 21:26:39 Added files: . : queueditems.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> dd a page showing a user's queued submissions to the AppDB. This should be quite useful for a user, and should also reduce the number of duplicate submissions, as many users seem to think their submissions have been lost if they are not accepted within a few hours. Patch: http://cvs.winehq.org/patch.py?id=30826 Old revision New revision Changes Path Added 1.1 +0 -0 appdb/queueditems.php Index: appdb/queueditems.php diff -u -p /dev/null appdb/queueditems.php:1.1 --- /dev/null 27 Dec 2006 3:26:39 -0000 +++ appdb/queueditems.php 27 Dec 2006 3:26:39 -0000 @@ -0,0 +1,70 @@ +<?php + +/** + * A list of the user's queued items + */ + +require("path.php"); +require(BASE."include/incl.php"); +require(BASE."include/filter.php"); +require(BASE."include/appData.php"); + +apidb_header("View Your Queued Items"); + +$oUser = new User($_SESSION['current']->iUserId); + +if(!$oUser->isLoggedIn()) +{ + echo "You need to log in to display your queued items."; + apidb_footer(); +} + +/* Test data */ +if($sResult = testData::listSubmittedBy($oUser->iUserId)) +{ + echo html_frame_start("Your Queued Test Results","90%"); + echo $sResult; + echo html_frame_end(" "); +} +else + echo "You have no queued test results.<br /><br />\n"; + +/* Applications */ +if($sResult = Application::listSubmittedBy($oUser->iUserId)) +{ + echo html_frame_start("Your Queued Applications","90%"); + echo $sResult; + echo html_frame_end(" "); +} else + echo "You have no queued applications.<br /><br />\n"; + +/* Versions */ +if($sResult = Version::listSubmittedBy($oUser->iUserId)) +{ + echo html_frame_start("Your Queued Versions","90%"); + echo $sResult; + echo html_frame_end(" "); +} else + echo "You have no queued versions.<br /><br />\n"; + +/* Bug links */ +if($sResult = bug::listSubmittedBy($oUser->iUserId)) +{ + echo html_frame_start("Your Queued Bug Links","90%"); + echo $sResult; + echo html_frame_end(" "); +} else + echo "You have no queued bugs.<br /><br />\n"; + +/* Application data */ +if($sResult = appData::listSubmittedBy($oUser->iUserId)) +{ + echo html_frame_start("Your Queued Application Data","90%"); + echo $sResult; + echo html_frame_end(" "); +} else + echo "You have no queued application data.<br /><br />\n"; + +apidb_footer(); + +?>

1 0

appdb/include application.php bugs.php sidebar ...
by WineHQ Dec. 26, 2006

Dec. 26, 2006

ChangeSet ID: 30825 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/12/26 21:26:16 Modified files: include : application.php bugs.php sidebar_login.php testData.php version.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Add a page showing a user's queued submissions to the AppDB. This should be quite useful for a user, and should also reduce the number of duplicate submissions, as many users seem to think their submissions have been lost if they are not accepted within a few hours. Patch: http://cvs.winehq.org/patch.py?id=30825 Old revision New revision Changes Path 1.79 1.80 +29 -0 appdb/include/application.php 1.17 1.18 +38 -2 appdb/include/bugs.php 1.18 1.19 +8 -0 appdb/include/sidebar_login.php 1.13 1.14 +29 -0 appdb/include/testData.php 1.88 1.89 +27 -0 appdb/include/version.php Index: appdb/include/application.php diff -u -p appdb/include/application.php:1.79 appdb/include/application.php:1.80 --- appdb/include/application.php:1.79 27 Dec 2006 3:26:16 -0000 +++ appdb/include/application.php 27 Dec 2006 3:26:16 -0000 @@ -786,6 +786,35 @@ class Application { echo "</table>\n\n"; echo html_frame_end(" "); } + + /* List applications submitted by a given user */ + function listSubmittedBy($iUserId, $bQueued = true) + { + $hResult = query_parameters("SELECT appId, appName, appFamily.vendorId, description, submitTime, vendorName FROM appFamily, vendor WHERE appFamily.vendorId = vendor.vendorId AND submitterId = '?' AND queued = '?' ORDER BY appId", $iUserId, $bQueued ? "true" : "false"); + + if(!$hResult || !mysql_num_rows($hResult)) + return false; + + $sResult = html_table_begin("width=\"100%\" align=\"center\""); + $sResult .= html_tr(array( + "Application", + "Description", + "Vendor", + "Submission Date"), + "color4"); + + for($i = 1; $oRow = mysql_fetch_object($hResult); $i++) + $sResult .= html_tr(array( + "<a href=\"".BASE."appview.php?iAppId=$oRow->appId\">$oRow->appName</a>", + $oRow->description, + "<a href=\"".BASE."vendorview.php?iVendorId=$oRow->vendorId\">$oRow->vendorName</a>", + print_date(mysqltimestamp_to_unixtimestamp($oRow->submitTime))), + ($i % 2) ? "color0" : "color1"); + + $sResult .= html_table_end(); + + return $sResult; + } } ?> Index: appdb/include/bugs.php diff -u -p appdb/include/bugs.php:1.17 appdb/include/bugs.php:1.18 --- appdb/include/bugs.php:1.17 27 Dec 2006 3:26:16 -0000 +++ appdb/include/bugs.php 27 Dec 2006 3:26:16 -0000 @@ -252,7 +252,43 @@ class Bug { { mail_appdb($sEmail, $sSubject ,$sMsg); } - } + } + + /* Get a list of bugs submitted by a given user */ + function listSubmittedBy($iUserId, $bQueued = true) + { + $hResult = query_parameters("SELECT appFamily.appName, buglinks.versionId, appVersion.versionName, buglinks.submitTime, buglinks.bug_id FROM buglinks, appFamily, appVersion WHERE appFamily.appId = appVersion.appId AND buglinks.versionId = appVersion.versionId AND buglinks.queued = '?' AND buglinks.submitterId = '?' ORDER BY buglinks.versionId", $bQueued ? "true" : "false", $iUserId); + + if(!$hResult || !mysql_num_rows($hResult)) + return FALSE; + + $sReturn = html_table_begin("width=\"100%\" align=\"center\""); + $sReturn .= html_tr(array( + "Version", + array("Bug #", 'width="50"'), + array("Status", 'width="80"'), + array("Resolution", 'width="110"'), + "Description", + "Submit time"), + "color4"); + + for($i = 1; $oRow = mysql_fetch_object($hResult); $i++) + { + $oBug = new Bug($oRow->bug_id); + $sReturn .= html_tr(array( + "<a href=\"".BASE."appview.php?iVersionId=".$oRow->versionId."\">".$oRow->appName.": ".$oRow->versionName."</a>", + "<a href=\"".BUGZILLA_ROOT."show_bug.cgi?id=".$oRow->bug_id."\">".$oRow->bug_id."</a>", + $oBug->sBug_status, + $oBug->sResolution, + $oBug->sShort_desc, + print_date(mysqltimestamp_to_unixtimestamp($oRow->submitTime))), + ($i % 2) ? "color0" : "color1"); + } + + $sReturn .= html_table_end(); + + return $sReturn; + } } @@ -342,6 +378,6 @@ function view_version_bugs($iVersionId = } echo '</table>',"\n"; echo html_frame_end(); -} +} ?> Index: appdb/include/sidebar_login.php diff -u -p appdb/include/sidebar_login.php:1.18 appdb/include/sidebar_login.php:1.19 --- appdb/include/sidebar_login.php:1.18 27 Dec 2006 3:26:16 -0000 +++ appdb/include/sidebar_login.php 27 Dec 2006 3:26:16 -0000 @@ -47,6 +47,14 @@ function global_sidebar_login() { $g->addmisc("<a href=\"".BASE."appview.php?iVersionId=$iVersionId\">".Application::lookup_name($iAppId)." ".Version::lookup_name($iVersionId)."</a>","center"); } + /* Display a link to the user's queued items, + but not for admins, as theirs are auto-accepted */ + if(!$_SESSION['current']->hasPriv("admin")) + { + $g->addmisc(""); + $g->addmisc("<a href=\"".BASE."queueditems.php\">Your queued items</a>"); + } + } else { Index: appdb/include/testData.php diff -u -p appdb/include/testData.php:1.13 appdb/include/testData.php:1.14 --- appdb/include/testData.php:1.13 27 Dec 2006 3:26:16 -0000 +++ appdb/include/testData.php 27 Dec 2006 3:26:16 -0000 @@ -740,6 +740,35 @@ class testData{ } echo "</select>\n"; } + + /* List test data submitted by a given user. Ignore test results for queued applications/versions */ + function listSubmittedBy($iUserId, $bQueued = true) + { + $hResult = query_parameters("SELECT testResults.versionId, testResults.testedDate, testResults.testedRelease, testResults.testedRating, testResults.submitTime, appFamily.appName, appVersion.versionName from testResults, appFamily, appVersion WHERE testResults.versionId = appVersion.versionId AND appVersion.appId = appFamily.appId AND (appFamily.queued = '?' OR appVersion.queued = '?') AND testResults.submitterId = '?' AND testResults.queued = '?' ORDER BY testResults.testingId", "false", "false", $iUserId, $bQueued ? "true" : "false"); + + if(!$hResult || !mysql_num_rows($hResult)) + return false; + + $sReturn = html_table_begin("width=\"100%\" align=\"center\""); + $sReturn .= html_tr(array( + "Version", + "Rating", + "Wine version", + "Submission Date"), + "color4"); + + for($i = 1; $oRow = mysql_fetch_object($hResult); $i++) + $sReturn .= html_tr(array( + "<a href=\"".BASE."appview.php?iVersionId=$oRow->versionId\">$oRow->appName: $oRow->versionName</a>", + $oRow->testedRating, + $oRow->testedRelease, + print_date(mysqltimestamp_to_unixtimestamp($oRow->submitTime))), + $oRow->testedRating); + + $sReturn .= html_table_end(); + + return $sReturn; + } } ?> Index: appdb/include/version.php diff -u -p appdb/include/version.php:1.88 appdb/include/version.php:1.89 --- appdb/include/version.php:1.88 27 Dec 2006 3:26:16 -0000 +++ appdb/include/version.php 27 Dec 2006 3:26:16 -0000 @@ -969,6 +969,33 @@ class Version { return $aMaintainers; } + + /* List the versions submitted by a user. Ignore versions for queued applications */ + function listSubmittedBy($iUserId, $bQueued = true) + { + $hResult = query_parameters("SELECT appFamily.appName, appVersion.versionName, appVersion.description, appVersion.versionId, appVersion.submitTime FROM appFamily, appVersion WHERE appFamily.appId = appVersion.appId AND appVersion.submitterId = '?' AND appVersion.queued = '?' AND appFamily.queued = '?'", $iUserId, $bQueued ? "true" : "false", "false"); + + if(!$hResult || !mysql_num_rows($hResult)) + return false; + + $sResult = html_table_begin("width=\"100%\" align=\"center\""); + $sResult .= html_tr(array( + "Name", + "Description", + "Submission Date"), + "color4"); + + for($i = 1; $oRow = mysql_fetch_object($hResult); $i++) + $sResult .= html_tr(array( + "<a href=\"".BASE."appview.php?iVersionId=$oRow->versionId\">$oRow->appName: $oRow->versionName</a>", + $oRow->description, + print_date(mysqltimestamp_to_unixtimestamp($oRow->submitTime))), + ($i % 2) ? "color0" : "color1"); + + $sResult .= html_table_end(); + + return $sResult; + } } ?>

1 0

appdb/include testData.php
by WineHQ Dec. 26, 2006

Dec. 26, 2006

ChangeSet ID: 30824 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/12/26 21:23:52 Modified files: include : testData.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> If test results are deleted by the person who submitted it, don't send an extra mail about it. Patch: http://cvs.winehq.org/patch.py?id=30824 Old revision New revision Changes Path 1.12 1.13 +2 -1 appdb/include/testData.php Index: appdb/include/testData.php diff -u -p appdb/include/testData.php:1.12 appdb/include/testData.php:1.13 --- appdb/include/testData.php:1.12 27 Dec 2006 3:23:52 -0000 +++ appdb/include/testData.php 27 Dec 2006 3:23:52 -0000 @@ -169,7 +169,8 @@ class testData{ if(!$bSilent) $this->SendNotificationMail("delete"); - $this->mailSubmitter("delete"); + if($this->iSubmitterId && ($this->iSubmitterId != $_SESSION['current']->iUserId)) + $this->mailSubmitter("delete"); }

1 0

appdb/include screenshot.php
by WineHQ Dec. 26, 2006

Dec. 26, 2006

ChangeSet ID: 30823 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/12/26 21:23:01 Modified files: include : screenshot.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> If a person deletes a screenshot he has submitted himself, don't send him an extra email about it. Patch: http://cvs.winehq.org/patch.py?id=30823 Old revision New revision Changes Path 1.51 1.52 +1 -1 appdb/include/screenshot.php Index: appdb/include/screenshot.php diff -u -p appdb/include/screenshot.php:1.51 appdb/include/screenshot.php:1.52 --- appdb/include/screenshot.php:1.51 27 Dec 2006 3:23: 1 -0000 +++ appdb/include/screenshot.php 27 Dec 2006 3:23: 1 -0000 @@ -144,7 +144,7 @@ class Screenshot { if(!$bSilent) $this->mailMaintainers(true); } - if($this->iSubmitterId) + if($this->iSubmitterId && ($this->iSubmitterId != $_SESSION['current']->iUserId)) { $this->mailSubmitter(true); }

1 0

appdb/tables create_tables
by WineHQ Dec. 26, 2006

Dec. 26, 2006

ChangeSet ID: 30822 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/12/26 21:21:15 Modified files: tables : create_tables Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> The create_tables script should also add the testData table. Patch: http://cvs.winehq.org/patch.py?id=30822 Old revision New revision Changes Path 1.9 1.10 +3 -0 appdb/tables/create_tables Index: appdb/tables/create_tables diff -u -p appdb/tables/create_tables:1.9 appdb/tables/create_tables:1.10 --- appdb/tables/create_tables:1.9 27 Dec 2006 3:21:15 -0000 +++ appdb/tables/create_tables 27 Dec 2006 3:21:15 -0000 @@ -35,3 +35,6 @@ mysql -p -u root < error_log.sql echo Adding distributions mysql -p -u root < distributions.sql + +echo Adding test data tables +mysql -p -u root < testResults.sql

1 0