Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-29 01:12:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

[WIN32SS:NTUSER] Few formatting fixes.

Browse source
This commit is contained in:
Hermès Bélusca-Maïto 2021-10-19 23:02:02 +02:00
parent be223b9de7
commit 6b7b0f0c7e
No known key found for this signature in database
GPG key ID: 3B2539C65E7B93D0
3 changed files with 27 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
win32ss/user/ntuser/desktop.c
View file

@ -1209,13 +1209,12 @@ IntValidateDesktopHandle(
{ {
NTSTATUS Status; NTSTATUS Status;
Status = ObReferenceObjectByHandle( Status = ObReferenceObjectByHandle(Desktop,
Desktop, DesiredAccess,
DesiredAccess, ExDesktopObjectType,
ExDesktopObjectType, AccessMode,
AccessMode, (PVOID*)Object,
(PVOID*)Object, NULL);
NULL);
TRACE("IntValidateDesktopHandle: handle:0x%p obj:0x%p access:0x%x Status:0x%lx\n", TRACE("IntValidateDesktopHandle: handle:0x%p obj:0x%p access:0x%x Status:0x%lx\n",
Desktop, *Object, DesiredAccess, Status); Desktop, *Object, DesiredAccess, Status);
@ -1319,7 +1318,7 @@ IntSetFocusMessageQueue(PUSER_MESSAGE_QUEUE NewQueue)
{ {
gpqForeground = NULL; gpqForeground = NULL;
ERR("ptiLastInput is CLEARED!!\n"); ERR("ptiLastInput is CLEARED!!\n");
ptiLastInput = NULL; // ReactOS hacks,,,, should check for process death. ptiLastInput = NULL; // ReactOS hacks... should check for process death.
} }
} }
@ -1570,12 +1569,10 @@ UserRedrawDesktop(VOID)
Window = UserGetDesktopWindow(); Window = UserGetDesktopWindow();
Rgn = IntSysCreateRectpRgnIndirect(&Window->rcWindow); Rgn = IntSysCreateRectpRgnIndirect(&Window->rcWindow);
IntInvalidateWindows( Window, IntInvalidateWindows(Window,
Rgn, Rgn,
RDW_FRAME | RDW_FRAME | RDW_ERASE |
RDW_ERASE | RDW_INVALIDATE | RDW_ALLCHILDREN);
RDW_INVALIDATE |
RDW_ALLCHILDREN);
REGION_Delete(Rgn); REGION_Delete(Rgn);
} }
@ -2448,7 +2445,7 @@ IntCreateDesktop(
pdesk->spwndMessage = pWnd; pdesk->spwndMessage = pWnd;
pWnd->fnid = FNID_MESSAGEWND; pWnd->fnid = FNID_MESSAGEWND;
/* Now,,, /* Now...
if !(WinStaObject->Flags & WSF_NOIO) is (not set) for desktop input output mode (see wiki) if !(WinStaObject->Flags & WSF_NOIO) is (not set) for desktop input output mode (see wiki)
Create Tooltip. Saved in DesktopObject->spwndTooltip. Create Tooltip. Saved in DesktopObject->spwndTooltip.
Tooltip dwExStyle: WS_EX_TOOLWINDOW|WS_EX_TOPMOST Tooltip dwExStyle: WS_EX_TOOLWINDOW|WS_EX_TOPMOST
@ -2646,11 +2643,11 @@ NtUserOpenInputDesktop(
HDESK hdesk; HDESK hdesk;
UserEnterExclusive(); UserEnterExclusive();
TRACE("Enter NtUserOpenInputDesktop gpdeskInputDesktop 0x%p\n",gpdeskInputDesktop); TRACE("Enter NtUserOpenInputDesktop gpdeskInputDesktop 0x%p\n", gpdeskInputDesktop);
hdesk = UserOpenInputDesktop(dwFlags, fInherit, dwDesiredAccess); hdesk = UserOpenInputDesktop(dwFlags, fInherit, dwDesiredAccess);
TRACE("NtUserOpenInputDesktop returning 0x%p\n",hdesk); TRACE("NtUserOpenInputDesktop returning 0x%p\n", hdesk);
UserLeave(); UserLeave();
return hdesk; return hdesk;
} }
@ -2714,7 +2711,7 @@ NtUserCloseDesktop(HDESK hDesktop)
RETURN(TRUE); RETURN(TRUE);
CLEANUP: CLEANUP:
TRACE("Leave NtUserCloseDesktop, ret=%i\n",_ret_); TRACE("Leave NtUserCloseDesktop, ret=%i\n", _ret_);
UserLeave(); UserLeave();
END_CLEANUP; END_CLEANUP;
} }
@ -2738,10 +2735,13 @@ BOOL APIENTRY
NtUserPaintDesktop(HDC hDC) NtUserPaintDesktop(HDC hDC)
{ {
BOOL Ret; BOOL Ret;
UserEnterExclusive(); UserEnterExclusive();
TRACE("Enter NtUserPaintDesktop\n"); TRACE("Enter NtUserPaintDesktop\n");
Ret = IntPaintDesktop(hDC); Ret = IntPaintDesktop(hDC);
TRACE("Leave NtUserPaintDesktop, ret=%i\n",Ret);
TRACE("Leave NtUserPaintDesktop, ret=%i\n", Ret);
UserLeave(); UserLeave();
return Ret; return Ret;
} }
@ -2966,13 +2966,13 @@ NtUserSwitchDesktop(HDESK hdesk)
/* Show the new desktop window */ /* Show the new desktop window */
co_IntShowDesktop(pdesk, UserGetSystemMetrics(SM_CXSCREEN), UserGetSystemMetrics(SM_CYSCREEN), bRedrawDesktop); co_IntShowDesktop(pdesk, UserGetSystemMetrics(SM_CXSCREEN), UserGetSystemMetrics(SM_CYSCREEN), bRedrawDesktop);
TRACE("SwitchDesktop gpdeskInputDesktop 0x%p\n",gpdeskInputDesktop); TRACE("SwitchDesktop gpdeskInputDesktop 0x%p\n", gpdeskInputDesktop);
ObDereferenceObject(pdesk); ObDereferenceObject(pdesk);
RETURN(TRUE); RETURN(TRUE);
CLEANUP: CLEANUP:
TRACE("Leave NtUserSwitchDesktop, ret=%i\n",_ret_); TRACE("Leave NtUserSwitchDesktop, ret=%i\n", _ret_);
UserLeave(); UserLeave();
END_CLEANUP; END_CLEANUP;
} }

2
win32ss/user/ntuser/window.c
View file

@ -739,7 +739,7 @@ IntGetWindowProc(PWND pWnd,
PCLS Class; PCLS Class;
WNDPROC gcpd, Ret = 0; WNDPROC gcpd, Ret = 0;
ASSERT(UserIsEnteredExclusive() == TRUE); ASSERT(UserIsEnteredExclusive());
Class = pWnd->pcls; Class = pWnd->pcls;

10
win32ss/user/user32/windows/window.c
View file

@ -150,20 +150,20 @@ RtlFreeLargeString(
DWORD DWORD
FASTCALL FASTCALL
RtlGetExpWinVer( HMODULE hModule ) RtlGetExpWinVer(HMODULE hModule)
{ {
DWORD dwMajorVersion = 3; // Set default to Windows 3.10. DWORD dwMajorVersion = 3; // Set default to Windows 3.10.
DWORD dwMinorVersion = 10; DWORD dwMinorVersion = 10;
PIMAGE_NT_HEADERS pinth; PIMAGE_NT_HEADERS pinth;
if ( hModule && !LOWORD( ((ULONG_PTR)hModule) )) if (hModule && !LOWORD((ULONG_PTR)hModule))
{ {
pinth = RtlImageNtHeader( hModule ); pinth = RtlImageNtHeader(hModule);
if ( pinth ) if (pinth)
{ {
dwMajorVersion = pinth->OptionalHeader.MajorSubsystemVersion; dwMajorVersion = pinth->OptionalHeader.MajorSubsystemVersion;
if ( dwMajorVersion == 1 ) if (dwMajorVersion == 1)
{ {
dwMajorVersion = 3; dwMajorVersion = 3;
} }