Ros-diffs February 2008

ros-diffs@reactos.org

21 participants
460 discussions

[ros-arm-bringup] 32132: Build FreeLDR for ARM. We merely provide a _start entrypoint stub and two stub architecture files with no functions implemented. We also supply the proper ARM configuration settings in the .rbuild files, and add the necessary headers. FreeLDR can now be compiled (along with rossym, libcntptr, rtl and cmlib) but it will not link until the actual ARM code is implemented.

by ros-arm-bringup＠svn.reactos.org

Author: ros-arm-bringup Date: Tue Feb 5 06:06:20 2008 New Revision: 32132 URL: http://svn.reactos.org/svn/reactos?rev=32132&view=rev Log: Build FreeLDR for ARM. We merely provide a _start entrypoint stub and two stub architecture files with no functions implemented. We also supply the proper ARM configuration settings in the .rbuild files, and add the necessary headers. FreeLDR can now be compiled (along with rossym, libcntptr, rtl and cmlib) but it will not link until the actual ARM code is implemented. Added: trunk/reactos/boot/freeldr/freeldr/arch/arm/ trunk/reactos/boot/freeldr/freeldr/arch/arm/boot.s (with props) trunk/reactos/boot/freeldr/freeldr/arch/arm/macharm.c (with props) trunk/reactos/boot/freeldr/freeldr/arch/arm/stubs.c (with props) trunk/reactos/boot/freeldr/freeldr/include/arch/arm/ trunk/reactos/boot/freeldr/freeldr/include/arch/arm/hardware.h (with props) Modified: trunk/reactos/boot/freeldr/freeldr/freeldr.rbuild trunk/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild trunk/reactos/boot/freeldr/freeldr/include/arch.h trunk/reactos/boot/freeldr/freeldr/include/freeldr.h trunk/reactos/boot/freeldr/freeldr/include/mm.h Added: trunk/reactos/boot/freeldr/freeldr/arch/arm/boot.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/arm/boot.s (added) +++ trunk/reactos/boot/freeldr/freeldr/arch/arm/boot.s Tue Feb 5 06:06:20 2008 @@ -1,0 +1,23 @@ +/* + * PROJECT: ReactOS Boot Loader + * LICENSE: GPL - See COPYING in the top level directory + * FILE: boot/freeldr/arch/arm/boot.s + * PURPOSE: Implements the entry point for ARM machines + * PROGRAMMERS: alex(a)winsiderss.com + */ + +/* INCLUDES *******************************************************************/ + +//#include <ksarm.h> +//#include <kxarm.h> + +/* GLOBALS ********************************************************************/ + +.globl _start +.globl _bss + +/* BOOT CODE ******************************************************************/ + +.extern ArmInit +_start: + b . Propchange: trunk/reactos/boot/freeldr/freeldr/arch/arm/boot.s ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/boot/freeldr/freeldr/arch/arm/boot.s ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: trunk/reactos/boot/freeldr/freeldr/arch/arm/macharm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/arm/macharm.c (added) +++ trunk/reactos/boot/freeldr/freeldr/arch/arm/macharm.c Tue Feb 5 06:06:20 2008 @@ -1,0 +1,23 @@ +/* + * PROJECT: ReactOS Boot Loader + * LICENSE: GPL - See COPYING in the top level directory + * FILE: boot/freeldr/arch/arm/marcharm.c + * PURPOSE: Implements ARM-specific machine initialization + * PROGRAMMERS: alex(a)winsiderss.com + */ + +/* INCLUDES *******************************************************************/ + +#include <freeldr.h> + +/* GLOBALS ********************************************************************/ + +/* FUNCTIONS ******************************************************************/ + +VOID +ArmMachInit(const char *CmdLine) +{ + // + // Setup ARM routines + // +} Propchange: trunk/reactos/boot/freeldr/freeldr/arch/arm/macharm.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/boot/freeldr/freeldr/arch/arm/macharm.c ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: trunk/reactos/boot/freeldr/freeldr/arch/arm/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/arm/stubs.c (added) +++ trunk/reactos/boot/freeldr/freeldr/arch/arm/stubs.c Tue Feb 5 06:06:20 2008 @@ -1,0 +1,15 @@ +/* + * PROJECT: ReactOS Boot Loader + * LICENSE: GPL - See COPYING in the top level directory + * FILE: boot/freeldr/arch/arm/stubs.c + * PURPOSE: Non-completed ARM hardware-specific routines + * PROGRAMMERS: alex(a)winsiderss.com + */ + +/* INCLUDES *******************************************************************/ + +#include <freeldr.h> + +/* GLOBALS ********************************************************************/ + +/* FUNCTIONS ******************************************************************/ Propchange: trunk/reactos/boot/freeldr/freeldr/arch/arm/stubs.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/boot/freeldr/freeldr/arch/arm/stubs.c ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: trunk/reactos/boot/freeldr/freeldr/freeldr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/freeldr.rbuild (original) +++ trunk/reactos/boot/freeldr/freeldr/freeldr.rbuild Tue Feb 5 06:06:20 2008 @@ -18,6 +18,21 @@ <linkerflag>-lgcc</linkerflag> </module> </if> + <if property="ARCH" value="arm"> + <module name="freeldr" type="bootloader"> + <bootstrap installbase="loader" /> + <library>freeldr_startup</library> + <library>freeldr_base64k</library> + <library>freeldr_base</library> + <library>freeldr_arch</library> + <library>freeldr_main</library> + <library>rossym</library> + <library>cmlib</library> + <library>rtl</library> + <library>libcntpr</library> + <linkerflag>-lgcc</linkerflag> + </module> + </if> <if property="ARCH" value="powerpc"> <module name="ofwldr" type="elfexecutable" buildtype="OFWLDR"> <library>freeldr_startup</library> Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild (original) +++ trunk/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild Tue Feb 5 06:06:20 2008 @@ -59,8 +59,8 @@ <file>ofw.c</file> <file>ofw_util.s</file> <file>ofw_calls.s</file> - <file>ofwdisk.c</file> - <file>ofw_method.c</file> + <file>ofwdisk.c</file> + <file>ofw_method.c</file> <file>prep.c</file> <file>prep_ide.c</file> <file>prep_pci.c</file> @@ -87,4 +87,23 @@ </module> </if> </directory> + <directory name="arm"> + <if property="ARCH" value="arm"> + <module name="freeldr_arch" type="objectlibrary"> + <include base="freeldr_base">include</include> + <include base="freeldr_base">cache</include> + <include base="ntoskrnl">include</include> + <compilerflag>-ffreestanding</compilerflag> + <compilerflag>-fno-builtin</compilerflag> + <compilerflag>-fno-inline</compilerflag> + <compilerflag>-fno-zero-initialized-in-bss</compilerflag> + <compilerflag>-Os</compilerflag> + <define name="DEBUG" /> + <define name="_NTHAL_" /> + <file>boot.s</file> + <file>macharm.c</file> + <file>stubs.c</file> + </module> + </if> + </directory> </directory> Modified: trunk/reactos/boot/freeldr/freeldr/include/arch.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/arch.h (original) +++ trunk/reactos/boot/freeldr/freeldr/include/arch.h Tue Feb 5 06:06:20 2008 @@ -40,7 +40,7 @@ #define BIOSCALLBUFOFFSET 0x0000 /* Buffer to store temporary data for any Int386() call */ #define FILESYSBUFFER 0x80000 /* Buffer to store file system data (e.g. cluster buffer for FAT) */ #define DISKREADBUFFER 0x90000 /* Buffer to store data read in from the disk via the BIOS */ -#elif defined(_M_PPC) +#elif defined(_M_PPC) || defined(_M_ARM) extern PVOID FsStaticBufferDisk, FsStaticBufferData; #define DISKREADBUFFER FsStaticBufferDisk #define FILESYSBUFFER FsStaticBufferData Added: trunk/reactos/boot/freeldr/freeldr/include/arch/arm/hardware.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/arch/arm/hardware.h (added) +++ trunk/reactos/boot/freeldr/freeldr/include/arch/arm/hardware.h Tue Feb 5 06:06:20 2008 @@ -1,0 +1,66 @@ +/* + * PROJECT: ReactOS Boot Loader + * LICENSE: GPL - See COPYING in the top level directory + * FILE: boot/freeldr/include/arch/arm/hardware.h + * PURPOSE: Implements routines to support booting from a RAM Disk + * PROGRAMMERS: alex(a)winsiderss.com + */ + +#ifndef _ARM_HARDWARE_ +#define __ARM_HARDWARE_ + +#ifndef __REGISTRY_H +#include "../../reactos/registry.h" +#endif + +// +// Static heap for ARC Hardware Component Tree +// 16KB oughta be enough for anyone. +// +#define HW_MAX_ARC_HEAP_SIZE 16 * 1024 + +// +// ARC Component Configuration Routines +// +VOID +NTAPI +FldrSetComponentInformation( + IN PCONFIGURATION_COMPONENT_DATA ComponentKey, + IN IDENTIFIER_FLAG Flags, + IN ULONG Key, + IN ULONG Affinity +); + +VOID +NTAPI +FldrSetIdentifier( + IN PCONFIGURATION_COMPONENT_DATA ComponentKey, + IN PCHAR Identifier +); + +VOID +NTAPI +FldrCreateSystemKey( + OUT PCONFIGURATION_COMPONENT_DATA *SystemKey +); + +VOID +NTAPI +FldrCreateComponentKey( + IN PCONFIGURATION_COMPONENT_DATA SystemKey, + IN PWCHAR BusName, + IN ULONG BusNumber, + IN CONFIGURATION_CLASS Class, + IN CONFIGURATION_TYPE Type, + OUT PCONFIGURATION_COMPONENT_DATA *ComponentKey +); + +VOID +NTAPI +FldrSetConfigurationData( + IN PCONFIGURATION_COMPONENT_DATA ComponentKey, + IN PCM_PARTIAL_RESOURCE_LIST ResourceList, + IN ULONG Size +); + +#endif Propchange: trunk/reactos/boot/freeldr/freeldr/include/arch/arm/hardware.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/boot/freeldr/freeldr/include/arch/arm/hardware.h ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: trunk/reactos/boot/freeldr/freeldr/include/freeldr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/freeldr.h (original) +++ trunk/reactos/boot/freeldr/freeldr/include/freeldr.h Tue Feb 5 06:06:20 2008 @@ -73,6 +73,8 @@ #include <internal/i386/ke.h> #elif defined(_M_PPC) #include <arch/powerpc/hardware.h> +#elif defined(_M_ARM) +#include <arch/arm/hardware.h> #elif defined(_M_MIPS) #include <arch/mips/arcbios.h> #endif Modified: trunk/reactos/boot/freeldr/freeldr/include/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/mm.h (original) +++ trunk/reactos/boot/freeldr/freeldr/include/mm.h Tue Feb 5 06:06:20 2008 @@ -37,7 +37,7 @@ ULONG Reserved; } PACKED BIOS_MEMORY_MAP, *PBIOS_MEMORY_MAP; -#if defined(__i386__) || defined(_PPC_) || defined(_MIPS_) +#if defined(__i386__) || defined(_PPC_) || defined(_MIPS_) || defined(_ARM_) #define MM_PAGE_SIZE 4096 #define MM_PAGE_MASK 0xFFF

16 years, 8 months

[ros-arm-bringup] 32131: Add basic arm target support to the build system. Reactos-arm.rbuild uses the same settings as the x86 version, but defines _ARM_ and __arm__ instead. _M_ARM is already defined by the compiler. Add ARM system call stub support to ncitool. We are currently using a SWI 0x2E to achieve this. Add ARM support to winnt.h. Add a preliminary intrin_arm.h Add ketypes.h and mmtypes.h for ARM in the NDK. For now these are mostly stubs to allow compiling to work. Add ARM support to

by ros-arm-bringup＠svn.reactos.org

Author: ros-arm-bringup Date: Tue Feb 5 05:58:28 2008 New Revision: 32131 URL: http://svn.reactos.org/svn/reactos?rev=32131&view=rev Log: Add basic arm target support to the build system. Reactos-arm.rbuild uses the same settings as the x86 version, but defines _ARM_ and __arm__ instead. _M_ARM is already defined by the compiler. Add ARM system call stub support to ncitool. We are currently using a SWI 0x2E to achieve this. Add ARM support to winnt.h. Add a preliminary intrin_arm.h Add ketypes.h and mmtypes.h for ARM in the NDK. For now these are mostly stubs to allow compiling to work. Add ARM support to winddk.h. Fix some broken x86-only assumptions in the NDK. Add config-arm-template.rbuild. By defauilt we build for armv5te (armv4 and v5 are supported, not v6). Set ROS_ARCH=arm to switch to ARM. Set ROS_PREFIX to an appropriate MinGW-32 ARM PE crosscompiler. Added: trunk/reactos/ReactOS-arm.rbuild (with props) trunk/reactos/config-arm.template.rbuild (with props) trunk/reactos/include/ndk/arm/ trunk/reactos/include/ndk/arm/ketypes.h (with props) trunk/reactos/include/ndk/arm/mmtypes.h (with props) trunk/reactos/include/psdk/intrin_arm.h (with props) Modified: trunk/reactos/config.template.rbuild trunk/reactos/include/ddk/winddk.h trunk/reactos/include/ndk/arch/ketypes.h trunk/reactos/include/ndk/arch/mmtypes.h trunk/reactos/include/ndk/i386/ketypes.h trunk/reactos/include/ndk/ketypes.h trunk/reactos/include/ndk/pstypes.h trunk/reactos/include/psdk/intrin.h trunk/reactos/include/psdk/winnt.h trunk/reactos/tools/nci/ncitool.c Added: trunk/reactos/ReactOS-arm.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-arm.rbuild?rev=321… ============================================================================== --- trunk/reactos/ReactOS-arm.rbuild (added) +++ trunk/reactos/ReactOS-arm.rbuild Tue Feb 5 05:58:28 2008 @@ -1,0 +1,36 @@ +<?xml version="1.0"?> +<!DOCTYPE project SYSTEM "tools/rbuild/project.dtd"> +<project name="ReactOS" makefile="makefile.auto" xmlns:xi="http://www.w3.org/2001/XInclude"> + <xi:include href="config-arm.rbuild"> + <xi:fallback> + <xi:include href="config-arm.template.rbuild" /> + </xi:fallback> + </xi:include> + + <xi:include href="ReactOS-generic.rbuild" /> + + <define name="_ARM_" /> + <define name="__arm__" /> + + <property name="NTOSKRNL_SHARED" value="-Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -shared"/> + + <if property="OPTIMIZE" value="1"> + <compilerflag>-Os</compilerflag> + <compilerflag>-ftracer</compilerflag> + </if> + <if property="OPTIMIZE" value="2"> + <compilerflag>-Os</compilerflag> + </if> + <if property="OPTIMIZE" value="3"> + <compilerflag>-O1</compilerflag> + </if> + <if property="OPTIMIZE" value="4"> + <compilerflag>-O2</compilerflag> + </if> + <if property="OPTIMIZE" value="5"> + <compilerflag>-O3</compilerflag> + </if> + + <compilerflag>-Wno-attributes</compilerflag> + <compilerflag>-fno-strict-aliasing</compilerflag> +</project> Propchange: trunk/reactos/ReactOS-arm.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/ReactOS-arm.rbuild ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: trunk/reactos/config-arm.template.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/config-arm.template.rbuild… ============================================================================== --- trunk/reactos/config-arm.template.rbuild (added) +++ trunk/reactos/config-arm.template.rbuild Tue Feb 5 05:58:28 2008 @@ -1,0 +1,81 @@ +<?xml version="1.0"?> +<!DOCTYPE group SYSTEM "tools/rbuild/project.dtd"> +<group> + + + + + +<property name="SARCH" value="" /> + + + +<property name="OARCH" value="armv5te" /> + + + +<property name="OPTIMIZE" value="1" /> + + + +<property name="KDBG" value="0" /> + + + +<property name="DBG" value="1" /> + + + +<property name="GDB" value="0" /> + + + +<property name="NSWPAT" value="0" /> + + +<property name="_WINKD_" value="0" /> + +</group> Propchange: trunk/reactos/config-arm.template.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/config-arm.template.rbuild ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: trunk/reactos/config.template.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/config.template.rbuild?rev… ============================================================================== (empty) Modified: trunk/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddk.h?rev=3… ============================================================================== --- trunk/reactos/include/ddk/winddk.h (original) +++ trunk/reactos/include/ddk/winddk.h Tue Feb 5 05:58:28 2008 @@ -228,7 +228,10 @@ #define ZwCurrentProcess() NtCurrentProcess() #define NtCurrentThread() ( (HANDLE)(LONG_PTR) -2 ) #define ZwCurrentThread() NtCurrentThread() + +#if (_M_IX86) #define KIP0PCRADDRESS 0xffdff000 +#endif #define KERNEL_STACK_SIZE 12288 #define KERNEL_LARGE_STACK_SIZE 61440 @@ -5535,6 +5538,8 @@ #elif defined(_MIPS_) +#error MIPS Headers are totally incorrect + typedef ULONG PFN_NUMBER, *PPFN_NUMBER; #define PASSIVE_LEVEL 0 @@ -5562,10 +5567,17 @@ return 0; } +#elif defined(_M_ARM) + +// +// NT-ARM is not documented, need NDK +// +#include <arm/ketypes.h> + #else #error Unknown architecture #endif - + #define PAGE_SIZE 0x1000 #define PAGE_SHIFT 12L Modified: trunk/reactos/include/ndk/arch/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/arch/ketypes.h… ============================================================================== --- trunk/reactos/include/ndk/arch/ketypes.h (original) +++ trunk/reactos/include/ndk/arch/ketypes.h Tue Feb 5 05:58:28 2008 @@ -26,6 +26,8 @@ #include <i386/ketypes.h> #elif defined(_M_PPC) #include <powerpc/ketypes.h> +#elif defined(_M_ARM) +#include <arm/ketypes.h> #else #error "Unknown processor" #endif Modified: trunk/reactos/include/ndk/arch/mmtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/arch/mmtypes.h… ============================================================================== --- trunk/reactos/include/ndk/arch/mmtypes.h (original) +++ trunk/reactos/include/ndk/arch/mmtypes.h Tue Feb 5 05:58:28 2008 @@ -26,6 +26,8 @@ #include <i386/mmtypes.h> #elif defined(_M_PPC) #include <powerpc/mmtypes.h> +#elif defined(_M_ARM) +#include <arm/mmtypes.h> #else #error "Unknown processor" #endif Added: trunk/reactos/include/ndk/arm/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/arm/ketypes.h?… ============================================================================== --- trunk/reactos/include/ndk/arm/ketypes.h (added) +++ trunk/reactos/include/ndk/arm/ketypes.h Tue Feb 5 05:58:28 2008 @@ -1,0 +1,211 @@ +/*++ NDK Version: 0098 + +Copyright (c) Alex Ionescu. All rights reserved. + +Header Name: + + ketypes.h (ARM) + +Abstract: + + ARM Type definitions for the Kernel services. + +Author: + + Alex Ionescu (alexi(a)tinykrnl.org) - Updated - 27-Feb-2006 + +--*/ + +#ifndef _ARM_KETYPES_H +#define _ARM_KETYPES_H + +// +// Dependencies +// + +// +// IRQLs +// +#define PASSIVE_LEVEL 0 +#define LOW_LEVEL 0 +#define APC_LEVEL 1 +#define DISPATCH_LEVEL 2 +#define IPI_LEVEL 7 +#define POWER_LEVEL 7 +#define PROFILE_LEVEL 8 +#define HIGH_LEVEL 8 +#define SYNCH_LEVEL (IPI_LEVEL - 1) + +// +// IPI Types +// +#define IPI_APC 1 +#define IPI_DPC 2 +#define IPI_FREEZE 4 +#define IPI_PACKET_READY 8 +#define IPI_SYNCH_REQUEST 16 + +// +// PRCB Flags +// +#define PRCB_MAJOR_VERSION 1 +#define PRCB_BUILD_DEBUG 1 +#define PRCB_BUILD_UNIPROCESSOR 2 + +// +// HAL Variables +// +#define INITIAL_STALL_COUNT 0x64 + +// +// Static Kernel-Mode Address start (use MM_KSEG0_BASE for actual) +// +#define KSEG0_BASE 0x80000000 + +// +// FIXME: mmtypes.h? +// +#define KIPCR 0xFFFFF000 +#define PCR ((volatile KPCR * const)KIPCR) + +// +// Synchronization-level IRQL +// +#define SYNCH_LEVEL DISPATCH_LEVEL + +// +// Trap Frame Definition +// +typedef struct _KTRAP_FRAME +{ + ULONG R0; + ULONG R1; + ULONG R2; + ULONG R3; + ULONG R4; + ULONG R5; + ULONG R6; + ULONG R7; + ULONG R8; + ULONG R9; + ULONG R10; + ULONG R11; + ULONG R12; + ULONG Sp; + ULONG Lr; + ULONG Pc; + ULONG Psr; + UCHAR ExceptionRecord[(sizeof(EXCEPTION_RECORD) + 7) & (~7)]; + UCHAR OldIrql; + UCHAR PreviousMode; + ULONG Fpscr; + ULONG FpExc; + ULONG S[33]; + ULONG FpExtra[8]; +} KTRAP_FRAME, *PKTRAP_FRAME; + +#ifndef NTOS_MODE_USER +// +// Stub +// +typedef struct _KFLOATING_SAVE +{ + ULONG Reserved; +} KFLOATING_SAVE, *PKFLOATING_SAVE; + +// +// Processor Region Control Block +// +typedef struct _KPRCB +{ + USHORT MinorVersion; + USHORT MajorVersion; + struct _KTHREAD *CurrentThread; + struct _KTHREAD *NextThread; + struct _KTHREAD *IdleThread; + UCHAR Number; + // + // TODO + // +} KPRCB, *PKPRCB; + +// +// Processor Control Region +// +typedef struct _KPCR +{ + ULONG MinorVersion; + ULONG MajorVersion; + PKINTERRUPT_ROUTINE InterruptRoutine[64]; + PVOID XcodeDispatch; + ULONG FirstLevelDcacheSize; + ULONG FirstLevelDcacheFillSize; + ULONG FirstLevelIcacheSize; + ULONG FirstLevelIcacheFillSize; + ULONG SecondLevelDcacheSize; + ULONG SecondLevelDcacheFillSize; + ULONG SecondLevelIcacheSize; + ULONG SecondLevelIcacheFillSize; + struct _KPRCB *Prcb; + struct _TEB *Teb; + PVOID TlsArray; + ULONG DcacheFillSize; + ULONG IcacheAlignment; + ULONG IcacheFillSize; + ULONG ProcessorId; + ULONG ProfileInterval; + ULONG ProfileCount; + ULONG StallExecutionCount; + ULONG StallScaleFactor; + CCHAR Number; + PVOID DataBusError; + PVOID InstructionBusError; + ULONG CachePolicy; + UCHAR IrqlMask[64]; + UCHAR IrqlTable[64]; + UCHAR CurrentIrql; + KAFFINITY SetMember; + struct _KTHREAD *CurrentThread; + KAFFINITY NotMember; + ULONG SystemReserved[6]; + ULONG DcacheAlignment; + ULONG HalReserved[64]; + BOOLEAN FirstLevelActive; + BOOLEAN DpcRoutineActive; + ULONG CurrentPid; + BOOLEAN OnInterruptStack; + PVOID SavedInitialStack; + PVOID SavedStackLimit; + PVOID SystemServiceDispatchStart; + PVOID SystemServiceDispatchEnd; + PVOID InterruptStack; + PVOID PanicStack; + PVOID BadVaddr; + PVOID InitialStack; + PVOID StackLimit; + ULONG QuantumEnd; +} KPCR, *PKPCR; + +// +// Macro to get current KPRCB +// +FORCEINLINE +struct _KPRCB * +KeGetCurrentPrcb(VOID) +{ + return PCR->Prcb; +} + +// +// Macro to get current CPU +// +FORCEINLINE +ULONG +DDKAPI +KeGetCurrentProcessorNumber(VOID) +{ + return PCR->Number; +} + +#endif +#endif Propchange: trunk/reactos/include/ndk/arm/ketypes.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/include/ndk/arm/ketypes.h ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: trunk/reactos/include/ndk/arm/mmtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/arm/mmtypes.h?… ============================================================================== --- trunk/reactos/include/ndk/arm/mmtypes.h (added) +++ trunk/reactos/include/ndk/arm/mmtypes.h Tue Feb 5 05:58:28 2008 @@ -1,0 +1,141 @@ +/*++ NDK Version: 0095 + +Copyright (c) Alex Ionescu. All rights reserved. + +Header Name: + + mmtypes.h (ARM) + +Abstract: + + ARM Type definitions for the Memory Manager + +Author: + + Alex Ionescu (alex.ionescu(a)reactos.com) 06-Oct-2004 + +--*/ + +#ifndef _ARM_MMTYPES_H +#define _ARM_MMTYPES_H + +// +// Dependencies +// + +// +// Page-related Macros +// +#define PAGE_SIZE 0x1000 +#define PAGE_SHIFT 12L +#define MM_ALLOCATION_GRANULARITY 0x10000 +#define MM_ALLOCATION_GRANULARITY_SHIFT 16L + +// +// Sanity checks for Paging Macros +// +#ifdef C_ASSERT +C_ASSERT(PAGE_SIZE == (1 << PAGE_SHIFT)); +C_ASSERT(MM_ALLOCATION_GRANULARITY == (1 << MM_ALLOCATION_GRANULARITY_SHIFT)); +C_ASSERT(MM_ALLOCATION_GRANULARITY && + !(MM_ALLOCATION_GRANULARITY & (MM_ALLOCATION_GRANULARITY - 1))); +C_ASSERT(MM_ALLOCATION_GRANULARITY >= PAGE_SIZE); +#endif + +// +// Page Table Entry Definitions +// +typedef struct _HARDWARE_PTE_ARM +{ + ULONG Valid:1; + ULONG Write:1; + ULONG Owner:1; + ULONG WriteThrough:1; + ULONG CacheDisable:1; + ULONG Accessed:1; + ULONG Dirty:1; + ULONG LargePage:1; + ULONG Global:1; + ULONG CopyOnWrite:1; + ULONG Prototype: 1; + ULONG reserved: 1; + ULONG PageFrameNumber:20; +} HARDWARE_PTE_ARM, *PHARDWARE_PTE_ARM; + +typedef struct _MMPTE_SOFTWARE +{ + ULONG Valid:1; + ULONG PageFileLow:4; + ULONG Protection:5; + ULONG Prototype:1; + ULONG Transition:1; + ULONG PageFileHigh:20; +} MMPTE_SOFTWARE; + +typedef struct _MMPTE_TRANSITION +{ + ULONG Valid:1; + ULONG Write:1; + ULONG Owner:1; + ULONG WriteThrough:1; + ULONG CacheDisable:1; + ULONG Protection:5; + ULONG Prototype:1; + ULONG Transition:1; + ULONG PageFrameNumber:20; +} MMPTE_TRANSITION; + +typedef struct _MMPTE_PROTOTYPE +{ + ULONG Valid:1; + ULONG ProtoAddressLow:7; + ULONG ReadOnly:1; + ULONG WhichPool:1; + ULONG Prototype:1; + ULONG ProtoAddressHigh:21; +} MMPTE_PROTOTYPE; + +typedef struct _MMPTE_SUBSECTION +{ + ULONG Valid:1; + ULONG SubsectionAddressLow:4; + ULONG Protection:5; + ULONG Prototype:1; + ULONG SubsectionAddressHigh:20; + ULONG WhichPool:1; +} MMPTE_SUBSECTION; + +typedef struct _MMPTE_LIST +{ + ULONG Valid:1; + ULONG OneEntry:1; + ULONG filler0:8; + ULONG NextEntry:20; + ULONG Prototype:1; + ULONG filler1:1; +} MMPTE_LIST; + +typedef struct _MMPTE_HARDWARE +{ + ULONG Valid:1; + ULONG Write:1; + ULONG Owner:1; + ULONG WriteThrough:1; + ULONG CacheDisable:1; + ULONG Accessed:1; + ULONG Dirty:1; + ULONG LargePage:1; + ULONG Global:1; + ULONG CopyOnWrite:1; + ULONG Prototype:1; + ULONG reserved:1; + ULONG PageFrameNumber:20; +} MMPTE_HARDWARE, *PMMPTE_HARDWARE; + +// +// Use the right PTE structure +// +#define HARDWARE_PTE HARDWARE_PTE_ARM +#define PHARDWARE_PTE PHARDWARE_PTE_ARM + +#endif Propchange: trunk/reactos/include/ndk/arm/mmtypes.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/include/ndk/arm/mmtypes.h ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: trunk/reactos/include/ndk/i386/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/i386/ketypes.h… ============================================================================== --- trunk/reactos/include/ndk/i386/ketypes.h (original) +++ trunk/reactos/include/ndk/i386/ketypes.h Tue Feb 5 05:58:28 2008 @@ -22,6 +22,17 @@ // // Dependencies // + +// +// KPCR Access for non-IA64 builds +// +#define K0IPCR ((ULONG_PTR)(KIP0PCRADDRESS)) +#define PCR ((volatile KPCR * const)K0IPCR) +#if !defined(CONFIG_SMP) && !defined(NT_BUILD) +#define KeGetPcr() PCR +#else +#define KeGetPcr() ((volatile KPCR * const)__readfsdword(0x1C)) +#endif // // Machine Types Modified: trunk/reactos/include/ndk/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/ketypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/ketypes.h (original) +++ trunk/reactos/include/ndk/ketypes.h Tue Feb 5 05:58:28 2008 @@ -102,17 +102,6 @@ // #define KI_EXCEPTION_INTERNAL 0x10000000 #define KI_EXCEPTION_ACCESS_VIOLATION (KI_EXCEPTION_INTERNAL | 0x04) - -// -// KPCR Access for non-IA64 builds -// -#define K0IPCR ((ULONG_PTR)(KIP0PCRADDRESS)) -#define PCR ((volatile KPCR * const)K0IPCR) -#if !defined(CONFIG_SMP) && !defined(NT_BUILD) -#define KeGetPcr() PCR -#else -#define KeGetPcr() ((volatile KPCR * const)__readfsdword(0x1C)) -#endif // // Number of dispatch codes supported by KINTERRUPT Modified: trunk/reactos/include/ndk/pstypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/pstypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/pstypes.h (original) +++ trunk/reactos/include/ndk/pstypes.h Tue Feb 5 05:58:28 2008 @@ -535,12 +535,14 @@ // // Descriptor Table Entry Definition // +#if (_M_IX86) #define _DESCRIPTOR_TABLE_ENTRY_DEFINED typedef struct _DESCRIPTOR_TABLE_ENTRY { ULONG Selector; LDT_ENTRY Descriptor; } DESCRIPTOR_TABLE_ENTRY, *PDESCRIPTOR_TABLE_ENTRY; +#endif // // PEB Lock Routine Modified: trunk/reactos/include/psdk/intrin.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/intrin.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/intrin.h (original) +++ trunk/reactos/include/psdk/intrin.h Tue Feb 5 05:58:28 2008 @@ -75,6 +75,8 @@ #include "intrin_ppc.h" #elif defined(_MIPS_) #include "intrin_mips.h" +#elif defined(_M_ARM) +#include "intrin_arm.h" #elif defined(__x86_64__) /* TODO: the x64 architecture shares most of the i386 intrinsics. It should be easy to support */ #include "intrin_x86_64.h" Added: trunk/reactos/include/psdk/intrin_arm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/intrin_arm.h?… ============================================================================== --- trunk/reactos/include/psdk/intrin_arm.h (added) +++ trunk/reactos/include/psdk/intrin_arm.h Tue Feb 5 05:58:28 2008 @@ -1,0 +1,152 @@ +/* + Compatibility <intrin.h> header for GCC -- GCC equivalents of intrinsic + Microsoft Visual C++ functions. Originally developed for the ReactOS + (<http://www.reactos.org/>) and TinyKrnl (<http://www.tinykrnl.org/>) + projects. + + Copyright (c) 2006 KJK::Hyperion <hackbunny(a)reactos.com> + + Permission is hereby granted, free of charge, to any person obtaining a + copy of this software and associated documentation files (the "Software"), + to deal in the Software without restriction, including without limitation + the rights to use, copy, modify, merge, publish, distribute, sublicense, + and/or sell copies of the Software, and to permit persons to whom the + Software is furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + DEALINGS IN THE SOFTWARE. +*/ + +#ifndef KJK_INTRIN_ARM_H_ +#define KJK_INTRIN_ARM_H_ + +#ifndef __GNUC__ +#error Unsupported compiler +#endif + +#define _ReadWriteBarrier() __sync_synchronize() + +FORCEINLINE char _InterlockedCompareExchange8(volatile char * const Destination, const char Exchange, const char Comperand) +{ + return __sync_val_compare_and_swap(Destination, Comperand, Exchange); +} + +FORCEINLINE short _InterlockedCompareExchange16(volatile short * const Destination, const short Exchange, const short Comperand) +{ + return __sync_val_compare_and_swap(Destination, Comperand, Exchange); +} + +FORCEINLINE long _InterlockedCompareExchange(volatile long * const Destination, const long Exchange, const long Comperand) +{ + return __sync_val_compare_and_swap(Destination, Comperand, Exchange); +} + +FORCEINLINE long long _InterlockedCompareExchange64(volatile long long * const Destination, const long long Exchange, const long long Comperand) +{ + return __sync_val_compare_and_swap(Destination, Comperand, Exchange); +} + +FORCEINLINE void * _InterlockedCompareExchangePointer(void * volatile * const Destination, void * const Exchange, void * const Comperand) +{ + return __sync_val_compare_and_swap(Destination, Comperand, Exchange); +} + +FORCEINLINE long _InterlockedExchange(volatile long * const Target, const long Value) +{ + /* NOTE: __sync_lock_test_and_set would be an acquire barrier, so we force a full barrier */ + __sync_synchronize(); + return __sync_lock_test_and_set(Target, Value); +} + +FORCEINLINE void * _InterlockedExchangePointer(void * volatile * const Target, void * const Value) +{ + /* NOTE: ditto */ + __sync_synchronize(); + return __sync_lock_test_and_set(Target, Value); +} + +static __inline__ __attribute__((always_inline)) long _InterlockedExchangeAdd16(volatile short * const Addend, const short Value) +{ + return __sync_fetch_and_add(Addend, Value); +} + +FORCEINLINE long _InterlockedExchangeAdd(volatile long * const Addend, const long Value) +{ + return __sync_fetch_and_add(Addend, Value); +} + +FORCEINLINE char _InterlockedAnd8(volatile char * const value, const char mask) +{ + return __sync_fetch_and_and(value, mask); +} + +FORCEINLINE short _InterlockedAnd16(volatile short * const value, const short mask) +{ + return __sync_fetch_and_and(value, mask); +} + +FORCEINLINE long _InterlockedAnd(volatile long * const value, const long mask) +{ + return __sync_fetch_and_and(value, mask); +} + +FORCEINLINE char _InterlockedOr8(volatile char * const value, const char mask) +{ + return __sync_fetch_and_or(value, mask); +} + +FORCEINLINE short _InterlockedOr16(volatile short * const value, const short mask) +{ + return __sync_fetch_and_or(value, mask); +} + +FORCEINLINE long _InterlockedOr(volatile long * const value, const long mask) +{ + return __sync_fetch_and_or(value, mask); +} + +FORCEINLINE char _InterlockedXor8(volatile char * const value, const char mask) +{ + return __sync_fetch_and_xor(value, mask); +} + +FORCEINLINE short _InterlockedXor16(volatile short * const value, const short mask) +{ + return __sync_fetch_and_xor(value, mask); +} + +FORCEINLINE long _InterlockedXor(volatile long * const value, const long mask) +{ + return __sync_fetch_and_xor(value, mask); +} + +static __inline__ __attribute__((always_inline)) long _InterlockedDecrement(volatile long * const lpAddend) +{ + return _InterlockedExchangeAdd(lpAddend, -1) - 1; +} + +static __inline__ __attribute__((always_inline)) long _InterlockedIncrement(volatile long * const lpAddend) +{ + return _InterlockedExchangeAdd(lpAddend, 1) + 1; +} + +static __inline__ __attribute__((always_inline)) long _InterlockedDecrement16(volatile short * const lpAddend) +{ + return _InterlockedExchangeAdd16(lpAddend, -1) - 1; +} + +static __inline__ __attribute__((always_inline)) long _InterlockedIncrement16(volatile short * const lpAddend) +{ + return _InterlockedExchangeAdd16(lpAddend, 1) + 1; +} + +#endif +/* EOF */ Propchange: trunk/reactos/include/psdk/intrin_arm.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/include/psdk/intrin_arm.h ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=3… ============================================================================== --- trunk/reactos/include/psdk/winnt.h (original) +++ trunk/reactos/include/psdk/winnt.h Tue Feb 5 05:58:28 2008 @@ -4064,6 +4064,8 @@ ); return ret; } +#elif defined (_M_ARM) + PVOID WINAPI GetCurrentFiber(VOID); #else #if defined(_M_PPC) static __inline__ __attribute__((always_inline)) unsigned long __readfsdword_winnt(const unsigned long Offset) @@ -4101,6 +4103,8 @@ return ret; } +#elif _M_ARM + struct _TEB* WINAPI NtCurrentTeb(VOID); #else static __inline__ struct _TEB * NtCurrentTeb(void) { @@ -4235,6 +4239,8 @@ #define YieldProcessor() __asm__ __volatile__("nop"); #elif defined(_M_MIPS) #define YieldProcessor() __asm__ __volatile__("nop"); +#elif defined(_M_ARM) +#define YieldProcessor() #else #error Unknown architecture #endif Modified: trunk/reactos/tools/nci/ncitool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/nci/ncitool.c?rev=32… ============================================================================== --- trunk/reactos/tools/nci/ncitool.c (original) +++ trunk/reactos/tools/nci/ncitool.c Tue Feb 5 05:58:28 2008 @@ -67,6 +67,13 @@ " lw $8,0($8)\n" \ " j $8\n" \ " nop\n" + +// +// For now, only supports 0-4 arguments +// +#define UserModeStub_arm " mov r12, #0x%x\n" \ + " swi #0x2E\n" \ + " bx lr\n\n" #elif defined(_MSC_VER) #define UserModeStub_x86 " asm { \n" \ @@ -96,6 +103,10 @@ #define KernelModeStub_mips " j KiSystemService\n" \ " nop\n" + +#define KernelModeStub_arm " mov r12, #0x%x\n" \ + " swi #0x2E\n" \ + " bx lr\n\n" #elif defined(_MSC_VER) #define KernelModeStub_x86 " asm { \n" \ @@ -127,6 +138,8 @@ "\t.globl %s\n", "%s:\n" }, { "mips", 4, KernelModeStub_mips, UserModeStub_mips, "\t.globl %s\n", "%s:\n" }, + { "arm", 4, KernelModeStub_arm, UserModeStub_arm, + "\t.globl %s\n", "%s:\n" }, { 0, } }; int arch_sel = 0;

16 years, 8 months

[ros-arm-bringup] 32130: The Windows headers include a file called ioaccess.h in the ddk folder, which exposes various READ/WRITE_PORT/REGISTER_ routines as inlined macros for various architectures (PPC, MIPS, AMD64, IA64, X86), making use of the MSVC compiler-intrinsics (inp, outp, etc). Since ReactOS already has those intrinscs implemented, we've also created an ioaccess.h w32api header file which makes use of them. We can now remove the portio.h and portio.c files in FreeLDR, since there's no

by ros-arm-bringup＠svn.reactos.org

Author: ros-arm-bringup Date: Tue Feb 5 05:40:08 2008 New Revision: 32130 URL: http://svn.reactos.org/svn/reactos?rev=32130&view=rev Log: The Windows headers include a file called ioaccess.h in the ddk folder, which exposes various READ/WRITE_PORT/REGISTER_ routines as inlined macros for various architectures (PPC, MIPS, AMD64, IA64, X86), making use of the MSVC compiler-intrinsics (inp, outp, etc). Since ReactOS already has those intrinscs implemented, we've also created an ioaccess.h w32api header file which makes use of them. We can now remove the portio.h and portio.c files in FreeLDR, since there's no more need to duplicate this code. Additionally, this can be also done with the PPC port of FreeLDR or any other architecture, since it doesn't require per-architecture support in FreeLDR anymore -- only the underlying intrinsics in intrin.h must be implemented (note that for PPC, MIPS and ARM, the notion of a port doesn't even exist -- those functions map to register-reading functions, where register basically means memory). Added: trunk/reactos/include/ddk/ioaccess.h (with props) Removed: trunk/reactos/boot/freeldr/freeldr/arch/i386/portio.c trunk/reactos/boot/freeldr/freeldr/include/portio.h Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxdisk.c trunk/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild trunk/reactos/boot/freeldr/freeldr/include/freeldr.h Removed: trunk/reactos/boot/freeldr/freeldr/arch/i386/portio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/portio.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/portio.c (removed) @@ -1,219 +1,0 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/hal/x86/portio.c - * PURPOSE: Port I/O functions - * PROGRAMMER: Eric Kohl - * UPDATE HISTORY: - * Created 18/10/99 - */ - -//#include <ntddk.h> -#include <freeldr.h> - - -/* FUNCTIONS ****************************************************************/ - -/* - * This file contains the definitions for the x86 IO instructions - * inb/inw/inl/outb/outw/outl and the "string versions" of the same - * (insb/insw/insl/outsb/outsw/outsl). You can also use "pausing" - * versions of the single-IO instructions (inb_p/inw_p/..). - * - * This file is not meant to be obfuscating: it's just complicated - * to (a) handle it all in a way that makes gcc able to optimize it - * as well as possible and (b) trying to avoid writing the same thing - * over and over again with slight variations and possibly making a - * mistake somewhere. - */ - -/* - * Thanks to James van Artsdalen for a better timing-fix than - * the two short jumps: using outb's to a nonexistent port seems - * to guarantee better timings even on fast machines. - * - * On the other hand, I'd like to be sure of a non-existent port: - * I feel a bit unsafe about using 0x80 (should be safe, though) - * - * Linus - */ - -#ifdef SLOW_IO_BY_JUMPING -#define __SLOW_DOWN_IO __asm__ __volatile__("jmp 1f\n1:\tjmp 1f\n1:") -#else -#define __SLOW_DOWN_IO __asm__ __volatile__("outb %al,$0x80") -#endif - -#ifdef REALLY_SLOW_IO -#define SLOW_DOWN_IO { __SLOW_DOWN_IO; __SLOW_DOWN_IO; __SLOW_DOWN_IO; __SLOW_DOWN_IO; } -#else -#define SLOW_DOWN_IO __SLOW_DOWN_IO -#endif - -#undef READ_PORT_BUFFER_UCHAR -NTHALAPI -VOID -DDKAPI -READ_PORT_BUFFER_UCHAR (PUCHAR Port, - PUCHAR Buffer, - ULONG Count) -{ - __asm__ __volatile__ ("cld ; rep ; insb\n\t" - : "=D" (Buffer), "=c" (Count) - : "d" (Port),"0" (Buffer),"1" (Count)); -} - -#undef READ_PORT_BUFFER_USHORT -NTHALAPI -VOID -DDKAPI -READ_PORT_BUFFER_USHORT (USHORT* Port, - USHORT* Buffer, - ULONG Count) -{ - __asm__ __volatile__ ("cld ; rep ; insw" - : "=D" (Buffer), "=c" (Count) - : "d" (Port),"0" (Buffer),"1" (Count)); -} - -#undef READ_PORT_BUFFER_ULONG -NTHALAPI -VOID -DDKAPI -READ_PORT_BUFFER_ULONG (ULONG* Port, - ULONG* Buffer, - ULONG Count) -{ - __asm__ __volatile__ ("cld ; rep ; insl" - : "=D" (Buffer), "=c" (Count) - : "d" (Port),"0" (Buffer),"1" (Count)); -} - -#undef READ_PORT_UCHAR -NTHALAPI -UCHAR -DDKAPI -READ_PORT_UCHAR (PUCHAR Port) -{ - UCHAR Value; - - __asm__("inb %w1, %0\n\t" - : "=a" (Value) - : "d" (Port)); - SLOW_DOWN_IO; - return(Value); -} - -#undef READ_PORT_USHORT -NTHALAPI -USHORT -DDKAPI -READ_PORT_USHORT (USHORT* Port) -{ - USHORT Value; - - __asm__("inw %w1, %0\n\t" - : "=a" (Value) - : "d" (Port)); - SLOW_DOWN_IO; - return(Value); -} - -#undef READ_PORT_ULONG -NTHALAPI -ULONG -DDKAPI -READ_PORT_ULONG (ULONG* Port) -{ - ULONG Value; - - __asm__("inl %w1, %0\n\t" - : "=a" (Value) - : "d" (Port)); - SLOW_DOWN_IO; - return(Value); -} - -#undef WRITE_PORT_BUFFER_UCHAR -NTHALAPI -VOID -DDKAPI -WRITE_PORT_BUFFER_UCHAR (PUCHAR Port, - PUCHAR Buffer, - ULONG Count) -{ - __asm__ __volatile__ ("cld ; rep ; outsb" - : "=S" (Buffer), "=c" (Count) - : "d" (Port),"0" (Buffer),"1" (Count)); -} - -#undef WRITE_PORT_BUFFER_USHORT -NTHALAPI -VOID -DDKAPI -WRITE_PORT_BUFFER_USHORT (USHORT* Port, - USHORT* Buffer, - ULONG Count) -{ - __asm__ __volatile__ ("cld ; rep ; outsw" - : "=S" (Buffer), "=c" (Count) - : "d" (Port),"0" (Buffer),"1" (Count)); -} - -#undef WRITE_PORT_BUFFER_ULONG -NTHALAPI -VOID -DDKAPI -WRITE_PORT_BUFFER_ULONG (ULONG* Port, - ULONG* Buffer, - ULONG Count) -{ - __asm__ __volatile__ ("cld ; rep ; outsl" - : "=S" (Buffer), "=c" (Count) - : "d" (Port),"0" (Buffer),"1" (Count)); -} - -#undef WRITE_PORT_UCHAR -NTHALAPI -VOID -DDKAPI -WRITE_PORT_UCHAR (PUCHAR Port, - UCHAR Value) -{ - __asm__("outb %0, %w1\n\t" - : - : "a" (Value), - "d" (Port)); - SLOW_DOWN_IO; -} - -#undef WRITE_PORT_USHORT -NTHALAPI -VOID -DDKAPI -WRITE_PORT_USHORT (USHORT* Port, - USHORT Value) -{ - __asm__("outw %0, %w1\n\t" - : - : "a" (Value), - "d" (Port)); - SLOW_DOWN_IO; -} - -#undef WRITE_PORT_ULONG -NTHALAPI -VOID -DDKAPI -WRITE_PORT_ULONG (ULONG* Port, - ULONG Value) -{ - __asm__("outl %0, %w1\n\t" - : - : "a" (Value), - "d" (Port)); - SLOW_DOWN_IO; -} - -/* EOF */ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxdisk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxdisk.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxdisk.c Tue Feb 5 05:40:08 2008 @@ -152,7 +152,7 @@ * Data block read and write commands */ #define IDEReadBlock(Address, Buffer, Count) \ - (READ_PORT_BUFFER_USHORT((PUSHORT)((Address) + IDE_REG_DATA_PORT), (PUSHORT)(Buffer), (Count) / 2)) + (__inwordstring(((Address) + IDE_REG_DATA_PORT), (PUSHORT)(Buffer), (Count) / 2)) #define IDEWriteBlock(Address, Buffer, Count) \ (WRITE_PORT_BUFFER_USHORT((PUSHORT)((Address) + IDE_REG_DATA_PORT), (PUSHORT)(Buffer), (Count) / 2)) Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild (original) +++ trunk/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild Tue Feb 5 05:40:08 2008 @@ -26,7 +26,6 @@ <file>pcmem.c</file> <file>pcrtc.c</file> <file>pcvideo.c</file> - <file>portio.c</file> <file>machxbox.c</file> <file>xboxcons.c</file> <file>xboxdisk.c</file> Modified: trunk/reactos/boot/freeldr/freeldr/include/freeldr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/freeldr.h (original) +++ trunk/reactos/boot/freeldr/freeldr/include/freeldr.h Tue Feb 5 05:40:08 2008 @@ -28,6 +28,7 @@ #define NTOSAPI #define printf TuiPrintf #include <ntddk.h> +#include <ioaccess.h> #include <arc/arc.h> #include <ketypes.h> #include <mmtypes.h> @@ -44,7 +45,6 @@ #include <inifile.h> #include <inffile.h> #include <video.h> -#include <portio.h> #include <ramdisk.h> /* NDK, needed for ReactOS/Windows loaders */ #include <ndk/rtlfuncs.h> Removed: trunk/reactos/boot/freeldr/freeldr/include/portio.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/portio.h (original) +++ trunk/reactos/boot/freeldr/freeldr/include/portio.h (removed) @@ -1,90 +1,0 @@ -/* - * FreeLoader - * Copyright (C) 2001 Brian Palmer <brianp(a)sginet.com> - * Copyright (C) 2001 Eric Kohl - * Copyright (C) 2001 Emanuele Aliberti - * - * 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 __PORTIO_H -#define __PORTIO_H - -/* - * Port I/O functions - */ - -NTHALAPI -VOID -DDKAPI -READ_PORT_BUFFER_UCHAR (PUCHAR Port, PUCHAR Value, ULONG Count); - -NTHALAPI -VOID -DDKAPI -READ_PORT_BUFFER_ULONG (ULONG* Port, ULONG* Value, ULONG Count); - -NTHALAPI -VOID -DDKAPI -READ_PORT_BUFFER_USHORT (USHORT* Port, USHORT* Value, ULONG Count); - -NTHALAPI -UCHAR -DDKAPI -READ_PORT_UCHAR (PUCHAR Port); - -NTHALAPI -ULONG -DDKAPI -READ_PORT_ULONG (ULONG* Port); - -NTHALAPI -USHORT -DDKAPI -READ_PORT_USHORT (USHORT* Port); - -NTHALAPI -VOID -DDKAPI -WRITE_PORT_BUFFER_UCHAR (PUCHAR Port, PUCHAR Value, ULONG Count); - -NTHALAPI -VOID -DDKAPI -WRITE_PORT_BUFFER_ULONG (ULONG* Port, ULONG* Value, ULONG Count); - -NTHALAPI -VOID -DDKAPI -WRITE_PORT_BUFFER_USHORT (USHORT* Port, USHORT* Value, ULONG Count); - -NTHALAPI -VOID -DDKAPI -WRITE_PORT_UCHAR (PUCHAR Port, UCHAR Value); - -NTHALAPI -VOID -DDKAPI -WRITE_PORT_ULONG (ULONG* Port, ULONG Value); - -NTHALAPI -VOID -DDKAPI -WRITE_PORT_USHORT (USHORT* Port, USHORT Value); - - -#endif // defined __PORTIO_H Added: trunk/reactos/include/ddk/ioaccess.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ioaccess.h?rev… ============================================================================== --- trunk/reactos/include/ddk/ioaccess.h (added) +++ trunk/reactos/include/ddk/ioaccess.h Tue Feb 5 05:40:08 2008 @@ -1,0 +1,70 @@ +/* + * ioaccess.h + * + * Windows Device Driver Kit + * + * This file is part of the w32api package. + * + * THIS SOFTWARE IS NOT COPYRIGHTED + * + * This source code is offered for use in the public domain. You may + * use, modify or distribute it freely. + * + * This code is distributed in the hope that it will be useful but + * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY + * DISCLAIMED. This includes but is not limited to warranties of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + */ +#ifndef __IOACCESS_H +#define __IOACCESS_H + +#if __GNUC__ >= 3 +#pragma GCC system_header +#endif + +#ifdef __cplusplus +extern "C" { +#endif + +#define H2I(p) PtrToUshort(p) + +#ifndef NO_PORT_MACROS + +#if defined(_X86_) +#define READ_REGISTER_UCHAR(r) (*(volatile UCHAR *)(r)) +#define READ_REGISTER_USHORT(r) (*(volatile USHORT *)(r)) +#define READ_REGISTER_ULONG(r) (*(volatile ULONG *)(r)) +#define WRITE_REGISTER_UCHAR(r, v) (*(volatile UCHAR *)(r) = (v)) +#define WRITE_REGISTER_USHORT(r, v) (*(volatile USHORT *)(r) = (v)) +#define WRITE_REGISTER_ULONG(r, v) (*(volatile ULONG *)(r) = (v)) +#define READ_PORT_UCHAR(p) (UCHAR)(__inbyte H2I(p)) +#define READ_PORT_USHORT(p) (USHORT)(__inword H2I(p)) +#define READ_PORT_ULONG(p) (ULONG)(__indword H2I(p)) +#define WRITE_PORT_UCHAR(p, v) __outbyte (H2I(p), (v)) +#define WRITE_PORT_USHORT(p, v) __outword (H2I(p), (v)) +#define WRITE_PORT_ULONG(p, v) __outdword (H2I(p), (v)) + +#elif defined(_PPC_) || defined(_MIPS_) || defined(_ARM_) + +#define READ_REGISTER_UCHAR(r) (*(volatile UCHAR * const)(r)) +#define READ_REGISTER_USHORT(r) (*(volatile USHORT * const)(r)) +#define READ_REGISTER_ULONG(r) (*(volatile ULONG * const)(r)) +#define WRITE_REGISTER_UCHAR(r, v) (*(volatile UCHAR * const)(r) = (v)) +#define WRITE_REGISTER_USHORT(r, v) (*(volatile USHORT * const)(r) = (v)) +#define WRITE_REGISTER_ULONG(r, v) (*(volatile ULONG * const)(r) = (v)) +#define READ_PORT_UCHAR(r) READ_REGISTER_UCHAR(r) +#define READ_PORT_USHORT(r) READ_REGISTER_USHORT(r) +#define READ_PORT_ULONG(r) READ_REGISTER_ULONG(r) +#define WRITE_PORT_UCHAR(p, v) WRITE_REGISTER_UCHAR(p, (UCHAR) (v)) +#define WRITE_PORT_USHORT(p, v) WRITE_REGISTER_USHORT(p, (USHORT) (v)) +#define WRITE_PORT_ULONG(p, v) WRITE_REGISTER_ULONG(p, (ULONG) (v)) + +#else + +#error Unsupported architecture + +#endif + +#endif /* NO_PORT_MACROS */ +#endif /* __IOACCESS_H */ Propchange: trunk/reactos/include/ddk/ioaccess.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/include/ddk/ioaccess.h ------------------------------------------------------------------------------ svn:executable = * Propchange: trunk/reactos/include/ddk/ioaccess.h ------------------------------------------------------------------------------ svn:mime-type = text/plain

16 years, 8 months

[ros-arm-bringup] 32129: --- FIXED COMMIT LOG FOR r32128. NO CHANGES IN THIS REVISION --- Implement ramdisk support for FreeLDR (ramdisk.c and ramdisk.h). The implementation is portable across all architectures. We also define a virual ramdisk file (hardcoded name is reactos.img, on the boot volume) for testing ramdisk support on architectures without native ramdisk support (such as x86). This could be further extended to allow network booting as a ramdisk at a later time, but is now primarly fo

by ros-arm-bringup＠svn.reactos.org

Author: ros-arm-bringup Date: Tue Feb 5 04:39:22 2008 New Revision: 32129 URL: http://svn.reactos.org/svn/reactos?rev=32129&view=rev Log: --- FIXED COMMIT LOG FOR r32128. NO CHANGES IN THIS REVISION --- Implement ramdisk support for FreeLDR (ramdisk.c and ramdisk.h). The implementation is portable across all architectures. We also define a virual ramdisk file (hardcoded name is reactos.img, on the boot volume) for testing ramdisk support on architectures without native ramdisk support (such as x86). This could be further extended to allow network booting as a ramdisk at a later time, but is now primarly for test purposes. We introduce two new FreeLDR command-line parameters that should be sent by non-x86 firmware: rdbase and rdsize, and a new freeldr.ini ARC path: ramdisk(0) -- this is compatible with Windows. For compatibility and status output, we use 8MB chunks for reading virtual ramdisk files (a dot is displayed for each additional 8MB chunk). Finally, for code-reuse, the ramdisk implementation will "steal" the BIOS support routines in the arch-vtable and replace them with simple memcpy wrappers. To the disk/filesystem routines in FreeLDR, they think they are reading from the BIOS (or other firmware), but instead, the sector reads are coming from memory). For now, only FAT ramdisks have been tested, and a sector size of 512 bytes is implied. We also disable the FAT block cache since it wouldn't make much sense to cache RAM. *** Note that kernel ramdisk support is missing, so once the kernel attempts to load drivers from the boot device (ramdisk(0)), it will panic. This is currently non an issue on non-x86 builds since the kernel won't get that far for a while. Modified: trunk/reactos/boot/freeldr/freeldr/disk/ramdisk.c Modified: trunk/reactos/boot/freeldr/freeldr/disk/ramdisk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/disk/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/disk/ramdisk.c (original) +++ trunk/reactos/boot/freeldr/freeldr/disk/ramdisk.c Tue Feb 5 04:39:22 2008 @@ -95,7 +95,7 @@ // Get the file size // gRamDiskSize = FsGetFileSize(RamFile); - TuiPrintf("Found virtual ramdisk (%dKB) \n", gRamDiskSize / 1024); + TuiPrintf("Found virtual ramdisk (%dKB)\n", gRamDiskSize / 1024); if (!gRamDiskSize) return; //

16 years, 8 months

[ros-arm-bringup] 32128: Implement ramdisk support for FreeLDR (ramdisk.c and ramdisk.h). The implementation is portable across all architectures. We also define a virual ramdisk file (hardcoded name is reactos.img, on the boot volume) for testing ramdisk support on architectures without native ramdisk support (such as x86). This could be $ We introduce two new FreeLDR command-line parameters that should be sent by non-x86 firmware: rdbase and rdsize, and a new freeldr.ini ARC path: ramdisk(0) -

by ros-arm-bringup＠svn.reactos.org

Author: ros-arm-bringup Date: Tue Feb 5 04:29:49 2008 New Revision: 32128 URL: http://svn.reactos.org/svn/reactos?rev=32128&view=rev Log: Implement ramdisk support for FreeLDR (ramdisk.c and ramdisk.h). The implementation is portable across all architectures. We also define a virual ramdisk file (hardcoded name is reactos.img, on the boot volume) for testing ramdisk support on architectures without native ramdisk support (such as x86). This could be $ We introduce two new FreeLDR command-line parameters that should be sent by non-x86 firmware: rdbase and rdsize, and a new freeldr.ini ARC path: ramdisk(0) -- this is compatible with Windows. For compatibility and status output, we use 8MB chunks for reading virtual ramdisk files (a dot is displayed for each additional 8MB chunk). Finally, for code-reuse, the ramdisk implementation will "steal" the BIOS support routines in the arch-vtable and replace them with simple memcpy wrappers. To the disk/filesystem routines in Fre$ For now, only FAT ramdisks have been tested, and a sector size of 512 bytes is implied. We also disable the FAT block cache since it wouldn't make much sense to cache RAM. $lds since the kernel won't get that far for a while. Added: trunk/reactos/boot/freeldr/freeldr/disk/ramdisk.c (with props) trunk/reactos/boot/freeldr/freeldr/include/ramdisk.h (with props) Modified: trunk/reactos/boot/freeldr/freeldr/bootmgr.c trunk/reactos/boot/freeldr/freeldr/freeldr.c trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild trunk/reactos/boot/freeldr/freeldr/include/freeldr.h trunk/reactos/boot/freeldr/freeldr/reactos/arcname.c trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c Modified: trunk/reactos/boot/freeldr/freeldr/bootmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/bootm… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/bootmgr.c (original) +++ trunk/reactos/boot/freeldr/freeldr/bootmgr.c Tue Feb 5 04:29:49 2008 @@ -37,6 +37,14 @@ return; } + // + // Check if we have a virtual RAM disk + // This is for x86 emulation -- on real hardware, the RAM disk will be + // located in one of the hardware memory descriptors as well as on the + // freeldr command-line + // + RamDiskCheckForVirtualFile(); + if (!IniFileInitialize()) { UiMessageBoxCritical("Error initializing .ini file"); Added: trunk/reactos/boot/freeldr/freeldr/disk/ramdisk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/disk/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/disk/ramdisk.c (added) +++ trunk/reactos/boot/freeldr/freeldr/disk/ramdisk.c Tue Feb 5 04:29:49 2008 @@ -1,0 +1,176 @@ +/* + * PROJECT: ReactOS Boot Loader + * LICENSE: GPL - See COPYING in the top level directory + * FILE: boot/freeldr/arch/i386/ramdisk.c + * PURPOSE: Implements routines to support booting from a RAM Disk + * PROGRAMMERS: alex(a)winsiderss.com + */ + +/* INCLUDES *******************************************************************/ + +#include <freeldr.h> +#define NDEBUG +#include <debug.h> + +/* GLOBALS ********************************************************************/ + +PVOID gRamDiskBase; +ULONG gRamDiskSize; +extern BOOLEAN gCacheEnabled; + +/* FUNCTIONS ******************************************************************/ + +FORCEINLINE +PVOID +RamDiskGetDataAtOffset(IN PVOID Offset) +{ + // + // Return data from our RAM Disk + // + assert(((ULONG_PTR)gRamDiskBase + (ULONG_PTR)Offset) < + ((ULONG_PTR)gRamDiskBase + (ULONG_PTR)gRamDiskSize)); + return (PVOID)((ULONG_PTR)gRamDiskBase + (ULONG_PTR)(Offset)); +} + +ULONG +RamDiskGetCacheableBlockCount(IN ULONG Reserved) +{ + // + // Allow 32KB transfers (64 sectors), emulating BIOS LBA + // + return 64; +} + +BOOLEAN +RamDiskGetDriveGeometry(IN ULONG Reserved, + OUT PGEOMETRY Geometry) +{ + // + // Should never be called when the caller expects valid Geometry! + // + return TRUE; +} + +BOOLEAN +RamDiskReadLogicalSectors(IN ULONG Reserved, + IN ULONGLONG SectorNumber, + IN ULONG SectorCount, + IN PVOID Buffer) +{ + PVOID StartAddress; + ULONG Length; + + // + // Get actual pointers and lengths + // + StartAddress = (PVOID)((ULONG)SectorNumber * 512); + Length = SectorCount * 512; + + // + // Don't allow reads past our image + // + if (((ULONG_PTR)StartAddress + Length) > gRamDiskSize) return FALSE; + + // + // Do the read + // + RtlCopyMemory(Buffer, RamDiskGetDataAtOffset(StartAddress), Length); + return TRUE; +} + +VOID +NTAPI +RamDiskCheckForVirtualFile(VOID) +{ + PFILE RamFile; + ULONG TotalRead, ChunkSize; + + // + // Try opening the ramdisk file (this assumes the boot volume was opened) + // + RamFile = FsOpenFile("reactos.img"); + if (RamFile) + { + // + // Get the file size + // + gRamDiskSize = FsGetFileSize(RamFile); + TuiPrintf("Found virtual ramdisk (%dKB) \n", gRamDiskSize / 1024); + if (!gRamDiskSize) return; + + // + // Allocate memory for it + // + ChunkSize = 8 * 1024 * 1024; + gRamDiskBase = MmAllocateMemory(gRamDiskSize); + if (!gRamDiskBase) return; + + // + // Read it in chunks + // + TuiPrintf("Loading ramdisk @ 0x%x...", gRamDiskBase); + for (TotalRead = 0; TotalRead < gRamDiskSize; TotalRead += ChunkSize) + { + // + // Check if we're at the last chunk + // + if ((gRamDiskSize - TotalRead) < ChunkSize) + { + // + // Only need the actual data required + // + ChunkSize = gRamDiskSize - TotalRead; + } + + // + // Copy the contents + // + TuiPrintf("."); + if (!FsReadFile(RamFile, + ChunkSize, + NULL, + (PVOID)((ULONG_PTR)gRamDiskBase + TotalRead))) + { + // + // Fail + // + TuiPrintf("Failed to read ramdisk\n"); + } + } + TuiPrintf("\n"); + } +} + +VOID +NTAPI +RamDiskSwitchFromBios(VOID) +{ + // + // Check if we have a ramdisk, in which case we need to switch routines + // + if (gRamDiskBase) + { + // + // Don't use the BIOS for reads anymore + // + MachVtbl.DiskReadLogicalSectors = RamDiskReadLogicalSectors; + MachVtbl.DiskGetDriveGeometry = RamDiskGetDriveGeometry; + MachVtbl.DiskGetCacheableBlockCount = RamDiskGetCacheableBlockCount; + + // + // Also disable cached FAT reads + // + gCacheEnabled = FALSE; + } +} + +VOID +NTAPI +RamDiskInit(IN PCHAR CmdLine) +{ + // + // Get RAM disk parameters + // + gRamDiskBase = (PVOID)atoi(strstr(CmdLine, "rdbase=")); + gRamDiskSize = atoi(strstr(CmdLine, "rdsize=")); +} Propchange: trunk/reactos/boot/freeldr/freeldr/disk/ramdisk.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/boot/freeldr/freeldr/disk/ramdisk.c ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: trunk/reactos/boot/freeldr/freeldr/freeldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/freeldr.c (original) +++ trunk/reactos/boot/freeldr/freeldr/freeldr.c Tue Feb 5 04:29:49 2008 @@ -26,6 +26,8 @@ MachInit(CmdLine); + RamDiskInit(CmdLine); + DebugInit(); DbgPrint((DPRINT_WARNING, "BootMain() called.\n")); Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild (original) +++ trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild Tue Feb 5 04:29:49 2008 @@ -19,6 +19,7 @@ <directory name="disk"> <file>disk.c</file> <file>partition.c</file> + <file>ramdisk.c</file> </directory> <directory name="fs"> <file>ext2.c</file> Modified: trunk/reactos/boot/freeldr/freeldr/include/freeldr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/freeldr.h (original) +++ trunk/reactos/boot/freeldr/freeldr/include/freeldr.h Tue Feb 5 04:29:49 2008 @@ -45,6 +45,7 @@ #include <inffile.h> #include <video.h> #include <portio.h> +#include <ramdisk.h> /* NDK, needed for ReactOS/Windows loaders */ #include <ndk/rtlfuncs.h> #include <ndk/ldrtypes.h> Added: trunk/reactos/boot/freeldr/freeldr/include/ramdisk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/ramdisk.h (added) +++ trunk/reactos/boot/freeldr/freeldr/include/ramdisk.h Tue Feb 5 04:29:49 2008 @@ -1,0 +1,33 @@ +/* + * PROJECT: ReactOS Boot Loader + * LICENSE: GPL - See COPYING in the top level directory + * FILE: boot/freeldr/include/ramdisk.h + * PURPOSE: Header file for ramdisk support + * PROGRAMMERS: alex(a)winsiderss.com + */ + +#ifndef _RAMDISK_ +#define _RAMDISK_ + +// +// Ramdisk Routines +// +VOID +NTAPI +RamDiskInit( + IN PCHAR CmdLine +); + +VOID +NTAPI +RamDiskSwitchFromBios( + VOID +); + +VOID +NTAPI +RamDiskCheckForVirtualFile( + VOID +); + +#endif Propchange: trunk/reactos/boot/freeldr/freeldr/include/ramdisk.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/boot/freeldr/freeldr/include/ramdisk.h ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: trunk/reactos/boot/freeldr/freeldr/reactos/arcname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/arcname.c (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/arcname.c Tue Feb 5 04:29:49 2008 @@ -24,6 +24,25 @@ BOOLEAN DissectArcPath(CHAR *ArcPath, CHAR *BootPath, ULONG* BootDrive, ULONG* BootPartition) { char *p; + + // + // Detect ramdisk path + // + if (_strnicmp(ArcPath, "ramdisk(0)", 10) == 0) + { + // + // Magic value for ramdisks + // + *BootDrive = 0x49; + *BootPartition = 1; + + // + // Get the path + // + p = ArcPath + 11; + strcpy(BootPath, p); + return TRUE; + } if (_strnicmp(ArcPath, "multi(0)disk(0)", 15) != 0) return FALSE; 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 Tue Feb 5 04:29:49 2008 @@ -707,6 +707,15 @@ UiDrawStatusText("Loading..."); + // + // If we have a ramdisk, this will switch to the ramdisk disk routines + // which read from memory instead of using the firmware. This has to be done + // after hardware detection, since hardware detection will require using the + // real routines in order to perform disk-detection (just because we're on a + // ram-boot doesn't mean the user doesn't have actual disks installed too!) + // + RamDiskSwitchFromBios(); + /* * Try to open system drive */

16 years, 8 months

[cfinck] 32127: - Add a function MatchFileNamePattern for matching a file against a pattern (imported from Busybox under GPL2 or later license, heavily modified for our purposes, more information in the function comments) - Add support for multiple search criterias, which are actually checked. This makes it possible to pass parameters like "*.rbuild *.txt" to the cabman command line for adding, displaying and extracting files in a cabinet. - Overhaul CreateSimpleCabinet, make it able to add mult

by cfinck＠svn.reactos.org

Author: cfinck Date: Tue Feb 5 01:48:42 2008 New Revision: 32127 URL: http://svn.reactos.org/svn/reactos?rev=32127&view=rev Log: - Add a function MatchFileNamePattern for matching a file against a pattern (imported from Busybox under GPL2 or later license, heavily modified for our purposes, more information in the function comments) - Add support for multiple search criterias, which are actually checked. This makes it possible to pass parameters like "*.rbuild *.txt" to the cabman command line for adding, displaying and extracting files in a cabinet. - Overhaul CreateSimpleCabinet, make it able to add multiple files to the cabinet using the new search criteria functions. - Fix some comments and indentation here and there. Modified: trunk/reactos/tools/cabman/cabinet.cxx trunk/reactos/tools/cabman/cabinet.h trunk/reactos/tools/cabman/cabman.h trunk/reactos/tools/cabman/dfp.cxx trunk/reactos/tools/cabman/main.cxx Modified: trunk/reactos/tools/cabman/cabinet.cxx URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/cabinet.cxx?r… ============================================================================== --- trunk/reactos/tools/cabman/cabinet.cxx (original) +++ trunk/reactos/tools/cabman/cabinet.cxx Tue Feb 5 01:48:42 2008 @@ -18,6 +18,9 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> +#if !defined(WIN32) +# include <dirent.h> +#endif #if defined(__FreeBSD__) || defined(__APPLE__) # include <sys/stat.h> #endif // __FreeBSD__ @@ -315,10 +318,12 @@ CabinetReservedFileBuffer = NULL; CabinetReservedFileSize = 0; - FolderListHead = NULL; - FolderListTail = NULL; - FileListHead = NULL; - FileListTail = NULL; + FolderListHead = NULL; + FolderListTail = NULL; + FileListHead = NULL; + FileListTail = NULL; + CriteriaListHead = NULL; + CriteriaListTail = NULL; Codec = NULL; CodecId = -1; @@ -509,6 +514,82 @@ ConvertPath(DestPath, false); if (strlen(DestPath) > 0) NormalizePath(DestPath, MAX_PATH); +} + +ULONG CCabinet::AddSearchCriteria(char* SearchCriteria) +/* + * FUNCTION: Adds a criteria to the search criteria list + * ARGUMENTS: + * SearchCriteria = String with the search criteria to add + * RETURNS: + * Status of operation + */ +{ + PSEARCH_CRITERIA Criteria; + + // Add the criteria to the list of search criteria + Criteria = (PSEARCH_CRITERIA)AllocateMemory(sizeof(SEARCH_CRITERIA)); + if(!Criteria) + { + DPRINT(MIN_TRACE, ("Insufficient memory.\n")); + return CAB_STATUS_NOMEMORY; + } + + Criteria->Prev = CriteriaListTail; + Criteria->Next = NULL; + + if(CriteriaListTail) + CriteriaListTail->Next = Criteria; + else + CriteriaListHead = Criteria; + + CriteriaListTail = Criteria; + + // Set the actual criteria string + Criteria->Search = (char*)AllocateMemory(strlen(SearchCriteria) + 1); + if (!Criteria->Search) + { + DPRINT(MIN_TRACE, ("Insufficient memory.\n")); + return CAB_STATUS_NOMEMORY; + } + + strcpy(Criteria->Search, SearchCriteria); + + return CAB_STATUS_SUCCESS; +} + +void CCabinet::DestroySearchCriteria() +/* + * FUNCTION: Destroys the list with the search criteria + */ +{ + PSEARCH_CRITERIA Criteria; + PSEARCH_CRITERIA NextCriteria; + + Criteria = CriteriaListHead; + + while(Criteria) + { + NextCriteria = Criteria->Next; + + FreeMemory(Criteria->Search); + FreeMemory(Criteria); + + Criteria = NextCriteria; + } + + CriteriaListHead = NULL; + CriteriaListTail = NULL; +} + +bool CCabinet::HasSearchCriteria() +/* + * FUNCTION: Returns whether we have search criteria + * RETURNS: + * Whether we have search criteria or not. + */ +{ + return (CriteriaListHead != NULL); } bool CCabinet::SetCompressionCodec(char* CodecName) @@ -821,19 +902,16 @@ } -ULONG CCabinet::FindFirst(char* FileName, - PCAB_SEARCH Search) +ULONG CCabinet::FindFirst(PCAB_SEARCH Search) /* * FUNCTION: Finds the first file in the cabinet that matches a search criteria * ARGUMENTS: - * FileName = Pointer to search criteria * Search = Pointer to search structure * RETURNS: * Status of operation */ { RestartSearch = false; - strncpy(Search->Search, FileName, MAX_PATH); Search->Next = FileListHead; return FindNext(Search); } @@ -848,6 +926,8 @@ * Status of operation */ { + bool bFound = false; + PSEARCH_CRITERIA Criteria; ULONG Status; if (RestartSearch) @@ -867,7 +947,32 @@ RestartSearch = false; } - /* FIXME: Check search criteria */ + /* Check each search criteria against each file */ + while(Search->Next) + { + // Some features (like displaying cabinets) don't require search criteria, so we can just break here. + // If a feature requires it, handle this in the ParseCmdline() function in "main.cxx". + if(!CriteriaListHead) + break; + + Criteria = CriteriaListHead; + + while(Criteria) + { + if(MatchFileNamePattern(Search->Next->FileName, Criteria->Search)) + { + bFound = true; + break; + } + + Criteria = Criteria->Next; + } + + if(bFound) + break; + + Search->Next = Search->Next->Next; + } if (!Search->Next) { @@ -1960,6 +2065,151 @@ return CAB_STATUS_SUCCESS; } +bool CCabinet::CreateSimpleCabinet() +/* + * FUNCTION: Create a simple cabinet based on the files in the criteria list + */ +{ + bool bRet = false; + char* pszFile; + char szFilePath[MAX_PATH]; + char szFile[MAX_PATH]; + PSEARCH_CRITERIA Criteria; + ULONG Status; + +#if defined(WIN32) + HANDLE hFind; + WIN32_FIND_DATA FindFileData; +#else + DIR* dirp; + struct dirent* dp; + struct stat stbuf; +#endif + + // Initialize a new cabinet + Status = NewCabinet(); + if (Status != CAB_STATUS_SUCCESS) + { + DPRINT(MIN_TRACE, ("Cannot create cabinet (%u).\n", (UINT)Status)); + goto cleanup; + } + + // Add each file in the criteria list + Criteria = CriteriaListHead; + + while(Criteria) + { + // Store the file path with a trailing slash in szFilePath + pszFile = strrchr(Criteria->Search, '/'); + if(!pszFile) + pszFile = strrchr(Criteria->Search, '\\'); + + if(pszFile) + { + strncpy(szFilePath, Criteria->Search, pszFile - Criteria->Search + 1); + szFilePath[pszFile - Criteria->Search + 1] = 0; + } + else + szFilePath[0] = 0; + +#if defined(WIN32) + // Windows: Use the easy FindFirstFile/FindNextFile API for getting all files and checking them against the pattern + hFind = FindFirstFile(Criteria->Search, &FindFileData); + + // Don't stop if a search criteria is not found + if(hFind == INVALID_HANDLE_VALUE && GetLastError() != ERROR_FILE_NOT_FOUND) + { + DPRINT(MIN_TRACE, ("FindFirstFile failed, Criteria: %s, error code is %u\n", Criteria->Search, (UINT)GetLastError())); + goto cleanup; + } + + do + { + if(!(FindFileData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) + { + strcpy(szFile, szFilePath); + strcat(szFile, FindFileData.cFileName); + + Status = AddFile(szFile); + + if(Status != CAB_STATUS_SUCCESS) + { + DPRINT(MIN_TRACE, ("Cannot add file to cabinet (%u).\n", (UINT)Status)); + goto cleanup; + } + } + } + while(FindNextFile(hFind, &FindFileData)); + + FindClose(hFind); +#else + // Unix: Use opendir/readdir to loop through all entries, stat to check if it's a file and MatchFileNamePattern to match the file against the pattern + if(szFilePath[0] == 0) + strcpy(szFilePath, "./"); + + dirp = opendir(szFilePath); + + if(dirp) + { + while( (dp = readdir(dirp)) ) + { + strcpy(szFile, szFilePath); + strcat(szFile, dp->d_name); + + if(stat(szFile, &stbuf) == 0) + { + if(stbuf.st_mode != S_IFDIR) + { + // As we added "./" to szFilePath above, szFile might contain "./test.txt" now and Criteria->Search "test.txt". + // Therefore they won't match using MatchFileNamePattern. By using pszFile here, we can avoid this problem. + if(szFile[0] == '.' && szFile[1] == '/') + pszFile = szFile + 2; + else + pszFile = szFile; + + if(MatchFileNamePattern(pszFile, Criteria->Search)) + { + Status = AddFile(szFile); + + if(Status != CAB_STATUS_SUCCESS) + { + DPRINT(MIN_TRACE, ("Cannot add file to cabinet (%u).\n", (UINT)Status)); + goto cleanup; + } + } + } + } + else + { + DPRINT(MIN_TRACE, ("stat failed, error code is %i\n", errno)); + goto cleanup; + } + } + + closedir(dirp); + } + +#endif + + Criteria = Criteria->Next; + } + + Status = WriteDisk(false); + if (Status == CAB_STATUS_SUCCESS) + Status = CloseDisk(); + if (Status != CAB_STATUS_SUCCESS) + { + DPRINT(MIN_TRACE, ("Cannot write disk (%u).\n", (UINT)Status)); + goto cleanup; + } + + CloseCabinet(); + bRet = true; + +cleanup: + DestroySearchCriteria(); + return bRet; +} void CCabinet::SetMaxDiskSize(ULONG Size) /* @@ -2509,8 +2759,6 @@ void CCabinet::DestroyFileNodes() /* * FUNCTION: Destroys file nodes - * ARGUMENTS: - * FolderNode = Pointer to folder node */ { PCFFILE_NODE PrevNode; @@ -2641,8 +2889,8 @@ ULONG CCabinet::ComputeChecksum(void* Buffer, - ULONG Size, - ULONG Seed) + ULONG Size, + ULONG Seed) /* * FUNCTION: Computes checksum for data block * ARGUMENTS: @@ -2700,8 +2948,8 @@ ULONG CCabinet::ReadBlock(void* Buffer, - ULONG Size, - PULONG BytesRead) + ULONG Size, + PULONG BytesRead) /* * FUNCTION: Read a block of data from file * ARGUMENTS: @@ -2716,6 +2964,67 @@ if (!ReadFileData(FileHandle, Buffer, Size, BytesRead)) return CAB_STATUS_INVALID_CAB; return CAB_STATUS_SUCCESS; +} + +bool CCabinet::MatchFileNamePattern(char* FileName, char* Pattern) +/* + * FUNCTION: Matches a wildcard character pattern against a file + * ARGUMENTS: + * FileName = The file name to check + * Pattern = The pattern + * RETURNS: + * Whether the pattern matches the file + * + * COPYRIGHT: + * This function is based on Busybox code, Copyright (C) 1998 by Erik Andersen, released under GPL2 or any later version. + * Adapted from code written by Ingo Wilken. + * Original location: http://www.busybox.net/cgi-bin/viewcvs.cgi/trunk/busybox/utility.c?rev=5&vi… + */ +{ + char* retryPattern = NULL; + char* retryFileName = NULL; + char ch; + + while (*FileName || *Pattern) + { + ch = *Pattern++; + + switch (ch) + { + case '*': + retryPattern = Pattern; + retryFileName = FileName; + break; + + case '?': + if (*FileName++ == '\0') + return false; + + break; + + default: + if (*FileName == ch) + { + if (*FileName) + FileName++; + break; + } + + if (*FileName) + { + Pattern = retryPattern; + FileName = ++retryFileName; + break; + } + + return false; + } + + if (!Pattern) + return false; + } + + return true; } #ifndef CAB_READ_ONLY Modified: trunk/reactos/tools/cabman/cabinet.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/cabinet.h?rev… ============================================================================== --- trunk/reactos/tools/cabman/cabinet.h (original) +++ trunk/reactos/tools/cabman/cabinet.h Tue Feb 5 01:48:42 2008 @@ -224,13 +224,18 @@ PCFFOLDER_NODE FolderNode; // Folder this file belong to } CFFILE_NODE, *PCFFILE_NODE; +typedef struct _SEARCH_CRITERIA +{ + struct _SEARCH_CRITERIA *Next; // Pointer to next search criteria + struct _SEARCH_CRITERIA *Prev; // Pointer to previous search criteria + char* Search; // The actual search criteria +} SEARCH_CRITERIA, *PSEARCH_CRITERIA; typedef struct _CAB_SEARCH { - char Search[MAX_PATH]; // Search criteria - PCFFILE_NODE Next; // Pointer to next node - PCFFILE File; // Pointer to current CFFILE - char* FileName; // Current filename + PCFFILE_NODE Next; // Pointer to next node + PCFFILE File; // Pointer to current CFFILE + char* FileName; // Current filename } CAB_SEARCH, *PCAB_SEARCH; @@ -345,16 +350,25 @@ /* Closes the current open cabinet file */ void Close(); /* Locates the first file in the current cabinet file that matches a search criteria */ - ULONG FindFirst(char* FileName, PCAB_SEARCH Search); + ULONG FindFirst(PCAB_SEARCH Search); /* Locates the next file in the current cabinet file */ ULONG FindNext(PCAB_SEARCH Search); /* Extracts a file from the current cabinet file */ ULONG ExtractFile(char* FileName); /* Select codec engine to use */ void SelectCodec(LONG Id); - /* Returns if a codec engine is selected */ + /* Returns whether a codec engine is selected */ bool IsCodecSelected(); + /* Adds a search criteria for adding files to a simple cabinet, displaying files in a cabinet or extracting them */ + ULONG AddSearchCriteria(char* SearchCriteria); + /* Destroys the search criteria list */ + void DestroySearchCriteria(); + /* Returns whether we have search criteria */ + bool HasSearchCriteria(); + #ifndef CAB_READ_ONLY + /* Creates a simple cabinet based on the search criteria data */ + bool CreateSimpleCabinet(); /* Sets the codec to use for compression (based on a string value) */ bool SetCompressionCodec(char* CodecName); /* Creates a new cabinet file */ @@ -412,6 +426,7 @@ void DestroyDeletedFolderNodes(); ULONG ComputeChecksum(void* Buffer, ULONG Size, ULONG Seed); ULONG ReadBlock(void* Buffer, ULONG Size, PULONG BytesRead); + bool MatchFileNamePattern(char* FileName, char* Pattern); #ifndef CAB_READ_ONLY ULONG InitCabinetHeader(); ULONG WriteCabinetHeader(bool MoreDisks); @@ -455,6 +470,8 @@ PCFDATA_NODE CurrentDataNode; PCFFILE_NODE FileListHead; PCFFILE_NODE FileListTail; + PSEARCH_CRITERIA CriteriaListHead; + PSEARCH_CRITERIA CriteriaListTail; CCABCodec *Codec; LONG CodecId; bool CodecSelected; Modified: trunk/reactos/tools/cabman/cabman.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/cabman.h?rev=… ============================================================================== --- trunk/reactos/tools/cabman/cabman.h (original) +++ trunk/reactos/tools/cabman/cabman.h Tue Feb 5 01:48:42 2008 @@ -27,7 +27,6 @@ private: void Usage(); bool CreateCabinet(); - bool CreateSimpleCabinet(); bool DisplayCabinet(); bool ExtractFromCabinet(); /* Event handlers */ @@ -39,7 +38,6 @@ bool ProcessAll; ULONG Mode; bool PromptOnOverwrite; - char Location[MAX_PATH]; char FileName[MAX_PATH]; }; Modified: trunk/reactos/tools/cabman/dfp.cxx URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/dfp.cxx?rev=3… ============================================================================== --- trunk/reactos/tools/cabman/dfp.cxx (original) +++ trunk/reactos/tools/cabman/dfp.cxx Tue Feb 5 01:48:42 2008 @@ -391,7 +391,7 @@ if (!InfFileOnly) { - printf("\nWriting cabinet. This may take a while...\n\n"); + printf("\nWriting cabinet. This may take a while...\n\n"); if (DiskCreated) { Modified: trunk/reactos/tools/cabman/main.cxx URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/main.cxx?rev=… ============================================================================== --- trunk/reactos/tools/cabman/main.cxx (original) +++ trunk/reactos/tools/cabman/main.cxx Tue Feb 5 01:48:42 2008 @@ -172,6 +172,7 @@ ProcessAll = false; InfFileOnly = false; Mode = CM_MODE_DISPLAY; + FileName[0] = 0; } @@ -190,8 +191,8 @@ { printf("ReactOS Cabinet Manager\n\n"); printf("CABMAN [-D | -E] [-A] [-L dir] cabinet [filename ...]\n"); - printf("CABMAN -C dirfile [-I] [-RC file] [-P dir]\n"); - printf("CABMAN -S cabinet filename\n"); + printf("CABMAN [-M mode] -C dirfile [-I] [-RC file] [-P dir]\n"); + printf("CABMAN [-M mode] -S cabinet filename ...\n"); printf(" cabinet Cabinet file.\n"); printf(" filename Name of the file to extract from the cabinet.\n"); printf(" Wild cards and multiple filenames\n"); @@ -207,7 +208,7 @@ printf(" -I Don't create the cabinet, only the .inf file.\n"); printf(" -L dir Location to place extracted or generated files\n"); printf(" (default is current directory).\n"); - printf(" -M Specify the compression method to use\n"); + printf(" -M mode Specify the compression method to use:\n"); printf(" raw - No compression\n"); printf(" mszip - MsZip compression (default)\n"); printf(" -N Don't create the .inf file, only the cabinet.\n"); @@ -351,10 +352,23 @@ } else { - if ((FoundCabinet) || (Mode == CM_MODE_CREATE)) - { - /* FIXME: There may be many of these if Mode != CM_MODE_CREATE */ - strcpy(FileName, argv[i]); + if(Mode == CM_MODE_CREATE) + { + if(FileName[0]) + { + printf("You may only specify one directive file!\n"); + return false; + } + else + { + // For creating cabinets, this argument is the path to the directive file + strcpy(FileName, argv[i]); + } + } + else if(FoundCabinet) + { + // For creating simple cabinets, displaying or extracting them, add the argument as a search criteria + AddSearchCriteria(argv[i]); } else { @@ -366,14 +380,21 @@ if (ShowUsage) { - Usage(); - return false; + Usage(); + return false; } // Select MsZip by default for creating cabinets if( (Mode == CM_MODE_CREATE || Mode == CM_MODE_CREATE_SIMPLE) && !IsCodecSelected() ) SelectCodec(CAB_CODEC_MSZIP); + // Search criteria (= the filename argument) is necessary for creating a simple cabinet + if( Mode == CM_MODE_CREATE_SIMPLE && !HasSearchCriteria()) + { + printf("You have to enter input file names!\n"); + return false; + } + return true; } @@ -396,43 +417,6 @@ return (Status == CAB_STATUS_SUCCESS ? true : false); } - - -bool CCABManager::CreateSimpleCabinet() -/* - * FUNCTION: Create cabinet - */ -{ - ULONG Status; - - Status = NewCabinet(); - if (Status != CAB_STATUS_SUCCESS) - { - DPRINT(MIN_TRACE, ("Cannot create cabinet (%u).\n", (UINT)Status)); - return false; - } - - Status = AddFile(FileName); - if (Status != CAB_STATUS_SUCCESS) - { - DPRINT(MIN_TRACE, ("Cannot add file to cabinet (%u).\n", (UINT)Status)); - return false; - } - - Status = WriteDisk(false); - if (Status == CAB_STATUS_SUCCESS) - Status = CloseDisk(); - if (Status != CAB_STATUS_SUCCESS) - { - DPRINT(MIN_TRACE, ("Cannot write disk (%u).\n", (UINT)Status)); - return false; - } - - CloseCabinet(); - - return true; -} - bool CCABManager::DisplayCabinet() /* @@ -448,7 +432,7 @@ { printf("Cabinet %s\n\n", GetCabinetName()); - if (FindFirst("", &Search) == CAB_STATUS_SUCCESS) + if (FindFirst(&Search) == CAB_STATUS_SUCCESS) { do { @@ -466,6 +450,8 @@ } } while (FindNext(&Search) == CAB_STATUS_SUCCESS); } + + DestroySearchCriteria(); if (FileCount > 0) { if (FileCount == 1) @@ -503,6 +489,7 @@ * FUNCTION: Extract file(s) from cabinet */ { + bool bRet = true; CAB_SEARCH Search; ULONG Status; @@ -510,34 +497,46 @@ { printf("Cabinet %s\n\n", GetCabinetName()); - if (FindFirst("", &Search) == CAB_STATUS_SUCCESS) + if (FindFirst(&Search) == CAB_STATUS_SUCCESS) { do { - switch (Status = ExtractFile(Search.FileName)) { + switch (Status = ExtractFile(Search.FileName)) + { case CAB_STATUS_SUCCESS: break; case CAB_STATUS_INVALID_CAB: printf("Cabinet contains errors.\n"); - return false; + bRet = false; + break; case CAB_STATUS_UNSUPPCOMP: printf("Cabinet uses unsupported compression type.\n"); - return false; + bRet = false; + break; case CAB_STATUS_CANNOT_WRITE: printf("You've run out of free space on the destination volume or the volume is damaged.\n"); - return false; + bRet = false; + break; default: printf("Unspecified error code (%u).\n", (UINT)Status); - return false; + bRet = false; + break; } + + if(!bRet) + break; } while (FindNext(&Search) == CAB_STATUS_SUCCESS); + + DestroySearchCriteria(); } - return true; - } else + + return bRet; + } + else printf("Cannot open file: %s.\n", GetCabinetName()); return false; @@ -555,19 +554,15 @@ { case CM_MODE_CREATE: return CreateCabinet(); - break; case CM_MODE_DISPLAY: return DisplayCabinet(); - break; case CM_MODE_EXTRACT: return ExtractFromCabinet(); - break; case CM_MODE_CREATE_SIMPLE: return CreateSimpleCabinet(); - break; default: break;

16 years, 8 months

[cwittich] 32126: always return Request->Status;

by cwittich＠svn.reactos.org

Author: cwittich Date: Tue Feb 5 01:41:09 2008 New Revision: 32126 URL: http://svn.reactos.org/svn/reactos?rev=32126&view=rev Log: always return Request->Status; Modified: trunk/reactos/subsystems/win32/csrss/api/alias.c Modified: trunk/reactos/subsystems/win32/csrss/api/alias.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/api… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/api/alias.c (original) +++ trunk/reactos/subsystems/win32/csrss/api/alias.c Tue Feb 5 01:41:09 2008 @@ -312,7 +312,7 @@ if (!Header) { Request->Status = STATUS_INSUFFICIENT_RESOURCES; - return STATUS_INSUFFICIENT_RESOURCES; + return Request->Status; } IntInsertAliasHeader(&RootHeader, Header); } @@ -339,7 +339,7 @@ if (!Entry) { Request->Status = STATUS_INSUFFICIENT_RESOURCES; - return STATUS_INSUFFICIENT_RESOURCES; + return Request->Status; } IntInsertAliasEntry(Header, Entry); @@ -365,26 +365,26 @@ if (!Header) { Request->Status = STATUS_INVALID_PARAMETER; - return STATUS_INVALID_PARAMETER; + return Request->Status; } Entry = IntGetAliasEntry(Header, Request->Data.GetConsoleAlias.lpSource); if (!Entry) { Request->Status = STATUS_INVALID_PARAMETER; - return STATUS_INVALID_PARAMETER; + return Request->Status; } Length = (wcslen(Entry->lpTarget)+1) * sizeof(WCHAR); if (Length > Request->Data.GetConsoleAlias.TargetBufferLength) { Request->Status = ERROR_INSUFFICIENT_BUFFER; - return ERROR_INSUFFICIENT_BUFFER; + return Request->Status; } wcscpy(Request->Data.GetConsoleAlias.TargetBuffer, Entry->lpTarget); Request->Data.GetConsoleAlias.BytesWritten = Length; Request->Status = STATUS_SUCCESS; - return STATUS_SUCCESS; + return Request->Status; } CSR_API(CsrGetAllConsoleAliases) @@ -402,13 +402,13 @@ if (!Header) { Request->Status = STATUS_INVALID_PARAMETER; - return STATUS_INVALID_PARAMETER; + return Request->Status; } if (IntGetAllConsoleAliasesLength(Header) > Request->Data.GetAllConsoleAlias.AliasBufferLength) { Request->Status = ERROR_INSUFFICIENT_BUFFER; - return ERROR_INSUFFICIENT_BUFFER; + return Request->Status; } BytesWritten = IntGetAllConsoleAliases(Header, @@ -417,7 +417,7 @@ Request->Data.GetAllConsoleAlias.BytesWritten = BytesWritten; Request->Status = STATUS_SUCCESS; - return STATUS_SUCCESS; + return Request->Status; } CSR_API(CsrGetAllConsoleAliasesLength) @@ -435,13 +435,13 @@ if (!Header) { Request->Status = STATUS_INVALID_PARAMETER; - return STATUS_INVALID_PARAMETER; + return Request->Status; } Length = IntGetAllConsoleAliasesLength(Header); Request->Data.GetAllConsoleAliasesLength.Length = Length; Request->Status = STATUS_SUCCESS; - return STATUS_SUCCESS; + return Request->Status; } @@ -453,7 +453,7 @@ if (ExesLength > Request->Data.GetConsoleAliasesExes.Length) { Request->Status = ERROR_INSUFFICIENT_BUFFER; - return ERROR_INSUFFICIENT_BUFFER; + return Request->Status; } if (Request->Data.GetConsoleAliasesExes.ExeNames == NULL) @@ -475,5 +475,5 @@ { Request->Status = STATUS_SUCCESS; Request->Data.GetConsoleAliasesExesLength.Length = IntGetConsoleAliasesExesLength(RootHeader); - return STATUS_SUCCESS; -} + return Request->Status; +}

16 years, 8 months

[janderwald] 32125: - remove unused members

by janderwald＠svn.reactos.org

Author: janderwald Date: Tue Feb 5 01:33:21 2008 New Revision: 32125 URL: http://svn.reactos.org/svn/reactos?rev=32125&view=rev Log: - remove unused members Modified: trunk/reactos/include/reactos/subsys/csrss/csrss.h Modified: trunk/reactos/include/reactos/subsys/csrss/csrss.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/subsys/csr… ============================================================================== --- trunk/reactos/include/reactos/subsys/csrss/csrss.h (original) +++ trunk/reactos/include/reactos/subsys/csrss/csrss.h Tue Feb 5 01:33:21 2008 @@ -445,7 +445,6 @@ typedef struct { - BOOL Unicode; DWORD BytesWritten; DWORD Length; LPWSTR ExeNames; @@ -453,7 +452,6 @@ typedef struct { - BOOL Unicode; DWORD Length; } CSRSS_GET_CONSOLE_ALIASES_EXES_LENGTH, *PCSRSS_GET_CONSOLE_ALIASES_EXES_LENGTH;

16 years, 8 months

[janderwald] 32124: - fix error status

by janderwald＠svn.reactos.org

Author: janderwald Date: Tue Feb 5 01:32:37 2008 New Revision: 32124 URL: http://svn.reactos.org/svn/reactos?rev=32124&view=rev Log: - fix error status Modified: trunk/reactos/subsystems/win32/csrss/api/alias.c Modified: trunk/reactos/subsystems/win32/csrss/api/alias.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/api… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/api/alias.c (original) +++ trunk/reactos/subsystems/win32/csrss/api/alias.c Tue Feb 5 01:32:37 2008 @@ -364,15 +364,15 @@ Header = IntFindAliasHeader(RootHeader, Request->Data.GetAllConsoleAlias.lpExeName); if (!Header) { - Request->Status = ERROR_NO_DATA; // FIXME - return ERROR_NO_DATA; + Request->Status = STATUS_INVALID_PARAMETER; + return STATUS_INVALID_PARAMETER; } Entry = IntGetAliasEntry(Header, Request->Data.GetConsoleAlias.lpSource); if (!Entry) { - Request->Status = ERROR_NO_DATA; // FIXME - return ERROR_NO_DATA; + Request->Status = STATUS_INVALID_PARAMETER; + return STATUS_INVALID_PARAMETER; } Length = (wcslen(Entry->lpTarget)+1) * sizeof(WCHAR); @@ -401,8 +401,8 @@ Header = IntFindAliasHeader(RootHeader, Request->Data.GetAllConsoleAlias.lpExeName); if (!Header) { - Request->Status = ERROR_NO_DATA; // FIXME - return ERROR_NO_DATA; + Request->Status = STATUS_INVALID_PARAMETER; + return STATUS_INVALID_PARAMETER; } if (IntGetAllConsoleAliasesLength(Header) > Request->Data.GetAllConsoleAlias.AliasBufferLength) @@ -434,8 +434,8 @@ Header = IntFindAliasHeader(RootHeader, Request->Data.GetAllConsoleAliasesLength.lpExeName); if (!Header) { - Request->Status = ERROR_NO_DATA; // FIXME - return ERROR_NO_DATA; + Request->Status = STATUS_INVALID_PARAMETER; + return STATUS_INVALID_PARAMETER; } Length = IntGetAllConsoleAliasesLength(Header);

16 years, 8 months

[cwittich] 32123: return 0 when type is DWORD remove unused alias struct

by cwittich＠svn.reactos.org

Author: cwittich Date: Tue Feb 5 01:11:56 2008 New Revision: 32123 URL: http://svn.reactos.org/svn/reactos?rev=32123&view=rev Log: return 0 when type is DWORD remove unused alias struct Modified: trunk/reactos/dll/win32/kernel32/misc/console.c Modified: trunk/reactos/dll/win32/kernel32/misc/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/co… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/console.c (original) +++ trunk/reactos/dll/win32/kernel32/misc/console.c Tue Feb 5 01:11:56 2008 @@ -18,14 +18,6 @@ #define NDEBUG #include <debug.h> - -typedef struct tagALIAS -{ - struct tagALIAS *next; - LPWSTR lpName; - LPWSTR lpSubst; - DWORD dwUsed; -} ALIAS, *LPALIAS; extern BOOL WINAPI DefaultConsoleCtrlHandler(DWORD Event); extern __declspec(noreturn) VOID CALLBACK ConsoleControlDispatcher(DWORD CodeAndFlag); @@ -187,11 +179,11 @@ BOOL STDCALL AddConsoleAliasW (LPCWSTR lpSource, LPCWSTR lpTarget, - LPCWSTR lpExeName /* FIXME: currently ignored */) + LPCWSTR lpExeName) { CSR_API_MESSAGE Request; ULONG CsrRequest; - NTSTATUS Status; + NTSTATUS Status; CsrRequest = MAKE_CSR_API(ADD_CONSOLE_ALIAS, CSR_NATIVE); @@ -308,7 +300,7 @@ { CSR_API_MESSAGE Request; ULONG CsrRequest; - NTSTATUS Status; + NTSTATUS Status; CsrRequest = MAKE_CSR_API(GET_CONSOLE_ALIAS, CSR_NATIVE); @@ -325,7 +317,7 @@ if (!NT_SUCCESS(Status) || !NT_SUCCESS(Status = Request.Status)) { SetLastErrorByStatus(Status); - return FALSE; + return 0; } return Request.Data.GetConsoleAlias.BytesWritten / sizeof(WCHAR); @@ -376,12 +368,12 @@ * @implemented */ DWORD STDCALL -GetConsoleAliasExesW (LPWSTR lpExeNameBuffer, +GetConsoleAliasExesW (LPWSTR lpExeNameBuffer, DWORD ExeNameBufferLength) { CSR_API_MESSAGE Request; ULONG CsrRequest; - NTSTATUS Status; + NTSTATUS Status; CsrRequest = MAKE_CSR_API(GET_CONSOLE_ALIASES_EXES, CSR_NATIVE); Request.Data.GetConsoleAliasesExes.ExeNames = lpExeNameBuffer; @@ -395,7 +387,7 @@ if (!NT_SUCCESS(Status) || !NT_SUCCESS(Status = Request.Status)) { SetLastErrorByStatus(Status); - return FALSE; + return 0; } return Request.Data.GetConsoleAliasesExes.BytesWritten / sizeof(WCHAR); @@ -445,7 +437,7 @@ if (!NT_SUCCESS(Status) || !NT_SUCCESS(Status = Request.Status)) { SetLastErrorByStatus(Status); - return FALSE; + return 0; } return Request.Data.GetConsoleAliasesExesLength.Length; @@ -478,12 +470,12 @@ { CSR_API_MESSAGE Request; ULONG CsrRequest; - NTSTATUS Status; + NTSTATUS Status; DWORD dwLength; dwLength = GetConsoleAliasesLengthW(ExeName); if (!dwLength || dwLength > AliasBufferLength) - return FALSE; + return 0; CsrRequest = MAKE_CSR_API(GET_ALL_CONSOLE_ALIASES, CSR_NATIVE); Request.Data.GetAllConsoleAlias.AliasBuffer = AliasBuffer; @@ -498,7 +490,7 @@ if (!NT_SUCCESS(Status) || !NT_SUCCESS(Status = Request.Status)) { SetLastErrorByStatus(Status); - return FALSE; + return 0; } return Request.Data.GetAllConsoleAlias.BytesWritten / sizeof(WCHAR); @@ -557,7 +549,7 @@ if (!NT_SUCCESS(Status) || !NT_SUCCESS(Status = Request.Status)) { SetLastErrorByStatus(Status); - return FALSE; + return 0; } return Request.Data.GetAllConsoleAliasesLength.Length;

16 years, 8 months

← Newer
1
...
38
39
40
41
42
43
44
45
46
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2008