Changeset 66827 in vbox for trunk/src/VBox/GuestHost

Timestamp:

May 8, 2017 4:53:52 PM (8 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

115274

Message:

GuestHost: Adjustments for Visual C++ v12 / Visual Studio 2013. New warnings and sal_supp.h conflict.

Location:

trunk/src/VBox/GuestHost/OpenGL

Files:

• include/cr_net.h (modified) (1 diff)
• state_tracker/state_snapshot.c (modified) (4 diffs)
• util/pixel.c (modified) (1 diff)

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

@@ -10 +10 @@
 #ifdef WINDOWS
 #define WIN32_LEAN_AND_MEAN
+# ifndef VBOX
 #pragma warning( push, 3 ) /* shut up about warnings in YOUR OWN HEADER FILES!!! */
 #include <winsock.h>
+# else
+# include <iprt/win/winsock.h>
+# endif /* VBOX */
 #endif
 

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

@@ -250 +250 @@
 {
     CRStencilBufferStack_v_33 stackV33;
-    int32_t rc = SSMR3GetMem(pSSM, &stackV33, sizeof (stackV33));
+    int32_t rc = SSMR3GetMem(pSSM, &stackV33, sizeof(stackV33));
+    AssertLogRelReturn(rc, rc);
 
     s->stencilTest = stackV33.stencilTest;
@@ -465 +466 @@
                         GLint curTex;
                         diff_api.GetIntegerv(getEnum, &curTex);
-                        if (curTex != pTexture->hwid)
+                        if ((GLuint)curTex != pTexture->hwid)
                         {
                             crWarning("texture not bound properly: expected %d, but was %d. Texture state data: target(0x%x), id(%d), w(%d), h(%d)",
@@ -1101 +1102 @@
 static void crStateSaveGLSLShaderKeyCB(unsigned long key, void *data1, void *data2)
 {
-    CRGLSLShader *pShader = (CRGLSLShader*) data1;
+    //CRGLSLShader *pShader = (CRGLSLShader*) data1;
     PSSMHANDLE pSSM = (PSSMHANDLE) data2;
     int32_t rc;
@@ -1448 +1449 @@
             for (i = u32Key; i < u32Count + u32Key; ++i)
             {
-                GLboolean fIsNew = crHashtableAllocRegisterKey(pHash, i);
+                GLboolean fIsNew = crHashtableAllocRegisterKey(pHash, i); NOREF(fIsNew);
 #if 0 //def DEBUG_misha
                 CRASSERT(fIsNew);

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

@@ -16 +16 @@
 #if defined(WINDOWS)
 # include <float.h>
+# undef isnan /* _MSC_VER 12.0+ defines this is a complicated macro */
 # define isnan(x) _isnan(x)
 #endif