Ros-diffs

ros-diffs@reactos.org

81390 discussions

[dreimer] 27123: Final Work today: - Added a nice Readme in PDF Format, based on Colin's - Started a Updated Changelog - Moved Basic Config.rbuild to the right Folder
by dreimer＠svn.reactos.org 10 Jun '07

10 Jun '07

Author: dreimer Date: Sun Jun 10 22:03:00 2007 New Revision: 27123 URL: http://svn.reactos.org/svn/reactos?rev=27123&view=rev Log: Final Work today: - Added a nice Readme in PDF Format, based on Colin's - Started a Updated Changelog - Moved Basic Config.rbuild to the right Folder Added: trunk/tools/RosBE-Windows/Root/readme.pdf (with props) trunk/tools/RosBE-Windows/Tools/config.rbuild Removed: trunk/tools/RosBE-Windows/Root/config.rbuild Modified: trunk/tools/RosBE-Windows/Root/ChangeLog.txt Modified: trunk/tools/RosBE-Windows/Root/ChangeLog.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/ChangeLog… ============================================================================== --- trunk/tools/RosBE-Windows/Root/ChangeLog.txt (original) +++ trunk/tools/RosBE-Windows/Root/ChangeLog.txt Sun Jun 10 22:03:00 2007 @@ -1,3 +1,8 @@ +*** Juni 21th, 2007 - RosBE 0.3.7 Released + +- Added a SVN Client +- Added a Build Configurator. + *** May 21th, 2007 - RosBE 0.3.6 Released - Updated: now using GCC 4.1.3 snapshot (20070405) Removed: trunk/tools/RosBE-Windows/Root/config.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/config.rb… ============================================================================== --- trunk/tools/RosBE-Windows/Root/config.rbuild (original) +++ trunk/tools/RosBE-Windows/Root/config.rbuild (removed) @@ -1,16 +1,0 @@ -<?xml version="1.0"?> -<rbuild xmlns:xi="http://www.w3.org/2001/XInclude"> - -<property name="ARCH" value="i386" /> -<property name="SARCH" value="" /> -<property name="OARCH" value="pentium" /> -<property name="OPTIMIZE" value="1" /> -<property name="MP" value="0" /> -<property name="KDBG" value="0" /> -<property name="DBG" value="1" /> -<property name="GDB" value="0" /> -<property name="NSWPAT" value="0" /> -<property name="NTLPC" value="1" /> -<property name="_WINKD_" value="0" /> - -</rbuild> Added: trunk/tools/RosBE-Windows/Root/readme.pdf URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/readme.pd… ============================================================================== Binary file - no diff available. Propchange: trunk/tools/RosBE-Windows/Root/readme.pdf ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/tools/RosBE-Windows/Tools/config.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config.r… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/config.rbuild (added) +++ trunk/tools/RosBE-Windows/Tools/config.rbuild Sun Jun 10 22:03:00 2007 @@ -1,0 +1,16 @@ +<?xml version="1.0"?> +<rbuild xmlns:xi="http://www.w3.org/2001/XInclude"> + +<property name="ARCH" value="i386" /> +<property name="SARCH" value="" /> +<property name="OARCH" value="pentium" /> +<property name="OPTIMIZE" value="1" /> +<property name="MP" value="0" /> +<property name="KDBG" value="0" /> +<property name="DBG" value="1" /> +<property name="GDB" value="0" /> +<property name="NSWPAT" value="0" /> +<property name="NTLPC" value="1" /> +<property name="_WINKD_" value="0" /> + +</rbuild>

1 0

[dreimer] 27122: OK. And this should make it possible to run it in RosBE, not just in a nice Test Folder.
by dreimer＠svn.reactos.org 10 Jun '07

10 Jun '07

Author: dreimer Date: Sun Jun 10 21:46:13 2007 New Revision: 27122 URL: http://svn.reactos.org/svn/reactos?rev=27122&view=rev Log: OK. And this should make it possible to run it in RosBE, not just in a nice Test Folder. Modified: trunk/tools/RosBE-Windows/Root/Config.cmd Modified: trunk/tools/RosBE-Windows/Root/Config.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Config.cm… ============================================================================== --- trunk/tools/RosBE-Windows/Root/Config.cmd (original) +++ trunk/tools/RosBE-Windows/Root/Config.cmd Sun Jun 10 21:46:13 2007 @@ -6,32 +6,34 @@ title ReactOS Build Configurator +cd "" + echo Architecture to build for. Not Editable. -echo +echo. echo Right now -grep \"ARCH\" config.rbuild|cut -d "\"" -f 4 -echo +call "%ROSBEBASEDIR%\Tools\grep.exe" \"ARCH\" %ROSBEBASEDIR%\Tools\config.rbuild|"%ROSBEBASEDIR%\Tools\cut.exe" -d "\"" -f 4 +echo. echo Sub-architecture to build for. echo Default is: none -echo +echo. echo Right now -grep \"SARCH\" config.rbuild|cut -d "\"" -f 4 +call "%ROSBEBASEDIR%\Tools\grep.exe" \"SARCH\" %ROSBEBASEDIR%\Tools\config.rbuild|"%ROSBEBASEDIR%\Tools\cut.exe" -d "\"" -f 4 SET /P X= (), (xbox) -sed "s/\"SARCH\" value=\"\"/\"SARCH\" value=\"%X%\"/g;s/\"SARCH\" value=\"xbox\"/\"SARCH\" value=\"%X%\"/g" config.rbuild > config2.rbuild +call "%ROSBEBASEDIR%\Tools\sed.exe" "s/\"SARCH\" value=\"\"/\"SARCH\" value=\"%X%\"/g;s/\"SARCH\" value=\"xbox\"/\"SARCH\" value=\"%X%\"/g" %ROSBEBASEDIR%\Tools\config.rbuild > %ROSBEBASEDIR%\Tools\config2.rbuild cls echo Which CPU ReactOS should be optimized for. -echo +echo. echo Examples: i486, i586, pentium, pentium2, pentium3, pentium4, athlon-xp, echo athlon-mp, k6-2 echo See GCC manual for more CPU names and which CPUs GCC can optimize for. echo Default is: pentium -echo +echo. echo Right now -grep \"OARCH\" config.rbuild|cut -d "\"" -f 4 +call "%ROSBEBASEDIR%\Tools\grep.exe" \"OARCH\" %ROSBEBASEDIR%\Tools\config.rbuild|"%ROSBEBASEDIR%\Tools\cut.exe" -d "\"" -f 4 SET /P XX= -sed "s/\"OARCH\" value=\".*\"/\"OARCH\" value=\"%XX%\"/g" config2.rbuild > config21.rbuild +call "%ROSBEBASEDIR%\Tools\sed.exe" "s/\"OARCH\" value=\".*\"/\"OARCH\" value=\"%XX%\"/g" %ROSBEBASEDIR%\Tools\config2.rbuild > %ROSBEBASEDIR%\Tools\config21.rbuild cls echo What level do you want ReactOS to be optimized at. @@ -40,68 +42,68 @@ echo 1 = Normal compiling. Recommended, it is default setting in echo official build and debug build. echo warning : 2,3,4,5 is not tested on ReactOS. Change at own risk. -echo +echo. echo Right now -grep \"OPTIMIZE\" config.rbuild|cut -d "\"" -f 4 +call "%ROSBEBASEDIR%\Tools\grep.exe" \"OPTIMIZE\" %ROSBEBASEDIR%\Tools\config.rbuild|"%ROSBEBASEDIR%\Tools\cut.exe" -d "\"" -f 4 SET /P Y= (0), (1), (2), (3), (4), (5) -sed "s/\"OPTIMIZE\" value=\"[0-5]\"/\"OPTIMIZE\" value=\"%Y%\"/g" config21.rbuild > config3.rbuild +call "%ROSBEBASEDIR%\Tools\sed.exe" "s/\"OPTIMIZE\" value=\"[0-5]\"/\"OPTIMIZE\" value=\"%Y%\"/g" %ROSBEBASEDIR%\Tools\config21.rbuild > %ROSBEBASEDIR%\Tools\config3.rbuild cls echo Whether to compile for an uniprocessor or multiprocessor machine. echo Default is: 0 -echo +echo. echo Right now -grep \"MP\" config.rbuild|cut -d "\"" -f 4 +call "%ROSBEBASEDIR%\Tools\grep.exe" \"MP\" %ROSBEBASEDIR%\Tools\config.rbuild|"%ROSBEBASEDIR%\Tools\cut.exe" -d "\"" -f 4 SET /P Z= (0), (1) -sed "s/\"MP\" value=\"[0-1]\"/\"MP\" value=\"%Z%\"/g" config3.rbuild > config4.rbuild +call "%ROSBEBASEDIR%\Tools\sed.exe" "s/\"MP\" value=\"[0-1]\"/\"MP\" value=\"%Z%\"/g" %ROSBEBASEDIR%\Tools\config3.rbuild > %ROSBEBASEDIR%\Tools\config4.rbuild cls echo Whether to compile in the integrated kernel debugger. echo Default is: 0 -echo +echo. echo Right now -grep \"KDBG\" config.rbuild|cut -d "\"" -f 4 +call "%ROSBEBASEDIR%\Tools\grep.exe" \"KDBG\" %ROSBEBASEDIR%\Tools\config.rbuild|"%ROSBEBASEDIR%\Tools\cut.exe" -d "\"" -f 4 SET /P A= (0), (1) -sed "s/\"KDBG\" value=\"[0-1]\"/\"KDBG\" value=\"%A%\"/g" config4.rbuild > config5.rbuild +call "%ROSBEBASEDIR%\Tools\sed.exe" "s/\"KDBG\" value=\"[0-1]\"/\"KDBG\" value=\"%A%\"/g" %ROSBEBASEDIR%\Tools\config4.rbuild > %ROSBEBASEDIR%\Tools\config5.rbuild cls echo Whether to compile for debugging. No compiler optimizations will be echo performed. echo Default is: 1 -echo +echo. echo Right now -grep \"DBG\" config.rbuild|cut -d "\"" -f 4 +call "%ROSBEBASEDIR%\Tools\grep.exe" \"DBG\" %ROSBEBASEDIR%\Tools\config.rbuild|"%ROSBEBASEDIR%\Tools\cut.exe" -d "\"" -f 4 SET /P B= (0), (1) -sed "s/\"DBG\" value=\"[0-1]\"/\"DBG\" value=\"%B%\"/g" config5.rbuild > config6.rbuild +call "%ROSBEBASEDIR%\Tools\sed.exe" "s/\"DBG\" value=\"[0-1]\"/\"DBG\" value=\"%B%\"/g" %ROSBEBASEDIR%\Tools\config5.rbuild > %ROSBEBASEDIR%\Tools\config6.rbuild cls echo Whether to compile for debugging with GDB. If you don't use GDB, don't echo enable this. echo Default is: 0 -echo +echo. echo Right now -grep \"GDB\" config.rbuild|cut -d "\"" -f 4 +call "%ROSBEBASEDIR%\Tools\grep.exe" \"GDB\" %ROSBEBASEDIR%\Tools\config.rbuild|"%ROSBEBASEDIR%\Tools\cut.exe" -d "\"" -f 4 SET /P C= (0), (1) -sed "s/\"GDB\" value=\"[0-1]\"/\"GDB\" value=\"%C%\"/g" config6.rbuild > config7.rbuild +call "%ROSBEBASEDIR%\Tools\sed.exe" "s/\"GDB\" value=\"[0-1]\"/\"GDB\" value=\"%C%\"/g" %ROSBEBASEDIR%\Tools\config6.rbuild > %ROSBEBASEDIR%\Tools\config7.rbuild cls echo Whether to compile apps/libs with features covered software patents or not. echo If you live in a country where software patents are valid/apply, don't echo enable this (except they/you purchased a license from the patent owner). echo Default is: 0 -echo +echo. echo Right now -grep \"NSWPAT\" config.rbuild|cut -d "\"" -f 4 +call "%ROSBEBASEDIR%\Tools\grep.exe" \"NSWPAT\" %ROSBEBASEDIR%\Tools\config.rbuild|"%ROSBEBASEDIR%\Tools\cut.exe" -d "\"" -f 4 SET /P D= (0), (1) -sed "s/\"NSWPAT\" value=\"[0-1]\"/\"NSWPAT\" value=\"%D%\"/g" config7.rbuild > config8.rbuild +call "%ROSBEBASEDIR%\Tools\sed.exe" "s/\"NSWPAT\" value=\"[0-1]\"/\"NSWPAT\" value=\"%D%\"/g" %ROSBEBASEDIR%\Tools\config7.rbuild > %ROSBEBASEDIR%\Tools\config8.rbuild cls echo Whether to compile with NT-compatible LPC Semantics. This should always be 1. -echo +echo. echo Right now -grep \"NTLPC\" config.rbuild|cut -d "\"" -f 4 +call "%ROSBEBASEDIR%\Tools\grep.exe" \"NTLPC\" %ROSBEBASEDIR%\Tools\config.rbuild|"%ROSBEBASEDIR%\Tools\cut.exe" -d "\"" -f 4 SET /P E= (0), (1) -sed "s/\"NTLPC\" value=\"[0-1]\"/\"NTLPC\" value=\"%E%\"/g" config8.rbuild > config9.rbuild +call "%ROSBEBASEDIR%\Tools\sed.exe" "s/\"NTLPC\" value=\"[0-1]\"/\"NTLPC\" value=\"%E%\"/g" %ROSBEBASEDIR%\Tools\config8.rbuild > %ROSBEBASEDIR%\Tools\config9.rbuild cls echo Whether to compile with the KD protocol. This will disable support for KDBG @@ -110,13 +112,15 @@ echo TinyKRNL. Booting into debug mode with this flag enabled will result in a echo failure to enter GUI mode. Do not enable unless you know what you're doing. echo Default is: 0 -echo +echo. echo Right now -grep \"_WINKD_\" config.rbuild|cut -d "\"" -f 4 +call "%ROSBEBASEDIR%\Tools\grep.exe" \"_WINKD_\" %ROSBEBASEDIR%\Tools\config.rbuild|"%ROSBEBASEDIR%\Tools\cut.exe" -d "\"" -f 4 SET /P F= (0), (1) -sed "s/\"_WINKD_\" value=\"[0-1]\"/\"_WINKD_\" value=\"%F%\"/g" config9.rbuild > config10.rbuild +call "%ROSBEBASEDIR%\Tools\sed.exe" "s/\"_WINKD_\" value=\"[0-1]\"/\"_WINKD_\" value=\"%F%\"/g" %ROSBEBASEDIR%\Tools\config9.rbuild > %ROSBEBASEDIR%\Tools\config10.rbuild -copy config10.rbuild config.tmp -del *.rbuild -copy config.tmp config.rbuild -del *.tmp +copy %ROSBEBASEDIR%\Tools\config10.rbuild %ROSBEBASEDIR%\Tools\config.tmp +del %ROSBEBASEDIR%\Tools\*.rbuild +copy %ROSBEBASEDIR%\Tools\config.tmp %ROSBEBASEDIR%\Tools\config.rbuild +del %ROSBEBASEDIR%\Tools\*.tmp +copy %ROSBEBASEDIR%\Tools\config.rbuild _ROSSOURCEDIR\config.rbuild +cd..

1 0

[dreimer] 27121: - Header Modification in SVN.cmd - Configurator reaches Beta Stadium. Hopefully no bugs are left.
by dreimer＠svn.reactos.org 10 Jun '07

10 Jun '07

Author: dreimer Date: Sun Jun 10 21:16:04 2007 New Revision: 27121 URL: http://svn.reactos.org/svn/reactos?rev=27121&view=rev Log: - Header Modification in SVN.cmd - Configurator reaches Beta Stadium. Hopefully no bugs are left. Modified: trunk/tools/RosBE-Windows/Root/Config.cmd trunk/tools/RosBE-Windows/Root/SVN.cmd Modified: trunk/tools/RosBE-Windows/Root/Config.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Config.cm… ============================================================================== --- trunk/tools/RosBE-Windows/Root/Config.cmd (original) +++ trunk/tools/RosBE-Windows/Root/Config.cmd Sun Jun 10 21:16:04 2007 @@ -1,64 +1,116 @@ +:: Copyright (c) Daniel Reimer. All rights reserved. +:: +:: A Basic Config.rbuild Creator for ReactOS. +:: @echo off -echo ARCH +title ReactOS Build Configurator + +echo Architecture to build for. Not Editable. +echo echo Right now grep \"ARCH\" config.rbuild|cut -d "\"" -f 4 +echo -echo SARCH +echo Sub-architecture to build for. +echo Default is: none +echo echo Right now grep \"SARCH\" config.rbuild|cut -d "\"" -f 4 SET /P X= (), (xbox) sed "s/\"SARCH\" value=\"\"/\"SARCH\" value=\"%X%\"/g;s/\"SARCH\" value=\"xbox\"/\"SARCH\" value=\"%X%\"/g" config.rbuild > config2.rbuild +cls -echo OARCH +echo Which CPU ReactOS should be optimized for. +echo +echo Examples: i486, i586, pentium, pentium2, pentium3, pentium4, athlon-xp, +echo athlon-mp, k6-2 +echo See GCC manual for more CPU names and which CPUs GCC can optimize for. +echo Default is: pentium +echo echo Right now grep \"OARCH\" config.rbuild|cut -d "\"" -f 4 SET /P XX= -sed "s/\"OARCH\" value=\"\"/\"OARCH\" value=\"%X%\"/g" config2.rbuild > config21.rbuild +sed "s/\"OARCH\" value=\".*\"/\"OARCH\" value=\"%XX%\"/g" config2.rbuild > config21.rbuild +cls -echo OPTIMIZE +echo What level do you want ReactOS to be optimized at. +echo this setting does not work if GDB is set +echo 0 = off +echo 1 = Normal compiling. Recommended, it is default setting in +echo official build and debug build. +echo warning : 2,3,4,5 is not tested on ReactOS. Change at own risk. +echo echo Right now grep \"OPTIMIZE\" config.rbuild|cut -d "\"" -f 4 SET /P Y= (0), (1), (2), (3), (4), (5) sed "s/\"OPTIMIZE\" value=\"[0-5]\"/\"OPTIMIZE\" value=\"%Y%\"/g" config21.rbuild > config3.rbuild +cls -echo MP +echo Whether to compile for an uniprocessor or multiprocessor machine. +echo Default is: 0 +echo echo Right now grep \"MP\" config.rbuild|cut -d "\"" -f 4 SET /P Z= (0), (1) sed "s/\"MP\" value=\"[0-1]\"/\"MP\" value=\"%Z%\"/g" config3.rbuild > config4.rbuild +cls -echo KDBG +echo Whether to compile in the integrated kernel debugger. +echo Default is: 0 +echo echo Right now grep \"KDBG\" config.rbuild|cut -d "\"" -f 4 SET /P A= (0), (1) sed "s/\"KDBG\" value=\"[0-1]\"/\"KDBG\" value=\"%A%\"/g" config4.rbuild > config5.rbuild +cls -echo DBG +echo Whether to compile for debugging. No compiler optimizations will be +echo performed. +echo Default is: 1 +echo echo Right now grep \"DBG\" config.rbuild|cut -d "\"" -f 4 SET /P B= (0), (1) sed "s/\"DBG\" value=\"[0-1]\"/\"DBG\" value=\"%B%\"/g" config5.rbuild > config6.rbuild +cls -echo GDB +echo Whether to compile for debugging with GDB. If you don't use GDB, don't +echo enable this. +echo Default is: 0 +echo echo Right now grep \"GDB\" config.rbuild|cut -d "\"" -f 4 SET /P C= (0), (1) sed "s/\"GDB\" value=\"[0-1]\"/\"GDB\" value=\"%C%\"/g" config6.rbuild > config7.rbuild +cls -echo NSWPAT +echo Whether to compile apps/libs with features covered software patents or not. +echo If you live in a country where software patents are valid/apply, don't +echo enable this (except they/you purchased a license from the patent owner). +echo Default is: 0 +echo echo Right now grep \"NSWPAT\" config.rbuild|cut -d "\"" -f 4 SET /P D= (0), (1) sed "s/\"NSWPAT\" value=\"[0-1]\"/\"NSWPAT\" value=\"%D%\"/g" config7.rbuild > config8.rbuild +cls -echo NTLPC +echo Whether to compile with NT-compatible LPC Semantics. This should always be 1. +echo echo Right now grep \"NTLPC\" config.rbuild|cut -d "\"" -f 4 SET /P E= (0), (1) sed "s/\"NTLPC\" value=\"[0-1]\"/\"NTLPC\" value=\"%E%\"/g" config8.rbuild > config9.rbuild +cls -echo _WINKD_ +echo Whether to compile with the KD protocol. This will disable support for KDBG +echo as well as rossym and symbol lookups, and allow WinDBG to connect to ReactOS. +echo This is currently not fully working, and requires kdcom from Windows 2003 or +echo TinyKRNL. Booting into debug mode with this flag enabled will result in a +echo failure to enter GUI mode. Do not enable unless you know what you're doing. +echo Default is: 0 +echo echo Right now grep \"_WINKD_\" config.rbuild|cut -d "\"" -f 4 SET /P F= (0), (1) Modified: trunk/tools/RosBE-Windows/Root/SVN.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/SVN.cmd?r… ============================================================================== --- trunk/tools/RosBE-Windows/Root/SVN.cmd (original) +++ trunk/tools/RosBE-Windows/Root/SVN.cmd Sun Jun 10 21:16:04 2007 @@ -1,6 +1,6 @@ -:: Copyright (c) Peter Ward and Daniel Reimer. All rights reserved. +:: Copyright (c) Daniel Reimer. All rights reserved. :: -:: SVN Client +:: Integrated SVN Client :: @echo off

1 0

[hpoussin] 27120: Fill HardwareDatabase, DriverStart and DriverSize fields before calling init routine
by hpoussin＠svn.reactos.org 10 Jun '07

10 Jun '07

Author: hpoussin Date: Sun Jun 10 20:15:16 2007 New Revision: 27120 URL: http://svn.reactos.org/svn/reactos?rev=27120&view=rev Log: Fill HardwareDatabase, DriverStart and DriverSize fields before calling init routine Modified: trunk/reactos/ntoskrnl/include/internal/io.h trunk/reactos/ntoskrnl/io/iomgr/driver.c trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Modified: trunk/reactos/ntoskrnl/include/internal/io.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/io.h (original) +++ trunk/reactos/ntoskrnl/include/internal/io.h Sun Jun 10 20:15:16 2007 @@ -806,6 +806,8 @@ IopCreateDriver(IN PUNICODE_STRING DriverName OPTIONAL, IN PDRIVER_INITIALIZE InitializationFunction, IN PUNICODE_STRING RegistryPath, + IN PVOID DllBase, + IN ULONG SizeOfImage, OUT PDRIVER_OBJECT *pDriverObject); VOID Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/driver.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c Sun Jun 10 20:15:16 2007 @@ -411,24 +411,25 @@ RtlInitUnicodeString(&DriverName, NameBuffer); DPRINT("Driver name: '%wZ'\n", &DriverName); - Status = IopCreateDriver(&DriverName, DriverEntry, &RegistryKey, &Driver); } else - { - Status = IopCreateDriver(NULL, DriverEntry, &RegistryKey, &Driver); - } + DriverName.Length = 0; + + Status = IopCreateDriver( + DriverName.Length > 0 ? &DriverName : NULL, + DriverEntry, + &RegistryKey, + ModuleObject->DllBase, + ModuleObject->SizeOfImage, + &Driver); RtlFreeUnicodeString(&RegistryKey); *DriverObject = Driver; if (!NT_SUCCESS(Status)) { - DPRINT1("IopCreateDriver() failed (Status 0x%08lx)\n", Status); + DPRINT("IopCreateDriver() failed (Status 0x%08lx)\n", Status); return Status; } - - Driver->HardwareDatabase = &IopHardwareDatabaseKey; - Driver->DriverStart = ModuleObject->DllBase; - Driver->DriverSize = ModuleObject->SizeOfImage; /* Set the driver as initialized */ Driver->Flags |= DRVO_INITIALIZED; @@ -1093,6 +1094,8 @@ IopCreateDriver(IN PUNICODE_STRING DriverName OPTIONAL, IN PDRIVER_INITIALIZE InitializationFunction, IN PUNICODE_STRING RegistryPath, + IN PVOID DllBase, + IN ULONG SizeOfImage, OUT PDRIVER_OBJECT *pDriverObject) { WCHAR NameBuffer[100]; @@ -1225,6 +1228,10 @@ /* Close the extra handle */ ZwClose(hDriver); + DriverObject->HardwareDatabase = &IopHardwareDatabaseKey; + DriverObject->DriverStart = DllBase; + DriverObject->DriverSize = SizeOfImage; + /* Finally, call its init function */ DPRINT("RegistryKey: %wZ\n", RegistryKey); DPRINT("Calling driver entrypoint at %p\n", InitializationFunction); @@ -1256,7 +1263,7 @@ IN PDRIVER_INITIALIZE InitializationFunction) { PDRIVER_OBJECT DriverObject; - return IopCreateDriver(DriverName, InitializationFunction, NULL, &DriverObject); + return IopCreateDriver(DriverName, InitializationFunction, NULL, 0, 0, &DriverObject); } /* Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Sun Jun 10 20:15:16 2007 @@ -2022,7 +2022,6 @@ DPRINT("IopInitiatePnpIrp() failed (Status %x)\n", Status); } - DPRINT("Sending IRP_MN_QUERY_DEVICE_TEXT.DeviceTextDescription to device stack\n"); Stack.Parameters.QueryDeviceText.DeviceTextType = DeviceTextDescription; @@ -2275,7 +2274,7 @@ if (!NT_SUCCESS(Status)) { /* FIXME: Log the error */ - DPRINT1("Could not retrieve configuration for device %wZ (Status 0x%08x)\n", + DPRINT("Could not retrieve configuration for device %wZ (Status 0x%08x)\n", &DeviceNode->InstancePath, Status); IopDeviceNodeSetFlag(DeviceNode, DNF_DISABLED); return STATUS_SUCCESS; @@ -2297,7 +2296,7 @@ return STATUS_SUCCESS; } - DPRINT1("Got Service %S\n", Service->Buffer); + DPRINT("Got Service %S\n", Service->Buffer); } return STATUS_SUCCESS; @@ -3315,7 +3314,7 @@ * Create root device node */ - Status = IopCreateDriver(NULL, PnpDriverInitializeEmpty, NULL, &IopRootDriverObject); + Status = IopCreateDriver(NULL, PnpDriverInitializeEmpty, NULL, 0, 0, &IopRootDriverObject); if (!NT_SUCCESS(Status)) { CPRINT("IoCreateDriverObject() failed\n");

1 0

[dreimer] 27119: Basic Config.rbuild Editor is ready. OARCH is not editable yet.
by dreimer＠svn.reactos.org 10 Jun '07

10 Jun '07

Author: dreimer Date: Sun Jun 10 19:34:40 2007 New Revision: 27119 URL: http://svn.reactos.org/svn/reactos?rev=27119&view=rev Log: Basic Config.rbuild Editor is ready. OARCH is not editable yet. Modified: trunk/tools/RosBE-Windows/Root/Config.cmd Modified: trunk/tools/RosBE-Windows/Root/Config.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Config.cm… ============================================================================== --- trunk/tools/RosBE-Windows/Root/Config.cmd (original) +++ trunk/tools/RosBE-Windows/Root/Config.cmd Sun Jun 10 19:34:40 2007 @@ -1,20 +1,70 @@ -sed "s/\"SARCH\" value=\"\"/\"SARCH\" value=\%1"\"/g;s/\"SARCH\" value=\"xbox\"/\"SARCH\" value=\"%1\"/g" config.rbuild > config2.rbuild -sed "s/\"OPTIMIZE\" value=\"[0-5]\"/\"OPTIMIZE\" value=\"%1\"/g" config.rbuild > config2.rbuild -sed "s/\"MP\" value=\"[0-1]\"/\"MP\" value=\"%1\"/g" config.rbuild > config2.rbuild -sed "s/\"KDBG\" value=\"[0-1]\"/\"KDBG\" value=\"%1\"/g" config.rbuild > config2.rbuild -sed "s/\"DBG\" value=\"[0-1]\"/\"DBG\" value=\"%1\"/g" config.rbuild > config2.rbuild -sed "s/\"GDB\" value=\"[0-1]\"/\"GDB\" value=\"%1\"/g" config.rbuild > config2.rbuild -sed "s/\"NSWPAT\" value=\"[0-1]\"/\"NSWPAT\" value=\"%1\"/g" config.rbuild > config2.rbuild -sed "s/\"NTLPC\" value=\"[0-1]\"/\"NTLPC\" value=\"%1\"/g" config.rbuild > config2.rbuild -sed "s/\"_WINKD_\" value=\"[0-1]\"/\"_WINKD_\" value=\"%1\"/g" config.rbuild > config2.rbuild +@echo off -grep SARCH config.rbuild|cut -d "\"" -f 4 -grep OARCH config.rbuild|cut -d "\"" -f 4 -grep OPTIMIZE config.rbuild|cut -d "\"" -f 4 -grep MP config.rbuild|cut -d "\"" -f 4 -grep KDBG config.rbuild|cut -d "\"" -f 4 -grep DBG config.rbuild|cut -d "\"" -f 4 -grep GDB config.rbuild|cut -d "\"" -f 4 -grep NSWPAT config.rbuild|cut -d "\"" -f 4 -grep NTLPC config.rbuild|cut -d "\"" -f 4 -grep _WINKD_ config.rbuild|cut -d "\"" -f 4 +echo ARCH +echo Right now +grep \"ARCH\" config.rbuild|cut -d "\"" -f 4 + +echo SARCH +echo Right now +grep \"SARCH\" config.rbuild|cut -d "\"" -f 4 +SET /P X= (), (xbox) +sed "s/\"SARCH\" value=\"\"/\"SARCH\" value=\"%X%\"/g;s/\"SARCH\" value=\"xbox\"/\"SARCH\" value=\"%X%\"/g" config.rbuild > config2.rbuild + +echo OARCH +echo Right now +grep \"OARCH\" config.rbuild|cut -d "\"" -f 4 +SET /P XX= +sed "s/\"OARCH\" value=\"\"/\"OARCH\" value=\"%X%\"/g" config2.rbuild > config21.rbuild + +echo OPTIMIZE +echo Right now +grep \"OPTIMIZE\" config.rbuild|cut -d "\"" -f 4 +SET /P Y= (0), (1), (2), (3), (4), (5) +sed "s/\"OPTIMIZE\" value=\"[0-5]\"/\"OPTIMIZE\" value=\"%Y%\"/g" config21.rbuild > config3.rbuild + +echo MP +echo Right now +grep \"MP\" config.rbuild|cut -d "\"" -f 4 +SET /P Z= (0), (1) +sed "s/\"MP\" value=\"[0-1]\"/\"MP\" value=\"%Z%\"/g" config3.rbuild > config4.rbuild + +echo KDBG +echo Right now +grep \"KDBG\" config.rbuild|cut -d "\"" -f 4 +SET /P A= (0), (1) +sed "s/\"KDBG\" value=\"[0-1]\"/\"KDBG\" value=\"%A%\"/g" config4.rbuild > config5.rbuild + +echo DBG +echo Right now +grep \"DBG\" config.rbuild|cut -d "\"" -f 4 +SET /P B= (0), (1) +sed "s/\"DBG\" value=\"[0-1]\"/\"DBG\" value=\"%B%\"/g" config5.rbuild > config6.rbuild + +echo GDB +echo Right now +grep \"GDB\" config.rbuild|cut -d "\"" -f 4 +SET /P C= (0), (1) +sed "s/\"GDB\" value=\"[0-1]\"/\"GDB\" value=\"%C%\"/g" config6.rbuild > config7.rbuild + +echo NSWPAT +echo Right now +grep \"NSWPAT\" config.rbuild|cut -d "\"" -f 4 +SET /P D= (0), (1) +sed "s/\"NSWPAT\" value=\"[0-1]\"/\"NSWPAT\" value=\"%D%\"/g" config7.rbuild > config8.rbuild + +echo NTLPC +echo Right now +grep \"NTLPC\" config.rbuild|cut -d "\"" -f 4 +SET /P E= (0), (1) +sed "s/\"NTLPC\" value=\"[0-1]\"/\"NTLPC\" value=\"%E%\"/g" config8.rbuild > config9.rbuild + +echo _WINKD_ +echo Right now +grep \"_WINKD_\" config.rbuild|cut -d "\"" -f 4 +SET /P F= (0), (1) +sed "s/\"_WINKD_\" value=\"[0-1]\"/\"_WINKD_\" value=\"%F%\"/g" config9.rbuild > config10.rbuild + +copy config10.rbuild config.tmp +del *.rbuild +copy config.tmp config.rbuild +del *.tmp

1 0

[mbosma] 27118: Some clean up
by mbosma＠svn.reactos.org 10 Jun '07

10 Jun '07

Author: mbosma Date: Sun Jun 10 18:43:48 2007 New Revision: 27118 URL: http://svn.reactos.org/svn/reactos?rev=27118&view=rev Log: Some clean up Added: trunk/rostests/dxtest/ddraw/DDraw/available_mem.cpp (with props) Modified: trunk/rostests/dxtest/ddraw/DDraw/create.cpp trunk/rostests/dxtest/ddraw/DDraw/display_modes.cpp trunk/rostests/dxtest/ddraw/testlist.cpp Added: trunk/rostests/dxtest/ddraw/DDraw/available_mem.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/ddraw/DDraw/availa… ============================================================================== --- trunk/rostests/dxtest/ddraw/DDraw/available_mem.cpp (added) +++ trunk/rostests/dxtest/ddraw/DDraw/available_mem.cpp Sun Jun 10 18:43:48 2007 @@ -1,0 +1,269 @@ + +BOOL Test_GetAvailableVidMem (INT* passed, INT* failed) +{ + LPDIRECTDRAW7 DirectDraw; + + /* Preparations */ + if (DirectDrawCreateEx(NULL, (VOID**)&DirectDraw, IID_IDirectDraw7, NULL) != DD_OK) + { + printf("ERROR: Failed to set up ddraw\n"); + return FALSE; + } + + /* Here we go */ + DWORD Total, Free; + DDSCAPS2 Caps = { 0 }; + + TEST (DirectDraw->GetAvailableVidMem(&Caps, NULL, NULL) == DDERR_INVALIDPARAMS); + TEST (DirectDraw->GetAvailableVidMem(NULL, &Total, &Free) == DDERR_INVALIDPARAMS); + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); + + /* testing caps */ + memset(&Caps,0,sizeof(DDSCAPS2)); + Caps.dwCaps = DDSCAPS_RESERVED1; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK ); + + memset(&Caps,0,sizeof(DDSCAPS2)); + Caps.dwCaps = DDSCAPS_ALPHA; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK ); + + memset(&Caps,0,sizeof(DDSCAPS2)); + Caps.dwCaps = DDSCAPS_BACKBUFFER; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DDERR_INVALIDPARAMS ); + + memset(&Caps,0,sizeof(DDSCAPS2)); + Caps.dwCaps = DDSCAPS_COMPLEX; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DDERR_INVALIDPARAMS ); + + memset(&Caps,0,sizeof(DDSCAPS2)); + Caps.dwCaps = DDSCAPS_FLIP; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DDERR_INVALIDPARAMS ); + + memset(&Caps,0,sizeof(DDSCAPS2)); + Caps.dwCaps = DDSCAPS_FRONTBUFFER; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DDERR_INVALIDPARAMS ); + + memset(&Caps,0,sizeof(DDSCAPS2)); + Caps.dwCaps = DDSCAPS_OFFSCREENPLAIN; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK ); + + memset(&Caps,0,sizeof(DDSCAPS2)); + Caps.dwCaps = DDSCAPS_OVERLAY; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK ); + + memset(&Caps,0,sizeof(DDSCAPS2)); + Caps.dwCaps = DDSCAPS_PALETTE; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DDERR_INVALIDPARAMS ); + + memset(&Caps,0,sizeof(DDSCAPS2)); + Caps.dwCaps = DDSCAPS_PRIMARYSURFACE; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK ); + + memset(&Caps,0,sizeof(DDSCAPS2)); + Caps.dwCaps = DDSCAPS_RESERVED3; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK ); + + memset(&Caps,0,sizeof(DDSCAPS2)); + Caps.dwCaps = DDSCAPS_SYSTEMMEMORY; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DDERR_INVALIDPARAMS ); + + memset(&Caps,0,sizeof(DDSCAPS2)); + Caps.dwCaps = DDSCAPS_TEXTURE; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK ); + + memset(&Caps,0,sizeof(DDSCAPS2)); + Caps.dwCaps = DDSCAPS_3DDEVICE; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK ); + + memset(&Caps,0,sizeof(DDSCAPS2)); + Caps.dwCaps = DDSCAPS_VIDEOMEMORY; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK ); + + memset(&Caps,0,sizeof(DDSCAPS2)); + Caps.dwCaps = DDSCAPS_VISIBLE; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DDERR_INVALIDPARAMS ); + + memset(&Caps,0,sizeof(DDSCAPS2)); + Caps.dwCaps = DDSCAPS_WRITEONLY; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DDERR_INVALIDPARAMS ); + + memset(&Caps,0,sizeof(DDSCAPS2)); + Caps.dwCaps = DDSCAPS_ZBUFFER; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK ); + + memset(&Caps,0,sizeof(DDSCAPS2)); + Caps.dwCaps = DDSCAPS_OWNDC; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DDERR_INVALIDPARAMS ); + + memset(&Caps,0,sizeof(DDSCAPS2)); + Caps.dwCaps = DDSCAPS_LIVEVIDEO; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK ); + + memset(&Caps,0,sizeof(DDSCAPS2)); + Caps.dwCaps = DDSCAPS_HWCODEC; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK ); + + memset(&Caps,0,sizeof(DDSCAPS2)); + Caps.dwCaps = DDSCAPS_MODEX; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK ); + + memset(&Caps,0,sizeof(DDSCAPS2)); + Caps.dwCaps = DDSCAPS_MIPMAP; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK ); + + memset(&Caps,0,sizeof(DDSCAPS2)); + Caps.dwCaps = DDSCAPS_RESERVED2; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK ); + + memset(&Caps,0,sizeof(DDSCAPS2)); + Caps.dwCaps = DDSCAPS_ALLOCONLOAD; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK ); + + memset(&Caps,0,sizeof(DDSCAPS2)); + Caps.dwCaps = DDSCAPS_VIDEOPORT; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK ); + + memset(&Caps,0,sizeof(DDSCAPS2)); + Caps.dwCaps = DDSCAPS_LOCALVIDMEM; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); + + memset(&Caps,0,sizeof(DDSCAPS2)); + Caps.dwCaps = DDSCAPS_NONLOCALVIDMEM; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); + + memset(&Caps,0,sizeof(DDSCAPS2)); + Caps.dwCaps2 = 0x01; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DDERR_INVALIDCAPS); + + memset(&Caps,0,sizeof(DDSCAPS2)); + Caps.dwCaps2 = DDSCAPS2_RESERVED4; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); + + memset(&Caps,0,sizeof(DDSCAPS2)); + Caps.dwCaps2 = DDSCAPS2_HINTDYNAMIC; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); + + memset(&Caps,0,sizeof(DDSCAPS2)); + Caps.dwCaps2 = DDSCAPS2_HINTSTATIC; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); + + memset(&Caps,0,sizeof(DDSCAPS2)); + Caps.dwCaps2 = DDSCAPS2_TEXTUREMANAGE; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); + + memset(&Caps,0,sizeof(DDSCAPS2)); + Caps.dwCaps2 = DDSCAPS2_RESERVED1; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); + + memset(&Caps,0,sizeof(DDSCAPS2)); + Caps.dwCaps2 = DDSCAPS2_RESERVED2; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); + + memset(&Caps,0,sizeof(DDSCAPS2)); + Caps.dwCaps2 = DDSCAPS2_OPAQUE; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); + + memset(&Caps,0,sizeof(DDSCAPS2)); + Caps.dwCaps2 = DDSCAPS2_HINTANTIALIASING; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); + + memset(&Caps,0,sizeof(DDSCAPS2)); + Caps.dwCaps2 = DDSCAPS2_CUBEMAP; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); + + memset(&Caps,0,sizeof(DDSCAPS2)); + Caps.dwCaps2 = DDSCAPS2_CUBEMAP_POSITIVEX; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); + + memset(&Caps,0,sizeof(DDSCAPS2)); + Caps.dwCaps2 = DDSCAPS2_CUBEMAP_NEGATIVEX; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); + + memset(&Caps,0,sizeof(DDSCAPS2)); + Caps.dwCaps2 = DDSCAPS2_CUBEMAP_POSITIVEY; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); + + memset(&Caps,0,sizeof(DDSCAPS2)); + Caps.dwCaps2 = DDSCAPS2_CUBEMAP_NEGATIVEY; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); + + memset(&Caps,0,sizeof(DDSCAPS2)); + Caps.dwCaps2 = DDSCAPS2_CUBEMAP_POSITIVEZ; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); + + memset(&Caps,0,sizeof(DDSCAPS2)); + Caps.dwCaps2 = DDSCAPS2_CUBEMAP_NEGATIVEZ; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); + + memset(&Caps,0,sizeof(DDSCAPS2)); + Caps.dwCaps2 = DDSCAPS2_MIPMAPSUBLEVEL; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); + + memset(&Caps,0,sizeof(DDSCAPS2)); + Caps.dwCaps2 = DDSCAPS2_D3DTEXTUREMANAGE; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); + + memset(&Caps,0,sizeof(DDSCAPS2)); + Caps.dwCaps2 = DDSCAPS2_DONOTPERSIST; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); + + memset(&Caps,0,sizeof(DDSCAPS2)); + Caps.dwCaps2 = DDSCAPS2_STEREOSURFACELEFT; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); + + memset(&Caps,0,sizeof(DDSCAPS2)); + Caps.dwCaps2 = DDSCAPS2_VOLUME; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); + + memset(&Caps,0,sizeof(DDSCAPS2)); + Caps.dwCaps2 = DDSCAPS2_NOTUSERLOCKABLE; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); + + memset(&Caps,0,sizeof(DDSCAPS2)); + Caps.dwCaps2 = DDSCAPS2_POINTS; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); + + memset(&Caps,0,sizeof(DDSCAPS2)); + Caps.dwCaps2 = DDSCAPS2_RTPATCHES; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); + + memset(&Caps,0,sizeof(DDSCAPS2)); + Caps.dwCaps2 = DDSCAPS2_NPATCHES; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); + + memset(&Caps,0,sizeof(DDSCAPS2)); + Caps.dwCaps2 = DDSCAPS2_RESERVED3; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); + + memset(&Caps,0,sizeof(DDSCAPS2)); + Caps.dwCaps2 = DDSCAPS2_DISCARDBACKBUFFER; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); + + memset(&Caps,0,sizeof(DDSCAPS2)); + Caps.dwCaps2 = DDSCAPS2_ENABLEALPHACHANNEL; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); + + memset(&Caps,0,sizeof(DDSCAPS2)); + Caps.dwCaps2 = DDSCAPS2_EXTENDEDFORMATPRIMARY; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); + + memset(&Caps,0,sizeof(DDSCAPS2)); + Caps.dwCaps2 = DDSCAPS2_ADDITIONALPRIMARY; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); + + memset(&Caps,0,sizeof(DDSCAPS2)); + Caps.dwCaps3 = ~(DDSCAPS3_MULTISAMPLE_QUALITY_MASK | DDSCAPS3_MULTISAMPLE_MASK | DDSCAPS3_RESERVED1 | DDSCAPS3_RESERVED2 | DDSCAPS3_LIGHTWEIGHTMIPMAP | DDSCAPS3_AUTOGENMIPMAP | DDSCAPS3_DMAP); + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DDERR_INVALIDCAPS); + + memset(&Caps,0,sizeof(DDSCAPS2)); + Caps.dwCaps3 = (DDSCAPS3_MULTISAMPLE_QUALITY_MASK | DDSCAPS3_MULTISAMPLE_MASK | DDSCAPS3_RESERVED1 | DDSCAPS3_RESERVED2 | DDSCAPS3_LIGHTWEIGHTMIPMAP | DDSCAPS3_AUTOGENMIPMAP | DDSCAPS3_DMAP); + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); + + memset(&Caps,0,sizeof(DDSCAPS2)); + Caps.dwCaps4 = 1; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DDERR_INVALIDCAPS ); + + DirectDraw->Release(); + + return TRUE; +} Propchange: trunk/rostests/dxtest/ddraw/DDraw/available_mem.cpp ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/rostests/dxtest/ddraw/DDraw/available_mem.cpp ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision Modified: trunk/rostests/dxtest/ddraw/DDraw/create.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/ddraw/DDraw/create… ============================================================================== --- trunk/rostests/dxtest/ddraw/DDraw/create.cpp (original) +++ trunk/rostests/dxtest/ddraw/DDraw/create.cpp Sun Jun 10 18:43:48 2007 @@ -79,276 +79,6 @@ return TRUE; } -BOOL Test_GetAvailableVidMem (INT* passed, INT* failed) -{ - LPDIRECTDRAW7 DirectDraw; - - /* Preparations */ - if (DirectDrawCreateEx(NULL, (VOID**)&DirectDraw, IID_IDirectDraw7, NULL) != DD_OK) - { - printf("ERROR: Failed to set up ddraw\n"); - return FALSE; - } - - /* Here we go */ - DWORD Total, Free; - DDSCAPS2 Caps = { 0 }; - - TEST (DirectDraw->GetAvailableVidMem(&Caps, NULL, NULL) == DDERR_INVALIDPARAMS); - TEST (DirectDraw->GetAvailableVidMem(NULL, &Total, &Free) == DDERR_INVALIDPARAMS); - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); - - - /* testing caps */ - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps = DDSCAPS_RESERVED1; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK ); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps = DDSCAPS_ALPHA; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK ); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps = DDSCAPS_BACKBUFFER; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DDERR_INVALIDPARAMS ); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps = DDSCAPS_COMPLEX; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DDERR_INVALIDPARAMS ); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps = DDSCAPS_FLIP; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DDERR_INVALIDPARAMS ); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps = DDSCAPS_FRONTBUFFER; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DDERR_INVALIDPARAMS ); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps = DDSCAPS_OFFSCREENPLAIN; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK ); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps = DDSCAPS_OVERLAY; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK ); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps = DDSCAPS_PALETTE; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DDERR_INVALIDPARAMS ); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps = DDSCAPS_PRIMARYSURFACE; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK ); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps = DDSCAPS_RESERVED3; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK ); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps = DDSCAPS_SYSTEMMEMORY; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DDERR_INVALIDPARAMS ); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps = DDSCAPS_TEXTURE; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK ); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps = DDSCAPS_3DDEVICE; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK ); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps = DDSCAPS_VIDEOMEMORY; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK ); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps = DDSCAPS_VISIBLE; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DDERR_INVALIDPARAMS ); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps = DDSCAPS_WRITEONLY; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DDERR_INVALIDPARAMS ); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps = DDSCAPS_ZBUFFER; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK ); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps = DDSCAPS_OWNDC; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DDERR_INVALIDPARAMS ); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps = DDSCAPS_LIVEVIDEO; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK ); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps = DDSCAPS_HWCODEC; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK ); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps = DDSCAPS_MODEX; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK ); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps = DDSCAPS_MIPMAP; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK ); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps = DDSCAPS_RESERVED2; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK ); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps = DDSCAPS_ALLOCONLOAD; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK ); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps = DDSCAPS_VIDEOPORT; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK ); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps = DDSCAPS_LOCALVIDMEM; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps = DDSCAPS_NONLOCALVIDMEM; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps2 = 0x01; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DDERR_INVALIDCAPS); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps2 = DDSCAPS2_RESERVED4; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps2 = DDSCAPS2_HINTDYNAMIC; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps2 = DDSCAPS2_HINTSTATIC; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps2 = DDSCAPS2_TEXTUREMANAGE; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps2 = DDSCAPS2_RESERVED1; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps2 = DDSCAPS2_RESERVED2; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps2 = DDSCAPS2_OPAQUE; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps2 = DDSCAPS2_HINTANTIALIASING; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps2 = DDSCAPS2_CUBEMAP; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps2 = DDSCAPS2_CUBEMAP_POSITIVEX; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps2 = DDSCAPS2_CUBEMAP_NEGATIVEX; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps2 = DDSCAPS2_CUBEMAP_POSITIVEY; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps2 = DDSCAPS2_CUBEMAP_NEGATIVEY; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps2 = DDSCAPS2_CUBEMAP_POSITIVEZ; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps2 = DDSCAPS2_CUBEMAP_NEGATIVEZ; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps2 = DDSCAPS2_MIPMAPSUBLEVEL; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps2 = DDSCAPS2_D3DTEXTUREMANAGE; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps2 = DDSCAPS2_DONOTPERSIST; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps2 = DDSCAPS2_STEREOSURFACELEFT; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps2 = DDSCAPS2_VOLUME; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps2 = DDSCAPS2_NOTUSERLOCKABLE; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps2 = DDSCAPS2_POINTS; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps2 = DDSCAPS2_RTPATCHES; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps2 = DDSCAPS2_NPATCHES; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps2 = DDSCAPS2_RESERVED3; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps2 = DDSCAPS2_DISCARDBACKBUFFER; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps2 = DDSCAPS2_ENABLEALPHACHANNEL; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps2 = DDSCAPS2_EXTENDEDFORMATPRIMARY; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps2 = DDSCAPS2_ADDITIONALPRIMARY; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps3 = ~(DDSCAPS3_MULTISAMPLE_QUALITY_MASK | DDSCAPS3_MULTISAMPLE_MASK | DDSCAPS3_RESERVED1 | DDSCAPS3_RESERVED2 | DDSCAPS3_LIGHTWEIGHTMIPMAP | DDSCAPS3_AUTOGENMIPMAP | DDSCAPS3_DMAP); - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DDERR_INVALIDCAPS); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps3 = (DDSCAPS3_MULTISAMPLE_QUALITY_MASK | DDSCAPS3_MULTISAMPLE_MASK | DDSCAPS3_RESERVED1 | DDSCAPS3_RESERVED2 | DDSCAPS3_LIGHTWEIGHTMIPMAP | DDSCAPS3_AUTOGENMIPMAP | DDSCAPS3_DMAP); - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps4 = 1; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DDERR_INVALIDCAPS ); - - DirectDraw->Release(); - - return TRUE; -} - BOOL Test_GetFourCCCodes (INT* passed, INT* failed) { LPDIRECTDRAW7 DirectDraw; @@ -381,8 +111,6 @@ DDDEVICEIDENTIFIER2 pDDDI; //OLECHAR GuidStr[100]; - - /* Preparations */ if (DirectDrawCreateEx(NULL, (VOID**)&DirectDraw, IID_IDirectDraw7, NULL) != DD_OK) { @@ -393,7 +121,6 @@ TEST ( DirectDraw->GetDeviceIdentifier(NULL, 0) == DDERR_INVALIDPARAMS ); TEST ( DirectDraw->GetDeviceIdentifier(NULL, ~DDGDI_GETHOSTIDENTIFIER) == DDERR_INVALIDPARAMS ); TEST ( DirectDraw->GetDeviceIdentifier(NULL, DDGDI_GETHOSTIDENTIFIER) == DDERR_INVALIDPARAMS ); - memset(&pDDDI,0,sizeof(DDDEVICEIDENTIFIER2)); TEST ( DirectDraw->GetDeviceIdentifier(&pDDDI, 0) == DD_OK ); Modified: trunk/rostests/dxtest/ddraw/DDraw/display_modes.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/ddraw/DDraw/displa… ============================================================================== --- trunk/rostests/dxtest/ddraw/DDraw/display_modes.cpp (original) +++ trunk/rostests/dxtest/ddraw/DDraw/display_modes.cpp Sun Jun 10 18:43:48 2007 @@ -4,6 +4,8 @@ INT* failed; LPDIRECTDRAW7 DirectDraw; } ENUMCONTEXT; + +BOOL Test_GetMonitorFrequency (INT* passed, INT* failed); HRESULT CALLBACK DummyEnumDisplayModes( LPDDSURFACEDESC2 pDDSD, ENUMCONTEXT* Context ) { @@ -53,6 +55,8 @@ /* The Test */ + Test_GetMonitorFrequency(passed, failed); + /* First try with some generic display modes */ TEST ( DirectDraw->SetDisplayMode (1586, 895, 0, 0, 0) == DDERR_UNSUPPORTED ); TEST ( DirectDraw->SetDisplayMode (0, 0, 0, 0, 0x123) == DDERR_INVALIDPARAMS ); @@ -62,7 +66,6 @@ TEST ( DirectDraw->SetDisplayMode (800, 600, 0, 0, 0) == DD_OK ); TEST ( DirectDraw->SetDisplayMode (0, 0, 16, 0, 0) == DD_OK ); - TEST ( DirectDraw->GetMonitorFrequency (NULL) == DDERR_INVALIDPARAMS ); TEST ( DirectDraw->GetDisplayMode (NULL) == DDERR_INVALIDPARAMS ); DDSURFACEDESC2 DisplayMode = {0}; TEST ( DirectDraw->GetDisplayMode (&DisplayMode) == DDERR_INVALIDPARAMS ); @@ -78,10 +81,8 @@ DirectDraw->Release(); - return TRUE; } - BOOL Test_GetMonitorFrequency (INT* passed, INT* failed) { @@ -103,29 +104,24 @@ TEST (DirectDraw->GetMonitorFrequency((PDWORD)0xdeadbeef) == DDERR_INVALIDPARAMS); TEST (DirectDraw->GetMonitorFrequency(NULL) == DDERR_INVALIDPARAMS); - /* This test depns on which graphice card you have */ + // result depends on our graphices card retVal = DirectDraw->GetMonitorFrequency((PDWORD)&lpFreq); + TEST ( retVal == DD_OK || retVal == DDERR_UNSUPPORTED); - if ( retVal == DDERR_UNSUPPORTED) - { - retVal = DD_OK; - } - TEST ( retVal == DD_OK); + /* Test by hacking interal structures */ - /* hacking testing */ - - /* shall return DDERR_UNSUPPORTED */ + // should return DDERR_UNSUPPORTED This->lpLcl->lpGbl->dwMonitorFrequency = 0; TEST (DirectDraw->GetMonitorFrequency(&temp) == DDERR_UNSUPPORTED); - /* shall return DD_OK */ + // should return DD_OK This->lpLcl->lpGbl->dwMonitorFrequency = 85; TEST (DirectDraw->GetMonitorFrequency(&temp) == DD_OK); - /* restore */ + /* Restore */ This->lpLcl->lpGbl->dwMonitorFrequency = lpFreq; DirectDraw->Release(); return TRUE; -} +} Modified: trunk/rostests/dxtest/ddraw/testlist.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/ddraw/testlist.cpp… ============================================================================== --- trunk/rostests/dxtest/ddraw/testlist.cpp (original) +++ trunk/rostests/dxtest/ddraw/testlist.cpp Sun Jun 10 18:43:48 2007 @@ -7,6 +7,7 @@ /* include the tests */ #include "DDraw/create.cpp" #include "DDraw/display_modes.cpp" +#include "DDraw/available_mem.cpp" #include "Surface/create.cpp" #include "Surface/private_data.cpp" #include "Surface/misc.cpp" @@ -16,7 +17,6 @@ { { "IDirectDraw: COM Stuff", Test_CreateDDraw }, { "IDirectDraw: GetDeviceIdentifier", Test_GetDeviceIdentifier }, - { "IDirectDraw: Display Frequency", Test_GetMonitorFrequency }, { "IDirectDraw: Display Modes", Test_DisplayModes }, { "IDirectDraw: Available Video Memory", Test_GetAvailableVidMem }, { "IDirectDraw: GetFourCC", Test_GetFourCCCodes },

1 0

[mbosma] 27117: Add tests for IDirectDrawSurface methods: - GetCaps - GetDC / ReleaseDC - ChangeUniquenessValue / GetUniquenessValue - GetPixelFormat - GetSurfaceDesc - GetDDInterface
by mbosma＠svn.reactos.org 10 Jun '07

10 Jun '07

Author: mbosma Date: Sun Jun 10 18:32:19 2007 New Revision: 27117 URL: http://svn.reactos.org/svn/reactos?rev=27117&view=rev Log: Add tests for IDirectDrawSurface methods: - GetCaps - GetDC / ReleaseDC - ChangeUniquenessValue / GetUniquenessValue - GetPixelFormat - GetSurfaceDesc - GetDDInterface Added: trunk/rostests/dxtest/ddraw/Surface/misc.cpp (with props) Modified: trunk/rostests/dxtest/ddraw/helper.cpp trunk/rostests/dxtest/ddraw/testlist.cpp Added: trunk/rostests/dxtest/ddraw/Surface/misc.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/ddraw/Surface/misc… ============================================================================== --- trunk/rostests/dxtest/ddraw/Surface/misc.cpp (added) +++ trunk/rostests/dxtest/ddraw/Surface/misc.cpp Sun Jun 10 18:32:19 2007 @@ -1,0 +1,64 @@ +BOOL CreateSurface(LPDIRECTDRAWSURFACE7* pSurface); + +BOOL Test_Misc (INT* passed, INT* failed) +{ + LPDIRECTDRAWSURFACE7 Surface; + if(!CreateSurface(&Surface)) + return FALSE; + + TEST (Surface->Initialize(NULL, NULL) == DDERR_ALREADYINITIALIZED); + + // GetCaps + DDSCAPS2 Caps; + TEST (Surface->GetCaps((DDSCAPS2*)0xdeadbeef) == DDERR_INVALIDPARAMS); + TEST (Surface->GetCaps(&Caps) == DD_OK && Caps.dwCaps == 0x10004040 + && Caps.dwCaps2 == Caps.dwCaps3 == Caps.dwCaps4 == 0); // FIXME: Replace 0x10004040 + + // GetDC / ReleaseDC + HDC hdc; + TEST (Surface->GetDC((HDC*)0xdeadbeef) == DDERR_INVALIDPARAMS); + TEST (Surface->ReleaseDC((HDC)0xdeadbeef) == DDERR_NODC); + TEST (Surface->ReleaseDC(GetDC(NULL)) == DDERR_NODC); + + TEST (Surface->GetDC(&hdc) == DD_OK); + TEST (MoveToEx(hdc, 0, 0, NULL) == TRUE); // validate hdc + TEST (Surface->Blt(NULL, NULL, NULL, 0, NULL) == DDERR_SURFACEBUSY); // check lock + TEST (Surface->ReleaseDC(hdc) == DD_OK); + + // ChangeUniquenessValue / GetUniquenessValue + DWORD Value; + // FIXME: find out other apis which increases the uniqueness value + TEST (Surface->GetUniquenessValue(&Value) == DD_OK && Value == 2); + TEST (Surface->Blt(NULL, NULL, NULL, 0, NULL) == DDERR_INVALIDPARAMS); // Even this increases the uniqueness value + TEST (Surface->GetUniquenessValue(&Value) == DD_OK && Value == 3); + TEST (Surface->ChangeUniquenessValue() == DD_OK); + TEST (Surface->GetUniquenessValue(&Value) == DD_OK && Value == 4); + + // GetPixelFormat + DDPIXELFORMAT PixelFormat = {0}; + // FIXME: Produce DDERR_INVALIDSURFACETYPE + TEST (Surface->GetPixelFormat((LPDDPIXELFORMAT)0xdeadbeef) == DDERR_INVALIDPARAMS); + TEST (Surface->GetPixelFormat(&PixelFormat)); + PixelFormat.dwSize = sizeof(DDPIXELFORMAT); + TEST (Surface->GetPixelFormat(&PixelFormat) == DD_OK && PixelFormat.dwFlags == 0x40); // FIXME: Find out what 0x40 is + + // GetSurfaceDesc / SetSurfaceDesc + DDSURFACEDESC2 Desc = {0}; + // FIXME: Produce DDERR_INVALIDSURFACETYPE + TEST (Surface->GetSurfaceDesc((LPDDSURFACEDESC2)0xdeadbeef) == DDERR_INVALIDPARAMS); + TEST (Surface->GetSurfaceDesc(&Desc)); + Desc.dwSize = sizeof(DDSURFACEDESC2); + TEST (Surface->GetSurfaceDesc(&Desc) == DD_OK && Desc.dwFlags == 0x100f); // FIXME: Find out what 0x100f is + TEST (memcmp ((PVOID)&Desc.ddpfPixelFormat, (PVOID)&PixelFormat, sizeof(DDPIXELFORMAT)) == 0); + // FIXME: Test SetSurfaceDesc + + // GetDDInterface + IUnknown* iface; + TEST(Surface->GetDDInterface((LPVOID*)0xdeadbeef) == DDERR_INVALIDPARAMS); + TEST(Surface->GetDDInterface((LPVOID*)&iface) == DD_OK && iface); + TEST(iface->Release() == 1); // FIXME: Test the interface further + + Surface->Release(); + + return TRUE; +} Propchange: trunk/rostests/dxtest/ddraw/Surface/misc.cpp ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/rostests/dxtest/ddraw/Surface/misc.cpp ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision Modified: trunk/rostests/dxtest/ddraw/helper.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/ddraw/helper.cpp?r… ============================================================================== --- trunk/rostests/dxtest/ddraw/helper.cpp (original) +++ trunk/rostests/dxtest/ddraw/helper.cpp Sun Jun 10 18:32:19 2007 @@ -24,7 +24,6 @@ return CreateWindow("DDrawTest", "ReactOS DirectDraw Test", WS_POPUP, 0, 0, 10, 10, NULL, NULL, GetModuleHandle(NULL), NULL); } - BOOL CreateSurface(LPDIRECTDRAWSURFACE7* pSurface) { Modified: trunk/rostests/dxtest/ddraw/testlist.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/ddraw/testlist.cpp… ============================================================================== --- trunk/rostests/dxtest/ddraw/testlist.cpp (original) +++ trunk/rostests/dxtest/ddraw/testlist.cpp Sun Jun 10 18:32:19 2007 @@ -9,6 +9,7 @@ #include "DDraw/display_modes.cpp" #include "Surface/create.cpp" #include "Surface/private_data.cpp" +#include "Surface/misc.cpp" /* The List of tests */ TEST TestList[] = @@ -20,8 +21,9 @@ { "IDirectDraw: Available Video Memory", Test_GetAvailableVidMem }, { "IDirectDraw: GetFourCC", Test_GetFourCCCodes }, { "IDirectDraw: Cooperative Levels", Test_SetCooperativeLevel }, - { "IDirectDraw: CreateSurface", Test_CreateSurface }, + { "IDirectDrawSurface: Creation", Test_CreateSurface }, { "IDirectDrawSurface: Private Data", Test_PrivateData }, + { "IDirectDrawSurface: Miscellaneous Tests", Test_Misc }, }; /* The function that gives us the number of tests */

1 0

[dreimer] 27116: First commit in the Direction of a Config.rbuild editor. Right now only a bunch of commands, without any real sense, but getting them made my head almost explode, so I want to have them secure.
by dreimer＠svn.reactos.org 10 Jun '07

10 Jun '07

Author: dreimer Date: Sun Jun 10 18:08:15 2007 New Revision: 27116 URL: http://svn.reactos.org/svn/reactos?rev=27116&view=rev Log: First commit in the Direction of a Config.rbuild editor. Right now only a bunch of commands, without any real sense, but getting them made my head almost explode, so I want to have them secure. Added: trunk/tools/RosBE-Windows/Root/Config.cmd trunk/tools/RosBE-Windows/Root/config.rbuild Modified: trunk/tools/RosBE-Windows/Root/Help.cmd trunk/tools/RosBE-Windows/Root/README.txt trunk/tools/RosBE-Windows/Root/RosBE.mac Added: trunk/tools/RosBE-Windows/Root/Config.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Config.cm… ============================================================================== --- trunk/tools/RosBE-Windows/Root/Config.cmd (added) +++ trunk/tools/RosBE-Windows/Root/Config.cmd Sun Jun 10 18:08:15 2007 @@ -1,0 +1,20 @@ +sed "s/\"SARCH\" value=\"\"/\"SARCH\" value=\%1"\"/g;s/\"SARCH\" value=\"xbox\"/\"SARCH\" value=\"%1\"/g" config.rbuild > config2.rbuild +sed "s/\"OPTIMIZE\" value=\"[0-5]\"/\"OPTIMIZE\" value=\"%1\"/g" config.rbuild > config2.rbuild +sed "s/\"MP\" value=\"[0-1]\"/\"MP\" value=\"%1\"/g" config.rbuild > config2.rbuild +sed "s/\"KDBG\" value=\"[0-1]\"/\"KDBG\" value=\"%1\"/g" config.rbuild > config2.rbuild +sed "s/\"DBG\" value=\"[0-1]\"/\"DBG\" value=\"%1\"/g" config.rbuild > config2.rbuild +sed "s/\"GDB\" value=\"[0-1]\"/\"GDB\" value=\"%1\"/g" config.rbuild > config2.rbuild +sed "s/\"NSWPAT\" value=\"[0-1]\"/\"NSWPAT\" value=\"%1\"/g" config.rbuild > config2.rbuild +sed "s/\"NTLPC\" value=\"[0-1]\"/\"NTLPC\" value=\"%1\"/g" config.rbuild > config2.rbuild +sed "s/\"_WINKD_\" value=\"[0-1]\"/\"_WINKD_\" value=\"%1\"/g" config.rbuild > config2.rbuild + +grep SARCH config.rbuild|cut -d "\"" -f 4 +grep OARCH config.rbuild|cut -d "\"" -f 4 +grep OPTIMIZE config.rbuild|cut -d "\"" -f 4 +grep MP config.rbuild|cut -d "\"" -f 4 +grep KDBG config.rbuild|cut -d "\"" -f 4 +grep DBG config.rbuild|cut -d "\"" -f 4 +grep GDB config.rbuild|cut -d "\"" -f 4 +grep NSWPAT config.rbuild|cut -d "\"" -f 4 +grep NTLPC config.rbuild|cut -d "\"" -f 4 +grep _WINKD_ config.rbuild|cut -d "\"" -f 4 Modified: trunk/tools/RosBE-Windows/Root/Help.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Help.cmd?… ============================================================================== --- trunk/tools/RosBE-Windows/Root/Help.cmd (original) +++ trunk/tools/RosBE-Windows/Root/Help.cmd Sun Jun 10 18:08:15 2007 @@ -21,6 +21,8 @@ echo specific command. echo svn [OPTIONS] - Create, Update or clean up your ReactOS Source echo tree. + echo config - Configures the way, ReactOS will be built. + echo echo basedir - Switch back to the ReactOS source directory. goto :EOF ) Modified: trunk/tools/RosBE-Windows/Root/README.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/README.tx… ============================================================================== --- trunk/tools/RosBE-Windows/Root/README.txt (original) +++ trunk/tools/RosBE-Windows/Root/README.txt Sun Jun 10 18:08:15 2007 @@ -42,7 +42,7 @@ NSIS (Nullsoft Scriptable Install System) http://nsis.sourceforge.net/ -The GnuWin32 Project (tee/test and their dependencies were obtained here) +The GnuWin32 Project (tee/test/sed/cut/grep and their dependencies were obtained here) http://gnuwin32.sourceforge.net/ Inspired by blight's ReactOS Build Environment v0.2-3.4.4 Modified: trunk/tools/RosBE-Windows/Root/RosBE.mac URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/RosBE.mac… ============================================================================== --- trunk/tools/RosBE-Windows/Root/RosBE.mac (original) +++ trunk/tools/RosBE-Windows/Root/RosBE.mac Sun Jun 10 18:08:15 2007 @@ -1,6 +1,7 @@ BASEDIR = cd /d "%_ROSSOURCEDIR%" CLEAN = "%ROSBEBASEDIR%\Clean.cmd" $* SVN = "%ROSBEBASEDIR%\SVN.cmd" $* +CONFIG = "%ROSBEBASEDIR%\Config.cmd" $* HELP = "%ROSBEBASEDIR%\Help.cmd" $* MAKE = "%ROSBEBASEDIR%\Build.cmd" $* MAKEX = "%ROSBEBASEDIR%\Build-Multi.cmd" $* Added: trunk/tools/RosBE-Windows/Root/config.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/config.rb… ============================================================================== --- trunk/tools/RosBE-Windows/Root/config.rbuild (added) +++ trunk/tools/RosBE-Windows/Root/config.rbuild Sun Jun 10 18:08:15 2007 @@ -1,0 +1,16 @@ +<?xml version="1.0"?> +<rbuild xmlns:xi="http://www.w3.org/2001/XInclude"> + +<property name="ARCH" value="i386" /> +<property name="SARCH" value="" /> +<property name="OARCH" value="pentium" /> +<property name="OPTIMIZE" value="1" /> +<property name="MP" value="0" /> +<property name="KDBG" value="0" /> +<property name="DBG" value="1" /> +<property name="GDB" value="0" /> +<property name="NSWPAT" value="0" /> +<property name="NTLPC" value="1" /> +<property name="_WINKD_" value="0" /> + +</rbuild>

1 0

[mbosma] 27115: added wrong file
by mbosma＠svn.reactos.org 10 Jun '07

10 Jun '07

Author: mbosma Date: Sun Jun 10 16:03:01 2007 New Revision: 27115 URL: http://svn.reactos.org/svn/reactos?rev=27115&view=rev Log: added wrong file Added: trunk/rostests/dxtest/ddraw/Surface/private_data.cpp (with props) Removed: trunk/rostests/dxtest/ddraw/Surface/overlay.cpp Removed: trunk/rostests/dxtest/ddraw/Surface/overlay.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/ddraw/Surface/over… ============================================================================== --- trunk/rostests/dxtest/ddraw/Surface/overlay.cpp (original) +++ trunk/rostests/dxtest/ddraw/Surface/overlay.cpp (removed) @@ -1,7 +1,0 @@ -//AddOverlayDirtyRect -//EnumOverlayZOrders -//GetOverlayPosition -//SetOverlayPosition -//UpdateOverlay -//UpdateOverlayDisplay -//UpdateOverlayZOrder Added: trunk/rostests/dxtest/ddraw/Surface/private_data.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/ddraw/Surface/priv… ============================================================================== --- trunk/rostests/dxtest/ddraw/Surface/private_data.cpp (added) +++ trunk/rostests/dxtest/ddraw/Surface/private_data.cpp Sun Jun 10 16:03:01 2007 @@ -1,0 +1,49 @@ +BOOL CreateSurface(LPDIRECTDRAWSURFACE7* pSurface); + +BOOL Test_PrivateData (INT* passed, INT* failed) +{ + LPDIRECTDRAWSURFACE7 Surface; + DWORD size, dummy = 0xBAADF00D; + GUID guid = { 0 }; + GUID guid2 = { 0x1 }; + + if(!CreateSurface(&Surface)) + return FALSE; + + // General test + TEST(Surface->SetPrivateData(guid, NULL, 0, 0) == DDERR_INVALIDPARAMS); + TEST(Surface->SetPrivateData(guid, (LPVOID)&dummy, 0, 0) == DDERR_INVALIDPARAMS); + TEST(Surface->SetPrivateData(guid, (LPVOID)0xdeadbeef, sizeof(DWORD), 0) == DDERR_INVALIDPARAMS); + TEST(Surface->SetPrivateData(guid, (LPVOID)&dummy, sizeof(DWORD), 0) == DD_OK); + + TEST(Surface->GetPrivateData(guid, NULL, 0) == DDERR_INVALIDPARAMS); + TEST(Surface->GetPrivateData(guid, &dummy, 0) == DDERR_INVALIDPARAMS); + size = 0; + TEST(Surface->GetPrivateData(guid, &dummy, &size) == DDERR_MOREDATA && size == sizeof(DWORD)); + size = 2; + TEST(Surface->GetPrivateData(guid, NULL, &size) == DDERR_MOREDATA && size == sizeof(DWORD)); + TEST(Surface->GetPrivateData(guid, NULL, &size) == DDERR_INVALIDPARAMS); + TEST(Surface->GetPrivateData(guid, &dummy, &size) == DD_OK && dummy == 0xBAADF00D); + TEST(Surface->GetPrivateData(guid2, NULL, 0) == DDERR_NOTFOUND); + + TEST(Surface->FreePrivateData(guid) == DD_OK); + TEST(Surface->FreePrivateData(guid) == DDERR_NOTFOUND); + + // Test for DDSPD_VOLATILE flag + TEST(Surface->SetPrivateData(guid, (LPVOID)&dummy, sizeof(DWORD), DDSPD_VOLATILE) == DD_OK); + size = 0; + TEST(Surface->GetPrivateData(guid, NULL, &size) == DDERR_MOREDATA && size == sizeof(DWORD)); + TEST(Surface->GetPrivateData(guid, &dummy, &size) == DD_OK && dummy == 0xBAADF00D); + + DDBLTFX bltfx; + bltfx.dwSize = sizeof(DDBLTFX); + bltfx.dwFillColor = RGB(0, 0, 0); + if(Surface->Blt(NULL, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &bltfx) != DD_OK) + printf("ERROR: Failed to draw to surface !"); + TEST(Surface->GetPrivateData(guid, &dummy, &size) == DDERR_EXPIRED); + + // TODO: Test for DDSPD_IUNKNOWNPOINTER (see http://msdn.microsoft.com/archive/default.asp?url=/archive/en-us/ddraw7/dir…) + + Surface->Release(); + return TRUE; +} Propchange: trunk/rostests/dxtest/ddraw/Surface/private_data.cpp ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/rostests/dxtest/ddraw/Surface/private_data.cpp ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision

1 0

[arty] 27114: - Fix hash function - Set 2nd hash bit for secondary reloads - Use dar for data reloads - Some debug for when it's needed
by arty＠svn.reactos.org 10 Jun '07

10 Jun '07

Author: arty Date: Sun Jun 10 15:57:39 2007 New Revision: 27114 URL: http://svn.reactos.org/svn/reactos?rev=27114&view=rev Log: - Fix hash function - Set 2nd hash bit for secondary reloads - Use dar for data reloads - Some debug for when it's needed Modified: branches/powerpc/reactos/include/reactos/ppcmmu/mmu.h branches/powerpc/reactos/lib/mmu/mmuobject.c branches/powerpc/reactos/lib/mmu/mmuutil.c Modified: branches/powerpc/reactos/include/reactos/ppcmmu/mmu.h URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/include/reactos… ============================================================================== --- branches/powerpc/reactos/include/reactos/ppcmmu/mmu.h (original) +++ branches/powerpc/reactos/include/reactos/ppcmmu/mmu.h Sun Jun 10 15:57:39 2007 @@ -81,7 +81,7 @@ typedef struct _ppc_trap_frame_t { unsigned long gpr[32]; - unsigned long lr, ctr, srr0, srr1, dsisr; + unsigned long lr, cr, ctr, srr0, srr1, dsisr, dar; } ppc_trap_frame_t; typedef int (*MmuPageCallback)(int inst, ppc_trap_frame_t *trap); Modified: branches/powerpc/reactos/lib/mmu/mmuobject.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/lib/mmu/mmuobje… ============================================================================== --- branches/powerpc/reactos/lib/mmu/mmuobject.c (original) +++ branches/powerpc/reactos/lib/mmu/mmuobject.c Sun Jun 10 15:57:39 2007 @@ -1,3 +1,4 @@ +#include <stdarg.h> #include "mmu.h" #include "mmuutil.h" #include "mmuobject.h" @@ -63,6 +64,7 @@ MmuVsidTree *NextTreePage = 0; MmuFreeTree *FreeTree; MmuVsidInfo *Segs[16], *VsidHead = 0; +extern void fmtout(const char *fmt, ...); __asm__(".text\n\t" ".globl mmumain\n\t" @@ -122,7 +124,9 @@ "lwz 0,128(1)\n\t" "mtlr 0\n\t" "lwz 0,132(1)\n\t" - "mfctr 0\n\t" + "mtcr 0\n\t" + "lwz 0,136(1)\n\t" + "mtctr 0\n\t" "lwz 0,4(1)\n\t" "mfsprg1 1\n\t" "lwz 0,0(1)\n\t" @@ -175,14 +179,18 @@ "stw 31,124(1)\n\t" "mflr 0\n\t" "stw 0,128(1)\n\t" + "mfcr 0\n\t" + "stw 0,132(1)\n\t" "mfctr 0\n\t" - "stw 0,132(1)\n\t" + "stw 0,136(1)\n\t" "mfsrr0 0\n\t" - "stw 0,136(1)\n\t" + "stw 0,140(1)\n\t" "mfsrr1 0\n\t" - "stw 0,140(1)\n\t" + "stw 0,144(1)\n\t" "mfdsisr 0\n\t" - "stw 0,144(1)\n\t" + "stw 0,148(1)\n\t" + "mfdar 0\n\t" + "stw 0,152(1)\n\t" "li 3,100\n\t" "mr 4,1\n\t" "lis 5,data_miss_finish_start@ha\n\t" @@ -253,14 +261,14 @@ freevsid((int)arg1); break; case 100: - if(!ptegreload(trap_frame)) + if(!ptegreload(trap_frame, trap_frame->dar)) { __asm__("mfmsr 3\n\tori 3,3,0x30\n\tmtmsr 3\n\t"); callback(0,arg1); } break; case 101: - if(!ptegreload(trap_frame)) + if(!ptegreload(trap_frame, trap_frame->srr0)) { __asm__("mfmsr 3\n\tori 3,3,0x30\n\tmtmsr 3\n\t"); callback(1,arg1); @@ -273,13 +281,70 @@ return ret; } +void outchar(char c) +{ + SetPhysByte(0x800003f8, c); +} + +void outstr(const char *str) +{ + while(*str) outchar(*str); +} + +void outdig(int dig) +{ + if(dig < 10) outchar(dig + '0'); + else outchar(dig - 10 + 'A'); +} + +void outnum(unsigned long num) +{ + int i; + for( i = 0; i < 8; i++ ) + { + outdig(num >> 28); + num <<= 4; + } +} + +void fmtout(const char *str, ...) +{ + va_list ap; + va_start(ap, str); + while(*str) + { + if(*str == '%') + { + if(str[1] == '%') + { + outchar('%'); + } + else if(str[1] == 's') + { + outstr(va_arg(ap, const char *)); + } + else + { + outnum(va_arg(ap, int)); + } + str++; + } + else + { + outchar(*str); + } + str++; + } + va_end(ap); +} + void mmusetramsize(paddr_t ramsize) { ppc_map_t *last_map = &PpcPageTable[PPC_PAGE_NUMBER(ramsize)]; if(!RamSize) { RamSize = ramsize; - FirstUsablePage = ROUND_UP((paddr_t)last_map, PPC_PAGE_ADDR(1)); + FirstUsablePage = (paddr_t)last_map; NextPage = PPC_PAGE_NUMBER(FirstUsablePage); } } @@ -299,7 +364,7 @@ SetPhys((paddr_t)target, *start); } - (&data_miss_start)[46]++; + (&data_miss_start)[50]++; for(target = (int *)0x400, start = &data_miss_start; start < &data_miss_end; start++, target++) { @@ -339,7 +404,7 @@ else if(TreeAlloc >= 3 || !NextTreePage) { ppc_map_t *map = allocpage(); - NextTreePage = (MmuVsidTree*)PPC_PAGE_ADDR(map - PpcPageTable); + NextTreePage = (MmuVsidTree*)PPC_PAGE_ADDR((map - PpcPageTable)); TreeAlloc = 1; return NextTreePage; } @@ -362,7 +427,7 @@ MmuVsidInfo *info; if(!map) return 0; map->pte.pteh = map->pte.ptel = 0; - info = (MmuVsidInfo*)PPC_PAGE_ADDR(map - PpcPageTable); + info = (MmuVsidInfo*)PPC_PAGE_ADDR((map - PpcPageTable)); info->vsid = vsid; info->next = VsidHead; VsidHead = info; @@ -423,13 +488,13 @@ } } - phys = PPC_PAGE_ADDR(PagePtr - PpcPageTable); + phys = PPC_PAGE_ADDR((PagePtr - PpcPageTable)); ptelo = phys & ~PPC_PAGE_MASK; - + /* Update page data */ PagePtr->pte.pteh = ptehi; PagePtr->pte.ptel = ptelo; - PagePtr->proc = info->proc; + PagePtr->proc = info[i].proc; PagePtr->addr = virt; vsid_table_hi = virt >> 20 & 255; @@ -531,13 +596,20 @@ } } -int ptegreload(ppc_trap_frame_t *frame) -{ - int addr = frame->srr0, ptegnum = PtegNumber(addr, (Clock >> 3) & 1); +int ptegreload(ppc_trap_frame_t *frame, vaddr_t addr) +{ + int hfun = (Clock >> 3) & 1, ptegnum = PtegNumber(addr, hfun); int vsid = GetSR((addr >> 28) & 15) & PPC_VSID_MASK; ppc_map_t *map = mmuvirtmap(addr, vsid); if(!map) return 0; + map->pte.pteh |= hfun << 6; PpcHashedPTE[ptegnum].block[Clock & 7] = map->pte; +#if 0 + fmtout("Reloading addr %x (phys %x) at %x[%x] (%x:%x)\r\n", + addr, PPC_PAGE_ADDR(map - PpcPageTable), ptegnum, Clock & 15, + PpcHashedPTE[ptegnum].block[Clock&7].pteh, + PpcHashedPTE[ptegnum].block[Clock&7].ptel); +#endif Clock++; __asm__("tlbie %0\n\tsync\n\tisync" : : "r" (addr)); return 1; Modified: branches/powerpc/reactos/lib/mmu/mmuutil.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/lib/mmu/mmuutil… ============================================================================== --- branches/powerpc/reactos/lib/mmu/mmuutil.c (original) +++ branches/powerpc/reactos/lib/mmu/mmuutil.c Sun Jun 10 15:57:39 2007 @@ -407,5 +407,5 @@ { int sr = GetSR( (virt >> 28) & 0xf ); int vsid = sr & PPC_VSID_MASK; - return (((vsid & 0x7ffff) ^ ((virt >> 12) & 0xffff)) ^ (hfun ? -1 : 0)) & ((HTABSIZ - 1) >> 3); -} + return ((((vsid & 0x7ffff) ^ ((virt >> 12) & 0xffff)) ^ (hfun ? -1 : 0)) & ((HTABSIZ - 1) >> 3) & 0x3ff); +}

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