[ros-diffs] [hbelusca] 58689: [CONSRV] Shut-up almost all the dprints.

Author: hbelusca
Date: Sat Apr  6 13:40:34 2013
New Revision: 58689

URL: http://svn.reactos.org/svn/reactos?rev=58689&view=rev
Log:
[CONSRV]
Shut-up almost all the dprints.

Modified:
    branches/ros-csrss/win32ss/user/consrv/console.c
    branches/ros-csrss/win32ss/user/consrv/frontends/gui/guiterm.c
    branches/ros-csrss/win32ss/user/consrv/handle.c
    branches/ros-csrss/win32ss/user/consrv/init.c

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] Sat Apr  6 13:40:34
2013
@@ -544,15 +544,15 @@
         }
     }
 
-    DPRINT1("Terminal initialized\n");
+    DPRINT("Terminal initialized\n");
 
     /* All went right, so add the console to the list */
     ConSrvLockConsoleListExclusive();
-    DPRINT1("Insert in the list\n");
+    DPRINT("Insert in the list\n");
     InsertTailList(&ConsoleList, &Console->Entry);
 
     /* The initialization is finished */
-    DPRINT1("Change state\n");
+    DPRINT("Change state\n");
     Console->State = CONSOLE_RUNNING;
 
     /* Unlock the console */
@@ -563,7 +563,7 @@
 
     /* Copy buffer contents to screen */
     ConioDrawConsole(Console);
-    DPRINT1("Console drawn\n");
+    DPRINT("Console drawn\n");
 
     /* Return the newly created console to the caller and a success code too */
     *NewConsole = Console;
@@ -576,7 +576,7 @@
     PLIST_ENTRY CurrentEntry;
     ConsoleInput* Event;
 
-    DPRINT1("ConSrvDeleteConsole\n");
+    DPRINT("ConSrvDeleteConsole\n");
 
     /*
      * Forbid validation of any console by other threads
@@ -683,14 +683,14 @@
     RtlFreeUnicodeString(&Console->Title);
     IntDeleteAllAliases(Console->Aliases);
 
-    DPRINT1("ConSrvDeleteConsole - Unlocking\n");
+    DPRINT("ConSrvDeleteConsole - Unlocking\n");
     LeaveCriticalSection(&Console->Lock);
-    DPRINT1("ConSrvDeleteConsole - Destroying lock\n");
+    DPRINT("ConSrvDeleteConsole - Destroying lock\n");
     DeleteCriticalSection(&Console->Lock);
-    DPRINT1("ConSrvDeleteConsole - Lock destroyed ; freeing console\n");
+    DPRINT("ConSrvDeleteConsole - Lock destroyed ; freeing console\n");
 
     RtlFreeHeap(ConSrvHeap, 0, Console);
-    DPRINT1("ConSrvDeleteConsole - Console freed\n");
+    DPRINT("ConSrvDeleteConsole - Console freed\n");
 
     /* Unlock the console list and return */
     ConSrvUnlockConsoleList();

Modified: branches/ros-csrss/win32ss/user/consrv/frontends/gui/guiterm.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/f…
==============================================================================
--- branches/ros-csrss/win32ss/user/consrv/frontends/gui/guiterm.c [iso-8859-1]
(original)
+++ branches/ros-csrss/win32ss/user/consrv/frontends/gui/guiterm.c [iso-8859-1] Sat Apr  6
13:40:34 2013
@@ -375,7 +375,7 @@
     TEXTMETRICW Metrics;
     SIZE CharSize;
 
-    DPRINT1("GuiConsoleHandleNcCreate\n");
+    DPRINT("GuiConsoleHandleNcCreate\n");
 
     if (NULL == GuiData)
     {
@@ -459,7 +459,7 @@
     SetTimer(GuiData->hWindow, CONGUI_UPDATE_TIMER, CONGUI_UPDATE_TIME, NULL);
     GuiConsoleCreateSysMenu(GuiData->hWindow);
 
-    DPRINT1("GuiConsoleHandleNcCreate - setting start event\n");
+    DPRINT("GuiConsoleHandleNcCreate - setting start event\n");
     SetEvent(GuiData->hGuiInitEvent);
 
     return (BOOL)DefWindowProcW(GuiData->hWindow, WM_NCCREATE, 0, (LPARAM)Create);
@@ -1767,16 +1767,16 @@
                 WindowCount++;
                 SetWindowLongW(hWnd, GWL_USERDATA, WindowCount);
 
-                DPRINT1("Set icons via PM_CREATE_CONSOLE\n");
+                DPRINT("Set icons via PM_CREATE_CONSOLE\n");
                 if (GuiData->hIcon == NULL)
                 {
-                    DPRINT1("Not really /o\\...\n");
+                    DPRINT("Not really /o\\...\n");
                     GuiData->hIcon   = ghDefaultIcon;
                     GuiData->hIconSm = ghDefaultIconSm;
                 }
                 else if (GuiData->hIcon != ghDefaultIcon)
                 {
-                    DPRINT1("Yes \\o/\n");
+                    DPRINT("Yes \\o/\n");
                     SendMessageW(GuiData->hWindow, WM_SETICON, ICON_BIG,
(LPARAM)GuiData->hIcon);
                     SendMessageW(GuiData->hWindow, WM_SETICON, ICON_SMALL,
(LPARAM)GuiData->hIconSm);
                 }
@@ -1790,7 +1790,7 @@
 
                 // ShowWindow(NewWindow, (int)wParam);
                 ShowWindowAsync(NewWindow, (int)wParam);
-                DPRINT1("Window showed\n");
+                DPRINT("Window showed\n");
             }
 
             return (LRESULT)NewWindow;
@@ -1824,7 +1824,7 @@
                 {
                     NotifyWnd = NULL;
                     DestroyWindow(hWnd);
-                    DPRINT1("CONSRV: Going to quit the Gui Thread!!\n");
+                    DPRINT("CONSRV: Going to quit the Gui Thread!!\n");
                     PostQuitMessage(0);
                 }
             }
@@ -1876,7 +1876,7 @@
         DispatchMessageW(&msg);
     }
 
-    DPRINT1("CONSRV: Quit the Gui Thread!!\n");
+    DPRINT("CONSRV: Quit the Gui Thread!!\n");
     PrivateCsrssManualGuiCheck(-1);
 
     return 1;
@@ -2004,16 +2004,16 @@
 
     SendMessageW(NotifyWnd, PM_DESTROY_CONSOLE, 0, (LPARAM)GuiData);
 
-    DPRINT1("Destroying icons !! - GuiData->hIcon = 0x%p ; ghDefaultIcon = 0x%p ;
GuiData->hIconSm = 0x%p ; ghDefaultIconSm = 0x%p\n",
+    DPRINT("Destroying icons !! - GuiData->hIcon = 0x%p ; ghDefaultIcon = 0x%p ;
GuiData->hIconSm = 0x%p ; ghDefaultIconSm = 0x%p\n",
             GuiData->hIcon, ghDefaultIcon, GuiData->hIconSm, ghDefaultIconSm);
     if (GuiData->hIcon != NULL && GuiData->hIcon != ghDefaultIcon)
     {
-        DPRINT1("Destroy hIcon\n");
+        DPRINT("Destroy hIcon\n");
         DestroyIcon(GuiData->hIcon);
     }
     if (GuiData->hIconSm != NULL && GuiData->hIconSm != ghDefaultIconSm)
     {
-        DPRINT1("Destroy hIconSm\n");
+        DPRINT("Destroy hIconSm\n");
         DestroyIcon(GuiData->hIconSm);
     }
 
@@ -2021,7 +2021,7 @@
     DeleteCriticalSection(&GuiData->Lock);
     RtlFreeHeap(ConSrvHeap, 0, GuiData);
 
-    DPRINT1("Quit GuiCleanupConsole\n");
+    DPRINT("Quit GuiCleanupConsole\n");
 }
 
 static VOID WINAPI
@@ -2306,7 +2306,7 @@
         GuiData->hIcon   = hIcon;
         GuiData->hIconSm = hIconSm;
 
-        DPRINT1("Set icons in GuiChangeIcon\n");
+        DPRINT("Set icons in GuiChangeIcon\n");
         PostMessageW(GuiData->hWindow, WM_SETICON, ICON_BIG,
(LPARAM)GuiData->hIcon);
         PostMessageW(GuiData->hWindow, WM_SETICON, ICON_SMALL,
(LPARAM)GuiData->hIconSm);
     }
@@ -2439,7 +2439,7 @@
         IconPath  = ConsoleStartInfo->AppPath;
         IconIndex = 0;
     }
-    DPRINT1("IconPath = %S ; IconIndex = %lu\n", (IconPath ? IconPath :
L"n/a"), IconIndex);
+    DPRINT("IconPath = %S ; IconIndex = %lu\n", (IconPath ? IconPath :
L"n/a"), IconIndex);
     if (IconPath)
     {
         HICON hIcon = NULL, hIconSm = NULL;
@@ -2448,10 +2448,10 @@
                               &hIcon,
                               &hIconSm,
                               1);
-        DPRINT1("hIcon = 0x%p ; hIconSm = 0x%p\n", hIcon, hIconSm);
+        DPRINT("hIcon = 0x%p ; hIconSm = 0x%p\n", hIcon, hIconSm);
         if (hIcon != NULL)
         {
-            DPRINT1("Effectively set the icons\n");
+            DPRINT("Effectively set the icons\n");
             GuiData->hIcon   = hIcon;
             GuiData->hIconSm = hIconSm;
         }
@@ -2470,14 +2470,14 @@
 
     /* Wait until initialization has finished */
     WaitForSingleObject(GuiData->hGuiInitEvent, INFINITE);
-    DPRINT1("OK we created the console window\n");
+    DPRINT("OK we created the console window\n");
     CloseHandle(GuiData->hGuiInitEvent);
     GuiData->hGuiInitEvent = NULL;
 
     /* Check whether we really succeeded in initializing the terminal window */
     if (GuiData->hWindow == NULL)
     {
-        DPRINT1("GuiInitConsole - We failed at creating a new terminal
window\n");
+        DPRINT("GuiInitConsole - We failed at creating a new terminal
window\n");
         // ConioCleanupConsole(Console);
         GuiCleanupConsole(Console);
         return STATUS_UNSUCCESSFUL;

Modified: branches/ros-csrss/win32ss/user/consrv/handle.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/h…
==============================================================================
--- branches/ros-csrss/win32ss/user/consrv/handle.c [iso-8859-1] (original)
+++ branches/ros-csrss/win32ss/user/consrv/handle.c [iso-8859-1] Sat Apr  6 13:40:34 2013
@@ -94,7 +94,7 @@
             }
             else if (Object->Type == CONIO_INPUT_BUFFER_MAGIC)
             {
-                DPRINT1("Closing the input buffer\n");
+                DPRINT("Closing the input buffer\n");
             }
         }
 
@@ -533,14 +533,14 @@
 {
     PCONSOLE Console = ProcessData->Console;
 
-    DPRINT1("ConSrvRemoveConsole\n");
+    DPRINT("ConSrvRemoveConsole\n");
 
     RtlEnterCriticalSection(&ProcessData->HandleTableLock);
 
     /* Validate and lock the console */
     if (ConSrvValidateConsole(Console, CONSOLE_RUNNING, TRUE))
     {
-        DPRINT1("ConSrvRemoveConsole - Locking OK\n");
+        DPRINT("ConSrvRemoveConsole - Locking OK\n");
 
         /* Close all console handles and free the handles table */
         ConSrvFreeHandlesTable(ProcessData);
@@ -555,7 +555,7 @@
         ConioRefreshInternalInfo(Console);
 
         /* Release the console */
-        DPRINT1("ConSrvRemoveConsole - Decrement Console->ReferenceCount =
%lu\n", Console->ReferenceCount);
+        DPRINT("ConSrvRemoveConsole - Decrement Console->ReferenceCount =
%lu\n", Console->ReferenceCount);
         ConSrvReleaseConsole(Console, TRUE);
         //CloseHandle(ProcessData->ConsoleEvent);
         //ProcessData->ConsoleEvent = NULL;

Modified: branches/ros-csrss/win32ss/user/consrv/init.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/i…
==============================================================================
--- branches/ros-csrss/win32ss/user/consrv/init.c [iso-8859-1] (original)
+++ branches/ros-csrss/win32ss/user/consrv/init.c [iso-8859-1] Sat Apr  6 13:40:34 2013
@@ -398,7 +398,7 @@
     if (!ConnectInfo->Console ||
          ConnectInfo->Console != ProcessData->ParentConsole)
     {
-        DPRINT1("ConSrvConnect - Allocate a new console\n");
+        DPRINT("ConSrvConnect - Allocate a new console\n");
 
         /*
          * We are about to create a new console. However when ConSrvNewProcess
@@ -426,7 +426,7 @@
     }
     else /* We inherit it from the parent */
     {
-        DPRINT1("ConSrvConnect - Reuse current (parent's) console\n");
+        DPRINT("ConSrvConnect - Reuse current (parent's) console\n");
 
         /* Reuse our current console */
         Status = ConSrvInheritConsole(ProcessData,
@@ -470,7 +470,7 @@
     if ( ProcessData->Console     != NULL ||
          ProcessData->HandleTable != NULL )
     {
-        DPRINT1("ConSrvDisconnect - calling ConSrvRemoveConsole\n");
+        DPRINT("ConSrvDisconnect - calling ConSrvRemoveConsole\n");
         ConSrvRemoveConsole(ProcessData);
     }