From 58f5ea229a4721764460a45c509303fe09a3c79c Mon Sep 17 00:00:00 2001 From: Gunnar Dalsnes Date: Tue, 6 Sep 2005 00:34:23 +0000 Subject: [PATCH] remove window update lock svn path=/trunk/; revision=17686 --- reactos/subsys/win32k/include/painting.h | 8 -------- reactos/subsys/win32k/include/window.h | 2 -- reactos/subsys/win32k/ntuser/painting.c | 15 --------------- reactos/subsys/win32k/ntuser/window.c | 1 - 4 files changed, 26 deletions(-) diff --git a/reactos/subsys/win32k/include/painting.h b/reactos/subsys/win32k/include/painting.h index 2add4872da7..eea752b953b 100644 --- a/reactos/subsys/win32k/include/painting.h +++ b/reactos/subsys/win32k/include/painting.h @@ -12,13 +12,5 @@ co_UserRedrawWindow(PWINDOW_OBJECT Wnd, const RECT* UpdateRect, HRGN UpdateRgn, BOOL FASTCALL IntGetPaintMessage(HWND hWnd, UINT MsgFilterMin, UINT MsgFilterMax, PW32THREAD Thread, MSG *Message, BOOL Remove); -//BOOL STDCALL -//NtUserValidateRgn(HWND hWnd, HRGN hRgn); - -#define IntLockWindowUpdate(Window) \ - ExAcquireFastMutex(&Window->UpdateLock) - -#define IntUnLockWindowUpdate(Window) \ - ExReleaseFastMutex(&Window->UpdateLock) #endif /* _WIN32K_PAINTING_H */ diff --git a/reactos/subsys/win32k/include/window.h b/reactos/subsys/win32k/include/window.h index dc0c1c9b4b4..9ff75cd6f29 100644 --- a/reactos/subsys/win32k/include/window.h +++ b/reactos/subsys/win32k/include/window.h @@ -63,8 +63,6 @@ typedef struct _WINDOW_OBJECT HANDLE NCUpdateRegion; /* Handle of the window region. */ HANDLE WindowRegion; - /* Lock to be held when manipulating (NC)UpdateRegion */ - FAST_MUTEX UpdateLock; /* Pointer to the owning thread's message queue. */ PUSER_MESSAGE_QUEUE MessageQueue; struct _WINDOW_OBJECT* FirstChild; diff --git a/reactos/subsys/win32k/ntuser/painting.c b/reactos/subsys/win32k/ntuser/painting.c index aeef735a840..ce42bfbdf2c 100644 --- a/reactos/subsys/win32k/ntuser/painting.c +++ b/reactos/subsys/win32k/ntuser/painting.c @@ -48,7 +48,6 @@ IntValidateParent(PWINDOW_OBJECT Child, HRGN ValidRegion) { if (!(ParentWindow->Style & WS_CLIPCHILDREN)) { - IntLockWindowUpdate(ParentWindow); if (ParentWindow->UpdateRegion != 0) { INT OffsetX, OffsetY; @@ -65,7 +64,6 @@ IntValidateParent(PWINDOW_OBJECT Child, HRGN ValidRegion) /* FIXME: If the resulting region is empty, remove fake posted paint message */ NtGdiOffsetRgn(ValidRegion, -OffsetX, -OffsetY); } - IntUnLockWindowUpdate(ParentWindow); } OldWindow = ParentWindow; ParentWindow = IntGetParentObject(ParentWindow); @@ -90,7 +88,6 @@ co_IntPaintWindows(PWINDOW_OBJECT Window, ULONG Flags) { if (Window->Flags & WINDOWOBJECT_NEED_NCPAINT) { - IntLockWindowUpdate(Window); if (Window->NCUpdateRegion) { IntValidateParent(Window, Window->NCUpdateRegion); @@ -103,7 +100,6 @@ co_IntPaintWindows(PWINDOW_OBJECT Window, ULONG Flags) Window->NCUpdateRegion = NULL; Window->Flags &= ~WINDOWOBJECT_NEED_NCPAINT; MsqDecPaintCountQueue(Window->MessageQueue); - IntUnLockWindowUpdate(Window); co_IntSendMessage(hWnd, WM_NCPAINT, (WPARAM)TempRegion, 0); if ((HANDLE) 1 != TempRegion && NULL != TempRegion) { @@ -198,12 +194,10 @@ IntInvalidateWindows(PWINDOW_OBJECT Window, HRGN hRgn, ULONG Flags) * Clip the given region with window rectangle (or region) */ - IntLockWindowUpdate(Window); if (!Window->WindowRegion || (Window->Style & WS_MINIMIZE)) { HRGN hRgnWindow; - IntUnLockWindowUpdate(Window); hRgnWindow = UnsafeIntCreateRectRgnIndirect(&Window->WindowRect); NtGdiOffsetRgn(hRgnWindow, -Window->WindowRect.left, @@ -214,14 +208,12 @@ IntInvalidateWindows(PWINDOW_OBJECT Window, HRGN hRgn, ULONG Flags) else { RgnType = NtGdiCombineRgn(hRgn, hRgn, Window->WindowRegion, RGN_AND); - IntUnLockWindowUpdate(Window); } /* * Save current state of pending updates */ - IntLockWindowUpdate(Window); HadPaintMessage = Window->UpdateRegion != NULL || Window->Flags & WINDOWOBJECT_NEED_INTERNALPAINT; HadNCPaintMessage = Window->Flags & WINDOWOBJECT_NEED_NCPAINT; @@ -401,7 +393,6 @@ IntInvalidateWindows(PWINDOW_OBJECT Window, HRGN hRgn, ULONG Flags) MsqIncPaintCountQueue(Window->MessageQueue); } - IntUnLockWindowUpdate(Window); } /* @@ -735,7 +726,6 @@ NtUserBeginPaint(HWND hWnd, PAINTSTRUCT* UnsafePs) RETURN( NULL); } - IntLockWindowUpdate(Window); if (Window->UpdateRegion != NULL) { MsqDecPaintCountQueue(Window->MessageQueue); @@ -764,7 +754,6 @@ NtUserBeginPaint(HWND hWnd, PAINTSTRUCT* UnsafePs) IntGetClientRect(Window, &Ps.rcPaint); } Window->Flags &= ~WINDOWOBJECT_NEED_INTERNALPAINT; - IntUnLockWindowUpdate(Window); if (Window->Flags & WINDOWOBJECT_NEED_ERASEBKGND) { @@ -910,7 +899,6 @@ co_UserGetUpdateRgn(HWND hWnd, HRGN hRgn, BOOL bErase) return ERROR; } - IntLockWindowUpdate(Window); if (Window->UpdateRegion == NULL) { RegionType = (NtGdiSetRectRgn(hRgn, 0, 0, 0, 0) ? NULLREGION : ERROR); @@ -923,7 +911,6 @@ co_UserGetUpdateRgn(HWND hWnd, HRGN hRgn, BOOL bErase) Window->WindowRect.left - Window->ClientRect.left, Window->WindowRect.top - Window->ClientRect.top); } - IntUnLockWindowUpdate(Window); if (bErase && RegionType != NULLREGION && RegionType != ERROR) { @@ -984,7 +971,6 @@ NtUserGetUpdateRect(HWND hWnd, LPRECT UnsafeRect, BOOL bErase) RETURN( ERROR); } - IntLockWindowUpdate(Window); if (Window->UpdateRegion == NULL) { Rect.left = Rect.top = Rect.right = Rect.bottom = 0; @@ -999,7 +985,6 @@ NtUserGetUpdateRect(HWND hWnd, LPRECT UnsafeRect, BOOL bErase) } AlwaysPaint = (Window->Flags & WINDOWOBJECT_NEED_NCPAINT) || (Window->Flags & WINDOWOBJECT_NEED_INTERNALPAINT); - IntUnLockWindowUpdate(Window); if (bErase && Rect.left < Rect.right && Rect.top < Rect.bottom) { diff --git a/reactos/subsys/win32k/ntuser/window.c b/reactos/subsys/win32k/ntuser/window.c index f2c1b5dcbfc..cafc7ea7ffa 100644 --- a/reactos/subsys/win32k/ntuser/window.c +++ b/reactos/subsys/win32k/ntuser/window.c @@ -1578,7 +1578,6 @@ co_IntCreateWindowEx(DWORD dwExStyle, } InitializeListHead(&WindowObject->PropListHead); - ExInitializeFastMutex(&WindowObject->UpdateLock); InitializeListHead(&WindowObject->WndObjListHead); ExInitializeFastMutex(&WindowObject->WndObjListLock);