Changed the default character set to be UNICODE, the same as chromium. Changes…

build/common.gypi

@@ -14,6 +14,7 @@
         'msvs_configuration_attributes': {
           'OutputDirectory': '$(SolutionDir)$(ConfigurationName)',
           'IntermediateDirectory': '$(OutDir)\\obj\\$(ProjectName)',
+          'CharacterSet': '1',  # UNICODE
         },
         'msvs_configuration_platform': 'Win32',
         'msvs_settings': {
@@ -43,13 +44,12 @@
             'GenerateDebugInformation': 'true',
             'ImportLibrary': '$(OutDir)\\lib\\$(TargetName).lib',
             'MapFileName': '$(OutDir)\\$(TargetName).map',
-            # SubSystem values:
-            #   0 == not set
-            #   1 == /SUBSYSTEM:CONSOLE
-            #   2 == /SUBSYSTEM:WINDOWS
             # Most of the executables we'll ever create are tests
             # and utilities with console output.
-            'SubSystem': '1',
+            'SubSystem': '1',  # /SUBSYSTEM:CONSOLE
+          },
+          'VCResourceCompilerTool': {
+            'Culture': '1033',
           },
         },
       },  # Common

samples/gles2_book/Common/Win32/esUtil_TGA.c

@@ -12,7 +12,6 @@
 //
 //    This file contains the Win32 implementation of a TGA image loader
 
-#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #include <stdio.h>
 #include <stdlib.h>

samples/gles2_book/Common/Win32/esUtil_win32.c

@@ -87,19 +87,18 @@ LRESULT WINAPI ESWindowProc ( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam
 //
 //      Create Win32 instance and window
 //
-GLboolean WinCreate ( ESContext *esContext, const char *title )
+GLboolean WinCreate ( ESContext *esContext, LPCTSTR title )
 {
    WNDCLASS wndclass = {0}; 
    DWORD    wStyle   = 0;
    RECT     windowRect;
    HINSTANCE hInstance = GetModuleHandle(NULL);
-
-
+   
    wndclass.style         = CS_OWNDC;
    wndclass.lpfnWndProc   = (WNDPROC)ESWindowProc; 
    wndclass.hInstance     = hInstance; 
    wndclass.hbrBackground = (HBRUSH)GetStockObject(BLACK_BRUSH); 
-   wndclass.lpszClassName = "opengles2.0"; 
+   wndclass.lpszClassName = TEXT("opengles2.0");
 
    if (!RegisterClass (&wndclass) ) 
       return FALSE; 
@@ -115,10 +114,8 @@ GLboolean WinCreate ( ESContext *esContext, const char *title )
 
    AdjustWindowRect ( &windowRect, wStyle, FALSE );
 
-
-
    esContext->hWnd = CreateWindow(
-                         "opengles2.0",
+                         TEXT("opengles2.0"),
                          title,
                          wStyle,
                          0,
@@ -134,7 +131,6 @@ GLboolean WinCreate ( ESContext *esContext, const char *title )
    // ESWindowProc
    SetWindowLongPtr (  esContext->hWnd, GWL_USERDATA, (LONG) (LONG_PTR) esContext );
 
-
    if ( esContext->hWnd == NULL )
       return GL_FALSE;
 

samples/gles2_book/Common/esUtil.c

@@ -129,7 +129,7 @@ void ESUTIL_API esInitContext ( ESContext *esContext )
 //          ES_WINDOW_STENCIL     - specifies that a stencil buffer should be created
 //          ES_WINDOW_MULTISAMPLE - specifies that a multi-sample buffer should be created
 //
-GLboolean ESUTIL_API esCreateWindow ( ESContext *esContext, const char* title, GLint width, GLint height, GLuint flags )
+GLboolean ESUTIL_API esCreateWindow ( ESContext *esContext, LPCTSTR title, GLint width, GLint height, GLuint flags )
 {
    EGLint attribList[] =
    {

samples/gles2_book/Common/esUtil.h

@@ -111,7 +111,7 @@ void ESUTIL_API esInitContext ( ESContext *esContext );
 ///         ES_WINDOW_STENCIL - specifies that a stencil buffer should be created
 ///         ES_WINDOW_MULTISAMPLE - specifies that a multi-sample buffer should be created
 /// \return GL_TRUE if window creation is succesful, GL_FALSE otherwise
-GLboolean ESUTIL_API esCreateWindow ( ESContext *esContext, const char *title, GLint width, GLint height, GLuint flags );
+GLboolean ESUTIL_API esCreateWindow ( ESContext *esContext, LPCTSTR title, GLint width, GLint height, GLuint flags );
 
 //
 /// \brief Start the main loop for the OpenGL ES application

samples/gles2_book/Common/esUtil_win.h

@@ -42,7 +42,7 @@ extern "C" {
 //
 //      Create Win32 instance and window
 //
-GLboolean WinCreate ( ESContext *esContext, const char *title );
+GLboolean WinCreate ( ESContext *esContext, LPCTSTR title );
 
 ///
 //  WinLoop()

samples/gles2_book/Hello_Triangle/Hello_Triangle.c

@@ -183,7 +183,7 @@ int main ( int argc, char *argv[] )
    esInitContext ( &esContext );
    esContext.userData = &userData;
 
-   esCreateWindow ( &esContext, "Hello Triangle", 320, 240, ES_WINDOW_RGB );
+   esCreateWindow ( &esContext, TEXT("Hello Triangle"), 320, 240, ES_WINDOW_RGB );
    
    if ( !Init ( &esContext ) )
       return 0;

samples/gles2_book/MipMap2D/MipMap2D.c

@@ -333,7 +333,7 @@ int main ( int argc, char *argv[] )
    esInitContext ( &esContext );
    esContext.userData = &userData;
 
-   esCreateWindow ( &esContext, "MipMap 2D", 320, 240, ES_WINDOW_RGB );
+   esCreateWindow ( &esContext, TEXT("MipMap 2D"), 320, 240, ES_WINDOW_RGB );
    
    if ( !Init ( &esContext ) )
       return 0;

samples/gles2_book/MultiTexture/MultiTexture.c

@@ -200,7 +200,7 @@ int main ( int argc, char *argv[] )
    esInitContext ( &esContext );
    esContext.userData = &userData;
 
-   esCreateWindow ( &esContext, "MultiTexture", 320, 240, ES_WINDOW_RGB );
+   esCreateWindow ( &esContext, TEXT("MultiTexture"), 320, 240, ES_WINDOW_RGB );
    
    if ( !Init ( &esContext ) )
       return 0;

samples/gles2_book/ParticleSystem/ParticleSystem.c

@@ -280,7 +280,7 @@ int main ( int argc, char *argv[] )
    esInitContext ( &esContext );
    esContext.userData = &userData;
 
-   esCreateWindow ( &esContext, "ParticleSystem", 640, 480, ES_WINDOW_RGB );
+   esCreateWindow ( &esContext, TEXT("ParticleSystem"), 640, 480, ES_WINDOW_RGB );
    
    if ( !Init ( &esContext ) )
       return 0;

samples/gles2_book/Simple_Texture2D/Simple_Texture2D.c

@@ -185,7 +185,7 @@ int main ( int argc, char *argv[] )
    esInitContext ( &esContext );
    esContext.userData = &userData;
 
-   esCreateWindow ( &esContext, "Simple Texture 2D", 320, 240, ES_WINDOW_RGB );
+   esCreateWindow ( &esContext, TEXT("Simple Texture 2D"), 320, 240, ES_WINDOW_RGB );
    
    if ( !Init ( &esContext ) )
       return 0;

samples/gles2_book/Simple_TextureCubemap/Simple_TextureCubemap.c

@@ -216,7 +216,7 @@ int main ( int argc, char *argv[] )
    esInitContext ( &esContext );
    esContext.userData = &userData;
 
-   esCreateWindow ( &esContext, "Simple Texture Cubemap", 320, 240, ES_WINDOW_RGB );
+   esCreateWindow ( &esContext, TEXT("Simple Texture Cubemap"), 320, 240, ES_WINDOW_RGB );
    
    if ( !Init ( &esContext ) )
       return 0;

samples/gles2_book/Simple_VertexShader/Simple_VertexShader.c

@@ -180,7 +180,7 @@ int main ( int argc, char *argv[] )
    esInitContext ( &esContext );
    esContext.userData = &userData;
 
-   esCreateWindow ( &esContext, "Simple Vertex Shader", 320, 240, ES_WINDOW_RGB );
+   esCreateWindow ( &esContext, TEXT("Simple Vertex Shader"), 320, 240, ES_WINDOW_RGB );
    
    if ( !Init ( &esContext ) )
       return 0;

samples/gles2_book/Stencil_Test/Stencil_Test.c

@@ -259,7 +259,7 @@ int main ( int argc, char *argv[] )
    esInitContext ( &esContext );
    esContext.userData = &userData;
 
-   esCreateWindow ( &esContext, "Stencil Test", 320, 240,
+   esCreateWindow ( &esContext, TEXT("Stencil Test"), 320, 240,
                     ES_WINDOW_RGB | ES_WINDOW_DEPTH | ES_WINDOW_STENCIL );
    
    if ( !Init ( &esContext ) )

samples/gles2_book/TextureWrap/TextureWrap.c

@@ -241,7 +241,7 @@ int main ( int argc, char *argv[] )
    esInitContext ( &esContext );
    esContext.userData = &userData;
 
-   esCreateWindow ( &esContext, "Texture Wrap", 640, 480, ES_WINDOW_RGB );
+   esCreateWindow ( &esContext, TEXT("Texture Wrap"), 640, 480, ES_WINDOW_RGB );
    
    if ( !Init ( &esContext ) )
       return 0;

src/compiler/InfoSink.cpp

@@ -17,11 +17,6 @@ void TInfoSinkBase::append(const char *s)
         sink.append(s); 
     }
 
-#ifdef _WIN32
-    if (outputStream & EDebugger)
-        OutputDebugString(s);
-#endif
-
     if (outputStream & EStdOut)
         fprintf(stdout, "%s", s);
 }
@@ -33,15 +28,6 @@ void TInfoSinkBase::append(int count, char c)
         sink.append(count, c); 
     }
 
-#ifdef _WIN32
-    if (outputStream & EDebugger) {
-        char str[2];
-        str[0] = c;
-        str[1] = '\0';
-        OutputDebugString(str);
-    }
-#endif
-
     if (outputStream & EStdOut)
         fprintf(stdout, "%c", c);
 }
@@ -53,11 +39,6 @@ void TInfoSinkBase::append(const TPersistString& t)
         sink.append(t); 
     }
 
-#ifdef _WIN32
-    if (outputStream & EDebugger)
-        OutputDebugString(t.c_str());
-#endif
-
     if (outputStream & EStdOut)
         fprintf(stdout, "%s", t.c_str());
 }
@@ -69,11 +50,6 @@ void TInfoSinkBase::append(const TString& t)
         sink.append(t.c_str()); 
     }
 
-#ifdef _WIN32
-    if (outputStream & EDebugger)
-        OutputDebugString(t.c_str());
-#endif
-
     if (outputStream & EStdOut)
         fprintf(stdout, "%s", t.c_str());
 }

src/compiler/InfoSink.h

@@ -25,9 +25,8 @@ enum TPrefixType {
 
 enum TOutputStream {
     ENull = 0,
-    EDebugger = 0x01,
-    EStdOut = 0x02,
-    EString = 0x04,
+    EStdOut = 0x01,
+    EString = 0x02,
 };
 //
 // Encapsulate info logs for all objects that have them.
@@ -37,7 +36,7 @@ enum TOutputStream {
 //
 class TInfoSinkBase {
 public:
-    TInfoSinkBase() : outputStream(4) {}
+    TInfoSinkBase() : outputStream(EString) {}
     void erase() { sink.erase(); }
     TInfoSinkBase& operator<<(const TPersistString& t) { append(t); return *this; }
     TInfoSinkBase& operator<<(char c)                  { append(1, c); return *this; }