Permalink
Browse files

Added support for 32 and 64 bit sharing same directory, copyright upd…

…ated
  • Loading branch information...
ctxis-canape committed May 9, 2014
1 parent d098f90 commit 6010b0c85eaeadde50a92a19e468769975f73d1d
Showing with 11 additions and 4 deletions.
  1. +9 −1 OleViewDotNet/COMRegistry.cs
  2. +0 −1 OleViewDotNet/OleViewDotNet.csproj
  3. +1 −1 OleViewDotNet/Properties/AssemblyInfo.cs
  4. +1 −1 README
@@ -32,7 +32,15 @@ static public Guid[] GetInterfaces(COMCLSIDEntry ent)
{
string strProcess;
strProcess = Path.Combine(COMUtilities.GetAppDirectory(), "EnumerateInterfaces.exe");
string appDirectory = COMUtilities.GetAppDirectory();
// Try sepecific bit version first
strProcess = Path.Combine(appDirectory, Environment.Is64BitProcess ? "EnumerateInterfaces64.exe" : "EnumerateInterfaces32.exe");
if (!File.Exists(strProcess))
{
strProcess = Path.Combine(appDirectory, "EnumerateInterfaces.exe");
}
Process proc = new Process();
ProcessStartInfo info = new ProcessStartInfo(strProcess, String.Format("{0} s {1} {2}",
ent.Clsid.ToString("B"), (int)ent.CreateContext, COMInterfaceEntry.IID_IMarshal.ToString("B")));
@@ -836,7 +836,6 @@
<Content Include="Lib\__future__.py" />
<Content Include="Lib\__phello__.foo.py" />
<Content Include="license.txt" />
<Content Include="logo.ico" />
<Content Include="oleview.ico" />
<Content Include="Notes.txt" />
<Content Include="PythonLib\oleviewdotnet\registry.py">
@@ -10,7 +10,7 @@
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany(".")]
[assembly: AssemblyProduct("OleViewDotNet")]
[assembly: AssemblyCopyright("Copyright © TyRaNiD 2009")]
[assembly: AssemblyCopyright("Copyright © James Forshaw 2014")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
View
2 README
@@ -5,4 +5,4 @@ interfaces on the object and then create an instance and invoke methods. It also
container to attack ActiveX objects to so you can see the display output while manipulating
the data.
All work (barring the shameless borrowing of the icon) copyright James Forshaw (c) 2010
All work (barring the shameless borrowing of the icon) copyright James Forshaw (c) 2014

0 comments on commit 6010b0c

Please sign in to comment.