Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 03/06: [VIDEOPRT] [FORMATTING] No code change
by Timo Kreuzer 15 Aug '19

15 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e7b3c66a42188f645f3f3… commit e7b3c66a42188f645f3f31a96e4ed2e79144a916 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Feb 11 13:43:05 2018 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Aug 15 14:13:54 2019 +0200 [VIDEOPRT] [FORMATTING] No code change --- win32ss/drivers/videoprt/int10.c | 227 ++++++++++++++++++++++----------------- 1 file changed, 129 insertions(+), 98 deletions(-) diff --git a/win32ss/drivers/videoprt/int10.c b/win32ss/drivers/videoprt/int10.c index b8eebfa49e8..82f3774067f 100644 --- a/win32ss/drivers/videoprt/int10.c +++ b/win32ss/drivers/videoprt/int10.c @@ -41,7 +41,7 @@ IntInitializeVideoAddressSpace(VOID) LARGE_INTEGER Offset; SIZE_T ViewSize; #ifdef _M_IX86 - CHAR IVTAndBda[1024+256]; + CHAR IVTAndBda[1024 + 256]; #endif // _M_IX86 /* Free the 1MB pre-reserved region. In reality, ReactOS should simply support us mapping the view into the reserved area, but it doesn't. */ @@ -151,124 +151,134 @@ IntInitializeVideoAddressSpace(VOID) #endif #if defined(_M_IX86) -VP_STATUS NTAPI +VP_STATUS +NTAPI IntInt10AllocateBuffer( - IN PVOID Context, - OUT PUSHORT Seg, - OUT PUSHORT Off, - IN OUT PULONG Length) + IN PVOID Context, + OUT PUSHORT Seg, + OUT PUSHORT Off, + IN OUT PULONG Length) { - PVOID MemoryAddress; - NTSTATUS Status; - PKPROCESS CallingProcess = (PKPROCESS)PsGetCurrentProcess(); - KAPC_STATE ApcState; - - TRACE_(VIDEOPRT, "IntInt10AllocateBuffer\n"); + PVOID MemoryAddress; + NTSTATUS Status; + PKPROCESS CallingProcess = (PKPROCESS)PsGetCurrentProcess(); + KAPC_STATE ApcState; - IntAttachToCSRSS(&CallingProcess, &ApcState); + TRACE_(VIDEOPRT, "IntInt10AllocateBuffer\n"); - MemoryAddress = (PVOID)0x20000; - Status = ZwAllocateVirtualMemory(NtCurrentProcess(), &MemoryAddress, 0, - Length, MEM_COMMIT, PAGE_EXECUTE_READWRITE); + IntAttachToCSRSS(&CallingProcess, &ApcState); - if (!NT_SUCCESS(Status)) - { - WARN_(VIDEOPRT, "- ZwAllocateVirtualMemory failed\n"); - IntDetachFromCSRSS(&CallingProcess, &ApcState); - return ERROR_NOT_ENOUGH_MEMORY; - } + MemoryAddress = (PVOID)0x20000; + Status = ZwAllocateVirtualMemory(NtCurrentProcess(), + &MemoryAddress, + 0, + Length, + MEM_COMMIT, + PAGE_EXECUTE_READWRITE); + if (!NT_SUCCESS(Status)) + { + WARN_(VIDEOPRT, "- ZwAllocateVirtualMemory failed\n"); + IntDetachFromCSRSS(&CallingProcess, &ApcState); + return ERROR_NOT_ENOUGH_MEMORY; + } - if (MemoryAddress > (PVOID)(0x100000 - *Length)) - { - ZwFreeVirtualMemory(NtCurrentProcess(), &MemoryAddress, Length, - MEM_RELEASE); - WARN_(VIDEOPRT, "- Unacceptable memory allocated\n"); - IntDetachFromCSRSS(&CallingProcess, &ApcState); - return ERROR_NOT_ENOUGH_MEMORY; - } + if (MemoryAddress > (PVOID)(0x100000 - *Length)) + { + ZwFreeVirtualMemory(NtCurrentProcess(), &MemoryAddress, Length, + MEM_RELEASE); + WARN_(VIDEOPRT, "- Unacceptable memory allocated\n"); + IntDetachFromCSRSS(&CallingProcess, &ApcState); + return ERROR_NOT_ENOUGH_MEMORY; + } - *Seg = (USHORT)((ULONG)MemoryAddress >> 4); - *Off = (USHORT)((ULONG)MemoryAddress & 0xF); + *Seg = (USHORT)((ULONG)MemoryAddress >> 4); + *Off = (USHORT)((ULONG)MemoryAddress & 0xF); - INFO_(VIDEOPRT, "- Segment: %x\n", (ULONG)MemoryAddress >> 4); - INFO_(VIDEOPRT, "- Offset: %x\n", (ULONG)MemoryAddress & 0xF); - INFO_(VIDEOPRT, "- Length: %x\n", *Length); + INFO_(VIDEOPRT, "- Segment: %x\n", (ULONG)MemoryAddress >> 4); + INFO_(VIDEOPRT, "- Offset: %x\n", (ULONG)MemoryAddress & 0xF); + INFO_(VIDEOPRT, "- Length: %x\n", *Length); - IntDetachFromCSRSS(&CallingProcess, &ApcState); + IntDetachFromCSRSS(&CallingProcess, &ApcState); - return NO_ERROR; + return NO_ERROR; } -VP_STATUS NTAPI +VP_STATUS +NTAPI IntInt10FreeBuffer( - IN PVOID Context, - IN USHORT Seg, - IN USHORT Off) + IN PVOID Context, + IN USHORT Seg, + IN USHORT Off) { - PVOID MemoryAddress = (PVOID)((Seg << 4) | Off); - NTSTATUS Status; - PKPROCESS CallingProcess = (PKPROCESS)PsGetCurrentProcess(); - KAPC_STATE ApcState; - SIZE_T Size = 0; - - TRACE_(VIDEOPRT, "IntInt10FreeBuffer\n"); - INFO_(VIDEOPRT, "- Segment: %x\n", Seg); - INFO_(VIDEOPRT, "- Offset: %x\n", Off); - - IntAttachToCSRSS(&CallingProcess, &ApcState); - Status = ZwFreeVirtualMemory(NtCurrentProcess(), &MemoryAddress, &Size, - MEM_RELEASE); - IntDetachFromCSRSS(&CallingProcess, &ApcState); - - return Status; + PVOID MemoryAddress = (PVOID)((Seg << 4) | Off); + NTSTATUS Status; + PKPROCESS CallingProcess = (PKPROCESS)PsGetCurrentProcess(); + KAPC_STATE ApcState; + SIZE_T Size = 0; + + TRACE_(VIDEOPRT, "IntInt10FreeBuffer\n"); + INFO_(VIDEOPRT, "- Segment: %x\n", Seg); + INFO_(VIDEOPRT, "- Offset: %x\n", Off); + + IntAttachToCSRSS(&CallingProcess, &ApcState); + Status = ZwFreeVirtualMemory(NtCurrentProcess(), + &MemoryAddress, + &Size, + MEM_RELEASE); + + IntDetachFromCSRSS(&CallingProcess, &ApcState); + + return Status; } -VP_STATUS NTAPI +VP_STATUS +NTAPI IntInt10ReadMemory( - IN PVOID Context, - IN USHORT Seg, - IN USHORT Off, - OUT PVOID Buffer, - IN ULONG Length) + IN PVOID Context, + IN USHORT Seg, + IN USHORT Off, + OUT PVOID Buffer, + IN ULONG Length) { - PKPROCESS CallingProcess = (PKPROCESS)PsGetCurrentProcess(); - KAPC_STATE ApcState; + PKPROCESS CallingProcess = (PKPROCESS)PsGetCurrentProcess(); + KAPC_STATE ApcState; - TRACE_(VIDEOPRT, "IntInt10ReadMemory\n"); - INFO_(VIDEOPRT, "- Segment: %x\n", Seg); - INFO_(VIDEOPRT, "- Offset: %x\n", Off); - INFO_(VIDEOPRT, "- Buffer: %x\n", Buffer); - INFO_(VIDEOPRT, "- Length: %x\n", Length); + TRACE_(VIDEOPRT, "IntInt10ReadMemory\n"); + INFO_(VIDEOPRT, "- Segment: %x\n", Seg); + INFO_(VIDEOPRT, "- Offset: %x\n", Off); + INFO_(VIDEOPRT, "- Buffer: %x\n", Buffer); + INFO_(VIDEOPRT, "- Length: %x\n", Length); - IntAttachToCSRSS(&CallingProcess, &ApcState); - RtlCopyMemory(Buffer, (PVOID)((Seg << 4) | Off), Length); - IntDetachFromCSRSS(&CallingProcess, &ApcState); + IntAttachToCSRSS(&CallingProcess, &ApcState); + RtlCopyMemory(Buffer, (PVOID)((Seg << 4) | Off), Length); + IntDetachFromCSRSS(&CallingProcess, &ApcState); - return NO_ERROR; + return NO_ERROR; } -VP_STATUS NTAPI +VP_STATUS +NTAPI IntInt10WriteMemory( - IN PVOID Context, - IN USHORT Seg, - IN USHORT Off, - IN PVOID Buffer, - IN ULONG Length) + IN PVOID Context, + IN USHORT Seg, + IN USHORT Off, + IN PVOID Buffer, + IN ULONG Length) { - PKPROCESS CallingProcess = (PKPROCESS)PsGetCurrentProcess(); - KAPC_STATE ApcState; + PKPROCESS CallingProcess = (PKPROCESS)PsGetCurrentProcess(); + KAPC_STATE ApcState; - TRACE_(VIDEOPRT, "IntInt10WriteMemory\n"); - INFO_(VIDEOPRT, "- Segment: %x\n", Seg); - INFO_(VIDEOPRT, "- Offset: %x\n", Off); - INFO_(VIDEOPRT, "- Buffer: %x\n", Buffer); - INFO_(VIDEOPRT, "- Length: %x\n", Length); + TRACE_(VIDEOPRT, "IntInt10WriteMemory\n"); + INFO_(VIDEOPRT, "- Segment: %x\n", Seg); + INFO_(VIDEOPRT, "- Offset: %x\n", Off); + INFO_(VIDEOPRT, "- Buffer: %x\n", Buffer); + INFO_(VIDEOPRT, "- Length: %x\n", Length); - IntAttachToCSRSS(&CallingProcess, &ApcState); - RtlCopyMemory((PVOID)((Seg << 4) | Off), Buffer, Length); - IntDetachFromCSRSS(&CallingProcess, &ApcState); + IntAttachToCSRSS(&CallingProcess, &ApcState); + RtlCopyMemory((PVOID)((Seg << 4) | Off), Buffer, Length); + IntDetachFromCSRSS(&CallingProcess, &ApcState); - return NO_ERROR; + return NO_ERROR; } VP_STATUS @@ -286,7 +296,7 @@ IntInt10CallBios( IntAttachToCSRSS(&CallingProcess, &ApcState); /* Clear the context */ - RtlZeroMemory(&BiosContext, sizeof(CONTEXT)); + RtlZeroMemory(&BiosContext, sizeof(BiosContext)); /* Fill out the bios arguments */ BiosContext.Eax = BiosArguments->Eax; @@ -300,8 +310,14 @@ IntInt10CallBios( BiosContext.SegEs = BiosArguments->SegEs; /* Do the ROM BIOS call */ - (void)KeWaitForMutexObject(&VideoPortInt10Mutex, Executive, KernelMode, FALSE, NULL); + (void)KeWaitForMutexObject(&VideoPortInt10Mutex, + Executive, + KernelMode, + FALSE, + NULL); + Status = Ke386CallBios(0x10, &BiosContext); + KeReleaseMutex(&VideoPortInt10Mutex, FALSE); /* Return the arguments */ @@ -317,7 +333,12 @@ IntInt10CallBios( /* Detach and return status */ IntDetachFromCSRSS(&CallingProcess, &ApcState); - if (NT_SUCCESS(Status)) return NO_ERROR; + + if (NT_SUCCESS(Status)) + { + return NO_ERROR; + } + return ERROR_INVALID_PARAMETER; } #endif @@ -328,7 +349,8 @@ IntInt10CallBios( * @implemented */ -VP_STATUS NTAPI +VP_STATUS +NTAPI VideoPortInt10( IN PVOID HwDeviceExtension, IN PVIDEO_X86_BIOS_ARGUMENTS BiosArguments) @@ -341,7 +363,7 @@ VideoPortInt10( if (!CsrssInitialized) { - return ERROR_INVALID_PARAMETER; + return ERROR_INVALID_PARAMETER; } /* Attach to CSRSS */ @@ -360,7 +382,11 @@ VideoPortInt10( BiosContext.Ebp = BiosArguments->Ebp; /* Do the ROM BIOS call */ - (void)KeWaitForMutexObject(&VideoPortInt10Mutex, Executive, KernelMode, FALSE, NULL); + (void)KeWaitForMutexObject(&VideoPortInt10Mutex, + Executive, + KernelMode, + FALSE, + NULL); Status = Ke386CallBios(0x10, &BiosContext); KeReleaseMutex(&VideoPortInt10Mutex, FALSE); @@ -375,7 +401,12 @@ VideoPortInt10( /* Detach from CSRSS */ IntDetachFromCSRSS(&CallingProcess, &ApcState); - if (NT_SUCCESS(Status)) return NO_ERROR; + + if (NT_SUCCESS(Status)) + { + return NO_ERROR; + } + return ERROR_INVALID_PARAMETER; #else /* Not implemented for anything else than X86*/

1 0

[reactos] 02/06: [HAL] Implement amd64 BIOS call support
by Timo Kreuzer 15 Aug '19

15 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9ab3246d4368eb8498ccb… commit 9ab3246d4368eb8498ccb01a4359161e4c36ef7a Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Feb 11 19:21:01 2018 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Aug 15 14:13:54 2019 +0200 [HAL] Implement amd64 BIOS call support The code uses FAST486 to emulate the BIOS code. --- hal/hal.spec | 14 +-- hal/halx86/CMakeLists.txt | 4 +- hal/halx86/amd64/x86bios.c | 280 +++++++++++++++++++++++++++++++++++-------- hal/halx86/generic/halinit.c | 4 + hal/halx86/include/halp.h | 8 ++ 5 files changed, 255 insertions(+), 55 deletions(-) diff --git a/hal/hal.spec b/hal/hal.spec index bfe55fa6b8e..4f8e0bec939 100644 --- a/hal/hal.spec +++ b/hal/hal.spec @@ -6,10 +6,10 @@ @ fastcall -arch=i386 ExTryToAcquireFastMutex(ptr) ntoskrnl.ExiTryToAcquireFastMutex @ stdcall HalAcquireDisplayOwnership(ptr) @ stdcall HalAdjustResourceList(ptr) +@ stdcall HalAllProcessorsStarted() @ stdcall HalAllocateAdapterChannel(ptr ptr long ptr) @ stdcall HalAllocateCommonBuffer(ptr long ptr long) @ stdcall HalAllocateCrashDumpRegisters(ptr ptr) -@ stdcall HalAllProcessorsStarted() @ stdcall HalAssignSlotResources(ptr ptr ptr ptr long long long ptr) @ stdcall -arch=i386,arm HalBeginSystemInterrupt(long long ptr) @ stdcall HalCalibratePerformanceCounter(ptr long long) @@ -29,8 +29,8 @@ @ stdcall HalGetInterruptVector(long long long long ptr ptr) ;@ stdcall -arch=x86_64 HalHandleMcheck() @ stdcall -arch=i386,x86_64 HalHandleNMI(ptr) -@ stdcall HalInitializeProcessor(long ptr) @ stdcall HalInitSystem(long ptr) +@ stdcall HalInitializeProcessor(long ptr) ;@ stdcall -arch=x86_64 HalIsHyperThreadingEnabled() @ stdcall HalMakeBeep(long) @ stdcall HalProcessorIdle() @@ -56,7 +56,6 @@ @ fastcall -arch=arm HalSweepIcache() @ fastcall -arch=arm HalSweepDcache() @ fastcall HalSystemVectorDispatchEntry(long long long) -;@ stdcall -arch=x86_64 HalSystemVectorDispatchEntry() @ stdcall HalTranslateBusAddress(long long long long ptr ptr) @ stdcall -arch=i386,x86_64 IoAssignDriveLetters(ptr str ptr ptr) HalpAssignDriveLetters @ stdcall IoFlushAdapterBuffers(ptr ptr ptr ptr long long) @@ -102,7 +101,8 @@ @ stdcall -arch=i386,arm WRITE_PORT_UCHAR(ptr long) @ stdcall -arch=i386,arm WRITE_PORT_ULONG(ptr long) @ stdcall -arch=i386,arm WRITE_PORT_USHORT(ptr long) -@ stdcall -arch=x86_64 HalInitializeBios(long ptr) -;@ stdcall -arch=x86_64 x86BiosExecuteInterrupt() -;@ stdcall -arch=x86_64 x86BiosInitializeBiosEx() -;@ stdcall -arch=x86_64 x86BiosTranslateAddress() +@ stdcall -arch=x86_64 x86BiosAllocateBuffer() +@ stdcall -arch=x86_64 x86BiosCall() +@ stdcall -arch=x86_64 x86BiosFreeBuffer() +@ stdcall -arch=x86_64 x86BiosReadMemory() +@ stdcall -arch=x86_64 x86BiosWriteMemory() diff --git a/hal/halx86/CMakeLists.txt b/hal/halx86/CMakeLists.txt index 831131494ec..f4148eb5ec0 100644 --- a/hal/halx86/CMakeLists.txt +++ b/hal/halx86/CMakeLists.txt @@ -5,7 +5,8 @@ add_definitions( include_directories( include - ${REACTOS_SOURCE_DIR}/ntoskrnl/include) + ${REACTOS_SOURCE_DIR}/ntoskrnl/include + ${REACTOS_SOURCE_DIR}/sdk/include/reactos/libs/fast486) function(add_hal _halname) cmake_parse_arguments(_haldata "" "" "SOURCES;COMPONENTS" ${ARGN}) @@ -76,5 +77,6 @@ elseif(ARCH STREQUAL "amd64") amd64/processor.c) add_hal(hal SOURCES ${HAL_SOURCE} COMPONENTS generic acpi apic) + target_link_libraries(hal fast486) endif() diff --git a/hal/halx86/amd64/x86bios.c b/hal/halx86/amd64/x86bios.c index 88f52421b7b..a8b7d94bc6c 100644 --- a/hal/halx86/amd64/x86bios.c +++ b/hal/halx86/amd64/x86bios.c @@ -12,7 +12,7 @@ //#define NDEBUG #include <debug.h> -//#include "x86emu.h" +#include <fast486.h> /* This page serves as fallback for pages used by Mm */ #define DEFAULT_PAGE 0x21 @@ -43,7 +43,9 @@ DbgDumpPage(PUCHAR MemBuffer, USHORT Segment) VOID NTAPI -HalInitializeBios(ULONG Unknown, PLOADER_PARAMETER_BLOCK LoaderBlock) +HalInitializeBios( + _In_ ULONG Unknown, + _In_ PLOADER_PARAMETER_BLOCK LoaderBlock) { PPFN_NUMBER PfnArray; PFN_NUMBER Pfn, Last; @@ -112,12 +114,12 @@ HalInitializeBios(ULONG Unknown, PLOADER_PARAMETER_BLOCK LoaderBlock) NTSTATUS NTAPI x86BiosAllocateBuffer( - ULONG *Size, - USHORT *Segment, - USHORT *Offset) + _In_ ULONG *Size, + _In_ USHORT *Segment, + _In_ USHORT *Offset) { /* Check if the system is initialized and the buffer is large enough */ - if (!x86BiosIsInitialized || *Size > PAGE_SIZE) + if (!x86BiosIsInitialized || (*Size > PAGE_SIZE)) { /* Something was wrong, fail! */ return STATUS_INSUFFICIENT_RESOURCES; @@ -141,11 +143,11 @@ x86BiosAllocateBuffer( NTSTATUS NTAPI x86BiosFreeBuffer( - USHORT Segment, - USHORT Offset) + _In_ USHORT Segment, + _In_ USHORT Offset) { /* Check if the system is initialized and if the address matches */ - if (!x86BiosIsInitialized || Segment != 0x2000 || Offset != 0) + if (!x86BiosIsInitialized || (Segment != 0x2000) || (Offset != 0)) { /* Something was wrong, fail */ return STATUS_INVALID_PARAMETER; @@ -165,10 +167,10 @@ x86BiosFreeBuffer( NTSTATUS NTAPI x86BiosReadMemory( - USHORT Segment, - USHORT Offset, - PVOID Buffer, - ULONG Size) + _In_ USHORT Segment, + _In_ USHORT Offset, + _Out_writes_bytes_(Size) PVOID Buffer, + _In_ ULONG Size) { ULONG_PTR Address; @@ -176,7 +178,7 @@ x86BiosReadMemory( Address = (Segment << 4) + Offset; /* Check if it's valid */ - if (!x86BiosIsInitialized || Address + Size > 0x100000) + if (!x86BiosIsInitialized || ((Address + Size) > 0x100000)) { /* Invalid */ return STATUS_INVALID_PARAMETER; @@ -192,10 +194,10 @@ x86BiosReadMemory( NTSTATUS NTAPI x86BiosWriteMemory( - USHORT Segment, - USHORT Offset, - PVOID Buffer, - ULONG Size) + _In_ USHORT Segment, + _In_ USHORT Offset, + _In_reads_bytes_(Size) PVOID Buffer, + _In_ ULONG Size) { ULONG_PTR Address; @@ -203,7 +205,7 @@ x86BiosWriteMemory( Address = (Segment << 4) + Offset; /* Check if it's valid */ - if (!x86BiosIsInitialized || Address + Size > 0x100000) + if (!x86BiosIsInitialized || ((Address + Size) > 0x100000)) { /* Invalid */ return STATUS_INVALID_PARAMETER; @@ -216,53 +218,237 @@ x86BiosWriteMemory( return STATUS_SUCCESS; } -#if 0 +static +VOID +FASTCALL +x86MemRead( + PFAST486_STATE State, + ULONG Address, + PVOID Buffer, + ULONG Size) +{ + /* Validate the address range */ + if (((ULONG64)Address + Size) < 0x100000) + { + RtlCopyMemory(Buffer, x86BiosMemoryMapping + Address, Size); + } + else + { + RtlFillMemory(Buffer, Size, 0xCC); + DPRINT1("x86MemRead: invalid read at 0x%lx (size 0x%lx)", Address, Size); + } +} + +static +VOID +FASTCALL +x86MemWrite( + PFAST486_STATE State, + ULONG Address, + PVOID Buffer, + ULONG Size) +{ + /* Validate the address range */ + if (((ULONG64)Address + Size) < 0x100000) + { + RtlCopyMemory(x86BiosMemoryMapping + Address, Buffer, Size); + } + else + { + DPRINT1("x86MemWrite: invalid write at 0x%lx (size 0x%lx)", Address, Size); + } +} + +static +BOOLEAN +ValidatePort( + USHORT Port, + UCHAR Size, + BOOLEAN IsWrite) +{ + switch (Port) + { + // VGA: https://wiki.osdev.org/VGA_Hardware#Port_0x3C0 + case 0x3C0: return (Size == 1) && IsWrite; + case 0x3C1: return (Size == 1) && !IsWrite; + case 0x3C2: return (Size == 1) && IsWrite; + case 0x3C4: return IsWrite; + case 0x3C5: return (Size <= 2); + case 0x3C7: return (Size == 1) && IsWrite; + case 0x3CC: return (Size == 1) && !IsWrite; + case 0x3CE: return IsWrite; + case 0x3CF: return (Size <= 2); + case 0x3D4: return IsWrite; + case 0x3D5: return (Size <= 2); + case 0x3C6: return (Size == 1); + case 0x3C8: return (Size == 1) && IsWrite; + case 0x3C9: return (Size == 1); + case 0x3DA: return (Size == 1) && !IsWrite; + + // CHECKME! + case 0x1CE: return (Size == 1) && IsWrite; + case 0x1CF: return (Size == 1); + case 0x3B6: return (Size <= 2); + } + + return FALSE; +} + +static +VOID +FASTCALL +x86IoRead( + PFAST486_STATE State, + USHORT Port, + PVOID Buffer, + ULONG DataCount, + UCHAR DataSize) +{ + /* Validate the port */ + if (!ValidatePort(Port, DataSize, FALSE)) + { + DPRINT1("Invalid IO port read access (port: 0x%x, count: 0x%x)\n", Port, DataSize); + } + + switch (DataSize) + { + case 1: READ_PORT_BUFFER_UCHAR((PUCHAR)(ULONG_PTR)Port, Buffer, DataCount); return; + case 2: READ_PORT_BUFFER_USHORT((PUSHORT)(ULONG_PTR)Port, Buffer, DataCount); return; + case 4: READ_PORT_BUFFER_ULONG((PULONG)(ULONG_PTR)Port, Buffer, DataCount); return; + } +} + +static +VOID +FASTCALL +x86IoWrite( + PFAST486_STATE State, + USHORT Port, + PVOID Buffer, + ULONG DataCount, + UCHAR DataSize) +{ + /* Validate the port */ + if (!ValidatePort(Port, DataSize, TRUE)) + { + DPRINT1("Invalid IO port write access (port: 0x%x, count: 0x%x)\n", Port, DataSize); + } + + switch (DataSize) + { + case 1: WRITE_PORT_BUFFER_UCHAR((PUCHAR)(ULONG_PTR)Port, Buffer, DataCount); return; + case 2: WRITE_PORT_BUFFER_USHORT((PUSHORT)(ULONG_PTR)Port, Buffer, DataCount); return; + case 4: WRITE_PORT_BUFFER_ULONG((PULONG)(ULONG_PTR)Port, Buffer, DataCount); return; + } +} + +static +VOID +FASTCALL +x86BOP( + PFAST486_STATE State, + UCHAR BopCode) +{ + ASSERT(FALSE); +} + +static +UCHAR +FASTCALL +x86IntAck ( + PFAST486_STATE State) +{ + ASSERT(FALSE); + return 0; +} + BOOLEAN NTAPI x86BiosCall( - ULONG InterruptNumber, - X86_BIOS_REGISTERS *Registers) + _In_ ULONG InterruptNumber, + _Inout_ PX86_BIOS_REGISTERS Registers) { - X86_VM_STATE VmState; + FAST486_STATE EmulatorContext; struct { USHORT Ip; USHORT SegCs; - } *InterrupTable; - - /* Zero the VmState */ - RtlZeroMemory(&VmState, sizeof(VmState)); + } *Ivt; + ULONG FlatIp; + PUCHAR InstructionPointer; + + /* Initialize the emulator context */ + Fast486Initialize(&EmulatorContext, + x86MemRead, + x86MemWrite, + x86IoRead, + x86IoWrite, + x86BOP, + x86IntAck, + NULL, // FpuCallback, + NULL); // Tlb + +//RegisterBop(BOP_UNSIMULATE, CpuUnsimulateBop); /* Copy the registers */ - VmState.BiosRegisters = *Registers; - - /* Set the physical memory buffer */ - VmState.MemBuffer = x86BiosMemoryMapping; + EmulatorContext.GeneralRegs[FAST486_REG_EAX].Long = Registers->Eax; + EmulatorContext.GeneralRegs[FAST486_REG_EBX].Long = Registers->Ebx; + EmulatorContext.GeneralRegs[FAST486_REG_ECX].Long = Registers->Ecx; + EmulatorContext.GeneralRegs[FAST486_REG_EDX].Long = Registers->Edx; + EmulatorContext.GeneralRegs[FAST486_REG_ESI].Long = Registers->Esi; + EmulatorContext.GeneralRegs[FAST486_REG_EDI].Long = Registers->Edi; + EmulatorContext.SegmentRegs[FAST486_REG_DS].Selector = Registers->SegDs; + EmulatorContext.SegmentRegs[FAST486_REG_ES].Selector = Registers->SegEs; /* Set Eflags */ - VmState.Registers.Eflags.Long = 0; // FIXME + EmulatorContext.Flags.Long = 0; + EmulatorContext.Flags.AlwaysSet = 1; + EmulatorContext.Flags.If = 1; - /* Setup stack */ - VmState.Registers.SegSs = 0; // FIXME - VmState.Registers.Sp = 0x2000 - 2; // FIXME + /* Set the stack pointer */ + Fast486SetStack(&EmulatorContext, 0, 0x2000 - 2); // FIXME - /* Initialize IP from the interrupt vector table */ - InterrupTable = (PVOID)x86BiosMemoryMapping; - VmState.Registers.SegCs = InterrupTable[InterruptNumber].SegCs; - VmState.Registers.Eip = InterrupTable[InterruptNumber].Ip; - - /* Make the function return on IRET */ - VmState.Flags.ReturnOnIret = 1; + /* Set CS:EIP from the IVT entry */ + Ivt = (PVOID)x86BiosMemoryMapping; + Fast486ExecuteAt(&EmulatorContext, + Ivt[InterruptNumber].SegCs, + Ivt[InterruptNumber].Ip); - /* Call the x86 emulator */ - x86Emulator(&VmState); + while (TRUE) + { + /* Step one instruction */ + Fast486StepInto(&EmulatorContext); - /* Copy registers back to caller */ - *Registers = VmState.BiosRegisters; + /* Check for iret */ + FlatIp = (EmulatorContext.SegmentRegs[FAST486_REG_CS].Selector << 4) + + EmulatorContext.InstPtr.Long; + if (FlatIp >= 0x100000) + { + DPRINT1("x86BiosCall: invalid IP (0x%lx) during BIOS execution", FlatIp); + return FALSE; + } + + /* Read the next instruction and check if it's IRET */ + InstructionPointer = x86BiosMemoryMapping + FlatIp; + if (*InstructionPointer == 0xCF) + { + /* We are done! */ + break; + } + } + + /* Copy the registers back */ + Registers->Eax = EmulatorContext.GeneralRegs[FAST486_REG_EAX].Long; + Registers->Ebx = EmulatorContext.GeneralRegs[FAST486_REG_EBX].Long; + Registers->Ecx = EmulatorContext.GeneralRegs[FAST486_REG_ECX].Long; + Registers->Edx = EmulatorContext.GeneralRegs[FAST486_REG_EDX].Long; + Registers->Esi = EmulatorContext.GeneralRegs[FAST486_REG_ESI].Long; + Registers->Edi = EmulatorContext.GeneralRegs[FAST486_REG_EDI].Long; + Registers->SegDs = EmulatorContext.SegmentRegs[FAST486_REG_DS].Selector; + Registers->SegEs = EmulatorContext.SegmentRegs[FAST486_REG_ES].Selector; return TRUE; } -#endif BOOLEAN NTAPI diff --git a/hal/halx86/generic/halinit.c b/hal/halx86/generic/halinit.c index 002605deb9f..90183d1fb4f 100644 --- a/hal/halx86/generic/halinit.c +++ b/hal/halx86/generic/halinit.c @@ -156,6 +156,10 @@ HalInitSystem(IN ULONG BootPhase, /* Do some HAL-specific initialization */ HalpInitPhase1(); + +#ifdef _M_AMD64 + HalInitializeBios(0, LoaderBlock); +#endif } /* All done, return */ diff --git a/hal/halx86/include/halp.h b/hal/halx86/include/halp.h index 190bfe84636..9c03a96f43d 100644 --- a/hal/halx86/include/halp.h +++ b/hal/halx86/include/halp.h @@ -871,6 +871,14 @@ HalpInitProcessor( ); #ifdef _M_AMD64 + +VOID +NTAPI +HalInitializeBios( + _In_ ULONG Unknown, + _In_ PLOADER_PARAMETER_BLOCK LoaderBlock +); + #define KfLowerIrql KeLowerIrql #define KiEnterInterruptTrap(TrapFrame) /* We do all neccessary in asm code */ #define KiEoiHelper(TrapFrame) return /* Just return to the caller */

1 0

[reactos] 01/06: [NDK] Add BIOS call API for amd64
by Timo Kreuzer 15 Aug '19

15 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f18958ffa2cfa4b8090ae… commit f18958ffa2cfa4b8090ae3108e904c7ad8f322fd Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Feb 11 16:43:51 2018 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Aug 15 14:13:54 2019 +0200 [NDK] Add BIOS call API for amd64 --- sdk/include/ndk/halfuncs.h | 47 ++++++++++++++++++++++++++++++++++++++++++++-- sdk/include/ndk/haltypes.h | 20 ++++++++++++++++++++ 2 files changed, 65 insertions(+), 2 deletions(-) diff --git a/sdk/include/ndk/halfuncs.h b/sdk/include/ndk/halfuncs.h index 03e869887a2..2086416f000 100644 --- a/sdk/include/ndk/halfuncs.h +++ b/sdk/include/ndk/halfuncs.h @@ -294,5 +294,48 @@ HalSetTimeIncrement( _In_ ULONG Increment ); -#endif -#endif + +// +// BIOS call API +// +#ifdef _M_AMD64 + +NTSTATUS +NTAPI +x86BiosAllocateBuffer( + _In_ ULONG *Size, + _In_ USHORT *Segment, + _In_ USHORT *Offset); + +NTSTATUS +NTAPI +x86BiosFreeBuffer( + _In_ USHORT Segment, + _In_ USHORT Offset); + +NTSTATUS +NTAPI +x86BiosReadMemory( + _In_ USHORT Segment, + _In_ USHORT Offset, + _Out_writes_bytes_(Size) PVOID Buffer, + _In_ ULONG Size); + +NTSTATUS +NTAPI +x86BiosWriteMemory( + _In_ USHORT Segment, + _In_ USHORT Offset, + _In_reads_bytes_(Size) PVOID Buffer, + _In_ ULONG Size); + +BOOLEAN +NTAPI +x86BiosCall( + _In_ ULONG InterruptNumber, + _Inout_ PX86_BIOS_REGISTERS Registers); + +#endif // _M_AMD64 + +#endif // NTOS_MODE_USER +#endif // _HALFUNCS_H diff --git a/sdk/include/ndk/haltypes.h b/sdk/include/ndk/haltypes.h index d27581b83fc..125158b4210 100644 --- a/sdk/include/ndk/haltypes.h +++ b/sdk/include/ndk/haltypes.h @@ -275,6 +275,26 @@ extern PUCHAR NTHALAPI KdComPortInUse; // #define HAL_IRQ_TRANSLATOR_VERSION 0x0 +// +// BIOS call structure +// +#ifdef _M_AMD64 + +typedef struct _X86_BIOS_REGISTERS +{ + ULONG Eax; + ULONG Ecx; + ULONG Edx; + ULONG Ebx; + ULONG Ebp; + ULONG Esi; + ULONG Edi; + USHORT SegDs; + USHORT SegEs; +} X86_BIOS_REGISTERS, *PX86_BIOS_REGISTERS; + +#endif // _M_AMD64 + #endif #endif

1 0

[reactos] 01/01: [NTOSKRNL][PS] Implement NtQueueApcThreadEx and use it in NtQueueApcThread
by Andrew Boyarshin 15 Aug '19

15 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b607e0119ffcc64da433c… commit b607e0119ffcc64da433cf090d463c510d7abfc4 Author: Andrew Boyarshin <andrew.boyarshin(a)gmail.com> AuthorDate: Sun Nov 25 14:11:04 2018 +0700 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Thu Aug 15 12:32:09 2019 +0200 [NTOSKRNL][PS] Implement NtQueueApcThreadEx and use it in NtQueueApcThread Actually rename NtQueueApcThread to NtQueueApcThreadEx and ignore one additional parameter for now. --- ntoskrnl/ps/state.c | 50 +++++++++++++++++++++++++++++++++++++++++++---- sdk/include/ndk/kefuncs.h | 12 ++++++++++++ 2 files changed, 58 insertions(+), 4 deletions(-) diff --git a/ntoskrnl/ps/state.c b/ntoskrnl/ps/state.c index 5d3839b0b95..4511c1ff625 100644 --- a/ntoskrnl/ps/state.c +++ b/ntoskrnl/ps/state.c @@ -470,7 +470,7 @@ NtTestAlert(VOID) } /*++ - * @name NtQueueApcThread + * @name NtQueueApcThreadEx * NT4 * * This routine is used to queue an APC from user-mode for the specified @@ -479,6 +479,10 @@ NtTestAlert(VOID) * @param ThreadHandle * Handle to the Thread. * This handle must have THREAD_SET_CONTEXT privileges. + * + * @param UserApcReserveHandle + * Optional handle to reserve object (introduced in Windows 7), providing ability to + * reserve memory before performing stability-critical parts of code. * * @param ApcRoutine * Pointer to the APC Routine to call when the APC executes. @@ -497,11 +501,12 @@ NtTestAlert(VOID) *--*/ NTSTATUS NTAPI -NtQueueApcThread(IN HANDLE ThreadHandle, +NtQueueApcThreadEx(IN HANDLE ThreadHandle, + IN OPTIONAL HANDLE UserApcReserveHandle, IN PKNORMAL_ROUTINE ApcRoutine, IN PVOID NormalContext, - IN PVOID SystemArgument1, - IN PVOID SystemArgument2) + IN OPTIONAL PVOID SystemArgument1, + IN OPTIONAL PVOID SystemArgument2) { PKAPC Apc; PETHREAD Thread; @@ -564,4 +569,41 @@ Quit: return Status; } +/*++ + * @name NtQueueApcThread + * NT4 + * + * This routine is used to queue an APC from user-mode for the specified + * thread. + * + * @param ThreadHandle + * Handle to the Thread. + * This handle must have THREAD_SET_CONTEXT privileges. + * + * @param ApcRoutine + * Pointer to the APC Routine to call when the APC executes. + * + * @param NormalContext + * Pointer to the context to send to the Normal Routine. + * + * @param SystemArgument[1-2] + * Pointer to a set of two parameters that contain untyped data. + * + * @return STATUS_SUCCESS or failure cute from associated calls. + * + * @remarks The thread must enter an alertable wait before the APC will be + * delivered. + * + *--*/ +NTSTATUS +NTAPI +NtQueueApcThread(IN HANDLE ThreadHandle, + IN PKNORMAL_ROUTINE ApcRoutine, + IN PVOID NormalContext, + IN PVOID SystemArgument1, + IN PVOID SystemArgument2) +{ + return NtQueueApcThreadEx(ThreadHandle, NULL, ApcRoutine, NormalContext, SystemArgument1, SystemArgument2); +} + /* EOF */ diff --git a/sdk/include/ndk/kefuncs.h b/sdk/include/ndk/kefuncs.h index 6d7b713cc8d..09627727937 100644 --- a/sdk/include/ndk/kefuncs.h +++ b/sdk/include/ndk/kefuncs.h @@ -467,6 +467,18 @@ NtQueueApcThread( _In_opt_ PVOID SystemArgument2 ); +NTSYSCALLAPI +NTSTATUS +NTAPI +NtQueueApcThreadEx( + _In_ HANDLE ThreadHandle, + _In_opt_ HANDLE UserApcReserveHandle, + _In_ PKNORMAL_ROUTINE ApcRoutine, + _In_opt_ PVOID NormalContext, + _In_opt_ PVOID SystemArgument1, + _In_opt_ PVOID SystemArgument2 +); + NTSYSCALLAPI NTSTATUS NTAPI

1 0

[reactos] 01/01: [SHELL32] CDefView: Improve the context menu positioning Previously we would always show a menu on the focused item, but this should only be done when it is also selected.
by Mark Jansen 15 Aug '19

15 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c96ba1aff2a681184f9ae… commit c96ba1aff2a681184f9aefd66327224d59e7d08a Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Thu Aug 8 21:01:19 2019 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Thu Aug 15 11:28:31 2019 +0200 [SHELL32] CDefView: Improve the context menu positioning Previously we would always show a menu on the focused item, but this should only be done when it is also selected. --- dll/win32/shell32/CDefView.cpp | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/dll/win32/shell32/CDefView.cpp b/dll/win32/shell32/CDefView.cpp index df076f5263a..acaa2e66383 100644 --- a/dll/win32/shell32/CDefView.cpp +++ b/dll/win32/shell32/CDefView.cpp @@ -1443,15 +1443,19 @@ LRESULT CDefView::OnContextMenu(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &b /* There is no position requested, so try to find one */ if (lParam == ~0) { - int lvIndex; + HWND hFocus = ::GetFocus(); + int lvIndex = -1; POINT pt; - /* Do we have a focused item, */ - if ((lvIndex = m_ListView.GetNextItem(-1, LVIS_FOCUSED)) < 0) + if (hFocus == m_ListView.m_hWnd || m_ListView.IsChild(hFocus)) { - /* or a selected item? */ - lvIndex = m_ListView.GetNextItem(-1, LVIS_SELECTED); + /* Is there an item focused and selected? */ + lvIndex = m_ListView.GetNextItem(-1, LVIS_SELECTED|LVIS_FOCUSED); + /* If not, find the first selected item */ + if (lvIndex < 0) + lvIndex = m_ListView.GetNextItem(-1, LVIS_SELECTED); } + /* We got something */ if (lvIndex > -1) {

1 0

[reactos] 01/01: [WININET_APITEST] Add Download testcase (#1832)
by Katayama Hirofumi MZ 15 Aug '19

15 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7464241adabfbdfec5a05… commit 7464241adabfbdfec5a058697632a8d3938479fb Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Aug 15 17:50:57 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Aug 15 17:50:57 2019 +0900 [WININET_APITEST] Add Download testcase (#1832) CORE-16310 --- modules/rostests/apitests/wininet/CMakeLists.txt | 4 +- modules/rostests/apitests/wininet/Download.c | 83 ++++++++++++++++++++++++ modules/rostests/apitests/wininet/testlist.c | 2 + 3 files changed, 87 insertions(+), 2 deletions(-) diff --git a/modules/rostests/apitests/wininet/CMakeLists.txt b/modules/rostests/apitests/wininet/CMakeLists.txt index fb18c91ac17..45baa402dda 100644 --- a/modules/rostests/apitests/wininet/CMakeLists.txt +++ b/modules/rostests/apitests/wininet/CMakeLists.txt @@ -1,7 +1,7 @@ -add_executable(wininet_apitest InternetOpen.c testlist.c) +add_executable(wininet_apitest Download.c InternetOpen.c testlist.c) target_link_libraries(wininet_apitest wine) set_module_type(wininet_apitest win32cui) #add_delay_importlibs(wininet_apitest wininet) -add_importlibs(wininet_apitest msvcrt kernel32 ntdll) +add_importlibs(wininet_apitest wininet msvcrt kernel32 ntdll) add_rostests_file(TARGET wininet_apitest) diff --git a/modules/rostests/apitests/wininet/Download.c b/modules/rostests/apitests/wininet/Download.c new file mode 100644 index 00000000000..307f532f065 --- /dev/null +++ b/modules/rostests/apitests/wininet/Download.c @@ -0,0 +1,83 @@ +/* + * PROJECT: ReactOS API Tests + * LICENSE: LGPL-2.1+ (https://spdx.org/licenses/LGPL-2.1+) + * PURPOSE: wininet Download testcase + * COPYRIGHT: Copyright 2019 Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) + */ +#include <apitest.h> +#include <stdio.h> + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H +#include <windef.h> +#include <wininet.h> + +#define FILENAME "download-testdata.txt" +#define TESTDATA "This is a test data.\r\n" + +static void DoDownload1(const char *url, const char *filename) +{ + HANDLE hFile; + HINTERNET hInternet, hConnect; + static const char s_header[] = "Accept: */" "*\r\n\r\n"; + BYTE buffer[256]; + DWORD cbRead; + BOOL ret; + + hFile = CreateFileA(filename, GENERIC_WRITE, FILE_SHARE_READ, NULL, + CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + ok(hFile != INVALID_HANDLE_VALUE, "hFile was INVALID_HANDLE_VALUE.\n"); + + hInternet = InternetOpenA(NULL, INTERNET_OPEN_TYPE_PRECONFIG, NULL, NULL, 0); + ok(hInternet != NULL, "hInternet was NULL.\n"); + + hConnect = InternetOpenUrlA(hInternet, url, s_header, lstrlenA(s_header), + INTERNET_FLAG_DONT_CACHE, 0); + ok(hConnect != NULL, "hConnect was NULL.\n"); + + for (;;) + { + Sleep(100); + + ret = InternetReadFile(hConnect, buffer, ARRAYSIZE(buffer), &cbRead); + if (!ret || !cbRead) + break; + + if (!WriteFile(hFile, buffer, cbRead, &cbRead, NULL)) + { + ok(0, "WriteFile returns FALSE.\n"); + break; + } + } + + ok_int(InternetCloseHandle(hConnect), TRUE); + ok_int(InternetCloseHandle(hInternet), TRUE); + CloseHandle(hFile); +} + +static void DoDownload2(const char *url, const char *filename) +{ + FILE *fp; + char buf[256]; + DoDownload1(url, filename); + ok_int(GetFileAttributesA(FILENAME) != INVALID_FILE_ATTRIBUTES, TRUE); + fp = fopen(FILENAME, "rb"); + ok(fp != NULL, "fp was NULL.\n"); + ok(fgets(buf, ARRAYSIZE(buf), fp) != NULL, "fgets failed.\n"); + ok_str(buf, TESTDATA); + fclose(fp); + DeleteFileA(FILENAME); +} + +START_TEST(Download) +{ + // https://tinyurl.com/y4cpy2fu + // --> + // https://raw.githubusercontent.com/katahiromz/downloads/master/download-test… + DoDownload2("https://tinyurl.com/y4cpy2fu", FILENAME); + + DoDownload2( + "https://raw.githubusercontent.com/katahiromz/downloads/master/download-test…", + FILENAME); +} diff --git a/modules/rostests/apitests/wininet/testlist.c b/modules/rostests/apitests/wininet/testlist.c index 16c84d6f87f..801c8c4d42e 100644 --- a/modules/rostests/apitests/wininet/testlist.c +++ b/modules/rostests/apitests/wininet/testlist.c @@ -3,10 +3,12 @@ #define STANDALONE #include <apitest.h> +extern void func_Download(void); extern void func_InternetOpen(void); const struct test winetest_testlist[] = { + { "Download", func_Download }, { "InternetOpen", func_InternetOpen }, { 0, 0 }

1 0

[reactos] 01/01: [MEDIA][FONTS] Add Baltic MS Sans Serif (ssee1257.fon) CORE-16166
by Katayama Hirofumi MZ 15 Aug '19

15 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9990169aaa7f5b3530dbb… commit 9990169aaa7f5b3530dbbb768431511eb9c1d13d Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Aug 15 10:23:50 2019 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Thu Aug 15 10:24:20 2019 +0900 [MEDIA][FONTS] Add Baltic MS Sans Serif (ssee1257.fon) CORE-16166 --- media/fonts/CMakeLists.txt | 1 + media/fonts/ssee1257.fon | Bin 0 -> 65424 bytes 2 files changed, 1 insertion(+) diff --git a/media/fonts/CMakeLists.txt b/media/fonts/CMakeLists.txt index bc4a5bf3191..f445391bb3b 100644 --- a/media/fonts/CMakeLists.txt +++ b/media/fonts/CMakeLists.txt @@ -151,6 +151,7 @@ list(APPEND FONT_FILES SourceCodePro-SemiboldIt.ttf #ssee1255.fon #ssee1256.fon + #ssee1257.fon #sserife.fon #sserifeg.fon #sserifer.fon diff --git a/media/fonts/ssee1257.fon b/media/fonts/ssee1257.fon new file mode 100644 index 00000000000..ee1bbcda616 Binary files /dev/null and b/media/fonts/ssee1257.fon differ

1 0

[reactos] 01/01: [FREELDR] Minor fixes.
by Hermès Bélusca-Maïto 14 Aug '19

14 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=423d1e2e091ba08b08925… commit 423d1e2e091ba08b08925bf35985d7440a4a8fb3 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Aug 14 15:59:01 2019 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Aug 14 16:36:50 2019 +0200 [FREELDR] Minor fixes. - Add some forgotten, or move some misplaced ArcClose() calls so as to avoid leakages in failure paths. (Thanks to Serge Gautherie for having caught some of them.) - Simplify some code; remove unneeded casts; use string-safe functions. --- boot/freeldr/freeldr/lib/inifile/ini_init.c | 1 + boot/freeldr/freeldr/miscboot.c | 19 ++-- boot/freeldr/freeldr/ntldr/wlregistry.c | 129 +++++++++++++--------------- 3 files changed, 74 insertions(+), 75 deletions(-) diff --git a/boot/freeldr/freeldr/lib/inifile/ini_init.c b/boot/freeldr/freeldr/lib/inifile/ini_init.c index 52a24bcdfdc..f9c7e1c26ad 100644 --- a/boot/freeldr/freeldr/lib/inifile/ini_init.c +++ b/boot/freeldr/freeldr/lib/inifile/ini_init.c @@ -63,6 +63,7 @@ BOOLEAN IniFileInitialize(VOID) if (Status != ESUCCESS || FileInformation.EndingAddress.HighPart != 0) { UiMessageBoxCritical("Error while getting informations about freeldr.ini.\nYou need to re-install FreeLoader."); + ArcClose(FileId); return FALSE; } FreeLoaderIniFileSize = FileInformation.EndingAddress.LowPart; diff --git a/boot/freeldr/freeldr/miscboot.c b/boot/freeldr/freeldr/miscboot.c index 535f9d6efab..f7a0e2a912e 100644 --- a/boot/freeldr/freeldr/miscboot.c +++ b/boot/freeldr/freeldr/miscboot.c @@ -31,6 +31,7 @@ LoadAndBootBootSector( IN PCHAR Argv[], IN PCHAR Envp[]) { + ARC_STATUS Status; PCSTR FileName; ULONG FileId; ULONG BytesRead; @@ -54,14 +55,14 @@ LoadAndBootBootSector( } /* Read boot sector */ - if ((ArcRead(FileId, (PVOID)0x7c00, 512, &BytesRead) != ESUCCESS) || (BytesRead != 512)) + Status = ArcRead(FileId, (PVOID)0x7c00, 512, &BytesRead); + ArcClose(FileId); + if ((Status != ESUCCESS) || (BytesRead != 512)) { UiMessageBox("Unable to read boot sector."); return EIO; } - ArcClose(FileId); - /* Check for validity */ if (*((USHORT*)(0x7c00 + 0x1fe)) != 0xaa55) { @@ -93,6 +94,7 @@ LoadAndBootPartitionOrDrive( IN UCHAR DriveNumber, IN ULONG PartitionNumber OPTIONAL) { + ARC_STATUS Status; ULONG FileId; ULONG BytesRead; CHAR ArcPath[MAX_PATH]; @@ -100,7 +102,10 @@ LoadAndBootPartitionOrDrive( /* Construct the corresponding ARC path */ ConstructArcPath(ArcPath, "", DriveNumber, PartitionNumber); *strrchr(ArcPath, '\\') = ANSI_NULL; // Trim the trailing path separator. - if (ArcOpen(ArcPath, OpenReadOnly, &FileId) != ESUCCESS) + + /* Open the volume */ + Status = ArcOpen(ArcPath, OpenReadOnly, &FileId); + if (Status != ESUCCESS) { UiMessageBox("Unable to open %s", ArcPath); return ENOENT; @@ -110,7 +115,9 @@ LoadAndBootPartitionOrDrive( * Now try to read the partition boot sector or the MBR (when PartitionNumber == 0). * If this fails then abort. */ - if ((ArcRead(FileId, (PVOID)0x7c00, 512, &BytesRead) != ESUCCESS) || (BytesRead != 512)) + Status = ArcRead(FileId, (PVOID)0x7c00, 512, &BytesRead); + ArcClose(FileId); + if ((Status != ESUCCESS) || (BytesRead != 512)) { if (PartitionNumber != 0) UiMessageBox("Unable to read partition's boot sector."); @@ -119,8 +126,6 @@ LoadAndBootPartitionOrDrive( return EIO; } - ArcClose(FileId); - /* Check for validity */ if (*((USHORT*)(0x7c00 + 0x1fe)) != 0xaa55) { diff --git a/boot/freeldr/freeldr/ntldr/wlregistry.c b/boot/freeldr/freeldr/ntldr/wlregistry.c index 1e39ec78961..c4a3e0ba9c9 100644 --- a/boot/freeldr/freeldr/ntldr/wlregistry.c +++ b/boot/freeldr/freeldr/ntldr/wlregistry.c @@ -41,14 +41,14 @@ WinLdrLoadSystemHive( ARC_STATUS Status; FILEINFORMATION FileInfo; ULONG HiveFileSize; - ULONG_PTR HiveDataPhysical; + PVOID HiveDataPhysical; PVOID HiveDataVirtual; ULONG BytesRead; PCWSTR FsService; /* Concatenate path and filename to get the full name */ - strcpy(FullHiveName, DirectoryPath); - strcat(FullHiveName, HiveName); + RtlStringCbCopyA(FullHiveName, sizeof(FullHiveName), DirectoryPath); + RtlStringCbCatA(FullHiveName, sizeof(FullHiveName), HiveName); Status = ArcOpen(FullHiveName, OpenReadOnly, &FileId); if (Status != ESUCCESS) @@ -69,11 +69,11 @@ WinLdrLoadSystemHive( HiveFileSize = FileInfo.EndingAddress.LowPart; /* Round up the size to page boundary and alloc memory */ - HiveDataPhysical = (ULONG_PTR)MmAllocateMemoryWithType( + HiveDataPhysical = MmAllocateMemoryWithType( MM_SIZE_TO_PAGES(HiveFileSize + MM_PAGE_SIZE - 1) << MM_PAGE_SHIFT, LoaderRegistryData); - if (HiveDataPhysical == 0) + if (HiveDataPhysical == NULL) { ArcClose(FileId); UiMessageBox("Unable to alloc memory for a hive!"); @@ -81,14 +81,14 @@ WinLdrLoadSystemHive( } /* Convert address to virtual */ - HiveDataVirtual = PaToVa((PVOID)HiveDataPhysical); + HiveDataVirtual = PaToVa(HiveDataPhysical); /* Fill LoaderBlock's entries */ LoaderBlock->RegistryLength = HiveFileSize; LoaderBlock->RegistryBase = HiveDataVirtual; /* Finally read from file to the memory */ - Status = ArcRead(FileId, (PVOID)HiveDataPhysical, HiveFileSize, &BytesRead); + Status = ArcRead(FileId, HiveDataPhysical, HiveFileSize, &BytesRead); if (Status != ESUCCESS) { ArcClose(FileId); @@ -131,7 +131,7 @@ WinLdrInitSystemHive( if (Setup) { - strcpy(SearchPath, SystemRoot); + RtlStringCbCopyA(SearchPath, sizeof(SearchPath), SystemRoot); HiveName = "SETUPREG.HIV"; } else @@ -140,8 +140,8 @@ WinLdrInitSystemHive( // fails, then give system.alt a try, and finally try a system.sav // FIXME: For now we only try system - strcpy(SearchPath, SystemRoot); - strcat(SearchPath, "system32\\config\\"); + RtlStringCbCopyA(SearchPath, sizeof(SearchPath), SystemRoot); + RtlStringCbCatA(SearchPath, sizeof(SearchPath), "system32\\config\\"); HiveName = "SYSTEM"; } @@ -191,8 +191,8 @@ BOOLEAN WinLdrScanSystemHive(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock, TRACE("NLS data %s %s %s\n", AnsiName, OemName, LangName); /* Load NLS data */ - strcpy(SearchPath, SystemRoot); - strcat(SearchPath, "system32\\"); + RtlStringCbCopyA(SearchPath, sizeof(SearchPath), SystemRoot); + RtlStringCbCatA(SearchPath, sizeof(SearchPath), "system32\\"); Success = WinLdrLoadNLSData(LoaderBlock, SearchPath, AnsiName, OemName, LangName); TRACE("NLS data loading %s\n", Success ? "successful" : "failed"); @@ -224,7 +224,7 @@ WinLdrGetNLSNames(PSTR AnsiName, &hKey); if (rc != ERROR_SUCCESS) { - //strcpy(szErrorOut, "Couldn't open CodePage registry key"); + //RtlStringCbCopyA(szErrorOut, sizeof(szErrorOut), "Couldn't open CodePage registry key"); return FALSE; } @@ -233,7 +233,7 @@ WinLdrGetNLSNames(PSTR AnsiName, rc = RegQueryValue(hKey, L"ACP", NULL, (PUCHAR)szIdBuffer, &BufferSize); if (rc != ERROR_SUCCESS) { - //strcpy(szErrorOut, "Couldn't get ACP NLS setting"); + //RtlStringCbCopyA(szErrorOut, sizeof(szErrorOut), "Couldn't get ACP NLS setting"); return FALSE; } @@ -241,7 +241,7 @@ WinLdrGetNLSNames(PSTR AnsiName, rc = RegQueryValue(hKey, szIdBuffer, NULL, (PUCHAR)NameBuffer, &BufferSize); if (rc != ERROR_SUCCESS) { - //strcpy(szErrorOut, "ACP NLS Setting exists, but isn't readable"); + //RtlStringCbCopyA(szErrorOut, sizeof(szErrorOut), "ACP NLS Setting exists, but isn't readable"); //return FALSE; wcscpy(NameBuffer, L"c_1252.nls"); // HACK: ReactOS bug CORE-6105 } @@ -252,7 +252,7 @@ WinLdrGetNLSNames(PSTR AnsiName, rc = RegQueryValue(hKey, L"OEMCP", NULL, (PUCHAR)szIdBuffer, &BufferSize); if (rc != ERROR_SUCCESS) { - //strcpy(szErrorOut, "Couldn't get OEMCP NLS setting"); + //RtlStringCbCopyA(szErrorOut, sizeof(szErrorOut), "Couldn't get OEMCP NLS setting"); return FALSE; } @@ -260,7 +260,7 @@ WinLdrGetNLSNames(PSTR AnsiName, rc = RegQueryValue(hKey, szIdBuffer, NULL, (PUCHAR)NameBuffer, &BufferSize); if (rc != ERROR_SUCCESS) { - //strcpy(szErrorOut, "OEMCP NLS setting exists, but isn't readable"); + //RtlStringCbCopyA(szErrorOut, sizeof(szErrorOut), "OEMCP NLS setting exists, but isn't readable"); //return FALSE; wcscpy(NameBuffer, L"c_437.nls"); // HACK: ReactOS bug CORE-6105 } @@ -272,7 +272,7 @@ WinLdrGetNLSNames(PSTR AnsiName, &hKey); if (rc != ERROR_SUCCESS) { - //strcpy(szErrorOut, "Couldn't open Language registry key"); + //RtlStringCbCopyA(szErrorOut, sizeof(szErrorOut), "Couldn't open Language registry key"); return FALSE; } @@ -281,7 +281,7 @@ WinLdrGetNLSNames(PSTR AnsiName, rc = RegQueryValue(hKey, L"Default", NULL, (PUCHAR)szIdBuffer, &BufferSize); if (rc != ERROR_SUCCESS) { - //strcpy(szErrorOut, "Couldn't get Language Default setting"); + //RtlStringCbCopyA(szErrorOut, sizeof(szErrorOut), "Couldn't get Language Default setting"); return FALSE; } @@ -289,7 +289,7 @@ WinLdrGetNLSNames(PSTR AnsiName, rc = RegQueryValue(hKey, szIdBuffer, NULL, (PUCHAR)NameBuffer, &BufferSize); if (rc != ERROR_SUCCESS) { - //strcpy(szErrorOut, "Language Default setting exists, but isn't readable"); + //RtlStringCbCopyA(szErrorOut, sizeof(szErrorOut), "Language Default setting exists, but isn't readable"); return FALSE; } sprintf(LangName, "%S", NameBuffer); @@ -305,12 +305,10 @@ WinLdrLoadNLSData(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock, IN PCSTR LanguageFileName) { CHAR FileName[255]; - ULONG AnsiFileId; - ULONG OemFileId; - ULONG LanguageFileId; + ULONG FileId; ULONG AnsiFileSize, OemFileSize, LanguageFileSize; ULONG TotalSize; - ULONG_PTR NlsDataBase; + PVOID NlsDataBase; PVOID NlsVirtual; BOOLEAN AnsiEqualsOem = FALSE; FILEINFORMATION FileInfo; @@ -322,21 +320,21 @@ WinLdrLoadNLSData(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock, AnsiEqualsOem = TRUE; /* Open file with ANSI and store its size */ - strcpy(FileName, DirectoryPath); - strcat(FileName, AnsiFileName); - Status = ArcOpen(FileName, OpenReadOnly, &AnsiFileId); + RtlStringCbCopyA(FileName, sizeof(FileName), DirectoryPath); + RtlStringCbCatA(FileName, sizeof(FileName), AnsiFileName); + Status = ArcOpen(FileName, OpenReadOnly, &FileId); if (Status != ESUCCESS) { WARN("Error while opening '%s', Status: %u\n", FileName, Status); goto Failure; } - Status = ArcGetFileInformation(AnsiFileId, &FileInfo); + Status = ArcGetFileInformation(FileId, &FileInfo); + ArcClose(FileId); if (Status != ESUCCESS) goto Failure; AnsiFileSize = FileInfo.EndingAddress.LowPart; TRACE("AnsiFileSize: %d\n", AnsiFileSize); - ArcClose(AnsiFileId); /* Open OEM file and store its length */ if (AnsiEqualsOem) @@ -346,128 +344,123 @@ WinLdrLoadNLSData(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock, else { //Print(L"Loading %s...\n", Filename); - strcpy(FileName, DirectoryPath); - strcat(FileName, OemFileName); - Status = ArcOpen(FileName, OpenReadOnly, &OemFileId); + RtlStringCbCopyA(FileName, sizeof(FileName), DirectoryPath); + RtlStringCbCatA(FileName, sizeof(FileName), OemFileName); + Status = ArcOpen(FileName, OpenReadOnly, &FileId); if (Status != ESUCCESS) { WARN("Error while opening '%s', Status: %u\n", FileName, Status); goto Failure; } - Status = ArcGetFileInformation(OemFileId, &FileInfo); + Status = ArcGetFileInformation(FileId, &FileInfo); + ArcClose(FileId); if (Status != ESUCCESS) goto Failure; OemFileSize = FileInfo.EndingAddress.LowPart; - ArcClose(OemFileId); } TRACE("OemFileSize: %d\n", OemFileSize); /* And finally open the language codepage file and store its length */ //Print(L"Loading %s...\n", Filename); - strcpy(FileName, DirectoryPath); - strcat(FileName, LanguageFileName); - Status = ArcOpen(FileName, OpenReadOnly, &LanguageFileId); + RtlStringCbCopyA(FileName, sizeof(FileName), DirectoryPath); + RtlStringCbCatA(FileName, sizeof(FileName), LanguageFileName); + Status = ArcOpen(FileName, OpenReadOnly, &FileId); if (Status != ESUCCESS) { WARN("Error while opening '%s', Status: %u\n", FileName, Status); goto Failure; } - Status = ArcGetFileInformation(LanguageFileId, &FileInfo); + Status = ArcGetFileInformation(FileId, &FileInfo); + ArcClose(FileId); if (Status != ESUCCESS) goto Failure; LanguageFileSize = FileInfo.EndingAddress.LowPart; - ArcClose(LanguageFileId); TRACE("LanguageFileSize: %d\n", LanguageFileSize); /* Sum up all three length, having in mind that every one of them must start at a page boundary => thus round up each file to a page */ TotalSize = MM_SIZE_TO_PAGES(AnsiFileSize) + - MM_SIZE_TO_PAGES(OemFileSize) + - MM_SIZE_TO_PAGES(LanguageFileSize); + MM_SIZE_TO_PAGES(OemFileSize) + + MM_SIZE_TO_PAGES(LanguageFileSize); /* Store it for later marking the pages as NlsData type */ TotalNLSSize = TotalSize; - NlsDataBase = (ULONG_PTR)MmAllocateMemoryWithType(TotalSize*MM_PAGE_SIZE, LoaderNlsData); - - if (NlsDataBase == 0) + NlsDataBase = MmAllocateMemoryWithType(TotalSize*MM_PAGE_SIZE, LoaderNlsData); + if (NlsDataBase == NULL) goto Failure; - NlsVirtual = PaToVa((PVOID)NlsDataBase); + NlsVirtual = PaToVa(NlsDataBase); LoaderBlock->NlsData->AnsiCodePageData = NlsVirtual; - LoaderBlock->NlsData->OemCodePageData = (PVOID)((PUCHAR)NlsVirtual + + LoaderBlock->NlsData->OemCodePageData = (PVOID)((ULONG_PTR)NlsVirtual + (MM_SIZE_TO_PAGES(AnsiFileSize) << MM_PAGE_SHIFT)); - LoaderBlock->NlsData->UnicodeCodePageData = (PVOID)((PUCHAR)NlsVirtual + + LoaderBlock->NlsData->UnicodeCodePageData = (PVOID)((ULONG_PTR)NlsVirtual + (MM_SIZE_TO_PAGES(AnsiFileSize) << MM_PAGE_SHIFT) + - (MM_SIZE_TO_PAGES(OemFileSize) << MM_PAGE_SHIFT)); + (MM_SIZE_TO_PAGES(OemFileSize) << MM_PAGE_SHIFT)); /* Ansi and OEM data are the same - just set pointers to the same area */ if (AnsiEqualsOem) LoaderBlock->NlsData->OemCodePageData = LoaderBlock->NlsData->AnsiCodePageData; - /* Now actually read the data into memory, starting with Ansi file */ - strcpy(FileName, DirectoryPath); - strcat(FileName, AnsiFileName); - Status = ArcOpen(FileName, OpenReadOnly, &AnsiFileId); + RtlStringCbCopyA(FileName, sizeof(FileName), DirectoryPath); + RtlStringCbCatA(FileName, sizeof(FileName), AnsiFileName); + Status = ArcOpen(FileName, OpenReadOnly, &FileId); if (Status != ESUCCESS) { WARN("Error while opening '%s', Status: %u\n", FileName, Status); goto Failure; } - Status = ArcRead(AnsiFileId, VaToPa(LoaderBlock->NlsData->AnsiCodePageData), AnsiFileSize, &BytesRead); + Status = ArcRead(FileId, VaToPa(LoaderBlock->NlsData->AnsiCodePageData), AnsiFileSize, &BytesRead); + ArcClose(FileId); if (Status != ESUCCESS) { WARN("Error while reading '%s', Status: %u\n", FileName, Status); goto Failure; } - ArcClose(AnsiFileId); - /* OEM now, if it doesn't equal Ansi of course */ if (!AnsiEqualsOem) { - strcpy(FileName, DirectoryPath); - strcat(FileName, OemFileName); - Status = ArcOpen(FileName, OpenReadOnly, &OemFileId); + RtlStringCbCopyA(FileName, sizeof(FileName), DirectoryPath); + RtlStringCbCatA(FileName, sizeof(FileName), OemFileName); + Status = ArcOpen(FileName, OpenReadOnly, &FileId); if (Status != ESUCCESS) { WARN("Error while opening '%s', Status: %u\n", FileName, Status); goto Failure; } - Status = ArcRead(OemFileId, VaToPa(LoaderBlock->NlsData->OemCodePageData), OemFileSize, &BytesRead); + Status = ArcRead(FileId, VaToPa(LoaderBlock->NlsData->OemCodePageData), OemFileSize, &BytesRead); + ArcClose(FileId); if (Status != ESUCCESS) { WARN("Error while reading '%s', Status: %u\n", FileName, Status); goto Failure; } - - ArcClose(OemFileId); } - /* finally the language file */ - strcpy(FileName, DirectoryPath); - strcat(FileName, LanguageFileName); - Status = ArcOpen(FileName, OpenReadOnly, &LanguageFileId); + /* Finally the language file */ + RtlStringCbCopyA(FileName, sizeof(FileName), DirectoryPath); + RtlStringCbCatA(FileName, sizeof(FileName), LanguageFileName); + Status = ArcOpen(FileName, OpenReadOnly, &FileId); if (Status != ESUCCESS) { WARN("Error while opening '%s', Status: %u\n", FileName, Status); goto Failure; } - Status = ArcRead(LanguageFileId, VaToPa(LoaderBlock->NlsData->UnicodeCodePageData), LanguageFileSize, &BytesRead); + Status = ArcRead(FileId, VaToPa(LoaderBlock->NlsData->UnicodeCodePageData), LanguageFileSize, &BytesRead); + ArcClose(FileId); if (Status != ESUCCESS) { WARN("Error while reading '%s', Status: %u\n", FileName, Status); goto Failure; } - ArcClose(LanguageFileId); - // // THIS IS HAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACK // Should go to WinLdrLoadOemHalFont(), when it will be implemented

1 0

[reactos] 01/01: [FREELDR] Minor enhancements for disk/partition boot and UI.
by Hermès Bélusca-Maïto 13 Aug '19

13 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=85d44fca5923089cd10e0… commit 85d44fca5923089cd10e03efe58c4854a2b8b176 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Aug 13 17:34:57 2019 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Aug 13 23:07:01 2019 +0200 [FREELDR] Minor enhancements for disk/partition boot and UI. - Factor out disk & partition opening in LoadAndBootPartition() and LoadAndBootDrive() into a LoadAndBootPartitionOrDrive() helper. - Use ARC paths and ArcOpen()/ArcRead() instead of calling the machine-specific BIOS-oriented DiskGetPartitionEntry() and MachDiskReadLogicalSectors() functions to open the disk/partition and read their boot sectors. - Don't forget to close the opened boot sector file in LoadAndBootBootSector(). - Add assertions for DiskReadBufferSize in PcMemFinalizeMemoryMap() and EnumerateHarddisks(). - x86/amd64 only: * Add a DisableA20 helper for disabling the A20 line, before rebooting back, or chain-load a boot sector, into 16-bit world. Also pulse the output port of the keyboard controller to clear out its state after having set the state of the A20 line. * In addition to disabling the A20 line when rebooting or chain-loading a boot sector, reset the video back to 80x25 text mode. - Reset the cursor position back to the origin when initializing or terminating the TUI. --- boot/freeldr/freeldr/arch/i386/hwdisk.c | 4 +- boot/freeldr/freeldr/arch/i386/pcmem.c | 2 + boot/freeldr/freeldr/arch/realmode/helpers.inc | 35 ++++++- boot/freeldr/freeldr/disk/disk.c | 2 +- boot/freeldr/freeldr/include/arch/pc/pcbios.h | 1 - boot/freeldr/freeldr/miscboot.c | 125 ++++++++++++------------- boot/freeldr/freeldr/ui/tui.c | 2 + 7 files changed, 102 insertions(+), 69 deletions(-) diff --git a/boot/freeldr/freeldr/arch/i386/hwdisk.c b/boot/freeldr/freeldr/arch/i386/hwdisk.c index 853d37f0981..fde0d8acf89 100644 --- a/boot/freeldr/freeldr/arch/i386/hwdisk.c +++ b/boot/freeldr/freeldr/arch/i386/hwdisk.c @@ -152,7 +152,7 @@ DiskRead(ULONG FileId, VOID* Buffer, ULONG N, ULONG* Count) MaxSectors = DiskReadBufferSize / Context->SectorSize; SectorOffset = Context->SectorNumber + Context->SectorOffset; - // If MaxSectors is 0, this will lead to infinite loop + // If MaxSectors is 0, this will lead to infinite loop. // In release builds assertions are disabled, however we also have sanity checks in DiskOpen() ASSERT(MaxSectors > 0); @@ -319,6 +319,8 @@ EnumerateHarddisks(OUT PBOOLEAN BootDriveReported) DiskCount = 0; DriveNumber = 0x80; + ASSERT(DiskReadBufferSize > 0); + /* * There are some really broken BIOSes out there. There are even BIOSes * that happily report success when you ask them to read from non-existent diff --git a/boot/freeldr/freeldr/arch/i386/pcmem.c b/boot/freeldr/freeldr/arch/i386/pcmem.c index 4dd709b247c..b3b5761d957 100644 --- a/boot/freeldr/freeldr/arch/i386/pcmem.c +++ b/boot/freeldr/freeldr/arch/i386/pcmem.c @@ -571,6 +571,8 @@ PcMemFinalizeMemoryMap( TRACE("DiskReadBuffer=0x%p, DiskReadBufferSize=0x%lx\n", DiskReadBuffer, DiskReadBufferSize); + ASSERT(DiskReadBufferSize > 0); + /* Now reserve the range for the disk read buffer */ ReserveMemory(MemoryMap, (ULONG_PTR)DiskReadBuffer, diff --git a/boot/freeldr/freeldr/arch/realmode/helpers.inc b/boot/freeldr/freeldr/arch/realmode/helpers.inc index 8f5db395892..981354826ae 100644 --- a/boot/freeldr/freeldr/arch/realmode/helpers.inc +++ b/boot/freeldr/freeldr/arch/realmode/helpers.inc @@ -18,6 +18,24 @@ EnableA20: mov al, HEX(0DF) // A20 on out HEX(060), al call Empty8042 + mov al, HEX(0FF) // pulse output port + out HEX(064), al + call Empty8042 + popa + ret + +DisableA20: + pusha + call Empty8042 + mov al, HEX(0D1) // command write + out HEX(064), al + call Empty8042 + mov al, HEX(0DD) // A20 off + out HEX(060), al + call Empty8042 + mov al, HEX(0FF) // pulse output port + out HEX(064), al + call Empty8042 popa ret @@ -95,6 +113,13 @@ writehex_common: Reboot: cli + /* Disable A20 address line */ + call DisableA20 + + /* Set the video back to 80x25 text mode */ + mov ax, HEX(0003) + int HEX(10) + /* Set the word at location 40h:72h to 0 (cold reboot) */ mov word ptr ds:[HEX(0472)], HEX(0) @@ -103,8 +128,16 @@ Reboot: ChainLoadBiosBootSectorCode: - /* Load segment registers */ cli + + /* Disable A20 address line */ + call DisableA20 + + /* Set the video back to 80x25 text mode */ + mov ax, HEX(0003) + int HEX(10) + + /* Load segment registers */ xor ax, ax mov ds, ax mov es, ax diff --git a/boot/freeldr/freeldr/disk/disk.c b/boot/freeldr/freeldr/disk/disk.c index 11cc0a7a63d..e9579a0beab 100644 --- a/boot/freeldr/freeldr/disk/disk.c +++ b/boot/freeldr/freeldr/disk/disk.c @@ -81,7 +81,7 @@ PCSTR DiskGetErrorCodeString(ULONG ErrorCode) case 0xE0: return "fixed disk status error/Error reg = 0"; case 0xFF: return "sense operation failed"; - default: return "unknown error code"; + default: return "unknown error code"; } } diff --git a/boot/freeldr/freeldr/include/arch/pc/pcbios.h b/boot/freeldr/freeldr/include/arch/pc/pcbios.h index 5ad273f0442..6faeb06986d 100644 --- a/boot/freeldr/freeldr/include/arch/pc/pcbios.h +++ b/boot/freeldr/freeldr/include/arch/pc/pcbios.h @@ -160,7 +160,6 @@ int __cdecl Int386(int ivec, REGS* in, REGS* out); // If CF is set then the call failed (usually) #define INT386_SUCCESS(regs) ((regs.x.eflags & EFLAGS_CF) == 0) -void EnableA20(void); VOID __cdecl ChainLoadBiosBootSectorCode(VOID); // Implemented in boot.S VOID __cdecl Reboot(VOID); // Implemented in boot.S VOID DetectHardware(VOID); // Implemented in hardware.c diff --git a/boot/freeldr/freeldr/miscboot.c b/boot/freeldr/freeldr/miscboot.c index 0d12e4bc2c6..535f9d6efab 100644 --- a/boot/freeldr/freeldr/miscboot.c +++ b/boot/freeldr/freeldr/miscboot.c @@ -54,13 +54,14 @@ LoadAndBootBootSector( } /* Read boot sector */ - if (ArcRead(FileId, (void*)0x7c00, 512, &BytesRead) != ESUCCESS || - (BytesRead != 512)) + if ((ArcRead(FileId, (PVOID)0x7c00, 512, &BytesRead) != ESUCCESS) || (BytesRead != 512)) { UiMessageBox("Unable to read boot sector."); return EIO; } + ArcClose(FileId); + /* Check for validity */ if (*((USHORT*)(0x7c00 + 0x1fe)) != 0xaa55) { @@ -81,56 +82,45 @@ LoadAndBootBootSector( * result in a read error. */ // DiskStopFloppyMotor(); - // DisableA20(); + /* NOTE: Don't touch FrldrBootDrive */ ChainLoadBiosBootSectorCode(); + Reboot(); /* Must not return! */ return ESUCCESS; } -ARC_STATUS -LoadAndBootPartition( - IN ULONG Argc, - IN PCHAR Argv[], - IN PCHAR Envp[]) +static ARC_STATUS +LoadAndBootPartitionOrDrive( + IN UCHAR DriveNumber, + IN ULONG PartitionNumber OPTIONAL) { - PCSTR ArgValue; - PARTITION_TABLE_ENTRY PartitionTableEntry; - UCHAR DriveNumber; - ULONG PartitionNumber; - - /* Find all the message box settings and run them */ - UiShowMessageBoxesInArgv(Argc, Argv); - - /* Read the boot drive */ - ArgValue = GetArgumentValue(Argc, Argv, "BootDrive"); - if (!ArgValue) - { - UiMessageBox("Boot drive not specified for selected OS!"); - return EINVAL; - } - DriveNumber = DriveMapGetBiosDriveNumber(ArgValue); - - /* Read the boot partition */ - ArgValue = GetArgumentValue(Argc, Argv, "BootPartition"); - if (!ArgValue) - { - UiMessageBox("Boot partition not specified for selected OS!"); - return EINVAL; - } - PartitionNumber = atoi(ArgValue); + ULONG FileId; + ULONG BytesRead; + CHAR ArcPath[MAX_PATH]; - /* Get the partition table entry */ - if (!DiskGetPartitionEntry(DriveNumber, PartitionNumber, &PartitionTableEntry)) + /* Construct the corresponding ARC path */ + ConstructArcPath(ArcPath, "", DriveNumber, PartitionNumber); + *strrchr(ArcPath, '\\') = ANSI_NULL; // Trim the trailing path separator. + if (ArcOpen(ArcPath, OpenReadOnly, &FileId) != ESUCCESS) { + UiMessageBox("Unable to open %s", ArcPath); return ENOENT; } - /* Now try to read the partition boot sector. If this fails then abort. */ - if (!MachDiskReadLogicalSectors(DriveNumber, PartitionTableEntry.SectorCountBeforePartition, 1, (PVOID)0x7C00)) + /* + * Now try to read the partition boot sector or the MBR (when PartitionNumber == 0). + * If this fails then abort. + */ + if ((ArcRead(FileId, (PVOID)0x7c00, 512, &BytesRead) != ESUCCESS) || (BytesRead != 512)) { - UiMessageBox("Unable to read partition's boot sector."); + if (PartitionNumber != 0) + UiMessageBox("Unable to read partition's boot sector."); + else + UiMessageBox("Unable to read MBR boot sector."); return EIO; } + ArcClose(FileId); + /* Check for validity */ if (*((USHORT*)(0x7c00 + 0x1fe)) != 0xaa55) { @@ -151,20 +141,22 @@ LoadAndBootPartition( * result in a read error. */ // DiskStopFloppyMotor(); - // DisableA20(); FrldrBootDrive = DriveNumber; + FrldrBootPartition = PartitionNumber; ChainLoadBiosBootSectorCode(); + Reboot(); /* Must not return! */ return ESUCCESS; } ARC_STATUS -LoadAndBootDrive( +LoadAndBootPartition( IN ULONG Argc, IN PCHAR Argv[], IN PCHAR Envp[]) { PCSTR ArgValue; UCHAR DriveNumber; + ULONG PartitionNumber; /* Find all the message box settings and run them */ UiShowMessageBoxesInArgv(Argc, Argv); @@ -178,37 +170,40 @@ LoadAndBootDrive( } DriveNumber = DriveMapGetBiosDriveNumber(ArgValue); - /* Now try to read the boot sector (or mbr). If this fails then abort. */ - if (!MachDiskReadLogicalSectors(DriveNumber, 0, 1, (PVOID)0x7C00)) + /* Read the boot partition */ + ArgValue = GetArgumentValue(Argc, Argv, "BootPartition"); + if (!ArgValue) { - UiMessageBox("Unable to read boot sector"); - return EIO; + UiMessageBox("Boot partition not specified for selected OS!"); + return EINVAL; } + PartitionNumber = atoi(ArgValue); - /* Check for validity */ - if (*((USHORT*)(0x7c00 + 0x1fe)) != 0xaa55) + return LoadAndBootPartitionOrDrive(DriveNumber, PartitionNumber); +} + +ARC_STATUS +LoadAndBootDrive( + IN ULONG Argc, + IN PCHAR Argv[], + IN PCHAR Envp[]) +{ + PCSTR ArgValue; + UCHAR DriveNumber; + + /* Find all the message box settings and run them */ + UiShowMessageBoxesInArgv(Argc, Argv); + + /* Read the boot drive */ + ArgValue = GetArgumentValue(Argc, Argv, "BootDrive"); + if (!ArgValue) { - UiMessageBox("Invalid boot sector magic (0xaa55)"); - return ENOEXEC; + UiMessageBox("Boot drive not specified for selected OS!"); + return EINVAL; } + DriveNumber = DriveMapGetBiosDriveNumber(ArgValue); - UiUnInitialize("Booting..."); - IniCleanup(); - - /* - * Don't stop the floppy drive motor when we - * are just booting a bootsector, or drive, or partition. - * If we were to stop the floppy motor then - * the BIOS wouldn't be informed and if the - * next read is to a floppy then the BIOS will - * still think the motor is on and this will - * result in a read error. - */ - // DiskStopFloppyMotor(); - // DisableA20(); - FrldrBootDrive = DriveNumber; - ChainLoadBiosBootSectorCode(); - return ESUCCESS; + return LoadAndBootPartitionOrDrive(DriveNumber, 0); } #endif // _M_IX86 diff --git a/boot/freeldr/freeldr/ui/tui.c b/boot/freeldr/freeldr/ui/tui.c index 8fd16aabc72..44f80163a5b 100644 --- a/boot/freeldr/freeldr/ui/tui.c +++ b/boot/freeldr/freeldr/ui/tui.c @@ -52,6 +52,7 @@ int TuiPrintf(const char *Format, ...) BOOLEAN TuiInitialize(VOID) { MachVideoHideShowTextCursor(FALSE); + MachVideoSetTextCursorPosition(0, 0); MachVideoClearScreen(ATTR(COLOR_GRAY, COLOR_BLACK)); TextVideoBuffer = VideoAllocateOffScreenBuffer(); @@ -75,6 +76,7 @@ VOID TuiUnInitialize(VOID) } MachVideoClearScreen(ATTR(COLOR_GRAY, COLOR_BLACK)); + MachVideoSetTextCursorPosition(0, 0); MachVideoHideShowTextCursor(TRUE); }

1 0

[reactos] 01/01: [OSK] Romanian translation update (#1820)
by Bișoc George 12 Aug '19

12 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4578ee3e2098647c8c425… commit 4578ee3e2098647c8c4254f3ceb532c0b5815176 Author: Bișoc George <fraizeraust99(a)gmail.com> AuthorDate: Mon Aug 12 20:58:39 2019 +0200 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Aug 12 20:58:39 2019 +0200 [OSK] Romanian translation update (#1820) --- base/applications/osk/lang/ro-RO.rc | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/base/applications/osk/lang/ro-RO.rc b/base/applications/osk/lang/ro-RO.rc index bc30611f975..21cae9a49d5 100644 --- a/base/applications/osk/lang/ro-RO.rc +++ b/base/applications/osk/lang/ro-RO.rc @@ -256,11 +256,11 @@ BEGIN POPUP "Tastatură" BEGIN - MENUITEM "Tastatură îmbunătățită", IDM_ENHANCED_KB, CHECKED + MENUITEM "Tastatură extinsă", IDM_ENHANCED_KB, CHECKED MENUITEM "Tastatură standard", IDM_STANDARD_KB MENUITEM SEPARATOR - MENUITEM "Aspect regular", IDM_REG_LAYOUT, CHECKED, GRAYED - MENUITEM "Aspect pe blocuri", IDM_BLOCK_LAYOUT, GRAYED + MENUITEM "Structură standard", IDM_REG_LAYOUT, CHECKED, GRAYED + MENUITEM "Structură bloc", IDM_BLOCK_LAYOUT, GRAYED MENUITEM SEPARATOR MENUITEM "101 taste", IDM_101_KEYS, CHECKED, GRAYED MENUITEM "102 taste", IDM_102_KEYS, GRAYED @@ -269,20 +269,20 @@ BEGIN POPUP "Setări" BEGIN - MENUITEM "Întotdeauna în sus", IDM_ON_TOP, CHECKED + MENUITEM "Întotdeauna în față", IDM_ON_TOP, CHECKED MENUITEM SEPARATOR - MENUITEM "&Folosește sunetul de clic", IDM_CLICK_SOUND + MENUITEM "&Utilizare sunetul de clic", IDM_CLICK_SOUND MENUITEM SEPARATOR - MENUITEM "&Modalitatea de scriere...", IDM_TYPE_MODE, GRAYED + MENUITEM "&Mod tastare...", IDM_TYPE_MODE, GRAYED MENUITEM SEPARATOR - MENUITEM "&Tip de caracter...", IDM_FONT, GRAYED + MENUITEM "&Font...", IDM_FONT, GRAYED END POPUP "Ajutor" BEGIN MENUITEM "&Manual", IDM_HELP_TOPICS, GRAYED MENUITEM SEPARATOR - MENUITEM "&Despre tastatură virtuală...", IDM_ABOUT + MENUITEM "&Despre Tastatura virtuală...", IDM_ABOUT END END

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