儲存庫 vbox 的更動 62782

時間撮記:

2016-7-31 下午10:50:29 (8 年以前)

作者:

vboxsync

訊息:

HostServices,GuestHost: warnings

位置:

trunk/src/VBox

檔案:

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

-              r55628
+              r62782
 # 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 */
 …
 #endif
 typedef void (*CR_GLXFuncPtr)();
+typedef void (*CR_GLXFuncPtr)(void);
 #ifndef GLX_ARB_get_proc_address
 #define GLX_ARB_get_proc_address 1
 …
 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 );

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

-              r55798
+              r62782
 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);
 …
 void crStateSyncHWErrorState(CRContext *ctx);
 GLenum crStateCleanHWErrorState();
+GLenum crStateCleanHWErrorState(void);
 #define CR_STATE_CLEAN_HW_ERR_WARN(_s) do {\
 …
 DECLEXPORT(int32_t) crStateSaveGlobals(PSSMHANDLE pSSM);
 DECLEXPORT(CRSharedState *) crStateGlobalSharedAcquire();
 DECLEXPORT(void) crStateGlobalSharedRelease();
+DECLEXPORT(CRSharedState *) crStateGlobalSharedAcquire(void);
+DECLEXPORT(void) crStateGlobalSharedRelease(void);
 #endif

r55832	r62782
44	44	#define CR_MAX_CLIENTS 64
45	45
46		/@todo must match MaxGuestMonitors from SchemaDefs.h/
	46	/** @todo must match MaxGuestMonitors from SchemaDefs.h*/
47	47	#define CR_MAX_GUEST_MONITORS VBOX_VIDEO_MAX_SCREENS
48	48

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

-              r56970
+              r62782
     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)))
 …
             return -1;
+    }
+    WARN(("internal error"));
+    return -1;
+    /* not reached */
+}
 …
 static DECLCALLBACK(bool) crVBoxServerHasData()
+static DECLCALLBACK(bool) crVBoxServerHasData(void)
+{
     HCR_FRAMEBUFFER hFb = CrPMgrFbGetFirstEnabled();

注意: 瀏覽 TracChangeset 來幫助您使用更動檢視器