Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 07:53:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WIN32K:NTUSER] Code style fixes only.

Browse source
This commit is contained in:
Hermès Bélusca-Maïto 2018-07-22 20:32:12 +02:00
parent bc7810a97e
commit 83104d9f00
No known key found for this signature in database
GPG key ID: 3B2539C65E7B93D0
3 changed files with 19 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1753,7 +1753,7 @@ IntCreateDesktop(
/* In case the object was not created (eg if it existed), return now */ /* In case the object was not created (eg if it existed), return now */
if (Context == FALSE) if (Context == FALSE)
{ {
TRACE("NtUserCreateDesktop opened desktop %wZ\n", ObjectAttributes->ObjectName); TRACE("IntCreateDesktop opened desktop '%wZ'\n", ObjectAttributes->ObjectName);
Status = STATUS_SUCCESS; Status = STATUS_SUCCESS;
goto Quit; goto Quit;
} }
@ -1825,8 +1825,8 @@ IntCreateDesktop(
Cs.cx = Cs.cy = 100; Cs.cx = Cs.cy = 100;
Cs.style = WS_POPUP|WS_CLIPCHILDREN; Cs.style = WS_POPUP|WS_CLIPCHILDREN;
Cs.hInstance = hModClient; // hModuleWin; // Server side winproc! Cs.hInstance = hModClient; // hModuleWin; // Server side winproc!
Cs.lpszName = (LPCWSTR) &WindowName; Cs.lpszName = (LPCWSTR)&WindowName;
Cs.lpszClass = (LPCWSTR) &ClassName; Cs.lpszClass = (LPCWSTR)&ClassName;
pWnd = IntCreateWindow(&Cs, &WindowName, pcls, NULL, NULL, NULL, pdesk); pWnd = IntCreateWindow(&Cs, &WindowName, pcls, NULL, NULL, NULL, pdesk);
if (pWnd == NULL) if (pWnd == NULL)
{ {
@ -2050,7 +2050,7 @@ NtUserCloseDesktop(HDESK hDesktop)
NTSTATUS Status; NTSTATUS Status;
DECLARE_RETURN(BOOL); DECLARE_RETURN(BOOL);
TRACE("NtUserCloseDesktop called (0x%p)\n", hDesktop); TRACE("NtUserCloseDesktop(0x%p) called\n", hDesktop);
UserEnterExclusive(); UserEnterExclusive();
if (hDesktop == gptiCurrent->hdesk || hDesktop == gptiCurrent->ppi->hdeskStartup) if (hDesktop == gptiCurrent->hdesk || hDesktop == gptiCurrent->ppi->hdeskStartup)
@ -2060,10 +2060,10 @@ NtUserCloseDesktop(HDESK hDesktop)
RETURN(FALSE); RETURN(FALSE);
} }
Status = IntValidateDesktopHandle( hDesktop, UserMode, 0, &pdesk); Status = IntValidateDesktopHandle(hDesktop, UserMode, 0, &pdesk);
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
{ {
ERR("Validation of desktop handle (0x%p) failed\n", hDesktop); ERR("Validation of desktop handle 0x%p failed\n", hDesktop);
RETURN(FALSE); RETURN(FALSE);
} }
@ -2236,10 +2236,10 @@ NtUserSwitchDesktop(HDESK hdesk)
UserEnterExclusive(); UserEnterExclusive();
TRACE("Enter NtUserSwitchDesktop(0x%p)\n", hdesk); TRACE("Enter NtUserSwitchDesktop(0x%p)\n", hdesk);
Status = IntValidateDesktopHandle( hdesk, UserMode, 0, &pdesk); Status = IntValidateDesktopHandle(hdesk, UserMode, 0, &pdesk);
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
{ {
ERR("Validation of desktop handle (0x%p) failed\n", hdesk); ERR("Validation of desktop handle 0x%p failed\n", hdesk);
RETURN(FALSE); RETURN(FALSE);
} }
@ -2539,10 +2539,10 @@ IntSetThreadDesktop(IN HDESK hDesktop,
if (hDesktop != NULL) if (hDesktop != NULL)
{ {
/* Validate the new desktop. */ /* Validate the new desktop. */
Status = IntValidateDesktopHandle( hDesktop, UserMode, 0, &pdesk); Status = IntValidateDesktopHandle(hDesktop, UserMode, 0, &pdesk);
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
{ {
ERR("Validation of desktop handle (0x%p) failed\n", hDesktop); ERR("Validation of desktop handle 0x%p failed\n", hDesktop);
return FALSE; return FALSE;
} }
@ -2583,7 +2583,7 @@ IntSetThreadDesktop(IN HDESK hDesktop,
return FALSE; return FALSE;
} }
pctiNew = DesktopHeapAlloc( pdesk, sizeof(CLIENTTHREADINFO)); pctiNew = DesktopHeapAlloc(pdesk, sizeof(CLIENTTHREADINFO));
if (pctiNew == NULL) if (pctiNew == NULL)
{ {
ERR("Failed to allocate new pcti\n"); ERR("Failed to allocate new pcti\n");

6
win32ss/user/ntuser/sysparams.c
View file

@ -25,6 +25,7 @@ BOOL g_PaintDesktopVersion = FALSE;
#define METRIC2REG(met) (-((((met) * 1440)- 0) / dpi)) #define METRIC2REG(met) (-((((met) * 1440)- 0) / dpi))
#define REQ_INTERACTIVE_WINSTA(err) \ #define REQ_INTERACTIVE_WINSTA(err) \
do { \
if (GetW32ProcessInfo()->prpwinsta != InputWindowStation) \ if (GetW32ProcessInfo()->prpwinsta != InputWindowStation) \
{ \ { \
if (GetW32ProcessInfo()->prpwinsta == NULL) \ if (GetW32ProcessInfo()->prpwinsta == NULL) \
@ -33,12 +34,13 @@ BOOL g_PaintDesktopVersion = FALSE;
} \ } \
else \ else \
{ \ { \
ERR("NtUserSystemParametersInfo requires interactive window station (current is %wZ)\n", \ ERR("NtUserSystemParametersInfo requires interactive window station (current is '%wZ')\n", \
&(OBJECT_HEADER_TO_NAME_INFO(OBJECT_TO_OBJECT_HEADER(GetW32ProcessInfo()->prpwinsta))->Name)); \ &(OBJECT_HEADER_TO_NAME_INFO(OBJECT_TO_OBJECT_HEADER(GetW32ProcessInfo()->prpwinsta))->Name)); \
} \ } \
EngSetLastError(err); \ EngSetLastError(err); \
return 0; \ return 0; \
} } \
} while (0)
static const WCHAR* KEY_MOUSE = L"Control Panel\\Mouse"; static const WCHAR* KEY_MOUSE = L"Control Panel\\Mouse";
static const WCHAR* VAL_MOUSE1 = L"MouseThreshold1"; static const WCHAR* VAL_MOUSE1 = L"MouseThreshold1";

8
win32ss/user/ntuser/winsta.c
View file

@ -971,7 +971,7 @@ NtUserCloseWindowStation(
UserMode, UserMode,
0, 0,
&Object, &Object,
0); NULL);
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
{ {
@ -1449,7 +1449,7 @@ NtUserLockWindowStation(HWINSTA hWindowStation)
UserMode, UserMode,
0, 0,
&Object, &Object,
0); NULL);
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
{ {
TRACE("Validation of window station handle (%p) failed\n", TRACE("Validation of window station handle (%p) failed\n",
@ -1494,7 +1494,7 @@ NtUserUnlockWindowStation(HWINSTA hWindowStation)
UserMode, UserMode,
0, 0,
&Object, &Object,
0); NULL);
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
{ {
TRACE("Validation of window station handle (%p) failed\n", TRACE("Validation of window station handle (%p) failed\n",
@ -1718,7 +1718,7 @@ BuildDesktopNameList(
UserMode, UserMode,
0, 0,
&WindowStation, &WindowStation,
0); NULL);
if (! NT_SUCCESS(Status)) if (! NT_SUCCESS(Status))
{ {
return Status; return Status;