Delete non-need header

.github/workflows/win32.yml

@@ -98,7 +98,6 @@ jobs:
           -DSDL2_LIBRARY=%SDL2_LIBRARY%
           -DVLC_LIBRARIES=%VLC_LIBRARIES%
           -DVLC_VERSION=%VLC_VERSION%
-          -DCMAKE_EXE_LINKER_FLAGS=/SAFESEH:NO
 
       # Use CMake to build project
       - name: Build EmulationStation

README.md

@@ -158,8 +158,7 @@ C:\src\EmulationStation>cmake . -B build -A Win32 ^
 -DCURL_LIBRARY=%CURL_LIBRARY% ^
 -DSDL2_LIBRARY=%SDL2_LIBRARY% ^
 -DVLC_LIBRARIES=%VLC_LIBRARIES% ^
--DVLC_VERSION=%VLC_VERSION% ^
+-DVLC_VERSION=%VLC_VERSION%
--DCMAKE_EXE_LINKER_FLAGS=/SAFESEH:NO
 ```
 
 * Use CMake to build the Visual Studio project.

es-app/src/FileData.cpp

@@ -280,10 +280,10 @@ void FileData::launchGame(Window* window)
 {
 	LOG(LogInfo) << "Attempting to launch game...";
 
-#ifndef _WIN32
 	AudioManager::getInstance()->deinit();
 	VolumeControl::getInstance()->deinit();
 	InputManager::getInstance()->deinit();
+#ifndef _WIN32
 	window->deinit();
 #endif
 
@@ -312,9 +312,9 @@ void FileData::launchGame(Window* window)
 
 #ifndef _WIN32
 	window->init();
+#endif
 	InputManager::getInstance()->init();
 	VolumeControl::getInstance()->init();
-#endif
 	window->normalizeNextUpdate();
 
 	//update number of times the game has been launched

es-core/src/components/VideoVlcComponent.cpp

@@ -7,7 +7,6 @@
 #include "Settings.h"
 #ifdef WIN32
 #include <basetsd.h>
-#include <codecvt>
 typedef SSIZE_T ssize_t;
 #else
 #include <unistd.h>

es-core/src/platform.cpp

@@ -2,9 +2,7 @@
 
 #include <SDL_events.h>
 #ifdef WIN32
-#include <codecvt>
 #include <SDL.h>
-#include <SDL_opengl.h>
 #include <Windows.h>
 #include "renderers/Renderer.h"
 #else
@@ -55,7 +53,6 @@ int launchGameCommand(const std::string& cmd_utf8)
 	SDL_SetWindowFullscreen(Renderer::getSDLWindow(), 0);
 	SDL_SetWindowBordered(Renderer::getSDLWindow(), SDL_TRUE);
 
-	glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 	Renderer::swapBuffers();
 
 	memset(&si, 0, sizeof si);
@@ -65,12 +62,9 @@ int launchGameCommand(const std::string& cmd_utf8)
 	if(!CreateProcess(NULL, (LPSTR)cmd_utf8.c_str(), NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi))
 		return 9009;
 
-	while(true){
+	while(WaitForSingleObject(pi.hProcess, 200) == WAIT_TIMEOUT)
-		if(WaitForSingleObject(pi.hProcess, 200) == 0)
-			break;
 		while(SDL_PollEvent(&event))
 			; // NOP
-	}
 
 	GetExitCodeProcess(pi.hProcess, &rcode);
 	CloseHandle(pi.hProcess);

es-core/src/utils/FileSystemUtil.cpp

@@ -69,8 +69,10 @@ namespace Utils
 							if(_recursive && isDirectory(fullName))
 								contentList.merge(getDirContent(fullName, true));
 						}
+
+						FindNextFile(hFind, &findData);
 					}
-					while(FindNextFile(hFind, &findData));
+					while(GetLastError() != ERROR_NO_MORE_FILES);
 
 					FindClose(hFind);
 				}