Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-07 04:13:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

fixed NtUserEnumDisplaySettings bug inside IntEnumDisplaySettings DWORD DisplayNumber was not init before it was use.

Browse source 
GetDisplayNumberFromDeviceName did not allown pdevice with NULL value or string lenght is 0 thuse have been fixed. 


svn path=/trunk/; revision=33274
This commit is contained in:
Magnus Olsen 2008-05-04 17:58:43 +00:00
parent 2260e9862a
commit 958edf5d4b
1 changed files with 43 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

47
reactos/subsystems/win32/win32k/objects/dc.c
View file

@ -2717,8 +2717,17 @@ GetDisplayNumberFromDeviceName(
if (DisplayNumber == NULL) if (DisplayNumber == NULL)
return STATUS_INVALID_PARAMETER_2; return STATUS_INVALID_PARAMETER_2;
if (pDeviceName && pDeviceName->Length <= DisplayString.Length) DPRINT1("GetDisplayNumberFromDeviceName Pass 1 seh \n");
return STATUS_OBJECT_NAME_INVALID;
if ((pDeviceName != NULL) && (pDeviceName->Length != 0))
{
if (pDeviceName->Length <= DisplayString.Length)
{
DPRINT1("GetDisplayNumberFromDeviceName FAIL pDeviceName : %wZ \n",pDeviceName);
DPRINT1("GetDisplayNumberFromDeviceName FAIL pDeviceName->Length : %d \n",pDeviceName->Length);
return STATUS_OBJECT_NAME_INVALID;
}
}
if (pDeviceName == NULL || pDeviceName->Length == 0) if (pDeviceName == NULL || pDeviceName->Length == 0)
{ {
@ -2757,7 +2766,7 @@ GetDisplayNumberFromDeviceName(
Number = Number * 10 + Char - L'0'; Number = Number * 10 + Char - L'0';
else if (Char != L'\0') else if (Char != L'\0')
return STATUS_OBJECT_NAME_INVALID; return STATUS_OBJECT_NAME_INVALID;
} }
*DisplayNumber = Number - 1; *DisplayNumber = Number - 1;
} }
@ -2783,7 +2792,7 @@ IntEnumDisplaySettings(
static UNICODE_STRING CachedDeviceName; static UNICODE_STRING CachedDeviceName;
PDEVMODEW CachedMode = NULL; PDEVMODEW CachedMode = NULL;
DEVMODEW DevMode; DEVMODEW DevMode;
ULONG DisplayNumber; ULONG DisplayNumber = 0;
if (!NT_SUCCESS(GetDisplayNumberFromDeviceName(pDeviceName, &DisplayNumber))) if (!NT_SUCCESS(GetDisplayNumberFromDeviceName(pDeviceName, &DisplayNumber)))
{ {
@ -2791,6 +2800,8 @@ IntEnumDisplaySettings(
return FALSE; return FALSE;
} }
DPRINT1("IntEnumDisplaySettings Pass 1 seh \n");
DPRINT("DevMode->dmSize = %d\n", pDevMode->dmSize); DPRINT("DevMode->dmSize = %d\n", pDevMode->dmSize);
DPRINT("DevMode->dmExtraSize = %d\n", pDevMode->dmDriverExtra); DPRINT("DevMode->dmExtraSize = %d\n", pDevMode->dmDriverExtra);
if (pDevMode->dmSize != SIZEOF_DEVMODEW_300 && if (pDevMode->dmSize != SIZEOF_DEVMODEW_300 &&
@ -2801,13 +2812,17 @@ IntEnumDisplaySettings(
return FALSE; return FALSE;
} }
DPRINT1("IntEnumDisplaySettings Pass 2 seh \n");
if (iModeNum == ENUM_CURRENT_SETTINGS) if (iModeNum == ENUM_CURRENT_SETTINGS)
{ {
DPRINT1("IntEnumDisplaySettings ENUM_CURRENT_SETTINGS \n");
CachedMode = &PrimarySurface.DMW; CachedMode = &PrimarySurface.DMW;
ASSERT(CachedMode->dmSize > 0); ASSERT(CachedMode->dmSize > 0);
} }
else if (iModeNum == ENUM_REGISTRY_SETTINGS) else if (iModeNum == ENUM_REGISTRY_SETTINGS)
{ {
DPRINT1("IntEnumDisplaySettings ENUM_REGISTRY_SETTINGS \n");
RtlZeroMemory(&DevMode, sizeof (DevMode)); RtlZeroMemory(&DevMode, sizeof (DevMode));
DevMode.dmSize = sizeof (DevMode); DevMode.dmSize = sizeof (DevMode);
DevMode.dmDriverExtra = 0; DevMode.dmDriverExtra = 0;
@ -2821,9 +2836,13 @@ IntEnumDisplaySettings(
/* FIXME: Maybe look for the matching devmode supplied by the /* FIXME: Maybe look for the matching devmode supplied by the
* driver so we can provide driver private/extra data? * driver so we can provide driver private/extra data?
*/ */
DPRINT1("IntEnumDisplaySettings Pass 3 seh \n");
} }
else else
{ {
DPRINT1("IntEnumDisplaySettings NO FLAGs \n");
BOOL IsCachedDevice = (CachedDevModes != NULL); BOOL IsCachedDevice = (CachedDevModes != NULL);
if (CachedDevModes && if (CachedDevModes &&
@ -2840,6 +2859,8 @@ IntEnumDisplaySettings(
LPWSTR CurrentName; LPWSTR CurrentName;
DRVENABLEDATA DrvEnableData; DRVENABLEDATA DrvEnableData;
DPRINT1("IntEnumDisplaySettings iModeNum \n");
/* Free resources from last driver cache */ /* Free resources from last driver cache */
if (IsCachedDevice == FALSE && CachedDeviceName.Buffer != NULL) if (IsCachedDevice == FALSE && CachedDeviceName.Buffer != NULL)
{ {
@ -2854,12 +2875,16 @@ IntEnumDisplaySettings(
return FALSE; return FALSE;
} }
DPRINT1("IntEnumDisplaySettings Pass 4 seh \n");
if (!IntPrepareDriverIfNeeded()) if (!IntPrepareDriverIfNeeded())
{ {
DPRINT1("IntPrepareDriverIfNeeded failed\n"); DPRINT1("IntPrepareDriverIfNeeded failed\n");
return FALSE; return FALSE;
} }
DPRINT1("IntEnumDisplaySettings Pass 5 seh \n");
/* /*
* DriverFileNames may be a list of drivers in REG_SZ_MULTI format, * DriverFileNames may be a list of drivers in REG_SZ_MULTI format,
* scan all of them until a good one found. * scan all of them until a good one found.
@ -2940,6 +2965,9 @@ IntEnumDisplaySettings(
SetLastWin32Error(STATUS_NO_MEMORY); SetLastWin32Error(STATUS_NO_MEMORY);
return FALSE; return FALSE;
} }
DPRINT1("IntEnumDisplaySettings Pass 6 seh \n");
if (CachedDevModes != NULL) if (CachedDevModes != NULL)
{ {
RtlCopyMemory(NewBuffer, CachedDevModes, SizeUsed); RtlCopyMemory(NewBuffer, CachedDevModes, SizeUsed);
@ -2978,12 +3006,19 @@ IntEnumDisplaySettings(
} }
/* return cached info */ /* return cached info */
DPRINT1("IntEnumDisplaySettings return cached info \n");
CachedMode = CachedDevModes; CachedMode = CachedDevModes;
if (CachedMode >= CachedDevModesEnd) if (CachedMode >= CachedDevModesEnd)
{ {
SetLastWin32Error(STATUS_NO_MORE_ENTRIES); SetLastWin32Error(STATUS_NO_MORE_ENTRIES);
return FALSE; return FALSE;
} }
DPRINT1("IntEnumDisplaySettings Pass 7 seh \n");
while (iModeNum-- > 0 && CachedMode < CachedDevModesEnd) while (iModeNum-- > 0 && CachedMode < CachedDevModesEnd)
{ {
assert(CachedMode->dmSize > 0); assert(CachedMode->dmSize > 0);
@ -2994,10 +3029,14 @@ IntEnumDisplaySettings(
SetLastWin32Error(STATUS_NO_MORE_ENTRIES); SetLastWin32Error(STATUS_NO_MORE_ENTRIES);
return FALSE; return FALSE;
} }
DPRINT1("IntEnumDisplaySettings Pass 8 seh \n");
} }
ASSERT(CachedMode != NULL); ASSERT(CachedMode != NULL);
DPRINT1("IntEnumDisplaySettings Pass 9 seh \n");
RtlCopyMemory(pDevMode, CachedMode, min(pDevMode->dmSize, CachedMode->dmSize)); RtlCopyMemory(pDevMode, CachedMode, min(pDevMode->dmSize, CachedMode->dmSize));
RtlZeroMemory(pDevMode + pDevMode->dmSize, pDevMode->dmDriverExtra); RtlZeroMemory(pDevMode + pDevMode->dmSize, pDevMode->dmDriverExtra);
RtlCopyMemory(pDevMode + min(pDevMode->dmSize, CachedMode->dmSize), CachedMode + CachedMode->dmSize, min(pDevMode->dmDriverExtra, CachedMode->dmDriverExtra)); RtlCopyMemory(pDevMode + min(pDevMode->dmSize, CachedMode->dmSize), CachedMode + CachedMode->dmSize, min(pDevMode->dmDriverExtra, CachedMode->dmDriverExtra));