[ros-diffs] [rharabien] 54198: [WIN32K] - Don't use exclusive lock when shared is enough - Don't declare functions in source code

[rharabien]

Author: rharabien
Date: Wed Oct 19 16:00:46 2011
New Revision: 54198

URL: http://svn.reactos.org/svn/reactos?rev=54198&view=rev
Log:
[WIN32K]
- Don't use exclusive lock when shared is enough
- Don't declare functions in source code

Modified:
    trunk/reactos/subsystems/win32/win32k/include/cursoricon.h
    trunk/reactos/subsystems/win32/win32k/ntuser/display.c

Modified: trunk/reactos/subsystems/win32/win32k/include/cursoricon.h
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/include/cursoricon.h?rev=54198&r1=54197&r2=54198&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/include/cursoricon.h [iso-8859-1] 
(original)
+++ trunk/reactos/subsystems/win32/win32k/include/cursoricon.h [iso-8859-1] Wed 
Oct 19 16:00:46 2011
@@ -68,9 +68,8 @@
 BOOL UserDrawIconEx(HDC hDc, INT xLeft, INT yTop, PCURICON_OBJECT pIcon, INT 
cxWidth,
    INT cyHeight, UINT istepIfAniCur, HBRUSH hbrFlickerFreeDraw, UINT diFlags);
 PCURICON_OBJECT FASTCALL UserGetCurIconObject(HCURSOR hCurIcon);
-
 BOOL UserSetCursorPos( INT x, INT y, DWORD flags, ULONG_PTR dwExtraInfo, BOOL 
Hook);
-
+BOOL APIENTRY UserClipCursor(RECTL *prcl);
 PSYSTEM_CURSORINFO IntGetSysCursorInfo(VOID);
 
 #define IntReleaseCurIconObject(CurIconObj) \

Modified: trunk/reactos/subsystems/win32/win32k/ntuser/display.c
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ntuser/display.c?rev=54198&r1=54197&r2=54198&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/ntuser/display.c [iso-8859-1] 
(original)
+++ trunk/reactos/subsystems/win32/win32k/ntuser/display.c [iso-8859-1] Wed Oct 
19 16:00:46 2011
@@ -11,7 +11,6 @@
 
 BOOL gbBaseVideo = 0;
 
-static const PWCHAR KEY_ROOT = L"";
 static const PWCHAR KEY_VIDEO = 
L"\\Registry\\Machine\\HARDWARE\\DEVICEMAP\\VIDEO";
 
 VOID
@@ -384,7 +383,7 @@
    }
 
     /* Acquire global USER lock */
-    UserEnterExclusive();
+    UserEnterShared();
 
     /* Call the internal function */
     Status = UserEnumDisplayDevices(pustrDevice, iDevNum, &dispdev, dwFlags);
@@ -551,7 +550,6 @@
     return Status ;
 }
 
-
 NTSTATUS
 APIENTRY
 NtUserEnumDisplaySettings(
@@ -593,7 +591,7 @@
    }
 
     /* Acquire global USER lock */
-    UserEnterExclusive();
+    UserEnterShared();
 
     if (iModeNum == ENUM_REGISTRY_SETTINGS)
     {
@@ -646,9 +644,6 @@
 
     return Status;
 }
-
-BOOL APIENTRY UserClipCursor(RECTL *prcl);
-VOID APIENTRY UserRedrawDesktop();
 
 LONG
 APIENTRY