[ros-diffs] [ion] 55694: Missed these guys.

ion at svn.reactos.org ion at svn.reactos.org
Sun Feb 19 02:25:31 UTC 2012


Author: ion
Date: Sun Feb 19 02:25:31 2012
New Revision: 55694

URL: http://svn.reactos.org/svn/reactos?rev=55694&view=rev
Log:
Missed these guys.

Modified:
    trunk/reactos/base/system/autochk/autochk.c
    trunk/reactos/base/system/smss2/pagefile.c
    trunk/reactos/base/system/smss2/smloop.c
    trunk/reactos/base/system/smss2/smss.c
    trunk/reactos/base/system/smss2/smsubsys.c

Modified: trunk/reactos/base/system/autochk/autochk.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/autochk/autochk.c?rev=55694&r1=55693&r2=55694&view=diff
==============================================================================
--- trunk/reactos/base/system/autochk/autochk.c [iso-8859-1] (original)
+++ trunk/reactos/base/system/autochk/autochk.c [iso-8859-1] Sun Feb 19 02:25:31 2012
@@ -326,7 +326,7 @@
     NtDrivePath[wcslen(NtDrivePath)-1] = 0;
     RtlInitUnicodeString(&DrivePathU, NtDrivePath);
 
-    DPRINT1("AUTOCHK: Checking %wZ\n", &DrivePathU);
+    DPRINT("AUTOCHK: Checking %wZ\n", &DrivePathU);
     Status = ChkdskFunc(&DrivePathU,
                         TRUE, // FixErrors
                         TRUE, // Verbose

Modified: trunk/reactos/base/system/smss2/pagefile.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss2/pagefile.c?rev=55694&r1=55693&r2=55694&view=diff
==============================================================================
--- trunk/reactos/base/system/smss2/pagefile.c [iso-8859-1] (original)
+++ trunk/reactos/base/system/smss2/pagefile.c [iso-8859-1] Sun Feb 19 02:25:31 2012
@@ -96,7 +96,7 @@
     }
 
     /* Parse the specified and get the name and arguments out of it */
-    DPRINT1("SMSS:PFILE: Paging file specifier `%wZ' \n", PageFileToken);
+    DPRINT("SMSS:PFILE: Paging file specifier `%wZ' \n", PageFileToken);
     Status = SmpParseCommandLine(PageFileToken,
                                  NULL,
                                  &PageFileName,
@@ -212,7 +212,7 @@
             /* This means no duplicates exist, so insert our descriptor! */
             InsertTailList(&SmpPagingFileDescriptorList, &Descriptor->Entry);
             SmpNumberOfPagingFiles++;
-            DPRINT1("SMSS:PFILE: Created descriptor for `%wZ' (`%wZ') \n",
+            DPRINT("SMSS:PFILE: Created descriptor for `%wZ' (`%wZ') \n",
                     PageFileToken, &Descriptor->Name);
             return STATUS_SUCCESS;
         }
@@ -241,7 +241,7 @@
     HANDLE FileHandle;
     FILE_STANDARD_INFORMATION StandardInfo;
 
-    DPRINT1("SMSS:PFILE: Trying to get size for `%wZ'\n", FileName);
+    DPRINT("SMSS:PFILE: Trying to get size for `%wZ'\n", FileName);
     Size->QuadPart = 0;
 
     InitializeObjectAttributes(&ObjectAttributes,
@@ -350,7 +350,7 @@
     VolumeName.Length = wcslen(PathString) * sizeof(WCHAR);
     VolumeName.MaximumLength = VolumeName.Length + sizeof(UNICODE_NULL);
     VolumeName.Buffer[STANDARD_DRIVE_LETTER_OFFSET] = Volume->DriveLetter;
-    DPRINT1("SMSS:PFILE: Querying volume `%wZ' for free space \n", &VolumeName);
+    DPRINT("SMSS:PFILE: Querying volume `%wZ' for free space \n", &VolumeName);
 
     /* Open the volume */
     InitializeObjectAttributes(&ObjectAttributes,
@@ -395,10 +395,6 @@
                          SizeInfo.SectorsPerAllocationUnit;
     FinalFreeSpace.QuadPart = FreeSpace.QuadPart * SizeInfo.BytesPerSector;
     Volume->FreeSpace = FinalFreeSpace;
-    DPRINT1("AUs: %I64x Sectors: %lx Bytes Per Sector: %lx\n",
-            SizeInfo.AvailableAllocationUnits.QuadPart,
-            SizeInfo.SectorsPerAllocationUnit,
-            SizeInfo.BytesPerSector);
 
     /* Check if there's less than 32MB free so we don't starve the disk */
     if (FinalFreeSpace.QuadPart <= 0x2000000)
@@ -460,7 +456,7 @@
     Status = NtCreatePagingFile(Name, MinSize, MaxSize, Priority);
     if (NT_SUCCESS(Status))
     {
-        DPRINT1("SMSS:PFILE: NtCreatePagingFile (%wZ, %I64X, %I64X) succeeded. \n",
+        DPRINT("SMSS:PFILE: NtCreatePagingFile (%wZ, %I64X, %I64X) succeeded. \n",
                 Name,
                 MinSize->QuadPart,
                 MaxSize->QuadPart);
@@ -508,7 +504,7 @@
         if (!(Descriptor->Flags & SMP_PAGEFILE_DUMP_PROCESSED))
         {
             /* Try to find a crash dump and extract it */
-            DPRINT1("SMSS:PFILE: Checking for crash dump in `%wZ' on boot volume \n",
+            DPRINT("SMSS:PFILE: Checking for crash dump in `%wZ' on boot volume \n",
                     &Descriptor->Name);
             SmpCheckForCrashDump(&Descriptor->Name);
 
@@ -521,7 +517,7 @@
             }
             else
             {
-                DPRINT1("Queried free space for boot volume `%wC: %I64x'\n",
+                DPRINT("Queried free space for boot volume `%wC: %I64x'\n",
                         Volume->DriveLetter, Volume->FreeSpace.QuadPart);
             }
 
@@ -532,7 +528,7 @@
     else
     {
         /* Crashdumps can only be on the boot volume */
-        DPRINT1("SMSS:PFILE: Skipping crash dump checking for `%wZ' on non boot"
+        DPRINT("SMSS:PFILE: Skipping crash dump checking for `%wZ' on non boot"
                 "volume `%wC' \n",
                 &Descriptor->Name,
                 Volume->DriveLetter);
@@ -545,10 +541,10 @@
     /* Check how big we can make the pagefile */
     Status = SmpGetPagingFileSize(&Descriptor->Name, &PageFileSize);
     if (PageFileSize.QuadPart > 0) ShouldDelete = TRUE;
-    DPRINT1("SMSS:PFILE: Detected size %I64X for future paging file `%wZ'\n",
+    DPRINT("SMSS:PFILE: Detected size %I64X for future paging file `%wZ'\n",
             PageFileSize,
             &Descriptor->Name);
-    DPRINT1("SMSS:PFILE: Free space on volume `%wC' is %I64X \n",
+    DPRINT("SMSS:PFILE: Free space on volume `%wC' is %I64X \n",
             Volume->DriveLetter,
             Volume->FreeSpace.QuadPart);
 
@@ -562,7 +558,7 @@
     {
         Descriptor->ActualMaxSize = PageFileSize;
     }
-    DPRINT1("SMSS:PFILE: min %I64X, max %I64X, real min %I64X \n",
+    DPRINT("SMSS:PFILE: min %I64X, max %I64X, real min %I64X \n",
             Descriptor->ActualMinSize.QuadPart,
             Descriptor->ActualMaxSize.QuadPart,
             MinimumSize->QuadPart);
@@ -697,7 +693,7 @@
     /* Capture the min and max */
     MinSize = Descriptor->MinSize.QuadPart;
     MaxSize = Descriptor->MaxSize.QuadPart;
-    DPRINT1("SMSS:PFILE: Validating sizes for `%wZ' %I64X %I64X\n",
+    DPRINT("SMSS:PFILE: Validating sizes for `%wZ' %I64X %I64X\n",
              &Descriptor->Name, MinSize, MaxSize);
 
     /* Don't let minimum be bigger than maximum */
@@ -732,7 +728,7 @@
     if (WasTooBig)
     {
         /* Notify debugger output and write a flag in the descriptor */
-        DPRINT1("SMSS:PFILE: Trimmed size of `%wZ' to maximum allowed \n",
+        DPRINT("SMSS:PFILE: Trimmed size of `%wZ' to maximum allowed \n",
                 &Descriptor->Name);
         Descriptor->Flags |= SMP_PAGEFILE_WAS_TOO_BIG;
     }
@@ -972,10 +968,6 @@
                              SizeInfo.SectorsPerAllocationUnit;
         FinalFreeSpace.QuadPart = FreeSpace.QuadPart * SizeInfo.BytesPerSector;
         Volume->FreeSpace = FinalFreeSpace;
-        DPRINT1("AUs: %I64x Sectors: %lx Bytes Per Sector: %lx\n",
-                SizeInfo.AvailableAllocationUnits.QuadPart,
-                SizeInfo.SectorsPerAllocationUnit,
-                SizeInfo.BytesPerSector);
 
         /* Check if there's less than 32MB free so we don't starve the disk */
         if (FinalFreeSpace.QuadPart <= 0x2000000)
@@ -992,7 +984,7 @@
         /* All done, add this volume to our descriptor list */
         InsertTailList(&SmpVolumeDescriptorList, &Volume->Entry);
         Volume->Flags |= SMP_VOLUME_INSERTED;
-        DPRINT1("SMSS:PFILE: Created volume descriptor for`%wZ' \n", &VolumePath);
+        DPRINT("SMSS:PFILE: Created volume descriptor for`%wZ' \n", &VolumePath);
     }
 
     /* We must've found at least the boot volume */
@@ -1045,7 +1037,7 @@
         if (Descriptor->Flags & SMP_PAGEFILE_SYSTEM_MANAGED)
         {
             /* This is a system-managed descriptor. Create the correct file */
-            DPRINT1("SMSS:PFILE: Creating a system managed paging file (`%wZ')\n",
+            DPRINT("SMSS:PFILE: Creating a system managed paging file (`%wZ')\n",
                     &Descriptor->Name);
             Status = SmpCreateSystemManagedPagingFile(Descriptor, FALSE);
             if (!NT_SUCCESS(Status))
@@ -1062,7 +1054,7 @@
             SmpValidatePagingFileSizes(Descriptor);
 
             /* Check if this is an ANY pagefile or a FIXED pagefile */
-            DPRINT1("SMSS:PFILE: Creating a normal paging file (`%wZ') \n",
+            DPRINT("SMSS:PFILE: Creating a normal paging file (`%wZ') \n",
                     &Descriptor->Name);
             if (Descriptor->Name.Buffer[STANDARD_DRIVE_LETTER_OFFSET] == L'?')
             {

Modified: trunk/reactos/base/system/smss2/smloop.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss2/smloop.c?rev=55694&r1=55693&r2=55694&view=diff
==============================================================================
--- trunk/reactos/base/system/smss2/smloop.c [iso-8859-1] (original)
+++ trunk/reactos/base/system/smss2/smloop.c [iso-8859-1] Sun Feb 19 02:25:31 2012
@@ -204,14 +204,12 @@
     if (SbApiMsg->h.ClientId.UniqueProcess == SmUniqueProcessId)
     {
         /* No need to get any handle -- assume session 0 */
-        DPRINT1("SM connecting to SM\n");
         ProcessHandle = NULL;
         SessionId = 0;
     }
     else
     {
         /* Reference the foreign process */
-        DPRINT1("Incoming request from %lx\n", SbApiMsg->h.ClientId.UniqueProcess);
         InitializeObjectAttributes(&ObjectAttributes, NULL, 0, NULL, NULL);
         Status = NtOpenProcess(&ProcessHandle,
                                PROCESS_QUERY_INFORMATION,
@@ -274,7 +272,6 @@
 
     /* Now send the actual accept reply (which could be a rejection) */
     PortView.Length = sizeof(PortView);
-    DPRINT1("Accepting: %d connection with context: %p\n", Accept, ClientContext);
     Status = NtAcceptConnectPort(&PortHandle,
                                  ClientContext,
                                  &SbApiMsg->h,
@@ -303,7 +300,6 @@
         SbApiMsg->ConnectionInfo.SbApiPortName[119] = UNICODE_NULL;
         RtlCreateUnicodeString(&SubsystemPort,
                                SbApiMsg->ConnectionInfo.SbApiPortName);
-        DPRINT1("Connecting back to %wZ\n", &SubsystemPort);
         Status = NtConnectPort(&CidSubsystem->SbApiPort,
                                &SubsystemPort,
                                &SecurityQos,
@@ -363,7 +359,6 @@
     while (TRUE)
     {
         /* Begin waiting on a request */
-        DPRINT1("API Loop: %p\n", SmApiPort);
         Status = NtReplyWaitReceivePort(SmApiPort,
                                         (PVOID*)&ClientContext,
                                         &ReplyMsg->h,
@@ -383,7 +378,6 @@
             /* A new connection */
             case LPC_CONNECTION_REQUEST:
                 /* Create the right structures for it */
-                DPRINT1("New connection request\n");
                 SmpHandleConnectionRequest(SmApiPort, (PSB_API_MSG)&RequestMsg);
                 ReplyMsg =  NULL;
                 break;
@@ -423,7 +417,6 @@
                 else
                 {
                     /* It's totally okay, so call the dispatcher for it */
-                    DPRINT1("Calling dispatcher for ID: %lx\n", RequestMsg.ApiNumber);
                     Status = SmpApiDispatch[RequestMsg.ApiNumber](&RequestMsg,
                                                                   ClientContext,
                                                                   SmApiPort);

Modified: trunk/reactos/base/system/smss2/smss.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss2/smss.c?rev=55694&r1=55693&r2=55694&view=diff
==============================================================================
--- trunk/reactos/base/system/smss2/smss.c [iso-8859-1] (original)
+++ trunk/reactos/base/system/smss2/smss.c [iso-8859-1] Sun Feb 19 02:25:31 2012
@@ -47,7 +47,6 @@
     NTSTATUS Status;
     RTL_USER_PROCESS_INFORMATION LocalProcessInfo;
     PRTL_USER_PROCESS_PARAMETERS ProcessParameters;
-    DPRINT1("Executing image: %wZ\n", FileName);
 
     /* Use the input process information if we have it, otherwise use local */
     ProcessInfo = ProcessInformation;

Modified: trunk/reactos/base/system/smss2/smsubsys.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss2/smsubsys.c?rev=55694&r1=55693&r2=55694&view=diff
==============================================================================
--- trunk/reactos/base/system/smss2/smsubsys.c [iso-8859-1] (original)
+++ trunk/reactos/base/system/smss2/smsubsys.c [iso-8859-1] Sun Feb 19 02:25:31 2012
@@ -150,7 +150,6 @@
     PVOID State;
     PSB_CREATE_PROCESS_MSG CreateProcess = &SbApiMsg.CreateProcess;
     PSB_CREATE_SESSION_MSG CreateSession = &SbApiMsg.CreateSession;
-    DPRINT1("Loading subsystem: %wZ\n", FileName);
 
     /* Make sure this is a found subsystem */
     if (Flags & SMP_INVALID_PATH)
@@ -202,7 +201,6 @@
 
     /* Allocate a new subsystem! */
     NewSubsystem = RtlAllocateHeap(SmpHeap, SmBaseTag, sizeof(SMP_SUBSYSTEM));
-    DPRINT1("new subsystem created: %p\n", NewSubsystem);
     if (!NewSubsystem)
     {
         RtlLeaveCriticalSection(&SmpKnownSubSysLock);
@@ -279,7 +277,6 @@
     else
     {
         /* This must be CSRSS itself, so just launch it and that's it */
-        DPRINT1("Executing CSRSS\n");
         Status = SmpExecuteImage(FileName,
                                  Directory,
                                  CommandLine,
@@ -314,7 +311,6 @@
             SmpWindowsSubSysProcess = ProcessInformation.ProcessHandle;
         }
         ASSERT(NT_SUCCESS(Status));
-        DPRINT1("CSRSS is up and running: %lx %lx\n", SmpWindowsSubSysProcessId, SmpWindowsSubSysProcess);
     }
     else
     {
@@ -399,7 +395,6 @@
     }
 
     /* Okay, everything looks good to go, initialize this subsystem now! */
-    DPRINT1("Resuming the subsystem!\n");
     Status = NtResumeThread(ProcessInformation.ThreadHandle, NULL);
     if (!NT_SUCCESS(Status))
     {
@@ -436,15 +431,12 @@
     else
     {
         /* This a session 0 subsystem, just wait for it to initialize */
-        DPRINT1("Waiting on the subsystem to initialize...\n");
         NtWaitForSingleObject(NewSubsystem->Event, FALSE, NULL);
-        DPRINT1("Subsystem is ready!!!\n");
     }
 
     /* Subsystem is created, resumed, and initialized. Close handles and exit */
     NtClose(ProcessInformation.ThreadHandle);
     Status = STATUS_SUCCESS;
-    DPRINT1("Returning success\n");
     goto Quickie2;
 
 Quickie:
@@ -537,7 +529,6 @@
     {
         /* Execute each one and move on */
         RegEntry = CONTAINING_RECORD(NextEntry, SMP_REGISTRY_VALUE, Entry);
-        DPRINT1("SetupExecute entry: %wZ\n", &RegEntry->Name);
         SmpExecuteCommand(&RegEntry->Name, 0, NULL, 0);
         NextEntry = NextEntry->Flink;
     }
@@ -548,7 +539,6 @@
     {
         /* Get the entry and check if this is the special Win32k entry */
         RegEntry = CONTAINING_RECORD(NextEntry, SMP_REGISTRY_VALUE, Entry);
-        DPRINT1("Subsystem: %wZ\n", &RegEntry->Name);
         if (!_wcsicmp(RegEntry->Name.Buffer, L"Kmode"))
         {
             /* Translate it */
@@ -581,7 +571,6 @@
                     AttachedSessionId = *MuSessionId;
 
                     /* Start Win32k.sys on this session */
-                    DPRINT1("Starting win32k.sys...\n");
                     RtlInitUnicodeString(&DestinationString,
                                          L"\\SystemRoot\\System32\\win32k.sys");
                     Status = NtSetSystemInformation(SystemExtendServiceTableInformation,
@@ -608,7 +597,6 @@
     {
         /* Get each entry and check if it's the internal debug or not */
         RegEntry = CONTAINING_RECORD(NextEntry, SMP_REGISTRY_VALUE, Entry);
-        DPRINT1("Subsystem (required): %wZ\n", &RegEntry->Name);
         if (_wcsicmp(RegEntry->Name.Buffer, L"debug"))
         {
             /* Load the required subsystem */
@@ -641,7 +629,6 @@
     {
         /* Get the custom initial command */
         RegEntry = CONTAINING_RECORD(NextEntry, SMP_REGISTRY_VALUE, Entry);
-        DPRINT1("Initial command found: %wZ\n", &RegEntry->Name);
 
         /* Write the initial command and wait for 5 seconds (why??!) */
         *InitialCommand = RegEntry->Name;
@@ -653,7 +640,6 @@
         /* Use the default Winlogon initial command */
         RtlInitUnicodeString(InitialCommand, L"winlogon.exe");
         InitialCommandBuffer[0] = UNICODE_NULL;
-        DPRINT1("Initial command found: %wZ\n", InitialCommand);
 
         /* Check if there's a debugger for Winlogon */
         Status2 = LdrQueryImageFileExecutionOptions(InitialCommand,
@@ -678,7 +664,6 @@
     {
         /* Execute each one */
         RegEntry = CONTAINING_RECORD(NextEntry, SMP_REGISTRY_VALUE, Entry);
-        DPRINT1("Initial command (custom): %wZ\n", &RegEntry->Name);
         SmpExecuteCommand(&RegEntry->Name, *MuSessionId, NULL, 0);
         NextEntry = NextEntry->Flink;
     }




More information about the Ros-diffs mailing list