[ros-diffs] [winesync] 26495: Autosyncing with Wine HEAD

Author: winesync
Date: Wed Apr 25 12:20:45 2007
New Revision: 26495

URL: http://svn.reactos.org/svn/reactos?rev=26495&view=rev
Log:
Autosyncing with Wine HEAD

Modified:
    trunk/reactos/dll/win32/cabinet/cabinet.h
    trunk/reactos/dll/win32/cabinet/cabinet_main.c
    trunk/reactos/dll/win32/cabinet/fci.c
    trunk/reactos/dll/win32/cabinet/fdi.c

Modified: trunk/reactos/dll/win32/cabinet/cabinet.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cabinet/cabinet.…
==============================================================================
--- trunk/reactos/dll/win32/cabinet/cabinet.h (original)
+++ trunk/reactos/dll/win32/cabinet/cabinet.h Wed Apr 25 12:20:45 2007
@@ -640,7 +640,7 @@
 
 /* from fdi.c */
 void QTMupdatemodel(struct QTMmodel *model, int sym);
-int make_decode_table(cab_ULONG nsyms, cab_ULONG nbits, cab_UBYTE *length, cab_UWORD
*table);
-cab_ULONG checksum(cab_UBYTE *data, cab_UWORD bytes, cab_ULONG csum);
+int make_decode_table(cab_ULONG nsyms, cab_ULONG nbits, const cab_UBYTE *length,
cab_UWORD *table);
+cab_ULONG checksum(const cab_UBYTE *data, cab_UWORD bytes, cab_ULONG csum);
 
 #endif /* __WINE_CABINET_H */

Modified: trunk/reactos/dll/win32/cabinet/cabinet_main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cabinet/cabinet_…
==============================================================================
--- trunk/reactos/dll/win32/cabinet/cabinet_main.c (original)
+++ trunk/reactos/dll/win32/cabinet/cabinet_main.c Wed Apr 25 12:20:45 2007
@@ -154,7 +154,7 @@
     return SetFilePointer(handle, dist, NULL, seektype);
 }
 
-static void fill_file_node(struct ExtractFileList *pNode, LPSTR szFilename)
+static void fill_file_node(struct ExtractFileList *pNode, LPCSTR szFilename)
 {
     pNode->next = NULL;
     pNode->flag = FALSE;
@@ -163,7 +163,7 @@
     lstrcpyA(pNode->filename, szFilename);
 }
 
-static BOOL file_in_list(struct ExtractFileList *pNode, LPSTR szFilename)
+static BOOL file_in_list(const struct ExtractFileList *pNode, LPCSTR szFilename)
 {
     while (pNode)
     {

Modified: trunk/reactos/dll/win32/cabinet/fci.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cabinet/fci.c?re…
==============================================================================
--- trunk/reactos/dll/win32/cabinet/fci.c (original)
+++ trunk/reactos/dll/win32/cabinet/fci.c Wed Apr 25 12:20:45 2007
@@ -430,12 +430,12 @@
 
 
 
-static cab_ULONG fci_get_checksum(void *pv, UINT cb, CHECKSUM seed)
+static cab_ULONG fci_get_checksum(const void *pv, UINT cb, CHECKSUM seed)
 {
-  cab_ULONG csum;
-  cab_ULONG ul;
-  int       cUlong;
-  BYTE      *pb;
+  cab_ULONG     csum;
+  cab_ULONG     ul;
+  int           cUlong;
+  const BYTE    *pb;
 
   csum = seed;
   cUlong = cb / 4;

Modified: trunk/reactos/dll/win32/cabinet/fdi.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cabinet/fdi.c?re…
==============================================================================
--- trunk/reactos/dll/win32/cabinet/fdi.c (original)
+++ trunk/reactos/dll/win32/cabinet/fdi.c Wed Apr 25 12:20:45 2007
@@ -220,7 +220,7 @@
  *   OK:    0
  *   error: 1
  */
-int make_decode_table(cab_ULONG nsyms, cab_ULONG nbits, cab_UBYTE *length, cab_UWORD
*table) {
+int make_decode_table(cab_ULONG nsyms, cab_ULONG nbits, const cab_UBYTE *length,
cab_UWORD *table) {
   register cab_UWORD sym;
   register cab_ULONG leaf;
   register cab_UBYTE bit_num = 1;
@@ -293,7 +293,7 @@
 /*************************************************************************
  * checksum (internal)
  */
-cab_ULONG checksum(cab_UBYTE *data, cab_UWORD bytes, cab_ULONG csum) {
+cab_ULONG checksum(const cab_UBYTE *data, cab_UWORD bytes, cab_ULONG csum) {
   int len;
   cab_ULONG ul = 0;
 
@@ -1132,16 +1132,16 @@
 /*********************************************************
  * fdi_Zipinflate_codes (internal)
  */
-static cab_LONG fdi_Zipinflate_codes(struct Ziphuft *tl, struct Ziphuft *td,
+static cab_LONG fdi_Zipinflate_codes(const struct Ziphuft *tl, const struct Ziphuft *td,
   cab_LONG bl, cab_LONG bd, fdi_decomp_state *decomp_state)
 {
-  register cab_ULONG e;  /* table entry flag/number of extra bits */
-  cab_ULONG n, d;        /* length and index for copy */
-  cab_ULONG w;           /* current window position */
-  struct Ziphuft *t;     /* pointer to table entry */
-  cab_ULONG ml, md;      /* masks for bl and bd bits */
-  register cab_ULONG b;  /* bit buffer */
-  register cab_ULONG k;  /* number of bits in bit buffer */
+  register cab_ULONG e;     /* table entry flag/number of extra bits */
+  cab_ULONG n, d;           /* length and index for copy */
+  cab_ULONG w;              /* current window position */
+  const struct Ziphuft *t;  /* pointer to table entry */
+  cab_ULONG ml, md;         /* masks for bl and bd bits */
+  register cab_ULONG b;     /* bit buffer */
+  register cab_ULONG k;     /* number of bits in bit buffer */
 
   /* make local copies of globals */
   b = ZIP(bb);                       /* initialize bit buffer */
@@ -1507,7 +1507,6 @@
   cab_UBYTE *inpos  = CAB(inbuf);
   cab_UBYTE *window = QTM(window);
   cab_UBYTE *runsrc, *rundest;
-
   cab_ULONG window_posn = QTM(window_posn);
   cab_ULONG window_size = QTM(window_size);
 
@@ -1677,7 +1676,7 @@
  */
 static int LZXfdi_decomp(int inlen, int outlen, fdi_decomp_state *decomp_state) {
   cab_UBYTE *inpos  = CAB(inbuf);
-  cab_UBYTE *endinp = inpos + inlen;
+  const cab_UBYTE *endinp = inpos + inlen;
   cab_UBYTE *window = LZX(window);
   cab_UBYTE *runsrc, *rundest;
   cab_UWORD *hufftbl; /* used in READ_HUFFSYM macro as chosen decoding table */
@@ -2007,7 +2006,7 @@
  * is also where we jump to additional cabinets in the case of split
  * cab's, and provide (some of) the NEXT_CABINET notification semantics.
  */
-static int fdi_decomp(struct fdi_file *fi, int savemode, fdi_decomp_state *decomp_state,
+static int fdi_decomp(const struct fdi_file *fi, int savemode, fdi_decomp_state
*decomp_state,
   char *pszCabPath, PFNFDINOTIFY pfnfdin, void *pvUser)
 {
   cab_ULONG bytes = savemode ? fi->length : fi->offset - CAB(offset);
@@ -2108,7 +2107,7 @@
 
           do {
 
-            pathlen = (userpath) ? strlen(userpath) : 0;
+            pathlen = strlen(userpath);
             filenamelen = (cab->mii.nextname) ? strlen(cab->mii.nextname) : 0;
 
             /* slight overestimation here to save CPU cycles in the developer's brain
*/