[USETUP] Comment out SetupQueueCopyWNew() declaration which is not used at all. Remov...

svn path=/branches/setup_improvements/; revision=75509

diff --git a/base/setup/usetup/filequeue.h b/base/setup/usetup/filequeue.h
index ebc05e2..f43ef91 100644 (file)
--- a/base/setup/usetup/filequeue.h
+++ b/base/setup/usetup/filequeue.h
@@ -60,7 +60,7 @@ typedef UINT (CALLBACK* PSP_FILE_CALLBACK_W)(
 typedef struct _COPYCONTEXT
 {
     LPCWSTR DestinationRootPath; /* Not owned by this structure */
-    LPCWSTR InstallPath; /* Not owned by this structure */
+    LPCWSTR InstallPath;         /* Not owned by this structure */
     ULONG TotalOperations;
     ULONG CompletedOperations;
     PPROGRESSBAR ProgressBar;
@@ -78,6 +78,7 @@ WINAPI
 SetupCloseFileQueue(
     IN HSPFILEQ QueueHandle);
 
+#if 0 // This is the API that is declared in setupapi.h and exported by setupapi.dll
 BOOL
 WINAPI
 SetupQueueCopyWNew(
@@ -90,6 +91,7 @@ SetupQueueCopyWNew(
     IN PCWSTR TargetDirectory,
     IN PCWSTR TargetFileName,
     IN DWORD CopyStyle);
+#endif
 
 BOOL
 SetupQueueCopy(

diff --git a/base/setup/usetup/usetup.c b/base/setup/usetup/usetup.c
index b34a7b7..d59a751 100644 (file)
--- a/base/setup/usetup/usetup.c
+++ b/base/setup/usetup/usetup.c
@@ -4078,9 +4078,9 @@ PrepareCopyPage(PINPUT_RECORD Ir)
             return QUIT_PAGE;
         }
 
-        InfHandle = INF_OpenBufferedFileA((CHAR*) InfFileData,
+        InfHandle = INF_OpenBufferedFileA((PSTR)InfFileData,
                                           InfFileSize,
-                                          (const CHAR*) NULL,
+                                          NULL,
                                           INF_STYLE_WIN4,
                                           LanguageId,
                                           &ErrorLine);