vbox的更動 63118 路徑 trunk/src

時間撮記:

2016-8-6 下午09:19:19 (8 年 以前)

作者:

vboxsync

訊息:

GuestHost/OpenGL: Warnings (forgotten yesterday)

位置:

trunk/src/VBox/GuestHost/OpenGL

檔案:

• include/chromium.h (修改) (3 筆差異)
• include/cr_pack.h (修改) (2 筆差異)
• packer/pack_buffer.c (修改) (1 筆差異)
• packer/pack_visibleregion.c (修改) (1 筆差異)
• util/sortarray.cpp (修改) (2 筆差異)

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

@@ -22 +22 @@
 
 #ifdef IN_RING0
+
+# ifndef VBOXVIDEOLOG_H
+#  undef WARN     /* VBoxMpUtils.h includes common/VBoxVideoLog.h which */
+#  undef LOG      /* uncondtionally redefines these three macros. */
+#  undef LOGREL
+# endif
 # include <common/VBoxMPUtils.h>
+
 # define WINGDIAPI /* gl/gl.h is using this (wingdi.h defines it a __declspec(dllimport) normaly).  */
+
 #endif
 
@@ -36 +44 @@
 #if defined(WINDOWS)
 # ifdef IN_RING0
-#  error "should not happen!"
+#  error "should not happen!" /* bird: This is certifiably insane, in my opinion. */
 # endif
 # define WIN32_LEAN_AND_MEAN
@@ -56 +64 @@
 
 #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). */
 #include <GL/glu.h>
+# endif /* !RT_OS_WINDOWS */
 #endif
 

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

@@ -97 +97 @@
 # define CR_PACKER_CONTEXT_ARGDECL
 # define CR_PACKER_CONTEXT_ARG
+# define CR_PACKER_CONTEXT_ARG_NOREF()  do {} while (0)
 # define CR_PACKER_CONTEXT_ARGCTX(C)
 # ifdef CHROMIUM_THREADSAFE
@@ -114 +115 @@
 # define CR_PACKER_CONTEXT_ARGDECL CR_PACKER_CONTEXT_ARGSINGLEDECL,
 # define CR_PACKER_CONTEXT_ARG _pCtx,
+# define CR_PACKER_CONTEXT_ARG_NOREF() RT_NOREF_PV(_pCtx)
 # define CR_PACKER_CONTEXT_ARGCTX(C) C,
 # define CR_GET_PACKER_CONTEXT(C) CRPackContext *C = _pCtx

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

@@ -76 +76 @@
 #ifndef IN_RING0
 /* This is useful for debugging packer problems */
-void crPackSetBufferDEBUG( const char *file, int line,
-                                                                                                         CRPackContext *pc, CRPackBuffer *buffer)
+void crPackSetBufferDEBUG( const char *file, int line, CRPackContext *pc, CRPackBuffer *buffer)
                                                    
 {

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

@@ -53 +53 @@
 void PACK_APIENTRY crPackWindowVisibleRegionSWAP( CR_PACKER_CONTEXT_ARGDECL  GLint window, GLint cRects, const GLint * pRects )
 {
-    RT_NOREF3(window, cRects, pRects);
+    RT_NOREF3(window, cRects, pRects); CR_PACKER_CONTEXT_ARG_NOREF();
     crError( "crPackWindowVisibleRegionSWAP unimplemented and shouldn't be called" );
 }

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

@@ -151 +151 @@
         return crSaInsAt(pArray, 0, element);
 
+    el = element; /* Shup up MSC. */
     while (iMin < iMax)
     {
@@ -336 +337 @@
 static int crSaClone(const CR_SORTARRAY *pArray1, CR_SORTARRAY *pResult)
 {
-    int rc = 0;
     CrSaClear(pResult);