From b13f74c0893279c4c09aad8f1717a4b4282c62ab Mon Sep 17 00:00:00 2001 From: sosssego Date: Wed, 8 Feb 2023 11:01:35 +0000 Subject: [PATCH] [Analyzers][CPP]Changes to fix warning 26493 on src/modules/ (L to M) (#23486) starting with letter L to Letter M --- .../MouseUtils/FindMyMouse/FindMyMouse.cpp | 32 ++++----- .../MouseUtils/FindMyMouse/dllmain.cpp | 65 ++++++++++++++++--- .../MouseHighlighter/MouseHighlighter.cpp | 12 ++-- .../MouseUtils/MouseHighlighter/dllmain.cpp | 42 ++++++++++-- .../InclusiveCrosshairs.cpp | 36 +++++----- .../MousePointerCrosshairs/dllmain.cpp | 42 ++++++++++-- .../launcher/Microsoft.Launcher/dllmain.cpp | 4 +- 7 files changed, 172 insertions(+), 61 deletions(-) diff --git a/src/modules/MouseUtils/FindMyMouse/FindMyMouse.cpp b/src/modules/MouseUtils/FindMyMouse/FindMyMouse.cpp index d03e91c684..4c84691095 100644 --- a/src/modules/MouseUtils/FindMyMouse/FindMyMouse.cpp +++ b/src/modules/MouseUtils/FindMyMouse/FindMyMouse.cpp @@ -161,7 +161,7 @@ bool SuperSonar::Initialize(HINSTANCE hinst) wc.hInstance = hinst; wc.hIcon = LoadIcon(hinst, IDI_APPLICATION); wc.hCursor = LoadCursor(nullptr, IDC_ARROW); - wc.hbrBackground = (HBRUSH)GetStockObject(NULL_BRUSH); + wc.hbrBackground = static_cast(GetStockObject(NULL_BRUSH)); wc.lpszClassName = className; if (!RegisterClassW(&wc)) @@ -196,14 +196,14 @@ LRESULT SuperSonar::s_WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM SuperSonar* self; if (message == WM_NCCREATE) { - auto info = (LPCREATESTRUCT)lParam; - SetWindowLongPtr(hwnd, GWLP_USERDATA, (LONG_PTR)info->lpCreateParams); - self = (SuperSonar*)info->lpCreateParams; + auto info = reinterpret_cast(lParam); + SetWindowLongPtr(hwnd, GWLP_USERDATA, reinterpret_cast(info->lpCreateParams)); + self = static_cast(info->lpCreateParams); self->m_hwnd = hwnd; } else { - self = (SuperSonar*)GetWindowLongPtr(hwnd, GWLP_USERDATA); + self = reinterpret_cast(GetWindowLongPtr(hwnd, GWLP_USERDATA)); } if (self) { @@ -230,7 +230,7 @@ LRESULT SuperSonar::BaseWndProc(UINT message, WPARAM wParam, LPARAM lParam) n break; case WM_INPUT: - OnSonarInput(wParam, (HRAWINPUT)lParam); + OnSonarInput(wParam, reinterpret_cast(lParam)); break; case WM_TIMER: @@ -272,7 +272,7 @@ void SuperSonar::OnSonarInput(WPARAM flags, HRAWINPUT hInput) RAWINPUT input; UINT size = sizeof(input); auto result = GetRawInputData(hInput, RID_INPUT, &input, &size, sizeof(RAWINPUTHEADER)); - if ((int)result < sizeof(RAWINPUTHEADER)) + if (result < sizeof(RAWINPUTHEADER)) { return; } @@ -397,7 +397,7 @@ void SuperSonar::DetectShake() { currentX += movement.diff.x; currentY += movement.diff.y; - distanceTravelled += sqrt((double)movement.diff.x * movement.diff.x + (double)movement.diff.y * movement.diff.y); // Pythagorean theorem + distanceTravelled += sqrt(static_cast(movement.diff.x) * movement.diff.x + static_cast(movement.diff.y) * movement.diff.y); // Pythagorean theorem minX = min(currentX, minX); maxX = max(currentX, maxX); minY = min(currentY, minY); @@ -410,8 +410,8 @@ void SuperSonar::DetectShake() } // Size of the rectangle the pointer moved in. - double rectangleWidth = (double)maxX - minX; - double rectangleHeight = (double)maxY - minY; + double rectangleWidth = static_cast(maxX) - minX; + double rectangleHeight = static_cast(maxY) - minY; double diagonal = sqrt(rectangleWidth * rectangleWidth + rectangleHeight * rectangleHeight); if (diagonal > 0 && distanceTravelled / diagonal > ShakeFactor) @@ -592,7 +592,7 @@ bool SuperSonar::IsForegroundAppExcluded() if (HWND foregroundApp{ GetForegroundWindow() }) { auto processPath = get_process_path(foregroundApp); - CharUpperBuffW(processPath.data(), (DWORD)processPath.length()); + CharUpperBuffW(processPath.data(), static_cast(processPath.length())); return find_app_name_in_path(processPath, m_excludedApps); } else @@ -613,7 +613,7 @@ struct CompositionSpotlight : SuperSonar void AfterMoveSonar() { - m_spotlight.Offset({ (float)m_sonarPos.x, (float)m_sonarPos.y, 0.0f }); + m_spotlight.Offset({ static_cast(m_sonarPos.x), static_cast(m_sonarPos.y), 0.0f }); } LRESULT WndProc(UINT message, WPARAM wParam, LPARAM lParam) noexcept @@ -924,10 +924,10 @@ struct GdiSpotlight : GdiSonar auto spotlight = CreateRoundRectRgn( this->m_sonarPos.x - radius, this->m_sonarPos.y - radius, this->m_sonarPos.x + radius, this->m_sonarPos.y + radius, radius * 2, radius * 2); - FillRgn(ps.hdc, spotlight, (HBRUSH)GetStockObject(WHITE_BRUSH)); + FillRgn(ps.hdc, spotlight, static_cast(GetStockObject(WHITE_BRUSH))); Sleep(1000 / 60); ExtSelectClipRgn(ps.hdc, spotlight, RGN_DIFF); - FillRect(ps.hdc, &ps.rcPaint, (HBRUSH)GetStockObject(BLACK_BRUSH)); + FillRect(ps.hdc, &ps.rcPaint, static_cast(GetStockObject(BLACK_BRUSH))); DeleteObject(spotlight); EndPaint(this->m_hwnd, &ps); @@ -959,7 +959,7 @@ struct GdiCrosshairs : GdiSonar auto radius = CurrentSonarRadius(); RECT rc; - HBRUSH white = (HBRUSH)GetStockObject(WHITE_BRUSH); + HBRUSH white = static_cast(GetStockObject(WHITE_BRUSH)); rc.left = m_sonarPos.x - radius; rc.top = ps.rcPaint.top; @@ -973,7 +973,7 @@ struct GdiCrosshairs : GdiSonar rc.bottom = m_sonarPos.y + radius; FillRect(ps.hdc, &rc, white); - HBRUSH black = (HBRUSH)GetStockObject(BLACK_BRUSH); + HBRUSH black = static_cast(GetStockObject(BLACK_BRUSH)); // Top left rc.left = ps.rcPaint.left; diff --git a/src/modules/MouseUtils/FindMyMouse/dllmain.cpp b/src/modules/MouseUtils/FindMyMouse/dllmain.cpp index 27d809d07d..0241a8922b 100644 --- a/src/modules/MouseUtils/FindMyMouse/dllmain.cpp +++ b/src/modules/MouseUtils/FindMyMouse/dllmain.cpp @@ -185,11 +185,16 @@ void FindMyMouse::parse_settings(PowerToysSettings::PowerToyValues& settings) { // Parse Activation Method auto jsonPropertiesObject = settingsObject.GetNamedObject(JSON_KEY_PROPERTIES).GetNamedObject(JSON_KEY_ACTIVATION_METHOD); - UINT value = (UINT)jsonPropertiesObject.GetNamedNumber(JSON_KEY_VALUE); - if (value < (int)FindMyMouseActivationMethod::EnumElements) + int value = static_cast(jsonPropertiesObject.GetNamedNumber(JSON_KEY_VALUE)); + if (value < static_cast(FindMyMouseActivationMethod::EnumElements) && value >= 0) { - findMyMouseSettings.activationMethod = (FindMyMouseActivationMethod)value; + findMyMouseSettings.activationMethod = static_cast(value); } + else + { + throw; + } + } catch (...) { @@ -198,7 +203,7 @@ void FindMyMouse::parse_settings(PowerToysSettings::PowerToyValues& settings) try { auto jsonPropertiesObject = settingsObject.GetNamedObject(JSON_KEY_PROPERTIES).GetNamedObject(JSON_KEY_DO_NOT_ACTIVATE_ON_GAME_MODE); - findMyMouseSettings.doNotActivateOnGameMode = (bool)jsonPropertiesObject.GetNamedBoolean(JSON_KEY_VALUE); + findMyMouseSettings.doNotActivateOnGameMode = jsonPropertiesObject.GetNamedBoolean(JSON_KEY_VALUE); } catch (...) { @@ -246,7 +251,15 @@ void FindMyMouse::parse_settings(PowerToysSettings::PowerToyValues& settings) { // Parse Overlay Opacity auto jsonPropertiesObject = settingsObject.GetNamedObject(JSON_KEY_PROPERTIES).GetNamedObject(JSON_KEY_OVERLAY_OPACITY); - findMyMouseSettings.overlayOpacity = (UINT)jsonPropertiesObject.GetNamedNumber(JSON_KEY_VALUE); + int value = static_cast(jsonPropertiesObject.GetNamedNumber(JSON_KEY_VALUE)); + if (value >= 0) + { + findMyMouseSettings.overlayOpacity = value; + } + else + { + throw; + } } catch (...) { @@ -256,7 +269,15 @@ void FindMyMouse::parse_settings(PowerToysSettings::PowerToyValues& settings) { // Parse Spotlight Radius auto jsonPropertiesObject = settingsObject.GetNamedObject(JSON_KEY_PROPERTIES).GetNamedObject(JSON_KEY_SPOTLIGHT_RADIUS); - findMyMouseSettings.spotlightRadius = (UINT)jsonPropertiesObject.GetNamedNumber(JSON_KEY_VALUE); + int value = static_cast(jsonPropertiesObject.GetNamedNumber(JSON_KEY_VALUE)); + if (value >= 0) + { + findMyMouseSettings.spotlightRadius = value; + } + else + { + throw; + } } catch (...) { @@ -266,7 +287,15 @@ void FindMyMouse::parse_settings(PowerToysSettings::PowerToyValues& settings) { // Parse Animation Duration auto jsonPropertiesObject = settingsObject.GetNamedObject(JSON_KEY_PROPERTIES).GetNamedObject(JSON_KEY_ANIMATION_DURATION_MS); - findMyMouseSettings.animationDurationMs = (UINT)jsonPropertiesObject.GetNamedNumber(JSON_KEY_VALUE); + int value = static_cast(jsonPropertiesObject.GetNamedNumber(JSON_KEY_VALUE)); + if (value >= 0) + { + findMyMouseSettings.animationDurationMs = value; + } + else + { + throw; + } } catch (...) { @@ -276,7 +305,15 @@ void FindMyMouse::parse_settings(PowerToysSettings::PowerToyValues& settings) { // Parse Spotlight Initial Zoom auto jsonPropertiesObject = settingsObject.GetNamedObject(JSON_KEY_PROPERTIES).GetNamedObject(JSON_KEY_SPOTLIGHT_INITIAL_ZOOM); - findMyMouseSettings.spotlightInitialZoom = (UINT)jsonPropertiesObject.GetNamedNumber(JSON_KEY_VALUE); + int value = static_cast(jsonPropertiesObject.GetNamedNumber(JSON_KEY_VALUE)); + if (value >= 0) + { + findMyMouseSettings.spotlightInitialZoom = value; + } + else + { + throw; + } } catch (...) { @@ -289,7 +326,7 @@ void FindMyMouse::parse_settings(PowerToysSettings::PowerToyValues& settings) std::wstring apps = jsonPropertiesObject.GetNamedString(JSON_KEY_VALUE).c_str(); std::vector excludedApps; auto excludedUppercase = apps; - CharUpperBuffW(excludedUppercase.data(), (DWORD)excludedUppercase.length()); + CharUpperBuffW(excludedUppercase.data(), static_cast(excludedUppercase.length())); std::wstring_view view(excludedUppercase); view = left_trim(trim(view)); @@ -311,7 +348,15 @@ void FindMyMouse::parse_settings(PowerToysSettings::PowerToyValues& settings) { // Parse Shaking Minimum Distance auto jsonPropertiesObject = settingsObject.GetNamedObject(JSON_KEY_PROPERTIES).GetNamedObject(JSON_KEY_SHAKING_MINIMUM_DISTANCE); - findMyMouseSettings.shakeMinimumDistance = (UINT)jsonPropertiesObject.GetNamedNumber(JSON_KEY_VALUE); + int value = static_cast(jsonPropertiesObject.GetNamedNumber(JSON_KEY_VALUE)); + if (value >= 0) + { + findMyMouseSettings.shakeMinimumDistance = value; + } + else + { + throw; + } } catch (...) { diff --git a/src/modules/MouseUtils/MouseHighlighter/MouseHighlighter.cpp b/src/modules/MouseUtils/MouseHighlighter/MouseHighlighter.cpp index f1107db483..2a10ff648d 100644 --- a/src/modules/MouseUtils/MouseHighlighter/MouseHighlighter.cpp +++ b/src/modules/MouseUtils/MouseHighlighter/MouseHighlighter.cpp @@ -132,7 +132,7 @@ void Highlighter::AddDrawingPoint(MouseButton button) auto circleGeometry = m_compositor.CreateEllipseGeometry(); circleGeometry.Radius({ m_radius, m_radius }); auto circleShape = m_compositor.CreateSpriteShape(circleGeometry); - circleShape.Offset({ (float)pt.x, (float)pt.y }); + circleShape.Offset({ static_cast(pt.x), static_cast(pt.y )}); if (button == MouseButton::Left) { circleShape.FillBrush(m_compositor.CreateColorBrush(m_leftClickColor)); @@ -166,12 +166,12 @@ void Highlighter::UpdateDrawingPointPosition(MouseButton button) if (button == MouseButton::Left) { - m_leftPointer.Offset({ (float)pt.x, (float)pt.y }); + m_leftPointer.Offset({ static_cast(pt.x), static_cast(pt.y )}); } else { //right - m_rightPointer.Offset({ (float)pt.x, (float)pt.y }); + m_rightPointer.Offset({ static_cast(pt.x), static_cast(pt.y )}); } } void Highlighter::StartDrawingPointFading(MouseButton button) @@ -217,7 +217,7 @@ LRESULT CALLBACK Highlighter::MouseHookProc(int nCode, WPARAM wParam, LPARAM lPa { if (nCode >= 0) { - MSLLHOOKSTRUCT* hookData = (MSLLHOOKSTRUCT*)lParam; + MSLLHOOKSTRUCT* hookData = reinterpret_cast(lParam); switch (wParam) { case WM_LBUTTONDOWN: @@ -293,7 +293,7 @@ void Highlighter::SwitchActivationMode() } void Highlighter::ApplySettings(MouseHighlighterSettings settings) { - m_radius = (float)settings.radius; + m_radius = static_cast(settings.radius); m_fadeDelay_ms = settings.fadeDelayMs; m_fadeDuration_ms = settings.fadeDurationMs; m_leftClickColor = settings.leftButtonColor; @@ -349,7 +349,7 @@ bool Highlighter::MyRegisterClass(HINSTANCE hInstance) wc.hInstance = hInstance; wc.hIcon = LoadIcon(hInstance, IDI_APPLICATION); wc.hCursor = LoadCursor(nullptr, IDC_ARROW); - wc.hbrBackground = (HBRUSH)GetStockObject(NULL_BRUSH); + wc.hbrBackground = static_cast(GetStockObject(NULL_BRUSH)); wc.lpszClassName = m_className; if (!RegisterClassW(&wc)) diff --git a/src/modules/MouseUtils/MouseHighlighter/dllmain.cpp b/src/modules/MouseUtils/MouseHighlighter/dllmain.cpp index 75cf746a02..b3860a227b 100644 --- a/src/modules/MouseUtils/MouseHighlighter/dllmain.cpp +++ b/src/modules/MouseUtils/MouseHighlighter/dllmain.cpp @@ -215,7 +215,15 @@ public: { // Parse Opacity auto jsonPropertiesObject = settingsObject.GetNamedObject(JSON_KEY_PROPERTIES).GetNamedObject(JSON_KEY_HIGHLIGHT_OPACITY); - opacity = (uint8_t)jsonPropertiesObject.GetNamedNumber(JSON_KEY_VALUE); + int value = static_cast(jsonPropertiesObject.GetNamedNumber(JSON_KEY_VALUE)); + if (value >= 0) + { + opacity = value; + } + else + { + throw; + } } catch (...) { @@ -234,7 +242,7 @@ public: auto jsonPropertiesObject = settingsObject.GetNamedObject(JSON_KEY_PROPERTIES).GetNamedObject(JSON_KEY_LEFT_BUTTON_CLICK_COLOR); auto leftColor = (std::wstring)jsonPropertiesObject.GetNamedString(JSON_KEY_VALUE); uint8_t r, g, b; - if (!checkValidRGB(leftColor,&r,&g,&b)) + if (!checkValidRGB(leftColor, &r, &g, &b)) { Logger::error("Left click color RGB value is invalid. Will use default value"); } @@ -270,7 +278,15 @@ public: { // Parse Radius auto jsonPropertiesObject = settingsObject.GetNamedObject(JSON_KEY_PROPERTIES).GetNamedObject(JSON_KEY_HIGHLIGHT_RADIUS); - highlightSettings.radius = (UINT)jsonPropertiesObject.GetNamedNumber(JSON_KEY_VALUE); + int value = static_cast(jsonPropertiesObject.GetNamedNumber(JSON_KEY_VALUE)); + if (value >= 0) + { + highlightSettings.radius = value; + } + else + { + throw; + } } catch (...) { @@ -280,7 +296,15 @@ public: { // Parse Fade Delay auto jsonPropertiesObject = settingsObject.GetNamedObject(JSON_KEY_PROPERTIES).GetNamedObject(JSON_KEY_HIGHLIGHT_FADE_DELAY_MS); - highlightSettings.fadeDelayMs = (UINT)jsonPropertiesObject.GetNamedNumber(JSON_KEY_VALUE); + int value = static_cast(jsonPropertiesObject.GetNamedNumber(JSON_KEY_VALUE)); + if (value >= 0) + { + highlightSettings.fadeDelayMs = value; + } + else + { + throw; + } } catch (...) { @@ -290,7 +314,15 @@ public: { // Parse Fade Duration auto jsonPropertiesObject = settingsObject.GetNamedObject(JSON_KEY_PROPERTIES).GetNamedObject(JSON_KEY_HIGHLIGHT_FADE_DURATION_MS); - highlightSettings.fadeDurationMs = (UINT)jsonPropertiesObject.GetNamedNumber(JSON_KEY_VALUE); + int value = static_cast(jsonPropertiesObject.GetNamedNumber(JSON_KEY_VALUE)); + if (value >= 0) + { + highlightSettings.fadeDurationMs = value; + } + else + { + throw; + } } catch (...) { diff --git a/src/modules/MouseUtils/MousePointerCrosshairs/InclusiveCrosshairs.cpp b/src/modules/MouseUtils/MousePointerCrosshairs/InclusiveCrosshairs.cpp index 0f84fe9632..6cedfe6d52 100644 --- a/src/modules/MouseUtils/MousePointerCrosshairs/InclusiveCrosshairs.cpp +++ b/src/modules/MouseUtils/MousePointerCrosshairs/InclusiveCrosshairs.cpp @@ -212,25 +212,25 @@ void InclusiveCrosshairs::UpdateCrosshairsPosition() float halfPixelAdjustment = m_crosshairs_thickness % 2 == 1 ? 0.5f : 0.0f; // Position crosshairs components around the mouse pointer. - m_left_crosshairs_border.Offset({ (float)ptCursor.x - m_crosshairs_radius + m_crosshairs_border_size + halfPixelAdjustment * 2, (float)ptCursor.y + halfPixelAdjustment, .0f }); - m_left_crosshairs_border.Size({ (float)ptCursor.x - (float)ptMonitorUpperLeft.x - m_crosshairs_radius + m_crosshairs_border_size + halfPixelAdjustment * 2, (float)m_crosshairs_thickness + m_crosshairs_border_size * 2 }); - m_left_crosshairs.Offset({ (float)ptCursor.x - m_crosshairs_radius + halfPixelAdjustment * 2, (float)ptCursor.y + halfPixelAdjustment, .0f }); - m_left_crosshairs.Size({ (float)ptCursor.x - (float)ptMonitorUpperLeft.x - m_crosshairs_radius + halfPixelAdjustment * 2, (float)m_crosshairs_thickness }); + m_left_crosshairs_border.Offset({ ptCursor.x - m_crosshairs_radius + m_crosshairs_border_size + halfPixelAdjustment * 2, ptCursor.y + halfPixelAdjustment, .0f }); + m_left_crosshairs_border.Size({ ptCursor.x - ptMonitorUpperLeft.x - m_crosshairs_radius + m_crosshairs_border_size + halfPixelAdjustment * 2, m_crosshairs_thickness + m_crosshairs_border_size * 2.f }); + m_left_crosshairs.Offset({ ptCursor.x - m_crosshairs_radius + halfPixelAdjustment * 2.f, ptCursor.y + halfPixelAdjustment, .0f }); + m_left_crosshairs.Size({ ptCursor.x - ptMonitorUpperLeft.x - m_crosshairs_radius + halfPixelAdjustment * 2, static_cast(m_crosshairs_thickness) }); - m_right_crosshairs_border.Offset({ (float)ptCursor.x + m_crosshairs_radius - m_crosshairs_border_size, (float)ptCursor.y + halfPixelAdjustment, .0f }); - m_right_crosshairs_border.Size({ (float)ptMonitorBottomRight.x - (float)ptCursor.x - m_crosshairs_radius + m_crosshairs_border_size, (float)m_crosshairs_thickness + m_crosshairs_border_size * 2 }); - m_right_crosshairs.Offset({ (float)ptCursor.x + m_crosshairs_radius, (float)ptCursor.y + halfPixelAdjustment, .0f }); - m_right_crosshairs.Size({ (float)ptMonitorBottomRight.x - (float)ptCursor.x - m_crosshairs_radius, (float)m_crosshairs_thickness }); + m_right_crosshairs_border.Offset({static_cast(ptCursor.x) + m_crosshairs_radius - m_crosshairs_border_size, ptCursor.y + halfPixelAdjustment, .0f }); + m_right_crosshairs_border.Size({ static_cast(ptMonitorBottomRight.x) - ptCursor.x - m_crosshairs_radius + m_crosshairs_border_size, m_crosshairs_thickness + m_crosshairs_border_size * 2.f }); + m_right_crosshairs.Offset({ static_cast(ptCursor.x) + m_crosshairs_radius, ptCursor.y + halfPixelAdjustment, .0f }); + m_right_crosshairs.Size({ static_cast(ptMonitorBottomRight.x) - ptCursor.x - m_crosshairs_radius, static_cast(m_crosshairs_thickness) }); - m_top_crosshairs_border.Offset({ (float)ptCursor.x + halfPixelAdjustment, (float)ptCursor.y - m_crosshairs_radius + m_crosshairs_border_size + halfPixelAdjustment * 2, .0f }); - m_top_crosshairs_border.Size({ (float)m_crosshairs_thickness + m_crosshairs_border_size * 2, (float)ptCursor.y - (float)ptMonitorUpperLeft.y - m_crosshairs_radius + m_crosshairs_border_size + halfPixelAdjustment * 2 }); - m_top_crosshairs.Offset({ (float)ptCursor.x + halfPixelAdjustment, (float)ptCursor.y - m_crosshairs_radius + halfPixelAdjustment * 2, .0f }); - m_top_crosshairs.Size({ (float)m_crosshairs_thickness, (float)ptCursor.y - (float)ptMonitorUpperLeft.y - m_crosshairs_radius + halfPixelAdjustment * 2 }); + m_top_crosshairs_border.Offset({ ptCursor.x + halfPixelAdjustment, ptCursor.y - m_crosshairs_radius + m_crosshairs_border_size + halfPixelAdjustment * 2, .0f }); + m_top_crosshairs_border.Size({ m_crosshairs_thickness + m_crosshairs_border_size * 2.f, ptCursor.y - ptMonitorUpperLeft.y - m_crosshairs_radius + m_crosshairs_border_size + halfPixelAdjustment * 2 }); + m_top_crosshairs.Offset({ ptCursor.x + halfPixelAdjustment, ptCursor.y - m_crosshairs_radius + halfPixelAdjustment * 2, .0f }); + m_top_crosshairs.Size({ static_cast(m_crosshairs_thickness), ptCursor.y - ptMonitorUpperLeft.y - m_crosshairs_radius + halfPixelAdjustment * 2 }); - m_bottom_crosshairs_border.Offset({ (float)ptCursor.x + halfPixelAdjustment, (float)ptCursor.y + m_crosshairs_radius - m_crosshairs_border_size, .0f }); - m_bottom_crosshairs_border.Size({ (float)m_crosshairs_thickness + m_crosshairs_border_size * 2, (float)ptMonitorBottomRight.y - (float)ptCursor.y - m_crosshairs_radius + m_crosshairs_border_size }); - m_bottom_crosshairs.Offset({ (float)ptCursor.x + halfPixelAdjustment, (float)ptCursor.y + m_crosshairs_radius, .0f }); - m_bottom_crosshairs.Size({ (float)m_crosshairs_thickness, (float)ptMonitorBottomRight.y - (float)ptCursor.y - m_crosshairs_radius }); + m_bottom_crosshairs_border.Offset({ ptCursor.x + halfPixelAdjustment, static_cast(ptCursor.y) + m_crosshairs_radius - m_crosshairs_border_size, .0f }); + m_bottom_crosshairs_border.Size({ m_crosshairs_thickness + m_crosshairs_border_size * 2.f, static_cast(ptMonitorBottomRight.y) - ptCursor.y - m_crosshairs_radius + m_crosshairs_border_size }); + m_bottom_crosshairs.Offset({ ptCursor.x + halfPixelAdjustment, static_cast(ptCursor.y) + m_crosshairs_radius, .0f }); + m_bottom_crosshairs.Size({ static_cast(m_crosshairs_thickness), static_cast(ptMonitorBottomRight.y) - ptCursor.y - m_crosshairs_radius }); } @@ -238,7 +238,7 @@ LRESULT CALLBACK InclusiveCrosshairs::MouseHookProc(int nCode, WPARAM wParam, LP { if (nCode >= 0) { - MSLLHOOKSTRUCT* hookData = (MSLLHOOKSTRUCT*)lParam; + MSLLHOOKSTRUCT* hookData = reinterpret_cast(lParam); if (wParam == WM_MOUSEMOVE) { instance->UpdateCrosshairsPosition(); } @@ -362,7 +362,7 @@ bool InclusiveCrosshairs::MyRegisterClass(HINSTANCE hInstance) wc.hInstance = hInstance; wc.hIcon = LoadIcon(hInstance, IDI_APPLICATION); wc.hCursor = LoadCursor(nullptr, IDC_ARROW); - wc.hbrBackground = (HBRUSH)GetStockObject(NULL_BRUSH); + wc.hbrBackground = static_cast(GetStockObject(NULL_BRUSH)); wc.lpszClassName = m_className; if (!RegisterClassW(&wc)) diff --git a/src/modules/MouseUtils/MousePointerCrosshairs/dllmain.cpp b/src/modules/MouseUtils/MousePointerCrosshairs/dllmain.cpp index 81c79c57b6..257d050e5e 100644 --- a/src/modules/MouseUtils/MousePointerCrosshairs/dllmain.cpp +++ b/src/modules/MouseUtils/MousePointerCrosshairs/dllmain.cpp @@ -222,7 +222,15 @@ public: { // Parse Opacity auto jsonPropertiesObject = settingsObject.GetNamedObject(JSON_KEY_PROPERTIES).GetNamedObject(JSON_KEY_CROSSHAIRS_OPACITY); - inclusiveCrosshairsSettings.crosshairsOpacity = (uint8_t)jsonPropertiesObject.GetNamedNumber(JSON_KEY_VALUE); + int value = static_cast(jsonPropertiesObject.GetNamedNumber(JSON_KEY_VALUE)); + if (value >= 0) + { + inclusiveCrosshairsSettings.crosshairsOpacity = value; + } + else + { + throw; + } } catch (...) { @@ -251,7 +259,16 @@ public: { // Parse Radius auto jsonPropertiesObject = settingsObject.GetNamedObject(JSON_KEY_PROPERTIES).GetNamedObject(JSON_KEY_CROSSHAIRS_RADIUS); - inclusiveCrosshairsSettings.crosshairsRadius = (UINT)jsonPropertiesObject.GetNamedNumber(JSON_KEY_VALUE); + int value = static_cast(jsonPropertiesObject.GetNamedNumber(JSON_KEY_VALUE)); + if (value >= 0) + { + inclusiveCrosshairsSettings.crosshairsRadius = value; + } + else + { + throw; + } + } catch (...) { @@ -261,7 +278,16 @@ public: { // Parse Thickness auto jsonPropertiesObject = settingsObject.GetNamedObject(JSON_KEY_PROPERTIES).GetNamedObject(JSON_KEY_CROSSHAIRS_THICKNESS); - inclusiveCrosshairsSettings.crosshairsThickness = (UINT)jsonPropertiesObject.GetNamedNumber(JSON_KEY_VALUE); + int value = static_cast(jsonPropertiesObject.GetNamedNumber(JSON_KEY_VALUE)); + if (value >= 0) + { + inclusiveCrosshairsSettings.crosshairsThickness = value; + } + else + { + throw; + } + } catch (...) { @@ -290,7 +316,15 @@ public: { // Parse border size auto jsonPropertiesObject = settingsObject.GetNamedObject(JSON_KEY_PROPERTIES).GetNamedObject(JSON_KEY_CROSSHAIRS_BORDER_SIZE); - inclusiveCrosshairsSettings.crosshairsBorderSize = (UINT)jsonPropertiesObject.GetNamedNumber(JSON_KEY_VALUE); + int value = static_cast (jsonPropertiesObject.GetNamedNumber(JSON_KEY_VALUE)); + if (value >= 0) + { + inclusiveCrosshairsSettings.crosshairsBorderSize = value; + } + else + { + throw; + } } catch (...) { diff --git a/src/modules/launcher/Microsoft.Launcher/dllmain.cpp b/src/modules/launcher/Microsoft.Launcher/dllmain.cpp index 386f9b0420..b692dd1daf 100644 --- a/src/modules/launcher/Microsoft.Launcher/dllmain.cpp +++ b/src/modules/launcher/Microsoft.Launcher/dllmain.cpp @@ -349,7 +349,7 @@ public: DWORD windowPid; GetWindowThreadProcessId(nextWindow, &windowPid); - if (windowPid == (DWORD)closePid) + if (windowPid == static_cast(closePid)) ::PostMessage(nextWindow, WM_CLOSE, 0, 0); return true; @@ -401,7 +401,7 @@ void Microsoft_Launcher::parse_hotkey(PowerToysSettings::PowerToyValues& setting try { auto jsonPropertiesObject = settingsObject.GetNamedObject(JSON_KEY_PROPERTIES); - m_use_centralized_keyboard_hook = (bool)jsonPropertiesObject.GetNamedBoolean(JSON_KEY_USE_CENTRALIZED_KEYBOARD_HOOK); + m_use_centralized_keyboard_hook =jsonPropertiesObject.GetNamedBoolean(JSON_KEY_USE_CENTRALIZED_KEYBOARD_HOOK); } catch (...) {