VirtualBox

儲存庫 vbox 的更動 63017


忽略:
時間撮記:
2016-8-4 下午11:02:57 (8 年 以前)
作者:
vboxsync
訊息:

GA/NT/Graphics: warnings

位置:
trunk
檔案:
新增 1 筆資料
修改 5 筆資料

圖例:

未更動
新增
刪除

  • trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/VBoxDispD3DIf.cpp

    r62522 r63017  
    11/* $Id$ */
    2 
    32/** @file
    43 * VBoxVideo Display D3D User mode dll
    … …  
    6261    if (!pD3D->hD3DLib)
    6362    {
    64         DWORD winErr = GetLastError();
     63        DWORD winErr = GetLastError(); NOREF(winErr)
    6564        WARN((__FUNCTION__": LoadLibrary failed, winErr = (%d)", winErr));
    6665        return E_FAIL;
    … …  
    11461145    }
    11471146
    1148 #if DEBUG
     1147#ifdef DEBUG
    11491148    vboxDispCheckCapsLevel(pCaps);
    11501149#endif
    … …  
    12021201    pCaps->MaxVertexW = 10000000000.f; /* Required by D3D feature level 9.3. */
    12031202
    1204 #if DEBUG
     1203#ifdef DEBUG
    12051204    vboxDispCheckCapsLevel(pCaps);
    12061205#endif

  • trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/VBoxDispD3DIf.h

    r62522 r63017  
    11/* $Id$ */
    2 
    32/** @file
    43 * VBoxVideo Display D3D User mode dll
    … …  
    2322#include <iprt/critsect.h>
    2423#include <iprt/semaphore.h>
    25 
    26 #       define _InterlockedExchange           _InterlockedExchange_StupidDDKVsCompilerCrap
    27 #       define _InterlockedExchangeAdd        _InterlockedExchangeAdd_StupidDDKVsCompilerCrap
    28 #       define _InterlockedCompareExchange    _InterlockedCompareExchange_StupidDDKVsCompilerCrap
    29 #       define _InterlockedAddLargeStatistic  _InterlockedAddLargeStatistic_StupidDDKVsCompilerCrap
    30 #       define _interlockedbittestandset      _interlockedbittestandset_StupidDDKVsCompilerCrap
    31 #       define _interlockedbittestandreset    _interlockedbittestandreset_StupidDDKVsCompilerCrap
    32 #       define _interlockedbittestandset64    _interlockedbittestandset64_StupidDDKVsCompilerCrap
    33 #       define _interlockedbittestandreset64  _interlockedbittestandreset64_StupidDDKVsCompilerCrap
    34 #       pragma warning(disable : 4163)
    35 #include <D3D9.h>
    36 #       pragma warning(default : 4163)
    37 #       undef  _InterlockedExchange
    38 #       undef  _InterlockedExchangeAdd
    39 #       undef  _InterlockedCompareExchange
    40 #       undef  _InterlockedAddLargeStatistic
    41 #       undef  _interlockedbittestandset
    42 #       undef  _interlockedbittestandreset
    43 #       undef  _interlockedbittestandset64
    44 #       undef  _interlockedbittestandreset64
    45 
     24#include <iprt/win/d3d9.h>
    4625#include "../../../Wine_new/vbox/VBoxWineEx.h"
    4726
    … …  
    10382} VBOXWDDMDISP_D3D, *PVBOXWDDMDISP_D3D;
    10483
    105 void VBoxDispD3DGlobalInit();
    106 void VBoxDispD3DGlobalTerm();
     84void VBoxDispD3DGlobalInit(void);
     85void VBoxDispD3DGlobalTerm(void);
    10786HRESULT VBoxDispD3DGlobalOpen(PVBOXWDDMDISP_D3D pD3D, PVBOXWDDMDISP_FORMATS pFormats);
    10887void VBoxDispD3DGlobalClose(PVBOXWDDMDISP_D3D pD3D, PVBOXWDDMDISP_FORMATS pFormats);

  • trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/VBoxUhgsmiBase.h

    r62679 r63017  
    11/* $Id$ */
    2 
    32/** @file
    43 * VBoxVideo Display D3D User mode dll
    … …  
    8988#define VBOXUHGSMDXALLOCBASE_GET_BUFFER(_p) VBOXUHGSMIPRIVATEBASE_GET_PRIVATE(_p, VBOXUHGSMI_BUFFER_PRIVATE_DX_ALLOC_BASE)
    9089
    91 DECLINLINE(int) vboxUhgsmiBaseDxLockData(PVBOXUHGSMI_BUFFER_PRIVATE_DX_ALLOC_BASE pPrivate, uint32_t offLock, uint32_t cbLock, VBOXUHGSMI_BUFFER_LOCK_FLAGS fFlags,
    92                                     D3DDDICB_LOCKFLAGS *pfFlags, UINT *pNumPages)
     90DECLINLINE(int) vboxUhgsmiBaseDxLockData(PVBOXUHGSMI_BUFFER_PRIVATE_DX_ALLOC_BASE pPrivate, uint32_t offLock, uint32_t cbLock,
     91                                         VBOXUHGSMI_BUFFER_LOCK_FLAGS fFlags, D3DDDICB_LOCKFLAGS *pfFlags, UINT *pNumPages)
    9392{
    9493    PVBOXUHGSMI_BUFFER pBuf = &pPrivate->BasePrivate.Base;
    … …  
    143142}
    144143
    145 DECLINLINE(void) vboxUhgsmiBaseDxAllocInfoFill(D3DDDI_ALLOCATIONINFO *pDdiAllocInfo, VBOXWDDM_ALLOCINFO *pAllocInfo, uint32_t cbBuffer, VBOXUHGSMI_BUFFER_TYPE_FLAGS fUhgsmiType)
     144DECLINLINE(void) vboxUhgsmiBaseDxAllocInfoFill(D3DDDI_ALLOCATIONINFO *pDdiAllocInfo, VBOXWDDM_ALLOCINFO *pAllocInfo,
     145                                               uint32_t cbBuffer, VBOXUHGSMI_BUFFER_TYPE_FLAGS fUhgsmiType)
    146146{
    147147    memset(pDdiAllocInfo, 0, sizeof (*pDdiAllocInfo));
    … …  
    155155
    156156DECLINLINE(int) vboxUhgsmiBaseDxDmaFill(PVBOXUHGSMI_BUFFER_SUBMIT aBuffers, uint32_t cBuffers,
    157         VOID* pCommandBuffer, UINT *pCommandBufferSize,
    158         D3DDDI_ALLOCATIONLIST *pAllocationList, UINT AllocationListSize,
    159         D3DDDI_PATCHLOCATIONLIST *pPatchLocationList, UINT PatchLocationListSize)
     157                                        VOID *pCommandBuffer, UINT *pCommandBufferSize,
     158                                        D3DDDI_ALLOCATIONLIST *pAllocationList, UINT AllocationListSize,
     159                                        D3DDDI_PATCHLOCATIONLIST *pPatchLocationList, UINT PatchLocationListSize)
    160160{
    161161    const uint32_t cbDmaCmd = RT_OFFSETOF(VBOXWDDM_DMA_PRIVATEDATA_UM_CHROMIUM_CMD, aBufInfos[cBuffers]);
    … …  
    215215DECLCALLBACK(int) vboxUhgsmiBaseEscBufferDestroy(PVBOXUHGSMI_BUFFER pBuf);
    216216DECLCALLBACK(int) vboxUhgsmiBaseEscBufferCreate(PVBOXUHGSMI pHgsmi, uint32_t cbBuf, VBOXUHGSMI_BUFFER_TYPE_FLAGS fUhgsmiType, PVBOXUHGSMI_BUFFER* ppBuf);
     217
    217218DECLINLINE(void) vboxUhgsmiBaseInit(PVBOXUHGSMI_PRIVATE_BASE pHgsmi, PFNVBOXCRHGSMI_ESCAPE pfnEscape)
    218219{

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

    r48345 r63017  
    277277
    278278#define WINE_DECLARE_DEBUG_CHANNEL(ch) \
    279     static struct __wine_debug_channel __wine_dbch_##ch = { ~0, #ch }
     279    static struct __wine_debug_channel __wine_dbch_##ch = { /*was: ~0, VBox:*/ UINT8_MAX, #ch }
    280280#define WINE_DEFAULT_DEBUG_CHANNEL(ch) \
    281     static struct __wine_debug_channel __wine_dbch_##ch = { ~0, #ch }; \
     281    static struct __wine_debug_channel __wine_dbch_##ch = { /*was: ~0, VBox:*/ UINT8_MAX, #ch }; \
    282282    static struct __wine_debug_channel * const __wine_dbch___default = &__wine_dbch_##ch
    283283

  • trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/wined3d/vboxext.c

    r62522 r63017  
    335335static DWORD g_cVBoxExtInits = 0;
    336336
    337 static DWORD vboxExtAddRef()
     337static DWORD vboxExtAddRef(void)
    338338{
    339339    return ++g_cVBoxExtInits;
    340340}
    341341
    342 static DWORD vboxExtRelease()
     342static DWORD vboxExtRelease(void)
    343343{
    344344    DWORD cVBoxExtInits = --g_cVBoxExtInits;
    … …  
    347347}
    348348
    349 static DWORD vboxExtGetRef()
     349static DWORD vboxExtGetRef(void)
    350350{
    351351    return g_cVBoxExtInits;
    352352}
    353353
    354 HRESULT VBoxExtCheckInit()
     354HRESULT VBoxExtCheckInit(void)
    355355{
    356356    HRESULT hr = S_OK;
    … …  
    368368}
    369369
    370 HRESULT VBoxExtCheckTerm()
     370HRESULT VBoxExtCheckTerm(void)
    371371{
    372372    HRESULT hr = S_OK;
注意: 瀏覽 TracChangeset 來幫助您使用更動檢視器

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