Changeset 62782 in vbox for trunk/src/VBox

Timestamp:

Jul 31, 2016 10:50:29 PM (8 years ago)

Author:

vboxsync

Message:

HostServices,GuestHost: warnings

Location:

trunk/src/VBox

Files:

• GuestHost/OpenGL/include/chromium.h (modified) (3 diffs)
• GuestHost/OpenGL/include/cr_dll.h (modified) (1 diff)
• GuestHost/OpenGL/include/cr_glstate.h (modified) (3 diffs)
• GuestHost/OpenGL/include/cr_server.h (modified) (1 diff)
• HostServices/SharedOpenGL/crserver/crservice.cpp (modified) (3 diffs)
• HostServices/SharedOpenGL/crserverlib/server_clip.c (modified) (1 diff)
• HostServices/SharedOpenGL/crserverlib/server_main.c (modified) (3 diffs)

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

@@ -39 +39 @@
 # define WIN32_LEAN_AND_MEAN
 # define WGL_APIENTRY __stdcall
-# include <windows.h>
+# ifdef VBOX
+#  include <iprt/win/windows.h>
+# else
+#  include <windows.h>
+# endif
 #elif defined(DARWIN)
 /* nothing */
@@ -434 +438 @@
 #endif
 
-typedef void (*CR_GLXFuncPtr)();
+typedef void (*CR_GLXFuncPtr)(void);
 #ifndef GLX_ARB_get_proc_address
 #define GLX_ARB_get_proc_address 1
@@ -796 +800 @@
 extern void APIENTRY crVBoxTexPresent(GLuint texture, GLuint cfg, GLint xPos, GLint yPos, GLint cRects, const GLint *pRects);
 
-typedef int (CR_APIENTRY *CR_PROC)();
+typedef int (CR_APIENTRY *CR_PROC)(void);
 CR_PROC APIENTRY crGetProcAddress( const char *name );
 

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

@@ -10 +10 @@
 #if defined(WINDOWS)
 #define WIN32_LEAN_AND_MEAN
+# ifdef VBOX
+#  include <iprt/win/windows.h>
+# else
 #include <windows.h>
+# endif
 #endif
 

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

@@ -208 +208 @@
 DECLEXPORT(void) crStateInit(void);
 DECLEXPORT(void) crStateDestroy(void);
-DECLEXPORT(void) crStateVBoxDetachThread();
-DECLEXPORT(void) crStateVBoxAttachThread();
+DECLEXPORT(void) crStateVBoxDetachThread(void);
+DECLEXPORT(void) crStateVBoxAttachThread(void);
 DECLEXPORT(CRContext *) crStateCreateContext(const CRLimitsState *limits, GLint visBits, CRContext *share);
 DECLEXPORT(CRContext *) crStateCreateContextEx(const CRLimitsState *limits, GLint visBits, CRContext *share, GLint presetID);
 DECLEXPORT(void) crStateMakeCurrent(CRContext *ctx);
 DECLEXPORT(void) crStateSetCurrent(CRContext *ctx);
-DECLEXPORT(void) crStateCleanupCurrent();
+DECLEXPORT(void) crStateCleanupCurrent(void);
 DECLEXPORT(CRContext *) crStateGetCurrent(void);
 DECLEXPORT(void) crStateDestroyContext(CRContext *ctx);
@@ -223 +223 @@
 
 void crStateSyncHWErrorState(CRContext *ctx);
-GLenum crStateCleanHWErrorState();
+GLenum crStateCleanHWErrorState(void);
 
 #define CR_STATE_CLEAN_HW_ERR_WARN(_s) do {\
@@ -296 +296 @@
 DECLEXPORT(int32_t) crStateSaveGlobals(PSSMHANDLE pSSM);
 
-DECLEXPORT(CRSharedState *) crStateGlobalSharedAcquire();
-DECLEXPORT(void) crStateGlobalSharedRelease();
+DECLEXPORT(CRSharedState *) crStateGlobalSharedAcquire(void);
+DECLEXPORT(void) crStateGlobalSharedRelease(void);
 #endif
 

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

@@ -44 +44 @@
 #define CR_MAX_CLIENTS 64
 
-/*@todo must match MaxGuestMonitors from SchemaDefs.h*/
+/** @todo must match MaxGuestMonitors from SchemaDefs.h*/
 #define CR_MAX_GUEST_MONITORS VBOX_VIDEO_MAX_SCREENS
 

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

@@ -1 +1 @@
 /* $Id$ */
-
 /** @file
- * VBox crOpenGL: Host service entry points.
+ * VBox crOpenGL - Host service entry points.
  */
 
@@ -33 +32 @@
 #include <VBox/log.h>
 #include <VBox/com/array.h>
+#if 0
 #include <VBox/com/ErrorInfo.h>
 #include <VBox/com/VirtualBox.h>
@@ -1595 +1595 @@
 }
 #endif
+#endif

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_clip.c

@@ -11 +11 @@
 
 #include <math.h>
+
 #include "cr_server.h"
 #include "cr_mem.h"

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

@@ -2568 +2568 @@
     int i;
 
-    if (sCount>CR_MAX_GUEST_MONITORS)
+    if (sCount > CR_MAX_GUEST_MONITORS)
         return VERR_INVALID_PARAMETER;
 
     /*Shouldn't happen yet, but to be safe in future*/
-    for (i=0; i<cr_server.screenCount; ++i)
+    for (i = 0; i < cr_server.screenCount; /*++i - unreachable code*/)
     {
         if (MAPPED(SCREEN(i)))
@@ -3573 +3573 @@
             return -1;
     }
-
-    WARN(("internal error"));
-    return -1;
+    /* not reached */
 }
 
@@ -3916 +3914 @@
 
 
-static DECLCALLBACK(bool) crVBoxServerHasData()
+static DECLCALLBACK(bool) crVBoxServerHasData(void)
 {
     HCR_FRAMEBUFFER hFb = CrPMgrFbGetFirstEnabled();