[ros-diffs] [fireball] 29971: - Proper fix for unicode/ansi compilation ability of 3dtext (at least to fix compiler warning preventing trunk to compile), however one problem remains: glCallLists(_tcslen(text), GL_UNSIGNED_SHORT, text); // Draws The Display List Text GL_UNSIGNED_SHORT should be substituted by GL_UNSIGNED_BYTE if compiling as ANSI.

Author: fireball
Date: Tue Oct 30 11:29:31 2007
New Revision: 29971
URL: http://svn.reactos.org/svn/reactos?rev=29971&view=rev
Log:
- Proper fix for unicode/ansi compilation ability of 3dtext (at least to fix compiler
warning preventing trunk to compile), however one problem remains:
  glCallLists(_tcslen(text), GL_UNSIGNED_SHORT, text);  // Draws The Display List Text
GL_UNSIGNED_SHORT should be substituted by GL_UNSIGNED_BYTE if compiling as ANSI.
Modified:
    trunk/reactos/base/applications/screensavers/3dtext/3dtext.c
Modified: trunk/reactos/base/applications/screensavers/3dtext/3dtext.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa…
==============================================================================
--- trunk/reactos/base/applications/screensavers/3dtext/3dtext.c (original)
+++ trunk/reactos/base/applications/screensavers/3dtext/3dtext.c Tue Oct 30 11:29:31 2007
@@ -77,14 +77,14 @@
   glDeleteLists(base, 256);                                                            //
Delete All 256 Characters
 }
-GLvoid glPrint(LPWSTR text)                                                            //
Custom GL "Print" Routine
+GLvoid glPrint(LPTSTR text)                                                            //
Custom GL "Print" Routine
 {
   if (text == NULL)
// If There's No Text
     return;
// Do Nothing
   glPushAttrib(GL_LIST_BIT);                                                   // Pushes
The Display List Bits
   glListBase(base);
// Sets The Base Character to 32
-  glCallLists(wcslen(text), GL_UNSIGNED_SHORT, text);  // Draws The Display List Text
+  glCallLists(_tcslen(text), GL_UNSIGNED_SHORT, text); // Draws The Display List Text
   glPopAttrib();
// Pops The Display List Bits
 }
@@ -140,7 +140,7 @@
                (1.0f*(cos(rot/20.0f))),
                (1.0f*(sin(rot/25.0f))),
                (1.0f-0.5f*(cos(rot/17.0f))));
-       glPrint(m_Text);                                                        // Print
GL Text To The Screen
+       glPrint(m_Text);                                                        // Print
GL Text To The Screen
        glColor3f(0.0f,0.0f,1.0f);
// Make The Text Blue
        rot+=0.1f;
// Increase The Rotation Variable
 }