Zebediah Figura : setupapi: Pass the full cabinet path as the second parameter to SPFILENOTIFY_FILEINCABINET.
Alexandre Julliard
julliard at winehq.org
Tue Mar 9 14:55:17 CST 2021
Module: wine
Branch: master
Commit: 8cb6e9585eefd4b0c0257f549d738f6a10f0d097
URL: https://source.winehq.org/git/wine.git/?a=commit;h=8cb6e9585eefd4b0c0257f549d738f6a10f0d097
Author: Zebediah Figura <z.figura12 at gmail.com>
Date: Sun Mar 7 14:57:50 2021 -0600
setupapi: Pass the full cabinet path as the second parameter to SPFILENOTIFY_FILEINCABINET.
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/setupapi/setupcab.c | 2 +-
dlls/setupapi/tests/setupcab.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dlls/setupapi/setupcab.c b/dlls/setupapi/setupcab.c
index b63f5fbaf28..d4d475c98cb 100644
--- a/dlls/setupapi/setupcab.c
+++ b/dlls/setupapi/setupcab.c
@@ -190,7 +190,7 @@ static INT_PTR CDECL sc_FNNOTIFY_A(FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION p
fici.DosAttribs = pfdin->attribs;
memset(fici.FullTargetName, 0, MAX_PATH);
err = phsc->msghandler(phsc->context, SPFILENOTIFY_FILEINCABINET,
- (UINT_PTR)&fici, (UINT_PTR)pfdin->psz1);
+ (UINT_PTR)&fici, (UINT_PTR)phsc->last_cab);
if (err == FILEOP_DOIT) {
TRACE("Callback specified filename: %s\n", debugstr_a(fici.FullTargetName));
if (!fici.FullTargetName[0]) {
diff --git a/dlls/setupapi/tests/setupcab.c b/dlls/setupapi/tests/setupcab.c
index 458708939da..0bfab8142c2 100644
--- a/dlls/setupapi/tests/setupcab.c
+++ b/dlls/setupapi/tests/setupcab.c
@@ -350,7 +350,7 @@ static UINT CALLBACK simple_callbackA(void *context, UINT message, UINT_PTR para
GetTempPathA(ARRAY_SIZE(temp), temp);
snprintf(path, ARRAY_SIZE(path), "%s/./testcab.cab", temp);
- todo_wine ok(!strcmp((const char *)param2, path), "%u: Got file name %s.\n",
+ ok(!strcmp((const char *)param2, path), "%u: Got file name %s.\n",
index, debugstr_a((const char *)param2));
snprintf(info->FullTargetName, ARRAY_SIZE(info->FullTargetName),
@@ -458,7 +458,7 @@ static UINT CALLBACK simple_callbackW(void *context, UINT message, UINT_PTR para
GetTempPathW(ARRAY_SIZE(temp), temp);
swprintf(path, ARRAY_SIZE(path), L"%s/./testcab.cab", temp);
- todo_wine ok(!wcscmp((const WCHAR *)param2, path), "%u: Got file name %s.\n",
+ ok(!wcscmp((const WCHAR *)param2, path), "%u: Got file name %s.\n",
index, debugstr_w((const WCHAR *)param2));
swprintf(info->FullTargetName, ARRAY_SIZE(info->FullTargetName),
More information about the wine-cvs
mailing list