[WIN32K:NTUSER] Rename some variables with more natural names.

This commit is contained in:
Hermès Bélusca-Maïto 2018-07-22 20:30:05 +02:00
parent 1abeb905c3
commit bc7810a97e
No known key found for this signature in database
GPG key ID: 3B2539C65E7B93D0

View file

@ -27,7 +27,7 @@ IntFreeDesktopHeap(IN PDESKTOP pdesk);
/* GLOBALS *******************************************************************/ /* GLOBALS *******************************************************************/
/* These can be changed via csrss startup, these are defaults */ /* These can be changed via CSRSS startup, these are defaults */
DWORD gdwDesktopSectionSize = 512; DWORD gdwDesktopSectionSize = 512;
DWORD gdwNOIOSectionSize = 128; // A guess, for one or more of the first three system desktops. DWORD gdwNOIOSectionSize = 128; // A guess, for one or more of the first three system desktops.
@ -631,7 +631,7 @@ HDESK FASTCALL
IntGetDesktopObjectHandle(PDESKTOP DesktopObject) IntGetDesktopObjectHandle(PDESKTOP DesktopObject)
{ {
NTSTATUS Status; NTSTATUS Status;
HDESK Ret; HDESK hDesk;
ASSERT(DesktopObject); ASSERT(DesktopObject);
@ -639,7 +639,7 @@ IntGetDesktopObjectHandle(PDESKTOP DesktopObject)
DesktopObject, DesktopObject,
ExDesktopObjectType, ExDesktopObjectType,
NULL, NULL,
(PHANDLE)&Ret)) (PHANDLE)&hDesk))
{ {
Status = ObOpenObjectByPointer(DesktopObject, Status = ObOpenObjectByPointer(DesktopObject,
0, 0,
@ -647,7 +647,7 @@ IntGetDesktopObjectHandle(PDESKTOP DesktopObject)
0, 0,
ExDesktopObjectType, ExDesktopObjectType,
UserMode, UserMode,
(PHANDLE)&Ret); (PHANDLE)&hDesk);
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
{ {
/* Unable to create a handle */ /* Unable to create a handle */
@ -657,10 +657,10 @@ IntGetDesktopObjectHandle(PDESKTOP DesktopObject)
} }
else else
{ {
TRACE("Got handle: %p\n", Ret); TRACE("Got handle: 0x%p\n", hDesk);
} }
return Ret; return hDesk;
} }
PUSER_MESSAGE_QUEUE FASTCALL PUSER_MESSAGE_QUEUE FASTCALL
@ -2327,7 +2327,7 @@ NtUserGetThreadDesktop(DWORD dwThreadId, DWORD Unknown1)
NTSTATUS Status; NTSTATUS Status;
PETHREAD Thread; PETHREAD Thread;
PDESKTOP DesktopObject; PDESKTOP DesktopObject;
HDESK Ret, hThreadDesktop; HDESK hDesk, hThreadDesktop;
OBJECT_HANDLE_INFORMATION HandleInformation; OBJECT_HANDLE_INFORMATION HandleInformation;
DECLARE_RETURN(HDESK); DECLARE_RETURN(HDESK);
@ -2351,9 +2351,9 @@ NtUserGetThreadDesktop(DWORD dwThreadId, DWORD Unknown1)
{ {
/* Just return the handle, we queried the desktop handle of a thread running /* Just return the handle, we queried the desktop handle of a thread running
in the same context */ in the same context */
Ret = ((PTHREADINFO)Thread->Tcb.Win32Thread)->hdesk; hDesk = ((PTHREADINFO)Thread->Tcb.Win32Thread)->hdesk;
ObDereferenceObject(Thread); ObDereferenceObject(Thread);
RETURN(Ret); RETURN(hDesk);
} }
/* Get the desktop handle and the desktop of the thread */ /* Get the desktop handle and the desktop of the thread */
@ -2387,12 +2387,12 @@ NtUserGetThreadDesktop(DWORD dwThreadId, DWORD Unknown1)
/* Lookup our handle table if we can find a handle to the desktop object, /* Lookup our handle table if we can find a handle to the desktop object,
if not, create one */ if not, create one */
Ret = IntGetDesktopObjectHandle(DesktopObject); hDesk = IntGetDesktopObjectHandle(DesktopObject);
/* All done, we got a valid handle to the desktop */ /* All done, we got a valid handle to the desktop */
ObDereferenceObject(DesktopObject); ObDereferenceObject(DesktopObject);
ObDereferenceObject(Thread); ObDereferenceObject(Thread);
RETURN(Ret); RETURN(hDesk);
CLEANUP: CLEANUP:
TRACE("Leave NtUserGetThreadDesktop, ret=%p\n",_ret_); TRACE("Leave NtUserGetThreadDesktop, ret=%p\n",_ret_);