OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-09 13:22:24 +03:00
Code Activity

0029169: Configuration - fix compilation with undefined UNICODE on Windows

Browse Source 
Eliminated usage of TEXT macros, usage of OSVERSIONINFO instead of OSVERSIONINFOW.
LoadIcon/LoadCursor are now used instead of LoadIconW/LoadCursorW
when passing macros to standard resources (which depend on UNICODE flag).
This commit is contained in:
kgv
2017-09-30 19:52:10 +03:00
committed by bugmaster
parent 03d960b8de
commit c85a994a37
4 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/OSD/OSD_Host.cxx
View File

@@ -211,7 +211,8 @@ OSD_Host :: OSD_Host () {
if ( !fInit ) {
nSize = MAX_COMPUTERNAME_LENGTH + 1;
osVerInfo.dwOSVersionInfoSize = sizeof ( OSVERSIONINFO );
ZeroMemory (&osVerInfo, sizeof(OSVERSIONINFOW));
osVerInfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFOW);
ZeroMemory (&ms, sizeof(ms));
ZeroMemory (szHostName, sizeof(char) * (MAX_COMPUTERNAME_LENGTH + 1));
@@ -262,11 +263,12 @@ OSD_Host :: OSD_Host () {
hostName = szHostName;
interAddr = Standard_CString ( hostAddr );
wsprintf (
osVerInfo.szCSDVersion, TEXT( "Windows NT Version %d.%d" ),
osVerInfo.dwMajorVersion, osVerInfo.dwMinorVersion
);
version = osVerInfo.szCSDVersion;
TCollection_AsciiString aVersion = TCollection_AsciiString("Windows NT Version ") + (int )osVerInfo.dwMajorVersion + "." + (int )osVerInfo.dwMinorVersion;
if (*osVerInfo.szCSDVersion != L'\0')
{
aVersion += TCollection_AsciiString(" ") + TCollection_AsciiString (osVerInfo.szCSDVersion);
}
version = aVersion;
fInit = TRUE;