From 40ee602754c55eb2ef4693ce6dbf93f31c5ac60c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?= Date: Sun, 20 Jan 2013 22:15:21 +0000 Subject: [PATCH] [CONSRV] Add extra parentheses in macros arguments usage. svn path=/branches/ros-csrss/; revision=58198 --- win32ss/user/consrv/conio.h | 6 +++--- win32ss/user/consrv/console.c | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/win32ss/user/consrv/conio.h b/win32ss/user/consrv/conio.h index 3f479dc3c56..4ee377d404a 100644 --- a/win32ss/user/consrv/conio.h +++ b/win32ss/user/consrv/conio.h @@ -162,11 +162,11 @@ typedef struct _CONSOLE_VTBL #define ConioSetScreenInfo(Console, Buff, OldCursorX, OldCursorY) \ (Console)->Vtbl->SetScreenInfo((Console), (Buff), (OldCursorX), (OldCursorY)) #define ConioUpdateScreenInfo(Console, Buff) \ - (Console)->Vtbl->UpdateScreenInfo(Console, Buff) + (Console)->Vtbl->UpdateScreenInfo((Console), (Buff)) #define ConioChangeTitle(Console) (Console)->Vtbl->ChangeTitle(Console) #define ConioCleanupConsole(Console) (Console)->Vtbl->CleanupConsole(Console) -#define ConioChangeIcon(Console, hWindowIcon) (Console)->Vtbl->ChangeIcon(Console, hWindowIcon) -#define ConioResizeBuffer(Console, Buff, Size) (Console)->Vtbl->ResizeBuffer(Console, Buff, Size) +#define ConioChangeIcon(Console, hWindowIcon) (Console)->Vtbl->ChangeIcon((Console), (hWindowIcon)) +#define ConioResizeBuffer(Console, Buff, Size) (Console)->Vtbl->ResizeBuffer((Console), (Buff), (Size)) /* console.c */ #define ConioLockConsole(ProcessData, Console) \ diff --git a/win32ss/user/consrv/console.c b/win32ss/user/consrv/console.c index 011188e0f46..716a502c236 100644 --- a/win32ss/user/consrv/console.c +++ b/win32ss/user/consrv/console.c @@ -98,6 +98,7 @@ CsrInitConsole(PCONSOLE* NewConsole, int ShowCmd, PCSR_PROCESS ConsoleLeaderProc RtlCreateUnicodeString(&Console->Title, L"Command Prompt"); } + InitializeCriticalSection(&Console->Lock); Console->ReferenceCount = 0; Console->LineBuffer = NULL; Console->ConsoleLeaderCID = ConsoleLeaderProcess->ClientId; @@ -116,6 +117,7 @@ CsrInitConsole(PCONSOLE* NewConsole, int ShowCmd, PCSR_PROCESS ConsoleLeaderProc InitializeListHead(&Console->HistoryBuffers); Console->CodePage = GetOEMCP(); Console->OutputCodePage = GetOEMCP(); + Console->GuiData = NULL; SecurityAttributes.nLength = sizeof(SECURITY_ATTRIBUTES); SecurityAttributes.lpSecurityDescriptor = NULL; @@ -125,11 +127,10 @@ CsrInitConsole(PCONSOLE* NewConsole, int ShowCmd, PCSR_PROCESS ConsoleLeaderProc if (NULL == Console->InputBuffer.ActiveEvent) { RtlFreeUnicodeString(&Console->Title); + DeleteCriticalSection(&Console->Lock); RtlFreeHeap(ConSrvHeap, 0, Console); return STATUS_UNSUCCESSFUL; } - Console->GuiData = NULL; - InitializeCriticalSection(&Console->Lock); GuiMode = DtbgIsDesktopVisible();