"Gerold J. Wucherpfennig" gjwucherpfennig@gmx.net writes:
--- dlls/cabinet/cabinet.h 14 May 2005 11:06:10 -0000 1.12 +++ dlls/cabinet/cabinet.h 8 Jun 2005 14:05:42 -0000 @@ -89,11 +89,17 @@ typedef UINT32 cab_off_t; #define cffoldCOMPTYPE_QUANTUM (0x0002) #define cffoldCOMPTYPE_LZX (0x0003) #define cfheadPREV_CABINET (0x0001) +#define cfhdrPREV_CABINET (0x0001) /* original name defined by MS */ #define cfheadNEXT_CABINET (0x0002) +#define cfhdrNEXT_CABINET (0x0002) /* original name defined by MS */ #define cfheadRESERVE_PRESENT (0x0004) +#define cfhdrRESERVE_PRESENT (0x0004) /* original name defined by MS */ #define cffileCONTINUED_FROM_PREV (0xFFFD) +#define ifoldCONTINUED_FROM_PREV (0xFFFD) /* original name defined by MS */ #define cffileCONTINUED_TO_NEXT (0xFFFE) +#define ifoldCONTINUED_TO_NEXT (0xFFFE) /* original name defined by MS */ #define cffileCONTINUED_PREV_AND_NEXT (0xFFFF) +#define ifoldCONTINUED_PREV_AND_NEXT (0xFFFF) /* original name defined by MS */
If these are the names defined by MS you should get rid of the others, there's no sense in having two different names for the same thing.
--- include/fci.h 28 Aug 2003 21:43:35 -0000 1.3 +++ include/fci.h 8 Jun 2005 14:05:54 -0000 @@ -112,15 +113,15 @@ typedef unsigned short TCOMP; */
typedef enum {
- FCIERR_NONE,
- FCIERR_OPEN_SRC,
- FCIERR_READ_SRC,
- FCIERR_ALLOC_FAIL,
- FCIERR_TEMP_FILE,
- FCIERR_BAD_COMPR_TYPE,
- FCIERR_CAB_FILE,
- FCIERR_USER_ABORT,
- FCIERR_MCI_FAIL,
- FCIERROR_NONE,
- FCIERROR_OPEN_SRC,
- FCIERROR_READ_SRC,
- FCIERROR_ALLOC_FAIL,
- FCIERROR_TEMP_FILE,
- FCIERROR_BAD_COMPR_TYPE,
- FCIERROR_CAB_FILE,
- FCIERROR_USER_ABORT,
- FCIERROR_MCI_FAIL,
The SDK header uses FCIERR, not FCIERROR. Why are you changing it?
-
Alexandre Julliard