Changeset 63021 in vbox

Timestamp:

Aug 4, 2016 11:43:05 PM (8 years ago)

Author:

vboxsync

Message:

GA/NT/Graphics: warnings

Location:

trunk/src/VBox/Additions/WINNT/Graphics/Wine_new

Files:

• Makefile.kmk (modified) (2 diffs)
• d3d8/d3d8_private.h (modified) (1 diff)
• vbox/libWineStub/debug.c (modified) (5 diffs)
• wined3d/context.c (modified) (1 diff)
• wined3d/vboxext.h (modified) (5 diffs)
• wined3d/wined3d_gl.h (modified) (1 diff)

trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/Makefile.kmk

@@ -40 +40 @@
 
 TEMPLATE_VBoxGuestWineDLL_DEFS.x86 = __i386__
+#  -wd4100: unreferenced format parameter
+#  -wd4204: nonstandard extension used : non-constant initializer
+#  -wd4245: '=' : conversion from 'int' to 'DWORD', signed/unsigned mismatch
+#  -wd4305: 'function' : truncation from 'double' to 'GLclampf'
+TEMPLATE_VBoxGuestWineDLL_CFLAGS = $(TEMPLATE_VBOXGUESTR3NPDLL_CFLAGS) -wd4100  -wd4204 -wd4245 -wd4305
 
 #
@@ -52 +57 @@
 #TEMPLATE_VBoxGuestWineD3DxDLL_INCS.x86   = vbox/libWineStub/include
 TEMPLATE_VBoxGuestWineD3DxDLL_DEFS = VBOX_WINE_WITH_IPRT
+TEMPLATE_VBoxGuestWineD3DxDLL_CFLAGS = -wd4100  -wd4204 -wd4245 -wd4305
 TEMPLATE_VBoxGuestWineD3DxDLL_LIBS = \
         $(VBOX_LIB_IPRT_GUEST_R3) \

trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/d3d8/d3d8_private.h

@@ -39 +39 @@
 #define NONAMELESSSTRUCT
 #define COBJMACROS
+#ifndef VBOX
 #include "windef.h"
 #include "winbase.h"
 #include "wingdi.h"
 #include "wine/debug.h"
+#else
+# include <iprt/win/windows.h>
+#endif
 #include "d3d8.h"
 #include "wine/wined3d.h"

trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/vbox/libWineStub/debug.c

@@ -28 +28 @@
  */
 
+#ifdef VBOX
+#include <iprt/win/windows.h>
+#else
 #include <windows.h>
+#endif
 
 #include "config.h"
@@ -161 +165 @@
             for (i = 0; i < sizeof(debug_classes)/sizeof(debug_classes[0]); i++)
             {
-                int len = strlen(debug_classes[i]);
+                int len = (int)strlen(debug_classes[i]);
                 if (len != (p - opt)) continue;
                 if (!memcmp( opt, debug_classes[i], len ))  /* found it */
@@ -299 +303 @@
 int interlocked_xchg_add( int *dest, int incr )
 {
-    return InterlockedExchangeAdd(dest, incr);
+    return InterlockedExchangeAdd((LONG *)dest, incr);
 }
 
@@ -327 +331 @@
 static const char *default_dbgstr_an( const char *str, int n )
 {
-    static const char hex[16] = "0123456789abcdef";
+    static const char hex[16+1] = "0123456789abcdef";
     char *dst, *res;
     size_t size;
@@ -338 +342 @@
         return res;
     }
-    if (n == -1) n = strlen(str);
+    if (n == -1) n = (int)strlen(str);
     if (n < 0) n = 0;
     size = 10 + min( 300, n * 4 );

trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/wined3d/context.c

@@ -1342 +1342 @@
 
 #if defined(VBOX_WINE_WITH_SINGLE_CONTEXT) || defined(VBOX_WINE_WITH_SINGLE_SWAPCHAIN_CONTEXT)
-void context_clear_on_thread_detach()
+void context_clear_on_thread_detach(void)
 {
     /* In theory, we should do context_set_current(NULL) here,

trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/wined3d/vboxext.h

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- *
  * VBox extension to Wine D3D
- *
+ */
+
+/*
  * Copyright (C) 2011-2016 Oracle Corporation
  *
@@ -14 +15 @@
  * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
  */
+
 #ifndef ___VBOXEXT_H__
 #define ___VBOXEXT_H__
 
 #ifdef VBOX_WINE_WITHOUT_LIBWINE
-# include <windows.h>
+# include <iprt/win/windows.h>
 #endif
 
 #include <iprt/list.h>
 
-HRESULT VBoxExtCheckInit();
-HRESULT VBoxExtCheckTerm();
+HRESULT VBoxExtCheckInit(void);
+HRESULT VBoxExtCheckTerm(void);
 #if defined(VBOX_WINE_WITH_SINGLE_CONTEXT) || defined(VBOX_WINE_WITH_SINGLE_SWAPCHAIN_CONTEXT)
 # ifndef VBOX_WITH_WDDM
@@ -40 +42 @@
  * So lock order should always be "wined3d lock" -> "dll lock".
  * To avoid possible deadlocks we make an asynchronous call to a worker thread to make a context release from there. */
+struct wined3d_context;
 void VBoxExtReleaseContextAsync(struct wined3d_context *context);
 #endif
@@ -55 +58 @@
 typedef FNVBOXEXT_HASHMAP_EQUAL *PFNVBOXEXT_HASHMAP_EQUAL;
 
+struct VBOXEXT_HASHMAP;
+struct VBOXEXT_HASHMAP_ENTRY;
 typedef DECLCALLBACK(bool) FNVBOXEXT_HASHMAP_VISITOR(struct VBOXEXT_HASHMAP *pMap, void *pvKey, struct VBOXEXT_HASHMAP_ENTRY *pValue, void *pvVisitor);
 typedef FNVBOXEXT_HASHMAP_VISITOR *PFNVBOXEXT_HASHMAP_VISITOR;
@@ -98 +103 @@
 }
 
+struct VBOXEXT_HASHCACHE_ENTRY;
 typedef DECLCALLBACK(void) FNVBOXEXT_HASHCACHE_CLEANUP_ENTRY(void *pvKey, struct VBOXEXT_HASHCACHE_ENTRY *pEntry);
 typedef FNVBOXEXT_HASHCACHE_CLEANUP_ENTRY *PFNVBOXEXT_HASHCACHE_CLEANUP_ENTRY;

trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/wined3d/wined3d_gl.h

@@ -200 +200 @@
 PGLFNCHROMIUMPARAMETERUCR pglChromiumParameteriCR;
 
+struct VBOXUHGSMI;
 HGLRC (WINAPI *pVBoxCreateContext)(HDC, struct VBOXUHGSMI*) DECLSPEC_HIDDEN;
 void (WINAPI *pVBoxCtxChromiumParameteriCR)(HGLRC , GLenum , GLint) DECLSPEC_HIDDEN;