Changeset 63199 in vbox for trunk/src/VBox

Timestamp:

Aug 9, 2016 11:40:19 AM (8 years ago)

Author:

vboxsync

Message:

GuestHost/OpenGL: warnings (gcc).

Location:

trunk/src/VBox/GuestHost/OpenGL

Files:

• include/chromium.h (modified) (1 diff)
• include/cr_error.h (modified) (2 diffs)
• include/cr_net.h (modified) (3 diffs)
• include/cr_protocol.h (modified) (1 diff)
• packer/pack_client.c (modified) (3 diffs)
• packer/pack_texture.c (modified) (1 diff)
• spu_loader/dispatch.py (modified) (1 diff)
• spu_loader/glloader.py (modified) (3 diffs)
• spu_loader/spuchange.py (modified) (2 diffs)
• spu_loader/spuinit.c (modified) (2 diffs)
• state_tracker/state_bufferobject.c (modified) (3 diffs)
• state_tracker/state_client.c (modified) (4 diffs)
• state_tracker/state_current.c (modified) (1 diff)
• state_tracker/state_enable.c (modified) (2 diffs)
• state_tracker/state_fence.c (modified) (2 diffs)
• state_tracker/state_framebuffer.c (modified) (10 diffs)
• state_tracker/state_glsl.c (modified) (9 diffs)
• state_tracker/state_init.c (modified) (21 diffs)
• state_tracker/state_lists.c (modified) (6 diffs)
• state_tracker/state_occlude.c (modified) (3 diffs)
• state_tracker/state_polygon.txt (modified) (1 diff)
• state_tracker/state_program.c (modified) (2 diffs)
• state_tracker/state_stencil.c (modified) (2 diffs)
• state_tracker/state_texdiff.c (modified) (1 diff)
• state_tracker/state_teximage.c (modified) (16 diffs)
• state_tracker/state_texture.c (modified) (3 diffs)
• util/blitter.cpp (modified) (5 diffs)
• util/bufpool.c (modified) (1 diff)
• util/compositor.cpp (modified) (2 diffs)
• util/devnull.c (modified) (1 diff)
• util/dll.c (modified) (2 diffs)
• util/error.c (modified) (3 diffs)
• util/filenet.c (modified) (1 diff)
• util/hash.c (modified) (1 diff)
• util/list.c (modified) (1 diff)
• util/net.c (modified) (7 diffs)
• util/net_internals.h (modified) (1 diff)
• util/pixel.c (modified) (1 diff)
• util/process.c (modified) (1 diff)
• util/tcpip.c (modified) (2 diffs)
• util/udptcpip.c (modified) (1 diff)
• util/vboxhgcm.c (modified) (32 diffs)
• util/vreg.cpp (modified) (5 diffs)

trunk/src/VBox/GuestHost/OpenGL/include/chromium.h

@@ -65 +65 @@
 #ifndef WINDOWS
 # ifndef RT_OS_WINDOWS /* If we don't need it in ring-3, we probably not need it in ring-0 either (triggers warnings). */
+#  if 1
+#   pragma GCC diagnostic push
+#   pragma GCC diagnostic ignored "-Wstrict-prototypes"
+#  endif
 #include <GL/glu.h>
+#  if 1
+#   pragma GCC diagnostic pop
+#  endif
 # endif /* !RT_OS_WINDOWS */
 #endif

trunk/src/VBox/GuestHost/OpenGL/include/cr_error.h

@@ -52 +52 @@
 DECLEXPORT(void) crInfo(const char *format, ... ) PRINTF;
 
-DECLEXPORT(void) crError(const char *format, ... ) NORETURN_PRINTF;
+DECLEXPORT(void) crError(const char *format, ... ) PRINTF /*NORETURN_PRINTF - it returns*/;
 
 /* Throw more info while opengl is not stable */
@@ -59 +59 @@
 #  include <iprt/assert.h>
 #  define CRASSERT Assert
-//extern int g_VBoxFbgFBreakDdi;
+/*extern int g_VBoxFbgFBreakDdi;*/
 #  define CR_DDI_PROLOGUE() do { /*if (g_VBoxFbgFBreakDdi) {Assert(0);}*/ } while (0)
 # else

trunk/src/VBox/GuestHost/OpenGL/include/cr_net.h

@@ -266 +266 @@
 
 extern DECLEXPORT(void) crNetInit( CRNetReceiveFunc recvFunc, CRNetCloseFunc closeFunc );
-extern DECLEXPORT(void) crNetTearDown();
+extern DECLEXPORT(void) crNetTearDown(void);
 
 extern DECLEXPORT(void) *crNetAlloc( CRConnection *conn );
@@ -288 +288 @@
 #if defined(VBOX_WITH_CRHGSMI) && defined(IN_GUEST)
                 CRConnection *conn
+#else
+                void
 #endif
         );
@@ -307 +309 @@
 #endif
 #ifdef IN_GUEST
-extern DECLEXPORT(uint32_t) crNetHostCapsGet();
+extern DECLEXPORT(uint32_t) crNetHostCapsGet(void);
 #endif
 extern DECLEXPORT(void) crNetDefaultRecv( CRConnection *conn, CRMessage *msg, unsigned int len );

trunk/src/VBox/GuestHost/OpenGL/include/cr_protocol.h

@@ -100 +100 @@
 } CRNetworkPointer;
 
-#if 0 //def DEBUG_misha
+#if 0 /*def DEBUG_misha*/
 #define CRDBGPTR_SETZ(_p) crMemset((_p), 0, sizeof (CRNetworkPointer))
 #define CRDBGPTR_CHECKZ(_p) do { \

trunk/src/VBox/GuestHost/OpenGL/packer/pack_client.c

@@ -443 +443 @@
         }
     }
-#endif // CR_EXT_secondary_color
+#endif /* CR_EXT_secondary_color */
 
 
@@ -459 +459 @@
         crPackFogCoordfEXT( *((GLfloat *) p) );
     }
-#endif // CR_EXT_fog_coord
+#endif /* CR_EXT_fog_coord */
 
     for (unit = 0 ; unit < CR_MAX_TEXTURE_UNITS ; unit++)
@@ -803 +803 @@
         crPackBegin(mode);
 
-    //crDebug("crPackExpandDrawElements mode:0x%x, count:%d, type:0x%x", mode, count, type);
+    /*crDebug("crPackExpandDrawElements mode:0x%x, count:%d, type:0x%x", mode, count, type);*/
 
     switch (type)

trunk/src/VBox/GuestHost/OpenGL/packer/pack_texture.c

@@ -799 +799 @@
     }
 
-    //crDebug( "Compressing that shit: %d", level );
+    /*crDebug( "Compressing that shit: %d", level );*/
 
     data_ptr = (unsigned char *) crPackAlloc( packet_length );

trunk/src/VBox/GuestHost/OpenGL/spu_loader/dispatch.py

@@ -119 +119 @@
                 if (ptr[i] == NULL) {
                         /*printf("!!!!!!!Warning entry[%d] = NULL\n", i);*/
-                        ptr[i] = (void *)NopFunction;
+                        ptr[i] = (void *)(uintptr_t)NopFunction;
                 }
         }

trunk/src/VBox/GuestHost/OpenGL/spu_loader/glloader.py

@@ -46 +46 @@
 #define SYSTEM_GL "libGL.so.1"
 #endif
-typedef void (*glxfuncptr)();
+typedef void (*glxfuncptr)(void);
 extern glxfuncptr glxGetProcAddressARB( const GLubyte *name );
 #else
@@ -85 +85 @@
 
 #ifndef WINDOWS
-static int FileExists(char *directory, char *filename)
+/*static int FileExists(char *directory, char *filename)
 {
         FILE *f;
@@ -102 +102 @@
             return 0;
         }
-}
+}*/
 #endif
 

trunk/src/VBox/GuestHost/OpenGL/spu_loader/spuchange.py

@@ -33 +33 @@
 keys = apiutil.GetDispatchedFunctions(sys.argv[1]+"/APIspec.txt")
 for func_name in keys:
-        print '\tif ((void *)table->%s == orig_func)' % func_name
+        print '\tif ((uintptr_t)table->%s == (uintptr_t)orig_func)' % func_name
         print '\t{'
-        print '\t\ttable->%s = (%sFunc_t)new_func;' % (func_name, func_name)
+        print '\t\ttable->%s = (%sFunc_t)(uintptr_t)new_func;' % (func_name, func_name)
         print '\t\tfor (temp = table->copyList ; temp ; temp = temp->next)'
         print '\t\t{'
@@ -65 +65 @@
     print '\tif (func && ((SPUGenericFunction)dispatch->%s!=func))' % func_name
     print '\t{'
-    print '\t\tcrDebug("%%s changed from %%p to %%p", "gl%s", dispatch->%s, func);' % (func_name, func_name)
-    print '\t\tcrSPUChangeInterface(dispatch, (void *)dispatch->%s, func);' % func_name
+    print '\t\tcrDebug("%%s changed from %%p to %%p", "gl%s", (void *)(uintptr_t)dispatch->%s, (void *)(uintptr_t)func);' % (func_name, func_name)
+    print '\t\tcrSPUChangeInterface(dispatch, (void *)(uintptr_t)dispatch->%s, (void *)(uintptr_t)func);' % func_name
     print '\t}\n'
 print """

trunk/src/VBox/GuestHost/OpenGL/spu_loader/spuinit.c

@@ -27 +27 @@
     table->server = NULL;
 }
+
+#if 0 /* unused */
 
 static int validate_int( const char *response, 
@@ -161 +163 @@
     return retval;
 }
+
+#endif /* unused */
 
 /** Use the default values for all the options:

trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_bufferobject.c

@@ -974 +974 @@
                              CRContext *fromCtx, CRContext *toCtx)
 {
-    CRBufferObjectState *from = &(fromCtx->bufferobject);
-    const CRBufferObjectState *to = &(toCtx->bufferobject);
+    /*CRBufferObjectState *from = &(fromCtx->bufferobject); - unused
+    const CRBufferObjectState *to = &(toCtx->bufferobject); - unused */
 
     if (!HaveBufferObjectExtension())
@@ -987 +987 @@
     CRBufferObject *pBufferObj = (CRBufferObject *) data1;
     CRBufferObjectState *pState = (CRBufferObjectState *) data2;
+    (void)key;
 
     if (pBufferObj->id && !pBufferObj->hwid)
@@ -1020 +1021 @@
                                CRContext *fromCtx, CRContext *toCtx)
 {
-    const CRBufferObjectState *from = &(fromCtx->bufferobject);
+    /*const CRBufferObjectState *from = &(fromCtx->bufferobject); - unused */
     CRBufferObjectState *to = &(toCtx->bufferobject);
     int i;

trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_client.c

@@ -1535 +1535 @@
   /* XXX todo */
     crWarning("crStateVertexArrayRangeNV not implemented");
+    (void)length; (void)pointer;
 }
 
@@ -1547 +1548 @@
 #define CRSTATE_IS_SERVER_CP(cp) (!(cp).enabled || !(cp).p || ((cp).buffer && (cp).buffer->id) || ((cp).locked))
 
+#if defined(DEBUG) && 0
 static void crStateDumpClientPointer(CRClientPointer *cp, const char *name, int i)
 {
@@ -1552 +1554 @@
   {
     crDebug("CP(%s): enabled:%d ptr:%p buffer:%p buffer.name:%i locked: %i %s",
-            name, cp->enabled, cp->p, cp->buffer, cp->buffer? cp->buffer->id:-1, (int)cp->locked,
+            name, cp->enabled, cp->p, cp->buffer, cp->buffer ? cp->buffer->id : ~(GLuint)0, (int)cp->locked,
             CRSTATE_IS_SERVER_CP(*cp) ? "":"!FAIL!");
   }
@@ -1558 +1560 @@
   {
     crDebug("CP(%s%i): enabled:%d ptr:%p buffer:%p buffer.name:%i locked: %i %s",
-            name, i, cp->enabled, cp->p, cp->buffer, cp->buffer? cp->buffer->id:-1, (int)cp->locked,
+            name, i, cp->enabled, cp->p, cp->buffer, cp->buffer ? cp->buffer->id : ~(GLuint)0, (int)cp->locked,
             CRSTATE_IS_SERVER_CP(*cp) ? "":"!FAIL!");
   }
 }
+#endif
 
 #ifdef DEBUG_misha
 /* debugging */
-//# define CR_NO_SERVER_ARRAYS
+/*# define CR_NO_SERVER_ARRAYS*/
 #endif
 

trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_current.c

@@ -366 +366 @@
              (toCtx->extensions.NV_vertex_program))) {
         const unsigned attribsUsedMask = toCtx->current.attribsUsedMask;
-        int i;
         for (i = 1; i < CR_MAX_VERTEX_ATTRIBS; i++) {  /* skip zero */
             if ((attribsUsedMask & (1 << i))

trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_enable.c

@@ -389 +389 @@
                 case GL_MAP1_VERTEX_ATTRIB15_4_NV:
                         {
-                                const GLint i = cap - GL_MAP1_VERTEX_ATTRIB0_4_NV;
-                                g->eval.enableAttrib1D[i] = val;
-                                DIRTY(sb->program.map1AttribArrayEnable[i], neg_bitid);
+                                const GLint idx = cap - GL_MAP1_VERTEX_ATTRIB0_4_NV;
+                                g->eval.enableAttrib1D[idx] = val;
+                                DIRTY(sb->program.map1AttribArrayEnable[idx], neg_bitid);
                                 DIRTY(sb->program.dirty, neg_bitid);
                         }
@@ -412 +412 @@
                 case GL_MAP2_VERTEX_ATTRIB15_4_NV:
                         {
-                                const GLint i = cap - GL_MAP2_VERTEX_ATTRIB0_4_NV;
-                                g->eval.enableAttrib2D[i] = val;
-                                DIRTY(sb->program.map2AttribArrayEnable[i], neg_bitid);
+                                const GLint idx = cap - GL_MAP2_VERTEX_ATTRIB0_4_NV;
+                                g->eval.enableAttrib2D[idx] = val;
+                                DIRTY(sb->program.map2AttribArrayEnable[idx], neg_bitid);
                                 DIRTY(sb->program.dirty, neg_bitid);
                         }

trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_fence.c

@@ -13 +13 @@
 void APIENTRY crStateGenFencesNV(GLsizei n, GLuint *fences)
 {
+    (void)n; (void)fences;
 }
 
@@ -18 +19 @@
 void APIENTRY crStateDeleteFencesNV(GLsizei n, const GLuint *fences)
 {
+    (void)n; (void)fences;
 }
 
 void APIENTRY crStateSetFenceNV(GLuint fence, GLenum condition)
 {
+    (void)fence; (void)condition;
 }
 
 GLboolean APIENTRY crStateTestFenceNV(GLuint fence)
 {
-   return GL_FALSE;
+    (void)fence;
+    return GL_FALSE;
 }
 
 void APIENTRY crStateFinishFenceNV(GLuint fence)
 {
+    (void)fence;
 }
 
 GLboolean APIENTRY crStateIsFenceNV(GLuint fence)
 {
-   return GL_FALSE;
+    (void)fence;
+    return GL_FALSE;
 }
 
 void APIENTRY crStateGetFenceivNV(GLuint fence, GLenum pname, GLint *params)
 {
+    (void)fence; (void)pname; (void)params;
 }
 

trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_framebuffer.c

@@ -228 +228 @@
 {
     CRContext *g = GetCurrentContext();
-    CRFramebufferObjectState *fbo = &g->framebufferobject;
+    /*CRFramebufferObjectState *fbo = &g->framebufferobject; - unused */
     int i;
 
@@ -481 +481 @@
 /*@todo: move this function somewhere else*/
 /*return floor of base 2 log of x. log(0)==0*/
-unsigned int crLog2Floor(unsigned int x)
+static unsigned int crLog2Floor(unsigned int x)
 {
     x |= (x >> 1);
@@ -614 +614 @@
 {
     CRContext *g = GetCurrentContext();
-    CRFramebufferObjectState *fbo = &g->framebufferobject;
+    /*CRFramebufferObjectState *fbo = &g->framebufferobject; - unused */
     CRFBOAttachmentPoint *aap[2];
     GLuint cap, i;
@@ -648 +648 @@
 {
     CRContext *g = GetCurrentContext();
-    CRFramebufferObjectState *fbo = &g->framebufferobject;
+    /* CRFramebufferObjectState *fbo = &g->framebufferobject; - unused */
     CRFBOAttachmentPoint *aap[2];
     GLuint cap, i;
@@ -686 +686 @@
 {
     CRContext *g = GetCurrentContext();
-    CRFramebufferObjectState *fbo = &g->framebufferobject;
+    /* CRFramebufferObjectState *fbo = &g->framebufferobject; - unused */
     CRFBOAttachmentPoint *aap[2];
     GLuint cap, i;
@@ -727 +727 @@
     CRFBOAttachmentPoint *aap[2];
     CRRenderbufferObject *rb;
+    (void)renderbuffertarget;
 
     CRSTATE_CHECKERR(g->current.inBeginEnd, GL_INVALID_OPERATION, "called in begin/end");
@@ -872 +873 @@
 crStateGenerateMipmapEXT(GLenum target)
 {
+    (void)target;
     /*@todo*/
 }
@@ -878 +880 @@
 {
     CRRenderbufferObject *pRBO = (CRRenderbufferObject*) data1;
+    (void)key; (void)data2;
 
     diff_api.GenRenderbuffersEXT(1, &pRBO->hwid);
@@ -943 +946 @@
     CRContext *ctx = (CRContext*) data2;
     GLint i;
+    (void)key;
 
     diff_api.GenFramebuffersEXT(1, &pFBO->hwid);
@@ -1089 +1093 @@
     CRContext *g = GetCurrentContext();
     CRFramebufferObject *pFBO = (CRFramebufferObject*) crHashtableSearch(g->shared->fbTable, id);
-#if 0 //def DEBUG_misha
+#if 0 /*def DEBUG_misha*/
     crDebug("FB id(%d) hw(%d)", id, pFBO ? pFBO->hwid : 0);
 #endif

trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_glsl.c

@@ -136 +136 @@
     CRContext *ctx = (CRContext*) data2;
     CRGLSLShader *pRealShader;
-    (void) key;
+    (void) key; (void)ctx;
 
     pRealShader = crStateGetShaderObj(pShader->id);
@@ -406 +406 @@
 static void crStateDbgCheckNoProgramOfId(void *data)
 {
+    (void)data;
     crError("Unexpected Program id");
 }
@@ -849 +850 @@
     }
 
-    if (cbData<sizeof(GLsizei))
+    if (cbData<(GLsizei)sizeof(GLsizei))
     {
         crWarning("crStateGLSLProgramCacheUniforms: data too short");
@@ -859 +860 @@
     cbRead = sizeof(GLsizei);
 
-    //crDebug("crStateGLSLProgramCacheUniforms: %i active uniforms", pProgram->cUniforms);
+    /*crDebug("crStateGLSLProgramCacheUniforms: %i active uniforms", pProgram->cUniforms);*/
 
     if (pProgram->cUniforms)
@@ -896 +897 @@
         pCurrent += cbName;
 
-        //crDebug("crStateGLSLProgramCacheUniforms: uniform[%i]=%d, %s", i, pProgram->pUniforms[i].location, pProgram->pUniforms[i].name);
+        /*crDebug("crStateGLSLProgramCacheUniforms: uniform[%i]=%d, %s", i, pProgram->pUniforms[i].location, pProgram->pUniforms[i].name);*/
     }
 
@@ -925 +926 @@
     }
 
-    if (cbData<sizeof(GLsizei))
+    if (cbData<(GLsizei)sizeof(GLsizei))
     {
         WARN(("crStateGLSLProgramCacheAttribs: data too short"));
@@ -991 +992 @@
     }
 
-    //crDebug("crStateGLSLProgramCacheUniforms: uniform[%i]=%s.", location, pName);
+    /*crDebug("crStateGLSLProgramCacheUniforms: uniform[%i]=%s.", location, pName);*/
 
     ((GLint*)*pCurrent)[0] = location;
@@ -1322 +1323 @@
     CRGLSLShader *pShader = (CRGLSLShader*) data1;
     CRContext *ctx = (CRContext *) data2;
+    (void)ctx; (void)key;
 
     pShader->hwid = diff_api.CreateShader(pShader->type);
@@ -1387 +1389 @@
     CRContext *ctx = (CRContext *) data2;
     GLuint i;
+    (void)key;
 
     pProgram->hwid = diff_api.CreateProgram();

trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_init.c

@@ -76 +76 @@
 }
 
-void crStateReleaseTextureInternal(CRSharedState *pS, CRContext *pCtx, CRTextureObj *pObj)
+static void crStateReleaseTextureInternal(CRSharedState *pS, CRContext *pCtx, CRTextureObj *pObj)
 {
     Assert(CR_STATE_SHAREDOBJ_USAGE_IS_USED(pObj) || pObj->pinned);
@@ -102 +102 @@
 }
 
-void crStateReleaseBufferObjectInternal(CRSharedState *pS, CRContext *pCtx, CRBufferObject *pObj)
+static void crStateReleaseBufferObjectInternal(CRSharedState *pS, CRContext *pCtx, CRBufferObject *pObj)
 {
     Assert(CR_STATE_SHAREDOBJ_USAGE_IS_USED(pObj));
@@ -110 +110 @@
 }
 
-void crStateReleaseFBOInternal(CRSharedState *pS, CRContext *pCtx, CRFramebufferObject *pObj)
+static void crStateReleaseFBOInternal(CRSharedState *pS, CRContext *pCtx, CRFramebufferObject *pObj)
 {
     Assert(CR_STATE_SHAREDOBJ_USAGE_IS_USED(pObj));
@@ -118 +118 @@
 }
 
-void crStateReleaseRBOInternal(CRSharedState *pS, CRContext *pCtx, CRRenderbufferObject *pObj)
+static void crStateReleaseRBOInternal(CRSharedState *pS, CRContext *pCtx, CRRenderbufferObject *pObj)
 {
     Assert(CR_STATE_SHAREDOBJ_USAGE_IS_USED(pObj));
@@ -130 +130 @@
     PCR_STATE_RELEASEOBJ pData = (PCR_STATE_RELEASEOBJ)data2;
     CRTextureObj *pObj = (CRTextureObj *)data1;
+    (void)key;
     crStateReleaseTextureInternal(pData->s, pData->pCtx, pObj);
 }
@@ -137 +138 @@
     PCR_STATE_RELEASEOBJ pData = (PCR_STATE_RELEASEOBJ)data2;
     CRBufferObject *pObj = (CRBufferObject *)data1;
+    (void)key;
     crStateReleaseBufferObjectInternal(pData->s, pData->pCtx, pObj);
 }
@@ -144 +146 @@
     PCR_STATE_RELEASEOBJ pData = (PCR_STATE_RELEASEOBJ)data2;
     CRFramebufferObject *pObj = (CRFramebufferObject *)data1;
+    (void)key;
     crStateReleaseFBOInternal(pData->s, pData->pCtx, pObj);
 }
@@ -151 +154 @@
     PCR_STATE_RELEASEOBJ pData = (PCR_STATE_RELEASEOBJ)data2;
     CRRenderbufferObject *pObj = (CRRenderbufferObject *)data1;
+    (void)key;
     crStateReleaseRBOInternal(pData->s, pData->pCtx, pObj);
 }
+
 
 /**
  * Decrement shared state's refcount and delete when it hits zero.
  */
-DECLEXPORT(void)
-crStateFreeShared(CRContext *pContext, CRSharedState *s)
+#ifndef IN_GUEST
+DECLEXPORT(void) crStateFreeShared(CRContext *pContext, CRSharedState *s)
+#else
+static void crStateFreeShared(CRContext *pContext, CRSharedState *s)
+#endif
 {
     int32_t refCount = ASMAtomicDecS32(&s->refCount);
@@ -188 +196 @@
 }
 
-DECLEXPORT(CRSharedState *) crStateGlobalSharedAcquire()
+#ifndef IN_GUEST
+
+DECLEXPORT(CRSharedState *) crStateGlobalSharedAcquire(void)
 {
     if (!gSharedState)
@@ -199 +209 @@
 }
 
-DECLEXPORT(void) crStateGlobalSharedRelease()
+DECLEXPORT(void) crStateGlobalSharedRelease(void)
 {
     crStateFreeShared(NULL, gSharedState);
 }
+
+#endif /* IN_GUEST */
 
 DECLEXPORT(void) STATE_APIENTRY
@@ -298 +310 @@
  */
 static CRContext *
-crStateCreateContextId(int i, const CRLimitsState *limits,
-                                             GLint visBits, CRContext *shareCtx)
+crStateCreateContextId(int i, const CRLimitsState *limits, GLint visBits, CRContext *shareCtx)
 {
     CRContext *ctx;
@@ -305 +316 @@
     int node32 = i >> 5;
     int node = i & 0x1f;
+    (void)limits;
 
     if (g_pAvailableContexts[i] != NULL)
@@ -800 +812 @@
 {
     /* This no-op function helps smooth code-gen */
+    (void)target; (void)value;
 }
 
@@ -806 +819 @@
 {
     /* This no-op function helps smooth code-gen */
+    (void)target; (void)value;
 }
 
@@ -812 +826 @@
 {
     /* This no-op function helps smooth code-gen */
+    (void)target; (void)type; (void)count; (void)values;
 }
 
@@ -818 +833 @@
 {
     /* This no-op function helps smooth code-gen */
+    (void)target; (void)index; (void)type; (void)count; (void)values;
 }
 
@@ -825 +841 @@
 {
     /* This no-op function helps smooth code-gen */
-}
-
-void crStateVBoxDetachThread()
+    (void)x; (void)y; (void)width; (void)height; (void)format; (void)type; (void)pixels;
+}
+
+void crStateVBoxDetachThread(void)
 {
     /* release the context ref so that it can be freed */
@@ -834 +851 @@
 
 
-void crStateVBoxAttachThread()
-{
-}
+void crStateVBoxAttachThread(void)
+{
+}
+
+#if 0 /* who's refering to these? */
 
 GLint crStateVBoxCreateContext( GLint con, const char * dpyName, GLint visual, GLint shareCtx )
 {
+    (void)con; (void)dpyName; (void)visual; (void)shareCtx;
     return 0;
 }
@@ -845 +865 @@
 GLint crStateVBoxWindowCreate( GLint con, const char *dpyName, GLint visBits  )
 {
+    (void)con; (void)dpyName; (void)visBits;
     return 0;
 }
@@ -850 +871 @@
 void crStateVBoxWindowDestroy( GLint con, GLint window )
 {
+    (void)con; (void)window;
 }
 
 GLint crStateVBoxConCreate(struct VBOXUHGSMI *pHgsmi)
 {
+    (void)pHgsmi;
     return 0;
 }
@@ -859 +882 @@
 void crStateVBoxConDestroy(GLint con)
 {
+    (void)con;
 }
 
 void crStateVBoxConFlush(GLint con)
 {
-}
+    (void)con;
+}
+
+#endif /* unused? */

trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_lists.c

@@ -14 +14 @@
 {
     /* nothing - dlists are in shared state */
+    (void)ctx;
 }
 
@@ -31 +32 @@
 }
 
-//#define CRSTATE_DEBUG_QUERY_HW_STATE
+/*#define CRSTATE_DEBUG_QUERY_HW_STATE*/
 
 #ifndef CRSTATE_DEBUG_QUERY_HW_STATE
@@ -173 +174 @@
     CRContext *g = GetCurrentContext();
     CRStateBits *sb = GetCurrentBits();
-    CRbitvalue *bitID=g->bitid, *negbitID=g->neg_bitid;
+    CRbitvalue /* *bitID=g->bitid, */ *negbitID=g->neg_bitid;
 
     CRASSERT(g_bVBoxEnableDiffOnMakeCurrent);
@@ -819 +820 @@
     {
         int i;
-        const int gleval_sizes[] = {4, 1, 3, 1, 2, 3, 4, 3, 4};
+        const int gleval_sizes_dup[] = {4, 1, 3, 1, 2, 3, 4, 3, 4};
 
         if (CHECKDIRTY(sb->eval.enable, negbitID))
@@ -850 +851 @@
                 if (order>0)
                 {
-                    coeffs = crAlloc(order * gleval_sizes[i] * sizeof(GLfloat));
+                    coeffs = crAlloc(order * gleval_sizes_dup[i] * sizeof(GLfloat));
                     if (!coeffs)
                     {
@@ -889 +890 @@
                 if (order[0]>0 && order[1]>0)
                 {
-                    coeffs = crAlloc(order[0] * order[1] * gleval_sizes[i] * sizeof(GLfloat));
+                    coeffs = crAlloc(order[0] * order[1] * gleval_sizes_dup[i] * sizeof(GLfloat));
                     if (!coeffs)
                     {

trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_occlude.c

@@ -138 +138 @@
         CRContext *g = GetCurrentContext();
         CROcclusionState *o = &(g->occlusion);
+        (void)target;
 
         FLUSH();
@@ -323 +324 @@
 {
         /* Apparently, no occlusion state differencing needed */
+        (void)bb; (void)bitID; (void)fromCtx; (void)toCtx;
 }
 
@@ -336 +338 @@
          * glEndQuery sequence.
          */
+        (void)bb; (void)bitID; (void)fromCtx; (void)toCtx;
         CRASSERT(!fromCtx->occlusion.currentQueryObject);
 }

trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_polygon.txt

@@ -15 +15 @@
 :mode:frontMode:PolygonMode,GL_FRONT
 -:stipple:stipple:*diff_api.PolygonStipple ((GLubyte *) to->stipple);
-+:stipple:*int j;
++:stipple:*int iStripple;
 +:stipple:*diff_api.PolygonStipple ((GLubyte *) to->stipple);
-+:stipple:*for (j=0; j<32; j++)
++:stipple:*for (iStripple=0; iStripple<32; iStripple++)
 +:stipple:*{
-+:stipple:*     from->stipple[j] = to->stipple[j];
++:stipple:*     from->stipple[iStripple] = to->stipple[iStripple];
 +:stipple:*}

trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_program.c

@@ -2301 +2301 @@
     CRProgram *pProgram = (CRProgram *) pProg;
     uint32_t i;
+    (void)key;
 
     if (pProgram->isARBprogram)
@@ -2348 +2349 @@
     CRProgram *pOrigVP, *pOrigFP;
 
-    (void) bForceUpdate;
+    (void) bForceUpdate; (void)bitID;
 
     /* save original bindings */

trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_stencil.c

@@ -102 +102 @@
 static void crStateStencilBufferFunc(CRContext *g, CRStencilBufferState *s, GLenum func, GLint ref, GLuint mask)
 {
+    (void)g;
     s->func = func;
     s->ref = ref;
@@ -171 +172 @@
 static void STATE_APIENTRY crStateStencilBufferOp (CRContext *g, CRStencilBufferState *s, GLenum fail, GLenum zfail, GLenum zpass)
 {
+    (void)g;
     s->fail = fail;
     s->passDepthFail = zfail;

trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_texdiff.c

@@ -1379 +1379 @@
     struct callback_info *info = (struct callback_info *) cbData;
     CRTextureObj *tobj = (CRTextureObj *) texObj;
+    (void)key;
+
     /*
     printf("  Checking %d 0x%x  bitid=0x%x\n",tobj->name, tobj->dirty[0], info->bitID[0]);

trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_teximage.c

@@ -575 +575 @@
     CRContext *g = GetCurrentContext();
     CRTextureState *t = &(g->texture);
+#ifndef CR_STATE_NO_TEXTURE_IMAGE_STORE
     CRClientState *c = &(g->client);
+#endif
     CRTextureObj *tobj;
     CRTextureLevel *tl;
     CRStateBits *sb = GetCurrentBits();
     CRTextureBits *tb = &(sb->texture);
+#ifdef CR_STATE_NO_TEXTURE_IMAGE_STORE
+    (void)pixels;
+#endif
 
     FLUSH();
@@ -685 +690 @@
     CRTextureObj *tobj = NULL;
     CRTextureLevel *tl = NULL;
+    (void)x; (void)y;
     
     crStateGetTextureObjectAndImage(g, target, level, &tobj, &tl);
@@ -727 +733 @@
     CRContext *g = GetCurrentContext();
     CRTextureState *t = &(g->texture);
+#ifndef CR_STATE_NO_TEXTURE_IMAGE_STORE
     CRClientState *c = &(g->client);
+#endif
     CRTextureObj *tobj = NULL;
     CRTextureLevel *tl = NULL;
@@ -864 +872 @@
     CRContext *g = GetCurrentContext();
     CRTextureState *t = &(g->texture);
+#ifndef CR_STATE_NO_TEXTURE_IMAGE_STORE
     CRClientState *c = &(g->client);
+#endif
     CRTextureObj *tobj = NULL;
     CRTextureLevel *tl = NULL;
     CRStateBits *sb = GetCurrentBits();
     CRTextureBits *tb = &(sb->texture);
+    (void)pixels;
 
     FLUSH();
@@ -959 +970 @@
     CRContext *g = GetCurrentContext();
     CRTextureState *t = &(g->texture);
+#ifndef CR_STATE_NO_TEXTURE_IMAGE_STORE
     CRClientState *c = &(g->client);
+#endif
     CRStateBits *sb = GetCurrentBits();
     CRTextureBits *tb = &(sb->texture);
@@ -965 +978 @@
     CRTextureObj *tobj = unit->currentTexture1D;
     CRTextureLevel *tl = tobj->level[0] + level;
+    (void)format; (void)type; (void)pixels;
 
     FLUSH();
@@ -1010 +1024 @@
 {
     CRContext *g = GetCurrentContext();
-    CRClientState *c = &(g->client);
     CRStateBits *sb = GetCurrentBits();
     CRTextureBits *tb = &(sb->texture);
     CRTextureObj *tobj;
     CRTextureLevel *tl;
+#ifndef CR_STATE_NO_TEXTURE_IMAGE_STORE
+    CRClientState *c = &(g->client);
     GLubyte *subimg = NULL;
     GLubyte *img = NULL;
-#ifndef CR_STATE_NO_TEXTURE_IMAGE_STORE
     GLubyte *src;
     int i;
 #endif
+    (void)format; (void)type; (void)pixels;
 
     FLUSH();
@@ -1105 +1120 @@
     CRContext *g = GetCurrentContext();
     CRTextureState *t = &(g->texture);
-    CRClientState *c = &(g->client);
     CRStateBits *sb = GetCurrentBits();
     CRTextureBits *tb = &(sb->texture);
@@ -1111 +1125 @@
     CRTextureObj *tobj = unit->currentTexture3D;
     CRTextureLevel *tl = tobj->level[0] + level;
+#ifndef CR_STATE_NO_TEXTURE_IMAGE_STORE
+    CRClientState *c = &(g->client);
     GLubyte *subimg = NULL;
     GLubyte *img = NULL;
-#ifndef CR_STATE_NO_TEXTURE_IMAGE_STORE
     GLubyte *src;
     int i;
 #endif
+    (void)format; (void)type; (void)pixels;
 
     FLUSH();
@@ -1191 +1207 @@
     CRStateBits *sb = GetCurrentBits();
     CRTextureBits *tb = &(sb->texture);
+    (void)data;
 
     FLUSH();
@@ -1271 +1288 @@
     CRStateBits *sb = GetCurrentBits();
     CRTextureBits *tb = &(sb->texture);
+    (void)data;
 
     FLUSH();
@@ -1352 +1370 @@
     CRStateBits *sb = GetCurrentBits();
     CRTextureBits *tb = &(sb->texture);
+    (void)data;
 
     FLUSH();
@@ -1433 +1452 @@
     CRTextureObj *tobj = unit->currentTexture1D;
     CRTextureLevel *tl = tobj->level[0] + level;
+    (void)format; (void)imageSize; (void)data;
 
     FLUSH();
@@ -1490 +1510 @@
     CRTextureObj *tobj = unit->currentTexture2D;
     CRTextureLevel *tl = tobj->level[0] + level;
+    (void)format; (void)imageSize; (void)data;
 
     FLUSH();
@@ -1552 +1573 @@
     CRTextureObj *tobj = unit->currentTexture3D;
     CRTextureLevel *tl = tobj->level[0] + level;
+    (void)format; (void)imageSize; (void)data;
 
     FLUSH();
@@ -1648 +1670 @@
 {
     CRContext *g = GetCurrentContext();
+#ifndef CR_STATE_NO_TEXTURE_IMAGE_STORE
     CRClientState *c = &(g->client);
+#endif
     CRTextureObj *tobj;
     CRTextureLevel *tl;

trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_texture.c

@@ -622 +622 @@
 {
     GLint i;
+    (void)g;
     for (i = 0; i < n; i++)
     {
@@ -3390 +3391 @@
     if (tobj)
     {
-//        crDebug("tex id(%d), hwid(%d)", tobj->id, tobj->hwid);
+/*        crDebug("tex id(%d), hwid(%d)", tobj->id, tobj->hwid);*/
     }
 #endif
@@ -3407 +3408 @@
         CRASSERT(diff_api.GenTextures);
         diff_api.GenTextures(1, &tobj->hwid);
-#if 0 //def DEBUG_misha
+#if 0 /*def DEBUG_misha*/
         crDebug("tex id(%d), hwid(%d)", tobj->id, tobj->hwid);
 #endif

trunk/src/VBox/GuestHost/OpenGL/util/blitter.cpp

@@ -82 +82 @@
 
     RTRECT Intersection;
-    const RTPOINT ZeroPoint = {0, 0};
+    /*const RTPOINT ZeroPoint = {0, 0}; - unused */
 
     for (uint32_t i = 0; i < cRects; ++i)
@@ -573 +573 @@
 DECLINLINE(GLint*) crBltVtRectTF(const RTRECT *pRect, uint32_t normalX, uint32_t normalY, GLint* pBuff, uint32_t height)
 {
+    (void)normalX; (void)normalY;
+
     /* xLeft yTop */
     pBuff[0] = pRect->xLeft;
@@ -1115 +1117 @@
 VBOXBLITTERDECL(int) CrBltImgGetMural(PCR_BLITTER pBlitter, bool fBb, CR_BLITTER_IMG *pDst)
 {
+    (void)fBb; (void)pDst;
     if (!CrBltIsEntered(pBlitter))
     {
@@ -2030 +2033 @@
     }
 
-    Assert(width == pScaledCache->Tex.width);
-    Assert(height == pScaledCache->Tex.height);
+    Assert(width == (uint32_t)pScaledCache->Tex.width);
+    Assert(height == (uint32_t)pScaledCache->Tex.height);
 
     if (!pScaledCache->Flags.DataValid)
@@ -2057 +2060 @@
 VBOXBLITTERDECL(int) CrTdBltDataAcquireScaled(PCR_TEXDATA pTex, GLenum enmFormat, bool fInverted, uint32_t width, uint32_t height, const CR_BLITTER_IMG**ppImg)
 {
-    if (pTex->Tex.width == width && pTex->Tex.height == height)
+    if ((uint32_t)pTex->Tex.width == width && (uint32_t)pTex->Tex.height == height)
         return CrTdBltDataAcquire(pTex, enmFormat, fInverted, ppImg);
 

trunk/src/VBox/GuestHost/OpenGL/util/bufpool.c

@@ -115 +115 @@
         /* check that the buffer to push isn't already in the pool! */
         {
-            const Buffer *b;
-            for (b = pool->head; b; b = b->next) {
-                CRASSERT(b->address != buf);
+            const Buffer *bd;
+            for (bd = pool->head; bd; bd = bd->next) {
+                CRASSERT(bd->address != buf);
             }
         }

trunk/src/VBox/GuestHost/OpenGL/util/compositor.cpp

@@ -105 +105 @@
 {
     uint32_t* pCounter = (uint32_t*)pvVisitor;
+    (void)pCompositor; (void)pEntry;
+
     Assert(VBoxVrListRectsCount(&pEntry->Vr));
     *pCounter += VBoxVrListRectsCount(&pEntry->Vr);
@@ -495 +497 @@
                                                   CR_TEXDATA *pTex)
 {
+    (void)pCompositor;
+
     if (pEntry->pTex == pTex)
         return VINF_SUCCESS;

trunk/src/VBox/GuestHost/OpenGL/util/devnull.c

@@ -82 +82 @@
         (void) conn;
         (void) port;
+        (void) hostname;
 }
 

trunk/src/VBox/GuestHost/OpenGL/util/dll.c

@@ -228 +228 @@
         return NULL;
     }
-# endif // CR_NO_GL_SYSTEM_PATH
+# endif /* CR_NO_GL_SYSTEM_PATH */
 #endif
 
@@ -328 +328 @@
 
 #elif defined(IRIX) || defined(IRIX64) || defined(Linux) || defined(FreeBSD) || defined(AIX) || defined(SunOS) || defined(OSF1)
-        return (CRDLLFunc) dlsym( dll->hinstLib, symname );
+        return (CRDLLFunc)(uintptr_t)dlsym( dll->hinstLib, symname );
 #else
 #error CR DLL ARCHITETECTURE

trunk/src/VBox/GuestHost/OpenGL/util/error.c

@@ -33 +33 @@
 # include "VBox/VBoxGuestLib.h"
 # include "iprt/initterm.h"
+#else
+# include "cr_error.h"
 #endif
 
@@ -77 +79 @@
 }
 
+#ifdef WINDOWS
 static void logMessage(const char *pszPrefix, const char *pszFormat, ...)
 {
@@ -85 +88 @@
     va_end(va);
 }
+#endif
 
 DECLEXPORT(void) crError(const char *pszFormat, ...)

trunk/src/VBox/GuestHost/OpenGL/util/filenet.c

@@ -92 +92 @@
 crFileAccept( CRConnection *conn, const char *hostname, unsigned short port )
 {
+        (void)hostname;
         conn->file_direction = CR_FILE_READ;
         conn->fd = open( conn->filename, O_RDONLY | O_BINARY );

trunk/src/VBox/GuestHost/OpenGL/util/hash.c

@@ -274 +274 @@
     }
 
-//    Assert(id != 2);
+/*    Assert(id != 2);*/
 
     RTListForEachSafe(&pool->freeList, f, next, FreeElem, Node)

trunk/src/VBox/GuestHost/OpenGL/util/list.c

@@ -312 +312 @@
 }
 
-#endif // CR_TESTING_LIST
+#endif /* CR_TESTING_LIST */

trunk/src/VBox/GuestHost/OpenGL/util/net.c

@@ -388 +388 @@
         conn->hostname = crStrdup( filename );
 
-    /* call the protocol-specific init routines */  // ktd (add)
+    /* call the protocol-specific init routines */  /* ktd (add) */
     InitConnection(conn, protocol_only, mtu
 #if defined(VBOX_WITH_CRHGSMI) && defined(IN_GUEST)
                 , NULL
 #endif
-            );       // ktd (add)
+            );       /* ktd (add) */
     }
     else {
@@ -513 +513 @@
 
 /* Free up stuff */
-void crNetTearDown()
+void crNetTearDown(void)
 {
     CRNetReceiveFuncList *rfl;
@@ -1274 +1274 @@
 
 #ifdef IN_GUEST
-uint32_t crNetHostCapsGet()
+uint32_t crNetHostCapsGet(void)
 {
 #ifdef VBOX_WITH_HGCM
@@ -1294 +1294 @@
 #if defined(VBOX_WITH_CRHGSMI) && defined(IN_GUEST)
         CRConnection *conn
+#else
+        void
 #endif
         )
@@ -1363 +1365 @@
 crNetSetContextRange( int low_context, int high_context )
 {
+#if !defined(TEAC_SUPPORT) && !defined(TCSCOMM_SUPPORT)
+    (void)low_context; (void)high_context;
+#endif
 #ifdef TEAC_SUPPORT
     crTeacSetContextRange( low_context, high_context );
@@ -1377 +1382 @@
 crNetSetNodeRange( const char *low_node, const char *high_node )
 {
+#if !defined(TEAC_SUPPORT) && !defined(TCSCOMM_SUPPORT)
+    (void)low_node; (void)high_node;
+#endif
 #ifdef TEAC_SUPPORT
     crTeacSetNodeRange( low_node, high_node );
@@ -1393 +1401 @@
 #ifdef TEAC_SUPPORT
     crTeacSetKey( key, keyLength );
-#endif
-}
+#else
+    (void)key; (void)keyLength;
+#endif
+}

trunk/src/VBox/GuestHost/OpenGL/util/net_internals.h

@@ -100 +100 @@
 #if defined(VBOX_WITH_CRHGSMI) && defined(IN_GUEST)
         CRConnection *conn
+#else
+        void
 #endif
         );
 #ifdef IN_GUEST
-extern uint32_t crVBoxHGCMHostCapsGet();
+extern uint32_t crVBoxHGCMHostCapsGet(void);
 #endif
 extern CRConnection** crVBoxHGCMDump( int *num );

trunk/src/VBox/GuestHost/OpenGL/util/pixel.c

@@ -1596 +1596 @@
             }
             else
-                //crDebug("Sending texture, BytesPerRow!=RowStrideBytes");
+                /*crDebug("Sending texture, BytesPerRow!=RowStrideBytes");*/
                 for (i = 0; i < height; i++)
                 {

trunk/src/VBox/GuestHost/OpenGL/util/process.c

@@ -229 +229 @@
 {
 #ifdef WINDOWS 
-  //return _getpid();
+  /*return _getpid();*/
   return GetCurrentProcess();
 #else

trunk/src/VBox/GuestHost/OpenGL/util/tcpip.c

@@ -519 +519 @@
     char            host[NI_MAXHOST];
 #endif
+    (void)hostname;
 
     cr_tcpip.server_sock = CreateListeningSocket(port);
@@ -1278 +1279 @@
         if ( conn->tcp_socket < 0 )
         {
-            int err = crTCPIPErrno( );
-            if (err != EAFNOSUPPORT)
-                crWarning( "socket error: %s, trying another way", crTCPIPErrorString( err ) );
+            int err2 = crTCPIPErrno( );
+            if (err2 != EAFNOSUPPORT)
+                crWarning( "socket error: %s, trying another way", crTCPIPErrorString( err2 ) );
             cur=cur->ai_next;
             continue;

trunk/src/VBox/GuestHost/OpenGL/util/udptcpip.c

@@ -521 +521 @@
                 else if ( FD_ISSET(conn->udp_socket, &read_fds ) )
                 {
-                        CRTCPIPBuffer *buf = ((CRTCPIPBuffer *) crTCPIPAlloc( conn )) - 1;
-                        unsigned int *seq = ((unsigned int *) (buf + 1)) - 1;
-                        int len;
+                        unsigned int *seq;
+                        buf = ((CRTCPIPBuffer *) crTCPIPAlloc( conn )) - 1;
+                        seq = ((unsigned int *) (buf + 1)) - 1;
 
                         len = recv( conn->udp_socket, (void *)seq,

trunk/src/VBox/GuestHost/OpenGL/util/vboxhgcm.c

@@ -64 +64 @@
 #define CRASSERT Assert
 #endif
-//#define IN_GUEST
-//#if defined(IN_GUEST)
-//#define VBOX_WITH_CRHGSMIPROFILE
-//#endif
+/*#define IN_GUEST
+#if defined(IN_GUEST)
+#define VBOX_WITH_CRHGSMIPROFILE
+#endif */
 #ifdef VBOX_WITH_CRHGSMIPROFILE
 #include <iprt/time.h>
@@ -101 +101 @@
 {
     uint64_t cStartTime;
-//    bool bDisable;
+/*    bool bDisable;*/
 } VBOXCRHGSMIPROFILE_SCOPE, *PVBOXCRHGSMIPROFILE_SCOPE;
 
@@ -131 +131 @@
 DECLINLINE(void) vboxCrHgsmiProfileScopeEnter(PVBOXCRHGSMIPROFILE_SCOPE pScope)
 {
-//    pScope->bDisable = false;
+/*    pScope->bDisable = false; */
     pScope->cStartTime = VBOXCRHGSMIPROFILE_GET_TIME_NANO();
 }
@@ -137 +137 @@
 DECLINLINE(void) vboxCrHgsmiProfileScopeExit(PVBOXCRHGSMIPROFILE_SCOPE pScope)
 {
-//    if (!pScope->bDisable)
+/*    if (!pScope->bDisable) */
     {
         uint64_t cTime = VBOXCRHGSMIPROFILE_GET_TIME_NANO();
@@ -522 +522 @@
     pSubm->fFlags.Value = 0;
     pSubm->fFlags.bDoNotRetire = 1;
-//    pSubm->fFlags.bDoNotSignalCompletion = 1; /* <- we do not need that actually since
-//                                                       * in case we want completion,
-//                                                       * we will block in _crVBoxHGSMICmdBufferGetRc (when locking the buffer)
-//                                                       * which is needed for getting the result */
+# if 0
+    pSubm->fFlags.bDoNotSignalCompletion = 1; /* <- we do not need that actually since
+                                               * in case we want completion,
+                                               * we will block in _crVBoxHGSMICmdBufferGetRc (when locking the buffer)
+                                               * which is needed for getting the result */
+# endif
 }
 #endif
@@ -549 +551 @@
 #endif
 
+#ifndef IN_GUEST
 /*@todo get rid of it*/
 static bool _crVBoxHGCMWriteBytes(CRConnection *conn, const void *buf, uint32_t len)
@@ -576 +579 @@
     return TRUE;
 }
+#endif
 
 /**
@@ -588 +592 @@
 {
 #ifdef IN_GUEST
-# if defined(VBOX_WITH_CRHGSMI)
+# ifndef VBOX_WITH_CRHGSMI
+    RT_NOREF(conn);
+# else
     PCRVBOXHGSMI_CLIENT pClient = g_crvboxhgcm.bHgsmiOn ? _crVBoxHGSMIClientGet(conn) : NULL;
     if (pClient)
@@ -681 +687 @@
 # endif /*#ifdef RT_OS_WINDOWS*/
     }
-#else /*#ifdef IN_GUEST*/
+
+#else  /* IN_GUEST */
+    RT_NOREF(conn, pvData, cbData);
     crError("crVBoxHGCMCall called on host side!");
     CRASSERT(FALSE);
     return VERR_NOT_SUPPORTED;
-#endif
+#endif /* IN_GUEST */
 }
 
@@ -805 +813 @@
     CRVBOXHGCMREAD parms;
     int rc;
+    RT_NOREF(buf, len);
 
     parms.hdr.result      = VERR_WRONG_ORDER;
@@ -811 +820 @@
     parms.hdr.cParms      = SHCRGL_CPARMS_READ;
 
-    CRASSERT(!conn->pBuffer); //make sure there's no data to process
+    CRASSERT(!conn->pBuffer); /* make sure there's no data to process */
     parms.pBuffer.type                   = VMMDevHGCMParmType_LinAddr_Out;
     parms.pBuffer.u.Pointer.size         = conn->cbHostBufferAllocated;
@@ -829 +838 @@
     if (parms.cbBuffer.u.value32)
     {
-        //conn->pBuffer  = (uint8_t*) parms.pBuffer.u.Pointer.u.linearAddr;
+        /*conn->pBuffer  = (uint8_t*) parms.pBuffer.u.Pointer.u.linearAddr; */
         conn->pBuffer  = conn->pHostBuffer;
         conn->cbBuffer = parms.cbBuffer.u.value32;
@@ -858 +867 @@
     parms.pBuffer.u.Pointer.u.linearAddr = (uintptr_t) buf;
 
-    CRASSERT(!conn->pBuffer); //make sure there's no data to process
+    CRASSERT(!conn->pBuffer); /*make sure there's no data to process*/
     parms.pWriteback.type                   = VMMDevHGCMParmType_LinAddr_Out;
     parms.pWriteback.u.Pointer.size         = conn->cbHostBufferAllocated;
@@ -965 +974 @@
     if (parms.cbWriteback.u.value32)
     {
-        //conn->pBuffer  = (uint8_t*) parms.pWriteback.u.Pointer.u.linearAddr;
+        /*conn->pBuffer  = (uint8_t*) parms.pWriteback.u.Pointer.u.linearAddr;*/
         conn->pBuffer  = conn->pHostBuffer;
         conn->cbBuffer = parms.cbWriteback.u.value32;
@@ -987 +996 @@
     {
 #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);
@@ -1107 +1116 @@
 #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.
@@ -1154 +1163 @@
     if (conn->allow_redir_ptr)
     {
-#endif //IN_GUEST
+#endif
         CRASSERT(conn->buffer_size >= sizeof(CRMessageRedirPtr));
 
@@ -1204 +1213 @@
         cached_type = msg->header.type;
     }
-#endif //IN_GUEST
+#endif /* !IN_GUEST*/
 
     conn->recv_credits     -= len;
@@ -1242 +1251 @@
 static void crVBoxHGCMAccept( CRConnection *conn, const char *hostname, unsigned short port )
 {
+    RT_NOREF(hostname, port);
     VBOXCRHGSMIPROFILE_FUNC_PROLOGUE();
     CRASSERT(conn && conn->pHostBuffer);
@@ -1254 +1264 @@
     CRVBOXHGCMSETVERSION parms;
     int rc;
+    RT_NOREF(vMajor, vMinor);
 
     parms.hdr.result      = VERR_WRONG_ORDER;
@@ -1616 +1627 @@
 static void crVBoxHGCMHandleNewMessage( CRConnection *conn, CRMessage *msg, unsigned int len )
 {
+    RT_NOREF(conn, msg, len);
     VBOXCRHGSMIPROFILE_FUNC_PROLOGUE();
     CRASSERT(FALSE);
@@ -1763 +1775 @@
     parms->hdr.u32ClientID = conn->u32ClientID;
     parms->hdr.u32Function = SHCRGL_GUEST_FN_READ;
-//    parms->hdr.u32Reserved = 0;
-
-    CRASSERT(!conn->pBuffer); //make sure there's no data to process
+/*    parms->hdr.u32Reserved = 0;*/
+
+    CRASSERT(!conn->pBuffer); /* make sure there's no data to process */
     parms->iBuffer = 1;
     parms->cbBuffer = 0;
@@ -1838 +1850 @@
     PVBOXUHGSMI_BUFFER pBuf = NULL;
     VBOXUHGSMI_BUFFER_LOCK_FLAGS fFlags;
-//    uint32_t cbBuffer;
+/*    uint32_t cbBuffer;*/
 
     parms->hdr.result      = VERR_WRONG_ORDER;
     parms->hdr.u32ClientID = conn->u32ClientID;
     parms->hdr.u32Function = SHCRGL_GUEST_FN_WRITE_READ;
-//    parms->hdr.u32Reserved = 0;
+/*    parms->hdr.u32Reserved = 0;*/
 
     parms->iBuffer = 1;
 
-    CRASSERT(!conn->pBuffer); //make sure there's no data to process
+    CRASSERT(!conn->pBuffer); /* make sure there's no data to process */
     parms->iWriteback = 2;
     parms->cbWriteback = 0;
@@ -2016 +2028 @@
         parms->hdr.u32ClientID = conn->u32ClientID;
         parms->hdr.u32Function = SHCRGL_GUEST_FN_INJECT;
-//        parms->hdr.u32Reserved = 0;
+/*        parms->hdr.u32Reserved = 0;*/
 
         parms->u32ClientID = conn->u32InjectClientID;
@@ -2050 +2062 @@
         parms->hdr.u32ClientID = conn->u32ClientID;
         parms->hdr.u32Function = SHCRGL_GUEST_FN_WRITE;
-//        parms->hdr.u32Reserved = 0;
+/*        parms->hdr.u32Reserved = 0; */
 
         parms->iBuffer = 1;
@@ -2100 +2112 @@
         {
 #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);
@@ -2399 +2411 @@
 
 /* Callback function used to free buffer pool entries */
-void crVBoxHGCMBufferFree(void *data)
+static void crVBoxHGCMBufferFree(void *data)
 {
     CRVBOXHGCMBUFFER *hgcm_buffer = (CRVBOXHGCMBUFFER *) data;
@@ -2528 +2540 @@
     conn->allow_redir_ptr = 1;
 
-    //@todo remove this crap at all later
+    /** @todo remove this crap at all later */
     conn->cbHostBufferAllocated = 2*1024;
     conn->pHostBuffer = (uint8_t*) crAlloc(conn->cbHostBufferAllocated);
@@ -2564 +2576 @@
 
 #if defined(IN_GUEST)
-void _crVBoxHGCMPerformPollHost(CRConnection *conn)
+static void _crVBoxHGCMPerformPollHost(CRConnection *conn)
 {
     if (conn->type == CR_NO_CONNECTION )
@@ -2586 +2598 @@
 #endif
 
-void _crVBoxHGCMPerformReceiveMessage(CRConnection *conn)
+static void _crVBoxHGCMPerformReceiveMessage(CRConnection *conn)
 {
     if ( conn->type == CR_NO_CONNECTION )
@@ -2598 +2610 @@
 
 #ifdef IN_GUEST
-uint32_t crVBoxHGCMHostCapsGet()
+uint32_t crVBoxHGCMHostCapsGet(void)
 {
     Assert(g_crvboxhgcm.fHostCapsInitialized);
@@ -2608 +2620 @@
 #if defined(VBOX_WITH_CRHGSMI) && defined(IN_GUEST)
         CRConnection *conn
+#else
+        void
 #endif
         )

trunk/src/VBox/GuestHost/OpenGL/util/vreg.cpp

@@ -401 +401 @@
 }
 
+#if 0 /* unused */
 /**
  * @returns Entry to be iterated next. ListHead is returned to break the
@@ -435 +436 @@
     }
 }
+#endif /* unused */
 
 static void vboxVrListJoinRectsHV(PVBOXVR_LIST pList, bool fHorizontal)
@@ -712 +714 @@
 }
 
+#if 0 /* unused */
+
 static DECLCALLBACK(PRTLISTNODE) vboxVrListIntersectNoJoinNonintersectedCb(PVBOXVR_LIST pList1, PVBOXVR_REG pReg1, void *pvContext)
 {
@@ -730 +734 @@
 }
 
-#if 0 /* unused */
 static DECLCALLBACK(PRTLISTNODE) vboxVrListIntersectNoJoinIntersectedCb(PVBOXVR_LIST pList1, PVBOXVR_REG pReg1, PCRTRECT pRect2,
                                                                         void *pvContext, PPRTLISTNODE ppNext)
@@ -755 +758 @@
     return &pReg1->ListEntry;
 }
-#endif
+
+#endif /* unused */
 
 static int vboxVrListIntersectNoJoin(PVBOXVR_LIST pList, PCVBOXVR_LIST pList2, bool *pfChanged)