mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-07 13:23:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

(UWP) Simplify UWP code - there was pre-Windows 2000 ifdefs in here

Browse Source
This commit is contained in:
libretroadmin 2023-02-20 13:00:06 +01:00
parent 66aebcabea
commit 23b8f3d97d
2 changed files with 2 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
frontend/drivers/platform_uwp.c
View File

@ -52,16 +52,12 @@ static void frontend_uwp_get_os(char *s, size_t len, int *major, int *minor)
char build_str[11] = {0}; char build_str[11] = {0};
bool server = false; bool server = false;
const char *arch = ""; const char *arch = "";
#if defined(_WIN32_WINNT) && _WIN32_WINNT >= 0x0500
/* Windows 2000 and later */
SYSTEM_INFO si = {{0}}; SYSTEM_INFO si = {{0}};
OSVERSIONINFOEX vi = {0}; OSVERSIONINFOEX vi = {0};
vi.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX); vi.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX);
GetSystemInfo(&si); GetSystemInfo(&si);
/* Available from NT 3.5 and Win95 */
GetVersionEx((OSVERSIONINFO*)&vi); GetVersionEx((OSVERSIONINFO*)&vi);
server = vi.wProductType != VER_NT_WORKSTATION; server = vi.wProductType != VER_NT_WORKSTATION;
@ -83,13 +79,6 @@ static void frontend_uwp_get_os(char *s, size_t len, int *major, int *minor)
default: default:
break; break;
} }
#else
OSVERSIONINFO vi = {0};
vi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
/* Available from NT 3.5 and Win95 */
GetVersionEx(&vi);
#endif
if (major) if (major)
*major = vi.dwMajorVersion; *major = vi.dwMajorVersion;
@ -203,8 +192,6 @@ enum frontend_powerstate frontend_uwp_get_powerstate(
enum frontend_architecture frontend_uwp_get_arch(void) enum frontend_architecture frontend_uwp_get_arch(void)
{ {
#if defined(_WIN32_WINNT) && _WIN32_WINNT >= 0x0500
/* Windows 2000 and later */
SYSTEM_INFO si = {{0}}; SYSTEM_INFO si = {{0}};
GetSystemInfo(&si); GetSystemInfo(&si);
@ -222,7 +209,6 @@ enum frontend_architecture frontend_uwp_get_arch(void)
default: default:
break; break;
} }
#endif
return FRONTEND_ARCH_NONE; return FRONTEND_ARCH_NONE;
} }
@ -362,36 +348,18 @@ static void frontend_uwp_env_get(int *argc, char *argv[],
static uint64_t frontend_uwp_get_total_mem(void) static uint64_t frontend_uwp_get_total_mem(void)
{ {
/* OSes below 2000 don't have the Ex version,
* and non-Ex cannot work with >4GB RAM */
#if _WIN32_WINNT >= 0x0500
MEMORYSTATUSEX mem_info; MEMORYSTATUSEX mem_info;
mem_info.dwLength = sizeof(MEMORYSTATUSEX); mem_info.dwLength = sizeof(MEMORYSTATUSEX);
GlobalMemoryStatusEx(&mem_info); GlobalMemoryStatusEx(&mem_info);
return mem_info.ullTotalPhys; return mem_info.ullTotalPhys;
#else
MEMORYSTATUS mem_info;
mem_info.dwLength = sizeof(MEMORYSTATUS);
GlobalMemoryStatus(&mem_info);
return mem_info.dwTotalPhys;
#endif
} }
static uint64_t frontend_uwp_get_free_mem(void) static uint64_t frontend_uwp_get_free_mem(void)
{ {
/* OSes below 2000 don't have the Ex version,
* and non-Ex cannot work with >4GB RAM */
#if _WIN32_WINNT >= 0x0500
MEMORYSTATUSEX mem_info; MEMORYSTATUSEX mem_info;
mem_info.dwLength = sizeof(MEMORYSTATUSEX); mem_info.dwLength = sizeof(MEMORYSTATUSEX);
GlobalMemoryStatusEx(&mem_info); GlobalMemoryStatusEx(&mem_info);
return ((frontend_uwp_get_total_mem() - mem_info.ullAvailPhys)); return (mem_info.ullTotalPhys - mem_info.ullAvailPhys);
#else
MEMORYSTATUS mem_info;
mem_info.dwLength = sizeof(MEMORYSTATUS);
GlobalMemoryStatus(&mem_info);
return ((frontend_uwp_get_total_mem() - mem_info.dwAvailPhys));
#endif
} }
frontend_ctx_driver_t frontend_ctx_uwp = { frontend_ctx_driver_t frontend_ctx_uwp = {

3
frontend/drivers/platform_win32.c
View File

@ -922,12 +922,11 @@ static const char *accessibility_win_language_code(const char* language)
return ""; return "";
} }
static bool terminate_win32_process(PROCESS_INFORMATION pi) static void terminate_win32_process(PROCESS_INFORMATION pi)
{ {
TerminateProcess(pi.hProcess,0); TerminateProcess(pi.hProcess,0);
CloseHandle(pi.hProcess); CloseHandle(pi.hProcess);
CloseHandle(pi.hThread); CloseHandle(pi.hThread);
return true;
} }
static PROCESS_INFORMATION g_pi; static PROCESS_INFORMATION g_pi;