Zebediah Figura : setupapi: Use SetupInstallFilesFromInfSectionW() in SetupInstallFromInfSectionW().
Alexandre Julliard
julliard at winehq.org
Mon Feb 7 15:56:06 CST 2022
Module: wine
Branch: master
Commit: 49c76f99fc5d492562bf05253c64003d325b9bca
URL: https://source.winehq.org/git/wine.git/?a=commit;h=49c76f99fc5d492562bf05253c64003d325b9bca
Author: Zebediah Figura <zfigura at codeweavers.com>
Date: Sun Feb 6 22:53:34 2022 -0600
setupapi: Use SetupInstallFilesFromInfSectionW() in SetupInstallFromInfSectionW().
Signed-off-by: Zebediah Figura <zfigura at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/setupapi/install.c | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
diff --git a/dlls/setupapi/install.c b/dlls/setupapi/install.c
index 58a19fa8a68..3a72c5f527d 100644
--- a/dlls/setupapi/install.c
+++ b/dlls/setupapi/install.c
@@ -1088,17 +1088,10 @@ BOOL WINAPI SetupInstallFromInfSectionW( HWND owner, HINF hinf, PCWSTR section,
}
if (flags & SPINST_FILES)
{
- struct files_callback_info info;
HSPFILEQ queue;
if (!(queue = SetupOpenFileQueue())) return FALSE;
- info.queue = queue;
- info.src_root = src_root;
- info.copy_flags = copy_flags;
- info.layout = hinf;
- ret = (iterate_section_fields( hinf, section, L"CopyFiles", copy_files_callback, &info ) &&
- iterate_section_fields( hinf, section, L"DelFiles", delete_files_callback, &info ) &&
- iterate_section_fields( hinf, section, L"RenFiles", rename_files_callback, &info ) &&
+ ret = (SetupInstallFilesFromInfSectionW( hinf, NULL, queue, section, src_root, copy_flags ) &&
SetupCommitFileQueueW( owner, queue, callback, context ));
SetupCloseFileQueue( queue );
if (!ret) return FALSE;
More information about the wine-cvs
mailing list