Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [RDBSS] Fix pointer value assignation.
by Hermès Bélusca-Maïto 03 Jan '19

03 Jan '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8d878f4bfaef289b9d504… commit 8d878f4bfaef289b9d504a47ff0be022d18d82e7 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Jan 3 15:47:29 2019 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Jan 3 15:49:07 2019 +0100 [RDBSS] Fix pointer value assignation. --- sdk/lib/drivers/rdbsslib/rdbss.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/lib/drivers/rdbsslib/rdbss.c b/sdk/lib/drivers/rdbsslib/rdbss.c index a65a695037..489d311657 100644 --- a/sdk/lib/drivers/rdbsslib/rdbss.c +++ b/sdk/lib/drivers/rdbsslib/rdbss.c @@ -1156,7 +1156,7 @@ RxCancelOperationInOverflowQueue( { /* Remove it from the list */ RemoveEntryList(&RxContext->OverflowListEntry); - RxContext->OverflowListEntry.Flink == NULL; + RxContext->OverflowListEntry.Flink = NULL; /* Decrement appropriate count */ if (BooleanFlagOn(RxContext->Flags, RX_CONTEXT_FLAG_FSP_CRITICAL_OVERFLOW_QUEUE))

1 0

[reactos] 01/01: [RXCE] Fix 64 bit build
by Timo Kreuzer 03 Jan '19

03 Jan '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cdee66961976c4015f6c6… commit cdee66961976c4015f6c69e29b41fe9111884862 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Thu Jan 3 14:27:15 2019 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Jan 3 14:27:15 2019 +0100 [RXCE] Fix 64 bit build --- sdk/lib/drivers/rxce/rxce.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/sdk/lib/drivers/rxce/rxce.c b/sdk/lib/drivers/rxce/rxce.c index 9c106d477a..0f65b3f6ab 100644 --- a/sdk/lib/drivers/rxce/rxce.c +++ b/sdk/lib/drivers/rxce/rxce.c @@ -725,7 +725,12 @@ RxCancelBlockingOperation( { PFOBX Fobx; BOOLEAN PostRequest; - C_ASSERT(FIELD_OFFSET(RX_CONTEXT, IoStatusBlock.Status) == 100); + +#ifdef _WIN64 + C_ASSERT(FIELD_OFFSET(RX_CONTEXT, IoStatusBlock.Status) == 0x0B0); +#else + C_ASSERT(FIELD_OFFSET(RX_CONTEXT, IoStatusBlock.Status) == 0x064); +#endif PAGED_CODE();

1 0

[reactos] 01/01: [ACPI] Add code to retrieve packet type data from ACPI methods. This will enable the cmbatt driver to retrieve _BIF (battery information) or _BST (battery status) data. Also fix the buffer size calculation for integer and string data.
by Eric Kohl 02 Jan '19

02 Jan '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=60f018aea6226390a09c6… commit 60f018aea6226390a09c6cfb327cb340b1c18169 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Wed Jan 2 23:29:12 2019 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Wed Jan 2 23:29:12 2019 +0100 [ACPI] Add code to retrieve packet type data from ACPI methods. This will enable the cmbatt driver to retrieve _BIF (battery information) or _BST (battery status) data. Also fix the buffer size calculation for integer and string data. --- drivers/bus/acpi/eval.c | 127 ++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 106 insertions(+), 21 deletions(-) diff --git a/drivers/bus/acpi/eval.c b/drivers/bus/acpi/eval.c index 7d10b486db..2d338272e7 100644 --- a/drivers/bus/acpi/eval.c +++ b/drivers/bus/acpi/eval.c @@ -3,6 +3,83 @@ #define NDEBUG #include <debug.h> +static +NTSTATUS +GetPackageSize(ACPI_OBJECT *Package, + PULONG Count, + PULONG Size) +{ + ULONG Length, RawLength, TotalLength; + UINT32 i; + + TotalLength = 0; + for (i = 0; i < Package->Package.Count; i++) + { + switch (Package->Package.Elements[i].Type) + { + case ACPI_TYPE_INTEGER: + Length = sizeof(ACPI_METHOD_ARGUMENT); + DPRINT("Integer %lu -> %lu: %lu (0x%lx)\n", sizeof(ULONG), Length, Package->Package.Elements[i].Integer.Value); + TotalLength += Length; + break; + + case ACPI_TYPE_STRING: + RawLength = Package->Package.Elements[i].String.Length + 1; + Length = sizeof(ACPI_METHOD_ARGUMENT); + if (RawLength > sizeof(ULONG)) + Length += RawLength - sizeof(ULONG); + DPRINT("String %lu -> %lu: '%s'\n", RawLength, Length, Package->Package.Elements[i].String.Pointer); + TotalLength += Length; + break; + + default: + DPRINT1("Unsupported element type %lu\n", Package->Package.Elements[i].Type); + return STATUS_UNSUCCESSFUL; + } + } + + *Count = Package->Package.Count; + *Size = TotalLength; + + return STATUS_SUCCESS; +} + + +static +NTSTATUS +ConvertPackageArguments(ACPI_METHOD_ARGUMENT *Argument, + ACPI_OBJECT *Package) +{ + ACPI_METHOD_ARGUMENT *Ptr; + UINT32 i; + + Ptr = Argument; + for (i = 0; i < Package->Package.Count; i++) + { + switch (Package->Package.Elements[i].Type) + { + case ACPI_TYPE_INTEGER: + DPRINT("Integer %lu\n", sizeof(ACPI_METHOD_ARGUMENT)); + ACPI_METHOD_SET_ARGUMENT_INTEGER(Ptr, Package->Package.Elements[i].Integer.Value); + break; + + case ACPI_TYPE_STRING: + DPRINT("String %lu\n", Package->Package.Elements[i].String.Length); + ACPI_METHOD_SET_ARGUMENT_STRING(Ptr, Package->Package.Elements[i].String.Pointer); + break; + + default: + DPRINT1("Unsupported element type %lu\n", Package->Package.Elements[i].Type); + return STATUS_UNSUCCESSFUL; + } + + Ptr = ACPI_METHOD_NEXT_ARGUMENT(Ptr); + } + + return STATUS_SUCCESS; +} + + NTSTATUS NTAPI Bus_PDO_EvalMethod(PPDO_DEVICE_DATA DeviceData, @@ -83,7 +160,8 @@ Bus_PDO_EvalMethod(PPDO_DEVICE_DATA DeviceData, if (ACPI_SUCCESS(Status)) { ACPI_OBJECT *Obj = RetBuff.Pointer; - ULONG ExtraParamLength; + ULONG ExtraParamLength = 0; + ULONG Count = 1; /* If we didn't get anything back then we're done */ if (!RetBuff.Pointer || RetBuff.Length == 0) @@ -92,39 +170,43 @@ Bus_PDO_EvalMethod(PPDO_DEVICE_DATA DeviceData, switch (Obj->Type) { case ACPI_TYPE_INTEGER: - ExtraParamLength = sizeof(ULONG); + ExtraParamLength = sizeof(ACPI_METHOD_ARGUMENT); break; case ACPI_TYPE_STRING: - ExtraParamLength = Obj->String.Length; + ExtraParamLength = sizeof(ACPI_METHOD_ARGUMENT); + if (Obj->String.Length + 1 > sizeof(ULONG)) + ExtraParamLength += Obj->String.Length + 1 - sizeof(ULONG); break; case ACPI_TYPE_BUFFER: - ExtraParamLength = Obj->Buffer.Length; + ExtraParamLength = sizeof(ACPI_METHOD_ARGUMENT); + if (Obj->Buffer.Length > sizeof(ULONG)) + ExtraParamLength += Obj->Buffer.Length + 1 - sizeof(ULONG); break; case ACPI_TYPE_PACKAGE: DPRINT1("ACPI_TYPE_PACKAGE not supported yet!\n"); - return STATUS_UNSUCCESSFUL; + Status = GetPackageSize(Obj, &Count, &ExtraParamLength); + if (!NT_SUCCESS(Status)) + return Status; + break; default: ASSERT(FALSE); return STATUS_UNSUCCESSFUL; } - /* Enough space for a ULONG is always included */ - if (ExtraParamLength >= sizeof(ULONG)) - ExtraParamLength -= sizeof(ULONG); - else - ExtraParamLength = 0; - - OutputBuf = ExAllocatePoolWithTag(NonPagedPool, sizeof(ACPI_EVAL_OUTPUT_BUFFER) + - ExtraParamLength, 'BpcA'); - if (!OutputBuf) return STATUS_INSUFFICIENT_RESOURCES; + DPRINT("ExtraParamLength %lu\n", ExtraParamLength); + OutputBuf = ExAllocatePoolWithTag(NonPagedPool, + sizeof(ACPI_EVAL_OUTPUT_BUFFER) - sizeof(ACPI_METHOD_ARGUMENT) + ExtraParamLength, + 'BpcA'); + if (!OutputBuf) + return STATUS_INSUFFICIENT_RESOURCES; OutputBuf->Signature = ACPI_EVAL_OUTPUT_BUFFER_SIGNATURE; - OutputBuf->Length = ExtraParamLength + sizeof(ACPI_METHOD_ARGUMENT); - OutputBuf->Count = 1; + OutputBuf->Length = ExtraParamLength; + OutputBuf->Count = Count; switch (Obj->Type) { @@ -142,19 +224,22 @@ Bus_PDO_EvalMethod(PPDO_DEVICE_DATA DeviceData, case ACPI_TYPE_PACKAGE: DPRINT1("ACPI_TYPE_PACKAGE not supported yet!\n"); - return STATUS_UNSUCCESSFUL; + Status = ConvertPackageArguments(OutputBuf->Argument, Obj); + if (!NT_SUCCESS(Status)) + return Status; + break; default: ASSERT(FALSE); return STATUS_UNSUCCESSFUL; } - if (IrpSp->Parameters.DeviceIoControl.OutputBufferLength >= sizeof(ACPI_EVAL_OUTPUT_BUFFER) + + if (IrpSp->Parameters.DeviceIoControl.OutputBufferLength >= sizeof(ACPI_EVAL_OUTPUT_BUFFER) - sizeof(ACPI_METHOD_ARGUMENT) + ExtraParamLength) { - RtlCopyMemory(Irp->AssociatedIrp.SystemBuffer, OutputBuf, sizeof(ACPI_EVAL_OUTPUT_BUFFER) + + RtlCopyMemory(Irp->AssociatedIrp.SystemBuffer, OutputBuf, sizeof(ACPI_EVAL_OUTPUT_BUFFER) - sizeof(ACPI_METHOD_ARGUMENT) + ExtraParamLength); - Irp->IoStatus.Information = sizeof(ACPI_EVAL_OUTPUT_BUFFER) + ExtraParamLength; + Irp->IoStatus.Information = sizeof(ACPI_EVAL_OUTPUT_BUFFER) - sizeof(ACPI_METHOD_ARGUMENT) + ExtraParamLength; ExFreePoolWithTag(OutputBuf, 'BpcA'); return STATUS_SUCCESS; } @@ -166,7 +251,7 @@ Bus_PDO_EvalMethod(PPDO_DEVICE_DATA DeviceData, } else { - DPRINT1("Query method %s failed on %p\n", EvalInputBuff->MethodName, DeviceData->AcpiHandle); + DPRINT1("Query method %4s failed on %p\n", EvalInputBuff->MethodName, DeviceData->AcpiHandle); return STATUS_UNSUCCESSFUL; } }

1 0

[reactos] 01/01: [TCPIP] Don't trust the TEB
by Pierre Schweitzer 02 Jan '19

02 Jan '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9d0eb9b7b85a5fb7b2606… commit 9d0eb9b7b85a5fb7b26065a46600fe5edc4dbdab Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Wed Jan 2 23:01:24 2019 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Wed Jan 2 23:02:44 2019 +0100 [TCPIP] Don't trust the TEB And trust the Russian hackers to exploit that. --- drivers/network/tcpip/include/precomp.h | 1 + drivers/network/tcpip/tcpip/fileobjs.c | 14 +++++++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/drivers/network/tcpip/include/precomp.h b/drivers/network/tcpip/include/precomp.h index b2cb75063d..a96c4a51c3 100644 --- a/drivers/network/tcpip/include/precomp.h +++ b/drivers/network/tcpip/include/precomp.h @@ -16,5 +16,6 @@ #include <lock.h> #include <interface.h> #include <chew/chew.h> +#include <pseh/pseh2.h> #endif /* _TCPIP_PCH_ */ diff --git a/drivers/network/tcpip/tcpip/fileobjs.c b/drivers/network/tcpip/tcpip/fileobjs.c index f050a09b0c..614f1e1147 100644 --- a/drivers/network/tcpip/tcpip/fileobjs.c +++ b/drivers/network/tcpip/tcpip/fileobjs.c @@ -396,7 +396,6 @@ NTSTATUS FileOpenAddress( PVOID Options) { PADDRESS_FILE AddrFile; - PTEB Teb; TI_DbgPrint(MID_TRACE, ("Called (Proto %d).\n", Protocol)); @@ -431,10 +430,15 @@ NTSTATUS FileOpenAddress( AddrFile->HeaderIncl = 1; AddrFile->ProcessId = PsGetCurrentProcessId(); - Teb = PsGetCurrentThreadTeb(); - if (Teb != NULL) { - AddrFile->SubProcessTag = Teb->SubProcessTag; - } + _SEH2_TRY { + PTEB Teb; + + Teb = PsGetCurrentThreadTeb(); + if (Teb != NULL) + AddrFile->SubProcessTag = Teb->SubProcessTag; + } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { + AddrFile->SubProcessTag = 0; + } _SEH2_END; KeQuerySystemTime(&AddrFile->CreationTime);

1 0

[reactos] 04/04: [WIN32SS] Try to recover display when changing the display mode fails for whatever reason.
by Hermès Bélusca-Maïto 02 Jan '19

02 Jan '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=333ce14dad9697eece926… commit 333ce14dad9697eece92641a8d86650a19af660e Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Jan 2 20:55:40 2019 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Jan 2 21:12:22 2019 +0100 [WIN32SS] Try to recover display when changing the display mode fails for whatever reason. This helps when e.g. changing the resolution on the Dell Latitude D531, which reports that it supports large resolutions (e.g. 1920x1440x32 and others larger than 1024x768x32) but fails to apply these. This usually happens because PDEVOBJ_pSurface(), and more precisely ppdev->pldev->pfn.EnableSurface(), fails for these resolutions. - PDEVOBJ_bSwitchMode(): Set the new video mode, or restore the original one in case of failure + release the allocated ppdevTmp if previous calls fail. Also unlock in reverse order of locking order. - UserChangeDisplaySettings(): In case PDEVOBJ_pSurface() fails (but has reverted the original video mode), we still need to refresh the display since the display may have been messed up. --- win32ss/gdi/eng/pdevobj.c | 22 +++++++++++----- win32ss/user/ntuser/display.c | 59 +++++++++++++++++++++++++++---------------- 2 files changed, 53 insertions(+), 28 deletions(-) diff --git a/win32ss/gdi/eng/pdevobj.c b/win32ss/gdi/eng/pdevobj.c index 64d1832087..85098a5843 100644 --- a/win32ss/gdi/eng/pdevobj.c +++ b/win32ss/gdi/eng/pdevobj.c @@ -522,10 +522,10 @@ PDEVOBJ_bSwitchMode( // Lookup the GraphicsDevice + select DEVMODE // pdm = PDEVOBJ_pdmMatchDevMode(ppdev, pdm); - /* 1. Temporarily disable the current PDEV */ + /* 1. Temporarily disable the current PDEV and reset video to its default mode */ if (!ppdev->pfn.AssertMode(ppdev->dhpdev, FALSE)) { - DPRINT1("DrvAssertMode failed\n"); + DPRINT1("DrvAssertMode(FALSE) failed\n"); goto leave; } @@ -535,7 +535,7 @@ PDEVOBJ_bSwitchMode( if (!ppdevTmp) { DPRINT1("Failed to create a new PDEV\n"); - goto leave; + goto leave2; } /* 3. Create a new surface */ @@ -543,7 +543,8 @@ PDEVOBJ_bSwitchMode( if (!pSurface) { DPRINT1("PDEVOBJ_pSurface failed\n"); - goto leave; + PDEVOBJ_vRelease(ppdevTmp); + goto leave2; } /* 4. Get DirectDraw information */ @@ -565,10 +566,19 @@ PDEVOBJ_bSwitchMode( /* Success! */ retval = TRUE; + +leave2: + /* Set the new video mode, or restore the original one in case of failure */ + if (!ppdev->pfn.AssertMode(ppdev->dhpdev, TRUE)) + { + DPRINT1("DrvAssertMode(TRUE) failed\n"); + } + leave: - /* Unlock PDEV */ - EngReleaseSemaphore(ppdev->hsemDevLock); + /* Unlock everything else */ EngReleaseSemaphore(ghsemPDEV); + /* Unlock the PDEV */ + EngReleaseSemaphore(ppdev->hsemDevLock); DPRINT1("leave, ppdev = %p, pSurface = %p\n", ppdev, ppdev->pSurface); diff --git a/win32ss/user/ntuser/display.c b/win32ss/user/ntuser/display.c index 8ef37c9c4b..6abe5c84a5 100644 --- a/win32ss/user/ntuser/display.c +++ b/win32ss/user/ntuser/display.c @@ -800,38 +800,53 @@ UserChangeDisplaySettings( pvOldCursor = UserSetCursor(pvOldCursor, TRUE); ASSERT(pvOldCursor == NULL); - /* Check for failure */ + /* Check for success or failure */ if (!ulResult) { + /* Setting mode failed */ ERR("Failed to set mode\n"); - lResult = (lResult == DISP_CHANGE_NOTUPDATED) ? - DISP_CHANGE_FAILED : DISP_CHANGE_RESTART; - goto leave; + /* Set the correct return value */ + if ((flags & CDS_UPDATEREGISTRY) && (lResult != DISP_CHANGE_NOTUPDATED)) + lResult = DISP_CHANGE_RESTART; + else + lResult = DISP_CHANGE_FAILED; } + else + { + /* Setting mode succeeded */ + lResult = DISP_CHANGE_SUCCESSFUL; - UserUpdateFullscreen(flags); + UserUpdateFullscreen(flags); - /* Update the system metrics */ - InitMetrics(); + /* Update the system metrics */ + InitMetrics(); - /* Set new size of the monitor */ - UserUpdateMonitorSize((HDEV)ppdev); + /* Set new size of the monitor */ + UserUpdateMonitorSize((HDEV)ppdev); - /* Update the SERVERINFO */ - gpsi->dmLogPixels = ppdev->gdiinfo.ulLogPixelsY; - gpsi->Planes = ppdev->gdiinfo.cPlanes; - gpsi->BitsPixel = ppdev->gdiinfo.cBitsPixel; - gpsi->BitCount = gpsi->Planes * gpsi->BitsPixel; - if (ppdev->gdiinfo.flRaster & RC_PALETTE) - { - gpsi->PUSIFlags |= PUSIF_PALETTEDISPLAY; + /* Update the SERVERINFO */ + gpsi->dmLogPixels = ppdev->gdiinfo.ulLogPixelsY; + gpsi->Planes = ppdev->gdiinfo.cPlanes; + gpsi->BitsPixel = ppdev->gdiinfo.cBitsPixel; + gpsi->BitCount = gpsi->Planes * gpsi->BitsPixel; + if (ppdev->gdiinfo.flRaster & RC_PALETTE) + { + gpsi->PUSIFlags |= PUSIF_PALETTEDISPLAY; + } + else + { + gpsi->PUSIFlags &= ~PUSIF_PALETTEDISPLAY; + } + // Font is realized and this dc was previously set to internal DC_ATTR. + gpsi->cxSysFontChar = IntGetCharDimensions(hSystemBM, &tmw, (DWORD*)&gpsi->cySysFontChar); + gpsi->tmSysFont = tmw; } - else - gpsi->PUSIFlags &= ~PUSIF_PALETTEDISPLAY; - // Font is realized and this dc was previously set to internal DC_ATTR. - gpsi->cxSysFontChar = IntGetCharDimensions(hSystemBM, &tmw, (DWORD*)&gpsi->cySysFontChar); - gpsi->tmSysFont = tmw; + + /* + * Refresh the display on success and even on failure, + * since the display may have been messed up. + */ /* Remove all cursor clipping */ UserClipCursor(NULL);

1 0

[reactos] 03/04: [WIN32SS:NTUSER] Remove some hardcoded buffer sizes + number of chars vs. bytes mixup.
by Hermès Bélusca-Maïto 02 Jan '19

02 Jan '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fb4a6e38c7c6e3db13fb0… commit fb4a6e38c7c6e3db13fb07222d813ca979d17b18 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Jan 2 20:53:42 2019 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Jan 2 21:12:21 2019 +0100 [WIN32SS:NTUSER] Remove some hardcoded buffer sizes + number of chars vs. bytes mixup. --- win32ss/user/ntuser/display.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/win32ss/user/ntuser/display.c b/win32ss/user/ntuser/display.c index e511600149..8ef37c9c4b 100644 --- a/win32ss/user/ntuser/display.c +++ b/win32ss/user/ntuser/display.c @@ -169,7 +169,7 @@ InitVideo(VOID) Status = RegOpenKey(L"\\REGISTRY\\MACHINE\\SYSTEM\\CurrentControlSet\\Control", &hkey); if (NT_SUCCESS(Status)) { - cbValue = 256; + cbValue = sizeof(awcBuffer); Status = RegQueryValue(hkey, L"SystemStartOptions", REG_SZ, awcBuffer, &cbValue); if (NT_SUCCESS(Status)) { @@ -193,11 +193,11 @@ InitVideo(VOID) } /* Read the name of the VGA adapter */ - cbValue = 20; + cbValue = sizeof(awcDeviceName); Status = RegQueryValue(hkey, L"VgaCompatible", REG_SZ, awcDeviceName, &cbValue); if (NT_SUCCESS(Status)) { - iVGACompatible = _wtoi(&awcDeviceName[13]); + iVGACompatible = _wtoi(&awcDeviceName[sizeof("\\Device\\Video")-1]); ERR("VGA adapter = %lu\n", iVGACompatible); }

1 0

[reactos] 02/04: [WIN32SS:NTUSER] Minor whitespace formatting.
by Hermès Bélusca-Maïto 02 Jan '19

02 Jan '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cc3fbfefac1c846dc68ca… commit cc3fbfefac1c846dc68ca0069faeb1a26ada14e9 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Jan 2 20:51:46 2019 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Jan 2 21:12:20 2019 +0100 [WIN32SS:NTUSER] Minor whitespace formatting. --- win32ss/user/ntuser/display.c | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/win32ss/user/ntuser/display.c b/win32ss/user/ntuser/display.c index 2850f41320..e511600149 100644 --- a/win32ss/user/ntuser/display.c +++ b/win32ss/user/ntuser/display.c @@ -712,9 +712,13 @@ UserChangeDisplaySettings( } } else if (pdm->dmSize < FIELD_OFFSET(DEVMODEW, dmFields)) - return DISP_CHANGE_BADMODE; /* This is what winXP SP3 returns */ + { + return DISP_CHANGE_BADMODE; /* This is what WinXP SP3 returns */ + } else + { dm = *pdm; + } /* Save original bit count */ OrigBC = gpsi->BitCount; @@ -735,13 +739,13 @@ UserChangeDisplaySettings( } /* Fixup values */ - if(dm.dmBitsPerPel == 0 || !(dm.dmFields & DM_BITSPERPEL)) + if (dm.dmBitsPerPel == 0 || !(dm.dmFields & DM_BITSPERPEL)) { dm.dmBitsPerPel = ppdev->pdmwDev->dmBitsPerPel; dm.dmFields |= DM_BITSPERPEL; } - if((dm.dmFields & DM_DISPLAYFREQUENCY) && (dm.dmDisplayFrequency == 0)) + if ((dm.dmFields & DM_DISPLAYFREQUENCY) && (dm.dmDisplayFrequency == 0)) dm.dmDisplayFrequency = ppdev->pdmwDev->dmDisplayFrequency; /* Look for the requested DEVMODE */ @@ -836,20 +840,20 @@ UserChangeDisplaySettings( //IntHideDesktop(pdesk); /* Send WM_DISPLAYCHANGE to all toplevel windows */ - UserSendNotifyMessage( HWND_BROADCAST, - WM_DISPLAYCHANGE, - gpsi->BitCount, - MAKELONG(gpsi->aiSysMet[SM_CXSCREEN], gpsi->aiSysMet[SM_CYSCREEN]) ); + UserSendNotifyMessage(HWND_BROADCAST, + WM_DISPLAYCHANGE, + gpsi->BitCount, + MAKELONG(gpsi->aiSysMet[SM_CXSCREEN], gpsi->aiSysMet[SM_CYSCREEN])); ERR("BitCount New %d Orig %d ChkNew %d\n",gpsi->BitCount,OrigBC,ppdev->gdiinfo.cBitsPixel); /* Not full screen and different bit count, send messages */ if (!(flags & CDS_FULLSCREEN) && - gpsi->BitCount != OrigBC ) + gpsi->BitCount != OrigBC) { - ERR("Detect settings changed.\n"); - UserSendNotifyMessage( HWND_BROADCAST, WM_SETTINGCHANGE, 0, 0 ); - UserSendNotifyMessage( HWND_BROADCAST, WM_SYSCOLORCHANGE, 0, 0 ); + ERR("Detect settings changed.\n"); + UserSendNotifyMessage(HWND_BROADCAST, WM_SETTINGCHANGE, 0, 0); + UserSendNotifyMessage(HWND_BROADCAST, WM_SYSCOLORCHANGE, 0, 0); } //co_IntShowDesktop(pdesk, ppdev->gdiinfo.ulHorzRes, ppdev->gdiinfo.ulVertRes);

1 0

[reactos] 01/04: [FRAMEBUF] Correctly check the return value of the EngDeviceIoControl() call and return adequate value in DrvAssertMode().
by Hermès Bélusca-Maïto 02 Jan '19

02 Jan '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3f716870ca878799ef670… commit 3f716870ca878799ef6700d6eea83fcdb0945f51 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Jan 1 20:44:24 2019 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Jan 2 21:12:19 2019 +0100 [FRAMEBUF] Correctly check the return value of the EngDeviceIoControl() call and return adequate value in DrvAssertMode(). --- win32ss/drivers/displays/framebuf/surface.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/win32ss/drivers/displays/framebuf/surface.c b/win32ss/drivers/displays/framebuf/surface.c index 43b3b89b96..b0b74da295 100644 --- a/win32ss/drivers/displays/framebuf/surface.c +++ b/win32ss/drivers/displays/framebuf/surface.c @@ -174,27 +174,28 @@ DrvAssertMode( if (bEnable) { - BOOLEAN Result; /* * Reinitialize the device to a clean state. */ - Result = EngDeviceIoControl(ppdev->hDriver, IOCTL_VIDEO_SET_CURRENT_MODE, - &(ppdev->ModeIndex), sizeof(ULONG), NULL, 0, - &ulTemp); + if (EngDeviceIoControl(ppdev->hDriver, IOCTL_VIDEO_SET_CURRENT_MODE, + &(ppdev->ModeIndex), sizeof(ULONG), NULL, 0, + &ulTemp)) + { + /* We failed, bail out */ + return FALSE; + } if (ppdev->BitsPerPixel == 8) { IntSetPalette(dhpdev, ppdev->PaletteEntries, 0, 256); } - return Result; - + return TRUE; } else { /* * Call the miniport driver to reset the device to a known state. */ - return !EngDeviceIoControl(ppdev->hDriver, IOCTL_VIDEO_RESET_DEVICE, NULL, 0, NULL, 0, &ulTemp); }

1 0

[reactos] 01/01: [NTUSER] Fix a few tests related to desktops and window stations - NtUserOpenInputDesktop: Don't crash if there is no input desktop yet - NtUserOpenInputDesktop: Fail if the process doesn't belong to the interactive window station - NtUserCreateWindowStation: Clear error on success - DesktopWindowProc: Use UserOpenInputDesktop to get a handle to the input desktop
by Giannis Adamopoulos 02 Jan '19

02 Jan '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=60448f83fb65d055b2391… commit 60448f83fb65d055b2391d89c26479d3a7a6de97 Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Wed Jan 2 16:50:35 2019 +0200 Commit: Giannis Adamopoulos <gadamopoulos(a)reactos.org> CommitDate: Wed Jan 2 17:15:40 2019 +0200 [NTUSER] Fix a few tests related to desktops and window stations - NtUserOpenInputDesktop: Don't crash if there is no input desktop yet - NtUserOpenInputDesktop: Fail if the process doesn't belong to the interactive window station - NtUserCreateWindowStation: Clear error on success - DesktopWindowProc: Use UserOpenInputDesktop to get a handle to the input desktop --- win32ss/user/ntuser/desktop.c | 66 +++++++++++++++++++++++++++++-------------- win32ss/user/ntuser/desktop.h | 1 + win32ss/user/ntuser/winsta.c | 2 ++ 3 files changed, 48 insertions(+), 21 deletions(-) diff --git a/win32ss/user/ntuser/desktop.c b/win32ss/user/ntuser/desktop.c index e066198226..875cc4b69c 100644 --- a/win32ss/user/ntuser/desktop.c +++ b/win32ss/user/ntuser/desktop.c @@ -1471,7 +1471,7 @@ DesktopWindowProc(PWND Wnd, UINT Msg, WPARAM wParam, LPARAM lParam, LRESULT *lRe PWINDOWPOS pWindowPos = (PWINDOWPOS)lParam; if ((pWindowPos->flags & SWP_SHOWWINDOW) != 0) { - HDESK hdesk = IntGetDesktopObjectHandle(gpdeskInputDesktop); + HDESK hdesk = UserOpenInputDesktop(0, FALSE, DESKTOP_ALL_ACCESS); IntSetThreadDesktop(hdesk, FALSE); } break; @@ -2569,6 +2569,48 @@ NtUserOpenDesktop( return Desktop; } +HDESK UserOpenInputDesktop(DWORD dwFlags, + BOOL fInherit, + ACCESS_MASK dwDesiredAccess) +{ + PTHREADINFO pti = PsGetCurrentThreadWin32Thread(); + NTSTATUS Status; + ULONG HandleAttributes = 0; + HDESK hdesk = NULL; + + if (!gpdeskInputDesktop) + { + return NULL; + } + + if (pti->ppi->prpwinsta != InputWindowStation) + { + ERR("Tried to open input desktop from non interactive winsta!\n"); + EngSetLastError(ERROR_INVALID_FUNCTION); + return NULL; + } + + if (fInherit) HandleAttributes = OBJ_INHERIT; + + /* Create a new handle to the object */ + Status = ObOpenObjectByPointer( + gpdeskInputDesktop, + HandleAttributes, + NULL, + dwDesiredAccess, + ExDesktopObjectType, + UserMode, + (PHANDLE)&hdesk); + + if (!NT_SUCCESS(Status)) + { + ERR("Failed to open input desktop object\n"); + SetLastNtError(Status); + } + + return hdesk; +} + /* * NtUserOpenInputDesktop * @@ -2597,30 +2639,12 @@ NtUserOpenInputDesktop( BOOL fInherit, ACCESS_MASK dwDesiredAccess) { - NTSTATUS Status; - HDESK hdesk = NULL; - ULONG HandleAttributes = 0; + HDESK hdesk; UserEnterExclusive(); TRACE("Enter NtUserOpenInputDesktop gpdeskInputDesktop 0x%p\n",gpdeskInputDesktop); - if (fInherit) HandleAttributes = OBJ_INHERIT; - - /* Create a new handle to the object */ - Status = ObOpenObjectByPointer( - gpdeskInputDesktop, - HandleAttributes, - NULL, - dwDesiredAccess, - ExDesktopObjectType, - UserMode, - (PHANDLE)&hdesk); - - if (!NT_SUCCESS(Status)) - { - ERR("Failed to open input desktop object\n"); - SetLastNtError(Status); - } + hdesk = UserOpenInputDesktop(dwFlags, fInherit, dwDesiredAccess); TRACE("NtUserOpenInputDesktop returning 0x%p\n",hdesk); UserLeave(); diff --git a/win32ss/user/ntuser/desktop.h b/win32ss/user/ntuser/desktop.h index 6f15bb12a3..8ec595af86 100644 --- a/win32ss/user/ntuser/desktop.h +++ b/win32ss/user/ntuser/desktop.h @@ -357,5 +357,6 @@ BOOL FASTCALL IntPaintDesktop(HDC); BOOL FASTCALL DesktopWindowProc(PWND, UINT, WPARAM, LPARAM, LRESULT *); BOOL FASTCALL UserMessageWindowProc(PWND pwnd, UINT Msg, WPARAM wParam, LPARAM lParam, LRESULT *lResult); VOID NTAPI DesktopThreadMain(VOID); +HDESK UserOpenInputDesktop(DWORD dwFlags, BOOL fInherit, ACCESS_MASK dwDesiredAccess); /* EOF */ diff --git a/win32ss/user/ntuser/winsta.c b/win32ss/user/ntuser/winsta.c index 63325fe800..4556e7412e 100644 --- a/win32ss/user/ntuser/winsta.c +++ b/win32ss/user/ntuser/winsta.c @@ -521,6 +521,8 @@ IntCreateWindowStation( ObjectAttributes->ObjectName, WindowStation, hWinSta); *phWinSta = hWinSta; + EngSetLastError(ERROR_SUCCESS); + return STATUS_SUCCESS; }

1 0

[reactos] 01/01: [RDBSS][RXCE] Implement IRP cancellation
by Pierre Schweitzer 02 Jan '19

02 Jan '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a9124b412d39ac57e09bc… commit a9124b412d39ac57e09bcb915064db0ec1265d1b Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Wed Jan 2 15:01:38 2019 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Wed Jan 2 15:02:15 2019 +0100 [RDBSS][RXCE] Implement IRP cancellation CORE-15441 --- sdk/include/ddk/rxcontx.h | 17 +++++ sdk/lib/drivers/rdbsslib/rdbss.c | 150 ++++++++++++++++++++++++++++++++++++++- sdk/lib/drivers/rxce/rxce.c | 87 +++++++++++++++++++++++ 3 files changed, 252 insertions(+), 2 deletions(-) diff --git a/sdk/include/ddk/rxcontx.h b/sdk/include/ddk/rxcontx.h index bfab6952fc..d00e96383a 100644 --- a/sdk/include/ddk/rxcontx.h +++ b/sdk/include/ddk/rxcontx.h @@ -517,6 +517,8 @@ RxReinitializeContext( } #endif +extern FAST_MUTEX RxContextPerFileSerializationMutex; + VOID NTAPI RxResumeBlockedOperations_Serially( @@ -527,4 +529,19 @@ VOID RxResumeBlockedOperations_ALL( _Inout_ PRX_CONTEXT RxContext); +#if (_WIN32_WINNT >= 0x0600) +VOID +RxCancelBlockingOperation( + _Inout_ PRX_CONTEXT RxContext, + _In_ PIRP Irp); +#else +VOID +RxCancelBlockingOperation( + _Inout_ PRX_CONTEXT RxContext); +#endif + +VOID +RxRemoveOperationFromBlockingQueue( + _Inout_ PRX_CONTEXT RxContext); + #endif diff --git a/sdk/lib/drivers/rdbsslib/rdbss.c b/sdk/lib/drivers/rdbsslib/rdbss.c index 8822d03155..a65a695037 100644 --- a/sdk/lib/drivers/rdbsslib/rdbss.c +++ b/sdk/lib/drivers/rdbsslib/rdbss.c @@ -361,6 +361,11 @@ NTSTATUS RxNotifyChangeDirectory( PRX_CONTEXT RxContext); +VOID +NTAPI +RxpCancelRoutine( + PVOID Context); + NTSTATUS RxpQueryInfoMiniRdr( PRX_CONTEXT RxContext, @@ -529,7 +534,6 @@ BOOLEAN DisableFlushOnCleanup = FALSE; ULONG ReadAheadGranularity = 1 << PAGE_SHIFT; LIST_ENTRY RxActiveContexts; NPAGED_LOOKASIDE_LIST RxContextLookasideList; -FAST_MUTEX RxContextPerFileSerializationMutex; RDBSS_DATA RxData; FCB RxDeviceFCB; BOOLEAN RxLoudLowIoOpsEnabled = FALSE; @@ -1128,13 +1132,126 @@ RxCancelNotifyChangeDirectoryRequestsForVNetRoot( return Status; } +/* + * @implemented + */ +BOOLEAN +RxCancelOperationInOverflowQueue( + PRX_CONTEXT RxContext) +{ + KIRQL OldIrql; + BOOLEAN OperationToCancel; + + /* By default, nothing cancelled */ + OperationToCancel = FALSE; + + /* Acquire the overflow spinlock */ + KeAcquireSpinLock(&RxFileSystemDeviceObject->OverflowQueueSpinLock, &OldIrql); + + /* Is our context in any queue? */ + if (BooleanFlagOn(RxContext->Flags, (RX_CONTEXT_FLAG_FSP_DELAYED_OVERFLOW_QUEUE | RX_CONTEXT_FLAG_FSP_CRITICAL_OVERFLOW_QUEUE))) + { + /* Make sure flag is consistent with facts... */ + if (RxContext->OverflowListEntry.Flink != NULL) + { + /* Remove it from the list */ + RemoveEntryList(&RxContext->OverflowListEntry); + RxContext->OverflowListEntry.Flink == NULL; + + /* Decrement appropriate count */ + if (BooleanFlagOn(RxContext->Flags, RX_CONTEXT_FLAG_FSP_CRITICAL_OVERFLOW_QUEUE)) + { + --RxFileSystemDeviceObject->OverflowQueueCount[CriticalWorkQueue]; + } + else + { + --RxFileSystemDeviceObject->OverflowQueueCount[DelayedWorkQueue]; + } + + /* Clear the flag */ + ClearFlag(RxContext->Flags, ~(RX_CONTEXT_FLAG_FSP_DELAYED_OVERFLOW_QUEUE | RX_CONTEXT_FLAG_FSP_CRITICAL_OVERFLOW_QUEUE)); + + /* Time to cancel! */ + OperationToCancel = TRUE; + } + } + + KeReleaseSpinLock(&RxFileSystemDeviceObject->OverflowQueueSpinLock, OldIrql); + + /* We have something to cancel & complete */ + if (OperationToCancel) + { + RxRemoveOperationFromBlockingQueue(RxContext); + RxCompleteRequest(RxContext, STATUS_CANCELLED); + } + + return OperationToCancel; +} + +/* + * @implemented + */ VOID NTAPI RxCancelRoutine( PDEVICE_OBJECT DeviceObject, PIRP Irp) { - UNIMPLEMENTED; + KIRQL OldIrql; + PLIST_ENTRY Entry; + PRX_CONTEXT RxContext; + + /* Lock our contexts list */ + KeAcquireSpinLock(&RxStrucSupSpinLock, &OldIrql); + + /* Now, find a context that matches the cancelled IRP */ + Entry = RxActiveContexts.Flink; + while (Entry != &RxActiveContexts) + { + RxContext = CONTAINING_RECORD(Entry, RX_CONTEXT, ContextListEntry); + Entry = Entry->Flink; + + /* Found! */ + if (RxContext->CurrentIrp == Irp) + { + break; + } + } + + /* If we reached the end of the list, we didn't find any context, so zero the buffer + * If the context is already under cancellation, forget about it too + */ + if (Entry == &RxActiveContexts || BooleanFlagOn(RxContext->Flags, RX_CONTEXT_FLAG_CANCELLED)) + { + RxContext = NULL; + } + else + { + /* Otherwise, reference it and mark it cancelled */ + SetFlag(RxContext->Flags, RX_CONTEXT_FLAG_CANCELLED); + InterlockedIncrement((volatile long *)&RxContext->ReferenceCount); + } + + /* Done with the contexts list */ + KeReleaseSpinLock(&RxStrucSupSpinLock, OldIrql); + + /* And done with the cancellation, we'll do it now */ + IoReleaseCancelSpinLock(Irp->CancelIrql); + + /* If we have a context to cancel */ + if (RxContext != NULL) + { + /* We cannot executed at dispatch, so queue a deferred cancel */ + if (KeGetCurrentIrql() >= DISPATCH_LEVEL) + { + RxDispatchToWorkerThread(RxFileSystemDeviceObject, CriticalWorkQueue, RxpCancelRoutine, RxContext); + } + /* Cancel now! */ + else + { + RxpCancelRoutine(RxContext); + } + } } /* @@ -7491,6 +7608,35 @@ RxNotifyChangeDirectory( return Status; } +/* + * @implemented + */ +VOID +NTAPI +RxpCancelRoutine( + PVOID Context) +{ + PRX_CONTEXT RxContext; + + PAGED_CODE(); + + RxContext = Context; + + /* First, notify mini-rdr about cancellation */ + if (RxContext->MRxCancelRoutine != NULL) + { + RxContext->MRxCancelRoutine(RxContext); + } + /* If we didn't find in overflow queue, try in blocking operations */ + else if (!RxCancelOperationInOverflowQueue(RxContext)) + { + RxCancelBlockingOperation(RxContext); + } + + /* And delete the context */ + RxDereferenceAndDeleteRxContext_Real(RxContext); +} + NTSTATUS RxPostStackOverflowRead ( IN PRX_CONTEXT RxContext) diff --git a/sdk/lib/drivers/rxce/rxce.c b/sdk/lib/drivers/rxce/rxce.c index 424294b33d..9c106d477a 100644 --- a/sdk/lib/drivers/rxce/rxce.c +++ b/sdk/lib/drivers/rxce/rxce.c @@ -143,6 +143,7 @@ LIST_ENTRY RxRecurrentWorkItemsList; KDPC RxTimerDpc; KTIMER RxTimer; ULONG RxTimerTickCount; +FAST_MUTEX RxContextPerFileSerializationMutex; #if DBG BOOLEAN DumpDispatchRoutine = TRUE; #else @@ -715,6 +716,66 @@ RxBootstrapWorkerThreadDispatcher( RxpWorkerThreadDispatcher(RxWorkQueue, NULL); } +/* + * @implemented + */ +VOID +RxCancelBlockingOperation( + IN OUT PRX_CONTEXT RxContext) +{ + PFOBX Fobx; + BOOLEAN PostRequest; + C_ASSERT(FIELD_OFFSET(RX_CONTEXT, IoStatusBlock.Status) == 100); + + PAGED_CODE(); + + Fobx = (PFOBX)RxContext->pFobx; + PostRequest = FALSE; + + /* Acquire the pipe mutex */ + ExAcquireFastMutex(&RxContextPerFileSerializationMutex); + + /* If that's a blocking pipe operation which is not the CCB one, then handle it */ + if (BooleanFlagOn(RxContext->FlagsForLowIo, RXCONTEXT_FLAG4LOWIO_PIPE_SYNC_OPERATION) && + RxContext->RxContextSerializationQLinks.Flink != NULL && + RxContext != CONTAINING_RECORD(&Fobx->Specific.NamedPipe.ReadSerializationQueue, RX_CONTEXT, RxContextSerializationQLinks) && + RxContext != CONTAINING_RECORD(&Fobx->Specific.NamedPipe.WriteSerializationQueue, RX_CONTEXT, RxContextSerializationQLinks)) + { + /* Clear it! */ + ClearFlag(RxContext->FlagsForLowIo, RXCONTEXT_FLAG4LOWIO_PIPE_SYNC_OPERATION); + + /* Drop it off the list */ + RemoveEntryList(&RxContext->RxContextSerializationQLinks); + RxContext->RxContextSerializationQLinks.Flink = NULL; + RxContext->RxContextSerializationQLinks.Blink = NULL; + + /* Set we've been cancelled */ + RxContext->IoStatusBlock.Status = STATUS_CANCELLED; + + /* + * If it's async, we'll post completion, otherwise, we signal to waiters + * it's being cancelled + */ + if (BooleanFlagOn(RxContext->Flags, RX_CONTEXT_FLAG_ASYNC_OPERATION)) + { + PostRequest = TRUE; + } + else + { + RxSignalSynchronousWaiter(RxContext); + } + } + + /* Done */ + ExReleaseFastMutex(&RxContextPerFileSerializationMutex); + + /* Post if async */ + if (PostRequest) + { + RxFsdPostRequest(RxContext); + } +} + /* * @implemented */ @@ -7562,6 +7623,32 @@ RxRemoveNameNetFcb( #endif } +/* + * @implemented + */ +VOID +RxRemoveOperationFromBlockingQueue( + IN OUT PRX_CONTEXT RxContext) +{ + /* Acquire the pipe mutex */ + ExAcquireFastMutex(&RxContextPerFileSerializationMutex); + + /* Is that a blocking serial operation? */ + if (BooleanFlagOn(RxContext->FlagsForLowIo, RXCONTEXT_FLAG4LOWIO_PIPE_SYNC_OPERATION)) + { + /* Clear it! */ + ClearFlag(RxContext->FlagsForLowIo, RXCONTEXT_FLAG4LOWIO_PIPE_SYNC_OPERATION); + + /* Drop it off the list */ + RemoveEntryList(&RxContext->RxContextSerializationQLinks); + RxContext->RxContextSerializationQLinks.Flink = NULL; + RxContext->RxContextSerializationQLinks.Blink = NULL; + } + + /* Done */ + ExReleaseFastMutex(&RxContextPerFileSerializationMutex); +} + /* * @implemented */

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