Fix build when compilation units are enabled for usetup.c

svn path=/trunk/; revision=23865

diff --git a/reactos/base/setup/usetup/filequeue.c b/reactos/base/setup/usetup/filequeue.c
index 01a04b7..aac989a 100644 (file)
--- a/reactos/base/setup/usetup/filequeue.c
+++ b/reactos/base/setup/usetup/filequeue.c
@@ -312,15 +312,6 @@ SetupQueueCopy(HSPFILEQ QueueHandle,
 }
 
 
-typedef struct _COPYCONTEXT
-{
-  LPCWSTR DestinationRootPath; /* Not owned by this structure */
-  LPCWSTR InstallPath; /* Not owned by this structure */
-  ULONG TotalOperations;
-  ULONG CompletedOperations;
-  PPROGRESSBAR ProgressBar;
-} COPYCONTEXT, *PCOPYCONTEXT;
-
 BOOL WINAPI
 SetupCommitFileQueueW(HWND Owner,
                     HSPFILEQ QueueHandle,
@@ -336,11 +327,8 @@ SetupCommitFileQueueW(HWND Owner,
   WCHAR FileSrcPath[MAX_PATH];
   WCHAR FileDstPath[MAX_PATH];
 
-  DPRINT1("Context %p\n", Context);
   TargetRootPath = ((PCOPYCONTEXT)Context)->DestinationRootPath;
-  DPRINT1("TargetRootPath %S\n", TargetRootPath);
   TargetPath = ((PCOPYCONTEXT)Context)->InstallPath;
-  DPRINT1("TargetPath %S\n", TargetPath);
 
   if (QueueHandle == NULL)
     return(FALSE);

diff --git a/reactos/base/setup/usetup/filequeue.h b/reactos/base/setup/usetup/filequeue.h
index cdc41df..d8e1579 100644 (file)
--- a/reactos/base/setup/usetup/filequeue.h
+++ b/reactos/base/setup/usetup/filequeue.h
@@ -58,6 +58,14 @@ typedef UINT (CALLBACK* PSP_FILE_CALLBACK_W)(PVOID Context,
                                   UINT_PTR Param1,
                                   UINT_PTR Param2);
 
+typedef struct _COPYCONTEXT
+{
+  LPCWSTR DestinationRootPath; /* Not owned by this structure */
+  LPCWSTR InstallPath; /* Not owned by this structure */
+  ULONG TotalOperations;
+  ULONG CompletedOperations;
+  PPROGRESSBAR ProgressBar;
+} COPYCONTEXT, *PCOPYCONTEXT;
 
 /* FUNCTIONS ****************************************************************/
 

diff --git a/reactos/base/setup/usetup/usetup.c b/reactos/base/setup/usetup/usetup.c
index 6dddf98..681fb19 100644 (file)
--- a/reactos/base/setup/usetup/usetup.c
+++ b/reactos/base/setup/usetup/usetup.c
@@ -69,16 +69,6 @@ typedef enum _PAGE_NUMBER
   REBOOT_PAGE,                 /* virtual page */
 } PAGE_NUMBER, *PPAGE_NUMBER;
 
-typedef struct _COPYCONTEXT
-{
-  LPCWSTR DestinationRootPath; /* Not owned by this structure */
-  LPCWSTR InstallPath; /* Not owned by this structure */
-  ULONG TotalOperations;
-  ULONG CompletedOperations;
-  PPROGRESSBAR ProgressBar;
-} COPYCONTEXT, *PCOPYCONTEXT;
-
-
 /* GLOBALS ******************************************************************/
 
 HANDLE ProcessHeap;

diff --git a/reactos/base/setup/usetup/usetup.h b/reactos/base/setup/usetup/usetup.h
index 78380ae..b309bee 100644 (file)
--- a/reactos/base/setup/usetup/usetup.h
+++ b/reactos/base/setup/usetup/usetup.h
@@ -59,8 +59,8 @@
 #include "partlist.h"
 #include "inffile.h"
 #include "inicache.h"
-#include "filequeue.h"
 #include "progress.h"
+#include "filequeue.h"
 #include "bootsup.h"
 #include "keytrans.h"
 #include "registry.h"