From 3bd333022778cee8dd95b58b02a7263870546c1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?eray=20or=C3=A7unus?= <erayorcunus@gmail.com>
Date: Fri, 2 Oct 2020 17:36:56 +0300
Subject: Load and write our settings in re3.ini & fixes

---
 src/skel/crossplatform.cpp | 10 ++++++++++
 src/skel/glfw/glfw.cpp     | 27 ++++++++++++++-------------
 src/skel/win/win.cpp       |  2 +-
 3 files changed, 25 insertions(+), 14 deletions(-)

(limited to 'src/skel')

diff --git a/src/skel/crossplatform.cpp b/src/skel/crossplatform.cpp
index 6188992d..452ad9fa 100644
--- a/src/skel/crossplatform.cpp
+++ b/src/skel/crossplatform.cpp
@@ -84,6 +84,16 @@ void FileTimeToSystemTime(time_t* writeTime, SYSTEMTIME* out) {
 }
 #endif
 
+// Because wchar length differs between platforms.
+wchar*
+AllocUnicode(const char* src)
+{
+	wchar *dst = (wchar*)malloc(strlen(src)*2 + 2);
+	wchar *i = dst;
+	while((*i++ = (unsigned char)*src++) != '\0');
+	return dst;
+}
+
 // Funcs/features from Windows that we need on other platforms
 #ifndef _WIN32
 char *strupr(char *s) {
diff --git a/src/skel/glfw/glfw.cpp b/src/skel/glfw/glfw.cpp
index 944e87b5..cd8380b2 100644
--- a/src/skel/glfw/glfw.cpp
+++ b/src/skel/glfw/glfw.cpp
@@ -41,7 +41,6 @@
 #include "AnimViewer.h"
 #include "Font.h"
 
-
 #define MAX_SUBSYSTEMS		(16)
 
 
@@ -425,6 +424,10 @@ psInitialize(void)
 			_dwOperatingSystemVersion = OS_WIN95;
 		}
 	}
+#else
+	_dwOperatingSystemVersion = OS_WINXP; // To fool other classes
+#endif
+
 	
 #ifndef PS2_MENU
 
@@ -434,6 +437,8 @@ psInitialize(void)
 
 #endif
 
+
+#ifdef _WIN32
 	MEMORYSTATUS memstats;
 	GlobalMemoryStatus(&memstats);
 
@@ -442,20 +447,10 @@ psInitialize(void)
 	debug("Physical memory size %u\n", memstats.dwTotalPhys);
 	debug("Available physical memory %u\n", memstats.dwAvailPhys);
 #else
-	
-#ifndef PS2_MENU
-
-#ifdef GTA3_1_1_PATCH
-	FrontEndMenuManager.LoadSettings();
-#endif
-
-#endif
 	struct sysinfo systemInfo;
 	sysinfo(&systemInfo);
 	
 	_dwMemAvailPhys = systemInfo.freeram;
-	_dwOperatingSystemVersion = OS_WINXP; // To fool other classes
-
 	debug("Physical memory size %u\n", systemInfo.totalram);
 	debug("Available physical memory %u\n", systemInfo.freeram);
 
@@ -835,7 +830,7 @@ bool IsThisJoystickBlacklisted(int i)
 
 	const char* joyname = glfwGetJoystickName(i);
 
-	if (strncmp(joyname, gSelectedJoystickName, sizeof(gSelectedJoystickName)) == 0)
+	if (strncmp(joyname, gSelectedJoystickName, strlen(gSelectedJoystickName)) == 0)
 		return false;
 
 	return true;
@@ -844,6 +839,9 @@ bool IsThisJoystickBlacklisted(int i)
 
 void _InputInitialiseJoys()
 {
+	PSGLOBAL(joy1id) = -1;
+	PSGLOBAL(joy2id) = -1;
+
 	for (int i = 0; i <= GLFW_JOYSTICK_LAST; i++) {
 		if (glfwJoystickPresent(i) && !IsThisJoystickBlacklisted(i)) {
 			if (PSGLOBAL(joy1id) == -1)
@@ -858,7 +856,9 @@ void _InputInitialiseJoys()
 	if (PSGLOBAL(joy1id) != -1) {
 		int count;
 		glfwGetJoystickButtons(PSGLOBAL(joy1id), &count);
+#ifdef DONT_TRUST_RECOGNIZED_JOYSTICKS
 		strcpy(gSelectedJoystickName, glfwGetJoystickName(PSGLOBAL(joy1id)));
+#endif
 		ControlsManager.InitDefaultControlConfigJoyPad(count);
 	}
 }
@@ -2067,14 +2067,15 @@ void joysChangeCB(int jid, int event)
 	if (event == GLFW_CONNECTED && !IsThisJoystickBlacklisted(jid)) {
 		if (PSGLOBAL(joy1id) == -1) {
 			PSGLOBAL(joy1id) = jid;
+#ifdef DONT_TRUST_RECOGNIZED_JOYSTICKS
 			strcpy(gSelectedJoystickName, glfwGetJoystickName(jid));
+#endif
 		} else if (PSGLOBAL(joy2id) == -1)
 			PSGLOBAL(joy2id) = jid;
 
 	} else if (event == GLFW_DISCONNECTED) {
 		if (PSGLOBAL(joy1id) == jid) {
 			PSGLOBAL(joy1id) = -1;
-			strcpy(gSelectedJoystickName, "");
 		} else if (PSGLOBAL(joy2id) == jid)
 			PSGLOBAL(joy2id) = -1;
 	}
diff --git a/src/skel/win/win.cpp b/src/skel/win/win.cpp
index 119e666e..ac46d23a 100644
--- a/src/skel/win/win.cpp
+++ b/src/skel/win/win.cpp
@@ -3378,4 +3378,4 @@ int strcasecmp(const char *str1, const char *str2)
 	return _strcmpi(str1, str2);
 }
 #endif
-#endif
\ No newline at end of file
+#endif
-- 
cgit v1.2.3