[ros-diffs] [hpoussin] 23865: Fix build when compilation units are enabled for usetup.c

Author: hpoussin
Date: Fri Sep  1 16:58:56 2006
New Revision: 23865

URL: http://svn.reactos.org/svn/reactos?rev=23865&view=rev
Log:
Fix build when compilation units are enabled for usetup.c

Modified:
    trunk/reactos/base/setup/usetup/filequeue.c
    trunk/reactos/base/setup/usetup/filequeue.h
    trunk/reactos/base/setup/usetup/usetup.c
    trunk/reactos/base/setup/usetup/usetup.h

Modified: trunk/reactos/base/setup/usetup/filequeue.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/filequeue...
==============================================================================
--- trunk/reactos/base/setup/usetup/filequeue.c (original)
+++ trunk/reactos/base/setup/usetup/filequeue.c Fri Sep  1 16:58:56 2006
@@ -312,15 +312,6 @@
 }

-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 @@
   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);

Modified: trunk/reactos/base/setup/usetup/filequeue.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/filequeue...
==============================================================================
--- trunk/reactos/base/setup/usetup/filequeue.h (original)
+++ trunk/reactos/base/setup/usetup/filequeue.h Fri Sep  1 16:58:56 2006
@@ -58,6 +58,14 @@
    			   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 ****************************************************************/

Modified: trunk/reactos/base/setup/usetup/usetup.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/usetup.c?...
==============================================================================
--- trunk/reactos/base/setup/usetup/usetup.c (original)
+++ trunk/reactos/base/setup/usetup/usetup.c Fri Sep  1 16:58:56 2006
@@ -69,16 +69,6 @@
   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;

Modified: trunk/reactos/base/setup/usetup/usetup.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/usetup.h?...
==============================================================================
--- trunk/reactos/base/setup/usetup/usetup.h (original)
+++ trunk/reactos/base/setup/usetup/usetup.h Fri Sep  1 16:58:56 2006
@@ -59,8 +59,8 @@
 #include "partlist.h"
 #include "inffile.h"
 #include "inicache.h"
+#include "progress.h"
 #include "filequeue.h"
-#include "progress.h"
 #include "bootsup.h"
 #include "keytrans.h"
 #include "registry.h"