| fci.h (6.0.6001.18000-Windows 6.0) | | fci.h (6.1.7601.17514-Windows 7.0) |
| | |
| skipping to change at line 365 | | skipping to change at line 365 |
| * fContinuation - true if this is a later segment of a continued file | | * fContinuation - true if this is a later segment of a continued file |
| * pv - the context of the client | | * pv - the context of the client |
| * | | * |
| * Exit-Success: | | * Exit-Success: |
| * return value anything but -1 | | * return value anything but -1 |
| * | | * |
| * Exit-Failure: | | * Exit-Failure: |
| * return value -1 means to abort | | * return value -1 means to abort |
| */ | | */ |
| typedef int (DIAMONDAPI *PFNFCIFILEPLACED)(PCCAB pccab, | | typedef int (DIAMONDAPI *PFNFCIFILEPLACED)(PCCAB pccab, |
|
| __in char *pszFile, | | __in LPSTR pszFile, |
| long cbFile, | | long cbFile, |
| BOOL fContinuation, | | BOOL fContinuation, |
| void FAR *pv); /* pfnfcifp */ | | void FAR *pv); /* pfnfcifp */ |
| | |
| #define FNFCIFILEPLACED(fn) int DIAMONDAPI fn(PCCAB pccab, \ | | #define FNFCIFILEPLACED(fn) int DIAMONDAPI fn(PCCAB pccab, \ |
|
| __in char *pszFile, \ | | __in LPSTR pszFile, \ |
| long cbFile, \ | | long cbFile, \ |
| BOOL fContinuation, \ | | BOOL fContinuation, \ |
| void FAR *pv) | | void FAR *pv) |
| | |
| /*** FNCDIGETOPENINFO - Open source file, get date/time/attribs | | /*** FNCDIGETOPENINFO - Open source file, get date/time/attribs |
| * | | * |
| * Entry: | | * Entry: |
| * pszName -- complete path to filename | | * pszName -- complete path to filename |
| * pdate -- location to return FAT-style date code | | * pdate -- location to return FAT-style date code |
| * ptime -- location to return FAT-style time code | | * ptime -- location to return FAT-style time code |
| * pattribs -- location to return FAT-style attributes | | * pattribs -- location to return FAT-style attributes |
| * pv -- client's context | | * pv -- client's context |
| * | | * |
| * Exit-Success: | | * Exit-Success: |
| * Return value is file handle of open file to read | | * Return value is file handle of open file to read |
| * | | * |
| * Exit-Failure: | | * Exit-Failure: |
| * Return value is -1 | | * Return value is -1 |
| */ | | */ |
|
| typedef INT_PTR (DIAMONDAPI *PFNFCIGETOPENINFO)(__in char *pszName, | | typedef INT_PTR (DIAMONDAPI *PFNFCIGETOPENINFO)(__in LPSTR pszName, |
| USHORT *pdate, | | USHORT *pdate, |
| USHORT *ptime, | | USHORT *ptime, |
| USHORT *pattribs, | | USHORT *pattribs, |
| int FAR *err, | | int FAR *err, |
| void FAR *pv); /* pfnfcigoi */ | | void FAR *pv); /* pfnfcigoi */ |
| | |
|
| #define FNFCIGETOPENINFO(fn) INT_PTR DIAMONDAPI fn(__in char *pszName, \ | | #define FNFCIGETOPENINFO(fn) INT_PTR DIAMONDAPI fn(__in LPSTR pszName, \ |
| USHORT *pdate, \ | | USHORT *pdate, \ |
| USHORT *ptime, \ | | USHORT *ptime, \ |
| USHORT *pattribs, \ | | USHORT *pattribs, \ |
| int FAR *err, \ | | int FAR *err, \ |
| void FAR *pv) | | void FAR *pv) |
| | |
| /*** FNFCISTATUS - Status/Cabinet Size callback | | /*** FNFCISTATUS - Status/Cabinet Size callback |
| * | | * |
| * Entry: | | * Entry: |
| * typeStatus == statusFile if compressing a block into a folder | | * typeStatus == statusFile if compressing a block into a folder |
| | |
| skipping to change at line 469 | | skipping to change at line 469 |
| * Exit-Failure: | | * Exit-Failure: |
| * return FALSE; could not create tempfile, or buffer too small | | * return FALSE; could not create tempfile, or buffer too small |
| * | | * |
| * Note: | | * Note: |
| * It is conceivable that this function may return a filename | | * It is conceivable that this function may return a filename |
| * that will already exist by the time it is opened. For this | | * that will already exist by the time it is opened. For this |
| * reason, the caller should make several attempts to create | | * reason, the caller should make several attempts to create |
| * temporary files before giving up. | | * temporary files before giving up. |
| */ | | */ |
| typedef BOOL (DIAMONDAPI *PFNFCIGETTEMPFILE)(__out_bcount(cbTempName) char *pszT
empName, | | typedef BOOL (DIAMONDAPI *PFNFCIGETTEMPFILE)(__out_bcount(cbTempName) char *pszT
empName, |
|
| int cbTempName, | | __in_range(>=, MAX_PATH) int cbTe
mpName, |
| void FAR *pv); /* pfnfcigtf */ | | void FAR *pv); /* pfnfcigtf */ |
| | |
| #define FNFCIGETTEMPFILE(fn) BOOL DIAMONDAPI fn(__out_bcount(cbTempName) char *p
szTempName, \ | | #define FNFCIGETTEMPFILE(fn) BOOL DIAMONDAPI fn(__out_bcount(cbTempName) char *p
szTempName, \ |
|
| int cbTempName, \ | | __in_range(>=, MAX_PATH) int c
bTempName, \ |
| void FAR *pv) | | void FAR *pv) |
| | |
| /*** FCICreate -- create an FCI context (an open CAB, an open FOL) | | /*** FCICreate -- create an FCI context (an open CAB, an open FOL) |
| * | | * |
| * Entry: | | * Entry: |
| * perf - structure where we return error codes | | * perf - structure where we return error codes |
| * pfnfcifp - callback to inform caller of eventual dest of files | | * pfnfcifp - callback to inform caller of eventual dest of files |
| * pfna - memory allocation function callback | | * pfna - memory allocation function callback |
| * pfnf - memory free function callback | | * pfnf - memory free function callback |
| * pfnfcigtf - temp file name generator callback | | * pfnfcigtf - temp file name generator callback |
| | |
| End of changes. 6 change blocks. |
| 6 lines changed or deleted | | 6 lines changed or added |
|
| fdi.h (6.0.6001.18000-Windows 6.0) | | fdi.h (6.1.7601.17514-Windows 7.0) |
| | |
| skipping to change at line 617 | | skipping to change at line 617 |
| */ | | */ |
| //** Memory functions for FDI | | //** Memory functions for FDI |
| typedef void HUGE * (FAR DIAMONDAPI *PFNALLOC)(ULONG cb); /* pfna */ | | typedef void HUGE * (FAR DIAMONDAPI *PFNALLOC)(ULONG cb); /* pfna */ |
| #define FNALLOC(fn) void HUGE * FAR DIAMONDAPI fn(ULONG cb) | | #define FNALLOC(fn) void HUGE * FAR DIAMONDAPI fn(ULONG cb) |
| | |
| typedef void (FAR DIAMONDAPI *PFNFREE)(__in_opt void HUGE *pv); /* pfnf */ | | typedef void (FAR DIAMONDAPI *PFNFREE)(__in_opt void HUGE *pv); /* pfnf */ |
| #define FNFREE(fn) void FAR DIAMONDAPI fn(__in_opt void HUGE *pv) | | #define FNFREE(fn) void FAR DIAMONDAPI fn(__in_opt void HUGE *pv) |
| | |
| //** File I/O functions for FDI | | //** File I/O functions for FDI |
| typedef INT_PTR (FAR DIAMONDAPI *PFNOPEN) (__in LPSTR pszFile, int oflag, int pm
ode); | | typedef INT_PTR (FAR DIAMONDAPI *PFNOPEN) (__in LPSTR pszFile, int oflag, int pm
ode); |
|
| typedef UINT (FAR DIAMONDAPI *PFNREAD) (__in INT_PTR hf, __out_ecount(cb) void F | | typedef UINT (FAR DIAMONDAPI *PFNREAD) (__in INT_PTR hf, __out_bcount(cb) void F |
| AR *pv, UINT cb); | | AR *pv, UINT cb); |
| typedef UINT (FAR DIAMONDAPI *PFNWRITE)(__in INT_PTR hf, __in_ecount(cb) void FA | | typedef UINT (FAR DIAMONDAPI *PFNWRITE)(__in INT_PTR hf, __in_bcount(cb) void FA |
| R *pv, UINT cb); | | R *pv, UINT cb); |
| typedef int (FAR DIAMONDAPI *PFNCLOSE)(__in INT_PTR hf); | | typedef int (FAR DIAMONDAPI *PFNCLOSE)(__in INT_PTR hf); |
| typedef long (FAR DIAMONDAPI *PFNSEEK) (__in INT_PTR hf, long dist, int seektype
); | | typedef long (FAR DIAMONDAPI *PFNSEEK) (__in INT_PTR hf, long dist, int seektype
); |
| | |
| #define FNOPEN(fn) INT_PTR FAR DIAMONDAPI fn(__in LPSTR pszFile, int oflag, int
pmode) | | #define FNOPEN(fn) INT_PTR FAR DIAMONDAPI fn(__in LPSTR pszFile, int oflag, int
pmode) |
|
| #define FNREAD(fn) UINT FAR DIAMONDAPI fn(__in INT_PTR hf, __out_ecount(cb) void | | #define FNREAD(fn) UINT FAR DIAMONDAPI fn(__in INT_PTR hf, __out_bcount(cb) void |
| FAR *pv, UINT cb) | | FAR *pv, UINT cb) |
| #define FNWRITE(fn) UINT FAR DIAMONDAPI fn(__in INT_PTR hf, __in_ecount(cb) void | | #define FNWRITE(fn) UINT FAR DIAMONDAPI fn(__in INT_PTR hf, __in_bcount(cb) void |
| FAR *pv, UINT cb) | | FAR *pv, UINT cb) |
| #define FNCLOSE(fn) int FAR DIAMONDAPI fn(__in INT_PTR hf) | | #define FNCLOSE(fn) int FAR DIAMONDAPI fn(__in INT_PTR hf) |
| #define FNSEEK(fn) long FAR DIAMONDAPI fn(__in INT_PTR hf, long dist, int seekty
pe) | | #define FNSEEK(fn) long FAR DIAMONDAPI fn(__in INT_PTR hf, long dist, int seekty
pe) |
| | |
| /*** PFNFDIDECRYPT - FDI Decryption callback | | /*** PFNFDIDECRYPT - FDI Decryption callback |
| * | | * |
| * If this function is passed on the FDICopy() call, then FDI calls it | | * If this function is passed on the FDICopy() call, then FDI calls it |
| * at various times to update the decryption state and to decrypt FCDATA | | * at various times to update the decryption state and to decrypt FCDATA |
| * blocks. | | * blocks. |
| * | | * |
| * Common Entry Conditions: | | * Common Entry Conditions: |
| | |
| End of changes. 2 change blocks. |
| 8 lines changed or deleted | | 8 lines changed or added |
|