Module: appdb
Branch: master
Commit: 7be5d6bd34d5c9c2f78df084e8d824b111925dcb
URL: http://source.winehq.org/git/appdb.git/?a=commit;h=7be5d6bd34d5c9c2f78df084…
Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com>
Date: Thu Jul 10 01:03:26 2008 +0200
Guard against intensive searches
---
include/util.php | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/include/util.php b/include/util.php
index 6fe6c1c..3b6453d 100644
--- a/include/util.php
+++ b/include/util.php
@@ -427,7 +427,16 @@ function cleanupSearchWords($search_words)
Search for the first word in the search query */
function searchForApplicationPartial($sSearchWords)
{
+ /* This would yield too many results and stress MySQL */
+ if(strlen($sSearchWords) < 4)
+ return null;
+
$sSearchWords = cleanupSearchWords($sSearchWords);
+
+ /* The search string may have gotten shorter; even empty */
+ if(strlen($sSearchWords) < 4)
+ return null;
+
$aWords = explode(' ', $sSearchWords);
$sSearchString = '';
$sEnsureExactWord = ''; // Used to ensure we don't match partial words when prepending
@@ -455,9 +464,17 @@ function searchForApplicationPartial($sSearchWords)
/* search the database and return a hResult from the query_appdb() */
function searchForApplication($search_words)
{
+ /* This would yield too many results and stress MySQL */
+ if(strlen($search_words) < 4)
+ return null;
+
/* cleanup search words */
$search_words = cleanupSearchWords($search_words);
+ /* The search string may have gotten shorter; even empty */
+ if(strlen($search_words) < 4)
+ return null;
+
/* remove any search words less than 4 letters */
$split_words = array();
$split_search_words = split(" ", $search_words);
Module: wine
Branch: stable
Commit: feb652a85ef9349e8205a4ef17a97459fb15800f
URL: http://source.winehq.org/git/wine.git/?a=commit;h=feb652a85ef9349e8205a4ef1…
Author: Scott Ritchie <scott(a)open-vote.org>
Date: Sun Jun 22 15:11:39 2008 -0700
wine.desktop: Add application/x-msi and change "emulator" to "program loader".
(cherry picked from commit f16e49baf2016348f4a1dfea3f09e72f9085135b)
---
tools/wine.desktop | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/tools/wine.desktop b/tools/wine.desktop
index 2be9b53..fe8f1e3 100644
--- a/tools/wine.desktop
+++ b/tools/wine.desktop
@@ -1,12 +1,20 @@
[Desktop Entry]
Type=Application
-Name=Wine Windows Emulator
-Name[de]=Wine Windows-Emulator
-Name[es]=Emulador Windows de Wine
-Name[nl]=Wine Windows-emulator
-Name[sv]=Windows-emulatorn Wine
-Name[ru]=Wine Эмулятор Windows
-Name[fr]=Émulateur Windows Wine
+Name=Wine Windows Program Loader
+Name[de]=Wine Windows-Programmstarter
+Name[es]=Wine Cargador de programas de Windows
+Name[nl]=Wine Windows programmalader
+Name[sv]=Wine Windows Programstartare
+Name[ru]=Wine - загрузчик Windows программ
+Name[uk]=Wine - завантажувач Windows програм
+Name[fr]=Wine Exécuter des programmes Windows
+Name[ca]=Wine - Carregador d'aplicacions del Windows
+Name[pt]=Carregador de aplicativos Windows Wine
+Name[pt_br]=Carregador de aplicativos Windows Wine
+Name[it]=Wine Carica Programmi Windows
+Name[da]=Wine, Programstarter til Windows-programmer
+Name[nb]=Wine Programlaster for Windowsapplikasjoner
+Name[nn]=Wine Programlaster for Windowsapplikasjoner
Exec=wine start /unix %f
-MimeType=application/x-ms-dos-executable;application/x-msdos-program;application/x-msdownload;application/exe;application/x-exe;application/dos-exe;vms/exe;application/x-winexe;application/msdos-windows;application/x-zip-compressed;application/x-executable;
+MimeType=application/x-ms-dos-executable;application/x-msdos-program;application/x-msdownload;application/exe;application/x-exe;application/dos-exe;vms/exe;application/x-winexe;application/msdos-windows;application/x-zip-compressed;application/x-executable;application/x-msi;
NoDisplay=true