Ros-diffs January 2005

ros-diffs@reactos.org

28 participants
703 discussions

[ion] 12714: Fix some wrong Mm definitions and sync up with proper ones.

by ion＠svn.reactos.com

Fix some wrong Mm definitions and sync up with proper ones. Modified: trunk/reactos/include/ddk/defines.h Modified: trunk/reactos/include/ddk/extypes.h Modified: trunk/reactos/include/ddk/mmfuncs.h Modified: trunk/reactos/include/ddk/mmtypes.h Modified: trunk/reactos/include/ddk/ntddk.h Modified: trunk/reactos/include/ddk/types.h Modified: trunk/reactos/ntoskrnl/mm/mdl.c Modified: trunk/reactos/ntoskrnl/mm/mm.c Modified: trunk/reactos/ntoskrnl/mm/mminit.c Modified: trunk/reactos/ntoskrnl/mm/npool.c Modified: trunk/reactos/ntoskrnl/mm/pool.c Modified: trunk/reactos/ntoskrnl/ps/process.c _____ Modified: trunk/reactos/include/ddk/defines.h --- trunk/reactos/include/ddk/defines.h 2005-01-02 04:27:29 UTC (rev 12713) +++ trunk/reactos/include/ddk/defines.h 2005-01-02 05:36:43 UTC (rev 12714) @@ -18,20 +18,6 @@ #define NR_PRIORITY_LEVELS (32) /* - * Types of memory to allocate - */ -enum -{ - NonPagedPool, - PagedPool, - NonPagedPoolMustSucceed, - NonPagedPoolCacheAligned = 4, - PagedPoolCacheAligned, - NonPagedPoolCacheAlignedMustS, -}; - - -/* * PURPOSE: Object attributes */ enum _____ Modified: trunk/reactos/include/ddk/extypes.h --- trunk/reactos/include/ddk/extypes.h 2005-01-02 04:27:29 UTC (rev 12713) +++ trunk/reactos/include/ddk/extypes.h 2005-01-02 05:36:43 UTC (rev 12714) @@ -5,6 +5,24 @@ typedef ULONG INTERLOCKED_RESULT; +typedef enum _POOL_TYPE { + NonPagedPool, + PagedPool, + NonPagedPoolMustSucceed, + DontUseThisType, + NonPagedPoolCacheAligned, + PagedPoolCacheAligned, + NonPagedPoolCacheAlignedMustS, + MaxPoolType, + NonPagedPoolSession = 32, + PagedPoolSession, + NonPagedPoolMustSucceedSession, + DontUseThisTypeSession, + NonPagedPoolCacheAlignedSession, + PagedPoolCacheAlignedSession, + NonPagedPoolCacheAlignedMustSSession +} POOL_TYPE; + typedef enum _WORK_QUEUE_TYPE { CriticalWorkQueue, DelayedWorkQueue, _____ Modified: trunk/reactos/include/ddk/mmfuncs.h --- trunk/reactos/include/ddk/mmfuncs.h 2005-01-02 04:27:29 UTC (rev 12713) +++ trunk/reactos/include/ddk/mmfuncs.h 2005-01-02 05:36:43 UTC (rev 12714) @@ -1,14 +1,14 @@ #ifndef _INCLUDE_DDK_MMFUNCS_H #define _INCLUDE_DDK_MMFUNCS_H -/* $Id: mmfuncs.h,v 1.24 2004/10/22 20:51:44 ekohl Exp $ */ +/* $Id$ */ /* MEMORY MANAGMENT ******************************************************/ #ifdef __NTOSKRNL__ -extern PVOID EXPORTED MmUserProbeAddress; +extern ULONG EXPORTED MmUserProbeAddress; extern PVOID EXPORTED MmHighestUserAddress; #else -extern PVOID IMPORTED MmUserProbeAddress; +extern ULONG IMPORTED MmUserProbeAddress; extern PVOID IMPORTED MmHighestUserAddress; #endif @@ -632,8 +632,8 @@ BOOLEAN STDCALL MmSetAddressRangeModified ( - DWORD Unknown0, - DWORD Unknown1 + IN PVOID Address, + IN ULONG Length ); NTSTATUS STDCALL _____ Modified: trunk/reactos/include/ddk/mmtypes.h --- trunk/reactos/include/ddk/mmtypes.h 2005-01-02 04:27:29 UTC (rev 12713) +++ trunk/reactos/include/ddk/mmtypes.h 2005-01-02 05:36:43 UTC (rev 12714) @@ -1,4 +1,4 @@ -/* $Id: mmtypes.h,v 1.21 2004/12/22 05:06:59 royce Exp $ */ +/* $Id$ */ #ifndef _INCLUDE_DDK_MMTYPES_H #define _INCLUDE_DDK_MMTYPES_H @@ -48,6 +48,11 @@ #define MDL_ALLOCATED_MUST_SUCCEED (0x4000) #define MDL_64_BIT_VA (0x8000) +typedef enum _MM_PAGE_PRIORITY { + LowPagePriority, + NormalPagePriority = 16, + HighPagePriority = 32 +} MM_PAGE_PRIORITY; typedef struct _MDL /* _____ Modified: trunk/reactos/include/ddk/ntddk.h --- trunk/reactos/include/ddk/ntddk.h 2005-01-02 04:27:29 UTC (rev 12713) +++ trunk/reactos/include/ddk/ntddk.h 2005-01-02 05:36:43 UTC (rev 12714) @@ -1,4 +1,4 @@ -/* $Id: ntddk.h,v 1.38 2003/12/30 17:39:38 fireball Exp $ +/* $Id$ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -62,8 +62,8 @@ #include <ddk/mmtypes.h> #include <ddk/potypes.h> #include <ddk/pnptypes.h> +#include <ddk/extypes.h> #include <ddk/iotypes.h> -#include <ddk/extypes.h> #include <ddk/pstypes.h> #include <ntos/ldrtypes.h> #include <ntos/zwtypes.h> _____ Modified: trunk/reactos/include/ddk/types.h --- trunk/reactos/include/ddk/types.h 2005-01-02 04:27:29 UTC (rev 12713) +++ trunk/reactos/include/ddk/types.h 2005-01-02 05:36:43 UTC (rev 12714) @@ -12,7 +12,6 @@ typedef UCHAR KIRQL; typedef KIRQL* PKIRQL; typedef ULONG IO_ALLOCATION_ACTION; -typedef ULONG POOL_TYPE; typedef ULONG TIMER_TYPE; typedef ULONG MM_SYSTEM_SIZE; typedef ULONG LOCK_OPERATION; _____ Modified: trunk/reactos/ntoskrnl/mm/mdl.c --- trunk/reactos/ntoskrnl/mm/mdl.c 2005-01-02 04:27:29 UTC (rev 12713) +++ trunk/reactos/ntoskrnl/mm/mdl.c 2005-01-02 05:36:43 UTC (rev 12714) @@ -1,4 +1,4 @@ -/* $Id: mdl.c,v 1.69 2004/10/22 20:38:22 ekohl Exp $ +/* $Id$ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -814,7 +814,7 @@ IN MEMORY_CACHING_TYPE CacheType, IN PVOID BaseAddress, IN ULONG BugCheckOnFailure, - IN ULONG Priority ) + IN MM_PAGE_PRIORITY Priority ) { UNIMPLEMENTED; return MmMapLockedPages (Mdl, AccessMode); _____ Modified: trunk/reactos/ntoskrnl/mm/mm.c --- trunk/reactos/ntoskrnl/mm/mm.c 2005-01-02 04:27:29 UTC (rev 12713) +++ trunk/reactos/ntoskrnl/mm/mm.c 2005-01-02 05:36:43 UTC (rev 12714) @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id: mm.c,v 1.80 2004/11/13 13:09:07 weiden Exp $ +/* $Id$ * * COPYRIGHT: See COPYING in the top directory * PROJECT: ReactOS kernel @@ -38,7 +38,7 @@ extern MODULE_OBJECT NtoskrnlModuleObject; extern MODULE_OBJECT HalModuleObject; -PVOID EXPORTED MmUserProbeAddress = NULL; +ULONG EXPORTED MmUserProbeAddress = 0; PVOID EXPORTED MmHighestUserAddress = NULL; PBOOLEAN EXPORTED Mm64BitPhysicalAddress = FALSE; PVOID EXPORTED MmSystemRangeStart = NULL; @@ -490,8 +490,8 @@ BOOLEAN STDCALL MmSetAddressRangeModified ( - DWORD Unknown0, - DWORD Unknown1 + IN PVOID Address, + IN ULONG Length ) { UNIMPLEMENTED; _____ Modified: trunk/reactos/ntoskrnl/mm/mminit.c --- trunk/reactos/ntoskrnl/mm/mminit.c 2005-01-02 04:27:29 UTC (rev 12713) +++ trunk/reactos/ntoskrnl/mm/mminit.c 2005-01-02 05:36:43 UTC (rev 12714) @@ -327,7 +327,7 @@ * FIXME: Set this based on the system command line */ MmSystemRangeStart = (PVOID)KERNEL_BASE; // 0xC0000000 - MmUserProbeAddress = (PVOID)0x7fff0000; + MmUserProbeAddress = 0x7fff0000; MmHighestUserAddress = (PVOID)0x7ffeffff; /* _____ Modified: trunk/reactos/ntoskrnl/mm/npool.c --- trunk/reactos/ntoskrnl/mm/npool.c 2005-01-02 04:27:29 UTC (rev 12713) +++ trunk/reactos/ntoskrnl/mm/npool.c 2005-01-02 05:36:43 UTC (rev 12714) @@ -1,4 +1,4 @@ -/* $Id: npool.c,v 1.93 2004/11/28 22:06:25 blight Exp $ +/* $Id$ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -1537,7 +1537,7 @@ } PVOID STDCALL -ExAllocateNonPagedPoolWithTag(ULONG Type, ULONG Size, ULONG Tag, PVOID Caller) +ExAllocateNonPagedPoolWithTag(POOL_TYPE Type, ULONG Size, ULONG Tag, PVOID Caller) { #ifdef WHOLE_PAGE_ALLOCATIONS PVOID block; _____ Modified: trunk/reactos/ntoskrnl/mm/pool.c --- trunk/reactos/ntoskrnl/mm/pool.c 2005-01-02 04:27:29 UTC (rev 12713) +++ trunk/reactos/ntoskrnl/mm/pool.c 2005-01-02 05:36:43 UTC (rev 12714) @@ -1,4 +1,4 @@ -/* $Id: pool.c,v 1.36 2004/12/11 00:13:37 royce Exp $ +/* $Id$ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -121,7 +121,7 @@ * @implemented */ PVOID STDCALL -ExAllocatePoolWithTag (ULONG PoolType, ULONG NumberOfBytes, ULONG Tag) +ExAllocatePoolWithTag (POOL_TYPE PoolType, ULONG NumberOfBytes, ULONG Tag) { PVOID Block; _____ Modified: trunk/reactos/ntoskrnl/ps/process.c --- trunk/reactos/ntoskrnl/ps/process.c 2005-01-02 04:27:29 UTC (rev 12713) +++ trunk/reactos/ntoskrnl/ps/process.c 2005-01-02 05:36:43 UTC (rev 12714) @@ -1,4 +1,4 @@ -/* $Id: process.c,v 1.160 2004/12/24 17:07:00 navaraf Exp $ +/* $Id$ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -787,7 +787,7 @@ MmLockAddressSpace(&Process->AddressSpace); /* Protect the highest 64KB of the process address space */ - BaseAddress = MmUserProbeAddress; + BaseAddress = (PVOID)MmUserProbeAddress; Status = MmCreateMemoryArea(Process, &Process->AddressSpace, MEMORY_AREA_NO_ACCESS,

19 years, 8 months

[ion] 12713: Fix horribly wrong defintions of ULONG32 and ULONG, as well as elf support which depended on these wrong definitions.

by ion＠svn.reactos.com

Fix horribly wrong defintions of ULONG32 and ULONG, as well as elf support which depended on these wrong definitions. Modified: trunk/reactos/include/basetsd.h Modified: trunk/reactos/include/ntos/types.h Modified: trunk/reactos/lib/rtl/mem.c Modified: trunk/reactos/ntoskrnl/mm/elf.c _____ Modified: trunk/reactos/include/basetsd.h --- trunk/reactos/include/basetsd.h 2005-01-02 01:06:17 UTC (rev 12712) +++ trunk/reactos/include/basetsd.h 2005-01-02 04:27:29 UTC (rev 12713) @@ -63,7 +63,7 @@ #ifndef XFree86Server typedef int INT32, *PINT32; #endif /* ndef XFree86Server */ -typedef unsigned long ULONG32, *PULONG32; +typedef unsigned int ULONG32, *PULONG32; typedef unsigned int DWORD32, *PDWORD32; typedef unsigned int UINT32, *PUINT32; _____ Modified: trunk/reactos/include/ntos/types.h --- trunk/reactos/include/ntos/types.h 2005-01-02 01:06:17 UTC (rev 12712) +++ trunk/reactos/include/ntos/types.h 2005-01-02 04:27:29 UTC (rev 12713) @@ -71,9 +71,9 @@ typedef INT32 INT, *PINT; typedef LONG32 LONG, *PLONG; -typedef ULONG32 DWORD, *PDWORD; +typedef unsigned long DWORD, *PDWORD; typedef UINT32 UINT, *PUINT; -typedef ULONG32 ULONG, *PULONG; +typedef unsigned long ULONG, *PULONG; #ifndef _WCHAR_T_ #define _WCHAR_T_ _____ Modified: trunk/reactos/lib/rtl/mem.c --- trunk/reactos/lib/rtl/mem.c 2005-01-02 01:06:17 UTC (rev 12712) +++ trunk/reactos/lib/rtl/mem.c 2005-01-02 04:27:29 UTC (rev 12713) @@ -1,5 +1,5 @@ -/* $Id: mem.c,v 1.3 2004/11/25 19:25:06 ekohl Exp $ +/* $Id$ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -39,7 +39,7 @@ * * @implemented */ -ULONG STDCALL +SIZE_T STDCALL RtlCompareMemory(IN const VOID *Source1, IN const VOID *Source2, IN SIZE_T Length) _____ Modified: trunk/reactos/ntoskrnl/mm/elf.c --- trunk/reactos/ntoskrnl/mm/elf.c 2005-01-02 01:06:17 UTC (rev 12712) +++ trunk/reactos/ntoskrnl/mm/elf.c 2005-01-02 04:27:29 UTC (rev 12713) @@ -37,7 +37,7 @@ static __inline BOOLEAN Intsafe_AddULong32 ( - OUT PULONG Result, + OUT PULONG32 Result, IN ULONG Addend1, IN ULONG Addend2 ) @@ -83,7 +83,7 @@ static __inline BOOLEAN Intsafe_MulULong32 ( - OUT PULONG Result, + OUT PULONG32 Result, IN ULONG Factor1, IN ULONG Factor2 ) @@ -239,7 +239,7 @@ ) { PBYTE p; - ULONG nSafeInput; + ULONG64 nSafeInput; RtlRetrieveUlonglong(&nSafeInput, Input); @@ -257,7 +257,7 @@ static __inline ULONG ElfFmtpSafeReadULong ( - IN CONST ULONG * Input, + IN CONST ULONG32 * Input, IN ULONG DataType ) { @@ -367,7 +367,7 @@ PMM_SECTION_SEGMENT pssSegments; Elf_Addr nImageBase = 0; Elf_Addr nEntryPoint; - ULONG nPrevVirtualEndOfSegment; + ULONG32 nPrevVirtualEndOfSegment; ULONG i; ULONG j;

19 years, 8 months

[ion] 12712: Don't use MmLowestUserAddress as a ULONG!

by ion＠svn.reactos.com

Don't use MmLowestUserAddress as a ULONG! Modified: trunk/reactos/ntoskrnl/include/internal/mm.h Modified: trunk/reactos/ntoskrnl/mm/aspace.c Modified: trunk/reactos/ntoskrnl/mm/marea.c _____ Modified: trunk/reactos/ntoskrnl/include/internal/mm.h --- trunk/reactos/ntoskrnl/include/internal/mm.h 2005-01-01 22:57:06 UTC (rev 12711) +++ trunk/reactos/ntoskrnl/include/internal/mm.h 2005-01-02 01:06:17 UTC (rev 12712) @@ -47,7 +47,7 @@ #define NR_SECTION_PAGE_ENTRIES (1024) #ifndef __USE_W32API -#define MM_LOWEST_USER_ADDRESS (4096) +#define MM_LOWEST_USER_ADDRESS (PVOID)0x10000 #endif #define MM_VIRTMEM_GRANULARITY (64 * 1024) /* Although Microsoft says this isn't hardcoded anymore, @@ -217,7 +217,7 @@ { LIST_ENTRY MAreaListHead; FAST_MUTEX Lock; - ULONG LowestAddress; + PVOID LowestAddress; struct _EPROCESS* Process; PUSHORT PageTableRefCountTable; ULONG PageTableRefCountTableSize; _____ Modified: trunk/reactos/ntoskrnl/mm/aspace.c --- trunk/reactos/ntoskrnl/mm/aspace.c 2005-01-01 22:57:06 UTC (rev 12711) +++ trunk/reactos/ntoskrnl/mm/aspace.c 2005-01-02 01:06:17 UTC (rev 12712) @@ -1,4 +1,4 @@ -/* $Id: aspace.c,v 1.19 2004/09/09 20:42:33 hbirr Exp $ +/* $Id$ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -76,7 +76,7 @@ } else { - AddressSpace->LowestAddress = KERNEL_BASE; + AddressSpace->LowestAddress = (PVOID)KERNEL_BASE; } AddressSpace->Process = Process; if (Process != NULL) _____ Modified: trunk/reactos/ntoskrnl/mm/marea.c --- trunk/reactos/ntoskrnl/mm/marea.c 2005-01-01 22:57:06 UTC (rev 12711) +++ trunk/reactos/ntoskrnl/mm/marea.c 2005-01-02 01:06:17 UTC (rev 12712) @@ -253,7 +253,7 @@ Address = (PVOID) MM_ROUND_UP(Address, Granularity); } /* Check if enough space for the block */ - if (AddressSpace->LowestAddress < KERNEL_BASE) + if (AddressSpace->LowestAddress < (PVOID)KERNEL_BASE) { if ((ULONG_PTR) Address >= KERNEL_BASE || Length > KERNEL_BASE - (ULONG_PTR) Address) { @@ -290,7 +290,7 @@ Length += PAGE_SIZE; /* For a guard page following the area */ #endif - if (AddressSpace->LowestAddress < KERNEL_BASE) //(ULONG_PTR)MmSystemRangeStart) + if (AddressSpace->LowestAddress < (PVOID)KERNEL_BASE) //(ULONG_PTR)MmSystemRangeStart) { HighestAddress = MmHighestUserAddress; } @@ -337,7 +337,7 @@ } /* Check if enough space for the block */ - if (AddressSpace->LowestAddress < KERNEL_BASE) + if (AddressSpace->LowestAddress < (PVOID)KERNEL_BASE) { if ((ULONG_PTR) Address >= KERNEL_BASE || Length > KERNEL_BASE - (ULONG_PTR) Address) { @@ -374,7 +374,7 @@ Address = (PVOID)PAGE_ROUND_DOWN(Address); - if (AddressSpace->LowestAddress < KERNEL_BASE) + if (AddressSpace->LowestAddress < (PVOID)KERNEL_BASE) { if (Address >= (PVOID)KERNEL_BASE) { @@ -383,7 +383,7 @@ } else { - if ((ULONG_PTR)Address < AddressSpace->LowestAddress) + if ((ULONG_PTR)Address < (ULONG_PTR)AddressSpace->LowestAddress) { return 0; } @@ -405,7 +405,7 @@ } current_entry = current_entry->Flink; } - if (AddressSpace->LowestAddress < KERNEL_BASE) + if (AddressSpace->LowestAddress < (PVOID)KERNEL_BASE) { return KERNEL_BASE - (ULONG_PTR)Address; } @@ -548,13 +548,13 @@ - (ULONG_PTR) MM_ROUND_DOWN(*BaseAddress, Granularity)); *BaseAddress = MM_ROUND_DOWN(*BaseAddress, Granularity); - if (AddressSpace->LowestAddress == KERNEL_BASE && + if (AddressSpace->LowestAddress == (PVOID)KERNEL_BASE && (*BaseAddress) < (PVOID)KERNEL_BASE) { return STATUS_ACCESS_VIOLATION; } - if (AddressSpace->LowestAddress < KERNEL_BASE && + if (AddressSpace->LowestAddress < (PVOID)KERNEL_BASE && (PVOID)((char*)(*BaseAddress) + tmpLength) > (PVOID)KERNEL_BASE) { return STATUS_ACCESS_VIOLATION;

19 years, 8 months

[ion] 12711: More LDR constants changes.

by ion＠svn.reactos.com

More LDR constants changes. Modified: trunk/reactos/ntoskrnl/ldr/rtl.c Modified: trunk/reactos/ntoskrnl/ldr/sysdll.c _____ Modified: trunk/reactos/ntoskrnl/ldr/rtl.c --- trunk/reactos/ntoskrnl/ldr/rtl.c 2005-01-01 22:53:21 UTC (rev 12710) +++ trunk/reactos/ntoskrnl/ldr/rtl.c 2005-01-01 22:57:06 UTC (rev 12711) @@ -1,4 +1,4 @@ -/* $Id: rtl.c,v 1.20 2004/08/15 16:39:06 chorns Exp $ +/* $Id$ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -28,9 +28,9 @@ DosHeader = (PIMAGE_DOS_HEADER)BaseAddress; NTHeaders = (PIMAGE_NT_HEADERS)((char*)BaseAddress + DosHeader->e_lfanew); - if ((DosHeader->e_magic != IMAGE_DOS_MAGIC) + if ((DosHeader->e_magic != IMAGE_DOS_SIGNATURE) || (DosHeader->e_lfanew == 0L) - || (*(PULONG) NTHeaders != IMAGE_PE_MAGIC)) + || (*(PULONG) NTHeaders != IMAGE_NT_SIGNATURE)) { return(NULL); } _____ Modified: trunk/reactos/ntoskrnl/ldr/sysdll.c --- trunk/reactos/ntoskrnl/ldr/sysdll.c 2005-01-01 22:53:21 UTC (rev 12710) +++ trunk/reactos/ntoskrnl/ldr/sysdll.c 2005-01-01 22:57:06 UTC (rev 12711) @@ -125,9 +125,9 @@ */ DosHeader = (PIMAGE_DOS_HEADER) BlockBuffer; NTHeaders = (PIMAGE_NT_HEADERS) (BlockBuffer + DosHeader->e_lfanew); - if ((DosHeader->e_magic != IMAGE_DOS_MAGIC) + if ((DosHeader->e_magic != IMAGE_DOS_SIGNATURE) || (DosHeader->e_lfanew == 0L) - || (*(PULONG) NTHeaders != IMAGE_PE_MAGIC)) + || (*(PULONG) NTHeaders != IMAGE_NT_SIGNATURE)) { DbgPrint("NTDLL format invalid\n"); ZwClose(FileHandle);

19 years, 8 months

[gvg] 12710: Fix copy command

by gvg＠svn.reactos.com

Fix copy command Modified: trunk/reactos/subsys/system/cmd/cmd.c Modified: trunk/reactos/subsys/system/cmd/cmd.h Modified: trunk/reactos/subsys/system/cmd/copy.c Modified: trunk/reactos/subsys/system/cmd/misc.c Modified: trunk/reactos/subsys/system/cmd/move.c Modified: trunk/reactos/subsys/system/cmd/where.c _____ Modified: trunk/reactos/subsys/system/cmd/cmd.c --- trunk/reactos/subsys/system/cmd/cmd.c 2005-01-01 22:10:23 UTC (rev 12709) +++ trunk/reactos/subsys/system/cmd/cmd.c 2005-01-01 22:53:21 UTC (rev 12710) @@ -1,4 +1,4 @@ -/* $Id: cmd.c,v 1.20 2004/11/08 02:16:06 weiden Exp $ +/* $Id$ * * CMD.C - command-line interface. * @@ -1151,7 +1151,7 @@ { if (!_tcsicmp (argv[i], _T("/p"))) { - if (!IsValidFileName (_T("\\autoexec.bat"))) + if (!IsExistingFile (_T("\\autoexec.bat"))) { #ifdef INCLUDE_CMD_DATE cmd_date (_T(""), _T("")); @@ -1216,11 +1216,11 @@ } /* run cmdstart.bat */ - if (IsValidFileName (_T("cmdstart.bat"))) + if (IsExistingFile (_T("cmdstart.bat"))) { ParseCommandLine (_T("cmdstart.bat")); } - else if (IsValidFileName (_T("\\cmdstart.bat"))) + else if (IsExistingFile (_T("\\cmdstart.bat"))) { ParseCommandLine (_T("\\cmdstart.bat")); } @@ -1234,7 +1234,7 @@ p = _tcsrchr (commandline, _T('\\')) + 1; _tcscpy (p, _T("cmdstart.bat")); - if (IsValidFileName (_T("commandline"))) + if (IsExistingFile (_T("commandline"))) { ConErrPrintf (_T("Running %s...\n", commandline)); ParseCommandLine (commandline); @@ -1268,12 +1268,12 @@ static VOID Cleanup (int argc, TCHAR *argv[]) { /* run cmdexit.bat */ - if (IsValidFileName (_T("cmdexit.bat"))) + if (IsExistingFile (_T("cmdexit.bat"))) { ConErrPrintf (_T("Running cmdexit.bat...\n")); ParseCommandLine (_T("cmdexit.bat")); } - else if (IsValidFileName (_T("\\cmdexit.bat"))) + else if (IsExistingFile (_T("\\cmdexit.bat"))) { ConErrPrintf (_T("Running \\cmdexit.bat...\n")); ParseCommandLine (_T("\\cmdexit.bat")); @@ -1289,7 +1289,7 @@ p = _tcsrchr (commandline, _T('\\')) + 1; _tcscpy (p, _T("cmdexit.bat")); - if (IsValidFileName (_T("commandline"))) + if (IsExistingFile (_T("commandline"))) { ConErrPrintf (_T("Running %s...\n"), commandline); ParseCommandLine (commandline); _____ Modified: trunk/reactos/subsys/system/cmd/cmd.h --- trunk/reactos/subsys/system/cmd/cmd.h 2005-01-01 22:10:23 UTC (rev 12709) +++ trunk/reactos/subsys/system/cmd/cmd.h 2005-01-01 22:53:21 UTC (rev 12710) @@ -1,4 +1,4 @@ -/* $Id: cmd.h,v 1.5 2004/06/21 18:57:22 weiden Exp $ +/* $Id$ * * CMD.H - header file for the modules in CMD.EXE * @@ -309,8 +309,8 @@ VOID freep (LPTSTR *); LPTSTR _stpcpy (LPTSTR, LPTSTR); BOOL IsValidPathName (LPCTSTR); -BOOL IsValidFileName (LPCTSTR); -BOOL IsValidDirectory (LPCTSTR); +BOOL IsExistingFile (LPCTSTR); +BOOL IsExistingDirectory (LPCTSTR); BOOL FileGetString (HANDLE, LPTSTR, INT); #ifndef __REACTOS__ HWND GetConsoleWindow(VOID); _____ Modified: trunk/reactos/subsys/system/cmd/copy.c --- trunk/reactos/subsys/system/cmd/copy.c 2005-01-01 22:10:23 UTC (rev 12709) +++ trunk/reactos/subsys/system/cmd/copy.c 2005-01-01 22:53:21 UTC (rev 12710) @@ -1,4 +1,4 @@ -/* $Id: copy.c,v 1.6 2004/11/08 02:16:06 weiden Exp $ +/* $Id$ * * COPY.C -- copy internal command. * @@ -53,17 +53,7 @@ static INT Overwrite (LPTSTR); - static BOOL -IsDirectory (LPTSTR fn) -{ - if (!IsValidFileName (fn)) - return FALSE; - return (GetFileAttributes (fn) & FILE_ATTRIBUTE_DIRECTORY); -} - - -static BOOL DoSwitches (LPTSTR arg, LPDWORD lpdwFlags) { if (!_tcsicmp (arg, _T("/-Y"))) @@ -362,7 +352,7 @@ *lpdwFlags & ASCII ? "ASCII" : "BINARY"); #endif - if (!IsValidFileName (dest)) + if (!IsExistingFile (dest)) { #ifdef _DEBUG DebugPrintf (_T("opening/creating\n")); @@ -529,8 +519,12 @@ /* Force a clean full path */ GetFullPathName( sources->szFile, 128, (LPTSTR) &temp, NULL); + if (IsExistingDirectory(temp)) + { + _tcscat(temp, _T("\\*")); + } - _tsplitpath (sources->szFile, drive_s, dir_s, file_s, ext_s); + _tsplitpath (temp, drive_s, dir_s, file_s, ext_s); hFind = FindFirstFile ((TCHAR*)&temp, &find); if (hFind == INVALID_HANDLE_VALUE) @@ -554,7 +548,7 @@ // printf("Merge %s, filename %s\n", from_merge, find.cFileName); - if (IsDirectory (from_merge)) + if (IsExistingDirectory (from_merge)) { // printf("Merge DIR\n"); @@ -576,7 +570,7 @@ sources->dwFlag & ASCII ? _T(", ASCII") : _T(", BINARY")); #endif - if (IsValidFileName (real_dest) && !bAll) + if (IsExistingFile (real_dest) && !bAll) { /* Don't prompt in a batch file */ if (bc != NULL) @@ -696,7 +690,7 @@ if (bDestFound) { _tsplitpath (dest.szFile, drive_d, dir_d, file_d, ext_d); - if (IsDirectory (dest.szFile)) + if (IsExistingDirectory (dest.szFile)) { // printf("A szFile= %s, Dir = %s, File = %s, Ext = %s\n", dest.szFile, dir_d, file_d, ext_d); _tcscat (dir_d, file_d); @@ -736,7 +730,7 @@ else if (!bDestFound && !bMultiple) { _tsplitpath (sources->szFile, drive_d, dir_d, file_d, ext_d); - if (IsDirectory (sources->szFile)) + if (IsExistingDirectory (sources->szFile)) { // printf("B File = %s, Ext = %s\n", file_d, ext_d); @@ -750,7 +744,7 @@ else { _tsplitpath(sources->szFile, drive_d, dir_d, file_d, ext_d); - if (IsDirectory (sources->szFile)) + if (IsExistingDirectory (sources->szFile)) { // printf("C File = %s, Ext = %s\n", file_d, ext_d); _____ Modified: trunk/reactos/subsys/system/cmd/misc.c --- trunk/reactos/subsys/system/cmd/misc.c 2005-01-01 22:10:23 UTC (rev 12709) +++ trunk/reactos/subsys/system/cmd/misc.c 2005-01-01 22:53:21 UTC (rev 12710) @@ -348,16 +348,17 @@ * Checks if a file exists (accessible) */ -BOOL IsValidFileName (LPCTSTR pszPath) +BOOL IsExistingFile (LPCTSTR pszPath) { DWORD attr = GetFileAttributes (pszPath); return (attr != 0xFFFFFFFF && (! (attr & FILE_ATTRIBUTE_DIRECTORY)) ); } -BOOL IsValidDirectory (LPCTSTR pszPath) +BOOL IsExistingDirectory (LPCTSTR pszPath) { - return (GetFileAttributes (pszPath) & FILE_ATTRIBUTE_DIRECTORY); + DWORD attr = GetFileAttributes (pszPath); + return (attr != 0xFFFFFFFF && (attr & FILE_ATTRIBUTE_DIRECTORY) ); } _____ Modified: trunk/reactos/subsys/system/cmd/move.c --- trunk/reactos/subsys/system/cmd/move.c 2005-01-01 22:10:23 UTC (rev 12709) +++ trunk/reactos/subsys/system/cmd/move.c 2005-01-01 22:53:21 UTC (rev 12710) @@ -179,7 +179,7 @@ { /* source is file */ - if (IsValidFileName (szDestPath)) + if (IsExistingFile (szDestPath)) { /* destination exists */ if (GetFileAttributes (szDestPath) & FILE_ATTRIBUTE_DIRECTORY) _____ Modified: trunk/reactos/subsys/system/cmd/where.c --- trunk/reactos/subsys/system/cmd/where.c 2005-01-01 22:10:23 UTC (rev 12709) +++ trunk/reactos/subsys/system/cmd/where.c 2005-01-01 22:53:21 UTC (rev 12710) @@ -117,7 +117,7 @@ if (pExtension) _tcscat(szPathBuffer, pExtension); - if (IsValidFileName (szPathBuffer)) + if (IsExistingFile (szPathBuffer)) { #ifdef _DEBUG DebugPrintf (_T("Found: \'%s\'\n"), szPathBuffer); @@ -140,7 +140,7 @@ if (pExtension) _tcscat (szPathBuffer, pExtension); - if (IsValidFileName (szPathBuffer)) + if (IsExistingFile (szPathBuffer)) { #ifdef _DEBUG DebugPrintf (_T("Found: \'%s\'\n"), szPathBuffer); @@ -190,7 +190,7 @@ if (pExtension) _tcscat (szPathBuffer, pExtension); - if (IsValidFileName (szPathBuffer)) + if (IsExistingFile (szPathBuffer)) { #ifdef _DEBUG DebugPrintf (_T("Found: \'%s\'\n"), szPathBuffer);

19 years, 8 months

[ion] 12709: Use W32API/PSDK structures/constants. The whole /ldr code is in MAJOR need of re-writing. Amazing it even works.

by ion＠svn.reactos.com

Use W32API/PSDK structures/constants. The whole /ldr code is in MAJOR need of re-writing. Amazing it even works. Modified: trunk/reactos/include/pe.h Modified: trunk/reactos/ntoskrnl/ldr/loader.c _____ Modified: trunk/reactos/include/pe.h --- trunk/reactos/include/pe.h 2005-01-01 20:44:34 UTC (rev 12708) +++ trunk/reactos/include/pe.h 2005-01-01 22:10:23 UTC (rev 12709) @@ -379,10 +379,10 @@ } u1; } IMAGE_THUNK_DATA,*PIMAGE_THUNK_DATA; typedef struct _IMAGE_IMPORT_DESCRIPTOR { - _ANONYMOUS_UNION union { + union { DWORD Characteristics; PIMAGE_THUNK_DATA OriginalFirstThunk; - } DUMMYUNIONNAME; + } ; DWORD TimeDateStamp; DWORD ForwarderChain; DWORD Name; @@ -635,6 +635,8 @@ #define IMAGE_SIZEOF_ARCHIVE_MEMBER_HDR 60 #define SIZEOF_RFPO_DATA 16 #define IMAGE_FIRST_SECTION(h) ((PIMAGE_SECTION_HEADER) ((DWORD)h+FIELD_OFFSET(IMAGE_NT_HEADERS,OptionalHeader)+((PIMAGE_NT_HEAD ERS)(h))->FileHeader.SizeOfOptionalHeader)) +/* Temporarily adding this here. This file will die soon. */ +#define IMAGE_SCN_TYPE_NOLOAD 0x2L #define IMAGE_SCN_TYPE_NO_PAD 8 #define IMAGE_SCN_CNT_CODE 32 #define IMAGE_SCN_CNT_INITIALIZED_DATA 64 _____ Modified: trunk/reactos/ntoskrnl/ldr/loader.c --- trunk/reactos/ntoskrnl/ldr/loader.c 2005-01-01 20:44:34 UTC (rev 12708) +++ trunk/reactos/ntoskrnl/ldr/loader.c 2005-01-01 22:10:23 UTC (rev 12709) @@ -428,7 +428,7 @@ /* If MZ header exists */ PEDosHeader = (PIMAGE_DOS_HEADER) ModuleLoadBase; - if (PEDosHeader->e_magic == IMAGE_DOS_MAGIC && PEDosHeader->e_lfanew != 0L) + if (PEDosHeader->e_magic == IMAGE_DOS_SIGNATURE && PEDosHeader->e_lfanew != 0L) { return LdrPEProcessModule(ModuleLoadBase, ModuleName, @@ -669,18 +669,18 @@ for (Idx = 0; Idx < PEFileHeader->NumberOfSections && (!Write || !Execute); Idx++) { Characteristics = PESectionHeaders[Idx].Characteristics; - if (!(Characteristics & IMAGE_SECTION_NOLOAD)) + if (!(Characteristics & IMAGE_SCN_TYPE_NOLOAD)) { Length = max(PESectionHeaders[Idx].Misc.VirtualSize, PESectionHeaders[Idx].SizeOfRawData); BaseAddress = PESectionHeaders[Idx].VirtualAddress + (char*)DriverBase; if (BaseAddress < (PVOID)((ULONG_PTR)PageStart + PAGE_SIZE) && PageStart < (PVOID)((ULONG_PTR)BaseAddress + Length)) { - if (Characteristics & IMAGE_SECTION_CHAR_CODE) + if (Characteristics & IMAGE_SCN_CNT_CODE) { Execute = TRUE; } - if (Characteristics & (IMAGE_SECTION_CHAR_WRITABLE|IMAGE_SECTION_CHAR_BSS)) + if (Characteristics & (IMAGE_SCN_MEM_WRITE|IMAGE_SCN_LNK_OTHER)) { Write = TRUE; } @@ -730,7 +730,7 @@ CHECKPOINT; /* Check file magic numbers */ - if (PEDosHeader->e_magic != IMAGE_DOS_MAGIC) + if (PEDosHeader->e_magic != IMAGE_DOS_SIGNATURE) { CPRINT("Incorrect MZ magic: %04x\n", PEDosHeader->e_magic); return STATUS_UNSUCCESSFUL; @@ -740,7 +740,7 @@ CPRINT("Invalid lfanew offset: %08x\n", PEDosHeader->e_lfanew); return STATUS_UNSUCCESSFUL; } - if (PENtHeaders->Signature != IMAGE_PE_MAGIC) + if (PENtHeaders->Signature != IMAGE_NT_SIGNATURE) { CPRINT("Incorrect PE magic: %08x\n", PENtHeaders->Signature); return STATUS_UNSUCCESSFUL; @@ -766,7 +766,7 @@ DriverSize = 0; for (Idx = 0; Idx < PENtHeaders->FileHeader.NumberOfSections; Idx++) { - if (!(PESectionHeaders[Idx].Characteristics & IMAGE_SECTION_NOLOAD)) + if (!(PESectionHeaders[Idx].Characteristics & IMAGE_SCN_TYPE_NOLOAD)) { CurrentSize = PESectionHeaders[Idx].VirtualAddress + PESectionHeaders[Idx].Misc.VirtualSize; DriverSize = max(DriverSize, CurrentSize); @@ -899,9 +899,9 @@ MmSetPageProtect(NULL, PageAddress, Protect); } - if (Characteristics & IMAGE_SECTION_CHAR_CODE) + if (Characteristics & IMAGE_SCN_CNT_CODE) { - if (Characteristics & IMAGE_SECTION_CHAR_WRITABLE) + if (Characteristics & IMAGE_SCN_MEM_WRITE) { Protect = PAGE_EXECUTE_READWRITE; } @@ -910,7 +910,7 @@ Protect = PAGE_EXECUTE_READ; } } - else if (Characteristics & (IMAGE_SECTION_CHAR_WRITABLE|IMAGE_SECTION_CHAR_BSS)) + else if (Characteristics & (IMAGE_SCN_MEM_WRITE|IMAGE_SCN_LNK_OTHER)) { Protect = PAGE_READWRITE; } @@ -996,7 +996,7 @@ CHECKPOINT; /* Check file magic numbers */ - if (PEDosHeader->e_magic != IMAGE_DOS_MAGIC) + if (PEDosHeader->e_magic != IMAGE_DOS_SIGNATURE) { return NULL; } @@ -1004,7 +1004,7 @@ { return NULL; } - if (PENtHeaders->Signature != IMAGE_PE_MAGIC) + if (PENtHeaders->Signature != IMAGE_NT_SIGNATURE) { return NULL; } @@ -1090,9 +1090,9 @@ BaseAddress = PESectionHeaders[Idx].VirtualAddress + (char*)DriverBase; PageAddress = (PVOID)PAGE_ROUND_DOWN(BaseAddress); - if (Characteristics & IMAGE_SECTION_CHAR_EXECUTABLE) + if (Characteristics & IMAGE_SCN_MEM_EXECUTE) { - if (Characteristics & IMAGE_SECTION_CHAR_WRITABLE) + if (Characteristics & IMAGE_SCN_MEM_WRITE) { Protect = PAGE_EXECUTE_READWRITE; } @@ -1101,7 +1101,7 @@ Protect = PAGE_EXECUTE_READ; } } - else if (Characteristics & IMAGE_SECTION_CHAR_WRITABLE) + else if (Characteristics & IMAGE_SCN_MEM_WRITE) { Protect = PAGE_READWRITE; } @@ -1115,7 +1115,7 @@ PageAddress = (PVOID)((ULONG_PTR)PageAddress + PAGE_SIZE); } if (DriverBase == ModuleLoadBase && - Characteristics & IMAGE_SECTION_CHAR_BSS) + Characteristics & IMAGE_SCN_LNK_OTHER) { /* For ntoskrnl, we must stop after the bss section */ break; @@ -1516,28 +1516,28 @@ static NTSTATUS LdrPEProcessImportDirectoryEntry(PVOID DriverBase, PMODULE_OBJECT ImportedModule, - PIMAGE_IMPORT_MODULE_DIRECTORY ImportModuleDirectory) + PIMAGE_IMPORT_DESCRIPTOR ImportModuleDirectory) { PVOID* ImportAddressList; PULONG FunctionNameList; ULONG Ordinal; - if (ImportModuleDirectory == NULL || ImportModuleDirectory->dwRVAModuleName == 0) + if (ImportModuleDirectory == NULL || ImportModuleDirectory->Name == 0) { return STATUS_UNSUCCESSFUL; } /* Get the import address list. */ - ImportAddressList = (PVOID*)(DriverBase + ImportModuleDirectory->dwRVAFunctionAddressList); + ImportAddressList = (PVOID*)(DriverBase + (ULONG_PTR)ImportModuleDirectory->FirstThunk); /* Get the list of functions to import. */ - if (ImportModuleDirectory->dwRVAFunctionNameList != 0) + if (ImportModuleDirectory->OriginalFirstThunk != 0) { - FunctionNameList = (PULONG) (DriverBase + ImportModuleDirectory->dwRVAFunctionNameList); + FunctionNameList = (PULONG) (DriverBase + (ULONG_PTR)ImportModuleDirectory->OriginalFirstThunk); } else { - FunctionNameList = (PULONG)(DriverBase + ImportModuleDirectory->dwRVAFunctionAddressList); + FunctionNameList = (PULONG)(DriverBase + (ULONG_PTR)ImportModuleDirectory->FirstThunk); } /* Walk through function list and fixup addresses. */ @@ -1573,22 +1573,22 @@ static NTSTATUS LdrPEFixupImports(PMODULE_OBJECT Module) { - PIMAGE_IMPORT_MODULE_DIRECTORY ImportModuleDirectory; + PIMAGE_IMPORT_DESCRIPTOR ImportModuleDirectory; PCHAR ImportedName; PMODULE_OBJECT ImportedModule; NTSTATUS Status; /* Process each import module */ - ImportModuleDirectory = (PIMAGE_IMPORT_MODULE_DIRECTORY) + ImportModuleDirectory = (PIMAGE_IMPORT_DESCRIPTOR) RtlImageDirectoryEntryToData(Module->Base, TRUE, IMAGE_DIRECTORY_ENTRY_IMPORT, NULL); DPRINT("Processeing import directory at %p\n", ImportModuleDirectory); - while (ImportModuleDirectory->dwRVAModuleName) + while (ImportModuleDirectory->Name) { /* Check to make sure that import lib is kernel */ - ImportedName = (PCHAR) Module->Base + ImportModuleDirectory->dwRVAModuleName; + ImportedName = (PCHAR) Module->Base + ImportModuleDirectory->Name; Status = LdrPEGetOrLoadModule(Module, ImportedName, &ImportedModule); if (!NT_SUCCESS(Status))

19 years, 8 months

[sedwards] 12708: didnt mean to commit this

by sedwards＠svn.reactos.com

didnt mean to commit this Modified: trunk/reactos/bootdata/hivesys.inf _____ Modified: trunk/reactos/bootdata/hivesys.inf --- trunk/reactos/bootdata/hivesys.inf 2005-01-01 20:32:43 UTC (rev 12707) +++ trunk/reactos/bootdata/hivesys.inf 2005-01-01 20:44:34 UTC (rev 12708) @@ -604,8 +604,8 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E972-E325-11CE-BFC1-08 002BE10318}\0000","BusNumber",0x00000000,"0" HKLM,"SYSTEM\CurrentControlSet\Control\Network\{4D36E972-E325-11CE-BFC1- 08002BE10318}\{RANDOMCFGGUIDFOR_PCNET1}",,0x00000000,"Network Adapters" HKLM,"SYSTEM\CurrentControlSet\Control\Network\{4D36E972-E325-11CE-BFC1- 08002BE10318}\{RANDOMCFGGUIDFOR_PCNET1}\Connection","Name",0x00000000,"A MD PCNet (static Registry entry)" -HKLM,"SYSTEM\CurrentControlSet\Services\PCNet1\Parameters\Tcpip","Defau ltGateway",0x00010000,"192.168.0.1" -HKLM,"SYSTEM\CurrentControlSet\Services\PCNet1\Parameters\Tcpip","IPAdd ress",0x00010000,"192.168.0.101" +HKLM,"SYSTEM\CurrentControlSet\Services\PCNet1\Parameters\Tcpip","Defau ltGateway",0x00010000,"10.0.0.1" +HKLM,"SYSTEM\CurrentControlSet\Services\PCNet1\Parameters\Tcpip","IPAdd ress",0x00010000,"10.0.0.100" HKLM,"SYSTEM\CurrentControlSet\Services\PCNet1\Parameters\Tcpip","Subnet Mask",0x00010000,"255.255.255.0" ; Named Pipe filesystem driver @@ -707,7 +707,7 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters","DataBasePath" ,0x00010000,"DataBasePath" HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters","Domain",0x000 10000,"" HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters","Hostname",0x0 0010000,"ROSHost" -HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters","NameServer", 0x00010000,"4.2.2.1" +HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters","NameServer", 0x00010000,"10.0.0.1" HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters","ForwardBroadc asts",0x00010001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters","IPEnableRoute r",0x00010001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters","SearchList",0 x00010000,""

19 years, 8 months

[sedwards] 12707: add urlmon and shdocvw to the build and install cd to get the Mozilla ActiveX Control working

by sedwards＠svn.reactos.com

add urlmon and shdocvw to the build and install cd to get the Mozilla ActiveX Control working Modified: trunk/reactos/Makefile Modified: trunk/reactos/bootdata/hivesys.inf Modified: trunk/reactos/bootdata/packages/reactos.dff Modified: trunk/reactos/config _____ Modified: trunk/reactos/Makefile --- trunk/reactos/Makefile 2005-01-01 19:33:26 UTC (rev 12706) +++ trunk/reactos/Makefile 2005-01-01 20:32:43 UTC (rev 12707) @@ -59,7 +59,7 @@ msgina msimg32 msvcrt20 msvideo mswsock netapi32 ntdll ole32 oleaut32 oledlg olepro32 opengl32 \ packet psapi riched20 richedit rpcrt4 samlib secur32 setupapi shell32 shlwapi snmpapi syssetup twain \ unicode user32 userenv version wininet winmm winspool ws2help ws2_32 wsock32 wshirda dnsapi \ - dinput dinput8 dxdiagn devenum dsound $(DLLS_KBD) $(DLLS_CPL) $(DLLS_SHELLEXT) + urlmon shdocvw dinput dinput8 dxdiagn devenum dsound $(DLLS_KBD) $(DLLS_CPL) $(DLLS_SHELLEXT) SUBSYS = smss win32k csrss ntvdm _____ Modified: trunk/reactos/bootdata/hivesys.inf --- trunk/reactos/bootdata/hivesys.inf 2005-01-01 19:33:26 UTC (rev 12706) +++ trunk/reactos/bootdata/hivesys.inf 2005-01-01 20:32:43 UTC (rev 12707) @@ -604,8 +604,8 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E972-E325-11CE-BFC1-08 002BE10318}\0000","BusNumber",0x00000000,"0" HKLM,"SYSTEM\CurrentControlSet\Control\Network\{4D36E972-E325-11CE-BFC1- 08002BE10318}\{RANDOMCFGGUIDFOR_PCNET1}",,0x00000000,"Network Adapters" HKLM,"SYSTEM\CurrentControlSet\Control\Network\{4D36E972-E325-11CE-BFC1- 08002BE10318}\{RANDOMCFGGUIDFOR_PCNET1}\Connection","Name",0x00000000,"A MD PCNet (static Registry entry)" -HKLM,"SYSTEM\CurrentControlSet\Services\PCNet1\Parameters\Tcpip","Defau ltGateway",0x00010000,"10.0.0.1" -HKLM,"SYSTEM\CurrentControlSet\Services\PCNet1\Parameters\Tcpip","IPAdd ress",0x00010000,"10.0.0.100" +HKLM,"SYSTEM\CurrentControlSet\Services\PCNet1\Parameters\Tcpip","Defau ltGateway",0x00010000,"192.168.0.1" +HKLM,"SYSTEM\CurrentControlSet\Services\PCNet1\Parameters\Tcpip","IPAdd ress",0x00010000,"192.168.0.101" HKLM,"SYSTEM\CurrentControlSet\Services\PCNet1\Parameters\Tcpip","Subnet Mask",0x00010000,"255.255.255.0" ; Named Pipe filesystem driver @@ -707,7 +707,7 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters","DataBasePath" ,0x00010000,"DataBasePath" HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters","Domain",0x000 10000,"" HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters","Hostname",0x0 0010000,"ROSHost" -HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters","NameServer", 0x00010000,"10.0.0.1" +HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters","NameServer", 0x00010000,"4.2.2.1" HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters","ForwardBroadc asts",0x00010001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters","IPEnableRoute r",0x00010001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters","SearchList",0 x00010000,"" _____ Modified: trunk/reactos/bootdata/packages/reactos.dff --- trunk/reactos/bootdata/packages/reactos.dff 2005-01-01 19:33:26 UTC (rev 12706) +++ trunk/reactos/bootdata/packages/reactos.dff 2005-01-01 20:32:43 UTC (rev 12707) @@ -112,10 +112,12 @@ lib\samlib\samlib.dll 1 lib\secur32\secur32.dll 1 lib\setupapi\setupapi.dll 1 +lib\shdocvw\shdocvw.dll 1 lib\shell32\shell32.dll 1 lib\shlwapi\shlwapi.dll 1 lib\syssetup\syssetup.dll 1 lib\twain\twain_32.dll 1 +lib\urlmon\urlmon.dll 1 lib\unicode\wine_unicode.dll 1 lib\user32\user32.dll 1 lib\userenv\userenv.dll 1 _____ Modified: trunk/reactos/config --- trunk/reactos/config 2005-01-01 19:33:26 UTC (rev 12706) +++ trunk/reactos/config 2005-01-01 20:32:43 UTC (rev 12707) @@ -25,7 +25,7 @@ # # Whether to compile for debugging # -DBG := 0 +DBG := 0 # # Whether to compile with optimizations

19 years, 8 months

[ea] 12706: - Updated years range in copyright note.

by ea＠svn.reactos.com

- Updated years range in copyright note. Modified: trunk/reactos/include/reactos/resource.h _____ Modified: trunk/reactos/include/reactos/resource.h --- trunk/reactos/include/reactos/resource.h 2005-01-01 17:44:06 UTC (rev 12705) +++ trunk/reactos/include/reactos/resource.h 2005-01-01 19:33:26 UTC (rev 12706) @@ -22,7 +22,7 @@ /* Common version strings for rc scripts */ #define RES_STR_COMPANY_NAME "ReactOS Development Team\0" -#define RES_STR_LEGAL_COPYRIGHT "Copyright (c) 1998-2004 ReactOS Team\0" +#define RES_STR_LEGAL_COPYRIGHT "Copyright (c) 1998-2005 ReactOS Team\0" #define RES_STR_PRODUCT_NAME "ReactOS Operating System\0" #define RES_STR_PRODUCT_VERSION KERNEL_VERSION_RC #define RES_STR_BUILD_DATE KERNEL_VERSION_BUILD_RC

19 years, 8 months

[ion] 12705: Remove unneeded defines and fix hal operation function types.

by ion＠svn.reactos.com

Remove unneeded defines and fix hal operation function types. Modified: trunk/reactos/include/ddk/iotypes.h Modified: trunk/reactos/ntoskrnl/io/deviface.c Modified: trunk/reactos/ntoskrnl/io/pnpdma.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr.c _____ Modified: trunk/reactos/include/ddk/iotypes.h --- trunk/reactos/include/ddk/iotypes.h 2005-01-01 14:54:25 UTC (rev 12704) +++ trunk/reactos/include/ddk/iotypes.h 2005-01-01 17:44:06 UTC (rev 12705) @@ -1196,18 +1196,18 @@ SCATTER_GATHER_ELEMENT Elements[1]; } SCATTER_GATHER_LIST, *PSCATTER_GATHER_LIST; -typedef VOID STDCALL (*PPUT_DMA_ADAPTER)( +typedef VOID (STDCALL *PPUT_DMA_ADAPTER)( PDMA_ADAPTER DmaAdapter ); -typedef PVOID STDCALL (*PALLOCATE_COMMON_BUFFER)( +typedef PVOID (STDCALL *PALLOCATE_COMMON_BUFFER)( IN PDMA_ADAPTER DmaAdapter, IN ULONG Length, OUT PPHYSICAL_ADDRESS LogicalAddress, IN BOOLEAN CacheEnabled ); -typedef VOID STDCALL (*PFREE_COMMON_BUFFER)( +typedef VOID (STDCALL *PFREE_COMMON_BUFFER)( IN PDMA_ADAPTER DmaAdapter, IN ULONG Length, IN PHYSICAL_ADDRESS LogicalAddress, @@ -1215,7 +1215,7 @@ IN BOOLEAN CacheEnabled ); -typedef NTSTATUS STDCALL (*PALLOCATE_ADAPTER_CHANNEL)( +typedef NTSTATUS (STDCALL *PALLOCATE_ADAPTER_CHANNEL)( IN PDMA_ADAPTER DmaAdapter, IN PDEVICE_OBJECT DeviceObject, IN ULONG NumberOfMapRegisters, @@ -1223,7 +1223,7 @@ IN PVOID Context ); -typedef BOOLEAN STDCALL (*PFLUSH_ADAPTER_BUFFERS)( +typedef BOOLEAN (STDCALL *PFLUSH_ADAPTER_BUFFERS)( IN PDMA_ADAPTER DmaAdapter, IN PMDL Mdl, IN PVOID MapRegisterBase, @@ -1232,17 +1232,17 @@ IN BOOLEAN WriteToDevice ); -typedef VOID STDCALL (*PFREE_ADAPTER_CHANNEL)( +typedef VOID (STDCALL *PFREE_ADAPTER_CHANNEL)( IN PDMA_ADAPTER DmaAdapter ); -typedef VOID STDCALL (*PFREE_MAP_REGISTERS)( +typedef VOID (STDCALL *PFREE_MAP_REGISTERS)( IN PDMA_ADAPTER DmaAdapter, PVOID MapRegisterBase, ULONG NumberOfMapRegisters ); -typedef PHYSICAL_ADDRESS STDCALL (*PMAP_TRANSFER)( +typedef PHYSICAL_ADDRESS (STDCALL *PMAP_TRANSFER)( IN PDMA_ADAPTER DmaAdapter, IN PMDL Mdl, IN PVOID MapRegisterBase, @@ -1251,22 +1251,22 @@ IN BOOLEAN WriteToDevice ); -typedef ULONG STDCALL (*PGET_DMA_ALIGNMENT)( +typedef ULONG (STDCALL *PGET_DMA_ALIGNMENT)( IN PDMA_ADAPTER DmaAdapter ); -typedef ULONG STDCALL (*PREAD_DMA_COUNTER)( +typedef ULONG (STDCALL *PREAD_DMA_COUNTER)( IN PDMA_ADAPTER DmaAdapter ); -typedef VOID STDCALL (*PDRIVER_LIST_CONTROL)( +typedef VOID (STDCALL *PDRIVER_LIST_CONTROL)( IN struct _DEVICE_OBJECT *DeviceObject, IN struct _IRP *Irp, IN PSCATTER_GATHER_LIST ScatterGather, IN PVOID Context ); -typedef NTSTATUS STDCALL (*PGET_SCATTER_GATHER_LIST)( +typedef NTSTATUS (STDCALL *PGET_SCATTER_GATHER_LIST)( IN PDMA_ADAPTER DmaAdapter, IN PDEVICE_OBJECT DeviceObject, IN PMDL Mdl, @@ -1277,7 +1277,7 @@ IN BOOLEAN WriteToDevice ); -typedef VOID STDCALL (*PPUT_SCATTER_GATHER_LIST)( +typedef VOID (STDCALL *PPUT_SCATTER_GATHER_LIST)( IN PDMA_ADAPTER DmaAdapter, IN PSCATTER_GATHER_LIST ScatterGather, IN BOOLEAN WriteToDevice _____ Modified: trunk/reactos/ntoskrnl/io/deviface.c --- trunk/reactos/ntoskrnl/io/deviface.c 2005-01-01 14:54:25 UTC (rev 12704) +++ trunk/reactos/ntoskrnl/io/deviface.c 2005-01-01 17:44:06 UTC (rev 12705) @@ -12,13 +12,13 @@ /* INCLUDES ******************************************************************/ #include <ntoskrnl.h> -#include <ole32/guiddef.h> -#ifdef DEFINE_GUID -DEFINE_GUID(GUID_SERENUM_BUS_ENUMERATOR, 0x4D36E978L, 0xE325, 0x11CE, 0xBF, 0xC1, 0x08, 0x00, 0x2B, 0xE1, 0x03, 0x18); -#endif + #define NDEBUG #include <internal/debug.h> +DEFINE_GUID(GUID_SERENUM_BUS_ENUMERATOR, + 0x4D36E978L, 0xE325, 0x11CE, 0xBF, 0xC1, 0x08, 0x00, 0x2B, 0xE1, 0x03, 0x18); + /* FUNCTIONS *****************************************************************/ /* @@ -574,7 +574,7 @@ PWCHAR KeyNameString = L"\\Device\\Serenum"; DPRINT("IoRegisterDeviceInterface called (UNIMPLEMENTED)\n"); - if (IsEqualGUID(InterfaceClassGuid, (LPGUID)&GUID_SERENUM_BUS_ENUMERATOR)) + if (!memcmp(InterfaceClassGuid, (LPGUID)&GUID_SERENUM_BUS_ENUMERATOR, sizeof(GUID))) { RtlInitUnicodeString(SymbolicLinkName, KeyNameString); return STATUS_SUCCESS; _____ Modified: trunk/reactos/ntoskrnl/io/pnpdma.c --- trunk/reactos/ntoskrnl/io/pnpdma.c 2005-01-01 14:54:25 UTC (rev 12704) +++ trunk/reactos/ntoskrnl/io/pnpdma.c 2005-01-01 17:44:06 UTC (rev 12705) @@ -14,11 +14,6 @@ #include <ntoskrnl.h> #define NDEBUG #include <internal/debug.h> -#ifdef __USE_W32API -#include <initguid.h> -#else -#include <ole32/guiddef.h> -#endif #include <ddk/wdmguid.h> typedef struct _DMA_ADAPTER_INTERNAL { _____ Modified: trunk/reactos/ntoskrnl/io/pnpmgr.c --- trunk/reactos/ntoskrnl/io/pnpmgr.c 2005-01-01 14:54:25 UTC (rev 12704) +++ trunk/reactos/ntoskrnl/io/pnpmgr.c 2005-01-01 17:44:06 UTC (rev 12705) @@ -1,4 +1,4 @@ -/* $Id: pnpmgr.c,v 1.52 2004/11/19 21:31:02 navaraf Exp $ +/* $Id$ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -12,7 +12,6 @@ /* INCLUDES ******************************************************************/ #include <ntoskrnl.h> -#include <ole32/guiddef.h> #define NDEBUG #include <internal/debug.h>

19 years, 8 months

← Newer
1
...
64
65
66
67
68
69
70
71
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 January 2005