Skip to content

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

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

Verified through manual testing. Signed-off-by: 's avatarZebediah Figura <z.figura12@gmail.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 978cc1d8
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
dlls/setupapi/setupcab.c
View file @ 811da7bf
...@@ -166,9 +166,9 @@ static INT_PTR CDECL sc_FNNOTIFY_A(FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION p ...@@ -166,9 +166,9 @@ static INT_PTR CDECL sc_FNNOTIFY_A(FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION p
switch (fdint) { switch (fdint) {
case fdintCABINET_INFO: case fdintCABINET_INFO:
TRACE("New cabinet, path %s, set %u, number %u, next disk %s.\n", 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->psz3), pfdin->setID, pfdin->iCabinet, debugstr_a(pfdin->psz2), debugstr_a(pfdin->psz1));
ci.CabinetFile = phsc->most_recent_cabinet_name; ci.CabinetFile = pfdin->psz1;
ci.CabinetPath = pfdin->psz3; ci.CabinetPath = pfdin->psz3;
ci.DiskName = pfdin->psz2; ci.DiskName = pfdin->psz2;
ci.SetId = pfdin->setID; ci.SetId = pfdin->setID;
......
dlls/setupapi/tests/setupcab.c
View file @ 811da7bf
...@@ -324,7 +324,7 @@ static UINT CALLBACK simple_callbackA(void *context, UINT message, UINT_PTR para ...@@ -324,7 +324,7 @@ static UINT CALLBACK simple_callbackA(void *context, UINT message, UINT_PTR para
GetTempPathA(ARRAY_SIZE(temp), temp); GetTempPathA(ARRAY_SIZE(temp), temp);
ok(!strcmp(info->CabinetPath, temp), "Got path %s.\n", debugstr_a(info->CabinetPath)); 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->DiskName[0], "Got disk name %s.\n", debugstr_a(info->DiskName));
ok(!info->SetId, "Got set ID %#x.\n", info->SetId); ok(!info->SetId, "Got set ID %#x.\n", info->SetId);
ok(!info->CabinetNumber, "Got cabinet number %u.\n", info->CabinetNumber); 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 ...@@ -432,7 +432,7 @@ static UINT CALLBACK simple_callbackW(void *context, UINT message, UINT_PTR para
GetTempPathW(ARRAY_SIZE(temp), temp); GetTempPathW(ARRAY_SIZE(temp), temp);
ok(!wcscmp(info->CabinetPath, temp), "Got path %s.\n", debugstr_w(info->CabinetPath)); 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->DiskName[0], "Got disk name %s.\n", debugstr_w(info->DiskName));
ok(!info->SetId, "Got set ID %#x.\n", info->SetId); ok(!info->SetId, "Got set ID %#x.\n", info->SetId);
ok(!info->CabinetNumber, "Got cabinet number %u.\n", info->CabinetNumber); ok(!info->CabinetNumber, "Got cabinet number %u.\n", info->CabinetNumber);
......
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