Ros-diffs November 2011

ros-diffs@reactos.org

16 participants
274 discussions

[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

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;

12 years, 11 months

[dgorbachev] 54473: [NTOSKRNL|KDCOM] Allow to specify the serial port address, as requested by people on the forum.

by dgorbachev＠svn.reactos.org

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

12 years, 11 months

[jgardou] 54472: [HALx86] - Fix the fix (do not truncate ULONGLONG value)

by jgardou＠svn.reactos.org

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;

12 years, 11 months

[jgardou] 54471: [HALx86] - Hey Arch, it's an USHORT!

by jgardou＠svn.reactos.org

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

12 years, 11 months

[jgardou] 54470: [HALx86] - fix various compiler warnings (msvc) - fix a bug, where only the last IO map entry would be saved

by jgardou＠svn.reactos.org

Author: jgardou Date: Mon Nov 21 12:04:16 2011 New Revision: 54470 URL: http://svn.reactos.org/svn/reactos?rev=54470&view=rev Log: [HALx86] - fix various compiler warnings (msvc) - fix a bug, where only the last IO map entry would be saved Modified: trunk/reactos/hal/halx86/generic/beep.c trunk/reactos/hal/halx86/generic/bios.c trunk/reactos/hal/halx86/generic/memory.c trunk/reactos/hal/halx86/generic/usage.c trunk/reactos/hal/halx86/up/pic.c Modified: trunk/reactos/hal/halx86/generic/beep.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/beep.c?… ============================================================================== --- trunk/reactos/hal/halx86/generic/beep.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/beep.c [iso-8859-1] Mon Nov 21 12:04:16 2011 @@ -91,7 +91,7 @@ // Next we write the reload value for channel 2 // __outbyte(TIMER_CHANNEL2_DATA_PORT, Divider & 0xFF); - __outbyte(TIMER_CHANNEL2_DATA_PORT, Divider >> 8); + __outbyte(TIMER_CHANNEL2_DATA_PORT, (Divider >> 8) & 0xFF); // // Reconnect the speaker to the timer and re-enable the output pin 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:04:16 2011 @@ -394,8 +394,9 @@ // Save it // ASSERT(j < 32); - HalpSavedIoMapData[j][0] = i; + HalpSavedIoMapData[j][0] = (UCHAR)i; HalpSavedIoMapData[j][1] = *Entry; + j++; } // @@ -656,7 +657,7 @@ // invalid op-code handler. // IdtPte = HalAddressToPte(((PKIPCR)KeGetPcr())->IDT); - RestoreWriteProtection = IdtPte->Write; + RestoreWriteProtection = IdtPte->Write != 0; IdtPte->Write = 1; // 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:04:16 2011 @@ -190,7 +190,7 @@ { /* Fill out the PTE */ PointerPte = HalAddressToPte(BaseAddress); - PointerPte->PageFrameNumber = PhysicalAddress.QuadPart >> PAGE_SHIFT; + PointerPte->PageFrameNumber = (ULONG_PTR)PhysicalAddress.QuadPart >> PAGE_SHIFT; PointerPte->Valid = 1; PointerPte->Write = 1; Modified: trunk/reactos/hal/halx86/generic/usage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/usage.c… ============================================================================== --- trunk/reactos/hal/halx86/generic/usage.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/usage.c [iso-8859-1] Mon Nov 21 12:04:16 2011 @@ -288,7 +288,7 @@ { /* Then register it for internal usage */ HalpIDTUsageFlags[i].Flags = IDT_INTERNAL; - HalpIDTUsage[i].BusReleativeVector = i; + HalpIDTUsage[i].BusReleativeVector = (UCHAR)i; } } @@ -499,7 +499,7 @@ /* Save the vector data */ HalpIDTUsage[SystemVector].Irql = Irql; - HalpIDTUsage[SystemVector].BusReleativeVector = BusVector; + HalpIDTUsage[SystemVector].BusReleativeVector = (UCHAR)BusVector; } #ifndef _MINIHAL_ Modified: trunk/reactos/hal/halx86/up/pic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/up/pic.c?rev=54… ============================================================================== --- trunk/reactos/hal/halx86/up/pic.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/up/pic.c [iso-8859-1] Mon Nov 21 12:04:16 2011 @@ -678,7 +678,7 @@ if (PendingIrql > DISPATCH_LEVEL) { /* Set new PIC mask */ - Mask.Both = Pcr->IDR; + Mask.Both = Pcr->IDR & 0xFFFF; __outbyte(PIC1_DATA_PORT, Mask.Master); __outbyte(PIC2_DATA_PORT, Mask.Slave); @@ -761,7 +761,7 @@ if (PendingIrql > DISPATCH_LEVEL) { /* Set new PIC mask */ - Mask.Both = Pcr->IDR; + Mask.Both = Pcr->IDR & 0xFFFF; __outbyte(PIC1_DATA_PORT, Mask.Master); __outbyte(PIC2_DATA_PORT, Mask.Slave); @@ -815,7 +815,7 @@ if (Irq > 8) { /* Send the EOI for the IRQ */ - __outbyte(PIC2_CONTROL_PORT, Ocw2.Bits | (Irq - 8)); + __outbyte(PIC2_CONTROL_PORT, Ocw2.Bits | ((Irq - 8) & 0xFF)); /* Send the EOI for IRQ2 on the master because this was cascaded */ __outbyte(PIC1_CONTROL_PORT, Ocw2.Bits | 2); @@ -823,7 +823,7 @@ else { /* Send the EOI for the IRQ */ - __outbyte(PIC1_CONTROL_PORT, Ocw2.Bits | Irq); + __outbyte(PIC1_CONTROL_PORT, Ocw2.Bits | (Irq &0xFF)); } /* Enable interrupts and return success */ @@ -835,7 +835,7 @@ Pcr->IRR |= (1 << (Irq + 4)); /* Set new PIC mask to real IRQL level, since the optimization is lost now */ - Mask.Both = KiI8259MaskTable[CurrentIrql] | Pcr->IDR; + Mask.Both = (KiI8259MaskTable[CurrentIrql] | Pcr->IDR) & 0xFFFF; __outbyte(PIC1_DATA_PORT, Mask.Master); __outbyte(PIC2_DATA_PORT, Mask.Slave); @@ -941,7 +941,7 @@ PKPCR Pcr = KeGetPcr(); /* Update the PIC */ - Mask.Both = KiI8259MaskTable[Irql] | Pcr->IDR; + Mask.Both = (KiI8259MaskTable[Irql] | Pcr->IDR) & 0xFFFF; __outbyte(PIC1_DATA_PORT, Mask.Master); __outbyte(PIC2_DATA_PORT, Mask.Slave); @@ -959,7 +959,7 @@ if (Irq > 8) { /* Send the EOI for the IRQ */ - __outbyte(PIC2_CONTROL_PORT, Ocw2.Bits | (Irq - 8)); + __outbyte(PIC2_CONTROL_PORT, Ocw2.Bits | ((Irq - 8) & 0xFF)); /* Send the EOI for IRQ2 on the master because this was cascaded */ __outbyte(PIC1_CONTROL_PORT, Ocw2.Bits | 2); @@ -967,7 +967,7 @@ else { /* Send the EOI for the IRQ */ - __outbyte(PIC1_CONTROL_PORT, Ocw2.Bits | Irq); + __outbyte(PIC1_CONTROL_PORT, Ocw2.Bits | (Irq & 0xFF)); } /* Check if this interrupt should be allowed to happen */ @@ -1129,7 +1129,7 @@ Pcr->IDR &= ~(1 << Irq); /* Set new PIC mask */ - PicMask.Both = KiI8259MaskTable[Pcr->Irql] | Pcr->IDR; + PicMask.Both = (KiI8259MaskTable[Pcr->Irql] | Pcr->IDR) & 0xFFFF; __outbyte(PIC1_DATA_PORT, PicMask.Master); __outbyte(PIC2_DATA_PORT, PicMask.Slave); @@ -1219,7 +1219,7 @@ if (PendingIrql > DISPATCH_LEVEL) { /* Set new PIC mask */ - Mask.Both = Pcr->IDR; + Mask.Both = Pcr->IDR & 0xFFFF; __outbyte(PIC1_DATA_PORT, Mask.Master); __outbyte(PIC2_DATA_PORT, Mask.Slave); @@ -1371,7 +1371,7 @@ if (PendingIrql > DISPATCH_LEVEL) { /* Set new PIC mask */ - Mask.Both = Pcr->IDR; + Mask.Both = Pcr->IDR & 0xFFFF; __outbyte(PIC1_DATA_PORT, Mask.Master); __outbyte(PIC2_DATA_PORT, Mask.Slave);

12 years, 11 months

[dgorbachev] 54469: [Translation] Changes in a registry file by Stefan Fulea (Romanian). Bug #6677.

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Mon Nov 21 06:03:39 2011 New Revision: 54469 URL: http://svn.reactos.org/svn/reactos?rev=54469&view=rev Log: [Translation] Changes in a registry file by Stefan Fulea (Romanian). Bug #6677. Modified: trunk/reactos/boot/bootdata/hivedef_i386.inf Modified: trunk/reactos/boot/bootdata/hivedef_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivedef_i386… ============================================================================== Binary files - no diff available.

12 years, 11 months

[dgorbachev] 54468: [NTOSKRNL] - Do not repeat messages into serial port even when using other debug methods. - Allow to specify debug log file name. - When using the "Screen" method, show blue scr...

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Mon Nov 21 05:28:08 2011 New Revision: 54468 URL: http://svn.reactos.org/svn/reactos?rev=54468&view=rev Log: [NTOSKRNL] - Do not repeat messages into serial port even when using other debug methods. - Allow to specify debug log file name. - When using the "Screen" method, show blue screen when entering KDB. - Disable the repetition of previous KDB command with long many-page output. [USETUP] - Add "ReactOS (Screen)" entry to boot menu. Modified: trunk/reactos/base/setup/usetup/bootsup.c trunk/reactos/boot/bootdata/autorun.inf (contents, props changed) trunk/reactos/boot/bootdata/bootcd.ini (contents, props changed) trunk/reactos/boot/bootdata/livecd.ini (contents, props changed) trunk/reactos/media/drivers/etc/KDBinit (contents, props changed) trunk/reactos/media/drivers/etc/hosts (props changed) trunk/reactos/ntoskrnl/kd/kdinit.c trunk/reactos/ntoskrnl/kd/kdio.c trunk/reactos/ntoskrnl/kdbg/kdb.c trunk/reactos/ntoskrnl/kdbg/kdb_cli.c Modified: trunk/reactos/base/setup/usetup/bootsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/bootsup.… ============================================================================== --- trunk/reactos/base/setup/usetup/bootsup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/bootsup.c [iso-8859-1] Mon Nov 21 05:28:08 2011 @@ -486,6 +486,12 @@ L"/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS /KDSERIAL"); #endif + /* ReactOS_Screen */ + CreateFreeLoaderEntry(IniCache, IniSection, + L"ReactOS_Screen", L"\"ReactOS (Screen)\"", + L"Windows2003", ArcPath, + L"/DEBUG /DEBUGPORT=SCREEN /SOS"); + /* ReactOS_LogFile */ CreateFreeLoaderEntry(IniCache, IniSection, L"ReactOS_LogFile", L"\"ReactOS (Log file)\"", Modified: trunk/reactos/boot/bootdata/autorun.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/autorun.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/autorun.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/autorun.inf [iso-8859-1] Mon Nov 21 05:28:08 2011 @@ -1,4 +1,3 @@ -[autorun] - -open=reactos\welcome.exe -icon=icon.ico +[autorun] +open=reactos\welcome.exe +icon=icon.ico Propchange: trunk/reactos/boot/bootdata/autorun.inf ------------------------------------------------------------------------------ --- svn:eol-style (original) +++ svn:eol-style Mon Nov 21 05:28:08 2011 @@ -1,1 +1,1 @@ -native +CRLF Modified: trunk/reactos/boot/bootdata/bootcd.ini URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/bootcd.ini?r… ============================================================================== --- trunk/reactos/boot/bootdata/bootcd.ini [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/bootcd.ini [iso-8859-1] Mon Nov 21 05:28:08 2011 @@ -1,32 +1,31 @@ -[FREELOADER] -DefaultOS=Setup -Timeout=0 - -[Display] -TitleText=ReactOS Setup -StatusBarColor=Cyan -StatusBarTextColor=Black -BackdropTextColor=White -BackdropColor=Blue -BackdropFillStyle=Medium -TitleBoxTextColor=White -TitleBoxColor=Red -MessageBoxTextColor=White -MessageBoxColor=Blue -MenuTextColor=Gray -MenuColor=Black -TextColor=Gray -SelectedTextColor=Black -SelectedColor=Gray -ShowTime=No -MenuBox=No -CenterMenu=No -MinimalUI=Yes -TimeText=Seconds until highlighted choice will be started automatically: - -[Operating Systems] -Setup="Setup" - -[Setup] -BootType=ReactOSSetup - +[FREELOADER] +DefaultOS=Setup +TimeOut=0 + +[Display] +TitleText=ReactOS Setup +StatusBarColor=Cyan +StatusBarTextColor=Black +BackdropTextColor=White +BackdropColor=Blue +BackdropFillStyle=Medium +TitleBoxTextColor=White +TitleBoxColor=Red +MessageBoxTextColor=White +MessageBoxColor=Blue +MenuTextColor=Gray +MenuColor=Black +TextColor=Gray +SelectedTextColor=Black +SelectedColor=Gray +ShowTime=No +MenuBox=No +CenterMenu=No +MinimalUI=Yes +TimeText=Seconds until highlighted choice will be started automatically: + +[Operating Systems] +Setup="Setup" + +[Setup] +BootType=ReactOSSetup Propchange: trunk/reactos/boot/bootdata/bootcd.ini ------------------------------------------------------------------------------ --- svn:eol-style (original) +++ svn:eol-style Mon Nov 21 05:28:08 2011 @@ -1,1 +1,1 @@ -native +CRLF Modified: trunk/reactos/boot/bootdata/livecd.ini URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/livecd.ini?r… ============================================================================== --- trunk/reactos/boot/bootdata/livecd.ini [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/livecd.ini [iso-8859-1] Mon Nov 21 05:28:08 2011 @@ -1,28 +1,51 @@ -[FREELOADER] -DefaultOS=ReactOS -Timeout=1 - -[Display] -TitleText=ReactOS Boot Manager -StatusBarColor=Cyan -StatusBarTextColor=Black -BackdropTextColor=White -BackdropColor=Blue -BackdropFillStyle=Medium -TitleBoxTextColor=White -TitleBoxColor=Red -MessageBoxTextColor=White -MessageBoxColor=Blue -MenuTextColor=White -MenuColor=Blue -TextColor=Yellow -SelectedTextColor=Black -SelectedColor=Gray - -[Operating Systems] -ReactOS="ReactOS" - -[ReactOS] -BootType=Windows2003 -SystemPath=LiveCD\reactos -Options=/DEBUGPORT=COM1 /SOS /MININT +[FREELOADER] +DefaultOS=LiveCD_Debug +TimeOut=3 + +[Display] +TitleText=ReactOS LiveCD +StatusBarColor=Cyan +StatusBarTextColor=Black +BackdropTextColor=White +BackdropColor=Blue +BackdropFillStyle=Medium +TitleBoxTextColor=White +TitleBoxColor=Red +MessageBoxTextColor=White +MessageBoxColor=Blue +MenuTextColor=Gray +MenuColor=Black +TextColor=Gray +SelectedTextColor=Black +SelectedColor=Gray +ShowTime=No +MenuBox=No +CenterMenu=No +MinimalUI=Yes +TimeText=Seconds until highlighted choice will be started automatically: + +[Operating Systems] +LiveCD="LiveCD" +LiveCD_Debug="LiveCD (Debug)" +LiveCD_Screen="LiveCD (Screen)" +LiveCD_LogFile="LiveCD (Log file)" + +[LiveCD] +BootType=Windows2003 +SystemPath=LiveCD\reactos +Options=/MININT + +[LiveCD_Debug] +BootType=Windows2003 +SystemPath=LiveCD\reactos +Options=/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS /MININT + +[LiveCD_Screen] +BootType=Windows2003 +SystemPath=LiveCD\reactos +Options=/DEBUG /DEBUGPORT=SCREEN /SOS /MININT + +[LiveCD_LogFile] +BootType=Windows2003 +SystemPath=LiveCD\reactos +Options=/DEBUG /DEBUGPORT=FILE:\Device\HarddiskX\PartitionY\debug.log /SOS /MININT Propchange: trunk/reactos/boot/bootdata/livecd.ini ------------------------------------------------------------------------------ --- svn:eol-style (original) +++ svn:eol-style Mon Nov 21 05:28:08 2011 @@ -1,1 +1,1 @@ -native +CRLF Modified: trunk/reactos/media/drivers/etc/KDBinit URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/drivers/etc/KDBinit?… ============================================================================== --- trunk/reactos/media/drivers/etc/KDBinit [iso-8859-1] (original) +++ trunk/reactos/media/drivers/etc/KDBinit [iso-8859-1] Mon Nov 21 05:28:08 2011 @@ -1,14 +1,13 @@ -# Example KDB.init file -# -# - -# Set the disassembly flavor to "intel" (default is "at&t") -set syntax intel - -# Change the condition to enter KDB on INT3 to "always" (default is "kmode") -# set condition INT3 first always - -# This is a special command available only in the KDBinit file - it breaks into -# KDB when it is interpreting the init file at startup. -#break - +# Example KDB.init file +# + +# Set the disassembly flavor to "intel" (default is "at&t") +set syntax intel + +# Change the condition to enter KDB on INT3 to "always" (default is "kmode") +#set condition INT3 first always + +# This is a special command available only in the KDBinit file - it breaks into +# KDB when it is interpreting the init file at startup. +#break + Propchange: trunk/reactos/media/drivers/etc/KDBinit ------------------------------------------------------------------------------ --- svn:eol-style (original) +++ svn:eol-style Mon Nov 21 05:28:08 2011 @@ -1,1 +1,1 @@ -native +CRLF Propchange: trunk/reactos/media/drivers/etc/hosts ------------------------------------------------------------------------------ svn:eol-style = CRLF 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] Mon Nov 21 05:28:08 2011 @@ -40,6 +40,8 @@ KdpBochsInit, KdpKdbgInit}; +extern ANSI_STRING KdpLogFileName; + /* PRIVATE FUNCTIONS *********************************************************/ PCHAR @@ -47,7 +49,7 @@ INIT_FUNCTION KdpGetDebugMode(PCHAR Currentp2) { - PCHAR p2 = Currentp2; + PCHAR p1, p2 = Currentp2; ULONG Value; /* Check for Screen Debugging */ @@ -73,12 +75,21 @@ KdpPort = Value; } } + /* Check for Debug Log Debugging */ else if (!_strnicmp(p2, "FILE", 4)) { /* Enable It */ p2 += 4; KdpDebugMode.File = TRUE; + if (*p2 == ':') + { + p2++; + p1 = p2; + while (*p2 != '\0' && *p2 != ' ') p2++; + KdpLogFileName.MaximumLength = KdpLogFileName.Length = p2 - p1; + KdpLogFileName.Buffer = p1; + } } /* Check for BOCHS Debugging */ @@ -171,11 +182,9 @@ else if (strstr(CommandLine, "CRASHDEBUG")) KdDebuggerEnabled = FALSE; else if (strstr(CommandLine, "DEBUG")) { - /* Enable on the serial port */ + /* Enable the kernel debugger */ KdDebuggerEnabled = TRUE; KdDebuggerNotPresent = FALSE; - KdpDebugMode.Serial = TRUE; - #ifdef KDBG /* Get the KDBG Settings */ KdbpGetCommandLineSettings(LoaderBlock->LoadOptions); @@ -201,6 +210,10 @@ Port = KdpGetDebugMode(Port); Port = strstr(Port, "DEBUGPORT"); } + + /* Use serial port then */ + if (KdDebuggerEnabled && KdpDebugMode.Value == 0) + KdpDebugMode.Serial = TRUE; /* Check if we got a baud rate */ if (BaudRate) Modified: trunk/reactos/ntoskrnl/kd/kdio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd/kdio.c?rev=544… ============================================================================== --- trunk/reactos/ntoskrnl/kd/kdio.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd/kdio.c [iso-8859-1] Mon Nov 21 05:28:08 2011 @@ -23,6 +23,7 @@ KSPIN_LOCK KdpDebugLogSpinLock; KEVENT KdpLoggerThreadEvent; HANDLE KdpLogFileHandle; +ANSI_STRING KdpLogFileName = RTL_CONSTANT_STRING("\\SystemRoot\\debug.log"); KSPIN_LOCK KdpSerialSpinLock; KD_PORT_INFORMATION SerialPortInfo = { DEFAULT_DEBUG_PORT, DEFAULT_DEBUG_BAUD_RATE, 0 }; @@ -201,7 +202,9 @@ else if (BootPhase == 3) { /* Setup the log name */ - RtlInitUnicodeString(&FileName, L"\\SystemRoot\\debug.log"); + Status = RtlAnsiStringToUnicodeString(&FileName, &KdpLogFileName, TRUE); + if (!NT_SUCCESS(Status)) return; + InitializeObjectAttributes(&ObjectAttributes, &FileName, 0, @@ -221,6 +224,8 @@ NULL, 0); + RtlFreeUnicodeString(&FileName); + if (!NT_SUCCESS(Status)) return; KeInitializeEvent(&KdpLoggerThreadEvent, SynchronizationEvent, TRUE); Modified: trunk/reactos/ntoskrnl/kdbg/kdb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb.c?rev=54… ============================================================================== --- trunk/reactos/ntoskrnl/kdbg/kdb.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kdbg/kdb.c [iso-8859-1] Mon Nov 21 05:28:08 2011 @@ -127,12 +127,6 @@ IN PKTRAP_FRAME TrapFrame, IN ULONG Esp); -/* ROS Internal. Please deprecate */ -NTHALAPI -VOID -NTAPI -HalReleaseDisplayOwnership(); - /* FUNCTIONS *****************************************************************/ static VOID @@ -1247,9 +1241,21 @@ ULONG SavedStackLimit; KbdDisableMouse(); - if (KdpDebugMode.Screen) - { + + if (KdpDebugMode.Screen && + InbvIsBootDriverInstalled() && + !InbvCheckDisplayOwnership()) + { + /* Acquire ownership and reset the display */ InbvAcquireDisplayOwnership(); + InbvResetDisplay(); + + /* Display blue screen */ + InbvSolidColorFill(0, 0, 639, 479, 6); + InbvSetTextColor(15); + InbvInstallDisplayStringFilter(NULL); + InbvEnableDisplayString(TRUE); + InbvSetScrollRegion(0, 0, 639, 479); } /* Call the interface's main loop on a different stack */ Modified: trunk/reactos/ntoskrnl/kdbg/kdb_cli.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb_cli.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/kdbg/kdb_cli.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kdbg/kdb_cli.c [iso-8859-1] Mon Nov 21 05:28:08 2011 @@ -107,6 +107,7 @@ static ULONG KdbNumberOfRowsPrinted = 0; static ULONG KdbNumberOfColsPrinted = 0; static BOOLEAN KdbOutputAborted = FALSE; +static BOOLEAN KdbRepeatLastCommand = FALSE; static LONG KdbNumberOfRowsTerminal = -1; static LONG KdbNumberOfColsTerminal = -1; @@ -2469,6 +2470,8 @@ if (KdbNumberOfRowsTerminal > 0 && (LONG)(KdbNumberOfRowsPrinted + RowsPrintedByTerminal) >= KdbNumberOfRowsTerminal) { + KdbRepeatLastCommand = FALSE; + if (KdbNumberOfColsPrinted > 0) DbgPrint("\n"); @@ -2789,6 +2792,8 @@ if (KdbNumberOfRowsTerminal > 0 && (LONG)(KdbNumberOfRowsPrinted + RowsPrintedByTerminal) >= KdbNumberOfRowsTerminal) { + KdbRepeatLastCommand = FALSE; + if (KdbNumberOfColsPrinted > 0) DbgPrint("\n"); @@ -2987,7 +2992,7 @@ PCHAR Orig = Buffer; ULONG ScanCode = 0; BOOLEAN EchoOn; - static CHAR LastCommand[1024] = ""; + static CHAR LastCommand[1024]; static CHAR NextKey = '\0'; INT CmdHistIndex = -1; INT i; @@ -3059,15 +3064,16 @@ * Repeat the last command if the user presses enter. Reduces the * risk of RSI when single-stepping. */ - if (Buffer == Orig) - { + if (Buffer != Orig) + { + KdbRepeatLastCommand = TRUE; + RtlStringCbCopyA(LastCommand, sizeof(LastCommand), Orig); + *Buffer = '\0'; + } + else if (KdbRepeatLastCommand) RtlStringCbCopyA(Buffer, Size, LastCommand); - } else - { *Buffer = '\0'; - RtlStringCbCopyA(LastCommand, sizeof(LastCommand), Orig); - } return; }

12 years, 11 months

[cgutman] 54467: [NDIS] - Remove unicode debug stuff out of the spinlock - Add a comment

by cgutman＠svn.reactos.org

Author: cgutman Date: Sun Nov 20 22:31:26 2011 New Revision: 54467 URL: http://svn.reactos.org/svn/reactos?rev=54467&view=rev Log: [NDIS] - Remove unicode debug stuff out of the spinlock - Add a comment Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] Sun Nov 20 22:31:26 2011 @@ -610,6 +610,8 @@ return NULL; } + NDIS_DbgPrint(DEBUG_MINIPORT, ("AdapterName = %wZ\n", AdapterName)); + KeAcquireSpinLock(&AdapterListLock, &OldIrql); { CurrentEntry = AdapterListHead.Flink; @@ -621,9 +623,9 @@ ASSERT(Adapter); NDIS_DbgPrint(DEBUG_MINIPORT, ("Examining adapter 0x%lx\n", Adapter)); - NDIS_DbgPrint(DEBUG_MINIPORT, ("AdapterName = %wZ\n", AdapterName)); - NDIS_DbgPrint(DEBUG_MINIPORT, ("DeviceName = %wZ\n", &Adapter->NdisMiniportBlock.MiniportName)); - + + /* We're technically not allowed to call this above PASSIVE_LEVEL, but it doesn't break + * right now and I'd rather use a working API than reimplement it here */ if (RtlCompareUnicodeString(AdapterName, &Adapter->NdisMiniportBlock.MiniportName, TRUE) == 0) { break;

12 years, 11 months

[cgutman] 54466: [NDIS] - Fix this indentation atrocity

by cgutman＠svn.reactos.org

Author: cgutman Date: Sun Nov 20 22:25:09 2011 New Revision: 54466 URL: http://svn.reactos.org/svn/reactos?rev=54466&view=rev Log: [NDIS] - Fix this indentation atrocity Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] Sun Nov 20 22:25:09 2011 @@ -508,7 +508,7 @@ KeLowerIrql(OldIrql); } - + BOOLEAN MiniAdapterHasAddress( PLOGICAL_ADAPTER Adapter, @@ -522,68 +522,67 @@ * TRUE if the destination address is that of the adapter, FALSE if not */ { - UINT Length; - PUCHAR Start1; - PUCHAR Start2; - PNDIS_BUFFER NdisBuffer; - UINT BufferLength; - - NDIS_DbgPrint(DEBUG_MINIPORT, ("Called.\n")); + UINT Length; + PUCHAR Start1; + PUCHAR Start2; + PNDIS_BUFFER NdisBuffer; + UINT BufferLength; + + NDIS_DbgPrint(DEBUG_MINIPORT, ("Called.\n")); #if DBG - if(!Adapter) - { - NDIS_DbgPrint(MIN_TRACE, ("Adapter object was null\n")); - return FALSE; - } - - if(!Packet) - { - NDIS_DbgPrint(MIN_TRACE, ("Packet was null\n")); - return FALSE; + if(!Adapter) + { + NDIS_DbgPrint(MIN_TRACE, ("Adapter object was null\n")); + return FALSE; + } + + if(!Packet) + { + NDIS_DbgPrint(MIN_TRACE, ("Packet was null\n")); + return FALSE; } #endif - NdisQueryPacket(Packet, NULL, NULL, &NdisBuffer, NULL); - - if (!NdisBuffer) - { - NDIS_DbgPrint(MIN_TRACE, ("Packet contains no buffers.\n")); - return FALSE; - } - - NdisQueryBuffer(NdisBuffer, (PVOID)&Start2, &BufferLength); - - /* FIXME: Should handle fragmented packets */ - - switch (Adapter->NdisMiniportBlock.MediaType) - { - case NdisMedium802_3: - Length = ETH_LENGTH_OF_ADDRESS; - /* Destination address is the first field */ - break; - - default: - NDIS_DbgPrint(MIN_TRACE, ("Adapter has unsupported media type (0x%X).\n", Adapter->NdisMiniportBlock.MediaType)); + NdisQueryPacket(Packet, NULL, NULL, &NdisBuffer, NULL); + + if (!NdisBuffer) + { + NDIS_DbgPrint(MIN_TRACE, ("Packet contains no buffers.\n")); return FALSE; } - if (BufferLength < Length) + NdisQueryBuffer(NdisBuffer, (PVOID)&Start2, &BufferLength); + + /* FIXME: Should handle fragmented packets */ + + switch (Adapter->NdisMiniportBlock.MediaType) + { + case NdisMedium802_3: + Length = ETH_LENGTH_OF_ADDRESS; + /* Destination address is the first field */ + break; + + default: + NDIS_DbgPrint(MIN_TRACE, ("Adapter has unsupported media type (0x%X).\n", Adapter->NdisMiniportBlock.MediaType)); + return FALSE; + } + + if (BufferLength < Length) { NDIS_DbgPrint(MIN_TRACE, ("Buffer is too small.\n")); return FALSE; } - Start1 = (PUCHAR)&Adapter->Address; - NDIS_DbgPrint(MAX_TRACE, ("packet address: %x:%x:%x:%x:%x:%x adapter address: %x:%x:%x:%x:%x:%x\n", - *((char *)Start1), *(((char *)Start1)+1), *(((char *)Start1)+2), *(((char *)Start1)+3), *(((char *)Start1)+4), *(((char *)Start1)+5), - *((char *)Start2), *(((char *)Start2)+1), *(((char *)Start2)+2), *(((char *)Start2)+3), *(((char *)Start2)+4), *(((char *)Start2)+5)) - ); - - return (RtlCompareMemory((PVOID)Start1, (PVOID)Start2, Length) == Length); -} - - + Start1 = (PUCHAR)&Adapter->Address; + NDIS_DbgPrint(MAX_TRACE, ("packet address: %x:%x:%x:%x:%x:%x adapter address: %x:%x:%x:%x:%x:%x\n", + *((char *)Start1), *(((char *)Start1)+1), *(((char *)Start1)+2), *(((char *)Start1)+3), *(((char *)Start1)+4), *(((char *)Start1)+5), + *((char *)Start2), *(((char *)Start2)+1), *(((char *)Start2)+2), *(((char *)Start2)+3), *(((char *)Start2)+4), *(((char *)Start2)+5))); + + return (RtlCompareMemory((PVOID)Start1, (PVOID)Start2, Length) == Length); +} + + PLOGICAL_ADAPTER MiniLocateDevice( PNDIS_STRING AdapterName) @@ -597,55 +596,55 @@ * is responsible for dereferencing after use */ { - KIRQL OldIrql; - PLIST_ENTRY CurrentEntry; - PLOGICAL_ADAPTER Adapter = 0; - - ASSERT(AdapterName); - - NDIS_DbgPrint(DEBUG_MINIPORT, ("Called.\n")); - - if(IsListEmpty(&AdapterListHead)) - { - NDIS_DbgPrint(MIN_TRACE, ("No registered miniports for protocol to bind to\n")); - return NULL; - } - - KeAcquireSpinLock(&AdapterListLock, &OldIrql); - { - CurrentEntry = AdapterListHead.Flink; - - while (CurrentEntry != &AdapterListHead) + KIRQL OldIrql; + PLIST_ENTRY CurrentEntry; + PLOGICAL_ADAPTER Adapter = 0; + + ASSERT(AdapterName); + + NDIS_DbgPrint(DEBUG_MINIPORT, ("Called.\n")); + + if(IsListEmpty(&AdapterListHead)) + { + NDIS_DbgPrint(MIN_TRACE, ("No registered miniports for protocol to bind to\n")); + return NULL; + } + + KeAcquireSpinLock(&AdapterListLock, &OldIrql); + { + CurrentEntry = AdapterListHead.Flink; + + while (CurrentEntry != &AdapterListHead) { - Adapter = CONTAINING_RECORD(CurrentEntry, LOGICAL_ADAPTER, ListEntry); - - ASSERT(Adapter); - - NDIS_DbgPrint(DEBUG_MINIPORT, ("Examining adapter 0x%lx\n", Adapter)); - NDIS_DbgPrint(DEBUG_MINIPORT, ("AdapterName = %wZ\n", AdapterName)); - NDIS_DbgPrint(DEBUG_MINIPORT, ("DeviceName = %wZ\n", &Adapter->NdisMiniportBlock.MiniportName)); - - if (RtlCompareUnicodeString(AdapterName, &Adapter->NdisMiniportBlock.MiniportName, TRUE) == 0) - { - break; - } - - Adapter = NULL; - CurrentEntry = CurrentEntry->Flink; + Adapter = CONTAINING_RECORD(CurrentEntry, LOGICAL_ADAPTER, ListEntry); + + ASSERT(Adapter); + + NDIS_DbgPrint(DEBUG_MINIPORT, ("Examining adapter 0x%lx\n", Adapter)); + NDIS_DbgPrint(DEBUG_MINIPORT, ("AdapterName = %wZ\n", AdapterName)); + NDIS_DbgPrint(DEBUG_MINIPORT, ("DeviceName = %wZ\n", &Adapter->NdisMiniportBlock.MiniportName)); + + if (RtlCompareUnicodeString(AdapterName, &Adapter->NdisMiniportBlock.MiniportName, TRUE) == 0) + { + break; + } + + Adapter = NULL; + CurrentEntry = CurrentEntry->Flink; } } - KeReleaseSpinLock(&AdapterListLock, OldIrql); - - if(Adapter) - { - NDIS_DbgPrint(DEBUG_MINIPORT, ("Leaving. Adapter found at 0x%x\n", Adapter)); - } - else - { - NDIS_DbgPrint(MIN_TRACE, ("Leaving (adapter not found for %wZ).\n", AdapterName)); - } - - return Adapter; + KeReleaseSpinLock(&AdapterListLock, OldIrql); + + if(Adapter) + { + NDIS_DbgPrint(DEBUG_MINIPORT, ("Leaving. Adapter found at 0x%x\n", Adapter)); + } + else + { + NDIS_DbgPrint(MIN_TRACE, ("Leaving (adapter not found for %wZ).\n", AdapterName)); + } + + return Adapter; } NDIS_STATUS

12 years, 11 months

[rharabien] 54465: [SHELL32] - Fix running batch files from patch containing spaces in ShellExecute API

by rharabien＠svn.reactos.org

Author: rharabien Date: Sun Nov 20 22:22:42 2011 New Revision: 54465 URL: http://svn.reactos.org/svn/reactos?rev=54465&view=rev Log: [SHELL32] - Fix running batch files from patch containing spaces in ShellExecute API Modified: trunk/reactos/dll/win32/shell32/shlexec.cpp Modified: trunk/reactos/dll/win32/shell32/shlexec.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlexec.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shlexec.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shlexec.cpp [iso-8859-1] Sun Nov 20 22:22:42 2011 @@ -475,7 +475,7 @@ } else if ((retval = GetLastError()) >= 32) { - TRACE("CreateProcess returned error %ld\n", retval); + WARN("CreateProcess returned error %ld\n", retval); retval = ERROR_BAD_FORMAT; } @@ -1906,7 +1906,7 @@ lpFile = wfileName; wcmd = wcmdBuffer; - len = lstrlenW(wszApplicationName) + 1; + len = lstrlenW(wszApplicationName) + 3; if (sei_tmp.lpParameters[0]) len += 1 + lstrlenW(wszParameters); if (len > wcmdLen) @@ -1914,7 +1914,7 @@ wcmd = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); wcmdLen = len; } - strcpyW(wcmd, wszApplicationName); + swprintf(wcmd, L"\"%s\"", wszApplicationName); if (sei_tmp.lpParameters[0]) { strcatW(wcmd, wSpace);

12 years, 11 months

← Newer
1
...
6
7
8
9
10
11
12
...
28
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 November 2011