From 127f9f2ee4dd769168d46732e67c451b548b1904 Mon Sep 17 00:00:00 2001
From: Souryo <mesenemu@gmail.com>
Date: Sun, 26 Jun 2016 16:31:29 -0400
Subject: [PATCH] Fixed warnings and function signatures (x86)

---
 Core/NsfeLoader.h             | 2 +-
 InteropDLL/ConsoleWrapper.cpp | 2 +-
 PGOHelper/PGOHelper.cpp       | 6 +++---
 SevenZip/7zMemBuffer.c        | 2 +-
 SevenZip/7zMemBuffer.h        | 4 ++--
 Utilities/ArchiveReader.cpp   | 6 +++---
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Core/NsfeLoader.h b/Core/NsfeLoader.h
index f8bb90e1..cfb70297 100644
--- a/Core/NsfeLoader.h
+++ b/Core/NsfeLoader.h
@@ -53,7 +53,7 @@ private:
 		}
 
 		//truncate all strings to 255 characters + null
-		for(int i = 0; i < strings.size(); i++) {
+		for(size_t i = 0; i < strings.size(); i++) {
 			strings[i] = strings[i].substr(0, std::min((int)strings[i].size(), 255));
 		}
 
diff --git a/InteropDLL/ConsoleWrapper.cpp b/InteropDLL/ConsoleWrapper.cpp
index 75a83f98..83468dea 100644
--- a/InteropDLL/ConsoleWrapper.cpp
+++ b/InteropDLL/ConsoleWrapper.cpp
@@ -337,7 +337,7 @@ namespace InteropEmu {
 				NsfMapper::GetInstance()->SelectTrack(trackNumber);
 			}
 		}
-		DllExport int32_t __stdcall NsfGetCurrentTrack(uint8_t trackNumber) {
+		DllExport int32_t __stdcall NsfGetCurrentTrack() {
 			if(NsfMapper::GetInstance()) {
 				return NsfMapper::GetInstance()->GetCurrentTrack();
 			}
diff --git a/PGOHelper/PGOHelper.cpp b/PGOHelper/PGOHelper.cpp
index 8bf68d1a..48b28e73 100644
--- a/PGOHelper/PGOHelper.cpp
+++ b/PGOHelper/PGOHelper.cpp
@@ -5,7 +5,7 @@
 
 extern "C" {
 	void __stdcall InitializeEmu(char* homeFolder, void*, void*);
-	void __stdcall LoadROM(const char* filename);
+	void __stdcall LoadROM(const char* filename, int32_t archiveFileIndex);
 	void __stdcall Run();
 	void __stdcall Stop();
 }
@@ -33,13 +33,13 @@ int main(int argc, char* argv[])
 	};
 
 	InitializeEmu("C:\\Windows\\Temp\\Mesen", nullptr, nullptr);
-	LoadROM(testRoms[0]);
+	LoadROM(testRoms[0], -1);
 	std::cout << "Running: " << testRoms[0] << std::endl;
 	thread testThread([testRoms] {
 		for(size_t i = 1; i < testRoms.size(); i++) {
 			std::this_thread::sleep_for(std::chrono::duration<int, std::milli>(5000));
 			std::cout << "Running: " << testRoms[i] << std::endl;
-			LoadROM(testRoms[i]);
+			LoadROM(testRoms[i], -1);
 		}
 		Stop();
 	});
diff --git a/SevenZip/7zMemBuffer.c b/SevenZip/7zMemBuffer.c
index e72cb677..6ad5e757 100644
--- a/SevenZip/7zMemBuffer.c
+++ b/SevenZip/7zMemBuffer.c
@@ -8,7 +8,7 @@ WRes MemBuffer_Read(CSzMemBuffer *p, void *data, size_t *size)
 	if(originalSize == 0)
 		return 0;
 
-	size_t length = p->pos + *size > p->size ? p->size - p->pos - 1 : *size;
+	size_t length = (size_t)(p->pos + *size > p->size ? p->size - p->pos - 1 : *size);
 	memcpy(data, (char*)(p->buffer) + p->pos, length);
 	p->pos += length;
 	return 0;
diff --git a/SevenZip/7zMemBuffer.h b/SevenZip/7zMemBuffer.h
index 5c24dbaa..6226ade6 100644
--- a/SevenZip/7zMemBuffer.h
+++ b/SevenZip/7zMemBuffer.h
@@ -9,8 +9,8 @@ EXTERN_C_BEGIN
 typedef struct
 {
 	void* buffer;
-	size_t size;
-	size_t pos;
+	Int64 size;
+	Int64 pos;
 } CSzMemBuffer;
 
 /* reads max(*size, remain file's size) bytes */
diff --git a/Utilities/ArchiveReader.cpp b/Utilities/ArchiveReader.cpp
index 47f7b4c8..6e36b6fb 100644
--- a/Utilities/ArchiveReader.cpp
+++ b/Utilities/ArchiveReader.cpp
@@ -61,7 +61,7 @@ bool ArchiveReader::LoadArchive(string filename)
 	ifstream in(filename, std::ios::binary | std::ios::in);
 	if(in) {
 		in.seekg(0, std::ios::end);
-		size_t filesize = in.tellg();
+		std::streampos filesize = in.tellg();
 		in.seekg(0, std::ios::beg);
 
 		if(_buffer) {
@@ -69,9 +69,9 @@ bool ArchiveReader::LoadArchive(string filename)
 			_buffer = nullptr;
 		}
 
-		_buffer = new uint8_t[filesize];
+		_buffer = new uint8_t[(uint32_t)filesize];
 		in.read((char*)_buffer, filesize);
-		bool result = LoadArchive(_buffer, filesize);
+		bool result = LoadArchive(_buffer, (size_t)filesize);
 		return result;
 	}
 	return false;