Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [POWERCFG] Disable the "Enable hibernation" checkbox if the system does not support hibernation
by Eric Kohl 15 Mar '20

15 Mar '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=beeb989eaa5ad095c106f… commit beeb989eaa5ad095c106f46036c639bf34d8cda1 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Mar 15 14:19:42 2020 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Mar 15 14:21:11 2020 +0100 [POWERCFG] Disable the "Enable hibernation" checkbox if the system does not support hibernation --- dll/cpl/powercfg/hibernate.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dll/cpl/powercfg/hibernate.c b/dll/cpl/powercfg/hibernate.c index 02e774e784e..3f19aea2ab3 100644 --- a/dll/cpl/powercfg/hibernate.c +++ b/dll/cpl/powercfg/hibernate.c @@ -19,6 +19,7 @@ Hib_InitDialog(HWND hwndDlg) TCHAR szTemp[MAX_PATH]; LPTSTR lpRoot; ULARGE_INTEGER FreeBytesAvailable, TotalNumberOfBytes, TotalNumberOfFreeBytes; + BOOLEAN bHibernate; if (GetPwrCapabilities(&PowerCaps)) { @@ -59,6 +60,12 @@ Hib_InitDialog(HWND hwndDlg) ShowWindow(GetDlgItem(hwndDlg, IDC_TOLESSFREESPACE), FALSE); EnableWindow(GetDlgItem(hwndDlg, IDC_HIBERNATEFILE), TRUE); } + + bHibernate = PowerCaps.HiberFilePresent ? TRUE : FALSE; + if (CallNtPowerInformation(SystemReserveHiberFile, &bHibernate, sizeof(bHibernate), NULL, 0) != STATUS_SUCCESS) + { + EnableWindow(GetDlgItem(hwndDlg, IDC_HIBERNATEFILE), FALSE); + } } }

1 0

[reactos] 02/02: [MSVCRT] Add _snwscanf
by Mark Jansen 15 Mar '20

15 Mar '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=315765ed8b0334fb3a3f2… commit 315765ed8b0334fb3a3f26b458a5acee2583c8f3 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun Mar 15 01:03:14 2020 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Mar 15 13:12:20 2020 +0100 [MSVCRT] Add _snwscanf --- dll/win32/msvcrt/msvcrt.spec | 2 +- sdk/lib/crt/string/scanf.c | 23 +++++++++++++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/dll/win32/msvcrt/msvcrt.spec b/dll/win32/msvcrt/msvcrt.spec index 4e0c07aa950..ba302857bc1 100644 --- a/dll/win32/msvcrt/msvcrt.spec +++ b/dll/win32/msvcrt/msvcrt.spec @@ -622,7 +622,7 @@ @ varargs _snprintf(ptr long str) @ varargs _snscanf(str long str) @ varargs _snwprintf(ptr long wstr) -# stub _snwscanf +@ varargs _snwscanf(wstr long wstr) @ varargs _sopen(str long long) @ varargs _spawnl(long str str) @ varargs _spawnle(long str str) diff --git a/sdk/lib/crt/string/scanf.c b/sdk/lib/crt/string/scanf.c index bb6f098967e..aa2f2d34795 100644 --- a/sdk/lib/crt/string/scanf.c +++ b/sdk/lib/crt/string/scanf.c @@ -95,6 +95,14 @@ static int wchar2digit(wchar_t c, int base) { #undef SECURE #include "scanf.h" +/* vsnwscanf_l */ +#define WIDE_SCANF 1 +#undef CONSOLE +#define STRING 1 +#define STRING_LEN 1 +#undef SECURE +#include "scanf.h" + #ifndef _LIBCNT_ /* vcscanf_l */ #undef WIDE_SCANF @@ -208,6 +216,21 @@ int CDECL _cscanf(const char *format, ...) } #endif +/********************************************************************* + * _snwscanf (MSVCRT.@) + */ +int WINAPIV _snwscanf(const wchar_t *input, size_t length, + const wchar_t *format, ...) +{ + __ms_va_list valist; + int res; + + __ms_va_start(valist, format); + res = vsnwscanf_l(input, length, format, NULL, valist); + __ms_va_end(valist); + return res; +} + /********************************************************************* * _snscanf (MSVCRT.@) */

1 0

[reactos] 01/02: [WINTRUST] Add WTHelperGetFileHash stub
by Mark Jansen 15 Mar '20

15 Mar '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=550ce7e81893371c08290… commit 550ce7e81893371c08290afe5fb974e3fd82b4f6 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun Mar 15 01:02:44 2020 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Mar 15 13:12:05 2020 +0100 [WINTRUST] Add WTHelperGetFileHash stub --- dll/win32/wintrust/wintrust.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/wintrust/wintrust.spec b/dll/win32/wintrust/wintrust.spec index 7ebd53f0396..4fb5ac94ffa 100644 --- a/dll/win32/wintrust/wintrust.spec +++ b/dll/win32/wintrust/wintrust.spec @@ -94,7 +94,7 @@ @ stub WTHelperCheckCertUsage @ stub WTHelperGetAgencyInfo @ stdcall WTHelperGetFileHandle(ptr) -#@ stub WTHelperGetFileHash +@ stub WTHelperGetFileHash @ stdcall WTHelperGetFileName(ptr) @ stdcall WTHelperGetKnownUsages(long ptr) @ stdcall WTHelperGetProvCertFromChain(ptr long)

1 0

[reactos] 01/01: [DESK][CONTROL] Select property pages by command line, for example 'control desk.cpl, , 1' and fix 'control color'
by Eric Kohl 15 Mar '20

15 Mar '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a88d7b5c2fe6d5ca903d5… commit a88d7b5c2fe6d5ca903d529bb5343abe32e65ca8 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Mar 15 11:46:31 2020 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Mar 15 11:46:31 2020 +0100 [DESK][CONTROL] Select property pages by command line, for example 'control desk.cpl,,1' and fix 'control color' --- base/applications/control/control.c | 2 +- dll/cpl/desk/desk.c | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/base/applications/control/control.c b/base/applications/control/control.c index ba3ceb2f45b..e08ed829b2f 100644 --- a/base/applications/control/control.c +++ b/base/applications/control/control.c @@ -86,7 +86,7 @@ wWinMain(HINSTANCE hInstance, /* Check one of the built-in control panel handlers */ if (!_wcsicmp(lpCmdLine, L"admintools")) return OpenShellFolder(L"\\::{D20EA4E1-3957-11d2-A40B-0C5020524153}"); - else if (!_wcsicmp(lpCmdLine, L"color")) return RunControlPanel(L"desk.cpl"); /* TODO: Switch to the "Apperance" tab */ + else if (!_wcsicmp(lpCmdLine, L"color")) return RunControlPanel(L"desk.cpl,,2"); else if (!_wcsicmp(lpCmdLine, L"date/time")) return RunControlPanel(L"timedate.cpl"); else if (!_wcsicmp(lpCmdLine, L"desktop")) return RunControlPanel(L"desk.cpl"); else if (!_wcsicmp(lpCmdLine, L"folders")) return RUNDLL(L"shell32.dll,Options_RunDLL"); diff --git a/dll/cpl/desk/desk.c b/dll/cpl/desk/desk.c index 28a296c1423..f2690aae5c5 100644 --- a/dll/cpl/desk/desk.c +++ b/dll/cpl/desk/desk.c @@ -150,6 +150,7 @@ DisplayApplet(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam) LPCWSTR pwszSelectedTab = NULL; LPCWSTR pwszFile = NULL; LPCWSTR pwszAction = NULL; + INT nPage = 0; UNREFERENCED_PARAMETER(wParam); @@ -160,6 +161,8 @@ DisplayApplet(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam) int argc; int i; + nPage = _wtoi((PWSTR)lParam); + #if 0 argv = CommandLineToArgvW((LPCWSTR)lParam, &argc); #else @@ -190,7 +193,7 @@ DisplayApplet(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam) ActivateThemeFile(pwszFile); goto cleanup; } - + g_GlobalData.pwszFile = pwszFile; g_GlobalData.pwszAction = pwszAction; g_GlobalData.desktop_color = GetSysColor(COLOR_DESKTOP); @@ -232,6 +235,9 @@ DisplayApplet(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam) /* NOTE: Don't call SHAddFromPropSheetExtArray here because this applet only allows replacing the background page but not extending the applet by more pages */ + if (nPage != 0 && psh.nStartPage == 0) + psh.nStartPage = nPage; + PropertySheet(&psh); cleanup: @@ -272,6 +278,7 @@ CPlApplet(HWND hwndCPl, UINT uMsg, LPARAM lParam1, LPARAM lParam2) case CPL_DBLCLK: Applets[i].AppletProc(hwndCPl, uMsg, lParam1, lParam2); break; + case CPL_STARTWPARMSW: return Applets[i].AppletProc(hwndCPl, uMsg, lParam1, lParam2); }

1 0

[reactos] 02/02: [ISAPNP] Rewrite device reporting method
by Hervé Poussineau 14 Mar '20

14 Mar '20

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:

1 0

[reactos] 01/02: [ISAPNP] Fix reading of serial number
by Hervé Poussineau 14 Mar '20

14 Mar '20

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;

1 0

[reactos] 01/01: [CMD] Fix another NtReadVirtualMemory parameter.
by Thomas Faber 14 Mar '20

14 Mar '20

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 */

1 0

[reactos] 01/01: [FREELDR] Move built-in VGA font to better location (#2429)
by Stanislav Motylkov 14 Mar '20

14 Mar '20

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

1 0

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

14 Mar '20

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)

1 0

[reactos] 01/01: [HOST] Do not pack structures
by Timo Kreuzer 14 Mar '20

14 Mar '20

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 */

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