Ros-diffs

ros-diffs@reactos.org

81390 discussions

[navaraf] 16448: Report correct system space start address in /3GB case.
by navaraf＠svn.reactos.com 06 Jul '05

06 Jul '05

Report correct system space start address in /3GB case. Modified: trunk/reactos/boot/freeldr/freeldr/multiboot.c _____ Modified: trunk/reactos/boot/freeldr/freeldr/multiboot.c --- trunk/reactos/boot/freeldr/freeldr/multiboot.c 2005-07-06 08:20:26 UTC (rev 16447) +++ trunk/reactos/boot/freeldr/freeldr/multiboot.c 2005-07-06 08:22:13 UTC (rev 16448) @@ -240,6 +240,9 @@ { PCHAR p; + /* Set KernelBase */ + LoaderBlock.KernelBase = KernelBase; + /* Read Command Line */ p = (PCHAR)LoaderBlock.CommandLine; while ((p = strchr(p, '/')) != NULL) { @@ -252,14 +255,12 @@ /* Use 3GB */ KernelBase = 0xE0000000; + LoaderBlock.KernelBase = 0xC0000000; } } p++; } - - /* Set KernelBase */ - LoaderBlock.KernelBase = KernelBase; } /*++

1 0

[navaraf] 16447: Kernel base address and system space start can be distinct addresses, so use KERNEL_BASE and MmSystemRangeStart accordingly in the code.
by navaraf＠svn.reactos.com 06 Jul '05

06 Jul '05

Kernel base address and system space start can be distinct addresses, so use KERNEL_BASE and MmSystemRangeStart accordingly in the code. Modified: trunk/reactos/ntoskrnl/include/internal/i386/mm.h Modified: trunk/reactos/ntoskrnl/include/internal/ke.h Modified: trunk/reactos/ntoskrnl/ke/i386/exp.c Modified: trunk/reactos/ntoskrnl/ke/main.c Modified: trunk/reactos/ntoskrnl/mm/aspace.c Modified: trunk/reactos/ntoskrnl/mm/i386/page.c Modified: trunk/reactos/ntoskrnl/mm/i386/pfault.c Modified: trunk/reactos/ntoskrnl/mm/marea.c Modified: trunk/reactos/ntoskrnl/mm/mdl.c Modified: trunk/reactos/ntoskrnl/mm/mm.c Modified: trunk/reactos/ntoskrnl/mm/rmap.c Modified: trunk/reactos/ntoskrnl/mm/virtual.c _____ Modified: trunk/reactos/ntoskrnl/include/internal/i386/mm.h --- trunk/reactos/ntoskrnl/include/internal/i386/mm.h 2005-07-06 07:54:04 UTC (rev 16446) +++ trunk/reactos/ntoskrnl/include/internal/i386/mm.h 2005-07-06 08:20:26 UTC (rev 16447) @@ -22,8 +22,6 @@ #define PA_SYSTEM (0) #endif -#define KERNEL_BASE (ULONG)MmSystemRangeStart - #if defined(__GNUC__) #define FLUSH_TLB { \ _____ Modified: trunk/reactos/ntoskrnl/include/internal/ke.h --- trunk/reactos/ntoskrnl/include/internal/ke.h 2005-07-06 07:54:04 UTC (rev 16446) +++ trunk/reactos/ntoskrnl/include/internal/ke.h 2005-07-06 08:20:26 UTC (rev 16447) @@ -308,6 +308,8 @@ /* INITIALIZATION FUNCTIONS *************************************************/ +extern ULONG_PTR KERNEL_BASE; + VOID KeInitExceptions(VOID); VOID KeInitInterrupts(VOID); VOID KeInitTimer(VOID); _____ Modified: trunk/reactos/ntoskrnl/ke/i386/exp.c --- trunk/reactos/ntoskrnl/ke/i386/exp.c 2005-07-06 07:54:04 UTC (rev 16446) +++ trunk/reactos/ntoskrnl/ke/i386/exp.c 2005-07-06 08:20:26 UTC (rev 16447) @@ -135,7 +135,7 @@ current_entry = current_entry->Flink; } - address = (PVOID)((ULONG_PTR)address & ~KERNEL_BASE); + address = (PVOID)((ULONG_PTR)address & ~(ULONG_PTR)MmSystemRangeStart); } while(++i <= 1); return(FALSE); _____ Modified: trunk/reactos/ntoskrnl/ke/main.c --- trunk/reactos/ntoskrnl/ke/main.c 2005-07-06 07:54:04 UTC (rev 16446) +++ trunk/reactos/ntoskrnl/ke/main.c 2005-07-06 08:20:26 UTC (rev 16447) @@ -22,18 +22,6 @@ ULONG NtMajorVersion = 5; ULONG NtMinorVersion = 0; ULONG NtOSCSDVersion = BUILD_OSCSDVERSION(6, 0); -#ifdef __GNUC__ -ULONG EXPORTED NtBuildNumber = KERNEL_VERSION_BUILD; -ULONG EXPORTED NtGlobalFlag = 0; -CHAR EXPORTED KeNumberProcessors; -KAFFINITY EXPORTED KeActiveProcessors; -LOADER_PARAMETER_BLOCK EXPORTED KeLoaderBlock; -ULONG EXPORTED KeDcacheFlushCount = 0; -ULONG EXPORTED KeIcacheFlushCount = 0; -ULONG EXPORTED KiDmaIoCoherency = 0; /* RISC Architectures only */ -ULONG EXPORTED InitSafeBootMode = 0; /* KB83764 */ -#else -/* Microsoft-style declarations */ EXPORTED ULONG NtBuildNumber = KERNEL_VERSION_BUILD; EXPORTED ULONG NtGlobalFlag = 0; EXPORTED CHAR KeNumberProcessors; @@ -43,7 +31,6 @@ EXPORTED ULONG KeIcacheFlushCount = 0; EXPORTED ULONG KiDmaIoCoherency = 0; /* RISC Architectures only */ EXPORTED ULONG InitSafeBootMode = 0; /* KB83764 */ -#endif /* __GNUC__ */ LOADER_MODULE KeLoaderModules[64]; static CHAR KeLoaderModuleStrings[64][256]; @@ -69,6 +56,9 @@ /* Cached modules from the loader block */ PLOADER_MODULE CachedModules[MaximumCachedModuleType]; +extern unsigned int _image_base__; +ULONG_PTR KERNEL_BASE = (ULONG_PTR)&_image_base__; + /* FUNCTIONS ****************************************************************/ /* _____ Modified: trunk/reactos/ntoskrnl/mm/aspace.c --- trunk/reactos/ntoskrnl/mm/aspace.c 2005-07-06 07:54:04 UTC (rev 16446) +++ trunk/reactos/ntoskrnl/mm/aspace.c 2005-07-06 08:20:26 UTC (rev 16447) @@ -73,7 +73,7 @@ } else { - AddressSpace->LowestAddress = (PVOID)KERNEL_BASE; + AddressSpace->LowestAddress = MmSystemRangeStart; } AddressSpace->Process = Process; if (Process != NULL) _____ Modified: trunk/reactos/ntoskrnl/mm/i386/page.c --- trunk/reactos/ntoskrnl/mm/i386/page.c 2005-07-06 07:54:04 UTC (rev 16446) +++ trunk/reactos/ntoskrnl/mm/i386/page.c 2005-07-06 08:20:26 UTC (rev 16447) @@ -105,7 +105,7 @@ MiFlushTlbIpiRoutine(Address); } #else - if ((Pt && MmUnmapPageTable(Pt)) || Address >= (PVOID)KERNEL_BASE) + if ((Pt && MmUnmapPageTable(Pt)) || Address >= MmSystemRangeStart) { FLUSH_TLB_ONE(Address); } @@ -226,7 +226,7 @@ for (i = 0; i < 4; i++) { PageDir = (PULONGLONG)MmCreateHyperspaceMapping(PAE_PTE_TO_PFN(PageDirTable[i])); - if (i < PAE_ADDR_TO_PDTE_OFFSET(KERNEL_BASE)) + if (i < PAE_ADDR_TO_PDTE_OFFSET(MmSystemRangeStart)) { for (j = 0; j < 512; j++) { @@ -274,7 +274,7 @@ PULONG Pde; PULONG PageDir; PageDir = MmCreateHyperspaceMapping(PTE_TO_PFN(Process->Pcb.DirectoryTableBase.u.L owPart)); - for (i = 0; i < ADDR_TO_PDE_OFFSET(KERNEL_BASE); i++) + for (i = 0; i < ADDR_TO_PDE_OFFSET(MmSystemRangeStart); i++) { if (PageDir[i] != 0) { @@ -358,7 +358,7 @@ PageDirTable[i] = PAE_PFN_TO_PTE(Pfn[1+i]) | PA_PRESENT; } MmDeleteHyperspaceMapping(PageDirTable); - for (i = PAE_ADDR_TO_PDTE_OFFSET(KERNEL_BASE); i < 4; i++) + for (i = PAE_ADDR_TO_PDTE_OFFSET(MmSystemRangeStart); i < 4; i++) { PageDir = (PULONGLONG)MmCreateHyperspaceMapping(Pfn[i+1]); memcpy(PageDir, &MmGlobalKernelPageDirectoryForPAE[i * 512], 512 * sizeof(ULONGLONG)); @@ -382,9 +382,9 @@ PULONG PageDirectory; PageDirectory = MmCreateHyperspaceMapping(Pfn[0]); - memcpy(PageDirectory + ADDR_TO_PDE_OFFSET(KERNEL_BASE), - MmGlobalKernelPageDirectory + ADDR_TO_PDE_OFFSET(KERNEL_BASE), - (1024 - ADDR_TO_PDE_OFFSET(KERNEL_BASE)) * sizeof(ULONG)); + memcpy(PageDirectory + ADDR_TO_PDE_OFFSET(MmSystemRangeStart), + MmGlobalKernelPageDirectory + ADDR_TO_PDE_OFFSET(MmSystemRangeStart), + (1024 - ADDR_TO_PDE_OFFSET(MmSystemRangeStart)) * sizeof(ULONG)); DPRINT("Addr %x\n",ADDR_TO_PDE_OFFSET(PAGETABLE_MAP)); PageDirectory[ADDR_TO_PDE_OFFSET(PAGETABLE_MAP)] = PFN_TO_PTE(Pfn[0]) | PA_PRESENT | PA_READWRITE; @@ -416,7 +416,7 @@ { *(ADDR_TO_PDE(Address)) = 0; } - if (Address >= (PVOID)KERNEL_BASE) + if (Address >= MmSystemRangeStart) { KEBUGCHECK(0); // MmGlobalKernelPageDirectory[ADDR_TO_PDE_OFFSET(Address)] = 0; @@ -474,7 +474,7 @@ } MiFlushTlb(NULL, Address); - if (Address >= (PVOID)KERNEL_BASE) + if (Address >= MmSystemRangeStart) { // MmGlobalKernelPageDirectory[ADDR_TO_PDE_OFFSET(Address)] = 0; KEBUGCHECK(0); @@ -506,7 +506,7 @@ { KEBUGCHECK(0); } - if (Address < (PVOID)KERNEL_BASE && Process && Process != PsGetCurrentProcess()) + if (Address < MmSystemRangeStart && Process && Process != PsGetCurrentProcess()) { PageDirTable = MmCreateHyperspaceMapping(PAE_PTE_TO_PFN(Process->Pcb.DirectoryTableBase .QuadPart)); if (PageDirTable == NULL) @@ -556,7 +556,7 @@ PageDir = PAE_ADDR_TO_PDE(Address); if (0LL == ExfInterlockedCompareExchange64UL(PageDir, &ZeroEntry, &ZeroEntry)) { - if (Address >= (PVOID)KERNEL_BASE) + if (Address >= MmSystemRangeStart) { if (MmGlobalKernelPageDirectoryForPAE[PAE_ADDR_TO_PDE_OFFSET(Address)] == 0LL) { @@ -612,7 +612,7 @@ ULONG Entry; PULONG Pt, PageDir; - if (Address < (PVOID)KERNEL_BASE && Process && Process != PsGetCurrentProcess()) + if (Address < MmSystemRangeStart && Process && Process != PsGetCurrentProcess()) { PageDir = MmCreateHyperspaceMapping(PTE_TO_PFN(Process->Pcb.DirectoryTableBase.Qua dPart)); if (PageDir == NULL) @@ -653,7 +653,7 @@ PageDir = ADDR_TO_PDE(Address); if (0 == InterlockedCompareExchangeUL(PageDir, 0, 0)) { - if (Address >= (PVOID)KERNEL_BASE) + if (Address >= MmSystemRangeStart) { if (0 == InterlockedCompareExchangeUL(&MmGlobalKernelPageDirectory[PdeOffset], 0, 0)) { @@ -1024,7 +1024,7 @@ */ if (Process != NULL && WasValid && Process->AddressSpace.PageTableRefCountTable != NULL && - Address < (PVOID)KERNEL_BASE) + Address < MmSystemRangeStart) { PUSHORT Ptrc; ULONG Idx; @@ -1072,7 +1072,7 @@ */ if (Process != NULL && Pte && Process->AddressSpace.PageTableRefCountTable != NULL && - Address < (PVOID)KERNEL_BASE) + Address < MmSystemRangeStart) { PUSHORT Ptrc; @@ -1116,7 +1116,7 @@ */ if (Process != NULL && Pte && Process->AddressSpace.PageTableRefCountTable != NULL && - Address < (PVOID)KERNEL_BASE) + Address < MmSystemRangeStart) { PUSHORT Ptrc; @@ -1193,7 +1193,7 @@ BOOLEAN MmIsAccessedAndResetAccessPage(PEPROCESS Process, PVOID Address) { - if (Address < (PVOID)KERNEL_BASE && Process == NULL) + if (Address < MmSystemRangeStart && Process == NULL) { DPRINT1("MmIsAccessedAndResetAccessPage is called for user space without a process.\n"); KEBUGCHECK(0); @@ -1258,7 +1258,7 @@ VOID MmSetCleanPage(PEPROCESS Process, PVOID Address) { - if (Address < (PVOID)KERNEL_BASE && Process == NULL) + if (Address < MmSystemRangeStart && Process == NULL) { DPRINT1("MmSetCleanPage is called for user space without a process.\n"); KEBUGCHECK(0); @@ -1321,7 +1321,7 @@ VOID MmSetDirtyPage(PEPROCESS Process, PVOID Address) { - if (Address < (PVOID)KERNEL_BASE && Process == NULL) + if (Address < MmSystemRangeStart && Process == NULL) { DPRINT1("MmSetDirtyPage is called for user space without a process.\n"); KEBUGCHECK(0); @@ -1475,7 +1475,7 @@ DPRINT("MmCreateVirtualMappingForKernel(%x, %x, %x, %d)\n", Address, flProtect, Pages, PageCount); - if (Address < (PVOID)KERNEL_BASE) + if (Address < MmSystemRangeStart) { DPRINT1("MmCreateVirtualMappingForKernel is called for user space\n"); KEBUGCHECK(0); @@ -1592,12 +1592,12 @@ PVOID Address, SWAPENTRY SwapEntry) { - if (Process == NULL && Address < (PVOID)KERNEL_BASE) + if (Process == NULL && Address < MmSystemRangeStart) { DPRINT1("No process\n"); KEBUGCHECK(0); } - if (Process != NULL && Address >= (PVOID)KERNEL_BASE) + if (Process != NULL && Address >= MmSystemRangeStart) { DPRINT1("Setting kernel address with process context\n"); KEBUGCHECK(0); @@ -1661,7 +1661,7 @@ } if (Process != NULL && Process->AddressSpace.PageTableRefCountTable != NULL && - Address < (PVOID)KERNEL_BASE) + Address < MmSystemRangeStart) { PUSHORT Ptrc; ULONG Idx; @@ -1692,7 +1692,7 @@ if (Process == NULL) { - if (Address < (PVOID)KERNEL_BASE) + if (Address < MmSystemRangeStart) { DPRINT1("No process\n"); KEBUGCHECK(0); @@ -1706,13 +1706,14 @@ } else { - if (Address >= (PVOID)KERNEL_BASE) + if (Address >= MmSystemRangeStart) { DPRINT1("Setting kernel address with process context\n"); KEBUGCHECK(0); } - if (PageCount > KERNEL_BASE / PAGE_SIZE || - (ULONG_PTR) Address / PAGE_SIZE + PageCount > KERNEL_BASE / PAGE_SIZE) + if (PageCount > (ULONG_PTR)MmSystemRangeStart / PAGE_SIZE || + (ULONG_PTR) Address / PAGE_SIZE + PageCount > + (ULONG_PTR)MmSystemRangeStart / PAGE_SIZE) { DPRINT1("Page Count to large\n"); KEBUGCHECK(0); @@ -1725,7 +1726,7 @@ NoExecute = TRUE; } Attributes &= 0xfff; - if (Address >= (PVOID)KERNEL_BASE) + if (Address >= MmSystemRangeStart) { Attributes &= ~PA_USER; if (Ke386GlobalPagesEnabled) @@ -1786,7 +1787,7 @@ { MmMarkPageUnmapped(PAE_PTE_TO_PFN((Pte))); } - if (Address < (PVOID)KERNEL_BASE && + if (Address < MmSystemRangeStart && Process->AddressSpace.PageTableRefCountTable != NULL && Attributes & PA_PRESENT) { @@ -1798,7 +1799,7 @@ } if (Pte != 0LL) { - if (Address > (PVOID)KERNEL_BASE || + if (Address > MmSystemRangeStart || (Pt >= (PULONGLONG)PAGETABLE_MAP && Pt < (PULONGLONG)PAGETABLE_MAP + 4*512*512)) { MiFlushTlb((PULONG)Pt, Address); @@ -1851,7 +1852,7 @@ MmMarkPageUnmapped(PTE_TO_PFN((Pte))); } InterlockedExchangeUL(Pt, PFN_TO_PTE(Pages[i]) | Attributes); - if (Address < (PVOID)KERNEL_BASE && + if (Address < MmSystemRangeStart && Process->AddressSpace.PageTableRefCountTable != NULL && Attributes & PA_PRESENT) { @@ -1863,7 +1864,7 @@ } if (Pte != 0) { - if (Address > (PVOID)KERNEL_BASE || + if (Address > MmSystemRangeStart || (Pt >= (PULONG)PAGETABLE_MAP && Pt < (PULONG)PAGETABLE_MAP + 1024*1024)) { MiFlushTlb(Pt, Address); @@ -1963,7 +1964,7 @@ NoExecute = TRUE; } Attributes &= 0xfff; - if (Address >= (PVOID)KERNEL_BASE) + if (Address >= MmSystemRangeStart) { Attributes &= ~PA_USER; if (Ke386GlobalPagesEnabled) @@ -2233,7 +2234,7 @@ { ULONG StartOffset, EndOffset, Offset; - if (Address < (PVOID)KERNEL_BASE) + if (Address < MmSystemRangeStart) { KEBUGCHECK(0); } @@ -2322,7 +2323,7 @@ if (Ke386Pae) { PULONGLONG CurrentPageDirectory = (PULONGLONG)PAE_PAGEDIRECTORY_MAP; - for (i = PAE_ADDR_TO_PDE_OFFSET(KERNEL_BASE); i < 4 * 512; i++) + for (i = PAE_ADDR_TO_PDE_OFFSET(MmSystemRangeStart); i < 4 * 512; i++) { if (!(i >= PAE_ADDR_TO_PDE_OFFSET(PAGETABLE_MAP) && i < PAE_ADDR_TO_PDE_OFFSET(PAGETABLE_MAP) + 4) && !(i >= PAE_ADDR_TO_PDE_OFFSET(HYPERSPACE) && i < PAE_ADDR_TO_PDE_OFFSET(HYPERSPACE) + 2) && @@ -2340,7 +2341,7 @@ else { PULONG CurrentPageDirectory = (PULONG)PAGEDIRECTORY_MAP; - for (i = ADDR_TO_PDE_OFFSET(KERNEL_BASE); i < 1024; i++) + for (i = ADDR_TO_PDE_OFFSET(MmSystemRangeStart); i < 1024; i++) { if (i != ADDR_TO_PDE_OFFSET(PAGETABLE_MAP) && i != ADDR_TO_PDE_OFFSET(HYPERSPACE) && @@ -2360,7 +2361,7 @@ ULONG MiGetUserPageDirectoryCount(VOID) { - return Ke386Pae ? PAE_ADDR_TO_PDE_OFFSET(KERNEL_BASE) : ADDR_TO_PDE_OFFSET(KERNEL_BASE); + return Ke386Pae ? PAE_ADDR_TO_PDE_OFFSET(MmSystemRangeStart) : ADDR_TO_PDE_OFFSET(MmSystemRangeStart); } VOID INIT_FUNCTION _____ Modified: trunk/reactos/ntoskrnl/mm/i386/pfault.c --- trunk/reactos/ntoskrnl/mm/i386/pfault.c 2005-07-06 07:54:04 UTC (rev 16446) +++ trunk/reactos/ntoskrnl/mm/i386/pfault.c 2005-07-06 08:20:26 UTC (rev 16447) @@ -51,7 +51,7 @@ Mode = KernelMode; } - if (Mode == KernelMode && Cr2 >= KERNEL_BASE && + if (Mode == KernelMode && Cr2 >= (ULONG_PTR)MmSystemRangeStart && Mmi386MakeKernelPageTableGlobal((PVOID)Cr2)) { return(STATUS_SUCCESS); _____ Modified: trunk/reactos/ntoskrnl/mm/marea.c --- trunk/reactos/ntoskrnl/mm/marea.c 2005-07-06 07:54:04 UTC (rev 16446) +++ trunk/reactos/ntoskrnl/mm/marea.c 2005-07-06 08:20:26 UTC (rev 16447) @@ -469,8 +469,8 @@ ULONG_PTR Length, ULONG_PTR Granularity) { - PVOID HighestAddress = AddressSpace->LowestAddress < (PVOID)KERNEL_BASE ? - (PVOID)(KERNEL_BASE - 1) : (PVOID)MAXULONG_PTR; + PVOID HighestAddress = AddressSpace->LowestAddress < MmSystemRangeStart ? + (PVOID)((ULONG_PTR)MmSystemRangeStart - 1) : (PVOID)MAXULONG_PTR; PVOID AlignedAddress; PMEMORY_AREA Node; PMEMORY_AREA FirstNode; @@ -546,8 +546,8 @@ ULONG_PTR Length, ULONG_PTR Granularity) { - PVOID HighestAddress = AddressSpace->LowestAddress < (PVOID)KERNEL_BASE ? - (PVOID)(KERNEL_BASE - 1) : (PVOID)MAXULONG_PTR; + PVOID HighestAddress = AddressSpace->LowestAddress < MmSystemRangeStart ? + (PVOID)((ULONG_PTR)MmSystemRangeStart - 1) : (PVOID)MAXULONG_PTR; PVOID AlignedAddress; PMEMORY_AREA Node; PMEMORY_AREA PreviousNode; @@ -645,16 +645,16 @@ { PMEMORY_AREA Node = AddressSpace->MemoryAreaRoot; PMEMORY_AREA RightNeighbour = NULL; - PVOID HighestAddress = AddressSpace->LowestAddress < (PVOID)KERNEL_BASE ? - (PVOID)(KERNEL_BASE - 1) : (PVOID)MAXULONG_PTR; + PVOID HighestAddress = AddressSpace->LowestAddress < MmSystemRangeStart ? + (PVOID)((ULONG_PTR)MmSystemRangeStart - 1) : (PVOID)MAXULONG_PTR; MmVerifyMemoryAreas(AddressSpace); Address = MM_ROUND_DOWN(Address, PAGE_SIZE); - if (AddressSpace->LowestAddress < (PVOID)KERNEL_BASE) + if (AddressSpace->LowestAddress < MmSystemRangeStart) { - if (Address >= (PVOID)KERNEL_BASE) + if (Address >= MmSystemRangeStart) { return 0; } @@ -970,15 +970,15 @@ - (ULONG_PTR) MM_ROUND_DOWN(*BaseAddress, Granularity)); *BaseAddress = MM_ROUND_DOWN(*BaseAddress, Granularity); - if (AddressSpace->LowestAddress == (PVOID)KERNEL_BASE && + if (AddressSpace->LowestAddress == MmSystemRangeStart && *BaseAddress < (PVOID)KERNEL_BASE) { CHECKPOINT; return STATUS_ACCESS_VIOLATION; } - if (AddressSpace->LowestAddress < (PVOID)KERNEL_BASE && - (ULONG_PTR)(*BaseAddress) + tmpLength > KERNEL_BASE) + if (AddressSpace->LowestAddress < MmSystemRangeStart && + (ULONG_PTR)(*BaseAddress) + tmpLength > (ULONG_PTR)MmSystemRangeStart) { CHECKPOINT; return STATUS_ACCESS_VIOLATION; _____ Modified: trunk/reactos/ntoskrnl/mm/mdl.c --- trunk/reactos/ntoskrnl/mm/mdl.c 2005-07-06 07:54:04 UTC (rev 16446) +++ trunk/reactos/ntoskrnl/mm/mdl.c 2005-07-06 08:20:26 UTC (rev 16447) @@ -217,7 +217,7 @@ * so there is no need to free it */ if ((Mdl->MdlFlags & MDL_SOURCE_IS_NONPAGED_POOL) && - ((ULONG_PTR)BaseAddress >= KERNEL_BASE)) + (BaseAddress >= MmSystemRangeStart)) { return; } @@ -242,7 +242,7 @@ NULL); } - if ((ULONG_PTR)BaseAddress >= KERNEL_BASE) + if (BaseAddress >= MmSystemRangeStart) { ASSERT(Mdl->MdlFlags & MDL_MAPPED_TO_SYSTEM_VA); @@ -377,7 +377,7 @@ ASSERT(NrPages <= (Mdl->Size - sizeof(MDL))/sizeof(PFN_TYPE)); - if (Mdl->StartVa >= (PVOID)KERNEL_BASE && + if (Mdl->StartVa >= MmSystemRangeStart && MmGetPfnForProcess(NULL, Mdl->StartVa) >= MmPageArraySize) { /* phys addr is not phys memory so this must be io memory */ @@ -392,7 +392,7 @@ } - if (Mdl->StartVa >= (PVOID)KERNEL_BASE) + if (Mdl->StartVa >= MmSystemRangeStart) { /* FIXME: why isn't AccessMode used? */ Mode = KernelMode; @@ -556,7 +556,7 @@ * mdl buffer must (at least) be in kernel space, thou this doesn't * necesarely mean that the buffer in within _nonpaged_ kernel space... */ - ASSERT((ULONG_PTR)Mdl->StartVa >= KERNEL_BASE); + ASSERT(Mdl->StartVa >= MmSystemRangeStart); PageCount = PAGE_ROUND_UP(Mdl->ByteOffset + Mdl->ByteCount) / PAGE_SIZE; MdlPages = (PPFN_TYPE)(Mdl + 1); _____ Modified: trunk/reactos/ntoskrnl/mm/mm.c --- trunk/reactos/ntoskrnl/mm/mm.c 2005-07-06 07:54:04 UTC (rev 16446) +++ trunk/reactos/ntoskrnl/mm/mm.c 2005-07-06 08:20:26 UTC (rev 16447) @@ -35,7 +35,7 @@ if (ExGetPreviousMode() == UserMode) { - if ((ULONG_PTR)Dest >= KERNEL_BASE) + if (Dest >= MmSystemRangeStart) { return(STATUS_ACCESS_VIOLATION); } @@ -56,7 +56,7 @@ if (ExGetPreviousMode() == UserMode) { - if ((ULONG_PTR)Src >= KERNEL_BASE) + if (Src >= MmSystemRangeStart) { return(STATUS_ACCESS_VIOLATION); } @@ -158,7 +158,7 @@ MEMORY_AREA* MemoryArea; PMADDRESS_SPACE AddressSpace; - if ((ULONG_PTR)VirtualAddress >= KERNEL_BASE) + if (VirtualAddress >= MmSystemRangeStart) { AddressSpace = MmGetKernelAddressSpace(); } @@ -205,7 +205,7 @@ /* * Find the memory area for the faulting address */ - if (Address >= KERNEL_BASE) + if (Address >= (ULONG_PTR)MmSystemRangeStart) { /* * Check permissions @@ -325,7 +325,7 @@ * after my init patch anyways */ CPRINT("No current process\n"); - if (Address < KERNEL_BASE) + if (Address < (ULONG_PTR)MmSystemRangeStart) { return(STATUS_UNSUCCESSFUL); } @@ -334,7 +334,7 @@ /* * Find the memory area for the faulting address */ - if (Address >= KERNEL_BASE) + if (Address >= (ULONG_PTR)MmSystemRangeStart) { /* * Check permissions _____ Modified: trunk/reactos/ntoskrnl/mm/rmap.c --- trunk/reactos/ntoskrnl/mm/rmap.c 2005-07-06 07:54:04 UTC (rev 16446) +++ trunk/reactos/ntoskrnl/mm/rmap.c 2005-07-06 08:20:26 UTC (rev 16447) @@ -74,7 +74,7 @@ { KEBUGCHECK(0); } - if (Address < (PVOID)KERNEL_BASE) + if (Address < MmSystemRangeStart) { Status = ObReferenceObjectByPointer(Process, PROCESS_ALL_ACCESS, NULL, KernelMode); ExReleaseFastMutex(&RmapListLock); @@ -100,7 +100,7 @@ if (MemoryArea == NULL || MemoryArea->DeleteInProgress) { MmUnlockAddressSpace(AddressSpace); - if (Address < (PVOID)KERNEL_BASE) + if (Address < MmSystemRangeStart) { ObDereferenceObject(Process); } @@ -122,7 +122,7 @@ if (PageOp == NULL) { MmUnlockAddressSpace(AddressSpace); - if (Address < (PVOID)KERNEL_BASE) + if (Address < MmSystemRangeStart) { ObDereferenceObject(Process); } @@ -142,13 +142,13 @@ } else if ((Type == MEMORY_AREA_VIRTUAL_MEMORY) || (Type == MEMORY_AREA_PEB_OR_TEB)) { - PageOp = MmGetPageOp(MemoryArea, Address < (PVOID)KERNEL_BASE ? Process->UniqueProcessId : NULL, + PageOp = MmGetPageOp(MemoryArea, Address < MmSystemRangeStart ? Process->UniqueProcessId : NULL, Address, NULL, 0, MM_PAGEOP_PAGEOUT, TRUE); if (PageOp == NULL) { MmUnlockAddressSpace(AddressSpace); - if (Address < (PVOID)KERNEL_BASE) + if (Address < MmSystemRangeStart) { ObDereferenceObject(Process); } @@ -170,7 +170,7 @@ { KEBUGCHECK(0); } - if (Address < (PVOID)KERNEL_BASE) + if (Address < MmSystemRangeStart) { ObDereferenceObject(Process); } @@ -204,7 +204,7 @@ KEBUGCHECK(0); } - if (Address < (PVOID)KERNEL_BASE) + if (Address < MmSystemRangeStart) { Status = ObReferenceObjectByPointer(Process, PROCESS_ALL_ACCESS, NULL, KernelMode); ExReleaseFastMutex(&RmapListLock); @@ -225,7 +225,7 @@ if (MemoryArea == NULL || MemoryArea->DeleteInProgress) { MmUnlockAddressSpace(AddressSpace); - if (Address < (PVOID)KERNEL_BASE) + if (Address < MmSystemRangeStart) { ObDereferenceObject(Process); } @@ -245,7 +245,7 @@ if (PageOp == NULL) { MmUnlockAddressSpace(AddressSpace); - if (Address < (PVOID)KERNEL_BASE) + if (Address < MmSystemRangeStart) { ObDereferenceObject(Process); } @@ -265,12 +265,12 @@ } else if ((Type == MEMORY_AREA_VIRTUAL_MEMORY) || (Type == MEMORY_AREA_PEB_OR_TEB)) { - PageOp = MmGetPageOp(MemoryArea, Address < (PVOID)KERNEL_BASE ? Process->UniqueProcessId : NULL, + PageOp = MmGetPageOp(MemoryArea, Address < MmSystemRangeStart ? Process->UniqueProcessId : NULL, Address, NULL, 0, MM_PAGEOP_PAGEOUT, TRUE); if (PageOp == NULL) { MmUnlockAddressSpace(AddressSpace); - if (Address < (PVOID)KERNEL_BASE) + if (Address < MmSystemRangeStart) { ObDereferenceObject(Process); } @@ -292,7 +292,7 @@ { KEBUGCHECK(0); } - if (Address < (PVOID)KERNEL_BASE) + if (Address < MmSystemRangeStart) { ObDereferenceObject(Process); } _____ Modified: trunk/reactos/ntoskrnl/mm/virtual.c --- trunk/reactos/ntoskrnl/mm/virtual.c 2005-07-06 07:54:04 UTC (rev 16446) +++ trunk/reactos/ntoskrnl/mm/virtual.c 2005-07-06 08:20:26 UTC (rev 16447) @@ -123,7 +123,7 @@ MEMORY_AREA* MemoryArea; PMADDRESS_SPACE AddressSpace; - if (Address < (PVOID)KERNEL_BASE) + if (Address < MmSystemRangeStart) { Status = ObReferenceObjectByHandle(ProcessHandle, PROCESS_QUERY_INFORMATION, @@ -248,7 +248,7 @@ } MmUnlockAddressSpace(AddressSpace); - if (Address < (PVOID)KERNEL_BASE) + if (Address < MmSystemRangeStart) { ObDereferenceObject(Process); } @@ -286,7 +286,7 @@ PrevMode = ExGetPreviousMode(); - if (Address >= (PVOID)KERNEL_BASE) + if (Address >= MmSystemRangeStart) { DPRINT1("Invalid parameter\n"); return STATUS_INVALID_PARAMETER;

1 0

[gvg] 16446: zebasoftis <zebasoftis@gmail.com>:
by gvg＠svn.reactos.com 06 Jul '05

06 Jul '05

zebasoftis <zebasoftis(a)gmail.com>: Polish Resource File for winlogon Added: trunk/reactos/subsys/system/winlogon/Pl.rc Modified: trunk/reactos/subsys/system/winlogon/winlogon.rc _____ Added: trunk/reactos/subsys/system/winlogon/Pl.rc --- trunk/reactos/subsys/system/winlogon/Pl.rc 2005-07-06 00:29:39 UTC (rev 16445) +++ trunk/reactos/subsys/system/winlogon/Pl.rc 2005-07-06 07:54:04 UTC (rev 16446) @@ -0,0 +1,46 @@ +//Polish translation by Sebastian Gasiorek +LANGUAGE LANG_POLISH, SUBLANG_DEFAULT + +IDD_SHUTDOWNCOMPUTER DIALOG 45, 22, 164, 52 +STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Wy??czanie komputera" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Mo?na bezpiecznie wy??czyµ komputer.", IDC_SHUTDOWNCOMPUTER, 31, 13, 132, 8 + ICON IDI_WINLOGON, IDC_SHTDOWNICON, 6, 7, 18, 20 + DEFPUSHBUTTON "&Uruchom ponownie", IDC_BTNSHTDOWNCOMPUTER, 62, 32, 40, 14 +END + +IDD_GINALOADFAILED DIALOG 58, 83, 231, 119 +STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "B??d interfejsu u?ytkownika" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Nie mo?na za?adowaµ biblioteki DLL interfejsu logowania u?ytkownika %s.", IDC_GINALOADFAILED, 39, 16, 156, 24 + LTEXT "Skontaktuj siÛ z administratorem systemu, aby zamieni? bibliotekÛ DLL lub odtworzy? jej oryginaln? wersjÛ.", IDC_GINALOADFAILEDCONTACT, 39, 53, 151, 25 + DEFPUSHBUTTON "&Uruchom ponownie", 1, 80, 91, 68, 14 +END + +STRINGTABLE +BEGIN + IDS_PREPARENETWORKCONNECTIONS "Trwa przygotowywanie po??cze± sieciowych..." + IDS_APPLYINGCOMPUTERSETTINGS "Trwa wprowadzanie ustawie± komputera..." + IDS_RUNNINGSTARTUPSCRIPTS "Trwa uruchamianie skrypt¾w uruchamiania..." + IDS_RUNNINGSHUTDOWNSCRIPTS "Trwa uruchamianie skrypt¾w zamykania..." + IDS_APPLYINGYOURPERSONALSETTINGS "Trwa wprowadzanie ustawie± osobistych..." + IDS_RUNNINGLOGOFFSCRIPTS "Trwa uruchamianie skrypt¾w wylogowania..." + IDS_RUNNINGLOGONSCRIPTS "Trwa uruchamianie skrypt¾w logowania..." + IDS_LOADINGYOURPERSONALSETTINGS "Trwa ?adowanie ustawie± osobistych..." + IDS_CLOSINGNETWORKCONNECTIONS "Trwa zamykanie po??cze± sieciowych..." + IDS_REACTOSISSHUTTINGDOWN "Trwa zamykanie systemu ReactOS..." + IDS_PREPARETOSTANDBY "Trwa przygotowywanie do przej£cia w stan wstrzymania..." + IDS_PREPARETOHIBERNATE "Trwa przygotowywanie do hibernacji..." + IDS_SAVEYOURSETTINGS "Trwa zapisywanie ustawie±..." + IDS_REACTOSISSTARTINGUP "Trwa uruchamianie systemu ReactOS..." +END + +STRINGTABLE +BEGIN + IDS_FAILEDACTIVATEUSERSHELL "Winlogon nie m¾g? aktywowaµ pow?oki u?ytkownika!" +END + Property changes on: trunk/reactos/subsys/system/winlogon/Pl.rc ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native _____ Modified: trunk/reactos/subsys/system/winlogon/winlogon.rc --- trunk/reactos/subsys/system/winlogon/winlogon.rc 2005-07-06 00:29:39 UTC (rev 16445) +++ trunk/reactos/subsys/system/winlogon/winlogon.rc 2005-07-06 07:54:04 UTC (rev 16446) @@ -16,4 +16,5 @@ #include "Cz.rc" #include "De.rc" #include "Es.rc" +#include "Pl.rc" #include "Sv.rc"

1 0

[navaraf] 16445: Put the page tables and hyperspace at the right place in memory (ie. Windows compatible).
by navaraf＠svn.reactos.com 06 Jul '05

06 Jul '05

Put the page tables and hyperspace at the right place in memory (ie. Windows compatible). Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/mb.S Modified: trunk/reactos/boot/freeldr/freeldr/multiboot.c Modified: trunk/reactos/ntoskrnl/mm/i386/page.c _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/mb.S --- trunk/reactos/boot/freeldr/freeldr/arch/i386/mb.S 2005-07-06 00:24:08 UTC (rev 16444) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/mb.S 2005-07-06 00:29:39 UTC (rev 16445) @@ -72,7 +72,7 @@ .fill 2*4096, 1, 0 _hyperspace_pagetable: - .fill 4096, 1, 0 + .fill 2*4096, 1, 0 _apic_pagetable: .fill 4096, 1, 0 _____ Modified: trunk/reactos/boot/freeldr/freeldr/multiboot.c --- trunk/reactos/boot/freeldr/freeldr/multiboot.c 2005-07-06 00:24:08 UTC (rev 16444) +++ trunk/reactos/boot/freeldr/freeldr/multiboot.c 2005-07-06 00:29:39 UTC (rev 16445) @@ -36,20 +36,21 @@ #define PaToPfn(p) \ ((p) >> PFN_SHIFT) -#define STARTUP_BASE 0xF0000000 -#define HYPERSPACE_BASE 0xF0800000 +#define STARTUP_BASE 0xC0000000 +#define HYPERSPACE_BASE 0xC0400000 +#define HYPERSPACE_PAE_BASE 0xC0800000 #define APIC_BASE 0xFEC00000 #define KPCR_BASE 0xFF000000 #define LowMemPageTableIndex 0 -#define StartupPageTableIndex (STARTUP_BASE >> 20) / sizeof(HARDWARE_PTE_X86) -#define HyperspacePageTableIndex (HYPERSPACE_BASE >> 20) / sizeof(HARDWARE_PTE_X86) -#define KpcrPageTableIndex (KPCR_BASE >> 20) / sizeof(HARDWARE_PTE_X86) -#define ApicPageTableIndex (APIC_BASE >> 20) / sizeof(HARDWARE_PTE_X86) +#define StartupPageTableIndex (STARTUP_BASE >> 22) +#define HyperspacePageTableIndex (HYPERSPACE_BASE >> 22) +#define KpcrPageTableIndex (KPCR_BASE >> 22) +#define ApicPageTableIndex (APIC_BASE >> 22) #define LowMemPageTableIndexPae 0 #define StartupPageTableIndexPae (STARTUP_BASE >> 21) -#define HyperspacePageTableIndexPae (HYPERSPACE_BASE >> 21) +#define HyperspacePageTableIndexPae (HYPERSPACE_PAE_BASE >> 21) #define KpcrPageTableIndexPae (KPCR_BASE >> 21) #define ApicPageTableIndexPae (APIC_BASE >> 21) @@ -250,7 +251,7 @@ if (p[4] == ' ' || p[4] == 0) { /* Use 3GB */ - KernelBase = 0xC0000000; + KernelBase = 0xE0000000; } } @@ -447,6 +448,9 @@ PageDir->Pde[HyperspacePageTableIndex].Valid = 1; PageDir->Pde[HyperspacePageTableIndex].Write = 1; PageDir->Pde[HyperspacePageTableIndex].PageFrameNumber = PaPtrToPfn(hyperspace_pagetable); + PageDir->Pde[HyperspacePageTableIndex + 1].Valid = 1; + PageDir->Pde[HyperspacePageTableIndex + 1].Write = 1; + PageDir->Pde[HyperspacePageTableIndex + 1].PageFrameNumber = PaPtrToPfn(hyperspace_pagetable + 4096); /* Set up the Apic PDE */ PageDir->Pde[ApicPageTableIndex].Valid = 1; @@ -640,9 +644,6 @@ ShortPtr = (PUSHORT)(Address + (*TypeOffset & 0xFFF)); - /* Don't relocate after the end of the loaded driver */ - if ((ULONG_PTR)ShortPtr >= MaxAddress) break; - switch (*TypeOffset >> 12) { case IMAGE_REL_BASED_ABSOLUTE: _____ Modified: trunk/reactos/ntoskrnl/mm/i386/page.c --- trunk/reactos/ntoskrnl/mm/i386/page.c 2005-07-06 00:24:08 UTC (rev 16444) +++ trunk/reactos/ntoskrnl/mm/i386/page.c 2005-07-06 00:29:39 UTC (rev 16445) @@ -34,13 +34,13 @@ #define PA_ACCESSED (1 << PA_BIT_ACCESSED) #define PA_GLOBAL (1 << PA_BIT_GLOBAL) -#define PAGETABLE_MAP (0xf0000000) -#define PAGEDIRECTORY_MAP (0xf0000000 + (PAGETABLE_MAP / (1024))) +#define PAGETABLE_MAP (0xc0000000) +#define PAGEDIRECTORY_MAP (0xc0000000 + (PAGETABLE_MAP / (1024))) -#define PAE_PAGEDIRECTORY_MAP (0xf0000000 + (PAGETABLE_MAP / (512))) +#define PAE_PAGEDIRECTORY_MAP (0xc0000000 + (PAGETABLE_MAP / (512))) -#define HYPERSPACE (0xf0800000) -#define IS_HYPERSPACE(v) (((ULONG)(v) >= 0xF0800000 && (ULONG)(v) < 0xF0C00000)) +#define HYPERSPACE (Ke386Pae ? 0xc0800000 : 0xc0400000) +#define IS_HYPERSPACE(v) (((ULONG)(v) >= HYPERSPACE && (ULONG)(v) < 0xc0c00000)) ULONG MmGlobalKernelPageDirectory[1024]; ULONGLONG MmGlobalKernelPageDirectoryForPAE[2048]; @@ -2390,7 +2390,7 @@ MmGetKernelAddressSpace(), MEMORY_AREA_SYSTEM, &BaseAddress, - 0x400000, + Ke386Pae ? 0x400000 : 0x800000, 0, &hyperspace_desc, TRUE,

1 0

[weiden] 16444: fix gcc4 warnings and indention
by weiden＠svn.reactos.com 06 Jul '05

06 Jul '05

fix gcc4 warnings and indention Modified: trunk/reactos/lib/aclui/checklist.c _____ Modified: trunk/reactos/lib/aclui/checklist.c --- trunk/reactos/lib/aclui/checklist.c 2005-07-05 23:15:22 UTC (rev 16443) +++ trunk/reactos/lib/aclui/checklist.c 2005-07-06 00:24:08 UTC (rev 16444) @@ -47,39 +47,39 @@ typedef struct _CHECKLISTWND { - HWND hSelf; - HWND hNotify; - HFONT hFont; - - PCHECKITEM CheckItemListHead; - UINT CheckItemCount; - - INT ItemHeight; - - BOOL HasFocus; - PCHECKITEM FocusedCheckItem; - UINT FocusedCheckItemBox; - BOOL FocusedPushed; - BOOL FocusVisible; - - COLORREF TextColor[2]; - INT CheckBoxLeft[2]; - - BOOL QuickSearchEnabled; - PCHECKITEM QuickSearchHitItem; - WCHAR QuickSearchText[65]; - UINT QuickSearchSetFocusDelay; - UINT QuickSearchResetDelay; - - DWORD CaretWidth; - BOOL ShowingCaret; + HWND hSelf; + HWND hNotify; + HFONT hFont; + PCHECKITEM CheckItemListHead; + UINT CheckItemCount; + + INT ItemHeight; + + BOOL HasFocus; + PCHECKITEM FocusedCheckItem; + UINT FocusedCheckItemBox; + BOOL FocusedPushed; + BOOL FocusVisible; + + COLORREF TextColor[2]; + INT CheckBoxLeft[2]; + + BOOL QuickSearchEnabled; + PCHECKITEM QuickSearchHitItem; + WCHAR QuickSearchText[65]; + UINT QuickSearchSetFocusDelay; + UINT QuickSearchResetDelay; + + DWORD CaretWidth; + BOOL ShowingCaret; + #if SUPPORT_UXTHEME - PCHECKITEM HoveredCheckItem; - UINT HoveredCheckItemBox; - UINT HoverTime; - - HTHEME ThemeHandle; + PCHECKITEM HoveredCheckItem; + UINT HoveredCheckItemBox; + UINT HoverTime; + + HTHEME ThemeHandle; #endif } CHECKLISTWND, *PCHECKLISTWND; @@ -2024,7 +2024,7 @@ if (IsWindowEnabled(hwnd)) { PCHECKITEM NewFocus; - INT NewFocusBox = 0; + UINT NewFocusBox = 0; BOOL InCheckBox; POINT pt; BOOL ChangeFocus, Capture = FALSE; @@ -2272,7 +2272,7 @@ case VK_TAB: { - INT CheckBox; + UINT CheckBox; BOOL EnabledBox; BOOL Shift = GetKeyState(VK_SHIFT) & 0x8000;

1 0

[weiden] 16443: fix warnings with -Wsign-compare for MP builds
by weiden＠svn.reactos.com 05 Jul '05

05 Jul '05

fix warnings with -Wsign-compare for MP builds Modified: trunk/reactos/ntoskrnl/ex/power.c Modified: trunk/reactos/ntoskrnl/ke/bug.c _____ Modified: trunk/reactos/ntoskrnl/ex/power.c --- trunk/reactos/ntoskrnl/ex/power.c 2005-07-05 22:58:11 UTC (rev 16442) +++ trunk/reactos/ntoskrnl/ex/power.c 2005-07-05 23:15:22 UTC (rev 16443) @@ -63,14 +63,14 @@ HalReturnToFirmware (FIRMWARE_OFF); #else #ifdef CONFIG_SMP - ULONG i; + LONG i; KIRQL OldIrql; OldIrql = KeRaiseIrqlToDpcLevel(); /* Halt all other processors */ for (i = 0; i < KeNumberProcessors; i++) { - if (i != KeGetCurrentProcessorNumber()) + if (i != (LONG)KeGetCurrentProcessorNumber()) { PKDPC Dpc = ExAllocatePool(NonPagedPool, sizeof(KDPC)); if (Dpc == NULL) _____ Modified: trunk/reactos/ntoskrnl/ke/bug.c --- trunk/reactos/ntoskrnl/ke/bug.c 2005-07-05 22:58:11 UTC (rev 16442) +++ trunk/reactos/ntoskrnl/ke/bug.c 2005-07-05 23:15:22 UTC (rev 16443) @@ -420,11 +420,11 @@ if (!InterlockedDecrement((PLONG)&KeBugCheckCount)) { #ifdef CONFIG_SMP - ULONG i; + LONG i; /* Freeze the other CPUs */ for (i = 0; i < KeNumberProcessors; i++) { - if (i != KeGetCurrentProcessorNumber()) + if (i != (LONG)KeGetCurrentProcessorNumber()) { /* Send the IPI and give them one second to catch up */ KiIpiSendRequest(1 << i, IPI_REQUEST_FREEZE);

1 0

[weiden] 16442: fix warnings with -Wsign-compare and -Wpointer-arith
by weiden＠svn.reactos.com 05 Jul '05

05 Jul '05

fix warnings with -Wsign-compare and -Wpointer-arith Modified: trunk/reactos/hal/halx86/mp/ioapic.c Modified: trunk/reactos/hal/halx86/mp/mpconfig.c _____ Modified: trunk/reactos/hal/halx86/mp/ioapic.c --- trunk/reactos/hal/halx86/mp/ioapic.c 2005-07-05 22:35:29 UTC (rev 16441) +++ trunk/reactos/hal/halx86/mp/ioapic.c 2005-07-05 22:58:11 UTC (rev 16442) @@ -10,8 +10,8 @@ /* INCLUDES *****************************************************************/ #include <hal.h> -#define NDEBUG -#include <debug.h> +#define NDEBUG +#include <debug.h> /* GLOBALS *****************************************************************/ @@ -319,7 +319,7 @@ entry.dest.logical.logical_dest = 0; idx = IOAPICGetIrqEntry(apic,pin,INT_VECTORED); - if (idx == -1) + if (idx == (ULONG)-1) { if (first_notcon) { _____ Modified: trunk/reactos/hal/halx86/mp/mpconfig.c --- trunk/reactos/hal/halx86/mp/mpconfig.c 2005-07-05 22:35:29 UTC (rev 16441) +++ trunk/reactos/hal/halx86/mp/mpconfig.c 2005-07-05 22:58:11 UTC (rev 16442) @@ -10,8 +10,8 @@ /* INCLUDES *****************************************************************/ #include <hal.h> -#define NDEBUG -#include <debug.h> +#define NDEBUG +#include <debug.h> /* GLOBALS ******************************************************************/ @@ -302,7 +302,7 @@ DPRINT("APIC at: %08x\n", Table->LocalAPICAddress); - Entry = (PUCHAR)((PVOID)Table + sizeof(MP_CONFIGURATION_TABLE)); + Entry = (PUCHAR)((ULONG_PTR)Table + sizeof(MP_CONFIGURATION_TABLE)); Count = 0; while (Count < (Table->Length - sizeof(MP_CONFIGURATION_TABLE))) {

1 0

[weiden] 16441: fixed some signed/unsigned comparison warnings with -Wsign-compare
by weiden＠svn.reactos.com 05 Jul '05

05 Jul '05

fixed some signed/unsigned comparison warnings with -Wsign-compare Modified: trunk/reactos/apps/utils/net/arp/arp.c Modified: trunk/reactos/apps/utils/net/finger/net.c Modified: trunk/reactos/apps/utils/net/ftp/fake.c Modified: trunk/reactos/apps/utils/net/ftp/ftp.c Modified: trunk/reactos/apps/utils/net/route/route.c Modified: trunk/reactos/apps/utils/ps/ps.c Modified: trunk/reactos/apps/utils/rosperf/fill.c Modified: trunk/reactos/apps/utils/rosperf/lines.c Modified: trunk/reactos/apps/utils/rosperf/rosperf.h Modified: trunk/reactos/boot/freeldr/freeldr/fs/ext2.c Modified: trunk/reactos/boot/freeldr/freeldr/fs/fat.c Modified: trunk/reactos/boot/freeldr/freeldr/fs/fs.c Modified: trunk/reactos/boot/freeldr/freeldr/fs/iso.c Modified: trunk/reactos/boot/freeldr/freeldr/fs/ntfs.c Modified: trunk/reactos/boot/freeldr/freeldr/inffile/inffile.c Modified: trunk/reactos/boot/freeldr/freeldr/mm/meminit.c Modified: trunk/reactos/boot/freeldr/freeldr/multiboot.c Modified: trunk/reactos/boot/freeldr/freeldr/reactos/binhive.c Modified: trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c Modified: trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c Modified: trunk/reactos/boot/freeldr/freeldr/rtl/print.c Modified: trunk/reactos/boot/freeldr/freeldr/ui/tui.c Modified: trunk/reactos/drivers/dd/blue/blue.c Modified: trunk/reactos/drivers/dd/bootvid/bootvid.c Modified: trunk/reactos/drivers/dd/parallel/parallel.c Modified: trunk/reactos/drivers/fs/ntfs/attrib.c Modified: trunk/reactos/drivers/fs/ntfs/mft.c Modified: trunk/reactos/drivers/fs/vfat/rw.c Modified: trunk/reactos/drivers/net/afd/afd/select.c Modified: trunk/reactos/drivers/net/ndis/ndis/buffer.c Modified: trunk/reactos/drivers/net/ndis/ndis/miniport.c Modified: trunk/reactos/drivers/net/npf/read.c Modified: trunk/reactos/drivers/net/npf/win_bpf_filter.c Modified: trunk/reactos/drivers/storage/disk/disk.c Modified: trunk/reactos/drivers/usb/cromwell/linux/usb.h Modified: trunk/reactos/drivers/video/displays/vga/objects/bitblt.c Modified: trunk/reactos/drivers/video/displays/vga/objects/lineto.c Modified: trunk/reactos/drivers/video/displays/vga/objects/paint.c Modified: trunk/reactos/drivers/video/displays/vga/objects/pointer.c Modified: trunk/reactos/drivers/video/displays/vga/vgavideo/vgavideo.c Modified: trunk/reactos/drivers/video/miniport/vga/initvga.c Modified: trunk/reactos/include/ndk/ketypes.h Modified: trunk/reactos/include/reactos/exeformat.h Modified: trunk/reactos/lib/aclui/checklist.c Modified: trunk/reactos/lib/adns/src/check.c Modified: trunk/reactos/lib/adns/src/query.c Modified: trunk/reactos/lib/adns/src/reply.c Modified: trunk/reactos/lib/adns/src/setup.c Modified: trunk/reactos/lib/adns/src/types.c Modified: trunk/reactos/lib/advapi32/crypt/crypt.c Modified: trunk/reactos/lib/advpack/advpack.c Modified: trunk/reactos/lib/cpl/desk/settings.c Modified: trunk/reactos/lib/cpl/intl/locale.c Modified: trunk/reactos/lib/cpl/intl/time.c Modified: trunk/reactos/lib/crt/direct/getcwd.c Modified: trunk/reactos/lib/crt/io/access.c Modified: trunk/reactos/lib/crt/io/chmod.c Modified: trunk/reactos/lib/crt/process/process.c Modified: trunk/reactos/lib/crt/search/lfind.c Modified: trunk/reactos/lib/crt/signal/signal.c Modified: trunk/reactos/lib/crt/stdio/fread.c Modified: trunk/reactos/lib/crt/stdio/fwrite.c Modified: trunk/reactos/lib/crt/stdlib/fcvtbuf.c Modified: trunk/reactos/lib/crt/stdlib/getenv.c Modified: trunk/reactos/lib/crt/string/strset.c Modified: trunk/reactos/lib/crt/time/ctime.c Modified: trunk/reactos/lib/crt/time/strftime.c Modified: trunk/reactos/lib/crt/wine/cppexcept.c Modified: trunk/reactos/lib/crt/wstring/wcsset.c Modified: trunk/reactos/lib/dnsapi/dnsapi/query.c Modified: trunk/reactos/lib/fslib/vfatlib/fat16.c Modified: trunk/reactos/lib/fslib/vfatlib/fat32.c Modified: trunk/reactos/lib/fslib/vfatlib/vfatlib.c Modified: trunk/reactos/lib/gdi32/misc/misc.c Modified: trunk/reactos/lib/gdi32/objects/dc.c Modified: trunk/reactos/lib/gdi32/objects/font.c Modified: trunk/reactos/lib/kernel32/file/bintype.c Modified: trunk/reactos/lib/kernel32/file/file.c Modified: trunk/reactos/lib/kernel32/misc/console.c Modified: trunk/reactos/lib/kernel32/misc/errormsg.c Modified: trunk/reactos/lib/kernel32/misc/lang.c Modified: trunk/reactos/lib/kernel32/misc/lzexpand_main.c Modified: trunk/reactos/lib/kernel32/misc/nls.c Modified: trunk/reactos/lib/kernel32/misc/profile.c Modified: trunk/reactos/lib/kernel32/misc/time.c Modified: trunk/reactos/lib/kernel32/process/create.c Modified: trunk/reactos/lib/ntdll/stdlib/lfind.c Modified: trunk/reactos/lib/rossym/frommem.c Modified: trunk/reactos/lib/rtl/i386/exception.c Modified: trunk/reactos/lib/rtl/unicode.c Modified: trunk/reactos/lib/syssetup/wizard.c Modified: trunk/reactos/lib/ws2_32/misc/dllmain.c Modified: trunk/reactos/lib/ws2_32/misc/ns.c Modified: trunk/reactos/ntoskrnl/ex/list.c Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c Modified: trunk/reactos/ntoskrnl/ex/uuid.c Modified: trunk/reactos/ntoskrnl/io/file.c Modified: trunk/reactos/ntoskrnl/io/iomgr.c Modified: trunk/reactos/ntoskrnl/io/irq.c Modified: trunk/reactos/ntoskrnl/io/pnpdma.c [truncated at 100 lines; 41 more skipped] _____ Modified: trunk/reactos/apps/utils/net/arp/arp.c --- trunk/reactos/apps/utils/net/arp/arp.c 2005-07-05 22:14:07 UTC (rev 16440) +++ trunk/reactos/apps/utils/net/arp/arp.c 2005-07-05 22:35:29 UTC (rev 16441) @@ -53,7 +53,8 @@ /* FIXME: allow user to specify an interface address, via pszIfAddr */ INT DisplayArpEntries(PTCHAR pszInetAddr, PTCHAR pszIfAddr) { - INT i, k, iRet; + INT iRet; + UINT i, k; PMIB_IPNETTABLE pIpNetTable; PMIB_IPADDRTABLE pIpAddrTable; ULONG ulSize = 0; _____ Modified: trunk/reactos/apps/utils/net/finger/net.c --- trunk/reactos/apps/utils/net/finger/net.c 2005-07-05 22:14:07 UTC (rev 16440) +++ trunk/reactos/apps/utils/net/finger/net.c 2005-07-05 22:35:29 UTC (rev 16441) @@ -59,7 +59,7 @@ return; *host++ = '\0'; - if (isdigit(*host) && (defaddr.s_addr = inet_addr(host)) != -1) { + if (isdigit(*host) && (defaddr.s_addr = inet_addr(host)) != (unsigned long)-1) { def.h_name = host; def.h_addr_list = alist; def.h_addr = (char *)&defaddr; _____ Modified: trunk/reactos/apps/utils/net/ftp/fake.c --- trunk/reactos/apps/utils/net/ftp/fake.c 2005-07-05 22:14:07 UTC (rev 16440) +++ trunk/reactos/apps/utils/net/ftp/fake.c 2005-07-05 22:35:29 UTC (rev 16441) @@ -100,7 +100,7 @@ index = 0; total = recv(s, buffer, sizeof(buffer), 0); - if (total == INVALID_SOCKET) + if (total == SOCKET_ERROR) { total = 0; return ERROR; _____ Modified: trunk/reactos/apps/utils/net/ftp/ftp.c --- trunk/reactos/apps/utils/net/ftp/ftp.c 2005-07-05 22:14:07 UTC (rev 16440) +++ trunk/reactos/apps/utils/net/ftp/ftp.c 2005-07-05 22:35:29 UTC (rev 16441) @@ -119,7 +119,7 @@ bzero((char *)&hisctladdr, sizeof (hisctladdr)); hisctladdr.sin_addr.s_addr = inet_addr(host); - if (hisctladdr.sin_addr.s_addr != -1) { + if (hisctladdr.sin_addr.s_addr != (unsigned long)-1) { hisctladdr.sin_family = AF_INET; (void) strncpy(hostnamebuf, host, sizeof(hostnamebuf)); } else { _____ Modified: trunk/reactos/apps/utils/net/route/route.c --- trunk/reactos/apps/utils/net/route/route.c 2005-07-05 22:14:07 UTC (rev 16440) +++ trunk/reactos/apps/utils/net/route/route.c 2005-07-05 22:35:29 UTC (rev 16441) @@ -36,7 +36,7 @@ DWORD Error; ULONG Size = 0; char Destination[IPBUF], Gateway[IPBUF], Netmask[IPBUF]; - int i; + unsigned int i; if( (Error = GetIpForwardTable( NULL, &Size, TRUE )) == ERROR_INSUFFICIENT_BUFFER ) { _____ Modified: trunk/reactos/apps/utils/ps/ps.c --- trunk/reactos/apps/utils/ps/ps.c 2005-07-05 22:14:07 UTC (rev 16440) +++ trunk/reactos/apps/utils/ps/ps.c 2005-07-05 22:35:29 UTC (rev 16441) @@ -213,7 +213,7 @@ unsigned char minute, minute1, tmin, tmin1; unsigned char seconds, seconds1, tsec, tsec1; - int ti; + unsigned int ti; LARGE_INTEGER ptime; ptime.QuadPart = CurrentProcess->KernelTime.QuadPart; _____ Modified: trunk/reactos/apps/utils/rosperf/fill.c --- trunk/reactos/apps/utils/rosperf/fill.c 2005-07-05 22:14:07 UTC (rev 16440) +++ trunk/reactos/apps/utils/rosperf/fill.c 2005-07-05 22:35:29 UTC (rev 16441) @@ -36,7 +36,7 @@ { #define SMALL_SIZE 16 unsigned Rep; - unsigned x, y; + int x, y; x = 0; y = 0; _____ Modified: trunk/reactos/apps/utils/rosperf/lines.c --- trunk/reactos/apps/utils/rosperf/lines.c 2005-07-05 22:14:07 UTC (rev 16440) +++ trunk/reactos/apps/utils/rosperf/lines.c 2005-07-05 22:35:29 UTC (rev 16441) @@ -60,7 +60,7 @@ LinesHorizontalProc(void *Context, PPERF_INFO PerfInfo, unsigned Reps) { unsigned Rep; - unsigned y; + int y; HDC Dc; for (Rep = 0; Rep < Reps; ) @@ -79,7 +79,7 @@ LinesVerticalProc(void *Context, PPERF_INFO PerfInfo, unsigned Reps) { unsigned Rep; - unsigned x; + int x; HDC Dc; for (Rep = 0; Rep < Reps; ) _____ Modified: trunk/reactos/apps/utils/rosperf/rosperf.h --- trunk/reactos/apps/utils/rosperf/rosperf.h 2005-07-05 22:14:07 UTC (rev 16440) +++ trunk/reactos/apps/utils/rosperf/rosperf.h 2005-07-05 22:35:29 UTC (rev 16441) @@ -28,8 +28,8 @@ COLORREF BackgroundColor; HDC ForegroundDc; HDC BackgroundDc; - ULONG WndWidth; - ULONG WndHeight; + INT WndWidth; + INT WndHeight; } PERF_INFO, *PPERF_INFO; typedef unsigned (*INITTESTPROC)(void **Context, PPERF_INFO PerfInfo, unsigned Reps); _____ Modified: trunk/reactos/boot/freeldr/freeldr/fs/ext2.c --- trunk/reactos/boot/freeldr/freeldr/fs/ext2.c 2005-07-05 22:14:07 UTC (rev 16440) +++ trunk/reactos/boot/freeldr/freeldr/fs/ext2.c 2005-07-05 22:35:29 UTC (rev 16441) @@ -192,7 +192,7 @@ */ BOOL Ext2LookupFile(PCHAR FileName, PEXT2_FILE_INFO Ext2FileInfoPointer) { - int i; + UINT i; ULONG NumberOfPathParts; CHAR PathPart[261]; PVOID DirectoryBuffer; _____ Modified: trunk/reactos/boot/freeldr/freeldr/fs/fat.c --- trunk/reactos/boot/freeldr/freeldr/fs/fat.c 2005-07-05 22:14:07 UTC (rev 16440) +++ trunk/reactos/boot/freeldr/freeldr/fs/fat.c 2005-07-05 22:35:29 UTC (rev 16441) @@ -689,7 +689,7 @@ */ BOOL FatLookupFile(PCHAR FileName, PFAT_FILE_INFO FatFileInfoPointer) { - int i; + UINT i; ULONG NumberOfPathParts; CHAR PathPart[261]; PVOID DirectoryBuffer; @@ -827,9 +827,9 @@ BOOL FatGetFatEntry(ULONG Cluster, ULONG* ClusterPointer) { ULONG fat = 0; - int FatOffset; - int ThisFatSecNum; - int ThisFatEntOffset; + UINT FatOffset; + UINT ThisFatSecNum; + UINT ThisFatEntOffset; DbgPrint((DPRINT_FILESYSTEM, "FatGetFatEntry() Retrieving FAT entry for cluster %d.\n", Cluster)); _____ Modified: trunk/reactos/boot/freeldr/freeldr/fs/fs.c --- trunk/reactos/boot/freeldr/freeldr/fs/fs.c 2005-07-05 22:14:07 UTC (rev 16440) +++ trunk/reactos/boot/freeldr/freeldr/fs/fs.c 2005-07-05 22:35:29 UTC (rev 16441) @@ -339,10 +339,10 @@ */ ULONG FsGetNumPathParts(PCHAR Path) { - ULONG i; + size_t i; ULONG num; - for (i=0,num=0; i<(int)strlen(Path); i++) + for (i=0,num=0; i<strlen(Path); i++) { if ((Path[i] == '\\') || (Path[i] == '/')) { @@ -364,12 +364,12 @@ */ VOID FsGetFirstNameFromPath(PCHAR Buffer, PCHAR Path) { - ULONG i; + size_t i; // Copy all the characters up to the end of the // string or until we hit a '\' character // and put them in Buffer - for (i=0; i<(int)strlen(Path); i++) + for (i=0; i<strlen(Path); i++) { if ((Path[i] == '\\') || (Path[i] == '/')) { _____ Modified: trunk/reactos/boot/freeldr/freeldr/fs/iso.c --- trunk/reactos/boot/freeldr/freeldr/fs/iso.c 2005-07-05 22:14:07 UTC (rev 16440) +++ trunk/reactos/boot/freeldr/freeldr/fs/iso.c 2005-07-05 22:35:29 UTC (rev 16441) @@ -182,7 +182,7 @@ */ static BOOL IsoLookupFile(PCHAR FileName, PISO_FILE_INFO IsoFileInfoPointer) { - int i; + UINT i; ULONG NumberOfPathParts; CHAR PathPart[261]; PVOID DirectoryBuffer; _____ Modified: trunk/reactos/boot/freeldr/freeldr/fs/ntfs.c --- trunk/reactos/boot/freeldr/freeldr/fs/ntfs.c 2005-07-05 22:14:07 UTC (rev 16440) +++ trunk/reactos/boot/freeldr/freeldr/fs/ntfs.c 2005-07-05 22:35:29 UTC (rev 16441) @@ -168,7 +168,7 @@ } /* II. Read all complete 64-sector blocks. */ - while (Length >= 64 * NtfsBootSector->BytesPerSector) + while (Length >= (ULONGLONG)64 * (ULONGLONG)NtfsBootSector->BytesPerSector) { if (!MachDiskReadLogicalSectors(NtfsDriveNumber, NtfsSectorOfClusterZero + (Offset / NtfsBootSector->BytesPerSector), 64, (PCHAR)DISKREADBUFFER)) return FALSE; _____ Modified: trunk/reactos/boot/freeldr/freeldr/inffile/inffile.c --- trunk/reactos/boot/freeldr/freeldr/inffile/inffile.c 2005-07-05 22:14:07 UTC (rev 16440) +++ trunk/reactos/boot/freeldr/freeldr/inffile/inffile.c 2005-07-05 22:35:29 UTC (rev 16441) @@ -56,7 +56,7 @@ struct _INFCACHELINE *Next; struct _INFCACHELINE *Prev; - LONG FieldCount; + ULONG FieldCount; PCHAR Key; @@ -437,7 +437,7 @@ /* push data from current token start up to pos into the current token */ static int push_token( struct parser *parser, const CHAR *pos ) { - int len = pos - parser->start; + unsigned int len = pos - parser->start; const CHAR *src = parser->start; CHAR *dst = parser->token + parser->token_len; _____ Modified: trunk/reactos/boot/freeldr/freeldr/mm/meminit.c --- trunk/reactos/boot/freeldr/freeldr/mm/meminit.c 2005-07-05 22:14:07 UTC (rev 16440) +++ trunk/reactos/boot/freeldr/freeldr/mm/meminit.c 2005-07-05 22:35:29 UTC (rev 16441) @@ -384,8 +384,8 @@ VOID MmFixupSystemMemoryMap(PBIOS_MEMORY_MAP BiosMemoryMap, ULONG* MapCount) { - int Index; - int Index2; + UINT Index; + UINT Index2; // Loop through each entry in the array for (Index=0; Index<*MapCount; Index++) _____ Modified: trunk/reactos/boot/freeldr/freeldr/multiboot.c --- trunk/reactos/boot/freeldr/freeldr/multiboot.c 2005-07-05 22:14:07 UTC (rev 16440) +++ trunk/reactos/boot/freeldr/freeldr/multiboot.c 2005-07-05 22:35:29 UTC (rev 16441) @@ -528,7 +528,7 @@ ULONG_PTR SourceSection; ULONG_PTR TargetSection; ULONG SectionSize; - LONG i; + INT i; PIMAGE_DATA_DIRECTORY RelocationDDir; PIMAGE_BASE_RELOCATION RelocationDir, RelocationEnd; ULONG Count; @@ -588,7 +588,7 @@ Section += SectionCount; /* Walk each section backwards */ - for (i=SectionCount; i >= 0; i--, Section--) { + for (i=(INT)SectionCount; i >= 0; i--, Section--) { /* Get the disk location and the memory location, and the size */ SourceSection = RaToPa(Section->PointerToRawData); @@ -636,7 +636,7 @@ /* Calculate the Offset of the Type */ TypeOffset = (PUSHORT)(RelocationDir + 1); - for (i = 0; i < Count; i++) { + for (i = 0; i < (INT)Count; i++) { ShortPtr = (PUSHORT)(Address + (*TypeOffset & 0xFFF)); @@ -765,7 +765,7 @@ if (ModuleData) { /* Make sure this is the right module and that it hasn't been closed */ - if ((ModuleBase == ModuleData->ModuleStart) && (ModuleData->ModuleEnd == -1)) { + if ((ModuleBase == ModuleData->ModuleStart) && (ModuleData->ModuleEnd == (ULONG_PTR)-1)) { /* Close the Module */ ModuleData->ModuleEnd = ModuleData->ModuleStart + ModuleSize; _____ Modified: trunk/reactos/boot/freeldr/freeldr/reactos/binhive.c --- trunk/reactos/boot/freeldr/freeldr/reactos/binhive.c 2005-07-05 22:14:07 UTC (rev 16440) +++ trunk/reactos/boot/freeldr/freeldr/reactos/binhive.c 2005-07-05 22:35:29 UTC (rev 16441) @@ -1360,10 +1360,10 @@ PWCHAR wName; PCHAR cName; LONG Error; - LONG DataSize; + ULONG DataSize; PCHAR cBuffer; PWCHAR wBuffer; - LONG i; + ULONG i; if (ValueCell->CellSize >= 0 || ValueCell->Id != REG_VALUE_CELL_ID) { _____ Modified: trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c --- trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c 2005-07-05 22:14:07 UTC (rev 16440) +++ trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c 2005-07-05 22:35:29 UTC (rev 16441) @@ -558,7 +558,7 @@ CHAR szHalName[1024]; CHAR szFileName[1024]; CHAR szBootPath[256]; - INT i; + UINT i; CHAR MsgBuffer[256]; ULONG SectionId; _____ Modified: trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c --- trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c 2005-07-05 22:14:07 UTC (rev 16440) +++ trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c 2005-07-05 22:35:29 UTC (rev 16441) @@ -240,7 +240,7 @@ ULONG Size; char *SourcePath; char *LoadOptions; - int i; + UINT i; HINF InfHandle; ULONG ErrorLine; _____ Modified: trunk/reactos/boot/freeldr/freeldr/rtl/print.c --- trunk/reactos/boot/freeldr/freeldr/rtl/print.c 2005-07-05 22:14:07 UTC (rev 16440) +++ trunk/reactos/boot/freeldr/freeldr/rtl/print.c 2005-07-05 22:35:29 UTC (rev 16441) @@ -27,7 +27,7 @@ */ void print(char *str) { - int i; + size_t i; for (i = 0; i < strlen(str); i++) MachConsPutChar(str[i]); _____ Modified: trunk/reactos/boot/freeldr/freeldr/ui/tui.c --- trunk/reactos/boot/freeldr/freeldr/ui/tui.c 2005-07-05 22:14:07 UTC (rev 16440) +++ trunk/reactos/boot/freeldr/freeldr/ui/tui.c 2005-07-05 22:35:29 UTC (rev 16441) @@ -517,9 +517,10 @@ VOID TuiMessageBoxCritical(PCHAR MessageText) { int width = 8; - int height = 1; + unsigned int height = 1; int curline = 0; - int i , j, k; + int k; + size_t i , j; int x1, x2, y1, y2; char temp[260]; char key; @@ -768,16 +769,17 @@ BOOL TuiEditBox(PCHAR MessageText, PCHAR EditTextBuffer, ULONG Length) { int width = 8; - int height = 1; + unsigned int height = 1; int curline = 0; - int i , j, k; + int k; + size_t i , j; int x1, x2, y1, y2; char temp[260]; char key; int EditBoxLine; - int EditBoxStartX, EditBoxEndX; + ULONG EditBoxStartX, EditBoxEndX; int EditBoxCursorX; - int EditBoxTextCount; + unsigned int EditBoxTextCount; int EditBoxTextDisplayIndex; BOOL ReturnCode; PVOID ScreenBuffer; _____ Modified: trunk/reactos/drivers/dd/blue/blue.c --- trunk/reactos/drivers/dd/blue/blue.c 2005-07-05 22:14:07 UTC (rev 16440) +++ trunk/reactos/drivers/dd/blue/blue.c 2005-07-05 22:35:29 UTC (rev 16441) @@ -165,7 +165,8 @@ NTSTATUS Status; char *pch = Irp->UserBuffer; PBYTE vidmem; - int i, j, offset; + unsigned int i; + int j, offset; int cursorx, cursory; int rows, columns; int processed = DeviceExtension->Mode & ENABLE_PROCESSED_OUTPUT; _____ Modified: trunk/reactos/drivers/dd/bootvid/bootvid.c --- trunk/reactos/drivers/dd/bootvid/bootvid.c 2005-07-05 22:14:07 UTC (rev 16440) +++ trunk/reactos/drivers/dd/bootvid/bootvid.c 2005-07-05 22:35:29 UTC (rev 16441) @@ -158,7 +158,7 @@ STATIC VOID FASTCALL vgaSetRegisters(PVGA_REGISTERS Registers) { - int i; + UINT i; /* Update misc output register */ WRITE_PORT_UCHAR(MISC, Registers->Misc); _____ Modified: trunk/reactos/drivers/dd/parallel/parallel.c --- trunk/reactos/drivers/dd/parallel/parallel.c 2005-07-05 22:14:07 UTC (rev 16440) +++ trunk/reactos/drivers/dd/parallel/parallel.c 2005-07-05 22:35:29 UTC (rev 16441) @@ -80,7 +80,7 @@ { PIO_STACK_LOCATION Stack = IoGetCurrentIrpStackLocation(Irp); NTSTATUS status; - int i; + UINT i; switch (Stack->MajorFunction) { _____ Modified: trunk/reactos/drivers/fs/ntfs/attrib.c --- trunk/reactos/drivers/fs/ntfs/attrib.c 2005-07-05 22:14:07 UTC (rev 16440) +++ trunk/reactos/drivers/fs/ntfs/attrib.c 2005-07-05 22:35:29 UTC (rev 16441) @@ -280,7 +280,7 @@ Attribute = (PATTRIBUTE)((ULONG_PTR)FileRecord + FileRecord->AttributeOffset); while (Attribute < (PATTRIBUTE)((ULONG_PTR)FileRecord + FileRecord->BytesInUse) && - Attribute->AttributeType != -1) + Attribute->AttributeType != (ATTRIBUTE_TYPE)-1) { NtfsDumpAttribute (Attribute); _____ Modified: trunk/reactos/drivers/fs/ntfs/mft.c --- trunk/reactos/drivers/fs/ntfs/mft.c 2005-07-05 22:14:07 UTC (rev 16440) +++ trunk/reactos/drivers/fs/ntfs/mft.c 2005-07-05 22:35:29 UTC (rev 16441) @@ -128,7 +128,7 @@ Attribute = (PATTRIBUTE)((ULONG_PTR)FileRecord + FileRecord->AttributeOffset); while (Attribute < (PATTRIBUTE)((ULONG_PTR)FileRecord + FileRecord->BytesInUse) && - Attribute->AttributeType != -1) + Attribute->AttributeType != (ATTRIBUTE_TYPE)-1) { if (Attribute->AttributeType == Type) { _____ Modified: trunk/reactos/drivers/fs/vfat/rw.c --- trunk/reactos/drivers/fs/vfat/rw.c 2005-07-05 22:14:07 UTC (rev 16440) +++ trunk/reactos/drivers/fs/vfat/rw.c 2005-07-05 22:35:29 UTC (rev 16441) @@ -831,7 +831,7 @@ ByteOffset = IrpContext->Stack->Parameters.Write.ByteOffset; if (ByteOffset.u.LowPart == FILE_WRITE_TO_END_OF_FILE && - ByteOffset.u.HighPart == 0xffffffff) + ByteOffset.u.HighPart == -1) { ByteOffset.QuadPart = Fcb->RFCB.FileSize.QuadPart; } _____ Modified: trunk/reactos/drivers/net/afd/afd/select.c --- trunk/reactos/drivers/net/afd/afd/select.c 2005-07-05 22:14:07 UTC (rev 16440) +++ trunk/reactos/drivers/net/afd/afd/select.c 2005-07-05 22:35:29 UTC (rev 16441) @@ -62,7 +62,7 @@ VOID SignalSocket( PAFD_ACTIVE_POLL Poll, PAFD_POLL_INFO PollReq, NTSTATUS Status ) { - int i; + UINT i; PIRP Irp = Poll->Irp; AFD_DbgPrint(MID_TRACE,("Called (Status %x)\n", Status)); KeCancelTimer( &Poll->Timer ); @@ -121,7 +121,7 @@ PIRP Irp; PAFD_POLL_INFO PollReq; PAFD_HANDLE HandleArray; - int i; + UINT i; AFD_DbgPrint(MID_TRACE,("Killing selects that refer to %x\n", FileObject)); _____ Modified: trunk/reactos/drivers/net/ndis/ndis/buffer.c --- trunk/reactos/drivers/net/ndis/ndis/buffer.c 2005-07-05 22:14:07 UTC (rev 16440) +++ trunk/reactos/drivers/net/ndis/ndis/buffer.c 2005-07-05 22:35:29 UTC (rev 16441) @@ -34,7 +34,7 @@ for (;;) { if (!Buffer) - return -1; + return 0xFFFFFFFF; NdisQueryBuffer(Buffer, (PVOID)Data, Size); @@ -77,7 +77,7 @@ NDIS_DbgPrint(MAX_TRACE, ("DstBuffer (0x%X) DstOffset (0x%X) SrcData (0x%X) Length (%d)\n", DstBuffer, DstOffset, SrcData, Length)); /* Skip DstOffset bytes in the destination buffer chain */ - if (SkipToOffset(DstBuffer, DstOffset, &DstData, &DstSize) == -1) + if (SkipToOffset(DstBuffer, DstOffset, &DstData, &DstSize) == 0xFFFFFFFF) return 0; /* Start copying the data */ @@ -134,7 +134,7 @@ NDIS_DbgPrint(MAX_TRACE, ("DstData 0x%X SrcBuffer 0x%X SrcOffset 0x%X Length %d\n",DstData,SrcBuffer, SrcOffset, Length)); /* Skip SrcOffset bytes in the source buffer chain */ - if (SkipToOffset(SrcBuffer, SrcOffset, &SrcData, &SrcSize) == -1) + if (SkipToOffset(SrcBuffer, SrcOffset, &SrcData, &SrcSize) == 0xFFFFFFFF) return 0; /* Start copying the data */ @@ -234,11 +234,11 @@ /* Skip DstOffset bytes in the destination buffer chain */ NdisQueryBuffer(DstBuffer, (PVOID)&DstData, &DstSize); - if (SkipToOffset(DstBuffer, DstOffset, &DstData, &DstSize) == -1) + if (SkipToOffset(DstBuffer, DstOffset, &DstData, &DstSize) == 0xFFFFFFFF) return 0; /* Skip SrcOffset bytes in the source packet */ NdisGetFirstBufferFromPacket(SrcPacket, &SrcBuffer, (PVOID)&SrcData, &SrcSize, &Total); - if (SkipToOffset(SrcBuffer, SrcOffset, &SrcData, &SrcSize) == -1) + if (SkipToOffset(SrcBuffer, SrcOffset, &SrcData, &SrcSize) == 0xFFFFFFFF) return 0; /* Copy the data */ for (Total = 0;;) { @@ -669,12 +669,12 @@ /* Skip DestinationOffset bytes in the destination packet */ NdisGetFirstBufferFromPacket(Destination, &DstBuffer, (PVOID)&DstData, &DstSize, &Total); - if (SkipToOffset(DstBuffer, DestinationOffset, &DstData, &DstSize) == -1) + if (SkipToOffset(DstBuffer, DestinationOffset, &DstData, &DstSize) == 0xFFFFFFFF) return; /* Skip SourceOffset bytes in the source packet */ NdisGetFirstBufferFromPacket(Source, &SrcBuffer, (PVOID)&SrcData, &SrcSize, &Total); - if (SkipToOffset(SrcBuffer, SourceOffset, &SrcData, &SrcSize) == -1) + if (SkipToOffset(SrcBuffer, SourceOffset, &SrcData, &SrcSize) == 0xFFFFFFFF) return; /* Copy the data */ _____ Modified: trunk/reactos/drivers/net/ndis/ndis/miniport.c --- trunk/reactos/drivers/net/ndis/ndis/miniport.c 2005-07-05 22:14:07 UTC (rev 16440) +++ trunk/reactos/drivers/net/ndis/ndis/miniport.c 2005-07-05 22:35:29 UTC (rev 16441) @@ -1395,7 +1395,7 @@ Status = IoGetDeviceProperty(Adapter->NdisMiniportBlock.PhysicalDeviceObject, DevicePropertyLegacyBusType, Size, &Adapter->NdisMiniportBlock.BusType, &Size); - if (!NT_SUCCESS(Status) || Adapter->NdisMiniportBlock.BusType == -1) + if (!NT_SUCCESS(Status) || Adapter->NdisMiniportBlock.BusType == (NDIS_INTERFACE_TYPE)-1) { NdisInitUnicodeString(&ParamName, L"BusType"); NdisReadConfiguration(&NdisStatus, &ConfigParam, ConfigHandle, @@ -1409,7 +1409,7 @@ Status = IoGetDeviceProperty(Adapter->NdisMiniportBlock.PhysicalDeviceObject, DevicePropertyBusNumber, Size, &Adapter->NdisMiniportBlock.BusNumber, &Size); - if (!NT_SUCCESS(Status) || Adapter->NdisMiniportBlock.BusNumber == -1) + if (!NT_SUCCESS(Status) || Adapter->NdisMiniportBlock.BusNumber == (NDIS_INTERFACE_TYPE)-1) { NdisInitUnicodeString(&ParamName, L"BusNumber"); NdisReadConfiguration(&NdisStatus, &ConfigParam, ConfigHandle, @@ -1424,7 +1424,7 @@ Status = IoGetDeviceProperty(Adapter->NdisMiniportBlock.PhysicalDeviceObject, DevicePropertyAddress, Size, &Adapter->NdisMiniportBlock.SlotNumber, &Size); - if (!NT_SUCCESS(Status) || Adapter->NdisMiniportBlock.SlotNumber == -1) + if (!NT_SUCCESS(Status) || Adapter->NdisMiniportBlock.SlotNumber == (NDIS_INTERFACE_TYPE)-1) { NdisInitUnicodeString(&ParamName, L"SlotNumber"); NdisReadConfiguration(&NdisStatus, &ConfigParam, ConfigHandle, _____ Modified: trunk/reactos/drivers/net/npf/read.c --- trunk/reactos/drivers/net/npf/read.c 2005-07-05 22:14:07 UTC (rev 16440) +++ trunk/reactos/drivers/net/npf/read.c 2005-07-05 22:35:29 UTC (rev 16441) @@ -437,7 +437,7 @@ return NDIS_STATUS_NOT_ACCEPTED; //if the filter returns -1 the whole packet must be accepted - if(fres==-1 || fres > PacketSize+HeaderBufferSize)fres=PacketSize+HeaderBufferSize; + if(fres==(UINT)-1 || fres > PacketSize+HeaderBufferSize)fres=PacketSize+HeaderBufferSize; if(Open->mode & MODE_STAT){ // we are in statistics mode _____ Modified: trunk/reactos/drivers/net/npf/win_bpf_filter.c --- trunk/reactos/drivers/net/npf/win_bpf_filter.c 2005-07-05 22:14:07 UTC (rev 16440) +++ trunk/reactos/drivers/net/npf/win_bpf_filter.c 2005-07-05 22:35:29 UTC (rev 16441) @@ -906,7 +906,7 @@ IF_LOUD(DbgPrint("Validating program");) flag=0; - for(j=0;j<VALID_INSTRUCTIONS_LEN;j++) + for(j=0;j<(int32)VALID_INSTRUCTIONS_LEN;j++) if (p->code==valid_instructions[j]) flag=1; if (flag==0) _____ Modified: trunk/reactos/drivers/storage/disk/disk.c --- trunk/reactos/drivers/storage/disk/disk.c 2005-07-05 22:14:07 UTC (rev 16440) +++ trunk/reactos/drivers/storage/disk/disk.c 2005-07-05 22:35:29 UTC (rev 16441) @@ -384,7 +384,7 @@ PDEVICE_EXTENSION DeviceExtension; PDISK_DATA DiskData; PIO_STACK_LOCATION IrpStack; - ULARGE_INTEGER EndingOffset; + LARGE_INTEGER EndingOffset; DPRINT("DiskClassCheckReadWrite() called\n"); _____ Modified: trunk/reactos/drivers/usb/cromwell/linux/usb.h --- trunk/reactos/drivers/usb/cromwell/linux/usb.h 2005-07-05 22:14:07 UTC (rev 16440) +++ trunk/reactos/drivers/usb/cromwell/linux/usb.h 2005-07-05 22:35:29 UTC (rev 16441) @@ -327,7 +327,7 @@ { int actual; actual = snprintf (buf, size, "usb-%s-%s", dev->bus->bus_name, dev->devpath); - return (actual >= size) ? -1 : actual; + return (actual >= (int)size) ? -1 : actual; } /*---------------------------------------------------------------------- ---*/ _____ Modified: trunk/reactos/drivers/video/displays/vga/objects/bitblt.c --- trunk/reactos/drivers/video/displays/vga/objects/bitblt.c 2005-07-05 22:14:07 UTC (rev 16440) +++ trunk/reactos/drivers/video/displays/vga/objects/bitblt.c 2005-07-05 22:35:29 UTC (rev 16441) @@ -174,11 +174,11 @@ BRUSHOBJ* Brush, POINTL* BrushPoint, ROP4 Rop4) { UCHAR SolidColor = 0; - ULONG Left; - ULONG Length; + LONG Left; + LONG Length; PUCHAR Video; UCHAR Mask; - ULONG i, j; + INT i, j; ULONG RasterOp = VGA_NORMAL; /* Punt brush blts to non-device surfaces. */ _____ Modified: trunk/reactos/drivers/video/displays/vga/objects/lineto.c --- trunk/reactos/drivers/video/displays/vga/objects/lineto.c 2005-07-05 22:14:07 UTC (rev 16440) +++ trunk/reactos/drivers/video/displays/vga/objects/lineto.c 2005-07-05 22:35:29 UTC (rev 16441) @@ -301,7 +301,8 @@ RECTL *RectBounds, MIX mix) { - LONG x, y, deltax, deltay, i, xchange, ychange, hx, vy; + LONG x, y, deltax, deltay, xchange, ychange, hx, vy; + ULONG i; ULONG Pixel = Brush->iSolidColor; RECT_ENUM RectEnum; BOOL EnumMore; @@ -342,7 +343,7 @@ CLIPOBJ_cEnumStart(Clip, FALSE, CT_RECTANGLES, CD_RIGHTDOWN, 0); do { - EnumMore = CLIPOBJ_bEnum(Clip, (ULONG) sizeof(RectEnum), (PVOID) &RectEnum); + EnumMore = CLIPOBJ_bEnum(Clip, sizeof(RectEnum), (PVOID) &RectEnum); for (i = 0; i < RectEnum.c && RectEnum.arcl[i].top <= y1; i++) { if (y1 < RectEnum.arcl[i].bottom && _____ Modified: trunk/reactos/drivers/video/displays/vga/objects/paint.c --- trunk/reactos/drivers/video/displays/vga/objects/paint.c 2005-07-05 22:14:07 UTC (rev 16440) +++ trunk/reactos/drivers/video/displays/vga/objects/paint.c 2005-07-05 22:35:29 UTC (rev 16441) @@ -7,10 +7,10 @@ BOOL VGADDIFillSolid(SURFOBJ *Surface, RECTL Dimensions, ULONG iColor) { - int x, y, x2, y2, w, h; - ULONG offset, j, pre1; + int x, y, x2, y2, w, h, j; + ULONG offset, pre1; ULONG orgpre1, orgx, midpre1, tmppre1; - ULONG ileftpix, imidpix, irightpix; + int ileftpix, imidpix, irightpix; /* double leftpix, midpix, rightpix;*/ UCHAR a; @@ -150,7 +150,7 @@ CLIPOBJ_cEnumStart(ClipRegion, FALSE, CT_RECTANGLES, CD_ANY, 0); do { - int i; + UINT i; EnumMore = CLIPOBJ_bEnum(ClipRegion, sizeof(RectEnum), (PVOID) &RectEnum); DPRINT("EnumMore: %d, count: %d\n", EnumMore, RectEnum.c); for( i=0; i<RectEnum.c; i++){ _____ Modified: trunk/reactos/drivers/video/displays/vga/objects/pointer.c --- trunk/reactos/drivers/video/displays/vga/objects/pointer.c 2005-07-05 22:14:07 UTC (rev 16440) +++ trunk/reactos/drivers/video/displays/vga/objects/pointer.c 2005-07-05 22:35:29 UTC (rev 16441) @@ -303,9 +303,9 @@ { ULONG SizeX, SizeY; - SizeX = min(((X + ppdev->pPointerAttributes->Width) + 7) & ~0x7, ppdev->sizeSurf.cx); + SizeX = min(((X + (LONG)ppdev->pPointerAttributes->Width) + 7) & ~0x7, ppdev->sizeSurf.cx); SizeX -= (X & ~0x7); - SizeY = min(ppdev->pPointerAttributes->Height, ppdev->sizeSurf.cy - Y); + SizeY = min((LONG)ppdev->pPointerAttributes->Height, ppdev->sizeSurf.cy - Y); Rect->left = max(X, 0) & ~0x7; Rect->top = max(Y, 0); @@ -365,8 +365,8 @@ Rect.bottom - Rect.top); /* Display the cursor. */ - SizeX = min(ppdev->pPointerAttributes->Width, ppdev->sizeSurf.cx - cx); - SizeY = min(ppdev->pPointerAttributes->Height, ppdev->sizeSurf.cy - cy); + SizeX = min((LONG)ppdev->pPointerAttributes->Width, ppdev->sizeSurf.cx - cx); + SizeY = min((LONG)ppdev->pPointerAttributes->Height, ppdev->sizeSurf.cy - cy); AndMask = ppdev->pPointerAttributes->Pixels + (ppdev->pPointerAttributes->Height - SizeY) * ppdev->pPointerAttributes->WidthInBytes; VGADDI_BltPointerToVGA(cx, _____ Modified: trunk/reactos/drivers/video/displays/vga/vgavideo/vgavideo.c --- trunk/reactos/drivers/video/displays/vga/vgavideo/vgavideo.c 2005-07-05 22:14:07 UTC (rev 16440) +++ trunk/reactos/drivers/video/displays/vga/vgavideo/vgavideo.c 2005-07-05 22:35:29 UTC (rev 16441) @@ -266,7 +266,7 @@ UCHAR a; ULONG pre1; ULONG orgpre1, orgx, midpre1; - ULONG ileftpix, imidpix, irightpix; + LONG ileftpix, imidpix, irightpix; orgx = x; @@ -341,7 +341,7 @@ BOOL vgaVLine(INT x, INT y, INT len, UCHAR c) { - ULONG offset, i; + INT offset, i; UCHAR a; offset = xconv[x]+y80[y]; @@ -391,9 +391,9 @@ ULONG left = x >> 3; ULONG shift = x - (x & ~0x7); UCHAR pixel, nextpixel; - ULONG rightcount; - ULONG i, j; - ULONG stride = w >> 3; + LONG rightcount; + INT i, j; + LONG stride = w >> 3; /* Calculate the number of rightmost bytes not in a dword block. */ if (w >= 8) @@ -528,9 +528,9 @@ void DIB_BltToVGA(int x, int y, int w, int h, void *b, int Source_lDelta, int StartMod) { PBYTE pb, opb = b; - ULONG i, j; - ULONG x2 = x + w; - ULONG y2 = y + h; + LONG i, j; + LONG x2 = x + w; + LONG y2 = y + h; ULONG offset; UCHAR a; _____ Modified: trunk/reactos/drivers/video/miniport/vga/initvga.c --- trunk/reactos/drivers/video/miniport/vga/initvga.c 2005-07-05 22:14:07 UTC (rev 16440) +++ trunk/reactos/drivers/video/miniport/vga/initvga.c 2005-07-05 22:35:29 UTC (rev 16441) @@ -27,7 +27,7 @@ STATIC VOID FASTCALL vgaSaveRegisters(PVGA_REGISTERS Registers) { - int i; + UINT i; for (i = 0; i < sizeof(Registers->CRT); i++) { @@ -60,7 +60,7 @@ STATIC VOID FASTCALL vgaSetRegisters(PVGA_REGISTERS Registers) { - int i; + UINT i; /* Update misc output register */ VideoPortWritePortUchar(MISC, Registers->Misc); _____ Modified: trunk/reactos/include/ndk/ketypes.h --- trunk/reactos/include/ndk/ketypes.h 2005-07-05 22:14:07 UTC (rev 16440) +++ trunk/reactos/include/ndk/ketypes.h 2005-07-05 22:35:29 UTC (rev 16441) @@ -98,7 +98,7 @@ PVOID RegionEnd; ULONG BucketShift; PVOID Buffer; - CSHORT Source; + KPROFILE_SOURCE Source; ULONG Affinity; BOOLEAN Active; struct _KPROCESS *Process; _____ Modified: trunk/reactos/include/reactos/exeformat.h --- trunk/reactos/include/reactos/exeformat.h 2005-07-05 22:14:07 UTC (rev 16440) +++ trunk/reactos/include/reactos/exeformat.h 2005-07-05 22:35:29 UTC (rev 16441) @@ -69,7 +69,7 @@ * as opposed to STATUS_INVALID_IMAGE_FORMAT meaning the format is supported, * but the particular file is malformed */ -#define STATUS_ROS_EXEFMT_UNKNOWN_FORMAT (0xA0100001) +#define STATUS_ROS_EXEFMT_UNKNOWN_FORMAT ((NTSTATUS)0xA0100001) /* * Returned by MmCreateSection to signal successful loading of an executable @@ -78,7 +78,7 @@ * STATUS_ROS_EXEFMT_LOADED_FORMAT and the appropriate EXEFMT_LOADED_XXX */ #define FACILITY_ROS_EXEFMT_FORMAT (0x11) -#define STATUS_ROS_EXEFMT_LOADED_FORMAT (0x60110000) +#define STATUS_ROS_EXEFMT_LOADED_FORMAT ((NTSTATUS)0x60110000) /* non-standard format, ZwQuerySection required to retrieve the format tag */ #define EXEFMT_LOADED_EXTENDED (0x0000FFFF) _____ Modified: trunk/reactos/lib/aclui/checklist.c --- trunk/reactos/lib/aclui/checklist.c 2005-07-05 22:14:07 UTC (rev 16440) +++ trunk/reactos/lib/aclui/checklist.c 2005-07-05 22:35:29 UTC (rev 16441) @@ -63,7 +63,7 @@ BOOL FocusVisible; COLORREF TextColor[2]; - UINT CheckBoxLeft[2]; + INT CheckBoxLeft[2]; BOOL QuickSearchEnabled; PCHECKITEM QuickSearchHitItem; @@ -531,7 +531,7 @@ VisibleItems = (rcClient.bottom - rcClient.top) / infoPtr->ItemHeight; - if (ScrollInfo.nPage == VisibleItems && ScrollInfo.nMax > 0) + if (ScrollInfo.nPage == (UINT)VisibleItems && ScrollInfo.nMax > 0) { ScrollInfo.nMax--; } @@ -1456,7 +1456,7 @@ default: { INT SearchLen = wcslen(infoPtr->QuickSearchText); - if (SearchLen < (sizeof(infoPtr->QuickSearchText) / sizeof(infoPtr->QuickSearchText[0])) - 1) + if (SearchLen < (INT)(sizeof(infoPtr->QuickSearchText) / sizeof(infoPtr->QuickSearchText[0])) - 1) { infoPtr->QuickSearchText[SearchLen++] = c; infoPtr->QuickSearchText[SearchLen] = L'\0'; @@ -1832,7 +1832,7 @@ case CLM_SETCHECKBOXCOLUMN: { - infoPtr->CheckBoxLeft[wParam != CLB_DENY] = (UINT)lParam; + infoPtr->CheckBoxLeft[wParam != CLB_DENY] = (INT)lParam; Ret = 1; break; } @@ -1894,7 +1894,7 @@ { LPSTYLESTRUCT Style = (LPSTYLESTRUCT)lParam; - if (wParam == GWL_STYLE) + if (wParam == (WPARAM)GWL_STYLE) { BOOL AllowChangeStyle; _____ Modified: trunk/reactos/lib/adns/src/check.c --- trunk/reactos/lib/adns/src/check.c 2005-07-05 22:14:07 UTC (rev 16440) +++ trunk/reactos/lib/adns/src/check.c 2005-07-05 22:35:29 UTC (rev 16441) @@ -116,7 +116,7 @@ break; case server_disconnected: case server_broken: - assert(ads->tcpsocket == -1); + assert(ads->tcpsocket == INVALID_SOCKET); checkc_notcpbuf(ads); break; case server_ok: _____ Modified: trunk/reactos/lib/adns/src/query.c --- trunk/reactos/lib/adns/src/query.c 2005-07-05 22:14:07 UTC (rev 16440) +++ trunk/reactos/lib/adns/src/query.c 2005-07-05 22:35:29 UTC (rev 16441) @@ -286,7 +286,7 @@ iaddr= (const unsigned char*) &(((const struct sockaddr_in*)addr) -> sin_addr); lreq= strlen(zone) + 4*4 + 1; - if (lreq > sizeof(shortbuf)) { + if (lreq > (int)sizeof(shortbuf)) { buf= malloc( strlen(zone) + 4*4 + 1 ); if (!buf) return errno; buf_free= buf; _____ Modified: trunk/reactos/lib/adns/src/reply.c --- trunk/reactos/lib/adns/src/reply.c 2005-07-05 22:14:07 UTC (rev 16440) +++ trunk/reactos/lib/adns/src/reply.c 2005-07-05 22:35:29 UTC (rev 16441) @@ -222,7 +222,7 @@ * it contains the relevant info. */ } - } else if (rrtype == (qu->typei->type & adns__rrt_typemask)) { + } else if (rrtype == ((INT)qu->typei->type & (INT)adns__rrt_typemask)) { wantedrrs++; } else { adns__debug(ads,serv,qu,"ignoring answer RR with irrelevant type %d",rrtype); @@ -322,7 +322,7 @@ &ownermatched); assert(!st); assert(rrtype != -1); if (rrclass != DNS_CLASS_IN || - rrtype != (qu->typei->type & adns__rrt_typemask) || + rrtype != ((INT)qu->typei->type & (INT)adns__rrt_typemask) || !ownermatched) continue; adns__update_expires(qu,ttl,now); _____ Modified: trunk/reactos/lib/adns/src/setup.c --- trunk/reactos/lib/adns/src/setup.c 2005-07-05 22:14:07 UTC (rev 16440) +++ trunk/reactos/lib/adns/src/setup.c 2005-07-05 22:35:29 UTC (rev 16441) @@ -163,7 +163,7 @@ return; } - if (l >= sizeof(tbuf)) { + if (l >= (int)sizeof(tbuf)) { configparseerr(ads,fn,lno,"sortlist entry `%.*s' too long",l,word); continue; } _____ Modified: trunk/reactos/lib/adns/src/types.c --- trunk/reactos/lib/adns/src/types.c 2005-07-05 22:14:07 UTC (rev 16440) +++ trunk/reactos/lib/adns/src/types.c 2005-07-05 22:35:29 UTC (rev 16441) @@ -749,7 +749,7 @@ if (lablen>1 && pai->qu->query_dgram[labstart]=='0') return adns_s_querydomainwrong; } - for (i=0; i<sizeof(expectdomain)/sizeof(*expectdomain); i++) { + for (i=0; i<(int)sizeof(expectdomain)/(int)sizeof(*expectdomain); i++) { st= adns__findlabel_next(&fls,&lablen,&labstart); assert(!st); l= strlen(expectdomain[i]); if (lablen != l || memcmp(pai->qu->query_dgram + labstart, expectdomain[i], (size_t)l)) _____ Modified: trunk/reactos/lib/advapi32/crypt/crypt.c --- trunk/reactos/lib/advapi32/crypt/crypt.c 2005-07-05 22:14:07 UTC (rev 16440) +++ trunk/reactos/lib/advapi32/crypt/crypt.c 2005-07-05 22:35:29 UTC (rev 16441) @@ -126,7 +126,7 @@ return TRUE; } wcount = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); - wcount = wcount < wstrsize/sizeof(WCHAR) ? wcount : wstrsize/sizeof(WCHAR); + wcount = wcount < wstrsize/(int)sizeof(WCHAR) ? wcount : wstrsize/(int)sizeof(WCHAR); if (wstrsize == -1) *wstr = CRYPT_Alloc(wcount * sizeof(WCHAR)); if (*wstr) _____ Modified: trunk/reactos/lib/advpack/advpack.c --- trunk/reactos/lib/advpack/advpack.c 2005-07-05 22:14:07 UTC (rev 16440) +++ trunk/reactos/lib/advpack/advpack.c 2005-07-05 22:35:29 UTC (rev 16441) @@ -272,7 +272,7 @@ PDWORD PReserved ) { HANDLE Process, Token; - INT i; + UINT i; BOOL Good = FALSE; DWORD Buffer[4096]; DWORD Size; _____ Modified: trunk/reactos/lib/cpl/desk/settings.c --- trunk/reactos/lib/cpl/desk/settings.c 2005-07-05 22:14:07 UTC (rev 16440) +++ trunk/reactos/lib/cpl/desk/settings.c 2005-07-05 22:35:29 UTC (rev 16441) @@ -247,7 +247,7 @@ if (LoadString(hApplet, (2900 + Current->dmBitsPerPel), Buffer, sizeof(Buffer) / sizeof(TCHAR))) { index = SendDlgItemMessage(hwndDlg, IDC_SETTINGS_BPP, CB_FINDSTRINGEXACT, (WPARAM)-1, (LPARAM)Buffer); [truncated at 1000 lines; 4365 more skipped]

1 0

[ion] 16440: Ged Murpy <gedmurphy@gmail.com>
by ion＠svn.reactos.com 05 Jul '05

05 Jul '05

Ged Murpy <gedmurphy(a)gmail.com> * ARP Rewrite, 90% complete (still in progress) Modified: trunk/reactos/apps/utils/net/arp/arp.c Modified: trunk/reactos/apps/utils/net/arp/arp.rc Modified: trunk/reactos/apps/utils/net/arp/arp.xml _____ Modified: trunk/reactos/apps/utils/net/arp/arp.c --- trunk/reactos/apps/utils/net/arp/arp.c 2005-07-05 21:57:55 UTC (rev 16439) +++ trunk/reactos/apps/utils/net/arp/arp.c 2005-07-05 22:14:07 UTC (rev 16440) @@ -1,97 +1,461 @@ -/* - * arp - display ARP cache from the IP stack parameters. +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS arp utility + * FILE: apps/utils/net/arp/arp.c + * PURPOSE: view and manipulate the ARP cache + * PROGRAMMERS: Ged Murphy (gedmurphy(a)gmail.com) + * REVISIONS: + * GM 27/06/05 Created * - * This source code is in the PUBLIC DOMAIN and has NO WARRANTY. - * - * Robert Dickenson <robd(a)reactos.org>, August 15, 2002. */ + + +#include <windows.h> #include <stdio.h> -#include <windows.h> +#include <stdlib.h> #include <tchar.h> -#include <time.h> - -#include <iptypes.h> -#include <ipexport.h> +#include <string.h> +#include <ctype.h> +#include <winsock2.h> #include <iphlpapi.h> -#include <snmp.h> + +#define WIN32_LEAN_AND_MEAN +#define UNICODE +#define _UNICODE + +/* + * Globals + */ +const char SEPERATOR = '-'; + + + +/* + * function declerations + */ +INT DisplayArpEntries(PTCHAR pszInetAddr, PTCHAR pszIfAddr); +INT PrintEntries(PMIB_IPNETROW pIpAddRow); +INT Addhost(PTCHAR pszInetAddr, PTCHAR pszEthAddr, PTCHAR pszIfAddr); +INT Deletehost(PTCHAR pszInetAddr, PTCHAR pszIfAddr); +VOID Usage(VOID); + + + +/* + * + * Takes optional parameters of an internet address and interface address. + * Retrieve all entries in the ARP cache. If an internet address is + * specified, display the ARP entry relating to that address. If an + * interface address is specified, display all entries relating to + * that interface. + * + */ +/* FIXME: allow user to specify an interface address, via pszIfAddr */ +INT DisplayArpEntries(PTCHAR pszInetAddr, PTCHAR pszIfAddr) +{ + INT i, k, iRet; + PMIB_IPNETTABLE pIpNetTable; + PMIB_IPADDRTABLE pIpAddrTable; + ULONG ulSize = 0; + struct in_addr inaddr, inaddr2; + DWORD dwSize = 0; + PTCHAR pszIpAddr; + TCHAR szIntIpAddr[20]; + + /* Return required buffer size */ + GetIpNetTable(NULL, &ulSize, 0); + + /* allocate memory for ARP address table */ + pIpNetTable = (PMIB_IPNETTABLE) malloc(ulSize * sizeof(BYTE)); + ZeroMemory(pIpNetTable, sizeof(*pIpNetTable)); + + /* get Arp address table */ + if (pIpNetTable != NULL) { + GetIpNetTable(pIpNetTable, &ulSize, TRUE); + } else { + _tprintf(_T("failed to allocate memory for GetIpNetTable\n")); + free(pIpNetTable); + return -1; + } + + /* check there are entries in the table */ + if (pIpNetTable->dwNumEntries == 0) { + _tprintf(_T("No ARP entires found\n")); + free(pIpNetTable); + return -1; + } + + + + /* try doing this in the way it's done above, it's clearer */ + /* Retrieve the interface-to-ip address mapping + * table to get the IP address for adapter */ + pIpAddrTable = (MIB_IPADDRTABLE *) malloc(dwSize); + GetIpAddrTable(pIpAddrTable, &dwSize, 0); // NULL ? + -#include "trace.h" - -VOID WINAPI SnmpSvcInitUptime(); - -/////////////////////////////////////////////////////////////////////// ///////// - -const char szUsage[] = { "\n" \ - "Displays and modifies the IP Protocol to physical address translation tables\n" \ - "used by address resolution protocol (ARP).\n" \ - "\n" \ - "ARP -s inet_addr eth_addr [if_addr]\n" \ - "ARP -d inet_addr [if_addr]\n" \ - "ARP -a [inet_addr] [-N if_addr]\n" \ - "\n" \ - " -a Displays the active ARP table by querying the current protocol\n" \ - " data. If inet_addr is specified, the IP and physical addresses\n" \ - " for the specified address are displayed. If more than one\n" \ - " network interface is using ARP, each interfaces ARP table is\n" \ - " displayed.\n" \ - " -g Indentical to -a.\n" \ - " inet_addr Specifies the IP address.\n" \ - " -N if_addr Displays the ARP table for the specified interface only\n" \ - " -d Deletes the host entry specified by inet_addr. inet_addr may be\n" \ - " wildcarded with * to delete all host entries in the ARP table.\n" \ - " -s Adds the host and associates the IP address inet_addr with the\n" \ - " physical address eth_addr. The physical address must be specified\n" \ - " as 6 hexadecimal characters delimited by hyphens. The new entry\n" \ - " will become permanent in the ARP table.\n" \ - " eth_addr Specifies the interface physical address.\n" \ - " if_addr If present, this specifies the IP address of the interface whose\n" \ - " address translation table should be modified. If not present, the\n" \ - " first applicable interface will be used.\n" \ - "Example:\n" \ - " > arp -s 192.168.0.12 55-AA-55-01-02-03 .... Static entry creation.\n" \ - " > arp -a .... ARP table display.\n" \ - " > arp -d * .... Delete all ARP table entries.\n" -}; - -void usage(void) + pIpAddrTable = (MIB_IPADDRTABLE *) malloc(dwSize); + //ZeroMemory(pIpAddrTable, sizeof(*pIpAddrTable)); + + if ((iRet = GetIpAddrTable(pIpAddrTable, &dwSize, TRUE)) != NO_ERROR) { // NO_ERROR = 0 + _tprintf(_T("GetIpAddrTable failed: %d\n"), iRet); + _tprintf(_T("error: %d\n"), WSAGetLastError()); + } + + + for (k=0; k < pIpAddrTable->dwNumEntries; k++) { + if (pIpNetTable->table[0].dwIndex == pIpAddrTable->table[k].dwIndex) { + //printf("printing pIpAddrTable->table[?].dwIndex = %lx\n", pIpNetTable->table[k].dwIndex); + inaddr2.s_addr = pIpAddrTable->table[k].dwAddr; + pszIpAddr = inet_ntoa(inaddr2); + strcpy(szIntIpAddr, pszIpAddr); + } + } + + + /* print header, including interface IP address and index number */ + _tprintf(_T("\nInterface: %s --- 0x%lx \n"), szIntIpAddr, pIpNetTable->table[0].dwIndex); + _tprintf(_T(" Internet Address Physical Address Type\n")); + + /* go through all ARP entries */ + for (i=0; i < pIpNetTable->dwNumEntries; i++) { + + /* if the user has supplied their own internet addesss * + * only print the arp entry which matches that */ + if (pszInetAddr) { + inaddr.S_un.S_addr = pIpNetTable->table[i].dwAddr; + pszIpAddr = inet_ntoa(inaddr); + + /* check if it matches, print it */ + if (strcmp(pszIpAddr, pszInetAddr) == 0) { + PrintEntries(&pIpNetTable->table[i]); + } + } else { + /* if an address is not supplied, print all entries */ + PrintEntries(&pIpNetTable->table[i]); + } + + } + + free(pIpNetTable); + free(pIpAddrTable); + + return 0; +} + + + +/* + * + * Takes an ARP entry and prints the IP address, + * the MAC address and the entry type to screen + * + */ +INT PrintEntries(PMIB_IPNETROW pIpAddRow) { -// fprintf(stderr,"USAGE:\n"); - fputs(szUsage, stderr); + IN_ADDR inaddr; + TCHAR cMacAddr[20]; + + /* print IP addresses */ + inaddr.S_un.S_addr = pIpAddRow->dwAddr; + _tprintf(_T(" %-22s"), inet_ntoa(inaddr)); //error checking + + /* print MAC address */ + _stprintf(cMacAddr, _T("%02x-%02x-%02x-%02x-%02x-%02x"), + pIpAddRow->bPhysAddr[0], + pIpAddRow->bPhysAddr[1], + pIpAddRow->bPhysAddr[2], + pIpAddRow->bPhysAddr[3], + pIpAddRow->bPhysAddr[4], + pIpAddRow->bPhysAddr[5]); + _tprintf(_T("%-22s"), cMacAddr); + + /* print cache type */ + switch (pIpAddRow->dwType) { + case MIB_IPNET_TYPE_DYNAMIC : _tprintf(_T("dynamic\n")); + break; + case MIB_IPNET_TYPE_STATIC : _tprintf(_T("static\n")); + break; + case MIB_IPNET_TYPE_INVALID : _tprintf(_T("invalid\n")); + break; + case MIB_IPNET_TYPE_OTHER : _tprintf(_T("other\n")); + break; + } + return 0; } - -int main(int argc, char *argv[]) + + + +/* + * + * Takes an internet address, a MAC address and an optional interface + * address as arguments and checks their validity. + * Fill out an MIB_IPNETROW structure and insert the data into the + * ARP cache as a static entry. + * + */ +INT Addhost(PTCHAR pszInetAddr, PTCHAR pszEthAddr, PTCHAR pszIfAddr) { - TCHAR szComputerName[50]; - DWORD dwSize = 50; - - int nBytes = 500; - BYTE* pCache; - - if (argc > 1) { - usage(); - return 1; + PMIB_IPNETROW pAddHost; + PMIB_IPADDRTABLE pIpAddrTable; + DWORD dwIpAddr; + DWORD dwSize = 0; + INT iRet, i, val; + TCHAR c; + + /* error checking */ + + /* check IP address */ + if (pszInetAddr != NULL) { + if ((dwIpAddr = inet_addr(pszInetAddr)) == INADDR_NONE) { + _tprintf(_T("ARP: bad IP address: %s\n"), pszInetAddr); + return -1; + } + } else { + Usage(); } - - SnmpSvcInitUptime(); - - GetComputerName(szComputerName, &dwSize); - _tprintf(_T("ReactOS ARP cache on Computer Name: %s\n"), szComputerName); - - pCache = (BYTE*)SnmpUtilMemAlloc(nBytes); - - Sleep(2500); - - if (pCache != NULL) { - - DWORD dwUptime = SnmpSvcGetUptime(); - - _tprintf(_T("SNMP uptime: %ld\n"), dwUptime); - - SnmpUtilMemFree(pCache); + + /* check MAC address */ + if (strlen(pszEthAddr) != 17) { + _tprintf(_T("ARP: bad argument: %s\n"), pszEthAddr); + return -1; + } + for (i=0; i<17; i++) { + if (pszEthAddr[i] == SEPERATOR) { + continue; + } + if (!isxdigit(pszEthAddr[i])) { + _tprintf(_T("ARP: bad argument: %s\n"), pszEthAddr); + return -1; + } + } + + /* reserve memory on heap and zero */ + pAddHost = (MIB_IPNETROW *) malloc(sizeof(MIB_IPNETROW)); + ZeroMemory(pAddHost, sizeof(MIB_IPNETROW)); + + + + + /* set dwIndex field to the index of a local IP address to + * indicate the network on which the ARP entry applies */ + if (pszIfAddr) { + sscanf(pszIfAddr, "%lx", &pAddHost->dwIndex); } else { - _tprintf(_T("ERROR: call to SnmpUtilMemAlloc() failed\n")); - return 1; + /* map the IP to the index */ + pIpAddrTable = (MIB_IPADDRTABLE *) malloc(dwSize); + GetIpAddrTable(pIpAddrTable, &dwSize, 0); + + pIpAddrTable = (MIB_IPADDRTABLE *) malloc(dwSize); + + if ((iRet = GetIpAddrTable(pIpAddrTable, &dwSize, TRUE)) != NO_ERROR) { // NO_ERROR = 0 + _tprintf(_T("GetIpAddrTable failed: %d\n"), iRet); + _tprintf(_T("error: %d\n"), WSAGetLastError()); + } + printf("printing pIpAddrTable->table[0].dwIndex = %lx\n", pIpAddrTable->table[0].dwIndex); + pAddHost->dwIndex = 4; } - return 0; + + /* Set MAC address to 6 bytes (typical) */ + pAddHost->dwPhysAddrLen = 6; + + + /* Encode bPhysAddr into correct byte array */ + for (i=0; i<6; i++) { + val =0; + c = toupper(pszEthAddr[i*3]); + c = c - (isdigit(c) ? '0' : ('A' - 10)); + val += c; + val = (val << 4); + c = toupper(pszEthAddr[i*3 + 1]); + c = c - (isdigit(c) ? '0' : ('A' - 10)); + val += c; + pAddHost->bPhysAddr[i] = val; + + } + + + /* copy converted IP address */ + pAddHost->dwAddr = dwIpAddr; + + + /* set type to static */ + pAddHost->dwType = MIB_IPNET_TYPE_STATIC; + + + /* Add the ARP entry */ + if ((iRet = SetIpNetEntry(pAddHost)) != NO_ERROR) { + _tprintf(_T("The ARP entry addition failed: %d\n"), iRet); + return -1; + } + + free(pIpAddrTable); + free(pAddHost); + + return 0; } - + + + +/* + * + * Takes an internet address and an optional interface address as + * arguments and checks their validity. + * Add the interface number and IP to an MIB_IPNETROW structure + * and remove the entrty from the ARP cache. + * + */ +INT Deletehost(PTCHAR pszInetAddr, PTCHAR pszIfAddr) +{ + PMIB_IPNETROW pDelHost; + PMIB_IPADDRTABLE pIpAddrTable; + DWORD dwIpAddr; + DWORD dwSize = 0; + INT iret; + + /* error checking */ + + /* check IP address */ + if (pszInetAddr != NULL) { + if ((dwIpAddr = inet_addr(pszInetAddr)) == INADDR_NONE) { + _tprintf(_T("ARP: bad IP address: %s\n"), pszInetAddr); + return -1; + } + } else { + Usage(); + } + + + pIpAddrTable = (MIB_IPADDRTABLE*) malloc(sizeof(MIB_IPADDRTABLE)); + pDelHost = (MIB_IPNETROW *) malloc(sizeof(MIB_IPNETROW)); + ZeroMemory(pIpAddrTable, sizeof(MIB_IPADDRTABLE)); + ZeroMemory(pDelHost, sizeof(MIB_IPNETROW)); + /* set dwIndex field to the index of a local IP address to + * indicate the network on which the ARP entry applies */ + if (pszIfAddr) { + sscanf(pszIfAddr, "%lx", &pDelHost->dwIndex); + } else { + /* map the IP to the index */ + if (GetIpAddrTable(pIpAddrTable, &dwSize, 0) == ERROR_INSUFFICIENT_BUFFER) { + pIpAddrTable = (MIB_IPADDRTABLE *) malloc(dwSize); + } + if ((iret = GetIpAddrTable(pIpAddrTable, &dwSize, TRUE)) != NO_ERROR) { + _tprintf(_T("GetIpAddrTable failed: %d\n"), iret); + _tprintf(_T("error: %d\n"), WSAGetLastError()); + } + pDelHost->dwIndex = 4; //pIpAddrTable->table[0].dwIndex; + } + + /* copy converted IP address */ + pDelHost->dwAddr = dwIpAddr; + + /* Add the ARP entry */ + if ((iret = DeleteIpNetEntry(pDelHost)) != NO_ERROR) { + _tprintf(_T("The ARP entry deletion failed: %d\n"), iret); + return -1; + } + + free(pIpAddrTable); + free(pDelHost); + + return 0; +} + + + +/* + * + * print program usage to screen + * + */ +VOID Usage(VOID) +{ + _tprintf(_T("\nDisplays and modifies the IP-to-Physical address translation tables used by\n" + "address resolution protocol (ARP).\n" + "\n" + "ARP -s inet_addr eth_addr [if_addr]\n" + "ARP -d inet_addr [if_addr]\n" + "ARP -a [inet_addr] [-N if_addr]\n" + "\n" + " -a Displays current ARP entries by interrogating the current\n" + " protocol data. If inet_addr is specified, the IP and Physical\n" + " addresses for only the specified computer are displayed. If\n" + " more than one network interface uses ARP, entries for each ARP\n" + " table are displayed.\n" + " -g Same as -a.\n" + " inet_addr Specifies an internet address.\n" + " -N if_addr Displays the ARP entries for the network interface specified\n" + " by if_addr.\n" + " -d Deletes the host specified by inet_addr. inet_addr may be\n" + " wildcarded with * to delete all hosts.\n" + " -s Adds the host and associates the Internet address inet_addr\n" + " with the Physical address eth_addr. The Physical address is\n" + " given as 6 hexadecimal bytes separated by hyphens. The entry\n" + " is permanent.\n" + " eth_addr Specifies a physical address.\n" + " if_addr If present, this specifies the Internet address of the\n" + " interface whose address translation table should be modified.\n" + " If not present, the first applicable interface will be used.\n" + "Example:\n" + " > arp -s 157.55.85.212 00-aa-00-62-c6-09 .... Adds a static entry.\n" + " > arp -a .... Displays the arp table.\n\n")); +} + + + +/* + * + * Program entry. + * Parse command line and call the required function + * + */ +INT main(int argc, char* argv[]) +{ + const char N[] = "-N"; + + if ((argc < 2) || (argc > 5)) + { + Usage(); + return FALSE; + } + + + if (argv[1][0] == '-') { + switch (argv[1][1]) { + /* FIX ME */ + /* need better control for -a, as -N might not be arg 4 */ + case 'a': if (argc == 2) + DisplayArpEntries(NULL, NULL); + else if (argc == 3) + DisplayArpEntries(argv[2], NULL); + else if ((argc == 5) && ((strcmp(argv[3], N)) == 0)) + DisplayArpEntries(argv[2], argv[4]); + else + Usage(); + break; + case 'g': break; + case 'd': if (argc == 3) + Deletehost(argv[2], NULL); + else if (argc == 4) + Deletehost(argv[2], argv[3]); + else + Usage(); + break; + case 's': if (argc == 4) + Addhost(argv[2], argv[3], NULL); + else if (argc == 5) + Addhost(argv[2], argv[3], argv[4]); + else + Usage(); + break; + default: + Usage(); + return -1; + } + } else { + Usage(); + return -1; + } + + return 0; +} _____ Modified: trunk/reactos/apps/utils/net/arp/arp.rc --- trunk/reactos/apps/utils/net/arp/arp.rc 2005-07-05 21:57:55 UTC (rev 16439) +++ trunk/reactos/apps/utils/net/arp/arp.rc 2005-07-05 22:14:07 UTC (rev 16440) @@ -1,6 +1,5 @@ -/* $Id$ */ - #define REACTOS_STR_FILE_DESCRIPTION "ReactOS TCP/IPv4 Win32 arp\0" #define REACTOS_STR_INTERNAL_NAME "arp\0" #define REACTOS_STR_ORIGINAL_FILENAME "arp.exe\0" +#define REACTOS_STR_ORIGINAL_COPYRIGHT "Ged Murphy (gedmurphy(a)gmail.com)\0" #include <reactos/version.rc> _____ Modified: trunk/reactos/apps/utils/net/arp/arp.xml --- trunk/reactos/apps/utils/net/arp/arp.xml 2005-07-05 21:57:55 UTC (rev 16439) +++ trunk/reactos/apps/utils/net/arp/arp.xml 2005-07-05 22:14:07 UTC (rev 16440) @@ -2,8 +2,10 @@ <include base="arp">.</include> <define name="__USE_W32API" /> <library>kernel32</library> - <library>user32</library> - <library>snmpapi</library> + <library>iphlpapi</library> + <library>ws2_32</library> + <library>shlwapi</library> <file>arp.c</file> <file>arp.rc</file> </module> +

1 0

[ion] 16439: Fix the build by adding KDPC_DATA as a shared arch structure. Kind of a hack but I could not find another way to avoid the undelrying recursive dependencies that not doing this would cause. Also made an arch-specific fix to KPROCESS and wrote a little comment on it
by ion＠svn.reactos.com 05 Jul '05

05 Jul '05

Fix the build by adding KDPC_DATA as a shared arch structure. Kind of a hack but I could not find another way to avoid the undelrying recursive dependencies that not doing this would cause. Also made an arch-specific fix to KPROCESS and wrote a little comment on it Modified: trunk/reactos/include/ndk/arch/ketypes.h Modified: trunk/reactos/include/ndk/ketypes.h _____ Modified: trunk/reactos/include/ndk/arch/ketypes.h --- trunk/reactos/include/ndk/arch/ketypes.h 2005-07-05 21:17:01 UTC (rev 16438) +++ trunk/reactos/include/ndk/arch/ketypes.h 2005-07-05 21:57:55 UTC (rev 16439) @@ -9,6 +9,15 @@ #ifndef _ARCH_KETYPES_H #define _ARCH_KETYPES_H +/* Shared structure needed by Arch-specific headers */ +typedef struct _KDPC_DATA +{ + LIST_ENTRY DpcListHead; + ULONG DpcLock; + ULONG DpcQueueDepth; + ULONG DpcCount; +} KDPC_DATA, *PKDPC_DATA; + #ifdef _M_IX86 #include <ndk/i386/ketypes.h> #else _____ Modified: trunk/reactos/include/ndk/ketypes.h --- trunk/reactos/include/ndk/ketypes.h 2005-07-05 21:17:01 UTC (rev 16438) +++ trunk/reactos/include/ndk/ketypes.h 2005-07-05 21:57:55 UTC (rev 16439) @@ -15,6 +15,12 @@ #include "mmtypes.h" #include <arc/arc.h> +/* + * Architecture-specific types + * NB: Although KPROCESS is Arch-Specific, + * only some members are different and we will use #ifdef + * directly in the structure to avoid dependency-hell + */ #include "arch/ketypes.h" /* CONSTANTS *****************************************************************/ @@ -57,23 +63,15 @@ CurrentApcEnvironment } KAPC_ENVIRONMENT; -typedef struct _KDPC_DATA -{ - LIST_ENTRY DpcListHead; - ULONG DpcLock; - ULONG DpcQueueDepth; - ULONG DpcCount; -} KDPC_DATA, *PKDPC_DATA; - /* We don't want to force NTIFS usage only for a single structure */ #ifndef _NTIFS_ typedef struct _KAPC_STATE { - LIST_ENTRY ApcListHead[2]; - PKPROCESS Process; - BOOLEAN KernelApcInProgress; - BOOLEAN KernelApcPending; - BOOLEAN UserApcPending; + LIST_ENTRY ApcListHead[2]; + PKPROCESS Process; + BOOLEAN KernelApcInProgress; + BOOLEAN KernelApcPending; + BOOLEAN UserApcPending; } KAPC_STATE, *PKAPC_STATE, *RESTRICTED_POINTER PRKAPC_STATE; #endif @@ -108,26 +106,26 @@ typedef struct _KINTERRUPT { - CSHORT Type; - CSHORT Size; - LIST_ENTRY InterruptListEntry; - PKSERVICE_ROUTINE ServiceRoutine; - PVOID ServiceContext; - KSPIN_LOCK SpinLock; - ULONG TickCount; - PKSPIN_LOCK ActualLock; - PVOID DispatchAddress; - ULONG Vector; - KIRQL Irql; - KIRQL SynchronizeIrql; - BOOLEAN FloatingSave; - BOOLEAN Connected; - CHAR Number; - UCHAR ShareVector; - KINTERRUPT_MODE Mode; - ULONG ServiceCount; - ULONG DispatchCount; - ULONG DispatchCode[106]; + CSHORT Type; + CSHORT Size; + LIST_ENTRY InterruptListEntry; + PKSERVICE_ROUTINE ServiceRoutine; + PVOID ServiceContext; + KSPIN_LOCK SpinLock; + ULONG TickCount; + PKSPIN_LOCK ActualLock; + PVOID DispatchAddress; + ULONG Vector; + KIRQL Irql; + KIRQL SynchronizeIrql; + BOOLEAN FloatingSave; + BOOLEAN Connected; + CHAR Number; + UCHAR ShareVector; + KINTERRUPT_MODE Mode; + ULONG ServiceCount; + ULONG DispatchCount; + ULONG DispatchCode[106]; } KINTERRUPT, *PKINTERRUPT; typedef struct _KEVENT_PAIR @@ -183,23 +181,14 @@ typedef struct _KTHREAD { - /* For waiting on thread exit */ DISPATCHER_HEADER DispatcherHeader; /* 00 */ - - /* List of mutants owned by the thread */ LIST_ENTRY MutantListHead; /* 10 */ PVOID InitialStack; /* 18 */ ULONG_PTR StackLimit; /* 1C */ - - /* Pointer to the thread's environment block in user memory */ struct _TEB *Teb; /* 20 */ - - /* Pointer to the thread's TLS array */ PVOID TlsArray; /* 24 */ PVOID KernelStack; /* 28 */ UCHAR DebugActive; /* 2C */ - - /* Thread state (one of THREAD_STATE_xxx constants below) */ UCHAR State; /* 2D */ BOOLEAN Alerted[2]; /* 2E */ UCHAR Iopl; /* 30 */ @@ -215,8 +204,8 @@ UCHAR WaitReason; /* 57 */ union /* 58 */ { - PKWAIT_BLOCK WaitBlockList; /* 58 */ - PKGATE GateObject; /* 58 */ + PKWAIT_BLOCK WaitBlockList; /* 58 */ + PKGATE GateObject; /* 58 */ }; /* 58 */ LIST_ENTRY WaitListEntry; /* 5C */ ULONG WaitTime; /* 64 */ @@ -230,10 +219,10 @@ { struct { - USHORT KernelApcDisable; - USHORT SpecialApcDisable; + USHORT KernelApcDisable; + USHORT SpecialApcDisable; }; - ULONG CombinedApcDisable; /* D0 */ + ULONG CombinedApcDisable; /* D0 */ }; KAFFINITY UserAffinity; /* D4 */ UCHAR SystemAffinityActive;/* D8 */ @@ -278,23 +267,18 @@ #include <poppack.h> -/* - * NAME: KPROCESS - * DESCRIPTION: Internal Kernel Process Structure. - * PORTABILITY: Architecture Dependent. - * KERNEL VERSION: 5.2 - * DOCUMENTATION: http://reactos.com/wiki/index.php/KPROCESS - */ typedef struct _KPROCESS { DISPATCHER_HEADER Header; /* 000 */ LIST_ENTRY ProfileListHead; /* 010 */ PHYSICAL_ADDRESS DirectoryTableBase; /* 018 */ +#if defined(_M_IX86) KGDTENTRY LdtDescriptor; /* 020 */ KIDTENTRY Int21Descriptor; /* 028 */ USHORT IopmOffset; /* 030 */ UCHAR Iopl; /* 032 */ UCHAR Unused; /* 033 */ +#endif ULONG ActiveProcessors; /* 034 */ ULONG KernelTime; /* 038 */ ULONG UserTime; /* 03C */

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs