Tweaks and cosmetics

Fixes various compiler and intellisense warnings
whitequill · Sep 15, 2022 · 5e66445 · 5e66445
1 parent 42d5518
commit 5e66445
Show file tree

Hide file tree

Showing 79 changed files with 1,341 additions and 1,215 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,6 +2,7 @@
 *.patch
 *.txt
 *.user
+*.aps
 /.vs
 /ipch
 /TestBench

diff --git a/Application/Application.cpp b/Application/Application.cpp
@@ -56,7 +56,7 @@ int APIENTRY wWinMain(HINSTANCE, HINSTANCE, LPWSTR, int)
 	//_CrtSetBreakAlloc(000);
 
 	// Prevent system error message boxes.
-	UINT oldMode = SetErrorMode(0);
+	UINT oldMode = SetErrorMode(0U);
 	SetErrorMode(oldMode | SEM_FAILCRITICALERRORS);
 
 	HINSTANCE instance = (HINSTANCE)&__ImageBase;
@@ -75,7 +75,7 @@ int APIENTRY wWinMain(HINSTANCE, HINSTANCE, LPWSTR, int)
 			}
 		}
 
-		WCHAR message[128];
+		WCHAR message[128] = { 0 };
 		wsprintf(
 			message,
 			L"Rainmeter.dll load error %ld.",
@@ -85,13 +85,13 @@ int APIENTRY wWinMain(HINSTANCE, HINSTANCE, LPWSTR, int)
 	else
 	{
 		// Stub prodecure. If icon resources have been removed, try to launch the actual Rainmeter.exe.
-		HKEY hKey;
+		HKEY hKey = nullptr;
 		const REGSAM desiredSam = KEY_QUERY_VALUE | KEY_WOW64_32KEY;
 		if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, L"Software\\Rainmeter", 0, desiredSam, &hKey) == ERROR_SUCCESS)
 		{
 			const DWORD size = MAX_PATH;
-			WCHAR buffer[size];
-			DWORD type = 0;
+			WCHAR buffer[size] = { 0 };
+			DWORD type = 0UL;
 			if (RegQueryValueEx(hKey, nullptr , nullptr, &type, (LPBYTE)buffer, (LPDWORD)&size) == ERROR_SUCCESS &&
 				type == REG_SZ)
 			{
@@ -100,6 +100,7 @@ int APIENTRY wWinMain(HINSTANCE, HINSTANCE, LPWSTR, int)
 				ShellExecute(nullptr, L"open", buffer, args, nullptr, SW_SHOWNORMAL);
 			}
 			RegCloseKey(hKey);
+			hKey = nullptr;
 		}
 
 		return 0;

diff --git a/Common/Dialog.cpp b/Common/Dialog.cpp
@@ -84,6 +84,7 @@ void BaseDialog::Show(const WCHAR* title, short x, short y, short w, short h, DW
 	}
 
 	delete [] dt;
+	dt = nullptr;
 }
 
 void BaseDialog::CreateControls(const ControlTemplate::Control* cts, UINT ctCount, HFONT font, ControlTemplate::GetStringFunc getString)

diff --git a/Common/FileUtil.cpp b/Common/FileUtil.cpp
@@ -83,10 +83,10 @@ bool GetBinaryFileBitness(const WCHAR* path, WORD& bitness)
 	};
 
 	hFile = CreateFile(path, GENERIC_READ, FILE_SHARE_READ, nullptr, OPEN_EXISTING, FILE_ATTRIBUTE_READONLY, nullptr);
-	if (hFile == INVALID_HANDLE_VALUE) return cleanUp(false);
+	if (!hFile || hFile == INVALID_HANDLE_VALUE) return cleanUp(false);
 
 	hMapping = CreateFileMapping(hFile, nullptr, PAGE_READONLY | SEC_IMAGE, 0UL, 0UL, nullptr);
-	if (hMapping == INVALID_HANDLE_VALUE) return cleanUp(false);
+	if (!hMapping || hMapping == INVALID_HANDLE_VALUE) return cleanUp(false);
 
 	addrMapping = MapViewOfFile(hMapping, FILE_MAP_READ, 0UL, 0UL, 0UL);
 	if (!addrMapping) return cleanUp(false);

diff --git a/Common/Gfx/Canvas.cpp b/Common/Gfx/Canvas.cpp
@@ -433,7 +433,7 @@ void Canvas::DrawTextW(const std::wstring& srcStr, const TextFormat& format, con
 		rect.bottom - rect.top,
 		!m_AccurateText && m_TextAntiAliasing)) return;
 
-	D2D1_POINT_2F drawPosition;
+	D2D1_POINT_2F drawPosition = D2D1::Point2F();
 	drawPosition.x = [&]()
 	{
 		if (!m_AccurateText)
@@ -558,12 +558,11 @@ bool Canvas::MeasureTextLinesW(const std::wstring& str, const TextFormat& format
 	return true;
 }
 
-void Canvas::DrawBitmap(const D2DBitmap* bitmap, const D2D1_RECT_F& dstRect, const D2D1_RECT_F& srcRect)
+void Canvas::DrawBitmap(D2DBitmap* bitmap, const D2D1_RECT_F& dstRect, const D2D1_RECT_F& srcRect)
 {
-	auto& segments = bitmap->m_Segments;
-	for (auto seg : segments)
+	for (auto& segment : bitmap->m_Segments)
 	{
-		const auto rSeg = seg.GetRect();
+		const auto& rSeg = segment.GetRect();
 		D2D1_RECT_F rSrc = (rSeg.left < rSeg.right && rSeg.top < rSeg.bottom) ?
 			D2D1::RectF(
 				max(rSeg.left, srcRect.left),
@@ -591,11 +590,11 @@ void Canvas::DrawBitmap(const D2DBitmap* bitmap, const D2D1_RECT_F& dstRect, con
 			rSrc.left -= m_MaxBitmapSize;
 		}
 
-		m_Target->DrawBitmap(seg.GetBitmap(), rDst, 1.0f, D2D1_INTERPOLATION_MODE_HIGH_QUALITY_CUBIC, &rSrc);
+		m_Target->DrawBitmap(segment.GetBitmap(), rDst, 1.0f, D2D1_INTERPOLATION_MODE_HIGH_QUALITY_CUBIC, &rSrc);
 	}
 }
 
-void Canvas::DrawTiledBitmap(const D2DBitmap* bitmap, const D2D1_RECT_F& dstRect, const D2D1_RECT_F& srcRect)
+void Canvas::DrawTiledBitmap(D2DBitmap* bitmap, const D2D1_RECT_F& dstRect, const D2D1_RECT_F& srcRect)
 {
 	const FLOAT width = (FLOAT)bitmap->m_Width;
 	const FLOAT height = (FLOAT)bitmap->m_Height;
@@ -621,7 +620,7 @@ void Canvas::DrawTiledBitmap(const D2DBitmap* bitmap, const D2D1_RECT_F& dstRect
 	}
 }
 
-void Canvas::DrawMaskedBitmap(const D2DBitmap* bitmap, const D2DBitmap* maskBitmap, const D2D1_RECT_F& dstRect,
+void Canvas::DrawMaskedBitmap(D2DBitmap* bitmap, D2DBitmap* maskBitmap, const D2D1_RECT_F& dstRect,
 	const D2D1_RECT_F& srcRect, const D2D1_RECT_F& srcRect2)
 {
 	if (!bitmap || !maskBitmap) return;
@@ -645,7 +644,7 @@ void Canvas::DrawMaskedBitmap(const D2DBitmap* bitmap, const D2DBitmap* maskBitm
 			(r1.bottom - r1.top) / height * r2.bottom);
 	};
 
-	for (auto bseg : bitmap->m_Segments)
+	for (auto& bseg : bitmap->m_Segments)
 	{
 		const auto rSeg = bseg.GetRect();
 		const auto rDst = getRectSubRegion(rSeg, dstRect);
@@ -671,7 +670,7 @@ void Canvas::DrawMaskedBitmap(const D2DBitmap* bitmap, const D2DBitmap* maskBitm
 		const auto aaMode = m_Target->GetAntialiasMode();
 		m_Target->SetAntialiasMode(D2D1_ANTIALIAS_MODE_ALIASED); // required
 
-		for (auto mseg : maskBitmap->m_Segments)
+		for (auto& mseg : maskBitmap->m_Segments)
 		{
 			const auto rmSeg = mseg.GetRect();
 			const auto rmDst = getRectSubRegion(rmSeg, dstRect);
@@ -719,7 +718,7 @@ void Canvas::FillGradientRectangle(const D2D1_RECT_F& rect, const D2D1_COLOR_F&
 
 	Microsoft::WRL::ComPtr<ID2D1GradientStopCollection> pGradientStops;
 
-	D2D1_GRADIENT_STOP gradientStops[2];
+	D2D1_GRADIENT_STOP gradientStops[2] = { 0 };
 	gradientStops[0].color = color1;
 	gradientStops[0].position = 0.0f;
 	gradientStops[1].color = color2;

diff --git a/Common/Gfx/Canvas.h b/Common/Gfx/Canvas.h
@@ -83,9 +83,9 @@ class Canvas
 	bool MeasureTextW(const std::wstring& srcStr, const TextFormat& format, D2D1_SIZE_F& size);
 	bool MeasureTextLinesW(const std::wstring& srcStr, const TextFormat& format, D2D1_SIZE_F& size, UINT32& lines);
 
-	void DrawBitmap(const D2DBitmap* bitmap, const D2D1_RECT_F& dstRect, const D2D1_RECT_F& srcRect);
-	void DrawTiledBitmap(const D2DBitmap* bitmap, const D2D1_RECT_F& dstRect, const D2D1_RECT_F& srcRect);
-	void DrawMaskedBitmap(const D2DBitmap* bitmap, const D2DBitmap* maskBitmap, const D2D1_RECT_F& dstRect,
+	void DrawBitmap(D2DBitmap* bitmap, const D2D1_RECT_F& dstRect, const D2D1_RECT_F& srcRect);
+	void DrawTiledBitmap(D2DBitmap* bitmap, const D2D1_RECT_F& dstRect, const D2D1_RECT_F& srcRect);
+	void DrawMaskedBitmap(D2DBitmap* bitmap, D2DBitmap* maskBitmap, const D2D1_RECT_F& dstRect,
 		const D2D1_RECT_F& srcRect, const D2D1_RECT_F& srcRect2);
 
 	void FillRectangle(const D2D1_RECT_F& rect, const D2D1_COLOR_F& color);

diff --git a/Common/Gfx/TextFormatD2D.cpp b/Common/Gfx/TextFormatD2D.cpp
@@ -79,7 +79,7 @@ bool TextFormatD2D::CreateLayout(ID2D1DeviceContext* target, const std::wstring&
 
 	bool strChanged = false;
 	if (strLen != m_LastString.length() ||
-		memcmp(str, m_LastString.c_str(), (strLen + 1) * sizeof(WCHAR)) != 0)
+		memcmp(str, m_LastString.c_str(), ((size_t)strLen + 1ULL) * sizeof(WCHAR)) != 0)
 	{
 		strChanged = true;
 		m_LastString.assign(str, strLen);

diff --git a/Common/Gfx/TextInlineFormat/TextInlineFormatGradientColor.h b/Common/Gfx/TextInlineFormat/TextInlineFormatGradientColor.h
@@ -21,6 +21,8 @@ struct GradientHelper
 	DWRITE_TEXT_RANGE range;
 	std::vector<DWRITE_TEXT_RANGE> innerRanges;
 	std::vector<Microsoft::WRL::ComPtr<ID2D1LinearGradientBrush>> brushes;
+
+	GradientHelper() : range() {}
 };
 
 }

diff --git a/Common/MathParser.cpp b/Common/MathParser.cpp
@@ -210,7 +210,7 @@ struct Parser
 	char valTop;
 	int obrDist;
 
-	Parser() : opTop(0), valTop(-1), obrDist(2) { opStack[0].type = Operator::OpeningBracket; }
+	Parser() : opStack(), numStack(), opTop(0), valTop(-1), obrDist(2) { opStack[0].type = Operator::OpeningBracket; }
 };
 
 static const WCHAR* CalcToObr(Parser& parser);
@@ -361,7 +361,7 @@ const WCHAR* Parse(
 
 			default:
 				{
-					Operation op;
+					Operation op = {};
 					op.type = lexer.value.oper;
 					switch (op.type)
 					{
@@ -401,7 +401,7 @@ const WCHAR* Parse(
 
 		case Token::Name:
 			{
-				Operation op;
+				Operation op = {};
 				if (lexer.nameLen <= FUNC_MAX_LEN &&
 					((op.funcIndex = GetFunctionIndex(lexer.name, (BYTE)lexer.nameLen)) != FUNC_INVALID))
 				{

diff --git a/Common/PathUtil.cpp b/Common/PathUtil.cpp
@@ -147,13 +147,15 @@ void ExpandEnvironmentVariables(std::wstring& path)
 				}
 
 				delete [] buffer;
+				buffer = nullptr;
 				bufSize = ret;
 				buffer = new WCHAR[bufSize];
 			}
 			while (true);
 		}
 
 		delete [] buffer;
+		buffer = nullptr;
 	}
 }
 

diff --git a/Common/Platform.cpp b/Common/Platform.cpp
@@ -38,7 +38,7 @@ std::wstring& GetBuildNumberFromRegistry()
 	return s_BuildNumber;
 }
 
-};
+};  // namespace
 
 inline bool IsWindows11OrGreater()
 {
@@ -77,8 +77,7 @@ Platform& Platform::GetInstance()
 
 void Platform::Initialize()
 {
-	// Is Windows 64 bit?
-	m_Is64BitWindows = [&]() -> bool
+	m_Is64Bit = [&]() -> bool
 	{
 #if _WIN64
 		return true;
@@ -185,7 +184,7 @@ void Platform::Initialize()
 
 		m_FriendlyName += L')';
 	}
-	m_FriendlyName += m_Is64BitWindows ? L" 64-bit" : L" 32-bit";
+	m_FriendlyName += m_Is64Bit ? L" 64-bit" : L" 32-bit";
 
 	// Retrieve user language LCID
 	LANGID id = GetUserDefaultUILanguage();

diff --git a/Common/Platform.h b/Common/Platform.h
@@ -10,12 +10,14 @@
 
 #include <string>
 
+inline bool IsWindows11OrGreater();
+
 class Platform
 {
 public:
 	static Platform& GetInstance();
 
-	bool Is64BitWindows() { return m_Is64BitWindows; }
+	bool Is64Bit() { return m_Is64Bit; }
 
 	std::wstring GetName() { return m_Name; }
 	std::wstring GetFriendlyName() { return m_FriendlyName; }
@@ -33,7 +35,7 @@ class Platform
 
 	void Initialize();
 
-	bool m_Is64BitWindows;
+	bool m_Is64Bit;
 
 	std::wstring m_Name;
 	std::wstring m_FriendlyName;

diff --git a/Library/CommandHandler.cpp b/Library/CommandHandler.cpp
@@ -864,7 +864,7 @@ void CommandHandler::DoWriteKeyValueBang(std::vector<std::wstring>& args, Skin*
 	}
 
 	// Verify whether the file exists.
-	if (_waccess(iniFile, 0) == -1)
+	if (_waccess_s(iniFile, 0) != 0)
 	{
 		LogErrorF(skin, L"!WriteKeyValue: File not found: %s", iniFile);
 		return;
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,6 +2,7 @@ @@
     *.patch
     *.txt
     *.user
+    *.aps
     /.vs
     /ipch
     /TestBench
@@ Expand Down @@