Use Qt abstractions for file I/O and threading on both Windows and Linux.

src/frontend/qt_sdl/CMakeLists.txt

@@ -17,6 +17,7 @@ endif()
 find_package(Qt5 COMPONENTS Core REQUIRED)
 find_package(Qt5 COMPONENTS Gui REQUIRED)
 find_package(Qt5 COMPONENTS Widgets REQUIRED)
+find_package(Threads REQUIRED)
 
 set(CMAKE_AUTOMOC ON)
 
@@ -27,22 +28,24 @@ add_executable(melonDS ${SOURCES_QT_SDL})
 target_include_directories(melonDS PRIVATE ${SDL2_INCLUDE_DIRS})
 target_include_directories(melonDS PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/..")
 target_include_directories(melonDS PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/../..")
-target_link_libraries(melonDS core ${SDL2_LIBRARIES})
+target_link_libraries(melonDS core ${SDL2_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
 
 if (UNIX)
-	option(UNIX_PORTABLE "Make a portable build that looks for its configuration in the current directory" OFF)
+	option(PORTABLE "Make a portable build that looks for its configuration in the current directory" OFF)
-	if (UNIX_PORTABLE)
-		add_definitions(-DUNIX_PORTABLE)
-	endif()
 
 	if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
 		target_link_libraries(melonDS dl Qt5::Core Qt5::Gui Qt5::Widgets)
 	endif ()
 elseif (WIN32)
+	option(PORTABLE "Make a portable build that looks for its configuration in the current directory" ON)
 	target_sources(melonDS PUBLIC "${CMAKE_SOURCE_DIR}/melon.rc")
 	target_link_libraries(melonDS comctl32 d2d1 dwrite uxtheme ws2_32 iphlpapi gdi32 Qt5::Core Qt5::Gui Qt5::Widgets)
 endif ()
 
+if (PORTABLE)
+	add_definitions(-DPORTABLE)
+endif()
+
 install(FILES ../../net.kuribo64.melonDS.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications)
 install(FILES ../../icon/melon_16x16.png DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/16x16/apps RENAME net.kuribo64.melonDS.png)
 install(FILES ../../icon/melon_32x32.png DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/32x32/apps RENAME net.kuribo64.melonDS.png)

src/frontend/qt_sdl/Platform.cpp

@@ -19,31 +19,33 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <SDL2/SDL.h>
+#include <QStandardPaths>
+#include <QDir>
+#include <QThread>
+#include <QSemaphore>
+#include <QOpenGLContext>
+
 #include "Platform.h"
 #include "PlatformConfig.h"
 //#include "LAN_Socket.h"
 //#include "LAN_PCap.h"
-#include <string>
 
 #ifdef __WIN32__
 #define NTDDI_VERSION		0x06000000 // GROSS FUCKING HACK
 #include <windows.h>
 //#include <knownfolders.h> // FUCK THAT SHIT
-    extern "C" const GUID DECLSPEC_SELECTANY FOLDERID_RoamingAppData = {0x3eb685db, 0x65f9, 0x4cf6, {0xa0, 0x3a, 0xe3, 0xef, 0x65, 0x72, 0x9f, 0x3d}};
 #include <shlobj.h>
 #include <winsock2.h>
 #include <ws2tcpip.h>
 #define socket_t    SOCKET
 #define sockaddr_t  SOCKADDR
 #else
-    #include <QStandardPaths>
+
-	#include <QDir>
 #include <unistd.h>
-	#include <arpa/inet.h>
 #include <netinet/in.h>
 #include <sys/select.h>
 #include <sys/socket.h>
+
 #define socket_t    int
 #define sockaddr_t  struct sockaddr
 #define closesocket close
@@ -62,22 +64,6 @@ void Stop(bool internal);
 namespace Platform
 {
 
-
-typedef struct
-{
-    SDL_Thread* ID;
-    void (*Func)();
-
-} ThreadData;
-
-int ThreadEntry(void* data)
-{
-    ThreadData* thread = (ThreadData*)data;
-    thread->Func();
-    return 0;
-}
-
-
 socket_t MPSocket;
 sockaddr_t MPSendAddr;
 u8 PacketBuffer[2048];
@@ -90,281 +76,125 @@ void StopEmu()
 	//Stop(true);
 }
 
-
 FILE* OpenFile(const char* path, const char* mode, bool mustexist)
 {
-    FILE* ret;
+	QFile f(path);
 
-#ifdef __WIN32__
+	if (!mustexist && !f.exists())
+		return nullptr;
 
-    int len = MultiByteToWideChar(CP_UTF8, 0, path, -1, NULL, 0);
+	f.open(QIODevice::ReadOnly);
-    if (len < 1) return NULL;
+	FILE* file = fdopen(dup(f.handle()), mode);
-    WCHAR* fatpath = new WCHAR[len];
+	f.close();
-    int res = MultiByteToWideChar(CP_UTF8, 0, path, -1, fatpath, len);
-    if (res != len) { delete[] fatpath; return NULL; } // checkme?
 
-    // this will be more than enough
+	return file;
-    WCHAR fatmode[4];
-    fatmode[0] = mode[0];
-    fatmode[1] = mode[1];
-    fatmode[2] = mode[2];
-    fatmode[3] = 0;
-
-    if (mustexist)
-    {
-        ret = _wfopen(fatpath, L"rb");
-        if (ret) ret = _wfreopen(fatpath, fatmode, ret);
 }
-    else
-        ret = _wfopen(fatpath, fatmode);
-
-    delete[] fatpath;
-
-#else
-
-    if (mustexist)
-    {
-        ret = fopen(path, "rb");
-        if (ret) ret = freopen(path, mode, ret);
-    }
-    else
-        ret = fopen(path, mode);
-
-#endif
-
-    return ret;
-}
-
-#if !defined(UNIX_PORTABLE) && !defined(__WIN32__)
 
 FILE* OpenLocalFile(const char* path, const char* mode)
 {
-    std::string fullpath;
+	QString fullpath;
 
 	if (path[0] == '/')
 	{
 		// If it's an absolute path, just open that.
-        fullpath = std::string(path);
+		fullpath = path;
 	}
 	else
 	{
+#ifdef PORTABLE
+		fullpath = QString("./") + path;
+#else
 		// Check user configuration directory
-        QString confpath = QStandardPaths::writableLocation(QStandardPaths::ConfigLocation) + "/melonDS/";
+		fullpath = QStandardPaths::writableLocation(QStandardPaths::ConfigLocation) + "/melonDS/";
-		confpath.append(path);
+		fullpath.append(path);
-
+#endif
-		fullpath = confpath.toStdString();
 	}
 
-    return OpenFile(fullpath.c_str(), mode, mode[0] != 'w');
+	return OpenFile(fullpath.toUtf8(), mode, mode[0] != 'w');
 }
 
 FILE* OpenDataFile(const char* path)
 {
-    QString melondir = "melonDS";
+#ifdef PORTABLE
+	return OpenLocalFile(path);
+#else
+	QString melondir = "/melonDS/";
 	QStringList sys_dirs = QStandardPaths::standardLocations(QStandardPaths::DataLocation);
-    QString sep = QDir::separator();
+	QString found = nullptr;
 
-    const char* found = NULL;
+	for (int i = 0; i < sys_dirs.size(); i++)
+	{
+		QString f = sys_dirs.at(i) + melondir + path;
 
-    for (int i = 0; i < sys_dirs.size(); i++) {
+		if (QFile::exists(f))
-        QString f = sys_dirs.at(i) + sep + melondir + sep + QString(path);
+		{
-
+			found = f;
-        if (QFile::exists(f)) {
-            found = f.toStdString().c_str();
 			break;
 		}
 	}
 
-    if (found == NULL)
+	if (found == nullptr)
-        return NULL;
+		return nullptr;
 
-    FILE* f = fopen(found, "rb");
+	FILE* f = OpenFile(found.toUtf8(), "rb", false);
 	if (f)
 		return f;
 
-    return NULL;
+	return nullptr;
-}
-
-#else
-
-FILE* OpenLocalFile(const char* path, const char* mode)
-{
-    bool relpath = false;
-    int pathlen = strlen(path);
-
-#ifdef __WIN32__
-    if (pathlen > 3)
-    {
-        if (path[1] == ':' && path[2] == '\\')
-            return OpenFile(path, mode);
-    }
-#else
-    if (pathlen > 1)
-    {
-        if (path[0] == '/')
-            return OpenFile(path, mode);
-    }
 #endif
-
-    if (pathlen >= 3)
-    {
-        if (path[0] == '.' && path[1] == '.' && (path[2] == '/' || path[2] == '\\'))
-            relpath = true;
 }
 
-    int emudirlen = strlen(EmuDirectory);
-    char* emudirpath;
-    if (emudirlen)
-    {
-        int len = emudirlen + 1 + pathlen + 1;
-        emudirpath = new char[len];
-        strncpy(&emudirpath[0], EmuDirectory, emudirlen);
-        emudirpath[emudirlen] = '/';
-        strncpy(&emudirpath[emudirlen+1], path, pathlen);
-        emudirpath[emudirlen+1+pathlen] = '\0';
-    }
-    else
-    {
-        emudirpath = new char[pathlen+1];
-        strncpy(&emudirpath[0], path, pathlen);
-        emudirpath[pathlen] = '\0';
-    }
-
-    // Locations are application directory, and AppData/melonDS on Windows or XDG_CONFIG_HOME/melonDS on Linux
-
-    FILE* f;
-
-    // First check current working directory
-    f = OpenFile(path, mode, true);
-    if (f) { delete[] emudirpath; return f; }
-
-    // then emu directory
-    f = OpenFile(emudirpath, mode, true);
-    if (f) { delete[] emudirpath; return f; }
-
-#ifdef __WIN32__
-
-    // a path relative to AppData wouldn't make much sense
-    if (!relpath)
-    {
-        // Now check AppData
-        PWSTR appDataPath = NULL;
-        SHGetKnownFolderPath(FOLDERID_RoamingAppData, 0, NULL, &appDataPath);
-        if (!appDataPath)
-        {
-            delete[] emudirpath;
-            return NULL;
-        }
-
-        // this will be more than enough
-        WCHAR fatperm[4];
-        fatperm[0] = mode[0];
-        fatperm[1] = mode[1];
-        fatperm[2] = mode[2];
-        fatperm[3] = 0;
-
-        int fnlen = MultiByteToWideChar(CP_UTF8, 0, path, -1, NULL, 0);
-        if (fnlen < 1) { delete[] emudirpath; return NULL; }
-        WCHAR* wfileName = new WCHAR[fnlen];
-        int res = MultiByteToWideChar(CP_UTF8, 0, path, -1, wfileName, fnlen);
-        if (res != fnlen) { delete[] wfileName; delete[] emudirpath; return NULL; } // checkme?
-
-        const WCHAR* appdir = L"\\melonDS\\";
-
-        int pos = wcslen(appDataPath);
-        void* ptr = CoTaskMemRealloc(appDataPath, (pos+wcslen(appdir)+fnlen+1)*sizeof(WCHAR));
-        if (!ptr) { delete[] wfileName; delete[] emudirpath; return NULL; } // oh well
-        appDataPath = (PWSTR)ptr;
-
-        wcscpy(&appDataPath[pos], appdir); pos += wcslen(appdir);
-        wcscpy(&appDataPath[pos], wfileName);
-
-        f = _wfopen(appDataPath, L"rb");
-        if (f) f = _wfreopen(appDataPath, fatperm, f);
-        CoTaskMemFree(appDataPath);
-        delete[] wfileName;
-        if (f) { delete[] emudirpath; return f; }
-    }
-
-#else
-
-    if (!relpath)
-    {
-        // Now check XDG_CONFIG_HOME
-        // TODO: check for memory leak there
-        std::string fullpath = QStandardPaths::writableLocation(QStandardPaths::ConfigLocation).toStdString() + "/melonDS/" + path;
-        f = OpenFile(fullpath.c_str(), mode, true);
-        if (f) { delete[] emudirpath; return f; }
-    }
-
-#endif
-
-    if (mode[0] != 'r')
-    {
-        f = OpenFile(emudirpath, mode);
-        if (f) { delete[] emudirpath; return f; }
-    }
-
-    delete[] emudirpath;
-    return NULL;
-}
-
-FILE* OpenDataFile(const char* path)
-{
-	return OpenLocalFile(path, "rb");
-}
-
-#endif
-
-
 void* Thread_Create(void (* func)())
 {
-    ThreadData* data = new ThreadData;
+	QThread* t = QThread::create(func);
-    data->Func = func;
+	t->start();
-    data->ID = SDL_CreateThread(ThreadEntry, "melonDS core thread", data);
+	return (void*) t;
-    return data;
 }
 
 void Thread_Free(void* thread)
 {
-    delete (ThreadData*)thread;
+	QThread* t = (QThread*) thread;
+	t->terminate();
+	delete t;
 }
 
 void Thread_Wait(void* thread)
 {
-    SDL_WaitThread((SDL_Thread*)((ThreadData*)thread)->ID, NULL);
+	((QThread*) thread)->wait();
 }
 
 
 void* Semaphore_Create()
 {
-    return SDL_CreateSemaphore(0);
+	return new QSemaphore();
 }
 
 void Semaphore_Free(void* sema)
 {
-    SDL_DestroySemaphore((SDL_sem*)sema);
+	delete (QSemaphore*) sema;
 }
 
 void Semaphore_Reset(void* sema)
 {
-    while (SDL_SemTryWait((SDL_sem*)sema) == 0);
+	QSemaphore* s = (QSemaphore*) sema;
+
+	s->acquire(s->available());
 }
 
 void Semaphore_Wait(void* sema)
 {
-    SDL_SemWait((SDL_sem*)sema);
+	((QSemaphore*) sema)->acquire();
 }
 
 void Semaphore_Post(void* sema)
 {
-    SDL_SemPost((SDL_sem*)sema);
+	((QSemaphore*) sema)->release();
 }
 
 
 void* GL_GetProcAddress(const char* proc)
 {
-    return NULL;//uiGLGetProcAddress(proc);
+	return (void*) QOpenGLContext::globalShareContext()->getProcAddress(proc);
 }
 
 
@@ -501,7 +331,6 @@ int MP_RecvPacket(u8* data, bool block)
 }
 
 
-
 bool LAN_Init()
 {
 	/*if (Config::DirectLAN)