VirtualBox

Changeset 60274 in vbox for trunk/src/VBox/Additions/WINNT


Ignore:
Timestamp:
Mar 31, 2016 11:30:37 AM (9 years ago)
Author:
vboxsync
Message:

Additions: try to purge all ocurrences of __FUNCTION__

Location:
trunk/src/VBox/Additions/WINNT
Files:
2 edited

Legend:

Unmodified
Added
Removed

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

    r50928 r60274  
    5757        bool bSupportedWin8 = true;
    5858        pCallbacks->pfnD3DKMTOpenAdapterFromHdc = (PFND3DKMT_OPENADAPTERFROMHDC)GetProcAddress(pCallbacks->hGdi32, "D3DKMTOpenAdapterFromHdc");
    59         Log((__FUNCTION__"pfnD3DKMTOpenAdapterFromHdc = %p\n", pCallbacks->pfnD3DKMTOpenAdapterFromHdc));
     59        LogFunc(("pfnD3DKMTOpenAdapterFromHdc = %p\n", pCallbacks->pfnD3DKMTOpenAdapterFromHdc));
    6060        bSupported &= !!(pCallbacks->pfnD3DKMTOpenAdapterFromHdc);
    6161
    6262        pCallbacks->pfnD3DKMTOpenAdapterFromGdiDisplayName = (PFND3DKMT_OPENADAPTERFROMGDIDISPLAYNAME)GetProcAddress(pCallbacks->hGdi32, "D3DKMTOpenAdapterFromGdiDisplayName");
    63         Log((__FUNCTION__": pfnD3DKMTOpenAdapterFromGdiDisplayName = %p\n", pCallbacks->pfnD3DKMTOpenAdapterFromGdiDisplayName));
     63        LogFunc(("pfnD3DKMTOpenAdapterFromGdiDisplayName = %p\n", pCallbacks->pfnD3DKMTOpenAdapterFromGdiDisplayName));
    6464        bSupported &= !!(pCallbacks->pfnD3DKMTOpenAdapterFromGdiDisplayName);
    6565
    6666        pCallbacks->pfnD3DKMTCloseAdapter = (PFND3DKMT_CLOSEADAPTER)GetProcAddress(pCallbacks->hGdi32, "D3DKMTCloseAdapter");
    67         Log((__FUNCTION__": pfnD3DKMTCloseAdapter = %p\n", pCallbacks->pfnD3DKMTCloseAdapter));
     67        LogFunc(("pfnD3DKMTCloseAdapter = %p\n", pCallbacks->pfnD3DKMTCloseAdapter));
    6868        bSupported &= !!(pCallbacks->pfnD3DKMTCloseAdapter);
    6969
    7070        pCallbacks->pfnD3DKMTEscape = (PFND3DKMT_ESCAPE)GetProcAddress(pCallbacks->hGdi32, "D3DKMTEscape");
    71         Log((__FUNCTION__": pfnD3DKMTEscape = %p\n", pCallbacks->pfnD3DKMTEscape));
     71        LogFunc(("pfnD3DKMTEscape = %p\n", pCallbacks->pfnD3DKMTEscape));
    7272        bSupported &= !!(pCallbacks->pfnD3DKMTEscape);
    7373
    7474        pCallbacks->pfnD3DKMTQueryAdapterInfo = (PFND3DKMT_QUERYADAPTERINFO)GetProcAddress(pCallbacks->hGdi32, "D3DKMTQueryAdapterInfo");
    75         Log((__FUNCTION__": pfnD3DKMTQueryAdapterInfo = %p\n", pCallbacks->pfnD3DKMTQueryAdapterInfo));
     75        LogFunc(("pfnD3DKMTQueryAdapterInfo = %p\n", pCallbacks->pfnD3DKMTQueryAdapterInfo));
    7676        bSupported &= !!(pCallbacks->pfnD3DKMTQueryAdapterInfo);
    7777
    7878                pCallbacks->pfnD3DKMTCreateDevice = (PFND3DKMT_CREATEDEVICE)GetProcAddress(pCallbacks->hGdi32, "D3DKMTCreateDevice");
    79         Log((__FUNCTION__": pfnD3DKMTCreateDevice = %p\n", pCallbacks->pfnD3DKMTCreateDevice));
     79        LogFunc(("pfnD3DKMTCreateDevice = %p\n", pCallbacks->pfnD3DKMTCreateDevice));
    8080        bSupported &= !!(pCallbacks->pfnD3DKMTCreateDevice);
    8181
    8282        pCallbacks->pfnD3DKMTDestroyDevice = (PFND3DKMT_DESTROYDEVICE)GetProcAddress(pCallbacks->hGdi32, "D3DKMTDestroyDevice");
    83         Log((__FUNCTION__": pfnD3DKMTDestroyDevice = %p\n", pCallbacks->pfnD3DKMTDestroyDevice));
     83        LogFunc(("pfnD3DKMTDestroyDevice = %p\n", pCallbacks->pfnD3DKMTDestroyDevice));
    8484        bSupported &= !!(pCallbacks->pfnD3DKMTDestroyDevice);
    8585
    8686        pCallbacks->pfnD3DKMTCreateContext = (PFND3DKMT_CREATECONTEXT)GetProcAddress(pCallbacks->hGdi32, "D3DKMTCreateContext");
    87         Log((__FUNCTION__": pfnD3DKMTCreateContext = %p\n", pCallbacks->pfnD3DKMTCreateContext));
     87        LogFunc(("pfnD3DKMTCreateContext = %p\n", pCallbacks->pfnD3DKMTCreateContext));
    8888        bSupported &= !!(pCallbacks->pfnD3DKMTCreateContext);
    8989
    9090        pCallbacks->pfnD3DKMTDestroyContext = (PFND3DKMT_DESTROYCONTEXT)GetProcAddress(pCallbacks->hGdi32, "D3DKMTDestroyContext");
    91         Log((__FUNCTION__": pfnD3DKMTDestroyContext = %p\n", pCallbacks->pfnD3DKMTDestroyContext));
     91        LogFunc(("pfnD3DKMTDestroyContext = %p\n", pCallbacks->pfnD3DKMTDestroyContext));
    9292        bSupported &= !!(pCallbacks->pfnD3DKMTDestroyContext);
    9393
    9494        pCallbacks->pfnD3DKMTRender = (PFND3DKMT_RENDER)GetProcAddress(pCallbacks->hGdi32, "D3DKMTRender");
    95         Log((__FUNCTION__": pfnD3DKMTRender = %p\n", pCallbacks->pfnD3DKMTRender));
     95        LogFunc(("pfnD3DKMTRender = %p\n", pCallbacks->pfnD3DKMTRender));
    9696        bSupported &= !!(pCallbacks->pfnD3DKMTRender);
    9797
    9898        pCallbacks->pfnD3DKMTCreateAllocation = (PFND3DKMT_CREATEALLOCATION)GetProcAddress(pCallbacks->hGdi32, "D3DKMTCreateAllocation");
    99         Log((__FUNCTION__": pfnD3DKMTCreateAllocation = %p\n", pCallbacks->pfnD3DKMTCreateAllocation));
     99        LogFunc(("pfnD3DKMTCreateAllocation = %p\n", pCallbacks->pfnD3DKMTCreateAllocation));
    100100        bSupported &= !!(pCallbacks->pfnD3DKMTCreateAllocation);
    101101
    102102        pCallbacks->pfnD3DKMTDestroyAllocation = (PFND3DKMT_DESTROYALLOCATION)GetProcAddress(pCallbacks->hGdi32, "D3DKMTDestroyAllocation");
    103         Log((__FUNCTION__": pfnD3DKMTDestroyAllocation = %p\n", pCallbacks->pfnD3DKMTDestroyAllocation));
     103        LogFunc(("pfnD3DKMTDestroyAllocation = %p\n", pCallbacks->pfnD3DKMTDestroyAllocation));
    104104        bSupported &= !!(pCallbacks->pfnD3DKMTDestroyAllocation);
    105105
    106106        pCallbacks->pfnD3DKMTLock = (PFND3DKMT_LOCK)GetProcAddress(pCallbacks->hGdi32, "D3DKMTLock");
    107         Log((__FUNCTION__": pfnD3DKMTLock = %p\n", pCallbacks->pfnD3DKMTLock));
     107        LogFunc(("pfnD3DKMTLock = %p\n", pCallbacks->pfnD3DKMTLock));
    108108        bSupported &= !!(pCallbacks->pfnD3DKMTLock);
    109109
    110110        pCallbacks->pfnD3DKMTUnlock = (PFND3DKMT_UNLOCK)GetProcAddress(pCallbacks->hGdi32, "D3DKMTUnlock");
    111         Log((__FUNCTION__": pfnD3DKMTUnlock = %p\n", pCallbacks->pfnD3DKMTUnlock));
     111        LogFunc(("pfnD3DKMTUnlock = %p\n", pCallbacks->pfnD3DKMTUnlock));
    112112        bSupported &= !!(pCallbacks->pfnD3DKMTUnlock);
    113113
    114114        pCallbacks->pfnD3DKMTInvalidateActiveVidPn = (PFND3DKMT_INVALIDATEACTIVEVIDPN)GetProcAddress(pCallbacks->hGdi32, "D3DKMTInvalidateActiveVidPn");
    115         Log((__FUNCTION__": pfnD3DKMTInvalidateActiveVidPn = %p\n", pCallbacks->pfnD3DKMTInvalidateActiveVidPn));
     115        LogFunc(("pfnD3DKMTInvalidateActiveVidPn = %p\n", pCallbacks->pfnD3DKMTInvalidateActiveVidPn));
    116116        bSupported &= !!(pCallbacks->pfnD3DKMTInvalidateActiveVidPn);
    117117
    118118        pCallbacks->pfnD3DKMTPollDisplayChildren = (PFND3DKMT_POLLDISPLAYCHILDREN)GetProcAddress(pCallbacks->hGdi32, "D3DKMTPollDisplayChildren");
    119         Log((__FUNCTION__": pfnD3DKMTPollDisplayChildren = %p\n", pCallbacks->pfnD3DKMTPollDisplayChildren));
     119        LogFunc(("pfnD3DKMTPollDisplayChildren = %p\n", pCallbacks->pfnD3DKMTPollDisplayChildren));
    120120        bSupported &= !!(pCallbacks->pfnD3DKMTPollDisplayChildren);
    121121
    122122        pCallbacks->pfnD3DKMTEnumAdapters = (PFND3DKMT_ENUMADAPTERS)GetProcAddress(pCallbacks->hGdi32, "D3DKMTEnumAdapters");
    123         Log((__FUNCTION__": pfnD3DKMTEnumAdapters = %p\n", pCallbacks->pfnD3DKMTEnumAdapters));
     123        LogFunc(("pfnD3DKMTEnumAdapters = %p\n", pCallbacks->pfnD3DKMTEnumAdapters));
    124124        /* this present starting win8 release preview only, so keep going if it is not available,
    125125         * i.e. do not clear the bSupported on its absence */
    … …  
    127127
    128128        pCallbacks->pfnD3DKMTOpenAdapterFromLuid = (PFND3DKMT_OPENADAPTERFROMLUID)GetProcAddress(pCallbacks->hGdi32, "D3DKMTOpenAdapterFromLuid");
    129         Log((__FUNCTION__": pfnD3DKMTOpenAdapterFromLuid = %p\n", pCallbacks->pfnD3DKMTOpenAdapterFromLuid));
     129        LogFunc(("pfnD3DKMTOpenAdapterFromLuid = %p\n", pCallbacks->pfnD3DKMTOpenAdapterFromLuid));
    130130        /* this present starting win8 release preview only, so keep going if it is not available,
    131131         * i.e. do not clear the bSupported on its absence */
    … …  
    143143        else
    144144        {
    145             Log((__FUNCTION__": one of pfnD3DKMT function pointers failed to initialize\n"));
     145            LogFunc(("one of pfnD3DKMT function pointers failed to initialize\n"));
    146146            hr = E_NOINTERFACE;
    147147        }
    … …  
    242242    else
    243243    {
    244         Log((__FUNCTION__": pfnD3DKMTOpenAdapterFromGdiDisplayName failed, Status (0x%x)\n", Status));
     244        LogFunc(("pfnD3DKMTOpenAdapterFromGdiDisplayName failed, Status (0x%x)\n", Status));
    245245        hr = E_FAIL;
    246246    }
    … …  
    328328    }
    329329
    330     Log((__FUNCTION__": pfnD3DKMTCloseAdapter failed, Status (0x%x)\n", Status));
     330    LogFunc(("pfnD3DKMTCloseAdapter failed, Status (0x%x)\n", Status));
    331331
    332332    return E_FAIL;

  • trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxDispIf.cpp

    r57741 r60274  
    2929            Log(_m); \
    3030        } while (0)
     31#define WARN_FUNC(_m) do { \
     32            Assert(0); \
     33            LogFunc(_m); \
     34        } while (0)
    3135#else
    3236#define WARN(_m) do { \
    3337            Log(_m); \
     38        } while (0)
     39#define WARN_FUNC(_m) do { \
     40            LogFunc(_m); \
    3441        } while (0)
    3542#endif
    … …  
    608615    if (OSinfo.dwMajorVersion >= 6)
    609616    {
    610         Log((__FUNCTION__": this is vista and up\n"));
     617        LogFunc(("this is vista and up\n"));
    611618        HMODULE hUser = GetModuleHandle("user32.dll");
    612619        if (hUser)
    613620        {
    614621            *(uintptr_t *)&pIf->modeData.wddm.pfnChangeDisplaySettingsEx = (uintptr_t)GetProcAddress(hUser, "ChangeDisplaySettingsExA");
    615             Log((__FUNCTION__": VBoxDisplayInit: pfnChangeDisplaySettingsEx = %p\n", pIf->modeData.wddm.pfnChangeDisplaySettingsEx));
     622            LogFunc(("VBoxDisplayInit: pfnChangeDisplaySettingsEx = %p\n", pIf->modeData.wddm.pfnChangeDisplaySettingsEx));
    616623            bSupported &= !!(pIf->modeData.wddm.pfnChangeDisplaySettingsEx);
    617624
    618625            *(uintptr_t *)&pIf->modeData.wddm.pfnEnumDisplayDevices = (uintptr_t)GetProcAddress(hUser, "EnumDisplayDevicesA");
    619             Log((__FUNCTION__": VBoxDisplayInit: pfnEnumDisplayDevices = %p\n", pIf->modeData.wddm.pfnEnumDisplayDevices));
     626            LogFunc(("VBoxDisplayInit: pfnEnumDisplayDevices = %p\n", pIf->modeData.wddm.pfnEnumDisplayDevices));
    620627            bSupported &= !!(pIf->modeData.wddm.pfnEnumDisplayDevices);
    621628            /* for win 7 and above */
    … …  
    623630            {
    624631                *(uintptr_t *)&gCtx.pfnSetDisplayConfig = (uintptr_t)GetProcAddress(hUser, "SetDisplayConfig");
    625                 Log((__FUNCTION__": VBoxDisplayInit: pfnSetDisplayConfig = %p\n", gCtx.pfnSetDisplayConfig));
     632                LogFunc(("VBoxDisplayInit: pfnSetDisplayConfig = %p\n", gCtx.pfnSetDisplayConfig));
    626633                bSupported &= !!(gCtx.pfnSetDisplayConfig);
    627634
    628635                *(uintptr_t *)&gCtx.pfnQueryDisplayConfig = (uintptr_t)GetProcAddress(hUser, "QueryDisplayConfig");
    629                 Log((__FUNCTION__": VBoxDisplayInit: pfnQueryDisplayConfig = %p\n", gCtx.pfnQueryDisplayConfig));
     636                LogFunc(("VBoxDisplayInit: pfnQueryDisplayConfig = %p\n", gCtx.pfnQueryDisplayConfig));
    630637                bSupported &= !!(gCtx.pfnQueryDisplayConfig);
    631638
    632639                *(uintptr_t *)&gCtx.pfnGetDisplayConfigBufferSizes = (uintptr_t)GetProcAddress(hUser, "GetDisplayConfigBufferSizes");
    633                 Log((__FUNCTION__": VBoxDisplayInit: pfnGetDisplayConfigBufferSizes = %p\n", gCtx.pfnGetDisplayConfigBufferSizes));
     640                LogFunc(("VBoxDisplayInit: pfnGetDisplayConfigBufferSizes = %p\n", gCtx.pfnGetDisplayConfigBufferSizes));
    634641                bSupported &= !!(gCtx.pfnGetDisplayConfigBufferSizes);
    635642            }
    … …  
    645652        else
    646653        {
    647             WARN((__FUNCTION__": GetModuleHandle(USER32) failed, err(%d)\n", GetLastError()));
     654            WARN_FUNC(("GetModuleHandle(USER32) failed, err(%d)\n", GetLastError()));
    648655            err = ERROR_NOT_SUPPORTED;
    649656        }
    … …  
    651658    else
    652659    {
    653         WARN((__FUNCTION__": can not switch to VBOXDISPIF_MODE_WDDM, because os is not Vista or upper\n"));
     660        WARN_FUNC(("can not switch to VBOXDISPIF_MODE_WDDM, because os is not Vista or upper\n"));
    654661        err = ERROR_NOT_SUPPORTED;
    655662    }
    … …  
    757764#endif
    758765        default:
    759             Log((__FUNCTION__": unknown mode (%d)\n", pIf->enmMode));
     766            LogFunc(("unknown mode (%d)\n", pIf->enmMode));
    760767            return ERROR_INVALID_PARAMETER;
    761768    }
    … …  
    775782#endif
    776783        default:
    777             Log((__FUNCTION__": unknown mode (%d)\n", pIf->enmMode));
     784            LogFunc(("unknown mode (%d)\n", pIf->enmMode));
    778785            return ERROR_INVALID_PARAMETER;
    779786    }
    … …  
    936943        }
    937944        case WM_CLOSE:
    938             Log((__FUNCTION__": got WM_CLOSE for hwnd(0x%x)", hwnd));
     945            LogFunc(("got WM_CLOSE for hwnd(0x%x)", hwnd));
    939946            return 0;
    940947        case WM_DESTROY:
    941             Log((__FUNCTION__": got WM_DESTROY for hwnd(0x%x)", hwnd));
     948            LogFunc(("got WM_DESTROY for hwnd(0x%x)", hwnd));
    942949            return 0;
    943950        case WM_NCHITTEST:
    944             Log((__FUNCTION__": got WM_NCHITTEST for hwnd(0x%x)\n", hwnd));
     951            LogFunc(("got WM_NCHITTEST for hwnd(0x%x)\n", hwnd));
    945952            return HTNOWHERE;
    946953        default:
    … …  
    973980        {
    974981            DWORD winErr = GetLastError();
    975             WARN((__FUNCTION__": RegisterClass failed, winErr(%d)\n", winErr));
     982            WARN_FUNC(("RegisterClass failed, winErr(%d)\n", winErr));
    976983            hr = E_FAIL;
    977984        }
    … …  
    9971004        {
    9981005            DWORD winErr = GetLastError();
    999             WARN((__FUNCTION__": CreateWindowEx failed, winErr(%d)\n", winErr));
     1006            WARN_FUNC(("CreateWindowEx failed, winErr(%d)\n", winErr));
    10001007            hr = E_FAIL;
    10011008        }
    … …  
    10121019
    10131020    DWORD winErr = GetLastError();
    1014     WARN((__FUNCTION__": DestroyWindow failed, winErr(%d) for hWnd(0x%x)\n", winErr, hWnd));
     1021    WARN_FUNC(("DestroyWindow failed, winErr(%d) for hWnd(0x%x)\n", winErr, hWnd));
    10151022
    10161023    return HRESULT_FROM_WIN32(winErr);
    … …  
    11071114    {
    11081115        DWORD winErr = GetLastError();
    1109         WARN((__FUNCTION__": SetEvent failed, winErr = (%d)", winErr));
     1116        WARN_FUNC(("SetEvent failed, winErr = (%d)", winErr));
    11101117        HRESULT tmpHr = HRESULT_FROM_WIN32(winErr);
    11111118        Assert(tmpHr != S_OK);
    … …  
    11601167        {
    11611168            DWORD winErr = GetLastError();
    1162             WARN((__FUNCTION__": CreateThread failed, winErr = (%d)", winErr));
     1169            WARN_FUNC(("CreateThread failed, winErr = (%d)", winErr));
    11631170            hr = HRESULT_FROM_WIN32(winErr);
    11641171            Assert(hr != S_OK);
    … …  
    11691176    {
    11701177        DWORD winErr = GetLastError();
    1171         WARN((__FUNCTION__": CreateEvent failed, winErr = (%d)", winErr));
     1178        WARN_FUNC(("CreateEvent failed, winErr = (%d)", winErr));
    11721179        hr = HRESULT_FROM_WIN32(winErr);
    11731180        Assert(hr != S_OK);
    … …  
    17291736#endif
    17301737        default:
    1731             WARN((__FUNCTION__": unknown mode (%d)\n", pIf->enmMode));
     1738            WARN_FUNC(("unknown mode (%d)\n", pIf->enmMode));
    17321739            return ERROR_INVALID_PARAMETER;
    17331740    }
    … …  
    17481755#endif
    17491756        default:
    1750             WARN((__FUNCTION__": unknown mode (%d)\n", pIf->enmMode));
     1757            WARN_FUNC(("unknown mode (%d)\n", pIf->enmMode));
    17511758            return ERROR_INVALID_PARAMETER;
    17521759    }
    … …  
    19261933#endif
    19271934        default:
    1928             WARN((__FUNCTION__": unknown mode (%d)\n", pIf->enmMode));
     1935            WARN_FUNC(("unknown mode (%d)\n", pIf->enmMode));
    19291936            return ERROR_INVALID_PARAMETER;
    19301937    }
    … …  
    19501957            bool bSupported = true;
    19511958            *(uintptr_t *)&pIf->modeData.xpdm.pfnChangeDisplaySettingsEx = (uintptr_t)GetProcAddress(hUser, "ChangeDisplaySettingsExA");
    1952             Log((__FUNCTION__": pfnChangeDisplaySettingsEx = %p\n", pIf->modeData.xpdm.pfnChangeDisplaySettingsEx));
     1959            LogFunc(("pfnChangeDisplaySettingsEx = %p\n", pIf->modeData.xpdm.pfnChangeDisplaySettingsEx));
    19531960            bSupported &= !!(pIf->modeData.xpdm.pfnChangeDisplaySettingsEx);
    19541961
    19551962            if (!bSupported)
    19561963            {
    1957                 WARN((__FUNCTION__": pfnChangeDisplaySettingsEx function pointer failed to initialize\n"));
     1964                WARN_FUNC(("pfnChangeDisplaySettingsEx function pointer failed to initialize\n"));
    19581965                err = ERROR_NOT_SUPPORTED;
    19591966            }
    … …  
    19611968        else
    19621969        {
    1963             WARN((__FUNCTION__": failed to get USER32 handle, err (%d)\n", GetLastError()));
     1970            WARN_FUNC(("failed to get USER32 handle, err (%d)\n", GetLastError()));
    19641971            err = ERROR_NOT_SUPPORTED;
    19651972        }
    … …  
    19671974    else
    19681975    {
    1969         WARN((__FUNCTION__": can not switch to VBOXDISPIF_MODE_XPDM, because os is not >= w2k\n"));
     1976        WARN_FUNC(("can not switch to VBOXDISPIF_MODE_XPDM, because os is not >= w2k\n"));
    19701977        err = ERROR_NOT_SUPPORTED;
    19711978    }
    … …  
    19972004    {
    19982005        case VBOXDISPIF_MODE_XPDM_NT4:
    1999             Log((__FUNCTION__": request to switch to VBOXDISPIF_MODE_XPDM_NT4\n"));
     2006            LogFunc(("request to switch to VBOXDISPIF_MODE_XPDM_NT4\n"));
    20002007            err = vboxDispIfSwitchToXPDM_NT4(pIf);
    20012008            if (err == NO_ERROR)
    20022009            {
    2003                 Log((__FUNCTION__": successfully switched to XPDM_NT4 mode\n"));
     2010                LogFunc(("successfully switched to XPDM_NT4 mode\n"));
    20042011                pIf->enmMode = VBOXDISPIF_MODE_XPDM_NT4;
    20052012            }
    20062013            else
    2007                 WARN((__FUNCTION__": failed to switch to XPDM_NT4 mode, err (%d)\n", err));
     2014                WARN_FUNC(("failed to switch to XPDM_NT4 mode, err (%d)\n", err));
    20082015            break;
    20092016        case VBOXDISPIF_MODE_XPDM:
    2010             Log((__FUNCTION__": request to switch to VBOXDISPIF_MODE_XPDM\n"));
     2017            LogFunc(("request to switch to VBOXDISPIF_MODE_XPDM\n"));
    20112018            err = vboxDispIfSwitchToXPDM(pIf);
    20122019            if (err == NO_ERROR)
    20132020            {
    2014                 Log((__FUNCTION__": successfully switched to XPDM mode\n"));
     2021                LogFunc(("successfully switched to XPDM mode\n"));
    20152022                pIf->enmMode = VBOXDISPIF_MODE_XPDM;
    20162023            }
    20172024            else
    2018                 WARN((__FUNCTION__": failed to switch to XPDM mode, err (%d)\n", err));
     2025                WARN_FUNC(("failed to switch to XPDM mode, err (%d)\n", err));
    20192026            break;
    20202027#ifdef VBOX_WITH_WDDM
    20212028        case VBOXDISPIF_MODE_WDDM:
    20222029        {
    2023             Log((__FUNCTION__": request to switch to VBOXDISPIF_MODE_WDDM\n"));
     2030            LogFunc(("request to switch to VBOXDISPIF_MODE_WDDM\n"));
    20242031            err = vboxDispIfSwitchToWDDM(pIf);
    20252032            if (err == NO_ERROR)
    20262033            {
    2027                 Log((__FUNCTION__": successfully switched to WDDM mode\n"));
     2034                LogFunc(("successfully switched to WDDM mode\n"));
    20282035                pIf->enmMode = VBOXDISPIF_MODE_WDDM;
    20292036            }
    20302037            else
    2031                 WARN((__FUNCTION__": failed to switch to WDDM mode, err (%d)\n", err));
     2038                WARN_FUNC(("failed to switch to WDDM mode, err (%d)\n", err));
    20322039            break;
    20332040        }
    20342041        case VBOXDISPIF_MODE_WDDM_W7:
    20352042        {
    2036             Log((__FUNCTION__": request to switch to VBOXDISPIF_MODE_WDDM_W7\n"));
     2043            LogFunc(("request to switch to VBOXDISPIF_MODE_WDDM_W7\n"));
    20372044            err = vboxDispIfSwitchToWDDM_W7(pIf);
    20382045            if (err == NO_ERROR)
    20392046            {
    2040                 Log((__FUNCTION__": successfully switched to WDDM mode\n"));
     2047                LogFunc(("successfully switched to WDDM mode\n"));
    20412048                pIf->enmMode = VBOXDISPIF_MODE_WDDM_W7;
    20422049            }
    20432050            else
    2044                 WARN((__FUNCTION__": failed to switch to WDDM mode, err (%d)\n", err));
     2051                WARN_FUNC(("failed to switch to WDDM mode, err (%d)\n", err));
    20452052            break;
    20462053        }
Note: See TracChangeset for help on using the changeset viewer.

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