June 2006 - Wine-commits - list.winehq.org

Paul Vriens : uxtheme/tests: Add a case sensitivity test.
by Alexandre Julliard 23 Jun '06

23 Jun '06

Module: wine Branch: refs/heads/master Commit: 7c0aaf31ec2d2cc6ba4262dc4a2551bb2706e509 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7c0aaf31ec2d2cc6ba4262d… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Thu Jun 22 14:38:32 2006 +0200 uxtheme/tests: Add a case sensitivity test. --- dlls/uxtheme/tests/system.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index 1072498..5375afe 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -160,6 +160,7 @@ static void test_OpenThemeData(void) WCHAR szInvalidClassList[] = {'D','E','A','D','B','E','E','F', 0 }; WCHAR szButtonClassList[] = {'B','u','t','t','o','n', 0 }; + WCHAR szButtonClassList2[] = {'b','U','t','T','o','N', 0 }; WCHAR szClassList[] = {'B','u','t','t','o','n',';','L','i','s','t','B','o','x', 0 }; bThemeActive = pIsThemeActive(); @@ -245,6 +246,15 @@ static void test_OpenThemeData(void) "Expected ERROR_SUCCESS, got 0x%08lx\n", GetLastError()); + /* Test with bUtToN instead of Button */ + SetLastError(0xdeadbeef); + hTheme = pOpenThemeData(hWnd, szButtonClassList2); + ok( hTheme != NULL, "got NULL, expected a HTHEME handle\n"); + todo_wine + ok( GetLastError() == ERROR_SUCCESS, + "Expected ERROR_SUCCESS, got 0x%08lx\n", + GetLastError()); + SetLastError(0xdeadbeef); hTheme = pOpenThemeData(hWnd, szClassList); ok( hTheme != NULL, "got NULL, expected a HTHEME handle\n");

1 0

Jonathan Ernst : oleview: Spelling fixes (English).
by Alexandre Julliard 23 Jun '06

23 Jun '06

Module: wine Branch: refs/heads/master Commit: 9cc02dd6a9a4df0e60a1f5219ec32e93465ac3e3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9cc02dd6a9a4df0e60a1f52… Author: Jonathan Ernst <jonathan(a)ernstfamily.ch> Date: Thu Jun 22 14:12:57 2006 +0200 oleview: Spelling fixes (English). --- programs/oleview/En.rc | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/oleview/En.rc b/programs/oleview/En.rc index 45e905a..abc4bee 100644 --- a/programs/oleview/En.rc +++ b/programs/oleview/En.rc @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA -*/ + */ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US @@ -58,7 +58,7 @@ IDM_MENU MENU { MENUITEM "&Expert mode", IDM_EXPERT,CHECKED MENUITEM SEPARATOR - MENUITEM "&Hidden component cattegories", IDM_HIDDEN, GRAYED + MENUITEM "&Hidden component categories", IDM_HIDDEN, GRAYED MENUITEM SEPARATOR MENUITEM "&Toolbar", IDM_TOOLBAR,CHECKED MENUITEM "&Status Bar", IDM_STATUSBAR,CHECKED @@ -98,7 +98,7 @@ STRINGTABLE IDM_TOOLBAR, "Show or hide the toolbar" IDM_STATUSBAR, "Show or hide the status bar" IDM_REFRESH, "Refresh all lists" - IDM_ABOUT, "Display program information, version namber and copyright" + IDM_ABOUT, "Display program information, version number and copyright" IDS_TREE_OC, "ObjectClasses" IDS_TREE_GBCC, "Grouped by Component Category"

1 0

Huw Davies : winex11: glXQueryExtension has its error and event base arguments swapped
by Alexandre Julliard 23 Jun '06

23 Jun '06

Module: wine Branch: refs/heads/master Commit: 4d361ce002e6563915388397b4d5241bf9e438ab URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4d361ce002e656391538839… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jun 22 12:44:43 2006 +0100 winex11: glXQueryExtension has its error and event base arguments swapped compared with other *QueryExtension functions! --- dlls/winex11.drv/opengl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index bfd023e..60ebcce 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -156,7 +156,7 @@ LOAD_FUNCPTR(glXDestroyGLXPixmap) #undef LOAD_FUNCPTR wine_tsx11_lock(); - if (pglXQueryExtension(gdi_display, &event_base, &error_base) == True) { + if (pglXQueryExtension(gdi_display, &error_base, &event_base) == True) { TRACE("GLX is up and running error_base = %d\n", error_base); } else { wine_dlclose(opengl_handle, NULL, 0);

1 0

Jonathan Ernst : oleview: French localization.
by Alexandre Julliard 23 Jun '06

23 Jun '06

Module: wine Branch: refs/heads/master Commit: 940d4e0f3babd7c19bca82e11a56b5d7802c9d28 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=940d4e0f3babd7c19bca82e… Author: Jonathan Ernst <jonathan(a)ernstfamily.ch> Date: Thu Jun 22 14:12:13 2006 +0200 oleview: French localization. --- programs/oleview/Fr.rc | 119 ++++++++++++++++++++++++++++++++++++++++++++++ programs/oleview/rsrc.rc | 1 2 files changed, 120 insertions(+), 0 deletions(-) create mode 100644 programs/oleview/Fr.rc diff --git a/programs/oleview/Fr.rc b/programs/oleview/Fr.rc new file mode 100644 index 0000000..cef6e45 --- /dev/null +++ b/programs/oleview/Fr.rc @@ -0,0 +1,119 @@ +/* + * OleView (Fr.rc) + * Frencg Language Support + * + * Copyright 2006 Jonathan Ernst + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL + +IDM_MENU MENU +{ + POPUP "&Fichier" + { + MENUITEM "&Lier au fichier...", IDM_BIND + MENUITEM "&Afficher la TypeLib...", IDM_TYPELIB + MENUITEM SEPARATOR + MENUITEM "&Configuration système", IDM_SYSCONF + MENUITEM "&Exécuter l'éditeur de la base de registre", IDM_REGEDIT + MENUITEM SEPARATOR + MENUITEM "&Quitter", IDM_EXIT + } + POPUP "&Objet" + { + POPUP "&CoCreateInstance Flag" + { + MENUITEM "CLSCTX_&INPROC_SERVER", IDM_FLAG_INSERV,CHECKED + MENUITEM "CLSCTX_INPROC_&HANDLER", IDM_FLAG_INHANDL + MENUITEM "CLSCTX_&LOCAL_SERVER", IDM_FLAG_LOCSERV,CHECKED + MENUITEM "CLSCTX_&REMOTE_SERVER", IDM_FLAG_REMSERV + } + MENUITEM SEPARATOR + MENUITEM "Afficher les informations sur le &type", IDM_TYPEINFO, GRAYED + MENUITEM SEPARATOR + MENUITEM "Créer une &instance", IDM_CREATEINST, GRAYED + MENUITEM "Créer une instance &sur", IDM_CREATEINSTON, GRAYED + MENUITEM "&Libérer l'instance", IDM_RELEASEINST, GRAYED + MENUITEM SEPARATOR + MENUITEM "Copier le &CLSID dans le presse-papiers", IDM_COPYCLSID, GRAYED + MENUITEM "Copier la balse &HTML de l'objet dans le presse-papiers", IDM_HTMLTAG, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Afficher...", IDM_VIEW, GRAYED + } + POPUP "&Affichage" + { + MENUITEM "Mode &expert", IDM_EXPERT,CHECKED + MENUITEM SEPARATOR + MENUITEM "Catégories de compsants &cachés", IDM_HIDDEN, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Barre d'outils", IDM_TOOLBAR,CHECKED + MENUITEM "Barre d'é&tat", IDM_STATUSBAR,CHECKED + MENUITEM SEPARATOR + MENUITEM "A&ctualiser\tF5", IDM_REFRESH + } + POPUP "Aid&e" + { + MENUITEM "À &propos de OleView", IDM_ABOUT + } +} + +STRINGTABLE +{ + IDS_APPNAME "OleView" + IDS_APPTITLE "OleView" + IDS_READY "Prêt" + IDS_ABOUT "OleView - Visionneur d'objets OLE/COM" + IDS_ABOUTVER "version 1.0" + + IDM_BIND, "Lie à un fichier à l'aide d'un File Moniker" + IDM_TYPELIB, "Ouvre un fichier TypeLib et afficher son contenu" + IDM_SYSCONF, "Modifie les paramètres COM distribuées pour l'ensemble de la machine" + IDM_REGEDIT, "Exécute l'éditeur de base de registre de Wine" + IDM_EXIT, "Quitte l'application après avoir demandé s'il faut enregistrer les modifications" + IDM_CREATEINST, "Crée une instance de l'objet sélectionné" + IDM_CREATEINSTON, "Crée une instance de l'objet sélectionné sur une machine spécifique" + IDM_RELEASEINST, "Libère l'instance de l'objet actuellement sélectionné" + IDM_COPYCLSID, "Copie le GUID de l'objet actuellement sélectionné dans le presse-papiers" + IDM_VIEW, "Affiche le visionneur pour l'objet actuellement sélectionné" + IDM_FLAG_INSERV, "Utilise CLSCTX_INPROC_SERVER lors de l'appel à CoGetClassObject" + IDM_FLAG_INHANDL, "Utilise CLSCTX_INPROC_HANDLER lors de l'appel à CoGetClassObject" + IDM_FLAG_LOCSERV, "Utilise CLSCTX_LOCAL_SERVER lors de l'appel à CoGetClassObject" + IDM_FLAG_REMSERV, "Utilise CLSCTX_REMOTE_SERVER lors de l'appel à CoGetClassObject" + IDM_EXPERT, "Bascule entre le mode d'affichage expert et le mode d'affichage débutant" + IDM_HIDDEN, "Bascule l'affichage des catégories des composant qui ne sont pas prévue pour être visible" + IDM_TOOLBAR, "Affiche ou masque la barre d'outils" + IDM_STATUSBAR, "Affiche ou masque la barre d'état" + IDM_REFRESH, "Actualise toutes les listes" + IDM_ABOUT, "Affiche les informations sur le programme ; le numéro de version et la licence" + + IDS_TREE_OC, "ObjectClasses" + IDS_TREE_GBCC, "Groupés par catégorie de composants" + IDS_TREE_O1O, "Objets OLE 1.0" + IDS_TREE_CLO, "Objets de la bibliothèque COM" + IDS_TREE_AO, "Tous les objets" + IDS_TREE_AID, "Identificateurs d'application" + IDS_TREE_TL, "Bibliothèques type" + IDS_TL_VER, "ver." + IDS_TREE_I, "Interfaces" + + IDS_TAB_REG, "Base de registre" + IDS_TAB_IMPL, "Implémentation" + IDS_TAB_ACTIV, "Activation" + + IDS_CGCOFAIL, "CoGetClassObject a échoué." + IDS_ERROR_UNKN, "Erreur inconnue" +} diff --git a/programs/oleview/rsrc.rc b/programs/oleview/rsrc.rc index 4b81a09..7193fa3 100644 --- a/programs/oleview/rsrc.rc +++ b/programs/oleview/rsrc.rc @@ -22,6 +22,7 @@ #include <windows.h> #include "resource.h" #include "En.rc" +#include "Fr.rc" IDA_OLEVIEW ACCELERATORS DISCARDABLE {

1 0

appdb/admin editDistribution.php
by WineHQ 23 Jun '06

23 Jun '06

ChangeSet ID: 25982 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/06/23 00:03:03 Modified files: admin : editDistribution.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Fix case of 'Submit' to fix creating a new distribution Patch: http://cvs.winehq.org/patch.py?id=25982 Old revision New revision Changes Path 1.3 1.4 +1 -1 appdb/admin/editDistribution.php Index: appdb/admin/editDistribution.php diff -u -p appdb/admin/editDistribution.php:1.3 appdb/admin/editDistribution.php:1.4 --- appdb/admin/editDistribution.php:1.3 23 Jun 2006 5: 3: 3 -0000 +++ appdb/admin/editDistribution.php 23 Jun 2006 5: 3: 3 -0000 @@ -6,7 +6,7 @@ require(BASE."include/distributions.php" $aClean = array(); //array of filtered user input $aClean['iDistributionId'] = makeSafe($_REQUEST['iDistributionId']); -$aClean['submit'] = makeSafe($_REQUEST['submit']); +$aClean['Submit'] = makeSafe($_REQUEST['Submit']); if(!$_SESSION['current']->hasPriv("admin")) {

1 0

appdb/ ./apidb.css include/util.php
by WineHQ 23 Jun '06

23 Jun '06

ChangeSet ID: 25981 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/06/22 23:11:50 Modified files: . : apidb.css include : util.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Fix the application name column in the top 'X' lists to be 150px wide so each top 'X' list looks uniform Patch: http://cvs.winehq.org/patch.py?id=25981 Old revision New revision Changes Path 1.14 1.15 +2 -0 appdb/apidb.css 1.57 1.58 +3 -3 appdb/include/util.php Index: appdb/apidb.css diff -u -p appdb/apidb.css:1.14 appdb/apidb.css:1.15 --- appdb/apidb.css:1.14 23 Jun 2006 4:11:50 -0000 +++ appdb/apidb.css 23 Jun 2006 4:11:50 -0000 @@ -196,6 +196,8 @@ TD.yes { color: #00B100; font-style: ita TD.no { color: #B10000; font-style: italic; text-align: center } TD.stub { color: #0000B1; font-style: italic; text-align: center } +/* width of the application column in the top 'X' lists on the main page */ +TD.app_name { width: 150px } /* Rating Number */ .rating { font-family: Helvetica, Arial; font-size: 6pt; color: #333333; } Index: appdb/include/util.php diff -u -p appdb/include/util.php:1.57 appdb/include/util.php:1.58 --- appdb/include/util.php:1.57 23 Jun 2006 4:11:50 -0000 +++ appdb/include/util.php 23 Jun 2006 4:11:50 -0000 @@ -269,9 +269,9 @@ function outputTopXRow($oRow) $img = get_screenshot_img(null, $oRow->versionId, false); // image, disable extra formatting echo ' <tr class="white"> - <td><a href="appview.php?versionId='.$oRow->versionId.'">'.$oApp->sName.' '.$oVersion->sName.'</a></td> - <td>'.trim_description($oApp->sDescription).'</td> - <td><center>'.$img.'</center></td> + <td class="app_name"><a href="appview.php?versionId='.$oRow->versionId.'">'.$oApp->sName.' '.$oVersion->sName.'</a></td> + <td>'.trim_description($oApp->sDescription).'</td> + <td><center>'.$img.'</center></td> </tr>'; }

1 0

appdb/admin editBundle.php
by WineHQ 23 Jun '06

23 Jun '06

ChangeSet ID: 25980 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/06/22 22:42:08 Modified files: admin : editBundle.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Fix editing bundles, they've been broken since appdb was imported into cvs and we haven't noticed, ha Patch: http://cvs.winehq.org/patch.py?id=25980 Old revision New revision Changes Path 1.7 1.8 +51 -48 appdb/admin/editBundle.php Index: appdb/admin/editBundle.php diff -u -p appdb/admin/editBundle.php:1.7 appdb/admin/editBundle.php:1.8 --- appdb/admin/editBundle.php:1.7 23 Jun 2006 3:42: 8 -0000 +++ appdb/admin/editBundle.php 23 Jun 2006 3:42: 8 -0000 @@ -21,73 +21,76 @@ function build_app_list() echo "</select>\n"; } - -if($cmd) +if($_REQUEST['cmd']) { - if($cmd == "delete") + if($_REQUEST['cmd'] == "delete") { - $hResult = query_appdb("DELETE FROM appBundle WHERE appId = $appId AND bundleId = $bundleId"); + $hResult = query_appdb("DELETE FROM appBundle WHERE appId =".$_REQUEST['appId']." AND bundleId =".$_REQUEST['bundleId']); if($hResult) addmsg("App deleted from bundle", "green"); + else + addmsg("Failed to delete app from bundle!", "red"); } - if($cmd == "add") + if($_REQUEST['cmd'] == "add") { - $hResult = query_appdb("INSERT INTO appBundle VALUES ($bundleId, $appId)"); + $hResult = query_appdb("INSERT INTO appBundle VALUES (".$_REQUEST['bundleId'].", ".$_REQUEST['appId'].")"); if($hResult) - addmsg("App $appId added to Bundle $bundleId", "green"); + addmsg("App $appId added to Bundle".$_REQUEST['bundleId'], "green"); } - redirectref(); - exit; } -else -{ - apidb_header("Edit Application Bundle"); - $hResult = query_appdb("SELECT bundleId, appBundle.appId, appName FROM appBundle, appFamily ". - "WHERE bundleId = $bundleId AND appFamily.appId = appBundle.appId"); - if($hResult && mysql_num_rows($hResult)) - { - echo html_frame_start("Apps in this Bundle","300",'',0); - echo "<table width='100%' border=0 cellpadding=3 cellspacing=0>\n\n"; - - echo "<tr class=color4>\n"; - echo " <td><font color=white> Application Name </font></td>\n"; - echo " <td><font color=white> Delete </font></td>\n"; - echo "</tr>\n\n"; +apidb_header("Edit Application Bundle"); + +$hResult = query_appdb("SELECT bundleId, appBundle.appId, appName FROM appBundle, appFamily ". + "WHERE bundleId = ".$_REQUEST['bundleId']." AND appFamily.appId = appBundle.appId"); + +echo html_frame_start("Apps in this Bundle","300",'',0); +echo "<table width='100%' border=0 cellpadding=3 cellspacing=0>\n\n"; - $c = 1; - while($oRow = mysql_fetch_object($hResult)) - { - //set row color - if ($c % 2 == 1) { $bgcolor = 'color0'; } else { $bgcolor = 'color1'; } +echo "<tr class=color4>\n"; +echo " <td><font color=white> Application Name </font></td>\n"; +echo " <td><font color=white> Delete </font></td>\n"; +echo "</tr>\n\n"; + +if($hResult && mysql_num_rows($hResult)) +{ + $c = 1; + while($oRow = mysql_fetch_object($hResult)) + { + //set row color + if ($c % 2 == 1) { $bgcolor = 'color0'; } else { $bgcolor = 'color1'; } - $delete_link = "[<a href='editBundle.php?cmd=delete&bundleId=$bundleId&appId=$oRow->appId'>delete</a>]"; + $delete_link = "[<a href='editBundle.php?cmd=delete&bundleId=".$_REQUEST['bundleId']."&appId=$oRow->appId'>delete</a>]"; - echo "<tr class=$bgcolor>\n"; - echo " <td>$oRow->appName  </td>\n"; - echo " <td>$delete_link  </td>\n"; - echo "</tr>\n\n"; + echo "<tr class=$bgcolor>\n"; + echo " <td>$oRow->appName  </td>\n"; + echo " <td>$delete_link  </td>\n"; + echo "</tr>\n\n"; - $c++; - } - - echo "</table>\n\n"; - echo html_frame_end(); + $c++; } +} else if($hResult && !mysql_num_rows($hResult)) +{ + /* indicate to the user that there are no apps in this bundle at the moment */ + echo "<tr>\n"; + echo " <td colspan=2 align=center><b>No applications in this bundle</b></td>\n"; + echo "</tr>\n"; +} - echo "<form method=post action=editBundle.php>\n"; +echo "</table>\n\n"; +echo html_frame_end(); - echo html_frame_start("Application List (double click to add)","",'',2); - build_app_list(); - echo html_frame_end(); +echo "<form method=post action=editBundle.php>\n"; + +echo html_frame_start("Application List (double click to add)","",'',2); +build_app_list(); +echo html_frame_end(); - echo "<input type=hidden name=bundleId value=$bundleId>\n"; - echo "<input type=hidden name=cmd value=add>\n"; - echo "</form>\n"; +echo "<input type=\"hidden\" name=\"bundleId\" value=\"".$_REQUEST['bundleId']."\">\n"; +echo "<input type=\"hidden\" name=\"cmd\" value=\"add\">\n"; +echo "</form>\n"; - apidb_footer(); -} - +apidb_footer(); ?>

1 0

appdb/include util.php
by WineHQ 22 Jun '06

22 Jun '06

ChangeSet ID: 25979 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/06/22 17:34:56 Modified files: include : util.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Fix indenting and formatting Patch: http://cvs.winehq.org/patch.py?id=25979 Old revision New revision Changes Path 1.56 1.57 +23 -18 appdb/include/util.php Index: appdb/include/util.php diff -u -p appdb/include/util.php:1.56 appdb/include/util.php:1.57 --- appdb/include/util.php:1.56 22 Jun 2006 22:34:56 -0000 +++ appdb/include/util.php 22 Jun 2006 22:34:56 -0000 @@ -9,21 +9,21 @@ function makeSafe($var) function build_urlarg($vars) { - $arr = array(); - while(list($key, $val) = each($vars)) - { - if(is_array($val)) + $arr = array(); + while(list($key, $val) = each($vars)) + { + if(is_array($val)) { - while(list($idx, $value) = each($val)) - { - //echo "Encoding $key / $value<br>"; - $arr[] = rawurlencode($key."[]")."=".rawurlencode($value); - } + while(list($idx, $value) = each($val)) + { + //echo "Encoding $key / $value<br>"; + $arr[] = rawurlencode($key."[]")."=".rawurlencode($value); + } } - else - $arr[] = $key."=".rawurlencode($val); - } - return implode("&", $arr); + else + $arr[] = $key."=".rawurlencode($val); + } + return implode("&", $arr); } @@ -735,8 +735,9 @@ function display_page_range($currentPage echo "<a href='".$linkurl."&page=$nextPage'>&gt</a> "; echo "<a href='".$linkurl."&page=$totalPages'>&gt|</a> "; } else + { echo "&gt &gt|"; - + } } // Expand a path like /something/somedirectory/../ to /something @@ -744,13 +745,16 @@ function display_page_range($currentPage function SimplifyPath($path) { $dirs = explode('/',$path); - for($i=0; $i<count($dirs);$i++) { - if($dirs[$i]=="." || $dirs[$i]=="") { + for($i=0; $i<count($dirs);$i++) + { + if($dirs[$i]=="." || $dirs[$i]=="") + { array_splice($dirs,$i,1); $i--; } - if($dirs[$i]=="..") { + if($dirs[$i]=="..") + { $cnt = count($dirs); $dirs=Simplify($dirs, $i); $i-= $cnt-count($dirs); @@ -759,7 +763,8 @@ function SimplifyPath($path) { return implode('/',$dirs); } -function Simplify($dirs, $idx) { +function Simplify($dirs, $idx) +{ if($idx==0) return $dirs; if($dirs[$idx-1]=="..") Simplify($dirs, $idx-1);

1 0

appdb/include session.php
by WineHQ 22 Jun '06

22 Jun '06

ChangeSet ID: 25978 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/06/22 17:34:23 Modified files: include : session.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> $_SESSION['current']->userId should be ->iUserId, there is no userId member of class user. Patch: http://cvs.winehq.org/patch.py?id=25978 Old revision New revision Changes Path 1.8 1.9 +1 -1 appdb/include/session.php Index: appdb/include/session.php diff -u -p appdb/include/session.php:1.8 appdb/include/session.php:1.9 --- appdb/include/session.php:1.8 22 Jun 2006 22:34:23 -0000 +++ appdb/include/session.php 22 Jun 2006 22:34:23 -0000 @@ -79,7 +79,7 @@ class session if(isset($GLOBALS['msg_buffer'])) $messages = implode("|", $GLOBALS['msg_buffer']); - query_appdb("REPLACE session_list VALUES ('$key', '".$_SESSION['current']->userid."', '".get_remote()."', '".addslashes($value)."', '$messages', NOW())"); + query_appdb("REPLACE session_list VALUES ('$key', '".$_SESSION['current']->iUserId."', '".get_remote()."', '".addslashes($value)."', '$messages', NOW())"); return true; }

1 0

appdb/include screenshot.php util.php
by WineHQ 22 Jun '06

22 Jun '06

ChangeSet ID: 25977 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/06/22 16:41:41 Modified files: include : screenshot.php util.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Compact the top 'X' lists on the main page by adding a flag to get_screenshot_img() that disables the output of html that was putting the image inside of another table Patch: http://cvs.winehq.org/patch.py?id=25977 Old revision New revision Changes Path 1.35 1.36 +17 -5 appdb/include/screenshot.php 1.55 1.56 +2 -2 appdb/include/util.php Index: appdb/include/screenshot.php diff -u -p appdb/include/screenshot.php:1.35 appdb/include/screenshot.php:1.36 --- appdb/include/screenshot.php:1.35 22 Jun 2006 21:41:41 -0000 +++ appdb/include/screenshot.php 22 Jun 2006 21:41:41 -0000 @@ -303,8 +303,10 @@ class Screenshot { /** * Get a random image for a particular version of an app. * If the version is not set, get a random app image + * + * $bFormatting == false turns off all extranious formatting applied to the returned image html */ -function get_screenshot_img($iAppId = null, $iVersionId = null) +function get_screenshot_img($iAppId = null, $iVersionId = null, $bFormatting = true) { // we want a random screenshots for this app if($iAppId && !$iVersionId) @@ -325,16 +327,24 @@ function get_screenshot_img($iAppId = nu AND queued = 'false' ORDER BY rand"); } + + if($bFormatting) + $sImgFile .= '<center>'; + if(!$hResult || !mysql_num_rows($hResult)) { - $sImgFile = '<center><img src="images/no_screenshot.png" alt="No Screenshot" /></center>'; + $sImgFile = '<img src="images/no_screenshot.png" alt="No Screenshot" />'; } else { $oRow = mysql_fetch_object($hResult); - $sImgFile = '<center><img src="appimage.php?thumbnail=true&id='.$oRow->id.'" alt="'.$oRow->description.'" /></center>'; + $sImgFile = '<img src="appimage.php?thumbnail=true&id='.$oRow->id.'" alt="'.$oRow->description.'" />'; } + + if($bFormatting) + $sImgFile .= '</center>'; - $sImg = html_frame_start("",'128','',2); + if($bFormatting) + $sImg = html_frame_start("",'128','',2); /* we have screenshots */ if(mysql_num_rows($hResult)) @@ -350,7 +360,9 @@ function get_screenshot_img($iAppId = nu { $sImg .= $sImgFile; } - $sImg .= html_frame_end()."<br />"; + + if($bFormatting) + $sImg .= html_frame_end()."<br />"; return $sImg; } Index: appdb/include/util.php diff -u -p appdb/include/util.php:1.55 appdb/include/util.php:1.56 --- appdb/include/util.php:1.55 22 Jun 2006 21:41:41 -0000 +++ appdb/include/util.php 22 Jun 2006 21:41:41 -0000 @@ -266,12 +266,12 @@ function outputTopXRow($oRow) { $oVersion = new Version($oRow->versionId); $oApp = new Application($oVersion->iAppId); - $img = get_screenshot_img(null, $oRow->versionId); // image + $img = get_screenshot_img(null, $oRow->versionId, false); // image, disable extra formatting echo ' <tr class="white"> <td><a href="appview.php?versionId='.$oRow->versionId.'">'.$oApp->sName.' '.$oVersion->sName.'</a></td> <td>'.trim_description($oApp->sDescription).'</td> - <td>'.$img.'</td> + <td><center>'.$img.'</center></td> </tr>'; }

1 0