Skip to content

Commit 4fcb49b

Browse files
wlawtwlawt
committed
fix: move script from 28 to 29
1 parent 6b1f5a0 commit 4fcb49b

File tree

2 files changed

+82
-82
lines changed

2 files changed

+82
-82
lines changed

‎bits/28_binstructs.js‎

Lines changed: 52 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
function write_UInt32LE(x/*:number*/, o) {
2-
if(!o) o = new_buf(4);
2+
if (!o) o = new_buf(4);
33
o.write_shift(4, x);
44
return o;
55
}
@@ -10,9 +10,9 @@ function parse_XLWideString(data/*::, length*/)/*:string*/ {
1010
return cchCharacters === 0 ? "" : data.read_shift(cchCharacters, 'dbcs');
1111
}
1212
function write_XLWideString(data/*:string*/, o) {
13-
var _null = false; if(o == null) { _null = true; o = new_buf(4+2*data.length); }
13+
var _null = false; if (o == null) { _null = true; o = new_buf(4 + 2 * data.length); }
1414
o.write_shift(4, data.length);
15-
if(data.length > 0) o.write_shift(0, data, 'dbcs');
15+
if (data.length > 0) o.write_shift(0, data, 'dbcs');
1616
return _null ? o.slice(0, o.l) : o;
1717
}
1818

@@ -27,7 +27,7 @@ function parse_StrRun(data) {
2727
return { ich: data.read_shift(2), ifnt: data.read_shift(2) };
2828
}
2929
function write_StrRun(run, o) {
30-
if(!o) o = new_buf(4);
30+
if (!o) o = new_buf(4);
3131
o.write_shift(2, run.ich || 0);
3232
o.write_shift(2, run.ifnt || 0);
3333
return o;
@@ -40,13 +40,13 @@ function parse_RichStr(data, length/*:number*/)/*:XLString*/ {
4040
var str = parse_XLWideString(data);
4141
var rgsStrRun = [];
4242
var z = ({ t: str, h: str }/*:any*/);
43-
if((flags & 1) !== 0) { /* fRichStr */
43+
if ((flags & 1) !== 0) { /* fRichStr */
4444
/* TODO: formatted string */
4545
var dwSizeStrRun = data.read_shift(4);
46-
for(var i = 0; i != dwSizeStrRun; ++i) rgsStrRun.push(parse_StrRun(data));
46+
for (var i = 0; i != dwSizeStrRun; ++i) rgsStrRun.push(parse_StrRun(data));
4747
z.r = rgsStrRun;
4848
}
49-
else z.r = [{ich:0, ifnt:0}];
49+
else z.r = [{ ich: 0, ifnt: 0 }];
5050
//if((flags & 2) !== 0) { /* fExtStr */
5151
// /* TODO: phonetic string */
5252
//}
@@ -55,33 +55,33 @@ function parse_RichStr(data, length/*:number*/)/*:XLString*/ {
5555
}
5656
function write_RichStr(str/*:XLString*/, o/*:?Block*/)/*:Block*/ {
5757
/* TODO: formatted string */
58-
var _null = false; if(o == null) { _null = true; o = new_buf(15+4*str.t.length); }
59-
o.write_shift(1,0);
58+
var _null = false; if (o == null) { _null = true; o = new_buf(15 + 4 * str.t.length); }
59+
o.write_shift(1, 0);
6060
write_XLWideString(str.t, o);
6161
return _null ? o.slice(0, o.l) : o;
6262
}
6363
/* [MS-XLSB] 2.4.328 BrtCommentText (RichStr w/1 run) */
6464
var parse_BrtCommentText = parse_RichStr;
6565
function write_BrtCommentText(str/*:XLString*/, o/*:?Block*/)/*:Block*/ {
6666
/* TODO: formatted string */
67-
var _null = false; if(o == null) { _null = true; o = new_buf(23+4*str.t.length); }
68-
o.write_shift(1,1);
67+
var _null = false; if (o == null) { _null = true; o = new_buf(23 + 4 * str.t.length); }
68+
o.write_shift(1, 1);
6969
write_XLWideString(str.t, o);
70-
o.write_shift(4,1);
71-
write_StrRun({ich:0,ifnt:0}, o);
70+
o.write_shift(4, 1);
71+
write_StrRun({ ich: 0, ifnt: 0 }, o);
7272
return _null ? o.slice(0, o.l) : o;
7373
}
7474

7575
/* [MS-XLSB] 2.5.9 */
7676
function parse_XLSBCell(data)/*:any*/ {
7777
var col = data.read_shift(4);
7878
var iStyleRef = data.read_shift(2);
79-
iStyleRef += data.read_shift(1) <<16;
79+
iStyleRef += data.read_shift(1) << 16;
8080
data.l++; //var fPhShow = data.read_shift(1);
81-
return { c:col, iStyleRef: iStyleRef };
81+
return { c: col, iStyleRef: iStyleRef };
8282
}
8383
function write_XLSBCell(cell/*:any*/, o/*:?Block*/) {
84-
if(o == null) o = new_buf(8);
84+
if (o == null) o = new_buf(8);
8585
o.write_shift(-4, cell.c);
8686
o.write_shift(3, cell.iStyleRef || cell.s);
8787
o.write_shift(1, 0); /* fPhShow */
@@ -99,9 +99,9 @@ function parse_XLNullableWideString(data/*::, length*/)/*:string*/ {
9999
return cchCharacters === 0 || cchCharacters === 0xFFFFFFFF ? "" : data.read_shift(cchCharacters, 'dbcs');
100100
}
101101
function write_XLNullableWideString(data/*:string*/, o) {
102-
var _null = false; if(o == null) { _null = true; o = new_buf(127); }
102+
var _null = false; if (o == null) { _null = true; o = new_buf(127); }
103103
o.write_shift(4, data.length > 0 ? data.length : 0xFFFFFFFF);
104-
if(data.length > 0) o.write_shift(0, data, 'dbcs');
104+
if (data.length > 0) o.write_shift(0, data, 'dbcs');
105105
return _null ? o.slice(0, o.l) : o;
106106
}
107107

@@ -116,34 +116,34 @@ var write_RelID = write_XLNullableWideString;
116116

117117
/* [MS-XLS] 2.5.217 ; [MS-XLSB] 2.5.122 */
118118
function parse_RkNumber(data)/*:number*/ {
119-
var b = data.slice(data.l, data.l+4);
119+
var b = data.slice(data.l, data.l + 4);
120120
var fX100 = (b[0] & 1), fInt = (b[0] & 2);
121-
data.l+=4;
121+
data.l += 4;
122122
b[0] &= 0xFC; // b[0] &= ~3;
123-
var RK = fInt === 0 ? __double([0,0,0,0,b[0],b[1],b[2],b[3]],0) : __readInt32LE(b,0)>>2;
124-
return fX100 ? (RK/100) : RK;
123+
var RK = fInt === 0 ? __double([0, 0, 0, 0, b[0], b[1], b[2], b[3]], 0) : __readInt32LE(b, 0) >> 2;
124+
return fX100 ? (RK / 100) : RK;
125125
}
126126
function write_RkNumber(data/*:number*/, o) {
127-
if(o == null) o = new_buf(4);
127+
if (o == null) o = new_buf(4);
128128
var fX100 = 0, fInt = 0, d100 = data * 100;
129-
if((data == (data | 0)) && (data >= -(1<<29)) && (data < (1 << 29))) { fInt = 1; }
130-
else if((d100 == (d100 | 0)) && (d100 >= -(1<<29)) && (d100 < (1 << 29))) { fInt = 1; fX100 = 1; }
131-
if(fInt) o.write_shift(-4, ((fX100 ? d100 : data) << 2) + (fX100 + 2));
129+
if ((data == (data | 0)) && (data >= -(1 << 29)) && (data < (1 << 29))) { fInt = 1; }
130+
else if ((d100 == (d100 | 0)) && (d100 >= -(1 << 29)) && (d100 < (1 << 29))) { fInt = 1; fX100 = 1; }
131+
if (fInt) o.write_shift(-4, ((fX100 ? d100 : data) << 2) + (fX100 + 2));
132132
else throw new Error("unsupported RkNumber " + data); // TODO
133133
}
134134

135135

136136
/* [MS-XLSB] 2.5.117 RfX */
137137
function parse_RfX(data /*::, length*/)/*:Range*/ {
138-
var cell/*:Range*/ = ({s: {}, e: {}}/*:any*/);
138+
var cell/*:Range*/ = ({ s: {}, e: {} }/*:any*/);
139139
cell.s.r = data.read_shift(4);
140140
cell.e.r = data.read_shift(4);
141141
cell.s.c = data.read_shift(4);
142142
cell.e.c = data.read_shift(4);
143143
return cell;
144144
}
145145
function write_RfX(r/*:Range*/, o) {
146-
if(!o) o = new_buf(16);
146+
if (!o) o = new_buf(16);
147147
o.write_shift(4, r.s.r);
148148
o.write_shift(4, r.e.r);
149149
o.write_shift(4, r.s.c);
@@ -180,20 +180,6 @@ var write_UncheckedRfX = write_RfX;
180180
function parse_Xnum(data/*::, length*/) { return data.read_shift(8, 'f'); }
181181
function write_Xnum(data, o) { return (o || new_buf(8)).write_shift(8, data, 'f'); }
182182

183-
/* [MS-XLSB] 2.5.97.2 */
184-
var BErr = {
185-
/*::[*/0x00/*::]*/: "#NULL!",
186-
/*::[*/0x07/*::]*/: "#DIV/0!",
187-
/*::[*/0x0F/*::]*/: "#VALUE!",
188-
/*::[*/0x17/*::]*/: "#REF!",
189-
/*::[*/0x1D/*::]*/: "#NAME?",
190-
/*::[*/0x24/*::]*/: "#NUM!",
191-
/*::[*/0x2A/*::]*/: "#N/A",
192-
/*::[*/0x2B/*::]*/: "#GETTING_DATA",
193-
/*::[*/0xFF/*::]*/: "#WTF?"
194-
};
195-
var RBErr = evert_num(BErr);
196-
197183
/* [MS-XLSB] 2.4.324 BrtColor */
198184
function parse_BrtColor(data/*::, length*/) {
199185
var out = {};
@@ -209,51 +195,51 @@ function parse_BrtColor(data/*::, length*/) {
209195
var bB = data.read_shift(1);
210196
data.l++; //var bAlpha = data.read_shift(1);
211197

212-
switch(xColorType) {
198+
switch (xColorType) {
213199
case 0: out.auto = 1; break;
214200
case 1:
215201
out.index = index;
216202
var icv = XLSIcv[index];
217203
/* automatic pseudo index 81 */
218-
if(icv) out.rgb = rgb2Hex(icv);
204+
if (icv) out.rgb = rgb2Hex(icv);
219205
break;
220206
case 2:
221207
/* if(!fValidRGB) throw new Error("invalid"); */
222208
out.rgb = rgb2Hex([bR, bG, bB]);
223209
break;
224210
case 3: out.theme = index; break;
225211
}
226-
if(nTS != 0) out.tint = nTS > 0 ? nTS / 32767 : nTS / 32768;
212+
if (nTS != 0) out.tint = nTS > 0 ? nTS / 32767 : nTS / 32768;
227213

228214
return out;
229215
}
230216
function write_BrtColor(color, o) {
231-
if(!o) o = new_buf(8);
232-
if(!color||color.auto) { o.write_shift(4, 0); o.write_shift(4, 0); return o; }
233-
if(color.index != null) {
217+
if (!o) o = new_buf(8);
218+
if (!color || color.auto) { o.write_shift(4, 0); o.write_shift(4, 0); return o; }
219+
if (color.index != null) {
234220
o.write_shift(1, 0x02);
235221
o.write_shift(1, color.index);
236-
} else if(color.theme != null) {
222+
} else if (color.theme != null) {
237223
o.write_shift(1, 0x06);
238224
o.write_shift(1, color.theme);
239225
} else {
240226
o.write_shift(1, 0x05);
241227
o.write_shift(1, 0);
242228
}
243229
var nTS = color.tint || 0;
244-
if(nTS > 0) nTS *= 32767;
245-
else if(nTS < 0) nTS *= 32768;
230+
if (nTS > 0) nTS *= 32767;
231+
else if (nTS < 0) nTS *= 32768;
246232
o.write_shift(2, nTS);
247-
if(!color.rgb || color.theme != null) {
233+
if (!color.rgb || color.theme != null) {
248234
o.write_shift(2, 0);
249235
o.write_shift(1, 0);
250236
o.write_shift(1, 0);
251237
} else {
252238
var rgb = (color.rgb || 'FFFFFF');
253-
if(typeof rgb == 'number') rgb = ("000000" + rgb.toString(16)).slice(-6);
254-
o.write_shift(1, parseInt(rgb.slice(0,2),16));
255-
o.write_shift(1, parseInt(rgb.slice(2,4),16));
256-
o.write_shift(1, parseInt(rgb.slice(4,6),16));
239+
if (typeof rgb == 'number') rgb = ("000000" + rgb.toString(16)).slice(-6);
240+
o.write_shift(1, parseInt(rgb.slice(0, 2), 16));
241+
o.write_shift(1, parseInt(rgb.slice(2, 4), 16));
242+
o.write_shift(1, parseInt(rgb.slice(4, 6), 16));
257243
o.write_shift(1, 0xFF);
258244
}
259245
return o;
@@ -276,14 +262,14 @@ function parse_FontFlags(data/*::, length, opts*/) {
276262
return out;
277263
}
278264
function write_FontFlags(font, o) {
279-
if(!o) o = new_buf(2);
265+
if (!o) o = new_buf(2);
280266
var grbit =
281-
(font.italic ? 0x02 : 0) |
282-
(font.strike ? 0x08 : 0) |
283-
(font.outline ? 0x10 : 0) |
284-
(font.shadow ? 0x20 : 0) |
267+
(font.italic ? 0x02 : 0) |
268+
(font.strike ? 0x08 : 0) |
269+
(font.outline ? 0x10 : 0) |
270+
(font.shadow ? 0x20 : 0) |
285271
(font.condense ? 0x40 : 0) |
286-
(font.extend ? 0x80 : 0);
272+
(font.extend ? 0x80 : 0);
287273
o.write_shift(1, grbit);
288274
o.write_shift(1, 0);
289275
return o;
@@ -292,13 +278,13 @@ function write_FontFlags(font, o) {
292278
/* [MS-OLEDS] 2.3.1 and 2.3.2 */
293279
function parse_ClipboardFormatOrString(o, w/*:number*/)/*:string*/ {
294280
// $FlowIgnore
295-
var ClipFmt = {2:"BITMAP",3:"METAFILEPICT",8:"DIB",14:"ENHMETAFILE"};
281+
var ClipFmt = { 2: "BITMAP", 3: "METAFILEPICT", 8: "DIB", 14: "ENHMETAFILE" };
296282
var m/*:number*/ = o.read_shift(4);
297-
switch(m) {
283+
switch (m) {
298284
case 0x00000000: return "";
299-
case 0xffffffff: case 0xfffffffe: return ClipFmt[o.read_shift(4)]||"";
285+
case 0xffffffff: case 0xfffffffe: return ClipFmt[o.read_shift(4)] || "";
300286
}
301-
if(m > 0x190) throw new Error("Unsupported Clipboard: " + m.toString(16));
287+
if (m > 0x190) throw new Error("Unsupported Clipboard: " + m.toString(16));
302288
o.l -= 4;
303289
return o.read_shift(0, w == 1 ? "lpstr" : "lpwstr");
304290
}

‎bits/29_xlsenum.js‎

Lines changed: 30 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,43 @@
11
/* [MS-OLEPS] 2.2 PropertyType */
22
//var VT_EMPTY = 0x0000;
33
//var VT_NULL = 0x0001;
4-
var VT_I2 = 0x0002;
5-
var VT_I4 = 0x0003;
4+
var VT_I2 = 0x0002;
5+
var VT_I4 = 0x0003;
66
//var VT_R4 = 0x0004;
77
//var VT_R8 = 0x0005;
88
//var VT_CY = 0x0006;
99
//var VT_DATE = 0x0007;
1010
//var VT_BSTR = 0x0008;
1111
//var VT_ERROR = 0x000A;
12-
var VT_BOOL = 0x000B;
13-
var VT_VARIANT = 0x000C;
12+
var VT_BOOL = 0x000B;
13+
var VT_VARIANT = 0x000C;
1414
//var VT_DECIMAL = 0x000E;
1515
//var VT_I1 = 0x0010;
1616
//var VT_UI1 = 0x0011;
1717
//var VT_UI2 = 0x0012;
18-
var VT_UI4 = 0x0013;
18+
var VT_UI4 = 0x0013;
1919
//var VT_I8 = 0x0014;
2020
//var VT_UI8 = 0x0015;
2121
//var VT_INT = 0x0016;
2222
//var VT_UINT = 0x0017;
23-
var VT_LPSTR = 0x001E;
23+
var VT_LPSTR = 0x001E;
2424
//var VT_LPWSTR = 0x001F;
2525
var VT_FILETIME = 0x0040;
26-
var VT_BLOB = 0x0041;
26+
var VT_BLOB = 0x0041;
2727
//var VT_STREAM = 0x0042;
2828
//var VT_STORAGE = 0x0043;
2929
//var VT_STREAMED_Object = 0x0044;
3030
//var VT_STORED_Object = 0x0045;
3131
//var VT_BLOB_Object = 0x0046;
32-
var VT_CF = 0x0047;
32+
var VT_CF = 0x0047;
3333
//var VT_CLSID = 0x0048;
3434
//var VT_VERSIONED_STREAM = 0x0049;
35-
var VT_VECTOR = 0x1000;
35+
var VT_VECTOR = 0x1000;
3636
//var VT_ARRAY = 0x2000;
3737

38-
var VT_STRING = 0x0050; // 2.3.3.1.11 VtString
39-
var VT_USTR = 0x0051; // 2.3.3.1.12 VtUnalignedString
40-
var VT_CUSTOM = [VT_STRING, VT_USTR];
38+
var VT_STRING = 0x0050; // 2.3.3.1.11 VtString
39+
var VT_USTR = 0x0051; // 2.3.3.1.12 VtUnalignedString
40+
var VT_CUSTOM = [VT_STRING, VT_USTR];
4141

4242
/* [MS-OSHARED] 2.3.3.2.2.1 Document Summary Information PIDDSI */
4343
var DocSummaryPIDDSI = {
@@ -100,9 +100,9 @@ var SpecialProperties = {
100100
/*::[*/0x72627262/*::]*/: {}
101101
};
102102

103-
(function() {
104-
for(var y in SpecialProperties) if(Object.prototype.hasOwnProperty.call(SpecialProperties, y))
105-
DocSummaryPIDDSI[y] = SummaryPIDSI[y] = SpecialProperties[y];
103+
(function () {
104+
for (var y in SpecialProperties) if (Object.prototype.hasOwnProperty.call(SpecialProperties, y))
105+
DocSummaryPIDDSI[y] = SummaryPIDSI[y] = SpecialProperties[y];
106106
})();
107107

108108
var DocSummaryRE/*:{[key:string]:string}*/ = evert_key(DocSummaryPIDDSI, "n");
@@ -185,7 +185,7 @@ var XLSFillPattern = [
185185
'gray0625'
186186
];
187187

188-
function rgbify(arr/*:Array<number>*/)/*:Array<[number, number, number]>*/ { return arr.map(function(x) { return [(x>>16)&255,(x>>8)&255,x&255]; }); }
188+
function rgbify(arr/*:Array<number>*/)/*:Array<[number, number, number]>*/ { return arr.map(function (x) { return [(x >> 16) & 255, (x >> 8) & 255, x & 255]; }); }
189189

190190
/* [MS-XLS] 2.5.161 */
191191
/* [MS-XLSB] 2.5.75 Icv */
@@ -282,3 +282,17 @@ var _XLSIcv = rgbify([
282282
0x000000 /* 0x51 icvInfoText ?? */
283283
]);
284284
var XLSIcv = dup(_XLSIcv);
285+
286+
/* [MS-XLSB] 2.5.97.2 */
287+
var BErr = {
288+
/*::[*/0x00/*::]*/: "#NULL!",
289+
/*::[*/0x07/*::]*/: "#DIV/0!",
290+
/*::[*/0x0F/*::]*/: "#VALUE!",
291+
/*::[*/0x17/*::]*/: "#REF!",
292+
/*::[*/0x1D/*::]*/: "#NAME?",
293+
/*::[*/0x24/*::]*/: "#NUM!",
294+
/*::[*/0x2A/*::]*/: "#N/A",
295+
/*::[*/0x2B/*::]*/: "#GETTING_DATA",
296+
/*::[*/0xFF/*::]*/: "#WTF?"
297+
};
298+
var RBErr = evert_num(BErr);

0 commit comments

Comments
 (0)