James Hawkins : cabinet: Store the cab file handle before extracting files so we can

[Alexandre Julliard]

Module: wine
Branch: refs/heads/master
Commit: d57c20ac95534839a247577e470f5bb291f3da95
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=d57c20ac95534839a247577e...

Author: James Hawkins 
Date:   Mon Jan  9 20:23:15 2006 +0100

cabinet: Store the cab file handle before extracting files so we can
close the cab file even if no files are extracted.

---

dlls/cabinet/fdi.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/dlls/cabinet/fdi.c b/dlls/cabinet/fdi.c
index 1491712..20d00fd 100644
--- a/dlls/cabinet/fdi.c
+++ b/dlls/cabinet/fdi.c
@@ -2370,6 +2370,7 @@ BOOL __cdecl FDICopy(

CAB(setID) = fdici.setID;
   CAB(iCabinet) = fdici.iCabinet;
+  CAB(cabhf) = cabhf;

/* read folders */
   for (i = 0; i < fdici.cFolders; i++) {
@@ -2554,7 +2555,6 @@ BOOL __cdecl FDICopy(
       /* set up decomp_state */
       CAB(hfdi) = hfdi;
       CAB(filehf) = filehf;
-      CAB(cabhf) = cabhf;

/* Was there a change of folder?  Compression type?  Did we somehow go backwards? */
       if ((ct1 != ct2) || (CAB(current) != fol) || (file->offset < CAB(offset))) {