Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tfaber] 70472: [ACPICA] - Update to version 20151218 CORE-10765
by tfaber＠svn.reactos.org 31 Dec '15

31 Dec '15

Author: tfaber Date: Thu Dec 31 14:25:35 2015 New Revision: 70472 URL: http://svn.reactos.org/svn/reactos?rev=70472&view=rev Log: [ACPICA] - Update to version 20151218 CORE-10765 Added: trunk/reactos/drivers/bus/acpi/acpica/executer/extrace.c (with props) Removed: trunk/reactos/drivers/bus/acpi/acpica/utilities/utfileio.c Modified: trunk/reactos/drivers/bus/acpi/CMakeLists.txt trunk/reactos/drivers/bus/acpi/acpica/dispatcher/dsargs.c trunk/reactos/drivers/bus/acpi/acpica/dispatcher/dscontrol.c trunk/reactos/drivers/bus/acpi/acpica/dispatcher/dsdebug.c trunk/reactos/drivers/bus/acpi/acpica/dispatcher/dsfield.c trunk/reactos/drivers/bus/acpi/acpica/dispatcher/dsinit.c trunk/reactos/drivers/bus/acpi/acpica/dispatcher/dsmethod.c trunk/reactos/drivers/bus/acpi/acpica/dispatcher/dsmthdat.c trunk/reactos/drivers/bus/acpi/acpica/dispatcher/dsobject.c trunk/reactos/drivers/bus/acpi/acpica/dispatcher/dsopcode.c trunk/reactos/drivers/bus/acpi/acpica/dispatcher/dsutils.c trunk/reactos/drivers/bus/acpi/acpica/dispatcher/dswexec.c trunk/reactos/drivers/bus/acpi/acpica/dispatcher/dswload.c trunk/reactos/drivers/bus/acpi/acpica/dispatcher/dswload2.c trunk/reactos/drivers/bus/acpi/acpica/dispatcher/dswscope.c trunk/reactos/drivers/bus/acpi/acpica/dispatcher/dswstate.c trunk/reactos/drivers/bus/acpi/acpica/events/evevent.c trunk/reactos/drivers/bus/acpi/acpica/events/evglock.c trunk/reactos/drivers/bus/acpi/acpica/events/evgpe.c trunk/reactos/drivers/bus/acpi/acpica/events/evgpeblk.c trunk/reactos/drivers/bus/acpi/acpica/events/evgpeinit.c trunk/reactos/drivers/bus/acpi/acpica/events/evgpeutil.c trunk/reactos/drivers/bus/acpi/acpica/events/evhandler.c trunk/reactos/drivers/bus/acpi/acpica/events/evmisc.c trunk/reactos/drivers/bus/acpi/acpica/events/evregion.c trunk/reactos/drivers/bus/acpi/acpica/events/evrgnini.c trunk/reactos/drivers/bus/acpi/acpica/events/evsci.c trunk/reactos/drivers/bus/acpi/acpica/events/evxface.c trunk/reactos/drivers/bus/acpi/acpica/events/evxfevnt.c trunk/reactos/drivers/bus/acpi/acpica/events/evxfgpe.c trunk/reactos/drivers/bus/acpi/acpica/events/evxfregn.c trunk/reactos/drivers/bus/acpi/acpica/executer/exconfig.c trunk/reactos/drivers/bus/acpi/acpica/executer/exconvrt.c trunk/reactos/drivers/bus/acpi/acpica/executer/excreate.c trunk/reactos/drivers/bus/acpi/acpica/executer/exdebug.c trunk/reactos/drivers/bus/acpi/acpica/executer/exdump.c trunk/reactos/drivers/bus/acpi/acpica/executer/exfield.c trunk/reactos/drivers/bus/acpi/acpica/executer/exfldio.c trunk/reactos/drivers/bus/acpi/acpica/executer/exmisc.c trunk/reactos/drivers/bus/acpi/acpica/executer/exmutex.c trunk/reactos/drivers/bus/acpi/acpica/executer/exnames.c trunk/reactos/drivers/bus/acpi/acpica/executer/exoparg1.c trunk/reactos/drivers/bus/acpi/acpica/executer/exoparg2.c trunk/reactos/drivers/bus/acpi/acpica/executer/exoparg3.c trunk/reactos/drivers/bus/acpi/acpica/executer/exoparg6.c trunk/reactos/drivers/bus/acpi/acpica/executer/exprep.c trunk/reactos/drivers/bus/acpi/acpica/executer/exregion.c trunk/reactos/drivers/bus/acpi/acpica/executer/exresnte.c trunk/reactos/drivers/bus/acpi/acpica/executer/exresolv.c trunk/reactos/drivers/bus/acpi/acpica/executer/exresop.c trunk/reactos/drivers/bus/acpi/acpica/executer/exstore.c trunk/reactos/drivers/bus/acpi/acpica/executer/exstoren.c trunk/reactos/drivers/bus/acpi/acpica/executer/exstorob.c trunk/reactos/drivers/bus/acpi/acpica/executer/exsystem.c trunk/reactos/drivers/bus/acpi/acpica/executer/exutils.c trunk/reactos/drivers/bus/acpi/acpica/hardware/hwacpi.c trunk/reactos/drivers/bus/acpi/acpica/hardware/hwesleep.c trunk/reactos/drivers/bus/acpi/acpica/hardware/hwgpe.c trunk/reactos/drivers/bus/acpi/acpica/hardware/hwregs.c trunk/reactos/drivers/bus/acpi/acpica/hardware/hwsleep.c trunk/reactos/drivers/bus/acpi/acpica/hardware/hwxface.c trunk/reactos/drivers/bus/acpi/acpica/hardware/hwxfsleep.c trunk/reactos/drivers/bus/acpi/acpica/include/acapps.h trunk/reactos/drivers/bus/acpi/acpica/include/acdebug.h trunk/reactos/drivers/bus/acpi/acpica/include/acdisasm.h trunk/reactos/drivers/bus/acpi/acpica/include/acevents.h trunk/reactos/drivers/bus/acpi/acpica/include/acexcep.h trunk/reactos/drivers/bus/acpi/acpica/include/acglobal.h trunk/reactos/drivers/bus/acpi/acpica/include/aclocal.h trunk/reactos/drivers/bus/acpi/acpica/include/acmacros.h trunk/reactos/drivers/bus/acpi/acpica/include/acnamesp.h trunk/reactos/drivers/bus/acpi/acpica/include/acobject.h trunk/reactos/drivers/bus/acpi/acpica/include/acopcode.h trunk/reactos/drivers/bus/acpi/acpica/include/acparser.h trunk/reactos/drivers/bus/acpi/acpica/include/acpiosxf.h trunk/reactos/drivers/bus/acpi/acpica/include/acpixf.h trunk/reactos/drivers/bus/acpi/acpica/include/actables.h trunk/reactos/drivers/bus/acpi/acpica/include/actypes.h trunk/reactos/drivers/bus/acpi/acpica/include/acutils.h trunk/reactos/drivers/bus/acpi/acpica/include/amlcode.h trunk/reactos/drivers/bus/acpi/acpica/include/platform/aclinux.h trunk/reactos/drivers/bus/acpi/acpica/include/platform/aclinuxex.h trunk/reactos/drivers/bus/acpi/acpica/namespace/nsaccess.c trunk/reactos/drivers/bus/acpi/acpica/namespace/nsalloc.c trunk/reactos/drivers/bus/acpi/acpica/namespace/nsarguments.c trunk/reactos/drivers/bus/acpi/acpica/namespace/nsconvert.c trunk/reactos/drivers/bus/acpi/acpica/namespace/nsdump.c trunk/reactos/drivers/bus/acpi/acpica/namespace/nsdumpdv.c trunk/reactos/drivers/bus/acpi/acpica/namespace/nseval.c trunk/reactos/drivers/bus/acpi/acpica/namespace/nsinit.c trunk/reactos/drivers/bus/acpi/acpica/namespace/nsload.c trunk/reactos/drivers/bus/acpi/acpica/namespace/nsnames.c trunk/reactos/drivers/bus/acpi/acpica/namespace/nsobject.c trunk/reactos/drivers/bus/acpi/acpica/namespace/nsparse.c trunk/reactos/drivers/bus/acpi/acpica/namespace/nsprepkg.c trunk/reactos/drivers/bus/acpi/acpica/namespace/nsrepair.c trunk/reactos/drivers/bus/acpi/acpica/namespace/nsrepair2.c trunk/reactos/drivers/bus/acpi/acpica/namespace/nssearch.c trunk/reactos/drivers/bus/acpi/acpica/namespace/nsutils.c trunk/reactos/drivers/bus/acpi/acpica/namespace/nswalk.c trunk/reactos/drivers/bus/acpi/acpica/namespace/nsxfeval.c trunk/reactos/drivers/bus/acpi/acpica/namespace/nsxfname.c trunk/reactos/drivers/bus/acpi/acpica/namespace/nsxfobj.c trunk/reactos/drivers/bus/acpi/acpica/parser/psargs.c trunk/reactos/drivers/bus/acpi/acpica/parser/psloop.c trunk/reactos/drivers/bus/acpi/acpica/parser/psobject.c trunk/reactos/drivers/bus/acpi/acpica/parser/psopcode.c trunk/reactos/drivers/bus/acpi/acpica/parser/psparse.c trunk/reactos/drivers/bus/acpi/acpica/parser/psscope.c trunk/reactos/drivers/bus/acpi/acpica/parser/psutils.c trunk/reactos/drivers/bus/acpi/acpica/parser/pswalk.c trunk/reactos/drivers/bus/acpi/acpica/parser/psxface.c trunk/reactos/drivers/bus/acpi/acpica/resources/rsaddr.c trunk/reactos/drivers/bus/acpi/acpica/resources/rscalc.c trunk/reactos/drivers/bus/acpi/acpica/resources/rscreate.c trunk/reactos/drivers/bus/acpi/acpica/resources/rsdump.c trunk/reactos/drivers/bus/acpi/acpica/resources/rslist.c trunk/reactos/drivers/bus/acpi/acpica/resources/rsmisc.c trunk/reactos/drivers/bus/acpi/acpica/resources/rsutils.c trunk/reactos/drivers/bus/acpi/acpica/resources/rsxface.c trunk/reactos/drivers/bus/acpi/acpica/tables/tbdata.c trunk/reactos/drivers/bus/acpi/acpica/tables/tbfadt.c trunk/reactos/drivers/bus/acpi/acpica/tables/tbfind.c trunk/reactos/drivers/bus/acpi/acpica/tables/tbinstal.c trunk/reactos/drivers/bus/acpi/acpica/tables/tbprint.c trunk/reactos/drivers/bus/acpi/acpica/tables/tbutils.c trunk/reactos/drivers/bus/acpi/acpica/tables/tbxface.c trunk/reactos/drivers/bus/acpi/acpica/tables/tbxfload.c trunk/reactos/drivers/bus/acpi/acpica/tables/tbxfroot.c trunk/reactos/drivers/bus/acpi/acpica/utilities/utaddress.c trunk/reactos/drivers/bus/acpi/acpica/utilities/utalloc.c trunk/reactos/drivers/bus/acpi/acpica/utilities/utcache.c trunk/reactos/drivers/bus/acpi/acpica/utilities/utcopy.c trunk/reactos/drivers/bus/acpi/acpica/utilities/utdecode.c trunk/reactos/drivers/bus/acpi/acpica/utilities/utdelete.c trunk/reactos/drivers/bus/acpi/acpica/utilities/uterror.c trunk/reactos/drivers/bus/acpi/acpica/utilities/uteval.c trunk/reactos/drivers/bus/acpi/acpica/utilities/uthex.c trunk/reactos/drivers/bus/acpi/acpica/utilities/utids.c trunk/reactos/drivers/bus/acpi/acpica/utilities/utinit.c trunk/reactos/drivers/bus/acpi/acpica/utilities/utmath.c trunk/reactos/drivers/bus/acpi/acpica/utilities/utmisc.c trunk/reactos/drivers/bus/acpi/acpica/utilities/utmutex.c trunk/reactos/drivers/bus/acpi/acpica/utilities/utnonansi.c trunk/reactos/drivers/bus/acpi/acpica/utilities/utobject.c trunk/reactos/drivers/bus/acpi/acpica/utilities/utosi.c trunk/reactos/drivers/bus/acpi/acpica/utilities/utownerid.c trunk/reactos/drivers/bus/acpi/acpica/utilities/utpredef.c trunk/reactos/drivers/bus/acpi/acpica/utilities/utprint.c trunk/reactos/drivers/bus/acpi/acpica/utilities/utresrc.c trunk/reactos/drivers/bus/acpi/acpica/utilities/utstate.c trunk/reactos/drivers/bus/acpi/acpica/utilities/utstring.c trunk/reactos/drivers/bus/acpi/acpica/utilities/uttrack.c trunk/reactos/drivers/bus/acpi/acpica/utilities/utuuid.c trunk/reactos/drivers/bus/acpi/acpica/utilities/utxface.c trunk/reactos/drivers/bus/acpi/acpica/utilities/utxferror.c trunk/reactos/drivers/bus/acpi/acpica/utilities/utxfinit.c trunk/reactos/drivers/bus/acpi/acpica/utilities/utxfmutex.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/drivers/bus/acpi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/CMakeList… Modified: trunk/reactos/drivers/bus/acpi/acpica/dispatcher/dsargs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/di… Modified: trunk/reactos/drivers/bus/acpi/acpica/dispatcher/dscontrol.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/di… Modified: trunk/reactos/drivers/bus/acpi/acpica/dispatcher/dsdebug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/di… Modified: trunk/reactos/drivers/bus/acpi/acpica/dispatcher/dsfield.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/di… Modified: trunk/reactos/drivers/bus/acpi/acpica/dispatcher/dsinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/di… Modified: trunk/reactos/drivers/bus/acpi/acpica/dispatcher/dsmethod.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/di… Modified: trunk/reactos/drivers/bus/acpi/acpica/dispatcher/dsmthdat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/di… Modified: trunk/reactos/drivers/bus/acpi/acpica/dispatcher/dsobject.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/di… Modified: trunk/reactos/drivers/bus/acpi/acpica/dispatcher/dsopcode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/di… Modified: trunk/reactos/drivers/bus/acpi/acpica/dispatcher/dsutils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/di… Modified: trunk/reactos/drivers/bus/acpi/acpica/dispatcher/dswexec.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/di… Modified: trunk/reactos/drivers/bus/acpi/acpica/dispatcher/dswload.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/di… Modified: trunk/reactos/drivers/bus/acpi/acpica/dispatcher/dswload2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/di… Modified: trunk/reactos/drivers/bus/acpi/acpica/dispatcher/dswscope.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/di… Modified: trunk/reactos/drivers/bus/acpi/acpica/dispatcher/dswstate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/di… Modified: trunk/reactos/drivers/bus/acpi/acpica/events/evevent.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ev… Modified: trunk/reactos/drivers/bus/acpi/acpica/events/evglock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ev… Modified: trunk/reactos/drivers/bus/acpi/acpica/events/evgpe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ev… Modified: trunk/reactos/drivers/bus/acpi/acpica/events/evgpeblk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ev… Modified: trunk/reactos/drivers/bus/acpi/acpica/events/evgpeinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ev… Modified: trunk/reactos/drivers/bus/acpi/acpica/events/evgpeutil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ev… Modified: trunk/reactos/drivers/bus/acpi/acpica/events/evhandler.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ev… Modified: trunk/reactos/drivers/bus/acpi/acpica/events/evmisc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ev… Modified: trunk/reactos/drivers/bus/acpi/acpica/events/evregion.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ev… Modified: trunk/reactos/drivers/bus/acpi/acpica/events/evrgnini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ev… Modified: trunk/reactos/drivers/bus/acpi/acpica/events/evsci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ev… Modified: trunk/reactos/drivers/bus/acpi/acpica/events/evxface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ev… Modified: trunk/reactos/drivers/bus/acpi/acpica/events/evxfevnt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ev… Modified: trunk/reactos/drivers/bus/acpi/acpica/events/evxfgpe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ev… Modified: trunk/reactos/drivers/bus/acpi/acpica/events/evxfregn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ev… Modified: trunk/reactos/drivers/bus/acpi/acpica/executer/exconfig.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ex… Modified: trunk/reactos/drivers/bus/acpi/acpica/executer/exconvrt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ex… Modified: trunk/reactos/drivers/bus/acpi/acpica/executer/excreate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ex… Modified: trunk/reactos/drivers/bus/acpi/acpica/executer/exdebug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ex… Modified: trunk/reactos/drivers/bus/acpi/acpica/executer/exdump.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ex… Modified: trunk/reactos/drivers/bus/acpi/acpica/executer/exfield.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ex… Modified: trunk/reactos/drivers/bus/acpi/acpica/executer/exfldio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ex… Modified: trunk/reactos/drivers/bus/acpi/acpica/executer/exmisc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ex… Modified: trunk/reactos/drivers/bus/acpi/acpica/executer/exmutex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ex… Modified: trunk/reactos/drivers/bus/acpi/acpica/executer/exnames.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ex… Modified: trunk/reactos/drivers/bus/acpi/acpica/executer/exoparg1.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ex… Modified: trunk/reactos/drivers/bus/acpi/acpica/executer/exoparg2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ex… Modified: trunk/reactos/drivers/bus/acpi/acpica/executer/exoparg3.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ex… Modified: trunk/reactos/drivers/bus/acpi/acpica/executer/exoparg6.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ex… Modified: trunk/reactos/drivers/bus/acpi/acpica/executer/exprep.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ex… Modified: trunk/reactos/drivers/bus/acpi/acpica/executer/exregion.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ex… Modified: trunk/reactos/drivers/bus/acpi/acpica/executer/exresnte.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ex… Modified: trunk/reactos/drivers/bus/acpi/acpica/executer/exresolv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ex… Modified: trunk/reactos/drivers/bus/acpi/acpica/executer/exresop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ex… Modified: trunk/reactos/drivers/bus/acpi/acpica/executer/exstore.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ex… Modified: trunk/reactos/drivers/bus/acpi/acpica/executer/exstoren.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ex… Modified: trunk/reactos/drivers/bus/acpi/acpica/executer/exstorob.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ex… Modified: trunk/reactos/drivers/bus/acpi/acpica/executer/exsystem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ex… Added: trunk/reactos/drivers/bus/acpi/acpica/executer/extrace.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ex… Modified: trunk/reactos/drivers/bus/acpi/acpica/executer/exutils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ex… Modified: trunk/reactos/drivers/bus/acpi/acpica/hardware/hwacpi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ha… Modified: trunk/reactos/drivers/bus/acpi/acpica/hardware/hwesleep.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ha… Modified: trunk/reactos/drivers/bus/acpi/acpica/hardware/hwgpe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ha… Modified: trunk/reactos/drivers/bus/acpi/acpica/hardware/hwregs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ha… Modified: trunk/reactos/drivers/bus/acpi/acpica/hardware/hwsleep.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ha… Modified: trunk/reactos/drivers/bus/acpi/acpica/hardware/hwxface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ha… Modified: trunk/reactos/drivers/bus/acpi/acpica/hardware/hwxfsleep.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ha… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/acapps.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/acdebug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/acdisasm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/acevents.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/acexcep.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/acglobal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/aclocal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/acmacros.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/acnamesp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/acobject.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/acopcode.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/acparser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/acpiosxf.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/acpixf.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/actables.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/actypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/acutils.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/amlcode.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/platform/aclinux.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/include/platform/aclinuxex.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… Modified: trunk/reactos/drivers/bus/acpi/acpica/namespace/nsaccess.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/na… Modified: trunk/reactos/drivers/bus/acpi/acpica/namespace/nsalloc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/na… Modified: trunk/reactos/drivers/bus/acpi/acpica/namespace/nsarguments.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/na… Modified: trunk/reactos/drivers/bus/acpi/acpica/namespace/nsconvert.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/na… Modified: trunk/reactos/drivers/bus/acpi/acpica/namespace/nsdump.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/na… Modified: trunk/reactos/drivers/bus/acpi/acpica/namespace/nsdumpdv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/na… Modified: trunk/reactos/drivers/bus/acpi/acpica/namespace/nseval.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/na… Modified: trunk/reactos/drivers/bus/acpi/acpica/namespace/nsinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/na… Modified: trunk/reactos/drivers/bus/acpi/acpica/namespace/nsload.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/na… Modified: trunk/reactos/drivers/bus/acpi/acpica/namespace/nsnames.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/na… Modified: trunk/reactos/drivers/bus/acpi/acpica/namespace/nsobject.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/na… Modified: trunk/reactos/drivers/bus/acpi/acpica/namespace/nsparse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/na… Modified: trunk/reactos/drivers/bus/acpi/acpica/namespace/nsprepkg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/na… Modified: trunk/reactos/drivers/bus/acpi/acpica/namespace/nsrepair.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/na… Modified: trunk/reactos/drivers/bus/acpi/acpica/namespace/nsrepair2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/na… Modified: trunk/reactos/drivers/bus/acpi/acpica/namespace/nssearch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/na… Modified: trunk/reactos/drivers/bus/acpi/acpica/namespace/nsutils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/na… Modified: trunk/reactos/drivers/bus/acpi/acpica/namespace/nswalk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/na… Modified: trunk/reactos/drivers/bus/acpi/acpica/namespace/nsxfeval.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/na… Modified: trunk/reactos/drivers/bus/acpi/acpica/namespace/nsxfname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/na… Modified: trunk/reactos/drivers/bus/acpi/acpica/namespace/nsxfobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/na… Modified: trunk/reactos/drivers/bus/acpi/acpica/parser/psargs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/pa… Modified: trunk/reactos/drivers/bus/acpi/acpica/parser/psloop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/pa… Modified: trunk/reactos/drivers/bus/acpi/acpica/parser/psobject.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/pa… Modified: trunk/reactos/drivers/bus/acpi/acpica/parser/psopcode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/pa… Modified: trunk/reactos/drivers/bus/acpi/acpica/parser/psparse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/pa… Modified: trunk/reactos/drivers/bus/acpi/acpica/parser/psscope.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/pa… Modified: trunk/reactos/drivers/bus/acpi/acpica/parser/psutils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/pa… Modified: trunk/reactos/drivers/bus/acpi/acpica/parser/pswalk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/pa… Modified: trunk/reactos/drivers/bus/acpi/acpica/parser/psxface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/pa… Modified: trunk/reactos/drivers/bus/acpi/acpica/resources/rsaddr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/re… Modified: trunk/reactos/drivers/bus/acpi/acpica/resources/rscalc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/re… Modified: trunk/reactos/drivers/bus/acpi/acpica/resources/rscreate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/re… Modified: trunk/reactos/drivers/bus/acpi/acpica/resources/rsdump.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/re… Modified: trunk/reactos/drivers/bus/acpi/acpica/resources/rslist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/re… Modified: trunk/reactos/drivers/bus/acpi/acpica/resources/rsmisc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/re… Modified: trunk/reactos/drivers/bus/acpi/acpica/resources/rsutils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/re… Modified: trunk/reactos/drivers/bus/acpi/acpica/resources/rsxface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/re… Modified: trunk/reactos/drivers/bus/acpi/acpica/tables/tbdata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ta… Modified: trunk/reactos/drivers/bus/acpi/acpica/tables/tbfadt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ta… Modified: trunk/reactos/drivers/bus/acpi/acpica/tables/tbfind.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ta… Modified: trunk/reactos/drivers/bus/acpi/acpica/tables/tbinstal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ta… Modified: trunk/reactos/drivers/bus/acpi/acpica/tables/tbprint.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ta… Modified: trunk/reactos/drivers/bus/acpi/acpica/tables/tbutils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ta… Modified: trunk/reactos/drivers/bus/acpi/acpica/tables/tbxface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ta… Modified: trunk/reactos/drivers/bus/acpi/acpica/tables/tbxfload.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ta… Modified: trunk/reactos/drivers/bus/acpi/acpica/tables/tbxfroot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ta… Modified: trunk/reactos/drivers/bus/acpi/acpica/utilities/utaddress.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ut… Modified: trunk/reactos/drivers/bus/acpi/acpica/utilities/utalloc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ut… Modified: trunk/reactos/drivers/bus/acpi/acpica/utilities/utcache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ut… Modified: trunk/reactos/drivers/bus/acpi/acpica/utilities/utcopy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ut… Modified: trunk/reactos/drivers/bus/acpi/acpica/utilities/utdecode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ut… Modified: trunk/reactos/drivers/bus/acpi/acpica/utilities/utdelete.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ut… Modified: trunk/reactos/drivers/bus/acpi/acpica/utilities/uterror.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ut… Modified: trunk/reactos/drivers/bus/acpi/acpica/utilities/uteval.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ut… Removed: trunk/reactos/drivers/bus/acpi/acpica/utilities/utfileio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ut… Modified: trunk/reactos/drivers/bus/acpi/acpica/utilities/uthex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ut… Modified: trunk/reactos/drivers/bus/acpi/acpica/utilities/utids.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ut… Modified: trunk/reactos/drivers/bus/acpi/acpica/utilities/utinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ut… Modified: trunk/reactos/drivers/bus/acpi/acpica/utilities/utmath.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ut… Modified: trunk/reactos/drivers/bus/acpi/acpica/utilities/utmisc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ut… Modified: trunk/reactos/drivers/bus/acpi/acpica/utilities/utmutex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ut… Modified: trunk/reactos/drivers/bus/acpi/acpica/utilities/utnonansi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ut… Modified: trunk/reactos/drivers/bus/acpi/acpica/utilities/utobject.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ut… Modified: trunk/reactos/drivers/bus/acpi/acpica/utilities/utosi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ut… Modified: trunk/reactos/drivers/bus/acpi/acpica/utilities/utownerid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ut… Modified: trunk/reactos/drivers/bus/acpi/acpica/utilities/utpredef.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ut… Modified: trunk/reactos/drivers/bus/acpi/acpica/utilities/utprint.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ut… Modified: trunk/reactos/drivers/bus/acpi/acpica/utilities/utresrc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ut… Modified: trunk/reactos/drivers/bus/acpi/acpica/utilities/utstate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ut… Modified: trunk/reactos/drivers/bus/acpi/acpica/utilities/utstring.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ut… Modified: trunk/reactos/drivers/bus/acpi/acpica/utilities/uttrack.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ut… Modified: trunk/reactos/drivers/bus/acpi/acpica/utilities/utuuid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ut… Modified: trunk/reactos/drivers/bus/acpi/acpica/utilities/utxface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ut… Modified: trunk/reactos/drivers/bus/acpi/acpica/utilities/utxferror.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ut… Modified: trunk/reactos/drivers/bus/acpi/acpica/utilities/utxfinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ut… Modified: trunk/reactos/drivers/bus/acpi/acpica/utilities/utxfmutex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ut…

1 0

[akhaldi] 70471: [0.4.0] * Merge the solitaire no action upon doubleclick fix by Carlo Bramini in r70470. CORE-6514
by akhaldi＠svn.reactos.org 31 Dec '15

31 Dec '15

Author: akhaldi Date: Thu Dec 31 13:55:16 2015 New Revision: 70471 URL: http://svn.reactos.org/svn/reactos?rev=70471&view=rev Log: [0.4.0] * Merge the solitaire no action upon doubleclick fix by Carlo Bramini in r70470. CORE-6514 Modified: branches/ros-branch-0_4_0/ (props changed) branches/ros-branch-0_4_0/reactos/ (props changed) branches/ros-branch-0_4_0/reactos/base/applications/games/solitaire/solgame.cpp branches/ros-branch-0_4_0/reactos/base/applications/games/solitaire/solitaire.cpp Propchange: branches/ros-branch-0_4_0/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Dec 31 13:55:16 2015 @@ -1 +1 @@ -/trunk:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70408,70424,70436-70437,70443,70464 +/trunk:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70408,70424,70436-70437,70443,70464,70470 Propchange: branches/ros-branch-0_4_0/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Dec 31 13:55:16 2015 @@ -20,4 +20,4 @@ /branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 /branches/wlan-bringup:54809-54998 -/trunk/reactos:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70408,70424,70436-70437,70443,70464 +/trunk/reactos:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70408,70424,70436-70437,70443,70464,70470 Modified: branches/ros-branch-0_4_0/reactos/base/applications/games/solitaire/solgame.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/base/a… ============================================================================== --- branches/ros-branch-0_4_0/reactos/base/applications/games/solitaire/solgame.cpp [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/base/applications/games/solitaire/solgame.cpp [iso-8859-1] Thu Dec 31 13:55:16 2015 @@ -12,6 +12,7 @@ CardStack activepile; int LastId; bool fGameStarted = false; +bool bAutoroute = false; void NewGame(void) { @@ -233,7 +234,7 @@ SetPlayTimer(); //only drop 1 card at a time - if(dragcards.NumCards() != 1) + if (!bAutoroute && dragcards.NumCards() != 1) { TRACE("EXIT SuitStackDropProc()\n"); return false; @@ -415,7 +416,9 @@ //stackobj.MoveCards(pDest, 1, true); //use the SimulateDrag funcion, because we get the //AddProc callbacks called for us on the destination stacks... + bAutoroute = true; stackobj.SimulateDrag(pDest, 1, true); + bAutoroute = false; } TRACE("EXIT RowStackDblClickProc()\n"); } Modified: branches/ros-branch-0_4_0/reactos/base/applications/games/solitaire/solitaire.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/base/a… ============================================================================== --- branches/ros-branch-0_4_0/reactos/base/applications/games/solitaire/solitaire.cpp [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/base/applications/games/solitaire/solitaire.cpp [iso-8859-1] Thu Dec 31 13:55:16 2015 @@ -243,6 +243,8 @@ NULL, // use window class menu hInst, // program instance handle NULL); // creation parameters + if (hwnd == NULL) + return 1; hwndMain = hwnd;

1 0

[ekohl] 70470: [SOLITAIRE] solitaire: no action upon doubleclick Patch by Carlo Bramini. CORE-6514 #resolve #comment Thanks a lot!
by ekohl＠svn.reactos.org 31 Dec '15

31 Dec '15

Author: ekohl Date: Thu Dec 31 12:58:18 2015 New Revision: 70470 URL: http://svn.reactos.org/svn/reactos?rev=70470&view=rev Log: [SOLITAIRE] solitaire: no action upon doubleclick Patch by Carlo Bramini. CORE-6514 #resolve #comment Thanks a lot! Modified: trunk/reactos/base/applications/games/solitaire/solgame.cpp trunk/reactos/base/applications/games/solitaire/solitaire.cpp Modified: trunk/reactos/base/applications/games/solitaire/solgame.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/solgame.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/solgame.cpp [iso-8859-1] Thu Dec 31 12:58:18 2015 @@ -12,6 +12,7 @@ CardStack activepile; int LastId; bool fGameStarted = false; +bool bAutoroute = false; void NewGame(void) { @@ -233,7 +234,7 @@ SetPlayTimer(); //only drop 1 card at a time - if(dragcards.NumCards() != 1) + if (!bAutoroute && dragcards.NumCards() != 1) { TRACE("EXIT SuitStackDropProc()\n"); return false; @@ -415,7 +416,9 @@ //stackobj.MoveCards(pDest, 1, true); //use the SimulateDrag funcion, because we get the //AddProc callbacks called for us on the destination stacks... + bAutoroute = true; stackobj.SimulateDrag(pDest, 1, true); + bAutoroute = false; } TRACE("EXIT RowStackDblClickProc()\n"); } Modified: trunk/reactos/base/applications/games/solitaire/solitaire.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/solitaire.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/solitaire.cpp [iso-8859-1] Thu Dec 31 12:58:18 2015 @@ -243,6 +243,8 @@ NULL, // use window class menu hInst, // program instance handle NULL); // creation parameters + if (hwnd == NULL) + return 1; hwndMain = hwnd;

1 0

[hbelusca] 70469: [USETUP]: Correctly check for existing "ReactOS" entries in FreeLdr in case ReactOS is reinstalled over an existing installation, and if no one does exist, then create a new one t...
by hbelusca＠svn.reactos.org 30 Dec '15

30 Dec '15

Author: hbelusca Date: Wed Dec 30 20:23:18 2015 New Revision: 70469 URL: http://svn.reactos.org/svn/reactos?rev=70469&view=rev Log: [USETUP]: Correctly check for existing "ReactOS" entries in FreeLdr in case ReactOS is reinstalled over an existing installation, and if no one does exist, then create a new one that actually works. Thanks tower for having reported the problem 8^) Modified: trunk/reactos/base/setup/usetup/bootsup.c Modified: trunk/reactos/base/setup/usetup/bootsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/bootsup.… ============================================================================== --- trunk/reactos/base/setup/usetup/bootsup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/bootsup.c [iso-8859-1] Wed Dec 30 20:23:18 2015 @@ -539,18 +539,19 @@ wcscpy(SectionName2, KeyData); } + /* Search for an existing ReactOS entry */ OsIniSection = IniCacheGetSection(IniCache, SectionName2); if (OsIniSection != NULL) { BOOLEAN UseExistingEntry = TRUE; - /* Check BootType */ + /* Check for boot type "Windows2003" */ Status = IniCacheGetKey(OsIniSection, L"BootType", &KeyData); if (NT_SUCCESS(Status)) { if ((KeyData == NULL) || - ( (_wcsicmp(KeyData, L"ReactOS") != 0) && - (_wcsicmp(KeyData, L"\"ReactOS\"") != 0) )) + ( (_wcsicmp(KeyData, L"Windows2003") != 0) && + (_wcsicmp(KeyData, L"\"Windows2003\"") != 0) )) { /* This is not a ReactOS entry */ UseExistingEntry = FALSE; @@ -563,17 +564,17 @@ if (UseExistingEntry) { - /* BootType is ReactOS. Now check SystemPath */ + /* BootType is Windows2003. Now check SystemPath. */ Status = IniCacheGetKey(OsIniSection, L"SystemPath", &KeyData); if (NT_SUCCESS(Status)) { - swprintf(SystemPath, L"\"%S\"", ArcPath); + swprintf(SystemPath, L"\"%s\"", ArcPath); if ((KeyData == NULL) || - ((_wcsicmp(KeyData, ArcPath) != 0) && - (_wcsicmp(KeyData, SystemPath) != 0) )) + ( (_wcsicmp(KeyData, ArcPath) != 0) && + (_wcsicmp(KeyData, SystemPath) != 0) )) { - /* This entry is a ReactOS entry, but the SystemRoot does not - match the one we are looking for */ + /* This entry is a ReactOS entry, but the SystemRoot + does not match the one we are looking for. */ UseExistingEntry = FALSE; } } @@ -595,29 +596,11 @@ i++; } - /* <SectionName>=<OsName> */ - IniCacheInsertKey(IniSection, - NULL, - INSERT_LAST, - SectionName, - OsName); - - /* Create <SectionName> section */ - IniSection = IniCacheAppendSection(IniCache, SectionName); - - /* BootType=ReactOS */ - IniCacheInsertKey(IniSection, - NULL, - INSERT_LAST, - L"BootType", - L"ReactOS"); - - /* SystemPath=<ArcPath> */ - IniCacheInsertKey(IniSection, - NULL, - INSERT_LAST, - L"SystemPath", - ArcPath); + /* Create a new "ReactOS" entry */ + CreateFreeLoaderEntry(IniCache, IniSection, + SectionName, OsName, + L"Windows2003", ArcPath, + L""); IniCacheSave(IniCache, IniPath); IniCacheDestroy(IniCache); @@ -2032,7 +2015,7 @@ /* Install new bootcode */ if (PartitionType == PARTITION_FAT32 || - PartitionType == PARTITION_FAT32_XINT13) + PartitionType == PARTITION_FAT32_XINT13) { /* Install FAT32 bootcode */ wcscpy(SrcPath, SourceRootPath->Buffer); @@ -2151,7 +2134,7 @@ /* Install new bootsector */ if (PartitionType == PARTITION_FAT32 || - PartitionType == PARTITION_FAT32_XINT13) + PartitionType == PARTITION_FAT32_XINT13) { wcscpy(SrcPath, SourceRootPath->Buffer); wcscat(SrcPath, L"\\loader\\fat32.bin");

1 0

[hbelusca] 70468: [USETUP]: Formatting fix & remove a redundant function.
by hbelusca＠svn.reactos.org 30 Dec '15

30 Dec '15

Author: hbelusca Date: Wed Dec 30 18:52:07 2015 New Revision: 70468 URL: http://svn.reactos.org/svn/reactos?rev=70468&view=rev Log: [USETUP]: Formatting fix & remove a redundant function. Modified: trunk/reactos/base/setup/usetup/inicache.c Modified: trunk/reactos/base/setup/usetup/inicache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/inicache… ============================================================================== --- trunk/reactos/base/setup/usetup/inicache.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/inicache.c [iso-8859-1] Wed Dec 30 18:52:07 2015 @@ -42,9 +42,7 @@ PINICACHEKEY Next; if (Key == NULL) - { - return NULL; - } + return NULL; Next = Key->Next; if (Key->Name != NULL) @@ -73,9 +71,7 @@ PINICACHESECTION Next; if (Section == NULL) - { - return NULL; - } + return NULL; Next = Section->Next; while (Section->FirstKey != NULL) @@ -209,42 +205,6 @@ } -#if 0 -static -PINICACHESECTION -IniCacheFindSection( - PINICACHE Cache, - PWCHAR Name, - ULONG NameLength) -{ - PINICACHESECTION Section = NULL; - - if (Cache == NULL || Name == NULL || NameLength == 0) - { - return NULL; - } - - Section = Cache->FirstSection; - - /* iterate through list of sections */ - while (Section != NULL) - { - if (NameLength == wcslen(Section->Name)) - { - /* are the contents the same too? */ - if (_wcsnicmp(Section->Name, Name, NameLength) == 0) - break; - } - - /* get the next section*/ - Section = Section->Next; - } - - return Section; -} -#endif - - static PINICACHESECTION IniCacheAddSection( @@ -351,7 +311,7 @@ *NamePtr = NULL; *NameSize = 0; - /* skip whitespace */ + /* Skip whitespace */ while (*Ptr != 0 && isspace(*Ptr)) { Ptr++; @@ -401,7 +361,7 @@ *NameSize = 0; Size = 0; - /* skip whitespace and empty lines */ + /* Skip whitespace and empty lines */ while (isspace(*Ptr) || *Ptr == '\n' || *Ptr == '\r') { Ptr++; @@ -703,9 +663,7 @@ PINICACHE Cache) { if (Cache == NULL) - { return; - } while (Cache->FirstSection != NULL) {

1 0

[hbelusca] 70467: [USETUP] Factorize the code that creates ReactOS freeldr.ini entries, and use it to create a freeldr.ini at a clean ReactOS installation, and when it is installed in the same part...
by hbelusca＠svn.reactos.org 30 Dec '15

30 Dec '15

Author: hbelusca Date: Wed Dec 30 18:26:42 2015 New Revision: 70467 URL: http://svn.reactos.org/svn/reactos?rev=70467&view=rev Log: [USETUP] Factorize the code that creates ReactOS freeldr.ini entries, and use it to create a freeldr.ini at a clean ReactOS installation, and when it is installed in the same partition as Win9x/DOS. CORE-4870 #comment Should be fixed with revision 70467, please retest. Modified: trunk/reactos/base/setup/usetup/bootsup.c trunk/reactos/base/setup/usetup/inicache.c trunk/reactos/base/setup/usetup/inicache.h Modified: trunk/reactos/base/setup/usetup/bootsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/bootsup.… ============================================================================== --- trunk/reactos/base/setup/usetup/bootsup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/bootsup.c [iso-8859-1] Wed Dec 30 18:26:42 2015 @@ -93,8 +93,7 @@ PINICACHESECTION IniSection; /* Create "FREELOADER" section */ - IniSection = IniCacheAppendSection(IniCache, - L"FREELOADER"); + IniSection = IniCacheAppendSection(IniCache, L"FREELOADER"); #if DBG if (IsUnattendedSetup) @@ -287,123 +286,6 @@ L"TimeText", L"Seconds until highlighted choice will be started automatically: "); } - - -NTSTATUS -CreateFreeLoaderIniForDos( - PWCHAR IniPath, - PWCHAR ArcPath) -{ - PINICACHE IniCache; - PINICACHESECTION IniSection; - - IniCache = IniCacheCreate(); - - CreateCommonFreeLoaderSections(IniCache); - - /* Create "Operating Systems" section */ - IniSection = IniCacheAppendSection(IniCache, L"Operating Systems"); - - /* REACTOS=ReactOS */ - IniCacheInsertKey(IniSection, - NULL, - INSERT_LAST, - L"ReactOS", - L"\"ReactOS\""); - - /* ReactOS_Debug="ReactOS (Debug)" */ - IniCacheInsertKey(IniSection, - NULL, - INSERT_LAST, - L"ReactOS_Debug", - L"\"ReactOS (Debug)\""); - - /* DOS=Dos/Windows */ - IniCacheInsertKey(IniSection, - NULL, - INSERT_LAST, - L"DOS", - L"\"DOS/Windows\""); - - /* Create "ReactOS" section */ - IniSection = IniCacheAppendSection(IniCache, L"ReactOS"); - - /* BootType=ReactOS */ - IniCacheInsertKey(IniSection, - NULL, - INSERT_LAST, - L"BootType", - L"ReactOS"); - - /* SystemPath=<ArcPath> */ - IniCacheInsertKey(IniSection, - NULL, - INSERT_LAST, - L"SystemPath", - ArcPath); - - /* Create "ReactOS_Debug" section */ - IniSection = IniCacheAppendSection(IniCache, L"ReactOS_Debug"); - - /* BootType=ReactOS */ - IniCacheInsertKey(IniSection, - NULL, - INSERT_LAST, - L"BootType", - L"ReactOS"); - - /* SystemPath=<ArcPath> */ - IniCacheInsertKey(IniSection, - NULL, - INSERT_LAST, - L"SystemPath", - ArcPath); - - /* Options=/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS */ - IniCacheInsertKey(IniSection, - NULL, - INSERT_LAST, - L"Options", - L"/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS"); - - /* Create "DOS" section */ - IniSection = IniCacheAppendSection(IniCache, - L"DOS"); - - /* BootType=BootSector */ - IniCacheInsertKey(IniSection, - NULL, - INSERT_LAST, - L"BootType", - L"BootSector"); - - /* BootDrive=hd0 */ - IniCacheInsertKey(IniSection, - NULL, - INSERT_LAST, - L"BootDrive", - L"hd0"); - - /* BootPartition=1 */ - IniCacheInsertKey(IniSection, - NULL, - INSERT_LAST, - L"BootPartition", - L"1"); - - /* BootSector=BOOTSECT.DOS */ - IniCacheInsertKey(IniSection, - NULL, - INSERT_LAST, - L"BootSectorFile", - L"BOOTSECT.DOS"); - - IniCacheSave(IniCache, IniPath); - IniCacheDestroy(IniCache); - - return STATUS_SUCCESS; -} - NTSTATUS CreateFreeLoaderEntry( @@ -451,17 +333,13 @@ return STATUS_SUCCESS; } -NTSTATUS -CreateFreeLoaderIniForReactOS( - PWCHAR IniPath, +static +VOID +CreateFreeLoaderReactOSEntries( + PINICACHE IniCache, PWCHAR ArcPath) { - PINICACHE IniCache; PINICACHESECTION IniSection; - - IniCache = IniCacheCreate(); - - CreateCommonFreeLoaderSections(IniCache); /* Create "Operating Systems" section */ IniSection = IniCacheAppendSection(IniCache, L"Operating Systems"); @@ -517,8 +395,90 @@ L"Windows2003", ArcPath, L"/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS /redirect=com2 /redirectbaudrate=115200"); #endif - - /* Save the ini file */ +} + +NTSTATUS +CreateFreeLoaderIniForReactOS( + PWCHAR IniPath, + PWCHAR ArcPath) +{ + PINICACHE IniCache; + + /* Initialize the INI file */ + IniCache = IniCacheCreate(); + + /* Create the common FreeLdr sections */ + CreateCommonFreeLoaderSections(IniCache); + + /* Add the ReactOS entries */ + CreateFreeLoaderReactOSEntries(IniCache, ArcPath); + + /* Save the INI file */ + IniCacheSave(IniCache, IniPath); + IniCacheDestroy(IniCache); + + return STATUS_SUCCESS; +} + +NTSTATUS +CreateFreeLoaderIniForDos( + PWCHAR IniPath, + PWCHAR ArcPath) +{ + PINICACHE IniCache; + PINICACHESECTION IniSection; + + /* Initialize the INI file */ + IniCache = IniCacheCreate(); + + /* Create the common FreeLdr sections */ + CreateCommonFreeLoaderSections(IniCache); + + /* Add the ReactOS entries */ + CreateFreeLoaderReactOSEntries(IniCache, ArcPath); + + /* Get "Operating Systems" section */ + IniSection = IniCacheGetSection(IniCache, L"Operating Systems"); + + /* DOS=DOS/Windows */ + IniCacheInsertKey(IniSection, + NULL, + INSERT_LAST, + L"DOS", + L"\"DOS/Windows\""); + + /* Create the "DOS" section */ + IniSection = IniCacheAppendSection(IniCache, L"DOS"); + + /* BootType=BootSector */ + IniCacheInsertKey(IniSection, + NULL, + INSERT_LAST, + L"BootType", + L"BootSector"); + + /* BootDrive=hd0 */ + IniCacheInsertKey(IniSection, + NULL, + INSERT_LAST, + L"BootDrive", + L"hd0"); + + /* BootPartition=1 */ + IniCacheInsertKey(IniSection, + NULL, + INSERT_LAST, + L"BootPartition", + L"1"); + + /* BootSector=BOOTSECT.DOS */ + IniCacheInsertKey(IniSection, + NULL, + INSERT_LAST, + L"BootSectorFile", + L"BOOTSECT.DOS"); + + /* Save the INI file */ IniCacheSave(IniCache, IniPath); IniCacheDestroy(IniCache); @@ -531,7 +491,6 @@ PWCHAR IniPath, PWCHAR ArcPath) { - UNICODE_STRING Name; PINICACHE IniCache; PINICACHESECTION IniSection; PINICACHESECTION OsIniSection; @@ -543,9 +502,7 @@ ULONG i,j; NTSTATUS Status; - RtlInitUnicodeString(&Name, IniPath); - - Status = IniCacheLoad(&IniCache, &Name, FALSE); + Status = IniCacheLoad(&IniCache, IniPath, FALSE); if (!NT_SUCCESS(Status)) return Status; @@ -1944,16 +1901,13 @@ PWSTR EntryName, PWSTR EntryValue) { - UNICODE_STRING Name; PINICACHE Cache = NULL; PINICACHESECTION Section = NULL; NTSTATUS Status; ULONG FileAttribute; PWCHAR OldValue = NULL; - RtlInitUnicodeString(&Name, BootIniPath); - - Status = IniCacheLoad(&Cache, &Name, FALSE); + Status = IniCacheLoad(&Cache, BootIniPath, FALSE); if (!NT_SUCCESS(Status)) { return Status; Modified: trunk/reactos/base/setup/usetup/inicache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/inicache… ============================================================================== --- trunk/reactos/base/setup/usetup/inicache.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/inicache.c [iso-8859-1] Wed Dec 30 18:26:42 2015 @@ -514,9 +514,10 @@ NTSTATUS IniCacheLoad( PINICACHE *Cache, - PUNICODE_STRING FileName, + PWCHAR FileName, BOOLEAN String) { + UNICODE_STRING Name; OBJECT_ATTRIBUTES ObjectAttributes; FILE_STANDARD_INFORMATION FileInfo; IO_STATUS_BLOCK IoStatusBlock; @@ -542,8 +543,10 @@ *Cache = NULL; /* Open ini file */ + RtlInitUnicodeString(&Name, FileName); + InitializeObjectAttributes(&ObjectAttributes, - FileName, + &Name, 0, NULL, NULL); @@ -1066,8 +1069,7 @@ } /* Create ini file */ - RtlInitUnicodeString(&Name, - FileName); + RtlInitUnicodeString(&Name, FileName); InitializeObjectAttributes(&ObjectAttributes, &Name, Modified: trunk/reactos/base/setup/usetup/inicache.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/inicache… ============================================================================== --- trunk/reactos/base/setup/usetup/inicache.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/inicache.h [iso-8859-1] Wed Dec 30 18:26:42 2015 @@ -76,7 +76,7 @@ NTSTATUS IniCacheLoad( PINICACHE *Cache, - PUNICODE_STRING FileName, + PWCHAR FileName, BOOLEAN String); VOID

1 0

[akhaldi] 70466: [0.4.0] * Somehow this wasn't committed in the previous revision.
by akhaldi＠svn.reactos.org 29 Dec '15

29 Dec '15

Author: akhaldi Date: Tue Dec 29 20:59:03 2015 New Revision: 70466 URL: http://svn.reactos.org/svn/reactos?rev=70466&view=rev Log: [0.4.0] * Somehow this wasn't committed in the previous revision. Modified: branches/ros-branch-0_4_0/ (props changed) Propchange: branches/ros-branch-0_4_0/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Dec 29 20:59:03 2015 @@ -1 +1 @@ -/trunk:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70408,70424,70436-70437,70443 +/trunk:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70408,70424,70436-70437,70443,70464

1 0

[akhaldi] 70465: [0.4.0] * Merge the gdi32 and win32k fixes by Timo in r70464. CORE-10583
by akhaldi＠svn.reactos.org 29 Dec '15

29 Dec '15

Author: akhaldi Date: Tue Dec 29 20:49:33 2015 New Revision: 70465 URL: http://svn.reactos.org/svn/reactos?rev=70465&view=rev Log: [0.4.0] * Merge the gdi32 and win32k fixes by Timo in r70464. CORE-10583 Modified: branches/ros-branch-0_4_0/reactos/ (props changed) branches/ros-branch-0_4_0/reactos/win32ss/gdi/gdi32/objects/bitmap.c branches/ros-branch-0_4_0/reactos/win32ss/gdi/ntgdi/dibobj.c Propchange: branches/ros-branch-0_4_0/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Dec 29 20:49:33 2015 @@ -20,4 +20,4 @@ /branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 /branches/wlan-bringup:54809-54998 -/trunk/reactos:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70408,70424,70436-70437,70443 +/trunk/reactos:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70408,70424,70436-70437,70443,70464 Modified: branches/ros-branch-0_4_0/reactos/win32ss/gdi/gdi32/objects/bitmap.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/win32s… ============================================================================== --- branches/ros-branch-0_4_0/reactos/win32ss/gdi/gdi32/objects/bitmap.c [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/win32ss/gdi/gdi32/objects/bitmap.c [iso-8859-1] Tue Dec 29 20:49:33 2015 @@ -408,23 +408,30 @@ // PDC_ATTR pDc_Attr; UINT InfoSize = 0; UINT cjBmpScanSize = 0; - HBITMAP hBmp; + HBITMAP hBmp = NULL; NTSTATUS Status = STATUS_SUCCESS; + PBITMAPINFO pbmiConverted; + UINT cjInfoSize; + + /* Convert the BITMAPINFO if it is a COREINFO */ + pbmiConverted = ConvertBitmapInfo(Data, ColorUse, &cjInfoSize, FALSE); /* Check for CBM_CREATDIB */ if (Init & CBM_CREATDIB) { /* CBM_CREATDIB needs Data. */ - if (!Data) - { - return 0; + if (pbmiConverted == NULL) + { + DPRINT1("CBM_CREATDIB needs a BITMAINFO!\n"); + goto Exit; } /* It only works with PAL or RGB */ if (ColorUse > DIB_PAL_COLORS) { + DPRINT1("Invalid ColorUse: %lu\n", ColorUse); GdiSetLastError(ERROR_INVALID_PARAMETER); - return 0; + goto Exit; } /* Use the header from the data */ @@ -434,38 +441,48 @@ /* Header is required */ if (!Header) { + DPRINT1("Header is NULL\n"); GdiSetLastError(ERROR_INVALID_PARAMETER); - return 0; + goto Exit; } /* Get the bitmap format and dimensions */ if (DIB_GetBitmapInfo(Header, &width, &height, &planes, &bpp, &compr, &dibsize) == -1) { + DPRINT1("DIB_GetBitmapInfo failed!\n"); GdiSetLastError(ERROR_INVALID_PARAMETER); - return NULL; + goto Exit; } /* Check if the Compr is incompatible */ if ((compr == BI_JPEG) || (compr == BI_PNG) || (compr == BI_BITFIELDS)) - return 0; + { + DPRINT1("invalid compr: %lu!\n", compr); + goto Exit; + } /* Only DIB_RGB_COLORS (0), DIB_PAL_COLORS (1) and 2 are valid. */ if (ColorUse > DIB_PAL_COLORS + 1) { + DPRINT1("invalid compr: %lu!\n", compr); GdiSetLastError(ERROR_INVALID_PARAMETER); - return 0; + goto Exit; } /* If some Bits are given, only DIB_PAL_COLORS and DIB_RGB_COLORS are valid */ if (Bits && (ColorUse > DIB_PAL_COLORS)) { + DPRINT1("Invalid ColorUse: %lu\n", ColorUse); GdiSetLastError(ERROR_INVALID_PARAMETER); - return 0; + goto Exit; } /* Negative width is not allowed */ if (width < 0) - return 0; + { + DPRINT1("Negative width: %li\n", width); + goto Exit; + } /* Top-down DIBs have a negative height. */ height = abs(height); @@ -473,13 +490,13 @@ // For Icm support. // GdiGetHandleUserData(hdc, GDI_OBJECT_TYPE_DC, (PVOID)&pDc_Attr)) - if (Data) + if (pbmiConverted) { _SEH2_TRY { - cjBmpScanSize = GdiGetBitmapBitsSize((BITMAPINFO *) Data); - CalculateColorTableSize(&Data->bmiHeader, &ColorUse, &InfoSize); - InfoSize += Data->bmiHeader.biSize; + cjBmpScanSize = GdiGetBitmapBitsSize(pbmiConverted); + CalculateColorTableSize(&pbmiConverted->bmiHeader, &ColorUse, &InfoSize); + InfoSize += pbmiConverted->bmiHeader.biSize; } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -490,8 +507,9 @@ if (!NT_SUCCESS(Status)) { + DPRINT1("Got an exception!\n"); GdiSetLastError(ERROR_INVALID_PARAMETER); - return NULL; + goto Exit; } DPRINT("pBMI %p, Size bpp %u, dibsize %d, Conv %u, BSS %u\n", Data, bpp, dibsize, InfoSize, @@ -501,9 +519,18 @@ hBmp = GetStockObject(DEFAULT_BITMAP); else { - hBmp = NtGdiCreateDIBitmapInternal(hDC, width, height, Init, (LPBYTE) Bits, - (LPBITMAPINFO) Data, ColorUse, InfoSize, cjBmpScanSize, 0, 0); - } + hBmp = NtGdiCreateDIBitmapInternal(hDC, width, height, Init, (LPBYTE)Bits, + (LPBITMAPINFO)pbmiConverted, ColorUse, InfoSize, cjBmpScanSize, 0, 0); + } + +Exit: + + /* Cleanup converted BITMAPINFO */ + if ((pbmiConverted != NULL) && (pbmiConverted != Data)) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, pbmiConverted); + } + return hBmp; } Modified: branches/ros-branch-0_4_0/reactos/win32ss/gdi/ntgdi/dibobj.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/win32s… ============================================================================== --- branches/ros-branch-0_4_0/reactos/win32ss/gdi/ntgdi/dibobj.c [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/win32ss/gdi/ntgdi/dibobj.c [iso-8859-1] Tue Dec 29 20:49:33 2015 @@ -248,6 +248,7 @@ UINT StartScan, UINT ScanLines, CONST VOID *Bits, + ULONG cjMaxBits, CONST BITMAPINFO *bmi, UINT ColorUse) { @@ -258,8 +259,39 @@ POINTL ptSrc; EXLATEOBJ exlo; PPALETTE ppalDIB = 0; + ULONG cjSizeImage; if (!bmi) return 0; + + /* Check if the header provided an image size */ + if (bmi->bmiHeader.biSizeImage != 0) + { + /* Use the given size */ + cjSizeImage = bmi->bmiHeader.biSizeImage; + } + /* Otherwise check for uncompressed formats */ + else if ((bmi->bmiHeader.biCompression == BI_RGB) || + (bmi->bmiHeader.biCompression == BI_BITFIELDS)) + { + /* Calculate the image size */ + cjSizeImage = DIB_GetDIBImageBytes(bmi->bmiHeader.biWidth, + ScanLines, + bmi->bmiHeader.biBitCount); + } + else + { + /* Compressed format without a size. This is invalid. */ + DPRINT1("Compressed format without a size!"); + return 0; + } + + /* Check if the size that we have is ok */ + if (cjSizeImage > cjMaxBits) + { + DPRINT1("Size too large! cjSizeImage = %lu, cjMaxBits = %lu\n", + cjSizeImage, cjMaxBits); + return 0; + } SourceBitmap = GreCreateBitmapEx(bmi->bmiHeader.biWidth, ScanLines, @@ -267,7 +299,7 @@ BitmapFormat(bmi->bmiHeader.biBitCount, bmi->bmiHeader.biCompression), bmi->bmiHeader.biHeight < 0 ? BMF_TOPDOWN : 0, - bmi->bmiHeader.biSizeImage, + cjSizeImage, (PVOID)Bits, 0); if (!SourceBitmap) @@ -308,6 +340,8 @@ rcDst.right = psurfDst->SurfObj.sizlBitmap.cx; ptSrc.x = 0; ptSrc.y = 0; + + NT_ASSERT(psurfSrc->SurfObj.cjBits <= cjMaxBits); result = IntEngCopyBits(&psurfDst->SurfObj, &psurfSrc->SurfObj, @@ -1316,6 +1350,7 @@ ULONG compression, DWORD init, LPBYTE bits, + ULONG cjMaxBits, PBITMAPINFO data, DWORD coloruse) { @@ -1359,7 +1394,11 @@ /* Undocumented flag which creates a DDB of the format specified by the bitmap info. */ handle = IntCreateCompatibleBitmap(Dc, width, height, planes, bpp); if (!handle) + { + DPRINT1("IntCreateCompatibleBitmap() failed!\n"); return NULL; + } + /* The palette must also match the given data */ Surface = SURFACE_ShareLockSurface(handle); ASSERT(Surface); @@ -1390,7 +1429,7 @@ if ((NULL != handle) && (CBM_INIT & init)) { - IntSetDIBits(Dc, handle, 0, height, bits, data, coloruse); + IntSetDIBits(Dc, handle, 0, height, bits, cjMaxBits, data, coloruse); } return handle; @@ -1423,6 +1462,7 @@ safeBits = ExAllocatePoolWithTag(PagedPool, cjMaxBits, TAG_DIB); if(!safeBits) { + DPRINT1("Failed to allocate %lu bytes\n", cjMaxBits); EngSetLastError(ERROR_NOT_ENOUGH_MEMORY); return NULL; } @@ -1445,6 +1485,7 @@ if(!NT_SUCCESS(Status)) { + DPRINT1("Got an exception! pjInit = %p\n", pjInit); SetLastNtError(Status); goto cleanup; } @@ -1491,6 +1532,7 @@ hdcDest = NtGdiCreateCompatibleDC(0); if(!hdcDest) { + DPRINT1("NtGdiCreateCompatibleDC failed\n"); return NULL; } } @@ -1502,6 +1544,7 @@ Dc = DC_LockDc(hdcDest); if (!Dc) { + DPRINT1("Failed to lock hdcDest %p\n", hdcDest); EngSetLastError(ERROR_INVALID_HANDLE); return NULL; } @@ -1529,7 +1572,7 @@ planes = 0; compression = 0; } - Bmp = IntCreateDIBitmap(Dc, cx, cy, planes, bpp, compression, fInit, pjInit, pbmi, iUsage); + Bmp = IntCreateDIBitmap(Dc, cx, cy, planes, bpp, compression, fInit, pjInit, cjMaxBits, pbmi, iUsage); DC_UnlockDc(Dc); if(!hDc)

1 0

[tkreuzer] 70464: [WIN32K] Properly check the bitmap size in IntSetDIBits, taking into account that it might be set to 0, then we have to calculate it ourselves. Fixes a crash when invalid data is ...
by tkreuzer＠svn.reactos.org 29 Dec '15

29 Dec '15

Author: tkreuzer Date: Tue Dec 29 20:28:23 2015 New Revision: 70464 URL: http://svn.reactos.org/svn/reactos?rev=70464&view=rev Log: [WIN32K] Properly check the bitmap size in IntSetDIBits, taking into account that it might be set to 0, then we have to calculate it ourselves. Fixes a crash when invalid data is passed to NtGdiCreateDIBitmapInternal. [GDI32] Convert COREINFOHEADER to BITMAPINFOHEADER before passing it to NtGdiCreateDIBitmapInternal, which doesn't support it. CORE-10583 #resolve Modified: trunk/reactos/win32ss/gdi/gdi32/objects/bitmap.c trunk/reactos/win32ss/gdi/ntgdi/dibobj.c Modified: trunk/reactos/win32ss/gdi/gdi32/objects/bitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/objects/… ============================================================================== --- trunk/reactos/win32ss/gdi/gdi32/objects/bitmap.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/gdi32/objects/bitmap.c [iso-8859-1] Tue Dec 29 20:28:23 2015 @@ -408,23 +408,30 @@ // PDC_ATTR pDc_Attr; UINT InfoSize = 0; UINT cjBmpScanSize = 0; - HBITMAP hBmp; + HBITMAP hBmp = NULL; NTSTATUS Status = STATUS_SUCCESS; + PBITMAPINFO pbmiConverted; + UINT cjInfoSize; + + /* Convert the BITMAPINFO if it is a COREINFO */ + pbmiConverted = ConvertBitmapInfo(Data, ColorUse, &cjInfoSize, FALSE); /* Check for CBM_CREATDIB */ if (Init & CBM_CREATDIB) { /* CBM_CREATDIB needs Data. */ - if (!Data) - { - return 0; + if (pbmiConverted == NULL) + { + DPRINT1("CBM_CREATDIB needs a BITMAINFO!\n"); + goto Exit; } /* It only works with PAL or RGB */ if (ColorUse > DIB_PAL_COLORS) { + DPRINT1("Invalid ColorUse: %lu\n", ColorUse); GdiSetLastError(ERROR_INVALID_PARAMETER); - return 0; + goto Exit; } /* Use the header from the data */ @@ -434,38 +441,48 @@ /* Header is required */ if (!Header) { + DPRINT1("Header is NULL\n"); GdiSetLastError(ERROR_INVALID_PARAMETER); - return 0; + goto Exit; } /* Get the bitmap format and dimensions */ if (DIB_GetBitmapInfo(Header, &width, &height, &planes, &bpp, &compr, &dibsize) == -1) { + DPRINT1("DIB_GetBitmapInfo failed!\n"); GdiSetLastError(ERROR_INVALID_PARAMETER); - return NULL; + goto Exit; } /* Check if the Compr is incompatible */ if ((compr == BI_JPEG) || (compr == BI_PNG) || (compr == BI_BITFIELDS)) - return 0; + { + DPRINT1("invalid compr: %lu!\n", compr); + goto Exit; + } /* Only DIB_RGB_COLORS (0), DIB_PAL_COLORS (1) and 2 are valid. */ if (ColorUse > DIB_PAL_COLORS + 1) { + DPRINT1("invalid compr: %lu!\n", compr); GdiSetLastError(ERROR_INVALID_PARAMETER); - return 0; + goto Exit; } /* If some Bits are given, only DIB_PAL_COLORS and DIB_RGB_COLORS are valid */ if (Bits && (ColorUse > DIB_PAL_COLORS)) { + DPRINT1("Invalid ColorUse: %lu\n", ColorUse); GdiSetLastError(ERROR_INVALID_PARAMETER); - return 0; + goto Exit; } /* Negative width is not allowed */ if (width < 0) - return 0; + { + DPRINT1("Negative width: %li\n", width); + goto Exit; + } /* Top-down DIBs have a negative height. */ height = abs(height); @@ -473,13 +490,13 @@ // For Icm support. // GdiGetHandleUserData(hdc, GDI_OBJECT_TYPE_DC, (PVOID)&pDc_Attr)) - if (Data) + if (pbmiConverted) { _SEH2_TRY { - cjBmpScanSize = GdiGetBitmapBitsSize((BITMAPINFO *) Data); - CalculateColorTableSize(&Data->bmiHeader, &ColorUse, &InfoSize); - InfoSize += Data->bmiHeader.biSize; + cjBmpScanSize = GdiGetBitmapBitsSize(pbmiConverted); + CalculateColorTableSize(&pbmiConverted->bmiHeader, &ColorUse, &InfoSize); + InfoSize += pbmiConverted->bmiHeader.biSize; } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -490,8 +507,9 @@ if (!NT_SUCCESS(Status)) { + DPRINT1("Got an exception!\n"); GdiSetLastError(ERROR_INVALID_PARAMETER); - return NULL; + goto Exit; } DPRINT("pBMI %p, Size bpp %u, dibsize %d, Conv %u, BSS %u\n", Data, bpp, dibsize, InfoSize, @@ -501,9 +519,18 @@ hBmp = GetStockObject(DEFAULT_BITMAP); else { - hBmp = NtGdiCreateDIBitmapInternal(hDC, width, height, Init, (LPBYTE) Bits, - (LPBITMAPINFO) Data, ColorUse, InfoSize, cjBmpScanSize, 0, 0); - } + hBmp = NtGdiCreateDIBitmapInternal(hDC, width, height, Init, (LPBYTE)Bits, + (LPBITMAPINFO)pbmiConverted, ColorUse, InfoSize, cjBmpScanSize, 0, 0); + } + +Exit: + + /* Cleanup converted BITMAPINFO */ + if ((pbmiConverted != NULL) && (pbmiConverted != Data)) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, pbmiConverted); + } + return hBmp; } Modified: trunk/reactos/win32ss/gdi/ntgdi/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dibobj.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/dibobj.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/dibobj.c [iso-8859-1] Tue Dec 29 20:28:23 2015 @@ -259,11 +259,37 @@ POINTL ptSrc; EXLATEOBJ exlo; PPALETTE ppalDIB = 0; + ULONG cjSizeImage; if (!bmi) return 0; - if (bmi->bmiHeader.biSizeImage > cjMaxBits) - { + /* Check if the header provided an image size */ + if (bmi->bmiHeader.biSizeImage != 0) + { + /* Use the given size */ + cjSizeImage = bmi->bmiHeader.biSizeImage; + } + /* Otherwise check for uncompressed formats */ + else if ((bmi->bmiHeader.biCompression == BI_RGB) || + (bmi->bmiHeader.biCompression == BI_BITFIELDS)) + { + /* Calculate the image size */ + cjSizeImage = DIB_GetDIBImageBytes(bmi->bmiHeader.biWidth, + ScanLines, + bmi->bmiHeader.biBitCount); + } + else + { + /* Compressed format without a size. This is invalid. */ + DPRINT1("Compressed format without a size!"); + return 0; + } + + /* Check if the size that we have is ok */ + if (cjSizeImage > cjMaxBits) + { + DPRINT1("Size too large! cjSizeImage = %lu, cjMaxBits = %lu\n", + cjSizeImage, cjMaxBits); return 0; } @@ -273,7 +299,7 @@ BitmapFormat(bmi->bmiHeader.biBitCount, bmi->bmiHeader.biCompression), bmi->bmiHeader.biHeight < 0 ? BMF_TOPDOWN : 0, - bmi->bmiHeader.biSizeImage, + cjSizeImage, (PVOID)Bits, 0); if (!SourceBitmap) @@ -314,6 +340,8 @@ rcDst.right = psurfDst->SurfObj.sizlBitmap.cx; ptSrc.x = 0; ptSrc.y = 0; + + NT_ASSERT(psurfSrc->SurfObj.cjBits <= cjMaxBits); result = IntEngCopyBits(&psurfDst->SurfObj, &psurfSrc->SurfObj, @@ -1366,7 +1394,11 @@ /* Undocumented flag which creates a DDB of the format specified by the bitmap info. */ handle = IntCreateCompatibleBitmap(Dc, width, height, planes, bpp); if (!handle) + { + DPRINT1("IntCreateCompatibleBitmap() failed!\n"); return NULL; + } + /* The palette must also match the given data */ Surface = SURFACE_ShareLockSurface(handle); ASSERT(Surface); @@ -1430,6 +1462,7 @@ safeBits = ExAllocatePoolWithTag(PagedPool, cjMaxBits, TAG_DIB); if(!safeBits) { + DPRINT1("Failed to allocate %lu bytes\n", cjMaxBits); EngSetLastError(ERROR_NOT_ENOUGH_MEMORY); return NULL; } @@ -1452,6 +1485,7 @@ if(!NT_SUCCESS(Status)) { + DPRINT1("Got an exception! pjInit = %p\n", pjInit); SetLastNtError(Status); goto cleanup; } @@ -1498,6 +1532,7 @@ hdcDest = NtGdiCreateCompatibleDC(0); if(!hdcDest) { + DPRINT1("NtGdiCreateCompatibleDC failed\n"); return NULL; } } @@ -1509,6 +1544,7 @@ Dc = DC_LockDc(hdcDest); if (!Dc) { + DPRINT1("Failed to lock hdcDest %p\n", hdcDest); EngSetLastError(ERROR_INVALID_HANDLE); return NULL; }

1 0

[tkreuzer] 70463: [WIN32KDLL_2K3SP2] Export NtUserGetClassInfoEx (as it's called in 2k3) both as NtUserGetClassInfo (as it's called on XP) and NtUserGetClassInfo. They have the same prototype.
by tkreuzer＠svn.reactos.org 28 Dec '15

28 Dec '15

Author: tkreuzer Date: Mon Dec 28 23:51:05 2015 New Revision: 70463 URL: http://svn.reactos.org/svn/reactos?rev=70463&view=rev Log: [WIN32KDLL_2K3SP2] Export NtUserGetClassInfoEx (as it's called in 2k3) both as NtUserGetClassInfo (as it's called on XP) and NtUserGetClassInfo. They have the same prototype. Modified: trunk/rostests/apitests/win32kdll/win32kdll_2k3sp2/win32kdll_2k3sp2.spec trunk/rostests/apitests/win32kdll/win32kdll_2k3sp2/win32ksvc-2k3sp2.h Modified: trunk/rostests/apitests/win32kdll/win32kdll_2k3sp2/win32kdll_2k3sp2.spec URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32kdll/win32k… ============================================================================== --- trunk/rostests/apitests/win32kdll/win32kdll_2k3sp2/win32kdll_2k3sp2.spec [iso-8859-1] (original) +++ trunk/rostests/apitests/win32kdll/win32kdll_2k3sp2/win32kdll_2k3sp2.spec [iso-8859-1] Mon Dec 28 23:51:05 2015 @@ -390,7 +390,8 @@ @ stdcall NtUserGetAtomName(long ptr) @ stdcall NtUserGetCaretBlinkTime() @ stdcall NtUserGetCaretPos(ptr) -@ stdcall NtUserGetClassInfo(ptr ptr ptr ptr long) # called NtUserGetClassInfoEx on 2k3,but identical to XP +@ stdcall NtUserGetClassInfo(ptr ptr ptr ptr long) NtUserGetClassInfoEx # called NtUserGetClassInfoEx on 2k3, but identical to XP's NtUserGetClassInfo +@ stdcall NtUserGetClassInfoEx(ptr ptr ptr ptr long) @ stdcall NtUserGetClassName(ptr long ptr) @ stdcall NtUserGetClipboardData(long ptr) @ stdcall NtUserGetClipboardFormatName(long wstr ptr) Modified: trunk/rostests/apitests/win32kdll/win32kdll_2k3sp2/win32ksvc-2k3sp2.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32kdll/win32k… ============================================================================== --- trunk/rostests/apitests/win32kdll/win32kdll_2k3sp2/win32ksvc-2k3sp2.h [iso-8859-1] (original) +++ trunk/rostests/apitests/win32kdll/win32kdll_2k3sp2/win32ksvc-2k3sp2.h [iso-8859-1] Mon Dec 28 23:51:05 2015 @@ -388,7 +388,7 @@ SVC_(UserGetAtomName, 2) SVC_(UserGetCaretBlinkTime, 0) SVC_(UserGetCaretPos, 1) -SVC_(UserGetClassInfo, 5) // called UserGetClassInfoEx on 2k3, but identical to XP +SVC_(UserGetClassInfoEx, 5) SVC_(UserGetClassName, 3) SVC_(UserGetClipboardData, 2) SVC_(UserGetClipboardFormatName, 3)

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs