system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-11-05 18:01:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

setupapi: Set the CabinetFile field to the name of the next cabinet.

Browse source 
Verified through manual testing.

Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Zebediah Figura 2021-03-07 14:57:48 -06:00 committed by Alexandre Julliard
parent 978cc1d856
commit 811da7bf1a
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
dlls/setupapi/setupcab.c
View file

@ -166,9 +166,9 @@ static INT_PTR CDECL sc_FNNOTIFY_A(FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION p
switch (fdint) {
case fdintCABINET_INFO:
TRACE("New cabinet, path %s, set %u, number %u, next disk %s.\n",
debugstr_a(pfdin->psz3), pfdin->setID, pfdin->iCabinet, debugstr_a(pfdin->psz2));
ci.CabinetFile = phsc->most_recent_cabinet_name;
TRACE("New cabinet, path %s, set %u, number %u, next disk %s, next cabinet %s.\n",
debugstr_a(pfdin->psz3), pfdin->setID, pfdin->iCabinet, debugstr_a(pfdin->psz2), debugstr_a(pfdin->psz1));
ci.CabinetFile = pfdin->psz1;
ci.CabinetPath = pfdin->psz3;
ci.DiskName = pfdin->psz2;
ci.SetId = pfdin->setID;

4
dlls/setupapi/tests/setupcab.c
View file

@ -324,7 +324,7 @@ static UINT CALLBACK simple_callbackA(void *context, UINT message, UINT_PTR para
GetTempPathA(ARRAY_SIZE(temp), temp);
ok(!strcmp(info->CabinetPath, temp), "Got path %s.\n", debugstr_a(info->CabinetPath));
todo_wine ok(!info->CabinetFile[0], "Got file %s.\n", debugstr_a(info->CabinetFile));
ok(!info->CabinetFile[0], "Got file %s.\n", debugstr_a(info->CabinetFile));
ok(!info->DiskName[0], "Got disk name %s.\n", debugstr_a(info->DiskName));
ok(!info->SetId, "Got set ID %#x.\n", info->SetId);
ok(!info->CabinetNumber, "Got cabinet number %u.\n", info->CabinetNumber);
@ -432,7 +432,7 @@ static UINT CALLBACK simple_callbackW(void *context, UINT message, UINT_PTR para
GetTempPathW(ARRAY_SIZE(temp), temp);
ok(!wcscmp(info->CabinetPath, temp), "Got path %s.\n", debugstr_w(info->CabinetPath));
todo_wine ok(!info->CabinetFile[0], "Got file %s.\n", debugstr_w(info->CabinetFile));
ok(!info->CabinetFile[0], "Got file %s.\n", debugstr_w(info->CabinetFile));
ok(!info->DiskName[0], "Got disk name %s.\n", debugstr_w(info->DiskName));
ok(!info->SetId, "Got set ID %#x.\n", info->SetId);
ok(!info->CabinetNumber, "Got cabinet number %u.\n", info->CabinetNumber);