ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix OS identification (#5880)

This commit is contained in:
Andrés 2017-12-07 18:49:35 -05:00 committed by bparker06
parent b0445e1e21
commit 305cb6d647
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
frontend/drivers/platform_win32.c
View File

@ -143,12 +143,14 @@ static void frontend_win32_get_os(char *s, size_t len, int *major, int *minor)
OSVERSIONINFOEX vi = {0}; OSVERSIONINFOEX vi = {0};
vi.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX); vi.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX);
server = vi.wProductType != VER_NT_WORKSTATION;
serverR2 = GetSystemMetrics(SM_SERVERR2);
GetSystemInfo(&si); GetSystemInfo(&si);
/* Available from NT 3.5 and Win95 */
GetVersionEx((OSVERSIONINFO*)&vi);
server = vi.wProductType != VER_NT_WORKSTATION;
serverR2 = GetSystemMetrics(SM_SERVERR2);
switch (si.wProcessorArchitecture) switch (si.wProcessorArchitecture)
{ {
case PROCESSOR_ARCHITECTURE_AMD64: case PROCESSOR_ARCHITECTURE_AMD64:
@ -166,10 +168,11 @@ static void frontend_win32_get_os(char *s, size_t len, int *major, int *minor)
#else #else
OSVERSIONINFO vi = {0}; OSVERSIONINFO vi = {0};
vi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); vi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
#endif
/* Available from NT 3.5 and Win95 */ /* Available from NT 3.5 and Win95 */
GetVersionEx((OSVERSIONINFO*)&vi); GetVersionEx(&vi);
#endif
if (major) if (major)
*major = vi.dwMajorVersion; *major = vi.dwMajorVersion;

2
menu/menu_displaylist.c
View File

@ -681,7 +681,7 @@ static int menu_displaylist_parse_system_info(menu_displaylist_info_t *info)
strlcpy(cpu_arch_str, "x86", sizeof(cpu_arch_str)); strlcpy(cpu_arch_str, "x86", sizeof(cpu_arch_str));
break; break;
case FRONTEND_ARCH_X86_64: case FRONTEND_ARCH_X86_64:
strlcpy(cpu_arch_str, "x86-64", sizeof(cpu_arch_str)); strlcpy(cpu_arch_str, "x64", sizeof(cpu_arch_str));
break; break;
case FRONTEND_ARCH_PPC: case FRONTEND_ARCH_PPC:
strlcpy(cpu_arch_str, "PPC", sizeof(cpu_arch_str)); strlcpy(cpu_arch_str, "PPC", sizeof(cpu_arch_str));