diff --git a/code/ryzom/tools/client/client_config/client_config.cpp b/code/ryzom/tools/client/client_config/client_config.cpp index 6f1442ac3..301e9c3aa 100644 --- a/code/ryzom/tools/client/client_config/client_config.cpp +++ b/code/ryzom/tools/client/client_config/client_config.cpp @@ -22,6 +22,8 @@ #include "client_configDlg.h" #include "cfg_file.h" +#include + using namespace NLMISC; using namespace NL3D; @@ -147,10 +149,10 @@ BOOL CClientConfigApp::InitInstance() IDriver *glDriver = CDRU::createGlDriver(); IDriver *d3dDriver = CDRU::createD3DDriver(); - // Get some informations about the system + // Get some information about the system RegisterVideoModes (0, glDriver); RegisterVideoModes (1, d3dDriver); - GetSystemInformations (d3dDriver); + GetSystemInformation (d3dDriver); // Load the config file if (!LoadConfigFile ()) @@ -257,35 +259,10 @@ CString GetString (uint res) return str; } - -// *************************************************************************** -bool supportUnicode() -{ - static bool init = false; - static bool unicodeSupported = false; - if (!init) - { - init = true; - OSVERSIONINFO osvi; - osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); - if (::GetVersionEx (&osvi)) - { - if (osvi.dwPlatformId == VER_PLATFORM_WIN32_NT) - { - if (osvi.dwMajorVersion >= 4) - { - unicodeSupported = true; - } - } - } - } - return unicodeSupported; -} - // *************************************************************************** void setWindowText(HWND hwnd, LPCWSTR lpText) { - if (supportUnicode()) + if (CSystemUtils::supportUnicode()) { SetWindowTextW(hwnd, lpText); } diff --git a/code/ryzom/tools/client/client_config/display_dlg.cpp b/code/ryzom/tools/client/client_config/display_dlg.cpp index b0989c91b..b5c15210b 100644 --- a/code/ryzom/tools/client/client_config/display_dlg.cpp +++ b/code/ryzom/tools/client/client_config/display_dlg.cpp @@ -44,7 +44,7 @@ uint HardwareSoundBuffer; uint64 SystemMemory; uint CPUFrequency; -bool GetGLInformations () +bool GetGLInformation () { // *** INIT VARIABLES @@ -66,7 +66,7 @@ bool GetGLInformations () wc.hIcon = (HICON)NULL; wc.hCursor = LoadCursor(NULL,IDC_ARROW); wc.hbrBackground = WHITE_BRUSH; - wc.lpszClassName = "RyzomGetGlInformations"; + wc.lpszClassName = "RyzomGetGlInformation"; wc.lpszMenuName = NULL; if ( !RegisterClass(&wc) ) return false; @@ -78,7 +78,7 @@ bool GetGLInformations () WndRect.top=0; WndRect.right=100; WndRect.bottom=100; - HWND hWnd = CreateWindow ( "RyzomGetGlInformations", + HWND hWnd = CreateWindow ( "RyzomGetGlInformation", "", WndFlags, CW_USEDEFAULT,CW_USEDEFAULT, @@ -122,7 +122,7 @@ bool GetGLInformations () HGLRC hRC = wglCreateContext (hDC); wglMakeCurrent(hDC, hRC); - // *** GET INFORMATIONS + // *** GET INFORMATION GLVendor = (const char *) glGetString (GL_VENDOR); GLRenderer = (const char *) glGetString (GL_RENDERER); @@ -168,7 +168,7 @@ bool GetGLInformations () // *************************************************************************** -bool GetD3DInformations (NL3D::IDriver *d3dDriver) +bool GetD3DInformation (NL3D::IDriver *d3dDriver) { IDriver::CAdapter desc; if (d3dDriver->getAdapter (0xffffffff, desc)) @@ -248,10 +248,10 @@ bool GetHardwareSoundBuffer () // *************************************************************************** -bool GetSystemInformations (IDriver *d3dDriver) +bool GetSystemInformation (IDriver *d3dDriver) { - bool result = GetGLInformations (); - result |= GetD3DInformations (d3dDriver); + bool result = GetGLInformation (); + result |= GetD3DInformation (d3dDriver); result |= GetVideoMemory (); result |= GetHardwareSoundBuffer (); SystemMemory = CSystemInfo::totalPhysicalMemory (); diff --git a/code/ryzom/tools/client/client_config/display_dlg.h b/code/ryzom/tools/client/client_config/display_dlg.h index 4ac15e5b1..94a56d536 100644 --- a/code/ryzom/tools/client/client_config/display_dlg.h +++ b/code/ryzom/tools/client/client_config/display_dlg.h @@ -153,8 +153,8 @@ extern uint CPUFrequency; // Register video modes void RegisterVideoModes (uint mode, NL3D::IDriver *driver); -// Get opengl informations -bool GetSystemInformations (NL3D::IDriver *d3dDriver); +// Get opengl information +bool GetSystemInformation (NL3D::IDriver *d3dDriver); // ***************************************************************************