From 090f1b629b24d23678ed57bf31ef66e5db31ae56 Mon Sep 17 00:00:00 2001 From: winesync Date: Thu, 28 Sep 2023 21:34:50 +0200 Subject: [PATCH] [WINESYNC] setupapi: Extract individual files from cabinets. Signed-off-by: Zebediah Figura Signed-off-by: Alexandre Julliard wine commit id fccb7552ebe81ea2c0c17bc747a920f90e2537a5 by Zebediah Figura NOTE: Already committed in ReactOS in commit 5c8ec78b7 (PR #5233). --- dll/win32/setupapi/queue.c | 4 ++-- sdk/tools/winesync/setupapi.cfg | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dll/win32/setupapi/queue.c b/dll/win32/setupapi/queue.c index 80c50becc9e..1371d406df7 100644 --- a/dll/win32/setupapi/queue.c +++ b/dll/win32/setupapi/queue.c @@ -381,7 +381,7 @@ static UINT WINAPI extract_cab_cb( void *arg, UINT message, UINT_PTR param1, UIN if (lstrcmpiW( filename, ctx->src )) return FILEOP_SKIP; - + strcpyW( info->FullTargetName, ctx->dst ); return FILEOP_DOIT; } @@ -416,8 +416,8 @@ static BOOL extract_cabinet_file( const WCHAR *cabinet, const WCHAR *root, static const WCHAR extW[] = {'.','c','a','b',0}; #endif static const WCHAR backslashW[] = {'\\',0}; - WCHAR path[MAX_PATH]; struct extract_cab_ctx ctx = {src, dst}; + WCHAR path[MAX_PATH]; #ifdef __REACTOS__ TRACE("extract_cabinet_file(cab = '%s' ; root = '%s' ; src = '%s' ; dst = '%s')\n", diff --git a/sdk/tools/winesync/setupapi.cfg b/sdk/tools/winesync/setupapi.cfg index 8a3678e555a..06994318d06 100644 --- a/sdk/tools/winesync/setupapi.cfg +++ b/sdk/tools/winesync/setupapi.cfg @@ -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: 7204f0f67f9fbd8765fce86c4195269c4f5aa876 + wine: fccb7552ebe81ea2c0c17bc747a920f90e2537a5