From 8114f88dd1f27674e2a43527c943ae7e8e0cb1e7 Mon Sep 17 00:00:00 2001
From: Clownacy <Clownacy@users.noreply.github.com>
Date: Fri, 6 Sep 2019 15:21:43 +0000
Subject: [PATCH] Shut up some build warnings

---
 src/Dialog.cpp  |  6 ++++++
 src/Generic.cpp |  2 +-
 src/Input.cpp   |  6 +++++-
 src/Main.cpp    |  4 ++++
 src/Organya.cpp | 14 +++++++++++---
 5 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/src/Dialog.cpp b/src/Dialog.cpp
index ba2803e2..f57fe31f 100644
--- a/src/Dialog.cpp
+++ b/src/Dialog.cpp
@@ -19,6 +19,8 @@ static const char *version_string =
 // TODO - Inaccurate stack frame
 INT_PTR __stdcall VersionDialog(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam)
 {
+	(void)lParam;
+
 	char string_buffer[104];
 
 	int year;
@@ -58,6 +60,8 @@ INT_PTR __stdcall VersionDialog(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lPara
 
 INT_PTR __stdcall DebugMuteDialog(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam)
 {
+	(void)lParam;
+
 	switch (Msg)
 	{
 		case WM_INITDIALOG:
@@ -100,6 +104,8 @@ INT_PTR __stdcall DebugMuteDialog(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lPa
 
 INT_PTR __stdcall DebugSaveDialog(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam)
 {
+	(void)lParam;
+
 	char string[100];
 
 	switch (Msg)
diff --git a/src/Generic.cpp b/src/Generic.cpp
index 76439c4e..6656bd7f 100644
--- a/src/Generic.cpp
+++ b/src/Generic.cpp
@@ -27,7 +27,7 @@ void GetCompileDate(int *year, int *month, int *day)
 	months[10] = "Oct";
 	months[11] = "Nov";
 	months[12] = "Dec";
-	sscanf(__DATE__, "%s %d %d", &month_string, day, year);
+	sscanf(__DATE__, "%s %d %d", month_string, day, year);
 
 	for (i = 0; i < 12; ++i)	// This being 12 instead of 13 might be a bug, but it works anyway by accident
 		if (!memcmp(&month_string, months[i], 3))
diff --git a/src/Input.cpp b/src/Input.cpp
index 5a9581f5..c229c58b 100644
--- a/src/Input.cpp
+++ b/src/Input.cpp
@@ -137,7 +137,11 @@ BOOL __stdcall EnumDevices_Callback(LPCDIDEVICEINSTANCE lpddi, LPVOID pvRef)
 	directinput_objects->device = _joystick;
 
 	char string[0x100];
-	sprintf(string, "DeviceGUID = %x\n", lpddi->guidInstance);
+#ifdef FIX_BUGS
+	sprintf(string, "DeviceGUID = %lx\n", lpddi->guidInstance.Data1);
+#else
+	sprintf(string, "DeviceGUID = %x\n", (unsigned int)lpddi->guidInstance.Data1);
+#endif
 	OutputDebugStringA(string);
 
 	return FALSE;
diff --git a/src/Main.cpp b/src/Main.cpp
index 08451c69..0b069813 100644
--- a/src/Main.cpp
+++ b/src/Main.cpp
@@ -98,6 +98,10 @@ unsigned long GetFramePerSecound(void)
 
 int __stdcall WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nShowCmd)
 {
+	(void)hPrevInstance;
+	(void)lpCmdLine;
+	(void)nShowCmd;
+
 	int i;
 
 	hObject = OpenMutexA(MUTEX_ALL_ACCESS, 0, mutex_name);
diff --git a/src/Organya.cpp b/src/Organya.cpp
index 24213ae5..371cbb4e 100644
--- a/src/Organya.cpp
+++ b/src/Organya.cpp
@@ -753,7 +753,8 @@ void OrgData::GetMusicInfo(MUSICINFO *mi)
 
 BOOL InitMMTimer();
 BOOL StartTimer(DWORD dwTimer);
-VOID CALLBACK TimerProc(UINT uTID,UINT uMsg,DWORD dwUser,DWORD dwParam1,DWORD dwParam2);
+//VOID CALLBACK TimerProc(UINT uTID,UINT uMsg,DWORD dwUser,DWORD dwParam1,DWORD dwParam2);	// The original code used the wrong types
+VOID CALLBACK TimerProc(UINT uTID,UINT uMsg,DWORD_PTR dwUser,DWORD_PTR dwParam1,DWORD_PTR dwParam2);
 BOOL QuitMMTimer();
 
 /*■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■*/
@@ -802,7 +803,7 @@ BOOL StartTimer(DWORD dwTimer)
 	(
 		dwTimer,                   // タイマー時間 (Timer time)
 		10,                        // 許容できるタイマー精度 (Acceptable timer accuracy)
-		(LPTIMECALLBACK)TimerProc, // コールバックプロシージャ (Callback procedure)
+		TimerProc,                 // コールバックプロシージャ (Callback procedure)
 		0,                         // ユーザーがコールバック関数のdwUserに送る情報値 (Information value sent by user to dwUser in callback function)
 		TIME_PERIODIC              // タイマー時間毎にイベントを発生させる (Generate an event every timer time)
 	);
@@ -818,8 +819,15 @@ BOOL StartTimer(DWORD dwTimer)
 /*■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■*/
 // タイマーのコールバック関数 (Timer callback function)
 /*■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■*/
-VOID CALLBACK TimerProc(UINT uTID,UINT uMsg,DWORD dwUser,DWORD dwParam1,DWORD dwParam2)
+//VOID CALLBACK TimerProc(UINT uTID,UINT uMsg,DWORD dwUser,DWORD dwParam1,DWORD dwParam2)	// The original code used the wrong types
+VOID CALLBACK TimerProc(UINT uTID,UINT uMsg,DWORD_PTR dwUser,DWORD_PTR dwParam1,DWORD_PTR dwParam2)
 {
+	(void)uTID;
+	(void)uMsg;
+	(void)dwUser;
+	(void)dwParam1;
+	(void)dwParam2;
+
 	DWORD dwNowTime;
 	dwNowTime = timeGetTime();
 	//===================================================================================