Changeset 78263 in vbox

Timestamp:

Apr 23, 2019 6:41:06 PM (5 years ago)

Author:

vboxsync

Message:

Config.kmk,GuestHost\OpenGL,HostServices\SharedOpenGL: Fix a bunch of compiler warnings and enable them again

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• src/VBox/GuestHost/OpenGL/include/cr_spu.h (modified) (1 diff)
• src/VBox/GuestHost/OpenGL/include/cr_unpack.h (modified) (1 diff)
• src/VBox/GuestHost/OpenGL/spu_loader/choosevisual.c (modified) (1 diff)
• src/VBox/GuestHost/OpenGL/state_tracker/state_client.c (modified) (3 diffs)
• src/VBox/GuestHost/OpenGL/state_tracker/state_glsl.c (modified) (2 diffs)
• src/VBox/GuestHost/OpenGL/state_tracker/state_init.c (modified) (1 diff)
• src/VBox/GuestHost/OpenGL/state_tracker/state_lists.c (modified) (3 diffs)
• src/VBox/GuestHost/OpenGL/state_tracker/state_snapshot.c (modified) (2 diffs)
• src/VBox/GuestHost/OpenGL/state_tracker/state_transform.c (modified) (3 diffs)
• src/VBox/GuestHost/OpenGL/util/vboxhgcm.c (modified) (1 diff)
• src/VBox/HostServices/SharedOpenGL/crserver/crservice.cpp (modified) (1 diff)
• src/VBox/HostServices/SharedOpenGL/crserverlib/presenter/display_base.cpp (modified) (12 diffs)
• src/VBox/HostServices/SharedOpenGL/crserverlib/presenter/display_window.cpp (modified) (3 diffs)
• src/VBox/HostServices/SharedOpenGL/crserverlib/presenter/display_window_rootvr.cpp (modified) (2 diffs)
• src/VBox/HostServices/SharedOpenGL/crserverlib/presenter/server_presenter.cpp (modified) (12 diffs)
• src/VBox/HostServices/SharedOpenGL/crserverlib/server.h (modified) (1 diff)
• src/VBox/HostServices/SharedOpenGL/crserverlib/server_boundsinfo.cpp (modified) (1 diff)
• src/VBox/HostServices/SharedOpenGL/crserverlib/server_bufferobject.cpp (modified) (3 diffs)
• src/VBox/HostServices/SharedOpenGL/crserverlib/server_clear.cpp (modified) (1 diff)
• src/VBox/HostServices/SharedOpenGL/crserverlib/server_context.cpp (modified) (3 diffs)
• src/VBox/HostServices/SharedOpenGL/crserverlib/server_getpointer.cpp (modified) (2 diffs)
• src/VBox/HostServices/SharedOpenGL/crserverlib/server_getshaders.cpp (modified) (10 diffs)
• src/VBox/HostServices/SharedOpenGL/crserverlib/server_main.cpp (modified) (22 diffs)
• src/VBox/HostServices/SharedOpenGL/crserverlib/server_misc.cpp (modified) (5 diffs)
• src/VBox/HostServices/SharedOpenGL/crserverlib/server_muralfbo.cpp (modified) (5 diffs)
• src/VBox/HostServices/SharedOpenGL/crserverlib/server_projmatrix.cpp (modified) (3 diffs)
• src/VBox/HostServices/SharedOpenGL/crserverlib/server_rpw.cpp (modified) (3 diffs)
• src/VBox/HostServices/SharedOpenGL/crserverlib/server_stream.cpp (modified) (1 diff)
• src/VBox/HostServices/SharedOpenGL/crserverlib/server_viewport.cpp (modified) (3 diffs)
• src/VBox/HostServices/SharedOpenGL/crserverlib/server_window.cpp (modified) (3 diffs)
• src/VBox/HostServices/SharedOpenGL/render/renderspu.c (modified) (7 diffs)
• src/VBox/HostServices/SharedOpenGL/render/renderspu.h (modified) (3 diffs)
• src/VBox/HostServices/SharedOpenGL/render/renderspu_init.c (modified) (2 diffs)
• src/VBox/HostServices/SharedOpenGL/render/renderspu_wgl.c (modified) (15 diffs)
• src/VBox/HostServices/SharedOpenGL/unpacker/unpack_program.cpp (modified) (1 diff)

trunk/Config.kmk

@@ -7349 +7349 @@
  TEMPLATE_VBOXCROGLR3HOSTDLL_OBJCFLAGS       = $(TEMPLATE_VBOXR3NP_OBJCFLAGS) -Wno-deprecated-declarations
 else ifeq ($(KBUILD_TARGET),win)
- #   -wd4255: cr_spu.h(146) : warning C4255: 'wglGetCurrentContextFunc_t' : no function prototype given: converting '()' to '(void)'
- #   -wd4296: udptcpip.c(662) : warning C4296: '>=' : expression is always true
- #   -wd4245: udptcpip.c(174) : warning C4245: '=' : conversion from 'int' to 'CRSocket', signed/unsigned mismatch
- #   -wd4668: tcpip.c(961) : warning C4668: 'CRAPPFAKER_SHOULD_DIE' is not defined as a preprocessor macro, replacing with '0' for '#if/#elif'
- #   -wd4005: v7.1\include\sal_supp.h(57) : warning C4005: '__useHeader' : macro redefinition
- #   -wd4057: state_lists.c(196) : warning C4057: 'function' : 'GLint *' differs in indirection to slightly different base types from 'GLenum *'
- #   -wd4389: renderspu.c(750) : warning C4389: '!=' : signed/unsigned mismatch
  #   -wd4054: renderspu_wgl.c(281) : warning C4054: 'type cast' : from function pointer 'HWND (__cdecl *)()' to data pointer 'void *'
  #   -wd4055: renderspu.c(1553) : warning C4055: 'type cast' : from data pointer 'const GLvoid *' to function pointer 'PFNVCRSERVER_CLIENT_CALLOUT'
- #   -wd4312: renderspu_wgl.c(1420) : warning C4312: 'type cast' : conversion from 'GLint' to 'HDC' of greater size [TODO: check this one out]
- #   -wd4305: renderspu_wgl.c(1118) : warning C4305: 'type cast' : truncation from 'uint64_t' to 'void *' [TODO: check this one out]
- #   -wd4306: renderspu_wgl.c(1420) : warning C4306: 'type cast' : conversion from 'GLint' to 'HDC' of greater size [TODO: check this one out]
- #   -wd4189: server_config.c(111) : warning C4189: 'my_rank' : local variable is initialized but not referenced
- #   -wd4100: vboxhgcm.c(1365) : warning C4100: 'conn' : unreferenced formal parameter
  TEMPLATE_VBOXCROGLR3HOSTDLL_CFLAGS          = $(TEMPLATE_$(TEMPLATE_VBOXCROGLR3HOSTDLL_EXTENDS)_CFLAGS) \
-        -wd4255 -wd4296 -wd4245 -wd4668 -wd4005 -wd4057 -wd4389 -wd4054 -wd4055 -wd4312 -wd4305 -wd4306 -wd4189 -wd4100
- TEMPLATE_VBOXCROGLR3HOSTDLL_CXXFLAGS        = $(TEMPLATE_$(TEMPLATE_VBOXCROGLR3HOSTDLL_EXTENDS)_CXXFLAGS) \
-        -wd4245 -wd4389 -wd4189 -wd4100
+  -wd4055
 endif
 

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

@@ -114 +114 @@
 typedef int (WGL_APIENTRY *wglDescribePixelFormatFunc_t)(HDC, int, UINT, CONST PIXELFORMATDESCRIPTOR *);
 typedef int (WGL_APIENTRY *wglSetPixelFormatFunc_t)(HDC, int, CONST PIXELFORMATDESCRIPTOR *);
-typedef HGLRC (WGL_APIENTRY *wglGetCurrentContextFunc_t)();
-typedef PROC (WGL_APIENTRY *wglGetProcAddressFunc_t)();
+typedef HGLRC (WGL_APIENTRY *wglGetCurrentContextFunc_t)(void);
+typedef PROC (WGL_APIENTRY *wglGetProcAddressFunc_t)(LPCSTR Arg1);
 typedef BOOL (WGL_APIENTRY *wglChoosePixelFormatEXTFunc_t)(HDC, const int *, const FLOAT *, UINT, int *, UINT *);
 typedef BOOL (WGL_APIENTRY *wglGetPixelFormatAttribivEXTFunc_t)(HDC, int, int, UINT, int *, int *);
 typedef BOOL (WGL_APIENTRY *wglGetPixelFormatAttribfvEXTFunc_t)(HDC, int, int, UINT, int *, float *);
 typedef const GLubyte *(WGL_APIENTRY *glGetStringFunc_t)( GLenum );
-typedef const GLubyte *(WGL_APIENTRY *wglGetExtensionsStringEXTFunc_t)();
+typedef const GLubyte *(WGL_APIENTRY *wglGetExtensionsStringEXTFunc_t)(void);
 typedef const GLubyte *(WGL_APIENTRY *wglGetExtensionsStringARBFunc_t)(HDC);
 /*@}*/

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

@@ -94 +94 @@
         return; \
     } \
-    size_t int_cbAccessVerified = (a_cbAccess)
+    size_t int_cbAccessVerified = (a_cbAccess); RT_NOREF(int_cbAccessVerified)
 
 #define CHECK_BUFFER_SIZE_STATIC_LAST(a_pState, a_offAccessLast, a_Type) CHECK_BUFFER_SIZE_STATIC(a_pState, (a_offAccessLast) + sizeof( a_Type ))

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

@@ -21 +21 @@
 {
         /* placeholder */
+        RT_NOREF(ws, visBits);
         return 0;
 }

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

@@ -1085 +1085 @@
     unsigned char *base = (unsigned char *) p;
 
+#ifndef IN_GUEST
+    RT_NOREF(fRealPtr);
+#endif
+
     if (g->current.inBeginEnd)
     {
@@ -1579 +1583 @@
 }
 
-void STATE_APIENTRY crStateUnlockArraysEXT()
+void STATE_APIENTRY crStateUnlockArraysEXT(void)
 {
     CRContext *g = GetCurrentContext();
@@ -1728 +1732 @@
             else
             {
-                zvMax = ~0;
+                zvMax = ~UINT32_C(0);
                 break;
             }

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

@@ -1281 +1281 @@
     return result;
 #else
+    RT_NOREF(program, name);
     crWarning("crStateGetUniformLocation called on host side!!");
     return -1;
@@ -1316 +1317 @@
     return result;
 #else
+    RT_NOREF(program, name);
     crWarning("crStateGetAttribLocation called on host side!!");
     return -1;

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

@@ -787 +787 @@
 }
 
-void crStateCleanupCurrent()
+void crStateCleanupCurrent(void)
 {
     crStateSetCurrentEx( NULL, GL_TRUE );

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

@@ -59 +59 @@
 #define CRSTATE_SET_ENABLED(state, cap) CRSTATE_SET_CAP(state, diff_api.IsEnabled(cap), "%u")
 
-#define CRSTATE_SET_ENUM(state, cap) {GLenum _e=g->state; diff_api.GetIntegerv(cap, &_e); CRSTATE_SET_CAP(state, _e, "%#x");}
+#define CRSTATE_SET_ENUM(state, cap) {GLenum _e=g->state; diff_api.GetIntegerv(cap, (GLint *)&_e); CRSTATE_SET_CAP(state, _e, "%#x");}
 #define CRSTATE_SET_FLOAT(state, cap) {GLfloat _f=g->state; diff_api.GetFloatv(cap, &_f); CRSTATE_SET_CAP(state, _f, "%f");}
 #define CRSTATE_SET_INT(state, cap) {GLint _i=g->state; diff_api.GetIntegerv(cap, &_i); CRSTATE_SET_CAP(state, _i, "%i");}
@@ -224 +224 @@
         {
             GLuint buf = 0;
-            diff_api.GetIntegerv(GL_DRAW_BUFFER, &buf);
+            diff_api.GetIntegerv(GL_DRAW_BUFFER, (GLint *)&buf);
 
             if (buf == GL_COLOR_ATTACHMENT0_EXT && (bbFbo || fbFbo))
             {
                 GLuint binding = 0;
-                diff_api.GetIntegerv(GL_DRAW_FRAMEBUFFER_BINDING, &binding);
+                diff_api.GetIntegerv(GL_DRAW_FRAMEBUFFER_BINDING, (GLint *)&binding);
                 if (!binding)
                 {
@@ -257 +257 @@
         {
             GLuint buf = 0;
-            diff_api.GetIntegerv(GL_READ_BUFFER, &buf);
+            diff_api.GetIntegerv(GL_READ_BUFFER, (GLint *)&buf);
 
             if (buf == GL_COLOR_ATTACHMENT0_EXT && (bbFbo || fbFbo))
             {
                 GLuint binding = 0;
-                diff_api.GetIntegerv(GL_READ_FRAMEBUFFER_BINDING, &binding);
+                diff_api.GetIntegerv(GL_READ_FRAMEBUFFER_BINDING, (GLint *)&binding);
                 if (!binding)
                 {

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

@@ -1106 +1106 @@
     int32_t rc;
 
+    RT_NOREF(data1);
+
     rc = SSMR3PutMem(pSSM, &key, sizeof(key));
     CRASSERT(rc == VINF_SUCCESS);
@@ -1809 +1811 @@
 #include "state_bits_globalop.h"
 #undef CRSTATE_BITS_OP
+#else
+    RT_NOREF(pSSM);
 #endif
     return VINF_SUCCESS;

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

@@ -343 +343 @@
 }
 
-void STATE_APIENTRY crStateLoadIdentity() 
+void STATE_APIENTRY crStateLoadIdentity(void) 
 {
     CRContext *g = GetCurrentContext();
@@ -366 +366 @@
 }
 
-void STATE_APIENTRY crStatePopMatrix() 
+void STATE_APIENTRY crStatePopMatrix(void) 
 {
     CRContext *g = GetCurrentContext();
@@ -398 +398 @@
 }
 
-void STATE_APIENTRY crStatePushMatrix() 
+void STATE_APIENTRY crStatePushMatrix(void) 
 {
     CRContext *g = GetCurrentContext();

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

@@ -1354 +1354 @@
 
 #else  /* !IN_GUEST */
+    RT_NOREF(conn);
     crError("crVBoxHGCMDoConnect called on host side!");
     CRASSERT(FALSE);

trunk/src/VBox/HostServices/SharedOpenGL/crserver/crservice.cpp

@@ -1575 +1575 @@
 BOOL WINAPI DllMain(HINSTANCE hDLLInst, DWORD fdwReason, LPVOID lpvReserved)
 {
+    RT_NOREF(hDLLInst);
     (void) lpvReserved;
 

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/presenter/display_base.cpp

@@ -130 +130 @@
 int CrFbDisplayBase::UpdateBegin(struct CR_FRAMEBUFFER *pFb)
 {
+    RT_NOREF(pFb);
+
     ++mcUpdates;
     Assert(!mFlags.fRegionsShanged || mcUpdates > 1);
@@ -138 +140 @@
 void CrFbDisplayBase::UpdateEnd(struct CR_FRAMEBUFFER *pFb)
 {
+    RT_NOREF(pFb);
+
     --mcUpdates;
     Assert(mcUpdates < UINT32_MAX/2);
@@ -147 +151 @@
 int CrFbDisplayBase::EntryCreated(struct CR_FRAMEBUFFER *pFb, HCR_FRAMEBUFFER_ENTRY hEntry)
 {
+    RT_NOREF(pFb, hEntry);
+
     if (!mcUpdates)
     {
@@ -158 +164 @@
 int CrFbDisplayBase::EntryAdded(struct CR_FRAMEBUFFER *pFb, HCR_FRAMEBUFFER_ENTRY hEntry)
 {
+    RT_NOREF(pFb, hEntry);
+
     if (!mcUpdates)
     {
@@ -171 +179 @@
     HCR_FRAMEBUFFER_ENTRY hReplacedEntry)
 {
+    RT_NOREF(pFb, hNewEntry, hReplacedEntry);
+
     if (!mcUpdates)
     {
@@ -182 +192 @@
 int CrFbDisplayBase::EntryTexChanged(struct CR_FRAMEBUFFER *pFb, HCR_FRAMEBUFFER_ENTRY hEntry)
 {
+    RT_NOREF(pFb, hEntry);
+
     if (!mcUpdates)
     {
@@ -193 +205 @@
 int CrFbDisplayBase::EntryRemoved(struct CR_FRAMEBUFFER *pFb, HCR_FRAMEBUFFER_ENTRY hEntry)
 {
+    RT_NOREF(pFb, hEntry);
+
     if (!mcUpdates)
     {
@@ -205 +219 @@
 int CrFbDisplayBase::EntryDestroyed(struct CR_FRAMEBUFFER *pFb, HCR_FRAMEBUFFER_ENTRY hEntry)
 {
+    RT_NOREF(pFb, hEntry);
     return VINF_SUCCESS;
 }
@@ -211 +226 @@
 int CrFbDisplayBase::EntryPosChanged(struct CR_FRAMEBUFFER *pFb, HCR_FRAMEBUFFER_ENTRY hEntry)
 {
+    RT_NOREF(pFb, hEntry);
+
     if (!mcUpdates)
     {
@@ -223 +240 @@
 int CrFbDisplayBase::RegionsChanged(struct CR_FRAMEBUFFER *pFb)
 {
+    RT_NOREF(pFb);
+
     if (!mcUpdates)
     {
@@ -235 +254 @@
 int CrFbDisplayBase::FramebufferChanged(struct CR_FRAMEBUFFER *pFb)
 {
+    RT_NOREF(pFb);
+
     if (!mcUpdates)
     {
@@ -349 +370 @@
 DECLCALLBACK(void) CrFbDisplayBase::slotEntryReleaseCB(HCR_FRAMEBUFFER hFb, HCR_FRAMEBUFFER_ENTRY hEntry, void *pvContext)
 {
+    RT_NOREF(hFb, hEntry, pvContext);
 }
 

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/presenter/display_window.cpp

@@ -22 +22 @@
     mpWindow(NULL),
     mViewportRect(*pViewportRect),
-    mu32Screen(~0),
+    mu32Screen(~UINT32_C(0)),
     mParentId(parentId)
 {
@@ -232 +232 @@
     }
 
-    CrFbWindow * pOld = mpWindow;
     if (mpWindow)
         windowDetach();
@@ -324 +323 @@
     CrFbDisplayBase::onUpdateEnd();
     bool fVisible = isVisible();
-    if (mFlags.fNeVisible != fVisible || mFlags.fNeForce)
+    if (RT_BOOL(mFlags.fNeVisible) != fVisible || mFlags.fNeForce)
     {
         crVBoxServerNotifyEvent(mu32Screen,

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/presenter/display_window_rootvr.cpp

@@ -136 +136 @@
     }
 
-    const VBOXVR_SCR_COMPOSITOR_ENTRY* pSrcEntry = CrFbEntryGetCompositorEntry(hEntry);
     VBOXVR_SCR_COMPOSITOR_ENTRY *pMyEntry = (VBOXVR_SCR_COMPOSITOR_ENTRY*)CrFbDDataEntryGet(hEntry, slotGet());
     CrVrScrCompositorEntryCleanup(pMyEntry);
@@ -322 +321 @@
 void CrFbDisplayWindowRootVr::rootVrTranslateForPos()
 {
-    const RTRECT *pRect = getViewportRect();
     const struct VBVAINFOSCREEN* pScreen = CrFbGetScreenInfo(getFramebuffer());
     int32_t x = pScreen->i32OriginX;

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/presenter/server_presenter.cpp

@@ -222 +222 @@
     int32_t dstHeight = pDstRect->yBottom - pDstRect->yTop;
 
-    RTPOINT DstPoint = {pDstRect->xLeft, pDstRect->yTop};
     float strX = ((float)dstWidth) / srcWidth;
     float strY = ((float)dstHeight) / srcHeight;
@@ -472 +471 @@
 
     return rc;
+#else
+    RT_NOREF(hFb, pSrcRectSize, pDstRect, cRects, pRects, pImg);
 #endif
 }
@@ -682 +683 @@
 static void crFbBltPutContentsFbVram(HCR_FRAMEBUFFER hFb, const RTPOINT *pPos, uint32_t cRects, const RTRECT *pRects, CR_BLITTER_IMG *pSrc)
 {
-    const RTRECT *pCompRect = CrVrScrCompositorRectGet(&hFb->Compositor);
-
     CR_BLITTER_IMG FbImg;
 
@@ -758 +757 @@
     }
 
-    bool fRegChanged = false;
     for (uint32_t i = 0; i < cCompRects; ++i)
     {
@@ -1268 +1266 @@
 void CrFbEntryAddRef(CR_FRAMEBUFFER *pFb, HCR_FRAMEBUFFER_ENTRY hEntry)
 {
+    RT_NOREF(pFb);
     ++hEntry->cRefs;
 }
@@ -1433 +1432 @@
     }
 
-    bool fChanged = 0;
-    VBOXVR_SCR_COMPOSITOR_ENTRY *pReplacedScrEntry = NULL;
+    bool fChanged = false;
     VBOXVR_SCR_COMPOSITOR_ENTRY *pNewEntry;
     bool fEntryWasInList;
@@ -1868 +1866 @@
         }
     }
+#else
+    RT_NOREF(idScreen);
 #endif
     return VINF_SUCCESS;
@@ -2081 +2081 @@
     CR_FB_INFO *pFbInfo = &g_CrPresenter.aFbInfos[idFb];
     CR_FBDISPLAY_INFO *pDpInfo = &g_CrPresenter.aDisplayInfos[i];
-    if (pDpInfo->iFb != idFb)
+    if (pDpInfo->iFb != (int32_t)idFb)
     {
         WARN(("target not connected"));
@@ -2304 +2304 @@
     CR_FB_INFO *pFbInfo = &g_CrPresenter.aFbInfos[idFb];
     CR_FBDISPLAY_INFO *pDpInfo = &g_CrPresenter.aDisplayInfos[i];
-    if (pDpInfo->iFb == idFb)
+    if (pDpInfo->iFb == (int32_t)idFb)
     {
         WARN(("target not connected"));
@@ -2909 +2909 @@
         if (hFb)
         {
-            Assert(hFb->ScreenInfo.u32ViewIndex == i);
+            Assert(hFb->ScreenInfo.u32ViewIndex == (uint32_t)i);
             rc = SSMR3PutU32(pSSM, hFb->ScreenInfo.u32ViewIndex);
             AssertRCReturn(rc, rc);
@@ -2954 +2954 @@
 int CrFbEntryLoadState(CR_FRAMEBUFFER *pFb, PSSMHANDLE pSSM, uint32_t version)
 {
+    RT_NOREF(version);
+
     uint32_t texture;
     int  rc = SSMR3GetU32(pSSM, &texture);
@@ -2973 +2975 @@
 
     Assert(hEntry);
-
-    const struct VBOXVR_SCR_COMPOSITOR_ENTRY *pEntry = CrFbEntryGetCompositorEntry(hEntry);
-    CR_TEXDATA *pTexData = CrVrScrCompositorEntryTexGet(pEntry);
-    CR_FBTEX *pFbTex = PCR_FBTEX_FROM_TEX(pTexData);
 
     RTPOINT Point;

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server.h

@@ -118 +118 @@
 GLint crServerMuralInit(CRMuralInfo *mural, GLboolean fGuestWindow, GLint visBits, GLint preloadWinID);
 void crServerMuralTerm(CRMuralInfo *mural);
-GLboolean crServerMuralSize(CRMuralInfo *mural, GLint width, GLint height);
+GLboolean crServerMuralSize(CRMuralInfo *mural, GLuint width, GLuint height);
 void crServerMuralPosition(CRMuralInfo *mural, GLint x, GLint y);
 void crServerMuralVisibleRegion( CRMuralInfo *mural, GLint cRects, const GLint *pRects );

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_boundsinfo.cpp

@@ -24 +24 @@
                                                                                                                         GLint len, GLint num_opcodes )
 {
-
+    RT_NOREF(bounds, payload, len, num_opcodes);
 }

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_bufferobject.cpp

@@ -15 +15 @@
 crServerDispatchMapBufferARB( GLenum target, GLenum access )
 {
+    RT_NOREF(target, access);
         return NULL;
 }
@@ -21 +22 @@
 crServerDispatchUnmapBufferARB( GLenum target )
 {
+    RT_NOREF(target);
         return GL_FALSE;
 }
@@ -75 +77 @@
     void *b;
 
+    RT_NOREF(data);
+
     if (size <= 0 || size >= INT32_MAX / 2)
     {

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_clear.cpp

@@ -162 +162 @@
 void SERVER_DISPATCH_APIENTRY crServerDispatchClear( GLenum mask )
 {
-        CRMuralInfo *mural = cr_server.curClient->currentMural;
-        const RunQueue *q = cr_server.run_queue;
-
         if (cr_server.only_swap_once)
         {

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_context.cpp

@@ -181 +181 @@
     CRContext *ctx = (CRContext *) data2;
 
+    RT_NOREF(key);
     CR_STATE_SHAREDOBJ_USAGE_CLEAR(mural, ctx);
 }
@@ -390 +391 @@
     if (mural && mural->fRedirected  && crServerSupportRedirMuralFBO())
     {
-        GLuint id = crServerMuralFBOIdxFromBufferName(mural, ctx->buffer.drawBuffer);
+        GLint id = crServerMuralFBOIdxFromBufferName(mural, ctx->buffer.drawBuffer);
         if (id != mural->iCurDrawBuffer)
         {
@@ -437 +438 @@
     CRMuralInfo *mural;
     CRContextInfo *ctxInfo = NULL;
+
+    RT_NOREF(nativeWindow);
 
     if (context >= 0 && window >= 0) {

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_getpointer.cpp

@@ -20 +20 @@
 {
         crError( "glGetVertexAttribPointervNV isn't *ever* allowed to be on the wire!" );
-        (void) pname;
-        (void) pointer;
+        RT_NOREF(index, pname, pointer);
 }
 
@@ -27 +26 @@
 {
         crError( "glGetVertexAttribPointervNV isn't *ever* allowed to be on the wire!" );
-        (void) pname;
-        (void) pointer;
+        RT_NOREF(index, pname, pointer);
 }
 

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_getshaders.cpp

@@ -37 +37 @@
 void SERVER_DISPATCH_APIENTRY crServerDispatchGetActiveAttrib(GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, char *name)
 {
+    RT_NOREF(name, type, size, length);
+
     crGetActive_t *pLocal = NULL;
 
@@ -57 +59 @@
 void SERVER_DISPATCH_APIENTRY crServerDispatchGetActiveUniform(GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, char *name)
 {
+    RT_NOREF(name, type, size, length);
+
     crGetActive_t *pLocal = NULL;
 
@@ -77 +81 @@
 void SERVER_DISPATCH_APIENTRY crServerDispatchGetAttachedShaders(GLuint program, GLsizei maxCount, GLsizei *count, GLuint *shaders)
 {
+    RT_NOREF(count, shaders);
+
     GLsizei *pLocal = NULL;
 
@@ -106 +112 @@
 void SERVER_DISPATCH_APIENTRY crServerDispatchGetAttachedObjectsARB(VBoxGLhandleARB containerObj, GLsizei maxCount, GLsizei * count, VBoxGLhandleARB * obj)
 {
+    RT_NOREF(count, obj);
+
     GLsizei *pLocal = NULL;
 
@@ -137 +145 @@
 void SERVER_DISPATCH_APIENTRY crServerDispatchGetInfoLogARB(VBoxGLhandleARB obj, GLsizei maxLength, GLsizei * length, GLcharARB * infoLog)
 {
+    RT_NOREF(length, infoLog);
+
     GLsizei *pLocal = NULL;
     GLuint hwid;
@@ -162 +172 @@
 void SERVER_DISPATCH_APIENTRY crServerDispatchGetShaderInfoLog(GLuint shader, GLsizei bufSize, GLsizei *length, char *infoLog)
 {
+    RT_NOREF(length, infoLog);
+
     GLsizei *pLocal = NULL;
 
@@ -182 +194 @@
 void SERVER_DISPATCH_APIENTRY crServerDispatchGetProgramInfoLog(GLuint program, GLsizei bufSize, GLsizei *length, char *infoLog)
 {
+    RT_NOREF(length, infoLog);
+
     GLsizei *pLocal = NULL;
 
@@ -203 +217 @@
 void SERVER_DISPATCH_APIENTRY crServerDispatchGetShaderSource(GLuint shader, GLsizei bufSize, GLsizei *length, char *source)
 {
+    RT_NOREF(length, source);
+
     GLsizei *pLocal = NULL;
 
@@ -287 +303 @@
 void SERVER_DISPATCH_APIENTRY crServerDispatchGetUniformfv(GLuint program, GLint location, GLfloat *params)
 {
+    RT_NOREF(params);
+
     int size = __GetUniformSize(program, location) * sizeof(GLfloat);
     GLfloat *pLocal;
@@ -306 +324 @@
 void SERVER_DISPATCH_APIENTRY crServerDispatchGetUniformiv(GLuint program, GLint location, GLint *params)
 {
+    RT_NOREF(params);
+
     int size = __GetUniformSize(program, location) * sizeof(GLint);
     GLint *pLocal;

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_main.cpp

@@ -647 +647 @@
 extern DECLEXPORT(int32_t) crVBoxServerClientGetCapsLegacy(uint32_t u32ClientID, uint32_t *pu32Caps)
 {
+    RT_NOREF(u32ClientID);
+
     uint32_t u32Caps = cr_server.u32Caps;
     u32Caps &= ~CR_VBOX_CAP_CMDVBVA;
@@ -655 +657 @@
 extern DECLEXPORT(int32_t) crVBoxServerClientGetCapsNew(uint32_t u32ClientID, CR_CAPS_INFO *pInfo)
 {
+    RT_NOREF(u32ClientID);
+
     pInfo->u32Caps = cr_server.u32Caps;
     pInfo->u32CmdVbvaVersion = CR_CMDVBVA_VERSION;
@@ -790 +794 @@
 static void crVBoxServerSyncTextureCB(unsigned long key, void *data1, void *data2)
 {
+    RT_NOREF(key);
+
     CRTextureObj *pTexture = (CRTextureObj *) data1;
     CRContext *pContext = (CRContext *) data2;
@@ -892 +898 @@
 static void crVBoxServerBuildContextUsedWindowMapCB(unsigned long key, void *data1, void *data2)
 {
+    RT_NOREF(key);
+
     CRContextInfo *pContextInfo = (CRContextInfo *)data1;
     PCRVBOX_CTXWND_CTXWALKER_CB pData = (PCRVBOX_CTXWND_CTXWALKER_CB)data2;
@@ -930 +938 @@
 static void crVBoxServerBuildContextUnusedWindowMapCB(unsigned long key, void *data1, void *data2)
 {
+    RT_NOREF(key);
+
     CRContextInfo *pContextInfo = (CRContextInfo *)data1;
     PCRVBOX_CTXWND_CTXWALKER_CB pData = (PCRVBOX_CTXWND_CTXWALKER_CB)data2;
@@ -2198 +2208 @@
             CRClient *pClient = cr_server.clients[i];
             CRClient client;
-            unsigned long ctxID=-1, winID=-1;
+            unsigned long ctxID = (unsigned long)-1, winID = (unsigned long)-1;
 
             rc = crServerLsrDataGetU32(&Reader, &ui);
@@ -2331 +2341 @@
 static void crVBoxServerReparentMuralCB(unsigned long key, void *data1, void *data2)
 {
+    RT_NOREF(key);
+
     CRMuralInfo *pMI = (CRMuralInfo*) data1;
     int *sIndex = (int*) data2;
@@ -2706 +2718 @@
             if (cParams == 1)
             {
-                CRVBOXHGSMIWRITE* pFnCmd = (CRVBOXHGSMIWRITE*)pHdr;
                 const VBOXCMDVBVA_CRCMD_BUFFER *pBuf = &pCmd->aBuffers[1];
                 /* Fetch parameters. */
@@ -2712 +2723 @@
                 uint8_t *pBuffer  = VBOXCRHGSMI_PTR_SAFE(pBuf->offBuffer, cbBuffer, uint8_t);
 
-                if (cbHdr < sizeof (*pFnCmd))
+                if (cbHdr < sizeof (CRVBOXHGSMIWRITE))
                 {
                     WARN(("invalid write cmd buffer size!"));
@@ -2957 +2968 @@
 static DECLCALLBACK(int) crVBoxCrCmdEnable(HVBOXCRCMDSVR hSvr, VBOXCRCMD_SVRENABLE_INFO *pInfo)
 {
+    RT_NOREF(hSvr);
     Assert(!cr_server.fCrCmdEnabled);
     Assert(!cr_server.numClients);
@@ -2973 +2985 @@
 static DECLCALLBACK(int) crVBoxCrCmdDisable(HVBOXCRCMDSVR hSvr)
 {
+    RT_NOREF(hSvr);
     Assert(cr_server.fCrCmdEnabled);
 
@@ -2992 +3005 @@
 static DECLCALLBACK(int) crVBoxCrCmdHostCtl(HVBOXCRCMDSVR hSvr, uint8_t* pCmd, uint32_t cbCmd)
 {
+    RT_NOREF(hSvr);
     return crVBoxServerHostCtl((VBOXCRCMDCTL*)pCmd, cbCmd);
 }
@@ -3075 +3089 @@
      * Toplevel input validation.
      */
+    RT_NOREF(hSvr);
     ASSERT_GUEST_LOGREL_RETURN(cbCmd >= sizeof(VBOXCMDVBVA_3DCTL), VERR_INVALID_PARAMETER);
     {
@@ -3120 +3135 @@
 static DECLCALLBACK(int) crVBoxCrCmdResize(HVBOXCRCMDSVR hSvr, const struct VBVAINFOSCREEN *pScreen, const uint32_t *pTargetMap)
 {
+    RT_NOREF(hSvr);
     CRASSERT(cr_server.fCrCmdEnabled);
     return CrPMgrResize(pScreen, NULL, pTargetMap);
@@ -3152 +3168 @@
 static int crVBoxCrCmdLoadClients(PSSMHANDLE pSSM, uint32_t u32Version)
 {
+    RT_NOREF(u32Version);
+
     uint32_t i;
     uint32_t u32;
@@ -3182 +3200 @@
 static DECLCALLBACK(int) crVBoxCrCmdSaveState(HVBOXCRCMDSVR hSvr, PSSMHANDLE pSSM)
 {
+    RT_NOREF(hSvr);
+
     int rc = VINF_SUCCESS;
 
@@ -3233 +3253 @@
 static DECLCALLBACK(int) crVBoxCrCmdLoadState(HVBOXCRCMDSVR hSvr, PSSMHANDLE pSSM, uint32_t u32Version)
 {
+    RT_NOREF(hSvr);
+
     int rc = VINF_SUCCESS;
 
@@ -3298 +3320 @@
                                            const VBOXCMDVBVA_HDR RT_UNTRUSTED_VOLATILE_GUEST *pCmd, uint32_t cbCmd)
 {
+    RT_NOREF(hSvr);
+
     uint8_t bOpcode = pCmd->u8OpCode;
     RT_UNTRUSTED_NONVOLATILE_COPY_FENCE();
@@ -3359 +3383 @@
 int32_t crVBoxServerCrHgsmiCmd(struct VBOXVDMACMD_CHROMIUM_CMD *pCmd, uint32_t cbCmd)
 {
+    RT_NOREF(cbCmd);
 
     int32_t rc;
@@ -3417 +3442 @@
             if (cParams == 1)
             {
-                CRVBOXHGSMIWRITE* pFnCmd = (CRVBOXHGSMIWRITE*)pHdr;
                 VBOXVDMACMD_CHROMIUM_BUFFER *pBuf = &pCmd->aBuffers[1];
                 /* Fetch parameters. */
@@ -3423 +3447 @@
                 uint8_t *pBuffer  = VBOXCRHGSMI_PTR_SAFE(pBuf->offBuffer, cbBuffer, uint8_t);
 
-                if (cbHdr < sizeof (*pFnCmd))
+                if (cbHdr < sizeof (CRVBOXHGSMIWRITE))
                 {
                     crWarning("invalid write cmd buffer size!");
@@ -3696 +3720 @@
 int32_t crVBoxServerCrHgsmiCtl(struct VBOXVDMACMD_CHROMIUM_CTL *pCtl, uint32_t cbCtl)
 {
+    RT_NOREF(cbCtl);
+
     int rc = VINF_SUCCESS;
 

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_misc.cpp

@@ -24 +24 @@
 void SERVER_DISPATCH_APIENTRY crServerDispatchGetChromiumParametervCR(GLenum target, GLuint index, GLenum type, GLsizei count, GLvoid *values)
 {
+    RT_NOREF(values);
+
     GLubyte local_storage[4096];
     GLint bytes = 0;
@@ -109 +111 @@
 void SERVER_DISPATCH_APIENTRY crServerDispatchChromiumParametervCR(GLenum target, GLenum type, GLsizei count, const GLvoid *values)
 {
-    CRMuralInfo *mural = cr_server.curClient->currentMural;
     static int gather_connect_count = 0;
 
@@ -1974 +1975 @@
             gl->GetProgramivARB(GL_VERTEX_PROGRAM_ARB, GL_PROGRAM_BINDING_ARB, &pid);
 
-            if (pid != ctx->program.currentVertexProgram->id)
+            if ((GLuint)pid != ctx->program.currentVertexProgram->id)
             {
                 crWarning("pid(%d) != ctx->program.currentVertexProgram->id(%d)", pid, ctx->program.currentVertexProgram->id);
             }
-            AssertRelease(pid == ctx->program.currentVertexProgram->id);
+            AssertRelease((GLuint)pid == ctx->program.currentVertexProgram->id);
         }
         else
@@ -1985 +1986 @@
 
             gl->GetIntegerv(GL_VERTEX_PROGRAM_BINDING_NV, &pid);
-            if (pid != ctx->program.currentVertexProgram->id)
+            if ((GLuint)pid != ctx->program.currentVertexProgram->id)
             {
                 crWarning("pid(%d) != ctx->program.currentVertexProgram->id(%d)", pid, ctx->program.currentVertexProgram->id);
             }
-            AssertRelease(pid == ctx->program.currentVertexProgram->id);
+            AssertRelease((GLuint)pid == ctx->program.currentVertexProgram->id);
         }
     }
@@ -1998 +1999 @@
         gl->GetIntegerv(GL_CURRENT_PROGRAM, &pid);
         //crDebug("pid %i, state: id %i, hwid %i", pid, ctx->glsl.activeProgram->id, ctx->glsl.activeProgram->hwid);
-        if (pid != ctx->glsl.activeProgram->hwid)
+        if ((GLuint)pid != ctx->glsl.activeProgram->hwid)
         {
             crWarning("pid(%d) != ctx->glsl.activeProgram->hwid(%d)", pid, ctx->glsl.activeProgram->hwid);
         }
-        AssertRelease(pid == ctx->glsl.activeProgram->hwid);
+        AssertRelease((GLuint)pid == ctx->glsl.activeProgram->hwid);
     }
 #endif

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_muralfbo.cpp

@@ -51 +51 @@
 static void crServerCheckMuralGeometryCB(unsigned long key, void *data1, void *data2)
 {
+    RT_NOREF(key);
+
     CRMuralInfo *pMI = (CRMuralInfo*) data1;
 
@@ -314 +316 @@
 static void crVBoxServerMuralFbCleanCB(unsigned long key, void *data1, void *data2)
 {
+    RT_NOREF(key);
+
     CRMuralInfo *pMI = (CRMuralInfo*) data1;
     HCR_FRAMEBUFFER hFb = (HCR_FRAMEBUFFER)data2;
@@ -330 +334 @@
 static void crVBoxServerMuralFbSetCB(unsigned long key, void *data1, void *data2)
 {
+    RT_NOREF(key);
+
     CRMuralInfo *pMI = (CRMuralInfo*) data1;
     HCR_FRAMEBUFFER hFb = (HCR_FRAMEBUFFER)data2;
@@ -657 +663 @@
 DECLEXPORT(void) crServerVBoxCompositionSetEnableStateGlobal(GLboolean fEnable)
 {
+    RT_NOREF(fEnable);
 }
 
@@ -819 +826 @@
 {
     CRContext *ctx = crStateGetCurrent();
-    GLuint iOldCurDrawBuffer = mural->iCurDrawBuffer;
-    GLuint iOldCurReadBuffer = mural->iCurReadBuffer;
+    GLint iOldCurDrawBuffer = mural->iCurDrawBuffer;
+    GLint iOldCurReadBuffer = mural->iCurReadBuffer;
     mural->iBbBuffer = ((mural->iBbBuffer + 1) % (mural->cBuffers));
     if (mural->iCurDrawBuffer >= 0)

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_projmatrix.cpp

@@ -43 +43 @@
 {
     const GLenum matMode = cr_server.curClient->currentCtxInfo->pContext->transform.matrixMode;
-    const CRMuralInfo *mural = cr_server.curClient->currentMural;
 
     crStateLoadMatrixf( m );
@@ -60 +59 @@
 {
     const GLenum matMode = cr_server.curClient->currentCtxInfo->pContext->transform.matrixMode;
-    const CRMuralInfo *mural = cr_server.curClient->currentMural;
 
     crStateLoadMatrixd( m );
@@ -112 +110 @@
 {
     const GLenum matMode = cr_server.curClient->currentCtxInfo->pContext->transform.matrixMode;
-    const CRMuralInfo *mural = cr_server.curClient->currentMural;
 
     crStateLoadIdentity();

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_rpw.cpp

@@ -122 +122 @@
 static DECLCALLBACK(int) crServerRpwWorkerThread(RTTHREAD ThreadSelf, void *pvUser)
 {
+    RT_NOREF(ThreadSelf);
+
     CR_SERVER_RPW *pWorker = (CR_SERVER_RPW *)pvUser;
     RTMSINTERVAL cWaitMillis = RT_INDEFINITE_WAIT;
@@ -273 +275 @@
 static int crServerRpwCtlNotify(CR_SERVER_RPW *pWorker, CR_SERVER_RPW_ENTRY *pEntry)
 {
+    RT_NOREF(pEntry);
+
     int rc = RTSemEventSignal(pWorker->hSubmitEvent);
     if (RT_SUCCESS(rc))
@@ -440 +444 @@
 int crServerRpwEntryResizeCleaned(CR_SERVER_RPW *pWorker, CR_SERVER_RPW_ENTRY *pEntry, uint32_t width, uint32_t height)
 {
+    RT_NOREF(pWorker);
+
     CRContext *pContext;
     if (!width || !height)

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_stream.cpp

@@ -930 +930 @@
 crServerRecv( CRConnection *conn, CRMessage *msg, unsigned int len )
 {
+    RT_NOREF(conn);
+
     CRMessage *pRealMsg;
     (void) len;

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_viewport.cpp

@@ -183 +183 @@
         }
         mural->viewportValidated = GL_TRUE;
+#else
+        RT_NOREF(v, mural);
 #endif
 }
@@ -221 +223 @@
                 crServerApplyBaseProjection(&(extent->baseProjection));
                 cr_server.currentSerialNo = extent->serialNo;
-        }               
+        }
+#else
+        RT_NOREF(mural, extNum);
 #endif
 }
@@ -272 +276 @@
 void SERVER_DISPATCH_APIENTRY crServerDispatchViewport( GLint x, GLint y, GLsizei width, GLsizei height )
 {
-        CRMuralInfo *mural = cr_server.curClient->currentMural;
         CRContext *ctx = crStateGetCurrent();
 

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_window.cpp

@@ -20 +20 @@
 GLint crServerMuralInit(CRMuralInfo *mural, GLboolean fGuestWindow, GLint visBits, GLint preloadWinID)
 {
+    RT_NOREF(fGuestWindow);
+
     CRMuralInfo *defaultMural;
     GLint dims[2];
@@ -237 +239 @@
 static void crServerCleanupCtxMuralRefsCB(unsigned long key, void *data1, void *data2)
 {
+    RT_NOREF(key);
+
     CRContextInfo *ctxInfo = (CRContextInfo *) data1;
     CRMuralInfo *mural = (CRMuralInfo *) data2;
@@ -336 +340 @@
 }
 
-GLboolean crServerMuralSize(CRMuralInfo *mural, GLint width, GLint height)
+GLboolean crServerMuralSize(CRMuralInfo *mural, GLuint width, GLuint height)
 {
     if (mural->width == width && mural->height == height)

trunk/src/VBox/HostServices/SharedOpenGL/render/renderspu.c

@@ -243 +243 @@
 }
 
-ContextInfo * renderspuDefaultSharedContextAcquire()
+ContextInfo * renderspuDefaultSharedContextAcquire(void)
 {
     ContextInfo * pCtx = render_spu.defaultSharedContext;
@@ -651 +651 @@
     WindowInfo *window;
 
+    RT_NOREF(dpyName);
+
     if (id <= 0)
     {
@@ -731 +733 @@
     window = (WindowInfo *) crHashtableSearch(render_spu.windowTable, win);
     if (window) {
-        if (w != window->BltInfo.width
-                || h != window->BltInfo.height)
+        if (   (GLuint)w != window->BltInfo.width
+            || (GLuint)h != window->BltInfo.height)
         {
             /* window is resized, compositor data is no longer valid
@@ -1063 +1065 @@
 {
     PCR_BLITTER pBlitter = renderspuVBoxPresentBlitterGetAndEnter(window, i32MakeCurrentUserData, fRedraw);
+
+    RT_NOREF(pChangedEntry);
     if (!pBlitter)
         return;
@@ -1111 +1115 @@
 {
     WindowInfo *window = (WindowInfo *) data1;
+    RT_NOREF(key, data2);
+
     renderspuVBoxCompositorSet(window, NULL);
 }
 
-void renderspuVBoxCompositorClearAll()
+void renderspuVBoxCompositorClearAll(void)
 {
     /* we need to clear window compositor, which is not that trivial though,
@@ -1506 +1512 @@
 }
 
-bool renderspuCalloutAvailable()
+bool renderspuCalloutAvailable(void)
 {
     return render_spu.pfnClientCallout != NULL;
@@ -1854 +1860 @@
 {
     WindowInfo *pWindow = (WindowInfo *)data1;
+    RT_NOREF(key, data2);
 
     renderspu_SystemReparentWindow(pWindow);

trunk/src/VBox/HostServices/SharedOpenGL/render/renderspu.h

@@ -339 +339 @@
 extern void renderspu_SystemWindowVisibleRegion(WindowInfo *window, GLint cRects, const GLint* pRects);
 extern GLboolean renderspu_SystemWindowNeedEmptyPresent(WindowInfo *window);
-extern int renderspu_SystemInit();
-extern int renderspu_SystemTerm();
+extern int renderspu_SystemInit(void);
+extern int renderspu_SystemTerm(void);
 extern void renderspu_SystemDefaultSharedContextChanged(ContextInfo *fromContext, ContextInfo *toContext);
 extern void renderspu_SystemShowWindow( WindowInfo *window, GLboolean showIt );
@@ -351 +351 @@
 extern int renderspuCreateFunctions( SPUNamedFunctionTable table[] );
 extern GLboolean renderspuVBoxCompositorSet( WindowInfo *window, const struct VBOXVR_SCR_COMPOSITOR * pCompositor);
-extern void renderspuVBoxCompositorClearAll();
+extern void renderspuVBoxCompositorClearAll(void);
 extern int renderspuVBoxCompositorLock(WindowInfo *window, const struct VBOXVR_SCR_COMPOSITOR **ppCompositor);
 extern int renderspuVBoxCompositorUnlock(WindowInfo *window);
@@ -408 +408 @@
 extern uint32_t renderspuContextMarkDeletedAndRelease( ContextInfo *context );
 
-int renderspuDefaultCtxInit();
+int renderspuDefaultCtxInit(void);
 void renderspuCleanupBase(bool fDeleteTables);
 
-ContextInfo * renderspuDefaultSharedContextAcquire();
+ContextInfo * renderspuDefaultSharedContextAcquire(void);
 void renderspuDefaultSharedContextRelease(ContextInfo * pCtx);
 uint32_t renderspuContextRelease(ContextInfo *context);
 uint32_t renderspuContextRetain(ContextInfo *context);
 
-bool renderspuCalloutAvailable();
+bool renderspuCalloutAvailable(void);
 bool renderspuCalloutClient(PFNVCRSERVER_CLIENT_CALLOUT_CB pfnCb, void *pvCb);
 

trunk/src/VBox/HostServices/SharedOpenGL/render/renderspu_init.c

@@ -100 +100 @@
 #endif
 
-int renderspuDefaultCtxInit()
+int renderspuDefaultCtxInit(void)
 {
     GLint defaultWin, defaultCtx;
@@ -367 +367 @@
     CRASSERT(window);
 
+    RT_NOREF(key, data2);
+
     renderspuVBoxPresentBlitterCleanup( window );
 }

trunk/src/VBox/HostServices/SharedOpenGL/render/renderspu_wgl.c

@@ -99 +99 @@
 }
 
-int renderspuIatPatcherPatchEntry(void *pvEntry, void *pvValue, void **ppvOldVal)
-{
-    void **ppfn = (void**)pvEntry;
+int renderspuIatPatcherPatchEntry(void *pvEntry, PFNRT pfnValue, PFNRT *ppfnOldVal)
+{
+    PFNRT *ppfn = (PFNRT *)pvEntry;
     DWORD dwOldProtect = 0;
 
@@ -110 +110 @@
     }
 
-    if (ppvOldVal)
-        *ppvOldVal = *ppfn;
-    *ppfn = pvValue;
+    if (ppfnOldVal)
+        *ppfnOldVal = *ppfn;
+    *ppfn = pfnValue;
 
     if (!VirtualProtect(pvEntry, sizeof (pvEntry), dwOldProtect, &dwOldProtect))
@@ -123 +123 @@
 
 
-int renderspuIatPatcherPatchFunction(HMODULE hModule, LPCSTR pszLib, LPCSTR pszName, void* pfn)
+int renderspuIatPatcherPatchFunction(HMODULE hModule, LPCSTR pszLib, LPCSTR pszName, PFNRT pfn)
 {
     void* pAdr;
@@ -144 +144 @@
 
 /* patch */
-static HWND __stdcall renderspuAtiQuirk_GetForegroundWindow()
+static HWND __stdcall renderspuAtiQuirk_GetForegroundWindow(void)
 {
     crDebug("renderspuAtiQuirk_GetForegroundWindow");
@@ -279 +279 @@
     }
 
-    rc = renderspuIatPatcherPatchFunction(hAtiDll, "user32.dll", "GetForegroundWindow", (void*)renderspuAtiQuirk_GetForegroundWindow);
+    rc = renderspuIatPatcherPatchFunction(hAtiDll, "user32.dll", "GetForegroundWindow", (PFNRT)renderspuAtiQuirk_GetForegroundWindow);
     if (RT_FAILURE(rc))
     {
@@ -311 +311 @@
 
 
-static int renderspuAtiQuirk_Apply()
+static int renderspuAtiQuirk_Apply(void)
 {
     char aBuf[4096];
@@ -337 +337 @@
 }
 
-static GLboolean renderspuAtiQuirk_Needed()
-{
-    const char * pszString = render_spu.ws.glGetString(GL_VENDOR);
+static GLboolean renderspuAtiQuirk_Needed(void)
+{
+    const char * pszString = (const char *)render_spu.ws.glGetString(GL_VENDOR);
     if (pszString && strstr(pszString, "ATI"))
         return GL_TRUE;
-    pszString = render_spu.ws.glGetString(GL_RENDERER);
+    pszString = (const char *)render_spu.ws.glGetString(GL_RENDERER);
     if (pszString && strstr(pszString, "ATI"))
         return GL_TRUE;
@@ -348 +348 @@
 }
 
-static void renderspuAtiQuirk_ChkApply()
+static void renderspuAtiQuirk_ChkApply(void)
 {
     static GLboolean fChecked = GL_FALSE;
@@ -506 +506 @@
     int attribList[100];
     float fattribList[] = { 0.0, 0.0 };
-    int numFormats;
+    unsigned numFormats;
     int i = 0;
     BOOL vis;
@@ -1400 +1400 @@
         }
 
+#if 0
         if (0/*render_spu.render_to_app_window && nativeWindow*/)
         {
@@ -1439 +1440 @@
         }
         else
+#endif
         {
             if (!context->hRC) {
@@ -1583 +1585 @@
 GLboolean renderspu_SystemWindowNeedEmptyPresent(WindowInfo *window)
 {
+    RT_NOREF(window);
     return GL_FALSE;
 }
@@ -1642 +1645 @@
 {
     int return_value;
+
+    RT_NOREF(flags);
 
     /* peek at the windows message queue */
@@ -1721 +1726 @@
 }
 
-int renderspu_SystemInit()
+int renderspu_SystemInit(void)
 {
     return VINF_SUCCESS;
 }
 
-int renderspu_SystemTerm()
+int renderspu_SystemTerm(void)
 {
     return VINF_SUCCESS;
@@ -1733 +1738 @@
 void renderspu_SystemDefaultSharedContextChanged(ContextInfo *fromContext, ContextInfo *toContext)
 {
-
+    RT_NOREF(fromContext, toContext);
 }
 
 uint32_t renderspu_SystemPostprocessFunctions(SPUNamedFunctionTable *aFunctions, uint32_t cFunctions, uint32_t cTable)
 {
+    RT_NOREF(aFunctions, cTable);
     return cFunctions;
 }

trunk/src/VBox/HostServices/SharedOpenGL/unpacker/unpack_program.cpp

@@ -294 +294 @@
 void crUnpackExtendGetProgramStringARB(PCrUnpackerState pState)
 {
+    RT_NOREF(pState);
 }