libmspack 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d95917a81eb9be1cba40ec5d7a43152f4996484
-  data.tar.gz: b3034aba50d00e5723cd728cf0ad0b7a6701ceeb
+  metadata.gz: 9c2006f7e3851c3958175cf7db8a47f31b11d013
+  data.tar.gz: 9f6670e7977d93010b2aefa24d0b6946c77a0ff2
 SHA512:
-  metadata.gz: b935fdc4f1b5a7ce2e42967d3d12026b1e6d5fbc44d89996f5a8a265655fa8f85cba6cbed506265619767522d93853340b3fff63495bc7f6f987eebd3b92c173
-  data.tar.gz: 29708f7e70bab4e1c61763c071ee3c4184670ee38cacc1d10ef8ef49162ac47b49540dfb6e7d12efd9e32a4c285b15b231cbdaa676fd2bd550d87f0ff786a9d5
+  metadata.gz: 7b25e651a134cde4efa33846afcd373a0bd3acf77fd43737852860dd390ce2512669d795cfcede7c05953f16865472fb5b2fc3f6d9aff3416c51ba62365e0442
+  data.tar.gz: 084fdf58252c604bddadec06af9d22e1dd2a7644e6b5bd10bfd324764e7f1b93786cb5b03c905494587c0637b321e1c484bd0858fefc8aeee74fd0b441f7dc68

data/ext/libmspack/ChangeLog

@@ -1,3 +1,10 @@
+2014-04-20  Stuart Caie <kyzer@4u.net>
+
+	* readhuff.h: fixed the table overflow check, which allowed one more
+	code after capacity had been reached, resulting in a read of
+	uninitialized data inside the decoding table. Thanks to Denis Kroshin
+	for identifying the problem and providing a sample file.
+
 2013-05-27  Stuart Caie <kyzer@4u.net>
 
 	* test/oabx.c: added new example command for unpacking OAB files.

data/ext/libmspack/Makefile.am

@@ -12,7 +12,7 @@ if DEBUG
 AM_CFLAGS +=		-DDEBUG
 endif
 if GCC
-AM_CFLAGS +=		-Wall -W -Wno-unused
+AM_CFLAGS +=		-Wall -Wextra -Wno-unused-parameter -Wno-unused-result
 endif
 AM_CPPFLAGS =		-I$(top_srcdir)/mspack -I$(top_srcdir)/test 
 

data/ext/libmspack/mspack/cabd.c

@@ -74,8 +74,7 @@ static int cabd_read_headers(
   struct mspack_system *sys, struct mspack_file *fh,
   struct mscabd_cabinet_p *cab, off_t offset, int quiet);
 static char *cabd_read_string(
-  struct mspack_system *sys, struct mspack_file *fh,
-  struct mscabd_cabinet_p *cab, int *error);
+  struct mspack_system *sys, struct mspack_file *fh, int *error);
 
 static struct mscabd_cabinet *cabd_search(
   struct mscab_decompressor *base, const char *filename);
@@ -391,14 +390,14 @@ static int cabd_read_headers(struct mspack_system *sys,
 
   /* read name and info of preceeding cabinet in set, if present */
   if (cab->base.flags & cfheadPREV_CABINET) {
-    cab->base.prevname = cabd_read_string(sys, fh, cab, &x); if (x) return x;
-    cab->base.previnfo = cabd_read_string(sys, fh, cab, &x); if (x) return x;
+    cab->base.prevname = cabd_read_string(sys, fh, &x); if (x) return x;
+    cab->base.previnfo = cabd_read_string(sys, fh, &x); if (x) return x;
   }
 
   /* read name and info of next cabinet in set, if present */
   if (cab->base.flags & cfheadNEXT_CABINET) {
-    cab->base.nextname = cabd_read_string(sys, fh, cab, &x); if (x) return x;
-    cab->base.nextinfo = cabd_read_string(sys, fh, cab, &x); if (x) return x;
+    cab->base.nextname = cabd_read_string(sys, fh, &x); if (x) return x;
+    cab->base.nextinfo = cabd_read_string(sys, fh, &x); if (x) return x;
   }
 
   /* read folders */
@@ -502,7 +501,7 @@ static int cabd_read_headers(struct mspack_system *sys,
     file->date_y = (x >> 9) + 1980;
 
     /* get filename */
-    file->filename = cabd_read_string(sys, fh, cab, &x);
+    file->filename = cabd_read_string(sys, fh, &x);
     if (x) { 
       sys->free(file);
       return x;
@@ -518,8 +517,7 @@ static int cabd_read_headers(struct mspack_system *sys,
 }
 
 static char *cabd_read_string(struct mspack_system *sys,
-			      struct mspack_file *fh,
-			      struct mscabd_cabinet_p *cab, int *error)
+			      struct mspack_file *fh, int *error)
 {
   off_t base = sys->tell(fh);
   char buf[256], *str;
@@ -1264,7 +1262,8 @@ static int cabd_sys_read_block(struct mspack_system *sys,
     /* blocks must not be over CAB_INPUTMAX in size */
     len = EndGetI16(&hdr[cfdata_CompressedSize]);
     if (((d->i_end - d->i_ptr) + len) > CAB_INPUTMAX) {
-      D(("block size > CAB_INPUTMAX (%ld + %d)", d->i_end - d->i_ptr, len))
+      D(("block size > CAB_INPUTMAX (%ld + %d)",
+          (long)(d->i_end - d->i_ptr), len))
       return MSPACK_ERR_DATAFORMAT;
     }
 

data/ext/libmspack/mspack/chmd.c

@@ -266,7 +266,7 @@ static int chmd_read_headers(struct mspack_system *sys, struct mspack_file *fh,
   unsigned char buf[0x54], *chunk = NULL, *name, *p, *end;
   struct mschmd_file *fi, *link = NULL;
   off_t offset, length;
-  int num_entries, i;
+  int num_entries;
 
   /* initialise pointers */
   chm->files         = NULL;
@@ -686,7 +686,7 @@ static int search_chunk(struct mschmd_header *chm,
 {
     const unsigned char *start, *end, *p;
     unsigned int qr_size, num_entries, qr_entries, qr_density, name_len;
-    unsigned int L, R, M, sec, fname_len, entries_off, is_pmgl;
+    unsigned int L, R, M, fname_len, entries_off, is_pmgl;
     int cmp;
 
     fname_len = strlen(filename);

data/ext/libmspack/mspack/kwajd.c

@@ -41,7 +41,7 @@ static void lzh_free(
 static int lzh_read_lens(
     struct kwajd_stream *kwaj,
     unsigned int type, unsigned int numsyms,
-    unsigned char *lens, unsigned short *table);
+    unsigned char *lens);
 static int lzh_read_input(
     struct kwajd_stream *kwaj);
 
@@ -399,14 +399,13 @@ static int kwajd_error(struct mskwaj_decompressor *base)
 	return MSPACK_ERR_OK;				\
 } while (0)
 
-#define BUILD_TREE(tbl, type)					\
-    STORE_BITS;							\
-    err = lzh_read_lens(lzh, type, MAXSYMBOLS(tbl),		\
-			 &HUFF_LEN(tbl,0), &HUFF_TABLE(tbl,0));	\
-    if (err) return err;					\
-    RESTORE_BITS;						\
-    if (make_decode_table(MAXSYMBOLS(tbl), TABLEBITS(tbl),	\
-	&HUFF_LEN(tbl,0), &HUFF_TABLE(tbl,0)))			\
+#define BUILD_TREE(tbl, type)						\
+    STORE_BITS;								\
+    err = lzh_read_lens(lzh, type, MAXSYMBOLS(tbl), &HUFF_LEN(tbl,0));	\
+    if (err) return err;						\
+    RESTORE_BITS;							\
+    if (make_decode_table(MAXSYMBOLS(tbl), TABLEBITS(tbl),		\
+	&HUFF_LEN(tbl,0), &HUFF_TABLE(tbl,0)))				\
 	return MSPACK_ERR_DATAFORMAT;
 
 #define WRITE_BYTE do {							\
@@ -494,7 +493,7 @@ static void lzh_free(struct kwajd_stream *lzh)
 
 static int lzh_read_lens(struct kwajd_stream *lzh,
 			 unsigned int type, unsigned int numsyms,
-			 unsigned char *lens, unsigned short *table)
+			 unsigned char *lens)
 {
     register unsigned int bit_buffer;
     register int bits_left;

data/ext/libmspack/mspack/lzxd.c

@@ -811,7 +811,8 @@ int lzxd_decompress(struct lzxd_stream *lzx, off_t out_bytes) {
 
     /* check that we've used all of the previous frame first */
     if (lzx->o_ptr != lzx->o_end) {
-      D(("%ld avail bytes, new %d frame", lzx->o_end-lzx->o_ptr, frame_size))
+      D(("%ld avail bytes, new %d frame",
+          (long)(lzx->o_end - lzx->o_ptr), frame_size))
       return lzx->error = MSPACK_ERR_DECRUNCH;
     }
 

data/ext/libmspack/mspack/oabd.c

@@ -259,7 +259,7 @@ static int oabd_decompress_incremental(struct msoab_decompressor *_self,
   struct mspack_file *outfh = NULL;
   unsigned char *buf = NULL;
   unsigned char hdrbuf[patchhead_SIZEOF];
-  unsigned int block_max, source_size, target_size, source_crc, target_crc;
+  unsigned int block_max, target_size;
   struct lzxd_stream *lzx = NULL;
   struct mspack_system oabd_sys;
   struct oabd_file in_ofh, out_ofh;
@@ -287,10 +287,7 @@ static int oabd_decompress_incremental(struct msoab_decompressor *_self,
   }
 
   block_max = EndGetI32(&hdrbuf[patchhead_BlockMax]);
-  source_size = EndGetI32(&hdrbuf[patchhead_SourceSize]);
   target_size = EndGetI32(&hdrbuf[patchhead_TargetSize]);
-  source_crc = EndGetI32(&hdrbuf[patchhead_SourceCRC]);
-  target_crc = EndGetI32(&hdrbuf[patchhead_TargetCRC]);
 
   /* We use it for reading block headers too */
   if (block_max < patchblk_SIZEOF)

data/ext/libmspack/mspack/readhuff.h

@@ -1,5 +1,5 @@
 /* This file is part of libmspack.
- * (C) 2003-2010 Stuart Caie.
+ * (C) 2003-2014 Stuart Caie.
  *
  * libmspack is free software; you can redistribute it and/or modify it under
  * the terms of the GNU Lesser General Public License (LGPL) version 2.1
@@ -10,8 +10,7 @@
 #ifndef MSPACK_READHUFF_H
 #define MSPACK_READHUFF_H 1
 
-/* This implements a fast Huffman tree decoding system.
- */
+/* This implements a fast Huffman tree decoding system. */
 
 #if !(defined(BITS_ORDER_MSB) || defined(BITS_ORDER_LSB))
 # error "readhuff.h is used in conjunction with readbits.h, include that first"
@@ -140,6 +139,7 @@ static int make_decode_table(unsigned int nsyms, unsigned int nbits,
     for (bit_num = nbits+1; bit_num <= HUFF_MAXBITS; bit_num++) {
 	for (sym = 0; sym < nsyms; sym++) {
 	    if (length[sym] != bit_num) continue;
+            if (pos >= table_mask) return 1; /* table overflow */
 
 #ifdef BITS_ORDER_MSB
 	    leaf = pos >> 16;
@@ -161,8 +161,7 @@ static int make_decode_table(unsigned int nsyms, unsigned int nbits,
 		if ((pos >> (15-fill)) & 1) leaf++;
 	    }
 	    table[leaf] = sym;
-
-	    if ((pos += bit_mask) > table_mask) return 1; /* table overflow */
+	    pos += bit_mask;
 	}
 	bit_mask >>= 1;
     }

data/ext/libmspack.h

@@ -0,0 +1,259 @@
+#ifndef LIBMSPACK_H
+#define LIBMSPACK_H 1
+
+#ifndef RBFFI_EXPORT
+# ifdef __cplusplus
+#  define RBFFI_EXPORT extern "C"
+# else
+#  define RBFFI_EXPORT
+# endif
+#endif
+
+struct LibMsPack_MsPack_MsPackFile {
+    int file;
+    const char * name;
+};
+
+struct LibMsPack_MsPack_MsPackSystem {
+    struct LibMsPack_MsPack_MsPackFile * (*open)(struct LibMsPack_MsPack_MsPackSystem *, const char *, int);
+    void (*close)(struct LibMsPack_MsPack_MsPackFile *);
+    int (*read)(struct LibMsPack_MsPack_MsPackFile *, inout void *, int);
+    int (*write)(struct LibMsPack_MsPack_MsPackFile *, inout void *, int);
+    int (*seek)(struct LibMsPack_MsPack_MsPackFile *, off_t, int);
+    off_t (*tell)(struct LibMsPack_MsPack_MsPackFile *);
+    void (*message)(struct LibMsPack_MsPack_MsPackFile *, const char *, ...);
+    void * (*alloc)(struct LibMsPack_MsPack_MsPackFile *, size_t);
+    void (*free)(void *);
+    void (*copy)(const in void *, out void *, size_t);
+    void * null_ptr;
+};
+
+struct LibMsPack_MsCab_MsCabdFolder {
+    struct LibMsPack_MsCab_MsCabdFolder * next;
+    int comp_type;
+    unsigned int num_blocks;
+};
+
+struct LibMsPack_MsCab_MsCabdFile {
+    struct LibMsPack_MsCab_MsCabdFile * next;
+    const char * filename;
+    unsigned int length;
+    int attribs;
+    char time_h;
+    char time_m;
+    char time_s;
+    char date_d;
+    char date_m;
+    int date_y;
+    struct LibMsPack_MsCab_MsCabdFolder * folder;
+    unsigned int offset;
+};
+
+struct LibMsPack_MsCab_MsCabdCabinet {
+    struct LibMsPack_MsCab_MsCabdCabinet * next;
+    const char * filename;
+    off_t base_offset;
+    unsigned int length;
+    struct LibMsPack_MsCab_MsCabdCabinet * prevcab;
+    struct LibMsPack_MsCab_MsCabdCabinet * nextcab;
+    const char * prevname;
+    const char * nextname;
+    const char * previnfo;
+    const char * nextinfo;
+    struct LibMsPack_MsCab_MsCabdFile * files;
+    struct LibMsPack_MsCab_MsCabdFolder * folders;
+    unsigned short set_id;
+    unsigned short set_index;
+    unsigned short header_resv;
+    int flags;
+};
+
+struct LibMsPack_MsCab_MsCabCompressor {
+    int dummy;
+};
+
+struct LibMsPack_MsCab_MsCabDecompressor {
+    struct LibMsPack_MsCab_MsCabdCabinet * (*open)(struct LibMsPack_MsCab_MsCabDecompressor *, const char *);
+    void (*close)(struct LibMsPack_MsCab_MsCabDecompressor *, struct LibMsPack_MsCab_MsCabdCabinet *);
+    struct LibMsPack_MsCab_MsCabdCabinet * (*search)(struct LibMsPack_MsCab_MsCabDecompressor *, const char *);
+    int (*append)(struct LibMsPack_MsCab_MsCabDecompressor *, struct LibMsPack_MsCab_MsCabdCabinet *, struct LibMsPack_MsCab_MsCabdCabinet *);
+    int (*prepend)(struct LibMsPack_MsCab_MsCabDecompressor *, struct LibMsPack_MsCab_MsCabdCabinet *, struct LibMsPack_MsCab_MsCabdCabinet *);
+    int (*extract)(struct LibMsPack_MsCab_MsCabDecompressor *, struct LibMsPack_MsCab_MsCabdFile *, const char *);
+    int (*set_param)(struct LibMsPack_MsCab_MsCabDecompressor *, int, int);
+    int (*last_error)(struct LibMsPack_MsCab_MsCabDecompressor *);
+};
+
+struct LibMsPack_MsChm_MsChmcFile {
+    int section;
+    const char * filename;
+    const char * chm_filename;
+    off_t length;
+};
+
+struct LibMsPack_MsChm_MsChmdSection {
+    struct LibMsPack_MsChm_MsChmdHeader * chm;
+    unsigned int id;
+};
+
+struct LibMsPack_MsChm_MsChmdFile {
+    struct LibMsPack_MsChm_MsChmdFile * next;
+    struct LibMsPack_MsChm_MsChmdSection * section;
+    off_t offset;
+    off_t length;
+    const char * filename;
+};
+
+struct LibMsPack_MsChm_MsChmdSecUncompressed {
+    struct LibMsPack_MsChm_MsChmdSection base;
+    off_t offset;
+};
+
+struct LibMsPack_MsChm_MsChmdSecMscompressed {
+    struct LibMsPack_MsChm_MsChmdSection base;
+    struct LibMsPack_MsChm_MsChmdFile * content;
+    struct LibMsPack_MsChm_MsChmdFile * control;
+    struct LibMsPack_MsChm_MsChmdFile * rtable;
+    struct LibMsPack_MsChm_MsChmdFile * spaninfo;
+};
+
+struct LibMsPack_MsChm_MsChmdHeader {
+    unsigned int version;
+    unsigned int timestamp;
+    unsigned int language;
+    const char * filename;
+    off_t length;
+    struct LibMsPack_MsChm_MsChmdFile * files;
+    struct LibMsPack_MsChm_MsChmdFile * sysfiles;
+    struct LibMsPack_MsChm_MsChmdSecUncompressed sec0;
+    struct LibMsPack_MsChm_MsChmdSecMscompressed sec1;
+    off_t dir_offset;
+    unsigned int num_chunks;
+    unsigned int chunk_size;
+    unsigned int density;
+    unsigned int depth;
+    unsigned int index_root;
+    unsigned int first_pmgl;
+    unsigned int last_pmgl;
+    void * chunk_cache;
+};
+
+struct LibMsPack_MsChm_MsChmCompressor {
+    int (*generate)(struct LibMsPack_MsChm_MsChmCompressor *, struct LibMsPack_MsChm_MsChmcFile *, const char *);
+    int (*use_temporary_file)(struct LibMsPack_MsChm_MsChmCompressor *, int, const char *);
+    int (*set_param)(struct LibMsPack_MsChm_MsChmCompressor *, int, unsigned int);
+    int (*last_error)(struct LibMsPack_MsChm_MsChmCompressor *);
+};
+
+struct LibMsPack_MsChm_MsChmDecompressor {
+    struct LibMsPack_MsChm_MsChmdHeader * (*open)(struct LibMsPack_MsChm_MsChmDecompressor *, const char *);
+    void (*close)(struct LibMsPack_MsChm_MsChmDecompressor *, struct LibMsPack_MsChm_MsChmdHeader *);
+    int (*extract)(struct LibMsPack_MsChm_MsChmDecompressor *, struct LibMsPack_MsChm_MsChmdFile *, const char *);
+    int (*last_error)(struct LibMsPack_MsChm_MsChmDecompressor *);
+    struct LibMsPack_MsChm_MsChmdHeader * (*fast_open)(struct LibMsPack_MsChm_MsChmDecompressor *, const char *);
+    int (*fast_find)(struct LibMsPack_MsChm_MsChmDecompressor *, struct LibMsPack_MsChm_MsChmdHeader *, const char *, struct LibMsPack_MsChm_MsChmdFile *, int);
+};
+
+struct LibMsPack_MsHlp_MsHlpCompressor {
+    int dummy;
+};
+
+struct LibMsPack_MsHlp_MsHlpDecompressor {
+    int dummy;
+};
+
+struct LibMsPack_MsKwaj_MsKwajdHeader {
+    unsigned short comp_type;
+    off_t data_offset;
+    int headers;
+    off_t length;
+    const char * filename;
+    void * extra;
+    unsigned short extra_length;
+};
+
+struct LibMsPack_MsKwaj_MsKwajCompressor {
+    int (*compress)(void *, const char *, const char *, off_t);
+    int (*set_param)(void *, int, unsigned int);
+    int (*set_filename)(void *, const char *);
+    int (*set_extra_data)(void *, void *, unsigned int);
+    int (*last_error)(void *);
+};
+
+struct LibMsPack_MsKwaj_MsKwajDecompressor {
+    void * (*open)(void *, const char *);
+    void (*close)(void *, void *);
+    int (*extract)(void *, void *, const char *);
+    int (*decompress)(void *, const char *, const char *);
+    int (*last_error)(void *);
+};
+
+struct LibMsPack_MsLit_MsLitCompressor {
+    int dummy;
+};
+
+struct LibMsPack_MsLit_MsLitDecompressor {
+    int dummy;
+};
+
+struct LibMsPack_MsOab_MsoabCompressor {
+    int (*compress)(void *, const char *, const char *);
+    int (*compress_incremental)(void *, const char *, const char *, const char *);
+};
+
+struct LibMsPack_MsOab_MsoabDecompressor {
+    int (*decompress)(void *, const char *, const char *);
+    int (*decompress_incremental)(void *, const char *, const char *, const char *);
+};
+
+struct LibMsPack_MsSzdd_MsSzdddHeader {
+    int format;
+    off_t length;
+    char missing_char;
+};
+
+struct LibMsPack_MsSzdd_MsSzddCompressor {
+    int (*compress)(void *, const char *, const char *, off_t);
+    int (*set_param)(void *, int, unsigned int);
+    int (*last_error)(void *);
+};
+
+struct LibMsPack_MsSzdd_MsSzddDecompressor {
+    void * (*open)(void *, const char *);
+    void (*close)(void *, void *);
+    int (*extract)(void *, void *, const char *);
+    int (*decompress)(void *, const char *, const char *);
+    int (*last_error)(void *);
+};
+
+RBFFI_EXPORT int mspack_sys_selftest_internal(int);
+RBFFI_EXPORT int mspack_version(int);
+RBFFI_EXPORT struct LibMsPack_MsCab_MsCabCompressor * mspack_create_cab_compressor(struct LibMsPack_MsPack_MsPackSystem *);
+RBFFI_EXPORT void mspack_destroy_cab_compressor(struct LibMsPack_MsCab_MsCabCompressor *);
+RBFFI_EXPORT struct LibMsPack_MsCab_MsCabDecompressor * mspack_create_cab_decompressor(struct LibMsPack_MsPack_MsPackSystem *);
+RBFFI_EXPORT void mspack_destroy_cab_decompressor(struct LibMsPack_MsCab_MsCabDecompressor *);
+RBFFI_EXPORT void * mspack_create_chm_compressor(struct LibMsPack_MsPack_MsPackSystem *);
+RBFFI_EXPORT void mspack_destroy_chm_compressor(void *);
+RBFFI_EXPORT void * mspack_create_chm_decompressor(struct LibMsPack_MsPack_MsPackSystem *);
+RBFFI_EXPORT void mspack_destroy_chm_decompressor(void *);
+RBFFI_EXPORT struct LibMsPack_MsLit_MsLitCompressor * mspack_create_lit_compressor(struct LibMsPack_MsPack_MsPackSystem *);
+RBFFI_EXPORT void mspack_destroy_lit_compressor(struct LibMsPack_MsLit_MsLitCompressor *);
+RBFFI_EXPORT struct LibMsPack_MsLit_MsLitDecompressor * mspack_create_lit_decompressor(struct LibMsPack_MsPack_MsPackSystem *);
+RBFFI_EXPORT void mspack_destroy_lit_decompressor(struct LibMsPack_MsLit_MsLitDecompressor *);
+RBFFI_EXPORT struct LibMsPack_MsHlp_MsHlpCompressor * mspack_create_hlp_compressor(struct LibMsPack_MsPack_MsPackSystem *);
+RBFFI_EXPORT void mspack_destroy_hlp_compressor(struct LibMsPack_MsHlp_MsHlpCompressor *);
+RBFFI_EXPORT struct LibMsPack_MsHlp_MsHlpDecompressor * mspack_create_hlp_decompressor(struct LibMsPack_MsPack_MsPackSystem *);
+RBFFI_EXPORT void mspack_destroy_hlp_decompressor(struct LibMsPack_MsHlp_MsHlpDecompressor *);
+RBFFI_EXPORT void * mspack_create_szdd_compressor(struct LibMsPack_MsPack_MsPackSystem *);
+RBFFI_EXPORT void mspack_destroy_szdd_compressor(void *);
+RBFFI_EXPORT void * mspack_create_szdd_decompressor(struct LibMsPack_MsPack_MsPackSystem *);
+RBFFI_EXPORT void mspack_destroy_szdd_decompressor(void *);
+RBFFI_EXPORT void * mspack_create_kwaj_compressor(struct LibMsPack_MsPack_MsPackSystem *);
+RBFFI_EXPORT void mspack_destroy_kwaj_compressor(void *);
+RBFFI_EXPORT void * mspack_create_kwaj_decompressor(struct LibMsPack_MsPack_MsPackSystem *);
+RBFFI_EXPORT void mspack_destroy_kwaj_decompressor(void *);
+RBFFI_EXPORT void * mspack_create_oab_compressor(struct LibMsPack_MsPack_MsPackSystem *);
+RBFFI_EXPORT void mspack_destroy_oab_compressor(void *);
+RBFFI_EXPORT void * mspack_create_oab_decompressor(struct LibMsPack_MsPack_MsPackSystem *);
+RBFFI_EXPORT void mspack_destroy_oab_decompressor(void *);
+
+#endif /* LIBMSPACK_H */

data/lib/libmspack/mscab.rb

@@ -43,14 +43,14 @@ module LibMsPack
         # Returns the compression method used by a folder.
         # @param [Fixnum] compType a MsCabdFolder.comp_type value
         # @return [Fixnum] one of MSCAB_COMP_NONE, MSCAB_COMP_MSZIP, MSCAB_COMP_QUANTUM or MSCAB_COMP_LZX
-        def MsCabdCompMethod(compType)
+        def self.MsCabdCompMethod(compType)
             compType & 0x0F
         end
 
         # Returns the compression level used by a folder.
         # @param [Fixnum] compType a MsCabdFolder.comp_type value
         # @return [Fixnum] the compression level. This is only defined by LZX and Quantum compression
-        def MsCabdCompLevel(compType)
+        def self.MsCabdCompLevel(compType)
             ((comp_type) >> 8) & 0x1F
         end
 
@@ -94,14 +94,14 @@ module LibMsPack
             #
             # @return [Fixnum] one of MSCAB_COMP_NONE, MSCAB_COMP_MSZIP, MSCAB_COMP_QUANTUM or MSCAB_COMP_LZX
             def compressionMethod
-                MsCabdCompMethod(comp_type)
+                MsCab::MsCabdCompMethod(comp_type)
             end
 
             # Returns the compression level used by a folder.
             #
             # @return [Fixnum] the compression level. This is only defined by LZX and Quantum compression
             def compressionLevel
-                MsCabdCompLevel(comp_type)
+                MsCab::MsCabdCompLevel(comp_type)
             end
         end
 

data/lib/libmspack/version.rb

@@ -1,4 +1,4 @@
 module LibMsPack
     # Version
-    VERSION = '0.0.4'
+    VERSION = '0.0.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libmspack
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Dāvis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-26 00:00:00.000000000 Z
+date: 2014-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -140,6 +140,7 @@ files:
 - UNLICENSE
 - ext/Rakefile
 - ext/i386-windows/libmspack.dll
+- ext/libmspack.h
 - ext/libmspack/AUTHORS
 - ext/libmspack/COPYING.LIB
 - ext/libmspack/ChangeLog