From 199d57b16c80e51ace23e1640a1c92c3ebca0314 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?eray=20or=C3=A7unus?= <erayorcunus@gmail.com>
Date: Sat, 25 Jul 2020 15:13:27 +0300
Subject: Fix/change some Windows define

---
 src/core/Game.cpp        |  2 +-
 src/skel/crossplatform.h | 10 +++------
 src/skel/win/win.cpp     | 56 ++++++++++++++++++++++++------------------------
 src/skel/win/win.h       |  3 ---
 4 files changed, 32 insertions(+), 39 deletions(-)

(limited to 'src')

diff --git a/src/core/Game.cpp b/src/core/Game.cpp
index f6275133..0d839dfa 100644
--- a/src/core/Game.cpp
+++ b/src/core/Game.cpp
@@ -365,7 +365,7 @@ bool CGame::Initialise(const char* datFile)
 	CStreaming::LoadInitialPeds();
 	CStreaming::RequestBigBuildings(LEVEL_GENERIC);
 	CStreaming::LoadAllRequestedModels(false);
-	printf("Streaming uses %dK of its memory", CStreaming::ms_memoryUsed / 1024);
+	printf("Streaming uses %zuK of its memory", CStreaming::ms_memoryUsed / 1024); // original modifier was %d
 	LoadingScreen("Loading the Game", "Load animations", GetRandomSplashScreen());
 	CAnimManager::LoadAnimFiles();
 	CPed::Initialise();
diff --git a/src/skel/crossplatform.h b/src/skel/crossplatform.h
index 066570be..268eedff 100644
--- a/src/skel/crossplatform.h
+++ b/src/skel/crossplatform.h
@@ -14,14 +14,10 @@ enum eWinVersion
 
 #ifdef _WIN32
 
-// As long as WITHWINDOWS isn't defined / <Windows.h> isn't included, include <windef.h>, which is lighter.
+// As long as WITHWINDOWS isn't defined / <Windows.h> isn't included, we only need type definitions so let's include <IntSafe.h>.
+// NOTE: It's perfectly fine to include <Windows.h> here, but it can increase build size and time in *some* conditions, and maybe substantially in future if we'll use crossplatform.h more.
 #ifndef _INC_WINDOWS
-    #ifdef _WIN64
-        #define _ARM64_
-    #else
-        #define _X86_
-    #endif
-    #include <windef.h>
+    #include <IntSafe.h>
 #endif
 #if defined RW_D3D9 || defined RWLIBS
 #include "win.h"
diff --git a/src/skel/win/win.cpp b/src/skel/win/win.cpp
index 9fde9d32..5c5c7ece 100644
--- a/src/skel/win/win.cpp
+++ b/src/skel/win/win.cpp
@@ -309,34 +309,6 @@ psNativeTextureSupport(void)
 	return RwD3D8DeviceSupportsDXTTexture();
 }
 
-/*
- *****************************************************************************
- */
-static BOOL
-InitApplication(HANDLE instance)
-{
-	/*
-	 * Perform any necessary MS Windows application initialization. Basically,
-	 * this means registering the window class for this application.
-	 */
-
-	WNDCLASS windowClass;
-
-	windowClass.style = CS_BYTEALIGNWINDOW;
-	windowClass.lpfnWndProc = (WNDPROC) MainWndProc;
-	windowClass.cbClsExtra = 0;
-	windowClass.cbWndExtra = 0;
-	windowClass.hInstance = (HINSTANCE)instance;
-	windowClass.hIcon = nil;
-	windowClass.hCursor = LoadCursor(nil, IDC_ARROW);
-	windowClass.hbrBackground = nil;
-	windowClass.lpszMenuName = NULL;
-	windowClass.lpszClassName = AppClassName;
-
-	return RegisterClass(&windowClass);
-}
-
-
 /*
  *****************************************************************************
  */
@@ -1292,6 +1264,34 @@ MainWndProc(HWND window, UINT message, WPARAM wParam, LPARAM lParam)
 }
 
 
+/*
+ *****************************************************************************
+ */
+static BOOL
+InitApplication(HANDLE instance)
+{
+	/*
+	 * Perform any necessary MS Windows application initialization. Basically,
+	 * this means registering the window class for this application.
+	 */
+
+	WNDCLASS windowClass;
+
+	windowClass.style = CS_BYTEALIGNWINDOW;
+	windowClass.lpfnWndProc = (WNDPROC)MainWndProc;
+	windowClass.cbClsExtra = 0;
+	windowClass.cbWndExtra = 0;
+	windowClass.hInstance = (HINSTANCE)instance;
+	windowClass.hIcon = nil;
+	windowClass.hCursor = LoadCursor(nil, IDC_ARROW);
+	windowClass.hbrBackground = nil;
+	windowClass.lpszMenuName = NULL;
+	windowClass.lpszClassName = AppClassName;
+
+	return RegisterClass(&windowClass);
+}
+
+
 /*
  *****************************************************************************
  */
diff --git a/src/skel/win/win.h b/src/skel/win/win.h
index 4b2001f8..be840898 100644
--- a/src/skel/win/win.h
+++ b/src/skel/win/win.h
@@ -68,9 +68,6 @@ extern "C"
 {
 #endif                          /* __cplusplus */
 
-extern LRESULT      CALLBACK
-MainWndProc(HWND window, UINT message, WPARAM wParam, LPARAM lParam);
-
 #ifdef __DINPUT_INCLUDED__
 HRESULT _InputInitialise();
 HRESULT CapturePad(RwInt32 padID);
-- 
cgit v1.2.3