Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-07 05:05:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

sync cabinet headers with wine 1.1.13

Browse source 
svn path=/trunk/; revision=38835
This commit is contained in:
Christoph von Wittich 2009-01-17 19:14:53 +00:00
parent 035d92f2c6
commit 58bd8bc9f9
2 changed files with 22 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
reactos/include/psdk/fci.h
View file

@ -13,12 +13,14 @@
* *
* You should have received a copy of the GNU Lesser General Public * You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software * License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#ifndef __WINE_FCI_H #ifndef __WINE_FCI_H
#define __WINE_FCI_H #define __WINE_FCI_H
#include <basetsd.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif /* defined(__cplusplus) */ #endif /* defined(__cplusplus) */
@ -32,10 +34,10 @@ extern "C" {
* Common FCI/TDI declarations * Common FCI/TDI declarations
*/ */
typedef unsigned long CHECKSUM; typedef ULONG CHECKSUM;
typedef unsigned long UOFF; typedef ULONG UOFF;
typedef unsigned long COFF; typedef ULONG COFF;
/**********************************************************************/ /**********************************************************************/
@ -161,7 +163,7 @@ typedef struct {
/**********************************************************************/ /**********************************************************************/
typedef void * (__cdecl *PFNFCIALLOC)(ULONG cb); typedef void * (__cdecl __WINE_ALLOC_SIZE(1) *PFNFCIALLOC)(ULONG cb);
#define FNFCIALLOC(fn) void * __cdecl fn(ULONG cb) #define FNFCIALLOC(fn) void * __cdecl fn(ULONG cb)
typedef void (__cdecl *PFNFCIFREE)(void *memory); typedef void (__cdecl *PFNFCIFREE)(void *memory);
@ -179,8 +181,8 @@ typedef UINT (__cdecl *PFNFCIWRITE)(INT_PTR hf, void *memory, UINT cb, int *err,
typedef int (__cdecl *PFNFCICLOSE)(INT_PTR hf, int *err, void *pv); typedef int (__cdecl *PFNFCICLOSE)(INT_PTR hf, int *err, void *pv);
#define FNFCICLOSE(fn) int __cdecl fn(INT_PTR hf, int *err, void *pv) #define FNFCICLOSE(fn) int __cdecl fn(INT_PTR hf, int *err, void *pv)
typedef long (__cdecl *PFNFCISEEK) (INT_PTR hf, long dist, int seektype, int *err, void *pv); typedef LONG (__cdecl *PFNFCISEEK) (INT_PTR hf, LONG dist, int seektype, int *err, void *pv);
#define FNFCISEEK(fn) long __cdecl fn(INT_PTR hf, long dist, int seektype, int *err, void *pv) #define FNFCISEEK(fn) LONG __cdecl fn(INT_PTR hf, LONG dist, int seektype, int *err, void *pv)
typedef int (__cdecl *PFNFCIDELETE) (char *pszFile, int *err, void *pv); typedef int (__cdecl *PFNFCIDELETE) (char *pszFile, int *err, void *pv);
#define FNFCIDELETE(fn) int __cdecl fn(char *pszFile, int *err, void *pv) #define FNFCIDELETE(fn) int __cdecl fn(char *pszFile, int *err, void *pv)
@ -192,12 +194,12 @@ typedef BOOL (__cdecl *PFNFCIGETNEXTCABINET)(PCCAB pccab, ULONG cbPrevCab, void
typedef int (__cdecl *PFNFCIFILEPLACED)(PCCAB pccab, typedef int (__cdecl *PFNFCIFILEPLACED)(PCCAB pccab,
char *pszFile, char *pszFile,
long cbFile, LONG cbFile,
BOOL fContinuation, BOOL fContinuation,
void *pv); void *pv);
#define FNFCIFILEPLACED(fn) int __cdecl fn(PCCAB pccab, \ #define FNFCIFILEPLACED(fn) int __cdecl fn(PCCAB pccab, \
char *pszFile, \ char *pszFile, \
long cbFile, \ LONG cbFile, \
BOOL fContinuation, \ BOOL fContinuation, \
void *pv) void *pv)
@ -218,11 +220,11 @@ typedef INT_PTR (__cdecl *PFNFCIGETOPENINFO)(char *pszName,
#define statusFolder 1 /* Add Folder to Cabinet callback */ #define statusFolder 1 /* Add Folder to Cabinet callback */
#define statusCabinet 2 /* Write out a completed cabinet callback */ #define statusCabinet 2 /* Write out a completed cabinet callback */
typedef long (__cdecl *PFNFCISTATUS)(UINT typeStatus, typedef LONG (__cdecl *PFNFCISTATUS)(UINT typeStatus,
ULONG cb1, ULONG cb1,
ULONG cb2, ULONG cb2,
void *pv); void *pv);
#define FNFCISTATUS(fn) long __cdecl fn(UINT typeStatus, \ #define FNFCISTATUS(fn) LONG __cdecl fn(UINT typeStatus, \
ULONG cb1, \ ULONG cb1, \
ULONG cb2, \ ULONG cb2, \
void *pv) void *pv)

18
reactos/include/psdk/fdi.h
View file

@ -13,7 +13,7 @@
* *
* You should have received a copy of the GNU Lesser General Public * You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software * License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#ifndef __WINE_FDI_H #ifndef __WINE_FDI_H
@ -32,10 +32,10 @@ extern "C" {
* Common FCI/TDI declarations * Common FCI/TDI declarations
*/ */
typedef unsigned long CHECKSUM; typedef ULONG CHECKSUM;
typedef unsigned long UOFF; typedef ULONG UOFF;
typedef unsigned long COFF; typedef ULONG COFF;
/**********************************************************************/ /**********************************************************************/
@ -143,7 +143,7 @@ typedef void *HFDI;
/**********************************************************************/ /**********************************************************************/
typedef struct { typedef struct {
long cbCabinet; /* Total length of cabinet file */ LONG cbCabinet; /* Total length of cabinet file */
USHORT cFolders; /* Count of folders in cabinet */ USHORT cFolders; /* Count of folders in cabinet */
USHORT cFiles; /* Count of files in cabinet */ USHORT cFiles; /* Count of files in cabinet */
USHORT setID; /* Cabinet set ID */ USHORT setID; /* Cabinet set ID */
@ -217,14 +217,14 @@ typedef UINT (__cdecl *PFNWRITE)(INT_PTR hf, void *pv, UINT cb);
typedef int (__cdecl *PFNCLOSE)(INT_PTR hf); typedef int (__cdecl *PFNCLOSE)(INT_PTR hf);
#define FNCLOSE(fn) int __cdecl fn(INT_PTR hf) #define FNCLOSE(fn) int __cdecl fn(INT_PTR hf)
typedef long (__cdecl *PFNSEEK) (INT_PTR hf, long dist, int seektype); typedef LONG (__cdecl *PFNSEEK) (INT_PTR hf, LONG dist, int seektype);
#define FNSEEK(fn) long __cdecl fn(INT_PTR hf, long dist, int seektype) #define FNSEEK(fn) LONG __cdecl fn(INT_PTR hf, LONG dist, int seektype)
typedef int (__cdecl *PFNFDIDECRYPT)(PFDIDECRYPT pfdid); typedef int (__cdecl *PFNFDIDECRYPT)(PFDIDECRYPT pfdid);
#define FNFDIDECRYPT(fn) int __cdecl fn(PFDIDECRYPT pfdid) #define FNFDIDECRYPT(fn) int __cdecl fn(PFDIDECRYPT pfdid)
typedef struct { typedef struct {
long cb; LONG cb;
char *psz1; char *psz1;
char *psz2; char *psz2;
char *psz3; /* Points to a 256 character buffer */ char *psz3; /* Points to a 256 character buffer */
@ -261,7 +261,7 @@ typedef INT_PTR (__cdecl *PFNFDINOTIFY)(FDINOTIFICATIONTYPE fdint,
typedef struct { typedef struct {
char ach[2]; /* Set to { '*', '\0' } */ char ach[2]; /* Set to { '*', '\0' } */
long cbFile; /* Required spill file size */ LONG cbFile; /* Required spill file size */
} FDISPILLFILE, *PFDISPILLFILE; } FDISPILLFILE, *PFDISPILLFILE;
#include <poppack.h> #include <poppack.h>