win32u: Move NtUserCloseWindowStation from user32.

dlls/user32/message.c

@@ -4335,7 +4335,7 @@ static BOOL CALLBACK bcast_winsta( LPWSTR winsta, LPARAM lp )
         return TRUE;
     ((BroadcastParm *)lp)->winsta = hwinsta;
     ret = EnumDesktopsW( hwinsta, bcast_desktop, lp );
-    CloseWindowStation( hwinsta );
+    NtUserCloseWindowStation( hwinsta );
     TRACE("-->%d\n", ret);
     return ret;
 }

dlls/user32/user32.spec

@@ -77,7 +77,7 @@
 @ stdcall CloseDesktop(long)
 @ stdcall CloseTouchInputHandle(long)
 @ stdcall CloseWindow(long)
-@ stdcall CloseWindowStation(long)
+@ stdcall CloseWindowStation(long) NtUserCloseWindowStation
 @ stdcall CopyAcceleratorTableA(long ptr long)
 @ stdcall CopyAcceleratorTableW(long ptr long)
 @ stdcall CopyIcon(long)

dlls/user32/user_private.h

@@ -25,7 +25,7 @@
 #include "windef.h"
 #include "winbase.h"
 #include "wingdi.h"
-#include "winuser.h"
+#include "ntuser.h"
 #include "winreg.h"
 #include "winternl.h"
 #include "hidusage.h"

dlls/user32/winstation.c

@@ -203,22 +203,6 @@ HWINSTA WINAPI OpenWindowStationW( LPCWSTR name, BOOL inherit, ACCESS_MASK acces
 }
 
 
-/***********************************************************************
- *              CloseWindowStation  (USER32.@)
- */
-BOOL WINAPI CloseWindowStation( HWINSTA handle )
-{
-    BOOL ret;
-    SERVER_START_REQ( close_winstation )
-    {
-        req->handle = wine_server_obj_handle( handle );
-        ret = !wine_server_call_err( req );
-    }
-    SERVER_END_REQ;
-    return ret;
-}
-
-
 /******************************************************************************
  *              GetProcessWindowStation  (USER32.@)
  */

dlls/win32u/Makefile.in

@@ -37,6 +37,7 @@ C_SRCS = \
 	syscall.c \
 	vertical.c \
 	vulkan.c \
+	winstation.c \
 	wrappers.c
 
 font_EXTRADEFS = -DWINE_FONT_DIR=\"`${MAKEDEP} -R ${datadir}/wine ${fontdir}`\"

dlls/win32u/syscall.c

@@ -29,6 +29,7 @@
 #include "windef.h"
 #include "winnt.h"
 #include "ntgdi_private.h"
+#include "ntuser.h"
 #include "wine/unixlib.h"
 
 
@@ -93,6 +94,7 @@ static void * const syscalls[] =
     NtGdiSetVirtualResolution,
     NtGdiSwapBuffers,
     NtGdiTransformPoints,
+    NtUserCloseWindowStation,
 };
 
 static BYTE arguments[ARRAY_SIZE(syscalls)];

dlls/win32u/win32u.spec

@@ -795,7 +795,7 @@
 @ stub NtUserClipCursor
 @ stub NtUserCloseClipboard
 @ stub NtUserCloseDesktop
-@ stub NtUserCloseWindowStation
+@ stdcall -syscall NtUserCloseWindowStation(long)
 @ stub NtUserCompositionInputSinkLuidFromPoint
 @ stub NtUserCompositionInputSinkViewInstanceIdFromPoint
 @ stub NtUserConfigureActivationObject

dlls/win32u/winstation.c

+/*
+ * Window stations and desktops
+ *
+ * Copyright 2002 Alexandre Julliard
+ *
+ * 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
+ */
+
+#if 0
+#pragma makedep unix
+#endif
+
+#include <stdarg.h>
+#include "windef.h"
+#include "winbase.h"
+#include "ntuser.h"
+#include "winternl.h"
+#include "wine/server.h"
+
+/***********************************************************************
+ *           NtUserCloseWindowStation  (win32u.@)
+ */
+BOOL WINAPI NtUserCloseWindowStation( HWINSTA handle )
+{
+    BOOL ret;
+    SERVER_START_REQ( close_winstation )
+    {
+        req->handle = wine_server_obj_handle( handle );
+        ret = !wine_server_call_err( req );
+    }
+    SERVER_END_REQ;
+    return ret;
+}

dlls/wow64win/Makefile.in

@@ -5,4 +5,5 @@ EXTRADLLFLAGS = -nodefaultlibs -Wl,--image-base,0x6f200000
 
 C_SRCS = \
 	gdi.c \
-	syscall.c
+	syscall.c \
+	user.c

dlls/wow64win/syscall.h

@@ -80,6 +80,7 @@
     SYSCALL_ENTRY( NtGdiSetTextJustification ) \
     SYSCALL_ENTRY( NtGdiSetVirtualResolution ) \
     SYSCALL_ENTRY( NtGdiSwapBuffers ) \
-    SYSCALL_ENTRY( NtGdiTransformPoints )
+    SYSCALL_ENTRY( NtGdiTransformPoints ) \
+    SYSCALL_ENTRY( NtUserCloseWindowStation )
 
 #endif /* __WOW64WIN_SYSCALL_H */

dlls/wow64win/user.c

+/*
+ * WoW64 User functions
+ *
+ * Copyright 2021 Jacek Caban for CodeWeavers
+ *
+ * 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 <stdarg.h>
+
+#include "ntstatus.h"
+#define WIN32_NO_STATUS
+#include "windef.h"
+#include "winbase.h"
+#include "ntuser.h"
+#include "wow64win_private.h"
+
+NTSTATUS WINAPI wow64_NtUserCloseWindowStation( UINT *args )
+{
+    HWINSTA handle = get_handle( &args );
+
+    return NtUserCloseWindowStation( handle );
+}

include/Makefile.in

@@ -551,6 +551,7 @@ SOURCES = \
 	ntsecapi.h \
 	ntsecpkg.h \
 	ntstatus.h \
+	ntuser.h \
 	oaidl.idl \
 	objbase.h \
 	objectarray.idl \

include/ntuser.h

+/*
+ * Copyright 2021 Jacek Caban for CodeWeavers
+ *
+ * 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
+ */
+
+#ifndef _NTUSER_
+#define _NTUSER_
+
+#include <winuser.h>
+#include <winternl.h>
+
+BOOL WINAPI NtUserCloseWindowStation( HWINSTA handle );
+
+#endif /* _NTUSER_ */