[ros-diffs] [hbelusca] 75509: [USETUP]: Comment out SetupQueueCopyWNew() declaration which is not used at all. Remove unnecessary casts in the INF_OpenBufferedFileA() call.

Author: hbelusca
Date: Tue Aug  8 14:07:17 2017
New Revision: 75509

URL: http://svn.reactos.org/svn/reactos?rev=75509&view=rev
Log:
[USETUP]: Comment out SetupQueueCopyWNew() declaration which is not used at all. Remove
unnecessary casts in the INF_OpenBufferedFileA() call.

Modified:
    branches/setup_improvements/base/setup/usetup/filequeue.h
    branches/setup_improvements/base/setup/usetup/interface/usetup.c

Modified: branches/setup_improvements/base/setup/usetup/filequeue.h
URL:
http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u…
==============================================================================
--- branches/setup_improvements/base/setup/usetup/filequeue.h	[iso-8859-1] (original)
+++ branches/setup_improvements/base/setup/usetup/filequeue.h	[iso-8859-1] Tue Aug  8
14:07:17 2017
@@ -60,7 +60,7 @@
 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 @@
 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 @@
     IN PCWSTR TargetDirectory,
     IN PCWSTR TargetFileName,
     IN DWORD CopyStyle);
+#endif
 
 BOOL
 SetupQueueCopy(

Modified: branches/setup_improvements/base/setup/usetup/interface/usetup.c
URL:
http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u…
==============================================================================
--- branches/setup_improvements/base/setup/usetup/interface/usetup.c	[iso-8859-1]
(original)
+++ branches/setup_improvements/base/setup/usetup/interface/usetup.c	[iso-8859-1] Tue Aug 
8 14:07:17 2017
@@ -3906,9 +3906,9 @@
             return QUIT_PAGE;
         }
 
-        InfHandle = INF_OpenBufferedFileA((CHAR*) InfFileData,
+        InfHandle = INF_OpenBufferedFileA((PSTR)InfFileData,
                                           InfFileSize,
-                                          (const CHAR*) NULL,
+                                          NULL,
                                           INF_STYLE_WIN4,
                                           LanguageId,
                                           &ErrorLine);