plugin manager now still checks for version information on dlls and exe files (managed code)

patrickjeremic · patrickjeremic · commit c2e41461ddec · 2017-11-20T21:09:05.000+01:00
diff --git a/NativeCore/ReClassNET_Plugin.hpp b/NativeCore/ReClassNET_Plugin.hpp
@@ -1,6 +1,4 @@
 #pragma once
-#ifndef __RECLASS_NET_PLUGIN_H__
-#define __RECLASS_NET_PLUGIN_H__
 
 #include <type_traits>
 #include <algorithm>
@@ -12,7 +10,7 @@
 // OS Specific
 
 #ifdef __linux__
-	#define __stdcall
+	#define __stdcall __attribute__((__stdcall__))
 #endif
 
 // Types
@@ -293,5 +291,3 @@ inline char16_t* str16cpy(char16_t* destination, const char16_t* source, size_t
 	}
 	return destination;
 }
-
-#endif
diff --git a/ReClass.NET/Memory/ProcessInfo.cs b/ReClass.NET/Memory/ProcessInfo.cs
@@ -26,12 +26,7 @@ public ProcessInfo(IntPtr id, string name, string path)
 			{
 				using (var i = NativeMethods.GetIconForFile(Path))
 				{
-					if (i == null)
-					{
-						return null;
-					}
-					
-					return i.ToBitmap();
+					return i?.ToBitmap();
 				}
 			});
 		}
diff --git a/ReClass.NET/Plugins/PluginManager.cs b/ReClass.NET/Plugins/PluginManager.cs
@@ -39,19 +39,19 @@ public void LoadAllPlugins(string path, ILogger logger)
 
 				var directory = new DirectoryInfo(path);
 
-				LoadPlugins(directory.GetFiles("*.dll"), logger);
+				LoadPlugins(directory.GetFiles("*.dll"), logger, true);
 
-				LoadPlugins(directory.GetFiles("*.exe"), logger);
+				LoadPlugins(directory.GetFiles("*.exe"), logger, true);
 
-				LoadPlugins(directory.GetFiles("*.so"), logger);
+				LoadPlugins(directory.GetFiles("*.so"), logger, false);
 			}
 			catch (Exception ex)
 			{
 				logger.Log(ex);
 			}
 		}
 
-		private void LoadPlugins(IEnumerable<FileInfo> files, ILogger logger)
+		private void LoadPlugins(IEnumerable<FileInfo> files, ILogger logger, bool checkProductName)
 		{
 			// TODO: How to include plugin infos for unix files as they don't have embedded version info.
 
@@ -65,10 +65,10 @@ private void LoadPlugins(IEnumerable<FileInfo> files, ILogger logger)
 				{
 					fvi = FileVersionInfo.GetVersionInfo(fi.FullName);
 
-					/*if (fvi.ProductName != PluginInfo.PluginName && fvi.ProductName != PluginInfo.PluginNativeName)
+					if (checkProductName && fvi.ProductName != PluginInfo.PluginName && fvi.ProductName != PluginInfo.PluginNativeName)
 					{
 						continue;
-					}*/
+					}
 				}
 				catch
 				{

Original file line number	Diff line number	Diff line change
`@@ -26,12 +26,7 @@ public ProcessInfo(IntPtr id, string name, string path)`
`26`	`26`	`{`
`27`	`27`	`using (var i = NativeMethods.GetIconForFile(Path))`
`28`	`28`	`{`
`29`		`- if (i == null)`
`30`		`- {`
`31`		`- return null;`
`32`		`- }`
`33`		`-`
`34`		`- return i.ToBitmap();`
	`29`	`+ return i?.ToBitmap();`
`35`	`30`	`}`
`36`	`31`	`});`
`37`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,19 +39,19 @@ public void LoadAllPlugins(string path, ILogger logger)`
`39`	`39`
`40`	`40`	`var directory = new DirectoryInfo(path);`
`41`	`41`
`42`		`- LoadPlugins(directory.GetFiles("*.dll"), logger);`
	`42`	`+ LoadPlugins(directory.GetFiles("*.dll"), logger, true);`
`43`	`43`
`44`		`- LoadPlugins(directory.GetFiles("*.exe"), logger);`
	`44`	`+ LoadPlugins(directory.GetFiles("*.exe"), logger, true);`
`45`	`45`
`46`		`- LoadPlugins(directory.GetFiles("*.so"), logger);`
	`46`	`+ LoadPlugins(directory.GetFiles("*.so"), logger, false);`
`47`	`47`	`}`
`48`	`48`	`catch (Exception ex)`
`49`	`49`	`{`
`50`	`50`	`logger.Log(ex);`
`51`	`51`	`}`
`52`	`52`	`}`
`53`	`53`
`54`		`- private void LoadPlugins(IEnumerable<FileInfo> files, ILogger logger)`
	`54`	`+ private void LoadPlugins(IEnumerable<FileInfo> files, ILogger logger, bool checkProductName)`
`55`	`55`	`{`
`56`	`56`	`// TODO: How to include plugin infos for unix files as they don't have embedded version info.`
`57`	`57`
`@@ -65,10 +65,10 @@ private void LoadPlugins(IEnumerable<FileInfo> files, ILogger logger)`
`65`	`65`	`{`
`66`	`66`	`fvi = FileVersionInfo.GetVersionInfo(fi.FullName);`
`67`	`67`
`68`		`- /*if (fvi.ProductName != PluginInfo.PluginName && fvi.ProductName != PluginInfo.PluginNativeName)`
	`68`	`+ if (checkProductName && fvi.ProductName != PluginInfo.PluginName && fvi.ProductName != PluginInfo.PluginNativeName)`
`69`	`69`	`{`
`70`	`70`	`continue;`
`71`		`- }*/`
	`71`	`+ }`
`72`	`72`	`}`
`73`	`73`	`catch`
`74`	`74`	`{`