Skip to content

W
wine-winehq
Commit cedbdf43 authored by Zebediah Figura's avatar Zebediah Figura Committed by Alexandre Julliard
Browse files
Options

setupapi: Avoid passing a NULL source root path to SetupQueueDefaultCopy() and…

setupapi: Avoid passing a NULL source root path to SetupQueueDefaultCopy() and SetupQueueCopySection(). Signed-off-by: 's avatarZebediah Figura <z.figura12@gmail.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 5d1febc9
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 2 deletions
dlls/setupapi/install.c
View file @ cedbdf43
......@@ -155,11 +155,20 @@ static WCHAR *dup_section_line_field( HINF hinf, const WCHAR *section, const WCH
static BOOL copy_files_callback( HINF hinf, PCWSTR field, void *arg )
{
struct files_callback_info *info = arg;
WCHAR src_root[MAX_PATH], *p;
if (!info->src_root)
{
strcpyW( src_root, PARSER_get_inf_filename( hinf ) );
if ((p = strrchrW( src_root, '\\' ))) *p = 0;
}
if (field[0] == '@') /* special case: copy single file */
SetupQueueDefaultCopyW( info->queue, info->layout ? info->layout : hinf, info->src_root, NULL, field+1, info->copy_flags );
SetupQueueDefaultCopyW( info->queue, info->layout ? info->layout : hinf,
info->src_root ? info->src_root : src_root, NULL, field+1, info->copy_flags );
else
SetupQueueCopySectionW( info->queue, info->src_root, info->layout ? info->layout : hinf, hinf, field, info->copy_flags );
SetupQueueCopySectionW( info->queue, info->src_root ? info->src_root : src_root,
info->layout ? info->layout : hinf, hinf, field, info->copy_flags );
return TRUE;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment