Skip to content

W
wine-winehq
Commit a8bbbf5a authored by Gregory M. Turner's avatar Gregory M. Turner Committed by Alexandre Julliard
Browse files
Options

- eliminate pesky global variables; should be threadsafe now

- fix more memory leaks - fix some bugs - some decruftification - implement support for split cabinets and "NEXT_CABINET" notification
parent 0a25be10
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 25 additions and 28 deletions
dlls/cabinet/cabextract.c
View file @ a8bbbf5a
...@@ -1123,10 +1123,6 @@ int ZIPdecompress(int inlen, int outlen, cab_decomp_state *decomp_state) ...@@ -1123,10 +1123,6 @@ int ZIPdecompress(int inlen, int outlen, cab_decomp_state *decomp_state)
/* This decruncher was researched and implemented by Matthew Russoto. */ /* This decruncher was researched and implemented by Matthew Russoto. */
/* It has since been tidied up by Stuart Caie */ /* It has since been tidied up by Stuart Caie */
/* FIXME: eliminate global variables */
static cab_UBYTE q_length_base[27], q_length_extra[27], q_extra_bits[42];
static cab_ULONG q_position_base[42];
/****************************************************************** /******************************************************************
* QTMinitmodel (internal) * QTMinitmodel (internal)
* *
...@@ -1169,12 +1165,12 @@ int QTMinit(int window, int level, cab_decomp_state *decomp_state) { ...@@ -1169,12 +1165,12 @@ int QTMinit(int window, int level, cab_decomp_state *decomp_state) {
/* initialise static slot/extrabits tables */ /* initialise static slot/extrabits tables */
for (i = 0, j = 0; i < 27; i++) { for (i = 0, j = 0; i < 27; i++) {
q_length_extra[i] = (i == 26) ? 0 : (i < 2 ? 0 : i - 2) >> 2; CAB(q_length_extra)[i] = (i == 26) ? 0 : (i < 2 ? 0 : i - 2) >> 2;
q_length_base[i] = j; j += 1 << ((i == 26) ? 5 : q_length_extra[i]); CAB(q_length_base)[i] = j; j += 1 << ((i == 26) ? 5 : CAB(q_length_extra)[i]);
} }
for (i = 0, j = 0; i < 42; i++) { for (i = 0, j = 0; i < 42; i++) {
q_extra_bits[i] = (i < 2 ? 0 : i-2) >> 1; CAB(q_extra_bits)[i] = (i < 2 ? 0 : i-2) >> 1;
q_position_base[i] = j; j += 1 << q_extra_bits[i]; CAB(q_position_base)[i] = j; j += 1 << CAB(q_extra_bits)[i];
} }
/* initialise arithmetic coding models */ /* initialise arithmetic coding models */
...@@ -1312,27 +1308,27 @@ int QTMdecompress(int inlen, int outlen, cab_decomp_state *decomp_state) ...@@ -1312,27 +1308,27 @@ int QTMdecompress(int inlen, int outlen, cab_decomp_state *decomp_state)
case 4: case 4:
/* selector 4 = fixed length of 3 */ /* selector 4 = fixed length of 3 */
GET_SYMBOL(model4, sym); GET_SYMBOL(model4, sym);
Q_READ_BITS(extra, q_extra_bits[sym]); Q_READ_BITS(extra, CAB(q_extra_bits)[sym]);
match_offset = q_position_base[sym] + extra + 1; match_offset = CAB(q_position_base)[sym] + extra + 1;
match_length = 3; match_length = 3;
break; break;
case 5: case 5:
/* selector 5 = fixed length of 4 */ /* selector 5 = fixed length of 4 */
GET_SYMBOL(model5, sym); GET_SYMBOL(model5, sym);
Q_READ_BITS(extra, q_extra_bits[sym]); Q_READ_BITS(extra, CAB(q_extra_bits)[sym]);
match_offset = q_position_base[sym] + extra + 1; match_offset = CAB(q_position_base)[sym] + extra + 1;
match_length = 4; match_length = 4;
break; break;
case 6: case 6:
/* selector 6 = variable length */ /* selector 6 = variable length */
GET_SYMBOL(model6len, sym); GET_SYMBOL(model6len, sym);
Q_READ_BITS(extra, q_length_extra[sym]); Q_READ_BITS(extra, CAB(q_length_extra)[sym]);
match_length = q_length_base[sym] + extra + 5; match_length = CAB(q_length_base)[sym] + extra + 5;
GET_SYMBOL(model6pos, sym); GET_SYMBOL(model6pos, sym);
Q_READ_BITS(extra, q_extra_bits[sym]); Q_READ_BITS(extra, CAB(q_extra_bits)[sym]);
match_offset = q_position_base[sym] + extra + 1; match_offset = CAB(q_position_base)[sym] + extra + 1;
break; break;
default: default:
...@@ -1434,10 +1430,6 @@ int QTMdecompress(int inlen, int outlen, cab_decomp_state *decomp_state) ...@@ -1434,10 +1430,6 @@ int QTMdecompress(int inlen, int outlen, cab_decomp_state *decomp_state)
* - lzx_extra_bits states how many bits of offset-from-base data is needed. * - lzx_extra_bits states how many bits of offset-from-base data is needed.
*/ */
/* FIXME: Eliminate global variables */
static cab_ULONG lzx_position_base[51];
static cab_UBYTE extra_bits[51];
/************************************************************ /************************************************************
* LZXinit (internal) * LZXinit (internal)
*/ */
...@@ -1460,12 +1452,12 @@ int LZXinit(int window, cab_decomp_state *decomp_state) { ...@@ -1460,12 +1452,12 @@ int LZXinit(int window, cab_decomp_state *decomp_state) {
/* initialise static tables */ /* initialise static tables */
for (i=0, j=0; i <= 50; i += 2) { for (i=0, j=0; i <= 50; i += 2) {
extra_bits[i] = extra_bits[i+1] = j; /* 0,0,0,0,1,1,2,2,3,3... */ CAB(extra_bits)[i] = CAB(extra_bits)[i+1] = j; /* 0,0,0,0,1,1,2,2,3,3... */
if ((i != 0) && (j < 17)) j++; /* 0,0,1,2,3,4...15,16,17,17,17,17... */ if ((i != 0) && (j < 17)) j++; /* 0,0,1,2,3,4...15,16,17,17,17,17... */
} }
for (i=0, j=0; i <= 50; i++) { for (i=0, j=0; i <= 50; i++) {
lzx_position_base[i] = j; /* 0,1,2,3,4,6,8,12,16,24,32,... */ CAB(lzx_position_base)[i] = j; /* 0,1,2,3,4,6,8,12,16,24,32,... */
j += 1 << extra_bits[i]; /* 1,1,1,1,2,2,4,4,8,8,16,16,32,32,... */ j += 1 << CAB(extra_bits)[i]; /* 1,1,1,1,2,2,4,4,8,8,16,16,32,32,... */
} }
/* calculate required position slots */ /* calculate required position slots */
...@@ -1473,7 +1465,7 @@ int LZXinit(int window, cab_decomp_state *decomp_state) { ...@@ -1473,7 +1465,7 @@ int LZXinit(int window, cab_decomp_state *decomp_state) {
else if (window == 21) posn_slots = 50; else if (window == 21) posn_slots = 50;
else posn_slots = window << 1; else posn_slots = window << 1;
/*posn_slots=i=0; while (i < wndsize) i += 1 << extra_bits[posn_slots++]; */ /*posn_slots=i=0; while (i < wndsize) i += 1 << CAB(extra_bits)[posn_slots++]; */
LZX(R0) = LZX(R1) = LZX(R2) = 1; LZX(R0) = LZX(R1) = LZX(R2) = 1;
LZX(main_elements) = LZX_NUM_CHARS + (posn_slots << 3); LZX(main_elements) = LZX_NUM_CHARS + (posn_slots << 3);
...@@ -1757,9 +1749,9 @@ int LZXdecompress(int inlen, int outlen, cab_decomp_state *decomp_state) { ...@@ -1757,9 +1749,9 @@ int LZXdecompress(int inlen, int outlen, cab_decomp_state *decomp_state) {
if (match_offset > 2) { if (match_offset > 2) {
/* not repeated offset */ /* not repeated offset */
if (match_offset != 3) { if (match_offset != 3) {
extra = extra_bits[match_offset]; extra = CAB(extra_bits)[match_offset];
READ_BITS(verbatim_bits, extra); READ_BITS(verbatim_bits, extra);
match_offset = lzx_position_base[match_offset] match_offset = CAB(lzx_position_base)[match_offset]
- 2 + verbatim_bits; - 2 + verbatim_bits;
} }
else { else {
...@@ -1830,8 +1822,8 @@ int LZXdecompress(int inlen, int outlen, cab_decomp_state *decomp_state) { ...@@ -1830,8 +1822,8 @@ int LZXdecompress(int inlen, int outlen, cab_decomp_state *decomp_state) {
if (match_offset > 2) { if (match_offset > 2) {
/* not repeated offset */ /* not repeated offset */
extra = extra_bits[match_offset]; extra = CAB(extra_bits)[match_offset];
match_offset = lzx_position_base[match_offset] - 2; match_offset = CAB(lzx_position_base)[match_offset] - 2;
if (extra > 3) { if (extra > 3) {
/* verbatim and aligned bits */ /* verbatim and aligned bits */
extra -= 3; extra -= 3;
......
dlls/cabinet/cabinet.h
View file @ a8bbbf5a
...@@ -269,6 +269,10 @@ typedef struct cds_forward { ...@@ -269,6 +269,10 @@ typedef struct cds_forward {
int (*decompress)(int, int, struct cds_forward *); /* chosen compress fn */ int (*decompress)(int, int, struct cds_forward *); /* chosen compress fn */
cab_UBYTE inbuf[CAB_INPUTMAX+2]; /* +2 for lzx bitbuffer overflows! */ cab_UBYTE inbuf[CAB_INPUTMAX+2]; /* +2 for lzx bitbuffer overflows! */
cab_UBYTE outbuf[CAB_BLOCKMAX]; cab_UBYTE outbuf[CAB_BLOCKMAX];
cab_UBYTE q_length_base[27], q_length_extra[27], q_extra_bits[42];
cab_ULONG q_position_base[42];
cab_ULONG lzx_position_base[51];
cab_UBYTE extra_bits[51];
union { union {
struct ZIPstate zip; struct ZIPstate zip;
struct QTMstate qtm; struct QTMstate qtm;
...@@ -344,6 +348,7 @@ typedef struct { ...@@ -344,6 +348,7 @@ typedef struct {
#define DECR_CHECKSUM (4) #define DECR_CHECKSUM (4)
#define DECR_INPUT (5) #define DECR_INPUT (5)
#define DECR_OUTPUT (6) #define DECR_OUTPUT (6)
#define DECR_USERABORT (7)
/* Bitstream reading macros (Quantum / normal byte order) /* Bitstream reading macros (Quantum / normal byte order)
* *
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment