diff --git a/Cpp.Build.props b/Cpp.Build.props index 94f3f8a6f6..e3b41aac0d 100644 --- a/Cpp.Build.props +++ b/Cpp.Build.props @@ -42,7 +42,7 @@ pch.h Level4 - 26800;28251;4389;4456;4457;4701;6387;4458;4505;4515;4459;4702;6031;6248;26451;28182;%(DisableSpecificWarnings) + 26800;28251;4389;4457;4701;6387;4458;4505;4515;4459;4702;6031;6248;26451;28182;%(DisableSpecificWarnings) true TurnOffAllWarnings false diff --git a/src/common/utils/com_object_factory.h b/src/common/utils/com_object_factory.h index e3ae06e938..fd2490691f 100644 --- a/src/common/utils/com_object_factory.h +++ b/src/common/utils/com_object_factory.h @@ -32,21 +32,18 @@ public: HRESULT __stdcall CreateInstance(IUnknown* punkOuter, const IID& riid, void** ppv) { *ppv = nullptr; - HRESULT hr; + if (punkOuter) { - hr = CLASS_E_NOAGGREGATION; + return CLASS_E_NOAGGREGATION; } - else + + T* psrm = new (std::nothrow) T(); + HRESULT hr = psrm ? S_OK : E_OUTOFMEMORY; + if (SUCCEEDED(hr)) { - T* psrm = new (std::nothrow) T(); - HRESULT hr = psrm ? S_OK : E_OUTOFMEMORY; - if (SUCCEEDED(hr)) - { - hr = psrm->QueryInterface(riid, ppv); - psrm->Release(); - } - return hr; + hr = psrm->QueryInterface(riid, ppv); + psrm->Release(); } return hr; } diff --git a/src/modules/ShortcutGuide/ShortcutGuide/overlay_window.cpp b/src/modules/ShortcutGuide/ShortcutGuide/overlay_window.cpp index 9436b9f463..e868b27025 100644 --- a/src/modules/ShortcutGuide/ShortcutGuide/overlay_window.cpp +++ b/src/modules/ShortcutGuide/ShortcutGuide/overlay_window.cpp @@ -278,11 +278,11 @@ D2DOverlayWindow::D2DOverlayWindow() : while (running) { // Removing causes C3538 on std::unique_lock lock(mutex); in show(..) - std::unique_lock lock(tasklist_cv_mutex); - tasklist_cv.wait(lock, [&] { return !running || tasklist_update; }); + std::unique_lock task_list_lock(tasklist_cv_mutex); + tasklist_cv.wait(task_list_lock, [&] { return !running || tasklist_update; }); if (!running) return; - lock.unlock(); + task_list_lock.unlock(); while (running && tasklist_update) { std::vector buttons; diff --git a/src/modules/fancyzones/FancyZonesLib/LayoutConfigurator.cpp b/src/modules/fancyzones/FancyZonesLib/LayoutConfigurator.cpp index 567be4688c..1f1402ff15 100644 --- a/src/modules/fancyzones/FancyZonesLib/LayoutConfigurator.cpp +++ b/src/modules/fancyzones/FancyZonesLib/LayoutConfigurator.cpp @@ -404,10 +404,10 @@ ZonesMap LayoutConfigurator::Custom(FancyZonesUtils::Rect workArea, HMONITOR mon DPIAware::Convert(monitor, x, y); DPIAware::Convert(monitor, zoneWidth, zoneHeight); - Zone zone(RECT{ static_cast(x), static_cast(y), static_cast(x + zoneWidth), static_cast(y + zoneHeight) }, zones.size()); - if (zone.IsValid()) + Zone zone_to_add(RECT{ static_cast(x), static_cast(y), static_cast(x + zoneWidth), static_cast(y + zoneHeight) }, zones.size()); + if (zone_to_add.IsValid()) { - if (!AddZone(zone, zones)) + if (!AddZone(zone_to_add, zones)) { Logger::error(L"Failed to create Custom layout. Invalid zone id"); return {}; diff --git a/src/modules/powerrename/unittests/PowerRenameRegExTests.cpp b/src/modules/powerrename/unittests/PowerRenameRegExTests.cpp index 37b16cb45d..597e33bff2 100644 --- a/src/modules/powerrename/unittests/PowerRenameRegExTests.cpp +++ b/src/modules/powerrename/unittests/PowerRenameRegExTests.cpp @@ -428,30 +428,30 @@ TEST_METHOD (VerifyFileAttributesMonthandDayNames) std::locale::global(std::locale("")); SYSTEMTIME fileTime = { 2020, 1, 3, 1, 15, 6, 42, 453 }; wchar_t localeName[LOCALE_NAME_MAX_LENGTH]; - wchar_t result[MAX_PATH] = L"bar"; + wchar_t dest[MAX_PATH] = L"bar"; wchar_t formattedDate[MAX_PATH]; if (GetUserDefaultLocaleName(localeName, LOCALE_NAME_MAX_LENGTH) == 0) StringCchCopy(localeName, LOCALE_NAME_MAX_LENGTH, L"en_US"); GetDateFormatEx(localeName, NULL, &fileTime, L"MMM", formattedDate, MAX_PATH, NULL); formattedDate[0] = towupper(formattedDate[0]); - StringCchPrintf(result, MAX_PATH, TEXT("%s%s"), result, formattedDate); + StringCchPrintf(dest, MAX_PATH, TEXT("%s%s"), dest, formattedDate); GetDateFormatEx(localeName, NULL, &fileTime, L"MMMM", formattedDate, MAX_PATH, NULL); formattedDate[0] = towupper(formattedDate[0]); - StringCchPrintf(result, MAX_PATH, TEXT("%s-%s"), result, formattedDate); + StringCchPrintf(dest, MAX_PATH, TEXT("%s-%s"), dest, formattedDate); GetDateFormatEx(localeName, NULL, &fileTime, L"ddd", formattedDate, MAX_PATH, NULL); formattedDate[0] = towupper(formattedDate[0]); - StringCchPrintf(result, MAX_PATH, TEXT("%s-%s"), result, formattedDate); + StringCchPrintf(dest, MAX_PATH, TEXT("%s-%s"), dest, formattedDate); GetDateFormatEx(localeName, NULL, &fileTime, L"dddd", formattedDate, MAX_PATH, NULL); formattedDate[0] = towupper(formattedDate[0]); - StringCchPrintf(result, MAX_PATH, TEXT("%s-%s"), result, formattedDate); + StringCchPrintf(dest, MAX_PATH, TEXT("%s-%s"), dest, formattedDate); SearchReplaceExpected sreTable[] = { //search, replace, test, result - { L"foo", L"bar$MMM-$MMMM-$DDD-$DDDD", L"foo", result }, + { L"foo", L"bar$MMM-$MMMM-$DDD-$DDDD", L"foo", dest }, }; for (int i = 0; i < ARRAYSIZE(sreTable); i++) diff --git a/src/runner/main.cpp b/src/runner/main.cpp index 76e7089e29..9921eaa153 100644 --- a/src/runner/main.cpp +++ b/src/runner/main.cpp @@ -477,8 +477,7 @@ int WINAPI WinMain(HINSTANCE /*hInstance*/, HINSTANCE /*hPrevInstance*/, LPSTR l if (result == 0) { // Save settings on closing, if closed 'normal' - auto general_settings = get_general_settings(); - PTSettingsHelper::save_general_settings(general_settings.to_json()); + PTSettingsHelper::save_general_settings(get_general_settings().to_json()); } } else diff --git a/tools/BugReportTool/BugReportTool/InstallationFolder.cpp b/tools/BugReportTool/BugReportTool/InstallationFolder.cpp index abecb6f308..792aaee9c0 100644 --- a/tools/BugReportTool/BugReportTool/InstallationFolder.cpp +++ b/tools/BugReportTool/BugReportTool/InstallationFolder.cpp @@ -144,7 +144,7 @@ wstring GetChecksum(path filePath) } else { - std::wstring result = L"CryptGetHashParam() failed. " + get_last_error_or_default(GetLastError());; + result = L"CryptGetHashParam() failed. " + get_last_error_or_default(GetLastError());; } CryptDestroyHash(hHash); diff --git a/tools/BugReportTool/BugReportTool/RegistryUtils.cpp b/tools/BugReportTool/BugReportTool/RegistryUtils.cpp index dde4579a90..693257d9e8 100644 --- a/tools/BugReportTool/BugReportTool/RegistryUtils.cpp +++ b/tools/BugReportTool/BugReportTool/RegistryUtils.cpp @@ -281,7 +281,7 @@ void ReportRegistry(const filesystem::path& tmpDir) else { DWORD data = 0; - DWORD dataSize = sizeof(data); + dataSize = sizeof(data); result = RegGetValueW(rootKey, subKey.c_str(), value.c_str(), flags, &type, &data, &dataSize); if (result == ERROR_SUCCESS) {