Changeset 83832 in vbox for trunk/src/VBox/Additions/3D/win

Timestamp:

Apr 19, 2020 2:12:33 PM (5 years ago)

Author:

vboxsync

Message:

Additions/3D: VC++ 14.1 adjustments and warnings. bugref:8489

Location:

trunk/src/VBox/Additions/3D/win

Files:

• VBoxGL/Makefile.kmk (modified) (1 diff)
• VBoxGL/VBoxGL.c (modified) (1 diff)
• VBoxICD/Makefile.kmk (modified) (1 diff)
• VBoxWddmUmHlp/VBoxMpLogger.cpp (modified) (1 diff)
• VBoxWddmUmHlp/VBoxWddmUmHlp.h (modified) (1 diff)
• include/VBoxGaDriver.h (modified) (1 diff)

trunk/src/VBox/Additions/3D/win/VBoxGL/Makefile.kmk

@@ -27 +27 @@
 VBoxGL_TEMPLATE = VBoxMesa3DGuestR3DllMinVista
 # -wd4005: '__useHeader' : redefinition
-VBoxGL_CFLAGS   = -wd4005
+VBoxGL_CFLAGS  := -wd4005
+if "$(VBOX_NEWER_VCC_TOOL_STEM)" >= "VCC141"
+# -wd4204: nonstandard extension used: non-constant aggregate initializer
+# -wd4459: stw_device.h(102): warning C4459: declaration of 'stw_dev' hides global declaration
+# -wd4668: c99_compat.h(99): warning C4668: '__STDC_VERSION__' is not defined as a preprocessor macro, replacing with '0' for '#if/#elif'
+VBoxGL_CFLAGS  += -wd4204 -wd4459 -wd4668
+endif
 VBoxGL_INCS     = \
         $(VBOX_PATH_3D)/win/include \

trunk/src/VBox/Additions/3D/win/VBoxGL/VBoxGL.c

@@ -272 +272 @@
         {
             D3DKMT_HANDLE hDevice = GaDrvEnvKmtDeviceHandle(pEnv);
-            NTSTATUS Status = vboxKmtOpenSharedSurface(hDevice, (D3DKMT_HANDLE)hSharedSurface, surface);
+            NTSTATUS Status = vboxKmtOpenSharedSurface(hDevice, (D3DKMT_HANDLE)(uintptr_t)hSharedSurface, surface);
             if (Status != STATUS_SUCCESS)
             {

trunk/src/VBox/Additions/3D/win/VBoxICD/Makefile.kmk

@@ -26 +26 @@
 VBoxICD_TEMPLATE = VBoxMesa3DGuestR3DllMinVista
 # -wd4005: '__useHeader' : redefinition
-VBoxICD_CFLAGS   = -wd4005
+VBoxICD_CFLAGS  := -wd4005
+if "$(VBOX_NEWER_VCC_TOOL_STEM)" >= "VCC141"
+# -wd4255: 'PFND3DKMT_CHECKEXCLUSIVEOWNERSHIP': no function prototype given: converting '()' to '(void)'
+VBoxICD_CFLAGS  += -wd4255
+endif
+
 VBoxICD_INCS     = \
         $(VBOX_PATH_3D)/win/include \

trunk/src/VBox/Additions/3D/win/VBoxWddmUmHlp/VBoxMpLogger.cpp

@@ -107 +107 @@
     char *pszBuffer = &szBuffer[0];
 
-    int cbWritten = _snprintf(pszBuffer, cbBuffer, "['%s' 0x%x.0x%x]: ",
+    int cbWritten = _snprintf(pszBuffer, cbBuffer, "['%s' 0x%lx.0x%lx]: ",
                               vboxUmLogGetModuleName(), GetCurrentProcessId(), GetCurrentThreadId());
     if (cbWritten < 0 || cbWritten >= cbBuffer)

trunk/src/VBox/Additions/3D/win/VBoxWddmUmHlp/VBoxWddmUmHlp.h

@@ -24 +24 @@
 #include <iprt/win/d3d9.h>
 #include <d3dumddi.h>
-#include <d3dkmthk.h>
+#include <iprt/win/d3dkmthk.h>
 
 #include <iprt/asm.h>

trunk/src/VBox/Additions/3D/win/include/VBoxGaDriver.h

@@ -73 +73 @@
 } WDDMGalliumDriverEnv;
 
+struct pipe_context;
+struct pipe_screen;
+struct pipe_resource;
+
 typedef struct pipe_screen * WINAPI FNGaDrvScreenCreate(const WDDMGalliumDriverEnv *pEnv);
 typedef FNGaDrvScreenCreate *PFNGaDrvScreenCreate;