VirtualBox

vbox的更動 63024 路徑 trunk/src


忽略:
時間撮記:
2016-8-5 上午12:47:28 (8 年 以前)
作者:
vboxsync
訊息:

GA/NT/Graphics: warnings

位置:
trunk/src/VBox/Additions/WINNT/Graphics/Wine_new
檔案:
修改 13 筆資料

圖例:

未更動
新增
刪除

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

    r63021 r63024  
    4444#  -wd4245: '=' : conversion from 'int' to 'DWORD', signed/unsigned mismatch
    4545#  -wd4305: 'function' : truncation from 'double' to 'GLclampf'
    46 TEMPLATE_VBoxGuestWineDLL_CFLAGS = $(TEMPLATE_VBOXGUESTR3NPDLL_CFLAGS) -wd4100  -wd4204 -wd4245 -wd4305
     46TEMPLATE_VBoxGuestWineDLL_CFLAGS = $(filter-out -WX,$(TEMPLATE_VBOXGUESTR3NPDLL_CFLAGS)) -wd4100  -wd4204 -wd4245 -wd4305
    4747
    4848#

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

    r51270 r63024  
    4545#include "winuser.h"
    4646#else
    47 #include <windows.h>
     47# include <iprt/win/windows.h>
    4848#endif
    4949#include "wine/debug.h"

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

    r48345 r63024  
    13281328    HRESULT hr;
    13291329
    1330     texture->IDirect3DBaseTexture9_iface.lpVtbl = (const IDirect3DBaseTexture9Vtbl *)&d3d9_texture_2d_vtbl;
     1330    texture->IDirect3DBaseTexture9_iface.lpVtbl = (/*const*/ IDirect3DBaseTexture9Vtbl *)&d3d9_texture_2d_vtbl;
    13311331    texture->refcount = 1;
    13321332
    … …  
    13781378    HRESULT hr;
    13791379
    1380     texture->IDirect3DBaseTexture9_iface.lpVtbl = (const IDirect3DBaseTexture9Vtbl *)&d3d9_texture_cube_vtbl;
     1380    texture->IDirect3DBaseTexture9_iface.lpVtbl = (/*const*/ IDirect3DBaseTexture9Vtbl *)&d3d9_texture_cube_vtbl;
    13811381    texture->refcount = 1;
    13821382
    … …  
    14271427    HRESULT hr;
    14281428
    1429     texture->IDirect3DBaseTexture9_iface.lpVtbl = (const IDirect3DBaseTexture9Vtbl *)&d3d9_texture_3d_vtbl;
     1429    texture->IDirect3DBaseTexture9_iface.lpVtbl = (/*const*/ IDirect3DBaseTexture9Vtbl *)&d3d9_texture_3d_vtbl;
    14301430    texture->refcount = 1;
    14311431

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

    r48345 r63024  
    389389    }
    390390
    391     declaration->IDirect3DVertexDeclaration9_iface.lpVtbl = &d3d9_vertex_declaration_vtbl;
     391    declaration->IDirect3DVertexDeclaration9_iface.lpVtbl = (struct IDirect3DVertexDeclaration9Vtbl *)&d3d9_vertex_declaration_vtbl;
    392392    declaration->refcount = 1;
    393393

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

    r48345 r63024  
    294294    HRESULT hr;
    295295
    296     volume->IDirect3DVolume9_iface.lpVtbl = &d3d9_volume_vtbl;
     296    volume->IDirect3DVolume9_iface.lpVtbl = (struct IDirect3DVolume9Vtbl *)&d3d9_volume_vtbl;
    297297    volume->refcount = 1;
    298298
    … …  
    318318    if (!iface)
    319319        return NULL;
    320     assert(iface->lpVtbl == (const IDirect3DVolume9Vtbl *)&d3d9_volume_vtbl);
     320    assert(iface->lpVtbl == (IDirect3DVolume9Vtbl *)&d3d9_volume_vtbl);
    321321    return CONTAINING_RECORD(iface, struct d3d9_volume, IDirect3DVolume9_iface);
    322322}

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

    r62522 r63024  
    11/* $Id$ */
    2 
    32/** @file
    43 * VBox D3D8 dll switcher
    … …  
    1716 */
    1817
    19 #include "d3d8.h"
     18#include "iprt/win/d3d8.h"
    2019#include "switcher.h"
    2120

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

    r62522 r63024  
    11/* $Id$ */
    2 
    32/** @file
    43 * VBox D3D8 dll switcher
    … …  
    1716 */
    1817
    19 #include "d3d9.h"
     18#include "iprt/win/d3d9.h"
    2019#include "switcher.h"
    2120

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

    r62522 r63024  
    1616 */
    1717
    18 #include <windows.h>
     18#include <iprt/win/windows.h>
    1919#include "switcher.h"
    2020

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

    r62522 r63024  
    11/* $Id$ */
    2 
    32/** @file
    43 * VBox D3D8/9 dll switcher

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

    r62522 r63024  
    5454typedef FNVBOXWINEEXD3DDEV9_CREATEVOLUMETEXTURE *PFNVBOXWINEEXD3DDEV9_CREATEVOLUMETEXTURE;
    5555
     56struct VBOXBOX3D;
     57struct VBOXPOINT3D;
    5658typedef VBOXWINEEX_DECL(HRESULT) FNVBOXWINEEXD3DDEV9_VOLBLT(IDirect3DDevice9Ex *iface,
    5759                                                    IDirect3DVolume9 *pSourceVolume, IDirect3DVolume9 *pDestinationVolume,

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

    r48345 r63024  
    24862486HRESULT __cdecl wined3d_device_flush_to_host(struct wined3d_device *device);
    24872487HRESULT __cdecl wined3d_device_finish(struct wined3d_device *device);
     2488struct VBOXPOINT3D;
    24882489HRESULT __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);
    24892490HRESULT __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

    r51270 r63024  
    321321    HGLRC new_ctx;
    322322
    323     if (!(gl_info->p_wglCreateContextAttribsARB = (void *)wglGetProcAddress("wglCreateContextAttribsARB")))
     323    if (!(*(PROC *)&gl_info->p_wglCreateContextAttribsARB = wglGetProcAddress("wglCreateContextAttribsARB")))
    324324        return;
    325325
    … …  
    26512651static void load_gl_funcs(struct wined3d_gl_info *gl_info)
    26522652{
    2653 #define USE_GL_FUNC(pfn) gl_info->gl_ops.ext.p_##pfn = (void *)wglGetProcAddress(#pfn);
     2653#define USE_GL_FUNC(pfn) (*(PROC *)(&gl_info->gl_ops.ext.p_##pfn)) = wglGetProcAddress(#pfn);
    26542654    GL_EXT_FUNCS_GEN;
    26552655#undef USE_GL_FUNC
    … …  
    29902990    {
    29912991        TRACE("GL CORE: GL_EXT_texture3D support.\n");
    2992         gl_info->gl_ops.ext.p_glTexImage3DEXT = (void *)gl_info->gl_ops.ext.p_glTexImage3D;
     2992        *(FARPROC *)&gl_info->gl_ops.ext.p_glTexImage3DEXT = (FARPROC)gl_info->gl_ops.ext.p_glTexImage3D;
    29932993        gl_info->gl_ops.ext.p_glTexSubImage3DEXT = gl_info->gl_ops.ext.p_glTexSubImage3D;
    29942994        gl_info->supported[EXT_TEXTURE3D] = TRUE;
    … …  
    53245324        }
    53255325
    5326         pDrvValidateVersion = (void*)GetProcAddress(mod_gl, "DrvValidateVersion");
     5326        *(FARPROC *)&pDrvValidateVersion = GetProcAddress(mod_gl, "DrvValidateVersion");
    53275327        if(!pDrvValidateVersion) {
    53285328            ERR("Can't get DrvValidateVersion\n");
    … …  
    53365336        }
    53375337
    5338 #  define VBOX_USE_FUNC(f) p##f = (void *)GetProcAddress(mod_gl, #f);
     5338#  define VBOX_USE_FUNC(f) (*(FARPROC *)&(p##f)) = GetProcAddress(mod_gl, #f);
    53395339        VBOX_GL_FUNCS_GEN
    53405340#  undef VBOX_USE_FUNC
    53415341# endif
    5342 # define USE_GL_FUNC(f) gl_info->gl_ops.gl.p_##f = (void *)GetProcAddress(mod_gl, #f);
     5342# define USE_GL_FUNC(f) (*(FARPROC *)&(gl_info->gl_ops.gl.p_##f)) = GetProcAddress(mod_gl, #f);
    53435343        ALL_WGL_FUNCS
    53445344# undef USE_GL_FUNC

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

    r62522 r63024  
    11/* $Id$ */
    22/** @file
    3  *
    43 * VBox extension to Wine D3D - shared resource
    5  *
     4 */
     5
     6/*
    67 * Copyright (C) 2010-2016 Oracle Corporation
    78 *
    … …  
    1415 * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
    1516 */
     17
    1618#ifndef ___vboxsharedrc_h___
    1719#define ___vboxsharedrc_h___
    … …  
    2123
    2224#define VBOXSHRC_GET_SHAREFLAFS(_o) ((_o)->resource.sharerc_flags)
    23 #define VBOXSHRC_GET_SHAREHANDLE(_o) ((HANDLE)(_o)->resource.sharerc_handle)
    24 #define VBOXSHRC_SET_SHAREHANDLE(_o, _h) ((_o)->resource.sharerc_handle = (DWORD)(_h))
     25#define VBOXSHRC_GET_SHAREHANDLE(_o) ((HANDLE)(uintptr_t)(_o)->resource.sharerc_handle)
     26#define VBOXSHRC_SET_SHAREHANDLE(_o, _h) ((_o)->resource.sharerc_handle = (DWORD)(uintptr_t)(_h))
    2527#define VBOXSHRC_COPY_SHAREDATA(_oDst, _oSrc) do { \
    2628        VBOXSHRC_GET_SHAREFLAFS(_oDst) = VBOXSHRC_GET_SHAREFLAFS(_oSrc);   \
注意: 瀏覽 TracChangeset 來幫助您使用更動檢視器

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette