Ros-diffs March 2020

ros-diffs@reactos.org

25 participants
156 discussions

[reactos] 02/02: [ISAPNP] Rewrite device reporting method

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7a98d28d7f8e58fcf3ef9… commit 7a98d28d7f8e58fcf3ef980514b79ec14b59c82b Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Thu Mar 12 11:53:09 2020 +0100 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Sat Mar 14 23:39:01 2020 +0100 [ISAPNP] Rewrite device reporting method IoCreateDevice() was called too early, when a spinlock was acquired. Create ISAPNP_LOGICAL_DEVICE structure when a device is detected, and call IoCreateDevice() later, when required. --- drivers/bus/isapnp/fdo.c | 47 ++++++++++++++++++++++++++++++++----------- drivers/bus/isapnp/hardware.c | 26 ++++-------------------- drivers/bus/isapnp/isapnp.c | 3 ++- drivers/bus/isapnp/isapnp.h | 28 ++++++++++++++++---------- drivers/bus/isapnp/pdo.c | 28 ++++++++++++++------------ 5 files changed, 73 insertions(+), 59 deletions(-) diff --git a/drivers/bus/isapnp/fdo.c b/drivers/bus/isapnp/fdo.c index c0a5eb9eb91..1529267b1c4 100644 --- a/drivers/bus/isapnp/fdo.c +++ b/drivers/bus/isapnp/fdo.c @@ -24,18 +24,16 @@ IsaFdoStartDevice( UNREFERENCED_PARAMETER(IrpSp); KeAcquireSpinLock(&FdoExt->Lock, &OldIrql); - Status = IsaHwDetectReadDataPort(FdoExt); + KeReleaseSpinLock(&FdoExt->Lock, OldIrql); + if (!NT_SUCCESS(Status)) { - KeReleaseSpinLock(&FdoExt->Lock, OldIrql); return Status; } FdoExt->Common.State = dsStarted; - KeReleaseSpinLock(&FdoExt->Lock, OldIrql); - return STATUS_SUCCESS; } @@ -46,6 +44,7 @@ IsaFdoQueryDeviceRelations( IN PIRP Irp, IN PIO_STACK_LOCATION IrpSp) { + PISAPNP_PDO_EXTENSION PdoExt; NTSTATUS Status; PLIST_ENTRY CurrentEntry; PISAPNP_LOGICAL_DEVICE IsaDevice; @@ -57,11 +56,11 @@ IsaFdoQueryDeviceRelations( return Irp->IoStatus.Status; KeAcquireSpinLock(&FdoExt->Lock, &OldIrql); - Status = IsaHwFillDeviceList(FdoExt); + KeReleaseSpinLock(&FdoExt->Lock, OldIrql); + if (!NT_SUCCESS(Status)) { - KeReleaseSpinLock(&FdoExt->Lock, OldIrql); return Status; } @@ -69,8 +68,7 @@ IsaFdoQueryDeviceRelations( sizeof(DEVICE_RELATIONS) + sizeof(DEVICE_OBJECT) * (FdoExt->DeviceCount - 1)); if (!DeviceRelations) { - KeReleaseSpinLock(&FdoExt->Lock, OldIrql); - return STATUS_INSUFFICIENT_RESOURCES; + return STATUS_NO_MEMORY; } CurrentEntry = FdoExt->DeviceListHead.Flink; @@ -78,17 +76,42 @@ IsaFdoQueryDeviceRelations( { IsaDevice = CONTAINING_RECORD(CurrentEntry, ISAPNP_LOGICAL_DEVICE, ListEntry); - DeviceRelations->Objects[i++] = IsaDevice->Common.Self; + if (!IsaDevice->Pdo) + { + Status = IoCreateDevice(FdoExt->DriverObject, + sizeof(ISAPNP_PDO_EXTENSION), + NULL, + FILE_DEVICE_CONTROLLER, + FILE_DEVICE_SECURE_OPEN | FILE_AUTOGENERATED_DEVICE_NAME, + FALSE, + &IsaDevice->Pdo); + if (!NT_SUCCESS(Status)) + { + break; + } - ObReferenceObject(IsaDevice->Common.Self); + IsaDevice->Pdo->Flags &= ~DO_DEVICE_INITIALIZING; + + //Device->Pdo->Flags |= DO_POWER_PAGABLE; + + PdoExt = (PISAPNP_PDO_EXTENSION)IsaDevice->Pdo->DeviceExtension; + + RtlZeroMemory(PdoExt, sizeof(ISAPNP_PDO_EXTENSION)); + + PdoExt->Common.IsFdo = FALSE; + PdoExt->Common.Self = IsaDevice->Pdo; + PdoExt->Common.State = dsStopped; + PdoExt->IsaPnpDevice = IsaDevice; + } + DeviceRelations->Objects[i++] = IsaDevice->Pdo; + + ObReferenceObject(IsaDevice->Pdo); CurrentEntry = CurrentEntry->Flink; } DeviceRelations->Count = FdoExt->DeviceCount; - KeReleaseSpinLock(&FdoExt->Lock, OldIrql); - Irp->IoStatus.Information = (ULONG_PTR)DeviceRelations; return STATUS_SUCCESS; diff --git a/drivers/bus/isapnp/hardware.c b/drivers/bus/isapnp/hardware.c index acabdd2d04c..df3d8e398a7 100644 --- a/drivers/bus/isapnp/hardware.c +++ b/drivers/bus/isapnp/hardware.c @@ -463,8 +463,6 @@ ProbeIsaPnpBus(PISAPNP_FDO_EXTENSION FdoExt) ISAPNP_LOGDEVID LogDevId; USHORT Csn; USHORT LogDev; - PDEVICE_OBJECT Pdo; - NTSTATUS Status; ASSERT(FdoExt->ReadDataPort); @@ -472,26 +470,12 @@ ProbeIsaPnpBus(PISAPNP_FDO_EXTENSION FdoExt) { for (LogDev = 0; LogDev <= 0xFF; LogDev++) { - Status = IoCreateDevice(FdoExt->Common.Self->DriverObject, - sizeof(ISAPNP_LOGICAL_DEVICE), - NULL, - FILE_DEVICE_CONTROLLER, - FILE_DEVICE_SECURE_OPEN, - FALSE, - &Pdo); - if (!NT_SUCCESS(Status)) - return Status; - - Pdo->Flags |= DO_BUS_ENUMERATED_DEVICE; - - LogDevice = Pdo->DeviceExtension; + LogDevice = ExAllocatePool(NonPagedPool, sizeof(ISAPNP_LOGICAL_DEVICE)); + if (!LogDevice) + return STATUS_NO_MEMORY; RtlZeroMemory(LogDevice, sizeof(ISAPNP_LOGICAL_DEVICE)); - LogDevice->Common.Self = Pdo; - LogDevice->Common.IsFdo = FALSE; - LogDevice->Common.State = dsStopped; - LogDevice->CSN = Csn; LogDevice->LDN = LogDev; @@ -503,7 +487,7 @@ ProbeIsaPnpBus(PISAPNP_FDO_EXTENSION FdoExt) if (Identifier.VendorId & 0x80) { - IoDeleteDevice(LogDevice->Common.Self); + ExFreePool(LogDevice); return STATUS_SUCCESS; } @@ -525,8 +509,6 @@ ProbeIsaPnpBus(PISAPNP_FDO_EXTENSION FdoExt) WaitForKey(); - Pdo->Flags &= ~DO_DEVICE_INITIALIZING; - InsertTailList(&FdoExt->DeviceListHead, &LogDevice->ListEntry); FdoExt->DeviceCount++; } diff --git a/drivers/bus/isapnp/isapnp.c b/drivers/bus/isapnp/isapnp.c index ae94622b66b..eebe03c29aa 100644 --- a/drivers/bus/isapnp/isapnp.c +++ b/drivers/bus/isapnp/isapnp.c @@ -152,6 +152,7 @@ IsaAddDevice( FdoExt->Common.Self = Fdo; FdoExt->Common.IsFdo = TRUE; FdoExt->Common.State = dsStopped; + FdoExt->DriverObject = DriverObject; FdoExt->Pdo = PhysicalDeviceObject; FdoExt->Ldo = IoAttachDeviceToDeviceStack(Fdo, PhysicalDeviceObject); @@ -186,7 +187,7 @@ IsaPnp( } else { - return IsaPdoPnp((PISAPNP_LOGICAL_DEVICE)DevExt, + return IsaPdoPnp((PISAPNP_PDO_EXTENSION)DevExt, Irp, IrpSp); } diff --git a/drivers/bus/isapnp/isapnp.h b/drivers/bus/isapnp/isapnp.h index 538e33b9063..c941712f77a 100644 --- a/drivers/bus/isapnp/isapnp.h +++ b/drivers/bus/isapnp/isapnp.h @@ -15,6 +15,18 @@ typedef enum { dsStarted } ISAPNP_DEVICE_STATE; +typedef struct _ISAPNP_LOGICAL_DEVICE { + PDEVICE_OBJECT Pdo; + UCHAR VendorId[3]; + USHORT ProdId; + ULONG SerialNumber; + USHORT IoAddr; + UCHAR IrqNo; + UCHAR CSN; + UCHAR LDN; + LIST_ENTRY ListEntry; +} ISAPNP_LOGICAL_DEVICE, *PISAPNP_LOGICAL_DEVICE; + typedef struct _ISAPNP_COMMON_EXTENSION { PDEVICE_OBJECT Self; BOOLEAN IsFdo; @@ -27,21 +39,15 @@ typedef struct _ISAPNP_FDO_EXTENSION { PDEVICE_OBJECT Pdo; LIST_ENTRY DeviceListHead; ULONG DeviceCount; + PDRIVER_OBJECT DriverObject; PUCHAR ReadDataPort; KSPIN_LOCK Lock; } ISAPNP_FDO_EXTENSION, *PISAPNP_FDO_EXTENSION; -typedef struct _ISAPNP_LOGICAL_DEVICE { +typedef struct _ISAPNP_PDO_EXTENSION { ISAPNP_COMMON_EXTENSION Common; - UCHAR VendorId[3]; - USHORT ProdId; - ULONG SerialNumber; - USHORT IoAddr; - UCHAR IrqNo; - UCHAR CSN; - UCHAR LDN; - LIST_ENTRY ListEntry; -} ISAPNP_LOGICAL_DEVICE, *PISAPNP_LOGICAL_DEVICE; + PISAPNP_LOGICAL_DEVICE IsaPnpDevice; +} ISAPNP_PDO_EXTENSION, *PISAPNP_PDO_EXTENSION; /* isapnp.c */ @@ -71,7 +77,7 @@ IsaFdoPnp( NTSTATUS NTAPI IsaPdoPnp( - IN PISAPNP_LOGICAL_DEVICE LogDev, + IN PISAPNP_PDO_EXTENSION PdoDeviceExtension, IN PIRP Irp, IN PIO_STACK_LOCATION IrpSp); diff --git a/drivers/bus/isapnp/pdo.c b/drivers/bus/isapnp/pdo.c index 450462f39d6..6e06af29241 100644 --- a/drivers/bus/isapnp/pdo.c +++ b/drivers/bus/isapnp/pdo.c @@ -13,7 +13,7 @@ NTSTATUS NTAPI IsaPdoQueryDeviceRelations( - IN PISAPNP_LOGICAL_DEVICE LogDev, + IN PISAPNP_PDO_EXTENSION PdoExt, IN PIRP Irp, IN PIO_STACK_LOCATION IrpSp) { @@ -27,8 +27,8 @@ IsaPdoQueryDeviceRelations( return STATUS_INSUFFICIENT_RESOURCES; DeviceRelations->Count = 1; - DeviceRelations->Objects[0] = LogDev->Common.Self; - ObReferenceObject(LogDev->Common.Self); + DeviceRelations->Objects[0] = PdoExt->Common.Self; + ObReferenceObject(PdoExt->Common.Self); Irp->IoStatus.Information = (ULONG_PTR)DeviceRelations; @@ -38,11 +38,12 @@ IsaPdoQueryDeviceRelations( NTSTATUS NTAPI IsaPdoQueryCapabilities( - IN PISAPNP_LOGICAL_DEVICE LogDev, + IN PISAPNP_PDO_EXTENSION PdoExt, IN PIRP Irp, IN PIO_STACK_LOCATION IrpSp) { PDEVICE_CAPABILITIES DeviceCapabilities; + PISAPNP_LOGICAL_DEVICE LogDev = PdoExt->IsaPnpDevice; DeviceCapabilities = IrpSp->Parameters.DeviceCapabilities.Capabilities; if (DeviceCapabilities->Version != 1) @@ -57,10 +58,11 @@ IsaPdoQueryCapabilities( NTSTATUS NTAPI IsaPdoQueryId( - IN PISAPNP_LOGICAL_DEVICE LogDev, + IN PISAPNP_PDO_EXTENSION PdoExt, IN PIRP Irp, IN PIO_STACK_LOCATION IrpSp) { + PISAPNP_LOGICAL_DEVICE LogDev = PdoExt->IsaPnpDevice; WCHAR Temp[256]; PWCHAR Buffer, End; ULONG Length; @@ -140,7 +142,7 @@ IsaPdoQueryId( NTSTATUS NTAPI IsaPdoPnp( - IN PISAPNP_LOGICAL_DEVICE LogDev, + IN PISAPNP_PDO_EXTENSION PdoExt, IN PIRP Irp, IN PIO_STACK_LOCATION IrpSp) { @@ -149,25 +151,25 @@ IsaPdoPnp( switch (IrpSp->MinorFunction) { case IRP_MN_START_DEVICE: - Status = IsaHwActivateDevice(LogDev); + Status = IsaHwActivateDevice(PdoExt->IsaPnpDevice); if (NT_SUCCESS(Status)) - LogDev->Common.State = dsStarted; + PdoExt->Common.State = dsStarted; break; case IRP_MN_STOP_DEVICE: - Status = IsaHwDeactivateDevice(LogDev); + Status = IsaHwDeactivateDevice(PdoExt->IsaPnpDevice); if (NT_SUCCESS(Status)) - LogDev->Common.State = dsStopped; + PdoExt->Common.State = dsStopped; break; case IRP_MN_QUERY_DEVICE_RELATIONS: - Status = IsaPdoQueryDeviceRelations(LogDev, Irp, IrpSp); + Status = IsaPdoQueryDeviceRelations(PdoExt, Irp, IrpSp); break; case IRP_MN_QUERY_CAPABILITIES: - Status = IsaPdoQueryCapabilities(LogDev, Irp, IrpSp); + Status = IsaPdoQueryCapabilities(PdoExt, Irp, IrpSp); break; case IRP_MN_QUERY_RESOURCES: @@ -179,7 +181,7 @@ IsaPdoPnp( break; case IRP_MN_QUERY_ID: - Status = IsaPdoQueryId(LogDev, Irp, IrpSp); + Status = IsaPdoQueryId(PdoExt, Irp, IrpSp); break; default:

4 years, 9 months

[reactos] 01/02: [ISAPNP] Fix reading of serial number

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=58e8be625874e9f267791… commit 58e8be625874e9f2677919d823f81bbbfbec7cbd Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Sat Mar 14 23:28:52 2020 +0100 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Sat Mar 14 23:39:00 2020 +0100 [ISAPNP] Fix reading of serial number --- drivers/bus/isapnp/hardware.c | 4 ++-- drivers/bus/isapnp/pdo.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/bus/isapnp/hardware.c b/drivers/bus/isapnp/hardware.c index fbf53eb8059..acabdd2d04c 100644 --- a/drivers/bus/isapnp/hardware.c +++ b/drivers/bus/isapnp/hardware.c @@ -516,11 +516,11 @@ ProbeIsaPnpBus(PISAPNP_FDO_EXTENSION FdoExt) LogDevice->VendorId[1] = (((LogDevId.VendorId & 0x3) << 3) | ((LogDevId.VendorId >> 13) & 0x7)) + 'A' - 1, LogDevice->VendorId[2] = ((LogDevId.VendorId >> 8) & 0x1f) + 'A' - 1, LogDevice->ProdId = RtlUshortByteSwap(LogDevId.ProdId); - LogDevice->SerialNumber = RtlUlongByteSwap(Identifier.Serial); + LogDevice->SerialNumber = Identifier.Serial; LogDevice->IoAddr = ReadIoBase(FdoExt->ReadDataPort, 0); LogDevice->IrqNo = ReadIrqNo(FdoExt->ReadDataPort, 0); - DPRINT1("Detected ISA PnP device - VID: '%3s' PID: 0x%x SN: 0x04x IoBase: 0x%x IRQ:0x%x\n", + DPRINT1("Detected ISA PnP device - VID: '%3s' PID: 0x%x SN: 0x%08x IoBase: 0x%x IRQ:0x%x\n", LogDevice->VendorId, LogDevice->ProdId, LogDevice->SerialNumber, LogDevice->IoAddr, LogDevice->IrqNo); WaitForKey(); diff --git a/drivers/bus/isapnp/pdo.c b/drivers/bus/isapnp/pdo.c index 619d3fc4e06..450462f39d6 100644 --- a/drivers/bus/isapnp/pdo.c +++ b/drivers/bus/isapnp/pdo.c @@ -114,7 +114,7 @@ IsaPdoQueryId( Status = RtlStringCbPrintfExW(Temp, sizeof(Temp), &End, NULL, 0, - L"%u", + L"%X", LogDev->SerialNumber); if (!NT_SUCCESS(Status)) return Status;

4 years, 9 months

[reactos] 01/01: [CMD] Fix another NtReadVirtualMemory parameter.

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=111721a64ab6be1699dcc… commit 111721a64ab6be1699dcc412826713c16a972003 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Fri Mar 13 22:15:56 2020 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sat Mar 14 21:23:06 2020 +0100 [CMD] Fix another NtReadVirtualMemory parameter. Spotted by Hermès. --- base/shell/cmd/cmd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/shell/cmd/cmd.c b/base/shell/cmd/cmd.c index b4658f9fc6c..ed79b192339 100644 --- a/base/shell/cmd/cmd.c +++ b/base/shell/cmd/cmd.c @@ -147,7 +147,7 @@ typedef NTSTATUS (WINAPI *NtQueryInformationProcessProc)(HANDLE, PROCESSINFOCLASS, PVOID, ULONG, PULONG); -typedef NTSTATUS (WINAPI *NtReadVirtualMemoryProc)(HANDLE, PVOID, PVOID, ULONG, PSIZE_T); +typedef NTSTATUS (WINAPI *NtReadVirtualMemoryProc)(HANDLE, PVOID, PVOID, SIZE_T, PSIZE_T); BOOL bExit = FALSE; /* Indicates EXIT was typed */ BOOL bCanExit = TRUE; /* Indicates if this shell is exitable */

4 years, 9 months

[reactos] 01/01: [FREELDR] Move built-in VGA font to better location (#2429)

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=dc7eac583f97d2222ed4a… commit dc7eac583f97d2222ed4a7d7ba8786bbe9a90898 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Sat Mar 14 20:13:49 2020 +0300 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Mar 14 18:13:49 2020 +0100 [FREELDR] Move built-in VGA font to better location (#2429) Addendum to 97eacb9. --- boot/freeldr/freeldr/CMakeLists.txt | 10 +++++++--- boot/freeldr/freeldr/arch/{i386/xbox/xboxfont.c => vgafont.c} | 0 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/boot/freeldr/freeldr/CMakeLists.txt b/boot/freeldr/freeldr/CMakeLists.txt index 75a8a98fec1..ec6010cb81f 100644 --- a/boot/freeldr/freeldr/CMakeLists.txt +++ b/boot/freeldr/freeldr/CMakeLists.txt @@ -122,6 +122,12 @@ if(ARCH STREQUAL "i386") arch/i386/i386idt.c disk/scsiport.c) + if(SARCH STREQUAL "pc98" OR SARCH STREQUAL "xbox") + # These machine types require built-in bitmap font + list(APPEND FREELDR_ARC_SOURCE + arch/vgafont.c) + endif() + if(SARCH STREQUAL "xbox") list(APPEND FREELDR_ARC_SOURCE # FIXME: Abstract things better so we don't need to include /pc/* here @@ -134,7 +140,6 @@ if(ARCH STREQUAL "i386") arch/i386/xbox/machxbox.c arch/i386/xbox/xboxcons.c arch/i386/xbox/xboxdisk.c - arch/i386/xbox/xboxfont.c arch/i386/xbox/xboxi2c.c arch/i386/xbox/xboxmem.c arch/i386/xbox/xboxrtc.c @@ -149,8 +154,7 @@ if(ARCH STREQUAL "i386") arch/i386/pc98/pc98hw.c arch/i386/pc98/pc98mem.c arch/i386/pc98/pc98rtc.c - arch/i386/pc98/pc98video.c - arch/i386/xbox/xboxfont.c) + arch/i386/pc98/pc98video.c) else() list(APPEND FREELDR_ARC_SOURCE arch/i386/pc/machpc.c diff --git a/boot/freeldr/freeldr/arch/i386/xbox/xboxfont.c b/boot/freeldr/freeldr/arch/vgafont.c similarity index 100% rename from boot/freeldr/freeldr/arch/i386/xbox/xboxfont.c rename to boot/freeldr/freeldr/arch/vgafont.c

4 years, 9 months

[reactos] 01/01: [MAIN] Select property pages by command line, for example 'control main.cpl, @0, 2'

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5ea8314e671be2367147c… commit 5ea8314e671be2367147cf787d2e7a61c2306cac Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Mar 14 18:03:52 2020 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Mar 14 18:03:52 2020 +0100 [MAIN] Select property pages by command line, for example 'control main.cpl,@0,2' --- dll/cpl/main/keyboard.c | 7 +++++++ dll/cpl/main/main.c | 3 +++ dll/cpl/main/mouse.c | 7 +++++++ 3 files changed, 17 insertions(+) diff --git a/dll/cpl/main/keyboard.c b/dll/cpl/main/keyboard.c index 5cf39b89bc9..29e839bbc5c 100644 --- a/dll/cpl/main/keyboard.c +++ b/dll/cpl/main/keyboard.c @@ -306,6 +306,7 @@ KeyboardApplet(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam) PROPSHEETHEADER psh; HPSXA hpsxa; TCHAR szCaption[256]; + INT nPage = 0; LONG ret; UNREFERENCED_PARAMETER(lParam); @@ -313,6 +314,9 @@ KeyboardApplet(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam) UNREFERENCED_PARAMETER(uMsg); UNREFERENCED_PARAMETER(hwnd); + if (uMsg == CPL_STARTWPARMSW && lParam != 0) + nPage = _wtoi((PWSTR)lParam); + LoadString(hApplet, IDS_CPLNAME_2, szCaption, sizeof(szCaption) / sizeof(TCHAR)); ZeroMemory(&psh, sizeof(PROPSHEETHEADER)); @@ -337,6 +341,9 @@ KeyboardApplet(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam) if (hpsxa != NULL) SHAddFromPropSheetExtArray(hpsxa, PropSheetAddPage, (LPARAM)&psh); + if (nPage != 0 && nPage <= psh.nPages) + psh.nStartPage = nPage; + ret = (LONG)(PropertySheet(&psh) != -1); if (hpsxa != NULL) diff --git a/dll/cpl/main/main.c b/dll/cpl/main/main.c index 272aafc52b4..6e1294b3bd0 100644 --- a/dll/cpl/main/main.c +++ b/dll/cpl/main/main.c @@ -113,6 +113,9 @@ CPlApplet(HWND hwndCpl, Applets[uAppIndex].AppletProc(hwndCpl, uMsg, lParam1, lParam2); break; } + + case CPL_STARTWPARMSW: + return Applets[(UINT)lParam1].AppletProc(hwndCpl, uMsg, lParam1, lParam2); } return FALSE; diff --git a/dll/cpl/main/mouse.c b/dll/cpl/main/mouse.c index 4614e6ebc1f..89d4bbbdeb4 100644 --- a/dll/cpl/main/mouse.c +++ b/dll/cpl/main/mouse.c @@ -1833,6 +1833,7 @@ MouseApplet(HWND hwnd, UINT uMsg, LPARAM lParam1, LPARAM lParam2) HPSXA hpsxa; TCHAR Caption[256]; UINT i; + INT nPage = 0; LONG ret; UNREFERENCED_PARAMETER(lParam1); @@ -1840,6 +1841,9 @@ MouseApplet(HWND hwnd, UINT uMsg, LPARAM lParam1, LPARAM lParam2) UNREFERENCED_PARAMETER(uMsg); UNREFERENCED_PARAMETER(hwnd); + if (uMsg == CPL_STARTWPARMSW && lParam2 != 0) + nPage = _wtoi((PWSTR)lParam2); + LoadString(hApplet, IDS_CPLNAME_1, Caption, sizeof(Caption) / sizeof(TCHAR)); ZeroMemory(&psh, sizeof(PROPSHEETHEADER)); @@ -1873,6 +1877,9 @@ MouseApplet(HWND hwnd, UINT uMsg, LPARAM lParam1, LPARAM lParam2) if (hpsxa != NULL) SHAddFromPropSheetExtArray(hpsxa, PropSheetAddPage, (LPARAM)&psh); + if (nPage != 0 && nPage <= psh.nPages) + psh.nStartPage = nPage; + ret = (LONG)(PropertySheet(&psh) != -1); if (hpsxa != NULL)

4 years, 9 months

[reactos] 01/01: [HOST] Do not pack structures

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=64bc9c233f2a725c20b2b… commit 64bc9c233f2a725c20b2b9750c64988a50cb927c Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Feb 22 17:27:31 2020 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Mar 14 10:26:21 2020 +0100 [HOST] Do not pack structures Most of them are unaffected by packing, the ones that are affected have pointers, and packing them will only misalign them, but not making the structures 32 bit compatible. --- sdk/include/host/typedefs.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sdk/include/host/typedefs.h b/sdk/include/host/typedefs.h index eaa2c9f5c06..df451c3344f 100644 --- a/sdk/include/host/typedefs.h +++ b/sdk/include/host/typedefs.h @@ -82,7 +82,7 @@ typedef WORD LANGID; #define MAXUSHORT USHRT_MAX /* Widely used structures */ -#include <pshpack4.h> + #ifndef _HAVE_RTL_BITMAP typedef struct _RTL_BITMAP { @@ -138,7 +138,6 @@ typedef struct _UNICODE_STRING } UNICODE_STRING, *PUNICODE_STRING; #endif -#include <poppack.h> #ifndef _HAVE_LIST_ENTRY /* List Functions */

4 years, 9 months

[reactos] 01/01: [SNDVOL32] Restore the previous placement data of the window (#2420)

by Bișoc George

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3af1141a61fecbf67df2f… commit 3af1141a61fecbf67df2fcbf0cf3ecf64de20fdf Author: Bișoc George <fraizeraust99(a)gmail.com> AuthorDate: Fri Mar 13 23:33:36 2020 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Mar 14 07:33:36 2020 +0900 [SNDVOL32] Restore the previous placement data of the window (#2420) Save the current coordinate data of the window to the Registry when the user closes the Sound Volume applet. --- base/applications/sndvol32/misc.c | 110 ++++++++++++++++++++++++++++++++++ base/applications/sndvol32/sndvol32.c | 14 +++++ base/applications/sndvol32/sndvol32.h | 10 ++++ 3 files changed, 134 insertions(+) diff --git a/base/applications/sndvol32/misc.c b/base/applications/sndvol32/misc.c index 670fa12f250..86bbbe67927 100644 --- a/base/applications/sndvol32/misc.c +++ b/base/applications/sndvol32/misc.c @@ -158,6 +158,116 @@ CloseAppConfig(VOID) } } +BOOL +LoadXYCoordWnd(IN PPREFERENCES_CONTEXT PrefContext) +{ + HKEY hKey; + LONG lResult; + TCHAR DeviceMixerSettings[256]; + DWORD dwData; + DWORD cbData = sizeof(dwData); + + /* Append the registry key path and device name key into one single string */ + StringCchPrintf(DeviceMixerSettings, _countof(DeviceMixerSettings), TEXT("%s\\%s"), AppRegSettings, PrefContext->DeviceName); + + lResult = RegOpenKeyEx(HKEY_CURRENT_USER, + DeviceMixerSettings, + 0, + KEY_READ, + &hKey); + if (lResult != ERROR_SUCCESS) + { + return FALSE; + } + + lResult = RegQueryValueEx(hKey, + TEXT("X"), + 0, + 0, + (LPBYTE)&dwData, + &cbData); + if (lResult != ERROR_SUCCESS) + { + RegCloseKey(hKey); + return FALSE; + } + + /* Cache the X coordinate point */ + PrefContext->MixerWindow->WndPosX = dwData; + + lResult = RegQueryValueEx(hKey, + TEXT("Y"), + 0, + 0, + (LPBYTE)&dwData, + &cbData); + if (lResult != ERROR_SUCCESS) + { + RegCloseKey(hKey); + return FALSE; + } + + /* Cache the Y coordinate point */ + PrefContext->MixerWindow->WndPosY = dwData; + + RegCloseKey(hKey); + return TRUE; +} + +BOOL +SaveXYCoordWnd(IN HWND hWnd, + IN PPREFERENCES_CONTEXT PrefContext) +{ + HKEY hKey; + LONG lResult; + TCHAR DeviceMixerSettings[256]; + WINDOWPLACEMENT wp; + + /* Get the placement coordinate data from the window */ + wp.length = sizeof(WINDOWPLACEMENT); + GetWindowPlacement(hWnd, &wp); + + /* Append the registry key path and device name key into one single string */ + StringCchPrintf(DeviceMixerSettings, _countof(DeviceMixerSettings), TEXT("%s\\%s"), AppRegSettings, PrefContext->DeviceName); + + lResult = RegOpenKeyEx(HKEY_CURRENT_USER, + DeviceMixerSettings, + 0, + KEY_SET_VALUE, + &hKey); + if (lResult != ERROR_SUCCESS) + { + return FALSE; + } + + lResult = RegSetValueEx(hKey, + TEXT("X"), + 0, + REG_DWORD, + (LPBYTE)&wp.rcNormalPosition.left, + sizeof(wp.rcNormalPosition.left)); + if (lResult != ERROR_SUCCESS) + { + RegCloseKey(hKey); + return FALSE; + } + + lResult = RegSetValueEx(hKey, + TEXT("Y"), + 0, + REG_DWORD, + (LPBYTE)&wp.rcNormalPosition.top, + sizeof(wp.rcNormalPosition.top)); + if (lResult != ERROR_SUCCESS) + { + RegCloseKey(hKey); + return FALSE; + } + + RegCloseKey(hKey); + return TRUE; +} + BOOL WriteLineConfig(IN LPTSTR szDeviceName, IN LPTSTR szLineName, diff --git a/base/applications/sndvol32/sndvol32.c b/base/applications/sndvol32/sndvol32.c index 64ce3ac5565..e39fceb46b5 100644 --- a/base/applications/sndvol32/sndvol32.c +++ b/base/applications/sndvol32/sndvol32.c @@ -880,6 +880,7 @@ MainWindowProc(HWND hwnd, { PMIXER_WINDOW MixerWindow; DWORD CtrlID, LineOffset; + BOOL bRet; LRESULT Result = 0; SET_VOLUME_CONTEXT Context; @@ -1211,6 +1212,18 @@ MainWindowProc(HWND hwnd, /* Disable the 'Advanced Controls' menu item */ EnableMenuItem(GetMenu(hwnd), IDM_ADVANCED_CONTROLS, MF_BYCOMMAND | MF_GRAYED); + /* Load the placement coordinate data of the window */ + bRet = LoadXYCoordWnd(&Preferences); + if (bRet) + { + /* + * LoadXYCoordWnd() might fail for the first time of opening the application which is normal as + * the Sound Control's applet settings haven't been saved yet to the Registry. At this point SetWindowPos() + * call is skipped. + */ + SetWindowPos(hwnd, NULL, MixerWindow->WndPosX, MixerWindow->WndPosY, 0, 0, SWP_NOSIZE | SWP_NOZORDER); + } + /* create status window */ if (MixerWindow->Mode == NORMAL_MODE) { @@ -1257,6 +1270,7 @@ MainWindowProc(HWND hwnd, case WM_CLOSE: { + SaveXYCoordWnd(hwnd, &Preferences); PostQuitMessage(0); break; } diff --git a/base/applications/sndvol32/sndvol32.h b/base/applications/sndvol32/sndvol32.h index 4dcf58bebba..970d98238f2 100644 --- a/base/applications/sndvol32/sndvol32.h +++ b/base/applications/sndvol32/sndvol32.h @@ -55,6 +55,8 @@ typedef struct _MIXER_WINDOW RECT rect; HFONT hFont; SIZE baseUnit; + INT WndPosX; + INT WndPosY; } MIXER_WINDOW, *PMIXER_WINDOW; extern HINSTANCE hAppInstance; @@ -63,6 +65,7 @@ extern HWND hMainWnd; extern HANDLE hAppHeap; #define SZ_APP_CLASS TEXT("Volume Control") +#define _countof(array) (sizeof(array) / sizeof(array[0])) ULONG DbgPrint(PCH , ...); #define DPRINT DbgPrint("SNDVOL32: %s:%i: ", __FILE__, __LINE__); DbgPrint @@ -192,6 +195,13 @@ InitAppConfig(VOID); VOID CloseAppConfig(VOID); +BOOL +LoadXYCoordWnd(IN PPREFERENCES_CONTEXT PrefContext); + +BOOL +SaveXYCoordWnd(IN HWND hWnd, + IN PPREFERENCES_CONTEXT PrefContext); + INT AllocAndLoadString(OUT LPWSTR *lpTarget, IN HINSTANCE hInst,

4 years, 9 months

[reactos] 01/01: [NTOS:IO][GDI32][CMD] Fix some under-sized variables. CORE-14922

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=72c51aabbab450a123883… commit 72c51aabbab450a123883433074e1810d6939dc8 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Fri Mar 13 20:45:06 2020 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Fri Mar 13 20:45:06 2020 +0100 [NTOS:IO][GDI32][CMD] Fix some under-sized variables. CORE-14922 Fixes x64 boot with RTC. --- base/shell/cmd/cmd.c | 6 +++--- ntoskrnl/io/pnpmgr/pnpmgr.c | 2 +- win32ss/gdi/gdi32/objects/dc.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/base/shell/cmd/cmd.c b/base/shell/cmd/cmd.c index 2b63948d94e..b4658f9fc6c 100644 --- a/base/shell/cmd/cmd.c +++ b/base/shell/cmd/cmd.c @@ -147,7 +147,7 @@ typedef NTSTATUS (WINAPI *NtQueryInformationProcessProc)(HANDLE, PROCESSINFOCLASS, PVOID, ULONG, PULONG); -typedef NTSTATUS (WINAPI *NtReadVirtualMemoryProc)(HANDLE, PVOID, PVOID, ULONG, PULONG); +typedef NTSTATUS (WINAPI *NtReadVirtualMemoryProc)(HANDLE, PVOID, PVOID, ULONG, PSIZE_T); BOOL bExit = FALSE; /* Indicates EXIT was typed */ BOOL bCanExit = TRUE; /* Indicates if this shell is exitable */ @@ -225,7 +225,7 @@ static BOOL IsConsoleProcess(HANDLE Process) NTSTATUS Status; PROCESS_BASIC_INFORMATION Info; PEB ProcessPeb; - ULONG BytesRead; + SIZE_T BytesRead; if (NULL == NtQueryInformationProcessPtr || NULL == NtReadVirtualMemoryPtr) { @@ -245,7 +245,7 @@ static BOOL IsConsoleProcess(HANDLE Process) sizeof(PEB), &BytesRead); if (! NT_SUCCESS(Status) || sizeof(PEB) != BytesRead) { - WARN ("Couldn't read virt mem status %08x bytes read %lu\n", Status, BytesRead); + WARN ("Couldn't read virt mem status %08x bytes read %Iu\n", Status, BytesRead); return TRUE; } diff --git a/ntoskrnl/io/pnpmgr/pnpmgr.c b/ntoskrnl/io/pnpmgr/pnpmgr.c index 76d712298e1..476e8f78fef 100644 --- a/ntoskrnl/io/pnpmgr/pnpmgr.c +++ b/ntoskrnl/io/pnpmgr/pnpmgr.c @@ -4498,7 +4498,7 @@ IoInvalidateDeviceState(IN PDEVICE_OBJECT PhysicalDeviceObject) { PDEVICE_NODE DeviceNode = IopGetDeviceNode(PhysicalDeviceObject); IO_STACK_LOCATION Stack; - ULONG PnPFlags; + ULONG_PTR PnPFlags; NTSTATUS Status; IO_STATUS_BLOCK IoStatusBlock; diff --git a/win32ss/gdi/gdi32/objects/dc.c b/win32ss/gdi/gdi32/objects/dc.c index 716e42ee515..bde7f2377a4 100644 --- a/win32ss/gdi/gdi32/objects/dc.c +++ b/win32ss/gdi/gdi32/objects/dc.c @@ -15,7 +15,7 @@ IntCreateDICW( UNICODE_STRING Device, Output; HDC hdc = NULL; BOOL Display = FALSE, Default = FALSE; - ULONG UMdhpdev = 0; + HANDLE UMdhpdev = 0; HANDLE hspool = NULL; @@ -65,7 +65,7 @@ IntCreateDICW( iType, // DCW 0 and ICW 1. Display, hspool, - (PVOID) &UMdhpdev ); + &UMdhpdev ); #if 0 // Handle something other than a normal dc object. if (GDI_HANDLE_GET_TYPE(hdc) != GDI_OBJECT_TYPE_DC)

4 years, 9 months

[reactos] 01/01: [APITESTS] Tested function must be called before GetLastError() log (#2433)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cb5aa7bee44f57306d6c0… commit cb5aa7bee44f57306d6c093bd5c93395ab7db7b7 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Fri Mar 13 18:15:21 2020 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Mar 13 18:15:21 2020 +0100 [APITESTS] Tested function must be called before GetLastError() log (#2433) So as to get the relevant LastError value. Fixes for apphelp_apitest, kernel32_apitest and ws2_32_apitest. --- modules/rostests/apitests/apphelp/layerapi.c | 42 ++++++---- .../rostests/apitests/kernel32/GetComputerNameEx.c | 89 ++++++++++++++++++---- .../apitests/kernel32/PrivMoveFileIdentityW.c | 10 ++- modules/rostests/apitests/ws2_32/WSARecv.c | 18 +++-- 4 files changed, 122 insertions(+), 37 deletions(-) diff --git a/modules/rostests/apitests/apphelp/layerapi.c b/modules/rostests/apitests/apphelp/layerapi.c index f06457c8c1f..69306f220a9 100644 --- a/modules/rostests/apitests/apphelp/layerapi.c +++ b/modules/rostests/apitests/apphelp/layerapi.c @@ -688,7 +688,8 @@ static void test_Sign_Media(void) ok(ret, "Expected redirect_iat to succeed\n"); if(ret) { - ok(create_file(workdir, "test.exe", 'a', 4), "create_file error: %d\n", GetLastError()); + ret = create_file(workdir, "test.exe", 'a', 4); + ok(ret, "create_file error: %d\n", GetLastError()); ok(wrapSdbSetPermLayerKeys2(drive, "test.exe", "TEST", 0), "Expected wrapSdbSetPermLayerKeys2 to succeed\n"); /* 4 */ @@ -696,7 +697,8 @@ static void test_Sign_Media(void) expect_LayerValue(0, "SIGN.MEDIA=4 test.exe", "TEST"); ok(wrapSdbSetPermLayerKeys2(drive, "test.exe", "", 0), "Expected wrapSdbSetPermLayerKeys2 to succeed\n"); - ok(create_file(workdir, "test.txt", 'a', 1), "create_file error: %d\n", GetLastError()); + ret = create_file(workdir, "test.txt", 'a', 1); + ok(ret, "create_file error: %d\n", GetLastError()); if (!expect_files(workdir, 2, "test.exe", "test.txt")) { @@ -711,7 +713,8 @@ static void test_Sign_Media(void) ok(wrapSdbSetPermLayerKeys2(drive, "test.exe", "", 0), "Expected wrapSdbSetPermLayerKeys2 to succeed\n"); } - ok(create_file(workdir, "test.zz", 'a', 0x1000), "create_file error: %d\n", GetLastError()); + ret = create_file(workdir, "test.zz", 'a', 0x1000); + ok(ret, "create_file error: %d\n", GetLastError()); if (!expect_files(workdir, 3, "test.exe", "test.txt", "test.zz")) { @@ -726,7 +729,8 @@ static void test_Sign_Media(void) ok(wrapSdbSetPermLayerKeys2(drive, "test.exe", "", 0), "Expected wrapSdbSetPermLayerKeys2 to succeed\n"); } - ok(create_file(subdir, "test.exe", 'a', 0x10203), "create_file error: %d\n", GetLastError()); + ret = create_file(subdir, "test.exe", 'a', 0x10203); + ok(ret, "create_file error: %d\n", GetLastError()); if (!expect_files(subdir, 1, "test.exe")) { @@ -741,7 +745,8 @@ static void test_Sign_Media(void) ok(wrapSdbSetPermLayerKeys2(drive, "sub\\test.exe", "", 0), "Expected wrapSdbSetPermLayerKeys2 to succeed\n"); } - ok(create_file(subdir, "test.bbb", 'a', 0), "create_file error: %d\n", GetLastError()); + ret = create_file(subdir, "test.bbb", 'a', 0); + ok(ret, "create_file error: %d\n", GetLastError()); if (!expect_files(subdir, 2, "test.bbb", "test.exe")) { @@ -756,7 +761,8 @@ static void test_Sign_Media(void) ok(wrapSdbSetPermLayerKeys2(drive, "sub\\test.exe", "", 0), "Expected wrapSdbSetPermLayerKeys2 to succeed\n"); } - ok(create_file(subdir, "TEST.txt", 'a', 0x30201), "create_file error: %d\n", GetLastError()); + ret = create_file(subdir, "TEST.txt", 'a', 0x30201); + ok(ret, "create_file error: %d\n", GetLastError()); if (!expect_files(subdir, 3, "test.bbb", "test.exe", "TEST.txt")) { @@ -771,7 +777,8 @@ static void test_Sign_Media(void) ok(wrapSdbSetPermLayerKeys2(drive, "sub\\test.exe", "", 0), "Expected wrapSdbSetPermLayerKeys2 to succeed\n"); } - ok(create_file(subdir, "TEST.aaa", 'a', 0x3a2a1), "create_file error: %d\n", GetLastError()); + ret = create_file(subdir, "TEST.aaa", 'a', 0x3a2a1); + ok(ret, "create_file error: %d\n", GetLastError()); if (!expect_files(subdir, 4, "TEST.aaa", "test.bbb", "test.exe", "TEST.txt")) { @@ -789,13 +796,20 @@ static void test_Sign_Media(void) ret = RestoreIat(GetModuleHandleA("apphelp.dll"), "kernel32.dll", "GetDriveTypeW", (ULONG_PTR)pGetDriveTypeW); ok(ret, "Expected restore_iat to succeed\n"); - ok(delete_file(subdir, "test.bbb"), "delete_file error: %d\n", GetLastError()); - ok(delete_file(subdir, "TEST.aaa"), "delete_file error: %d\n", GetLastError()); - ok(delete_file(subdir, "TEST.txt"), "delete_file error: %d\n", GetLastError()); - ok(delete_file(subdir, "test.exe"), "delete_file error: %d\n", GetLastError()); - ok(delete_file(workdir, "test.zz"), "delete_file error: %d\n", GetLastError()); - ok(delete_file(workdir, "test.txt"), "delete_file error: %d\n", GetLastError()); - ok(delete_file(workdir, "test.exe"), "delete_file error: %d\n", GetLastError()); + ret = delete_file(subdir, "test.bbb"); + ok(ret, "delete_file error: %d\n", GetLastError()); + ret = delete_file(subdir, "TEST.aaa"); + ok(ret, "delete_file error: %d\n", GetLastError()); + ret = delete_file(subdir, "TEST.txt"); + ok(ret, "delete_file error: %d\n", GetLastError()); + ret = delete_file(subdir, "test.exe"); + ok(ret, "delete_file error: %d\n", GetLastError()); + ret = delete_file(workdir, "test.zz"); + ok(ret, "delete_file error: %d\n", GetLastError()); + ret = delete_file(workdir, "test.txt"); + ok(ret, "delete_file error: %d\n", GetLastError()); + ret = delete_file(workdir, "test.exe"); + ok(ret, "delete_file error: %d\n", GetLastError()); } ret = DefineDosDeviceA(DDD_REMOVE_DEFINITION | DDD_NO_BROADCAST_SYSTEM, drive, NULL); ok(ret, "DefineDosDeviceA error: %d\n", GetLastError()); diff --git a/modules/rostests/apitests/kernel32/GetComputerNameEx.c b/modules/rostests/apitests/kernel32/GetComputerNameEx.c index 2fbcbf6c61b..4eee1a8c350 100644 --- a/modules/rostests/apitests/kernel32/GetComputerNameEx.c +++ b/modules/rostests/apitests/kernel32/GetComputerNameEx.c @@ -49,8 +49,8 @@ TestGetComputerNameEx( StartSeh() Ret = GetComputerNameExA(NameType, NULL, NULL); Error = GetLastError(); - ok(Ret == FALSE, "[%d] GetComputerNameExW returned %d\n", NameType, Ret); - ok(Error == ERROR_INVALID_PARAMETER, "[%d] GetComputerNameExW returned error %lu\n", NameType, Error); + ok(Ret == FALSE, "[%d] GetComputerNameExA returned %d\n", NameType, Ret); + ok(Error == ERROR_INVALID_PARAMETER, "[%d] GetComputerNameExA returned error %lu\n", NameType, Error); EndSeh(STATUS_SUCCESS); /* NULL buffer, nonzero size */ @@ -328,6 +328,7 @@ TestReturnValues() CHAR ComputerName[128]; DWORD ComputerNameSize = 0; INT ErrorCode; + BOOL Ret; memset(OrigNetBIOS, 0, sizeof(OrigNetBIOS)); memset(OrigHostname, 0, sizeof(OrigHostname)); @@ -363,9 +364,14 @@ TestReturnValues() StartSeh() GetComputerNameExA(ComputerNamePhysicalNetBIOS, ComputerName, &ComputerNameSize); if (ComputerNameSize) - ok(GetComputerNameExA(ComputerNamePhysicalNetBIOS, ComputerName, &ComputerNameSize), "GetComputerNameExA(ComputerNamePhysicalNetBIOS) failed with %ld\n", GetLastError()); + { + Ret = GetComputerNameExA(ComputerNamePhysicalNetBIOS, ComputerName, &ComputerNameSize); + ok(Ret, "GetComputerNameExA(ComputerNamePhysicalNetBIOS) failed with %ld\n", GetLastError()); + } else + { memset(ComputerName, 0, sizeof(ComputerName)); + } ok(strcmp(ComputerName, OrigNetBIOS) == 0, "ComputerNamePhysicalNetBIOS doesn't match registry value '%s' != '%s'\n", ComputerName, OrigNetBIOS); EndSeh(STATUS_SUCCESS); @@ -374,9 +380,14 @@ TestReturnValues() StartSeh() GetComputerNameExA(ComputerNamePhysicalDnsHostname, ComputerName, &ComputerNameSize); if (ComputerNameSize) - ok(GetComputerNameExA(ComputerNamePhysicalDnsHostname, ComputerName, &ComputerNameSize), "GetComputerNameExA(ComputerNamePhysicalDnsHostname) failed with %ld\n", GetLastError()); + { + Ret = GetComputerNameExA(ComputerNamePhysicalDnsHostname, ComputerName, &ComputerNameSize); + ok(Ret, "GetComputerNameExA(ComputerNamePhysicalDnsHostname) failed with %ld\n", GetLastError()); + } else + { memset(ComputerName, 0, sizeof(ComputerName)); + } ok(strcmp(ComputerName, OrigHostname) == 0, "ComputerNamePhysicalDnsHostname doesn't match registry value '%s' != '%s'\n", ComputerName, OrigHostname); EndSeh(STATUS_SUCCESS); @@ -385,9 +396,14 @@ TestReturnValues() StartSeh() GetComputerNameExA(ComputerNamePhysicalDnsDomain, ComputerName, &ComputerNameSize); if (ComputerNameSize) - ok(GetComputerNameExA(ComputerNamePhysicalDnsDomain, ComputerName, &ComputerNameSize), "GetComputerNameExA(ComputerNamePhysicalDnsDomain) failed with %ld\n", GetLastError()); + { + Ret = GetComputerNameExA(ComputerNamePhysicalDnsDomain, ComputerName, &ComputerNameSize); + ok(Ret, "GetComputerNameExA(ComputerNamePhysicalDnsDomain) failed with %ld\n", GetLastError()); + } else + { memset(ComputerName, 0, sizeof(ComputerName)); + } ok(strcmp(ComputerName, OrigDomainName) == 0, "ComputerNamePhysicalDnsDomain doesn't match registry value '%s' != '%s'\n", ComputerName, OrigDomainName); EndSeh(STATUS_SUCCESS); ComputerNameSize = 0; @@ -396,9 +412,14 @@ TestReturnValues() StartSeh() GetComputerNameExA(ComputerNameNetBIOS, ComputerName, &ComputerNameSize); if (ComputerNameSize) - ok(GetComputerNameExA(ComputerNameNetBIOS, ComputerName, &ComputerNameSize), "GetComputerNameExA(ComputerNameNetBIOS) failed with %ld\n", GetLastError()); + { + Ret = GetComputerNameExA(ComputerNameNetBIOS, ComputerName, &ComputerNameSize); + ok(Ret, "GetComputerNameExA(ComputerNameNetBIOS) failed with %ld\n", GetLastError()); + } else + { memset(ComputerName, 0, sizeof(ComputerName)); + } ok(strcmp(ComputerName, OrigNetBIOS) == 0, "ComputerNameNetBIOS doesn't match registry value '%s' != '%s'\n", ComputerName, OrigNetBIOS); EndSeh(STATUS_SUCCESS); @@ -407,9 +428,14 @@ TestReturnValues() StartSeh() GetComputerNameExA(ComputerNameDnsHostname, ComputerName, &ComputerNameSize); if (ComputerNameSize) - ok(GetComputerNameExA(ComputerNameDnsHostname, ComputerName, &ComputerNameSize), "GetComputerNameExA(ComputerNameDnsHostname) failed with %ld\n", GetLastError()); + { + Ret = GetComputerNameExA(ComputerNameDnsHostname, ComputerName, &ComputerNameSize); + ok(Ret, "GetComputerNameExA(ComputerNameDnsHostname) failed with %ld\n", GetLastError()); + } else + { memset(ComputerName, 0, sizeof(ComputerName)); + } ok(strcmp(ComputerName, OrigHostname) == 0, "ComputerNameDnsHostname doesn't match registry value '%s' != '%s'\n", ComputerName, OrigHostname); EndSeh(STATUS_SUCCESS); @@ -418,9 +444,14 @@ TestReturnValues() StartSeh() GetComputerNameExA(ComputerNameDnsDomain, ComputerName, &ComputerNameSize); if (ComputerNameSize) - ok(GetComputerNameExA(ComputerNameDnsDomain, ComputerName, &ComputerNameSize), "GetComputerNameExA(ComputerNameDnsDomain) failed with %ld\n", GetLastError()); + { + Ret = GetComputerNameExA(ComputerNameDnsDomain, ComputerName, &ComputerNameSize); + ok(Ret, "GetComputerNameExA(ComputerNameDnsDomain) failed with %ld\n", GetLastError()); + } else + { memset(ComputerName, 0, sizeof(ComputerName)); + } ok(strcmp(ComputerName, OrigDomainName) == 0, "ComputerNameDnsDomain doesn't match registry value '%s' != '%s'\n", ComputerName, OrigDomainName); EndSeh(STATUS_SUCCESS); @@ -434,9 +465,14 @@ TestReturnValues() StartSeh() GetComputerNameExA(ComputerNamePhysicalNetBIOS, ComputerName, &ComputerNameSize); if (ComputerNameSize) - ok(GetComputerNameExA(ComputerNamePhysicalNetBIOS, ComputerName, &ComputerNameSize), "GetComputerNameExA(ComputerNamePhysicalNetBIOS) failed with %ld\n", GetLastError()); + { + Ret = GetComputerNameExA(ComputerNamePhysicalNetBIOS, ComputerName, &ComputerNameSize); + ok(Ret, "GetComputerNameExA(ComputerNamePhysicalNetBIOS) failed with %ld\n", GetLastError()); + } else + { memset(ComputerName, 0, sizeof(ComputerName)); + } ok(strcmp(ComputerName, OrigNetBIOS) == 0, "ComputerNamePhysicalNetBIOS doesn't match registry value '%s' != '%s'\n", ComputerName, OrigNetBIOS); EndSeh(STATUS_SUCCESS); @@ -445,9 +481,14 @@ TestReturnValues() StartSeh() GetComputerNameExA(ComputerNamePhysicalDnsHostname, ComputerName, &ComputerNameSize); if (ComputerNameSize) - ok(GetComputerNameExA(ComputerNamePhysicalDnsHostname, ComputerName, &ComputerNameSize), "GetComputerNameExA(ComputerNamePhysicalDnsHostname) failed with %ld\n", GetLastError()); + { + Ret = GetComputerNameExA(ComputerNamePhysicalDnsHostname, ComputerName, &ComputerNameSize); + ok(Ret, "GetComputerNameExA(ComputerNamePhysicalDnsHostname) failed with %ld\n", GetLastError()); + } else + { memset(ComputerName, 0, sizeof(ComputerName)); + } ok(strcmp(ComputerName, OrigHostname) == 0, "ComputerNamePhysicalDnsHostname doesn't match registry value '%s' != '%s'\n", ComputerName, OrigHostname); EndSeh(STATUS_SUCCESS); @@ -456,9 +497,14 @@ TestReturnValues() StartSeh() GetComputerNameExA(ComputerNamePhysicalDnsDomain, ComputerName, &ComputerNameSize); if (ComputerNameSize) - ok(GetComputerNameExA(ComputerNamePhysicalDnsDomain, ComputerName, &ComputerNameSize), "GetComputerNameExA(ComputerNamePhysicalDnsDomain) failed with %ld\n", GetLastError()); + { + Ret = GetComputerNameExA(ComputerNamePhysicalDnsDomain, ComputerName, &ComputerNameSize); + ok(Ret, "GetComputerNameExA(ComputerNamePhysicalDnsDomain) failed with %ld\n", GetLastError()); + } else + { memset(ComputerName, 0, sizeof(ComputerName)); + } ok(strcmp(ComputerName, OrigDomainName) == 0, "ComputerNamePhysicalDnsDomain doesn't match registry value '%s' != '%s'\n", ComputerName, OrigDomainName); EndSeh(STATUS_SUCCESS); ComputerNameSize = 0; @@ -467,9 +513,14 @@ TestReturnValues() StartSeh() GetComputerNameExA(ComputerNameNetBIOS, ComputerName, &ComputerNameSize); if (ComputerNameSize) - ok(GetComputerNameExA(ComputerNameNetBIOS, ComputerName, &ComputerNameSize), "GetComputerNameExA(ComputerNameNetBIOS) failed with %ld\n", GetLastError()); + { + Ret = GetComputerNameExA(ComputerNameNetBIOS, ComputerName, &ComputerNameSize); + ok(Ret, "GetComputerNameExA(ComputerNameNetBIOS) failed with %ld\n", GetLastError()); + } else + { memset(ComputerName, 0, sizeof(ComputerName)); + } ok(strcmp(ComputerName, OrigNetBIOS) == 0, "ComputerNameNetBIOS doesn't match registry value '%s' != '%s'\n", ComputerName, OrigNetBIOS); EndSeh(STATUS_SUCCESS); @@ -478,9 +529,14 @@ TestReturnValues() StartSeh() GetComputerNameExA(ComputerNameDnsHostname, ComputerName, &ComputerNameSize); if (ComputerNameSize) - ok(GetComputerNameExA(ComputerNameDnsHostname, ComputerName, &ComputerNameSize), "GetComputerNameExA(ComputerNameDnsHostname) failed with %ld\n", GetLastError()); + { + Ret = GetComputerNameExA(ComputerNameDnsHostname, ComputerName, &ComputerNameSize); + ok(Ret, "GetComputerNameExA(ComputerNameDnsHostname) failed with %ld\n", GetLastError()); + } else + { memset(ComputerName, 0, sizeof(ComputerName)); + } ok(strcmp(ComputerName, OrigHostname) == 0, "ComputerNameDnsHostname doesn't match registry value '%s' != '%s'\n", ComputerName, OrigHostname); EndSeh(STATUS_SUCCESS); @@ -489,9 +545,14 @@ TestReturnValues() StartSeh() GetComputerNameExA(ComputerNameDnsDomain, ComputerName, &ComputerNameSize); if (ComputerNameSize) - ok(GetComputerNameExA(ComputerNameDnsDomain, ComputerName, &ComputerNameSize), "GetComputerNameExA(ComputerNameDnsDomain) failed with %ld\n", GetLastError()); + { + Ret = GetComputerNameExA(ComputerNameDnsDomain, ComputerName, &ComputerNameSize); + ok(Ret, "GetComputerNameExA(ComputerNameDnsDomain) failed with %ld\n", GetLastError()); + } else + { memset(ComputerName, 0, sizeof(ComputerName)); + } ok(strcmp(ComputerName, OrigDomainName) == 0, "ComputerNameDnsDomain doesn't match registry value '%s' != '%s'\n", ComputerName, OrigDomainName); EndSeh(STATUS_SUCCESS); diff --git a/modules/rostests/apitests/kernel32/PrivMoveFileIdentityW.c b/modules/rostests/apitests/kernel32/PrivMoveFileIdentityW.c index fcc557c4961..d9fe7e23430 100644 --- a/modules/rostests/apitests/kernel32/PrivMoveFileIdentityW.c +++ b/modules/rostests/apitests/kernel32/PrivMoveFileIdentityW.c @@ -60,6 +60,7 @@ TestPrivMoveFileIdentityW(VOID) HANDLE hDest; WCHAR Self[MAX_PATH]; OFSTRUCT ReOpen; + BOOL Ret; DeleteFileW(FileName); DeleteFileW(FileName2); @@ -97,13 +98,15 @@ TestPrivMoveFileIdentityW(VOID) ok(FileBasicInfo.CreationTime.QuadPart != CreationTime.QuadPart, "Equal creation times\n"); ok(FileStandardInfo.EndOfFile.QuadPart == 0LL, "File wasn't created empty: %I64d\n", FileStandardInfo.EndOfFile.QuadPart); SetLastError(0xdeadbeef); - ok(pPrivMoveFileIdentityW(Self, FileName, 0) == FALSE, "PrivMoveFileIdentityW succeed\n"); + Ret = pPrivMoveFileIdentityW(Self, FileName, 0); + ok(Ret == FALSE, "PrivMoveFileIdentityW succeeded unexpectedly\n"); ok(GetLastError() == ERROR_SHARING_VIOLATION, "Last error: %#lx\n", GetLastError()); ok(QueryFileInfo(FileName, &FileBasicInfo, &FileStandardInfo) == TRUE, "QueryFileInfo returned FALSE\n"); ok(FileBasicInfo.CreationTime.QuadPart != CreationTime.QuadPart, "Equal creation times\n"); ok(FileStandardInfo.EndOfFile.QuadPart == 0LL, "File wasn't created empty: %I64d\n", FileStandardInfo.EndOfFile.QuadPart); SetLastError(0xdeadbeef); - ok(pPrivMoveFileIdentityW(Self, FileName, 2) == TRUE, "PrivMoveFileIdentityW failed with %#lx\n", GetLastError()); + Ret = pPrivMoveFileIdentityW(Self, FileName, 2); + ok(Ret == TRUE, "PrivMoveFileIdentityW failed with %#lx\n", GetLastError()); ok(QueryFileInfo(FileName, &FileBasicInfo, &FileStandardInfo) == TRUE, "QueryFileInfo returned FALSE\n"); ok(FileBasicInfo.CreationTime.QuadPart == CreationTime.QuadPart, "Creation time didn't change\n"); ok(FileStandardInfo.EndOfFile.QuadPart == 0LL, "File not empty anymore: %I64d\n", FileStandardInfo.EndOfFile.QuadPart); @@ -126,7 +129,8 @@ TestPrivMoveFileIdentityW(VOID) ok(QueryFileInfo(FileName2, &FileBasicInfo, &FileStandardInfo) == TRUE, "QueryFileInfo returned FALSE\n"); ok(FileBasicInfo.CreationTime.QuadPart != CreationTime.QuadPart, "Equal creation times\n"); SetLastError(0xdeadbeef); - ok(pPrivMoveFileIdentityW(FileName, FileName2, 3) == TRUE, "PrivMoveFileIdentityW failed with %#lx\n", GetLastError()); + Ret = pPrivMoveFileIdentityW(FileName, FileName2, 3); + ok(Ret == TRUE, "PrivMoveFileIdentityW failed with %#lx\n", GetLastError()); ok(QueryFileInfo(FileName2, &FileBasicInfo, &FileStandardInfo) == TRUE, "QueryFileInfo returned FALSE\n"); ok(FileBasicInfo.CreationTime.QuadPart == CreationTime.QuadPart, "Creation time didn't change\n"); ok(OpenFile(FileNameA, &ReOpen, OF_EXIST) == HFILE_ERROR, "Source file still exists\n"); diff --git a/modules/rostests/apitests/ws2_32/WSARecv.c b/modules/rostests/apitests/ws2_32/WSARecv.c index c81b775b9ce..a7c4b16669a 100644 --- a/modules/rostests/apitests/ws2_32/WSARecv.c +++ b/modules/rostests/apitests/ws2_32/WSARecv.c @@ -47,6 +47,7 @@ void Test_WSARecv() WSAOVERLAPPED overlapped; char szGetRequest[] = "GET / HTTP/1.0\r\n\r\n"; struct fd_set readable; + BOOL ret; /* Start up Winsock */ iResult = WSAStartup(MAKEWORD(2, 2), &wdata); @@ -104,7 +105,8 @@ void Test_WSARecv() { iResult = WSAWaitForMultipleEvents(1, &overlapped.hEvent, TRUE, WSARecv_TIMEOUT, TRUE); ok(iResult == WSA_WAIT_EVENT_0, "WSAWaitForMultipleEvents failed %d\n", iResult); - ok(WSAGetOverlappedResult(sck, &overlapped, &dwSent, TRUE, &dwFlags), "WSAGetOverlappedResult failed %d\n", WSAGetLastError()); + ret = WSAGetOverlappedResult(sck, &overlapped, &dwSent, TRUE, &dwFlags); + ok(ret, "WSAGetOverlappedResult failed %d\n", WSAGetLastError()); } ok(dwSent == strlen(szGetRequest), "dwSent %ld != %d\n", dwSent, strlen(szGetRequest)); #if 0 /* break windows too */ @@ -139,7 +141,8 @@ void Test_WSARecv() { iResult = WSAWaitForMultipleEvents(1, &overlapped.hEvent, TRUE, WSARecv_TIMEOUT, TRUE); ok(iResult == WSA_WAIT_EVENT_0, "WSAWaitForMultipleEvents failed %d\n", iResult); - ok(WSAGetOverlappedResult(sck, &overlapped, &dwRecv, TRUE, &dwFlags), "WSAGetOverlappedResult failed %d\n", WSAGetLastError()); + ret = WSAGetOverlappedResult(sck, &overlapped, &dwRecv, TRUE, &dwFlags); + ok(ret, "WSAGetOverlappedResult failed %d\n", WSAGetLastError()); } ok(dwRecv == sizeof(szRecvBuf), "dwRecv %ld != %d\n", dwRecv, sizeof(szRecvBuf)); /* normal overlapped, no completion */ @@ -155,7 +158,8 @@ void Test_WSARecv() { iResult = WSAWaitForMultipleEvents(1, &overlapped.hEvent, TRUE, WSARecv_TIMEOUT, TRUE); ok(iResult == WSA_WAIT_EVENT_0, "WSAWaitForMultipleEvents failed %d\n", iResult); - ok(WSAGetOverlappedResult(sck, &overlapped, &dwRecv, TRUE, &dwFlags), "WSAGetOverlappedResult failed %d\n", WSAGetLastError()); + ret = WSAGetOverlappedResult(sck, &overlapped, &dwRecv, TRUE, &dwFlags); + ok(ret, "WSAGetOverlappedResult failed %d\n", WSAGetLastError()); } ok(dwRecv == sizeof(szBuf), "dwRecv %ld != %d\n", dwRecv, sizeof(szBuf)); ok(memcmp(szRecvBuf, szBuf, sizeof(szBuf)) == 0, "MSG_PEEK shouldn't have moved the pointer\n"); @@ -170,9 +174,11 @@ void Test_WSARecv() { iResult = WSAWaitForMultipleEvents(1, &overlapped.hEvent, TRUE, WSARecv_TIMEOUT, TRUE); ok(iResult == WSA_WAIT_EVENT_0, "WSAWaitForMultipleEvents failed %d\n", iResult); - ok(WSAGetOverlappedResult(sck, &overlapped, &dwRecv, TRUE, &dwFlags), "WSAGetOverlappedResult failed %d\n", WSAGetLastError()); + ret = WSAGetOverlappedResult(sck, &overlapped, &dwRecv, TRUE, &dwFlags); + ok(ret, "WSAGetOverlappedResult failed %d\n", WSAGetLastError()); } - ok(WSACloseEvent(overlapped.hEvent), "WSAGetOverlappedResult failed %d\n", WSAGetLastError()); + ret = WSACloseEvent(overlapped.hEvent); + ok(ret, "WSACloseEvent failed %d\n", WSAGetLastError()); ok(dwRecv == sizeof(szBuf), "dwRecv %ld != %d\n", dwRecv, sizeof(szBuf)); /* no overlapped with completion */ dwFlags = 0; @@ -181,7 +187,7 @@ void Test_WSARecv() iResult = WSARecv(sck, &buffers, 1, &dwRecv, &dwFlags, NULL, &completion); err = WSAGetLastError(); ok(iResult == 0 || (iResult == SOCKET_ERROR && err == WSA_IO_PENDING), "iResult = %d, %d\n", iResult, err); - ok(WSAGetLastError() == 0, "WSAGetLastError failed %d\n", WSAGetLastError()); + ok(err == 0, "WSARecv failed %d\n", err); ok(dwRecv == sizeof(szBuf), "dwRecv %ld != %d and 0\n", dwRecv, sizeof(szBuf)); closesocket(sck);

4 years, 9 months

[reactos] 01/01: [PSDK] SYSTEM_POWER_STATUS: Rename Reserved1 to SystemStatusFlag (#2419)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=dbfd511ecd125565bd5c4… commit dbfd511ecd125565bd5c4a19a35786176eb0deb3 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Fri Mar 13 18:14:16 2020 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Mar 13 18:14:16 2020 +0100 [PSDK] SYSTEM_POWER_STATUS: Rename Reserved1 to SystemStatusFlag (#2419) As on Win10. Cherry pick https://source.winehq.org/git/wine.git/commit/7c5ea436af8a6b5a3d2b095bd4697… --- modules/rostests/winetests/kernel32/generated.c | 12 ++++++------ sdk/include/psdk/winbase.h | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/rostests/winetests/kernel32/generated.c b/modules/rostests/winetests/kernel32/generated.c index 45b95922e11..2f0126edb35 100644 --- a/modules/rostests/winetests/kernel32/generated.c +++ b/modules/rostests/winetests/kernel32/generated.c @@ -1755,9 +1755,9 @@ static void test_pack_SYSTEM_POWER_STATUS(void) TEST_FIELD_SIZE (SYSTEM_POWER_STATUS, BatteryLifePercent, 1) TEST_FIELD_ALIGN (SYSTEM_POWER_STATUS, BatteryLifePercent, 1) TEST_FIELD_OFFSET(SYSTEM_POWER_STATUS, BatteryLifePercent, 2) - TEST_FIELD_SIZE (SYSTEM_POWER_STATUS, Reserved1, 1) - TEST_FIELD_ALIGN (SYSTEM_POWER_STATUS, Reserved1, 1) - TEST_FIELD_OFFSET(SYSTEM_POWER_STATUS, Reserved1, 3) + TEST_FIELD_SIZE (SYSTEM_POWER_STATUS, SystemStatusFlag, 1) + TEST_FIELD_ALIGN (SYSTEM_POWER_STATUS, SystemStatusFlag, 1) + TEST_FIELD_OFFSET(SYSTEM_POWER_STATUS, SystemStatusFlag, 3) TEST_FIELD_SIZE (SYSTEM_POWER_STATUS, BatteryLifeTime, 4) TEST_FIELD_ALIGN (SYSTEM_POWER_STATUS, BatteryLifeTime, 4) TEST_FIELD_OFFSET(SYSTEM_POWER_STATUS, BatteryLifeTime, 4) @@ -3612,9 +3612,9 @@ static void test_pack_SYSTEM_POWER_STATUS(void) TEST_FIELD_SIZE (SYSTEM_POWER_STATUS, BatteryLifePercent, 1) TEST_FIELD_ALIGN (SYSTEM_POWER_STATUS, BatteryLifePercent, 1) TEST_FIELD_OFFSET(SYSTEM_POWER_STATUS, BatteryLifePercent, 2) - TEST_FIELD_SIZE (SYSTEM_POWER_STATUS, Reserved1, 1) - TEST_FIELD_ALIGN (SYSTEM_POWER_STATUS, Reserved1, 1) - TEST_FIELD_OFFSET(SYSTEM_POWER_STATUS, Reserved1, 3) + TEST_FIELD_SIZE (SYSTEM_POWER_STATUS, SystemStatusFlag, 1) + TEST_FIELD_ALIGN (SYSTEM_POWER_STATUS, SystemStatusFlag, 1) + TEST_FIELD_OFFSET(SYSTEM_POWER_STATUS, SystemStatusFlag, 3) TEST_FIELD_SIZE (SYSTEM_POWER_STATUS, BatteryLifeTime, 4) TEST_FIELD_ALIGN (SYSTEM_POWER_STATUS, BatteryLifeTime, 4) TEST_FIELD_OFFSET(SYSTEM_POWER_STATUS, BatteryLifeTime, 4) diff --git a/sdk/include/psdk/winbase.h b/sdk/include/psdk/winbase.h index 9128d36d752..f5d79a04e93 100644 --- a/sdk/include/psdk/winbase.h +++ b/sdk/include/psdk/winbase.h @@ -1151,7 +1151,7 @@ typedef struct _SYSTEM_POWER_STATUS { BYTE ACLineStatus; BYTE BatteryFlag; BYTE BatteryLifePercent; - BYTE Reserved1; + BYTE SystemStatusFlag; DWORD BatteryLifeTime; DWORD BatteryFullLifeTime; } SYSTEM_POWER_STATUS,*LPSYSTEM_POWER_STATUS;

4 years, 9 months

← Newer
1
...
8
9
10
11
12
13
14
15
16
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 March 2020