diff --git a/src/common/utils/exec.h b/src/common/utils/exec.h index 0d4ca2cc6e..ec76c92876 100644 --- a/src/common/utils/exec.h +++ b/src/common/utils/exec.h @@ -5,9 +5,10 @@ // disable warning 26471 - Don't use reinterpret_cast. A cast from void* can use static_cast // disable warning 26492 - Don't use const_cast to cast away const +// disable warning 26493 - Don't use C-style casts // Disable 26497 for winrt - This function function-name could be marked constexpr if compile-time evaluation is desired. #pragma warning(push) -#pragma warning(disable : 26471 26492 26497) +#pragma warning(disable : 26471 26492 26493 26497) #include #pragma warning(pop) diff --git a/tools/BugReportTool/BugReportTool/EventViewer.cpp b/tools/BugReportTool/BugReportTool/EventViewer.cpp index 81024e2088..f6e9a6baf0 100644 --- a/tools/BugReportTool/BugReportTool/EventViewer.cpp +++ b/tools/BugReportTool/BugReportTool/EventViewer.cpp @@ -57,7 +57,7 @@ namespace if (ERROR_INSUFFICIENT_BUFFER == (status = GetLastError())) { dwBufferSize = dwBufferUsed; - pRenderedContent = (LPWSTR)malloc(dwBufferSize); + pRenderedContent = static_cast(malloc(dwBufferSize)); if (pRenderedContent) { EvtRender(NULL, hEvent, EvtRenderEventXml, dwBufferSize, pRenderedContent, &dwBufferUsed, &dwPropertyCount); diff --git a/tools/BugReportTool/BugReportTool/InstallationFolder.cpp b/tools/BugReportTool/BugReportTool/InstallationFolder.cpp index 01fcc06d9d..42a4f13653 100644 --- a/tools/BugReportTool/BugReportTool/InstallationFolder.cpp +++ b/tools/BugReportTool/BugReportTool/InstallationFolder.cpp @@ -27,7 +27,7 @@ wstring GetVersion(path filePath) { if (size) { - VS_FIXEDFILEINFO* verInfo = (VS_FIXEDFILEINFO*)lpBuffer; + VS_FIXEDFILEINFO* verInfo = static_cast(lpBuffer); if (verInfo->dwSignature == 0xfeef04bd) { version = diff --git a/tools/BugReportTool/BugReportTool/Main.cpp b/tools/BugReportTool/BugReportTool/Main.cpp index c2e1e540e4..5cc8134891 100644 --- a/tools/BugReportTool/BugReportTool/Main.cpp +++ b/tools/BugReportTool/BugReportTool/Main.cpp @@ -166,7 +166,7 @@ void ReportWindowsVersion(const filesystem::path& tmpDir) { NTSTATUS(WINAPI * RtlGetVersion) (LPOSVERSIONINFOEXW) = nullptr; - *(FARPROC*)&RtlGetVersion = GetProcAddress(GetModuleHandleA("ntdll"), "RtlGetVersion"); + *reinterpret_cast(& RtlGetVersion) = GetProcAddress(GetModuleHandleA("ntdll"), "RtlGetVersion"); if (RtlGetVersion) { osInfo.dwOSVersionInfoSize = sizeof(osInfo); diff --git a/tools/BugReportTool/BugReportTool/RegistryUtils.cpp b/tools/BugReportTool/BugReportTool/RegistryUtils.cpp index 693257d9e8..1085d913bc 100644 --- a/tools/BugReportTool/BugReportTool/RegistryUtils.cpp +++ b/tools/BugReportTool/BugReportTool/RegistryUtils.cpp @@ -126,7 +126,7 @@ namespace stream << achValue; } - stream << " > " << (LPCTSTR)value << "\n"; + stream << " > " << reinterpret_cast(value) << "\n"; } else { diff --git a/tools/BugReportTool/BugReportTool/ReportMonitorInfo.cpp b/tools/BugReportTool/BugReportTool/ReportMonitorInfo.cpp index 96e14ac3f6..888f26e48e 100644 --- a/tools/BugReportTool/BugReportTool/ReportMonitorInfo.cpp +++ b/tools/BugReportTool/BugReportTool/ReportMonitorInfo.cpp @@ -15,7 +15,7 @@ namespace }; auto callback = [](HMONITOR monitor, HDC, RECT*, LPARAM prm) -> BOOL { - std::wostream& os = *((capture*)prm)->os; + std::wostream& os = *(reinterpret_cast(prm))->os; MONITORINFOEX mi; mi.cbSize = sizeof(mi); @@ -48,7 +48,7 @@ namespace capture c; c.os = &os; - if (EnumDisplayMonitors(nullptr, nullptr, callback, (LPARAM)&c)) + if (EnumDisplayMonitors(nullptr, nullptr, callback, reinterpret_cast(& c))) { os << "EnumDisplayMonitors OK\n"; } diff --git a/tools/MonitorReportTool/MonitorReportTool.cpp b/tools/MonitorReportTool/MonitorReportTool.cpp index 747ea91e1a..289ebf5561 100644 --- a/tools/MonitorReportTool/MonitorReportTool.cpp +++ b/tools/MonitorReportTool/MonitorReportTool.cpp @@ -221,7 +221,7 @@ void LogWMI() // on a particular host computer. IWbemLocator* pLocator = 0; - hres = CoCreateInstance(CLSID_WbemLocator, 0, CLSCTX_INPROC_SERVER, IID_IWbemLocator, (LPVOID*)&pLocator); + hres = CoCreateInstance(CLSID_WbemLocator, 0, CLSCTX_INPROC_SERVER, IID_IWbemLocator, reinterpret_cast(&pLocator)); if (FAILED(hres)) { Logger::log(L"Failed to create IWbemLocator object. Error code = ", hres); @@ -346,7 +346,7 @@ void LogWMICIMV2() // on a particular host computer. IWbemLocator* pLocator = 0; - hres = CoCreateInstance(CLSID_WbemLocator, 0, CLSCTX_INPROC_SERVER, IID_IWbemLocator, (LPVOID*)&pLocator); + hres = CoCreateInstance(CLSID_WbemLocator, 0, CLSCTX_INPROC_SERVER, IID_IWbemLocator, reinterpret_cast(&pLocator)); if (FAILED(hres)) { Logger::log(L"Failed to create IWbemLocator object. Error code = ", hres); diff --git a/tools/WebcamReportTool/DirectShowUtils.h b/tools/WebcamReportTool/DirectShowUtils.h index ccc94cf7c5..00e3a6e7c9 100644 --- a/tools/WebcamReportTool/DirectShowUtils.h +++ b/tools/WebcamReportTool/DirectShowUtils.h @@ -7,11 +7,12 @@ // disable warning 26471 - Don't use reinterpret_cast. A cast from void* can use static_cast // disable warning 26492 - Don't use const_cast to cast away const on winrt +// disable warning 26493 - Don't use C-style casts // Disable 26497 for winrt - This function function-name could be marked constexpr if compile-time evaluation is desired. #pragma warning(push) -#pragma warning(disable : 26471 26492 26497) +#pragma warning(disable : 26471 26492 26493 26497) #include -#pragma warning(push) +#pragma warning(pop) #include diff --git a/tools/WebcamReportTool/main.cpp b/tools/WebcamReportTool/main.cpp index 5f79b9b3fe..e0f0a625b4 100644 --- a/tools/WebcamReportTool/main.cpp +++ b/tools/WebcamReportTool/main.cpp @@ -7,11 +7,12 @@ // disable warning 26471 - Don't use reinterpret_cast. A cast from void* can use static_cast // disable warning 26492 - Don't use const_cast to cast away const +// disable warning 26493 - Don't use C-style casts // Disable 26497 for winrt - This function function-name could be marked constexpr if compile-time evaluation is desired. #pragma warning(push) -#pragma warning(disable : 26471 26492 26497) +#pragma warning(disable : 26471 26492 26493 26497) #include -#pragma warning(push) +#pragma warning(pop) #include @@ -178,7 +179,7 @@ void ReportAllWebcams() std::string friendlyName; for (wchar_t c : wideFriendlyName) { - friendlyName += (char)c; + friendlyName += static_cast(c); } log() << "Webcam " << friendlyName << '\n';