[ARWINSS]

- Implement logon process registration in win32k and its shutdown notification.
- Add a hack into server/queue.c which allows to send message to a thread without the desktop. Once the dektop issue is properly solved, this hack should go away.
- Arwinss boots to the desktop now.
- Remove redundant csr_shared.h, and use trunk's ntuser.h instead.

svn path=/branches/arwinss/; revision=70345

Author: bragin

arwinss/client/user32/csr.c

@@ -28,13 +28,18 @@
 
 /* CSRSS Headers */
 #include <subsys/csr/csr.h>
-#include <csr_shared.h>
+#include <ntuser.h>
 #include <subsys/win/winmsg.h>
 
+#include "wine/rosuser.h"
+
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(usercsr);
 
+/* GLOBALS ********************************************************************/
+
+BOOLEAN gfLogonProcess  = FALSE;
 
 /* FUNCTIONS ******************************************************************/
 
@@ -89,63 +94,51 @@ RegisterServicesProcess(DWORD ServicesProcessId)
     return TRUE;
 }
 
+EXTINLINE BOOL NtUserxRegisterLogonProcess(DWORD dwProcessId, BOOL bRegister)
+{
+    return (BOOL)NtUserCallTwoParam((DWORD_PTR)dwProcessId, (DWORD_PTR)bRegister, TWOPARAM_ROUTINE_REGISTERLOGONPROCESS);
+}
+
 /***********************************************************************
  *		RegisterLogonProcess (USER32.@)
  */
-BOOL WINAPI RegisterLogonProcess(DWORD dwProcessId, BOOL bRegister)
+BOOL
+WINAPI
+RegisterLogonProcess(DWORD dwProcessId,
+                     BOOL bRegister)
 {
-        NTSTATUS Status;
+    gfLogonProcess = NtUserxRegisterLogonProcess(dwProcessId, bRegister);
+
+    if (gfLogonProcess)
+    {
         USER_API_MESSAGE ApiMessage;
+        PUSER_REGISTER_LOGON_PROCESS RegisterLogonProcessRequest = &ApiMessage.Data.RegisterLogonProcessRequest;
 
-        ApiMessage.Data.RegisterLogonProcessRequest.ProcessId = dwProcessId;
-        ApiMessage.Data.RegisterLogonProcessRequest.Register = bRegister;
+        RegisterLogonProcessRequest->ProcessId = dwProcessId;
+        RegisterLogonProcessRequest->Register  = bRegister;
 
-        Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage,
-                                     NULL,
-                                     CSR_CREATE_API_NUMBER(USERSRV_SERVERDLL_INDEX, UserpRegisterLogonProcess),
-                                     sizeof(USER_REGISTER_LOGON_PROCESS));
-        if (!NT_SUCCESS(Status))
+        CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage,
+                            NULL,
+                            CSR_CREATE_API_NUMBER(USERSRV_SERVERDLL_INDEX, UserpRegisterLogonProcess),
+                            sizeof(*RegisterLogonProcessRequest));
+        if (!NT_SUCCESS(ApiMessage.Status))
         {
             ERR("Failed to register logon process with CSRSS\n");
-            SetLastError(RtlNtStatusToDosError(Status));
-            return FALSE;
+            SetLastError(RtlNtStatusToDosError(ApiMessage.Status));
         }
+    }
 
-    return TRUE;
+    return gfLogonProcess;
 }
 
-
 /***********************************************************************
  *		SetLogonNotifyWindow (USER32.@)
  */
 BOOL
 WINAPI
 SetLogonNotifyWindow (HWND Wnd)
 {
-#if 0
-    /* Maybe we should call NtUserSetLogonNotifyWindow and let that one inform CSRSS??? */
-    CSR_API_MESSAGE Request;
-    ULONG CsrRequest;
-    NTSTATUS Status;
-
-    CsrRequest = MAKE_CSR_API(SET_LOGON_NOTIFY_WINDOW, CSR_GUI);
-    Request.Data.SetLogonNotifyWindowRequest.LogonNotifyWindow = Wnd;
-
-    Status = CsrClientCallServer(&Request,
-                                 NULL,
-                                 CsrRequest,
-                                 sizeof(CSR_API_MESSAGE));
-    if (!NT_SUCCESS(Status) || !NT_SUCCESS(Status = Request.Status))
-    {
-        SetLastError(RtlNtStatusToDosError(Status));
-        return FALSE;
-    }
-    
-    return TRUE;
-#else
-    ERR("SetLogonNotifyWindow is not yet implemented in Arwinss\n");
-    return TRUE;
-#endif
+    return NtUserSetLogonNotifyWindow(Wnd);
 }
 
 /* EOF */

arwinss/include/csr_shared.h

@@ -11,6 +11,14 @@
 #ifndef __WIN32K_ROSUSER_H
 #define __WIN32K_ROSUSER_H
 
+#if defined(__GNUC__)
+#define EXTINLINE extern inline __attribute__((always_inline))
+#elif defined(_MSC_VER)
+#define EXTINLINE extern __forceinline
+#else
+#error
+#endif
+
 /* DEFINES *******************************************************************/
 
 #define SWM_ROOT_WINDOW_ID 1
@@ -181,6 +189,12 @@ RosUserDeRegisterShellHookWindow(HWND hWnd);
 BOOL NTAPI
 RosUserBuildShellHookHwndList(HWND *list, UINT *cbSize);
 
+DWORD_PTR NTAPI
+NtUserCallTwoParam(DWORD_PTR Param1, DWORD_PTR Param2, DWORD Routine);
+
+BOOL NTAPI
+NtUserSetLogonNotifyWindow(HWND hWnd);
+
 SWM_WINDOW_ID NTAPI
 SwmNewWindow(SWM_WINDOW_ID parent, RECT *WindowRect, HWND hWnd, DWORD ex_style);
 

arwinss/include/wine/rosuser.h

@@ -10,14 +10,33 @@
 
 #include <win32k.h>
 
-//#define NDEBUG
+#define NDEBUG
 #include <debug.h>
 
 #include <ntstatus.h>
 #include <shutdown.h>
 #include <csr.h>
 
 extern PEPROCESS CsrProcess;
+extern HWND hwndSAS;
+
+/* Registered logon process ID */
+HANDLE gpidLogon = 0;
+
+BOOL
+APIENTRY
+NtUserSetLogonNotifyWindow(HWND hWnd)
+{
+    if (gpidLogon != PsGetCurrentProcessId())
+        return FALSE;
+
+    DPRINT("Logon hwnd %x\n", hWnd);
+
+    hwndSAS = hWnd;
+
+    return TRUE;
+}
+
 
 NTSTATUS
 APIENTRY
@@ -163,3 +182,64 @@ NtUserSetInformationThread(IN HANDLE ThreadHandle,
     UserLeave();
     return Status;
 }
+
+BOOL
+UserRegisterLogonProcess(HANDLE ProcessId, BOOL Register)
+{
+    NTSTATUS Status;
+    PEPROCESS Process;
+
+    Status = PsLookupProcessByProcessId(ProcessId, &Process);
+    if (!NT_SUCCESS(Status))
+    {
+        EngSetLastError(RtlNtStatusToDosError(Status));
+        return FALSE;
+    }
+
+    ProcessId = Process->UniqueProcessId;
+    ObDereferenceObject(Process);
+
+    if (Register)
+    {
+        /* Register the logon process */
+        if (gpidLogon != 0) return FALSE;
+        gpidLogon = ProcessId;
+    }
+    else
+    {
+        /* Deregister the logon process */
+        if (gpidLogon != ProcessId) return FALSE;
+        gpidLogon = 0;
+    }
+
+    return TRUE;
+}
+
+DWORD_PTR
+APIENTRY
+NtUserCallTwoParam(
+    DWORD_PTR Param1,
+    DWORD_PTR Param2,
+    DWORD Routine)
+{
+    DWORD_PTR ReturnValue;
+
+    DPRINT("Enter NtUserCallTwoParam\n");
+    UserEnterExclusive();
+
+    switch(Routine)
+    {
+        case TWOPARAM_ROUTINE_REGISTERLOGONPROCESS:
+            ReturnValue = (DWORD_PTR)UserRegisterLogonProcess((HANDLE)Param1, (BOOL)Param2);
+            break;
+
+        default:
+            DPRINT1("Calling invalid routine number 0x%x in NtUserCallTwoParam(), Param1=0x%x Parm2=0x%x\n",
+                Routine, Param1, Param2);
+            EngSetLastError(ERROR_INVALID_PARAMETER);
+    }
+
+    DPRINT("Leave NtUserCallTwoParam, ret=%p\n", ReturnValue);
+    UserLeave();
+    return ReturnValue;
+}