Updated some deprecated functions

Author: coruja747

SphereSvr.vcxproj

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|x64">
       <Configuration>Debug</Configuration>
@@ -15,21 +15,10 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <TargetName>SphereSvr</TargetName>
-    <ProjectName>0.56d</ProjectName>
     <ProjectGuid>{40CA07B5-BCC7-A9C8-A6E6-DEFC536EE8CB}</ProjectGuid>
     <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)'=='Debug'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)'=='Nightly'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)'=='Release'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ItemDefinitionGroup>
     <ClCompile>
@@ -40,7 +29,7 @@
     </ClCompile>
     <Link>
       <AdditionalDependencies>libmysql.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>src\common\mysql\lib</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(ProjectDir)src\common\mysql\lib</AdditionalLibraryDirectories>
       <LanguageStandard>stdcpp20</LanguageStandard>
       <SubSystem>Windows</SubSystem>
     </Link>
@@ -63,7 +52,7 @@ git rev-parse --is-inside-work-tree &gt;nul 2&gt;&amp;1 &amp;&amp; (
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
       <EnableCOMDATFolding>false</EnableCOMDATFolding>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
     </ClCompile>
@@ -78,7 +67,7 @@ git rev-parse --is-inside-work-tree &gt;nul 2&gt;&amp;1 &amp;&amp; (
     <ClCompile>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <Optimization>MaxSpeed</Optimization>
-      <PreprocessorDefinitions>_NIGHTLYBUILD;_THREAD_TRACK_CALLSTACK;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_NIGHTLYBUILD;_THREAD_TRACK_CALLSTACK;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <WholeProgramOptimization>true</WholeProgramOptimization>
     </ClCompile>
     <ResourceCompile>
@@ -93,7 +82,7 @@ git rev-parse --is-inside-work-tree &gt;nul 2&gt;&amp;1 &amp;&amp; (
     <ClCompile>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <Optimization>MaxSpeed</Optimization>
-      <PreprocessorDefinitions>_THREAD_TRACK_CALLSTACK;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_THREAD_TRACK_CALLSTACK;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <WholeProgramOptimization>true</WholeProgramOptimization>
     </ClCompile>
     <ResourceCompile>

src/common/CSocket.cpp

@@ -1,4 +1,5 @@
 #include "../graysvr/graysvr.h"
+#include <thread>
 #ifdef __FreeBSD__
 	#include <errno.h>
 #endif
@@ -16,9 +17,20 @@ void CSocketAddressIP::SetHostStr(LPCTSTR pszHostName)
 		return SetAddrStr(pszHostName);
 
 	// Try to resolve hostname
-	struct hostent *pHost = gethostbyname(pszHostName);
-	if ( pHost && pHost->h_addr )
-		SetAddrIP(*reinterpret_cast<DWORD *>(pHost->h_addr));
+	struct addrinfo hints = {};
+	hints.ai_family = AF_INET;
+	hints.ai_socktype = SOCK_STREAM;
+	struct addrinfo *pResult = NULL;
+
+	if ( getaddrinfo(pszHostName, NULL, &hints, &pResult) == 0 )
+	{
+		if ( pResult )
+		{
+			struct sockaddr_in *pSockAddrIn = reinterpret_cast<struct sockaddr_in *>(pResult->ai_addr);
+			SetAddrIP(pSockAddrIn->sin_addr.s_addr);
+			freeaddrinfo(pResult);
+		}
+	}
 }
 
 ///////////////////////////////////////////////////////////
@@ -67,13 +79,12 @@ void CSocketAddress::SetHostPortStr(LPCTSTR pszIP)
 ///////////////////////////////////////////////////////////
 // CGSocket
 
-int CGSocket::GetLastError(bool fUseErrno)
+int CGSocket::GetLastError()
 {
 #ifdef _WIN32
-	UNREFERENCED_PARAMETER(fUseErrno);
 	return WSAGetLastError();
 #else
-	return fUseErrno ? errno : h_errno;
+	return errno;
 #endif
 }
 
@@ -228,6 +239,6 @@ void CGSocket::ClearAsync()
 {
 	// TO BE CALLED IN CClient destructor !!!
 	CancelIo(reinterpret_cast<HANDLE>(m_hSocket));
-	SleepEx(1, TRUE);
+	std::this_thread::sleep_for(std::chrono::milliseconds(1));
 }
 #endif

src/common/CSocket.h

@@ -34,22 +34,32 @@ struct CSocketAddressIP : public in_addr
 	{
 		s_addr = dwIP;
 	}
-	explicit CSocketAddressIP(const char *ip)
+	explicit CSocketAddressIP(LPCTSTR pszIP)
 	{
-		s_addr = inet_addr(ip);
+		SetAddrStr(pszIP);
 	}
 
 public:
 	void SetHostStr(LPCTSTR pszHostName);
 
 	LPCTSTR GetAddrStr() const
 	{
-		return inet_ntoa(*this);
+		static thread_local TCHAR szIP[INET_ADDRSTRLEN];
+		if ( inet_ntop(AF_INET, const_cast<struct in_addr *>(static_cast<const struct in_addr *>(this)), szIP, sizeof(szIP)) )
+			return szIP;
+
+		return "0.0.0.0";
 	}
 	void SetAddrStr(LPCTSTR pszIP)
 	{
 		// IP must be in IPv4 format (x.x.x.x)
-		s_addr = inet_addr(pszIP);
+		s_addr = INADDR_BROADCAST;
+		if ( pszIP )
+		{
+			struct in_addr addr;
+			if ( inet_pton(AF_INET, pszIP, &addr) == 1 )
+				s_addr = addr.s_addr;
+		}
 	}
 
 	DWORD GetAddrIP() const
@@ -177,7 +187,7 @@ class CGSocket
 	}
 
 public:
-	static int GetLastError(bool fUseErrno = false);
+	static int GetLastError();
 	bool IsOpen() const
 	{
 		return (m_hSocket != INVALID_SOCKET);

src/common/os_unix.h

@@ -3,15 +3,15 @@
 #pragma once
 
 #ifndef _WIN32
+#include <cctype>
+#include <climits>
+#include <cstdarg>
 #include <cstdint>
-#include <stdio.h>
-#include <stdarg.h>
-#include <string.h>
-#include <limits.h>
+#include <cstdio>
+#include <cstring>
 #include <pthread.h>
-#include <unistd.h>
 #include <sys/wait.h>
-#include <cctype>
+#include <unistd.h>
 
 // Port some Windows stuff to Linux
 typedef unsigned char		BYTE;				// 8 bits
@@ -50,8 +50,6 @@ typedef int					BOOL;
 #define _cdecl
 #define __cdecl
 #define _vsnprintf				vsnprintf
-#define Sleep(mSec)				usleep(mSec * 1000)		// arg is microseconds = 1/1000000
-#define SleepEx(mSec, unused)	usleep(mSec * 1000)		// arg is microseconds = 1/1000000
 
 #ifndef _MAX_PATH
 	#define _MAX_PATH	260
@@ -71,16 +69,24 @@ typedef int					BOOL;
 	#define UNREFERENCED_PARAMETER(P)	(void)(P)
 #endif
 
-inline void _strupr(TCHAR *pszStr)
+inline TCHAR* _strupr(TCHAR *pszStr)
 {
-	for ( ; *pszStr != '\0'; ++pszStr )
-		*pszStr = toupper(*pszStr);
+	if ( pszStr )
+	{
+		for ( ; *pszStr != '\0'; ++pszStr )
+			*pszStr = static_cast<TCHAR>(toupper(static_cast<unsigned char>(*pszStr)));
+	}
+	return pszStr;
 }
 
-inline void _strlwr(TCHAR *pszStr)
+inline TCHAR* _strlwr(TCHAR *pszStr)
 {
-	for ( ; *pszStr != '\0'; ++pszStr )
-		*pszStr = tolower(*pszStr);
+	if ( pszStr )
+	{
+		for ( ; *pszStr != '\0'; ++pszStr )
+			*pszStr = static_cast<TCHAR>(tolower(static_cast<unsigned char>(*pszStr)));
+	}
+	return pszStr;
 }
 
 #endif	// _WIN32

src/common/os_windows.h

@@ -3,12 +3,6 @@
 #pragma once
 
 #ifdef _WIN32
-#ifndef _CRT_SECURE_NO_WARNINGS
-	#define _CRT_SECURE_NO_WARNINGS
-#endif
-#ifndef _WINSOCK_DEPRECATED_NO_WARNINGS
-	#define _WINSOCK_DEPRECATED_NO_WARNINGS
-#endif
 #undef FD_SETSIZE
 #define FD_SETSIZE 1024	// for max of n users ! default = 64
 

src/graysvr/CClientMsg.cpp

@@ -2629,18 +2629,18 @@ void CClient::addAOSTooltip(const CObjBase *pObj, bool fRequested, bool fShop)
 								if ( iMaxWeight > 0 )
 								{
 									m_TooltipData.Add(t = new CClientTooltip(1072241)); // Contents: ~1_COUNT~/~2_MAXCOUNT~ items, ~3_WEIGHT~/~4_MAXWEIGHT~ stones
-									t->FormatArgs("%" FMTSIZE_T "\t%d\t%d\t%d", pContainer->GetCount(), MAX_ITEMS_CONT, pContainer->GetTotalWeight() / WEIGHT_UNITS, iMaxWeight / WEIGHT_UNITS);
+									t->FormatArgs("%zu\t%d\t%d\t%d", pContainer->GetCount(), MAX_ITEMS_CONT, pContainer->GetTotalWeight() / WEIGHT_UNITS, iMaxWeight / WEIGHT_UNITS);
 								}
 								else
 								{
 									m_TooltipData.Add(t = new CClientTooltip(1073841)); // Contents: ~1_COUNT~/~2_MAXCOUNT~ items, ~3_WEIGHT~ stones
-									t->FormatArgs("%" FMTSIZE_T "\t%d\t%d", pContainer->GetCount(), MAX_ITEMS_CONT, pContainer->GetTotalWeight() / WEIGHT_UNITS);
+									t->FormatArgs("%zu\t%d\t%d", pContainer->GetCount(), MAX_ITEMS_CONT, pContainer->GetTotalWeight() / WEIGHT_UNITS);
 								}
 							}
 							else
 							{
 								m_TooltipData.Add(t = new CClientTooltip(1050044)); // ~1_COUNT~ items, ~2_WEIGHT~ stones
-								t->FormatArgs("%" FMTSIZE_T "\t%d", pContainer->GetCount(), pContainer->GetTotalWeight() / WEIGHT_UNITS);
+								t->FormatArgs("%zu\t%d", pContainer->GetCount(), pContainer->GetTotalWeight() / WEIGHT_UNITS);
 							}
 
 							if ( pItem->m_WeightReduction != 0 )
@@ -2651,7 +2651,7 @@ void CClient::addAOSTooltip(const CObjBase *pObj, bool fRequested, bool fShop)
 						}
 					}
 
-					const CChar *pCraftsman = static_cast<CGrayUID>(pItem->GetDefNum("CRAFTEDBY")).CharFind();
+					const CChar *pCraftsman = static_cast<CGrayUID>(static_cast<DWORD>(pItem->GetDefNum("CRAFTEDBY"))).CharFind();
 					if ( pCraftsman )
 					{
 						m_TooltipData.Add(t = new CClientTooltip(1050043)); // crafted by ~1_NAME~
@@ -3361,28 +3361,28 @@ void CClient::SendPacket(TCHAR *pszKey)
 		if ( packet->getLength() > SCRIPT_MAX_LINE_LEN - 4 )
 		{
 			// We won't get here because this lenght is enforced in all scripts
-			DEBUG_ERR(("SENDPACKET function exceeded max length allowed (%" FMTSIZE_T "/%d)\n", packet->getLength(), SCRIPT_MAX_LINE_LEN - 4));
+			DEBUG_ERR(("SENDPACKET function exceeded max length allowed (%zu/%d)\n", packet->getLength(), SCRIPT_MAX_LINE_LEN - 4));
 			delete packet;
 			return;
 		}
 
 		GETNONWHITESPACE(pszKey);
-
-		if ( toupper(*pszKey) == 'D' )
-		{
-			++pszKey;
-			packet->writeInt32(static_cast<DWORD>(Exp_GetLLVal(pszKey)));
-		}
-		else if ( toupper(*pszKey) == 'W' )
-		{
-			++pszKey;
-			packet->writeInt16(static_cast<WORD>(Exp_GetLLVal(pszKey)));
-		}
-		else
+		switch ( toupper(*pszKey) )
 		{
-			if ( toupper(*pszKey) == 'B' )
+			case 'D':
 				++pszKey;
-			packet->writeByte(static_cast<BYTE>(Exp_GetLLVal(pszKey)));
+				packet->writeInt32(static_cast<DWORD>(Exp_GetLLVal(pszKey)));
+				break;
+			case 'W':
+				++pszKey;
+				packet->writeInt16(static_cast<WORD>(Exp_GetLLVal(pszKey)));
+				break;
+			case 'B':
+				++pszKey;
+				// fall through
+			default:
+				packet->writeByte(static_cast<BYTE>(Exp_GetLLVal(pszKey)));
+				break;
 		}
 	}