Annotate GolFile a bit

Author: madebr

CMakeLists.txt

@@ -196,7 +196,8 @@ if (MSVC_FOR_DECOMP)
     target_link_options(goldp PRIVATE "/OPT:NOREF,ICF")
   endif()
 
-  set_property(TARGET legoracers goldp PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>DLL")
+  set_property(TARGET legoracers PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>DLL")
+  set_property(TARGET goldp PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
 
   set(CMAKE_CXX_FLAGS "/W3 /GX /D \"WIN32\" /D \"_WINDOWS\"")
   set(CMAKE_CXX_FLAGS_DEBUG "/Gm /Zi /Od /D \"_DEBUG\"")

GolDP/library_msvc.h

@@ -12,12 +12,36 @@
 // LIBRARY: GOLDP 0x1004b7fe
 // __purecall
 
+// LIBRARY: GOLDP 0x1004bbd2
+// __tell
+
+// LIBRARY: GOLDP 0x1004bbe3
+// __lseek
+
 // LIBRARY: GOLDP 0x1004c5c7
 // __CRT_INIT@12
 
 // LIBRARY: GOLDP 0x1004c6a0
 // __DllMainCRTStartup@12
 
+// LIBRARY: GOLDP 0x1004bd2e
+// __errno
+
+// LIBRARY: GOLDP 0x1004bd40
+// __open
+
+// LIBRARY: GOLDP 0x1004c026
+// __close
+
+// LIBRARY: GOLDP 0x1004c106
+// __read
+
+// LIBRARY: GOLDP 0x1004c344
+// __write
+
+// LIBRARY: GOLDP 0x1004c534
+// __commit
+
 // GLOBAL: GOLDP 0x10067620
 // __pRawDllMain
 

LEGORacers/src/ironflame0x944.cpp

@@ -56,7 +56,7 @@ void IronFlame0x944::VTable0x14()
 {
 	char buffer[100];
 	// const char *dllname;
-	GolImport gol_import;
+	GolImport golImport;
 
 	if (m_unk0x928 & 0x2) {
 		m_golLibrary = LoadLibraryA("GolGlide.DLL");
@@ -80,9 +80,9 @@ void IronFlame0x944::VTable0x14()
 	if (golEntry == NULL) {
 		GOL_FATALERROR_MESSAGE("Invalid Gol DLL - cannot call entry procedure");
 	}
-	CreateGolImport(&gol_import);
-	gol_import.m_fatalErrorMessage = GolFatalErrorMessage;
-	m_golExport = golEntry(&gol_import);
+	CreateGolImport(&golImport);
+	golImport.m_fatalErrorMessage = GolFatalErrorMessage;
+	m_golExport = golEntry(&golImport);
 	m_golDrawState = m_golExport->VTable0x04();
 }
 

common/include/golfile.h

@@ -5,6 +5,7 @@
 #include "decomp.h"
 #include "golstream.h"
 
+// VTABLE: GOLDP 0x10057934
 // VTABLE: LEGORACERS 0x4b1250
 // SIZE 0x30
 class GolFile : public GolStream {
@@ -19,6 +20,7 @@ class GolFile : public GolStream {
 	LegoS32 Write(void* p_buf, LegoU32 p_size) override;                    // vtable+0x10
 	LegoS32 Flush() override;                                               // vtable+0x14
 
+	// SYNTHETIC: GOLDP 0x100328e0
 	// SYNTHETIC: LEGORACERS 0x450ab0
 	// GolFile::`scalar deleting destructor'
 };

common/include/golstream.h

@@ -4,6 +4,7 @@
 #include "decomp.h"
 #include "types.h"
 
+// VTABLE: GOLDP 0x10057884
 // VTABLE: LEGORACERS 0x4b0f38
 // SIZE 0x30
 class GolStream {

common/src/golfile.cpp

@@ -16,12 +16,14 @@ GolFile::GolFile()
 	m_fd = -1;
 }
 
+// FUNCTION: GOLDP 0x10032900
 // FUNCTION: LEGORACERS 0x450ad0
 GolFile::~GolFile()
 {
 	GolStream::Dispose();
 }
 
+// FUNCTION: GOLDP 0x10032950
 // FUNCTION: LEGORACERS 0x450b50
 LegoS32 GolFile::Open(LegoChar* p_fileName)
 {
@@ -90,6 +92,7 @@ LegoS32 GolFile::Open(LegoChar* p_fileName)
 	return result;
 }
 
+// FUNCTION: GOLDP 0x10032a90
 // FUNCTION: LEGORACERS 0x450c90
 LegoS32 GolFile::Close()
 {
@@ -106,6 +109,7 @@ LegoS32 GolFile::Close()
 	return e_ioSuccess;
 }
 
+// FUNCTION: GOLDP 0x10032ad0
 // FUNCTION: LEGORACERS 0x450cd0
 LegoS32 GolFile::Seek(LegoS32 p_offset)
 {
@@ -117,6 +121,7 @@ LegoS32 GolFile::Seek(LegoS32 p_offset)
 	return e_ioSuccess;
 }
 
+// FUNCTION: GOLDP 0x10032b00
 // FUNCTION: LEGORACERS 0x450d00
 LegoS32 GolFile::Read(void* p_buf, LegoU32 p_size, LegoS32* p_lenRead)
 {
@@ -130,12 +135,14 @@ LegoS32 GolFile::Read(void* p_buf, LegoU32 p_size, LegoS32* p_lenRead)
 	return result != 0 ? e_ioSuccess : e_ioEndOfFile;
 }
 
+// FUNCTION: GOLDP 0x10032b40
 // FUNCTION: LEGORACERS 0x450d40
 LegoS32 GolFile::Write(void* p_buf, LegoU32 p_size)
 {
 	return _write(m_fd, p_buf, p_size) < 0 ? e_ioWriteError : e_ioSuccess;
 }
 
+// FUNCTION: GOLDP 0x10032b70
 // FUNCTION: LEGORACERS 0x450d70
 LegoS32 GolFile::Flush()
 {

common/src/golstream.cpp

@@ -15,6 +15,7 @@ LegoChar g_pathBuffer[256];
 // GLOBAL: LEGORACERS 0x4c7384
 LegoChar* g_unk0x4c7384[4];
 
+// GLOBAL: GOLDP 0x10065e78
 // GLOBAL: LEGORACERS 0x4c7394
 GolFileSource* g_fileSources;
 
@@ -24,12 +25,14 @@ LegoU32 g_fileSourceCount;
 // GLOBAL: LEGORACERS 0x4c739c
 LegoU32 g_unk0x4c739c;
 
+// FUNCTION: GOLDP 0x100314a0
 // FUNCTION: LEGORACERS 0x44c920
 GolStream::GolStream()
 {
 	Init();
 }
 
+// FUNCTION: GOLDP 0x10031530
 // FUNCTION: LEGORACERS 0x44c960
 GolStream::~GolStream()
 {
@@ -168,6 +171,7 @@ LegoS32 GolStream::BufferedOpen(LegoChar* p_fileName, LegoS32 p_mode, LegoU32 p_
 	return e_ioSuccess;
 }
 
+// FUNCTION: GOLDP 0x10031790
 // FUNCTION: LEGORACERS 0x44cc90
 LegoS32 GolStream::Dispose()
 {
@@ -601,12 +605,14 @@ LegoS32 GolStream::FlushWriteBuffer()
 	return result;
 }
 
+// FUNCTION: GOLDP 0x100016f0 FOLDED
 // FUNCTION: LEGORACERS 0x44e7e0
 LegoS32 GolStream::Flush()
 {
 	return e_ioSuccess;
 }
 
+// FUNCTION: GOLDP 0x10029950 FOLDED
 // FUNCTION: LEGORACERS 0x44e7f0
 LegoS32 GolStream::Write(void*, LegoU32)
 {