Merged system metrics support into sysparams.c, and moved that file to

dlls/user/Makefile.in

@@ -34,8 +34,6 @@ C_SRCS = \
 	$(TOPOBJDIR)/windows/scroll.c \
 	$(TOPOBJDIR)/windows/spy.c \
 	$(TOPOBJDIR)/windows/syscolor.c \
-	$(TOPOBJDIR)/windows/sysmetrics.c \
-	$(TOPOBJDIR)/windows/sysparams.c \
 	$(TOPOBJDIR)/windows/user.c \
 	$(TOPOBJDIR)/windows/win.c \
 	$(TOPOBJDIR)/windows/winhelp.c \
@@ -66,6 +64,7 @@ C_SRCS = \
 	resource.c \
 	scroll.c \
 	static.c \
+	sysparams.c \
 	text.c \
 	uitools.c \
 	user_main.c \

dlls/user/user_main.c

@@ -225,8 +225,7 @@ static BOOL process_attach(void)
     if (!load_driver()) return FALSE;
 
     /* Initialize system colors and metrics */
-    SYSMETRICS_Init();
-    SYSCOLOR_Init();
+    SYSPARAMS_Init();
 
     /* Setup palette function pointers */
     palette_init();

dlls/user/user_private.h

@@ -126,8 +126,7 @@ extern BOOL FOCUS_MouseActivate( HWND hwnd );
 extern BOOL HOOK_IsHooked( INT id );
 extern void SYSCOLOR_Init(void);
 extern HPEN SYSCOLOR_GetPen( INT index );
-extern void SYSMETRICS_Init(void);
-extern INT SYSMETRICS_Set( INT index, INT value );
+extern void SYSPARAMS_Init(void);
 extern void USER_CheckNotLock(void);
 extern BOOL USER_IsExitingThread( DWORD tid );