From 5d58b51f5c8332f20d152ee1364f10d190506683 Mon Sep 17 00:00:00 2001
From: amber <amber@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Thu, 31 Mar 2005 21:03:22 +0000
Subject: fixed memory corruption in mapif_guild_info:int_guild.c

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@1367 54d463be-8e91-2dee-dedb-b68131a5f0ec
---
 Changelog-SVN.txt              |  2 ++
 src/char/int_guild.c           |  2 +-
 vcproj/char-server_sql.vcproj  |  9 ++++++---
 vcproj/char-server_txt.vcproj  |  9 ++++++---
 vcproj/login-server_sql.vcproj | 10 ++++++----
 vcproj/login-server_txt.vcproj | 10 ++++++----
 vcproj/map-server_sql.vcproj   |  9 ++++++---
 vcproj/map-server_txt.vcproj   |  6 ++++--
 8 files changed, 37 insertions(+), 20 deletions(-)

diff --git a/Changelog-SVN.txt b/Changelog-SVN.txt
index 4c1330d07..0a952fafb 100644
--- a/Changelog-SVN.txt
+++ b/Changelog-SVN.txt
@@ -2,6 +2,8 @@
 Date	Added
 
 03/31
+        * fixed memory corruption in mapif_guild_info:int_guild.c
+          [SVN 1367: MouseJstr]
 	* Fixed common/lock.c (problem with unistd.h include) [Codemaster]
         * Added father/mother/child fields to mmo_char_tostr() and
           mmo_char_fromstr() [veider]
diff --git a/src/char/int_guild.c b/src/char/int_guild.c
index 95f0cf099..9268d9339 100644
--- a/src/char/int_guild.c
+++ b/src/char/int_guild.c
@@ -731,7 +731,7 @@ int mapif_guild_noinfo(int fd, int guild_id) {
 
 // ギルド情報まとめ送り
 int mapif_guild_info(int fd, struct guild *g) {
-	unsigned char buf[2048];
+	unsigned char buf[16384];
 
 	WBUFW(buf,0) = 0x3831;
 	memcpy(buf + 4, g, sizeof(struct guild));
diff --git a/vcproj/char-server_sql.vcproj b/vcproj/char-server_sql.vcproj
index 3a0d6e600..f2ba8781d 100644
--- a/vcproj/char-server_sql.vcproj
+++ b/vcproj/char-server_sql.vcproj
@@ -69,9 +69,10 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
-				RuntimeLibrary="4"
-				UsePrecompiledHeader="3"
+				AdditionalIncludeDirectories="..\src\common;;src\zlib;C:\Program Files\MySQL\MySQL Server 4.1\include"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_WIN32;PACKETVER=6;NEW_006b;__WIN32;LOCALZLIB"
+				RuntimeLibrary="1"
+				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="TRUE"
 				DebugInformationFormat="3"/>
@@ -79,6 +80,8 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="WSOCK32.lib mysqlclient.lib"
+				AdditionalLibraryDirectories="C:\Program Files\MySQL\MySQL Server 4.1\lib\debug"
 				OutputFile="../char-server_sql.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="TRUE"
diff --git a/vcproj/char-server_txt.vcproj b/vcproj/char-server_txt.vcproj
index 8ccd9a5ed..26319cd9e 100644
--- a/vcproj/char-server_txt.vcproj
+++ b/vcproj/char-server_txt.vcproj
@@ -68,9 +68,11 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
-				RuntimeLibrary="4"
-				UsePrecompiledHeader="3"
+				AdditionalIncludeDirectories="..\src\common;;src\zlib"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_WIN32;PACKETVER=6;TXT_ONLY;NEW_006b;__WIN32;LOCALZLIB"
+
+				RuntimeLibrary="5"
+				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="TRUE"
 				DebugInformationFormat="3"/>
@@ -78,6 +80,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="WSOCK32.lib"
 				OutputFile="..\char-server.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="TRUE"
diff --git a/vcproj/login-server_sql.vcproj b/vcproj/login-server_sql.vcproj
index 931dea77a..dcf4fc108 100644
--- a/vcproj/login-server_sql.vcproj
+++ b/vcproj/login-server_sql.vcproj
@@ -69,9 +69,10 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
-				RuntimeLibrary="4"
-				UsePrecompiledHeader="3"
+				AdditionalIncludeDirectories="src\common;src\map;src\zlib;C:\Program Files\MySQL\MySQL Server 4.1\include"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_WIN32;PACKETVER=6;NEW_006b;__WIN32;LOCALZLIB"
+				RuntimeLibrary="1"
+				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="TRUE"
 				DebugInformationFormat="3"/>
@@ -79,7 +80,8 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile="..\login-server_sql.exe"
+				AdditionalLibraryDirectories="C:\Program Files\MySQL\MySQL Server 4.1\lib\debug"
+				AdditionalDependencies="WSOCK32.lib  mysqlclient.lib"				OutputFile="..\login-server_sql.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="TRUE"
 				SubSystem="1"
diff --git a/vcproj/login-server_txt.vcproj b/vcproj/login-server_txt.vcproj
index 679c06cc7..84766b3af 100644
--- a/vcproj/login-server_txt.vcproj
+++ b/vcproj/login-server_txt.vcproj
@@ -68,9 +68,10 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
-				RuntimeLibrary="4"
-				UsePrecompiledHeader="3"
+				AdditionalIncludeDirectories="src\common;src\map;src\zlib"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_WIN32;PACKETVER=6;TXT_ONLY;NEW_006b;__WIN32;LOCALZLIB"
+				RuntimeLibrary="1"
+				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="TRUE"
 				DebugInformationFormat="3"/>
@@ -78,7 +79,8 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile="$(OutDir)/eAthena.exe"
+				AdditionalDependencies="WSOCK32.lib"
+				OutputFile="..\login-server.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="TRUE"
 				SubSystem="1"
diff --git a/vcproj/map-server_sql.vcproj b/vcproj/map-server_sql.vcproj
index cbde0d29a..f1dc809ce 100644
--- a/vcproj/map-server_sql.vcproj
+++ b/vcproj/map-server_sql.vcproj
@@ -70,9 +70,10 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
-				RuntimeLibrary="4"
-				UsePrecompiledHeader="3"
+				AdditionalIncludeDirectories="..\src\common;..\src\map;..\src\zlib;C:\Program Files\MySQL\MySQL Server 4.1\include"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_WIN32;PACKETVER=6;NEW_006b;__WIN32;LOCALZLIB"
+				RuntimeLibrary="1"
+				UsePrecompiledHeader="1"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="TRUE"
 				DebugInformationFormat="3"/>
@@ -80,6 +81,8 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="WSOCK32.lib mysqlclient.lib"
+				AdditionalLibraryDirectories="C:\Program Files\MySQL\MySQL Server 4.1\lib\debug"
 				OutputFile="..\map-server_sql.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="TRUE"
diff --git a/vcproj/map-server_txt.vcproj b/vcproj/map-server_txt.vcproj
index 3387ea695..83aac2565 100644
--- a/vcproj/map-server_txt.vcproj
+++ b/vcproj/map-server_txt.vcproj
@@ -68,7 +68,8 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				AdditionalIncludeDirectories="..\src\common;..\src\map;..\src\zlib"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_WIN32;PACKETVER=6;TXT_ONLY;NEW_006b;__WIN32;LOCALZLIB"
 				RuntimeLibrary="4"
 				UsePrecompiledHeader="3"
 				WarningLevel="3"
@@ -78,7 +79,8 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile="$(OutDir)/eAthena.exe"
+				AdditionalDependencies="WSOCK32.lib"
+				OutputFile="..\map-server.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="TRUE"
 				SubSystem="1"
-- 
cgit v1.2.3-70-g09d2