Ros-diffs

ros-diffs@reactos.org

81390 discussions

[peterw] 29897: - Make options.exe only write path variables if there is something to write. - Fix a bug in the way options.cmd was calling options.exe. - Move GCC environment setup to rosbe-gcc-env.cmd to support the next bullet. - Added the command 'chdefgcc' to allow easy switching of the current toolset. (automatically adjusts all include/lib/binary paths for the new location/GCC version)
by peterw＠svn.reactos.org 26 Oct '07

26 Oct '07

Author: peterw Date: Fri Oct 26 16:16:27 2007 New Revision: 29897 URL: http://svn.reactos.org/svn/reactos?rev=29897&view=rev Log: - Make options.exe only write path variables if there is something to write. - Fix a bug in the way options.cmd was calling options.exe. - Move GCC environment setup to rosbe-gcc-env.cmd to support the next bullet. - Added the command 'chdefgcc' to allow easy switching of the current toolset. (automatically adjusts all include/lib/binary paths for the new location/GCC version) Added: trunk/tools/RosBE-Windows/Root/chdefgcc.cmd (with props) trunk/tools/RosBE-Windows/Root/rosbe-gcc-env.cmd (with props) Modified: trunk/tools/RosBE-Windows/Root/Help.cmd trunk/tools/RosBE-Windows/Root/RosBE.cmd trunk/tools/RosBE-Windows/Root/RosBE.mac trunk/tools/RosBE-Windows/Root/chdefdir.cmd trunk/tools/RosBE-Windows/Root/options.cmd trunk/tools/RosBE-Windows/Root/scut.cmd trunk/tools/RosBE-Windows/Tools/config/options.c 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 Fri Oct 26 16:16:27 2007 @@ -28,6 +28,11 @@ echo current RosBE session. ) + if exist "%_ROSBE_BASEDIR%\chdefgcc.cmd" ( + echo chdefgcc [PATH] - Change the MinGW/GCC directory for the + echo current RosBE session. + ) + echo clean [logs] - Fully clean the ReactOS source directory and/or echo the RosBE build logs. @@ -95,6 +100,14 @@ echo Change the ReactOS source directory for the current RosBE session. echo. echo previous - Switch to the previous ReactOS source directory. + goto :EOC + ) +) +if exist "%_ROSBE_BASEDIR%\chdefgcc.cmd" ( + if /i "%1" == "chdefgcc" ( + echo Usage: chdefgcc [PATH] + echo Change the MinGW/GCC directory for the current RosBE session. + echo. goto :EOC ) ) Modified: trunk/tools/RosBE-Windows/Root/RosBE.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/RosBE.cmd… ============================================================================== --- trunk/tools/RosBE-Windows/Root/RosBE.cmd (original) +++ trunk/tools/RosBE-Windows/Root/RosBE.cmd Fri Oct 26 16:16:27 2007 @@ -19,7 +19,8 @@ set _ROSBE_BASEDIR=%~dp0 set _ROSBE_BASEDIR=%_ROSBE_BASEDIR:~0,-1% set _ROSBE_ROSSOURCEDIR=%CD% -set _ROSBE_PREVIOUSSOURCEDIR=%_ROSBE_ROSSOURCEDIR% +set PATH=%_ROSBE_BASEDIR%\Tools;%PATH% +set _ROSBE_ORIGINALPATH=%PATH% set _ROSBE_SHOWTIME=1 set _ROSBE_WRITELOG=1 set _ROSBE_USECCACHE=0 @@ -28,6 +29,7 @@ set _ROSBE_LOGDIR=%CD%\RosBE-Logs set _ROSBE_OBJPATH= set _ROSBE_OUTPATH= + :: :: Check if the user has used the options utility and :: if so, load their options. @@ -62,16 +64,10 @@ :: Load the Base Directory from the Shortcut-txt and set it as new :: Source Directory and add PATH for Tools Folder. :: -set PATH=%_ROSBE_BASEDIR%\Tools;%PATH% -if exist "%_ROSBE_BASEDIR%\scut.cmd" (call "%_ROSBE_BASEDIR%\scut.cmd" run) - -:: -:: Display the current version of GCC, NASM, ld and make. -:: -gcc -v 2>&1 | find "gcc version" -nasm -v -ld -v -mingw32-make -v | find "GNU Make" +if exist "%_ROSBE_BASEDIR%\scut.cmd" ( + echo. + call "%_ROSBE_BASEDIR%\scut.cmd" run +) :: :: Tell how to display the available commands. @@ -101,26 +97,18 @@ :: environment. :: :RosBE4 - :: - :: Set the correct path for the build tools and set the MinGW make. - :: - set _ROSBE_GCCVERSION=4.1.3 - set PATH=%_ROSBE_MINGWPATH%\bin;%_ROSBE_MINGWPATH%\libexec\gcc\mingw32\4.1.3;%PATH% - set _ROSBE_MINGWMAKE=%_ROSBE_MINGWPATH%\bin\mingw32-make.exe - if defined _ROSBE_OLDMODE ( - set C_INCLUDE_PATH=%_ROSBE_MINGWPATH%\include;%_ROSBE_MINGWPATH%\lib\gcc\mingw32\4.1.3\include - set CPLUS_INCLUDE_PATH=%_ROSBE_MINGWPATH%\include;%_ROSBE_MINGWPATH%\include\c++\4.1.3;%_ROSBE_MINGWPATH%\include\c++\4.1.3\mingw32;%_ROSBE_MINGWPATH%\lib\gcc\mingw32\4.1.3\include - ) - set HOST_CFLAGS=-I"%_ROSBE_MINGWPATH%\include" -I"%_ROSBE_MINGWPATH%\lib\gcc\mingw32\4.1.3\include" - set HOST_CPPFLAGS=-I"%_ROSBE_MINGWPATH%\include" -I"%_ROSBE_MINGWPATH%\include\c++\4.1.3" -I"%_ROSBE_MINGWPATH%\include\c++\4.1.3\mingw32" -I"%_ROSBE_MINGWPATH%\lib\gcc\mingw32\4.1.3\include" - set LIBRARY_PATH=%_ROSBE_MINGWPATH%\lib;%_ROSBE_MINGWPATH%\lib\gcc\mingw32\4.1.3 - echo ******************************************************************************* echo * * echo * ReactOS Build Environment %_ROSBE_VERSION% * echo * * echo ******************************************************************************* echo. + echo. + ver + :: + :: Set the correct path for the build tools and set the MinGW make. + :: + call "%_ROSBE_BASEDIR%\rosbe-gcc-env.cmd" goto :EOF :: 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 Fri Oct 26 16:16:27 2007 @@ -1,11 +1,14 @@ BASEDIR = cd /d "%_ROSBE_ROSSOURCEDIR%" CHDEFDIR = "%_ROSBE_BASEDIR%\chdefdir.cmd" $* +CHDEFGCC = "%_ROSBE_BASEDIR%\chdefgcc.cmd" $* CLEAN = "%_ROSBE_BASEDIR%\Clean.cmd" $* CONFIG = "%_ROSBE_BASEDIR%\Config.cmd" $* +ENV = set HELP = "%_ROSBE_BASEDIR%\Help.cmd" $* MAKE = "%_ROSBE_BASEDIR%\Build.cmd" $* MAKEX = "%_ROSBE_BASEDIR%\Build.cmd" multi $* RADDR2LINE = "%_ROSBE_BASEDIR%\reladdr2line.cmd" $* +RENV = for /f "usebackq" %i in (`set _ROSBE_`) do @echo %i SCUT = "%_ROSBE_BASEDIR%\scut.cmd" $* SSVN = "%_ROSBE_BASEDIR%\sSVN.cmd" $* OPTIONS = "%_ROSBE_BASEDIR%\options.cmd" $* Modified: trunk/tools/RosBE-Windows/Root/chdefdir.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/chdefdir.… ============================================================================== --- trunk/tools/RosBE-Windows/Root/chdefdir.cmd (original) +++ trunk/tools/RosBE-Windows/Root/chdefdir.cmd Fri Oct 26 16:16:27 2007 @@ -21,15 +21,15 @@ set _1=%1 ) if /i "%_1%" == "previous" ( - set _ROSBE_ROSSOURCEDIR=%_ROSBE_PREVIOUSSOURCEDIR% + popd ) else ( if not exist "%_1%\." ( echo ERROR: The path specified doesn't seem to exist. goto :EOC ) - set _ROSBE_PREVIOUSSOURCEDIR=%_ROSBE_ROSSOURCEDIR% - set _ROSBE_ROSSOURCEDIR=%_1% + pushd %_1% ) +set _ROSBE_ROSSOURCEDIR=%CD% goto :EOC :: @@ -37,8 +37,11 @@ :: :INTERACTIVE set /p _1="Please enter a ReactOS source directory, or 'previous': " +if "%_1%" == "" ( + echo ERROR: You must enter a ReactOS source directory, or 'previous'. + goto :EOC +) goto :EOF :EOC title ReactOS Build Environment %_ROSBE_VERSION% -cd /d "%_ROSBE_ROSSOURCEDIR%" Added: trunk/tools/RosBE-Windows/Root/chdefgcc.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/chdefgcc.… ============================================================================== --- trunk/tools/RosBE-Windows/Root/chdefgcc.cmd (added) +++ trunk/tools/RosBE-Windows/Root/chdefgcc.cmd Fri Oct 26 16:16:27 2007 @@ -1,0 +1,46 @@ +:: +:: PROJECT: RosBE - ReactOS Build Environment for Windows +:: LICENSE: GPL - See LICENSE.txt in the top level directory +:: FILE: Root/chdefgcc.cmd +:: PURPOSE: Tool to change the current gcc in RosBE. +:: COPYRIGHT: Copyright 2007 Daniel Reimer <reimer.daniel(a)freenet.de> +:: Peter Ward <dralnix(a)gmail.com> +:: +@echo off + +title Change the current MinGW/GCC directory... + +if not defined _ROSBE_PREVIOUSMINGWPATH ( + set _ROSBE_PREVIOUSMINGWPATH=%_ROSBE_MINGWPATH% +) + +:: +:: Parse the command line arguments. +:: +if "%1" == "" ( + call :INTERACTIVE +) else ( + set _1=%1 +) + +if not exist "%_1%\." ( + echo ERROR: The path specified doesn't seem to exist. + goto :EOC +) +set _ROSBE_PREVIOUSMINGWPATH=%_ROSBE_MINGWPATH% +set _ROSBE_MINGWPATH=%_1% +echo Location: %_ROSBE_MINGWPATH% +call "%_ROSBE_BASEDIR%\rosbe-gcc-env.cmd" + +goto :EOC + +:INTERACTIVE +set /p XY="Please enter a MinGW/GCC directory: " +if "%_1%" == "" ( + echo ERROR: You must enter a MinGW/GCC directory. + goto :EOC +) +goto :EOF + +:EOC +title ReactOS Build Environment %_ROSBE_VERSION% Propchange: trunk/tools/RosBE-Windows/Root/chdefgcc.cmd ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/tools/RosBE-Windows/Root/options.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/options.c… ============================================================================== --- trunk/tools/RosBE-Windows/Root/options.cmd (original) +++ trunk/tools/RosBE-Windows/Root/options.cmd Fri Oct 26 16:16:27 2007 @@ -14,8 +14,12 @@ :: Run options.exe :: if exist "%_ROSBE_BASEDIR%\options.exe" ( - call "%_ROSBE_BASEDIR%\options.exe" - "%_ROSBE_BASEDIR%\RosBE.cmd" + pushd %_ROSBE_BASEDIR% + call options.exe + popd + if exist "%_ROSBE_BASEDIR%\rosbe-options.cmd" ( + call "%_ROSBE_BASEDIR%\rosbe-options.cmd" + ) ) else ( echo ERROR: options.exe was not found. title ReactOS Build Environment %_ROSBE_VERSION% Added: trunk/tools/RosBE-Windows/Root/rosbe-gcc-env.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/rosbe-gcc… ============================================================================== --- trunk/tools/RosBE-Windows/Root/rosbe-gcc-env.cmd (added) +++ trunk/tools/RosBE-Windows/Root/rosbe-gcc-env.cmd Fri Oct 26 16:16:27 2007 @@ -1,0 +1,34 @@ +:: +:: PROJECT: RosBE - ReactOS Build Environment for Windows +:: LICENSE: GPL - See LICENSE.txt in the top level directory. +:: FILE: Root/rosbe-gcc-env.cmd +:: PURPOSE: Set up the GCC 4.x.x build environment. +:: COPYRIGHT: Copyright 2007 Daniel Reimer <reimer.daniel(a)freenet.de> +:: Peter Ward <dralnix(a)gmail.com> +:: +:: +@echo off + +:: +:: Set up the GCC 4.x.x build environment. +:: +set PATH=%_ROSBE_MINGWPATH%\bin;%_ROSBE_ORIGINALPATH% +set _ROSBE_GCCVERSION= +for /f "usebackq tokens=3" %%i in (`"gcc -v 2>&1 | find "gcc version""`) do set _ROSBE_GCCVERSION=%%i +set PATH=%_ROSBE_MINGWPATH%\bin;%_ROSBE_MINGWPATH%\libexec\gcc\mingw32\%_ROSBE_GCCVERSION%;%_ROSBE_ORIGINALPATH% +set _ROSBE_MINGWMAKE=%_ROSBE_MINGWPATH%\bin\mingw32-make.exe +if defined _ROSBE_OLDMODE ( + set C_INCLUDE_PATH=%_ROSBE_MINGWPATH%\include;%_ROSBE_MINGWPATH%\lib\gcc\mingw32\%_ROSBE_GCCVERSION%\include + set CPLUS_INCLUDE_PATH=%_ROSBE_MINGWPATH%\include;%_ROSBE_MINGWPATH%\include\c++\%_ROSBE_GCCVERSION%;%_ROSBE_MINGWPATH%\include\c++\%_ROSBE_GCCVERSION%\mingw32;%_ROSBE_MINGWPATH%\lib\gcc\mingw32\%_ROSBE_GCCVERSION%\include +) +set HOST_CFLAGS=-I"%_ROSBE_MINGWPATH%\include" -I"%_ROSBE_MINGWPATH%\lib\gcc\mingw32\%_ROSBE_GCCVERSION%\include" +set HOST_CPPFLAGS=-I"%_ROSBE_MINGWPATH%\include" -I"%_ROSBE_MINGWPATH%\include\c++\%_ROSBE_GCCVERSION%" -I"%_ROSBE_MINGWPATH%\include\c++\%_ROSBE_GCCVERSION%\mingw32" -I"%_ROSBE_MINGWPATH%\lib\gcc\mingw32\%_ROSBE_GCCVERSION%\include" +set LIBRARY_PATH=%_ROSBE_MINGWPATH%\lib;%_ROSBE_MINGWPATH%\lib\gcc\mingw32\%_ROSBE_GCCVERSION% + +:: +:: Display the current version of GCC, NASM, ld and make. +:: +gcc -v 2>&1 | find "gcc version" +nasm -v +ld -v +mingw32-make -v | find "GNU Make" Propchange: trunk/tools/RosBE-Windows/Root/rosbe-gcc-env.cmd ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/tools/RosBE-Windows/Root/scut.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/scut.cmd?… ============================================================================== --- trunk/tools/RosBE-Windows/Root/scut.cmd (original) +++ trunk/tools/RosBE-Windows/Root/scut.cmd Fri Oct 26 16:16:27 2007 @@ -43,7 +43,6 @@ for /f "usebackq tokens=1-2 delims=," %%i in (`type "%_ROSBE_BASEDIR%\srclist.txt"`) do ( if %%i == Base ( echo Active Shortcut: %%j - echo. :: : Set new source directory, if needed. :: Modified: trunk/tools/RosBE-Windows/Tools/config/options.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/o… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/config/options.c (original) +++ trunk/tools/RosBE-Windows/Tools/config/options.c Fri Oct 26 16:16:27 2007 @@ -108,10 +108,10 @@ fprintf(pFile, "set _ROSBE_USECCACHE=%d\n", useccache); fprintf(pFile, "set _ROSBE_STRIP=%d\n", strip); fprintf(pFile, "set _ROSBE_WRITELOG=%d\n", writelog); - fprintf(pFile, "set _ROSBE_LOGDIR=%S\n", logdir); - fprintf(pFile, "set _ROSBE_MINGWPATH=%S\n", mingwpath); - fprintf(pFile, "set _ROSBE_OBJPATH=%S\n", objdir); - fprintf(pFile, "set _ROSBE_OUTPATH=%S\n", outdir); + if (wcslen(logdir) > 0) fprintf(pFile, "set _ROSBE_LOGDIR=%S\n", logdir); + if (wcslen(mingwpath) > 0) fprintf(pFile, "set _ROSBE_MINGWPATH=%S\n", mingwpath); + if (wcslen(objdir) > 0) fprintf(pFile, "set _ROSBE_OBJPATH=%S\n", objdir); + if (wcslen(outdir) > 0) fprintf(pFile, "set _ROSBE_OUTPATH=%S\n", outdir); fclose(pFile); return TRUE; }

1 0

[fireball] 29896: - Both calls to LpcpMoveMessage must be guarded with SEH. See issue #2243 for more details.
by fireball＠svn.reactos.org 26 Oct '07

26 Oct '07

Author: fireball Date: Fri Oct 26 13:02:24 2007 New Revision: 29896 URL: http://svn.reactos.org/svn/reactos?rev=29896&view=rev Log: - Both calls to LpcpMoveMessage must be guarded with SEH. See issue #2243 for more details. Modified: trunk/reactos/ntoskrnl/lpc/close.c (props changed) trunk/reactos/ntoskrnl/lpc/complete.c (props changed) trunk/reactos/ntoskrnl/lpc/connect.c (props changed) trunk/reactos/ntoskrnl/lpc/create.c (props changed) trunk/reactos/ntoskrnl/lpc/listen.c (props changed) trunk/reactos/ntoskrnl/lpc/port.c (props changed) trunk/reactos/ntoskrnl/lpc/reply.c (props changed) trunk/reactos/ntoskrnl/lpc/send.c (contents, props changed) Propchange: trunk/reactos/ntoskrnl/lpc/close.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/ntoskrnl/lpc/complete.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/ntoskrnl/lpc/connect.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/ntoskrnl/lpc/create.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/ntoskrnl/lpc/listen.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/ntoskrnl/lpc/port.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/ntoskrnl/lpc/reply.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Modified: trunk/reactos/ntoskrnl/lpc/send.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/lpc/send.c?rev=29… ============================================================================== --- trunk/reactos/ntoskrnl/lpc/send.c (original) +++ trunk/reactos/ntoskrnl/lpc/send.c Fri Oct 26 13:02:24 2007 @@ -434,11 +434,19 @@ (&Message->Request) + 1); /* Move the message */ - LpcpMoveMessage(LpcReply, - &Message->Request, - (&Message->Request) + 1, - 0, - NULL); + _SEH_TRY + { + LpcpMoveMessage(LpcReply, + &Message->Request, + (&Message->Request) + 1, + 0, + NULL); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; /* Check if this is an LPC request with data information */ if ((LpcpGetMessageType(&Message->Request) == LPC_REQUEST) && Propchange: trunk/reactos/ntoskrnl/lpc/send.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[fireball] 29895: - Make behavior consistent: if there is no relocation information, return SUCCESS in both possible cases. See issue #2268 for more details.
by fireball＠svn.reactos.org 26 Oct '07

26 Oct '07

Author: fireball Date: Fri Oct 26 12:48:04 2007 New Revision: 29895 URL: http://svn.reactos.org/svn/reactos?rev=29895&view=rev Log: - Make behavior consistent: if there is no relocation information, return SUCCESS in both possible cases. See issue #2268 for more details. Modified: trunk/reactos/dll/ntdll/ldr/utils.c Modified: trunk/reactos/dll/ntdll/ldr/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/utils.c?rev=… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/utils.c (original) +++ trunk/reactos/dll/ntdll/ldr/utils.c Fri Oct 26 12:48:04 2007 @@ -1230,7 +1230,7 @@ if (NTHeaders->FileHeader.Characteristics & IMAGE_FILE_RELOCS_STRIPPED) { - return STATUS_UNSUCCESSFUL; + return STATUS_SUCCESS; } RelocationDDir =

1 0

[arty] 29894: Remaining fixes from branch transition. MmuTurnOn, now with GDB stub.
by arty＠svn.reactos.org 26 Oct '07

26 Oct '07

Author: arty Date: Fri Oct 26 10:37:52 2007 New Revision: 29894 URL: http://svn.reactos.org/svn/reactos?rev=29894&view=rev Log: Remaining fixes from branch transition. MmuTurnOn, now with GDB stub. Modified: trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c trunk/reactos/lib/ppcmmu/mmuobject.c trunk/reactos/lib/ppcmmu/mmuobject.h Modified: trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c Fri Oct 26 10:37:52 2007 @@ -127,8 +127,6 @@ NTAPI FrLdrStartup(ULONG Magic) { - KernelEntryFn KernelEntryAddress = - (KernelEntryFn)(KernelEntryPoint + KernelBase); ULONG_PTR i, j, page, count; PCHAR ModHeader; boot_infos_t *LocalBootInfo = &BootInfo; @@ -136,6 +134,8 @@ LoaderBlock.ArchExtra = (ULONG)LocalBootInfo; ppc_map_info_t *info = MmAllocateMemory(0x80 * sizeof(*info)); + printf("FrLdrStartup(KernelEntry = %x)\n", KernelEntryPoint); + for(i = 0; i < LoaderBlock.ModsCount; i++) { ModHeader = ((PCHAR)reactos_modules[i].ModStart); @@ -145,19 +145,28 @@ (PCHAR)reactos_modules[i].String); } + printf("PpcInitializeMmu\n"); PpcInitializeMmu(0); + printf("PpcInitializeMmu done\n"); /* We'll use vsid 1 for freeldr (expendable) */ MmuAllocVsid(1, 0xff); + printf("(1)\n"); MmuSetVsid(0, 8, 1); + printf("(2)\n"); MmuAllocVsid(0, 0xff00); + printf("(3)\n"); MmuSetVsid(8, 16, 0); - + printf("(4)\n"); + + printf("MmuSetTrapHandler\n"); MmuSetTrapHandler(3, MmuPageMiss); MmuSetTrapHandler(4, MmuPageMiss); + printf("MmuSetTrapHandler done\n"); info = MmAllocateMemory((KernelMemorySize >> PAGE_SHIFT) * sizeof(*info)); + printf("page info at %x\n", info); /* Map kernel space 0x80000000 ... */ for( i = (ULONG)KernelMemory, page = 0; @@ -169,11 +178,14 @@ info[page].flags = MMU_ALL_RW; } + printf("Adding page info (%d pages)\n", page); MmuMapPage(info, page); + printf("Adding page info (%d pages) ... done\n", page); /* Map module name strings */ for( count = 0, i = 0; i < LoaderBlock.ModsCount; i++ ) { + printf("Checking string %s\n", reactos_modules[i].String); page = ROUND_DOWN(((ULONG)reactos_modules[i].String), (1<<PFN_SHIFT)); for( j = 0; j < count; j++ ) { @@ -181,6 +193,8 @@ } if( j != count ) { + printf("Mapping page %x containing string %s\n", + page, reactos_modules[i].String); info[count].flags = MMU_ALL_RW; info[count].proc = 1; info[count].addr = page; @@ -194,6 +208,7 @@ { if(info[j].addr == page) break; } + if( j != count ) { info[count].flags = MMU_ALL_RW; @@ -202,9 +217,13 @@ info[count].phys = page; // PpcVirt2phys(page, 0); count++; } + printf("Mapping module name strings\n"); MmuMapPage(info, count); - - MmuTurnOn(KernelEntryAddress, (void*)&LoaderBlock); + printf("Module name strings mapped\n"); + + printf("MmuTurnOn(KernelEntry = %x)\n", KernelEntryPoint); + MmuTurnOn((KernelEntryFn)KernelEntryPoint, (void*)&LoaderBlock); + printf("MAED OF FALE!!1\n"); /* Nothing more */ while(1); @@ -467,7 +486,6 @@ } ImageSize = SWAPD(NtHeader->OptionalHeader.SizeOfImage); - KernelEntryPoint = SWAPD(NtHeader->OptionalHeader.AddressOfEntryPoint); printf("Total image size is %x\n", ImageSize); /* Handle relocation sections */ @@ -689,17 +707,21 @@ NTAPI FrLdrMapImage(IN FILE *Image, IN PCHAR ShortName, IN ULONG ImageType) { - PVOID Result; + PVOID Result = NULL; + + printf("Loading image %s (type %d)\n", ShortName, ImageType); if (ImageType == 1) { if(FrLdrMapKernel(Image)) - return (PVOID)KernelMemory; - else - return NULL; + Result = (PVOID)KernelMemory; } else - Result = (PVOID)FrLdrLoadModule(Image, ShortName, NULL); + { + PVOID ModuleBase = (PVOID)NextModuleBase; + if(FrLdrMapModule(Image, ShortName, 0, 0)) + Result = ModuleBase; + } return Result; } Modified: trunk/reactos/lib/ppcmmu/mmuobject.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/ppcmmu/mmuobject.c?rev… ============================================================================== --- trunk/reactos/lib/ppcmmu/mmuobject.c (original) +++ trunk/reactos/lib/ppcmmu/mmuobject.c Fri Oct 26 10:37:52 2007 @@ -73,7 +73,6 @@ int _mmumain(int action, void *arg1, void *arg2, void *arg3, void *tf) { - void (*fun)(void *) = arg1; ppc_trap_frame_t *trap_frame = (action >= 0x100) ? tf : arg1; int ret = 0; @@ -84,14 +83,14 @@ if(!ptegreload(trap_frame, trap_frame->dar)) { __asm__("mfmsr 3\n\tori 3,3,0x30\n\tmtmsr 3\n\t"); - if (!callback[action](action,trap_frame)) hang(action, trap_frame); + if (!callback[action](action,trap_frame)) TakeException(action, trap_frame); } break; case 4: if(!ptegreload(trap_frame, trap_frame->srr0)) { __asm__("mfmsr 3\n\tori 3,3,0x30\n\tmtmsr 3\n\t"); - if (!callback[action](action,trap_frame)) hang(action, trap_frame); + if (!callback[action](action,trap_frame)) TakeException(action, trap_frame); } break; @@ -141,16 +140,7 @@ ret = mmunitest(); break; case 0x107: - __asm__("mfmsr 3\n\t" - "ori 3,3,0x30\n\t" - "mtmsr 3\n\t" - "mtsdr1 %0\n\t" - "mr 0,%2\n\t" - "mtctr 0\n\t" - "mr 3,%1\n\t" - "bctrl\n\t" - : : "r" (HTABORG), "r" (arg2), "r" (fun)); - /* BYE ! */ + callkernel(arg1, arg2); break; case 0x108: mmusetramsize((paddr_t)arg1); @@ -423,7 +413,7 @@ for(i = 0; i < 16; i++) { if(mask & (1 << i)) - allocvsid((vsid << 4) + i); + freevsid((vsid << 4) + i); } } @@ -602,3 +592,18 @@ __asm__("tlbie %0\n\tsync\n\tisync" : : "r" (addr)); return 1; } + +void callkernel(void *fun_ptr, void *arg) +{ + void (*fun)(void *) = fun_ptr; + __asm__("mfmsr 3\n\t" + "ori 3,3,0x30\n\t" + "mtmsr 3\n\t" + "mtsdr1 %0\n\t" + "mr 0,%2\n\t" + "mtctr 0\n\t" + "mr 3,%1\n\t" + "bctrl\n\t" + : : "r" (HTABORG), "r" (arg), "r" (fun)); + /* BYE ! */ +} Modified: trunk/reactos/lib/ppcmmu/mmuobject.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/ppcmmu/mmuobject.h?rev… ============================================================================== --- trunk/reactos/lib/ppcmmu/mmuobject.h (original) +++ trunk/reactos/lib/ppcmmu/mmuobject.h Fri Oct 26 10:37:52 2007 @@ -12,5 +12,6 @@ void freevsid(int); void mmufreevsid(int vsid, int mask); int mmunitest(); +void callkernel(void *fun_ptr, void *arg); #endif/*_LIBMMU_MMUOBJECT_H*/

1 0

[jimtabor] 29893: ScrollDC From my notes 08/16/2003: - Wine testing was not enough. If dx & dy are zero and hrgn and lprc are used or not zero. The Rect for hrgn and lprc are set zero w/o NtUserScrollDC being called. It just returns TRUE. - If HDC is zero it will return FALSE and not call NtUserScrollDC.
by jimtabor＠svn.reactos.org 26 Oct '07

26 Oct '07

Author: jimtabor Date: Fri Oct 26 06:07:33 2007 New Revision: 29893 URL: http://svn.reactos.org/svn/reactos?rev=29893&view=rev Log: ScrollDC From my notes 08/16/2003: - Wine testing was not enough. If dx & dy are zero and hrgn and lprc are used or not zero. The Rect for hrgn and lprc are set zero w/o NtUserScrollDC being called. It just returns TRUE. - If HDC is zero it will return FALSE and not call NtUserScrollDC. Modified: trunk/reactos/dll/win32/user32/windows/paint.c Modified: trunk/reactos/dll/win32/user32/windows/paint.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/p… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/paint.c (original) +++ trunk/reactos/dll/win32/user32/windows/paint.c Fri Oct 26 06:07:33 2007 @@ -185,6 +185,16 @@ ScrollDC(HDC hDC, int dx, int dy, CONST RECT *lprcScroll, CONST RECT *lprcClip, HRGN hrgnUpdate, LPRECT lprcUpdate) { + if (hDC == NULL) return FALSE; + + if (dx == 0 && dy == 0) + { + if (hrgnUpdate) SetRectRgn(hrgnUpdate, 0, 0, 0, 0); + if (lprcUpdate) lprcUpdate->left = lprcUpdate->right = + lprcUpdate->top = lprcUpdate->bottom = 0; + return TRUE; + } + return NtUserScrollDC(hDC, dx, dy, lprcScroll, lprcClip, hrgnUpdate, lprcUpdate); }

1 0

[peterw] 29892: - Make tee behave properly with regards to overwriting files.
by peterw＠svn.reactos.org 25 Oct '07

25 Oct '07

Author: peterw Date: Fri Oct 26 03:27:44 2007 New Revision: 29892 URL: http://svn.reactos.org/svn/reactos?rev=29892&view=rev Log: - Make tee behave properly with regards to overwriting files. Modified: trunk/tools/RosBE-Windows/Tools/tee.c Modified: trunk/tools/RosBE-Windows/Tools/tee.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/tee.c?re… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/tee.c (original) +++ trunk/tools/RosBE-Windows/Tools/tee.c Fri Oct 26 03:27:44 2007 @@ -31,38 +31,25 @@ return 0; } - FILE = fopen(argv[1], "r"); - if (FILE) + FILE = fopen(argv[1], "w"); + if (!FILE) { - fprintf(stderr, "%s: Error file \"%s\" already exists.\n", argv[0], argv[1]); - if (fclose(FILE)) - { - fprintf(stderr, "%s: Error closing file \"%s\"\n", argv[0], argv[1]); - } + fprintf(stderr, "%s: Error cannot create/open file \"%s\".\n", argv[0], argv[1]); return -1; } - else + while (!feof(stdin)) { - FILE = fopen(argv[1], "w"); - if (!FILE) + charbuff = fgetc(stdin); + if (!feof(stdin)) { - fprintf(stderr, "%s: Error cannot create file \"%s\".\n", argv[0], argv[1]); - return -1; + fputc(charbuff, stdout); + fputc(charbuff, FILE); } - while (!feof(stdin)) - { - charbuff = fgetc(stdin); - if (!feof(stdin)) - { - fputc(charbuff, stdout); - fputc(charbuff, FILE); - } - } - if (fclose(FILE)) - { - fprintf(stderr, "%s: Error closing file \"%s\"\n", argv[0], argv[1]); - return -1; - } + } + if (fclose(FILE)) + { + fprintf(stderr, "%s: Error closing file \"%s\"\n", argv[0], argv[1]); + return -1; } return 0;

1 0

[gedmurphy] 29891: fix use of globals introduced in r29883
by gedmurphy＠svn.reactos.org 25 Oct '07

25 Oct '07

Author: gedmurphy Date: Fri Oct 26 03:23:53 2007 New Revision: 29891 URL: http://svn.reactos.org/svn/reactos?rev=29891&view=rev Log: fix use of globals introduced in r29883 Modified: trunk/reactos/dll/cpl/desk/settings.c Modified: trunk/reactos/dll/cpl/desk/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/settings.c?re… ============================================================================== --- trunk/reactos/dll/cpl/desk/settings.c (original) +++ trunk/reactos/dll/cpl/desk/settings.c Fri Oct 26 03:23:53 2007 @@ -15,10 +15,11 @@ { PDISPLAY_DEVICE_ENTRY DisplayDeviceList; PDISPLAY_DEVICE_ENTRY CurrentDisplayDevice; + HBITMAP hBitmap; + int cxSource; + int cySource; } GLOBAL_DATA, *PGLOBAL_DATA; -static HBITMAP hBitmap = NULL; -static int cxSource, cySource; static VOID UpdateDisplay(IN HWND hwndDlg, PGLOBAL_DATA pGlobalData, IN BOOL bUpdateThumb) @@ -281,6 +282,7 @@ static VOID OnInitDialog(IN HWND hwndDlg) { + BITMAP bitmap; DWORD Result = 0; DWORD iDevNum = 0; DISPLAY_DEVICE displayDevice; @@ -359,6 +361,16 @@ HeapFree(GetProcessHeap(), 0, pMonitors); } } + + /* init the color spectrum*/ + pGlobalData->hBitmap = LoadImageW(hApplet, MAKEINTRESOURCEW(IDB_SPECTRUM), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR); + if (pGlobalData->hBitmap != NULL) + { + GetObjectW(pGlobalData->hBitmap, sizeof(BITMAP), &bitmap); + + pGlobalData->cxSource = bitmap.bmWidth; + pGlobalData->cySource = bitmap.bmHeight; + } } static VOID @@ -561,22 +573,12 @@ pGlobalData = (PGLOBAL_DATA)GetWindowLongPtr(hwndDlg, DWLP_USER); - BITMAP bitmap; - + switch(uMsg) { case WM_INITDIALOG: { OnInitDialog(hwndDlg); - - hBitmap = LoadImageW(hApplet, MAKEINTRESOURCEW(IDB_SPECTRUM), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR); - if (hBitmap != NULL) - { - GetObjectW(hBitmap, sizeof(BITMAP), &bitmap); - - cxSource = bitmap.bmWidth; - cySource = bitmap.bmHeight; - } break; } case WM_DRAWITEM: @@ -589,11 +591,11 @@ hdcMem = CreateCompatibleDC(lpDrawItem->hDC); if (hdcMem != NULL) { - SelectObject(hdcMem, hBitmap); + SelectObject(hdcMem, pGlobalData->hBitmap); StretchBlt(lpDrawItem->hDC, lpDrawItem->rcItem.left, lpDrawItem->rcItem.top, lpDrawItem->rcItem.right - lpDrawItem->rcItem.left, lpDrawItem->rcItem.bottom - lpDrawItem->rcItem.top, - hdcMem, 0, 0, cxSource, cySource, SRCCOPY); + hdcMem, 0, 0, pGlobalData->cxSource, pGlobalData->cySource, SRCCOPY); DeleteDC(hdcMem); } } @@ -798,7 +800,8 @@ HeapFree(GetProcessHeap(), 0, pGlobalData); - DeleteObject(hBitmap); + if (pGlobalData->hBitmap) + DeleteObject(pGlobalData->hBitmap); } } return FALSE;

1 0

[tkreuzer] 29890: UserScrollDC: - rename rcScroll to rcClip - simplify calculation of source point - fix calculation of invalidated region
by tkreuzer＠svn.reactos.org 25 Oct '07

25 Oct '07

Author: tkreuzer Date: Fri Oct 26 03:10:50 2007 New Revision: 29890 URL: http://svn.reactos.org/svn/reactos?rev=29890&view=rev Log: UserScrollDC: - rename rcScroll to rcClip - simplify calculation of source point - fix calculation of invalidated region Modified: trunk/reactos/subsystems/win32/win32k/ntuser/painting.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/painting.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/painting.c Fri Oct 26 03:10:50 2007 @@ -1131,40 +1131,31 @@ const RECT *prcClip, HRGN hrgnUpdate, LPRECT prcUpdate) { PDC pDC; - RECT rcScroll, rcSrc, rcDst; - SIZE szSrcOrg; + RECT rcClip, rcSrc, rcDst; INT Result; - IntGdiGetClipBox(hDC, &rcScroll); + IntGdiGetClipBox(hDC, &rcClip); if (prcClip) { - IntGdiIntersectRect(&rcScroll, &rcScroll, prcClip); + IntGdiIntersectRect(&rcClip, &rcClip, prcClip); } if (prcScroll) { - IntGdiIntersectRect(&rcSrc, &rcScroll, prcScroll); + IntGdiIntersectRect(&rcSrc, &rcClip, prcScroll); } else { - rcSrc = rcScroll; + rcSrc = rcClip; } rcDst = rcSrc; IntGdiOffsetRect(&rcDst, dx, dy); - if (rcDst.left < rcScroll.left) - szSrcOrg.cx = rcScroll.left - rcDst.left; - else - szSrcOrg.cx = 0; - if (rcDst.top < rcScroll.top) - szSrcOrg.cy = rcScroll.top - rcDst.top; - else - szSrcOrg.cy = 0; - IntGdiIntersectRect(&rcDst, &rcDst, &rcScroll); + IntGdiIntersectRect(&rcDst, &rcDst, &rcClip); if (!NtGdiBitBlt(hDC, rcDst.left, rcDst.top, rcDst.right - rcDst.left, rcDst.bottom - rcDst.top, - hDC, rcSrc.left + szSrcOrg.cx, rcSrc.top + szSrcOrg.cy, SRCCOPY, 0, 0)) + hDC, rcDst.left - dx, rcDst.top - dy, SRCCOPY, 0, 0)) { return ERROR; } @@ -1173,7 +1164,7 @@ could not be copied, because it was not visible */ if (hrgnUpdate || prcUpdate) { - HRGN hrgnOwn, hrgnVisible, hrgnDst; + HRGN hrgnOwn, hrgnVisible, hrgnTmp; pDC = DC_LockDc(hDC); if (!pDC) @@ -1183,24 +1174,34 @@ hrgnVisible = pDC->w.hVisRgn; // pDC->w.hGCClipRgn? DC_UnlockDc(pDC); + /* Begin with the source rect */ if (hrgnUpdate) { hrgnOwn = hrgnUpdate; - if (!NtGdiSetRectRgn(hrgnOwn, rcScroll.left, rcScroll.top, rcScroll.right, rcScroll.bottom)) + if (!NtGdiSetRectRgn(hrgnOwn, rcSrc.left, rcSrc.top, rcSrc.right, rcSrc.bottom)) { return ERROR; } } else { - hrgnOwn = UnsafeIntCreateRectRgnIndirect(&rcScroll); - } - - hrgnDst = UnsafeIntCreateRectRgnIndirect(&rcSrc); - NtGdiCombineRgn(hrgnDst, hrgnDst, hrgnVisible, RGN_AND); - NtGdiOffsetRgn(hrgnDst, dx, dy); - Result = NtGdiCombineRgn(hrgnOwn, hrgnOwn, hrgnDst, RGN_DIFF); - NtGdiDeleteObject(hrgnDst); + hrgnOwn = UnsafeIntCreateRectRgnIndirect(&rcSrc); + } + + /* Substract the dest rect */ + hrgnTmp = UnsafeIntCreateRectRgnIndirect(&rcDst); + NtGdiCombineRgn(hrgnOwn, hrgnOwn, hrgnTmp, RGN_DIFF); + + /* Add the part of the dest that wasn't visible in source */ + NtGdiSetRectRgn(hrgnTmp, rcSrc.left, rcSrc.top, rcSrc.right, rcSrc.bottom); + Result = NtGdiCombineRgn(hrgnTmp, hrgnTmp, hrgnVisible, RGN_DIFF); + if (Result != NULLREGION && Result != ERROR) + { + NtGdiOffsetRgn(hrgnTmp, dx, dy); + NtGdiCombineRgn(hrgnOwn, hrgnOwn, hrgnTmp, RGN_OR); + } + + NtGdiDeleteObject(hrgnTmp); if (prcUpdate) {

1 0

[tkreuzer] 29889: remove ToUnicode() stub from win32k
by tkreuzer＠svn.reactos.org 25 Oct '07

25 Oct '07

Author: tkreuzer Date: Fri Oct 26 03:06:50 2007 New Revision: 29889 URL: http://svn.reactos.org/svn/reactos?rev=29889&view=rev Log: remove ToUnicode() stub from win32k Modified: trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c Fri Oct 26 03:06:50 2007 @@ -437,22 +437,6 @@ return ToUnicodeResult; } -int STDCALL ToUnicode( UINT wVirtKey, - UINT wScanCode, - PBYTE lpKeyState, - LPWSTR pwszBuff, - int cchBuff, - UINT wFlags ) -{ - return ToUnicodeEx( wVirtKey, - wScanCode, - gQueueKeyStateTable, - pwszBuff, - cchBuff, - wFlags, - 0 ); -} - BOOL FASTCALL IntTranslateKbdMessage(LPMSG lpMsg,

1 0

[tkreuzer] 29888: fix error check
by tkreuzer＠svn.reactos.org 25 Oct '07

25 Oct '07

Author: tkreuzer Date: Fri Oct 26 03:03:04 2007 New Revision: 29888 URL: http://svn.reactos.org/svn/reactos?rev=29888&view=rev Log: fix error check Modified: trunk/reactos/base/system/autochk/autochk.c Modified: trunk/reactos/base/system/autochk/autochk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/autochk/autoch… ============================================================================== --- trunk/reactos/base/system/autochk/autochk.c (original) +++ trunk/reactos/base/system/autochk/autochk.c Fri Oct 26 03:03:04 2007 @@ -285,7 +285,7 @@ /* Load the provider which will do the chkdsk */ Provider = LoadProvider(FileSystem); - if (!NT_SUCCESS(Status)) + if (Provider == NULL) { DPRINT1("LoadProvider() failed\n"); PrintString(" Unable to verify a %S volume\n", FileSystem);

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