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

Stefan Leichter : ole32: Remove 'recursive registry key delete' function.
by Alexandre Julliard 24 Aug '07

24 Aug '07

Module: wine Branch: master Commit: fee1e38e5618a9d3592943bdbbfd5b552d00897e URL: http://source.winehq.org/git/wine.git/?a=commit;h=fee1e38e5618a9d3592943bdb… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Thu Aug 23 18:03:39 2007 +0200 ole32: Remove 'recursive registry key delete' function. --- dlls/ole32/regsvr.c | 80 ++++----------------------------------------------- 1 files changed, 6 insertions(+), 74 deletions(-) diff --git a/dlls/ole32/regsvr.c b/dlls/ole32/regsvr.c index fdb45c8..51b4f06 100644 --- a/dlls/ole32/regsvr.c +++ b/dlls/ole32/regsvr.c @@ -112,9 +112,6 @@ static LONG register_key_defvalueA(HKEY base, WCHAR const *name, char const *value); static LONG register_progid(WCHAR const *clsid, char const *progid, char const *name); -static LONG recursive_delete_key(HKEY key); -static LONG recursive_delete_keyA(HKEY base, char const *name); - /*********************************************************************** * register_interfaces @@ -201,22 +198,12 @@ static HRESULT unregister_interfaces(struct regsvr_interface const *list) for (; res == ERROR_SUCCESS && list->iid; ++list) { WCHAR buf[39]; - HKEY iid_key; StringFromGUID2(list->iid, buf, 39); - res = RegOpenKeyExW(interface_key, buf, 0, - KEY_READ | KEY_WRITE, &iid_key); - if (res == ERROR_FILE_NOT_FOUND) { - res = ERROR_SUCCESS; - continue; - } - if (res != ERROR_SUCCESS) goto error_close_interface_key; - res = recursive_delete_key(iid_key); - RegCloseKey(iid_key); - if (res != ERROR_SUCCESS) goto error_close_interface_key; + res = RegDeleteTreeW(interface_key, buf); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; } -error_close_interface_key: RegCloseKey(interface_key); error_return: return res != ERROR_SUCCESS ? HRESULT_FROM_WIN32(res) : S_OK; @@ -308,22 +295,15 @@ static HRESULT unregister_coclasses(struct regsvr_coclass const *list) for (; res == ERROR_SUCCESS && list->clsid; ++list) { WCHAR buf[39]; - HKEY clsid_key; StringFromGUID2(list->clsid, buf, 39); - res = RegOpenKeyExW(coclass_key, buf, 0, - KEY_READ | KEY_WRITE, &clsid_key); - if (res == ERROR_FILE_NOT_FOUND) { - res = ERROR_SUCCESS; - continue; - } - if (res != ERROR_SUCCESS) goto error_close_coclass_key; - res = recursive_delete_key(clsid_key); - RegCloseKey(clsid_key); + res = RegDeleteTreeW(coclass_key, buf); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; if (res != ERROR_SUCCESS) goto error_close_coclass_key; if (list->progid) { - res = recursive_delete_keyA(HKEY_CLASSES_ROOT, list->progid); + res = RegDeleteTreeA(HKEY_CLASSES_ROOT, list->progid); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; if (res != ERROR_SUCCESS) goto error_close_coclass_key; } } @@ -418,54 +398,6 @@ error_close_progid_key: } /*********************************************************************** - * recursive_delete_key - */ -static LONG recursive_delete_key(HKEY key) -{ - LONG res; - WCHAR subkey_name[MAX_PATH]; - DWORD cName; - HKEY subkey; - - for (;;) { - cName = sizeof(subkey_name) / sizeof(WCHAR); - res = RegEnumKeyExW(key, 0, subkey_name, &cName, - NULL, NULL, NULL, NULL); - if (res != ERROR_SUCCESS && res != ERROR_MORE_DATA) { - res = ERROR_SUCCESS; /* presumably we're done enumerating */ - break; - } - res = RegOpenKeyExW(key, subkey_name, 0, - KEY_READ | KEY_WRITE, &subkey); - if (res == ERROR_FILE_NOT_FOUND) continue; - if (res != ERROR_SUCCESS) break; - - res = recursive_delete_key(subkey); - RegCloseKey(subkey); - if (res != ERROR_SUCCESS) break; - } - - if (res == ERROR_SUCCESS) res = RegDeleteKeyW(key, 0); - return res; -} - -/*********************************************************************** - * recursive_delete_keyA - */ -static LONG recursive_delete_keyA(HKEY base, char const *name) -{ - LONG res; - HKEY key; - - res = RegOpenKeyExA(base, name, 0, KEY_READ | KEY_WRITE, &key); - if (res == ERROR_FILE_NOT_FOUND) return ERROR_SUCCESS; - if (res != ERROR_SUCCESS) return res; - res = recursive_delete_key(key); - RegCloseKey(key); - return res; -} - -/*********************************************************************** * coclass list */ static GUID const CLSID_StdOleLink = {

1 0

Stefan Leichter : objsel: Remove 'recursive registry key delete' function.
by Alexandre Julliard 24 Aug '07

24 Aug '07

Module: wine Branch: master Commit: 519b4ef4a240a524b7082f08d2f8e73ba2ef1b3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=519b4ef4a240a524b7082f08d… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Thu Aug 23 18:30:56 2007 +0200 objsel: Remove 'recursive registry key delete' function. --- dlls/objsel/regsvr.c | 76 +++++-------------------------------------------- 1 files changed, 8 insertions(+), 68 deletions(-) diff --git a/dlls/objsel/regsvr.c b/dlls/objsel/regsvr.c index 17c9fd3..bfb4dd1 100644 --- a/dlls/objsel/regsvr.c +++ b/dlls/objsel/regsvr.c @@ -127,9 +127,6 @@ static LONG register_key_defvalueA(HKEY base, WCHAR const *name, static LONG register_progid(WCHAR const *clsid, char const *progid, char const *curver_progid, char const *name, char const *extra); -static LONG recursive_delete_key(HKEY key); -static LONG recursive_delete_keyA(HKEY base, char const *name); -static LONG recursive_delete_keyW(HKEY base, WCHAR const *name); /*********************************************************************** * register_interfaces @@ -216,7 +213,8 @@ static HRESULT unregister_interfaces(struct regsvr_interface const *list) { WCHAR buf[39]; StringFromGUID2(list->iid, buf, 39); - res = recursive_delete_keyW(interface_key, buf); + res = RegDeleteTreeW(interface_key, buf); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; } RegCloseKey(interface_key); @@ -336,16 +334,19 @@ static HRESULT unregister_coclasses(struct regsvr_coclass const *list) { WCHAR buf[39]; StringFromGUID2(list->clsid, buf, 39); - res = recursive_delete_keyW(coclass_key, buf); + res = RegDeleteTreeW(coclass_key, buf); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; if (res != ERROR_SUCCESS) goto error_close_coclass_key; if (list->progid) { - res = recursive_delete_keyA(HKEY_CLASSES_ROOT, list->progid); + res = RegDeleteTreeA(HKEY_CLASSES_ROOT, list->progid); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; if (res != ERROR_SUCCESS) goto error_close_coclass_key; } if (list->viprogid) { - res = recursive_delete_keyA(HKEY_CLASSES_ROOT, list->viprogid); + res = RegDeleteTreeA(HKEY_CLASSES_ROOT, list->viprogid); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; if (res != ERROR_SUCCESS) goto error_close_coclass_key; } } @@ -454,67 +455,6 @@ error_close_progid_key: } /*********************************************************************** - * recursive_delete_key - */ -static LONG recursive_delete_key(HKEY key) { - LONG res; - WCHAR subkey_name[MAX_PATH]; - DWORD cName; - HKEY subkey; - - for (;;) { - cName = sizeof(subkey_name) / sizeof(WCHAR); - res = RegEnumKeyExW(key, 0, subkey_name, &cName, - NULL, NULL, NULL, NULL); - if (res != ERROR_SUCCESS && res != ERROR_MORE_DATA) { - res = ERROR_SUCCESS; /* presumably we're done enumerating */ - break; - } - res = RegOpenKeyExW(key, subkey_name, 0, - KEY_READ | KEY_WRITE, &subkey); - if (res == ERROR_FILE_NOT_FOUND) continue; - if (res != ERROR_SUCCESS) break; - - res = recursive_delete_key(subkey); - RegCloseKey(subkey); - if (res != ERROR_SUCCESS) break; - } - - if (res == ERROR_SUCCESS) res = RegDeleteKeyW(key, 0); - return res; -} - -/*********************************************************************** - * recursive_delete_keyA - */ -static LONG recursive_delete_keyA(HKEY base, char const *name) { - LONG res; - HKEY key; - - res = RegOpenKeyExA(base, name, 0, KEY_READ | KEY_WRITE, &key); - if (res == ERROR_FILE_NOT_FOUND) return ERROR_SUCCESS; - if (res != ERROR_SUCCESS) return res; - res = recursive_delete_key(key); - RegCloseKey(key); - return res; -} - -/*********************************************************************** - * recursive_delete_keyW - */ -static LONG recursive_delete_keyW(HKEY base, WCHAR const *name) { - LONG res; - HKEY key; - - res = RegOpenKeyExW(base, name, 0, KEY_READ | KEY_WRITE, &key); - if (res == ERROR_FILE_NOT_FOUND) return ERROR_SUCCESS; - if (res != ERROR_SUCCESS) return res; - res = recursive_delete_key(key); - RegCloseKey(key); - return res; -} - -/*********************************************************************** * coclass list */ static struct regsvr_coclass const coclass_list[] = {

1 0

Paul Vriens : winetest: Put dll version information in the report.
by Alexandre Julliard 24 Aug '07

24 Aug '07

Module: wine Branch: master Commit: d0ce7ec59902abab0d4c88407b0e6dda92f6dfc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0ce7ec59902abab0d4c88407… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Thu Aug 23 18:28:23 2007 +0200 winetest: Put dll version information in the report. --- programs/winetest/Makefile.in | 2 +- programs/winetest/main.c | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 1 deletions(-) diff --git a/programs/winetest/Makefile.in b/programs/winetest/Makefile.in index 01111f4..30d29ff 100644 --- a/programs/winetest/Makefile.in +++ b/programs/winetest/Makefile.in @@ -4,7 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = winetest.exe APPMODE = -mconsole -IMPORTS = comctl32 user32 gdi32 wsock32 kernel32 +IMPORTS = comctl32 version user32 gdi32 wsock32 kernel32 C_SRCS = \ gui.c \ diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 5d5462b..54574b1 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -62,6 +62,39 @@ static struct rev_info *rev_infos = NULL; static const char whitespace[] = " \t\r\n"; static const char testexe[] = "_test.exe"; +static char * get_file_version(char * file_name) +{ + static char version[32]; + DWORD size; + DWORD handle; + + size = GetFileVersionInfoSizeA(file_name, &handle); + if (size) { + char * data = xmalloc(size); + if (data) { + if (GetFileVersionInfoA(file_name, handle, size, data)) { + static char backslash[] = "\\"; + VS_FIXEDFILEINFO *pFixedVersionInfo; + UINT len; + if (VerQueryValueA(data, backslash, (LPVOID *)&pFixedVersionInfo, &len)) { + sprintf(version, "%d.%d.%d.%d", + pFixedVersionInfo->dwFileVersionMS >> 16, + pFixedVersionInfo->dwFileVersionMS & 0xffff, + pFixedVersionInfo->dwFileVersionLS >> 16, + pFixedVersionInfo->dwFileVersionLS & 0xffff); + } else + sprintf(version, "version not available"); + } else + sprintf(version, "unknown"); + free(data); + } else + sprintf(version, "failed"); + } else + sprintf(version, "version not available"); + + return version; +} + static int running_under_wine (void) { HMODULE module = GetModuleHandleA("ntdll.dll"); @@ -448,6 +481,8 @@ extract_test_proc (HMODULE hModule, LPCTSTR lpszType, } FreeLibrary(dll); + xprintf (" %s=%s\n", dllname, get_file_version(dllname)); + get_subtests( tempdir, &wine_tests[nr_of_files], lpszName ); nr_of_tests += wine_tests[nr_of_files].subtest_count; nr_of_files++;

1 0

Rob Shearman : include: Define some shell service IDs.
by Alexandre Julliard 24 Aug '07

24 Aug '07

Module: wine Branch: master Commit: 601cc42a03f212705565ca53a44ec6ad68047cb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=601cc42a03f212705565ca53a… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Aug 23 15:44:03 2007 +0100 include: Define some shell service IDs. --- include/shlguid.h | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/include/shlguid.h b/include/shlguid.h index ed677c0..be80199 100644 --- a/include/shlguid.h +++ b/include/shlguid.h @@ -79,9 +79,16 @@ DEFINE_GUID(CLSID_CUrlHistory, 0x3c374a40, 0xbae4, 0x11cf, 0xbf, 0x7d, 0x00, 0xa DEFINE_GUID(CLSID_CURLSearchHook, 0xcfbfae00, 0x17a6, 0x11d0, 0x99, 0xcb, 0x00, 0xc0, 0x4f, 0xd6, 0x44, 0x97); -DEFINE_GUID(SID_STopLevelBrowser, 0x4C96BE40L, 0x915C, 0x11CF, 0x99, 0xD3, 0x00, 0xAA, 0x00, 0x4A, 0xE8, 0x37); +DEFINE_GUID(SID_STopLevelBrowser, 0x4C96BE40, 0x915C, 0x11CF, 0x99, 0xD3, 0x00, 0xAA, 0x00, 0x4A, 0xE8, 0x37); +DEFINE_GUID(SID_STopWindow, 0x49e1b500, 0x4636, 0x11d3, 0x97, 0xf7, 0x00, 0xc0, 0x4f, 0x45, 0xd0, 0xb3); +DEFINE_GUID(SID_SCommDlgBrowser, 0x80f30233, 0xb7df, 0x11d2, 0xa3, 0x3b, 0x00, 0x60, 0x97, 0xdf, 0x5b, 0xd4); +#define SID_LinkSite IID_IShellLinkW #define SID_SShellBrowser IID_IShellBrowser +#define SID_SShellDesktop CLSID_ShellDesktop +#define SID_SInternetExplorer IID_IWebBrowserApp +#define SID_SWebBrowserApp IID_IWebBrowserApp +#define SID_SWebBrowserEventsService IID_IWebBrowserEventsService #define IID_IFileViewer WINELIB_NAME_AW(IID_IFileViewer) #define IID_IShellLink WINELIB_NAME_AW(IID_IShellLink)

1 0

appdb/include distribution.php
by WineHQ 24 Aug '07

24 Aug '07

ChangeSet ID: 31343 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/08/23 22:49:33 Modified files: include : distribution.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Enable deletion of a distribution's test results along with the distribution, if the user has admin privileges. Patch: http://cvs.winehq.org/patch.py?id=31343 Old revision New revision Changes Path 1.42 1.43 +9 -4 appdb/include/distribution.php Index: appdb/include/distribution.php diff -u -p appdb/include/distribution.php:1.42 appdb/include/distribution.php:1.43 --- appdb/include/distribution.php:1.42 24 Aug 2007 3:49:33 -0000 +++ appdb/include/distribution.php 24 Aug 2007 3:49:33 -0000 @@ -151,11 +151,16 @@ class distribution { $this->sQueued != "false"))) return false; - /* Check for associated test results */ - if(sizeof($this->aTestingIds)) + // if the distribution has test results only enable an admin to delete + // the distribution + if(sizeof($this->aTestingIds) && !$_SESSION['current']->hasPriv("admin")) + return FALSE; + + // delete any test results this distribution has + foreach($this->aTestingIds as $iTestId) { - addmsg("This distribution still has associated test results", "red"); - return FALSE; + $oTestData = new TestData($iTestId); + $oTestData->delete(); } // now delete the Distribution

1 0

appdb/. appview.php
by WineHQ 24 Aug '07

24 Aug '07

ChangeSet ID: 31342 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/08/23 22:17:25 Modified files: . : appview.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Create a version instance from $aClean['iVersionId'], if $aClean['iVersionId'] is set. We use this version instance in several sets of logic. Fixes bug 9275. Patch: http://cvs.winehq.org/patch.py?id=31342 Old revision New revision Changes Path 1.103 1.104 +5 -0 appdb/appview.php Index: appdb/appview.php diff -u -p appdb/appview.php:1.103 appdb/appview.php:1.104 --- appdb/appview.php:1.103 24 Aug 2007 3:17:25 -0000 +++ appdb/appview.php 24 Aug 2007 3:17:25 -0000 @@ -76,6 +76,11 @@ if(empty($aClean['iAppId']) && empty($aC if (isset($aClean['sSub'])) { + // create the version object if iVersionId is set + // we use this version object in many of the below cases + if(isset($aClean['iVersionId'])) + $oVersion = new Version($aClean['iVersionId']); + if(($aClean['sSub'] == 'delete' ) && ($aClean['iBuglinkId'])) { if(($_SESSION['current']->hasPriv("admin") ||

1 0

appdb/include version.php
by WineHQ 24 Aug '07

24 Aug '07

ChangeSet ID: 31341 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/08/23 21:54:07 Modified files: include : version.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Fix $bSilent parameter for comment::delete() to be 'true', which makes the deletion silent. Fixes previous commit. Patch: http://cvs.winehq.org/patch.py?id=31341 Old revision New revision Changes Path 1.147 1.148 +1 -1 appdb/include/version.php Index: appdb/include/version.php diff -u -p appdb/include/version.php:1.147 appdb/include/version.php:1.148 --- appdb/include/version.php:1.147 24 Aug 2007 2:54: 7 -0000 +++ appdb/include/version.php 24 Aug 2007 2:54: 7 -0000 @@ -259,7 +259,7 @@ class version { // delete the comment silently, we don't want to send out // any notifications since the version is being deleted - $oComment->delete(false); + $oComment->delete(true); }

1 0

appdb/ ./deletecomment.php include/comment.php ...
by WineHQ 24 Aug '07

24 Aug '07

ChangeSet ID: 31340 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/08/23 21:52:34 Modified files: . : deletecomment.php include : comment.php version.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Fix comment::delete() to take $bSilent as an input parameter and use comment::SendNotificationEmail(). Update version::delete() to pass false into comment::delete() so we don't send an email for each comment we are deleting for a given version. Fixes bug 8473. Patch: http://cvs.winehq.org/patch.py?id=31340 Old revision New revision Changes Path 1.32 1.33 +3 -3 appdb/deletecomment.php 1.38 1.39 +49 -22 appdb/include/comment.php 1.146 1.147 +4 -3 appdb/include/version.php Index: appdb/deletecomment.php diff -u -p appdb/deletecomment.php:1.32 appdb/deletecomment.php:1.33 --- appdb/deletecomment.php:1.32 24 Aug 2007 2:52:34 -0000 +++ appdb/deletecomment.php 24 Aug 2007 2:52:34 -0000 @@ -6,7 +6,7 @@ * - iCommentId, comment identifier * * Optional parameters: - * - sWhy, reason for deleting the comment + * - sReplyText, reason for deleting the comment * - iDeleteIt, 1 if the deletion has been confirmed */ @@ -40,7 +40,7 @@ if($_SESSION['current']->getPref("confir echo htmlify_urls($oComment->sBody), "<br /><br />\n"; echo html_frame_end(); echo '<table width="100%" border=0 cellpadding=0 cellspacing=1>',"\n"; - echo "<tr class=color1><td colspan=2><textarea name=\"sWhy\" cols=\"70\" rows=\"15\" wrap=\"virtual\"></textarea></td></tr>\n"; + echo "<tr class=color1><td colspan=2><textarea name=\"sReplyText\" cols=\"70\" rows=\"15\" wrap=\"virtual\"></textarea></td></tr>\n"; echo "<tr class=color1><td colspan=2 align=center>\n"; echo " <input type=\"submit\" value=\"Delete Comment\" class=\"button\" />\n"; echo "</td></tr>\n"; @@ -54,7 +54,7 @@ if($_SESSION['current']->getPref("confir // otherwise, just delete the comment } else { - $oComment->delete($aClean['sWhy']); + $oComment->delete(true); $oVersion = new version($oComment->iVersionId); util_redirect_and_exit($oVersion->objectMakeUrl()); } Index: appdb/include/comment.php diff -u -p appdb/include/comment.php:1.38 appdb/include/comment.php:1.39 --- appdb/include/comment.php:1.38 24 Aug 2007 2:52:34 -0000 +++ appdb/include/comment.php 24 Aug 2007 2:52:34 -0000 @@ -162,7 +162,7 @@ class Comment { * Informs interested people about the deletion. * Returns true on success and false on failure. */ - function delete($sReason=null) + function delete($bSilent = false) { $hResult = query_parameters("DELETE FROM appComments WHERE commentId = '?'", $this->iCommentId); if ($hResult) @@ -170,33 +170,60 @@ class Comment { /* fixup the child comments so the parentId points to a valid parent comment */ $hResult = query_parameters("UPDATE appComments set parentId = '?' WHERE parentId = '?'", $this->iParentId, $this->iCommentId); - $sEmail = User::get_notify_email_address_list($this->iAppId, $this->iVersionId); - $sEmail .= $this->oOwner->sEmail; - if($sEmail) + + if(!$bSilent) { - $sSubject = "Comment for '".version::fullName($this->iVersionId)."' deleted by ".$_SESSION['current']->sRealname; - $oVersion = new version($this->iVersionId); - $sMsg = $oVersion->objectMakeUrl()."\n"; - $sMsg .= "\n"; - $sMsg .= "This comment was made on ".substr($this->sDateCreated,0,10)." by ".$this->oOwner->sRealname."\n"; - $sMsg .= "\n"; - $sMsg .= "Subject: ".$this->sSubject."\r\n"; - $sMsg .= "\n"; - $sMsg .= $this->sBody."\r\n"; - $sMsg .= "\n"; - $sMsg .= "Because:\n"; - if($sReason) - $sMsg .= $sReason."\n"; - else - $sMsg .= "No reason given.\n"; - mail_appdb($sEmail, $sSubject ,$sMsg); - } - addmsg("Comment deleted.", "green"); + $this->SendNotificationMail("delete"); + } + return true; + } else + { + addmsg("Error removing the deleted comment!", "red"); } + return false; } + function SendNotificationMail($sAction="add", $sMsg = null) + { + global $aClean; + + // use 'sReplyText' if it is defined, otherwise define the value as an empty string + if(!isset($aClean['sReplyText'])) + $aClean['sReplyText'] = ""; + + $oApp = new Application($this->iAppId); + switch($sAction) + { + case "delete": + $sSubject = "Comment for '".version::fullName($this->iVersionId)."' deleted by ".$_SESSION['current']->sRealname; + $oVersion = new version($this->iVersionId); + $sMsg = $oVersion->objectMakeUrl()."\n"; + $sMsg .= "\n"; + $sMsg .= "This comment was made on ".substr($this->sDateCreated,0,10)." by ".$this->oOwner->sRealname."\n"; + $sMsg .= "\n"; + $sMsg .= "Subject: ".$this->sSubject."\r\n"; + $sMsg .= "\n"; + $sMsg .= $this->sBody."\r\n"; + $sMsg .= "\n"; + $sMsg .= "Because:\n"; + if($sReason) + $sMsg .= $sReason."\n"; + else + $sMsg .= "No reason given.\n"; + + addmsg("Comment deleted.", "green"); + + break; + } + + $sEmail = User::get_notify_email_address_list($this->iAppId, $this->iVersionId); + $sEmail .= $this->oOwner->sEmail; + if($sEmail) + mail_appdb($sEmail, $sSubject, $sMsg); + } + function get_comment_count_for_versionid($iVersionId) { $sQuery = "SELECT count(*) as cnt from appComments where versionId = '?'"; Index: appdb/include/version.php diff -u -p appdb/include/version.php:1.146 appdb/include/version.php:1.147 --- appdb/include/version.php:1.146 24 Aug 2007 2:52:34 -0000 +++ appdb/include/version.php 24 Aug 2007 2:52:34 -0000 @@ -256,7 +256,10 @@ class version { foreach($aCommentsIds as $iCommentId) { $oComment = new Comment($iCommentId); - $oComment->delete($bSilent); + + // delete the comment silently, we don't want to send out + // any notifications since the version is being deleted + $oComment->delete(false); } @@ -297,8 +300,6 @@ class version { } - - /* fetch Test Results Ids */ $aTestingIds = array(); $sQuery = "SELECT *

1 0

appdb/include objectManager.php
by WineHQ 24 Aug '07

24 Aug '07

ChangeSet ID: 31339 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/08/23 21:10:23 Modified files: include : objectManager.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Add page selection control at the bottom of pages, without the items per-page selector. Fix objectMananger::handleMultiPageControls() to not display the items per-page selector if the $bItemsPerPageSelector input parameter is false. Patch: http://cvs.winehq.org/patch.py?id=31339 Old revision New revision Changes Path 1.48 1.49 +29 -16 appdb/include/objectManager.php Index: appdb/include/objectManager.php diff -u -p appdb/include/objectManager.php:1.48 appdb/include/objectManager.php:1.49 --- appdb/include/objectManager.php:1.48 24 Aug 2007 2:10:23 -0000 +++ appdb/include/objectManager.php 24 Aug 2007 2:10:23 -0000 @@ -95,8 +95,8 @@ class ObjectManager $oObject = new $this->sClass(); - /* Display selectors for items per page and current page, if applicable. The function - returns FALSE or an array of arguments to be passed to objectGetEntries() */ + // Display top of the page selectors for items per page and + // current page, if applicable. $this->handleMultiPageControls($aClean, TRUE); /* query the class for its entries */ @@ -192,6 +192,11 @@ class ObjectManager echo "<br /><br /><a href=\"".$this->makeUrl("add", false, "Add $this->sClass")."\">Add entry</a>\n"; } + + // Display bottom of page selectors current page, if applicable + // NOTE: second parameter is false because we don't want the + // items per page selector appearing for the second set of page controls + $this->handleMultiPageControls($aClean, FALSE); } /* display the entry for editing */ @@ -704,24 +709,32 @@ class ObjectManager $iItemsPerPage = $iDefaultPerPage; - if ( isset($aClean['iItemsPerPage']) && in_array($aClean['iItemsPerPage'], $aItemsPerPage) ) + if ( isset($aClean['iItemsPerPage']) && + in_array($aClean['iItemsPerPage'], $aItemsPerPage) ) + { $iItemsPerPage = $aClean['iItemsPerPage']; + } - $sControls = "<form action=\"".$this->makeUrl()."\" method=\"get\">"; - - /* Fill in form data for the objectManager URL */ - $sControls .= $this->makeUrlFormData(); - $sControls .= "<p><b> Items per page</b>"; - $sControls .= "<select name=\"iItemsPerPage\" />"; + // if $bItemsPerPageSelector is true, display the items + // per-page dropdown and update button + if($bItemsPerPageSelector) + { + $sControls = "<form action=\"".$this->makeUrl()."\" method=\"get\">"; + + /* Fill in form data for the objectManager URL */ + $sControls .= $this->makeUrlFormData(); + $sControls .= "<p><b> Items per page</b>"; + $sControls .= "<select name=\"iItemsPerPage\" />"; - foreach($aItemsPerPage as $iNum) - { - $sSelected = ($iNum == $iItemsPerPage) ? ' selected="selected"' : ""; - $sControls .= "<option$sSelected>$iNum</option>"; + foreach($aItemsPerPage as $iNum) + { + $sSelected = ($iNum == $iItemsPerPage) ? ' selected="selected"' : ""; + $sControls .= "<option$sSelected>$iNum</option>"; + } + $sControls .= "</select>"; + $sControls .= "   <input type=\"submit\" value=\"Update\" />"; + $sControls .= "</form></p>"; } - $sControls .= "</select>"; - $sControls .= "   <input type=\"submit\" value=\"Update\" />"; - $sControls .= "</form></p>"; $iTotalEntries = $oObject->objectGetEntriesCount($this->bIsQueue, $this->bIsRejected); $iNumPages = ceil($iTotalEntries / $iItemsPerPage);

1 0

appdb/tables bugzilla_tables.sql
by WineHQ 24 Aug '07

24 Aug '07

ChangeSet ID: 31338 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/08/23 20:50:49 Modified files: tables : bugzilla_tables.sql Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Update the structure and data of the bugzilla versions table. The structure and data changed after a bugzilla update. Patch: http://cvs.winehq.org/patch.py?id=31338 Old revision New revision Changes Path 1.3 1.4 +116 -51 appdb/tables/bugzilla_tables.sql Index: appdb/tables/bugzilla_tables.sql diff -u -p appdb/tables/bugzilla_tables.sql:1.3 appdb/tables/bugzilla_tables.sql:1.4 --- appdb/tables/bugzilla_tables.sql:1.3 24 Aug 2007 1:50:49 -0000 +++ appdb/tables/bugzilla_tables.sql 24 Aug 2007 1:50:49 -0000 @@ -11,59 +11,124 @@ drop table if exists versions; /* * versions information */ -create table versions ( - value tinytext, - product_id smallint not null -); -INSERT INTO versions VALUES ('unspecified', 1 ); -INSERT INTO versions VALUES ('20010112', 1 ); -INSERT INTO versions VALUES ('20010216', 1 ); -INSERT INTO versions VALUES ('20010305', 1 ); -INSERT INTO versions VALUES ('20010326', 1 ); -INSERT INTO versions VALUES ('20010418', 1 ); -INSERT INTO versions VALUES ('20010510', 1 ); -INSERT INTO versions VALUES ('20010629', 1 ); -INSERT INTO versions VALUES ('20010824', 1 ); -INSERT INTO versions VALUES ('20011004', 1 ); -INSERT INTO versions VALUES ('20011108', 1 ); -INSERT INTO versions VALUES ('20020228', 1 ); -INSERT INTO versions VALUES ('20020310', 1 ); -INSERT INTO versions VALUES ('20020411', 1 ); -INSERT INTO versions VALUES ('20020509', 1 ); -INSERT INTO versions VALUES ('20020605', 1 ); -INSERT INTO versions VALUES ('20020710', 1 ); -INSERT INTO versions VALUES ('20020804', 1 ); -INSERT INTO versions VALUES ('20020904', 1 ); -INSERT INTO versions VALUES ('20021007', 1 ); -INSERT INTO versions VALUES ('20021031', 1 ); -INSERT INTO versions VALUES ('20021125', 1 ); -INSERT INTO versions VALUES ('20021219', 1 ); -INSERT INTO versions VALUES ('20030115', 1 ); -INSERT INTO versions VALUES ('20030219', 1 ); -INSERT INTO versions VALUES ('20030318', 1 ); -INSERT INTO versions VALUES ('20030408', 1 ); -INSERT INTO versions VALUES ('20030508', 1 ); -INSERT INTO versions VALUES ('20030618', 1 ); -INSERT INTO versions VALUES ('20030709', 1 ); -INSERT INTO versions VALUES ('20030813', 1 ); -INSERT INTO versions VALUES ('20030911', 1 ); -INSERT INTO versions VALUES ('20031016', 1 ); -INSERT INTO versions VALUES ('20031118', 1 ); -INSERT INTO versions VALUES ('20031212', 1 ); -INSERT INTO versions VALUES ('20040121', 1 ); -INSERT INTO versions VALUES ('20040213', 1 ); -INSERT INTO versions VALUES ('20040309', 1 ); -INSERT INTO versions VALUES ('20040408', 1 ); -INSERT INTO versions VALUES ('20040505', 1 ); -INSERT INTO versions VALUES ('20040615', 1 ); -INSERT INTO versions VALUES ('20040716', 1 ); -INSERT INTO versions VALUES ('20040813', 1 ); -INSERT INTO versions VALUES ('20040914', 1 ); -INSERT INTO versions VALUES ('20041019', 1 ); -INSERT INTO versions VALUES ('20041201', 1 ); -INSERT INTO versions VALUES ('CVS', 1 ); +CREATE TABLE `versions` ( + `value` varchar(64) NOT NULL default '', + `product_id` smallint(6) NOT NULL default '0', + `id` mediumint(9) NOT NULL auto_increment, + PRIMARY KEY (`id`), + UNIQUE KEY `versions_product_id_idx` (`product_id`,`value`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 PACK_KEYS=1; + +-- +-- Dumping data for table `versions` +-- +INSERT INTO `versions` VALUES ('unspecified',1,1); +INSERT INTO `versions` VALUES ('CVS',1,2); +INSERT INTO `versions` VALUES ('unspecified',2,3); +INSERT INTO `versions` VALUES ('unspecified',3,4); +INSERT INTO `versions` VALUES ('unspecified',4,5); +INSERT INTO `versions` VALUES ('20010305',1,6); +INSERT INTO `versions` VALUES ('20010216',1,7); +INSERT INTO `versions` VALUES ('20010112',1,8); +INSERT INTO `versions` VALUES ('20010326',1,9); +INSERT INTO `versions` VALUES ('2.11',3,10); +INSERT INTO `versions` VALUES ('20010418',1,11); +INSERT INTO `versions` VALUES ('20020509',1,12); +INSERT INTO `versions` VALUES ('20010510',1,13); +INSERT INTO `versions` VALUES ('20010629',1,14); +INSERT INTO `versions` VALUES ('20010824',1,15); +INSERT INTO `versions` VALUES ('20011004',1,16); +INSERT INTO `versions` VALUES ('20011108',1,17); +INSERT INTO `versions` VALUES ('20020228',1,18); +INSERT INTO `versions` VALUES ('20020310',1,19); +INSERT INTO `versions` VALUES ('20020411',1,20); +INSERT INTO `versions` VALUES ('2.14.2',3,21); +INSERT INTO `versions` VALUES ('20020605',1,22); +INSERT INTO `versions` VALUES ('20020710',1,23); +INSERT INTO `versions` VALUES ('20020804',1,24); +INSERT INTO `versions` VALUES ('20020904',1,25); +INSERT INTO `versions` VALUES ('20021007',1,26); +INSERT INTO `versions` VALUES ('20021031',1,27); +INSERT INTO `versions` VALUES ('20021125',1,28); +INSERT INTO `versions` VALUES ('20021219',1,29); +INSERT INTO `versions` VALUES ('20030115',1,30); +INSERT INTO `versions` VALUES ('20030219',1,31); +INSERT INTO `versions` VALUES ('20030318',1,32); +INSERT INTO `versions` VALUES ('20030408',1,33); +INSERT INTO `versions` VALUES ('20030508',1,34); +INSERT INTO `versions` VALUES ('20030618',1,35); +INSERT INTO `versions` VALUES ('20030709',1,36); +INSERT INTO `versions` VALUES ('20030813',1,37); +INSERT INTO `versions` VALUES ('20030911',1,38); +INSERT INTO `versions` VALUES ('20031016',1,39); +INSERT INTO `versions` VALUES ('20031118',1,40); +INSERT INTO `versions` VALUES ('20031212',1,41); +INSERT INTO `versions` VALUES ('20040121',1,42); +INSERT INTO `versions` VALUES ('20040213',1,43); +INSERT INTO `versions` VALUES ('20040309',1,44); +INSERT INTO `versions` VALUES ('20040408',1,45); +INSERT INTO `versions` VALUES ('20040505',1,46); +INSERT INTO `versions` VALUES ('20040615',1,47); +INSERT INTO `versions` VALUES ('20040716',1,48); +INSERT INTO `versions` VALUES ('20040813',1,49); +INSERT INTO `versions` VALUES ('20040914',1,50); +INSERT INTO `versions` VALUES ('20041019',1,51); +INSERT INTO `versions` VALUES ('20041201',1,52); +INSERT INTO `versions` VALUES ('20050111',1,53); +INSERT INTO `versions` VALUES ('20050211',1,54); +INSERT INTO `versions` VALUES ('20050310',1,55); +INSERT INTO `versions` VALUES ('20050419',1,56); +INSERT INTO `versions` VALUES ('20050524',1,57); +INSERT INTO `versions` VALUES ('20050628',1,58); +INSERT INTO `versions` VALUES ('20050725',1,59); +INSERT INTO `versions` VALUES ('20050830',1,60); +INSERT INTO `versions` VALUES ('20050930',1,61); +INSERT INTO `versions` VALUES ('0.9',1,62); +INSERT INTO `versions` VALUES ('0.9.1.',1,63); +INSERT INTO `versions` VALUES ('0.9.2.',1,64); +INSERT INTO `versions` VALUES ('0.9.3.',1,65); +INSERT INTO `versions` VALUES ('0.9.4.',1,66); +INSERT INTO `versions` VALUES ('0.9.5.',1,67); +INSERT INTO `versions` VALUES ('0.9.6.',1,68); +INSERT INTO `versions` VALUES ('0.9.7.',1,69); +INSERT INTO `versions` VALUES ('0.9.8.',1,70); +INSERT INTO `versions` VALUES ('0.9.9.',1,71); +INSERT INTO `versions` VALUES ('0.9.10.',1,72); +INSERT INTO `versions` VALUES ('0.9.11.',1,73); +INSERT INTO `versions` VALUES ('0.9.12.',1,74); +INSERT INTO `versions` VALUES ('0.9.13.',1,75); +INSERT INTO `versions` VALUES ('0.9.14.',1,76); +INSERT INTO `versions` VALUES ('0.9.15.',1,77); +INSERT INTO `versions` VALUES ('0.9.16.',1,78); +INSERT INTO `versions` VALUES ('0.9.17.',1,79); +INSERT INTO `versions` VALUES ('0.9.18.',1,80); +INSERT INTO `versions` VALUES ('0.9.19.',1,81); +INSERT INTO `versions` VALUES ('0.9.20.',1,82); +INSERT INTO `versions` VALUES ('0.9.21.',1,83); +INSERT INTO `versions` VALUES ('0.9.22.',1,84); +INSERT INTO `versions` VALUES ('0.9.23.',1,85); +INSERT INTO `versions` VALUES ('0.9.24.',1,86); +INSERT INTO `versions` VALUES ('0.9.25.',1,87); +INSERT INTO `versions` VALUES ('0.9.26.',1,88); +INSERT INTO `versions` VALUES ('0.9.27.',1,89); +INSERT INTO `versions` VALUES ('0.9.28.',1,90); +INSERT INTO `versions` VALUES ('0.9.29.',1,91); +INSERT INTO `versions` VALUES ('0.9.30.',1,92); +INSERT INTO `versions` VALUES ('0.9.31.',1,93); +INSERT INTO `versions` VALUES ('0.9.32.',1,94); +INSERT INTO `versions` VALUES ('0.9.33.',1,95); +INSERT INTO `versions` VALUES ('0.9.34.',1,96); +INSERT INTO `versions` VALUES ('0.9.35.',1,97); +INSERT INTO `versions` VALUES ('0.9.36.',1,98); +INSERT INTO `versions` VALUES ('0.9.37.',1,99); +INSERT INTO `versions` VALUES ('0.9.38.',1,100); +INSERT INTO `versions` VALUES ('0.9.39.',1,101); +INSERT INTO `versions` VALUES ('0.9.40.',1,102); +INSERT INTO `versions` VALUES ('0.9.41.',1,103); +INSERT INTO `versions` VALUES ('0.9.42.',1,104); +INSERT INTO `versions` VALUES ('0.9.43.',1,105); -- -- Table structure for table `bugs`

1 0