Merge branch 'MP1.37_Pre.Release_Test1' of https://github.com/MediaPo…

…rtal/MediaPortal-1 into MP1.37_Pre.Release_Test1
MediaPortal · Feb 8, 2025 · 1e87171 · 1e87171
2 parents 1e7fab8 + 83c0ab7
commit 1e87171
Show file tree

Hide file tree

Showing 13 changed files with 844 additions and 254 deletions.
diff --git a/TvEngine3/TVLibrary/Plugins/TvMovie/TvMovie.cs b/TvEngine3/TVLibrary/Plugins/TvMovie/TvMovie.cs
@@ -69,6 +69,8 @@ private static string GetRegistryValueFromValueName(string valueName)
         {
           string virtualStoreSubKey = Check64bit() ? _virtualStoreRegSubKey64b : _virtualStoreRegSubKey32b;
 
+          Log.Debug("TVMovie: Looking for registry setting {0} in {1}", valueName, virtualStoreSubKey);
+
           foreach (String userKeyName in Registry.Users.GetSubKeyNames())
           {
             using (
@@ -83,13 +85,13 @@ private static string GetRegistryValueFromValueName(string valueName)
       }
       catch (Exception ex)
       {
-        Log.Error("TVMovie: Registry lookup for {1} failed: {0}", valueName, ex.Message);
+        Log.Error("TVMovie: Registry lookup for {0} failed: {1}", valueName, ex.Message);
       }
 
       if (string.IsNullOrEmpty(value))
-      {
-        Log.Info("TVMovie: Registry setting {1} has no value", valueName);
-      }
+        Log.Debug("TVMovie: Registry setting {0} has no value", valueName);
+      else
+        Log.Debug("TVMovie: Registry setting {0} has value {1}", valueName, value);
 
       return value;
     }
@@ -155,6 +157,9 @@ [Out] out bool lpSystemInfo
 
     public static bool Check64bit()
     {
+      if (IntPtr.Size > 4) //64bit process
+        return true;
+
       //IsWow64Process is not supported under Windows2000
       if (!OSInfo.OSInfo.XpOrLater())
       {

diff --git a/TvEngine3/TVLibrary/Plugins/TvMovie/TvMovie.csproj b/TvEngine3/TVLibrary/Plugins/TvMovie/TvMovie.csproj
@@ -98,6 +98,7 @@
     <Compile Include="TvMovie.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="TvMovieDatabase.cs" />
+    <Compile Include="TvMovieDatabaseConnection.cs" />
     <Compile Include="TvMovieSetup.cs">
       <SubType>UserControl</SubType>
     </Compile>