From 1058065ce7c9dc02c765341fe7f3f27e72021e78 Mon Sep 17 00:00:00 2001
From: Mark Vejvoda <mark_vejvoda@hotmail.com>
Date: Thu, 26 Aug 2010 20:28:26 +0000
Subject: [PATCH] - changing the max filecount lower to avoid stack overflow
 due to array taking > 1MB

---
 mk/windoze/Glest.sln                          |  3 +++
 mk/windoze/glest_editor.vcproj                |  2 +-
 source/glest_game/network/network_message.cpp | 14 +++++++++-----
 source/glest_game/network/network_message.h   |  4 ++--
 4 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/mk/windoze/Glest.sln b/mk/windoze/Glest.sln
index 3da6f4ae..84fc49eb 100755
--- a/mk/windoze/Glest.sln
+++ b/mk/windoze/Glest.sln
@@ -22,6 +22,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "g3d_viewer", "g3d_viewer.vc
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glest_configurator", "glest_configurator.vcproj", "{FE5C7C7C-F109-44F5-8329-19A4E24F162D}"
+	ProjectSection(ProjectDependencies) = postProject
+		{8DAA0C24-95CD-4F66-B4C5-19ABDD771746} = {8DAA0C24-95CD-4F66-B4C5-19ABDD771746}
+	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libstreflop", "libstreflop.vcproj", "{CDF4DDB9-945E-4D0D-9F0E-2BBEB5D22141}"
 EndProject
diff --git a/mk/windoze/glest_editor.vcproj b/mk/windoze/glest_editor.vcproj
index e421fe1d..f48f1cc2 100755
--- a/mk/windoze/glest_editor.vcproj
+++ b/mk/windoze/glest_editor.vcproj
@@ -64,7 +64,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="wxbase28d.lib wxbase28d_net.lib wxbase28d_xml.lib wxexpatd.lib wxjpegd.lib wxmsw28d_adv.lib wxmsw28d_aui.lib wxmsw28d_core.lib wxmsw28d_gl.lib wxmsw28d_html.lib wxmsw28d_media.lib wxmsw28d_qa.lib wxmsw28d_richtext.lib wxmsw28d_xrc.lib wxpngd.lib wxregexd.lib wxtiffd.lib wxzlibd.lib winmm.lib rpcrt4.lib kernel32.lib user32.lib gdi32.lib ole32.lib oleaut32.lib comctl32.lib comdlg32.lib uuid.lib advapi32.lib shell32.lib  libglest.lib sdl.lib sdlmain.lib dsound.lib dxguid.lib Dbghelp.lib libcurl.lib ws2_32.lib"
+				AdditionalDependencies="wxbase28d.lib wxbase28d_net.lib wxbase28d_xml.lib wxexpatd.lib wxjpegd.lib wxmsw28d_adv.lib wxmsw28d_aui.lib wxmsw28d_core.lib wxmsw28d_gl.lib wxmsw28d_html.lib wxmsw28d_media.lib wxmsw28d_qa.lib wxmsw28d_richtext.lib wxmsw28d_xrc.lib wxpngd.lib wxregexd.lib wxtiffd.lib wxzlibd.lib winmm.lib rpcrt4.lib kernel32.lib user32.lib gdi32.lib ole32.lib oleaut32.lib comctl32.lib comdlg32.lib uuid.lib advapi32.lib shell32.lib libglest.lib sdl.lib sdlmain.lib dsound.lib dxguid.lib Dbghelp.lib libcurl.lib ws2_32.lib"
 				OutputFile="$(OutDir)\Glest_Editor.exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="../../source/win32_deps/lib;&quot;../../build/$(ConfigurationName)/libglest&quot;"
diff --git a/source/glest_game/network/network_message.cpp b/source/glest_game/network/network_message.cpp
index 9a3c77e1..da8a946c 100644
--- a/source/glest_game/network/network_message.cpp
+++ b/source/glest_game/network/network_message.cpp
@@ -593,16 +593,20 @@ bool NetworkMessageSynchNetworkGameData::receive(Socket* socket) {
 
 		SystemFlags::OutputDebug(SystemFlags::debugNetwork,"In [%s::%s Line: %d] packetLoopCount = %d\n",__FILE__,__FUNCTION__,__LINE__,packetLoopCount);
 
-		for(int iPacketLoop = 0; iPacketLoop < packetLoopCount; ++iPacketLoop) {
+		for(int iPacketLoop = 0; result == true && iPacketLoop < packetLoopCount; ++iPacketLoop) {
 
 			int packetIndex = iPacketLoop * NetworkMessageSynchNetworkGameData::maxFileCRCPacketCount;
 			int maxFileCountPerPacket = maxFileCRCPacketCount;
 			int packetFileCount = min(maxFileCountPerPacket,data.header.techCRCFileCount - packetIndex);
+			int packetDetail1DataSize = (DetailSize1 * packetFileCount);
+			int packetDetail2DataSize = (DetailSize2 * packetFileCount);
+
+			SystemFlags::OutputDebug(SystemFlags::debugNetwork,"In [%s::%s Line: %d] iPacketLoop = %d, packetIndex = %d, maxFileCountPerPacket = %d, packetFileCount = %d, packetDetail1DataSize = %d, packetDetail2DataSize = %d\n",__FILE__,__FUNCTION__,__LINE__,iPacketLoop,packetIndex,maxFileCountPerPacket,packetFileCount,packetDetail1DataSize,packetDetail2DataSize);
 
 			for(int peekAttempt = 1; peekAttempt < 5000; peekAttempt++) {
 				SystemFlags::OutputDebug(SystemFlags::debugNetwork,"In [%s::%s Line: %d] peekAttempt = %d\n",__FILE__,__FUNCTION__,__LINE__,peekAttempt);
 
-				if (NetworkMessage::peek(socket, &data.detail.techCRCFileList[packetIndex], (DetailSize1 * packetFileCount)) == true) {
+				if (NetworkMessage::peek(socket, &data.detail.techCRCFileList[packetIndex], packetDetail1DataSize) == true) {
 					break;
 				}
 				else {
@@ -610,7 +614,7 @@ bool NetworkMessageSynchNetworkGameData::receive(Socket* socket) {
 				}
 			}
 
-			result = NetworkMessage::receive(socket, &data.detail.techCRCFileList[packetIndex], (DetailSize1 * packetFileCount));
+			result = NetworkMessage::receive(socket, &data.detail.techCRCFileList[packetIndex], packetDetail1DataSize);
 			if(result == true) {
 				for(int i = 0; i < data.header.techCRCFileCount; ++i) {
 					data.detail.techCRCFileList[i].nullTerminate();
@@ -619,7 +623,7 @@ bool NetworkMessageSynchNetworkGameData::receive(Socket* socket) {
 
 				for(int peekAttempt = 1; peekAttempt < 5000; peekAttempt++) {
 					SystemFlags::OutputDebug(SystemFlags::debugNetwork,"In [%s::%s Line: %d] peekAttempt = %d\n",__FILE__,__FUNCTION__,__LINE__,peekAttempt);
-					if (NetworkMessage::peek(socket, &data.detail.techCRCFileCRCList[packetIndex], (DetailSize2 * packetFileCount)) == true) {
+					if (NetworkMessage::peek(socket, &data.detail.techCRCFileCRCList[packetIndex], packetDetail2DataSize) == true) {
 						break;
 					}
 					else {
@@ -627,7 +631,7 @@ bool NetworkMessageSynchNetworkGameData::receive(Socket* socket) {
 					}
 				}
 
-				result = NetworkMessage::receive(socket, &data.detail.techCRCFileCRCList[packetIndex], (DetailSize2 * packetFileCount));
+				result = NetworkMessage::receive(socket, &data.detail.techCRCFileCRCList[packetIndex], packetDetail2DataSize);
 			}
 		}
 	}
diff --git a/source/glest_game/network/network_message.h b/source/glest_game/network/network_message.h
index 1090e80a..15685761 100644
--- a/source/glest_game/network/network_message.h
+++ b/source/glest_game/network/network_message.h
@@ -345,7 +345,7 @@ class NetworkMessageSynchNetworkGameData: public NetworkMessage{
 private:
 
 static const int maxStringSize= 255;
-static const int maxFileCRCCount= 2500;
+static const int maxFileCRCCount= 1500;
 static const int maxFileCRCPacketCount= 100;
 
 private:
@@ -417,7 +417,7 @@ class NetworkMessageSynchNetworkGameDataStatus: public NetworkMessage{
 private:
 
 static const int maxStringSize= 255;
-static const int maxFileCRCCount= 2500;
+static const int maxFileCRCCount= 1500;
 static const int maxFileCRCPacketCount= 100;
 
 private: