9 files changed, 44 insertions, 30 deletions

diff --git a/src/core/Camera.cpp b/src/core/Camera.cpp
index 44749fd7..c253d00f 100644
--- a/src/core/Camera.cpp
+++ b/src/core/Camera.cpp
@@ -2978,15 +2978,15 @@ CCamera::LoadTrainCamNodes(char const *name)
 	char token[16] = { 0 };
 	char filename[16] = { 0 };
 	uint8 *buf;
-	int bufpos = 0;
+	size_t bufpos = 0;
 	int field = 0;
 	int tokpos = 0;
 	char c;
 	int i;
-	int len;
+	size_t len;
 
 	strcpy(filename, name);
-	len = strlen(filename);
+	len = (int)strlen(filename);
 	filename[len] = '.';
 	filename[len+1] = 'd';
 	filename[len+2] = 'a';
diff --git a/src/core/Directory.cpp b/src/core/Directory.cpp
index cc4d65d8..05344065 100644
--- a/src/core/Directory.cpp
+++ b/src/core/Directory.cpp
@@ -30,7 +30,8 @@ CDirectory::ReadDirFile(const char *filename)
 bool
 CDirectory::WriteDirFile(const char *filename)
 {
-	int fd, n;
+	int fd;
+	size_t n;
 	fd = CFileMgr::OpenFileForWriting(filename);
 	n = CFileMgr::Write(fd, (char*)entries, numEntries*sizeof(DirectoryInfo));
 	CFileMgr::CloseFile(fd);
diff --git a/src/core/FileMgr.cpp b/src/core/FileMgr.cpp
index 1939c861..8dbc6894 100644
--- a/src/core/FileMgr.cpp
+++ b/src/core/FileMgr.cpp
@@ -163,7 +163,7 @@ myfgets(char *buf, int len, int fd)
 	return buf;
 }
 
-static int
+static size_t
 myfread(void *buf, size_t elt, size_t n, int fd)
 {
 	if(myfiles[fd].isText){
@@ -184,7 +184,7 @@ myfread(void *buf, size_t elt, size_t n, int fd)
 	return fread(buf, elt, n, myfiles[fd].file);
 }
 
-static int
+static size_t
 myfwrite(void *buf, size_t elt, size_t n, int fd)
 {
 	if(myfiles[fd].isText){
@@ -265,11 +265,11 @@ CFileMgr::SetDirMyDocuments(void)
 	mychdir(_psGetUserFilesFolder());
 }
 
-int
+size_t
 CFileMgr::LoadFile(const char *file, uint8 *buf, int unused, const char *mode)
 {
 	int fd;
-	int n, len;
+	size_t n, len;
 
 	fd = myfopen(file, mode);
 	if(fd == 0)
@@ -298,13 +298,13 @@ CFileMgr::OpenFileForWriting(const char *file)
 	return OpenFile(file, "wb");
 }
 
-int
+size_t
 CFileMgr::Read(int fd, const char *buf, int len)
 {
 	return myfread((void*)buf, 1, len, fd);
 }
 
-int
+size_t
 CFileMgr::Write(int fd, const char *buf, int len)
 {
 	return myfwrite((void*)buf, 1, len, fd);
diff --git a/src/core/FileMgr.h b/src/core/FileMgr.h
index 1d0faf50..0ad9daa7 100644
--- a/src/core/FileMgr.h
+++ b/src/core/FileMgr.h
@@ -9,12 +9,12 @@ public:
 	static void ChangeDir(const char *dir);
 	static void SetDir(const char *dir);
 	static void SetDirMyDocuments(void);
-	static int LoadFile(const char *file, uint8 *buf, int unused, const char *mode);
+	static size_t LoadFile(const char *file, uint8 *buf, int unused, const char *mode);
 	static int OpenFile(const char *file, const char *mode);
 	static int OpenFile(const char *file) { return OpenFile(file, "rb"); }
 	static int OpenFileForWriting(const char *file);
-	static int Read(int fd, const char *buf, int len);
-	static int Write(int fd, const char *buf, int len);
+	static size_t Read(int fd, const char *buf, int len);
+	static size_t Write(int fd, const char *buf, int len);
 	static bool Seek(int fd, int offset, int whence);
 	static bool ReadLine(int fd, char *buf, int len);
 	static int CloseFile(int fd);
diff --git a/src/core/Frontend.cpp b/src/core/Frontend.cpp
index 6e4e8917..95d5f6e6 100644
--- a/src/core/Frontend.cpp
+++ b/src/core/Frontend.cpp
@@ -2604,7 +2604,7 @@ CMenuManager::DrawPlayerSetupScreen()
 		char nameTemp[256];
 		for (m_pSelectedSkin = m_pSkinListHead.nextSkin; m_pSelectedSkin; m_pSelectedSkin = m_pSelectedSkin->nextSkin) {
 			// Drop extension
-			int oldLength = strlen(m_pSelectedSkin->skinNameDisplayed);
+			int oldLength = (int)strlen(m_pSelectedSkin->skinNameDisplayed);
 			m_pSelectedSkin->skinNameDisplayed[oldLength - 4] = '\0';
 			m_pSelectedSkin->skinNameOriginal[oldLength - 4] = '\0';
 
diff --git a/src/core/Pad.cpp b/src/core/Pad.cpp
index 851625d2..944d7b2c 100644
--- a/src/core/Pad.cpp
+++ b/src/core/Pad.cpp
@@ -2634,7 +2634,7 @@ void CPad::ResetCheats(void)
 
 char *CPad::EditString(char *pStr, int32 nSize)
 {
-	int32 pos = strlen(pStr);
+	int32 pos = (int32)strlen(pStr);
 
 	// letters
 	for ( int32 i = 0; i < ('Z' - 'A' + 1); i++ )
diff --git a/src/core/Streaming.cpp b/src/core/Streaming.cpp
index b701f43f..6b652a6a 100644
--- a/src/core/Streaming.cpp
+++ b/src/core/Streaming.cpp
@@ -45,7 +45,7 @@ int32 CStreaming::ms_oldSectorX;
 int32 CStreaming::ms_oldSectorY;
 int32 CStreaming::ms_streamingBufferSize;
 int8 *CStreaming::ms_pStreamingBuffer[2];
-int32 CStreaming::ms_memoryUsed;
+size_t CStreaming::ms_memoryUsed;
 CStreamingChannel CStreaming::ms_channel[2];
 int32 CStreaming::ms_channelError;
 int32 CStreaming::ms_numVehiclesLoaded;
@@ -62,7 +62,7 @@ uint16 CStreaming::ms_loadedGangCars;
 int32 CStreaming::ms_imageOffsets[NUMCDIMAGES];
 int32 CStreaming::ms_lastImageRead;
 int32 CStreaming::ms_imageSize;
-uint32 CStreaming::ms_memoryAvailable;
+size_t CStreaming::ms_memoryAvailable;
 
 int32 desiredNumVehiclesLoaded = 12;
 
@@ -202,14 +202,19 @@ CStreaming::Init2(void)
 	// PC only, figure out how much memory we got
 #ifdef GTA_PC
 #define MB (1024*1024)
-	extern unsigned long _dwMemAvailPhys;
+
+	extern size_t _dwMemAvailPhys;
 	ms_memoryAvailable = (_dwMemAvailPhys - 10*MB)/2;
 	if(ms_memoryAvailable < 50*MB)
 		ms_memoryAvailable = 50*MB;
-	desiredNumVehiclesLoaded = (ms_memoryAvailable/MB - 50)/3 + 12;
+	desiredNumVehiclesLoaded = (int32)((ms_memoryAvailable / MB - 50) / 3 + 12);
 	if(desiredNumVehiclesLoaded > MAXVEHICLESLOADED)
 		desiredNumVehiclesLoaded = MAXVEHICLESLOADED;
+#if defined(__LP64__) || defined(_WIN64)
+	debug("Memory allocated to Streaming is %lluMB", ms_memoryAvailable/MB);
+#else
 	debug("Memory allocated to Streaming is %dMB", ms_memoryAvailable/MB);
+#endif
 #undef MB
 #endif
 
@@ -1085,7 +1090,7 @@ CStreaming::RemoveAllUnusedModels(void)
 }
 
 bool
-CStreaming::RemoveReferencedTxds(int32 mem)
+CStreaming::RemoveReferencedTxds(size_t mem)
 {
 	CStreamingInfo *si;
 	int streamId;
@@ -2201,7 +2206,7 @@ CStreaming::DeleteRwObjectsAfterDeath(const CVector &pos)
 }
 
 void
-CStreaming::DeleteRwObjectsBehindCamera(int32 mem)
+CStreaming::DeleteRwObjectsBehindCamera(size_t mem)
 {
 	int ix, iy;
 	int x, y;
@@ -2382,7 +2387,7 @@ CStreaming::DeleteRwObjectsInOverlapSectorList(CPtrList &list, int32 x, int32 y)
 }
 
 bool
-CStreaming::DeleteRwObjectsBehindCameraInSectorList(CPtrList &list, int32 mem)
+CStreaming::DeleteRwObjectsBehindCameraInSectorList(CPtrList &list, size_t mem)
 {
 	CPtrNode *node;
 	CEntity *e;
@@ -2403,7 +2408,7 @@ CStreaming::DeleteRwObjectsBehindCameraInSectorList(CPtrList &list, int32 mem)
 }
 
 bool
-CStreaming::DeleteRwObjectsNotInFrustumInSectorList(CPtrList &list, int32 mem)
+CStreaming::DeleteRwObjectsNotInFrustumInSectorList(CPtrList &list, size_t mem)
 {
 	CPtrNode *node;
 	CEntity *e;
@@ -2430,7 +2435,7 @@ CStreaming::MakeSpaceFor(int32 size)
 	// the code still happens to work in that case because ms_memoryAvailable is unsigned
 	// but it's not nice....
 
-	while((uint32)ms_memoryUsed >= ms_memoryAvailable - size)
+	while(ms_memoryUsed >= ms_memoryAvailable - size)
 		if(!RemoveLeastUsedModel()){
 			DeleteRwObjectsBehindCamera(ms_memoryAvailable - size);
 			return;
@@ -2492,7 +2497,11 @@ CStreaming::UpdateForAnimViewer(void)
 	if (CStreaming::ms_channelError == -1) {
 		CStreaming::AddModelsToRequestList(CVector(0.0f, 0.0f, 0.0f));
 		CStreaming::LoadRequestedModels();
+#if defined(__LP64__) || defined(_WIN64)
+		sprintf(gString, "Requested %d, memory size %lluK\n", CStreaming::ms_numModelsRequested, 2 * CStreaming::ms_memoryUsed);
+#else
 		sprintf(gString, "Requested %d, memory size %dK\n", CStreaming::ms_numModelsRequested, 2 * CStreaming::ms_memoryUsed);
+#endif
 	}
 	else {
 		CStreaming::RetryLoadFile(CStreaming::ms_channelError);
diff --git a/src/core/Streaming.h b/src/core/Streaming.h
index 84434769..0b2ff124 100644
--- a/src/core/Streaming.h
+++ b/src/core/Streaming.h
@@ -86,7 +86,7 @@ public:
 	static int32 ms_oldSectorY;
 	static int32 ms_streamingBufferSize;
 	static int8 *ms_pStreamingBuffer[2];
-	static int32 ms_memoryUsed;
+	static size_t ms_memoryUsed;
 	static CStreamingChannel ms_channel[2];
 	static int32 ms_channelError;
 	static int32 ms_numVehiclesLoaded;
@@ -103,7 +103,7 @@ public:
 	static int32 ms_imageOffsets[NUMCDIMAGES];
 	static int32 ms_lastImageRead;
 	static int32 ms_imageSize;
-	static uint32 ms_memoryAvailable;
+	static size_t ms_memoryAvailable;
 
 	static void Init(void);
 	static void Init2(void);
@@ -140,7 +140,7 @@ public:
 	static bool RemoveLeastUsedModel(void);
 	static void RemoveAllUnusedModels(void);
 	static void RemoveUnusedModelsInLoadedList(void);
-	static bool RemoveReferencedTxds(int32 mem);
+	static bool RemoveReferencedTxds(size_t mem);
 	static int32 GetAvailableVehicleSlot(void);
 	static bool IsTxdUsedByRequestedModels(int32 txdId);
 	static bool AddToLoadedVehiclesList(int32 modelId);
@@ -176,11 +176,11 @@ public:
 	static void DeleteFarAwayRwObjects(const CVector &pos);
 	static void DeleteAllRwObjects(void);
 	static void DeleteRwObjectsAfterDeath(const CVector &pos);
-	static void DeleteRwObjectsBehindCamera(int32 mem);
+	static void DeleteRwObjectsBehindCamera(size_t mem);
 	static void DeleteRwObjectsInSectorList(CPtrList &list);
 	static void DeleteRwObjectsInOverlapSectorList(CPtrList &list, int32 x, int32 y);
-	static bool DeleteRwObjectsBehindCameraInSectorList(CPtrList &list, int32 mem);
-	static bool DeleteRwObjectsNotInFrustumInSectorList(CPtrList &list, int32 mem);
+	static bool DeleteRwObjectsBehindCameraInSectorList(CPtrList &list, size_t mem);
+	static bool DeleteRwObjectsNotInFrustumInSectorList(CPtrList &list, size_t mem);
 
 	static void LoadScene(const CVector &pos);
 
diff --git a/src/core/common.h b/src/core/common.h
index 4bf1aebd..17a186d0 100644
--- a/src/core/common.h
+++ b/src/core/common.h
@@ -17,7 +17,11 @@
 
 #if defined _WIN32 && defined WITHD3D
 #include <windows.h>
+#ifndef USE_D3D9
 #include <d3d8types.h>
+#else
+#include <d3d9types.h>
+#endif
 #endif
 
 #include <rwcore.h>