- Don't use exclusive lock when shared is enough
- Don't declare functions in source code

svn path=/trunk/; revision=54198
This commit is contained in:
Rafal Harabien 2011-10-19 16:00:46 +00:00
parent c9134c871b
commit 51a410c228
2 changed files with 3 additions and 9 deletions

View file

@ -68,9 +68,8 @@ VOID FASTCALL IntCleanupCurIcons(struct _EPROCESS *Process, PPROCESSINFO Win32Pr
BOOL UserDrawIconEx(HDC hDc, INT xLeft, INT yTop, PCURICON_OBJECT pIcon, INT cxWidth, BOOL UserDrawIconEx(HDC hDc, INT xLeft, INT yTop, PCURICON_OBJECT pIcon, INT cxWidth,
INT cyHeight, UINT istepIfAniCur, HBRUSH hbrFlickerFreeDraw, UINT diFlags); INT cyHeight, UINT istepIfAniCur, HBRUSH hbrFlickerFreeDraw, UINT diFlags);
PCURICON_OBJECT FASTCALL UserGetCurIconObject(HCURSOR hCurIcon); PCURICON_OBJECT FASTCALL UserGetCurIconObject(HCURSOR hCurIcon);
BOOL UserSetCursorPos( INT x, INT y, DWORD flags, ULONG_PTR dwExtraInfo, BOOL Hook); BOOL UserSetCursorPos( INT x, INT y, DWORD flags, ULONG_PTR dwExtraInfo, BOOL Hook);
BOOL APIENTRY UserClipCursor(RECTL *prcl);
PSYSTEM_CURSORINFO IntGetSysCursorInfo(VOID); PSYSTEM_CURSORINFO IntGetSysCursorInfo(VOID);
#define IntReleaseCurIconObject(CurIconObj) \ #define IntReleaseCurIconObject(CurIconObj) \

View file

@ -11,7 +11,6 @@ DBG_DEFAULT_CHANNEL(UserDisplay);
BOOL gbBaseVideo = 0; BOOL gbBaseVideo = 0;
static const PWCHAR KEY_ROOT = L"";
static const PWCHAR KEY_VIDEO = L"\\Registry\\Machine\\HARDWARE\\DEVICEMAP\\VIDEO"; static const PWCHAR KEY_VIDEO = L"\\Registry\\Machine\\HARDWARE\\DEVICEMAP\\VIDEO";
VOID VOID
@ -384,7 +383,7 @@ NtUserEnumDisplayDevices(
} }
/* Acquire global USER lock */ /* Acquire global USER lock */
UserEnterExclusive(); UserEnterShared();
/* Call the internal function */ /* Call the internal function */
Status = UserEnumDisplayDevices(pustrDevice, iDevNum, &dispdev, dwFlags); Status = UserEnumDisplayDevices(pustrDevice, iDevNum, &dispdev, dwFlags);
@ -551,7 +550,6 @@ UserEnumRegistryDisplaySettings(
return Status ; return Status ;
} }
NTSTATUS NTSTATUS
APIENTRY APIENTRY
NtUserEnumDisplaySettings( NtUserEnumDisplaySettings(
@ -593,7 +591,7 @@ NtUserEnumDisplaySettings(
} }
/* Acquire global USER lock */ /* Acquire global USER lock */
UserEnterExclusive(); UserEnterShared();
if (iModeNum == ENUM_REGISTRY_SETTINGS) if (iModeNum == ENUM_REGISTRY_SETTINGS)
{ {
@ -647,9 +645,6 @@ NtUserEnumDisplaySettings(
return Status; return Status;
} }
BOOL APIENTRY UserClipCursor(RECTL *prcl);
VOID APIENTRY UserRedrawDesktop();
LONG LONG
APIENTRY APIENTRY
UserChangeDisplaySettings( UserChangeDisplaySettings(