wine-commits August 2017

wine-commits@winehq.org

2 participants
351 discussions

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 12 Aug '17

12 Aug '17

Module: wine Branch: master Commit: 6725a11b78fd493425a2e443ac064a401a20bfa3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6725a11b78fd493425a2e443a… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Tue Aug 8 20:36:09 2017 +0300 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/po/lt.po b/po/lt.po index 055a965..975f275 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2017-07-13 09:10+0300\n" +"PO-Revision-Date: 2017-08-08 20:34+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -7289,42 +7289,36 @@ msgid "{{Disk full: }}" msgstr "{{Diskas pilnas: }}" #: msi.rc:77 -#, fuzzy -#| msgid "Action %s: [1]. [2]" msgid "Action [Time]: [1]. [2]" -msgstr "Veiksmas %s: [1]. [2]" +msgstr "Veiksmas [Time]: [1]. [2]" #: msi.rc:78 msgid "Message type: [1], Argument: [2]{, [3]}" msgstr "Pranešimo tipas: [1], Argumentai: [2]{, [3]}" #: msi.rc:81 -#, fuzzy -#| msgid "=== Logging started: %s %s ===" msgid "=== Logging started: [Date] [Time] ===" -msgstr "=== Registravimas pradėtas: %s %s ===" +msgstr "=== Registravimas pradėtas: [Date] [Time] ===" #: msi.rc:79 -#, fuzzy -#| msgid "Action start %s: [1]." msgid "Action start [Time]: [1]." -msgstr "Veiksmo pradžia %s: [1]." +msgstr "Veiksmo pradžia [Time]: [1]." #: msi.rc:80 -#, fuzzy -#| msgid "Action ended %s: [1]. Return value [2]." msgid "Action ended [Time]: [1]. Return value [2]." -msgstr "Veiksmas baigtas %s: [1]. Grąžinta reikšmė [2]." +msgstr "Veiksmas baigtas [Time]: [1]. Grąžinta reikšmė [2]." #: msi.rc:83 msgid "Please insert the disk: [2]" -msgstr "" +msgstr "Įdėkite diską: [2]" #: msi.rc:84 msgid "" "Source file not found{{(cabinet)}}: [2]. Verify that the file exists and " "that you can access it." msgstr "" +"Šaltinio failas nerastas{{(cabinet)}}: [2]. Patikrinkite, ar failas " +"egzistuoja ir yra prieinamas." #: msrle32.rc:31 msgid "Wine MS-RLE video codec"

1 0

Julian Rüger : po: Update German translation.
by Alexandre Julliard 12 Aug '17

12 Aug '17

Module: wine Branch: master Commit: ced582e6f8c06aaa16f972c4c6ccc6b63894329e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ced582e6f8c06aaa16f972c4c… Author: Julian Rüger <jr98(a)gmx.net> Date: Tue Aug 8 16:33:36 2017 +0200 po: Update German translation. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/de.po | 56 +++++++++----------------------------------------------- 1 file changed, 9 insertions(+), 47 deletions(-) diff --git a/po/de.po b/po/de.po index 4ac6bbc..42fe892 100644 --- a/po/de.po +++ b/po/de.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2017-07-25 15:17+0200\n" +"PO-Revision-Date: 2017-08-08 16:25+0200\n" "Last-Translator: Julian Rüger\n" "Language-Team: German\n" "Language: de\n" @@ -7295,42 +7295,36 @@ msgid "{{Disk full: }}" msgstr "{{Datenträger voll: }}" #: msi.rc:77 -#, fuzzy -#| msgid "Action %s: [1]. [2]" msgid "Action [Time]: [1]. [2]" -msgstr "Aktion %s: [1]. [2]" +msgstr "Aktion [Time]: [1]. [2]" #: msi.rc:78 msgid "Message type: [1], Argument: [2]{, [3]}" msgstr "Nachrichtentyp: [1], Argument: [2]{, [3]}" #: msi.rc:81 -#, fuzzy -#| msgid "=== Logging started: %s %s ===" msgid "=== Logging started: [Date] [Time] ===" -msgstr "=== Logging gestartet: %s %s ===" +msgstr "=== Logging gestartet: [Date] [Time] ===" #: msi.rc:79 -#, fuzzy -#| msgid "Action start %s: [1]." msgid "Action start [Time]: [1]." -msgstr "Beginn der Aktion %s: [1]." +msgstr "Beginn der Aktion [Time]: [1]." #: msi.rc:80 -#, fuzzy -#| msgid "Action ended %s: [1]. Return value [2]." msgid "Action ended [Time]: [1]. Return value [2]." -msgstr "Ende der Aktion %s: [1]. Rückgabewert [2]." +msgstr "Ende der Aktion [Time]: [1]. Rückgabewert [2]." #: msi.rc:83 msgid "Please insert the disk: [2]" -msgstr "" +msgstr "Bitte legen Sie folgenden Datenträger ein: [2]" #: msi.rc:84 msgid "" "Source file not found{{(cabinet)}}: [2]. Verify that the file exists and " "that you can access it." msgstr "" +"Quelldatei nicht gefunden{{(cabinet)}}: [2]. Stellen Sie sicher, dass die " +"Datei existiert und lesbar ist." #: msrle32.rc:31 msgid "Wine MS-RLE video codec" @@ -12475,38 +12469,6 @@ msgstr "" "Registrierungsdatei." #: regedit.rc:408 -#, fuzzy -#| msgid "" -#| "Usage:\n" -#| " regedit [options] [filename] [reg_key]\n" -#| "\n" -#| "Options:\n" -#| " [no option] Launch the graphical version of this program.\n" -#| " /L:system.dat The location of the system.dat file to be modified.\n" -#| " Compatible with any other switch. Ignored.\n" -#| " /R:user.dat The location of the user.dat file to be modified.\n" -#| " Compatible with any other switch. Ignored.\n" -#| " /C Import the contents of a registry file.\n" -#| " /D Delete a specified registry key.\n" -#| " /E Export the contents of a specified registry key to a " -#| "file.\n" -#| " If no key is specified, the entire registry is " -#| "exported.\n" -#| " /S Silent mode. No messages will be displayed.\n" -#| " /V Launch the GUI in advanced mode. Ignored.\n" -#| " /? Display this information and exit.\n" -#| " [filename] The location of the file containing registry information " -#| "to\n" -#| " be imported. When used with [/E], this option specifies " -#| "the\n" -#| " file location where registry information will be " -#| "exported.\n" -#| " [reg_key] The registry key to be modified.\n" -#| "\n" -#| "Usage examples:\n" -#| " regedit \"import.reg\"\n" -#| " regedit /E \"export.reg\" \"HKEY_CURRENT_USER\\Console\"\n" -#| " regedit /D \"HKEY_LOCAL_MACHINE\\Error\\Path\"\n" msgid "" "Usage:\n" " regedit [options] [filename] [reg_key]\n" @@ -12562,7 +12524,7 @@ msgstr "" "Beispielaufrufe:\n" " regedit \"import.reg\"\n" " regedit /E \"export.reg\" \"HKEY_CURRENT_USER\\Console\"\n" -" regedit /D \"HKEY_LOCAL_MACHINE\\Error\\Path\"\n" +" regedit /D \"HKEY_LOCAL_MACHINE\\Schlüssel\\Pfad\"\n" #: regedit.rc:409 msgid "regedit: Invalid or unrecognized switch [%1]\n"

1 0

Zebediah Figura : Don't open a donav if ctrl-clicked
by Jeremy Newman 11 Aug '17

11 Aug '17

Module: appdb Branch: master Commit: 4bc543661715c3824cd84390ff26e5cdfd73bc3c URL: http://source.winehq.org/git/appdb.git/?a=commit;h=4bc543661715c3824cd84390… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Aug 10 16:03:48 2017 -0500 Don't open a donav if ctrl-clicked Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- js/utils.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/js/utils.js b/js/utils.js index 33befa8..26128a9 100644 --- a/js/utils.js +++ b/js/utils.js @@ -166,7 +166,9 @@ $(document).ready(function() $(this).addClass('cursor-pointer'); $(this).click(function(e) { - document.location = sURL; + if (!e.ctrlKey) { + document.location = sURL; + } }); });

1 0

Rosanne DiMesio : Add case Cancel to processForm()
by Jeremy Newman 10 Aug '17

10 Aug '17

Module: appdb Branch: master Commit: d90969fd145eb63572fb809e390a91197a802788 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=d90969fd145eb63572fb809e… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Thu Aug 10 12:12:18 2017 -0500 Add case Cancel to processForm() Most of the error_log entries are due to its absence. Also corrects a typo in a nearby comment. Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- include/objectManager.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/include/objectManager.php b/include/objectManager.php index 36df560..2f19b64 100644 --- a/include/objectManager.php +++ b/include/objectManager.php @@ -1456,13 +1456,16 @@ class ObjectManager break; case "Delete": - /* Heere we call an objectManager function instead + /* Here we call an objectManager function instead of a function of the object's class. Thus we need to store the object so changes in getOutputEditorValues() are caught. */ $this->oObject = $oObject; $this->delete_entry($aClean['sReplyText']); break; + + case "Cancel": + break; default: // shouldn't end up here, log the submit type that landed us here

1 0

Rosanne DiMesio : Enable admins to view error logs online
by Jeremy Newman 10 Aug '17

10 Aug '17

Module: appdb Branch: master Commit: 2916ad44a231d9ce05552f06cd2bc3686b14766b URL: http://source.winehq.org/git/appdb.git/?a=commit;h=2916ad44a231d9ce05552f06… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Thu Aug 10 10:08:40 2017 -0500 Enable admins to view error logs online Removes the unused function to email admins error log entries and adds functions needed to view them online in the admin control center. Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- admin.php | 8 ++- include/error_log.php | 133 ++++++++++++++++++++++++++++++++++---------------- 2 files changed, 97 insertions(+), 44 deletions(-) diff --git a/admin.php b/admin.php index b608019..5f89a4b 100644 --- a/admin.php +++ b/admin.php @@ -327,7 +327,9 @@ function showChoices() echo '<a href="admin.php?sAction=purgeRejectedVendors" class="list-group-item"><h4>Purge rejected vendors</h4></a>'; - echo '<a href="admin.php?sAction=deleteOldErrorLogs" class="list-group-item"><h4>Delete Old Error Logs</h4></a>'; + echo '<a href="admin.php?sAction=deleteOldErrorLogs" class="list-group-item"><h4>Delete old error logs</h4></a>'; + + echo '<a href ="'.BASE.'objectManager.php?sClass=error_log&sTitle=View+Error_log" class="list-group-item"><h4>View Error log entries</h4></a>'; echo '<a href="admin.php?sAction=updateVersionRatings" class="list-group-item"><h4>Update version ratings</h4></a>'; @@ -372,6 +374,10 @@ switch(getInput('sAction', $aClean)) case 'deleteOldErrorLogs': deleteOldErrorLogs(); break; + + case 'viewErrorLogEntries'; + viewErrorLogEntries(); + break; case 'updateVersionRatings': updateVersionRatings(); diff --git a/include/error_log.php b/include/error_log.php index 73ea208..379e91c 100644 --- a/include/error_log.php +++ b/include/error_log.php @@ -41,17 +41,9 @@ class error_log ob_end_clean(); error_log::log_error("general_error", $sDescription.' '.$sDebugOutput); - } - - function getEntryCount() - { - $sQuery = "SELECT count(*) as cnt FROM error_log WHERE deleted = '0'"; - $hResult = query_parameters($sQuery); - $oRow = query_fetch_object($hResult); - return $oRow->cnt; - } - - /* purge all of the current entries from the error log */ + } + + /* mark all of the current entries as deleted */ function flush() { $sQuery = "UPDATE error_log SET deleted='1'"; @@ -61,43 +53,98 @@ class error_log else return false; } - function mail_admins_error_log($sSubject = "") + function objectGetId() { - $sSubject .= "Database Error log\r\n"; - $sEmail = user::getAdminEmails(); /* get list admins */ - - $sQuery = "SELECT * from error_log WHERE deleted='0' ORDER BY submitTime"; - $hResult = query_parameters($sQuery); - - $bEmpty = false; - if(query_num_rows($hResult) == 0) - $bEmpty = true; - - $sMsg = "Log entries:\r\n"; - $sMsg.= "\r\n"; + return $this->iId; + } + + function objectGetState() + { + return 'accepted'; + } + + public function objectGetHeader() + { + return $oRow; + } + + public function canEdit() + { + return $_SESSION['current']->hasPriv('admin'); + } + + function objectWantCustomDraw() + { + return true; + } - $sMsg.= "Submit time userid type\r\n"; - $sMsg.= "log_text\r\n"; - $sMsg.= "request_text\r\n"; - $sMsg.="----------------------------------\r\n\r\n"; + public function objectGetTableRow() + { + return $oRow; + } - /* append each log entry to $sMsg */ + public function objectDrawCustomTable($hResult) + { + echo html_frame_start("Error Log Entries","100%","",0); + echo '<table width="100%" border=0 cellpadding=3 cellspacing=0>'; + echo '<tr class=color1>'; + echo '<td>Id</td>'; + echo '<td>Submit time</td>'; + echo '<td>UserId</td>'; + echo '<td>Type</td>'; + echo '<td>Log text</td>'; + echo '<td>Request text</td>'; + echo '</tr>'; + + $i = 0; while($oRow = query_fetch_object($hResult)) { - $sMsg.=$oRow->submitTime." ".$oRow->userid." ".$oRow->type."\r\n"; - $sMsg.= "---------------------\r\n"; - $sMsg.=$oRow->log_text."\r\n"; - $sMsg.= "---------------------\r\n"; - $sMsg.=$oRow->request_text."\r\n\r\n"; - } - - /* if we had no entries we should indicate */ - /* that the error log is empty */ - if($bEmpty) - $sMsg = "The error log is empty.\r\n"; - - if($sEmail) - mail_appdb($sEmail, $sSubject, $sMsg); + echo '<tr class=color0>'; + echo '<td>'.$oRow->id.'</td>'; + echo '<td>'.$oRow->submitTime.'</td>'; + echo '<td>'.$oRow->userid.'</td>'; + echo '<td>'.$oRow->type.'</td>'; + echo '<td>'.$oRow->log_text.'</td>'; + echo '<td>'.$oRow->request_text.'</td>'; + $i++; + } + echo '</table>'; + echo html_frame_end(); + + echo "Found $i entries. <br>"; + } + + function objectGetItemsPerPage($sState = 'accepted') + { + $aItemsPerPage = array(25, 50, 100, 200); + $iDefaultPerPage = 25; + return array($aItemsPerPage, $iDefaultPerPage); + } + + public function objectGetEntries($sState, $iRows = null, $iStart = 0) + { + if(!$_SESSION['current']->hasPriv('admin')) + return false; + + $sLimit = objectManager::getSqlLimitClause($iRows, $iStart, 'error_log'); + + $sQuery = "SELECT * FROM error_log ORDER BY id DESC $sLimit"; + $hResult = query_parameters($sQuery); + + return $hResult; + } + + function objectGetEntriesCount() + { + $sQuery = "SELECT COUNT(DISTINCT id) as count FROM error_log"; + $hResult = query_parameters($sQuery); + + if(!$hResult) + return $hResult; + + $oRow = query_fetch_object($hResult); + + return $oRow->count; } }

1 0

Rosanne DiMesio : Update cleanup cron script
by Jeremy Newman 10 Aug '17

10 Aug '17

Module: appdb Branch: master Commit: 272e99660686480c967cc7afef5f1c54bc167ef2 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=272e99660686480c967cc7af… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Thu Aug 10 10:03:08 2017 -0500 Update cleanup cron script Removes two unused functions and adds two new ones. Removes individual email notices from the votes and screenshots cleanups. Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- cron/cleanup.php | 123 +++++++++++++------------------------------------------ 1 file changed, 28 insertions(+), 95 deletions(-) diff --git a/cron/cleanup.php b/cron/cleanup.php index 08ba100..dbf930d 100644 --- a/cron/cleanup.php +++ b/cron/cleanup.php @@ -1,7 +1,7 @@ #!/usr/bin/php <?php /**************************************************/ -/* this script has to be run once a month by cron */ +/* this script has to be run daily by cron */ /* it's purpose is to clean the user's table. */ /**************************************************/ @@ -16,9 +16,8 @@ notifyAdminsOfCleanupStart(); /* check to see if there are orphaned versions in the database */ orphanVersionCheck(); -/* report error log entries to admins and flush the error log after doing so */ -// temporarily disabled - it apperas we have too many errors -// reportErrorLogEntries(); +// delete error logs over 12 months old +deleteOldErrorLogs(); /* remove screenshots that are missing their screenshot and thumbnail files */ removeScreenshotsWithMissingFiles(); @@ -28,12 +27,12 @@ removeScreenshotsWithMissingFiles(); /* status since they aren't really maintaining the application/version */ maintainerCheck(); +// remove maintainers who have not logged in in over 24 months +deleteInactiveMaintainers(); + /* remove votes for versions that have been deleted */ cleanupVotes(); -/* Updates the rating info for all versions based on test results */ -//updateRatings(); - function notifyAdminsOfCleanupStart() { @@ -54,34 +53,12 @@ function orphanVersionCheck() $sQuery = "select versionId, versionName from appVersion where appId = 0 and state != 'deleted'"; $hResult = query_appdb($sQuery); - $found_orphans = false; - - $sMsg = "Found these orphaned versions in the database with\r\n"; - $sMsg.= "this sql command '".$sQuery."'\r\n"; - - /* don't report anything if no orphans are found */ - if(query_num_rows($hResult) == 0) - return; - - $sMsg .= "versionId/name\r\n"; - while($oRow = query_fetch_object($hResult)) - { - $sMsg .= $oRow->versionId."/".$oRow->versionName."\r\n"; - } - - $sSubject = $sEmailSubject."Orphan version cleanup\r\n"; - - $sEmail = user::getAdminEmails(); /* get list admins */ - if($sEmail) - mail_appdb($sEmail, $sSubject, $sMsg); } -// report the database error log entries to the mailing list -function reportErrorLogEntries() +function deleteOldErrorLogs() { - global $sEmailSubject; - error_log::mail_admins_error_log($sEmailSubject); - error_log::flush(); + $sQuery = "DELETE FROM error_log WHERE submitTime <= DATE_SUB(CURDATE(), INTERVAL '12' MONTH)"; + $hResult = query_parameters($sQuery); } // returns an array of iScreenshotIds of screenshots that are @@ -118,39 +95,7 @@ function getMissingScreenshotArray() function removeScreenshotsWithMissingFiles() { - global $sEmailSubject; - - $aMissingScreenshotIds = getMissingScreenshotArray(); - - if(sizeof($aMissingScreenshotIds)) - { - $sPlural = (sizeof($aMissingScreenshotIds) == 1) ? "" : "s"; - // build the email to admins about what we are doing - $sMsg = "Found ".count($aMissingScreenshotIds)." screenshot$sPlural with missing files.\r\n"; - - if($sPlural) - $sMsg.= "Deleting these screenshots.\r\n"; - else - $sMsgm.= "Deleting it.\r\n"; - - // add the screenshot ids to the email so we can see which screenshots are - // going to be deleted - $sMsg.="\r\n"; - $sMsg.="Screenshot ID$sPlural:\r\n"; - foreach($aMissingScreenshotIds as $iScreenshotId) - { - $sMsg.=$iScreenshotId."\r\n"; - } - } else - { - $sMsg = "No screenshot entries with missing files were found.\r\n"; - } - - $sSubject = $sEmailSubject."Missing screenshot cleanup\r\n"; - - $sEmail = user::getAdminEmails(); /* get list admins */ - if($sEmail) - mail_appdb($sEmail, $sSubject, $sMsg); + $aMissingScreenshotIds = getMissingScreenshotArray(); // log in as admin user with user id 1000 // NOTE: this is a bit of a hack but we need admin @@ -178,6 +123,24 @@ function maintainerCheck() maintainer::notifyMaintainersOfQueuedData(); } +// removes maintainers who have not logged in in over 24 months +function deleteInactiveMaintainers() +{ + $hResult = maintainer::getInactiveMaintainers(24); + $i = 0; + while($oRow = query_fetch_object($hResult)) + { + $oMaintainer = new maintainer(null, $oRow); + $oMaintainer->delete(); + $oUser = new User($oRow->userid); + $sEmail = $oUser->sEmail; + $sSubject = "Maintainer status removed"; + $sMsg = "Your maintainer status has been removed because you have not logged into the AppDB in over 24 months."; + mail_appdb($sEmail, $sSubject, $sMsg); + $i++; + } +} + /* remove votes for versions that have been deleted */ function cleanupVotes() { @@ -199,36 +162,6 @@ function cleanupVotes() else $iFailed++; } - - $sEmails = user::getAdminEmails(); // only admins - - if($sEmails) - { - global $sEmailSubject; - $sSubject = $sEmailSubject . 'Vote Cleanup'; - $sPlural = ($iDeleted == 1) ? '' : 's'; - $sMsg = "Removed $iDeleted vote$sPlural cast for deleted versions\n"; - if($iFailed) - { - $sPlural = ($iFailed == 1) ? '' : 's'; - $sMsg .= "WARNING: Failed to delete $iFailed vote$sPlural\n"; - } - mail_appdb($sEmails, $sSubject, $sMsg); - } -} - -function updateRatings() -{ - $hResult = query_parameters("SELECT * FROM appVersion"); - - if(!$hResult) - return; - - while($oRow = query_fetch_object($hResult)) - { - $oVersion = new version(0, $oRow); - $oVersion->updateRatingInfo(); - } } ?>

1 0

Rosanne DiMesio : Respect the send_email flag for admin-only emails
by Jeremy Newman 08 Aug '17

08 Aug '17

Module: appdb Branch: master Commit: c163a3c1c2d6d860a8a0707eef3d129af807f15b URL: http://source.winehq.org/git/appdb.git/?a=commit;h=c163a3c1c2d6d860a8a0707e… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Tue Aug 8 11:09:19 2017 -0500 Respect the send_email flag for admin-only emails Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- include/user.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/include/user.php b/include/user.php index ff6b0fa..5a4b428 100644 --- a/include/user.php +++ b/include/user.php @@ -561,10 +561,12 @@ class User { public static function getAdminEmails() { $sRecipients = ''; - $sQuery = "SELECT DISTINCT(user_list.email) FROM user_privs, user_list WHERE - user_privs.userid = user_list.userId - AND - user_privs.priv= 'admin'"; + $sQuery = "SELECT user_list.email FROM user_privs, user_list, user_prefs + WHERE user_privs.userid = user_list.userId + AND user_privs.userId = user_prefs.userId + AND user_privs.priv = 'admin' + AND user_prefs.name = 'send_email' + AND user_prefs.value = 'yes'"; $hResult = query_parameters($sQuery); if(!$hResult) return FALSE;

1 0

Julian Rüger : Update German translation of Downloads page
by Jeremy Newman 08 Aug '17

08 Aug '17

Module: website Branch: master Commit: 23da25aad500840576cd509f8ebf6a438a14a324 URL: http://source.winehq.org/git/website.git/?a=commit;h=23da25aad500840576cd50… Author: Julian Rüger <jr98(a)gmx.net> Date: Tue Aug 8 18:16:26 2017 +0200 Update German translation of Downloads page Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- templates/de/download.template | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/templates/de/download.template b/templates/de/download.template index 3b3bb7c..b596971 100644 --- a/templates/de/download.template +++ b/templates/de/download.template @@ -75,11 +75,9 @@ <b><a href="https://wiki.winehq.org/Ubuntu">Ubuntu</a></b> - WineHQ Binärpakete für Ubuntu 14.04, 16.04, 16.10 und 17.04</p> <p><b><a href="https://wiki.winehq.org/Debian">Debian</a></b> - - WineHQ Binärpakete für Debian Wheezy, Jessie, Stretch und Sid</p> + - WineHQ Binärpakete für Debian Wheezy, Jessie, Stretch, Buster und Sid</p> <p><b><a href="https://wiki.winehq.org/Fedora">Fedora</a></b> - - WineHQ Binärpakete für Fedora 24 und 25 </p> - <p><b><a href="https://wiki.winehq.org/Mageia">Mageia</a></b> - - WineHQ Binärpakete für Mageia 5</p> + - WineHQ Binärpakete für Fedora 24, 25 und 26</p> <p><b><a href="https://wiki.winehq.org/MacOSX">macOS</a></b> - WineHQ Binärpakete für macOS 10.8 und höher</p> </div>

1 0

Julian Rüger : German translation for release 2.14
by Jeremy Newman 08 Aug '17

08 Aug '17

Module: website Branch: master Commit: f9f86ad8ab6e9b035d6862a2931c16c17e4464e0 URL: http://source.winehq.org/git/website.git/?a=commit;h=f9f86ad8ab6e9b035d6862… Author: Julian Rüger <jr98(a)gmx.net> Date: Tue Aug 8 17:18:49 2017 +0200 German translation for release 2.14 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2017080301.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/de/2017080301.xml b/news/de/2017080301.xml new file mode 100644 index 0000000..e7ba544 --- /dev/null +++ b/news/de/2017080301.xml @@ -0,0 +1,16 @@ +<news> +<date>3. August 2017</date> +<title>Wine 2.14 freigegeben</title> +<body> +<p> Die Entwicklungsversion 2.14 von Wine ist jetzt verfügbar.</p> +<p> <a href="{$root}/announce/2.14">Neuerungen (en)</a> in dieser Version:</p> +<ul> + <li>Aktualisierte Mono-Engine mit verschiedenen Fehlerkorrekturen.</li> + <li>Workarounds für C++ calling conventions im IDL-Compiler.</li> + <li>Z-Order-Unterstützung im Android-Grafiktreiber.</li> + <li>Skalierbare Mauszeiger unter macOS.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +<p>Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/2.x/wine-2.14.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</p></body></news>

1 0

Zebediah Figura : msi: Add support for ActionText table.
by Alexandre Julliard 08 Aug '17

08 Aug '17

Module: wine Branch: master Commit: 52fbaeb2c44e585cacd7f0b57e902dfbcf54d09b URL: http://source.winehq.org/git/wine.git/?a=commit;h=52fbaeb2c44e585cacd7f0b57… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jul 23 20:49:05 2017 -0500 msi: Add support for ActionText table. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/action.c | 15 ++++++++++++++- dlls/msi/tests/package.c | 25 +++++++++++++++++++++++-- 2 files changed, 37 insertions(+), 3 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index b521925..64e01c4 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -160,13 +160,26 @@ static const WCHAR szWriteEnvironmentStrings[] = static INT ui_actionstart(MSIPACKAGE *package, LPCWSTR action, LPCWSTR description, LPCWSTR template) { - MSIRECORD *row = MSI_CreateRecord(3); + WCHAR query[] = {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ', + '`','A','c','t','i','o','n','T','e','x','t','`',' ','W','H','E','R','E',' ', + '`','A','c','t','i','o','n','`',' ','=',' ','\'','%','s','\'',0}; + MSIRECORD *row, *textrow; INT rc; + + textrow = MSI_QueryGetRecord(package->db, query, action); + if (textrow) + { + description = MSI_RecordGetString(textrow, 2); + template = MSI_RecordGetString(textrow, 3); + } + + row = MSI_CreateRecord(3); if (!row) return -1; MSI_RecordSetStringW(row, 1, action); MSI_RecordSetStringW(row, 2, description); MSI_RecordSetStringW(row, 3, template); rc = MSI_ProcessMessage(package, INSTALLMESSAGE_ACTIONSTART, row); + if (textrow) msiobj_release(&textrow->hdr); msiobj_release(&row->hdr); return rc; } diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index c10488a..c00ed61 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -687,6 +687,16 @@ static UINT create_controlevent_table( MSIHANDLE hdb ) "PRIMARY KEY `Dialog_`, `Control_`, `Event`, `Argument`, `Condition`)"); } +static UINT create_actiontext_table( MSIHANDLE hdb ) +{ + return run_query(hdb, + "CREATE TABLE `ActionText` (" + "`Action` CHAR(72) NOT NULL, " + "`Description` CHAR(64) LOCALIZABLE, " + "`Template` CHAR(128) LOCALIZABLE " + "PRIMARY KEY `Action`)"); +} + #define make_add_entry(type, qtext) \ static UINT add##_##type##_##entry( MSIHANDLE hdb, const char *values ) \ { \ @@ -782,6 +792,10 @@ make_add_entry(controlevent, "INSERT INTO `ControlEvent` " "(`Dialog_`, `Control_`, `Event`, `Argument`, `Condition`, `Ordering`) VALUES( %s )"); +make_add_entry(actiontext, + "INSERT INTO `ActionText` " + "(`Action`, `Description`, `Template`) VALUES( %s )"); + static UINT add_reglocator_entry( MSIHANDLE hdb, const char *sig, UINT root, const char *path, const char *name, UINT type ) { @@ -9394,14 +9408,14 @@ static const struct externalui_message processmessage_error_format_sequence[] = }; static const struct externalui_message doaction_costinitialize_sequence[] = { - {INSTALLMESSAGE_ACTIONSTART, 3, {"", "CostInitialize", "", ""}, {0, 1, 0, 1}}, + {INSTALLMESSAGE_ACTIONSTART, 3, {"", "CostInitialize", "cost description", "cost template"}, {0, 1, 1, 1}}, {INSTALLMESSAGE_INFO, 2, {"", "CostInitialize", ""}, {0, 1, 1}}, {INSTALLMESSAGE_INFO, 2, {"", "CostInitialize", "1"}, {0, 1, 1}}, {0} }; static const struct externalui_message doaction_custom_sequence[] = { - {INSTALLMESSAGE_ACTIONSTART, 3, {"", "custom", "", ""}, {0, 1, 1, 1}}, + {INSTALLMESSAGE_ACTIONSTART, 3, {"", "custom", "description", "template"}, {0, 1, 1, 1}}, {INSTALLMESSAGE_INFO, 2, {"", "custom", "1"}, {0, 1, 1}}, {INSTALLMESSAGE_INFO, 2, {"", "custom", "0"}, {0, 1, 1}}, {0} @@ -9540,6 +9554,13 @@ static void test_externalui_message(void) r = run_query(hdb, "INSERT INTO `Error` (`Error`, `Message`) VALUES (5, 'internal error')"); ok(r == ERROR_SUCCESS, "Failed to insert into Error table: %u\n", r); + r = create_actiontext_table(hdb); + ok(r == ERROR_SUCCESS, "Failed to create ActionText table: %u\n", r); + r = add_actiontext_entry(hdb, "'custom', 'description', 'template'"); + ok(r == ERROR_SUCCESS, "Failed to insert into ActionText table: %u\n", r); + r = add_actiontext_entry(hdb, "'CostInitialize', 'cost description', 'cost template'"); + ok(r == ERROR_SUCCESS, "Failed to insert into ActionText table: %u\n", r); + r = MsiOpenPackageA(NULL, &hpkg); ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", r); ok_sequence(empty_sequence, "MsiOpenPackage with NULL db", FALSE);

1 0

← Newer
1
...
24
25
26
27
28
29
30
...
36
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2017