Fixes

Rectify11 · Mar 22, 2024 · 6b51fa0 · 6b51fa0
1 parent c4ed752
commit 6b51fa0
Show file tree

Hide file tree

Showing 6 changed files with 52 additions and 26 deletions.
diff --git a/Rectify11Installer.sln b/Rectify11Installer.sln
@@ -32,8 +32,8 @@ Global
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{F1F7B13F-9EF7-4B77-9500-B062CC9DB17D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F1F7B13F-9EF7-4B77-9500-B062CC9DB17D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F1F7B13F-9EF7-4B77-9500-B062CC9DB17D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{F1F7B13F-9EF7-4B77-9500-B062CC9DB17D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{F1F7B13F-9EF7-4B77-9500-B062CC9DB17D}.Debug|Mixed Platforms.ActiveCfg = Debug|x64
+		{F1F7B13F-9EF7-4B77-9500-B062CC9DB17D}.Debug|Mixed Platforms.Build.0 = Debug|x64
 		{F1F7B13F-9EF7-4B77-9500-B062CC9DB17D}.Debug|Win32.ActiveCfg = Debug|Any CPU
 		{F1F7B13F-9EF7-4B77-9500-B062CC9DB17D}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{F1F7B13F-9EF7-4B77-9500-B062CC9DB17D}.Debug|x64.Build.0 = Debug|Any CPU

diff --git a/Rectify11Installer/Core/Backend/Themes.cs b/Rectify11Installer/Core/Backend/Themes.cs
@@ -110,7 +110,7 @@ public static bool Uninstall()
 
                 UninstallThemeWallpapers();
 
-                int hr = RectifyThemeUtil.Utility.UninstallThemeTool();
+                nint hr = RectifyThemeUtil.Utility.UninstallThemeTool();
                 if (hr != 0)
                 {
                     Logger.WriteLine("FAILED TO REMOVE THEMETOOL: " + hr);
@@ -179,7 +179,7 @@ private static bool InstallThemes()
                     Helper.OperationType.Copy);
 
                 Logger.WriteLine("Copied Themetool.");
-                int hr = 0;
+                nint hr = 0;
                 try
                 {
                     hr = RectifyThemeUtil.Utility.InstallThemeTool();
@@ -213,7 +213,7 @@ private static bool InstallThemes()
                 UninstallMsstyles();
                 Helper.SafeFileDeletion(Path.Combine(Variables.Windir, "ThemeTool.exe"));
 
-                int hr = 0;
+                nint hr = 0;
                 try
                 {
                     hr = RectifyThemeUtil.Utility.UninstallThemeTool();

diff --git a/Rectify11Installer/Rectify11Installer.csproj b/Rectify11Installer/Rectify11Installer.csproj
@@ -83,6 +83,28 @@
   <PropertyGroup>
     <StartupObject>Rectify11Installer.Program</StartupObject>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x64\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <LangVersion>9.0</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>empty.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <OutputPath>bin\x64\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <Optimize>true</Optimize>
+    <PlatformTarget>x64</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <GenerateSerializationAssemblies>On</GenerateSerializationAssemblies>
+    <LangVersion>9.0</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="libmsstyle, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>

diff --git a/Rectify11Installer/Rectify11Installer.csproj.user b/Rectify11Installer/Rectify11Installer.csproj.user
@@ -1,16 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-	<PropertyGroup>
-		<PublishUrlHistory>output\|publish\</PublishUrlHistory>
-		<InstallUrlHistory />
-		<SupportUrlHistory />
-		<UpdateUrlHistory />
-		<BootstrapperUrlHistory />
-		<ErrorReportUrlHistory />
-		<FallbackCulture>en-US</FallbackCulture>
-		<VerifyUploadedFiles>false</VerifyUploadedFiles>
-	</PropertyGroup>
-	<PropertyGroup>
-		<EnableSecurityDebugging>false</EnableSecurityDebugging>
-	</PropertyGroup>
+  <PropertyGroup>
+    <PublishUrlHistory>output\|publish\</PublishUrlHistory>
+    <InstallUrlHistory />
+    <SupportUrlHistory />
+    <UpdateUrlHistory />
+    <BootstrapperUrlHistory />
+    <ErrorReportUrlHistory />
+    <FallbackCulture>en-US</FallbackCulture>
+    <VerifyUploadedFiles>false</VerifyUploadedFiles>
+  </PropertyGroup>
+  <PropertyGroup>
+    <EnableSecurityDebugging>false</EnableSecurityDebugging>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
+    <EnableUnmanagedDebugging>true</EnableUnmanagedDebugging>
+  </PropertyGroup>
 </Project>
diff --git a/Rectify11Installer/Win32/RectifyUtil.cs b/Rectify11Installer/Win32/RectifyUtil.cs
@@ -12,16 +12,17 @@ public class CRectifyUtil
     }
 
     [Guid("A7BCDC3B-C5A2-44BB-B8EC-560B24ACAAD8")]
+    [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
     public interface IRectifyUtil
     {
-        public int GetMicaSettings(ref bool enabled, ref bool tabbed);
-        public int SetMicaForEveryoneEnabled(ref bool enabled, ref bool tabbed);
-        public int GetCurrentMenuIndex(ref int index);
-        public int SetCurrentMenuByIndex(ref int index);
+        public nint GetMicaSettings(ref bool enabled, ref bool tabbed);
+        public nint SetMicaForEveryoneEnabled(ref bool enabled, ref bool tabbed);
+        public nint GetCurrentMenuIndex(ref int index);
+        public nint SetCurrentMenuByIndex(ref int index);
 
-        public int ApplyTheme(string themeName);
-        public int InstallThemeTool();
-        public int UninstallThemeTool();
+        public nint ApplyTheme(string themeName);
+        public nint InstallThemeTool();
+        public nint UninstallThemeTool();
     }
 
     public static class RectifyThemeUtil

diff --git a/RectifyControlPanel2 b/RectifyControlPanel2
+1 −1		Rectify11CPL/CRectifyUtil.cpp
+2 −2		Rectify11CPL/ElementProvider.cpp
+163 −819		Rectify11CPL/theme.cpp