unsigned int y = get_u16();
if (x != y)
{
- fprintf(stderr, "%s: 0x%x: expected u16:%u, got u16:%u\n", where, pos - 2, x, y);
+ fprintf(stderr, "%s: 0x%x: expected u16:%u, got u16:%u: ", where, pos - 2, x, y);
+ hex_dump(stderr, pos - 2, 64);
exit(1);
}
}
match_byte_assert(0);
if (match_byte(0))
{
- match_zeros_assert(7);
+ match_byte_assert(0);
+ if (!match_byte(1))
+ match_byte_assert(0);
+ match_zeros_assert(5);
if (!match_byte(0))
match_byte_assert(1);
match_zeros_assert(5);
get_string1();
if (match_byte(1))
{
- parse_weirdness();
- match_byte_assert(0);
- pos++;
- match_zeros_assert(11);
- match_byte_assert(1);
- match_zeros_assert(3);
- get_string4();
- match_byte_assert(0);
- if (match_byte(0))
+ if (data[pos] == 1)
{
- match_zeros_assert(2);
- if (match_u32(8500))
- match_u32_assert(11000);
- else
- {
- match_u32_assert(11000);
- match_u32_assert(8500);
- }
- pos += 32;
- get_string1();
- if (!match_byte(0))
- match_byte_assert(1);
- pos++;
- pos++;
- pos++;
+ parse_weirdness();
+ match_byte_assert(0);
pos++;
- get_string4(); /* page title */
- match_byte_assert(1);
+ match_zeros_assert(11);
match_byte_assert(1);
match_zeros_assert(3);
- get_string4(); /* page number */
+ get_string4();
match_byte_assert(0);
- pos += 2;
- match_u16_assert(2);
+ if (match_byte(0))
+ {
+ match_zeros_assert(2);
+ if (match_u32(8500))
+ match_u32_assert(11000);
+ else
+ {
+ match_u32_assert(11000);
+ match_u32_assert(8500);
+ }
+ pos += 32;
+ get_string1();
+ if (!match_byte(0))
+ match_byte_assert(1);
+ pos++;
+ pos++;
+ pos++;
+ pos++;
+ get_string4(); /* page title */
+ match_byte_assert(1);
+ match_byte_assert(1);
+ match_zeros_assert(3);
+ get_string4(); /* page number */
+ match_byte_assert(0);
+ pos += 2;
+ match_u16_assert(2);
+ }
+ parse_flexible();
}
- parse_flexible();
}
else
match_zeros_assert(3);
static void
match_NavOleItem(void)
-{ /* 0e 80 */
- match_byte_assert(0x0e);
+{ /* 0e 80 or 12 80*/
+ if (!match_byte(0x12))
+ match_byte_assert(0x0e);
match_byte_assert(0x80);
parse_NavOleItem();
}
match_byte_assert(2);
match_zeros_assert(8);
match_u32_assert(24);
- if (!match_u32(0))
+ if (!match_u32(0) && !match_u32(0xffffff4b))
match_u32_assert(-40);
pos += 8;
match_u32_assert(2);
+ if (!match_u32(2))
+ match_u32_assert(1);
+}
+
+static void
+parse_PTPivotController(void)
+{
+ match_byte_assert(2);
+ pos += 8;
+ match_u32_assert(100);
+ match_u32_assert(100);
+ match_u32_assert(100);
+ match_u32_assert(100);
+}
+
+static void
+parse_PVPivotView(void)
+{
+ match_byte_assert(5);
+ match_zeros_assert(4);
+}
+
+static void
+parse_NDimensional__DspCell(void)
+{
+ match_byte_assert(0);
match_u32_assert(1);
}
+static void
+parse_IndexedCollection(void)
+{
+ match_byte_assert(0);
+ if (match_byte(0))
+ {
+ match_zeros_assert(12);
+ }
+ else
+ {
+ get_u32();
+ match_u16_assert(1);
+ }
+}
+
static void
parse_flexible(void)
{
else if (!strcmp(heading, "NavHead"))
parse_NavHead();
else if (!strcmp(heading, "IndexedCollection"))
- match_zeros_assert(14);
+ parse_IndexedCollection();
else if (!strcmp(heading, "NavOleItem"))
parse_NavOleItem();
else if (!strcmp(heading, "NavTitle"))
parse_NavTitle();
else if (!strcmp(heading, "NavNote"))
parse_NavNote();
+ else if (!strcmp(heading, "PTPivotController"))
+ parse_PTPivotController();
+ else if (!strcmp(heading, "PVPivotView"))
+ parse_PVPivotView();
+ else if (!strcmp(heading, "PMPivotModel"))
+ match_byte_assert(3);
+ else if (!strcmp(heading, "NDimensional__DspCell"))
+ parse_NDimensional__DspCell();
+ else if (!strcmp(heading, "PMPivotItemTree"))
+ match_byte_assert(0);
+ else if (!strcmp(heading, "PMModelItemInfo"))
+ parse_PMModelItemInfo();
+ else if (!strcmp(heading, "AbstractTreeBranch"))
+ match_byte_assert(0);
else
{
fprintf(stderr, "don't know %s at offset 0x%x: ", heading, start);
else if (data[pos] == 0x15 && data[pos + 1] == 0x80)
{
/* 15 80 */
- data += 2;
- match_byte_assert(2);
- printf ("15 80(%f", get_double());
- printf (" %s)\n", get_string1());
+ pos += 2;
+ if (match_byte(2))
+ {
+ printf ("15 80(%f", get_double());
+ printf (" %s)\n", get_string1());
+ if (match_byte(1))
+ {
+ match_byte_assert(0);
+ get_string1();
+ if (!match_byte(2) && !match_byte(3))
+ match_byte_assert(0);
+ match_zeros_assert(3);
+ get_string1();
+ match_byte_assert(0);
+ match_byte_assert(1);
+ match_zeros_assert(3);
+ match_byte_assert(1);
+ match_byte_assert(0);
+ }
+ }
+ else
+ {
+ match_byte_assert(0);
+ if (match_u32(0xc))
+ match_u16_assert(1);
+ else
+ match_zeros_assert(13);
+ }
}
else if (data[pos] == 0x9 && data[pos + 1] == 0x80)
{
match_NavLog();
}
- else if (data[pos] == 0xe)
+ else if (data[pos] == 0xe || data[pos] == 0x12)
match_NavOleItem();
+ else if (data[pos] == 0x11 || data[pos] == 0x13)
+ {
+ pos += 2;
+ match_byte_assert(0);
+ if (match_u32(0xc) || match_u32(0xd))
+ match_u16_assert(1);
+ else
+ match_zeros_assert(13);
+ }
+ else if (data[pos] == 0x29 ||
+ data[pos] == 0x2b ||
+ data[pos] == 0x2d ||
+ data[pos] == 0x31 ||
+ data[pos] == 0x32 ||
+ data[pos] == 0x4a ||
+ data[pos] == 0x4c ||
+ data[pos] == 0x4f ||
+ data[pos] == 0x4d ||
+ data[pos] == 0x50 ||
+ data[pos] == 0x36 ||
+ data[pos] == 0x52 ||
+ data[pos] == 0x53 ||
+ data[pos] == 0x54 ||
+ data[pos] == 0x55 ||
+ data[pos] == 0x57 ||
+ data[pos] == 0x56 ||
+ data[pos] == 0x58 ||
+ data[pos] == 0x5c ||
+ data[pos] == 0x5b ||
+ data[pos] == 0x5e ||
+ data[pos] == 0x62 ||
+ data[pos] == 0x64 ||
+ data[pos] == 0x4e ||
+ data[pos] == 0x51 ||
+ data[pos] == 0x59 ||
+ data[pos] == 0x5a ||
+ data[pos] == 0x5d ||
+ data[pos] == 0x66 ||
+ data[pos] == 0x60 ||
+ data[pos] == 0x68 ||
+ data[pos] == 0x48 ||
+ data[pos] == 0x6a ||
+ data[pos] == 0x37)
+ {
+ pos += 2;
+ match_byte_assert(0);
+ }
+ else if (data[pos] == 0x2c ||
+ data[pos] == 0x2e ||
+ data[pos] == 0x30 ||
+ data[pos] == 0x34 ||
+ data[pos] == 0x3d ||
+ data[pos] == 0x40 ||
+ data[pos] == 0x3f ||
+ data[pos] == 0x42 ||
+ data[pos] == 0x43 ||
+ data[pos] == 0x44 ||
+ data[pos] == 0x49 ||
+ data[pos] == 0x3e ||
+ data[pos] == 0x46)
+ {
+ pos += 2;
+ parse_format();
+ }
else
{
+#if 0
fprintf (stderr, "bad record 0x%02x at offset %x: ",
data[pos], pos);
+#endif
hex_dump (stderr, pos, 64);
assert(0);
}
}
else if (match_byte(0xa))
{
- match_zeros_assert(5);
- assert(pos == n);
- exit (0);
+ match_byte_assert(0);
+ if (match_u16(0x0e74))
+ match_byte_assert(0);
+ else
+ {
+ match_zeros_assert(4);
+ assert(pos == n);
+ exit (0);
+ }
+ }
+ else if (match_byte(1))
+ {
+ match_byte_assert(0);
+ get_string1();
+ if (!match_byte(2))
+ match_byte_assert(0);
+ match_zeros_assert(3);
+ get_string1();
+ if (match_byte(0x08))
+ {
+ match_byte_assert(0);
+ match_u16_assert(0x0e74);
+ match_byte_assert(0);
+ }
+ else if (match_byte(3))
+ {
+ match_byte_assert(0);
+ if (match_u16(0x0e74))
+ match_byte_assert(0);
+ else
+ {
+ match_zeros_assert(6);
+ if (!match_byte(0xe) && !match_byte(0x11))
+ match_byte_assert(0);
+ match_byte_assert(0);
+ if (!match_u16(0x0e74))
+ match_u16_assert(0);
+ match_byte_assert(0);
+ }
+ }
+ else
+ {
+ match_byte_assert(0);
+ match_byte_assert(1);
+ match_zeros_assert(3);
+ match_byte_assert(1);
+ match_byte_assert(0);
+ }
+ }
+ else if (match_byte(7) || match_byte(4) || match_byte(5) || match_byte(6) || match_byte(8) || match_byte(9) || match_byte(0xb) || match_byte(0xc))
+ {
+ match_byte_assert(0);
+ if (!match_u16(0x0e74))
+ match_byte_assert(0);
+ match_byte_assert(0);
+ }
+ else if (match_byte(2) || match_byte(3))
+ {
+ match_byte_assert(0);
+ if (!match_u16(0x0e74))
+ {
+ match_zeros_assert(6);
+ if (match_byte(0))
+ match_zeros_assert(4);
+ else
+ {
+ pos++;
+ match_byte(0);
+ match_u16_assert(0x0e74);
+ }
+ }
+ //match_byte_assert(0);
}
else
{
- fprintf (stderr, "bad record start at offset %x: ", pos);
+ //fprintf (stderr, "bad record start at offset %x: ", pos);
hex_dump (stderr, pos, 64);
assert(0);
}
exit(0);
parse_heading("NavLog");
parse_NavLog();
- parse_flexible();
- parse_flexible();
- parse_flexible();
- parse_flexible();
- parse_flexible();
- parse_flexible();
- parse_flexible();
- parse_flexible();
- parse_flexible();
- parse_flexible();
+ for (;;)
+ {
+ if (data[pos] == 0)
+ pos++;
+ else
+ parse_flexible();
+ }
exit(0);
puts(get_padded_string(32));
if (!match_u32(80))
projects / pspp / blobdiff