Index: trunk/.scm-settings
===================================================================
--- trunk/.scm-settings	(revision 69391)
+++ trunk/.scm-settings	(revision 69392)
@@ -54,5 +54,4 @@
 --filter-out-dirs  "/src/apps/kchmviewer*/."
 
---filter-out-dirs  "/src/VBox/GuestHost/OpenGL/*/."
 --filter-out-dirs  "/src/VBox/Devices/Graphics/shaderlib*/."
 --filter-out-dirs  "/src/VBox/Devices/Graphics/vmsvga/."
Index: trunk/src/VBox/GuestHost/OpenGL/.scm-settings
===================================================================
--- trunk/src/VBox/GuestHost/OpenGL/.scm-settings	(revision 69392)
+++ trunk/src/VBox/GuestHost/OpenGL/.scm-settings	(revision 69392)
@@ -0,0 +1,50 @@
+# $Id$
+## @file
+# Source code massager settings for the OpenGL guest/host code.
+#
+
+#
+# Copyright (C) 2017 Oracle Corporation
+#
+# This file is part of VirtualBox Open Source Edition (OSE), as
+# available from http://www.virtualbox.org. This file is free software;
+# you can redistribute it and/or modify it under the terms of the GNU
+# General Public License (GPL) as published by the Free Software
+# Foundation, in version 2 as it comes in the "COPYING" file of the
+# VirtualBox OSE distribution. VirtualBox OSE is distributed in the
+# hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
+#
+
+# The basic config here is external copyright, however there are lots of exceptions
+/*.h:                                      --external-copyright --no-convert-tabs --no-strip-trailing-blanks
+/include/cr_blitter.h:                     --no-external-copyright --convert-tabs --strip-trailing-blanks
+/include/cr_compositor.h:                  --no-external-copyright --convert-tabs --strip-trailing-blanks
+/include/cr_dump.h:                        --no-external-copyright --convert-tabs --strip-trailing-blanks
+/include/cr_glext.h:                       --no-external-copyright --convert-tabs --strip-trailing-blanks
+/include/cr_htable.h:                      --no-external-copyright --convert-tabs --strip-trailing-blanks
+/include/cr_sortarray.h:                   --no-external-copyright --convert-tabs --strip-trailing-blanks
+/include/cr_vreg.h:                        --no-external-copyright --convert-tabs --strip-trailing-blanks
+/include/state/cr_framebuffer.h:           --no-external-copyright --convert-tabs --strip-trailing-blanks
+/include/state/cr_glsl.h:                  --no-external-copyright --convert-tabs --strip-trailing-blanks
+/state_tracker/state_bits_globalop.h:      --no-external-copyright --convert-tabs --strip-trailing-blanks
+
+
+/*.c:                                      --external-copyright --no-convert-tabs --no-strip-trailing-blanks
+/packer/pack_framebuffer.c:                --no-external-copyright --convert-tabs --strip-trailing-blanks
+/packer/pack_shaders.c:                    --no-external-copyright --convert-tabs --strip-trailing-blanks
+/packer/pack_visibleregion.c:              --no-external-copyright --convert-tabs --strip-trailing-blanks
+/state_tracker/state_framebuffer.c:        --no-external-copyright --convert-tabs --strip-trailing-blanks
+/state_tracker/state_glsl.c:               --no-external-copyright --convert-tabs --strip-trailing-blanks
+/state_tracker/state_snapshot.c:           --no-external-copyright --convert-tabs --strip-trailing-blanks
+/util/error.c:                             --no-external-copyright --convert-tabs --strip-trailing-blanks
+/util/vboxhgcm.c:                          --no-external-copyright --convert-tabs --strip-trailing-blanks
+/util/vboxhgsmi.c:                         --no-external-copyright --convert-tabs --strip-trailing-blanks
+
+/*.def:                                    --external-copyright
+/*.py:                                     --external-copyright --no-convert-tabs --no-strip-trailing-blanks
+
+--filter-out-files *_special
+--filter-out-files /LICENSE
+--filter-out-files *.txt
+
+
Index: trunk/src/VBox/GuestHost/OpenGL/packer/pack_client.c
===================================================================
--- trunk/src/VBox/GuestHost/OpenGL/packer/pack_client.c	(revision 69391)
+++ trunk/src/VBox/GuestHost/OpenGL/packer/pack_client.c	(revision 69392)
@@ -673,5 +673,5 @@
     if (elementsBuffer && elementsBuffer->id)
     {
-        /*@todo not sure it's possible, and not sure what to do*/
+        /** @todo not sure it's possible, and not sure what to do*/
         if (!elementsBuffer->data)
         {
@@ -720,5 +720,5 @@
     if (elementsBuffer && elementsBuffer->id)
     {
-        /*@todo not sure it's possible, and not sure what to do*/
+        /** @todo not sure it's possible, and not sure what to do*/
         if (!elementsBuffer->data)
         {
Index: trunk/src/VBox/GuestHost/OpenGL/packer/pack_framebuffer.c
===================================================================
--- trunk/src/VBox/GuestHost/OpenGL/packer/pack_framebuffer.c	(revision 69391)
+++ trunk/src/VBox/GuestHost/OpenGL/packer/pack_framebuffer.c	(revision 69392)
@@ -21,5 +21,5 @@
 #include "cr_string.h"
 
-void PACK_APIENTRY 
+void PACK_APIENTRY
 crPackDeleteRenderbuffersEXT(GLsizei n, const GLuint * renderbuffers)
 {
@@ -38,5 +38,5 @@
 }
 
-void PACK_APIENTRY 
+void PACK_APIENTRY
 crPackDeleteFramebuffersEXT(GLsizei n, const GLuint * framebuffers)
 {
@@ -55,5 +55,5 @@
 }
 
-void PACK_APIENTRY 
+void PACK_APIENTRY
 crPackDeleteRenderbuffersEXTSWAP(GLsizei n, const GLuint * renderbuffers)
 {
@@ -63,5 +63,5 @@
 }
 
-void PACK_APIENTRY 
+void PACK_APIENTRY
 crPackDeleteFramebuffersEXTSWAP(GLsizei n, const GLuint * framebuffers)
 {
Index: trunk/src/VBox/GuestHost/OpenGL/packer/pack_shaders.c
===================================================================
--- trunk/src/VBox/GuestHost/OpenGL/packer/pack_shaders.c	(revision 69391)
+++ trunk/src/VBox/GuestHost/OpenGL/packer/pack_shaders.c	(revision 69392)
@@ -56,5 +56,5 @@
         packet_length += pLocalLength[i];
     }
-    
+
     if (length)
     {
@@ -408,5 +408,5 @@
 }
 
-/*@todo next 8 functions are bit hacky, 
+/** @todo next 8 functions are bit hacky,
  * we expect packspu to pass a single structure with all output parameters via first output pointer.
  * it'd be better to add CRMessageMultiReadback one day.
@@ -474,16 +474,16 @@
 void PACK_APIENTRY crPackGetAttachedObjectsARB(VBoxGLhandleARB containerObj, GLsizei maxCount, GLsizei * count, VBoxGLhandleARB * obj, int * writeback)
 {
-	CR_GET_PACKER_CONTEXT(pc);
-	unsigned char *data_ptr;
-	(void) pc; (void) obj;
-	CR_GET_BUFFERED_POINTER(pc, 32);
-	WRITE_DATA(0, GLint, 32);
-	WRITE_DATA(4, GLenum, CR_GETATTACHEDOBJECTSARB_EXTEND_OPCODE);
-	WRITE_DATA(8, VBoxGLhandleARB, containerObj);
-	WRITE_DATA(12, GLsizei, maxCount);
-	WRITE_NETWORK_POINTER(16, (void *) count);
-	WRITE_NETWORK_POINTER(24, (void *) writeback);
-	WRITE_OPCODE(pc, CR_EXTEND_OPCODE);
-	CR_CMDBLOCK_CHECK_FLUSH(pc);
+        CR_GET_PACKER_CONTEXT(pc);
+        unsigned char *data_ptr;
+        (void) pc; (void) obj;
+        CR_GET_BUFFERED_POINTER(pc, 32);
+        WRITE_DATA(0, GLint, 32);
+        WRITE_DATA(4, GLenum, CR_GETATTACHEDOBJECTSARB_EXTEND_OPCODE);
+        WRITE_DATA(8, VBoxGLhandleARB, containerObj);
+        WRITE_DATA(12, GLsizei, maxCount);
+        WRITE_NETWORK_POINTER(16, (void *) count);
+        WRITE_NETWORK_POINTER(24, (void *) writeback);
+        WRITE_OPCODE(pc, CR_EXTEND_OPCODE);
+        CR_CMDBLOCK_CHECK_FLUSH(pc);
     CR_UNLOCK_PACKER_CONTEXT(pc);
 }
@@ -491,16 +491,16 @@
 void PACK_APIENTRY crPackGetInfoLogARB(VBoxGLhandleARB obj, GLsizei maxLength, GLsizei * length, GLcharARB * infoLog, int * writeback)
 {
-	CR_GET_PACKER_CONTEXT(pc);
-	unsigned char *data_ptr;
-	(void) pc; (void) infoLog;
-	CR_GET_BUFFERED_POINTER(pc, 32);
-	WRITE_DATA(0, GLint, 32);
-	WRITE_DATA(4, GLenum, CR_GETINFOLOGARB_EXTEND_OPCODE);
-	WRITE_DATA(8, VBoxGLhandleARB, obj);
-	WRITE_DATA(12, GLsizei, maxLength);
-	WRITE_NETWORK_POINTER(16, (void *) length);
-	WRITE_NETWORK_POINTER(24, (void *) writeback);
-	WRITE_OPCODE(pc, CR_EXTEND_OPCODE);
-	CR_CMDBLOCK_CHECK_FLUSH(pc);
+        CR_GET_PACKER_CONTEXT(pc);
+        unsigned char *data_ptr;
+        (void) pc; (void) infoLog;
+        CR_GET_BUFFERED_POINTER(pc, 32);
+        WRITE_DATA(0, GLint, 32);
+        WRITE_DATA(4, GLenum, CR_GETINFOLOGARB_EXTEND_OPCODE);
+        WRITE_DATA(8, VBoxGLhandleARB, obj);
+        WRITE_DATA(12, GLsizei, maxLength);
+        WRITE_NETWORK_POINTER(16, (void *) length);
+        WRITE_NETWORK_POINTER(24, (void *) writeback);
+        WRITE_OPCODE(pc, CR_EXTEND_OPCODE);
+        CR_CMDBLOCK_CHECK_FLUSH(pc);
     CR_UNLOCK_PACKER_CONTEXT(pc);
 }
@@ -562,5 +562,5 @@
 void PACK_APIENTRY crPackGetUniformsLocations(GLuint program, GLsizei maxcbData, GLsizei * cbData, GLvoid * pData, int * writeback)
 {
-	CR_GET_PACKER_CONTEXT(pc);
+        CR_GET_PACKER_CONTEXT(pc);
     unsigned char *data_ptr;
     (void) pData;
Index: trunk/src/VBox/GuestHost/OpenGL/state_tracker/get_components.py
===================================================================
--- trunk/src/VBox/GuestHost/OpenGL/state_tracker/get_components.py	(revision 69391)
+++ trunk/src/VBox/GuestHost/OpenGL/state_tracker/get_components.py	(revision 69392)
@@ -140,3 +140,2 @@
 """)
 
-
Index: trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_attrib.c
===================================================================
--- trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_attrib.c	(revision 69391)
+++ trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_attrib.c	(revision 69392)
@@ -56,5 +56,5 @@
 }
 
-/*@todo check if NV rect needed too*/
+/** @todo check if NV rect needed too*/
 static void
 copy_texunit(CRTextureUnit *dest, const CRTextureUnit *src)
Index: trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_bufferobject.c
===================================================================
--- trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_bufferobject.c	(revision 69391)
+++ trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_bufferobject.c	(revision 69392)
@@ -997,5 +997,5 @@
     if (pBufferObj->data)
     {
-        /*@todo http://www.opengl.org/registry/specs/ARB/pixel_buffer_object.txt
+        /** @todo http://www.opengl.org/registry/specs/ARB/pixel_buffer_object.txt
           "While it is entirely legal to create a buffer object by binding
           it to GL_ARRAY_BUFFER and loading it with data, then using it
@@ -1125,3 +1125,2 @@
 }
 
-
Index: trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_fence.c
===================================================================
--- trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_fence.c	(revision 69391)
+++ trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_fence.c	(revision 69392)
@@ -49,3 +49,2 @@
 }
 
-
Index: trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_framebuffer.c
===================================================================
--- trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_framebuffer.c	(revision 69391)
+++ trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_framebuffer.c	(revision 69392)
@@ -175,5 +175,5 @@
     int u;
 
-    if (!pFBO) 
+    if (!pFBO)
         return;
 
@@ -394,5 +394,5 @@
     }
 
-    /* @todo: http://www.opengl.org/registry/specs/ARB/framebuffer_object.txt 
+    /** @todo http://www.opengl.org/registry/specs/ARB/framebuffer_object.txt
      * FBO status might change when binding a different FBO here...but I doubt it happens.
      * So no status reset here until a proper check.
@@ -479,5 +479,5 @@
 }
 
-/*@todo: move this function somewhere else*/
+/** @todo move this function somewhere else*/
 /*return floor of base 2 log of x. log(0)==0*/
 static unsigned int crLog2Floor(unsigned int x)
@@ -874,5 +874,5 @@
 {
     (void)target;
-    /*@todo*/
+    /** @todo */
 }
 
@@ -900,5 +900,5 @@
         case GL_TEXTURE:
             CRASSERT(pAP->name!=0);
-            
+
             tobj = (CRTextureObj *) crHashtableSearch(ctx->shared->textureTable, pAP->name);
             if (tobj)
@@ -987,6 +987,6 @@
         diff_api.BindRenderbufferEXT(GL_RENDERBUFFER_EXT, to->framebufferobject.renderbuffer?
             to->framebufferobject.renderbuffer->hwid:0);
-    } 
-    else 
+    }
+    else
     {
         if (to->framebufferobject.drawFB!=from->framebufferobject.drawFB
Index: trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_glsl.c
===================================================================
--- trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_glsl.c	(revision 69391)
+++ trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_glsl.c	(revision 69392)
@@ -139,5 +139,5 @@
 
     pRealShader = crStateGetShaderObj(pShader->id);
-    
+
     if (pRealShader)
     {
@@ -188,5 +188,5 @@
     CRContext *g = GetCurrentContext();
 
-    /*@todo: hack to allow crStateFreeGLSLProgram to work correctly, 
+    /** @todo hack to allow crStateFreeGLSLProgram to work correctly,
       as the current context isn't the one being destroyed*/
 #ifdef CHROMIUM_THREADSAFE
@@ -671,5 +671,5 @@
     pAttribs[pProgram->currentState.cAttribs].index = index;
     pAttribs[pProgram->currentState.cAttribs].name = crStrdup(name);
-    
+
     pProgram->currentState.cAttribs++;
     if (pProgram->currentState.pAttribs) crFree(pProgram->currentState.pAttribs);
@@ -827,8 +827,8 @@
 }
 
-/*@todo: one of those functions should ignore uniforms starting with "gl"*/
+/** @todo one of those functions should ignore uniforms starting with "gl"*/
 
 #ifdef IN_GUEST
-DECLEXPORT(void) STATE_APIENTRY 
+DECLEXPORT(void) STATE_APIENTRY
 crStateGLSLProgramCacheUniforms(GLuint program, GLsizei cbData, GLvoid *pData)
 {
@@ -981,5 +981,5 @@
 }
 #else /* IN_GUEST */
-static GLboolean crStateGLSLProgramCacheOneUniform(GLuint location, GLsizei cbName, GLchar *pName, 
+static GLboolean crStateGLSLProgramCacheOneUniform(GLuint location, GLsizei cbName, GLchar *pName,
                                                    char **pCurrent, GLsizei *pcbWritten, GLsizei maxcbData)
 {
@@ -1004,5 +1004,5 @@
 }
 
-DECLEXPORT(void) STATE_APIENTRY 
+DECLEXPORT(void) STATE_APIENTRY
 crStateGLSLProgramCacheUniforms(GLuint program, GLsizei maxcbData, GLsizei *cbData, GLvoid *pData)
 {
@@ -1021,5 +1021,5 @@
      * OpenGL spec says about GL_ACTIVE_UNIFORM_MAX_LENGTH:
      * "If no active uniform variable exist, 0 is returned."
-     */ 
+     */
     diff_api.GetProgramiv(pProgram->hwid, GL_ACTIVE_UNIFORM_MAX_LENGTH, &maxUniformLen);
     if (maxUniformLen > 0)
@@ -1077,5 +1077,5 @@
                  *The name returned by glGetActiveUniform is driver dependent,
                  *atleast it's with [0] on win/ati and without [0] on linux/nvidia.
-                 */                
+                 */
                 if (!pIndexStr)
                 {
@@ -1364,5 +1364,5 @@
     CRGLSLProgram *pProgram = (CRGLSLProgram *) data2;
     (void) key;
-    
+
     if (pShader->source)
     {
@@ -1380,5 +1380,5 @@
     CRGLSLProgram *pProgram = (CRGLSLProgram *) data2;
     (void) key;
-    
+
     diff_api.DetachShader(pProgram->hwid, pShader->hwid);
 }
Index: trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_init.c
===================================================================
--- trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_init.c	(revision 69391)
+++ trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_init.c	(revision 69392)
@@ -436,5 +436,5 @@
 }
 
-/*@todo crStateAttribDestroy*/
+/** @todo crStateAttribDestroy*/
 static void
 crStateFreeContext(CRContext *ctx)
Index: trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_polygon.c
===================================================================
--- trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_polygon.c	(revision 69391)
+++ trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_polygon.c	(revision 69392)
@@ -186,5 +186,5 @@
     }
 
-    /*@todo track mask if buffer is bound?*/
+    /** @todo track mask if buffer is bound?*/
     if (!crStateIsBufferBound(GL_PIXEL_UNPACK_BUFFER_ARB))
     {
Index: trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_program.c
===================================================================
--- trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_program.c	(revision 69391)
+++ trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_program.c	(revision 69392)
@@ -2306,5 +2306,5 @@
 }
 
-/*@todo support NVprograms and add some data validity checks*/
+/** @todo support NVprograms and add some data validity checks*/
 static void
 DiffProgramCallback(unsigned long key, void *pProg, void *pCtx)
Index: trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_snapshot.c
===================================================================
--- trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_snapshot.c	(revision 69391)
+++ trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_snapshot.c	(revision 69392)
@@ -38,9 +38,9 @@
  * we'd have to update this code if we'd change state tracking.
  * On the bright side it's fast, though it's not really needed as it's not that often operation.
- * It could also worth to split those functions into appropriate parts, 
+ * It could also worth to split those functions into appropriate parts,
  * similar to the way context creation is being done.
  *
  * Second way would be to implement full dispatch api table and substitute diff_api during saving/loading.
- * Then if we implement that api in a similar way to packer/unpacker with a change to store/load 
+ * Then if we implement that api in a similar way to packer/unpacker with a change to store/load
  * via provided pSSM handle instead of pack buffer,
  * saving state could be done by simple diffing against empty "dummy" context.
@@ -400,5 +400,5 @@
     int32_t rc, face, i;
     GLint bound = 0;
-    
+
     CRASSERT(pTexture && pSSM);
 
@@ -419,5 +419,5 @@
             }
 #ifdef CR_STATE_NO_TEXTURE_IMAGE_STORE
-            /* Note, this is not a bug. 
+            /* Note, this is not a bug.
              * Even with CR_STATE_NO_TEXTURE_IMAGE_STORE defined, it's possible that ptl->img!=NULL.
              * For ex. we're saving snapshot right after it was loaded
@@ -515,5 +515,5 @@
 #endif
 
-                    /*@todo: ugly workaround for crashes inside ati driver,
+                    /** @todo ugly workaround for crashes inside ati driver,
                      *       they overwrite their own allocated memory in cases where texlevel >=4
                              and width or height <=2.
@@ -559,5 +559,5 @@
 {
     int32_t rc, face, i;
-    
+
     CRASSERT(pTexture && pSSM);
 
@@ -623,5 +623,5 @@
 {
     int32_t rc;
-    
+
     CRASSERT(pStack && pSSM);
 
@@ -1221,5 +1221,5 @@
 
                 crStateSaveString(name, pSSM);
-            
+
                 if (crStateIsIntUniform(type))
                 {
@@ -1597,5 +1597,5 @@
 
     /* Save attrib stack*/
-    /*@todo could go up to used stack depth here?*/
+    /** @todo could go up to used stack depth here?*/
     for ( i = 0 ; i < CR_MAX_ATTRIB_STACK_DEPTH ; i++)
     {
@@ -2112,10 +2112,10 @@
 #endif /*CR_ARB_vertex_buffer_object*/
 
-    /*@todo CR_NV_vertex_program*/
+    /** @todo CR_NV_vertex_program*/
     crStateCopyEvalPtrs1D(pTmpContext->eval.eval1D, pContext->eval.eval1D);
     crStateCopyEvalPtrs2D(pTmpContext->eval.eval2D, pContext->eval.eval2D);
-    
-    SLC_COPYPTR(feedback.buffer);  /*@todo*/
-    SLC_COPYPTR(selection.buffer); /*@todo*/
+
+    SLC_COPYPTR(feedback.buffer);  /** @todo */
+    SLC_COPYPTR(selection.buffer); /** @todo */
 
     SLC_COPYPTR(lighting.light);
@@ -2125,5 +2125,5 @@
 
 #if CR_ARB_occlusion_query
-    SLC_COPYPTR(occlusion.objects); /*@todo*/
+    SLC_COPYPTR(occlusion.objects); /** @todo */
 #endif
 
@@ -2387,5 +2387,5 @@
             rc = SSMR3GetMem(pSSM, pBufferObj->data, pBufferObj->size);
             AssertRCReturn(rc, rc);
-        } 
+        }
         else if (pBufferObj->id!=0 && pBufferObj->size>0)
         {
@@ -2403,5 +2403,5 @@
 
         if (key!=0)
-            crHashtableAdd(pContext->shared->buffersTable, key, pBufferObj);        
+            crHashtableAdd(pContext->shared->buffersTable, key, pBufferObj);
     }
     /* Load pointers */
@@ -2458,5 +2458,5 @@
         crHashtableAdd(pContext->program.programHash, pProgram->id, pProgram);
         //DIRTY(pProgram->dirtyProgram, pContext->neg_bitid);
-        
+
     }
     /* Load Pointers */
@@ -2528,15 +2528,15 @@
     rc = SSMR3GetU32(pSSM, &ui);
     AssertRCReturn(rc, rc);
-    pContext->framebufferobject.drawFB = ui==0 ? NULL 
+    pContext->framebufferobject.drawFB = ui==0 ? NULL
                                                : crHashtableSearch(pContext->shared->fbTable, ui);
 
     rc = SSMR3GetU32(pSSM, &ui);
     AssertRCReturn(rc, rc);
-    pContext->framebufferobject.readFB = ui==0 ? NULL 
+    pContext->framebufferobject.readFB = ui==0 ? NULL
                                                : crHashtableSearch(pContext->shared->fbTable, ui);
 
     rc = SSMR3GetU32(pSSM, &ui);
     AssertRCReturn(rc, rc);
-    pContext->framebufferobject.renderbuffer = ui==0 ? NULL 
+    pContext->framebufferobject.renderbuffer = ui==0 ? NULL
                                                      : crHashtableSearch(pContext->shared->rbTable, ui);
 
@@ -2591,5 +2591,5 @@
         }
 
-        if (pProgram->activeState.attachedShaders)  
+        if (pProgram->activeState.attachedShaders)
         {
             pProgram->activeState.attachedShaders = crAllocHashtable();
@@ -2606,5 +2606,5 @@
         }
 
-        if (pProgram->currentState.cAttribs) 
+        if (pProgram->currentState.cAttribs)
             pProgram->currentState.pAttribs = (CRGLSLAttrib*) crAlloc(pProgram->currentState.cAttribs*sizeof(CRGLSLAttrib));
         for (k=0; k<pProgram->currentState.cAttribs; ++k)
@@ -2615,5 +2615,5 @@
         }
 
-        if (pProgram->activeState.cAttribs) 
+        if (pProgram->activeState.cAttribs)
             pProgram->activeState.pAttribs = (CRGLSLAttrib*) crAlloc(pProgram->activeState.cAttribs*sizeof(CRGLSLAttrib));
         for (k=0; k<pProgram->activeState.cAttribs; ++k)
Index: trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_texture.c
===================================================================
--- trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_texture.c	(revision 69391)
+++ trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_texture.c	(revision 69392)
@@ -3321,5 +3321,5 @@
          * the crserverlib code be able to pass it to host ogl */
 
-        /* TODO: store texture priorities in the state data to be able to restore it properly
+        /** @todo store texture priorities in the state data to be able to restore it properly
          * on save state load */
     }
@@ -3336,5 +3336,5 @@
     UNUSED(textures);
     UNUSED(residences);
-    /* TODO: */
+    /** @todo */
     return GL_TRUE;
 }
Index: trunk/src/VBox/GuestHost/OpenGL/util/blitter.cpp
===================================================================
--- trunk/src/VBox/GuestHost/OpenGL/util/blitter.cpp	(revision 69391)
+++ trunk/src/VBox/GuestHost/OpenGL/util/blitter.cpp	(revision 69392)
@@ -17,7 +17,7 @@
 
 
-/*******************************************************************************
-*   Header Files                                                               *
-*******************************************************************************/
+/*********************************************************************************************************************************
+*   Header Files                                                                                                                 *
+*********************************************************************************************************************************/
 #ifdef IN_VMSVGA3D
 # include <OpenGL/OpenGL.h>
@@ -833,5 +833,5 @@
         crWarning("GL_ARB_pixel_buffer_object not supported");
 
-    /* BlitFramebuffer seems to be buggy on Intel, 
+    /* BlitFramebuffer seems to be buggy on Intel,
      * try always glDrawXxx for now */
     if (!pBlitter->Flags.ForceDrawBlit && crStrstr(pszExtension, "GL_EXT_framebuffer_blit"))
@@ -1001,5 +1001,5 @@
     pBlitter->pDispatch->BindFramebufferEXT(GL_DRAW_FRAMEBUFFER, pBlitter->idFBO);
 
-    /* TODO: mag/min filters ? */
+    /** @todo mag/min filters ? */
 
     pBlitter->pDispatch->FramebufferTexture2DEXT(GL_DRAW_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, pDst->target, pDst->hwid, 0);
@@ -1161,5 +1161,5 @@
     crWarning("GLSL unsuported, gl version %d", pCache->iGlVersion);
 
-    /* @todo: we could also check for GL_ARB_shader_objects and GL_ARB_fragment_shader,
+    /** @todo we could also check for GL_ARB_shader_objects and GL_ARB_fragment_shader,
      * but seems like chromium does not support properly gl*Object versions of shader functions used with those extensions */
     return false;
Index: trunk/src/VBox/GuestHost/OpenGL/util/compositor.cpp
===================================================================
--- trunk/src/VBox/GuestHost/OpenGL/util/compositor.cpp	(revision 69391)
+++ trunk/src/VBox/GuestHost/OpenGL/util/compositor.cpp	(revision 69392)
@@ -16,13 +16,14 @@
  */
 
-/*******************************************************************************
-*   Header Files                                                               *
-*******************************************************************************/
+
+/*********************************************************************************************************************************
+*   Header Files                                                                                                                 *
+*********************************************************************************************************************************/
 #include "../include/cr_compositor.h"
 
 
-/*******************************************************************************
-*   Defined Constants And Macros                                               *
-*******************************************************************************/
+/*********************************************************************************************************************************
+*   Defined Constants And Macros                                                                                                 *
+*********************************************************************************************************************************/
 #define VBOXVR_SCR_COMPOSITOR_RECTS_UNDEFINED UINT32_MAX
 #ifdef IN_VMSVGA3D
@@ -514,5 +515,5 @@
                                                    bool fPosRelated, bool *pfChanged)
 {
-    /* @todo: the fChanged sate calculation is really rough now, this is enough for now though */
+    /** @todo the fChanged sate calculation is really rough now, this is enough for now though */
     bool fChanged = false, fPosChanged = false;
     bool fWasInList = CrVrScrCompositorEntryIsInList(pEntry);
Index: trunk/src/VBox/GuestHost/OpenGL/util/net.c
===================================================================
--- trunk/src/VBox/GuestHost/OpenGL/util/net.c	(revision 69391)
+++ trunk/src/VBox/GuestHost/OpenGL/util/net.c	(revision 69392)
@@ -441,5 +441,5 @@
     {
 #ifdef WINDOWS
-        /* @todo: do we actually need that WSA stuff with VBox at all? */
+        /** @todo do we actually need that WSA stuff with VBox at all? */
         WORD wVersionRequested = MAKEWORD(2, 0);
         WSADATA wsaData;
Index: trunk/src/VBox/GuestHost/OpenGL/util/pixel.c
===================================================================
--- trunk/src/VBox/GuestHost/OpenGL/util/pixel.c	(revision 69391)
+++ trunk/src/VBox/GuestHost/OpenGL/util/pixel.c	(revision 69392)
@@ -1693,5 +1693,5 @@
     (void)dstPacking;
 
-    /*@todo this should be implemented properly*/
+    /** @todo this should be implemented properly*/
 
 #ifndef DEBUG_misha
Index: trunk/src/VBox/GuestHost/OpenGL/util/vboxhgcm.c
===================================================================
--- trunk/src/VBox/GuestHost/OpenGL/util/vboxhgcm.c	(revision 69391)
+++ trunk/src/VBox/GuestHost/OpenGL/util/vboxhgcm.c	(revision 69392)
@@ -46,5 +46,5 @@
 #endif
 
-/*@todo move define somewhere else, and make sure it's less than VBGLR0_MAX_HGCM_KERNEL_PARM*/
+/** @todo move define somewhere else, and make sure it's less than VBGLR0_MAX_HGCM_KERNEL_PARM*/
 /*If we fail to pass data in one chunk, send it in chunks of this size instead*/
 #define CR_HGCM_SPLIT_BUFFER_SIZE (8*_1M)
@@ -545,5 +545,5 @@
 
 #ifndef IN_GUEST
-/*@todo get rid of it*/
+/** @todo get rid of it*/
 static bool _crVBoxHGCMWriteBytes(CRConnection *conn, const void *buf, uint32_t len)
 {
@@ -593,5 +593,5 @@
     else
 # endif
-    {        
+    {
         rc = VbglR3HGCMCall(pData, cbData);
         if (RT_SUCCESS(rc))
@@ -916,5 +916,5 @@
     {
 #ifndef IN_GUEST
-            /**@todo remove temp buffer allocation in unpacker*/
+            /** @todo remove temp buffer allocation in unpacker*/
             /* we're at the host side, so just store data until guest polls us */
             _crVBoxHGCMWriteBytes(conn, start, len);
@@ -1023,5 +1023,5 @@
     CRASSERT(hgcm_buffer->magic == CR_VBOXHGCM_BUFFER_MAGIC);
 
-    /*@todo wrong len for redir buffers*/
+    /** @todo wrong len for redir buffers*/
     conn->recv_credits += hgcm_buffer->len;
 
@@ -1033,5 +1033,5 @@
 #endif
             if (g_crvboxhgcm.bufpool) {
-                /**@todo o'rly? */
+                /** @todo o'rly? */
                 /* pool may have been deallocated just a bit earlier in response
                  * to a SIGPIPE (Broken Pipe) signal.
@@ -1376,5 +1376,5 @@
 }
 
-/*@todo same, replace DeviceIoControl with vbglR3DoIOCtl */
+/** @todo same, replace DeviceIoControl with vbglR3DoIOCtl */
 static void crVBoxHGCMDoDisconnect( CRConnection *conn )
 {
@@ -2189,5 +2189,5 @@
 
     /* Can't open VBox guest driver here, because it gets called for host side as well */
-    /*@todo as we have 2 dll versions, can do it now.*/
+    /** @todo as we have 2 dll versions, can do it now.*/
 
 #ifdef RT_OS_WINDOWS
Index: trunk/src/VBox/GuestHost/OpenGL/util/vboxhgsmi.c
===================================================================
--- trunk/src/VBox/GuestHost/OpenGL/util/vboxhgsmi.c	(revision 69391)
+++ trunk/src/VBox/GuestHost/OpenGL/util/vboxhgsmi.c	(revision 69392)
@@ -618,5 +618,5 @@
         {
             _crVBoxHGSMIWaitCmd(pClient);
-                /* @todo: do we need to wait for completion actually?
+                /** @todo do we need to wait for completion actually?
                  * NOTE: in case we do not need completion,
                  * we MUST specify bDoNotSignalCompletion flag for the command buffer */
@@ -652,5 +652,5 @@
         {
             _crVBoxHGSMIWaitCmd(pClient);
-                /* @todo: do we need to wait for completion actually?
+                /** @todo do we need to wait for completion actually?
                  * NOTE: in case we do not need completion,
                  * we MUST specify bDoNotSignalCompletion flag for the command buffer */
@@ -924,5 +924,5 @@
         pClient = _crVBoxHGSMIClientGet();
 #ifndef IN_GUEST
-            //@todo remove temp buffer allocation in unpacker
+            /// @todo remove temp buffer allocation in unpacker
             /* we're at the host side, so just store data until guest polls us */
             _crVBoxHGCMWriteBytes(conn, start, len);
@@ -1010,5 +1010,5 @@
     else
     {
-        /*@todo wrong len for redir buffers*/
+        /** @todo wrong len for redir buffers*/
         conn->recv_credits += hgsmi_buffer->u32Len;
 
@@ -1245,5 +1245,5 @@
 }
 
-/*@todo same, replace DeviceIoControl with vbglR3DoIOCtl */
+/** @todo same, replace DeviceIoControl with vbglR3DoIOCtl */
 static void crVBoxHGSMIDoDisconnect( CRConnection *conn )
 {
@@ -1261,5 +1261,5 @@
     conn->cbBuffer = 0;
 
-    //@todo hold lock here?
+    /// @todo hold lock here?
     if (conn->type == CR_VBOXHGCM)
     {
@@ -1348,5 +1348,5 @@
     Assert(0);
 
-    /* @todo */
+    /** @todo */
 }
 
@@ -1395,5 +1395,5 @@
 
     /* Can't open VBox guest driver here, because it gets called for host side as well */
-    /*@todo as we have 2 dll versions, can do it now.*/
+    /** @todo as we have 2 dll versions, can do it now.*/
 
 #ifdef RT_OS_WINDOWS
@@ -1483,5 +1483,5 @@
     conn->allow_redir_ptr = 1;
 
-    //@todo remove this crap at all later
+    /// @todo remove this crap at all later
     conn->cbHostBufferAllocated = 0;//2*1024;
     conn->pHostBuffer = NULL;//(uint8_t*) crAlloc(conn->cbHostBufferAllocated);
Index: trunk/src/VBox/GuestHost/OpenGL/util/vreg.cpp
===================================================================
--- trunk/src/VBox/GuestHost/OpenGL/util/vreg.cpp	(revision 69391)
+++ trunk/src/VBox/GuestHost/OpenGL/util/vreg.cpp	(revision 69392)
@@ -16,7 +16,8 @@
  */
 
-/*******************************************************************************
-*   Header Files                                                               *
-*******************************************************************************/
+
+/*********************************************************************************************************************************
+*   Header Files                                                                                                                 *
+*********************************************************************************************************************************/
 #ifdef IN_VMSVGA3D
 # include "../include/cr_vreg.h"
@@ -99,13 +100,13 @@
 
 
-/*******************************************************************************
-*   Defined Constants And Macros                                               *
-*******************************************************************************/
+/*********************************************************************************************************************************
+*   Defined Constants And Macros                                                                                                 *
+*********************************************************************************************************************************/
 #define VBOXVR_INVALID_COORD    (~0U)
 
 
-/*******************************************************************************
-*   Global Variables                                                           *
-*******************************************************************************/
+/*********************************************************************************************************************************
+*   Global Variables                                                                                                             *
+*********************************************************************************************************************************/
 static volatile int32_t g_cVBoxVrInits = 0;
 
@@ -812,5 +813,5 @@
                     Assert(VBoxRectCmp(pRect2, &RegRect1));
 
-                    /* @todo: this can have false-alarming sometimes if the separated rects will then be joind into the original rect,
+                    /** @todo this can have false-alarming sometimes if the separated rects will then be joind into the original rect,
                      * so far this should not be a problem for VReg clients, so keep it this way for now  */
                     fChanged = true;
@@ -961,5 +962,5 @@
         return VINF_SUCCESS;
 
-    /* @todo: fChanged will have false alarming here, fix if needed */
+    /** @todo fChanged will have false alarming here, fix if needed */
     VBoxVrListClear(pList);
 
