Cleanup

krlvm · Mar 17, 2023 · 443bcc6 · 443bcc6
1 parent 01b012c
commit 443bcc6
Show file tree

Hide file tree

Showing 16 changed files with 350 additions and 347 deletions.
diff --git a/AccentColorizer/AccentColorHelper.cpp b/AccentColorizer/AccentColorHelper.cpp
@@ -1,7 +1,7 @@
 #include "AccentColorHelper.h"
 #include "ColorHelper.h"
 
-COLORREF accent;
+COLORREF g_dwAccent;
 
 bool UpdateAccentColors()
 {
@@ -12,11 +12,11 @@ bool UpdateAccentColors()
 
 	DWORD dwAccent = RGB2BGR(dwAccentRGB);
 
-	if (accent == dwAccent)
+	if (g_dwAccent == dwAccent)
 	{
 		return false;
 	}
 
-	accent = dwAccent;
+	g_dwAccent = dwAccent;
 	return true;
 }
diff --git a/AccentColorizer/AccentColorHelper.h b/AccentColorizer/AccentColorHelper.h
@@ -1,6 +1,6 @@
 #pragma once
 #include "framework.h"
 
-extern COLORREF accent;
+extern COLORREF g_dwAccent;
 
 bool UpdateAccentColors();
diff --git a/AccentColorizer/AccentColorizer.h b/AccentColorizer/AccentColorizer.h
diff --git a/AccentColorizer/AccentColorizer.vcxproj b/AccentColorizer/AccentColorizer.vcxproj
@@ -218,7 +218,6 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClInclude Include="AccentColorHelper.h" />
-    <ClInclude Include="AccentColorizer.h" />
     <ClInclude Include="BitmapHelper.h" />
     <ClInclude Include="ColorHelper.h" />
     <ClInclude Include="SettingsHelper.h" />
@@ -230,7 +229,7 @@
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="AccentColorHelper.cpp" />
-    <ClCompile Include="AccentColorizer.cpp" />
+    <ClCompile Include="main.cpp" />
     <ClCompile Include="BitmapHelper.cpp" />
     <ClCompile Include="ColorHelper.cpp" />
     <ClCompile Include="SettingsHelper.cpp" />

diff --git a/AccentColorizer/AccentColorizer.vcxproj.filters b/AccentColorizer/AccentColorizer.vcxproj.filters
@@ -4,7 +4,7 @@
     <ClCompile Include="AccentColorHelper.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="AccentColorizer.cpp">
+    <ClCompile Include="main.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="BitmapHelper.cpp">
@@ -30,9 +30,6 @@
     <ClInclude Include="AccentColorHelper.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="AccentColorizer.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="BitmapHelper.h">
       <Filter>Header Files</Filter>
     </ClInclude>

diff --git a/AccentColorizer/BitmapHelper.cpp b/AccentColorizer/BitmapHelper.cpp
@@ -30,15 +30,15 @@ bool RecolorizeBitmap(HBITMAP hbm, BitmapHandler handler) {
 
     if (!hbm || bm.bmBitsPixel != 32)
     {
-        return FALSE;
+        return false;
     }
 
     BYTE* pBits = new BYTE[bm.bmWidth * bm.bmHeight * 4];
     GetBitmapBits(hbm, bm.bmWidth * bm.bmHeight * 4, pBits);
 
     for (int y = 0; y < bm.bmHeight; y++)
     {
-        BYTE* pPixel = (BYTE*)pBits + bm.bmWidth * 4 * y;
+        BYTE* pPixel = pBits + bm.bmWidth * 4 * y;
 
         for (int x = 0; x < bm.bmWidth; x++)
         {
@@ -47,7 +47,7 @@ bool RecolorizeBitmap(HBITMAP hbm, BitmapHandler handler) {
             int b = PixB(pPixel); // [0]
             int a = PixA(pPixel); // [3]
 
-            handler(&r, &g, &b, &a);
+            handler(r, g, b, a);
 
             pPixel[2] = r;
             pPixel[1] = g;
@@ -61,5 +61,5 @@ bool RecolorizeBitmap(HBITMAP hbm, BitmapHandler handler) {
     SetBitmapBits(hbm, bm.bmWidth * bm.bmHeight * 4, pBits);
 
     delete[] pBits;
-    return TRUE;
+    return true;
 }
diff --git a/AccentColorizer/BitmapHelper.h b/AccentColorizer/BitmapHelper.h
@@ -1,5 +1,5 @@
 #pragma once
 #include "framework.h"
 
-typedef void (*BitmapHandler)(int* r, int* g, int* b, int* a);
+typedef void (*BitmapHandler)(int& r, int& g, int& b, int& a);
 bool RecolorizeBitmap(HBITMAP hbm, BitmapHandler handler);
diff --git a/AccentColorizer/ColorHelper.cpp b/AccentColorizer/ColorHelper.cpp
@@ -28,7 +28,7 @@ hsv rgb2hsv(rgb in)
 		// if max is 0, then r = g = b = 0              
 		// s = 0, h is undefined
 		out.s = 0.0;
-		out.h = NAN;                            // its now undefined
+		//out.h = NAN;                            // its now undefined
 		return out;
 	}
 	if (in.r >= max)                           // > is bogus, just keeps compilor happy
@@ -107,11 +107,11 @@ rgb hsv2rgb(hsv in)
 
 int GetHSVh(COLORREF dwColor)
 {
-	rgb rgbVal = { 
+	return rgb2hsv(
+		{
 		(double)GetRValue(dwColor),
 		(double)GetGValue(dwColor),
-		(double)GetBValue(dwColor) 
-	};
-	hsv hsvVal = rgb2hsv(rgbVal);
-	return hsvVal.h;
+		(double)GetBValue(dwColor)
+		}
+	).h;
 }
diff --git a/AccentColorizer/SettingsHelper.cpp b/AccentColorizer/SettingsHelper.cpp
@@ -1,4 +1,5 @@
 #include "SettingsHelper.h"
+#include "SystemHelper.h"
 #include <VersionHelpers.h>
 
 bool IsRegistryValueEnabled(LPCWSTR key, LPCWSTR value)
@@ -11,7 +12,7 @@ bool IsRegistryValueEnabled(LPCWSTR key, LPCWSTR value)
 
     if (!hKey)
     {
-        return FALSE;
+        return false;
     }
 
     DWORD dwBufferSize(sizeof(DWORD));
@@ -24,15 +25,16 @@ bool IsRegistryValueEnabled(LPCWSTR key, LPCWSTR value)
 
     RegCloseKey(hKey);
 
-    return ERROR_SUCCESS == nError ? nResult : FALSE;
+    return ERROR_SUCCESS == nError ? nResult : false;
 }
 
 bool IsMenuColorizationEnabled()
 {
-    if (!IsWindows10OrGreater())
+    if (g_winver < WIN_10)
     {
-        return TRUE;
+        return true;
     }
+
     return INVALID_FILE_ATTRIBUTES == GetFileAttributes(L"C:\\Windows\\ContextMenuNormalizer.exe")
         && GetLastError() == ERROR_FILE_NOT_FOUND;
 }