From aa110db3ea93c7ebab4895fe74dd9884b3835b5b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?= Date: Tue, 8 Aug 2017 14:07:17 +0000 Subject: [PATCH] [USETUP] Comment out SetupQueueCopyWNew() declaration which is not used at all. Remove unnecessary casts in the INF_OpenBufferedFileA() call. svn path=/branches/setup_improvements/; revision=75509 --- base/setup/usetup/filequeue.h | 4 +++- base/setup/usetup/usetup.c | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/base/setup/usetup/filequeue.h b/base/setup/usetup/filequeue.h index ebc05e282b7..f43ef914622 100644 --- 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 b34a7b762fd..d59a751e429 100644 --- 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); -- 2.17.1