Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-05 04:06:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Speed optimize NtUserEnumDisplaySettings bit by remove

Browse source 
COPY_DEVMODE_VALUE_TO_CALLER macro and using SEH directly 

svn path=/trunk/; revision=33270
This commit is contained in:
Magnus Olsen 2008-05-04 14:31:20 +00:00
parent 5e393b5c8d
commit 8ef0a1282d
1 changed files with 18 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
reactos/subsystems/win32/win32k/ntuser/windc.c
View file

@ -890,15 +890,6 @@ NtUserGetDC(HWND hWnd)
return NtUserGetDCEx(hWnd, NULL, NULL == hWnd ? DCX_CACHE | DCX_WINDOW : DCX_USESTYLE);
}
#define COPY_DEVMODE_VALUE_TO_CALLER(dst, src, member) \
Status = MmCopyToCaller(&(dst)->member, &(src)->member, sizeof ((src)->member)); \
if (!NT_SUCCESS(Status)) \
{ \
SetLastNtError(Status); \
ExFreePool(src); \
return FALSE; \
}
BOOL
STDCALL
NtUserEnumDisplaySettings(
@ -916,7 +907,7 @@ NtUserEnumDisplaySettings(
/* Copy the devmode */
_SEH_TRY
{
ProbeForRead(&lpDevMode->dmSize, sizeof(DEVMODEW), 1);
ProbeForRead(lpDevMode, sizeof(DEVMODEW), 1);
Size = lpDevMode->dmSize;
ExtraSize = lpDevMode->dmDriverExtra;
}
@ -963,11 +954,23 @@ NtUserEnumDisplaySettings(
RtlFreeUnicodeString(pSafeDeviceName);
/* Copy some information back */
COPY_DEVMODE_VALUE_TO_CALLER(lpDevMode, pSafeDevMode, dmPelsWidth);
COPY_DEVMODE_VALUE_TO_CALLER(lpDevMode, pSafeDevMode, dmPelsHeight);
COPY_DEVMODE_VALUE_TO_CALLER(lpDevMode, pSafeDevMode, dmBitsPerPel);
COPY_DEVMODE_VALUE_TO_CALLER(lpDevMode, pSafeDevMode, dmDisplayFrequency);
COPY_DEVMODE_VALUE_TO_CALLER(lpDevMode, pSafeDevMode, dmDisplayFlags);
_SEH_TRY
{
ProbeForWrite(lpDevMode,Size, 1);
lpDevMode->dmPelsWidth = pSafeDevMode->dmPelsWidth;
lpDevMode->dmPelsHeight = pSafeDevMode->dmPelsHeight;
lpDevMode->dmBitsPerPel = pSafeDevMode->dmBitsPerPel;
lpDevMode->dmDisplayFrequency = pSafeDevMode->dmDisplayFrequency;
lpDevMode->dmDisplayFlags = pSafeDevMode->dmDisplayFlags;
}
_SEH_HANDLE
{
DPRINT1("Warning crash here \n");
SetLastNtError(_SEH_GetExceptionCode());
_SEH_YIELD(return FALSE);
}
_SEH_END;
/* output private/extra driver data */
if (ExtraSize > 0)
@ -985,8 +988,6 @@ NtUserEnumDisplaySettings(
return TRUE;
}
#undef COPY_DEVMODE_VALUE_TO_CALLER
LONG
STDCALL
NtUserChangeDisplaySettings(