Various proto changes.

1 files changed, 51 insertions, 24 deletions

diff --git a/lib/sisfileheader.cpp b/lib/sisfileheader.cpp
index b9800b2..ddd8a11 100644
--- a/lib/sisfileheader.cpp
+++ b/lib/sisfileheader.cpp
@@ -4,14 +4,18 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+const int OFF_NUMBER_OF_FILES = 26;
+const int OFF_INSTALLATION_DRIVE = 28;
+
 void
 SISFileHeader::fillFrom(uchar* buf, int* base)
 {
-	int ix = *base;
-	m_uid1 = read32(buf, &ix);
+	uchar* start = buf + *base;
+	m_buf = buf;
+	m_uid1 = read32(start);
 	if (logLevel >= 1)
 		printf("Got uid1 = %08x\n", m_uid1);
-	m_uid2 = read32(buf, &ix);
+	m_uid2 = read32(start + 4);
 	if (m_uid2 != 0x1000006d)
 		{
 		printf("Got bad uid2.\n");
@@ -19,7 +23,7 @@ SISFileHeader::fillFrom(uchar* buf, int* base)
 		}
 	if (logLevel >= 2)
 		printf("Got uid2 = %08x\n", m_uid2);
-	m_uid3 = read32(buf, &ix);
+	m_uid3 = read32(start + 8);
 	if (m_uid3 != 0x10000419)
 		{
 		printf("Got bad uid3.\n");
@@ -27,7 +31,7 @@ SISFileHeader::fillFrom(uchar* buf, int* base)
 		}
 	if (logLevel >= 2)
 		printf("Got uid3 = %08x\n", m_uid3);
-	m_uid4 = read32(buf, &ix);
+	m_uid4 = read32(start + 12);
 //	printf("Got uid4 = %08x\n", m_uid4);
 	uint16 crc1 = 0;
 	for (int i = 0; i < 12; i += 2)
@@ -43,50 +47,73 @@ SISFileHeader::fillFrom(uchar* buf, int* base)
 		printf("Got bad crc.\n");
 		exit(1);
 		}
-	m_crc = read16(buf, &ix);
-	m_nlangs = read16(buf, &ix);
+	m_crc = read16(start + 16);
+	m_nlangs = read16(start + 18);
 	if (logLevel >= 2)
 		printf("Got %d languages\n", m_nlangs);
-	m_nfiles = read16(buf, &ix);
+	m_nfiles = read16(start + 20);
 	if (logLevel >= 2)
 		printf("Got %d files\n", m_nfiles);
-	m_nreqs = read16(buf, &ix);
+	m_nreqs = read16(start + 22);
 	if (logLevel >= 2)
 		printf("Got %d reqs\n", m_nreqs);
-	m_installationLanguage = read16(buf, &ix);
-	m_installationFiles = read16(buf, &ix);
-	m_installationDrive = read32(buf, &ix);
-	m_installerVersion = read32(buf, &ix);
+	m_installationLanguage = read16(start + 24);
+	if (logLevel >= 2)
+		printf("Selected language is %d\n", m_installationLanguage);
+	m_installationFiles = read16(start + OFF_NUMBER_OF_FILES);
+	if (logLevel >= 2)
+		printf("Installed files: %d / %d\n", m_installationFiles, m_nfiles);
+	m_installationDrive = read32(start + OFF_INSTALLATION_DRIVE);
+	if (logLevel >= 2)
+		printf("Installed on drive %c\n", m_installationDrive);
+	m_installerVersion = read32(start + 32);
 	if (logLevel >= 2)
 		printf("Got installer version: %08x\n", m_installerVersion);
-	m_options = read16(buf, &ix);
+	m_options = read16(start + 36);
 	if (logLevel >= 2)
 		printf("Got options: %04x\n", m_options);
-	m_type = read16(buf, &ix);
+	m_type = read16(start + 38);
 	if (logLevel >= 2)
 		printf("Got type: %0x\n", m_type);
-	m_major = read16(buf, &ix);
+	m_major = read16(start + 40);
 	if (logLevel >= 2)
 		printf("Got major: %d\n", m_major);
-	m_minor = read16(buf, &ix);
+	m_minor = read16(start + 42);
 	if (logLevel >= 2)
 		printf("Got minor: %d\n", m_minor);
-	m_minor = read32(buf, &ix);
+	m_variant = read32(start + 44);
 	if (logLevel >= 2)
 		printf("Got variant: %d\n", m_variant);
-	m_languagePtr = read32(buf, &ix);
+	m_languagePtr = read32(start + 48);
 	if (logLevel >= 2)
 		printf("Languages begin at %d\n", m_languagePtr);
-	m_filesPtr = read32(buf, &ix);
+	m_filesPtr = read32(start + 52);
 	if (logLevel >= 2)
 		printf("Files begin at %d\n", m_filesPtr);
-	m_reqPtr = read32(buf, &ix);
+	m_reqPtr = read32(start + 56);
 	if (logLevel >= 2)
 		printf("Requisites begin at %d\n", m_reqPtr);
-	m_unknown = read32(buf, &ix);
-	m_componentPtr = read32(buf, &ix);
+	m_unknown = read32(start + 60);
+	m_componentPtr = read32(start + 64);
 	if (logLevel >= 2)
 		printf("Components begin at %d\n", m_componentPtr);
-	*base = ix;
+	*base += 68;
+}
+
+void
+SISFileHeader::setDrive(char drive)
+{
+	m_installationDrive = drive;
+	m_buf[OFF_INSTALLATION_DRIVE] = drive;
+	m_buf[OFF_INSTALLATION_DRIVE + 1] =
+		m_buf[OFF_INSTALLATION_DRIVE + 2] =
+		m_buf[OFF_INSTALLATION_DRIVE + 3] = 0;
+}
+
+void
+SISFileHeader::setFiles(int nFiles)
+{
+	m_installationFiles = nFiles;
+	write16(m_buf + OFF_NUMBER_OF_FILES, nFiles);
 }