Changeset 63024 in vbox for trunk/src/VBox/Additions/WINNT/Graphics/Wine_new

Timestamp:

Aug 5, 2016 12:47:28 AM (8 years ago)

Author:

vboxsync

Message:

GA/NT/Graphics: warnings

Location:

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

Files:

• Makefile.kmk (modified) (1 diff)
• d3d9/d3d9_private.h (modified) (1 diff)
• d3d9/texture.c (modified) (3 diffs)
• d3d9/vertexdeclaration.c (modified) (1 diff)
• d3d9/volume.c (modified) (2 diffs)
• switcher/d3d8_main.c (modified) (2 diffs)
• switcher/d3d9_main.c (modified) (2 diffs)
• switcher/sw_common.c (modified) (1 diff)
• switcher/switcher.h (modified) (1 diff)
• vbox/VBoxWineEx.h (modified) (1 diff)
• vbox/libWineStub/include/wine/wined3d.h (modified) (1 diff)
• wined3d/directx.c (modified) (5 diffs)
• wined3d/vboxsharedrc.h (modified) (3 diffs)

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

@@ -44 +44 @@
 #  -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
+TEMPLATE_VBoxGuestWineDLL_CFLAGS = $(filter-out -WX,$(TEMPLATE_VBOXGUESTR3NPDLL_CFLAGS)) -wd4100  -wd4204 -wd4245 -wd4305
 
 #

trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/d3d9/d3d9_private.h

@@ -45 +45 @@
 #include "winuser.h"
 #else
-#include <windows.h>
+# include <iprt/win/windows.h>
 #endif
 #include "wine/debug.h"

trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/d3d9/texture.c

@@ -1328 +1328 @@
     HRESULT hr;
 
-    texture->IDirect3DBaseTexture9_iface.lpVtbl = (const IDirect3DBaseTexture9Vtbl *)&d3d9_texture_2d_vtbl;
+    texture->IDirect3DBaseTexture9_iface.lpVtbl = (/*const*/ IDirect3DBaseTexture9Vtbl *)&d3d9_texture_2d_vtbl;
     texture->refcount = 1;
 
@@ -1378 +1378 @@
     HRESULT hr;
 
-    texture->IDirect3DBaseTexture9_iface.lpVtbl = (const IDirect3DBaseTexture9Vtbl *)&d3d9_texture_cube_vtbl;
+    texture->IDirect3DBaseTexture9_iface.lpVtbl = (/*const*/ IDirect3DBaseTexture9Vtbl *)&d3d9_texture_cube_vtbl;
     texture->refcount = 1;
 
@@ -1427 +1427 @@
     HRESULT hr;
 
-    texture->IDirect3DBaseTexture9_iface.lpVtbl = (const IDirect3DBaseTexture9Vtbl *)&d3d9_texture_3d_vtbl;
+    texture->IDirect3DBaseTexture9_iface.lpVtbl = (/*const*/ IDirect3DBaseTexture9Vtbl *)&d3d9_texture_3d_vtbl;
     texture->refcount = 1;
 

trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/d3d9/vertexdeclaration.c

@@ -389 +389 @@
     }
 
-    declaration->IDirect3DVertexDeclaration9_iface.lpVtbl = &d3d9_vertex_declaration_vtbl;
+    declaration->IDirect3DVertexDeclaration9_iface.lpVtbl = (struct IDirect3DVertexDeclaration9Vtbl *)&d3d9_vertex_declaration_vtbl;
     declaration->refcount = 1;
 

trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/d3d9/volume.c

@@ -294 +294 @@
     HRESULT hr;
 
-    volume->IDirect3DVolume9_iface.lpVtbl = &d3d9_volume_vtbl;
+    volume->IDirect3DVolume9_iface.lpVtbl = (struct IDirect3DVolume9Vtbl *)&d3d9_volume_vtbl;
     volume->refcount = 1;
 
@@ -318 +318 @@
     if (!iface)
         return NULL;
-    assert(iface->lpVtbl == (const IDirect3DVolume9Vtbl *)&d3d9_volume_vtbl);
+    assert(iface->lpVtbl == (IDirect3DVolume9Vtbl *)&d3d9_volume_vtbl);
     return CONTAINING_RECORD(iface, struct d3d9_volume, IDirect3DVolume9_iface);
 }

trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/switcher/d3d8_main.c

@@ -1 +1 @@
 /* $Id$ */
-
 /** @file
  * VBox D3D8 dll switcher
@@ -17 +16 @@
  */
 
-#include "d3d8.h"
+#include "iprt/win/d3d8.h"
 #include "switcher.h"
 

trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/switcher/d3d9_main.c

@@ -1 +1 @@
 /* $Id$ */
-
 /** @file
  * VBox D3D8 dll switcher
@@ -17 +16 @@
  */
 
-#include "d3d9.h"
+#include "iprt/win/d3d9.h"
 #include "switcher.h"
 

trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/switcher/sw_common.c

@@ -16 +16 @@
  */
 
-#include <windows.h>
+#include <iprt/win/windows.h>
 #include "switcher.h"
 

trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/switcher/switcher.h

@@ -1 +1 @@
 /* $Id$ */
-
 /** @file
  * VBox D3D8/9 dll switcher

trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/vbox/VBoxWineEx.h

@@ -54 +54 @@
 typedef FNVBOXWINEEXD3DDEV9_CREATEVOLUMETEXTURE *PFNVBOXWINEEXD3DDEV9_CREATEVOLUMETEXTURE;
 
+struct VBOXBOX3D;
+struct VBOXPOINT3D;
 typedef VBOXWINEEX_DECL(HRESULT) FNVBOXWINEEXD3DDEV9_VOLBLT(IDirect3DDevice9Ex *iface,
                                                     IDirect3DVolume9 *pSourceVolume, IDirect3DVolume9 *pDestinationVolume,

trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/vbox/libWineStub/include/wine/wined3d.h

@@ -2486 +2486 @@
 HRESULT __cdecl wined3d_device_flush_to_host(struct wined3d_device *device);
 HRESULT __cdecl wined3d_device_finish(struct wined3d_device *device);
+struct VBOXPOINT3D;
 HRESULT __cdecl wined3d_device_blt_vol(struct wined3d_device *device, struct wined3d_volume *src, struct wined3d_volume *dst, const struct wined3d_box *pSrcBoxArg, const struct VBOXPOINT3D *pDstPoin3D);
 HRESULT __cdecl wined3d_device_blt_voltex(struct wined3d_device *device, struct wined3d_texture *src, struct wined3d_texture *dst, const struct wined3d_box *pSrcBoxArg, const struct VBOXPOINT3D *pDstPoin3D);

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

@@ -321 +321 @@
     HGLRC new_ctx;
 
-    if (!(gl_info->p_wglCreateContextAttribsARB = (void *)wglGetProcAddress("wglCreateContextAttribsARB")))
+    if (!(*(PROC *)&gl_info->p_wglCreateContextAttribsARB = wglGetProcAddress("wglCreateContextAttribsARB")))
         return;
 
@@ -2651 +2651 @@
 static void load_gl_funcs(struct wined3d_gl_info *gl_info)
 {
-#define USE_GL_FUNC(pfn) gl_info->gl_ops.ext.p_##pfn = (void *)wglGetProcAddress(#pfn);
+#define USE_GL_FUNC(pfn) (*(PROC *)(&gl_info->gl_ops.ext.p_##pfn)) = wglGetProcAddress(#pfn);
     GL_EXT_FUNCS_GEN;
 #undef USE_GL_FUNC
@@ -2990 +2990 @@
     {
         TRACE("GL CORE: GL_EXT_texture3D support.\n");
-        gl_info->gl_ops.ext.p_glTexImage3DEXT = (void *)gl_info->gl_ops.ext.p_glTexImage3D;
+        *(FARPROC *)&gl_info->gl_ops.ext.p_glTexImage3DEXT = (FARPROC)gl_info->gl_ops.ext.p_glTexImage3D;
         gl_info->gl_ops.ext.p_glTexSubImage3DEXT = gl_info->gl_ops.ext.p_glTexSubImage3D;
         gl_info->supported[EXT_TEXTURE3D] = TRUE;
@@ -5324 +5324 @@
         }
 
-        pDrvValidateVersion = (void*)GetProcAddress(mod_gl, "DrvValidateVersion");
+        *(FARPROC *)&pDrvValidateVersion = GetProcAddress(mod_gl, "DrvValidateVersion");
         if(!pDrvValidateVersion) {
             ERR("Can't get DrvValidateVersion\n");
@@ -5336 +5336 @@
         }
 
-#  define VBOX_USE_FUNC(f) p##f = (void *)GetProcAddress(mod_gl, #f);
+#  define VBOX_USE_FUNC(f) (*(FARPROC *)&(p##f)) = GetProcAddress(mod_gl, #f);
         VBOX_GL_FUNCS_GEN
 #  undef VBOX_USE_FUNC
 # endif
-# define USE_GL_FUNC(f) gl_info->gl_ops.gl.p_##f = (void *)GetProcAddress(mod_gl, #f);
+# define USE_GL_FUNC(f) (*(FARPROC *)&(gl_info->gl_ops.gl.p_##f)) = GetProcAddress(mod_gl, #f);
         ALL_WGL_FUNCS
 # undef USE_GL_FUNC

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

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- *
  * VBox extension to Wine D3D - shared resource
- *
+ */
+
+/*
  * Copyright (C) 2010-2016 Oracle Corporation
  *
@@ -14 +15 @@
  * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
  */
+
 #ifndef ___vboxsharedrc_h___
 #define ___vboxsharedrc_h___
@@ -21 +23 @@
 
 #define VBOXSHRC_GET_SHAREFLAFS(_o) ((_o)->resource.sharerc_flags)
-#define VBOXSHRC_GET_SHAREHANDLE(_o) ((HANDLE)(_o)->resource.sharerc_handle)
-#define VBOXSHRC_SET_SHAREHANDLE(_o, _h) ((_o)->resource.sharerc_handle = (DWORD)(_h))
+#define VBOXSHRC_GET_SHAREHANDLE(_o) ((HANDLE)(uintptr_t)(_o)->resource.sharerc_handle)
+#define VBOXSHRC_SET_SHAREHANDLE(_o, _h) ((_o)->resource.sharerc_handle = (DWORD)(uintptr_t)(_h))
 #define VBOXSHRC_COPY_SHAREDATA(_oDst, _oSrc) do { \
         VBOXSHRC_GET_SHAREFLAFS(_oDst) = VBOXSHRC_GET_SHAREFLAFS(_oSrc);   \