[win32k]

- SetThreadDesktop: Actually set hdesk in PTHREADINFO
Now GetThreadDesktop doesn't return 0

svn path=/trunk/; revision=51086

reactos/subsystems/win32/win32k/include/desktop.h

@@ -102,7 +102,7 @@ IntHideDesktop(PDESKTOP Desktop);
 HDESK FASTCALL
 IntGetDesktopObjectHandle(PDESKTOP DesktopObject);
 
-BOOL IntSetThreadDesktop(IN PDESKTOP DesktopObject,
+BOOL IntSetThreadDesktop(IN HDESK hDesktop,
                          IN BOOL FreeOnFailure);
 
 NTSTATUS FASTCALL

reactos/subsystems/win32/win32k/main/dllmain.c

@@ -237,28 +237,13 @@ Win32kThreadCallback(struct _ETHREAD *Thread,
 
             if (hDesk != NULL)
             {
-                PDESKTOP DesktopObject;
                 Win32Thread->rpdesk = NULL;
-                Status = ObReferenceObjectByHandle(hDesk,
+                Win32Thread->hdesk = NULL;
-                                                   0,
+                if (!IntSetThreadDesktop(hDesk, FALSE))
-                                                   ExDesktopObjectType,
-                                                   KernelMode,
-                                                   (PVOID*)&DesktopObject,
-                                                   NULL);
-                NtClose(hDesk);
-                if(NT_SUCCESS(Status))
-                {
-                    if (!IntSetThreadDesktop(DesktopObject,
-                                             FALSE))
                 {
                         DPRINT1("Unable to set thread desktop\n");
                 }
             }
-                else
-                {
-                    DPRINT1("Unable to reference thread desktop handle 0x%x\n", hDesk);
-                }
-            }
         }
         else
         {

reactos/subsystems/win32/win32k/ntuser/desktop.c

@@ -1055,7 +1055,7 @@ NtUserCreateDesktop(
    }
 #endif
 
-   if (!ptiCurrent->rpdesk) IntSetThreadDesktop(DesktopObject,FALSE);
+   if (!ptiCurrent->rpdesk) IntSetThreadDesktop(Desktop,FALSE);
 
   /*
      Based on wine/server/window.c in get_desktop_window.
@@ -1795,22 +1795,39 @@ IntMapDesktopView(IN PDESKTOP DesktopObject)
 }
 
 BOOL
-IntSetThreadDesktop(IN PDESKTOP DesktopObject,
+IntSetThreadDesktop(IN HDESK hDesktop,
                     IN BOOL FreeOnFailure)
 {
-    PDESKTOP OldDesktop;
+    PDESKTOP DesktopObject, OldDesktop;
+    HDESK hOldDesktop;
     PTHREADINFO W32Thread;
     NTSTATUS Status;
     BOOL MapHeap;
     CLIENTTHREADINFO ctiSave;
 
-    DPRINT("IntSetThreadDesktop() DO=%p, FOF=%d\n", DesktopObject, FreeOnFailure);
+    DPRINT("IntSetThreadDesktop() , FOF=%d\n", FreeOnFailure);
     MapHeap = (PsGetCurrentProcess() != PsInitialSystemProcess);
     W32Thread = PsGetCurrentThreadWin32Thread();
     
-    if (W32Thread->rpdesk != DesktopObject)
+    /* Validate the new desktop. */
+    Status = IntValidateDesktopHandle(
+                hDesktop,
+                UserMode,
+                0,
+                &DesktopObject);
+
+    if (!NT_SUCCESS(Status))
     {
-        OldDesktop = W32Thread->rpdesk;
+        DPRINT("Validation of desktop handle (0x%X) failed\n", hDesktop);
+        return FALSE;
+    }
+
+    if (W32Thread->rpdesk == DesktopObject)
+    {
+        /* Nothing to do */
+        ObDereferenceObject(DesktopObject);
+        return TRUE;
+    }
 
     if (!IsListEmpty(&W32Thread->WindowListHead))
     {
@@ -1819,7 +1836,11 @@ IntSetThreadDesktop(IN PDESKTOP DesktopObject,
         return FALSE;
     }
 
+    OldDesktop = W32Thread->rpdesk;
+    hOldDesktop = W32Thread->hdesk;
+
     W32Thread->rpdesk = DesktopObject;
+    W32Thread->hdesk = hDesktop;
 
     if (MapHeap && DesktopObject != NULL)
     {
@@ -1885,6 +1906,7 @@ IntSetThreadDesktop(IN PDESKTOP DesktopObject,
         InsertTailList(&DesktopObject->PtiList, &W32Thread->PtiLink);
     }
 
+    /* Close the old desktop */
     if (OldDesktop != NULL)
     {
         if (MapHeap)
@@ -1894,6 +1916,10 @@ IntSetThreadDesktop(IN PDESKTOP DesktopObject,
 
         ObDereferenceObject(OldDesktop);
     }
+    
+    if (hOldDesktop != NULL)
+    {
+        ZwClose(hOldDesktop);
     }
 
     return TRUE;
@@ -1909,40 +1935,15 @@ IntSetThreadDesktop(IN PDESKTOP DesktopObject,
 BOOL APIENTRY
 NtUserSetThreadDesktop(HDESK hDesktop)
 {
-   PDESKTOP DesktopObject;
+   BOOL ret;
-   NTSTATUS Status;
-   DECLARE_RETURN(BOOL);
 
    UserEnterExclusive();
-   DPRINT("Enter NtUserSetThreadDesktop\n");
    
-   /* Validate the new desktop. */
+   ret = IntSetThreadDesktop(hDesktop, FALSE);
-   Status = IntValidateDesktopHandle(
-               hDesktop,
-               UserMode,
-               0,
-               &DesktopObject);
    
-   if (!NT_SUCCESS(Status))
-   {
-      DPRINT("Validation of desktop handle (0x%X) failed\n", hDesktop);
-      RETURN(FALSE);
-   }
-
-   /* FIXME: Should check here to see if the thread has any windows. */
-
-   if (!IntSetThreadDesktop(DesktopObject,
-                            FALSE))
-   {
-       RETURN(FALSE);
-   }
-
-   RETURN(TRUE);
-
-CLEANUP:
-   DPRINT("Leave NtUserSetThreadDesktop, ret=%i\n",_ret_);
    UserLeave();
-   END_CLEANUP;
+   
+   return ret;
 }
 
 /* EOF */