piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-24 06:39:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

Dolphin:

Browse Source 
System Information(InfoWindow.cpp) - Added a method to check what Windows OS you are running(I do not know of a method to check what linux OS someone is using)
             and also added a extended version of the cpu_summarize.
Plugin manager - Temporarily fixed a problem that caused a crashing when pressing Stop reported in Issue 1656

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4561 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
death2droid
2009-11-14 08:53:16 +00:00
parent de9991c30d
commit 2667a469fb
5 changed files with 89 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Source/Core/DolphinWX/Src/InfoWindow.cpp
View File

@ -57,7 +57,8 @@ void wxInfoWindow::Init_ChildControls()
Info.append(StringFromFormat(
"\n\n%s\n%s\n%s\n\n%s\n\n",
"\n\n_-Computer Information-_\n\n%s\n%s\n%s\n\n_-Dolphin Information-_\n\n%s\n\n%s\n\n",
Summarize_OS().c_str(),
Summarize_Drives().c_str(),
Summarize_CPU().c_str(),
Summarize_Plug().c_str(),

64
Source/Core/DolphinWX/Src/Summarize.h
View File

@ -18,6 +18,9 @@
#ifndef __SUMMARIZE_H__
#define __SUMMARIZE_H__
#include <windows.h>
#include <dos.h>
std::string Summarize_Plug()
{
return StringFromFormat(
@ -104,7 +107,7 @@ std::string Summarize_CPU()
{
return StringFromFormat(
"Processor Information: \n%s\n",
cpu_info.Summarize().c_str()
cpu_info.Summarize_long().c_str()
);
}
@ -124,4 +127,61 @@ std::string Summarize_Drives()
return drive;
}
#endif //__SUMMARIZE_H__
std::string Summarize_OS(void)
{
std::string operatingSystem = "Operating System: ";
#ifdef _WIN32
OSVERSIONINFO osver;
osver.dwOSVersionInfoSize = sizeof(osver);
if (GetVersionEx(&osver))
{
switch(osver.dwMajorVersion)
{
case 6:
switch(osver.dwMinorVersion)
{
case 1:
if(osver.dwPlatformId == VER_NT_WORKSTATION)
operatingSystem += "Windows 7";
else
operatingSystem += "Windows Server 2008 R2";
break;
case 0:
if(osver.dwPlatformId == VER_NT_WORKSTATION)
operatingSystem += "Windows Vista";
else
operatingSystem += "Windows Server 2008";
break;
}
break;
case 5:
switch(osver.dwMinorVersion)
{
case 2:
if(GetSystemMetrics(SM_SERVERR2) != 0)
operatingSystem += "Windows Server 2003 R2";
else
operatingSystem += "Windows Server 2003";
break;
case 1:
operatingSystem += "Windows XP";
break;
case 0:
operatingSystem += "Windows 2000";
break;
}
break;
}
}
#else
operatingSystem = std::string("Non Windows operating system");
#endif
return operatingSystem;
}
#endif //__SUMMARIZE_H__