Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-10-01 23:14:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix build when compilation units are enabled for usetup.c

Browse source 
svn path=/trunk/; revision=23865
This commit is contained in:
Hervé Poussineau 2006-09-01 12:58:56 +00:00
parent 5244a29dad
commit 562f8391e8
4 changed files with 9 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
reactos/base/setup/usetup/filequeue.c
View file

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

8
reactos/base/setup/usetup/filequeue.h
View file

@ -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 ****************************************************************/

10
reactos/base/setup/usetup/usetup.c
View file

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

2
reactos/base/setup/usetup/usetup.h
View file

@ -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"