Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jgardou] 54480: [NTOSKRNL/MM] - Also round down offset we're given when creating a page op, so we don't miss the one that could be running at the time
by jgardou＠svn.reactos.org 23 Nov '11

23 Nov '11

Author: jgardou Date: Wed Nov 23 00:24:29 2011 New Revision: 54480 URL: http://svn.reactos.org/svn/reactos?rev=54480&view=rev Log: [NTOSKRNL/MM] - Also round down offset we're given when creating a page op, so we don't miss the one that could be running at the time Modified: trunk/reactos/ntoskrnl/mm/pageop.c Modified: trunk/reactos/ntoskrnl/mm/pageop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/pageop.c?rev=5… ============================================================================== --- trunk/reactos/ntoskrnl/mm/pageop.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/pageop.c [iso-8859-1] Wed Nov 23 00:24:29 2011 @@ -147,6 +147,7 @@ PMM_PAGEOP PageOp; Address = (PVOID)PAGE_ROUND_DOWN(Address); + Offset = PAGE_ROUND_DOWN(Offset); /* * Calcuate the hash value for pageop structure

1 0

[pschweitzer] 54479: [NTOSKRNL] Don't attempt to free random address Don't attempt to free null address
by pschweitzer＠svn.reactos.org 22 Nov '11

22 Nov '11

Author: pschweitzer Date: Tue Nov 22 22:07:35 2011 New Revision: 54479 URL: http://svn.reactos.org/svn/reactos?rev=54479&view=rev Log: [NTOSKRNL] Don't attempt to free random address Don't attempt to free null address Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] Tue Nov 22 22:07:35 2011 @@ -1245,7 +1245,7 @@ { ULONG KeyNameBufferLength; PKEY_VALUE_PARTIAL_INFORMATION ParentIdPrefixInformation = NULL; - UNICODE_STRING KeyName; + UNICODE_STRING KeyName = {0, 0, NULL}; UNICODE_STRING KeyValue; UNICODE_STRING ValueName; HANDLE hKey = NULL; @@ -1267,10 +1267,8 @@ ParentIdPrefixInformation = ExAllocatePool(PagedPool, KeyNameBufferLength + sizeof(WCHAR)); if (!ParentIdPrefixInformation) { - Status = STATUS_INSUFFICIENT_RESOURCES; - goto cleanup; - } - + return STATUS_INSUFFICIENT_RESOURCES; + } KeyName.Buffer = ExAllocatePool(PagedPool, (49 * sizeof(WCHAR)) + DeviceNode->Parent->InstancePath.Length); if (!KeyName.Buffer)

1 0

[jgardou] 54478: [OOPS] - I forgot this one
by jgardou＠svn.reactos.org 22 Nov '11

22 Nov '11

Author: jgardou Date: Tue Nov 22 22:05:02 2011 New Revision: 54478 URL: http://svn.reactos.org/svn/reactos?rev=54478&view=rev Log: [OOPS] - I forgot this one Modified: trunk/reactos/ntoskrnl/include/internal/mm.h Modified: trunk/reactos/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] Tue Nov 22 22:05:02 2011 @@ -88,6 +88,7 @@ #define MM_PAGEOP_PAGEOUT (2) #define MM_PAGEOP_PAGESYNCH (3) #define MM_PAGEOP_ACCESSFAULT (4) +#define MM_PAGEOP_CHANGEPROTECT (5) /* Number of list heads to use */ #define MI_FREE_POOL_LISTS 4 @@ -1639,15 +1640,6 @@ NTSTATUS NTAPI -MmWritePageSectionView( - PMMSUPPORT AddressSpace, - PMEMORY_AREA MArea, - PVOID Address, - PMM_PAGEOP PageOp -); - -NTSTATUS -NTAPI MmInitSectionImplementation(VOID); NTSTATUS

1 0

[jgardou] 54477: [NTOSKRNL/MM] - create a page op when changing page protection attribute - properly handle PAGE_NOACCESS protection change in NtProtectVirtualMemory - Round down the address we're ...
by jgardou＠svn.reactos.org 22 Nov '11

22 Nov '11

Author: jgardou Date: Tue Nov 22 22:01:06 2011 New Revision: 54477 URL: http://svn.reactos.org/svn/reactos?rev=54477&view=rev Log: [NTOSKRNL/MM] - create a page op when changing page protection attribute - properly handle PAGE_NOACCESS protection change in NtProtectVirtualMemory - Round down the address we're given when creating a page op, so we're sure there is o,ly one page op for running for one page - Add a small hack Now ReatOS boots with DPH enabled on low memory conditions Modified: trunk/reactos/ntoskrnl/mm/anonmem.c trunk/reactos/ntoskrnl/mm/i386/page.c trunk/reactos/ntoskrnl/mm/pageop.c Modified: trunk/reactos/ntoskrnl/mm/anonmem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/anonmem.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/anonmem.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/anonmem.c [iso-8859-1] Tue Nov 22 22:01:06 2011 @@ -420,16 +420,42 @@ OldProtect != NewProtect) { ULONG i; + PMM_PAGEOP PageOp; + PMEMORY_AREA MArea; + char* addr = (char*)BaseAddress; for (i=0; i < PAGE_ROUND_UP(RegionSize)/PAGE_SIZE; i++) { - if (MmIsPagePresent(Process, - (char*)BaseAddress + (i*PAGE_SIZE))) + MArea = MmLocateMemoryAreaByAddress(AddressSpace, addr); + do { - MmSetPageProtect(Process, - (char*)BaseAddress + (i*PAGE_SIZE), - NewProtect); + PageOp = MmGetPageOp(MArea, Process->UniqueProcessId, addr, + NULL, 0, MM_PAGEOP_CHANGEPROTECT, TRUE); + } while(PageOp == NULL); + + /* Should we enable/disable virtual mapping? */ + if((NewProtect & PAGE_NOACCESS) && + !(OldProtect & PAGE_NOACCESS) && + (MmIsPagePresent(Process, addr))) + { + /* Set other flags if any */ + if(NewProtect != PAGE_NOACCESS) + MmSetPageProtect(Process, addr, NewProtect & ~PAGE_NOACCESS); + MmDisableVirtualMapping(Process, addr, NULL, NULL); } + else if((OldProtect & PAGE_NOACCESS) && !(NewProtect & PAGE_NOACCESS)) + { + MmEnableVirtualMapping(Process, addr); + } + + /* Set new protection flags */ + if(MmIsPagePresent(Process, addr)) + { + MmSetPageProtect(Process, addr, NewProtect); + } + KeSetEvent(&PageOp->CompletionEvent, IO_NO_INCREMENT, FALSE); + MmReleasePageOp(PageOp); + addr += PAGE_SIZE; } } } Modified: trunk/reactos/ntoskrnl/mm/i386/page.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/i386/page.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/i386/page.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/i386/page.c [iso-8859-1] Tue Nov 22 22:01:06 2011 @@ -304,21 +304,17 @@ MmReleasePageMemoryConsumer(MC_SYSTEM, Pfn); } InterlockedExchangePte(PageDir, MmGlobalKernelPageDirectory[PdeOffset]); - /* Flush it before accessing it */ - KeInvalidateTlbEntry(MiPteToAddress(PageDir)); RtlZeroMemory(MiPteToAddress(PageDir), PAGE_SIZE); return (PULONG)MiAddressToPte(Address); } InterlockedExchangePte(PageDir, MmGlobalKernelPageDirectory[PdeOffset]); - /* Flush it before accessing it */ - KeInvalidateTlbEntry(MiPteToAddress(PageDir)); } return (PULONG)MiAddressToPte(Address); } BOOLEAN MmUnmapPageTable(PULONG Pt) { - if (Pt >= (PULONG)PAGETABLE_MAP && Pt < (PULONG)PAGETABLE_MAP + 1024*1024) + if (!IS_HYPERSPACE(Pt)) { return TRUE; } @@ -383,7 +379,10 @@ Pte = *Pt; } while (Pte != InterlockedCompareExchangePte(Pt, Pte & ~PA_PRESENT, Pte)); - MiFlushTlb(Pt, Address); + if(Pte & PA_PRESENT) + MiFlushTlb(Pt, Address); + else + MmUnmapPageTable(Pt); WasValid = (PAGE_MASK(Pte) != 0); if (!WasValid) @@ -457,16 +456,17 @@ */ Pte = InterlockedExchangePte(Pt, 0); - MiFlushTlb(Pt, Address); WasValid = (PAGE_MASK(Pte) != 0); if (WasValid) { Pfn = PTE_TO_PFN(Pte); + MiFlushTlb(Pt, Address); } else { Pfn = 0; + MmUnmapPageTable(Pt); } if (FreePage && WasValid) @@ -523,7 +523,13 @@ */ Pte = InterlockedExchangePte(Pt, 0); - MiFlushTlb(Pt, Address); + //MiFlushTlb(Pt, Address); + MmUnmapPageTable(Pt); + + if(!(Pte & 0x800)) + { + KeBugCheck(MEMORY_MANAGEMENT); + } /* * Return some information to the caller @@ -632,8 +638,14 @@ Pt = MmGetPageTableForProcess(Process, Address, FALSE); if (Pt == NULL) { - KeBugCheck(MEMORY_MANAGEMENT); - } + //HACK to get DPH working, waiting for MM rewrite :-/ + //KeBugCheck(MEMORY_MANAGEMENT); + return; + } + + /* Do not mark a 0 page as present */ + if(0 == InterlockedCompareExchangePte(Pt, 0, 0)) + return; do { @@ -695,9 +707,13 @@ { KeBugCheck(MEMORY_MANAGEMENT); } - Pte = *Pt; - InterlockedExchangePte(Pt, SwapEntry << 1); - MiFlushTlb(Pt, Address); + Pte = InterlockedExchangePte(Pt, SwapEntry << 1); + if(PAGE_MASK(Pte)) + { + KeBugCheck(MEMORY_MANAGEMENT); + } + //MiFlushTlb(Pt, Address); + MmUnmapPageTable(Pt); return(STATUS_SUCCESS); } @@ -792,19 +808,19 @@ } oldPdeOffset = PdeOffset; - Pte = *Pt; + Pte = InterlockedExchangePte(Pt, PFN_TO_PTE(Pages[i]) | Attributes);; /* There should not be anything valid here */ - if ((Pte & PA_PRESENT) || (Pte & 0x800)) - { + if (PAGE_MASK(Pte) != 0) + { + PMMPFN Pfn1 = MiGetPfnEntry(PTE_TO_PFN(Pte)); + (void)Pfn1; DPRINT1("Bad PTE %lx\n", Pte); KeBugCheck(MEMORY_MANAGEMENT); } - InterlockedExchangePte(Pt, PFN_TO_PTE(Pages[i]) | Attributes); /* flush if currently mapped, just continue editing if hyperspace - * NOTE : Do not call MiFlushTlb, as it will unmap the page table, - * and we might need it afterwards */ - if (Address >= MmSystemRangeStart || - (Pt >= (PULONG)PAGETABLE_MAP && Pt < (PULONG)PAGETABLE_MAP + 1024*1024)) + * NOTE : This check is similar to what is done in MiFlushTlb, but we + * don't use it because it would unmap the page table */ + if (Addr >= MmSystemRangeStart || (!IS_HYPERSPACE(Pt))) { KeInvalidateTlbEntry(Addr); } @@ -889,6 +905,7 @@ { ULONG Attributes = 0; PULONG Pt; + ULONG Pte; DPRINT("MmSetPageProtect(Process %x Address %x flProtect %x)\n", Process, Address, flProtect); @@ -910,8 +927,17 @@ { KeBugCheck(MEMORY_MANAGEMENT); } - InterlockedExchangePte(Pt, PAGE_MASK(*Pt) | Attributes | (*Pt & (PA_ACCESSED|PA_DIRTY))); - MiFlushTlb(Pt, Address); + Pte = InterlockedExchangePte(Pt, PAGE_MASK(*Pt) | Attributes | (*Pt & (PA_ACCESSED|PA_DIRTY))); + + if(!PAGE_MASK(Pte)) + { + DPRINT1("Invalid Pte %lx\n", Pte); + __debugbreak(); + } + if((Pte & Attributes) != Attributes) + MiFlushTlb(Pt, Address); + else + MmUnmapPageTable(Pt); } /* Modified: trunk/reactos/ntoskrnl/mm/pageop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/pageop.c?rev=5… ============================================================================== --- trunk/reactos/ntoskrnl/mm/pageop.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/pageop.c [iso-8859-1] Tue Nov 22 22:01:06 2011 @@ -145,6 +145,8 @@ ULONG_PTR Hash; KIRQL oldIrql; PMM_PAGEOP PageOp; + + Address = (PVOID)PAGE_ROUND_DOWN(Address); /* * Calcuate the hash value for pageop structure

1 0

[rharabien] 54476: - Partially revert r54475 to check if it fixes KVM
by rharabien＠svn.reactos.org 22 Nov '11

22 Nov '11

Author: rharabien Date: Tue Nov 22 20:11:55 2011 New Revision: 54476 URL: http://svn.reactos.org/svn/reactos?rev=54476&view=rev Log: - Partially revert r54475 to check if it fixes KVM Modified: trunk/reactos/dll/win32/kernel32/client/proc.c trunk/reactos/subsystems/win32/csrss/win32csr/handle.c Modified: trunk/reactos/dll/win32/kernel32/client/proc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/proc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/proc.c [iso-8859-1] Tue Nov 22 20:11:55 2011 @@ -2902,7 +2902,7 @@ if (!NT_SUCCESS(Status)) { - DPRINT1("CSR Notification Failed"); + DPRINT1("CSR Notification Failed\n"); BaseSetLastNTError(Status); goto Cleanup; } Modified: trunk/reactos/subsystems/win32/csrss/win32csr/handle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/handle.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/handle.c [iso-8859-1] Tue Nov 22 20:11:55 2011 @@ -158,8 +158,8 @@ LeaveCriticalSection(&Console->Lock); if (_InterlockedDecrement(&Console->ReferenceCount) == 0) ConioDeleteConsole(&Console->Header); - CloseHandle(ProcessData->ConsoleEvent); - ProcessData->ConsoleEvent = NULL; + //CloseHandle(ProcessData->ConsoleEvent); + //ProcessData->ConsoleEvent = NULL; RtlLeaveCriticalSection(&ProcessData->HandleTableLock); return STATUS_SUCCESS; }

1 0

[rharabien] 54475: [WIN32CSR] - Fix process reference leak in case of GuiConsoleOpenUserRegistryPathPerProcessId failing to open registry key. Fixes console processes in LiveCD being ghosts.
by rharabien＠svn.reactos.org 22 Nov '11

22 Nov '11

Author: rharabien Date: Tue Nov 22 18:49:40 2011 New Revision: 54475 URL: http://svn.reactos.org/svn/reactos?rev=54475&view=rev Log: [WIN32CSR] - Fix process reference leak in case of GuiConsoleOpenUserRegistryPathPerProcessId failing to open registry key. Fixes console processes in LiveCD being ghosts. Modified: trunk/reactos/subsystems/win32/csrss/win32csr/console.c trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c trunk/reactos/subsystems/win32/csrss/win32csr/handle.c Modified: trunk/reactos/subsystems/win32/csrss/win32csr/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/console.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/console.c [iso-8859-1] Tue Nov 22 18:49:40 2011 @@ -140,7 +140,7 @@ GuiMode = TRUE; } } - if (GuiMode) + else /* GuiMode */ { Status = GuiInitConsole(Console, ShowCmd); if (! NT_SUCCESS(Status)) Modified: trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c [iso-8859-1] Tue Nov 22 18:49:40 2011 @@ -215,8 +215,8 @@ if (!GetTokenInformation(hProcessToken, TokenUser, (PVOID)Buffer, sizeof(Buffer), &Length)) { DPRINT("Error: GetTokenInformation failed(0x%x)\n",GetLastError()); + CloseHandle(hProcessToken); CloseHandle(hProcess); - CloseHandle(hProcessToken); return FALSE; } @@ -224,6 +224,8 @@ if (!NT_SUCCESS(RtlConvertSidToUnicodeString(&SidName, TokUser, TRUE))) { DPRINT("Error: RtlConvertSidToUnicodeString failed(0x%x)\n", GetLastError()); + CloseHandle(hProcessToken); + CloseHandle(hProcess); return FALSE; } @@ -231,15 +233,18 @@ RtlFreeUnicodeString(&SidName); CloseHandle(hProcessToken); + if (res != ERROR_SUCCESS) + { + CloseHandle(hProcess); + return FALSE; + } + if (hProcHandle) *hProcHandle = hProcess; else CloseHandle(hProcess); - if (res != ERROR_SUCCESS) - return FALSE; - else - return TRUE; + return TRUE; } static BOOL @@ -285,7 +290,7 @@ if (!fLength) { - DPRINT("GetProcessImageFileNameW failed(0x%x)ProcessId %d\n", GetLastError(),hProcess); + DPRINT("GetProcessImageFileNameW failed(0x%x)ProcessId %d\n", GetLastError(), ProcessId); return FALSE; } /* @@ -2310,7 +2315,7 @@ NULL); if (NULL == ThreadHandle) { - NtClose(GraphicsStartupEvent); + CloseHandle(GraphicsStartupEvent); DPRINT1("Win32Csr: Failed to create graphics console thread. Expect problems\n"); return STATUS_UNSUCCESSFUL; } Modified: trunk/reactos/subsystems/win32/csrss/win32csr/handle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/handle.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/handle.c [iso-8859-1] Tue Nov 22 18:49:40 2011 @@ -158,6 +158,8 @@ LeaveCriticalSection(&Console->Lock); if (_InterlockedDecrement(&Console->ReferenceCount) == 0) ConioDeleteConsole(&Console->Header); + CloseHandle(ProcessData->ConsoleEvent); + ProcessData->ConsoleEvent = NULL; RtlLeaveCriticalSection(&ProcessData->HandleTableLock); return STATUS_SUCCESS; }

1 0

[rharabien] 54474: [EXPLORER] - Close thread handle for startup processes in Run and RunOnce keys. Fixes cmd.exe ghost on first bootcd explorer startup.
by rharabien＠svn.reactos.org 22 Nov '11

22 Nov '11

Author: rharabien Date: Tue Nov 22 15:07:27 2011 New Revision: 54474 URL: http://svn.reactos.org/svn/reactos?rev=54474&view=rev Log: [EXPLORER] - Close thread handle for startup processes in Run and RunOnce keys. Fixes cmd.exe ghost on first bootcd explorer startup. Modified: trunk/reactos/base/shell/explorer/services/startup.c Modified: trunk/reactos/base/shell/explorer/services/startup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/servic… ============================================================================== --- trunk/reactos/base/shell/explorer/services/startup.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/services/startup.c [iso-8859-1] Tue Nov 22 15:07:27 2011 @@ -267,6 +267,7 @@ GetExitCodeProcess(info.hProcess, &exit_code); } + CloseHandle(info.hThread); CloseHandle(info.hProcess); return exit_code;

1 0

[dgorbachev] 54473: [NTOSKRNL|KDCOM] Allow to specify the serial port address, as requested by people on the forum.
by dgorbachev＠svn.reactos.org 22 Nov '11

22 Nov '11

Author: dgorbachev Date: Tue Nov 22 02:30:16 2011 New Revision: 54473 URL: http://svn.reactos.org/svn/reactos?rev=54473&view=rev Log: [NTOSKRNL|KDCOM] Allow to specify the serial port address, as requested by people on the forum. Modified: trunk/reactos/drivers/base/kdcom/i386/kdbg.c trunk/reactos/ntoskrnl/kd/kdinit.c Modified: trunk/reactos/drivers/base/kdcom/i386/kdbg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdcom/i386/kd… ============================================================================== --- trunk/reactos/drivers/base/kdcom/i386/kdbg.c [iso-8859-1] (original) +++ trunk/reactos/drivers/base/kdcom/i386/kdbg.c [iso-8859-1] Tue Nov 22 02:30:16 2011 @@ -258,19 +258,27 @@ if (PortInformation->BaudRate == 0) PortInformation->BaudRate = DEFAULT_BAUD_RATE; - if (PortInformation->ComPort == 0) + if (PortInformation->ComPort != 0) + { + if (!KdpDoesComPortExist(BaseArray[PortInformation->ComPort])) + { + sprintf(buffer, + "\nKernel Debugger: Serial port not found!\n\n"); + HalDisplayString(buffer); + return FALSE; + } + + ComPortBase = BaseArray[PortInformation->ComPort]; + PortInformation->BaseAddress = ComPortBase; + } + else + { + ComPortBase = PortInformation->BaseAddress; + } + + if (ComPortBase == 0) return FALSE; - if (!KdpDoesComPortExist(BaseArray[PortInformation->ComPort])) - { - sprintf(buffer, - "\nKernel Debugger: Serial port not found!\n\n"); - HalDisplayString(buffer); - return FALSE; - } - - ComPortBase = BaseArray[PortInformation->ComPort]; - PortInformation->BaseAddress = ComPortBase; #ifndef NDEBUG sprintf(buffer, "\nSerial port COM%ld found at 0x%lx\n", Modified: trunk/reactos/ntoskrnl/kd/kdinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd/kdinit.c?rev=5… ============================================================================== --- trunk/reactos/ntoskrnl/kd/kdinit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd/kdinit.c [iso-8859-1] Tue Nov 22 02:30:16 2011 @@ -64,15 +64,29 @@ { /* Gheck for a valid Serial Port */ p2 += 3; - Value = (ULONG)atol(p2); - if (Value > 0 && Value < 5) - { - /* Valid port found, enable Serial Debugging */ - KdpDebugMode.Serial = TRUE; - - /* Set the port to use */ - SerialPortInfo.ComPort = Value; - KdpPort = Value; + if (*p2 != ':') + { + Value = (ULONG)atol(p2); + if (Value > 0 && Value < 5) + { + /* Valid port found, enable Serial Debugging */ + KdpDebugMode.Serial = TRUE; + + /* Set the port to use */ + SerialPortInfo.ComPort = Value; + KdpPort = Value; + } + } + else + { + Value = strtoul(p2 + 1, NULL, 0); + if (Value) + { + KdpDebugMode.Serial = TRUE; + SerialPortInfo.BaseAddress = Value; + SerialPortInfo.ComPort = 0; + KdpPort = 0; + } } }

1 0

[jgardou] 54472: [HALx86] - Fix the fix (do not truncate ULONGLONG value)
by jgardou＠svn.reactos.org 21 Nov '11

21 Nov '11

Author: jgardou Date: Mon Nov 21 12:30:01 2011 New Revision: 54472 URL: http://svn.reactos.org/svn/reactos?rev=54472&view=rev Log: [HALx86] - Fix the fix (do not truncate ULONGLONG value) Modified: trunk/reactos/hal/halx86/generic/memory.c Modified: trunk/reactos/hal/halx86/generic/memory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/memory.… ============================================================================== --- trunk/reactos/hal/halx86/generic/memory.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/memory.c [iso-8859-1] Mon Nov 21 12:30:01 2011 @@ -190,7 +190,7 @@ { /* Fill out the PTE */ PointerPte = HalAddressToPte(BaseAddress); - PointerPte->PageFrameNumber = (ULONG_PTR)PhysicalAddress.QuadPart >> PAGE_SHIFT; + PointerPte->PageFrameNumber = (PFN_NUMBER)(PhysicalAddress.QuadPart >> PAGE_SHIFT); PointerPte->Valid = 1; PointerPte->Write = 1;

1 0

[jgardou] 54471: [HALx86] - Hey Arch, it's an USHORT!
by jgardou＠svn.reactos.org 21 Nov '11

21 Nov '11

Author: jgardou Date: Mon Nov 21 12:17:57 2011 New Revision: 54471 URL: http://svn.reactos.org/svn/reactos?rev=54471&view=rev Log: [HALx86] - Hey Arch, it's an USHORT! Modified: trunk/reactos/hal/halx86/generic/bios.c Modified: trunk/reactos/hal/halx86/generic/bios.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/bios.c?… ============================================================================== --- trunk/reactos/hal/halx86/generic/bios.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/bios.c [iso-8859-1] Mon Nov 21 12:17:57 2011 @@ -377,7 +377,7 @@ NTAPI HalpStoreAndClearIopm(VOID) { - ULONG i, j; + USHORT i, j; PUSHORT Entry = HalpSavedIoMap; // @@ -394,7 +394,7 @@ // Save it // ASSERT(j < 32); - HalpSavedIoMapData[j][0] = (UCHAR)i; + HalpSavedIoMapData[j][0] = i; HalpSavedIoMapData[j][1] = *Entry; j++; }

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