Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-23 17:05:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

[USERSRV]: Code formatting.

Browse source 
svn path=/trunk/; revision=71337
This commit is contained in:
Hermès Bélusca-Maïto 2016-05-15 22:29:23 +00:00
parent 02a7b8eca5
commit 497e74bc43
1 changed files with 31 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

65
reactos/win32ss/user/winsrv/usersrv/harderror.c
View file

@ -104,7 +104,7 @@ UserpGetClientFileName(
return Status; return Status;
} }
ClientFileNameU->Length = wcslen(ClientFileNameU->Buffer)*sizeof(wchar_t); ClientFileNameU->Length = wcslen(ClientFileNameU->Buffer) * sizeof(WCHAR);
DPRINT("ClientFileNameU=\'%wZ\'\n", &ClientFileNameU); DPRINT("ClientFileNameU=\'%wZ\'\n", &ClientFileNameU);
return STATUS_SUCCESS; return STATUS_SUCCESS;
@ -160,7 +160,6 @@ UserpCaptureStringParameters(
&ParamStringU, &ParamStringU,
sizeof(ParamStringU), sizeof(ParamStringU),
NULL); NULL);
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
break; break;
@ -271,7 +270,6 @@ UserpFormatMessages(
LANG_NEUTRAL, LANG_NEUTRAL,
Message->Status, Message->Status,
&MessageResource); &MessageResource);
if (NT_SUCCESS(Status)) if (NT_SUCCESS(Status))
{ {
if (MessageResource->Flags) if (MessageResource->Flags)
@ -347,8 +345,10 @@ UserpFormatMessages(
{ {
Parameters[0] = Parameters[1]; Parameters[0] = Parameters[1];
Parameters[1] = Parameters[3]; Parameters[1] = Parameters[3];
if (Parameters[2]) Parameters[2] = (ULONG_PTR)L"written"; if (Parameters[2])
else Parameters[2] = (ULONG_PTR)L"read"; Parameters[2] = (ULONG_PTR)L"written";
else
Parameters[2] = (ULONG_PTR)L"read";
MessageResource = NULL; MessageResource = NULL;
} }
else if (ExceptionCode == STATUS_IN_PAGE_ERROR) else if (ExceptionCode == STATUS_IN_PAGE_ERROR)
@ -373,7 +373,6 @@ UserpFormatMessages(
LANG_NEUTRAL, LANG_NEUTRAL,
ExceptionCode, ExceptionCode,
&MessageResource); &MessageResource);
if (NT_SUCCESS(Status)) if (NT_SUCCESS(Status))
{ {
if (FormatA.Buffer) RtlFreeUnicodeString(&FormatU); if (FormatA.Buffer) RtlFreeUnicodeString(&FormatU);
@ -453,30 +452,31 @@ UserpMessageBox(
/* Set the message box type */ /* Set the message box type */
switch (ValidResponseOptions) switch (ValidResponseOptions)
{ {
case OptionAbortRetryIgnore: case OptionAbortRetryIgnore:
Type = MB_ABORTRETRYIGNORE; Type = MB_ABORTRETRYIGNORE;
break; break;
case OptionOk: case OptionOk:
Type = MB_OK; Type = MB_OK;
break; break;
case OptionOkCancel: case OptionOkCancel:
Type = MB_OKCANCEL; Type = MB_OKCANCEL;
break; break;
case OptionRetryCancel: case OptionRetryCancel:
Type = MB_RETRYCANCEL; Type = MB_RETRYCANCEL;
break; break;
case OptionYesNo: case OptionYesNo:
Type = MB_YESNO; Type = MB_YESNO;
break; break;
case OptionYesNoCancel: case OptionYesNoCancel:
Type = MB_YESNOCANCEL; Type = MB_YESNOCANCEL;
break; break;
case OptionShutdownSystem: case OptionShutdownSystem:
Type = MB_RETRYCANCEL; // FIXME??? Type = MB_RETRYCANCEL; // FIXME???
break; break;
/* Anything else is invalid */ /* Anything else is invalid */
default: default:
return ResponseNotHandled; return ResponseNotHandled;
} }
/* Set severity */ /* Set severity */
@ -515,9 +515,6 @@ UserServerHardError(
IN PCSR_THREAD ThreadData, IN PCSR_THREAD ThreadData,
IN PHARDERROR_MSG Message) IN PHARDERROR_MSG Message)
{ {
#if DBG
PCSR_PROCESS ProcessData = ThreadData->Process;
#endif
ULONG_PTR Parameters[MAXIMUM_HARDERROR_PARAMETERS]; ULONG_PTR Parameters[MAXIMUM_HARDERROR_PARAMETERS];
OBJECT_ATTRIBUTES ObjectAttributes; OBJECT_ATTRIBUTES ObjectAttributes;
UNICODE_STRING TextU, CaptionU; UNICODE_STRING TextU, CaptionU;
@ -525,8 +522,9 @@ UserServerHardError(
HANDLE hProcess; HANDLE hProcess;
ULONG Size; ULONG Size;
ASSERT(ThreadData->Process != NULL);
/* Default to not handled */ /* Default to not handled */
ASSERT(ProcessData != NULL);
Message->Response = ResponseNotHandled; Message->Response = ResponseNotHandled;
/* Make sure we don't have too many parameters */ /* Make sure we don't have too many parameters */
@ -541,7 +539,6 @@ UserServerHardError(
PROCESS_VM_READ | PROCESS_QUERY_INFORMATION, PROCESS_VM_READ | PROCESS_QUERY_INFORMATION,
&ObjectAttributes, &ObjectAttributes,
&Message->h.ClientId); &Message->h.ClientId);
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
{ {
DPRINT1("NtOpenProcess failed with code: %lx\n", Status); DPRINT1("NtOpenProcess failed with code: %lx\n", Status);