Changeset 3695 for trunk/src

Timestamp:

Jun 13, 2000, 8:40:41 AM (25 years ago)

Author:

phaller

Message:

Updated to current WINE Level 20000612

File:

• trunk/src/lz32/lz32.cpp (modified) (6 diffs)

trunk/src/lz32/lz32.cpp

@@ -1 @@
-/* $Id: lz32.cpp,v 1.8 2000-01-03 10:25:57 sandervl Exp $ */
+/* $Id: lz32.cpp,v 1.9 2000-06-13 06:40:41 phaller Exp $ */
 
 /*
@@ -190 +190 @@
         if (i == MAX_LZSTATES) return LZERROR_GLOBALLOC;
 
-   lzstates[i] = lzs = (lzstate*)HeapAlloc( SystemHeap, 0, sizeof(struct lzstate) );
-
+   lzstates[i] = lzs = (lzstate*)HeapAlloc( GetProcessHeap(), 0, sizeof(struct lzstate) );
+   if (lzs == NULL) return LZERROR_GLOBALLOC;
+  
    memset(lzs,'\0',sizeof(*lzs));
    lzs->realfd = hfSrc;
@@ -197 +198 @@
    lzs->reallength = head.reallength;
 
-   lzs->get = (BYTE*)HEAP_xalloc( GetProcessHeap(), 0, GETLEN );
+   lzs->get = (BYTE*)HeapAlloc( GetProcessHeap(), 0, GETLEN );
    lzs->getlen = 0;
    lzs->getcur = 0;
-
+  
+   if (lzs->get == NULL) {
+       HeapFree(GetProcessHeap(), 0, lzs);
+       lzstates[i] = NULL;
+       return LZERROR_GLOBALLOC;
+   }
+  
    /* Yes, preinitialize with spaces */
    memset(lzs->table,' ',0x1000);
@@ -472 +479 @@
     * casts right. (Or they probably just do not like WINAPI in general)
     */
-
    _readfun xread;
 
@@ -515 +521 @@
 {
     char *p;
-    char *mfn = (char *)HEAP_xalloc( GetProcessHeap(), 0,
-                                     strlen(fn) + 3 ); /* "._" and \0 */
+    char *mfn = (char *)HeapAlloc( GetProcessHeap(), 0,
+                                    strlen(fn) + 3 ); /* "._" and \0 */
+    if (mfn == NULL) return NULL;
     strcpy( mfn, fn );
     if (!(p = strrchr( mfn, '\\' ))) p = mfn;
@@ -607 +614 @@
             CloseHandle(lzs->realfd);
             lzstates[fd - 0x400] = NULL;
-            HeapFree( SystemHeap, 0, lzs );
+            HeapFree( GetProcessHeap(), 0, lzs );
         }
 }