Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-28 19:32:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WINESYNC] !! Wine commit code removal kept for ReactOS only !!

Browse source 
setupapi: Remove implementation for LayoutInf parameter of SP_FILE_COPY_PARAMS.

Tests demonstrate that the existing implementation is not correct, and I was
unable to find an arrangement of parameters such that it was respected on
Windows. Most likely it has to do with the undocumented parameters used in
the "master" C:\windows\inf\layout.inf.

Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id ee36f923c59d9ba51b429247df90e0ed30592e62 by Zebediah Figura <z.figura12@gmail.com>
This commit is contained in:
winesync 2023-09-28 22:26:06 +02:00 committed by Hermès Bélusca-Maïto
parent 59c0527690
commit 90e557fd4e
No known key found for this signature in database
GPG key ID: 3B2539C65E7B93D0
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
dll/win32/setupapi/queue.c
View file

@ -255,7 +255,7 @@ UINT CALLBACK QUEUE_callback_WtoA( void *context, UINT notification,
return ret;
}
#ifdef __REACTOS__
/***********************************************************************
* get_src_file_info
*
@ -335,6 +335,7 @@ static void get_src_file_info( HINF hinf, struct file_op *op )
}
if (!op->src_root) op->src_root = PARSER_get_src_root(hinf);
}
#endif // __REACTOS__
static void get_source_info( HINF hinf, const WCHAR *src_file, SP_FILE_COPY_PARAMS_W *params,
WCHAR *src_root, WCHAR *src_path)
@ -573,10 +574,14 @@ BOOL WINAPI SetupQueueCopyIndirectW( PSP_FILE_COPY_PARAMS_W params )
/* some defaults */
if (!op->src_file) op->src_file = op->dst_file;
if (params->LayoutInf)
#ifdef __REACTOS__
{
get_src_file_info( params->LayoutInf, op );
if (!op->dst_path) op->dst_path = get_destination_dir( params->LayoutInf, op->dst_file );
}
#else
FIXME("Unhandled LayoutInf %p.\n", params->LayoutInf);
#endif
TRACE( "root=%s path=%s file=%s -> dir=%s file=%s descr=%s tag=%s\n",
debugstr_w(op->src_root), debugstr_w(op->src_path), debugstr_w(op->src_file),

2
sdk/tools/winesync/setupapi.cfg
View file

@ -8,4 +8,4 @@ files:
dlls/setupapi/setupcab.c: dll/win32/setupapi/setupcab.c
dlls/setupapi/stringtable.c: dll/win32/setupapi/stringtable_wine.c
tags:
wine: 466b80786fbf7ced695358af3ee87302ed00eb1b
wine: ee36f923c59d9ba51b429247df90e0ed30592e62