[WIN32K]

- Code formatting for NtUserProcessConnect.
[USER32]
- Hack a call to GetConnected in ClientThreadSetup in an attempt to temporarily "fix" a bug that makes the bots fail. Now we really need to fix user32 init!

svn path=/trunk/; revision=65714

reactos/include/reactos/subsys/win/base.h

@@ -13,7 +13,7 @@
 
 typedef
 BOOL
-(CALLBACK *BASE_PROCESS_CREATE_NOTIFY_ROUTINE)(
+(NTAPI *BASE_PROCESS_CREATE_NOTIFY_ROUTINE)(
     HANDLE NewProcessId,
     HANDLE ParentThreadId,
     ULONG  dwUnknown,

reactos/win32ss/include/ntuser.h

@@ -2521,8 +2521,8 @@ BOOL
 NTAPI
 NtUserNotifyProcessCreate(
     HANDLE NewProcessId,
-    HANDLE SourceThreadId,
+    HANDLE ParentThreadId,
-    DWORD dwUnknown,
+    ULONG  dwUnknown,
     ULONG  CreateFlags);
 
 VOID

reactos/win32ss/user/ntuser/ntstubs.c

@@ -725,34 +725,43 @@ NtUserProcessConnect(
     DWORD Size)
 {
     NTSTATUS Status = STATUS_SUCCESS;
-  TRACE("NtUserProcessConnect\n");
-  if (pUserConnect && ( Size == sizeof(USERCONNECT) ))
-  {
     PPROCESSINFO W32Process;
+
+    TRACE("NtUserProcessConnect\n");
+
+    if ( pUserConnect == NULL ||
+         Size         != sizeof(*pUserConnect) )
+    {
+        return STATUS_UNSUCCESSFUL;
+    }
+
     UserEnterShared();
-     GetW32ThreadInfo();
+
     W32Process = PsGetCurrentProcessWin32Process();
     _SEH2_TRY
     {
+        // FIXME: Check that pUserConnect->ulVersion == USER_VERSION;
+
         pUserConnect->siClient.psi = gpsi;
         pUserConnect->siClient.aheList = gHandleTable;
-        pUserConnect->siClient.ulSharedDelta = (ULONG_PTR)W32Process->HeapMappings.KernelMapping -
+        pUserConnect->siClient.ulSharedDelta =
+            (ULONG_PTR)W32Process->HeapMappings.KernelMapping -
             (ULONG_PTR)W32Process->HeapMappings.UserMapping;
     }
     _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
     {
         Status = _SEH2_GetExceptionCode();
     }
-     _SEH2_END
+    _SEH2_END;
+
     if (!NT_SUCCESS(Status))
     {
         SetLastNtError(Status);
     }
+
     UserLeave();
     return Status;
 }
-  return STATUS_UNSUCCESSFUL;
-}
 
 NTSTATUS
 APIENTRY

reactos/win32ss/user/user32/misc/dllmain.c

@@ -240,6 +240,8 @@ ClientThreadSetup(VOID)
     // continue as normal.
     //
 
+    GetConnected();
+
     UNIMPLEMENTED;
     return TRUE;
 }
@@ -247,16 +249,25 @@ ClientThreadSetup(VOID)
 BOOL
 Init(VOID)
 {
+    NTSTATUS Status;
     USERCONNECT UserCon;
 
+    TRACE("user32::Init()\n");
+
     /* Set PEB data */
     NtCurrentPeb()->KernelCallbackTable = apfnDispatch;
     NtCurrentPeb()->PostProcessInitRoutine = NULL;
 
-   NtUserProcessConnect( NtCurrentProcess(),
+    /* Minimal setup of the connect info structure */
-                         &UserCon,
+    UserCon.ulVersion = USER_VERSION;
-                         sizeof(USERCONNECT));
 
+    /* Connect to win32k */
+    Status = NtUserProcessConnect(NtCurrentProcess(),
+                                  &UserCon,
+                                  sizeof(UserCon));
+    if (!NT_SUCCESS(Status)) return FALSE;
+
+    /* Retrieve data */
     g_ppi = GetWin32ClientInfo()->ppi; // Snapshot PI, used as pointer only!
     g_ulSharedDelta = UserCon.siClient.ulSharedDelta;
     gpsi = SharedPtrToUser(UserCon.siClient.psi);
@@ -267,10 +278,11 @@ Init(VOID)
 
     //ERR("1 SI 0x%x : HT 0x%x : D 0x%x\n", UserCon.siClient.psi, UserCon.siClient.aheList,  g_ulSharedDelta);
 
-   /* Allocate an index for user32 thread local data. */
+    /* Allocate an index for user32 thread local data */
     User32TlsIndex = TlsAlloc();
-   if (User32TlsIndex != TLS_OUT_OF_INDEXES)
+    if (User32TlsIndex == TLS_OUT_OF_INDEXES)
-   {
+        return FALSE;
+
     if (MessageInit())
     {
         if (MenuInit())
@@ -281,9 +293,8 @@ Init(VOID)
         }
         MessageCleanup();
     }
-      TlsFree(User32TlsIndex);
-   }
 
+    TlsFree(User32TlsIndex);
     return FALSE;
 }
 
@@ -324,6 +335,9 @@ DllMain(
             /* Don't bother us for each thread */
             DisableThreadLibraryCalls(hInstanceDll);
 
+            /* Minimal setup of the connect info structure */
+            ConnectInfo.ulVersion = USER_VERSION;
+
             /* Setup the Object Directory path */
             if (!SessionId)
             {
@@ -373,32 +387,40 @@ DllMain(
         }
     }
 
-    /* Finally init GDI */
+    /* Finally, initialize GDI */
     return GdiDllInitialize(hInstanceDll, dwReason, reserved);
 }
 
-// FIXME: This function seems to be unused...
+// FIXME: This function IS A BIIG HACK!!
 VOID
 FASTCALL
 GetConnected(VOID)
 {
+    NTSTATUS Status;
     USERCONNECT UserCon;
 
+    TRACE("user32::GetConnected()\n");
+
     if ((PTHREADINFO)NtCurrentTeb()->Win32ThreadInfo == NULL)
         NtUserGetThreadState(THREADSTATE_GETTHREADINFO);
 
     if (gpsi && g_ppi) return;
 
-  NtUserProcessConnect( NtCurrentProcess(),
+    /* Minimal setup of the connect info structure */
-                         &UserCon,
+    UserCon.ulVersion = USER_VERSION;
-                         sizeof(USERCONNECT));
 
-  g_ppi = GetWin32ClientInfo()->ppi;
+    /* Connect to win32k */
+    Status = NtUserProcessConnect(NtCurrentProcess(),
+                                  &UserCon,
+                                  sizeof(UserCon));
+    if (!NT_SUCCESS(Status)) return;
+
+    /* Retrieve data */
+    g_ppi = GetWin32ClientInfo()->ppi; // Snapshot PI, used as pointer only!
     g_ulSharedDelta = UserCon.siClient.ulSharedDelta;
     gpsi = SharedPtrToUser(UserCon.siClient.psi);
     gHandleTable = SharedPtrToUser(UserCon.siClient.aheList);
     gHandleEntries = SharedPtrToUser(gHandleTable->handles);
-
 }
 
 NTSTATUS