win32u: Move NtUserGetProcessWindowStation implementation from user32.

Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

dlls/user32/driver.c

@@ -95,7 +95,7 @@ static const USER_DRIVER *load_driver(void)
         USEROBJECTFLAGS flags;
         HWINSTA winstation;
 
-        winstation = GetProcessWindowStation();
+        winstation = NtUserGetProcessWindowStation();
         if (!GetUserObjectInformationA(winstation, UOI_FLAGS, &flags, sizeof(flags), NULL)
             || (flags.dwFlags & WSF_VISIBLE))
             driver->pCreateWindow = nodrv_CreateWindow;

dlls/user32/sysparams.c

@@ -4120,7 +4120,7 @@ BOOL CDECL nulldrv_EnumDisplayMonitors( HDC hdc, RECT *rect, MONITORENUMPROC pro
     TRACE("(%p, %p, %p, 0x%lx)\n", hdc, rect, proc, lp);
 
     /* Report physical monitor information only if window station has visible display surfaces */
-    winstation = GetProcessWindowStation();
+    winstation = NtUserGetProcessWindowStation();
     if (GetUserObjectInformationW( winstation, UOI_FLAGS, &flags, sizeof(flags), NULL ))
         is_winstation_visible = flags.dwFlags & WSF_VISIBLE;
 

dlls/user32/user32.spec

@@ -361,7 +361,7 @@
 @ stdcall GetPriorityClipboardFormat(ptr long)
 @ stdcall GetProcessDefaultLayout(ptr)
 @ stdcall GetProcessDpiAwarenessInternal(long ptr)
-@ stdcall GetProcessWindowStation()
+@ stdcall GetProcessWindowStation() NtUserGetProcessWindowStation
 @ stdcall GetProgmanWindow ()
 @ stdcall GetPropA(long str)
 @ stdcall GetPropW(long wstr)

dlls/user32/user_main.c

@@ -290,7 +290,7 @@ static void winstation_init(void)
     }
 
     /* set winstation if explicitly specified, or if we don't have one yet */
-    if (buffer || !GetProcessWindowStation())
+    if (buffer || !NtUserGetProcessWindowStation())
     {
         handle = CreateWindowStationW( winstation ? winstation : L"WinSta0", 0, WINSTA_ALL_ACCESS, NULL );
         if (handle)

dlls/user32/winstation.c

@@ -203,23 +203,6 @@ HWINSTA WINAPI OpenWindowStationW( LPCWSTR name, BOOL inherit, ACCESS_MASK acces
 }
 
 
-/******************************************************************************
- *              GetProcessWindowStation  (USER32.@)
- */
-HWINSTA WINAPI GetProcessWindowStation(void)
-{
-    HWINSTA ret = 0;
-
-    SERVER_START_REQ( get_process_winstation )
-    {
-        if (!wine_server_call_err( req ))
-            ret = wine_server_ptr_handle( reply->handle );
-    }
-    SERVER_END_REQ;
-    return ret;
-}
-
-
 /***********************************************************************
  *              SetProcessWindowStation  (USER32.@)
  */
@@ -472,7 +455,7 @@ BOOL WINAPI EnumDesktopsW( HWINSTA winsta, DESKTOPENUMPROCW func, LPARAM lparam
     NTSTATUS status;
 
     if (!winsta)
-        winsta = GetProcessWindowStation();
+        winsta = NtUserGetProcessWindowStation();
 
     while (ret)
     {

dlls/win32u/syscall.c

@@ -95,6 +95,7 @@ static void * const syscalls[] =
     NtGdiSwapBuffers,
     NtGdiTransformPoints,
     NtUserCloseWindowStation,
+    NtUserGetProcessWindowStation,
 };
 
 static BYTE arguments[ARRAY_SIZE(syscalls)];

dlls/win32u/win32u.spec

@@ -979,7 +979,7 @@
 @ stub NtUserGetPriorityClipboardFormat
 @ stub NtUserGetProcessDpiAwarenessContext
 @ stub NtUserGetProcessUIContextInformation
-@ stub NtUserGetProcessWindowStation
+@ stdcall -syscall NtUserGetProcessWindowStation()
 @ stub NtUserGetProp
 @ stub NtUserGetQueueStatus
 @ stub NtUserGetQueueStatusReadonly

dlls/win32u/winstation.c

@@ -43,3 +43,19 @@ BOOL WINAPI NtUserCloseWindowStation( HWINSTA handle )
     SERVER_END_REQ;
     return ret;
 }
+
+/***********************************************************************
+ *           NtUSerGetProcessWindowStation  (win32u.@)
+ */
+HWINSTA WINAPI NtUserGetProcessWindowStation(void)
+{
+    HWINSTA ret = 0;
+
+    SERVER_START_REQ( get_process_winstation )
+    {
+        if (!wine_server_call_err( req ))
+            ret = wine_server_ptr_handle( reply->handle );
+    }
+    SERVER_END_REQ;
+    return ret;
+}

dlls/wow64win/syscall.h

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

dlls/wow64win/user.c

@@ -33,3 +33,8 @@ NTSTATUS WINAPI wow64_NtUserCloseWindowStation( UINT *args )
 
     return NtUserCloseWindowStation( handle );
 }
+
+NTSTATUS WINAPI wow64_NtUserGetProcessWindowStation( UINT *args )
+{
+    return HandleToUlong( NtUserGetProcessWindowStation() );
+}

include/ntuser.h

@@ -22,6 +22,7 @@
 #include <winuser.h>
 #include <winternl.h>
 
-BOOL WINAPI NtUserCloseWindowStation( HWINSTA handle );
+BOOL    WINAPI NtUserCloseWindowStation( HWINSTA handle );
+HWINSTA WINAPI NtUserGetProcessWindowStation(void);
 
 #endif /* _NTUSER_ */