Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jimtabor] 28501: Fix math and add notes.
by jimtabor＠svn.reactos.org 23 Aug '07

23 Aug '07

Author: jimtabor Date: Fri Aug 24 02:29:37 2007 New Revision: 28501 URL: http://svn.reactos.org/svn/reactos?rev=28501&view=rev Log: Fix math and add notes. Modified: trunk/reactos/dll/win32/gdi32/objects/bitmap.c Modified: trunk/reactos/dll/win32/gdi32/objects/bitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/bi… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/bitmap.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/bitmap.c Fri Aug 24 02:29:37 2007 @@ -3,7 +3,7 @@ /* * Return the full scan size for a bitmap. * - * Based on Wine and Windows Graphics Prog pg 595 + * Based on Wine, Utils.c and Windows Graphics Prog pg 595 */ UINT FASTCALL @@ -20,10 +20,10 @@ { if ((Info->bmiHeader.biCompression) && (Info->bmiHeader.biCompression != BI_BITFIELDS)) return Info->bmiHeader.biSizeImage; + // Planes are over looked by Yuan. I guess assumed always 1. MaxBits = Info->bmiHeader.biBitCount * Info->bmiHeader.biPlanes * Info->bmiHeader.biWidth; } - // Planes are over looked by Yuan. I guess assumed always 1. - MaxBits = (MaxBits + 31) / 32; // ScanLineSize = (Width * bitcount + 31)/32 + MaxBits = ((MaxBits + 31) & ~31 ) / 8; // From Yuan, ScanLineSize = (Width * bitcount + 31)/32 return (MaxBits * ScanLines); // ret the full Size. }

1 0

[dreimer] 28500: ARCH does not exist anymore in config.rbuild. thx to towerr for this hint.
by dreimer＠svn.reactos.org 23 Aug '07

23 Aug '07

Author: dreimer Date: Fri Aug 24 02:14:40 2007 New Revision: 28500 URL: http://svn.reactos.org/svn/reactos?rev=28500&view=rev Log: ARCH does not exist anymore in config.rbuild. thx to towerr for this hint. 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 Fri Aug 24 02:14:40 2007 @@ -102,12 +102,6 @@ :: :: Start with reading settings from config.rbuild and let the user edit them. :: -echo Architecture to build for. Not Editable. -echo. -echo Right now -grep \"ARCH\" "%ROSBEBASEDIR%\config.rbuild"|cut -d "\"" -f 4 -echo. - echo Sub-architecture to build for. echo Default is: none echo.

1 0

[dreimer] 28499: - OK, Translations in Batch is stupid. - Fix a error in config.cmd
by dreimer＠svn.reactos.org 23 Aug '07

23 Aug '07

Author: dreimer Date: Fri Aug 24 02:00:36 2007 New Revision: 28499 URL: http://svn.reactos.org/svn/reactos?rev=28499&view=rev Log: - OK, Translations in Batch is stupid. - Fix a error in config.cmd Removed: trunk/tools/RosBE-Windows/Root/de-DE/ 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 Fri Aug 24 02:00:36 2007 @@ -90,7 +90,7 @@ echo *** config.template.rbuild is newer than working config.rbuild *** echo *** The Editor cannot continue with this file. Do you wanna *** echo *** update to the most recent one? You need to reset all your *** - cho *** previously made settings. *** + echo *** previously made settings. *** echo. SET /P XY="(yes), (no)" if /I "%XY%"=="yes" del "%ROSBEBASEDIR%\*.rbuild" | del "config.rbuild" | copy "config.template.rbuild" "%ROSBEBASEDIR%\config.rbuild" | goto :OK

1 0

[fireball] 28497: - Make freeldr do identity memory mapping. This simplifies a lot of things throughout the code, and finally places the kernel at the same addresses where NT kernel is located. - Fix code in ntoskrnl which was based on (wrong) assumptions.
by fireball＠svn.reactos.org 23 Aug '07

23 Aug '07

Author: fireball Date: Fri Aug 24 01:29:28 2007 New Revision: 28497 URL: http://svn.reactos.org/svn/reactos?rev=28497&view=rev Log: - Make freeldr do identity memory mapping. This simplifies a lot of things throughout the code, and finally places the kernel at the same addresses where NT kernel is located. - Fix code in ntoskrnl which was based on (wrong) assumptions. Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/loader.c trunk/reactos/boot/freeldr/freeldr/include/reactos.h trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c trunk/reactos/ntoskrnl/ke/freeldr.c trunk/reactos/ntoskrnl/mm/mminit.c trunk/reactos/tools/rbuild/module.cpp Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/loader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/loader.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/loader.c Fri Aug 24 01:29:28 2007 @@ -33,8 +33,8 @@ /* Unrelocated Kernel Base in Virtual Memory */ ULONG_PTR KernelBase; -/* Kernel Entrypoint in Physical Memory */ -ULONG_PTR KernelEntry; +/* Kernel Entrypoint in Virtual Memory */ +ULONG_PTR KernelEntryPoint; /* Page Directory and Tables for non-PAE Systems */ extern PAGE_DIRECTORY_X86 startup_pagedirectory; @@ -297,9 +297,9 @@ ULONG ExportDirSize; /* HAL and NTOS use a virtual address, switch it to physical mode */ - if ((ULONG_PTR)BaseAddress & 0x80000000) - { - BaseAddress = (PVOID)((ULONG_PTR)BaseAddress - KSEG0_BASE + 0x200000); + if ((ULONG_PTR)BaseAddress & KSEG0_BASE) + { + BaseAddress = RVA(BaseAddress, -KSEG0_BASE); } ExportDir = (PIMAGE_EXPORT_DIRECTORY) @@ -439,7 +439,7 @@ *ImportAddressList = LdrPEGetExportByName((PVOID)LoaderModule->ModStart, pe_name->Name, pe_name->Hint); /* Fixup the address to be virtual */ - *ImportAddressList = (PVOID)((ULONG_PTR)*ImportAddressList + (KSEG0_BASE - 0x200000)); + *ImportAddressList = RVA(*ImportAddressList, KSEG0_BASE); //DbgPrint("Looked for: %s and found: %p\n", pe_name->Name, *ImportAddressList); if ((*ImportAddressList) == NULL) @@ -592,7 +592,7 @@ /* Set the virtual (image) and physical (load) addresses */ LoadBase = (PVOID)NextModuleBase; - ImageBase = RVA(LoadBase , -KERNEL_BASE_PHYS + KSEG0_BASE); + ImageBase = RVA(LoadBase, KSEG0_BASE); /* Save the Image Size */ ImageSize = FsGetFileSize(Image); Modified: trunk/reactos/boot/freeldr/freeldr/include/reactos.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/reactos.h (original) +++ trunk/reactos/boot/freeldr/freeldr/include/reactos.h Fri Aug 24 01:29:28 2007 @@ -21,7 +21,7 @@ #define __REACTOS_H /* Base Addres of Kernel in Physical Memory */ -#define KERNEL_BASE_PHYS 0x200000 +#define KERNEL_BASE_PHYS 0x800000 /* Bits to shift to convert a Virtual Address into an Offset in the Page Table */ #define PFN_SHIFT 12 @@ -29,10 +29,6 @@ /* Bits to shift to convert a Virtual Address into an Offset in the Page Directory */ #define PDE_SHIFT 22 #define PDE_SHIFT_PAE 18 - -/* Converts a Relative Address read from the Kernel into a Physical Address */ -#define RaToPa(p) \ - (ULONG_PTR)((ULONG_PTR)p + KERNEL_BASE_PHYS) /* Converts a Physical Address Pointer into a Page Frame Number */ #define PaPtrToPfn(p) \ @@ -54,8 +50,6 @@ #define KpcrPageTableIndex (KPCR_BASE >> 22) #define ApicPageTableIndex (APIC_BASE >> 22) #define KuserPageTableIndex (KI_USER_SHARED_DATA >> 22) - -#define KernelEntryPoint (KernelEntry - KERNEL_BASE_PHYS) + KernelBase typedef struct _PAGE_DIRECTORY_X86 { Modified: trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c Fri Aug 24 01:29:28 2007 @@ -36,7 +36,7 @@ CHAR SystemRoot[255]; static CHAR szLoadingMsg[] = "Loading ReactOS..."; BOOLEAN FrLdrBootType; -extern ULONG_PTR KernelBase, KernelEntry; +extern ULONG_PTR KernelBase, KernelEntryPoint; BOOLEAN FrLdrLoadDriver(PCHAR szFileName, @@ -759,7 +759,7 @@ /* Get the NT header, kernel base and kernel entry */ NtHeader = RtlImageNtHeader(LoadBase); KernelBase = NtHeader->OptionalHeader.ImageBase; - KernelEntry = RaToPa(NtHeader->OptionalHeader.AddressOfEntryPoint); + KernelEntryPoint = KernelBase + NtHeader->OptionalHeader.AddressOfEntryPoint; LoaderBlock.KernelBase = KernelBase; /* Modified: trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c Fri Aug 24 01:29:28 2007 @@ -31,7 +31,7 @@ char szBootPath[256]; char szHalName[256]; CHAR SystemRoot[255]; -extern ULONG_PTR KernelBase, KernelEntry; +extern ULONG_PTR KernelBase, KernelEntryPoint; extern BOOLEAN FrLdrLoadDriver(PCHAR szFileName, INT nPos); @@ -83,7 +83,7 @@ /* Get the NT header, kernel base and kernel entry */ NtHeader = RtlImageNtHeader(LoadBase); KernelBase = NtHeader->OptionalHeader.ImageBase; - KernelEntry = RaToPa(NtHeader->OptionalHeader.AddressOfEntryPoint); + KernelEntryPoint = KernelBase + NtHeader->OptionalHeader.AddressOfEntryPoint; LoaderBlock.KernelBase = KernelBase; /* Update Processbar and return success */ Modified: trunk/reactos/ntoskrnl/ke/freeldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/freeldr.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/freeldr.c (original) +++ trunk/reactos/ntoskrnl/ke/freeldr.c Fri Aug 24 01:29:28 2007 @@ -102,7 +102,7 @@ if (!_stricmp(DriverName, "ansi.nls")) { /* ANSI Code page */ - ModStart = (PVOID)((ULONG_PTR)ModStart + (KSEG0_BASE - 0x200000)); + ModStart = RVA(ModStart, KSEG0_BASE); LoaderBlock->NlsData->AnsiCodePageData = ModStart; /* Create an MD for it */ @@ -117,7 +117,7 @@ else if (!_stricmp(DriverName, "oem.nls")) { /* OEM Code page */ - ModStart = (PVOID)((ULONG_PTR)ModStart + (KSEG0_BASE - 0x200000)); + ModStart = RVA(ModStart, KSEG0_BASE); LoaderBlock->NlsData->OemCodePageData = ModStart; /* Create an MD for it */ @@ -132,7 +132,7 @@ else if (!_stricmp(DriverName, "casemap.nls")) { /* Unicode Code page */ - ModStart = (PVOID)((ULONG_PTR)ModStart + (KSEG0_BASE - 0x200000)); + ModStart = RVA(ModStart, KSEG0_BASE); LoaderBlock->NlsData->UnicodeCodePageData = ModStart; /* Create an MD for it */ @@ -150,7 +150,7 @@ !(_stricmp(DriverName, "system.hiv"))) { /* Save registry data */ - ModStart = (PVOID)((ULONG_PTR)ModStart + (KSEG0_BASE - 0x200000)); + ModStart = RVA(ModStart, KSEG0_BASE); LoaderBlock->RegistryBase = ModStart; LoaderBlock->RegistryLength = ModSize; @@ -172,7 +172,7 @@ !(_stricmp(DriverName, "hardware.hiv"))) { /* Create an MD for it */ - ModStart = (PVOID)((ULONG_PTR)ModStart + (KSEG0_BASE - 0x200000)); + ModStart = RVA(ModStart, KSEG0_BASE); MdEntry = &BldrMemoryDescriptors[i]; MdEntry->MemoryType = LoaderRegistryData; MdEntry->BasePage = (ULONG_PTR)ModStart >> PAGE_SHIFT; @@ -284,6 +284,11 @@ LoaderBlock->Extension->Size = sizeof(LOADER_PARAMETER_EXTENSION); LoaderBlock->Extension->MajorVersion = 5; LoaderBlock->Extension->MinorVersion = 2; + + /* Save the number of pages the kernel images take */ + LoaderBlock->Extension->LoaderPagesSpanned = + MmFreeLdrLastKrnlPhysAddr - MmFreeLdrFirstKrnlPhysAddr; + LoaderBlock->Extension->LoaderPagesSpanned /= PAGE_SIZE; /* Now setup the setup block if we have one */ if (LoaderBlock->SetupLdrBlock) @@ -379,9 +384,8 @@ ModsCount - 1]. ModEnd); MmFreeLdrFirstKrnlPhysAddr = KeRosLoaderBlock->ModsAddr[0].ModStart - - KSEG0_BASE + 0x200000; - MmFreeLdrLastKrnlPhysAddr = MmFreeLdrLastKernelAddress - - KSEG0_BASE + 0x200000; + KSEG0_BASE; + MmFreeLdrLastKrnlPhysAddr = MmFreeLdrLastKernelAddress - KSEG0_BASE; #if defined(_M_IX86) /* Set up the VDM Data */ Modified: trunk/reactos/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mminit.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mminit.c (original) +++ trunk/reactos/ntoskrnl/mm/mminit.c Fri Aug 24 01:29:28 2007 @@ -90,8 +90,13 @@ MmInitMemoryAreas(); - /* Start the paged and nonpaged pool at a 4MB boundary. */ - MiNonPagedPoolStart = (PVOID)ROUND_UP((ULONG_PTR)LastKernelAddress + PAGE_SIZE, 0x400000); + /* + * FreeLDR Marks 6MB "in use" at the start of the kernel base, + * so start the non-paged pool at a boundary of 6MB from where + * the last driver was loaded. This should be the end of the + * FreeLDR-marked region. + */ + MiNonPagedPoolStart = (PVOID)ROUND_UP((ULONG_PTR)LastKernelAddress + PAGE_SIZE, 0x600000); MiNonPagedPoolLength = MM_NONPAGED_POOL_SIZE; MmPagedPoolBase = (PVOID)ROUND_UP((ULONG_PTR)MiNonPagedPoolStart + MiNonPagedPoolLength + PAGE_SIZE, 0x400000); Modified: trunk/reactos/tools/rbuild/module.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/module.cpp?re… ============================================================================== --- trunk/reactos/tools/rbuild/module.cpp (original) +++ trunk/reactos/tools/rbuild/module.cpp Fri Aug 24 01:29:28 2007 @@ -992,7 +992,7 @@ switch ( type ) { case Kernel: - return "0x80000000"; + return "0x80800000"; case Win32DLL: case Win32OCX: return "0x10000000";

1 0

[dreimer] 28496: - Updated Changelog. - Modified one error to be more helpful. - Beginning of a German translation of RosBE (still missing: config, help). Do NOT translate it in another language yet. I still need to find a nice way to select the language. Heeya, Waxy :-P
by dreimer＠svn.reactos.org 23 Aug '07

23 Aug '07

Author: dreimer Date: Fri Aug 24 01:24:42 2007 New Revision: 28496 URL: http://svn.reactos.org/svn/reactos?rev=28496&view=rev Log: - Updated Changelog. - Modified one error to be more helpful. - Beginning of a German translation of RosBE (still missing: config, help). Do NOT translate it in another language yet. I still need to find a nice way to select the language. Heeya, Waxy :-P Added: trunk/tools/RosBE-Windows/Root/de-DE/ trunk/tools/RosBE-Windows/Root/de-DE/Build-Multi.cmd trunk/tools/RosBE-Windows/Root/de-DE/Build-Shared.cmd trunk/tools/RosBE-Windows/Root/de-DE/Build.cmd trunk/tools/RosBE-Windows/Root/de-DE/Clean.cmd trunk/tools/RosBE-Windows/Root/de-DE/RosBE.cmd trunk/tools/RosBE-Windows/Root/de-DE/reladdr2line.cmd trunk/tools/RosBE-Windows/Root/de-DE/sSVN.cmd trunk/tools/RosBE-Windows/Root/de-DE/scut.cmd Modified: trunk/tools/RosBE-Windows/Root/Build-Shared.cmd trunk/tools/RosBE-Windows/Root/ChangeLog.txt Modified: trunk/tools/RosBE-Windows/Root/Build-Shared.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Build-Sha… ============================================================================== --- trunk/tools/RosBE-Windows/Root/Build-Shared.cmd (original) +++ trunk/tools/RosBE-Windows/Root/Build-Shared.cmd Fri Aug 24 01:24:42 2007 @@ -32,7 +32,7 @@ if %logdiff% == 0 ( if not exist "RosBE-Logs\." ( if not exist ".svn\." ( - echo Folder is empty. No Build can be performed. + echo Folder is empty. No Build can be performed without a Source Code. goto :EOB ) else ( mkdir "RosBE-Logs" 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 Fri Aug 24 01:24:42 2007 @@ -1,7 +1,9 @@ *** Oct XXth, 2007 - RosBE 0.3.8 Released - Added DrFred's Config Tool. (Daniel Reimer) -- Added ShortCut Tool (Daniel Reimer) +- Added ShortCut Tool. (Daniel Reimer) +- Updated w32api-3.9 to w32api-3.10. (except float.h which breaks build) (Daniel Reimer) +- Updated mingw-runtime-3.12 to mingw-runtime-3.13. (Daniel Reimer) *** Aug XXst, 2007 - RosBE 0.3.7.2 Released (Unsupported) Added: trunk/tools/RosBE-Windows/Root/de-DE/Build-Multi.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/de-DE/Bui… ============================================================================== --- trunk/tools/RosBE-Windows/Root/de-DE/Build-Multi.cmd (added) +++ trunk/tools/RosBE-Windows/Root/de-DE/Build-Multi.cmd Fri Aug 24 01:24:42 2007 @@ -1,0 +1,40 @@ +:: +:: PROJECT: RosBE - ReactOS Build Environment for Windows +:: LICENSE: GPL - See COPYING in the top level directory +:: FILE: Root/Build-Multi.cmd +:: PURPOSE: Perform the build of ReactOS, but use the -j option with the appropriate +:: number for the number of CPUs in the system. +:: COPYRIGHT: Copyright 2007 Daniel Reimer <reimer.daniel(a)freenet.de> +:: Colin Finck <mail(a)colinfinck.de> +:: Peter Ward <dralnix(a)gmail.com> +:: +:: +@echo off + +title Kompiliert... + +:: +:: Clear variables before use. +:: +set CPUCOUNT= + +:: +:: Get the number of CPUs in the system so we know how many jobs to execute. +:: To modify the number used alter the options used with cpucount: +:: No Option - Number of CPUs. +:: -x1 - Number of CPUs, Plus 1. +:: -x2 - Number of CPUs, Doubled. +:: +for /f "usebackq" %%i in (`cpucount -x1`) do set CPUCOUNT=%%i + +:: +:: Set the build command +:: +set MAKE_COMMAND="%_MINGWMAKE%" -j %CPUCOUNT% %1 + +:: +:: Execute the shared build commands +:: +call "%ROSBEBASEDIR%\Build-Shared.cmd" %2 + +title ReactOS Build Environment %_VER% Added: trunk/tools/RosBE-Windows/Root/de-DE/Build-Shared.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/de-DE/Bui… ============================================================================== --- trunk/tools/RosBE-Windows/Root/de-DE/Build-Shared.cmd (added) +++ trunk/tools/RosBE-Windows/Root/de-DE/Build-Shared.cmd Fri Aug 24 01:24:42 2007 @@ -1,0 +1,103 @@ +:: +:: PROJECT: RosBE - ReactOS Build Environment for Windows +:: LICENSE: GPL - See COPYING in the top level directory +:: FILE: Root/Build-Shared.cmd +:: PURPOSE: Shared actions for "Build.cmd" and "Build-Multi.cmd". +:: COPYRIGHT: Copyright 2007 Daniel Reimer <reimer.daniel(a)freenet.de> +:: Colin Finck <mail(a)colinfinck.de> +:: Peter Ward <dralnix(a)gmail.com> +:: +:: +@echo off + +:: +:: Take over the 2nd parameter of Build.cmd, which enables/disables stripping. +:: +if "%1" == "strip" ( + set ROS_LEAN_AND_MEAN = yes + goto :Build +) +if "%1" == "" ( + set ROS_LEAN_AND_MEAN = no + goto :Build +) + +:Build + +:: +:: Check if our log directory exists, if it doesn't, create it. Also check +:: if the default Path was editied by Config Tool. If so, update the +:: path. +:: +if %logdiff% == 0 ( +if not exist "RosBE-Logs\." ( + if not exist ".svn\." ( + echo Der Ordner ist leer. Kompilieren ist ohne Source-Code nicht möglich. + goto :EOB + ) else ( + mkdir "RosBE-Logs" + set _ROSBELOGDIR=RosBE-Logs + ) + ) else ( + set _ROSBELOGDIR=RosBE-Logs + ) +) +if %logdiff% == 1 ( + if not exist "%ROSBE_LOGPATH%\." ( + echo LogFolder does not exist. + ) else ( + set _ROSBELOGDIR=%ROSBE_LOGPATH% + ) + ) +) + +:: +:: Check if config.template.rbuild is newer than config.rbuild, if it is then +:: abort the build and inform the user. +:: +if exist "config.rbuild" ( + test "config.template.rbuild" -nt "config.rbuild" + if not errorlevel 1 ( + echo. + echo *** config.template.rbuild ist neuer als config.rbuild *** + echo *** aborting build. Bitte aktualisieren Sie ihre *** + echo *** config.rbuild, indem Sie "config update" eintippen.*** + echo. + goto :EOB + ) +) + +:: +:: Get the current date and time for use in in our build log's file name. +:: +call "%ROSBEBASEDIR%\TimeDate.cmd" + +:: +:: Now use mingw32-make to build ReactOS, passing along options, if any. +:: +title Started: %TIMERAW%, Building... + +if %ROSBE_SHOWTIME% == 1 ( + if %ROSBE_WRITELOG% == 1 ( + buildtime "%MAKE_COMMAND%" 2>&1 | tee "%_ROSBELOGDIR%\BuildLog-%_MINGWVERSION%-%DATENAME%-%TIMENAME%.txt" + ) + if %ROSBE_WRITELOG% == 0 ( + buildtime "%MAKE_COMMAND%" 2>&1 + ) +) +if %ROSBE_SHOWTIME% == 0 ( + if %ROSBE_WRITELOG% == 1 ( + "%MAKE_COMMAND%" 2>&1 | tee "%_ROSBELOGDIR%\BuildLog-%_MINGWVERSION%-%DATENAME%-%TIMENAME%.txt" + ) + if %ROSBE_WRITELOG% == 0 ( + "%MAKE_COMMAND%" 2>&1 + ) +) + +:: +:: Highlight the fact that building has ended. +:: +flash + +:EOB +title ReactOS Build Environment %_VER% Added: trunk/tools/RosBE-Windows/Root/de-DE/Build.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/de-DE/Bui… ============================================================================== --- trunk/tools/RosBE-Windows/Root/de-DE/Build.cmd (added) +++ trunk/tools/RosBE-Windows/Root/de-DE/Build.cmd Fri Aug 24 01:24:42 2007 @@ -1,0 +1,25 @@ +:: +:: PROJECT: RosBE - ReactOS Build Environment for Windows +:: LICENSE: GPL - See COPYING in the top level directory +:: FILE: Root/Build.cmd +:: PURPOSE: Perform the build of ReactOS. +:: COPYRIGHT: Copyright 2007 Daniel Reimer <reimer.daniel(a)freenet.de> +:: Colin Finck <mail(a)colinfinck.de> +:: Peter Ward <dralnix(a)gmail.com> +:: +:: +@echo off + +title Kompiliert... + +:: +:: Set the build command +:: +set MAKE_COMMAND="%_MINGWMAKE%" %1 + +:: +:: Execute the shared build commands +:: +call "%ROSBEBASEDIR%\Build-Shared.cmd" %2 + +title ReactOS Build Environment %_VER% Added: trunk/tools/RosBE-Windows/Root/de-DE/Clean.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/de-DE/Cle… ============================================================================== --- trunk/tools/RosBE-Windows/Root/de-DE/Clean.cmd (added) +++ trunk/tools/RosBE-Windows/Root/de-DE/Clean.cmd Fri Aug 24 01:24:42 2007 @@ -1,0 +1,135 @@ +:: +:: PROJECT: RosBE - ReactOS Build Environment for Windows +:: LICENSE: GPL - See COPYING in the top level directory +:: FILE: Root/Clean.cmd +:: PURPOSE: Clean the ReactOS source directory. +:: COPYRIGHT: Copyright 2007 Daniel Reimer <reimer.daniel(a)freenet.de> +:: Peter Ward <dralnix(a)gmail.com> +:: +:: +@echo off + +title Aufräumen... + +if "%1" == "" ( + :: + : Check if we have something to clean, if so, clean it. + :: + if exist "obj-i386\." ( + echo ReactOS Source Ordner wird aufgeräumt... + + :: + : Run ReactOS's make clean. + :: + "%_MINGWMAKE%" clean 1> NUL 2> NUL + + :: + : Remove directories/makefile.auto created by the build. + :: + if exist "obj-i386\." ( + rd /s /q "obj-i386" 1> NUL 2> NUL + ) + if exist "output-i386\." ( + rd /s /q "output-i386" 1> NUL 2> NUL + ) + if exist "reactos\." ( + rd /s /q "reactos" 1> NUL 2> NUL + ) + if exist "makefile.auto" ( + del "makefile.auto" 1> NUL 2> NUL + ) + + :: + : Now delete auto-generated/copied files not removed by make clean. + :: + del /f "media\inf\syssetup.inf" 1> NUL 2> NUL + del /f "include\roscfg.h" 1> NUL 2> NUL + del /f "dll\win32\ole32\nodrop.cur" 1> NUL 2> NUL + del /f "dll\win32\ole32\drag_move.cur" 1> NUL 2> NUL + del /f "dll\win32\ole32\drag_copy.cur" 1> NUL 2> NUL + del /f "dll\win32\ole32\drag_link.cur" 1> NUL 2> NUL + del /f "dll\win32\comctl32\idc_divideropen.cur" 1> NUL 2> NUL + del /f "dll\win32\comctl32\idc_copy.cur" 1> NUL 2> NUL + del /f "dll\win32\comctl32\idc_divider.cur" 1> NUL 2> NUL + del /f "dll\win32\comctl32\idb_view_small.bmp" 1> NUL 2> NUL + del /f "dll\win32\comctl32\idb_std_large.bmp" 1> NUL 2> NUL + del /f "dll\win32\comctl32\idb_view_large.bmp" 1> NUL 2> NUL + del /f "dll\win32\comctl32\idi_tt_info_sm.ico" 1> NUL 2> NUL + del /f "dll\win32\comctl32\idc_movebutton.cur" 1> NUL 2> NUL + del /f "dll\win32\comctl32\idi_tt_warn_sm.ico" 1> NUL 2> NUL + del /f "dll\win32\comctl32\idi_dragarrow.ico" 1> NUL 2> NUL + del /f "dll\win32\comctl32\idb_hist_small.bmp" 1> NUL 2> NUL + del /f "dll\win32\comctl32\idb_hist_large.bmp" 1> NUL 2> NUL + del /f "dll\win32\comctl32\idt_check.bmp" 1> NUL 2> NUL + del /f "dll\win32\comctl32\idi_tt_error_sm.ico" 1> NUL 2> NUL + del /f "dll\win32\comctl32\idb_std_small.bmp" 1> NUL 2> NUL + del /f "dll\win32\msi\instabsent.bmp" 1> NUL 2> NUL + del /f "dll\win32\msi\instlocal.bmp" 1> NUL 2> NUL + del /f "dll\win32\msi\instadvert.bmp" 1> NUL 2> NUL + del /f "dll\win32\comdlg32\network.ico" 1> NUL 2> NUL + del /f "dll\win32\comdlg32\fontpics.bmp" 1> NUL 2> NUL + del /f "dll\win32\comdlg32\pd32_nocollate.ico" 1> NUL 2> NUL + del /f "dll\win32\comdlg32\pd32_collate.ico" 1> NUL 2> NUL + del /f "dll\win32\comdlg32\folder.ico" 1> NUL 2> NUL + del /f "dll\win32\comdlg32\cdrom.ico" 1> NUL 2> NUL + del /f "dll\win32\comdlg32\floppy.ico" 1> NUL 2> NUL + del /f "dll\win32\comdlg32\pd32_landscape.ico" 1> NUL 2> NUL + del /f "dll\win32\comdlg32\folder2.ico" 1> NUL 2> NUL + del /f "dll\win32\comdlg32\800.bmp" 1> NUL 2> NUL + del /f "dll\win32\comdlg32\pd32_portrait.ico" 1> NUL 2> NUL + del /f "dll\win32\comdlg32\hdisk.ico" 1> NUL 2> NUL + + del /f "dll\ntdll\napi.S" 1> NUL 2> NUL + del /f "dll\ntdll\i386\napi.S" 1> NUL 2> NUL + rmdir /q "dll\ntdll\i386" 1> NUL 2> NUL + del /f "dll\win32\gdi32\misc\win32k.S" 1> NUL 2> NUL + del /f "dll\win32\gdi32\misc\i386\win32k.S" 1> NUL 2> NUL + rmdir /q "dll\win32\gdi32\misc\i386" 1> NUL 2> NUL + del /f "dll\win32\kernel32\errcodes.rc" 1> NUL 2> NUL + del /f "dll\win32\user32\misc\win32k.S" 1> NUL 2> NUL + del /f "dll\win32\user32\misc\i386\win32k.S" 1> NUL 2> NUL + rmdir /q "dll\win32\user32\misc\i386" 1> NUL 2> NUL + del /f "include\reactos\bugcodes.h" 1> NUL 2> NUL + del /f "include\reactos\buildno.h" 1> NUL 2> NUL + del /f "include\reactos\errcodes.h" 1> NUL 2> NUL + del /f "lib\win32ksys\win32k.S" 1> NUL 2> NUL + del /f "lib\win32ksys\i386\win32k.S" 1> NUL 2> NUL + rmdir /q "lib\win32ksys\i386" 1> NUL 2> NUL + del /f "ntoskrnl\bugcodes.rc" 1> NUL 2> NUL + del /f "ntoskrnl\ex\zw.S" 1> NUL 2> NUL + del /f "ntoskrnl\ex\i386\zw.S" 1> NUL 2> NUL + del /f "ntoskrnl\include\internal\napi.h" 1> NUL 2> NUL + del /f "subsystems\win32\win32k\dib\dib16gen.c" 1> NUL 2> NUL + del /f "subsystems\win32\win32k\dib\dib32gen.c" 1> NUL 2> NUL + del /f "subsystems\win32\win32k\dib\dib8gen.c" 1> NUL 2> NUL + del /f "subsystems\win32\win32k\include\napi.h" 1> NUL 2> NUL + + echo ReactOS Source Ordner aufgeräumt. + ) else ( + echo ReactOS Source Ordner ist bereits aufgeräumt. + ) + title ReactOS Build Environment %_VER% + goto :EOC +) +if "%1" == "logs" ( + :: + : Check if we have any logs to clean, if so, clean them. + :: + if exist "%_ROSBELOGDIR%\*.txt" ( + echo Kompilier-Logs werden gelöscht... + + del /f "%_ROSBELOGDIR%\*.txt" 1> NUL 2> NUL + + echo Alle Kompilier-Logs gelöscht. + ) else ( + echo Keine Logs zu löschen vorhanden. + ) + goto :EOC +) +if not "%1" == "" ( + echo Unbekannter Parameter. Versuchen Sie 'help [BEFEHL]'. + goto :EOC +) + +:EOC +title ReactOS Build Environment %_VER% Added: trunk/tools/RosBE-Windows/Root/de-DE/RosBE.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/de-DE/Ros… ============================================================================== --- trunk/tools/RosBE-Windows/Root/de-DE/RosBE.cmd (added) +++ trunk/tools/RosBE-Windows/Root/de-DE/RosBE.cmd Fri Aug 24 01:24:42 2007 @@ -1,0 +1,130 @@ +:: +:: PROJECT: RosBE - ReactOS Build Environment for Windows +:: LICENSE: GPL - See COPYING in the top level directory +:: FILE: Root/RosBE.cmd +:: PURPOSE: This script provides/sets up various build environments for +:: ReactOS. Currently it provides GCC 4.1.3 build environments. +:: COPYRIGHT: Copyright 2007 Daniel Reimer <reimer.daniel(a)freenet.de> +:: Peter Ward <dralnix(a)gmail.com> +:: +:: +@echo off + +:: +:: Set Defaults to work with and override them if edited by +:: Config Tool. +:: +color 0A +set _VER=0.3.7.2 +set ROSBEBASEDIR=%~dp0 +for /f "usebackq" %%i in (`"echo %ROSBEBASEDIR%|%ROSBEBASEDIR%Tools\sed s/.$//g"`) do @SET ROSBEBASEDIR=%%i +set _ROSSOURCEDIRBASE=%CD% +set ROSBE_SHOWTIME=1 +set ROSBE_WRITELOG=1 +set _LOGDIR=%CD%\RosBE-Logs + +if exist %ROSBEBASEDIR%\options.cmd ( + goto :PREV +) else ( + set logdiff=0 + goto :NEXT +) + +:PREV +call %ROSBEBASEDIR%\options.cmd +if %_LOGDIR% == %ROSBE_LOGPATH% ( + set logdiff=0 +) else ( + set logdiff=1 +) + +:NEXT +title ReactOS Build Environment %_VER% + +:: +:: Make sure RosBE was initialized right. +:: +if "%1" == "" ( + cls + call :RosBE4 + goto :EndCommandParse +) +if not "%1" == "" ( + cls + echo Unbekannter Parameter. Anwendung wird geschlossen. + goto :ExitRosBE +) + +:EndCommandParse + +:: +:: Load the Base Directory from the Shortcut-XML and set it as new +:: Source Directory and add PATH for Tools Folder. +:: +set PATH=%ROSBEBASEDIR%\Tools;%PATH% +for /f "usebackq" %%i in (`"grep base= "%ROSBEBASEDIR%\srclist.xml"|cutz main"`) do @SET scut=%%i +echo Verwendeter Shortcut: %scut% +echo. + +:: +:: 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" + +:: +:: Tell how to display the available commands. +:: +echo. +echo Für eine Liste aller integrierten Befehle, tippen Sie: "help" ein. +echo ------------------------------------------------------------------ + +:: +:: Load the macros that serve as our commands and set new Source +:: Directory / Default Source Directory. +:: +doskey /macrofile="%ROSBEBASEDIR%\RosBE.mac" +if "%scut%" == "Default" ( + set _ROSSOURCEDIR=%_ROSSOURCEDIRBASE% +) else ( + call %ROSBEBASEDIR%\scut %scut% +) +:: +:: Look if the Source Folder is empty. If so, ask for using "svn create". +:: +dir /b "%_ROSSOURCEDIR%" 2>nul|findstr "." >nul +if errorlevel 1 ( + echo Kein ReactOS Source gefunden. Bitte nutzen Sie "ssvn create", um ihn herunterzuladen. + goto :ExitRosBE +) else ( + goto :ExitRosBE +) +goto :ExitRosBE + +:: +:: Display the banner and set up the environment for the GCC 4.x.x build +:: environment. +:: +:RosBE4 + :: + :: Set the correct path for the build tools and set the MinGW make. + :: + set PATH=%ROSBEBASEDIR%\4.1.3\bin;%ROSBEBASEDIR%\4.1.3\libexec\gcc\mingw32\4.1.3;%PATH% + set _MINGWMAKE=%ROSBEBASEDIR%\4.1.3\bin\mingw32-make.exe + set _MINGWVERSION=4.1.3 + :: Set all paths (needed by Windows Vista) + set C_INCLUDE_PATH=%ROSBEBASEDIR%\4.1.3\include;%ROSBEBASEDIR%\4.1.3\lib\gcc\mingw32\4.1.3\include + set CPLUS_INCLUDE_PATH=%ROSBEBASEDIR%\4.1.3\include;%ROSBEBASEDIR%\4.1.3\include\c++\4.1.3;%ROSBEBASEDIR%\4.1.3\include\c++\4.1.3\mingw32;%ROSBEBASEDIR%\4.1.3\lib\gcc\mingw32\4.1.3\include + set LIBRARY_PATH=%ROSBEBASEDIR%\4.1.3\lib;%ROSBEBASEDIR%\4.1.3\lib\gcc\mingw32\4.1.3 + + echo ******************************************************************************* + echo * * + echo * ReactOS Build Environment %_VER%-4.1.3-20070703 (prerelease) * + echo * * + echo ******************************************************************************* + echo. +goto :EOF + +:ExitRosBE Added: trunk/tools/RosBE-Windows/Root/de-DE/reladdr2line.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/de-DE/rel… ============================================================================== --- trunk/tools/RosBE-Windows/Root/de-DE/reladdr2line.cmd (added) +++ trunk/tools/RosBE-Windows/Root/de-DE/reladdr2line.cmd Fri Aug 24 01:24:42 2007 @@ -1,0 +1,56 @@ +:: +:: PROJECT: RosBE - ReactOS Build Environment for Windows +:: LICENSE: GPL - See COPYING in the top level directory +:: FILE: Root/reladdr2line.cmd +:: PURPOSE: Converts a value to hex and displays it. +:: COPYRIGHT: Copyright 2007 Christoph von Wittich <Christoph_vW(a)reactos.org> +:: Daniel Reimer <reimer.daniel(a)freenet.de> +:: +:: +@echo off + +title relAddr2Line... + +:: +:: Receive the Parameters and decide what to do. +:: + +if "%1" == "" ( + goto :MAN +) +if not "%1" == "" ( + set _1=%1 + if "%2" == "" ( + goto :AUTO1 + ) else ( + set _2=%2 + goto :EOC + ) +) + +:: +:: If Parameters were set, parse them, if not, ask the user to add them. +:: +:MAN +echo Geben Sie den Pfad zur zu untersuchenden Anwendung ein. +SET /P _1= +:AUTO1 +echo Geben Sie die Adresse ein, die Sie innerhalb der Anwendung untersuchen wollen. +SET /P _2= + +:EOC +:: +:: First get the ImageBase of the File. If its smaller than the given +:: Parameter, everything is ok, because it was already added onto the +:: adress and can be given directly to raddr2line. If not, add it and +:: give the result to raddr2line. +:: +for /f "tokens=2" %%i in ('"objdump -p %_1% 2>NUL | findstr ImageBase"') do SET baseaddr=0x%%i +if %%i LSS %_2% ( + raddr2line "%_1%" "%_2%" 2>NUL +) else ( + set /a baseaddr += 0x%_2% + for /f %%i in ('"echoh %baseaddr%"') do set relbase=%%i + raddr2line "%_1%" "%relbase%" 2>NUL +) +title ReactOS Build Environment %_VER% Added: trunk/tools/RosBE-Windows/Root/de-DE/sSVN.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/de-DE/sSV… ============================================================================== --- trunk/tools/RosBE-Windows/Root/de-DE/sSVN.cmd (added) +++ trunk/tools/RosBE-Windows/Root/de-DE/sSVN.cmd Fri Aug 24 01:24:42 2007 @@ -1,0 +1,89 @@ +:: +:: PROJECT: RosBE - ReactOS Build Environment for Windows +:: LICENSE: GPL - See COPYING in the top level directory +:: FILE: Root/SVN.cmd +:: PURPOSE: Integrated SVN Client. +:: COPYRIGHT: Copyright 2007 Daniel Reimer <reimer.daniel(a)freenet.de> +:: +:: +@echo off + +:: +:: Receive the first Parameter and decide what to do. +:: +if "%1" == "" ( + echo Unbekannter Parameter. Versuchen Sie 'help [BEFEHL]'. + goto :ExitSVN +) +:: +:: These two are directly parsed to svn. +:: +if "%1" == "update" ( + title Aktualisiert... + if not "%2" == "" ( + svn update -r %2 + ) else ( + svn update + ) +goto :ExitSVN +) +if "%1" == "cleanup" ( + title Aufräumen... + svn cleanup + goto :ExitSVN +) +:: +:: Check if the Folder is empty. If not, output an error. +:: + +if "%1" == "create" ( + title Erstellt... + if exist ".svn\." ( + echo Dieser Ordner enthält bereits einen Source Code. Anwendung wird beendet. + goto :ExitSVN + ) + dir /b 2>nul|findstr "." >nul + if errorlevel 1 ( + svn checkout svn://svn.reactos.org/reactos/trunk/reactos + ) else ( + echo Dieser Ordner ist nicht leer. Fortsetzen ist riskant und kann Fehler verursachen. Anwendung wird beendet. + ) + goto :ExitSVN +) +:: +:: Output the rev of your and the Online Tree and tell the User if +:: its Up to Date or not. +:: +if "%1" == "status" ( + title Status + for /f "usebackq" %%i IN (`svnversion .`) DO @set OFFSVN=%%i + for /f "usebackq" %%j IN (`"svn info svn://svn.reactos.org/reactos/trunk/reactos|find "Revision:"|cutz svn"`) DO @set ONSVN=%%j + call :UP + goto :ExitSVN +) + +if not "%1" == "" ( + echo Unbekannter Parameter. Versuchen Sie 'help [BEFEHL]'. + goto :ExitSVN +) + +:UP +echo Derzeitige Offline Revision: %OFFSVN% +echo Online HEAD Revision: %ONSVN% +echo. +if %OFFSVN% LSS %ONSVN% ( + echo Ihr Code ist nicht aktuell. Wollen Sie ihn aktualisieren? + goto :UP2 +) +if %OFFSVN% EQU %ONSVN% ( + echo Ihr Code ist aktuell. + goto :ExitSVN +) + +:UP2 +SET /P XY="(yes), (no)" +if /I "%XY%"=="yes" %ROSBEBASEDIR%\ssvn update +if /I "%XY%"=="no" goto :ExitSVN + +:ExitSVN +title ReactOS Build Environment %_VER% Added: trunk/tools/RosBE-Windows/Root/de-DE/scut.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/de-DE/scu… ============================================================================== --- trunk/tools/RosBE-Windows/Root/de-DE/scut.cmd (added) +++ trunk/tools/RosBE-Windows/Root/de-DE/scut.cmd Fri Aug 24 01:24:42 2007 @@ -1,0 +1,138 @@ +:: +:: PROJECT: RosBE - ReactOS Build Environment for Windows +:: LICENSE: GPL - See COPYING in the top level directory +:: FILE: Root/scut.cmd +:: PURPOSE: Shortcut Creator, Remover and Switcher. +:: COPYRIGHT: Copyright 2007 Daniel Reimer <reimer.daniel(a)freenet.de> +:: +:: +@echo off + +title Wählen Sie Ihren Source Ordner... + +:: +:: Receive the first Parameter and decide what to do. +:: +if /I "%1"=="" ( + goto :DEF +) +if /I "%1"=="add" ( + goto :ADD +) +if /I "%1"=="rem" ( + goto :REM +) +if /I "%1"=="def" ( + goto :DEF2 +) else ( + set XY=%1 + goto :RUN +) +goto :END + +:: +:: Load Shortcut from XML and set it active. +:: +:DEF +echo Wählen Sie Ihren Source Ordner: +SET /P XY= +:RUN +grep name=\"%XY%\" "%ROSBEBASEDIR%\srclist.xml"|cutz dir > "%ROSBEBASEDIR%\aaa.tmp" +test -s "%ROSBEBASEDIR%\aaa.tmp" +if errorlevel 1 ( + echo Ein Shortcut mit diesem Namen ist nicht vorhanden. + del "%ROSBEBASEDIR%\aaa.tmp" + goto :END +) else ( + set /P dir=<"%ROSBEBASEDIR%\aaa.tmp" + call cd /D %dir% + del "%ROSBEBASEDIR%\aaa.tmp" + goto :END +) + +:: +:: Add new Shortcut to XML. +:: +:ADD +if not "%2" == "" ( + if not "%3" == "" ( + set CUT=%2 + set DIR=%3 + goto :ADD23 + ) else ( + set CUT=%2 + goto :ADD2 + ) +) else ( + goto :ADD1 +) + +:ADD1 +echo Wählen Sie Ihren Shortcut: +SET /P CUT= +:ADD2 +echo Wählen Sie Ihren Source Ordner: +SET /P DIR= +:ADD23 +echo ^<property name="%CUT%" value="%DIR%" /^> > "%ROSBEBASEDIR%\aaa.tmp" +copy "%ROSBEBASEDIR%\srclist.xml" + "%ROSBEBASEDIR%\aaa.tmp" "%ROSBEBASEDIR%\srclist2.xml" +del "%ROSBEBASEDIR%\srclist.xml" +ren "%ROSBEBASEDIR%\srclist2.xml" srclist.xml +del "%ROSBEBASEDIR%\aaa.tmp" +goto :END + +:: +:: Remove Shortcut from XML. +:: +:REM +if not "%2" == "" ( + set CUTREM=%2 + goto :REM1 +) +echo Wählen Sie Ihren Shortcut: +SET /P CUTREM= +:REM1 +grep name=\"%CUTREM%\" "%ROSBEBASEDIR%\srclist.xml"|cutz dir > "%ROSBEBASEDIR%\aaa.tmp" +test -s "%ROSBEBASEDIR%\aaa.tmp" +if errorlevel 1 ( + echo Ein Shortcut mit diesem Namen ist nicht vorhanden. + del "%ROSBEBASEDIR%\aaa.tmp" + goto :END +) else ( + grep -v name=\"%CUTREM%\" "%ROSBEBASEDIR%\srclist.xml" > "%ROSBEBASEDIR%\srclist2.xml" + del "%ROSBEBASEDIR%\srclist.xml" + ren "%ROSBEBASEDIR%\srclist2.xml" srclist.xml + del "%ROSBEBASEDIR%\aaa.tmp" + goto :END +) + +:: +:: Set Default Shortcut. +:: +:DEF2 +if not "%2" == "" ( + set DEF=%2 + goto :DEF1 +) +echo Wählen Sie Ihren neuen Standard-Shortcut: +SET /P DEF= +:DEF1 +grep name=\"%DEF%\" "%ROSBEBASEDIR%\srclist.xml"|cutz dir > "%ROSBEBASEDIR%\aaa.tmp" +test -s "%ROSBEBASEDIR%\aaa.tmp" +if errorlevel 1 ( + echo Ein Shortcut mit diesem Namen ist nicht vorhanden. + del "%ROSBEBASEDIR%\aaa.tmp" + goto :END +) else ( + sed "s/base=\".*\"/base=\"%DEF%\"/g" "%ROSBEBASEDIR%\srclist.xml" > "%ROSBEBASEDIR%\srclist2.xml" + del "%ROSBEBASEDIR%\srclist.xml" + ren "%ROSBEBASEDIR%\srclist2.xml" srclist.xml + del "%ROSBEBASEDIR%\aaa.tmp" + goto :PREEND +) + +:PREEND +call "%ROSBEBASEDIR%\RosBE.cmd" + +:END +title ReactOS Build Environment %_VER%

1 0

[janderwald] 28495: - add german translation
by janderwald＠svn.reactos.org 23 Aug '07

23 Aug '07

Author: janderwald Date: Fri Aug 24 00:47:53 2007 New Revision: 28495 URL: http://svn.reactos.org/svn/reactos?rev=28495&view=rev Log: - add german translation Added: trunk/reactos/base/applications/cmdutils/find/lang/de-DE.rc (with props) Modified: trunk/reactos/base/applications/cmdutils/find/rsrc.rc Added: trunk/reactos/base/applications/cmdutils/find/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/find/lang/de-DE.rc (added) +++ trunk/reactos/base/applications/cmdutils/find/lang/de-DE.rc Fri Aug 24 00:47:53 2007 @@ -1,0 +1,17 @@ +LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + +IDS_USAGE, "Sucht in einer Datei nach einer Zeichenfolge.\n\n\ + FIND [ /C ] [ /I ] [ /N ] [ /V ] \"string\" [ file... ]\n\ + /C Zeigt nur die Anzahl der die Zeichenfolge enthaltenen Zeilen an.\n\ + /I Ignoriert Groß-/Kleinbuchstaben bei der Suche.\n\ + /N Zeigt die Zeilen mit ihren Zeilennummern an.\n\ + /V Zeigt alle Zeilen an, die die Zeichenfolge NICHT enhalten." + +IDS_NO_SUCH_FILE, "Datei %s nicht gefunden\n" + +IDS_CANNOT_OPEN, "Datei %s kann nicht geöffnet werden.\n" + +} Propchange: trunk/reactos/base/applications/cmdutils/find/lang/de-DE.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/cmdutils/find/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/find/rsrc.rc (original) +++ trunk/reactos/base/applications/cmdutils/find/rsrc.rc Fri Aug 24 00:47:53 2007 @@ -1,5 +1,6 @@ #include <windows.h> #include "resource.h" +#include "lang/de-DE.rc" #include "lang/en-US.rc" #include "lang/ru-RU.rc"

1 0

[greatlrd] 28494: implement DeviceCapabilitiesExA and DeviceCapabilitiesExW, both always return -1 redirect DeleteColorSpace@4 to NtGdiDeleteColorSpace@4
by greatlrd＠svn.reactos.org 23 Aug '07

23 Aug '07

Author: greatlrd Date: Fri Aug 24 00:47:43 2007 New Revision: 28494 URL: http://svn.reactos.org/svn/reactos?rev=28494&view=rev Log: implement DeviceCapabilitiesExA and DeviceCapabilitiesExW, both always return -1 redirect DeleteColorSpace@4 to NtGdiDeleteColorSpace@4 Modified: trunk/reactos/dll/win32/gdi32/gdi32.def trunk/reactos/dll/win32/gdi32/misc/stubs.c trunk/reactos/dll/win32/gdi32/misc/stubsa.c trunk/reactos/dll/win32/gdi32/misc/stubsw.c Modified: trunk/reactos/dll/win32/gdi32/gdi32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/gdi32.def?… ============================================================================== --- trunk/reactos/dll/win32/gdi32/gdi32.def (original) +++ trunk/reactos/dll/win32/gdi32/gdi32.def Fri Aug 24 00:47:43 2007 @@ -86,18 +86,21 @@ CreateScalableFontResourceA@16 CreateScalableFontResourceW@16 CreateSolidBrush@4 - -ClearBitmapAttributes@8 -ClearBrushAttributes@8 DPtoLP@12 -DeleteColorSpace@4 +DeleteColorSpace@4=NtGdiDeleteColorSpace@4 DeleteDC@4 DeleteEnhMetaFile@4 DeleteMetaFile@4 DeleteObject@4 DescribePixelFormat@16 -DeviceCapabilitiesExA@20 -DeviceCapabilitiesExW@20 +DeviceCapabilitiesExA +DeviceCapabilitiesExW +DrawEscape@16 + +ClearBitmapAttributes@8 +ClearBrushAttributes@8 +DeleteObject@4 +DescribePixelFormat@16 DdEntry1@16=NtGdiD3dContextCreate@16 DdEntry2@4=NtGdiD3dContextDestroy@4 DdEntry3@4=NtGdiD3dContextDestroyAll@4 @@ -154,7 +157,6 @@ DdEntry54@8=NtGdiDdUnlockD3D@8 DdEntry55@12=NtGdiDdUpdateOverlay@12 DdEntry56@8=NtGdiDdWaitForVerticalBlank@8 -DrawEscape@16 Ellipse@20=NtGdiEllipse@20 EnableEUDC@4 EndDoc@4 Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/stubs.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/stubs.c Fri Aug 24 00:47:43 2007 @@ -835,22 +835,6 @@ SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } - - -/* - * @unimplemented - */ -BOOL -STDCALL -DeleteColorSpace( - HCOLORSPACE a0 - ) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; -} - /* * @unimplemented Modified: trunk/reactos/dll/win32/gdi32/misc/stubsa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/stubsa.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/stubsa.c Fri Aug 24 00:47:43 2007 @@ -15,7 +15,7 @@ /* - * @unimplemented + * @implemented */ int STDCALL @@ -27,9 +27,8 @@ CONST DEVMODEA *pDevMode ) { - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + /* Note Windows 2000/XP/VISTA always return -1 */ + return -1; } Modified: trunk/reactos/dll/win32/gdi32/misc/stubsw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/stubsw.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/stubsw.c Fri Aug 24 00:47:43 2007 @@ -14,7 +14,7 @@ #define UNIMPLEMENTED DbgPrint("GDI32: %s is unimplemented, please try again later.\n", __FUNCTION__); /* - * @unimplemented + * @implemented */ int STDCALL @@ -26,18 +26,8 @@ CONST DEVMODEW *pDevMode ) { -#if 0 - /* FIXME no NtGdiDeviceCapabilities???? */ - return NtGdiDeviceCapabilities ( pDevice, - pPort, - fwCapability, - pOutput, - pDevMode ); -#else - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -#endif + /* Note Windows 2000/XP/VISTA always return -1 */ + return -1; }

1 0

[dreimer] 28493: Fix a typo.
by dreimer＠svn.reactos.org 23 Aug '07

23 Aug '07

Author: dreimer Date: Fri Aug 24 00:30:11 2007 New Revision: 28493 URL: http://svn.reactos.org/svn/reactos?rev=28493&view=rev Log: Fix a typo. Modified: trunk/reactos/base/applications/logoff/lang/de-DE.rc Modified: trunk/reactos/base/applications/logoff/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/logoff/l… ============================================================================== --- trunk/reactos/base/applications/logoff/lang/de-DE.rc (original) +++ trunk/reactos/base/applications/logoff/lang/de-DE.rc Fri Aug 24 00:30:11 2007 @@ -7,7 +7,7 @@ /v\t\tZeigt Informationen zu den Aktionen an, die gerade ausgeführt werden.\n\ /?\t\tZeigt diese Informationen an.\n\n" -IDS_LOGOFF_REMOTE, "Beendet eine Siztung auf einem Server." +IDS_LOGOFF_REMOTE, "Beendet eine Sitzung auf einem Server." IDS_LOGOFF_LOCAL, "Beendet eine Sitzung auf dem aktuellen Server." IDS_ILLEGAL_PARAM, "Ungültige(r) Parameter\n"

1 0

[janderwald] 28492: - turn back cursor on screensaver exit - display fullscreen instead of maximized - patch by Vytis Girdzijauskas, "CMan", cman[at]cman[dot]us See issue #2583 for more details.
by janderwald＠svn.reactos.org 23 Aug '07

23 Aug '07

Author: janderwald Date: Fri Aug 24 00:25:20 2007 New Revision: 28492 URL: http://svn.reactos.org/svn/reactos?rev=28492&view=rev Log: - turn back cursor on screensaver exit - display fullscreen instead of maximized - patch by Vytis Girdzijauskas, "CMan", cman[at]cman[dot]us See issue #2583 for more details. Modified: trunk/reactos/base/applications/screensavers/logon/logon.c trunk/reactos/base/applications/screensavers/scrnsave/scrnsave.c trunk/reactos/base/applications/screensavers/starfield/screensaver.c Modified: trunk/reactos/base/applications/screensavers/logon/logon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/logon/logon.c (original) +++ trunk/reactos/base/applications/screensavers/logon/logon.c Fri Aug 24 00:25:20 2007 @@ -155,6 +155,7 @@ { KillTimer (hwnd, APP_TIMER); DeleteObject(bitmap); + ShowCursor(TRUE); PostQuitMessage(0); break; } @@ -223,14 +224,20 @@ else { HWND hwnd; - hwnd = CreateWindow(APPNAME, APPNAME, - WS_VISIBLE | WS_POPUP | WS_EX_TOPMOST, - 0, 0, - GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN), - HWND_DESKTOP, 0, - hInstance, NULL); - ShowWindow(hwnd, SW_SHOWMAXIMIZED); - ShowCursor(FALSE); + hwnd = CreateWindowEx(WS_EX_TOPMOST, + APPNAME, + APPNAME, + WS_VISIBLE | WS_POPUP, + 0, 0, + GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN), + HWND_DESKTOP, 0, + hInstance, NULL); + + SetWindowPos(hwnd, + 0, 0, 0, 0, 0, + SWP_NOZORDER|SWP_NOACTIVATE|SWP_NOSIZE|SWP_SHOWWINDOW); + + ShowCursor(FALSE); fullscreen = TRUE; } } Modified: trunk/reactos/base/applications/screensavers/scrnsave/scrnsave.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/scrnsave/scrnsave.c (original) +++ trunk/reactos/base/applications/screensavers/scrnsave/scrnsave.c Fri Aug 24 00:25:20 2007 @@ -37,6 +37,7 @@ switch (msg) { case WM_DESTROY: + ShowCursor(TRUE); PostQuitMessage(0); break; @@ -104,13 +105,19 @@ else { HWND hwnd; - hwnd = CreateWindow(APPNAME, APPNAME, - WS_VISIBLE | WS_POPUP | WS_EX_TOPMOST, - 0, 0, - GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN), - HWND_DESKTOP, 0, - hInstance, NULL); - ShowWindow(hwnd, SW_SHOWMAXIMIZED); + hwnd = CreateWindowEx(WS_EX_TOPMOST, + APPNAME, + APPNAME, + WS_VISIBLE | WS_POPUP, + 0, 0, + GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN), + HWND_DESKTOP, 0, + hInstance, NULL); + + SetWindowPos(hwnd, + 0, 0, 0, 0, 0, + SWP_NOZORDER|SWP_NOACTIVATE|SWP_NOSIZE|SWP_SHOWWINDOW); + ShowCursor(FALSE); fullscreen = TRUE; } Modified: trunk/reactos/base/applications/screensavers/starfield/screensaver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/starfield/screensaver.c (original) +++ trunk/reactos/base/applications/screensavers/starfield/screensaver.c Fri Aug 24 00:25:20 2007 @@ -192,6 +192,7 @@ { KillTimer (hwnd, APP_TIMER); free(stars); + ShowCursor(TRUE); PostQuitMessage (0); return 0; } @@ -266,13 +267,19 @@ else { HWND hwnd; - hwnd = CreateWindow(APPNAME, APPNAME, - WS_VISIBLE | WS_POPUP | WS_EX_TOPMOST, - 0, 0, - GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN), - HWND_DESKTOP, 0, - hInstance, NULL); - ShowWindow(hwnd, SW_SHOWMAXIMIZED); + hwnd = CreateWindowEx(WS_EX_TOPMOST, + APPNAME, + APPNAME, + WS_VISIBLE | WS_POPUP, + 0, 0, + GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN), + HWND_DESKTOP, 0, + hInstance, NULL); + + SetWindowPos(hwnd, + 0, 0, 0, 0, 0, + SWP_NOZORDER|SWP_NOACTIVATE|SWP_NOSIZE|SWP_SHOWWINDOW); + ShowCursor(FALSE); fullscreen = TRUE; }

1 0

[fireball] 28491: - Add some early skeleton for OHCI. This code isn't called by anything, so it can't break something.
by fireball＠svn.reactos.org 23 Aug '07

23 Aug '07

Author: fireball Date: Fri Aug 24 00:14:45 2007 New Revision: 28491 URL: http://svn.reactos.org/svn/reactos?rev=28491&view=rev Log: - Add some early skeleton for OHCI. This code isn't called by anything, so it can't break something. Added: trunk/reactos/drivers/usb/nt4compat/usbdriver/ohci.c (with props) trunk/reactos/drivers/usb/nt4compat/usbdriver/ohci.h (with props) Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/usbdriver.rbuild Added: trunk/reactos/drivers/usb/nt4compat/usbdriver/ohci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/ohci.c (added) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/ohci.c Fri Aug 24 00:14:45 2007 @@ -1,0 +1,271 @@ +/** + * ohci.c - USB driver stack project + * + * Copyright (c) 2007 Aleksey Bragin <aleksey(a)reactos.org> + * based on some code by Zhiming <mypublic99(a)yahoo.com> + * + * This program/include file is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as published + * by the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program/include file is distributed in the hope that it will be + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty + * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with + * this program (in the main directory of the distribution, the file + * COPYING); if not, write to the Free Software Foundation,Inc., 59 Temple + * Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "usbdriver.h" +#include "ohci.h" + +PDEVICE_OBJECT ohci_alloc(PDRIVER_OBJECT drvr_obj, PUNICODE_STRING reg_path, + ULONG bus_addr, PUSB_DEV_MANAGER dev_mgr); +//BOOLEAN ohci_release(PDEVICE_OBJECT pdev); +//static VOID ohci_stop(PEHCI_DEV ehci); +PDEVICE_OBJECT ohci_probe(PDRIVER_OBJECT drvr_obj, PUNICODE_STRING reg_path, + PUSB_DEV_MANAGER dev_mgr); +//PDEVICE_OBJECT ohci_create_device(PDRIVER_OBJECT drvr_obj, PUSB_DEV_MANAGER dev_mgr); +//BOOLEAN ohci_delete_device(PDEVICE_OBJECT pdev); +//VOID ohci_get_capabilities(PEHCI_DEV ehci, PBYTE base); +//BOOLEAN NTAPI ohci_isr(PKINTERRUPT interrupt, PVOID context); +//BOOLEAN ohci_start(PHCD hcd); + +extern USB_DEV_MANAGER g_dev_mgr; + + +PDEVICE_OBJECT ohci_probe(PDRIVER_OBJECT drvr_obj, PUNICODE_STRING reg_path, + PUSB_DEV_MANAGER dev_mgr) +{ + LONG bus, i, j, ret = 0; + PCI_SLOT_NUMBER slot_num; + PPCI_COMMON_CONFIG pci_config; + PDEVICE_OBJECT pdev; + BYTE buffer[sizeof(PCI_COMMON_CONFIG)]; + POHCI_DEVICE_EXTENSION pdev_ext; + + slot_num.u.AsULONG = 0; + pci_config = (PPCI_COMMON_CONFIG) buffer; + pdev = NULL; + + //scan the bus to find ohci controller + for(bus = 0; bus < 2; bus++) /*enum only bus0 and bus1 */ + { + for(i = 0; i < PCI_MAX_DEVICES; i++) + { + slot_num.u.bits.DeviceNumber = i; + for(j = 0; j < PCI_MAX_FUNCTIONS; j++) + { + slot_num.u.bits.FunctionNumber = j; + + ret = HalGetBusData(PCIConfiguration, + bus, slot_num.u.AsULONG, pci_config, PCI_COMMON_HDR_LENGTH); + + /* Don't look further on this device */ + if ((ret == 0) || (ret == 2)) + break; + + if (pci_config->BaseClass == 0x0c && pci_config->SubClass == 0x03 + && pci_config->ProgIf == 0x10) + { + // we found our usb host controller( OHCI ), create device + pdev = ohci_alloc(drvr_obj, reg_path, ((bus << 8) | (i << 3) | j), dev_mgr); + + if (!pdev) + continue; + } + } + + if (ret == 0) + break; + } + } + + if (pdev) + { + pdev_ext = pdev->DeviceExtension; + if (pdev_ext) + { + // acquire higher irql to eliminate pre-empty + //KeSynchronizeExecution(pdev_ext->ehci_int, ehci_cal_cpu_freq, NULL); + } + } + return NULL; +} + +PDEVICE_OBJECT +ohci_alloc(PDRIVER_OBJECT drvr_obj, PUNICODE_STRING reg_path, ULONG bus_addr, PUSB_DEV_MANAGER dev_mgr) +{ + //LONG frd_num, prd_num; + PDEVICE_OBJECT pdev = NULL; + //POHCI_DEVICE_EXTENSION pdev_ext; + //ULONG vector, addr_space; + LONG bus; + //KIRQL irql; + //KAFFINITY affinity; + + DEVICE_DESCRIPTION dev_desc; + //CM_PARTIAL_RESOURCE_DESCRIPTOR *pprd; + PCI_SLOT_NUMBER slot_num; + //NTSTATUS status; + + bus = (bus_addr >> 8); + + slot_num.u.AsULONG = 0; + slot_num.u.bits.DeviceNumber = ((bus_addr & 0xff) >> 3); + slot_num.u.bits.FunctionNumber = (bus_addr & 0x07); + + + //now create adapter object + RtlZeroMemory(&dev_desc, sizeof(dev_desc)); + + dev_desc.Version = DEVICE_DESCRIPTION_VERSION; + dev_desc.Master = TRUE; + dev_desc.ScatterGather = TRUE; + dev_desc.Dma32BitAddresses = TRUE; + dev_desc.BusNumber = bus; + dev_desc.InterfaceType = PCIBus; + //dev_desc.MaximumLength = EHCI_MAX_SIZE_TRANSFER; + + DbgPrint("ohci_alloc(): reg_path=0x%x, \n \ + ohci_alloc(): bus=0x%x, bus_addr=0x%x \n \ + ohci_alloc(): slot_num=0x%x \n \ + ", (DWORD) reg_path, (DWORD) bus, (DWORD) bus_addr, (DWORD) slot_num.u.AsULONG); +#if 0 + //let's allocate resources for this device + DbgPrint("ohci_alloc(): about to assign slot res\n"); + if ((status = HalAssignSlotResources(reg_path, NULL, //no class name yet + drvr_obj, NULL, //no support of another ehci controller + PCIBus, + bus, slot_num.u.AsULONG, &pdev_ext->res_list)) != STATUS_SUCCESS) + { + DbgPrint("ohci_alloc(): error assign slot res, 0x%x\n", status); + release_adapter(pdev_ext->padapter); + pdev_ext->padapter = NULL; + ohci_delete_device(pdev); + return NULL; + } + + //parse the resource list + for(frd_num = 0; frd_num < (LONG) pdev_ext->res_list->Count; frd_num++) + { + for(prd_num = 0; prd_num < (LONG) pdev_ext->res_list->List[frd_num].PartialResourceList.Count; + prd_num++) + { + pprd = &pdev_ext->res_list->List[frd_num].PartialResourceList.PartialDescriptors[prd_num]; + if (pprd->Type == CmResourceTypePort) + { + RtlCopyMemory(&pdev_ext->res_port, &pprd->u.Port, sizeof(pprd->u.Port)); + + } + else if (pprd->Type == CmResourceTypeInterrupt) + { + RtlCopyMemory(&pdev_ext->res_interrupt, &pprd->u.Interrupt, sizeof(pprd->u.Interrupt)); + } + else if (pprd->Type == CmResourceTypeMemory) + { + RtlCopyMemory(&pdev_ext->res_memory, &pprd->u.Memory, sizeof(pprd->u.Memory)); + } + } + } + + //for port, translate them to system address + addr_space = 0; + if (HalTranslateBusAddress(PCIBus, bus, pdev_ext->res_port.Start, &addr_space, //io space + &pdev_ext->ehci->ehci_reg_base) != (BOOLEAN) TRUE) + { + DbgPrint("ehci_alloc(): error, can not translate bus address\n"); + release_adapter(pdev_ext->padapter); + pdev_ext->padapter = NULL; + ehci_delete_device(pdev); + return NULL; + } + + DbgPrint("ehci_alloc(): address space=0x%x\n, reg_base=0x%x\n", + addr_space, pdev_ext->ehci->ehci_reg_base.u.LowPart); + + if (addr_space == 0) + { + //port has been mapped to memory space + pdev_ext->ehci->port_mapped = TRUE; + pdev_ext->ehci->port_base = (PBYTE) MmMapIoSpace(pdev_ext->ehci->ehci_reg_base, + pdev_ext->res_port.Length, FALSE); + + //fatal error can not map the registers + if (pdev_ext->ehci->port_base == NULL) + { + release_adapter(pdev_ext->padapter); + pdev_ext->padapter = NULL; + ehci_delete_device(pdev); + return NULL; + } + } + else + { + //io space + pdev_ext->ehci->port_mapped = FALSE; + pdev_ext->ehci->port_base = (PBYTE) pdev_ext->ehci->ehci_reg_base.LowPart; + } + + //before we connect the interrupt, we have to init ehci + pdev_ext->ehci->pdev_ext = pdev_ext; + + //init ehci_caps + // i = ( ( PEHCI_HCS_CONTENT )( &pdev_ext->ehci->ehci_caps.hcs_params ) )->length; + + ehci_get_capabilities(pdev_ext->ehci, pdev_ext->ehci->port_base); + i = pdev_ext->ehci->ehci_caps.length; + pdev_ext->ehci->port_base += i; + + if (ehci_init_schedule(pdev_ext->ehci, pdev_ext->padapter) == FALSE) + { + release_adapter(pdev_ext->padapter); + pdev_ext->padapter = NULL; + ehci_delete_device(pdev); + return NULL; + } + + InitializeListHead(&pdev_ext->ehci->urb_list); + KeInitializeSpinLock(&pdev_ext->ehci->pending_endp_list_lock); + InitializeListHead(&pdev_ext->ehci->pending_endp_list); + + ehci_dbg_print(DBGLVL_MAXIMUM, ("ehci_alloc(): pending_endp_list=0x%x\n", + &pdev_ext->ehci->pending_endp_list)); + + init_pending_endp_pool(&pdev_ext->ehci->pending_endp_pool); + + KeInitializeTimer(&pdev_ext->ehci->reset_timer); + + vector = HalGetInterruptVector(PCIBus, + bus, + pdev_ext->res_interrupt.level, + pdev_ext->res_interrupt.vector, &irql, &affinity); + + //connect the interrupt + DbgPrint("ehci_alloc(): the int=0x%x\n", vector); + if ((status = IoConnectInterrupt(&pdev_ext->ehci_int, ehci_isr, pdev_ext->ehci, NULL, //&pdev_ext->ehci->frame_list_lock, + vector, irql, irql, LevelSensitive, TRUE, //share the vector + affinity, FALSE)) //No float save + != STATUS_SUCCESS) + { + DbgPrint("ehci_alloc(): Failed to connect interrupt, status = 0x%x!\n", status); + ehci_release(pdev); + return NULL; + } + + KeInitializeDpc(&pdev_ext->ehci_dpc, ehci_dpc_callback, (PVOID) pdev_ext->ehci); +#endif + + return pdev; +} + +PDEVICE_OBJECT +ohci_create_device(PDRIVER_OBJECT drvr_obj, PUSB_DEV_MANAGER dev_mgr) +{ + return NULL; +} + Propchange: trunk/reactos/drivers/usb/nt4compat/usbdriver/ohci.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/usb/nt4compat/usbdriver/ohci.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/ohci.h (added) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/ohci.h Fri Aug 24 00:14:45 2007 @@ -1,0 +1,41 @@ +/* + * Copyright (c) 2007 by Aleksey Bragin + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +#ifndef __OHCI_H__ +#define __OHCI_H__ + +typedef struct _OHCI_DEV +{ + HCD hcd_interf; +} OHCI_DEV, *POHCI_DEV; + +typedef struct _OHCI_DEVICE_EXTENSION +{ + DEVEXT_HEADER dev_ext_hdr; + PDEVICE_OBJECT pdev_obj; + PDRIVER_OBJECT pdrvr_obj; + POHCI_DEV ohci; + + ULONG pci_addr; // bus number | slot number | funciton number + UHCI_INTERRUPT res_interrupt; + + PKINTERRUPT ohci_int; + KDPC ohci_dpc; +} OHCI_DEVICE_EXTENSION, *POHCI_DEVICE_EXTENSION; + + +#endif /* __OHCI_H__ */ Propchange: trunk/reactos/drivers/usb/nt4compat/usbdriver/ohci.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/usbdriver.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/usbdriver.rbuild (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/usbdriver.rbuild Fri Aug 24 00:14:45 2007 @@ -5,6 +5,7 @@ <library>ntoskrnl</library> <library>hal</library> <file>ehci.c</file> + <file>ohci.c</file> <file>uhci.c</file> <file>roothub.c</file> <file>hub.c</file>

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