[USETUP]

- Turn off debugging
- Fix the checkpoint print so it doesn't happen anytime a usetup progress bar reaches 50%

svn path=/trunk/; revision=55979

diff --git a/reactos/base/setup/usetup/filequeue.c b/reactos/base/setup/usetup/filequeue.c
index 760cc15..ce0b144 100644 (file)
--- a/reactos/base/setup/usetup/filequeue.c
+++ b/reactos/base/setup/usetup/filequeue.c
@@ -382,7 +382,7 @@ SetupCommitFileQueueW(HWND Owner,
       }
 
     /* FIXME: Do it! */
-    DPRINT1("'%S' ==> '%S'\n",
+    DPRINT("'%S' ==> '%S'\n",
           FileSrcPath,
           FileDstPath);
 

diff --git a/reactos/base/setup/usetup/interface/usetup.c b/reactos/base/setup/usetup/interface/usetup.c
index c7b99d0..f15efdf 100644 (file)
--- a/reactos/base/setup/usetup/interface/usetup.c
+++ b/reactos/base/setup/usetup/interface/usetup.c
@@ -3098,6 +3098,11 @@ FileCopyCallback(PVOID Context,
 
         case SPFILENOTIFY_ENDCOPY:
             CopyContext->CompletedOperations++;
+
+            /* SYSREG checkpoint */
+            if (CopyContext->TotalOperations >> 1 == CopyContext->CompletedOperations)
+                DPRINT1("CHECKPOINT:HALF_COPIED\n");
+
             ProgressNextStep(CopyContext->ProgressBar);
             SetupUpdateMemoryInfo(CopyContext, FALSE);
             break;

diff --git a/reactos/base/setup/usetup/progress.c b/reactos/base/setup/usetup/progress.c
index bd6d490..5543381 100644 (file)
--- a/reactos/base/setup/usetup/progress.c
+++ b/reactos/base/setup/usetup/progress.c
@@ -317,14 +317,6 @@ ProgressSetStep (PPROGRESSBAR Bar,
     {
       Bar->Percent = NewPercent;
 
-      /* DO NOT REMOVE THOSE LINES
-       * This might be needed by sysreg
-       */
-      if (NewPercent ==  50)
-      {
-        DPRINT1("CHECKPOINT:HALF_COPIED\n");
-      }
-
       sprintf(TextBuffer, "%-3lu%%", Bar->Percent);
 
       coPos.X = Bar->Left + (Bar->Width - 2) / 2;