0029169: Configuration - fix compilation with undefined UNICODE on Windows

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).

diff --git a/src/Draw/init.cxx b/src/Draw/init.cxx
index 34d2176910c95bfbd6da56b822d4ca85f704ab9a..7cb6fc4dcdce9d7b0a3860d282c239dac2c1034c 100644 (file)
--- a/src/Draw/init.cxx
+++ b/src/Draw/init.cxx
@@ -42,15 +42,15 @@ BOOL RegisterAppClass(HINSTANCE hInstance)
   // Parametres communs aux classes
   //-----
   wndClass.style         = CS_HREDRAW | CS_VREDRAW | CS_CLASSDC;
-  wndClass.cbClsExtra    = 0;  
-  wndClass.hCursor       = LoadCursorW (NULL, IDC_ARROW);
+  wndClass.cbClsExtra    = 0;
+  wndClass.hCursor       = LoadCursor (NULL, IDC_ARROW);
   wndClass.hInstance     = hInstance;
 
   // Enregistrement de la fenetre principale
   //-----
   wndClass.cbWndExtra    = sizeof(void*);
   wndClass.lpfnWndProc   = (WNDPROC)WndProc;
-  wndClass.hIcon         = (HICON )LoadIconW (hInstance, MAKEINTRESOURCE(IDI_ICON1));
+  wndClass.hIcon         = LoadIconW (hInstance, MAKEINTRESOURCEW(IDI_ICON1));
   wndClass.hbrBackground = (HBRUSH) GetStockObject(WHITE_BRUSH);
   wndClass.lpszMenuName  = MAKEINTRESOURCEW(APPMENU);
   wndClass.lpszClassName = APPCLASS;

diff --git a/src/OSD/OSD_Host.cxx b/src/OSD/OSD_Host.cxx
index 91fd43d16715c5430c54f1fbefb2526c1ab09d8c..b4fd1df3692dafdc9813ffa835aed50a5bfdd6f3 100644 (file)
--- a/src/OSD/OSD_Host.cxx
+++ b/src/OSD/OSD_Host.cxx
@@ -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;
   

diff --git a/src/ViewerTest/ViewerTest_ViewerCommands.cxx b/src/ViewerTest/ViewerTest_ViewerCommands.cxx
index e603fea7397fec271c8080fd5687e94874005dd4..1f12147693e3a5d9b87336a75b310415d87f6ccb 100644 (file)
--- a/src/ViewerTest/ViewerTest_ViewerCommands.cxx
+++ b/src/ViewerTest/ViewerTest_ViewerCommands.cxx
@@ -262,7 +262,7 @@ const Handle(Standard_Transient)& ViewerTest::WClass()
   {
     theWClass = new WNT_WClass ("GW3D_Class", (Standard_Address )AdvViewerWindowProc,
                                 CS_VREDRAW | CS_HREDRAW, 0, 0,
-                                ::LoadCursorW (NULL, IDC_ARROW));
+                                ::LoadCursor (NULL, IDC_ARROW));
   }
 #endif
   return theWClass;

diff --git a/src/WNT/WNT_WClass.cxx b/src/WNT/WNT_WClass.cxx
index 7898f9c6efa6b17f0e10ec1fad196bffb9168d61..d35d7c6175d76c5c72a6a99510a80e964ab99b87 100644 (file)
--- a/src/WNT/WNT_WClass.cxx
+++ b/src/WNT/WNT_WClass.cxx
@@ -48,8 +48,8 @@ WNT_WClass::WNT_WClass (const TCollection_AsciiString& theClassName,
   aWinClass.cbClsExtra    = theClassExtra;
   aWinClass.cbWndExtra    = theWindowExtra;
   aWinClass.hInstance     = (HINSTANCE )myAppInstance;
-  aWinClass.hIcon         = theIcon   != NULL ? (HICON   )theIcon   : LoadIconW   (NULL, IDI_APPLICATION);
-  aWinClass.hCursor       = theCursor != NULL ? (HCURSOR )theCursor : LoadCursorW (NULL, IDC_NO);
+  aWinClass.hIcon         = theIcon   != NULL ? (HICON   )theIcon   : LoadIcon   (NULL, IDI_APPLICATION);
+  aWinClass.hCursor       = theCursor != NULL ? (HCURSOR )theCursor : LoadCursor (NULL, IDC_NO);
   aWinClass.hbrBackground = 0;
   aWinClass.lpszMenuName  = !aMenuNameW.IsEmpty() ? aMenuNameW.ToWideString() : NULL;
   aWinClass.lpszClassName = aClassNameW.ToWideString();