[ros-diffs] [hbelusca] 58198: [CONSRV] Add extra parentheses in macros arguments usage.

Author: hbelusca
Date: Sun Jan 20 22:15:21 2013
New Revision: 58198

URL: http://svn.reactos.org/svn/reactos?rev=58198&view=rev
Log:
[CONSRV]
Add extra parentheses in macros arguments usage.

Modified:
    branches/ros-csrss/win32ss/user/consrv/conio.h
    branches/ros-csrss/win32ss/user/consrv/console.c

Modified: branches/ros-csrss/win32ss/user/consrv/conio.h
URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/c…
==============================================================================
--- branches/ros-csrss/win32ss/user/consrv/conio.h [iso-8859-1] (original)
+++ branches/ros-csrss/win32ss/user/consrv/conio.h [iso-8859-1] Sun Jan 20 22:15:21 2013
@@ -162,11 +162,11 @@
 #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) \

Modified: branches/ros-csrss/win32ss/user/consrv/console.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/c…
==============================================================================
--- branches/ros-csrss/win32ss/user/consrv/console.c [iso-8859-1] (original)
+++ branches/ros-csrss/win32ss/user/consrv/console.c [iso-8859-1] Sun Jan 20 22:15:21
2013
@@ -98,6 +98,7 @@
         RtlCreateUnicodeString(&Console->Title, L"Command Prompt");
     }
 
+    InitializeCriticalSection(&Console->Lock);
     Console->ReferenceCount = 0;
     Console->LineBuffer = NULL;
     Console->ConsoleLeaderCID = ConsoleLeaderProcess->ClientId;
@@ -116,6 +117,7 @@
     InitializeListHead(&Console->HistoryBuffers);
     Console->CodePage = GetOEMCP();
     Console->OutputCodePage = GetOEMCP();
+    Console->GuiData = NULL;
 
     SecurityAttributes.nLength = sizeof(SECURITY_ATTRIBUTES);
     SecurityAttributes.lpSecurityDescriptor = NULL;
@@ -125,11 +127,10 @@
     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();