Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [ISAPNP] Properly stub IRP_MJ_POWER
by Hervé Poussineau 30 Jul '20

30 Jul '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9df05ba4b65631942d006… commit 9df05ba4b65631942d006f36a4ad1d848f0bf61f Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Sun Jul 12 15:37:20 2020 +0200 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Thu Jul 30 13:24:29 2020 +0200 [ISAPNP] Properly stub IRP_MJ_POWER --- drivers/bus/isapnp/isapnp.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/drivers/bus/isapnp/isapnp.c b/drivers/bus/isapnp/isapnp.c index 913721b3acd..f14894de6c8 100644 --- a/drivers/bus/isapnp/isapnp.c +++ b/drivers/bus/isapnp/isapnp.c @@ -807,6 +807,28 @@ IsaAddDevice( return STATUS_SUCCESS; } +DRIVER_DISPATCH IsaPower; +NTSTATUS +NTAPI +IsaPower( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PISAPNP_COMMON_EXTENSION DevExt = DeviceObject->DeviceExtension; + NTSTATUS Status; + + if (!DevExt->IsFdo) + { + Status = Irp->IoStatus.Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; + } + + PoStartNextPowerIrp(Irp); + IoSkipCurrentIrpStackLocation(Irp); + return PoCallDriver(((PISAPNP_FDO_EXTENSION)DevExt)->Ldo, Irp); +} + static DRIVER_DISPATCH IsaPnp; static @@ -849,6 +871,7 @@ DriverEntry( DriverObject->MajorFunction[IRP_MJ_WRITE] = IsaReadWrite; DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = IsaIoctl; DriverObject->MajorFunction[IRP_MJ_PNP] = IsaPnp; + DriverObject->MajorFunction[IRP_MJ_POWER] = IsaPower; DriverObject->DriverExtension->AddDevice = IsaAddDevice; return STATUS_SUCCESS;

1 0

[reactos] 01/01: [WinSpool] Fix Header Order.
by James Tabor 29 Jul '20

29 Jul '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c2b65c3feaafca79558fc… commit c2b65c3feaafca79558fc2bc9fc0f1dbb6e3891a Author: James Tabor <james.tabor(a)reactos.org> AuthorDate: Wed Jul 29 13:06:07 2020 -0500 Commit: James Tabor <james.tabor(a)reactos.org> CommitDate: Wed Jul 29 13:06:07 2020 -0500 [WinSpool] Fix Header Order. Found an issue with the header. --- sdk/include/psdk/winspool.h | 118 ++++++++++++++++++++++---------------------- 1 file changed, 60 insertions(+), 58 deletions(-) diff --git a/sdk/include/psdk/winspool.h b/sdk/include/psdk/winspool.h index 0116d18f978..fa03a2acfbb 100644 --- a/sdk/include/psdk/winspool.h +++ b/sdk/include/psdk/winspool.h @@ -533,6 +533,66 @@ extern "C" { __MINGW_TYPEDEF_AW(PDRIVER_INFO_6) __MINGW_TYPEDEF_AW(LPDRIVER_INFO_6) +typedef struct _DRIVER_INFO_8W { + DWORD cVersion; + LPWSTR pName; + LPWSTR pEnvironment; + LPWSTR pDriverPath; + LPWSTR pDataFile; + LPWSTR pConfigFile; + LPWSTR pHelpFile; + LPWSTR pDependentFiles; + LPWSTR pMonitorName; + LPWSTR pDefaultDataType; + LPWSTR pszzPreviousNames; + FILETIME ftDriverDate; + DWORDLONG dwlDriverVersion; + LPWSTR pszMfgName; + LPWSTR pszOEMUrl; + LPWSTR pszHardwareID; + LPWSTR pszProvider; + LPWSTR pszPrintProcessor; + LPWSTR pszVendorSetup; + LPWSTR pszzColorProfiles; + LPWSTR pszInfPath; + DWORD dwPrinterDriverAttributes; + LPWSTR pszzCoreDriverDependencies; + FILETIME ftMinInboxDriverVerDate; + DWORDLONG dwlMinInboxDriverVerVersion; +} DRIVER_INFO_8W, *PDRIVER_INFO_8W, *LPDRIVER_INFO_8W; + +typedef struct _DRIVER_INFO_8A { + DWORD cVersion; + LPSTR pName; + LPSTR pEnvironment; + LPSTR pDriverPath; + LPSTR pDataFile; + LPSTR pConfigFile; + LPSTR pHelpFile; + LPSTR pDependentFiles; + LPSTR pMonitorName; + LPSTR pDefaultDataType; + LPSTR pszzPreviousNames; + FILETIME ftDriverDate; + DWORDLONG dwlDriverVersion; + LPSTR pszMfgName; + LPSTR pszOEMUrl; + LPSTR pszHardwareID; + LPSTR pszProvider; + LPSTR pszPrintProcessor; + LPSTR pszVendorSetup; + LPSTR pszzColorProfiles; + LPSTR pszInfPath; + DWORD dwPrinterDriverAttributes; + LPSTR pszzCoreDriverDependencies; + FILETIME ftMinInboxDriverVerDate; + DWORDLONG dwlMinInboxDriverVerVersion; +} DRIVER_INFO_8A, *PDRIVER_INFO_8A, *LPDRIVER_INFO_8A; + +__MINGW_TYPEDEF_AW(DRIVER_INFO_8) +__MINGW_TYPEDEF_AW(PDRIVER_INFO_8) +__MINGW_TYPEDEF_AW(LPDRIVER_INFO_8) + #define DRIVER_KERNELMODE 0x00000001 #define DRIVER_USERMODE 0x00000002 @@ -1420,61 +1480,6 @@ HRESULT DocumentEventW( PVOID pvOut ); -typedef struct _DRIVER_INFO_8W { - DWORD cVersion; - LPWSTR pName; - LPWSTR pEnvironment; - LPWSTR pDriverPath; - LPWSTR pDataFile; - LPWSTR pConfigFile; - LPWSTR pHelpFile; - LPWSTR pDependentFiles; - LPWSTR pMonitorName; - LPWSTR pDefaultDataType; - LPWSTR pszzPreviousNames; - FILETIME ftDriverDate; - DWORDLONG dwlDriverVersion; - LPWSTR pszMfgName; - LPWSTR pszOEMUrl; - LPWSTR pszHardwareID; - LPWSTR pszProvider; - LPWSTR pszPrintProcessor; - LPWSTR pszVendorSetup; - LPWSTR pszzColorProfiles; - LPWSTR pszInfPath; - DWORD dwPrinterDriverAttributes; - LPWSTR pszzCoreDriverDependencies; - FILETIME ftMinInboxDriverVerDate; - DWORDLONG dwlMinInboxDriverVerVersion; -} DRIVER_INFO_8W, *PDRIVER_INFO_8W, *LPDRIVER_INFO_8W; - -typedef struct _DRIVER_INFO_8A { - DWORD cVersion; - LPSTR pName; - LPSTR pEnvironment; - LPSTR pDriverPath; - LPSTR pDataFile; - LPSTR pConfigFile; - LPSTR pHelpFile; - LPSTR pDependentFiles; - LPSTR pMonitorName; - LPSTR pDefaultDataType; - LPSTR pszzPreviousNames; - FILETIME ftDriverDate; - DWORDLONG dwlDriverVersion; - LPSTR pszMfgName; - LPSTR pszOEMUrl; - LPSTR pszHardwareID; - LPSTR pszProvider; - LPSTR pszPrintProcessor; - LPSTR pszVendorSetup; - LPSTR pszzColorProfiles; - LPSTR pszInfPath; - DWORD dwPrinterDriverAttributes; - LPSTR pszzCoreDriverDependencies; - FILETIME ftMinInboxDriverVerDate; - DWORDLONG dwlMinInboxDriverVerVersion; -} DRIVER_INFO_8A, *PDRIVER_INFO_8A, *LPDRIVER_INFO_8A; typedef struct _FORM_INFO_2A { DWORD Flags; @@ -1502,9 +1507,6 @@ typedef struct _FORM_INFO_2W { LANGID wLangId; } FORM_INFO_2W, *PFORM_INFO_2W; -__MINGW_TYPEDEF_AW(DRIVER_INFO_8) -__MINGW_TYPEDEF_AW(PDRIVER_INFO_8) -__MINGW_TYPEDEF_AW(LPDRIVER_INFO_8) __MINGW_TYPEDEF_AW(FORM_INFO_2) __MINGW_TYPEDEF_AW(PFORM_INFO_2)

1 0

[reactos] 06/06: [BOOTVID] More improvements for PC-98 (#2936)
by Dmitry Borisov 29 Jul '20

29 Jul '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=06cbc2acd28d376af4ea3… commit 06cbc2acd28d376af4ea377f339e69b4005f1ea0 Author: Dmitry Borisov <di.sean(a)protonmail.com> AuthorDate: Tue Jul 28 00:25:18 2020 +0600 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Wed Jul 29 19:10:39 2020 +0300 [BOOTVID] More improvements for PC-98 (#2936) - Fix failure handling - Reduce memory mapping that's not needed --- drivers/base/bootvid/i386/pc98/bootvid.c | 37 ++++++++++++++++++++++---------- sdk/include/reactos/drivers/pc98/video.h | 2 ++ 2 files changed, 28 insertions(+), 11 deletions(-) diff --git a/drivers/base/bootvid/i386/pc98/bootvid.c b/drivers/base/bootvid/i386/pc98/bootvid.c index c938910e957..18af07764a6 100644 --- a/drivers/base/bootvid/i386/pc98/bootvid.c +++ b/drivers/base/bootvid/i386/pc98/bootvid.c @@ -11,8 +11,8 @@ /* GLOBALS ********************************************************************/ -static ULONG_PTR VideoMemoryI; -ULONG_PTR FrameBuffer; +static ULONG_PTR PegcControl = 0; +ULONG_PTR FrameBuffer = 0; #define PEGC_MAX_COLORS 256 @@ -25,23 +25,38 @@ GraphGetStatus( UCHAR Result; WRITE_PORT_UCHAR((PUCHAR)GRAPH_IO_o_STATUS_SELECT, Status); - KeStallExecutionProcessor(1); Result = READ_PORT_UCHAR((PUCHAR)GRAPH_IO_i_STATUS); return (Result & GRAPH_STATUS_SET) && (Result != 0xFF); } +static BOOLEAN +TestMmio(VOID) +{ + USHORT OldValue, NewValue; + + OldValue = READ_REGISTER_USHORT((PUSHORT)(PegcControl + PEGC_MMIO_MODE)); + + /* Bits [15:1] are not writable */ + WRITE_REGISTER_USHORT((PUSHORT)(PegcControl + PEGC_MMIO_MODE), 0x80); + NewValue = READ_REGISTER_USHORT((PUSHORT)(PegcControl + PEGC_MMIO_MODE)); + + WRITE_REGISTER_USHORT((PUSHORT)(PegcControl + PEGC_MMIO_MODE), OldValue); + + return !(NewValue & 0x80); +} + static BOOLEAN HasPegcController(VOID) { BOOLEAN Success; if (GraphGetStatus(GRAPH_STATUS_PEGC)) - return TRUE; + return TestMmio(); WRITE_PORT_UCHAR((PUCHAR)GDC2_IO_o_MODE_FLIPFLOP2, GDC2_EGC_FF_UNPROTECT); WRITE_PORT_UCHAR((PUCHAR)GDC2_IO_o_MODE_FLIPFLOP2, GDC2_MODE_PEGC_ENABLE); - Success = GraphGetStatus(GRAPH_STATUS_PEGC); + Success = GraphGetStatus(GRAPH_STATUS_PEGC) ? TestMmio() : FALSE; WRITE_PORT_UCHAR((PUCHAR)GDC2_IO_o_MODE_FLIPFLOP2, GDC2_MODE_PEGC_DISABLE); WRITE_PORT_UCHAR((PUCHAR)GDC2_IO_o_MODE_FLIPFLOP2, GDC2_EGC_FF_PROTECT); @@ -212,8 +227,8 @@ InitializeDisplay(VOID) WRITE_PORT_UCHAR((PUCHAR)GDC2_IO_o_MODE_FLIPFLOP2, GDC2_MODE_PEGC_ENABLE); WRITE_PORT_UCHAR((PUCHAR)GDC2_IO_o_MODE_FLIPFLOP2, GDC2_MODE_LINES_800); WRITE_PORT_UCHAR((PUCHAR)GDC2_IO_o_MODE_FLIPFLOP2, GDC2_EGC_FF_PROTECT); - WRITE_REGISTER_USHORT((PUSHORT)(VideoMemoryI + PEGC_MMIO_MODE), PEGC_MODE_PACKED); - WRITE_REGISTER_USHORT((PUSHORT)(VideoMemoryI + PEGC_MMIO_FRAMEBUFFER), PEGC_FB_MAP); + WRITE_REGISTER_USHORT((PUSHORT)(PegcControl + PEGC_MMIO_MODE), PEGC_MODE_PACKED); + WRITE_REGISTER_USHORT((PUSHORT)(PegcControl + PEGC_MMIO_FRAMEBUFFER), PEGC_FB_MAP); /* Select the video source */ RelayState = READ_PORT_UCHAR((PUCHAR)GRAPH_IO_i_RELAY) & ~(GRAPH_RELAY_0 | GRAPH_RELAY_1); @@ -348,8 +363,8 @@ VidInitialize( PHYSICAL_ADDRESS BaseAddress; BaseAddress.QuadPart = VRAM_NORMAL_PLANE_I; - VideoMemoryI = (ULONG_PTR)MmMapIoSpace(BaseAddress, VRAM_PLANE_SIZE, MmNonCached); - if (!VideoMemoryI) + PegcControl = (ULONG_PTR)MmMapIoSpace(BaseAddress, PEGC_CONTROL_SIZE, MmNonCached); + if (!PegcControl) goto Failure; if (!HasPegcController()) @@ -366,8 +381,8 @@ VidInitialize( return TRUE; Failure: - if (!VideoMemoryI) MmUnmapIoSpace((PVOID)VideoMemoryI, VRAM_PLANE_SIZE); - if (!FrameBuffer) MmUnmapIoSpace((PVOID)FrameBuffer, PEGC_FRAMEBUFFER_SIZE); + if (PegcControl) + MmUnmapIoSpace((PVOID)PegcControl, PEGC_CONTROL_SIZE); return FALSE; } diff --git a/sdk/include/reactos/drivers/pc98/video.h b/sdk/include/reactos/drivers/pc98/video.h index 35a5f704b75..6c20b26cfcd 100644 --- a/sdk/include/reactos/drivers/pc98/video.h +++ b/sdk/include/reactos/drivers/pc98/video.h @@ -22,6 +22,8 @@ #define PEGC_FRAMEBUFFER_PACKED 0xF00000 #define PEGC_FRAMEBUFFER_SIZE 0x080000 +#define PEGC_CONTROL_SIZE 0x000200 + /* High-resolution machine */ #define VRAM_HI_RESO_PLANE_B 0xC0000 #define VRAM_HI_RESO_PLANE_G 0xC8000

1 0

[reactos] 05/06: [BOOTVID] Fix screen buffer copying code for PC-98 (#2936)
by Dmitry Borisov 29 Jul '20

29 Jul '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e318801c1c052035777aa… commit e318801c1c052035777aaef49b4071d37a0a7b89 Author: Dmitry Borisov <di.sean(a)protonmail.com> AuthorDate: Tue Jul 28 00:19:34 2020 +0600 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Wed Jul 29 19:10:39 2020 +0300 [BOOTVID] Fix screen buffer copying code for PC-98 (#2936) --- drivers/base/bootvid/i386/pc98/bootvid.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/base/bootvid/i386/pc98/bootvid.c b/drivers/base/bootvid/i386/pc98/bootvid.c index 0563da8a5e0..c938910e957 100644 --- a/drivers/base/bootvid/i386/pc98/bootvid.c +++ b/drivers/base/bootvid/i386/pc98/bootvid.c @@ -421,7 +421,7 @@ VidScreenToBufferBlt( ULONG X, Y; PUCHAR OutputBuffer; USHORT Px; - PUSHORT PixelsPosition = (PUSHORT)(FrameBuffer + FB_OFFSET(Left, Top)); + PUSHORT PixelsPosition; /* Clear the destination buffer */ RtlZeroMemory(Buffer, Delta * Height); @@ -429,6 +429,7 @@ VidScreenToBufferBlt( for (Y = 0; Y < Height; Y++) { OutputBuffer = Buffer + Y * Delta; + PixelsPosition = (PUSHORT)(FrameBuffer + FB_OFFSET(Left, Top + Y)); for (X = 0; X < Width; X += sizeof(USHORT)) {

1 0

[reactos] 04/06: [BOOTVID] Improve text scrolling performance for PC-98 (#2936)
by Dmitry Borisov 29 Jul '20

29 Jul '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c87be643f844a276f69d7… commit c87be643f844a276f69d759dd2652b7eff02086d Author: Dmitry Borisov <di.sean(a)protonmail.com> AuthorDate: Mon Jul 27 23:57:45 2020 +0600 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Wed Jul 29 19:10:39 2020 +0300 [BOOTVID] Improve text scrolling performance for PC-98 (#2936) --- drivers/base/bootvid/i386/pc98/bootvid.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/base/bootvid/i386/pc98/bootvid.c b/drivers/base/bootvid/i386/pc98/bootvid.c index 459c8e07ca4..0563da8a5e0 100644 --- a/drivers/base/bootvid/i386/pc98/bootvid.c +++ b/drivers/base/bootvid/i386/pc98/bootvid.c @@ -283,24 +283,24 @@ PreserveRow( _In_ ULONG TopDelta, _In_ BOOLEAN Restore) { - PUCHAR OldPosition, NewPosition; - ULONG PixelCount = TopDelta * SCREEN_WIDTH; + PULONG OldPosition, NewPosition; + ULONG PixelCount = TopDelta * (SCREEN_WIDTH / sizeof(ULONG)); if (Restore) { /* Restore the row by copying back the contents saved off-screen */ - OldPosition = (PUCHAR)(FrameBuffer + FB_OFFSET(0, SCREEN_HEIGHT)); - NewPosition = (PUCHAR)(FrameBuffer + FB_OFFSET(0, CurrentTop)); + OldPosition = (PULONG)(FrameBuffer + FB_OFFSET(0, SCREEN_HEIGHT)); + NewPosition = (PULONG)(FrameBuffer + FB_OFFSET(0, CurrentTop)); } else { /* Preserve the row by saving its contents off-screen */ - OldPosition = (PUCHAR)(FrameBuffer + FB_OFFSET(0, CurrentTop)); - NewPosition = (PUCHAR)(FrameBuffer + FB_OFFSET(0, SCREEN_HEIGHT)); + OldPosition = (PULONG)(FrameBuffer + FB_OFFSET(0, CurrentTop)); + NewPosition = (PULONG)(FrameBuffer + FB_OFFSET(0, SCREEN_HEIGHT)); } while (PixelCount--) - WRITE_REGISTER_UCHAR(NewPosition++, READ_REGISTER_UCHAR(OldPosition++)); + WRITE_REGISTER_ULONG(NewPosition++, READ_REGISTER_ULONG(OldPosition++)); } VOID

1 0

[reactos] 03/06: [BOOTVID] Fix BitBlt behavior (#2936)
by Dmitry Borisov 29 Jul '20

29 Jul '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5d40981efa6160eac3472… commit 5d40981efa6160eac3472d815c6bec6464736c27 Author: Dmitry Borisov <di.sean(a)protonmail.com> AuthorDate: Sun Jun 21 19:21:46 2020 +0600 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Wed Jul 29 19:10:38 2020 +0300 [BOOTVID] Fix BitBlt behavior (#2936) --- drivers/base/bootvid/common.c | 38 +++++++++++++++++++++----------------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/drivers/base/bootvid/common.c b/drivers/base/bootvid/common.c index 87257167ec0..9f4dda4de23 100644 --- a/drivers/base/bootvid/common.c +++ b/drivers/base/bootvid/common.c @@ -55,9 +55,9 @@ BitBlt( _In_ ULONG BitsPerPixel, _In_ ULONG Delta) { - ULONG sx, dx, dy; - UCHAR color; - ULONG offset = 0; + ULONG X, Y, Pixel; + UCHAR Colors; + PUCHAR InputBuffer; const ULONG Bottom = Top + Height; const ULONG Right = Left + Width; @@ -82,24 +82,28 @@ BitBlt( PrepareForSetPixel(); /* 4bpp blitting */ - for (dy = Top; dy < Bottom; ++dy) + for (Y = Top; Y < Bottom; ++Y) { - sx = 0; - do - { - /* Extract color */ - color = Buffer[offset + sx]; + InputBuffer = Buffer; - /* Calc destination x */ - dx = Left + (sx << 1); + for (X = Left, Pixel = 0; + X < Right; + ++X, ++Pixel) + { + if (Pixel % 2 == 0) + { + /* Extract colors at every two pixels */ + Colors = *InputBuffer++; - /* Set two pixels */ - SetPixel(dx, dy, color >> 4); - SetPixel(dx + 1, dy, color & 0x0F); + SetPixel(X, Y, Colors >> 4); + } + else + { + SetPixel(X, Y, Colors & 0x0F); + } + } - sx++; - } while (dx < Right); - offset += Delta; + Buffer += Delta; } }

1 0

[reactos] 02/06: [BOOTVID] Annotate some functions to avoid confusing (#2936)
by Dmitry Borisov 29 Jul '20

29 Jul '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=da9384b918842ef2d0fdb… commit da9384b918842ef2d0fdbbd2c5b01486315da542 Author: Dmitry Borisov <di.sean(a)protonmail.com> AuthorDate: Sat Jun 20 22:12:56 2020 +0600 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Wed Jul 29 19:10:38 2020 +0300 [BOOTVID] Annotate some functions to avoid confusing (#2936) Also fix some magic constants. --- drivers/base/bootvid/arm/bootvid.c | 2 +- drivers/base/bootvid/common.c | 8 ++++---- drivers/base/bootvid/i386/pc/vga.c | 2 +- drivers/base/bootvid/i386/pc98/bootvid.c | 4 ++-- drivers/base/bootvid/i386/xbox/bootvid.c | 4 ++-- sdk/include/reactos/drivers/bootvid/bootvid.h | 8 ++++---- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/drivers/base/bootvid/arm/bootvid.c b/drivers/base/bootvid/arm/bootvid.c index d34f08140a5..b56e4e2499d 100644 --- a/drivers/base/bootvid/arm/bootvid.c +++ b/drivers/base/bootvid/arm/bootvid.c @@ -255,7 +255,7 @@ VidCleanUp(VOID) VOID NTAPI VidScreenToBufferBlt( - _Out_ PUCHAR Buffer, + _Out_writes_bytes_(Delta * Height) PUCHAR Buffer, _In_ ULONG Left, _In_ ULONG Top, _In_ ULONG Width, diff --git a/drivers/base/bootvid/common.c b/drivers/base/bootvid/common.c index 7979ea42a04..87257167ec0 100644 --- a/drivers/base/bootvid/common.c +++ b/drivers/base/bootvid/common.c @@ -51,7 +51,7 @@ BitBlt( _In_ ULONG Top, _In_ ULONG Width, _In_ ULONG Height, - _In_ PUCHAR Buffer, + _In_reads_bytes_(Delta * Height) PUCHAR Buffer, _In_ ULONG BitsPerPixel, _In_ ULONG Delta) { @@ -318,7 +318,7 @@ VidSetTextColor( VOID NTAPI VidDisplayStringXY( - _In_ PUCHAR String, + _In_z_ PUCHAR String, _In_ ULONG Left, _In_ ULONG Top, _In_ BOOLEAN Transparent) @@ -368,7 +368,7 @@ VidSetScrollRegion( VOID NTAPI VidDisplayString( - _In_ PUCHAR String) + _In_z_ PUCHAR String) { /* Start looping the string */ for (; *String; ++String) @@ -446,7 +446,7 @@ VidDisplayString( VOID NTAPI VidBufferToScreenBlt( - _In_ PUCHAR Buffer, + _In_reads_bytes_(Delta * Height) PUCHAR Buffer, _In_ ULONG Left, _In_ ULONG Top, _In_ ULONG Width, diff --git a/drivers/base/bootvid/i386/pc/vga.c b/drivers/base/bootvid/i386/pc/vga.c index 3f6c9bc703c..9eb394626e6 100644 --- a/drivers/base/bootvid/i386/pc/vga.c +++ b/drivers/base/bootvid/i386/pc/vga.c @@ -331,7 +331,7 @@ VidCleanUp(VOID) VOID NTAPI VidScreenToBufferBlt( - _Out_ PUCHAR Buffer, + _Out_writes_bytes_(Delta * Height) PUCHAR Buffer, _In_ ULONG Left, _In_ ULONG Top, _In_ ULONG Width, diff --git a/drivers/base/bootvid/i386/pc98/bootvid.c b/drivers/base/bootvid/i386/pc98/bootvid.c index e4b8b1b834b..459c8e07ca4 100644 --- a/drivers/base/bootvid/i386/pc98/bootvid.c +++ b/drivers/base/bootvid/i386/pc98/bootvid.c @@ -411,7 +411,7 @@ VidResetDisplay( VOID NTAPI VidScreenToBufferBlt( - _Out_ PUCHAR Buffer, + _Out_writes_bytes_(Delta * Height) PUCHAR Buffer, _In_ ULONG Left, _In_ ULONG Top, _In_ ULONG Width, @@ -430,7 +430,7 @@ VidScreenToBufferBlt( { OutputBuffer = Buffer + Y * Delta; - for (X = 0; X < Width; X += 2) + for (X = 0; X < Width; X += sizeof(USHORT)) { Px = READ_REGISTER_USHORT(PixelsPosition++); *OutputBuffer++ = (FIRSTBYTE(Px) << 4) | (SECONDBYTE(Px) & 0x0F); diff --git a/drivers/base/bootvid/i386/xbox/bootvid.c b/drivers/base/bootvid/i386/xbox/bootvid.c index 5fddab54769..61e94a44d08 100644 --- a/drivers/base/bootvid/i386/xbox/bootvid.c +++ b/drivers/base/bootvid/i386/xbox/bootvid.c @@ -412,7 +412,7 @@ VidSolidColorFill( VOID NTAPI VidScreenToBufferBlt( - _Out_ PUCHAR Buffer, + _Out_writes_bytes_(Delta * Height) PUCHAR Buffer, _In_ ULONG Left, _In_ ULONG Top, _In_ ULONG Width, @@ -430,7 +430,7 @@ VidScreenToBufferBlt( PUCHAR Buf = Buffer + y * Delta; /* Start the X inner loop */ - for (ULONG x = 0; x < Width; x += 2) + for (ULONG x = 0; x < Width; x += sizeof(USHORT)) { /* Read the current value */ *Buf = (*Back++ & 0xF) << 4; diff --git a/sdk/include/reactos/drivers/bootvid/bootvid.h b/sdk/include/reactos/drivers/bootvid/bootvid.h index 6df26e96739..6747fd415b4 100644 --- a/sdk/include/reactos/drivers/bootvid/bootvid.h +++ b/sdk/include/reactos/drivers/bootvid/bootvid.h @@ -30,7 +30,7 @@ VidSetTextColor( VOID NTAPI VidDisplayStringXY( - _In_ PUCHAR String, + _In_z_ PUCHAR String, _In_ ULONG Left, _In_ ULONG Top, _In_ BOOLEAN Transparent); @@ -50,7 +50,7 @@ VidCleanUp(VOID); VOID NTAPI VidBufferToScreenBlt( - _In_ PUCHAR Buffer, + _In_reads_bytes_(Delta * Height) PUCHAR Buffer, _In_ ULONG Left, _In_ ULONG Top, _In_ ULONG Width, @@ -60,7 +60,7 @@ VidBufferToScreenBlt( VOID NTAPI VidDisplayString( - _In_ PUCHAR String); + _In_z_ PUCHAR String); VOID NTAPI @@ -72,7 +72,7 @@ VidBitBlt( VOID NTAPI VidScreenToBufferBlt( - _Out_ PUCHAR Buffer, + _Out_writes_bytes_(Delta * Height) PUCHAR Buffer, _In_ ULONG Left, _In_ ULONG Top, _In_ ULONG Width,

1 0

[reactos] 01/06: [BOOTVID] Fix drawing strings on top of the bitmap (#2936)
by Dmitry Borisov 29 Jul '20

29 Jul '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4d54b8ce6954afa09b136… commit 4d54b8ce6954afa09b136a7cfe3a1cafb2bda7eb Author: Dmitry Borisov <di.sean(a)protonmail.com> AuthorDate: Sat Jun 20 17:21:42 2020 +0600 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Wed Jul 29 19:10:38 2020 +0300 [BOOTVID] Fix drawing strings on top of the bitmap (#2936) Also fix VGA pixel drawing. CORE-15896 --- drivers/base/bootvid/i386/pc/pc.h | 7 +++++-- drivers/base/bootvid/i386/pc/vga.c | 2 ++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/base/bootvid/i386/pc/pc.h b/drivers/base/bootvid/i386/pc/pc.h index c1a96e797a6..c299a1ecd81 100644 --- a/drivers/base/bootvid/i386/pc/pc.h +++ b/drivers/base/bootvid/i386/pc/pc.h @@ -43,8 +43,11 @@ SetPixel( /* Select the bitmask register and write the mask */ __outpw(VGA_BASE_IO_PORT + GRAPH_ADDRESS_PORT, (PixelMask[Left & 7] << 8) | IND_BIT_MASK); - /* Read the current pixel value and add our color */ - WRITE_REGISTER_UCHAR(PixelPosition, READ_REGISTER_UCHAR(PixelPosition) & Color); + /* Dummy read to load latch registers */ + (VOID)READ_REGISTER_UCHAR(PixelPosition); + + /* Set the new color */ + WRITE_REGISTER_UCHAR(PixelPosition, Color); } VOID diff --git a/drivers/base/bootvid/i386/pc/vga.c b/drivers/base/bootvid/i386/pc/vga.c index b985bc68eb1..3f6c9bc703c 100644 --- a/drivers/base/bootvid/i386/pc/vga.c +++ b/drivers/base/bootvid/i386/pc/vga.c @@ -94,6 +94,8 @@ PrepareForSetPixel(VOID) do { \ /* Select the bitmask register and write the mask */ \ __outpw(VGA_BASE_IO_PORT + GRAPH_ADDRESS_PORT, ((_PixelMask) << 8) | IND_BIT_MASK); \ + /* Dummy read to load latch registers */ \ + (VOID)READ_REGISTER_UCHAR((_PixelPtr)); \ /* Set the new color */ \ WRITE_REGISTER_UCHAR((_PixelPtr), (UCHAR)(_TextColor)); \ } while (0);

1 0

[reactos] 01/01: [NTOS:KE] Fix stack memory disclosure in KiInitializeUserApc (#2988)
by Nguyen Trung Khanh 27 Jul '20

27 Jul '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9d2ecd3a13143609a30ac… commit 9d2ecd3a13143609a30aca7480b195fa5f56df18 Author: Nguyen Trung Khanh <nguyentrungkhanh97(a)gmail.com> AuthorDate: Mon Jul 27 07:39:48 2020 +0700 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Jul 27 03:39:48 2020 +0300 [NTOS:KE] Fix stack memory disclosure in KiInitializeUserApc (#2988) --- ntoskrnl/ke/amd64/stubs.c | 2 +- ntoskrnl/ke/arm/usercall.c | 2 +- ntoskrnl/ke/i386/usercall.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ntoskrnl/ke/amd64/stubs.c b/ntoskrnl/ke/amd64/stubs.c index 9f8ed16e0de..43117fe6868 100644 --- a/ntoskrnl/ke/amd64/stubs.c +++ b/ntoskrnl/ke/amd64/stubs.c @@ -207,7 +207,7 @@ KiInitializeUserApc(IN PKEXCEPTION_FRAME ExceptionFrame, IN PVOID SystemArgument1, IN PVOID SystemArgument2) { - CONTEXT Context; + CONTEXT Context = { 0 }; ULONG64 AlignedRsp, Stack; EXCEPTION_RECORD SehExceptRecord; diff --git a/ntoskrnl/ke/arm/usercall.c b/ntoskrnl/ke/arm/usercall.c index 1895c2ce45f..c98ff55e0ad 100644 --- a/ntoskrnl/ke/arm/usercall.c +++ b/ntoskrnl/ke/arm/usercall.c @@ -270,7 +270,7 @@ KiInitializeUserApc(IN PKEXCEPTION_FRAME ExceptionFrame, IN PVOID SystemArgument1, IN PVOID SystemArgument2) { - CONTEXT Context; + CONTEXT Context = { 0 }; ULONG_PTR Stack; ULONG ContextLength; DPRINT1("User APC: %p %p %p\n", NormalContext, SystemArgument1, SystemArgument2); diff --git a/ntoskrnl/ke/i386/usercall.c b/ntoskrnl/ke/i386/usercall.c index 8f59f7dc103..da99b0e1ce8 100644 --- a/ntoskrnl/ke/i386/usercall.c +++ b/ntoskrnl/ke/i386/usercall.c @@ -51,7 +51,7 @@ KiInitializeUserApc(IN PKEXCEPTION_FRAME ExceptionFrame, IN PVOID SystemArgument1, IN PVOID SystemArgument2) { - CONTEXT Context; + CONTEXT Context = { 0 }; ULONG_PTR Stack, AlignedEsp; ULONG ContextLength; EXCEPTION_RECORD SehExceptRecord;

1 0

[reactos] 01/01: [WinddiUI] Fix Format
by James Tabor 26 Jul '20

26 Jul '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=517e6dc8ab3c2fd342dc3… commit 517e6dc8ab3c2fd342dc3e14467fa30310933adf Author: James Tabor <james.tabor(a)reactos.org> AuthorDate: Sun Jul 26 15:42:28 2020 -0500 Commit: James Tabor <james.tabor(a)reactos.org> CommitDate: Sun Jul 26 15:42:28 2020 -0500 [WinddiUI] Fix Format Format This .... --- sdk/include/psdk/winddiui.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/sdk/include/psdk/winddiui.h b/sdk/include/psdk/winddiui.h index 714e5ec652b..94b777e94b4 100644 --- a/sdk/include/psdk/winddiui.h +++ b/sdk/include/psdk/winddiui.h @@ -125,14 +125,14 @@ typedef struct _DEVICEPROPERTYHEADER { LONG WINAPI DrvDocumentPropertySheets(PPROPSHEETUI_INFO,LPARAM); typedef struct _DOCUMENTPROPERTYHEADER { - WORD cbSize; - WORD Reserved; - HANDLE hPrinter; - LPTSTR pszPrinterName; - PDEVMODE pdmIn; - PDEVMODE pdmOut; - DWORD cbOut; - DWORD fMode; + WORD cbSize; + WORD Reserved; + HANDLE hPrinter; + LPTSTR pszPrinterName; + PDEVMODE pdmIn; + PDEVMODE pdmOut; + DWORD cbOut; + DWORD fMode; } DOCUMENTPROPERTYHEADER, *PDOCUMENTPROPERTYHEADER; #define DM_ADVANCED 0x10 @@ -147,7 +147,7 @@ typedef struct _DEVQUERYPRINT_INFO { LPWSTR pszErrorStr; DWORD cchErrorStr; DWORD cchNeeded; - } DEVQUERYPRINT_INFO, *PDEVQUERYPRINT_INFO; +} DEVQUERYPRINT_INFO, *PDEVQUERYPRINT_INFO; BOOL WINAPI DevQueryPrintEx(PDEVQUERYPRINT_INFO);

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