VirtualBox

儲存庫 vbox 的更動 63033


忽略:
時間撮記:
2016-8-5 上午11:19:40 (8 年 以前)
作者:
vboxsync
訊息:

GA/NT/Graphics: warnings

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

圖例:

未更動
新增
刪除

  • trunk/src/VBox/Additions/WINNT/Graphics/Video/common/VBoxVideoLog.h

    r62522 r63033  
    11/* $Id$ */
    2 
    32/** @file
    43 * VBox Video drivers, logging helper

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

    r62522 r63033  
    11/* $Id$ */
    2 
    32/** @file
    43 * VBoxVideo Display D3D User mode dll
    … …  
    9190void vboxDispCmSessionCtxRemoveLocked(PVBOXDISPCM_SESSION pSession, PVBOXWDDMDISP_CONTEXT pContext)
    9291{
     92    RT_NOREF(pSession);
    9393    RTListNodeRemove(&pContext->ListNode);
    9494}
    … …  
    138138        fIsCrContext = FALSE;
    139139    }
    140     Info.hUmEvent = (uint64_t)g_pVBoxCmMgr.Session.hEvent;
    141     Info.u64UmInfo = (uint64_t)pContext;
     140    Info.hUmEvent = (uintptr_t)g_pVBoxCmMgr.Session.hEvent;
     141    Info.u64UmInfo = (uintptr_t)pContext;
    142142
    143143    if (VBOXDISPMODE_IS_3D(pDevice->pAdapter))
    … …  
    330330void vboxDispCmLog(LPCSTR pszMsg)
    331331{
     332    RT_NOREF(pszMsg);
    332333    PVBOXDISPCM_SESSION pSession = &g_pVBoxCmMgr.Session;
    333334
    … …  
    338339    if (pContext)
    339340    {
    340         PVBOXWDDMDISP_DEVICE pDevice = pContext->pDevice;
    341         Assert(pDevice);
     341        Assert(pContext->pDevice);
    342342        vboxVDbgPrint(("%s", pszMsg));
    343343    }

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

    r62679 r63033  
    1515 * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
    1616 */
    17 #ifndef __VBoxDispD3DBase_h_
    18 #define __VBoxDispD3DBase_h_
    1917
    20 #       define _InterlockedExchange           _InterlockedExchange_StupidDDKVsCompilerCrap
    21 #       define _InterlockedExchangeAdd        _InterlockedExchangeAdd_StupidDDKVsCompilerCrap
    22 #       define _InterlockedCompareExchange    _InterlockedCompareExchange_StupidDDKVsCompilerCrap
    23 #       define _InterlockedAddLargeStatistic  _InterlockedAddLargeStatistic_StupidDDKVsCompilerCrap
    24 #       define _interlockedbittestandset      _interlockedbittestandset_StupidDDKVsCompilerCrap
    25 #       define _interlockedbittestandreset    _interlockedbittestandreset_StupidDDKVsCompilerCrap
    26 #       define _interlockedbittestandset64    _interlockedbittestandset64_StupidDDKVsCompilerCrap
    27 #       define _interlockedbittestandreset64  _interlockedbittestandreset64_StupidDDKVsCompilerCrap
    28 #       pragma warning(disable : 4163)
    29 #include <iprt/win/windows.h>
    30 #       pragma warning(default : 4163)
    31 #       undef  _InterlockedExchange
    32 #       undef  _InterlockedExchangeAdd
    33 #       undef  _InterlockedCompareExchange
    34 #       undef  _InterlockedAddLargeStatistic
    35 #       undef  _interlockedbittestandset
    36 #       undef  _interlockedbittestandreset
    37 #       undef  _interlockedbittestandset64
    38 #       undef  _interlockedbittestandreset64
     18#ifndef ___VBoxDispD3DBase_h
     19#define ___VBoxDispD3DBase_h
     20
     21/* Include nt-and-windows.h here so we get NT_SUCCESS, but don't try if
     22   something windowsy is already included because that'll cause conflicts. */
     23#ifndef STATUS_WAIT_0
     24# include <iprt/nt/nt-and-windows.h>
     25#endif
    3926
    4027#include <d3d9types.h>
    … …  
    4330#include <d3dhal.h>
    4431
     32#endif
    4533
    46 #endif /* #ifndef __VBoxDispD3DBase_h_ */

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

    r62679 r63033  
    11/* $Id$ */
    2 
    32/** @file
    43 * VBoxVideo Display D3D User mode dll
    … …  
    1716 */
    1817
    19 /* @todo: move this to VBoxDispD3DCmn.h ? */
    20 #   if (_MSC_VER >= 1400) && !defined(VBOX_WITH_PATCHED_DDK)
    21 #       define _InterlockedExchange           _InterlockedExchange_StupidDDKVsCompilerCrap
    22 #       define _InterlockedExchangeAdd        _InterlockedExchangeAdd_StupidDDKVsCompilerCrap
    23 #       define _InterlockedCompareExchange    _InterlockedCompareExchange_StupidDDKVsCompilerCrap
    24 #       define _InterlockedAddLargeStatistic  _InterlockedAddLargeStatistic_StupidDDKVsCompilerCrap
    25 #       define _interlockedbittestandset      _interlockedbittestandset_StupidDDKVsCompilerCrap
    26 #       define _interlockedbittestandreset    _interlockedbittestandreset_StupidDDKVsCompilerCrap
    27 #       define _interlockedbittestandset64    _interlockedbittestandset64_StupidDDKVsCompilerCrap
    28 #       define _interlockedbittestandreset64  _interlockedbittestandreset64_StupidDDKVsCompilerCrap
    29 #       pragma warning(disable : 4163)
    30 #       include <iprt/win/windows.h>
    31 #       pragma warning(default : 4163)
    32 #       undef  _InterlockedExchange
    33 #       undef  _InterlockedExchangeAdd
    34 #       undef  _InterlockedCompareExchange
    35 #       undef  _InterlockedAddLargeStatistic
    36 #       undef  _interlockedbittestandset
    37 #       undef  _interlockedbittestandreset
    38 #       undef  _interlockedbittestandset64
    39 #       undef  _interlockedbittestandreset64
    40 #   else
    41 #       include <iprt/win/windows.h>
    42 #   endif
    43 
    4418#include "VBoxDispD3DCmn.h"
    4519
    … …  
    6034        if (!cName)
    6135        {
     36#ifdef LOG_ENABLED
    6237            DWORD winEr = GetLastError();
     38#endif
    6339            WARN(("GetModuleFileNameA failed, winEr %d", winEr));
    6440            return NULL;
    … …  
    225201static DECLCALLBACK(void) vboxVDbgAllocRectContentsDumperCb(PVBOXVDBG_DUMP_INFO pInfo, BOOLEAN fBreak, void *pvDumper)
    226202{
     203    RT_NOREF(fBreak, pvDumper);
    227204    const VBOXWDDMDISP_ALLOCATION *pAlloc = pInfo->pAlloc;
    228205    const RECT *pRect = pInfo->pRect;
    … …  
    280257static DECLCALLBACK(void) vboxVDbgRcRectContentsDumperCb(PVBOXVDBG_DUMP_INFO pInfo, BOOLEAN fBreak, void *pvDumper)
    281258{
     259    RT_NOREF(pvDumper);
    282260    const VBOXWDDMDISP_ALLOCATION *pAlloc = pInfo->pAlloc;
    283     IDirect3DResource9 *pD3DRc = pInfo->pD3DRc;
    284261    const RECT *pRect = pInfo->pRect;
    285262    IDirect3DSurface9 *pSurf;
    … …  
    353330{
    354331    IDirect3DSurface9 *pBb = NULL;
    355     HRESULT hr = pSwapchainIf->GetBackBuffer(-1, D3DBACKBUFFER_TYPE_MONO, &pBb);
     332    HRESULT hr = pSwapchainIf->GetBackBuffer(~(UINT)0, D3DBACKBUFFER_TYPE_MONO, &pBb);
    356333    Assert(hr == S_OK);
    357334    if (FAILED(hr))
    … …  
    426403static DECLCALLBACK(void) vboxVDbgLockUnlockSurfTexContentsDumperCb(PVBOXVDBG_DUMP_INFO pInfo, BOOLEAN fBreak, void *pvDumper)
    427404{
     405    RT_NOREF(pvDumper);
    428406    const VBOXWDDMDISP_ALLOCATION *pAlloc = pInfo->pAlloc;
    429407    const RECT *pRect = pInfo->pRect;
    … …  
    660638static VOID CALLBACK vboxVDbgTimerCb(__in PVOID lpParameter, __in BOOLEAN TimerOrWaitFired)
    661639{
     640    RT_NOREF(lpParameter, TimerOrWaitFired);
    662641    Assert(0);
    663642}
    … …  
    696675    if (!pszModule)
    697676        return FALSE;
    698     DWORD cbModule, cbName;
     677    size_t cbModule, cbName;
    699678    cbModule = strlen(pszModule);
    700679    cbName = strlen(pszName);

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

    r62522 r63033  
    11/* $Id$ */
    2 
    32/** @file
    4  * VBoxVideo Display D3D User mode dll
     3 * VBoxVideo Display D3D User Mode Dll.
    54 */
    65
    … …  
    2322#include <iprt/log.h>
    2423
    25 #ifndef NT_SUCCESS
    26 # define NT_SUCCESS(_Status) ((_Status) >= 0)
    27 #endif
    2824
    2925/**
    … …  
    382378    Info.crVersionMajor = crVersionMajor;
    383379    Info.crVersionMinor = crVersionMinor;
    384     Info.hUmEvent = (uint64_t)hEvent;
     380    Info.hUmEvent = (uintptr_t)hEvent;
    385381    Info.u64UmInfo = u64UmInfo;
    386382    D3DKMT_CREATECONTEXT ContextData = {0};

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

    r62522 r63033  
    11/* $Id$ */
    2 
    32/** @file
    43 * VBoxVideo Display D3D User mode dll
    … …  
    1918#include "VBoxDispD3DCmn.h"
    2019
    21 DECLCALLBACK(int) vboxUhgsmiBaseEscBufferLock(PVBOXUHGSMI_BUFFER pBuf, uint32_t offLock, uint32_t cbLock, VBOXUHGSMI_BUFFER_LOCK_FLAGS fFlags, void**pvLock)
    22 {
     20DECLCALLBACK(int) vboxUhgsmiBaseEscBufferLock(PVBOXUHGSMI_BUFFER pBuf, uint32_t offLock, uint32_t cbLock,
     21                                              VBOXUHGSMI_BUFFER_LOCK_FLAGS fFlags, void**pvLock)
     22{
     23    RT_NOREF(cbLock, fFlags);
    2324    PVBOXUHGSMI_BUFFER_PRIVATE_ESC_BASE pBuffer = VBOXUHGSMIESCBASE_GET_BUFFER(pBuf);
    2425    *pvLock = (void*)(pBuffer->Alloc.pvData + offLock);
    … …  
    2829DECLCALLBACK(int) vboxUhgsmiBaseEscBufferUnlock(PVBOXUHGSMI_BUFFER pBuf)
    2930{
     31    RT_NOREF(pBuf);
    3032    return VINF_SUCCESS;
    3133}
    … …  
    5557        if (!*phSynch)
    5658        {
    57             DWORD winEr = GetLastError();
     59            /*DWORD winEr = GetLastError(); - unused */
    5860            /* todo: translate winer */
    5961            return VERR_GENERAL_FAILURE;
    … …  
    6365}
    6466
    65 int vboxUhgsmiKmtEscBufferInit(PVBOXUHGSMI_PRIVATE_BASE pPrivate, PVBOXUHGSMI_BUFFER_PRIVATE_ESC_BASE pBuffer, uint32_t cbBuf, VBOXUHGSMI_BUFFER_TYPE_FLAGS fUhgsmiType, PFNVBOXUHGSMI_BUFFER_DESTROY pfnDestroy)
     67int vboxUhgsmiKmtEscBufferInit(PVBOXUHGSMI_PRIVATE_BASE pPrivate, PVBOXUHGSMI_BUFFER_PRIVATE_ESC_BASE pBuffer, uint32_t cbBuf,
     68                               VBOXUHGSMI_BUFFER_TYPE_FLAGS fUhgsmiType, PFNVBOXUHGSMI_BUFFER_DESTROY pfnDestroy)
    6669{
    6770    HANDLE hSynch = NULL;
    … …  
    7881    cbBuf = VBOXWDDM_ROUNDBOUND(cbBuf, 0x1000);
    7982    Assert(cbBuf);
     83#ifdef VBOX_STRICT
    8084    uint32_t cPages = cbBuf >> 12;
    8185    Assert(cPages);
     86#endif
    8287
    8388    VBOXDISPIFESCAPE_UHGSMI_ALLOCATE AllocInfo = {0};
    8489    AllocInfo.EscapeHdr.escapeCode = VBOXESC_UHGSMI_ALLOCATE;
    8590    AllocInfo.Alloc.cbData = cbBuf;
    86     AllocInfo.Alloc.hSynch = (uint64_t)hSynch;
     91    AllocInfo.Alloc.hSynch = (uintptr_t)hSynch;
    8792    AllocInfo.Alloc.fUhgsmiType = fUhgsmiType;
    8893
    … …  
    122127}
    123128
    124 DECLCALLBACK(int) vboxUhgsmiBaseEscBufferCreate(PVBOXUHGSMI pHgsmi, uint32_t cbBuf, VBOXUHGSMI_BUFFER_TYPE_FLAGS fUhgsmiType, PVBOXUHGSMI_BUFFER* ppBuf)
     129DECLCALLBACK(int) vboxUhgsmiBaseEscBufferCreate(PVBOXUHGSMI pHgsmi, uint32_t cbBuf, VBOXUHGSMI_BUFFER_TYPE_FLAGS fUhgsmiType,
     130                                                PVBOXUHGSMI_BUFFER* ppBuf)
    125131{
    126132    *ppBuf = NULL;
    … …  
    190196    }
    191197
    192     int rc = vboxCrHgsmiPrivateEscape(pPrivate, &Buf.SubmitInfo, RT_OFFSETOF(VBOXDISPIFESCAPE_UHGSMI_SUBMIT, aBuffers[cBuffers]), FALSE);
     198    int rc = vboxCrHgsmiPrivateEscape(pPrivate, &Buf.SubmitInfo, RT_OFFSETOF(VBOXDISPIFESCAPE_UHGSMI_SUBMIT, aBuffers[cBuffers]),
     199                                      FALSE);
    193200    if (RT_SUCCESS(rc))
    194201    {

  • trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/xpdm/VBoxDispInternal.h

    r62522 r63033  
    11/* $Id$ */
    2 
    32/** @file
    43 * VBox XPDM Display driver, internal header
    … …  
    2524#include <iprt/err.h>
    2625#include <iprt/assert.h>
    27 #include <windef.h>
     26#include <iprt/win/windef.h>
    2827#include <wingdi.h>
    2928#include <winddi.h>

  • trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/xpdm/VBoxDispVBVA.cpp

    r62522 r63033  
    11/* $Id$ */
    2 
    32/** @file
    43 * VBox XPDM Display driver
注意: 瀏覽 TracChangeset 來幫助您使用更動檢視器

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