github
/
winsw
mirror of https://github.com/winsw/winsw
1
0
Fork 0
Code Issues Releases Wiki Activity

Remove dead codes

pull/511/head
NextTurn 2019-09-07 00:00:00 +08:00 committed by Next Turn
parent ec3f6f383f
commit 31af6fe11c
4 changed files with 4 additions and 149 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Directory.Build.targets
View File

@ -4,10 +4,4 @@
<DefineConstants>VNEXT</DefineConstants> <DefineConstants>VNEXT</DefineConstants>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
<!-- https://docs.microsoft.com/windows/win32/wmisdk/common-information-model -->
<!-- https://github.com/kohsuke/winsw/issues/411 -->
<!-- <DefineConstants>$(DefineConstants);FEATURE_CIM</DefineConstants> -->
</PropertyGroup>
</Project> </Project>

15
src/Core/WinSWCore/Util/ProcessHelper.cs
View File

@ -1,14 +1,9 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics; using System.Diagnostics;
#if !FEATURE_CIM
using System.Management; using System.Management;
#endif
using System.Threading; using System.Threading;
using log4net; using log4net;
#if FEATURE_CIM
using Microsoft.Management.Infrastructure;
#endif
namespace winsw.Util namespace winsw.Util
{ {
@ -32,15 +27,6 @@ namespace winsw.Util
try try
{ {
string query = "SELECT * FROM Win32_Process WHERE ParentProcessID = " + pid; string query = "SELECT * FROM Win32_Process WHERE ParentProcessID = " + pid;
#if FEATURE_CIM
using CimSession session = CimSession.Create(null);
foreach (CimInstance instance in session.QueryInstances("root/cimv2", "WQL", query))
{
object childProcessId = instance.CimInstanceProperties["ProcessID"].Value;
Logger.Info("Found child process: " + childProcessId + " Name: " + instance.CimInstanceProperties["Name"].Value);
childPids.Add(Convert.ToInt32(childProcessId));
}
#else
using ManagementObjectSearcher searcher = new ManagementObjectSearcher(query); using ManagementObjectSearcher searcher = new ManagementObjectSearcher(query);
using ManagementObjectCollection results = searcher.Get(); using ManagementObjectCollection results = searcher.Get();
foreach (ManagementBaseObject wmiObject in results) foreach (ManagementBaseObject wmiObject in results)
@ -49,7 +35,6 @@ namespace winsw.Util
Logger.Info("Found child process: " + childProcessId + " Name: " + wmiObject["Name"]); Logger.Info("Found child process: " + childProcessId + " Name: " + wmiObject["Name"]);
childPids.Add(Convert.ToInt32(childProcessId)); childPids.Add(Convert.ToInt32(childProcessId));
} }
#endif
} }
catch (Exception ex) catch (Exception ex)
{ {

2
src/Core/WinSWCore/WinSWCore.csproj
View File

@ -14,8 +14,6 @@
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'"> <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
<!-- https://github.com/kohsuke/winsw/issues/411 -->
<!-- <PackageReference Include="Microsoft.Management.Infrastructure" Version="2.0.0" /> -->
<PackageReference Include="System.Diagnostics.EventLog" Version="4.7.0" /> <PackageReference Include="System.Diagnostics.EventLog" Version="4.7.0" />
<PackageReference Include="System.Management" Version="4.7.0" /> <PackageReference Include="System.Management" Version="4.7.0" />
<PackageReference Include="System.Security.AccessControl" Version="4.7.0" /> <PackageReference Include="System.Security.AccessControl" Version="4.7.0" />

130
src/Core/WinSWCore/Wmi.cs
View File

@ -1,15 +1,8 @@
using System; using System;
using System.Diagnostics;
#if !FEATURE_CIM
using System.Management; using System.Management;
#endif
using System.Reflection; using System.Reflection;
using System.Text; using System.Text;
using DynamicProxy; using DynamicProxy;
#if FEATURE_CIM
using Microsoft.Management.Infrastructure;
using Microsoft.Management.Infrastructure.Generic;
#endif
namespace WMI namespace WMI
{ {
@ -84,27 +77,14 @@ namespace WMI
/// </summary> /// </summary>
public interface IWmiObject public interface IWmiObject
{ {
/// <summary>
/// Reflect updates made to this object to the WMI provider.
/// </summary>
void Commit();
} }
public sealed class WmiRoot public sealed class WmiRoot
{ {
#if FEATURE_CIM
private const string CimNamespace = "root/cimv2";
private readonly CimSession cimSession;
#else
private readonly ManagementScope wmiScope; private readonly ManagementScope wmiScope;
#endif
public WmiRoot(string? machineName = null) public WmiRoot()
{ {
#if FEATURE_CIM
this.cimSession = CimSession.Create(machineName);
#else
ConnectionOptions options = new ConnectionOptions ConnectionOptions options = new ConnectionOptions
{ {
EnablePrivileges = true, EnablePrivileges = true,
@ -112,15 +92,8 @@ namespace WMI
Authentication = AuthenticationLevel.PacketPrivacy, Authentication = AuthenticationLevel.PacketPrivacy,
}; };
string path; this.wmiScope = new ManagementScope(@"\\.\root\cimv2", options);
this.wmiScope.Connect();
if (machineName != null)
path = $@"\\{machineName}\root\cimv2";
else
path = @"\root\cimv2";
wmiScope = new ManagementScope(path, options);
wmiScope.Connect();
#endif
} }
private static string Capitalize(string s) private static string Capitalize(string s)
@ -132,36 +105,13 @@ namespace WMI
{ {
public abstract object? Invoke(object proxy, MethodInfo method, object[] arguments); public abstract object? Invoke(object proxy, MethodInfo method, object[] arguments);
#if FEATURE_CIM
protected void CheckError(CimMethodResult result)
{
uint code = (uint)result.ReturnValue.Value;
if (code != 0)
throw new WmiException((ReturnValue)code);
}
#else
protected void CheckError(ManagementBaseObject result) protected void CheckError(ManagementBaseObject result)
{ {
uint code = (uint)result["returnValue"]; uint code = (uint)result["returnValue"];
if (code != 0) if (code != 0)
throw new WmiException((ReturnValue)code); throw new WmiException((ReturnValue)code);
} }
#endif
#if FEATURE_CIM
protected CimMethodParametersCollection GetMethodParameters(CimClass cimClass, string methodName, ParameterInfo[] methodParameters, object[] arguments)
{
CimMethodParametersCollection cimParameters = new CimMethodParametersCollection();
CimReadOnlyKeyedCollection<CimMethodParameterDeclaration> cimParameterDeclarations = cimClass.CimClassMethods[methodName].Parameters;
for (int i = 0; i < arguments.Length; i++)
{
string capitalizedName = Capitalize(methodParameters[i].Name!);
cimParameters.Add(CimMethodParameter.Create(capitalizedName, arguments[i], cimParameterDeclarations[capitalizedName].CimType, CimFlags.None));
}
return cimParameters;
}
#else
protected ManagementBaseObject GetMethodParameters(ManagementObject wmiObject, string methodName, ParameterInfo[] methodParameters, object[] arguments) protected ManagementBaseObject GetMethodParameters(ManagementObject wmiObject, string methodName, ParameterInfo[] methodParameters, object[] arguments)
{ {
ManagementBaseObject wmiParameters = wmiObject.GetMethodParameters(methodName); ManagementBaseObject wmiParameters = wmiObject.GetMethodParameters(methodName);
@ -173,25 +123,13 @@ namespace WMI
return wmiParameters; return wmiParameters;
} }
#endif
} }
private class InstanceHandler : BaseHandler, IWmiObject private class InstanceHandler : BaseHandler, IWmiObject
{ {
#if FEATURE_CIM
private readonly CimSession cimSession;
private readonly CimInstance cimInstance;
public InstanceHandler(CimSession cimSession, CimInstance cimInstance)
{
this.cimSession = cimSession;
this.cimInstance = cimInstance;
}
#else
private readonly ManagementObject wmiObject; private readonly ManagementObject wmiObject;
public InstanceHandler(ManagementObject wmiObject) => this.wmiObject = wmiObject; public InstanceHandler(ManagementObject wmiObject) => this.wmiObject = wmiObject;
#endif
public override object? Invoke(object proxy, MethodInfo method, object[] arguments) public override object? Invoke(object proxy, MethodInfo method, object[] arguments)
{ {
@ -203,72 +141,34 @@ namespace WMI
// TODO: proper property support // TODO: proper property support
if (method.Name.StartsWith("set_")) if (method.Name.StartsWith("set_"))
{ {
#if FEATURE_CIM
CimProperty cimProperty = this.cimInstance.CimInstanceProperties[method.Name.Substring(4)];
Debug.Assert((cimProperty.Flags & CimFlags.ReadOnly) == CimFlags.None);
cimProperty.Value = arguments[0];
#else
this.wmiObject[method.Name.Substring(4)] = arguments[0]; this.wmiObject[method.Name.Substring(4)] = arguments[0];
#endif
return null; return null;
} }
if (method.Name.StartsWith("get_")) if (method.Name.StartsWith("get_"))
{ {
#if FEATURE_CIM
return this.cimInstance.CimInstanceProperties[method.Name.Substring(4)].Value;
#else
return this.wmiObject[method.Name.Substring(4)]; return this.wmiObject[method.Name.Substring(4)];
#endif
} }
string methodName = method.Name; string methodName = method.Name;
#if FEATURE_CIM
using CimMethodParametersCollection? cimParameters = arguments.Length == 0 ? null :
this.GetMethodParameters(this.cimInstance.CimClass, methodName, method.GetParameters(), arguments);
using CimMethodResult result = this.cimSession.InvokeMethod(CimNamespace, this.cimInstance, methodName, cimParameters);
this.CheckError(result);
#else
using ManagementBaseObject? wmiParameters = arguments.Length == 0 ? null : using ManagementBaseObject? wmiParameters = arguments.Length == 0 ? null :
this.GetMethodParameters(this.wmiObject, methodName, method.GetParameters(), arguments); this.GetMethodParameters(this.wmiObject, methodName, method.GetParameters(), arguments);
using ManagementBaseObject result = this.wmiObject.InvokeMethod(methodName, wmiParameters, null); using ManagementBaseObject result = this.wmiObject.InvokeMethod(methodName, wmiParameters, null);
this.CheckError(result); this.CheckError(result);
#endif
return null; return null;
} }
public void Commit()
{
#if !FEATURE_CIM
this.wmiObject.Put();
#endif
}
} }
private class ClassHandler : BaseHandler private class ClassHandler : BaseHandler
{ {
#if FEATURE_CIM
private readonly CimSession cimSession;
private readonly CimClass cimClass;
#else
private readonly ManagementClass wmiClass; private readonly ManagementClass wmiClass;
#endif
private readonly string className; private readonly string className;
#if FEATURE_CIM
public ClassHandler(CimSession cimSession, string className)
{
this.cimSession = cimSession;
this.cimClass = cimSession.GetClass(CimNamespace, className);
this.className = className;
}
#else
public ClassHandler(ManagementScope wmiScope, string className) public ClassHandler(ManagementScope wmiScope, string className)
{ {
this.wmiClass = new ManagementClass(wmiScope, new ManagementPath(className), null); this.wmiClass = new ManagementClass(wmiScope, new ManagementPath(className), null);
this.className = className; this.className = className;
} }
#endif
public override object? Invoke(object proxy, MethodInfo method, object[] arguments) public override object? Invoke(object proxy, MethodInfo method, object[] arguments)
{ {
@ -286,13 +186,6 @@ namespace WMI
query.Append(' ').Append(Capitalize(methodParameters[i].Name!)).Append(" = '").Append(arguments[i]).Append('\''); query.Append(' ').Append(Capitalize(methodParameters[i].Name!)).Append(" = '").Append(arguments[i]).Append('\'');
} }
#if FEATURE_CIM
// TODO: support collections
foreach (CimInstance cimInstance in this.cimSession.QueryInstances(CimNamespace, "WQL", query.ToString()))
{
return ProxyFactory.Create(new InstanceHandler(this.cimSession, cimInstance), method.ReturnType, true);
}
#else
using ManagementObjectSearcher searcher = new ManagementObjectSearcher(this.wmiClass.Scope, new ObjectQuery(query.ToString())); using ManagementObjectSearcher searcher = new ManagementObjectSearcher(this.wmiClass.Scope, new ObjectQuery(query.ToString()));
using ManagementObjectCollection results = searcher.Get(); using ManagementObjectCollection results = searcher.Get();
// TODO: support collections // TODO: support collections
@ -300,23 +193,15 @@ namespace WMI
{ {
return ProxyFactory.Create(new InstanceHandler(wmiObject), method.ReturnType, true); return ProxyFactory.Create(new InstanceHandler(wmiObject), method.ReturnType, true);
} }
#endif
return null; return null;
} }
string methodName = method.Name; string methodName = method.Name;
#if FEATURE_CIM
using CimMethodParametersCollection? cimParameters = arguments.Length == 0 ? null :
this.GetMethodParameters(this.cimClass, methodName, methodParameters, arguments);
using CimMethodResult result = this.cimSession.InvokeMethod(CimNamespace, this.className, methodName, cimParameters);
this.CheckError(result);
#else
using ManagementBaseObject? wmiParameters = arguments.Length == 0 ? null : using ManagementBaseObject? wmiParameters = arguments.Length == 0 ? null :
this.GetMethodParameters(this.wmiClass, methodName, methodParameters, arguments); this.GetMethodParameters(this.wmiClass, methodName, methodParameters, arguments);
using ManagementBaseObject result = this.wmiClass.InvokeMethod(methodName, wmiParameters, null); using ManagementBaseObject result = this.wmiClass.InvokeMethod(methodName, wmiParameters, null);
this.CheckError(result); this.CheckError(result);
#endif
return null; return null;
} }
} }
@ -328,14 +213,7 @@ namespace WMI
{ {
WmiClassName className = (WmiClassName)typeof(T).GetCustomAttributes(typeof(WmiClassName), false)[0]; WmiClassName className = (WmiClassName)typeof(T).GetCustomAttributes(typeof(WmiClassName), false)[0];
return (T)ProxyFactory.Create( return (T)ProxyFactory.Create(new ClassHandler(this.wmiScope, className.Name), typeof(T), true);
#if FEATURE_CIM
new ClassHandler(this.cimSession, className.Name),
#else
new ClassHandler(this.wmiScope, className.Name),
#endif
typeof(T),
true);
} }
} }
} }