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

Nigel Liang : shell32: Conformance tests for unicode filenames and fix a bug for file deletion.
by Alexandre Julliard 11 Jun '07

11 Jun '07

Module: wine Branch: master Commit: 1fc0cb75eebeb011a1f620fb96f32245d886916c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fc0cb75eebeb011a1f620fb9… Author: Nigel Liang <ncliang(a)gmail.com> Date: Fri Jun 8 14:25:24 2007 -0700 shell32: Conformance tests for unicode filenames and fix a bug for file deletion. --- dlls/shell32/tests/shlfileop.c | 88 ++++++++++++++++++++++++++++++++++++++++ dlls/shell32/xdg.c | 4 +- 2 files changed, 90 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index 1f2f0f7..7c5354b 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -33,14 +33,19 @@ #endif static CHAR CURR_DIR[MAX_PATH]; +static const WCHAR UNICODE_PATH[] = {'c',':','\\',0x00c4,'\0','\0'}; + /* "c:\Ä", or "c:\A" with diaeresis */ + /* Double-null termination needed for pFrom field of SHFILEOPSTRUCT */ static HMODULE hshell32; static int (WINAPI *pSHCreateDirectoryExA)(HWND, LPCSTR, LPSECURITY_ATTRIBUTES); +static int (WINAPI *pSHCreateDirectoryExW)(HWND, LPCWSTR, LPSECURITY_ATTRIBUTES); static void InitFunctionPointers(void) { hshell32 = GetModuleHandleA("shell32.dll"); pSHCreateDirectoryExA = (void*)GetProcAddress(hshell32, "SHCreateDirectoryExA"); + pSHCreateDirectoryExW = (void*)GetProcAddress(hshell32, "SHCreateDirectoryExW"); } /* creates a file with the specified name for tests */ @@ -56,11 +61,25 @@ static void createTestFile(const CHAR *name) CloseHandle(file); } +static void createTestFileW(const WCHAR *name) +{ + HANDLE file; + + file = CreateFileW(name, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); + ok(file != INVALID_HANDLE_VALUE, "Failure to open file\n"); + CloseHandle(file); +} + static BOOL file_exists(const CHAR *name) { return GetFileAttributesA(name) != INVALID_FILE_ATTRIBUTES; } +static BOOL file_existsW(LPCWSTR name) +{ + return GetFileAttributesW(name) != INVALID_FILE_ATTRIBUTES; +} + static BOOL file_has_content(const CHAR *name, const CHAR *content) { CHAR buf[MAX_PATH]; @@ -983,6 +1002,73 @@ static void test_sh_create_dir(void) ok(file_exists("c:\\testdir3"), "The directory is not created\n"); } +static void test_unicode(void) +{ + SHFILEOPSTRUCTW shfoW; + int ret; + HANDLE file; + + shfoW.hwnd = NULL; + shfoW.wFunc = FO_DELETE; + shfoW.pFrom = UNICODE_PATH; + shfoW.pTo = '\0'; + shfoW.fFlags = FOF_NOCONFIRMATION | FOF_SILENT | FOF_NOERRORUI; + shfoW.hNameMappings = NULL; + shfoW.lpszProgressTitle = NULL; + + /* Clean up before start test */ + DeleteFileW(UNICODE_PATH); + RemoveDirectoryW(UNICODE_PATH); + + /* Make sure we are on a system that supports unicode */ + SetLastError(0xdeadbeef); + file = CreateFileW(UNICODE_PATH, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); + if (GetLastError()==ERROR_CALL_NOT_IMPLEMENTED) + { + skip("Unicode tests skipped on non-unicode system\n"); + return; + } + CloseHandle(file); + + /* Try to delete a file with unicode filename */ + ok(file_existsW(UNICODE_PATH), "The file does not exist\n"); + ret = SHFileOperationW(&shfoW); + ok(!ret, "File is not removed, ErrorCode: %d\n", ret); + ok(!file_existsW(UNICODE_PATH), "The file should have been removed\n"); + + /* Try to trash a file with unicode filename */ + createTestFileW(UNICODE_PATH); + shfoW.fFlags |= FOF_ALLOWUNDO; + ok(file_existsW(UNICODE_PATH), "The file does not exist\n"); + ret = SHFileOperationW(&shfoW); + ok(!ret, "File is not removed, ErrorCode: %d\n", ret); + ok(!file_existsW(UNICODE_PATH), "The file should have been removed\n"); + + if(!pSHCreateDirectoryExW) + { + skip("Skipping SHCreateDirectoryExW tests\n"); + return; + } + + /* Try to delete a directory with unicode filename */ + ret = pSHCreateDirectoryExW(NULL, UNICODE_PATH, NULL); + ok(!ret, "SHCreateDirectoryExW returned %d\n", ret); + ok(file_existsW(UNICODE_PATH), "The directory is not created\n"); + shfoW.fFlags &= ~FOF_ALLOWUNDO; + ret = SHFileOperationW(&shfoW); + ok(!ret, "Directory is not removed, ErrorCode: %d\n", ret); + ok(!file_existsW(UNICODE_PATH), "The directory should have been removed\n"); + + /* Try to trash a directory with unicode filename */ + ret = pSHCreateDirectoryExW(NULL, UNICODE_PATH, NULL); + ok(!ret, "SHCreateDirectoryExW returned %d\n", ret); + ok(file_existsW(UNICODE_PATH), "The directory was not created\n"); + shfoW.fFlags |= FOF_ALLOWUNDO; + ret = SHFileOperationW(&shfoW); + ok(!ret, "Directory is not removed, ErrorCode: %d\n", ret); + ok(!file_existsW(UNICODE_PATH), "The directory should have been removed\n"); +} + START_TEST(shlfileop) { InitFunctionPointers(); @@ -1011,4 +1097,6 @@ START_TEST(shlfileop) test_sh_create_dir(); clean_after_shfo_tests(); + + test_unicode(); } diff --git a/dlls/shell32/xdg.c b/dlls/shell32/xdg.c index a3d6010..6521232 100644 --- a/dlls/shell32/xdg.c +++ b/dlls/shell32/xdg.c @@ -376,8 +376,8 @@ static int url_encode(const char *value, char *output) if (output) { *(output++) = '%'; - *(output++) = hexchars[(unsigned)(*c)/16]; - *(output++) = hexchars[(unsigned)(*c)%16]; + *(output++) = hexchars[(unsigned char)*c / 16]; + *(output++) = hexchars[(unsigned char)*c % 16]; } num_written += 3; }

1 0

Alexandre Julliard : libwine: Set install name to an absolute path for the installed library on Mac OS.
by Alexandre Julliard 11 Jun '07

11 Jun '07

Module: wine Branch: master Commit: 79c2e077a1eaab96e51d2bd7335e3a3417fbd302 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79c2e077a1eaab96e51d2bd73… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 8 19:04:17 2007 +0200 libwine: Set install name to an absolute path for the installed library on Mac OS. --- configure | 2 +- configure.ac | 2 +- libs/wine/Makefile.in | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure b/configure index 6e3da55..6a72a5d 100755 --- a/configure +++ b/configure @@ -13161,7 +13161,7 @@ fi DLLFLAGS="$DLLFLAGS -fPIC" LDDLLFLAGS="-bundle -multiply_defined suppress" LIBWINE_LDFLAGS="-multiply_defined suppress" - LDSHARED="\$(CC) -dynamiclib -install_name @executable_path/\`\$(RELPATH) \$(bindir) \$(libdir)\`/\$(DYNAME)" + LDSHARED="\$(CC) -dynamiclib" STRIP="$STRIP -u -r" COREFOUNDATIONLIB="-framework CoreFoundation" diff --git a/configure.ac b/configure.ac index 9cbbaf0..f224711 100644 --- a/configure.ac +++ b/configure.ac @@ -975,7 +975,7 @@ case $host_os in DLLFLAGS="$DLLFLAGS -fPIC" LDDLLFLAGS="-bundle -multiply_defined suppress" LIBWINE_LDFLAGS="-multiply_defined suppress" - LDSHARED="\$(CC) -dynamiclib -install_name @executable_path/\`\$(RELPATH) \$(bindir) \$(libdir)\`/\$(DYNAME)" + LDSHARED="\$(CC) -dynamiclib" STRIP="$STRIP -u -r" dnl declare needed frameworks AC_SUBST(COREFOUNDATIONLIB,"-framework CoreFoundation") diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in index d126e5b..11278b7 100644 --- a/libs/wine/Makefile.in +++ b/libs/wine/Makefile.in @@ -134,10 +134,10 @@ libwine.dll: $(OBJS) wine.def Makefile.in DYLIB_LDFLAGS = -compatibility_version $(SOVERSION) -current_version $(VERSION) libwine.$(VERSION).dylib: $(OBJS) $(RELPATH) Makefile.in - $(LDSHARED) $(DYLIB_LDFLAGS) $(OBJS) $(EXTRALIBS) $(LDFLAGS) $(LIBS) -o $@ + $(LDSHARED) -install_name $(libdir)/$(DYNAME) $(DYLIB_LDFLAGS) $(OBJS) $(EXTRALIBS) $(LDFLAGS) $(LIBS) -o $@ libwine.$(SOVERSION).dylib: libwine.$(VERSION).dylib - $(RM) $@ && $(LN_S) libwine.$(VERSION).dylib $@ + cp -p libwine.$(VERSION).dylib $@ && install_name_tool -id @executable_path/`$(RELPATH) $(bindir) $(libdir)`/$(DYNAME) $@ || $(RM) $@ libwine.dylib: libwine.$(SOVERSION).dylib $(RM) $@ && $(LN_S) libwine.$(SOVERSION).dylib $@

1 0

Alexandre Julliard : configure: Replace some obsolete macros to avoid warnings.
by Alexandre Julliard 11 Jun '07

11 Jun '07

Module: wine Branch: master Commit: ad356def5233c1c9c113eef908ee3257aa24abaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad356def5233c1c9c113eef90… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 8 20:23:16 2007 +0200 configure: Replace some obsolete macros to avoid warnings. --- aclocal.m4 | 5 +- configure | 47 +++++++++----------- configure.ac | 137 +++++++++++++++++++--------------------------------------- 3 files changed, 68 insertions(+), 121 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ad356def5233c1c9c113e…

1 0

Alexandre Julliard : include: Add DO_NO_IMPORTS ifdefs where needed.
by Alexandre Julliard 11 Jun '07

11 Jun '07

Module: wine Branch: master Commit: 9719bcaf5cf7ebd3a2e33cb55b55149cb0c661cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=9719bcaf5cf7ebd3a2e33cb55… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 8 15:49:36 2007 +0200 include: Add DO_NO_IMPORTS ifdefs where needed. --- include/activscp.idl | 2 ++ include/comcat.idl | 2 ++ include/dispex.idl | 2 ++ include/mlang.idl | 2 ++ include/msxml.idl | 3 ++- include/oaidl.idl | 2 ++ include/objidl.idl | 2 ++ include/objsafe.idl | 2 ++ include/ocidl.idl | 3 ++- include/oleidl.idl | 2 ++ include/propidl.idl | 3 ++- include/unknwn.idl | 2 ++ 12 files changed, 24 insertions(+), 3 deletions(-) diff --git a/include/activscp.idl b/include/activscp.idl index 1ccfc3d..248203e 100644 --- a/include/activscp.idl +++ b/include/activscp.idl @@ -16,9 +16,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#ifndef DO_NO_IMPORTS import "ocidl.idl"; import "oleidl.idl"; import "oaidl.idl"; +#endif typedef enum tagSCRIPTSTATE { SCRIPTSTATE_UNINITIALIZED = 0, diff --git a/include/comcat.idl b/include/comcat.idl index 2df8cf0..010db7d 100644 --- a/include/comcat.idl +++ b/include/comcat.idl @@ -17,7 +17,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#ifndef DO_NO_IMPORTS import "unknwn.idl"; +#endif /***************************************************************************** * Types diff --git a/include/dispex.idl b/include/dispex.idl index 3ba6f74..5891f08 100644 --- a/include/dispex.idl +++ b/include/dispex.idl @@ -16,10 +16,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#ifndef DO_NO_IMPORTS import "ocidl.idl"; import "oleidl.idl"; import "oaidl.idl"; import "servprov.idl"; +#endif cpp_quote("#define fdexNameCaseSensitive 0x00000001L") cpp_quote("#define fdexNameEnsure 0x00000002L") diff --git a/include/mlang.idl b/include/mlang.idl index 96e96fa..c76826a 100644 --- a/include/mlang.idl +++ b/include/mlang.idl @@ -16,7 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#ifndef DO_NO_IMPORTS import "unknwn.idl"; +#endif interface IStream; diff --git a/include/msxml.idl b/include/msxml.idl index 2d4ecc9..ff5cc49 100644 --- a/include/msxml.idl +++ b/include/msxml.idl @@ -19,11 +19,12 @@ #include <msxmldid.h> +#ifndef DO_NO_IMPORTS import "unknwn.idl"; import "wtypes.idl"; import "objidl.idl"; import "oaidl.idl"; - +#endif [ local, diff --git a/include/oaidl.idl b/include/oaidl.idl index 7f2f701..7afc862 100644 --- a/include/oaidl.idl +++ b/include/oaidl.idl @@ -16,7 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#ifndef DO_NO_IMPORTS import "objidl.idl"; +#endif interface IDispatch; interface ITypeInfo; diff --git a/include/objidl.idl b/include/objidl.idl index f7a5b12..0e869cb 100644 --- a/include/objidl.idl +++ b/include/objidl.idl @@ -16,7 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#ifndef DO_NO_IMPORTS import "unknwn.idl"; +#endif interface IStream; interface IEnumString; diff --git a/include/objsafe.idl b/include/objsafe.idl index 312ee24..76df444 100644 --- a/include/objsafe.idl +++ b/include/objsafe.idl @@ -16,7 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#ifndef DO_NO_IMPORTS import "unknwn.idl"; +#endif cpp_quote("#define INTERFACESAFE_FOR_UNTRUSTED_CALLER 1") cpp_quote("#define INTERFACESAFE_FOR_UNTRUSTED_DATA 2") diff --git a/include/ocidl.idl b/include/ocidl.idl index 9fe9517..6c33240 100644 --- a/include/ocidl.idl +++ b/include/ocidl.idl @@ -18,11 +18,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#ifndef DO_NO_IMPORTS import "oleidl.idl"; import "oaidl.idl"; import "servprov.idl"; import "urlmon.idl"; - +#endif /***************************************************************************** * IOleControlTypes interface diff --git a/include/oleidl.idl b/include/oleidl.idl index 02aef43..169d83b 100644 --- a/include/oleidl.idl +++ b/include/oleidl.idl @@ -18,7 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#ifndef DO_NO_IMPORTS import "objidl.idl"; +#endif interface IOleInPlaceActiveObject; diff --git a/include/propidl.idl b/include/propidl.idl index c041be9..a0d83be 100644 --- a/include/propidl.idl +++ b/include/propidl.idl @@ -18,9 +18,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#ifndef DO_NO_IMPORTS import "objidl.idl"; import "oaidl.idl"; - +#endif /* * Windows SDK braindamage alert diff --git a/include/unknwn.idl b/include/unknwn.idl index 0ae9dee..9071973 100644 --- a/include/unknwn.idl +++ b/include/unknwn.idl @@ -16,7 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#ifndef DO_NO_IMPORTS import "wtypes.idl"; +#endif /* Interfaces */

1 0

appdb/include distribution.php
by WineHQ 11 Jun '07

11 Jun '07

ChangeSet ID: 31184 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/06/10 23:06:06 Modified files: include : distribution.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Add a couple of comments and braces Patch: http://cvs.winehq.org/patch.py?id=31184 Old revision New revision Changes Path 1.32 1.33 +4 -0 appdb/include/distribution.php Index: appdb/include/distribution.php diff -u -p appdb/include/distribution.php:1.32 appdb/include/distribution.php:1.33 --- appdb/include/distribution.php:1.32 11 Jun 2007 4: 6: 6 -0000 +++ appdb/include/distribution.php 11 Jun 2007 4: 6: 6 -0000 @@ -462,11 +462,15 @@ class distribution { "<a href=\"$this->sUrl\">$this->sUrl</a>", array(sizeof($this->aTestingIds), "align=\"right\"")); + // add actions if the current user has permission to edit this object if($this->canEdit()) { + // enable the 'delete' action if this distribution has no testing results if(!sizeof($this->aTestingIds)) + { $shDeleteLink = "   [<a href='".$oManager->makeUrl("delete", $this->iDistributionId)."'>delete</a>]"; + } $aCells[] = array( "[<a href='".$oManager->makeUrl("edit",

1 0

appdb/include testData.php
by WineHQ 11 Jun '07

11 Jun '07

ChangeSet ID: 31183 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/06/10 21:53:57 Modified files: include : testData.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Add some guidance to the 'Tested release' selection for a testData submission since we've removed a bunch of versions lately, including 'CVS'. Patch: http://cvs.winehq.org/patch.py?id=31183 Old revision New revision Changes Path 1.57 1.58 +12 -0 appdb/include/testData.php Index: appdb/include/testData.php diff -u -p appdb/include/testData.php:1.57 appdb/include/testData.php:1.58 --- appdb/include/testData.php:1.57 11 Jun 2007 2:53:57 -0000 +++ appdb/include/testData.php 11 Jun 2007 2:53:57 -0000 @@ -602,10 +602,22 @@ class testData{ echo '<td class=color0>',"\n"; distribution::make_distribution_list("iDistributionId", $this->iDistributionId); echo '</td></tr>',"\n"; + // Version List echo '<tr><td class=color1>Tested release</td><td class=color0>',"\n"; make_bugzilla_version_list("sTestedRelease", $this->sTestedRelease); + // Give the user some information about our available versions + echo "<ul>\n"; + echo "<li>If you are testing with a newer release than listed please"; + echo " check back tomorrow, sometimes it takes us a day to update the list.</li>\n"; + echo "<li>If you are testing with an older release than listed please"; + echo " upgrade and test with a newer release.</li>\n"; + echo "<li>NOTE: 'CVS' was recently removed as a version because we simply can't track"; + echo " exactly which CVS version was used. If you haven't tested with one of the"; + echo " listed versions please retest with a recent release and resubmit.</li>\n"; + echo "</ul>\n"; echo '</td></tr>',"\n"; + // Installs echo '<tr><td class=color0>Installs?</td><td class=color0>',"\n"; testData::make_Installs_list("sInstalls", $this->sInstalls);

1 0

appdb/include url.php
by WineHQ 11 Jun '07

11 Jun '07

ChangeSet ID: 31182 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/06/10 20:27:29 Modified files: include : url.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Url::normalize() shouldn't be prepending anything to empty strings Patch: http://cvs.winehq.org/patch.py?id=31182 Old revision New revision Changes Path 1.19 1.20 +4 -0 appdb/include/url.php Index: appdb/include/url.php diff -u -p appdb/include/url.php:1.19 appdb/include/url.php:1.20 --- appdb/include/url.php:1.19 11 Jun 2007 1:27:29 -0000 +++ appdb/include/url.php 11 Jun 2007 1:27:29 -0000 @@ -502,6 +502,10 @@ class Url { // and prepend "http://" function normalize($sTheUrl) { + // return if we have an empty string + if($sTheUrl == "") + return $sTheUrl; + // if we already have "://" in the url // we can leave the url alone if(strpos($sTheUrl, "://") === false)

1 0

appdb/include url.php
by WineHQ 11 Jun '07

11 Jun '07

ChangeSet ID: 31181 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/06/10 20:08:21 Modified files: include : url.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Url constructor should use the id from the database query as the $iUrlId argument to the constructor doesn't need to be valid Patch: http://cvs.winehq.org/patch.py?id=31181 Old revision New revision Changes Path 1.18 1.19 +1 -1 appdb/include/url.php Index: appdb/include/url.php diff -u -p appdb/include/url.php:1.18 appdb/include/url.php:1.19 --- appdb/include/url.php:1.18 11 Jun 2007 1: 8:21 -0000 +++ appdb/include/url.php 11 Jun 2007 1: 8:21 -0000 @@ -39,7 +39,7 @@ class Url { // we are working on an existing url if($oRow) { - $this->iUrlId = $iUrlId; + $this->iUrlId = $oRow->id; $this->sDescription = $oRow->description; $this->iAppId = $oRow->appId; $this->iVersionId = $oRow->versionId;

1 0

appdb/include util.php
by WineHQ 11 Jun '07

11 Jun '07

ChangeSet ID: 31180 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/06/10 19:25:50 Modified files: include : util.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Remove "CVS" version from the array of Wine versions we present to the user. It was a dumb idea to have a CVS version anyway since all CVS versions appear the same. Patch: http://cvs.winehq.org/patch.py?id=31180 Old revision New revision Changes Path 1.91 1.92 +9 -10 appdb/include/util.php Index: appdb/include/util.php diff -u -p appdb/include/util.php:1.91 appdb/include/util.php:1.92 --- appdb/include/util.php:1.91 11 Jun 2007 0:25:50 -0000 +++ appdb/include/util.php 11 Jun 2007 0:25:50 -0000 @@ -168,29 +168,28 @@ function make_bugzilla_version_list($var // and we can't use 'order by' since we have no column // to order by, but the entries should come out in the // order they were added - // - Trim the list, we don't want every version of wine ever released - // - Add 'CVS' explicitly since we trim it out + // - Trim the list, we don't want every version of wine ever released and + // we don't want the "CVS" version included since we can never figure out + // what version of Wine any given "CVS" version is // // TODO: if we ever get a reasonable way to order the list replace this code // with that $aVersions = array(); - while(list($value) = mysql_fetch_row($hResult)) + while(list($sValue) = mysql_fetch_row($hResult)) { - // exclude unspecified versions - if($value != "unspecified") - $aVersions[] = $value; + // exclude unspecified versions and the "CVS" version + if(($sValue != "unspecified") && ($sValue != "CVS")) + $aVersions[] = $sValue; } - // now reverse the array order + // now reverse the array order since the oldest + // versions were added first $aVersions = array_reverse($aVersions); // now trim off all but the last X versions $iVersionsToKeep = 6; $aVersions = array_slice($aVersions, 0, $iVersionsToKeep); - // explicitly add 'CVS' since we are eliminating that above - $aVersions[] = "CVS"; - // DONE TRIMMING VERSIONS /////////////////////////

1 0

appdb/include util.php
by WineHQ 11 Jun '07

11 Jun '07

ChangeSet ID: 31179 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/06/10 19:12:08 Modified files: include : util.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Remove makeSafe(), we don't use this method anymore now that we have filter_gpc() Patch: http://cvs.winehq.org/patch.py?id=31179 Old revision New revision Changes Path 1.90 1.91 +0 -7 appdb/include/util.php Index: appdb/include/util.php diff -u -p appdb/include/util.php:1.90 appdb/include/util.php:1.91 --- appdb/include/util.php:1.90 11 Jun 2007 0:12: 8 -0000 +++ appdb/include/util.php 11 Jun 2007 0:12: 8 -0000 @@ -24,13 +24,6 @@ function util_redirect_and_exit($url) exit; } -function makeSafe($var) -{ -/* Disable addslashes() until we can use more finely grained filtering on user input */ -/* $var = trim(addslashes($var)); */ - return $var; -} - function build_urlarg($vars) { $arr = array();

1 0