[ros-diffs] [cwittich] 38835: sync cabinet headers with wine 1.1.13

Author: cwittich
Date: Sat Jan 17 13:14:53 2009
New Revision: 38835

URL: http://svn.reactos.org/svn/reactos?rev=38835&view=rev
Log:
sync cabinet headers with wine 1.1.13

Modified:
    trunk/reactos/include/psdk/fci.h
    trunk/reactos/include/psdk/fdi.h

Modified: trunk/reactos/include/psdk/fci.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/fci.h?rev=388…
==============================================================================
--- trunk/reactos/include/psdk/fci.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/fci.h [iso-8859-1] Sat Jan 17 13:14:53 2009
@@ -13,11 +13,13 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * 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
 #define __WINE_FCI_H
+
+#include <basetsd.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -32,10 +34,10 @@
  * Common FCI/TDI declarations
  */
 
-typedef unsigned long CHECKSUM;
-
-typedef unsigned long UOFF;
-typedef unsigned long COFF;
+typedef ULONG CHECKSUM;
+
+typedef ULONG UOFF;
+typedef ULONG COFF;
 
 /**********************************************************************/
 
@@ -161,7 +163,7 @@
 
 /**********************************************************************/
 
-typedef void * (__cdecl *PFNFCIALLOC)(ULONG cb);
+typedef void * (__cdecl __WINE_ALLOC_SIZE(1) *PFNFCIALLOC)(ULONG cb);
 #define FNFCIALLOC(fn) void * __cdecl fn(ULONG cb)
 
 typedef void (__cdecl *PFNFCIFREE)(void *memory);
@@ -179,8 +181,8 @@
 typedef int  (__cdecl *PFNFCICLOSE)(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);
-#define FNFCISEEK(fn) long __cdecl fn(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)
 
 typedef int  (__cdecl *PFNFCIDELETE) (char *pszFile, int *err, void *pv);
 #define FNFCIDELETE(fn) int __cdecl fn(char *pszFile, int *err, void *pv)
@@ -192,12 +194,12 @@
 
 typedef int (__cdecl *PFNFCIFILEPLACED)(PCCAB pccab,
 					char *pszFile,
-					long  cbFile,
+					LONG  cbFile,
 					BOOL  fContinuation,
 					void *pv);
 #define FNFCIFILEPLACED(fn) int __cdecl fn(PCCAB pccab, \
 					   char *pszFile, \
-					   long  cbFile, \
+                                           LONG  cbFile, \
 					   BOOL  fContinuation, \
 					   void *pv)
 
@@ -218,11 +220,11 @@
 #define statusFolder   1  /* Add Folder to 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 cb2,
 				     void *pv);
-#define FNFCISTATUS(fn) long __cdecl fn(UINT typeStatus, \
+#define FNFCISTATUS(fn) LONG __cdecl fn(UINT typeStatus, \
 					ULONG  cb1, \
 					ULONG  cb2, \
 					void *pv)

Modified: trunk/reactos/include/psdk/fdi.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/fdi.h?rev=388…
==============================================================================
--- trunk/reactos/include/psdk/fdi.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/fdi.h [iso-8859-1] Sat Jan 17 13:14:53 2009
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * 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
@@ -32,10 +32,10 @@
  * Common FCI/TDI declarations
  */
 
-typedef unsigned long CHECKSUM;
-
-typedef unsigned long UOFF;
-typedef unsigned long COFF;
+typedef ULONG CHECKSUM;
+
+typedef ULONG UOFF;
+typedef ULONG COFF;
 
 /**********************************************************************/
 
@@ -143,7 +143,7 @@
 /**********************************************************************/
 
 typedef struct {
-    long    cbCabinet;  /* Total length of cabinet file */
+    LONG    cbCabinet;  /* Total length of cabinet file */
     USHORT  cFolders;   /* Count of folders in cabinet */
     USHORT  cFiles;     /* Count of files in cabinet */
     USHORT  setID;      /* Cabinet set ID */
@@ -217,14 +217,14 @@
 typedef int  (__cdecl *PFNCLOSE)(INT_PTR hf);
 #define FNCLOSE(fn) int __cdecl fn(INT_PTR hf)
 
-typedef long (__cdecl *PFNSEEK) (INT_PTR hf, long dist, int seektype);
-#define FNSEEK(fn) long __cdecl fn(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)
 
 typedef int (__cdecl *PFNFDIDECRYPT)(PFDIDECRYPT pfdid);
 #define FNFDIDECRYPT(fn) int __cdecl fn(PFDIDECRYPT pfdid)
 
 typedef struct {
-    long  cb;
+    LONG  cb;
     char *psz1;
     char *psz2;
     char *psz3;  /* Points to a 256 character buffer */
@@ -261,7 +261,7 @@
 
 typedef struct {
     char ach[2];  /* Set to { '*', '\0' } */
-    long cbFile;  /* Required spill file size */
+    LONG cbFile;  /* Required spill file size */
 } FDISPILLFILE, *PFDISPILLFILE;
 
 #include <poppack.h>