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

appdb/include util.php
by WineHQ 15 Mar '07

15 Mar '07

ChangeSet ID: 30973 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/03/15 18:45:49 Modified files: include : util.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Parse MySQL timestamps according to the MySQL version Patch: http://cvs.winehq.org/patch.py?id=30973 Old revision New revision Changes Path 1.83 1.84 +24 -7 appdb/include/util.php Index: appdb/include/util.php diff -u -p appdb/include/util.php:1.83 appdb/include/util.php:1.84 --- appdb/include/util.php:1.83 15 Mar 2007 23:45:49 -0000 +++ appdb/include/util.php 15 Mar 2007 23:45:49 -0000 @@ -77,13 +77,30 @@ function print_short_date($sTimestamp) function mysqltimestamp_to_unixtimestamp($sTimestamp) { - $d = substr($sTimestamp,6,2); // day - $m = substr($sTimestamp,4,2); // month - $y = substr($sTimestamp,0,4); // year - $hours = substr($sTimestamp,8,2); // year - $minutes = substr($sTimestamp,10,2); // year - $seconds = substr($sTimestamp,12,2); // year - return mktime($hours,$minutes,$seconds,$m, $d, $y); + $sResult = mysql_get_server_info(); + $fVersion = substr($sResult, 0, 3); + + /* This differs between MySQL versions, newer ones are in the form + yyyy-mm-dd hh:mm:ss */ + if($fVersion >= 4.1) + { + $iDay = substr($sTimestamp, 8, 2); + $iMonth = substr($sTimestamp, 5, 2); + $iYear = substr($sTimestamp, 0, 4); + $iHours = substr($sTimestamp, 11, 2); + $iMinutes = substr($sTimestamp, 14, 2); + $iSeconds = substr($sTimestamp, 17, 2); + } else + /* The old ones are in the form yyyymmddhhmmss */ + { + $iDay = substr($sTimestamp,6,2); + $iMonth = substr($sTimestamp,4,2); + $iYear = substr($sTimestamp,0,4); + $iHours = substr($sTimestamp,8,2); + $iMinutes = substr($sTimestamp,10,2); + $iSeconds = substr($sTimestamp,12,2); + } + return mktime($iHours, $iMinutes, $iSeconds, $iMonth, $iDay, $iYear); } function mysqldatetime_to_unixtimestamp($sDatetime)

1 0

appdb/ include/appData.php include/version.php ...
by WineHQ 15 Mar '07

15 Mar '07

ChangeSet ID: 30972 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/03/15 18:43:46 Modified files: include : appData.php version.php unit_test : run_tests.php Added files: unit_test : test_appData.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Fix appData::listSubmittedBy() to run faster. Add a unit test for appData::listSubmittedBy() Patch: http://cvs.winehq.org/patch.py?id=30972 Old revision New revision Changes Path 1.9 1.10 +18 -16 appdb/include/appData.php 1.105 1.106 +6 -1 appdb/include/version.php 1.11 1.12 +2 -0 appdb/unit_test/run_tests.php Added 1.1 +0 -0 appdb/unit_test/test_appData.php Index: appdb/include/appData.php diff -u -p appdb/include/appData.php:1.9 appdb/include/appData.php:1.10 --- appdb/include/appData.php:1.9 15 Mar 2007 23:43:46 -0000 +++ appdb/include/appData.php 15 Mar 2007 23:43:46 -0000 @@ -39,22 +39,17 @@ class appData function listSubmittedBy($iUserId, $bQueued = true) { - $hResult = query_parameters("SELECT appData.TYPE, appData.appId, - appData.versionId, appData.description, appData.submitTime, - appFamily.appName, appVersion.versionName FROM appData, - appFamily, appVersion - WHERE (appFamily.appId = appData.appId OR - (appData.versionId = appVersion.versionId AND appFamily.appId = - appVersion.appId)) AND (appFamily.queued = '?' OR - appVersion.queued = '?') AND appData.submitterId = '?' AND + $hResult = query_parameters("SELECT * FROM appData WHERE + appData.submitterId = '?' + AND appData.queued = '?' ORDER BY appData.id", - "false", "false", $iUserId, $bQueued ? "true" : "false"); + $iUserId, $bQueued ? "true" : "false"); if(!$hResult || !mysql_num_rows($hResult)) return false; - $sReturn .= html_table_begin("width=\"100%\" align=\"center\""); + $sReturn = html_table_begin("width=\"100%\" align=\"center\""); $sReturn .= html_tr(array( "Version", "Type", @@ -64,13 +59,19 @@ class appData for($i = 1; $oRow = mysql_fetch_object($hResult); $i++) { + if($oRow->versionId) + { + $oVersion = new version($oRow->versionId); + $sLink = "<a href=\"".$oVersion->objectMakeUrl()."\">". + $oVersion->fullName($oVersion->iVersionId)."</a>"; + } else + { + $oApp = new application($this->appId); + $sLink = $oApp->objectMakeLink(); + } $sReturn .= html_tr(array( - $oRow->versionId ? - "<a href=\"".BASE."appview.php?iVersionId=$oRow->versionId\">". - "$oRow->appName: $oRow->versionName</a>" : - "<a href=\"".BASE."appview.php?iAppId=$oRow->appId\">". - "$oRow->appName</a>", - $oRow->TYPE, + $sLink, + $oRow->type, $oRow->description, print_date(mysqltimestamp_to_unixtimestamp($oRow->submitTime))), ($i % 2) ? "color0" : "color1"); @@ -79,6 +80,7 @@ class appData $sReturn .= html_table_end(""); return $sReturn; + } /* Get appData for a given version/application, optionally filter by type */ Index: appdb/include/version.php diff -u -p appdb/include/version.php:1.105 appdb/include/version.php:1.106 --- appdb/include/version.php:1.105 15 Mar 2007 23:43:46 -0000 +++ appdb/include/version.php 15 Mar 2007 23:43:46 -0000 @@ -1133,9 +1133,14 @@ class Version { return FALSE; } + function objectMakeUrl() + { + return BASE."appview.php?iVersionId=$this->iVersionId"; + } + function objectMakeLink() { - $sLink = "<a href=\"".BASE."appview.php?iVersionId=$this->iVersionId\">". + $sLink = "<a href=\"".$this->objectMakeUrl()."\">". $this->sName."</a>"; return $sLink; } Index: appdb/unit_test/run_tests.php diff -u -p appdb/unit_test/run_tests.php:1.11 appdb/unit_test/run_tests.php:1.12 --- appdb/unit_test/run_tests.php:1.11 15 Mar 2007 23:43:46 -0000 +++ appdb/unit_test/run_tests.php 15 Mar 2007 23:43:46 -0000 @@ -26,4 +26,6 @@ echo "\n"; include_once("test_url.php"); echo "\n"; include_once("test_om_objects.php"); +echo "\n"; +include_once("test_appData.php"); ?> Index: appdb/unit_test/test_appData.php diff -u -p /dev/null appdb/unit_test/test_appData.php:1.1 --- /dev/null 15 Mar 2007 23:43:46 -0000 +++ appdb/unit_test/test_appData.php 15 Mar 2007 23:43:46 -0000 @@ -0,0 +1,51 @@ +<?php + +require_once("path.php"); +require_once("test_common.php"); +require_once(BASE."include/appData.php"); +require_once(BASE."include/downloadurl.php"); + +function test_appData_listSubmittedBy() +{ + test_start(__FUNCTION__); + + global $test_email, $test_password; + if(!$oUser = create_and_login_user()) + { + echo "Failed to create and log in user\n"; + return FALSE; + } + + /* Create a queued appData entry */ + $oDownloadUrl = new downloadurl; + + $oDownloadUrl->sUrl = "http://www.microsoft.com/windowsmedia"; + $oDownloadUrl->sDescription = "Download Meida Player"; + $oDownloadUrl->iVersionId = 1; + + $oDownloadUrl->create(); + + $shReturn = appData::listSubmittedBy($oUser->iUserId, true); + + /* There should be two lines; one header and one for the downloadurl */ + $iExpected = 2; + $iReceived = substr_count($shReturn, "</tr>"); + if($iExpected != $iReceived) + { + echo "Got $iReceived rows instead of $iExpected.\n"; + return FALSE; + } + + /* Clean up */ + $oDownloadUrl->delete(); + $oUser->delete(); + + return TRUE; +} + +if(!test_appData_listSubmittedBy()) + echo "test_appData_listSubmittedBy() failed!\n"; +else + echo "test_appData_listSubmittedBy() passed\n"; + +?>

1 0

bugzilla/. defparams.pl
by Jeremy Newman 15 Mar '07

15 Mar '07

ChangeSet ID: 30971 CVSROOT: /opt/cvs-commit Module name: bugzilla Changes by: jnewman(a)winehq.org 2007/03/15 13:20:36 Modified files: . : defparams.pl Log message: revert last patch Patch: http://cvs.winehq.org/patch.py?id=30971 Old revision New revision Changes Path 1.2 1.3 +0 -2 bugzilla/defparams.pl Index: bugzilla/defparams.pl diff -u -p bugzilla/defparams.pl:1.2 bugzilla/defparams.pl:1.3 --- bugzilla/defparams.pl:1.2 15 Mar 2007 18:20:36 -0000 +++ bugzilla/defparams.pl 15 Mar 2007 18:20:36 -0000 @@ -494,8 +494,6 @@ To use the wonders of Bugzilla, you can To: %to% Subject: [Bug %bugid%] %neworchanged%%summary% X-Bugzilla-Reason: %reasonsheader% -X-Bugzilla-Product: %product% -X-Bugzilla-Component: %component% %urlbase%show_bug.cgi?id=%bugid%

1 0

Fabian Bieler : kernel32: GlobalMemoryStatusEx: always report at least 1 byte of virtual memory even if none is available.
by Alexandre Julliard 15 Mar '07

15 Mar '07

Module: wine Branch: master Commit: 70ff521a2442fb62af988a6c36e3a21f50837efd URL: http://source.winehq.org/git/wine.git/?a=commit;h=70ff521a2442fb62af988a6c3… Author: Fabian Bieler <der.fabe(a)gmx.net> Date: Thu Mar 15 00:22:53 2007 +0100 kernel32: GlobalMemoryStatusEx: always report at least 1 byte of virtual memory even if none is available. --- dlls/kernel32/heap.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index df6a3c6..4297167 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -1312,6 +1312,13 @@ BOOL WINAPI GlobalMemoryStatusEx( LPMEMORYSTATUSEX lpmemex ) lpmemex->ullTotalPageFile += lpmemex->ullTotalPhys; lpmemex->ullAvailPageFile += lpmemex->ullAvailPhys; + /* Titan Quest refuses to run if TotalPageFile <= ullTotalPhys */ + if(lpmemex->ullTotalPageFile == lpmemex->ullTotalPhys) + { + lpmemex->ullTotalPhys -= 1; + lpmemex->ullAvailPhys -= 1; + } + /* FIXME: should do something for other systems */ GetSystemInfo(&si); lpmemex->ullTotalVirtual = (char*)si.lpMaximumApplicationAddress-(char*)si.lpMinimumApplicationAddress;

1 0

Alexandre Julliard : configure: Remove no longer needed check for libsane.
by Alexandre Julliard 15 Mar '07

15 Mar '07

Module: wine Branch: master Commit: edae7a0a5ca4a2420163a5c9c7ad41544d59269d URL: http://source.winehq.org/git/wine.git/?a=commit;h=edae7a0a5ca4a2420163a5c9c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 15 13:51:16 2007 +0100 configure: Remove no longer needed check for libsane. --- configure | 80 +-------------------------------------------------------- configure.ac | 13 +-------- 2 files changed, 4 insertions(+), 89 deletions(-) diff --git a/configure b/configure index 81ea302..e95dec5 100755 --- a/configure +++ b/configure @@ -717,7 +717,6 @@ XSLTLIBS XSLTINCL HALINCL sane_devel -SANELIBS SANEINCL gphoto2_devel gphoto2port_devel @@ -9837,18 +9836,13 @@ echo "${ECHO_T}no" >&6; } fi -SANELIBS="" - SANEINCL="" if test "$sane_devel" != "no" then - SANELIBS="`$sane_devel --libs`" SANEINCL="`$sane_devel --cflags`" ac_save_CPPFLAGS="$CPPFLAGS" - ac_save_LIBS="$LIBS" CPPFLAGS="$CPPFLAGS $SANEINCL" - LIBS="$LIBS $SANELIBS" if test "${ac_cv_header_sane_sane_h+set}" = set; then { echo "$as_me:$LINENO: checking for sane/sane.h" >&5 echo $ECHO_N "checking for sane/sane.h... $ECHO_C" >&6; } @@ -9980,85 +9974,16 @@ echo "${ECHO_T}$ac_cv_header_sane_sane_h" >&6; } fi if test $ac_cv_header_sane_sane_h = yes; then - { echo "$as_me:$LINENO: checking for sane_open in -lsane" >&5 -echo $ECHO_N "checking for sane_open in -lsane... $ECHO_C" >&6; } -if test "${ac_cv_lib_sane_sane_open+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lsane $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char sane_open (); -int -main () -{ -return sane_open (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_sane_sane_open=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_sane_sane_open=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_sane_sane_open" >&5 -echo "${ECHO_T}$ac_cv_lib_sane_sane_open" >&6; } -if test $ac_cv_lib_sane_sane_open = yes; then cat >>confdefs.h <<\_ACEOF #define HAVE_SANE 1 _ACEOF else - SANELIBS="" - SANEINCL="" -fi - -else - SANELIBS="" - SANEINCL="" + SANEINCL="" fi - LIBS="$ac_save_LIBS" CPPFLAGS="$ac_save_CPPFLAGS" fi @@ -22073,7 +21998,6 @@ XSLTLIBS!$XSLTLIBS$ac_delim XSLTINCL!$XSLTINCL$ac_delim HALINCL!$HALINCL$ac_delim sane_devel!$sane_devel$ac_delim -SANELIBS!$SANELIBS$ac_delim SANEINCL!$SANEINCL$ac_delim gphoto2_devel!$gphoto2_devel$ac_delim gphoto2port_devel!$gphoto2port_devel$ac_delim @@ -22130,7 +22054,7 @@ LIBOBJS!$LIBOBJS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 75; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 74; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 diff --git a/configure.ac b/configure.ac index ec4616d..95b3b8d 100644 --- a/configure.ac +++ b/configure.ac @@ -541,24 +541,15 @@ LIBS="$ac_save_LIBS" dnl **** Check for SANE **** AC_CHECK_PROG(sane_devel,sane-config,sane-config,no) -AC_SUBST(SANELIBS,"") AC_SUBST(SANEINCL,"") if test "$sane_devel" != "no" then - SANELIBS="`$sane_devel --libs`" SANEINCL="`$sane_devel --cflags`" ac_save_CPPFLAGS="$CPPFLAGS" - ac_save_LIBS="$LIBS" CPPFLAGS="$CPPFLAGS $SANEINCL" - LIBS="$LIBS $SANELIBS" AC_CHECK_HEADER(sane/sane.h, - [AC_CHECK_LIB(sane,sane_open, - [AC_DEFINE(HAVE_SANE, 1, [Define if we have SANE development environment])], - [SANELIBS="" - SANEINCL=""])], - [SANELIBS="" - SANEINCL=""]) - LIBS="$ac_save_LIBS" + [AC_DEFINE(HAVE_SANE, 1, [Define if we have SANE development environment])], + [SANEINCL=""]) CPPFLAGS="$ac_save_CPPFLAGS" fi

1 0

Dmitry Timoshkov : gdi32: Add a GetTextMetrics test, make it pass under Wine.
by Alexandre Julliard 15 Mar '07

15 Mar '07

Module: wine Branch: master Commit: bd07f3f39e69b0e03fb6873ec6471c647add6e51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd07f3f39e69b0e03fb6873ec… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Mar 15 14:12:09 2007 +0800 gdi32: Add a GetTextMetrics test, make it pass under Wine. --- dlls/gdi32/font.c | 18 +++- dlls/gdi32/freetype.c | 10 ++- dlls/gdi32/tests/font.c | 219 ++++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 240 insertions(+), 7 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bd07f3f39e69b0e03fb68…

1 0

Fabian Bieler : kernel32: GlobalMemoryStatusEx: memory usage reported only reflects physical memory.
by Alexandre Julliard 15 Mar '07

15 Mar '07

Module: wine Branch: master Commit: 7d1ffb564f0f1f0c5d2644f5fb2c093c94bfe5e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d1ffb564f0f1f0c5d2644f5f… Author: Fabian Bieler <der.fabe(a)gmx.net> Date: Thu Mar 15 00:20:37 2007 +0100 kernel32: GlobalMemoryStatusEx: memory usage reported only reflects physical memory. --- dlls/kernel32/heap.c | 16 ++++++---------- 1 files changed, 6 insertions(+), 10 deletions(-) diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index 4fb4929..d311d1f 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -1262,14 +1262,6 @@ BOOL WINAPI GlobalMemoryStatusEx( LPMEMORYSTATUSEX lpmemex ) lpmemex->ullAvailPhys += cached*1024; } fclose( f ); - - if (lpmemex->ullTotalPhys) - { - DWORDLONG TotalPhysical = lpmemex->ullTotalPhys+lpmemex->ullTotalPageFile; - DWORDLONG AvailPhysical = lpmemex->ullAvailPhys+lpmemex->ullAvailPageFile; - lpmemex->dwMemoryLoad = (TotalPhysical-AvailPhysical) - / (TotalPhysical / 100); - } } #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__APPLE__) mib[0] = CTL_HW; @@ -1284,7 +1276,6 @@ BOOL WINAPI GlobalMemoryStatusEx( LPMEMORYSTATUSEX lpmemex ) lpmemex->ullAvailPhys = val; lpmemex->ullTotalPageFile = val; lpmemex->ullAvailPageFile = val; - lpmemex->dwMemoryLoad = lpmemex->ullTotalPhys - lpmemex->ullAvailPhys; #elif defined ( sun ) pagesize=sysconf(_SC_PAGESIZE); maxpages=sysconf(_SC_PHYS_PAGES); @@ -1305,9 +1296,14 @@ BOOL WINAPI GlobalMemoryStatusEx( LPMEMORYSTATUSEX lpmemex ) lpmemex->ullAvailPhys = pagesize*freepages; lpmemex->ullTotalPageFile = swapspace; lpmemex->ullAvailPageFile = swapfree; - lpmemex->dwMemoryLoad = lpmemex->ullTotalPhys - lpmemex->ullAvailPhys; #endif + if (lpmemex->ullTotalPhys) + { + lpmemex->dwMemoryLoad = (lpmemex->ullTotalPhys-lpmemex->ullAvailPhys) + / (lpmemex->ullTotalPhys / 100); + } + /* Project2k refuses to start if it sees less than 1Mb of free swap */ if (lpmemex->ullTotalPageFile < lpmemex->ullTotalPhys) lpmemex->ullTotalPageFile = lpmemex->ullTotalPhys;

1 0

Fabian Bieler : kernel32: GlobalMemoryStatusEx: return the size of physical memory + swapsize in ullTotalPageFile/ ullAvailPageFile.
by Alexandre Julliard 15 Mar '07

15 Mar '07

Module: wine Branch: master Commit: e1c6c97fc5054cd500d5e9ef8edab6f61f5f53f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1c6c97fc5054cd500d5e9ef8… Author: Fabian Bieler <der.fabe(a)gmx.net> Date: Thu Mar 15 00:21:25 2007 +0100 kernel32: GlobalMemoryStatusEx: return the size of physical memory + swapsize in ullTotalPageFile/ullAvailPageFile. --- dlls/kernel32/heap.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index d311d1f..df6a3c6 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -1304,11 +1304,13 @@ BOOL WINAPI GlobalMemoryStatusEx( LPMEMORYSTATUSEX lpmemex ) / (lpmemex->ullTotalPhys / 100); } - /* Project2k refuses to start if it sees less than 1Mb of free swap */ - if (lpmemex->ullTotalPageFile < lpmemex->ullTotalPhys) - lpmemex->ullTotalPageFile = lpmemex->ullTotalPhys; - if (lpmemex->ullAvailPageFile < lpmemex->ullAvailPhys) - lpmemex->ullAvailPageFile = lpmemex->ullAvailPhys; + /* Win98 returns only the swapsize in ullTotalPageFile/ullAvailPageFile, + WinXP returns the size of physical memory + swapsize; + mimic the behavior of XP. + Note: Project2k refuses to start if it sees less than 1Mb of free swap. + */ + lpmemex->ullTotalPageFile += lpmemex->ullTotalPhys; + lpmemex->ullAvailPageFile += lpmemex->ullAvailPhys; /* FIXME: should do something for other systems */ GetSystemInfo(&si);

1 0

Andrew Talbot : cabinet: Constify some variables.
by Alexandre Julliard 15 Mar '07

15 Mar '07

Module: wine Branch: master Commit: 5c812a14f30a4ab82b89d2b75273e90f098587e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c812a14f30a4ab82b89d2b75… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Wed Mar 14 23:09:28 2007 +0000 cabinet: Constify some variables. --- dlls/cabinet/cabinet.h | 4 ++-- dlls/cabinet/cabinet_main.c | 4 ++-- dlls/cabinet/fci.c | 10 +++++----- dlls/cabinet/fdi.c | 25 ++++++++++++------------- 4 files changed, 21 insertions(+), 22 deletions(-) diff --git a/dlls/cabinet/cabinet.h b/dlls/cabinet/cabinet.h index 53744af..befa604 100644 --- a/dlls/cabinet/cabinet.h +++ b/dlls/cabinet/cabinet.h @@ -640,7 +640,7 @@ typedef struct { /* from fdi.c */ void QTMupdatemodel(struct QTMmodel *model, int sym); -int make_decode_table(cab_ULONG nsyms, cab_ULONG nbits, cab_UBYTE *length, cab_UWORD *table); -cab_ULONG checksum(cab_UBYTE *data, cab_UWORD bytes, cab_ULONG csum); +int make_decode_table(cab_ULONG nsyms, cab_ULONG nbits, const cab_UBYTE *length, cab_UWORD *table); +cab_ULONG checksum(const cab_UBYTE *data, cab_UWORD bytes, cab_ULONG csum); #endif /* __WINE_CABINET_H */ diff --git a/dlls/cabinet/cabinet_main.c b/dlls/cabinet/cabinet_main.c index c37a449..2c21286 100644 --- a/dlls/cabinet/cabinet_main.c +++ b/dlls/cabinet/cabinet_main.c @@ -154,7 +154,7 @@ static long fdi_seek(INT_PTR hf, long dist, int seektype) return SetFilePointer(handle, dist, NULL, seektype); } -static void fill_file_node(struct ExtractFileList *pNode, LPSTR szFilename) +static void fill_file_node(struct ExtractFileList *pNode, LPCSTR szFilename) { pNode->next = NULL; pNode->flag = FALSE; @@ -163,7 +163,7 @@ static void fill_file_node(struct ExtractFileList *pNode, LPSTR szFilename) lstrcpyA(pNode->filename, szFilename); } -static BOOL file_in_list(struct ExtractFileList *pNode, LPSTR szFilename) +static BOOL file_in_list(const struct ExtractFileList *pNode, LPCSTR szFilename) { while (pNode) { diff --git a/dlls/cabinet/fci.c b/dlls/cabinet/fci.c index 76ead07..112c06b 100644 --- a/dlls/cabinet/fci.c +++ b/dlls/cabinet/fci.c @@ -430,12 +430,12 @@ static BOOL fci_flush_data_block (HFCI hfci, int* err, -static cab_ULONG fci_get_checksum(void *pv, UINT cb, CHECKSUM seed) +static cab_ULONG fci_get_checksum(const void *pv, UINT cb, CHECKSUM seed) { - cab_ULONG csum; - cab_ULONG ul; - int cUlong; - BYTE *pb; + cab_ULONG csum; + cab_ULONG ul; + int cUlong; + const BYTE *pb; csum = seed; cUlong = cb / 4; diff --git a/dlls/cabinet/fdi.c b/dlls/cabinet/fdi.c index 93b0ad2..6815d6d 100644 --- a/dlls/cabinet/fdi.c +++ b/dlls/cabinet/fdi.c @@ -220,7 +220,7 @@ void QTMupdatemodel(struct QTMmodel *model, int sym) { * OK: 0 * error: 1 */ -int make_decode_table(cab_ULONG nsyms, cab_ULONG nbits, cab_UBYTE *length, cab_UWORD *table) { +int make_decode_table(cab_ULONG nsyms, cab_ULONG nbits, const cab_UBYTE *length, cab_UWORD *table) { register cab_UWORD sym; register cab_ULONG leaf; register cab_UBYTE bit_num = 1; @@ -293,7 +293,7 @@ int make_decode_table(cab_ULONG nsyms, cab_ULONG nbits, cab_UBYTE *length, cab_U /************************************************************************* * checksum (internal) */ -cab_ULONG checksum(cab_UBYTE *data, cab_UWORD bytes, cab_ULONG csum) { +cab_ULONG checksum(const cab_UBYTE *data, cab_UWORD bytes, cab_ULONG csum) { int len; cab_ULONG ul = 0; @@ -1132,16 +1132,16 @@ struct Ziphuft **t, cab_LONG *m, fdi_decomp_state *decomp_state) /********************************************************* * fdi_Zipinflate_codes (internal) */ -static cab_LONG fdi_Zipinflate_codes(struct Ziphuft *tl, struct Ziphuft *td, +static cab_LONG fdi_Zipinflate_codes(const struct Ziphuft *tl, const struct Ziphuft *td, cab_LONG bl, cab_LONG bd, fdi_decomp_state *decomp_state) { - register cab_ULONG e; /* table entry flag/number of extra bits */ - cab_ULONG n, d; /* length and index for copy */ - cab_ULONG w; /* current window position */ - struct Ziphuft *t; /* pointer to table entry */ - cab_ULONG ml, md; /* masks for bl and bd bits */ - register cab_ULONG b; /* bit buffer */ - register cab_ULONG k; /* number of bits in bit buffer */ + register cab_ULONG e; /* table entry flag/number of extra bits */ + cab_ULONG n, d; /* length and index for copy */ + cab_ULONG w; /* current window position */ + const struct Ziphuft *t; /* pointer to table entry */ + cab_ULONG ml, md; /* masks for bl and bd bits */ + register cab_ULONG b; /* bit buffer */ + register cab_ULONG k; /* number of bits in bit buffer */ /* make local copies of globals */ b = ZIP(bb); /* initialize bit buffer */ @@ -1507,7 +1507,6 @@ static int QTMfdi_decomp(int inlen, int outlen, fdi_decomp_state *decomp_state) cab_UBYTE *inpos = CAB(inbuf); cab_UBYTE *window = QTM(window); cab_UBYTE *runsrc, *rundest; - cab_ULONG window_posn = QTM(window_posn); cab_ULONG window_size = QTM(window_size); @@ -1677,7 +1676,7 @@ static int fdi_lzx_read_lens(cab_UBYTE *lens, cab_ULONG first, cab_ULONG last, s */ static int LZXfdi_decomp(int inlen, int outlen, fdi_decomp_state *decomp_state) { cab_UBYTE *inpos = CAB(inbuf); - cab_UBYTE *endinp = inpos + inlen; + const cab_UBYTE *endinp = inpos + inlen; cab_UBYTE *window = LZX(window); cab_UBYTE *runsrc, *rundest; cab_UWORD *hufftbl; /* used in READ_HUFFSYM macro as chosen decoding table */ @@ -2007,7 +2006,7 @@ static int LZXfdi_decomp(int inlen, int outlen, fdi_decomp_state *decomp_state) * is also where we jump to additional cabinets in the case of split * cab's, and provide (some of) the NEXT_CABINET notification semantics. */ -static int fdi_decomp(struct fdi_file *fi, int savemode, fdi_decomp_state *decomp_state, +static int fdi_decomp(const struct fdi_file *fi, int savemode, fdi_decomp_state *decomp_state, char *pszCabPath, PFNFDINOTIFY pfnfdin, void *pvUser) { cab_ULONG bytes = savemode ? fi->length : fi->offset - CAB(offset);

1 0

Jan Zerebecki : msvcrt: Remove unused variable.
by Alexandre Julliard 15 Mar '07

15 Mar '07

Module: wine Branch: master Commit: fbe9b578e1e6912b666f033f5ae42cf43706605e URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbe9b578e1e6912b666f033f5… Author: Jan Zerebecki <jan.wine(a)zerebecki.de> Date: Thu Mar 15 08:27:12 2007 +0100 msvcrt: Remove unused variable. --- dlls/msvcrt/tests/data.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/tests/data.c b/dlls/msvcrt/tests/data.c index 262909e..a981c87 100644 --- a/dlls/msvcrt/tests/data.c +++ b/dlls/msvcrt/tests/data.c @@ -49,7 +49,6 @@ static void initcallback(void) static void test_initterm(void) { int i; - int rc; static _INITTERMFUN callbacks[4]; if (!p_initterm)

1 0