Synchronize with trunk's revision r57629.

[reactos.git] / base / setup / usetup / cabinet.h

diff --git a/base/setup/usetup/cabinet.h b/base/setup/usetup/cabinet.h
index 711a07f..0965045 100644 (file)
--- a/base/setup/usetup/cabinet.h
+++ b/base/setup/usetup/cabinet.h
@@ -108,6 +108,8 @@ typedef struct _CAB_SEARCH
   WCHAR        Cabinet[MAX_PATH];
   USHORT       Index;
   PCFFILE      File;               // Pointer to current CFFILE
+  PCFDATA      CFData;
+  ULONG        Offset;
 } CAB_SEARCH, *PCAB_SEARCH;
 
 
@@ -166,9 +168,9 @@ typedef VOID (*PCABINET_DISK_CHANGE)(PWCHAR CabinetName,
 /* Classes */
 
 /* Default constructor */
-VOID CabinetInitialize();
+VOID CabinetInitialize(VOID);
 /* Default destructor */
-VOID CabinetCleanup();
+VOID CabinetCleanup(VOID);
 /* Returns a pointer to the filename part of a fully qualified filename */
 PWCHAR CabinetGetFileName(PWCHAR Path);
 /* Removes a filename from a fully qualified filename */
@@ -176,23 +178,25 @@ VOID CabinetRemoveFileName(PWCHAR Path);
 /* Normalizes a path */
 BOOL CabinetNormalizePath(PWCHAR Path, ULONG Length);
 /* Returns name of cabinet file */
-PWCHAR CabinetGetCabinetName();
+PWCHAR CabinetGetCabinetName(VOID);
 /* Sets the name of the cabinet file */
 VOID CabinetSetCabinetName(PWCHAR FileName);
 /* Sets destination path for extracted files */
 VOID CabinetSetDestinationPath(PWCHAR DestinationPath);
 /* Returns destination path */
-PWCHAR CabinetGetDestinationPath();
+PWCHAR CabinetGetDestinationPath(VOID);
 /* Returns zero-based current disk number */
-ULONG CabinetGetCurrentDiskNumber();
+ULONG CabinetGetCurrentDiskNumber(VOID);
 /* Opens the current cabinet file */
-ULONG CabinetOpen();
+ULONG CabinetOpen(VOID);
 /* Closes the current open cabinet file */
-VOID CabinetClose();
+VOID CabinetClose(VOID);
 /* Locates the first file in the current cabinet file that matches a search criteria */
 ULONG CabinetFindFirst(PWCHAR FileName, PCAB_SEARCH Search);
-/* Locates the next file in the current cabinet file */
+/* Locates the next file that matches the current search criteria */
 ULONG CabinetFindNext(PCAB_SEARCH Search);
+/* Locates the next file in the current cabinet file sequentially */
+ULONG CabinetFindNextFileSequential(PWCHAR FileName, PCAB_SEARCH Search);
 /* Extracts a file from the current cabinet file */
 ULONG CabinetExtractFile(PCAB_SEARCH Search);
 /* Select codec engine to use */