zlib-streams 1.0.0 → 1.0.1

package/Makefile

@@ -129,11 +129,11 @@ ci:
 # -----------------------------------------------------------------------------
 EMCC ?= emsdk/upstream/emscripten/emcc
 
-WASM_SRCS = src/wasm/inflate9_stream_wasm.c src/wasm/inflate_stream_wasm.c src/wasm/deflate_stream_wasm.c src/inflate9.c \
+WASM_SRCS = src/wasm/inflate9_stream_wasm.c src/wasm/inflate_stream_wasm.c src/wasm/deflate_stream_wasm.c src/wasm/allocator.c src/inflate9.c \
 	src/zlib/contrib/infback9/inftree9.c \
 	src/zlib/inffast.c src/zlib/inflate.c src/zlib/inftrees.c src/zlib/zutil.c \
 	src/zlib/crc32.c src/zlib/adler32.c src/zlib/trees.c src/zlib/deflate.c
-WASM_CFLAGS = -Isrc -Isrc/zlib -Isrc/zlib/contrib/infback9 -O2 -flto -DDYNAMIC_CRC_TABLE
+WASM_CFLAGS = -Isrc -Isrc/zlib -Isrc/zlib/contrib/infback9 -O2 -flto -DDYNAMIC_CRC_TABLE -DBUILDFIXED -DZ_SOLO
 
 .PHONY: wasm
 wasm: dist/zlib-streams-dev.wasm

package/README.md

@@ -1,4 +1,4 @@
-# zlib-streams Project: WASM-based Compression Streams API implementation using zlib, with support for deflate64 decompression
+# WASM-based Compression Streams API implementation using zlib, with support for deflate64 decompression
 
 The zlib source code is included as a submodule in `src/zlib`.
 

package/build/debug/src/inflate9.d

@@ -0,0 +1,9 @@
+build/debug/src/inflate9.o: src/inflate9.c src/zlib/zutil.h \
+  src/zlib/zlib.h src/zlib/zconf.h src/zlib/contrib/infback9/inftree9.h \
+  src/zlib/inflate.h src/zlib/contrib/infback9/infback9.h
+src/zlib/zutil.h:
+src/zlib/zlib.h:
+src/zlib/zconf.h:
+src/zlib/contrib/infback9/inftree9.h:
+src/zlib/inflate.h:
+src/zlib/contrib/infback9/infback9.h:

package/build/debug/src/zlib/adler32.d

@@ -0,0 +1,5 @@
+build/debug/src/zlib/adler32.o: src/zlib/adler32.c src/zlib/zutil.h \
+  src/zlib/zlib.h src/zlib/zconf.h
+src/zlib/zutil.h:
+src/zlib/zlib.h:
+src/zlib/zconf.h:

package/build/debug/src/zlib/contrib/infback9/infback9.d

@@ -0,0 +1,13 @@
+build/debug/src/zlib/contrib/infback9/infback9.o: \
+  src/zlib/contrib/infback9/infback9.c src/zlib/zutil.h src/zlib/zlib.h \
+  src/zlib/zconf.h src/zlib/contrib/infback9/infback9.h \
+  src/zlib/contrib/infback9/inftree9.h \
+  src/zlib/contrib/infback9/inflate9.h \
+  src/zlib/contrib/infback9/inffix9.h
+src/zlib/zutil.h:
+src/zlib/zlib.h:
+src/zlib/zconf.h:
+src/zlib/contrib/infback9/infback9.h:
+src/zlib/contrib/infback9/inftree9.h:
+src/zlib/contrib/infback9/inflate9.h:
+src/zlib/contrib/infback9/inffix9.h:

package/build/debug/src/zlib/contrib/infback9/inftree9.d

@@ -0,0 +1,7 @@
+build/debug/src/zlib/contrib/infback9/inftree9.o: \
+  src/zlib/contrib/infback9/inftree9.c src/zlib/zutil.h src/zlib/zlib.h \
+  src/zlib/zconf.h src/zlib/contrib/infback9/inftree9.h
+src/zlib/zutil.h:
+src/zlib/zlib.h:
+src/zlib/zconf.h:
+src/zlib/contrib/infback9/inftree9.h:

package/build/debug/src/zlib/crc32.d

@@ -0,0 +1,6 @@
+build/debug/src/zlib/crc32.o: src/zlib/crc32.c src/zlib/zutil.h \
+  src/zlib/zlib.h src/zlib/zconf.h src/zlib/crc32.h
+src/zlib/zutil.h:
+src/zlib/zlib.h:
+src/zlib/zconf.h:
+src/zlib/crc32.h:

package/build/debug/src/zlib/infback.d

@@ -0,0 +1,10 @@
+build/debug/src/zlib/infback.o: src/zlib/infback.c src/zlib/zutil.h \
+  src/zlib/zlib.h src/zlib/zconf.h src/zlib/inftrees.h \
+  src/zlib/inflate.h src/zlib/inffast.h src/zlib/inffixed.h
+src/zlib/zutil.h:
+src/zlib/zlib.h:
+src/zlib/zconf.h:
+src/zlib/inftrees.h:
+src/zlib/inflate.h:
+src/zlib/inffast.h:
+src/zlib/inffixed.h:

package/build/debug/src/zlib/inffast.d

@@ -0,0 +1,9 @@
+build/debug/src/zlib/inffast.o: src/zlib/inffast.c src/zlib/zutil.h \
+  src/zlib/zlib.h src/zlib/zconf.h src/zlib/inftrees.h \
+  src/zlib/inflate.h src/zlib/inffast.h
+src/zlib/zutil.h:
+src/zlib/zlib.h:
+src/zlib/zconf.h:
+src/zlib/inftrees.h:
+src/zlib/inflate.h:
+src/zlib/inffast.h:

package/build/debug/src/zlib/inflate.d

@@ -0,0 +1,10 @@
+build/debug/src/zlib/inflate.o: src/zlib/inflate.c src/zlib/zutil.h \
+  src/zlib/zlib.h src/zlib/zconf.h src/zlib/inftrees.h \
+  src/zlib/inflate.h src/zlib/inffast.h src/zlib/inffixed.h
+src/zlib/zutil.h:
+src/zlib/zlib.h:
+src/zlib/zconf.h:
+src/zlib/inftrees.h:
+src/zlib/inflate.h:
+src/zlib/inffast.h:
+src/zlib/inffixed.h:

package/build/debug/src/zlib/inftrees.d

@@ -0,0 +1,6 @@
+build/debug/src/zlib/inftrees.o: src/zlib/inftrees.c src/zlib/zutil.h \
+  src/zlib/zlib.h src/zlib/zconf.h src/zlib/inftrees.h
+src/zlib/zutil.h:
+src/zlib/zlib.h:
+src/zlib/zconf.h:
+src/zlib/inftrees.h:

package/build/debug/src/zlib/trees.d

@@ -0,0 +1,7 @@
+build/debug/src/zlib/trees.o: src/zlib/trees.c src/zlib/deflate.h \
+  src/zlib/zutil.h src/zlib/zlib.h src/zlib/zconf.h src/zlib/trees.h
+src/zlib/deflate.h:
+src/zlib/zutil.h:
+src/zlib/zlib.h:
+src/zlib/zconf.h:
+src/zlib/trees.h:

package/build/debug/src/zlib/zutil.d

@@ -0,0 +1,6 @@
+build/debug/src/zlib/zutil.o: src/zlib/zutil.c src/zlib/zutil.h \
+  src/zlib/zlib.h src/zlib/zconf.h src/zlib/gzguts.h
+src/zlib/zutil.h:
+src/zlib/zlib.h:
+src/zlib/zconf.h:
+src/zlib/gzguts.h:

package/build/src/inflate9.d

@@ -0,0 +1,9 @@
+build/src/inflate9.o: src/inflate9.c src/zlib/zutil.h src/zlib/zlib.h \
+  src/zlib/zconf.h src/zlib/contrib/infback9/inftree9.h \
+  src/zlib/inflate.h src/zlib/contrib/infback9/infback9.h
+src/zlib/zutil.h:
+src/zlib/zlib.h:
+src/zlib/zconf.h:
+src/zlib/contrib/infback9/inftree9.h:
+src/zlib/inflate.h:
+src/zlib/contrib/infback9/infback9.h:

package/build/src/zlib/adler32.d

@@ -0,0 +1,5 @@
+build/src/zlib/adler32.o: src/zlib/adler32.c src/zlib/zutil.h \
+  src/zlib/zlib.h src/zlib/zconf.h
+src/zlib/zutil.h:
+src/zlib/zlib.h:
+src/zlib/zconf.h:

package/build/src/zlib/contrib/infback9/infback9.d

@@ -0,0 +1,13 @@
+build/src/zlib/contrib/infback9/infback9.o: \
+  src/zlib/contrib/infback9/infback9.c src/zlib/zutil.h src/zlib/zlib.h \
+  src/zlib/zconf.h src/zlib/contrib/infback9/infback9.h \
+  src/zlib/contrib/infback9/inftree9.h \
+  src/zlib/contrib/infback9/inflate9.h \
+  src/zlib/contrib/infback9/inffix9.h
+src/zlib/zutil.h:
+src/zlib/zlib.h:
+src/zlib/zconf.h:
+src/zlib/contrib/infback9/infback9.h:
+src/zlib/contrib/infback9/inftree9.h:
+src/zlib/contrib/infback9/inflate9.h:
+src/zlib/contrib/infback9/inffix9.h:

package/build/src/zlib/contrib/infback9/inftree9.d

@@ -0,0 +1,7 @@
+build/src/zlib/contrib/infback9/inftree9.o: \
+  src/zlib/contrib/infback9/inftree9.c src/zlib/zutil.h src/zlib/zlib.h \
+  src/zlib/zconf.h src/zlib/contrib/infback9/inftree9.h
+src/zlib/zutil.h:
+src/zlib/zlib.h:
+src/zlib/zconf.h:
+src/zlib/contrib/infback9/inftree9.h:

package/build/src/zlib/crc32.d

@@ -0,0 +1,6 @@
+build/src/zlib/crc32.o: src/zlib/crc32.c src/zlib/zutil.h src/zlib/zlib.h \
+  src/zlib/zconf.h src/zlib/crc32.h
+src/zlib/zutil.h:
+src/zlib/zlib.h:
+src/zlib/zconf.h:
+src/zlib/crc32.h:

package/build/src/zlib/infback.d

@@ -0,0 +1,10 @@
+build/src/zlib/infback.o: src/zlib/infback.c src/zlib/zutil.h \
+  src/zlib/zlib.h src/zlib/zconf.h src/zlib/inftrees.h \
+  src/zlib/inflate.h src/zlib/inffast.h src/zlib/inffixed.h
+src/zlib/zutil.h:
+src/zlib/zlib.h:
+src/zlib/zconf.h:
+src/zlib/inftrees.h:
+src/zlib/inflate.h:
+src/zlib/inffast.h:
+src/zlib/inffixed.h:

package/build/src/zlib/inffast.d

@@ -0,0 +1,9 @@
+build/src/zlib/inffast.o: src/zlib/inffast.c src/zlib/zutil.h \
+  src/zlib/zlib.h src/zlib/zconf.h src/zlib/inftrees.h \
+  src/zlib/inflate.h src/zlib/inffast.h
+src/zlib/zutil.h:
+src/zlib/zlib.h:
+src/zlib/zconf.h:
+src/zlib/inftrees.h:
+src/zlib/inflate.h:
+src/zlib/inffast.h:

package/build/src/zlib/inflate.d

@@ -0,0 +1,10 @@
+build/src/zlib/inflate.o: src/zlib/inflate.c src/zlib/zutil.h \
+  src/zlib/zlib.h src/zlib/zconf.h src/zlib/inftrees.h \
+  src/zlib/inflate.h src/zlib/inffast.h src/zlib/inffixed.h
+src/zlib/zutil.h:
+src/zlib/zlib.h:
+src/zlib/zconf.h:
+src/zlib/inftrees.h:
+src/zlib/inflate.h:
+src/zlib/inffast.h:
+src/zlib/inffixed.h:

package/build/src/zlib/inftrees.d

@@ -0,0 +1,6 @@
+build/src/zlib/inftrees.o: src/zlib/inftrees.c src/zlib/zutil.h \
+  src/zlib/zlib.h src/zlib/zconf.h src/zlib/inftrees.h
+src/zlib/zutil.h:
+src/zlib/zlib.h:
+src/zlib/zconf.h:
+src/zlib/inftrees.h:

package/build/src/zlib/trees.d

@@ -0,0 +1,7 @@
+build/src/zlib/trees.o: src/zlib/trees.c src/zlib/deflate.h \
+  src/zlib/zutil.h src/zlib/zlib.h src/zlib/zconf.h src/zlib/trees.h
+src/zlib/deflate.h:
+src/zlib/zutil.h:
+src/zlib/zlib.h:
+src/zlib/zconf.h:
+src/zlib/trees.h:

package/build/src/zlib/zutil.d

@@ -0,0 +1,6 @@
+build/src/zlib/zutil.o: src/zlib/zutil.c src/zlib/zutil.h src/zlib/zlib.h \
+  src/zlib/zconf.h src/zlib/gzguts.h
+src/zlib/zutil.h:
+src/zlib/zlib.h:
+src/zlib/zconf.h:
+src/zlib/gzguts.h:

package/package.json

@@ -3,7 +3,7 @@
   "description": "WASM-based Compression Streams API implementation using zlib, with support for deflate64 decompression.",
   "author": "Gildas Lormeau",
   "license": "BSD-3-Clause",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "type": "module",
   "keywords": [
     "deflate",

package/src/inflate9.c

@@ -113,11 +113,19 @@ int ZEXPORT inflate9Init2_(z_streamp strm, int windowBits, const char *version,
     return Z_STREAM_ERROR;
   strm->msg = Z_NULL; /* in case we return an error */
   if (strm->zalloc == (alloc_func)0) {
+#ifdef Z_SOLO
+    return Z_STREAM_ERROR;
+#else
     strm->zalloc = zcalloc;
     strm->opaque = (voidpf)0;
+#endif
   }
   if (strm->zfree == (free_func)0)
+#ifdef Z_SOLO
+    return Z_STREAM_ERROR;
+#else
     strm->zfree = zcfree;
+#endif
   state =
       (struct inflate_state FAR *)ZALLOC(strm, 1, sizeof(struct inflate_state));
   if (state == Z_NULL)

package/src/wasm/allocator.c

@@ -0,0 +1,12 @@
+#include <stdlib.h>
+#include "zlib.h"
+
+voidpf my_zalloc(voidpf opaque, unsigned items, unsigned size) {
+  (void)opaque;
+  return malloc(items * size);
+}
+
+void my_zfree(voidpf opaque, voidpf ptr) {
+  (void)opaque;
+  free(ptr);
+}

package/src/wasm/allocator.h

@@ -0,0 +1,4 @@
+#include <zconf.h>
+
+voidpf my_zalloc(voidpf opaque, unsigned items, unsigned size);
+void my_zfree(voidpf opaque, voidpf ptr);

package/src/wasm/deflate_stream_wasm.c

@@ -2,6 +2,7 @@
 #include <string.h>
 #include <stdint.h>
 #include "zlib.h"
+#include "allocator.h"
 
 #ifndef RAW_WBITS
 #if defined(MAX_WBITS)
@@ -23,8 +24,8 @@ unsigned deflate_new(void) {
   if (!c)
     return 0;
   memset(c, 0, sizeof(*c));
-  c->strm.zalloc = Z_NULL;
-  c->strm.zfree = Z_NULL;
+  c->strm.zalloc = my_zalloc;
+  c->strm.zfree = my_zfree;
   c->strm.opaque = Z_NULL;
   c->inbuf = NULL;
   c->inbuf_sz = 0;

package/src/wasm/inflate9_stream_wasm.c

@@ -3,6 +3,7 @@
 #include <stdint.h>
 #include "zlib.h"
 #include "inflate9.h"
+#include "allocator.h"
 #ifndef DEFLATE64_WBITS
 #if defined(MAX_WBITS) && (MAX_WBITS >= 16)
 #define DEFLATE64_WBITS MAX_WBITS
@@ -23,8 +24,8 @@ unsigned inflate9_new(void) {
   if (!c)
     return 0;
   memset(c, 0, sizeof(*c));
-  c->strm.zalloc = Z_NULL;
-  c->strm.zfree = Z_NULL;
+  c->strm.zalloc = my_zalloc;
+  c->strm.zfree = my_zfree;
   c->strm.opaque = Z_NULL;
   c->inbuf = NULL;
   c->inbuf_sz = 0;

package/src/wasm/inflate_stream_wasm.c

@@ -2,6 +2,7 @@
 #include <string.h>
 #include <stdint.h>
 #include "zlib.h"
+#include "allocator.h"
 
 #ifndef RAW_WBITS
 #if defined(MAX_WBITS)
@@ -23,9 +24,9 @@ unsigned inflate_new(void) {
   if (!c)
     return 0;
   memset(c, 0, sizeof(*c));
-  c->strm.zalloc = Z_NULL;
-  c->strm.zfree = Z_NULL;
-  c->strm.opaque = Z_NULL;
+  c->strm.zalloc = my_zalloc;
+  c->strm.zfree = my_zfree;
+  c->strm.opaque = NULL;
   c->inbuf = NULL;
   c->inbuf_sz = 0;
   return (unsigned)(uintptr_t)c;