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

Alexandre Julliard : tools: Upgrade the config.guess/config.sub scripts.
by Alexandre Julliard June 11, 2007

June 11, 2007

Module: wine Branch: master Commit: aafc07086ec49c2efa25eb306d26c32ec1292355 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aafc07086ec49c2efa25eb306… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 8 20:27:08 2007 +0200 tools: Upgrade the config.guess/config.sub scripts. --- tools/config.guess | 39 +++++++++++++++++++++++++++++---------- tools/config.sub | 36 +++++++++++++++++++++++++++--------- 2 files changed, 56 insertions(+), 19 deletions(-) diff --git a/tools/config.guess b/tools/config.guess index c085f4f..951383e 100755 --- a/tools/config.guess +++ b/tools/config.guess @@ -4,7 +4,7 @@ # 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, # Inc. -timestamp='2006-05-13' +timestamp='2007-05-17' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -161,6 +161,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in arm*) machine=arm-unknown ;; sh3el) machine=shl-unknown ;; sh3eb) machine=sh-unknown ;; + sh5el) machine=sh5le-unknown ;; *) machine=${UNAME_MACHINE_ARCH}-unknown ;; esac # The Operating System including object format, if it has switched @@ -211,7 +212,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} exit ;; macppc:MirBSD:*:*) - echo powerppc-unknown-mirbsd${UNAME_RELEASE} + echo powerpc-unknown-mirbsd${UNAME_RELEASE} exit ;; *:MirBSD:*:*) echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} @@ -329,7 +330,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; - i86pc:SunOS:5.*:*) + i86pc:SunOS:5.*:* | ix86xen:SunOS:5.*:*) echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; sun4*:SunOS:6*:*) @@ -780,7 +781,7 @@ EOF i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin exit ;; - i*:MINGW*:*) + *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; i*:windows32*:*) @@ -790,12 +791,15 @@ EOF i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit ;; - x86:Interix*:[345]*) - echo i586-pc-interix${UNAME_RELEASE} - exit ;; - EM64T:Interix*:[345]*) - echo x86_64-unknown-interix${UNAME_RELEASE} - exit ;; + *:Interix*:[3456]*) + case ${UNAME_MACHINE} in + x86) + echo i586-pc-interix${UNAME_RELEASE} + exit ;; + EM64T | authenticamd) + echo x86_64-unknown-interix${UNAME_RELEASE} + exit ;; + esac ;; [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) echo i${UNAME_MACHINE}-pc-mks exit ;; @@ -831,6 +835,9 @@ EOF arm*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; + avr32*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; cris:Linux:*:*) echo cris-axis-linux-gnu exit ;; @@ -947,6 +954,9 @@ EOF x86_64:Linux:*:*) echo x86_64-unknown-linux-gnu exit ;; + xtensa:Linux:*:*) + echo xtensa-unknown-linux-gnu + exit ;; i*86:Linux:*:*) # The BFD linker knows what the default object file format is, so # first see if it will tell us. cd to the root directory to prevent @@ -1205,6 +1215,15 @@ EOF SX-6:SUPER-UX:*:*) echo sx6-nec-superux${UNAME_RELEASE} exit ;; + SX-7:SUPER-UX:*:*) + echo sx7-nec-superux${UNAME_RELEASE} + exit ;; + SX-8:SUPER-UX:*:*) + echo sx8-nec-superux${UNAME_RELEASE} + exit ;; + SX-8R:SUPER-UX:*:*) + echo sx8r-nec-superux${UNAME_RELEASE} + exit ;; Power*:Rhapsody:*:*) echo powerpc-apple-rhapsody${UNAME_RELEASE} exit ;; diff --git a/tools/config.sub b/tools/config.sub index 4d936e2..c060f44 100755 --- a/tools/config.sub +++ b/tools/config.sub @@ -4,7 +4,7 @@ # 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, # Inc. -timestamp='2006-05-13' +timestamp='2007-04-29' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -241,16 +241,16 @@ case $basic_machine in | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ - | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ + | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ | bfin \ | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ - | fr30 | frv \ + | fido | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ - | maxq | mb | microblaze | mcore \ + | maxq | mb | microblaze | mcore | mep \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ @@ -276,6 +276,7 @@ case $basic_machine in | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | pyramid \ + | score \ | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ @@ -284,7 +285,7 @@ case $basic_machine in | tahoe | thumb | tic4x | tic80 | tron \ | v850 | v850e \ | we32k \ - | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \ + | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ | z8k) basic_machine=$basic_machine-unknown ;; @@ -317,13 +318,13 @@ case $basic_machine in | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ - | avr-* \ + | avr-* | avr32-* \ | bfin-* | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ - | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \ + | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | i*86-* | i860-* | i960-* | ia64-* \ @@ -367,7 +368,7 @@ case $basic_machine in | tron-* \ | v850-* | v850e-* | vax-* \ | we32k-* \ - | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \ + | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ | xstormy16-* | xtensa-* \ | ymp-* \ | z8k-*) @@ -682,6 +683,10 @@ case $basic_machine in basic_machine=i386-pc os=-mingw32 ;; + mingw32ce) + basic_machine=arm-unknown + os=-mingw32ce + ;; miniframe) basic_machine=m68000-convergent ;; @@ -909,6 +914,10 @@ case $basic_machine in sb1el) basic_machine=mipsisa64sb1el-unknown ;; + sde) + basic_machine=mipsisa32-sde + os=-elf + ;; sei) basic_machine=mips-sei os=-seiux @@ -920,6 +929,9 @@ case $basic_machine in basic_machine=sh-hitachi os=-hms ;; + sh5el) + basic_machine=sh5le-unknown + ;; sh64) basic_machine=sh64-unknown ;; @@ -1214,7 +1226,7 @@ case $os in | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos*) + | -skyos* | -haiku* | -rdos* | -toppers* | -drops*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1366,6 +1378,9 @@ else # system, and we'll never get to this point. case $basic_machine in + score-*) + os=-elf + ;; spu-*) os=-elf ;; @@ -1406,6 +1421,9 @@ case $basic_machine in m68*-cisco) os=-aout ;; + mep-*) + os=-elf + ;; mips*-cisco) os=-elf ;;

1 0

Alexandre Julliard : configure: Replace some obsolete macros to avoid warnings.
by Alexandre Julliard June 11, 2007

June 11, 2007

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 : libwine: Set install name to an absolute path for the installed library on Mac OS.
by Alexandre Julliard June 11, 2007

June 11, 2007

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 : include: Add DO_NO_IMPORTS ifdefs where needed.
by Alexandre Julliard June 11, 2007

June 11, 2007

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 June 10, 2007

June 10, 2007

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 June 10, 2007

June 10, 2007

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 June 10, 2007

June 10, 2007

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 June 10, 2007

June 10, 2007

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 June 10, 2007

June 10, 2007

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 June 10, 2007

June 10, 2007

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