From 609990f7167de4490732dd0dbe4b013949e169ad Mon Sep 17 00:00:00 2001
From: Jacek Caban <jacek@codeweavers.com>
Date: Mon, 28 Nov 2022 21:46:02 +0100
Subject: [PATCH] user32: Merge painting.c into win.c.

---
 dlls/user32/Makefile.in |  1 -
 dlls/user32/painting.c  | 64 -------------------------------------------------
 dlls/user32/win.c       | 40 +++++++++++++++++++++++++++++++
 3 files changed, 40 insertions(+), 65 deletions(-)
 delete mode 100644 dlls/user32/painting.c

diff --git a/dlls/user32/Makefile.in b/dlls/user32/Makefile.in
index 3a01810991d..1a29970e112 100644
--- a/dlls/user32/Makefile.in
+++ b/dlls/user32/Makefile.in
@@ -32,7 +32,6 @@ C_SRCS = \
 	misc.c \
 	msgbox.c \
 	nonclient.c \
-	painting.c \
 	property.c \
 	resource.c \
 	scroll.c \
diff --git a/dlls/user32/painting.c b/dlls/user32/painting.c
deleted file mode 100644
index de67cd97e5f..00000000000
--- a/dlls/user32/painting.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Window painting functions
- *
- * Copyright 1993, 1994, 1995, 2001, 2004, 2005, 2008 Alexandre Julliard
- * Copyright 1996, 1997, 1999 Alex Korobka
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-#include "user_private.h"
-
-
-/***********************************************************************
- *		UpdateWindow (USER32.@)
- */
-BOOL WINAPI UpdateWindow( HWND hwnd )
-{
-    if (!hwnd)
-    {
-        SetLastError( ERROR_INVALID_WINDOW_HANDLE );
-        return FALSE;
-    }
-
-    return NtUserRedrawWindow( hwnd, NULL, 0, RDW_UPDATENOW | RDW_ALLCHILDREN );
-}
-
-
-/***********************************************************************
- *		ValidateRgn (USER32.@)
- */
-BOOL WINAPI ValidateRgn( HWND hwnd, HRGN hrgn )
-{
-    if (!hwnd)
-    {
-        SetLastError( ERROR_INVALID_WINDOW_HANDLE );
-        return FALSE;
-    }
-
-    return NtUserRedrawWindow( hwnd, NULL, hrgn, RDW_VALIDATE );
-}
-
-
-/*************************************************************************
- *		ScrollWindow (USER32.@)
- *
- */
-BOOL WINAPI ScrollWindow( HWND hwnd, INT dx, INT dy,
-                          const RECT *rect, const RECT *clipRect )
-{
-    UINT flags = SW_INVALIDATE | SW_ERASE | (rect ? 0 : SW_SCROLLCHILDREN) | SW_NODCCACHE;
-    return NtUserScrollWindowEx( hwnd, dx, dy, rect, clipRect, 0, NULL, flags );
-}
diff --git a/dlls/user32/win.c b/dlls/user32/win.c
index 383de818172..a6f43c188c4 100644
--- a/dlls/user32/win.c
+++ b/dlls/user32/win.c
@@ -1428,6 +1428,46 @@ BOOL WINAPI SetProcessDefaultLayout( DWORD layout )
     return NtUserSetProcessDefaultLayout( layout );
 }
 
+
+/***********************************************************************
+ *           UpdateWindow (USER32.@)
+ */
+BOOL WINAPI UpdateWindow( HWND hwnd )
+{
+    if (!hwnd)
+    {
+        SetLastError( ERROR_INVALID_WINDOW_HANDLE );
+        return FALSE;
+    }
+
+    return NtUserRedrawWindow( hwnd, NULL, 0, RDW_UPDATENOW | RDW_ALLCHILDREN );
+}
+
+
+/***********************************************************************
+ *           ValidateRgn (USER32.@)
+ */
+BOOL WINAPI ValidateRgn( HWND hwnd, HRGN hrgn )
+{
+    if (!hwnd)
+    {
+        SetLastError( ERROR_INVALID_WINDOW_HANDLE );
+        return FALSE;
+    }
+
+    return NtUserRedrawWindow( hwnd, NULL, hrgn, RDW_VALIDATE );
+}
+
+
+/*************************************************************************
+ *           ScrollWindow (USER32.@)
+ */
+BOOL WINAPI ScrollWindow( HWND hwnd, INT dx, INT dy, const RECT *rect, const RECT *clip_rect )
+{
+    UINT flags = SW_INVALIDATE | SW_ERASE | (rect ? 0 : SW_SCROLLCHILDREN) | SW_NODCCACHE;
+    return NtUserScrollWindowEx( hwnd, dx, dy, rect, clip_rect, 0, NULL, flags );
+}
+
 #ifdef _WIN64
 
 /* 64bit versions */
-- 
2.11.4.GIT