ApfelTeeSaft/reactos
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/reactos.git synced 2026-08-31 12:23:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

[NtUser] Try to fix tests for user32:EnumDisplaySettings

Browse Source 
svn path=/trunk/; revision=72655
This commit is contained in:
Dmitry Chapyshev
2016-09-11 16:13:46 +00:00
parent db1b0cb26d
commit 10c7e5cb30
1 changed files with 18 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
reactos/win32ss/user/ntuser/display.c
+18 -26
View File
@@ -443,7 +443,7 @@ UserEnumCurrentDisplaySettings(
{
/* No device found */
ERR("No PDEV found!\n");
return STATUS_UNSUCCESSFUL;
return STATUS_INVALID_PARAMETER_1;
}
*ppdm = ppdev->pdmwDev;
@@ -474,7 +474,7 @@ UserEnumDisplaySettings(
{
/* No device found */
ERR("No device found!\n");
return STATUS_UNSUCCESSFUL;
return STATUS_INVALID_PARAMETER_1;
}
iFoundMode = 0;
@@ -571,13 +571,18 @@ NtUserEnumDisplaySettings(
_SEH2_TRY
{
ProbeForWrite(lpDevMode, sizeof(DEVMODEW), 1);
ProbeForRead(lpDevMode, sizeof(DEVMODEW), 1);
cbSize = lpDevMode->dmSize;
cbExtra = lpDevMode->dmDriverExtra;
ProbeForWrite(lpDevMode, cbSize + cbExtra, 1);
}
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
{
_SEH2_YIELD(return _SEH2_GetExceptionCode());
}
_SEH2_END
_SEH2_END;
if (lpDevMode->dmSize != sizeof(DEVMODEW))
{
@@ -586,31 +591,30 @@ NtUserEnumDisplaySettings(
if (pustrDevice)
{
if (pustrDevice->Buffer == NULL || pustrDevice->Length == 0)
{
Status = STATUS_INVALID_PARAMETER_1;
}
/* Initialize destination string */
RtlInitEmptyUnicodeString(&ustrDevice, awcDevice, sizeof(awcDevice));
_SEH2_TRY
{
/* Probe the UNICODE_STRING and the buffer */
ProbeForRead(pustrDevice, sizeof(UNICODE_STRING), 1);
ProbeForRead(pustrDevice->Buffer, pustrDevice->Length, 1);
ProbeForReadUnicodeString(pustrDevice);
if (!pustrDevice->Length || !pustrDevice->Buffer)
ExRaiseStatus(STATUS_NO_MEMORY);
ProbeForRead(pustrDevice->Buffer, pustrDevice->Length, sizeof(UCHAR));
/* Copy the string */
RtlCopyUnicodeString(&ustrDevice, pustrDevice);
}
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
{
_SEH2_YIELD(return _SEH2_GetExceptionCode());
_SEH2_YIELD(return STATUS_INVALID_PARAMETER_1);
}
_SEH2_END
_SEH2_END;
pustrDevice = &ustrDevice;
}
}
/* Acquire global USER lock */
UserEnterShared();
@@ -642,11 +646,6 @@ NtUserEnumDisplaySettings(
/* Copy some information back */
_SEH2_TRY
{
ProbeForRead(lpDevMode, sizeof(DEVMODEW), 1);
cbSize = lpDevMode->dmSize;
cbExtra = lpDevMode->dmDriverExtra;
ProbeForWrite(lpDevMode, cbSize + cbExtra, 1);
/* Output what we got */
RtlCopyMemory(lpDevMode, pdm, min(cbSize, pdm->dmSize));
@@ -664,13 +663,6 @@ NtUserEnumDisplaySettings(
}
_SEH2_END;
}
else
{
if (Status == STATUS_UNSUCCESSFUL)
{
Status = STATUS_INVALID_PARAMETER_1;
}
}
return Status;
}