Ros-diffs September 2020

ros-diffs@reactos.org

25 participants
382 discussions

[reactos] 11/15: [NTOS:KE] Zero out ExceptionFrame member in Syscall handler

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=04f0c7d0d7d3d9981476c… commit 04f0c7d0d7d3d9981476cca55372bdf49d200a1e Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Tue May 15 12:43:37 2018 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Sep 20 23:08:17 2020 +0200 [NTOS:KE] Zero out ExceptionFrame member in Syscall handler --- ntoskrnl/ke/amd64/stubs.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ntoskrnl/ke/amd64/stubs.c b/ntoskrnl/ke/amd64/stubs.c index ff973935d69..b5ae60a550d 100644 --- a/ntoskrnl/ke/amd64/stubs.c +++ b/ntoskrnl/ke/amd64/stubs.c @@ -330,6 +330,9 @@ KiSystemCallHandler( TrapFrame->TrapFrame = (ULONG64)Thread->TrapFrame; Thread->TrapFrame = TrapFrame; + /* We don't have an exception frame yet */ + TrapFrame->ExceptionFrame = 0; + /* Before enabling interrupts get the user rsp from the KPCR */ UserRsp = __readgsqword(FIELD_OFFSET(KIPCR, UserRsp)); TrapFrame->Rsp = UserRsp;

3 years, 12 months

[reactos] 10/15: [NTOS:KE] Disable interrupts before lowering IRQL in KiDpcInterruptHandler to avoid stacking up DPC interrupts

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=366e8a840ca8ef4484a18… commit 366e8a840ca8ef4484a183ce6a22ba410a0cafed Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Fri Mar 9 21:07:10 2018 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Sep 20 23:08:17 2020 +0200 [NTOS:KE] Disable interrupts before lowering IRQL in KiDpcInterruptHandler to avoid stacking up DPC interrupts --- ntoskrnl/ke/amd64/stubs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ntoskrnl/ke/amd64/stubs.c b/ntoskrnl/ke/amd64/stubs.c index 43117fe6868..ff973935d69 100644 --- a/ntoskrnl/ke/amd64/stubs.c +++ b/ntoskrnl/ke/amd64/stubs.c @@ -71,9 +71,9 @@ KiDpcInterruptHandler(VOID) KiSwapContext(APC_LEVEL, OldThread); } - /* Go back to old irql and disable interrupts */ - KeLowerIrql(OldIrql); + /* Disable interrupts and go back to old irql */ _disable(); + KeLowerIrql(OldIrql); }

3 years, 12 months

[reactos] 09/15: [NTOS:KE] Save and restore previous mode in KiZwSystemService and fix restoring the trap frame

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3aaee3562910cd0611356… commit 3aaee3562910cd06113569cace4eb155ee2a6050 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Mon Feb 5 01:23:30 2018 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Sep 20 23:08:17 2020 +0200 [NTOS:KE] Save and restore previous mode in KiZwSystemService and fix restoring the trap frame --- ntoskrnl/ke/amd64/trap.S | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/ntoskrnl/ke/amd64/trap.S b/ntoskrnl/ke/amd64/trap.S index 15f816f756b..3bcaa1684bf 100644 --- a/ntoskrnl/ke/amd64/trap.S +++ b/ntoskrnl/ke/amd64/trap.S @@ -835,6 +835,10 @@ FUNC KiZwSystemService /* Get current thread */ mov r11, gs:[PcCurrentThread] + /* Save PreviousMode in the trap frame */ + mov dil, byte ptr [r11 + KTHREAD_PreviousMode] + mov byte ptr [rbp + KTRAP_FRAME_PreviousMode], dil + /* Save the old trap frame in TrapFrame.Rdx */ mov rdi, [r11 + KTHREAD_TrapFrame] mov [rbp + KTRAP_FRAME_Rdx], rdi @@ -865,9 +869,13 @@ FUNC KiZwSystemService /* Restore the old trap frame */ mov r11, gs:[PcCurrentThread] - mov rsi, [rsp + KTRAP_FRAME_Rdx] + mov rsi, [rbp + KTRAP_FRAME_Rdx] mov [r11 + KTHREAD_TrapFrame], rsi + /* Restore PreviousMode from the trap frame */ + mov dil, byte ptr [rbp + KTRAP_FRAME_PreviousMode] + mov byte ptr [r11 + KTHREAD_PreviousMode], dil + /* Restore rdi and rsi */ mov rsi, [rbp + KTRAP_FRAME_Rsi] mov rdi, [rbp + KTRAP_FRAME_Rdi]

3 years, 12 months

[reactos] 08/15: [NTOS:KE] Don't use FrLdrDbgPrint anymore. It served us well, but now it's time to go away.

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b2a483b9ea02020c42db0… commit b2a483b9ea02020c42db07091dc78e4f1bfcdc66 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Fri Mar 9 22:06:03 2018 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Sep 20 23:08:17 2020 +0200 [NTOS:KE] Don't use FrLdrDbgPrint anymore. It served us well, but now it's time to go away. --- ntoskrnl/ke/amd64/trap.S | 89 +----------------------------------------------- 1 file changed, 1 insertion(+), 88 deletions(-) diff --git a/ntoskrnl/ke/amd64/trap.S b/ntoskrnl/ke/amd64/trap.S index 3a017b85b77..15f816f756b 100644 --- a/ntoskrnl/ke/amd64/trap.S +++ b/ntoskrnl/ke/amd64/trap.S @@ -12,7 +12,6 @@ #include <trapamd64.inc> EXTERN KiDispatchException:PROC -EXTERN FrLdrDbgPrint:DWORD EXTERN KeBugCheckWithTf:PROC EXTERN MmAccessFault:PROC EXTERN KiSystemFatalException:PROC @@ -27,64 +26,6 @@ EXTERN KdSetOwedBreakpoints:PROC #endif -/* GLOBALS *******************************************************************/ - -.data - -PUBLIC MsgUnimplemented -MsgUnimplemented: -.asciz "WARNING: %s at %s:%d is UNIMPLEMENTED!\n" - -MsgPageFault: -.asciz "Page fault! Code = 0x%x, RIP = %p, FaultingAddress = %p\n" - -MsgGeneralProtFault: -.asciz "General protection fault at %p!\n" - -MsgBreakpointTrap: -.asciz "BreakpointTrap at %p\n" - -MsgUnexpectedInterrupt: -.asciz "UnexpectedInterrupt Vector=0x%02lx\n" - -MsgInvalidOpcodeFault: -.asciz "Invalid opcode fault at %p!\n" - -MsgDoubleFault: -.asciz "Double fault at %p, rbp=%p!\n" - -MsgTrapInfo: -.asciz "Trap: %s at %p\n" - -MACRO(TRAPINFO, func) -LOCAL label1, label2 -#if 0 - jmp label2 -label1: .asciz "\func" -label2: - push rax - push rcx - push rdx - push r8 - push r9 - push r10 - push r11 - sub rsp, 32 - lea rcx, MsgTrapInfo[rip] - lea rdx, 1b[rip] - mov r8, [rbp + KTRAP_FRAME_Rip] - call qword ptr FrLdrDbgPrint[rip] - pop r11 - pop r10 - pop r9 - pop r8 - pop rdx - pop rcx - pop rax - add rsp, 32 -#endif -ENDM - /* Helper Macros *************************************************************/ MACRO(DispatchException, Status, Number, P1, P2, P3) @@ -235,8 +176,6 @@ FUNC KiDebugTrapOrFault /* Push pseudo error code */ EnterTrap TF_SAVE_ALL - TRAPINFO KiDebugTrapOrFault - /* Check if the frame was from kernelmode */ test word ptr [rbp + KTRAP_FRAME_SegCs], 3 jz KiDebugTrapOrFaultKMode @@ -332,12 +271,6 @@ FUNC KiInvalidOpcodeFault /* Push pseudo error code */ EnterTrap TF_SAVE_ALL - TRAPINFO KiInvalidOpcodeFault - - mov rdx, [rbp + KTRAP_FRAME_Rip] - lea rcx, MsgInvalidOpcodeFault[rip] - call qword ptr FrLdrDbgPrint[rip] - /* Enable interrupts */ sti @@ -385,10 +318,7 @@ FUNC KiDoubleFaultAbort /* A zero error code is pushed */ EnterTrap (TF_HAS_ERROR_CODE OR TF_SAVE_ALL) - lea rcx, MsgDoubleFault[rip] - mov rdx, [rbp + KTRAP_FRAME_FaultAddress] - mov r8, rbp - call qword ptr FrLdrDbgPrint[rip] + int 3 /* Bugcheck */ Fatal 8 // EXCEPTION_DOUBLE_FAULT @@ -446,11 +376,6 @@ FUNC KiGeneralProtectionFault /* We have an error code */ EnterTrap (TF_HAS_ERROR_CODE OR TF_SAVE_ALL) - //TRAPINFO KiGeneralProtectionFault - //mov rdx, [rbp + KTRAP_FRAME_Rip] - //lea rcx, MsgGeneralProtFault[rip] - //call qword ptr FrLdrDbgPrint[rip] - /* Call the C handler */ mov rcx, rbp call KiGeneralProtectionFaultHandler @@ -485,16 +410,6 @@ FUNC KiPageFault /* We have an error code */ EnterTrap (TF_HAS_ERROR_CODE OR TF_SAVE_ALL) - TRAPINFO KiPageFault - -#if 0 - lea rcx, MsgPageFault[rip] - mov rdx, [rbp + KTRAP_FRAME_ErrorCode] - mov r8, [rbp + KTRAP_FRAME_Rip] - mov r9, [rbp + KTRAP_FRAME_FaultAddress] - call qword ptr FrLdrDbgPrint[rip] -#endif - /* Save page fault address */ mov rdx, cr2 mov [rbp + KTRAP_FRAME_FaultAddress], rdx @@ -644,8 +559,6 @@ FUNC KiDebugServiceTrap /* No error code */ EnterTrap TF_SAVE_ALL - TRAPINFO KiDebugServiceTrap - /* Increase Rip to skip the int3 */ inc qword ptr [rbp + KTRAP_FRAME_Rip]

3 years, 12 months

[reactos] 07/15: [HAL] Use iretq instead of iret

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0343ac4f0b99b617d7d97… commit 0343ac4f0b99b617d7d975f9af6ec79fbd12ef71 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Feb 2 09:45:17 2020 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Sep 20 23:08:17 2020 +0200 [HAL] Use iretq instead of iret --- hal/halx86/apic/apictrap.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hal/halx86/apic/apictrap.S b/hal/halx86/apic/apictrap.S index 3aa9a713ab9..52f1dabec0f 100644 --- a/hal/halx86/apic/apictrap.S +++ b/hal/halx86/apic/apictrap.S @@ -20,7 +20,7 @@ TRAP_ENTRY HalpProfileInterrupt, (TF_VOLATILES OR TF_SEND_EOI) PUBLIC ApicSpuriousService ApicSpuriousService: - iret + iretq PUBLIC HackEoi HackEoi:

3 years, 12 months

[reactos] 06/15: [HAL] Fix calculation of timer increment

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3bbcc16d8e76ecf4296bd… commit 3bbcc16d8e76ecf4296bdfc57e461a18523198a6 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Tue Dec 31 09:39:55 2019 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Sep 20 23:08:17 2020 +0200 [HAL] Fix calculation of timer increment --- hal/halx86/apic/rtctimer.c | 42 +++++++++++++++++++++++++++++++++++------- 1 file changed, 35 insertions(+), 7 deletions(-) diff --git a/hal/halx86/apic/rtctimer.c b/hal/halx86/apic/rtctimer.c index afd3d9dab5a..62318f724ba 100644 --- a/hal/halx86/apic/rtctimer.c +++ b/hal/halx86/apic/rtctimer.c @@ -4,7 +4,9 @@ * FILE: hal/halx86/apic/rtctimer.c * PURPOSE: HAL APIC Management and Control Code * PROGRAMMERS: Timo Kreuzer (timo.kreuzer(a)reactos.org) - * REFERENCES: + * REFERENCES: https://wiki.osdev.org/RTC + * https://forum.osdev.org/viewtopic.php?f=13&t=20825&start=0 + * http://www.bioscentral.com/misc/cmosmap.htm */ /* INCLUDES *******************************************************************/ @@ -24,16 +26,42 @@ BOOLEAN HalpClockSetMSRate; UCHAR HalpNextMSRate; UCHAR HalpCurrentRate = 9; /* Initial rate 9: 128 Hz / 7.8 ms */ ULONG HalpCurrentTimeIncrement; -static UCHAR RtcMinimumClockRate = 6; /* Minimum rate 6: 16 Hz / 62.5 ms */ -static UCHAR RtcMaximumClockRate = 10; /* Maximum rate 10: 256 Hz / 3.9 ms */ - - +static UCHAR RtcMinimumClockRate = 8; /* Minimum rate 8: 256 Hz / 3.9 ms */ +static UCHAR RtcMaximumClockRate = 12; /* Maximum rate 12: 16 Hz / 62.5 ms */ + +/*! + \brief Converts the CMOS RTC rate into the time increment in 100ns intervals. + + Rate Freqency Interval (ms) Result + ------------------------------------- + 0 disabled + 1 32768 0.03052 305 + 2 16384 0.06103 610 + 3 8192 0.12207 1221 + 4 4096 0.24414 2441 + 5 2048 0.48828 4883 + 6 1024 0.97656 9766 + 7 512 1.95313 19531 + 8 256 3.90625 39063 + 9 128 7.8125 78125 + 10 64 15.6250 156250 + 11 32 31.25 312500 + 12 16 62.5 625000 + 13 8 125 1250000 + 14 4 250 2500000 + 15 2 500 5000000 + +*/ FORCEINLINE ULONG RtcClockRateToIncrement(UCHAR Rate) { - ULONG Freqency = ((32768 << 1) >> Rate); - return (1000000 + (Freqency/2)) / Freqency; + /* Calculate frequency */ + ULONG Freqency = 32768 >> (Rate - 1); + + /* Calculate interval in 100ns interval: Interval = (1 / Frequency) * 10000000 + This formula will round properly, instead of truncating. */ + return (10000000 + (Freqency/2)) / Freqency; } VOID

3 years, 12 months

[reactos] 05/15: [CRT] Return from fpreset()

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=64d7db506c71c38e1d61a… commit 64d7db506c71c38e1d61a57da734d25abec4a070 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Feb 11 21:49:45 2018 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Sep 20 23:08:17 2020 +0200 [CRT] Return from fpreset() --- sdk/lib/crt/float/amd64/fpreset.S | 1 + 1 file changed, 1 insertion(+) diff --git a/sdk/lib/crt/float/amd64/fpreset.S b/sdk/lib/crt/float/amd64/fpreset.S index 8ab5f0f2a55..008da4152eb 100644 --- a/sdk/lib/crt/float/amd64/fpreset.S +++ b/sdk/lib/crt/float/amd64/fpreset.S @@ -6,6 +6,7 @@ FUNC _fpreset .endprolog fninit + ret ENDFUNC END

3 years, 12 months

[reactos] 04/15: [CRT] Use chkstk_ms.s on x64 builds

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=aff33c855dbffbc0ef2e9… commit aff33c855dbffbc0ef2e96e041103a26ec54814b Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Mon Jan 29 18:37:09 2018 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Sep 20 23:08:17 2020 +0200 [CRT] Use chkstk_ms.s on x64 builds --- sdk/lib/crt/CMakeLists.txt | 5 +---- sdk/lib/crt/except/amd64/chkstk_ms.s | 18 ++++++++++-------- sdk/lib/crt/libcntpr.cmake | 2 +- sdk/lib/crt/msvcrtex.cmake | 1 - 4 files changed, 12 insertions(+), 14 deletions(-) diff --git a/sdk/lib/crt/CMakeLists.txt b/sdk/lib/crt/CMakeLists.txt index 03a366ce372..24d4205fbd0 100644 --- a/sdk/lib/crt/CMakeLists.txt +++ b/sdk/lib/crt/CMakeLists.txt @@ -9,10 +9,7 @@ if(ARCH STREQUAL "i386") list(APPEND CHKSTK_SOURCE except/i386/chkstk_ms.s) endif() elseif(ARCH STREQUAL "amd64") - list(APPEND CHKSTK_ASM_SOURCE except/amd64/chkstk_asm.s) - if(NOT MSVC) - list(APPEND CHKSTK_SOURCE except/amd64/chkstk_ms.s) - endif() + list(APPEND CHKSTK_ASM_SOURCE except/amd64/chkstk_ms.s) elseif(ARCH STREQUAL "arm") list(APPEND CHKSTK_ASM_SOURCE except/arm/chkstk_asm.s) if(NOT MSVC) diff --git a/sdk/lib/crt/except/amd64/chkstk_ms.s b/sdk/lib/crt/except/amd64/chkstk_ms.s index dbf9eb2e691..0894720975f 100644 --- a/sdk/lib/crt/except/amd64/chkstk_ms.s +++ b/sdk/lib/crt/except/amd64/chkstk_ms.s @@ -15,14 +15,17 @@ /* CODE **********************************************************************/ .code64 -PUBLIC ___chkstk_ms +PUBLIC __chkstk +PUBLIC __alloca_probe + +__alloca_probe: +.PROC __chkstk - //cfi_startproc() -___chkstk_ms: push rcx /* save temps */ - //cfi_push(%rcx) + .pushreg rcx push rax - //cfi_push(%rax) + .pushreg rax + .endprolog cmp rax, PAGE_SIZE /* > 4k ?*/ lea rcx, [rsp + 24] /* point past return addr */ @@ -41,11 +44,10 @@ l_LessThanAPage: or byte ptr [rcx], 0 /* less than 4k, just peek here */ pop rax - //cfi_pop(%rax) pop rcx - //cfi_pop(%rcx) ret - //cfi_endproc() + +.ENDP END /* EOF */ diff --git a/sdk/lib/crt/libcntpr.cmake b/sdk/lib/crt/libcntpr.cmake index 1a49be53d75..f15f60367b1 100644 --- a/sdk/lib/crt/libcntpr.cmake +++ b/sdk/lib/crt/libcntpr.cmake @@ -112,7 +112,7 @@ if(ARCH STREQUAL "i386") endif() elseif(ARCH STREQUAL "amd64") list(APPEND LIBCNTPR_ASM_SOURCE - except/amd64/chkstk_asm.s + except/amd64/chkstk_ms.s except/amd64/seh.s setjmp/amd64/setjmp.s math/amd64/atan.S diff --git a/sdk/lib/crt/msvcrtex.cmake b/sdk/lib/crt/msvcrtex.cmake index 3d68ce5189f..66b90d47ed8 100644 --- a/sdk/lib/crt/msvcrtex.cmake +++ b/sdk/lib/crt/msvcrtex.cmake @@ -67,7 +67,6 @@ if(ARCH STREQUAL "i386") math/i386/cisqrt.c) elseif(ARCH STREQUAL "amd64") list(APPEND MSVCRTEX_ASM_SOURCE - except/amd64/chkstk_asm.s except/amd64/chkstk_ms.s) elseif(ARCH STREQUAL "arm") list(APPEND MSVCRTEX_SOURCE

3 years, 12 months

[reactos] 03/15: [ASM] Fix KUMS_CONTEXT_HEADER offsets in ksamd64.template.h

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=38be76187adb58edac247… commit 38be76187adb58edac247c4ebb92c9f529f4b14e Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Oct 26 16:14:27 2019 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Sep 20 23:08:17 2020 +0200 [ASM] Fix KUMS_CONTEXT_HEADER offsets in ksamd64.template.h --- sdk/include/asm/ksamd64.template.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sdk/include/asm/ksamd64.template.h b/sdk/include/asm/ksamd64.template.h index 18fcb246b2f..7ad83dc557d 100644 --- a/sdk/include/asm/ksamd64.template.h +++ b/sdk/include/asm/ksamd64.template.h @@ -801,13 +801,13 @@ SIZE(RTL_UMS_CONTEXT_LENGTH, RTL_UMS_CONTEXT), HEADER("KUMS_CONTEXT_HEADER offsets"), OFFSET(UchStackTop, KUMS_CONTEXT_HEADER, StackTop), -OFFSET(UchStackSize, KUMS_CONTEXT_HEADER, StackTop), -OFFSET(UchRspOffset, KUMS_CONTEXT_HEADER, StackTop), -OFFSET(UchRip, KUMS_CONTEXT_HEADER, StackTop), -OFFSET(UchFltSave, KUMS_CONTEXT_HEADER, StackTop), -OFFSET(UchFlags, KUMS_CONTEXT_HEADER, StackTop), -OFFSET(UchTrapFrame, KUMS_CONTEXT_HEADER, StackTop), -OFFSET(UchExceptionFrame, KUMS_CONTEXT_HEADER, StackTop), +OFFSET(UchStackSize, KUMS_CONTEXT_HEADER, StackSize), +OFFSET(UchRspOffset, KUMS_CONTEXT_HEADER, RspOffset), +OFFSET(UchRip, KUMS_CONTEXT_HEADER, Rip), +OFFSET(UchFltSave, KUMS_CONTEXT_HEADER, FltSave), +OFFSET(UchFlags, KUMS_CONTEXT_HEADER, Flags), +OFFSET(UchTrapFrame, KUMS_CONTEXT_HEADER, TrapFrame), +OFFSET(UchExceptionFrame, KUMS_CONTEXT_HEADER, ExceptionFrame), SIZE(KUMS_CONTEXT_HEADER_LENGTH, KUMS_CONTEXT_HEADER), HEADER("UMS_CONTROL_BLOCK offsets"),

3 years, 12 months

[reactos] 02/15: [BOOTDATA] Use reactos subfolder as source dir on bootcd for now

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=867820124b89982f89acb… commit 867820124b89982f89acbb4462b2b0c2d56866ba Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Thu Jun 27 18:09:39 2019 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Sep 20 23:08:17 2020 +0200 [BOOTDATA] Use reactos subfolder as source dir on bootcd for now --- boot/bootdata/txtsetup.sif | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/boot/bootdata/txtsetup.sif b/boot/bootdata/txtsetup.sif index df17100f580..5e3134d4ab4 100644 --- a/boot/bootdata/txtsetup.sif +++ b/boot/bootdata/txtsetup.sif @@ -19,7 +19,8 @@ _1 = %cdname%,%cdtagfile%,,"" 1 = %cdname%,%cdtagfilei%,,\reactos [SourceDisksNames.amd64] -1 = %cdname%,%cdtagfilea%,,\amd64 +;1 = %cdname%,%cdtagfilea%,,\amd64 +1 = %cdname%,%cdtagfilei%,,\reactos ; ; The directories listed in the [Directories] or [WinntDirectories] sections

3 years, 12 months

← Newer
1
...
4
5
6
7
8
9
10
...
39
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 September 2020