- Timestamp:
- Mar 31, 2016 11:30:37 AM (9 years ago)
- 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 57 57 bool bSupportedWin8 = true; 58 58 pCallbacks->pfnD3DKMTOpenAdapterFromHdc = (PFND3DKMT_OPENADAPTERFROMHDC)GetProcAddress(pCallbacks->hGdi32, "D3DKMTOpenAdapterFromHdc"); 59 Log ((__FUNCTION__"pfnD3DKMTOpenAdapterFromHdc = %p\n", pCallbacks->pfnD3DKMTOpenAdapterFromHdc));59 LogFunc(("pfnD3DKMTOpenAdapterFromHdc = %p\n", pCallbacks->pfnD3DKMTOpenAdapterFromHdc)); 60 60 bSupported &= !!(pCallbacks->pfnD3DKMTOpenAdapterFromHdc); 61 61 62 62 pCallbacks->pfnD3DKMTOpenAdapterFromGdiDisplayName = (PFND3DKMT_OPENADAPTERFROMGDIDISPLAYNAME)GetProcAddress(pCallbacks->hGdi32, "D3DKMTOpenAdapterFromGdiDisplayName"); 63 Log ((__FUNCTION__":pfnD3DKMTOpenAdapterFromGdiDisplayName = %p\n", pCallbacks->pfnD3DKMTOpenAdapterFromGdiDisplayName));63 LogFunc(("pfnD3DKMTOpenAdapterFromGdiDisplayName = %p\n", pCallbacks->pfnD3DKMTOpenAdapterFromGdiDisplayName)); 64 64 bSupported &= !!(pCallbacks->pfnD3DKMTOpenAdapterFromGdiDisplayName); 65 65 66 66 pCallbacks->pfnD3DKMTCloseAdapter = (PFND3DKMT_CLOSEADAPTER)GetProcAddress(pCallbacks->hGdi32, "D3DKMTCloseAdapter"); 67 Log ((__FUNCTION__":pfnD3DKMTCloseAdapter = %p\n", pCallbacks->pfnD3DKMTCloseAdapter));67 LogFunc(("pfnD3DKMTCloseAdapter = %p\n", pCallbacks->pfnD3DKMTCloseAdapter)); 68 68 bSupported &= !!(pCallbacks->pfnD3DKMTCloseAdapter); 69 69 70 70 pCallbacks->pfnD3DKMTEscape = (PFND3DKMT_ESCAPE)GetProcAddress(pCallbacks->hGdi32, "D3DKMTEscape"); 71 Log ((__FUNCTION__":pfnD3DKMTEscape = %p\n", pCallbacks->pfnD3DKMTEscape));71 LogFunc(("pfnD3DKMTEscape = %p\n", pCallbacks->pfnD3DKMTEscape)); 72 72 bSupported &= !!(pCallbacks->pfnD3DKMTEscape); 73 73 74 74 pCallbacks->pfnD3DKMTQueryAdapterInfo = (PFND3DKMT_QUERYADAPTERINFO)GetProcAddress(pCallbacks->hGdi32, "D3DKMTQueryAdapterInfo"); 75 Log ((__FUNCTION__":pfnD3DKMTQueryAdapterInfo = %p\n", pCallbacks->pfnD3DKMTQueryAdapterInfo));75 LogFunc(("pfnD3DKMTQueryAdapterInfo = %p\n", pCallbacks->pfnD3DKMTQueryAdapterInfo)); 76 76 bSupported &= !!(pCallbacks->pfnD3DKMTQueryAdapterInfo); 77 77 78 78 pCallbacks->pfnD3DKMTCreateDevice = (PFND3DKMT_CREATEDEVICE)GetProcAddress(pCallbacks->hGdi32, "D3DKMTCreateDevice"); 79 Log ((__FUNCTION__":pfnD3DKMTCreateDevice = %p\n", pCallbacks->pfnD3DKMTCreateDevice));79 LogFunc(("pfnD3DKMTCreateDevice = %p\n", pCallbacks->pfnD3DKMTCreateDevice)); 80 80 bSupported &= !!(pCallbacks->pfnD3DKMTCreateDevice); 81 81 82 82 pCallbacks->pfnD3DKMTDestroyDevice = (PFND3DKMT_DESTROYDEVICE)GetProcAddress(pCallbacks->hGdi32, "D3DKMTDestroyDevice"); 83 Log ((__FUNCTION__":pfnD3DKMTDestroyDevice = %p\n", pCallbacks->pfnD3DKMTDestroyDevice));83 LogFunc(("pfnD3DKMTDestroyDevice = %p\n", pCallbacks->pfnD3DKMTDestroyDevice)); 84 84 bSupported &= !!(pCallbacks->pfnD3DKMTDestroyDevice); 85 85 86 86 pCallbacks->pfnD3DKMTCreateContext = (PFND3DKMT_CREATECONTEXT)GetProcAddress(pCallbacks->hGdi32, "D3DKMTCreateContext"); 87 Log ((__FUNCTION__":pfnD3DKMTCreateContext = %p\n", pCallbacks->pfnD3DKMTCreateContext));87 LogFunc(("pfnD3DKMTCreateContext = %p\n", pCallbacks->pfnD3DKMTCreateContext)); 88 88 bSupported &= !!(pCallbacks->pfnD3DKMTCreateContext); 89 89 90 90 pCallbacks->pfnD3DKMTDestroyContext = (PFND3DKMT_DESTROYCONTEXT)GetProcAddress(pCallbacks->hGdi32, "D3DKMTDestroyContext"); 91 Log ((__FUNCTION__":pfnD3DKMTDestroyContext = %p\n", pCallbacks->pfnD3DKMTDestroyContext));91 LogFunc(("pfnD3DKMTDestroyContext = %p\n", pCallbacks->pfnD3DKMTDestroyContext)); 92 92 bSupported &= !!(pCallbacks->pfnD3DKMTDestroyContext); 93 93 94 94 pCallbacks->pfnD3DKMTRender = (PFND3DKMT_RENDER)GetProcAddress(pCallbacks->hGdi32, "D3DKMTRender"); 95 Log ((__FUNCTION__":pfnD3DKMTRender = %p\n", pCallbacks->pfnD3DKMTRender));95 LogFunc(("pfnD3DKMTRender = %p\n", pCallbacks->pfnD3DKMTRender)); 96 96 bSupported &= !!(pCallbacks->pfnD3DKMTRender); 97 97 98 98 pCallbacks->pfnD3DKMTCreateAllocation = (PFND3DKMT_CREATEALLOCATION)GetProcAddress(pCallbacks->hGdi32, "D3DKMTCreateAllocation"); 99 Log ((__FUNCTION__":pfnD3DKMTCreateAllocation = %p\n", pCallbacks->pfnD3DKMTCreateAllocation));99 LogFunc(("pfnD3DKMTCreateAllocation = %p\n", pCallbacks->pfnD3DKMTCreateAllocation)); 100 100 bSupported &= !!(pCallbacks->pfnD3DKMTCreateAllocation); 101 101 102 102 pCallbacks->pfnD3DKMTDestroyAllocation = (PFND3DKMT_DESTROYALLOCATION)GetProcAddress(pCallbacks->hGdi32, "D3DKMTDestroyAllocation"); 103 Log ((__FUNCTION__":pfnD3DKMTDestroyAllocation = %p\n", pCallbacks->pfnD3DKMTDestroyAllocation));103 LogFunc(("pfnD3DKMTDestroyAllocation = %p\n", pCallbacks->pfnD3DKMTDestroyAllocation)); 104 104 bSupported &= !!(pCallbacks->pfnD3DKMTDestroyAllocation); 105 105 106 106 pCallbacks->pfnD3DKMTLock = (PFND3DKMT_LOCK)GetProcAddress(pCallbacks->hGdi32, "D3DKMTLock"); 107 Log ((__FUNCTION__":pfnD3DKMTLock = %p\n", pCallbacks->pfnD3DKMTLock));107 LogFunc(("pfnD3DKMTLock = %p\n", pCallbacks->pfnD3DKMTLock)); 108 108 bSupported &= !!(pCallbacks->pfnD3DKMTLock); 109 109 110 110 pCallbacks->pfnD3DKMTUnlock = (PFND3DKMT_UNLOCK)GetProcAddress(pCallbacks->hGdi32, "D3DKMTUnlock"); 111 Log ((__FUNCTION__":pfnD3DKMTUnlock = %p\n", pCallbacks->pfnD3DKMTUnlock));111 LogFunc(("pfnD3DKMTUnlock = %p\n", pCallbacks->pfnD3DKMTUnlock)); 112 112 bSupported &= !!(pCallbacks->pfnD3DKMTUnlock); 113 113 114 114 pCallbacks->pfnD3DKMTInvalidateActiveVidPn = (PFND3DKMT_INVALIDATEACTIVEVIDPN)GetProcAddress(pCallbacks->hGdi32, "D3DKMTInvalidateActiveVidPn"); 115 Log ((__FUNCTION__":pfnD3DKMTInvalidateActiveVidPn = %p\n", pCallbacks->pfnD3DKMTInvalidateActiveVidPn));115 LogFunc(("pfnD3DKMTInvalidateActiveVidPn = %p\n", pCallbacks->pfnD3DKMTInvalidateActiveVidPn)); 116 116 bSupported &= !!(pCallbacks->pfnD3DKMTInvalidateActiveVidPn); 117 117 118 118 pCallbacks->pfnD3DKMTPollDisplayChildren = (PFND3DKMT_POLLDISPLAYCHILDREN)GetProcAddress(pCallbacks->hGdi32, "D3DKMTPollDisplayChildren"); 119 Log ((__FUNCTION__":pfnD3DKMTPollDisplayChildren = %p\n", pCallbacks->pfnD3DKMTPollDisplayChildren));119 LogFunc(("pfnD3DKMTPollDisplayChildren = %p\n", pCallbacks->pfnD3DKMTPollDisplayChildren)); 120 120 bSupported &= !!(pCallbacks->pfnD3DKMTPollDisplayChildren); 121 121 122 122 pCallbacks->pfnD3DKMTEnumAdapters = (PFND3DKMT_ENUMADAPTERS)GetProcAddress(pCallbacks->hGdi32, "D3DKMTEnumAdapters"); 123 Log ((__FUNCTION__":pfnD3DKMTEnumAdapters = %p\n", pCallbacks->pfnD3DKMTEnumAdapters));123 LogFunc(("pfnD3DKMTEnumAdapters = %p\n", pCallbacks->pfnD3DKMTEnumAdapters)); 124 124 /* this present starting win8 release preview only, so keep going if it is not available, 125 125 * i.e. do not clear the bSupported on its absence */ … … 127 127 128 128 pCallbacks->pfnD3DKMTOpenAdapterFromLuid = (PFND3DKMT_OPENADAPTERFROMLUID)GetProcAddress(pCallbacks->hGdi32, "D3DKMTOpenAdapterFromLuid"); 129 Log ((__FUNCTION__":pfnD3DKMTOpenAdapterFromLuid = %p\n", pCallbacks->pfnD3DKMTOpenAdapterFromLuid));129 LogFunc(("pfnD3DKMTOpenAdapterFromLuid = %p\n", pCallbacks->pfnD3DKMTOpenAdapterFromLuid)); 130 130 /* this present starting win8 release preview only, so keep going if it is not available, 131 131 * i.e. do not clear the bSupported on its absence */ … … 143 143 else 144 144 { 145 Log ((__FUNCTION__":one of pfnD3DKMT function pointers failed to initialize\n"));145 LogFunc(("one of pfnD3DKMT function pointers failed to initialize\n")); 146 146 hr = E_NOINTERFACE; 147 147 } … … 242 242 else 243 243 { 244 Log ((__FUNCTION__":pfnD3DKMTOpenAdapterFromGdiDisplayName failed, Status (0x%x)\n", Status));244 LogFunc(("pfnD3DKMTOpenAdapterFromGdiDisplayName failed, Status (0x%x)\n", Status)); 245 245 hr = E_FAIL; 246 246 } … … 328 328 } 329 329 330 Log ((__FUNCTION__":pfnD3DKMTCloseAdapter failed, Status (0x%x)\n", Status));330 LogFunc(("pfnD3DKMTCloseAdapter failed, Status (0x%x)\n", Status)); 331 331 332 332 return E_FAIL; -
trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxDispIf.cpp
r57741 r60274 29 29 Log(_m); \ 30 30 } while (0) 31 #define WARN_FUNC(_m) do { \ 32 Assert(0); \ 33 LogFunc(_m); \ 34 } while (0) 31 35 #else 32 36 #define WARN(_m) do { \ 33 37 Log(_m); \ 38 } while (0) 39 #define WARN_FUNC(_m) do { \ 40 LogFunc(_m); \ 34 41 } while (0) 35 42 #endif … … 608 615 if (OSinfo.dwMajorVersion >= 6) 609 616 { 610 Log ((__FUNCTION__":this is vista and up\n"));617 LogFunc(("this is vista and up\n")); 611 618 HMODULE hUser = GetModuleHandle("user32.dll"); 612 619 if (hUser) 613 620 { 614 621 *(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)); 616 623 bSupported &= !!(pIf->modeData.wddm.pfnChangeDisplaySettingsEx); 617 624 618 625 *(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)); 620 627 bSupported &= !!(pIf->modeData.wddm.pfnEnumDisplayDevices); 621 628 /* for win 7 and above */ … … 623 630 { 624 631 *(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)); 626 633 bSupported &= !!(gCtx.pfnSetDisplayConfig); 627 634 628 635 *(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)); 630 637 bSupported &= !!(gCtx.pfnQueryDisplayConfig); 631 638 632 639 *(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)); 634 641 bSupported &= !!(gCtx.pfnGetDisplayConfigBufferSizes); 635 642 } … … 645 652 else 646 653 { 647 WARN ((__FUNCTION__":GetModuleHandle(USER32) failed, err(%d)\n", GetLastError()));654 WARN_FUNC(("GetModuleHandle(USER32) failed, err(%d)\n", GetLastError())); 648 655 err = ERROR_NOT_SUPPORTED; 649 656 } … … 651 658 else 652 659 { 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")); 654 661 err = ERROR_NOT_SUPPORTED; 655 662 } … … 757 764 #endif 758 765 default: 759 Log ((__FUNCTION__":unknown mode (%d)\n", pIf->enmMode));766 LogFunc(("unknown mode (%d)\n", pIf->enmMode)); 760 767 return ERROR_INVALID_PARAMETER; 761 768 } … … 775 782 #endif 776 783 default: 777 Log ((__FUNCTION__":unknown mode (%d)\n", pIf->enmMode));784 LogFunc(("unknown mode (%d)\n", pIf->enmMode)); 778 785 return ERROR_INVALID_PARAMETER; 779 786 } … … 936 943 } 937 944 case WM_CLOSE: 938 Log ((__FUNCTION__":got WM_CLOSE for hwnd(0x%x)", hwnd));945 LogFunc(("got WM_CLOSE for hwnd(0x%x)", hwnd)); 939 946 return 0; 940 947 case WM_DESTROY: 941 Log ((__FUNCTION__":got WM_DESTROY for hwnd(0x%x)", hwnd));948 LogFunc(("got WM_DESTROY for hwnd(0x%x)", hwnd)); 942 949 return 0; 943 950 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)); 945 952 return HTNOWHERE; 946 953 default: … … 973 980 { 974 981 DWORD winErr = GetLastError(); 975 WARN ((__FUNCTION__":RegisterClass failed, winErr(%d)\n", winErr));982 WARN_FUNC(("RegisterClass failed, winErr(%d)\n", winErr)); 976 983 hr = E_FAIL; 977 984 } … … 997 1004 { 998 1005 DWORD winErr = GetLastError(); 999 WARN ((__FUNCTION__":CreateWindowEx failed, winErr(%d)\n", winErr));1006 WARN_FUNC(("CreateWindowEx failed, winErr(%d)\n", winErr)); 1000 1007 hr = E_FAIL; 1001 1008 } … … 1012 1019 1013 1020 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)); 1015 1022 1016 1023 return HRESULT_FROM_WIN32(winErr); … … 1107 1114 { 1108 1115 DWORD winErr = GetLastError(); 1109 WARN ((__FUNCTION__":SetEvent failed, winErr = (%d)", winErr));1116 WARN_FUNC(("SetEvent failed, winErr = (%d)", winErr)); 1110 1117 HRESULT tmpHr = HRESULT_FROM_WIN32(winErr); 1111 1118 Assert(tmpHr != S_OK); … … 1160 1167 { 1161 1168 DWORD winErr = GetLastError(); 1162 WARN ((__FUNCTION__":CreateThread failed, winErr = (%d)", winErr));1169 WARN_FUNC(("CreateThread failed, winErr = (%d)", winErr)); 1163 1170 hr = HRESULT_FROM_WIN32(winErr); 1164 1171 Assert(hr != S_OK); … … 1169 1176 { 1170 1177 DWORD winErr = GetLastError(); 1171 WARN ((__FUNCTION__":CreateEvent failed, winErr = (%d)", winErr));1178 WARN_FUNC(("CreateEvent failed, winErr = (%d)", winErr)); 1172 1179 hr = HRESULT_FROM_WIN32(winErr); 1173 1180 Assert(hr != S_OK); … … 1729 1736 #endif 1730 1737 default: 1731 WARN ((__FUNCTION__":unknown mode (%d)\n", pIf->enmMode));1738 WARN_FUNC(("unknown mode (%d)\n", pIf->enmMode)); 1732 1739 return ERROR_INVALID_PARAMETER; 1733 1740 } … … 1748 1755 #endif 1749 1756 default: 1750 WARN ((__FUNCTION__":unknown mode (%d)\n", pIf->enmMode));1757 WARN_FUNC(("unknown mode (%d)\n", pIf->enmMode)); 1751 1758 return ERROR_INVALID_PARAMETER; 1752 1759 } … … 1926 1933 #endif 1927 1934 default: 1928 WARN ((__FUNCTION__":unknown mode (%d)\n", pIf->enmMode));1935 WARN_FUNC(("unknown mode (%d)\n", pIf->enmMode)); 1929 1936 return ERROR_INVALID_PARAMETER; 1930 1937 } … … 1950 1957 bool bSupported = true; 1951 1958 *(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)); 1953 1960 bSupported &= !!(pIf->modeData.xpdm.pfnChangeDisplaySettingsEx); 1954 1961 1955 1962 if (!bSupported) 1956 1963 { 1957 WARN ((__FUNCTION__":pfnChangeDisplaySettingsEx function pointer failed to initialize\n"));1964 WARN_FUNC(("pfnChangeDisplaySettingsEx function pointer failed to initialize\n")); 1958 1965 err = ERROR_NOT_SUPPORTED; 1959 1966 } … … 1961 1968 else 1962 1969 { 1963 WARN ((__FUNCTION__":failed to get USER32 handle, err (%d)\n", GetLastError()));1970 WARN_FUNC(("failed to get USER32 handle, err (%d)\n", GetLastError())); 1964 1971 err = ERROR_NOT_SUPPORTED; 1965 1972 } … … 1967 1974 else 1968 1975 { 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")); 1970 1977 err = ERROR_NOT_SUPPORTED; 1971 1978 } … … 1997 2004 { 1998 2005 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")); 2000 2007 err = vboxDispIfSwitchToXPDM_NT4(pIf); 2001 2008 if (err == NO_ERROR) 2002 2009 { 2003 Log ((__FUNCTION__":successfully switched to XPDM_NT4 mode\n"));2010 LogFunc(("successfully switched to XPDM_NT4 mode\n")); 2004 2011 pIf->enmMode = VBOXDISPIF_MODE_XPDM_NT4; 2005 2012 } 2006 2013 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)); 2008 2015 break; 2009 2016 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")); 2011 2018 err = vboxDispIfSwitchToXPDM(pIf); 2012 2019 if (err == NO_ERROR) 2013 2020 { 2014 Log ((__FUNCTION__":successfully switched to XPDM mode\n"));2021 LogFunc(("successfully switched to XPDM mode\n")); 2015 2022 pIf->enmMode = VBOXDISPIF_MODE_XPDM; 2016 2023 } 2017 2024 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)); 2019 2026 break; 2020 2027 #ifdef VBOX_WITH_WDDM 2021 2028 case VBOXDISPIF_MODE_WDDM: 2022 2029 { 2023 Log ((__FUNCTION__":request to switch to VBOXDISPIF_MODE_WDDM\n"));2030 LogFunc(("request to switch to VBOXDISPIF_MODE_WDDM\n")); 2024 2031 err = vboxDispIfSwitchToWDDM(pIf); 2025 2032 if (err == NO_ERROR) 2026 2033 { 2027 Log ((__FUNCTION__":successfully switched to WDDM mode\n"));2034 LogFunc(("successfully switched to WDDM mode\n")); 2028 2035 pIf->enmMode = VBOXDISPIF_MODE_WDDM; 2029 2036 } 2030 2037 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)); 2032 2039 break; 2033 2040 } 2034 2041 case VBOXDISPIF_MODE_WDDM_W7: 2035 2042 { 2036 Log ((__FUNCTION__":request to switch to VBOXDISPIF_MODE_WDDM_W7\n"));2043 LogFunc(("request to switch to VBOXDISPIF_MODE_WDDM_W7\n")); 2037 2044 err = vboxDispIfSwitchToWDDM_W7(pIf); 2038 2045 if (err == NO_ERROR) 2039 2046 { 2040 Log ((__FUNCTION__":successfully switched to WDDM mode\n"));2047 LogFunc(("successfully switched to WDDM mode\n")); 2041 2048 pIf->enmMode = VBOXDISPIF_MODE_WDDM_W7; 2042 2049 } 2043 2050 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)); 2045 2052 break; 2046 2053 }
Note:
See TracChangeset
for help on using the changeset viewer.