From 43b746d2f8f4c009488ae7a54542dcdf41631ecb Mon Sep 17 00:00:00 2001
From: lewa_j <lewa.j20@gmail.com>
Date: Sun, 13 May 2018 23:25:51 +0300
Subject: [PATCH] Fix MinGW build

---
 engine/common/common.h          |  3 ++-
 engine/common/net_ws.c          |  8 +++++++-
 engine/common/system.c          | 10 +++++-----
 engine/platform/sdl/vid_sdl.c   |  3 ++-
 engine/platform/win32/win_con.c |  4 ++--
 engine/platform/win32/win_lib.c |  4 ++--
 6 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/engine/common/common.h b/engine/common/common.h
index c5a96b93..43502194 100644
--- a/engine/common/common.h
+++ b/engine/common/common.h
@@ -425,7 +425,8 @@ typedef struct
 typedef struct host_parm_s
 {
 	HINSTANCE			hInst;
-
+	HANDLE				hMutex;
+	
 	host_status_t	status;		// global host state
 	game_status_t	game;		// game manager
 	uint		type;		// running at
diff --git a/engine/common/net_ws.c b/engine/common/net_ws.c
index 799f4124..c0cd1ce6 100644
--- a/engine/common/net_ws.c
+++ b/engine/common/net_ws.c
@@ -103,6 +103,11 @@ static dllfunc_t winsock_funcs[] =
 
 dll_info_t winsock_dll = { "wsock32.dll", winsock_funcs, false };
 
+static void (_stdcall *pInitializeCriticalSection)( void* );
+static void (_stdcall *pEnterCriticalSection)( void* );
+static void (_stdcall *pLeaveCriticalSection)( void* );
+static void (_stdcall *pDeleteCriticalSection)( void* );
+
 static dllfunc_t kernel32_funcs[] =
 {
 	{ "InitializeCriticalSection", (void **) &pInitializeCriticalSection },
@@ -1429,9 +1434,10 @@ void NET_SendPacket( netsrc_t sock, size_t length, const void *data, netadr_t to
 
 	if( NET_IsSocketError( ret ))
 	{
+		int err = 0;
 		{
 #ifdef _WIN32
-			int err = pWSAGetLastError();
+			err = pWSAGetLastError();
 
 			// WSAEWOULDBLOCK is silent
 			if( err == WSAEWOULDBLOCK )
diff --git a/engine/common/system.c b/engine/common/system.c
index 2f712506..9c096dea 100644
--- a/engine/common/system.c
+++ b/engine/common/system.c
@@ -538,7 +538,7 @@ void Sys_WaitForQuit( void )
 #ifdef _WIN32
 	MSG	msg;
 
-	Con_RegisterHotkeys();		
+	Wcon_RegisterHotkeys();		
 
 	msg.message = 0;
 
@@ -616,8 +616,8 @@ void Sys_Error( const char *error, ... )
 	if( host_developer.value )
 	{
 #ifdef _WIN32
-		Con_ShowConsole( true );
-		Con_DisableInput();	// disable input line for dedicated server
+		Wcon_ShowConsole( true );
+		Wcon_DisableInput();	// disable input line for dedicated server
 #endif
 		Sys_Print( text );	// print error message
 		Sys_WaitForQuit();
@@ -625,7 +625,7 @@ void Sys_Error( const char *error, ... )
 	else
 	{
 #ifdef _WIN32
-		Con_ShowConsole( false );
+		Wcon_ShowConsole( false );
 #endif
 		MSGBOX( text );
 	}
@@ -730,7 +730,7 @@ void Sys_Print( const char *pMsg )
 
 		*b = *c = 0; // terminator
 
-		Con_WinPrint( buffer );
+		Wcon_WinPrint( buffer );
 	}
 #endif
 
diff --git a/engine/platform/sdl/vid_sdl.c b/engine/platform/sdl/vid_sdl.c
index df55143a..d4300f22 100644
--- a/engine/platform/sdl/vid_sdl.c
+++ b/engine/platform/sdl/vid_sdl.c
@@ -302,7 +302,7 @@ static void WIN_SetDPIAwareness( void )
 				MsgDev( D_NOTE, "SetDPIAwareness: Success\n" );
 				bSuccess = TRUE;
 			}
-			else if( hResult = E_INVALIDARG ) MsgDev( D_NOTE, "SetDPIAwareness: Invalid argument\n" );
+			else if( hResult == E_INVALIDARG ) MsgDev( D_NOTE, "SetDPIAwareness: Invalid argument\n" );
 			else if( hResult == E_ACCESSDENIED ) MsgDev( D_NOTE, "SetDPIAwareness: Access Denied\n" );
 		}
 		else MsgDev( D_NOTE, "SetDPIAwareness: Can't get SetProcessDpiAwareness\n" );
@@ -540,6 +540,7 @@ void VID_RestoreScreenResolution( void )
 }
 
 #if defined(_WIN32) && !defined(XASH_64BIT) // ICO support only for Win32
+#include "SDL_syswm.h"
 static void WIN_SetWindowIcon( HICON ico )
 {
 	SDL_SysWMinfo wminfo;
diff --git a/engine/platform/win32/win_con.c b/engine/platform/win32/win_con.c
index 92b982b5..8725a720 100644
--- a/engine/platform/win32/win_con.c
+++ b/engine/platform/win32/win_con.c
@@ -270,7 +270,7 @@ void Wcon_CreateConsole( void )
 	string	FontName;
 
 	wc.style         = 0;
-	wc.lpfnWndProc   = (WNDPROC)Con_WndProc;
+	wc.lpfnWndProc   = (WNDPROC)Wcon_WndProc;
 	wc.cbClsExtra    = 0;
 	wc.cbWndExtra    = 0;
 	wc.hInstance     = host.hInst;
@@ -384,7 +384,7 @@ register console commands (dedicated only)
 void Wcon_InitConsoleCommands( void )
 {
 	if( host.type != HOST_DEDICATED ) return;
-	Cmd_AddCommand( "clear", Con_Clear_f, "clear console history" );
+	Cmd_AddCommand( "clear", Wcon_Clear_f, "clear console history" );
 }
 
 /*
diff --git a/engine/platform/win32/win_lib.c b/engine/platform/win32/win_lib.c
index dbfb6fc2..49743de4 100644
--- a/engine/platform/win32/win_lib.c
+++ b/engine/platform/win32/win_lib.c
@@ -915,7 +915,7 @@ void COM_FreeLibrary( void *hInstance )
 	Mem_Free( hInst );	// done
 }
 
-dword COM_FunctionFromName( void *hInstance, const char *pName )
+void *COM_FunctionFromName( void *hInstance, const char *pName )
 {
 	dll_user_t	*hInst = (dll_user_t *)hInstance;
 	int		i, index;
@@ -938,7 +938,7 @@ dword COM_FunctionFromName( void *hInstance, const char *pName )
 	return 0;
 }
 
-const char *COM_NameForFunction( void *hInstance, dword function )
+const char *COM_NameForFunction( void *hInstance, void *function )
 {
 	dll_user_t	*hInst = (dll_user_t *)hInstance;
 	int		i, index;