Ros-diffs July 2005

ros-diffs@reactos.org

21 participants
563 discussions

[navaraf] 16451: Don't continue processing after displaying the usage screen.

by navaraf＠svn.reactos.com

Don't continue processing after displaying the usage screen. Modified: trunk/reactos/apps/utils/net/arp/arp.c _____ Modified: trunk/reactos/apps/utils/net/arp/arp.c --- trunk/reactos/apps/utils/net/arp/arp.c 2005-07-06 09:27:08 UTC (rev 16450) +++ trunk/reactos/apps/utils/net/arp/arp.c 2005-07-06 11:31:03 UTC (rev 16451) @@ -326,6 +326,7 @@ } } else { Usage(); + return -1; }

19 years, 3 months

[navaraf] 16450: Fix some compilation issues.

by navaraf＠svn.reactos.com

Fix some compilation issues. Modified: trunk/reactos/apps/utils/net/arp/arp.c _____ Modified: trunk/reactos/apps/utils/net/arp/arp.c --- trunk/reactos/apps/utils/net/arp/arp.c 2005-07-06 08:43:36 UTC (rev 16449) +++ trunk/reactos/apps/utils/net/arp/arp.c 2005-07-06 09:27:08 UTC (rev 16450) @@ -214,6 +214,7 @@ } } else { Usage(); + return -1; } /* check MAC address */ @@ -255,6 +256,8 @@ } printf("printing pIpAddrTable->table[0].dwIndex = %lx\n", pIpAddrTable->table[0].dwIndex); pAddHost->dwIndex = 4; + + free(pIpAddrTable); } /* Set MAC address to 6 bytes (typical) */ @@ -290,7 +293,6 @@ return -1; } - free(pIpAddrTable); free(pAddHost); return 0;

19 years, 3 months

[navaraf] 16449: Generating relocations twice for DLLs? Oh, what a clever idea ... not.

by navaraf＠svn.reactos.com

Generating relocations twice for DLLs? Oh, what a clever idea ... not. Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp _____ Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp 2005-07-06 08:22:13 UTC (rev 16448) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp 2005-07-06 08:43:36 UTC (rev 16449) @@ -1341,41 +1341,18 @@ if ( module.IsDLL () ) { - string base_tmp = ros_temp + module.name + ".base.tmp"; - CLEAN_FILE ( base_tmp ); - string junk_tmp = ros_temp + module.name + ".junk.tmp"; - CLEAN_FILE ( junk_tmp ); string temp_exp = ros_temp + module.name + ".temp.exp"; CLEAN_FILE ( temp_exp ); - fprintf ( fMakefile, - "\t%s %s -Wl,--base-file,%s -o %s %s %s %s\n", - linker.c_str (), - linkerParameters.c_str (), - base_tmp.c_str (), - junk_tmp.c_str (), - objectsMacro.c_str (), - libsMacro.c_str (), - GetLinkerMacro ().c_str () ); - - fprintf ( fMakefile, - "\t-@${rm} %s 2>$(NUL)\n", - junk_tmp.c_str () ); - string killAt = module.mangledSymbols ? "" : "--kill-at"; fprintf ( fMakefile, - "\t${dlltool} --dllname %s --base-file %s --def %s --output-exp %s %s\n", + "\t${dlltool} --dllname %s --def %s --output-exp %s %s\n", targetName.c_str (), - base_tmp.c_str (), def_file.c_str (), temp_exp.c_str (), killAt.c_str () ); fprintf ( fMakefile, - "\t-@${rm} %s 2>$(NUL)\n", - base_tmp.c_str () ); - - fprintf ( fMakefile, "\t%s %s %s -o %s %s %s %s\n", linker.c_str (), linkerParameters.c_str (),

19 years, 3 months

[navaraf] 16448: Report correct system space start address in /3GB case.

by navaraf＠svn.reactos.com

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; } /*++

19 years, 3 months

[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

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;

19 years, 3 months

[gvg] 16446: zebasoftis <zebasoftis@gmail.com>:

by gvg＠svn.reactos.com

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"

19 years, 3 months

[navaraf] 16445: Put the page tables and hyperspace at the right place in memory (ie. Windows compatible).

by navaraf＠svn.reactos.com

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,

19 years, 3 months

[weiden] 16444: fix gcc4 warnings and indention

by weiden＠svn.reactos.com

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;

19 years, 3 months

[weiden] 16443: fix warnings with -Wsign-compare for MP builds

by weiden＠svn.reactos.com

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);

19 years, 3 months

[weiden] 16442: fix warnings with -Wsign-compare and -Wpointer-arith

by weiden＠svn.reactos.com

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))) {

19 years, 3 months

← Newer
1
...
45
46
47
48
49
50
51
...
57
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2005