pimhwang
/
SharpDevelop
mirror of https://github.com/icsharpcode/SharpDevelop.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

SubversionAddIn: on 64-bit Windows, look for 64-bit version of TortoiseSVN. 

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/branches/3.0@3966 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
Daniel Grunwald 17 years ago
parent
2f86318fd8
commit
718fd03ff0
4 changed files with 117 additions and 63 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      src/AddIns/Misc/Profiler/Controller/Controller.csproj
  2. 158
      src/AddIns/Misc/Profiler/Controller/ExtendedRegistry.cs
  3. 15
      src/AddIns/Misc/SubversionAddIn/Project/Src/Gui/SvnGuiWrapper.cs
  4. 3
      src/AddIns/Misc/SubversionAddIn/Project/SubversionAddIn.csproj

4
src/AddIns/Misc/Profiler/Controller/Controller.csproj
Unescape View File

@ -30,14 +30,14 @@ @@ -30,14 +30,14 @@
<DebugSymbols>true</DebugSymbols>
<DebugType>Full</DebugType>
<Optimize>false</Optimize>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DefineConstants>DEBUG;TRACE;PUBLIC_EXTENDEDREGISTRY</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>PdbOnly</DebugType>
<Optimize>true</Optimize>
<DefineConstants>TRACE</DefineConstants>
<DefineConstants>TRACE;PUBLIC_EXTENDEDREGISTRY</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DebugSymbols>false</DebugSymbols>

158
src/AddIns/Misc/Profiler/Controller/ExtendedRegistry.cs
Unescape View File

@ -16,9 +16,13 @@ namespace ICSharpCode.Profiler.Controller @@ -16,9 +16,13 @@ namespace ICSharpCode.Profiler.Controller
/// <summary>
/// Provides access to 32-bit Windows Registry on 32-bit systems and 32-bit and 64-bit views of the Windows Registry on 64-bit systems.
/// </summary>
public class ExtendedRegistry
#if PUBLIC_EXTENDEDREGISTRY
public
#endif
class ExtendedRegistry
{
static class NativeMethods {
static class NativeMethods
{
// internal static readonly UIntPtr HKEY_CLASSES_ROOT = new UIntPtr(0x80000000);
internal static readonly UIntPtr HKEY_CURRENT_USER = new UIntPtr(0x80000001);
internal static readonly UIntPtr HKEY_LOCAL_MACHINE = new UIntPtr(0x80000002);
@ -27,14 +31,14 @@ namespace ICSharpCode.Profiler.Controller @@ -27,14 +31,14 @@ namespace ICSharpCode.Profiler.Controller
// internal static readonly UIntPtr HKEY_CURRENT_CONFIG = new UIntPtr(0x80000005);
// internal static readonly UIntPtr HKEY_DYN_DATA = new UIntPtr(0x80000006);
// [DllImport("advapi32.dll", CharSet = CharSet.Unicode)]
// internal static extern int RegOpenKeyEx(HKEY hKey, string subKey, uint options, RegSAM samDesired, out HKEY hKeyResult);
[DllImport("advapi32.dll", CharSet = CharSet.Unicode)]
internal static extern int RegOpenKeyEx(HKEY hKey, string subKey, uint options, RegSAM samDesired, out HKEY hKeyResult);
[DllImport("advapi32.dll")]
internal static extern int RegCloseKey(HKEY hKey);
// [DllImport("advapi32.dll", CharSet = CharSet.Unicode)]
// internal static extern int RegQueryValueEx(HKEY hkey, string valueName, IntPtr reserved, out uint type, IntPtr buffer, ref uint bufferLength);
[DllImport("advapi32.dll", CharSet = CharSet.Unicode)]
internal static extern int RegQueryValueEx(HKEY hkey, string valueName, IntPtr reserved, out uint type, IntPtr buffer, ref uint bufferLength);
[DllImport("advapi32.dll", CharSet = CharSet.Unicode)]
internal static extern int RegCreateKeyEx(HKEY hkey, string subKey, uint reserved, string lpClass, uint options, RegSAM samDesired, IntPtr securityAttributes, out HKEY result, out uint disposition);
@ -54,47 +58,49 @@ namespace ICSharpCode.Profiler.Controller @@ -54,47 +58,49 @@ namespace ICSharpCode.Profiler.Controller
[DllImport("kernel32", SetLastError = true)]
[return: MarshalAs(UnmanagedType.Bool)]
internal static extern bool IsWow64Process(IntPtr hProcess, out bool wow64Process);
[Flags]
internal enum RegOption
{
NonVolatile = 0x0,
Volatile = 0x1,
CreateLink = 0x2,
BackupRestore = 0x4,
OpenLink = 0x8
}
[Flags]
internal enum RegSAM
{
QueryValue = 0x0001,
SetValue = 0x0002,
CreateSubKey = 0x0004,
EnumerateSubKeys = 0x0008,
Notify = 0x0010,
CreateLink = 0x0020,
WOW64_32Key = 0x0200,
WOW64_64Key = 0x0100,
Read = 0x00020019,
Write = 0x00020006,
Execute = 0x00020019,
AllAccess = 0x000f003f
}
internal const uint REG_SZ = 0x1;
internal enum RegResult
{
CreatedNewKey = 0x00000001,
OpenedExistingKey = 0x00000002
}
}
[Flags]
enum RegOption
{
NonVolatile = 0x0,
Volatile = 0x1,
CreateLink = 0x2,
BackupRestore = 0x4,
OpenLink = 0x8
}
[Flags]
enum RegSAM
{
QueryValue = 0x0001,
SetValue = 0x0002,
CreateSubKey = 0x0004,
EnumerateSubKeys = 0x0008,
Notify = 0x0010,
CreateLink = 0x0020,
WOW64_32Key = 0x0200,
WOW64_64Key = 0x0100,
Read = 0x00020019,
Write = 0x00020006,
Execute = 0x00020019,
AllAccess = 0x000f003f
}
const uint REG_SZ = 0x1;
const int ERROR_MORE_DATA = 234;
const int ERROR_FILE_NOT_FOUND = 2;
enum RegResult
{
CreatedNewKey = 0x00000001,
OpenedExistingKey = 0x00000002
}
UIntPtr rootKey;
NativeMethods.RegSAM keyType;
RegSAM keyType;
ExtendedRegistry(UIntPtr rootKey, NativeMethods.RegSAM keyType) {
ExtendedRegistry(UIntPtr rootKey, RegSAM keyType) {
this.rootKey = rootKey;
this.keyType = keyType;
}
@ -115,12 +121,12 @@ namespace ICSharpCode.Profiler.Controller @@ -115,12 +121,12 @@ namespace ICSharpCode.Profiler.Controller
UIntPtr keyPtr;
uint dummy;
IntPtr ptr = IntPtr.Zero;
int errorCode = NativeMethods.RegCreateKeyEx(rootKey, subkey, 0x0, null, 0x0, NativeMethods.RegSAM.CreateSubKey | NativeMethods.RegSAM.SetValue | keyType, IntPtr.Zero, out keyPtr, out dummy);
int errorCode = NativeMethods.RegCreateKeyEx(rootKey, subkey, 0x0, null, 0x0, RegSAM.CreateSubKey | RegSAM.SetValue | keyType, IntPtr.Zero, out keyPtr, out dummy);
if (errorCode != 0)
throw ExceptionForError(errorCode);
try {
if (errorCode != 0)
throw ExceptionForError(errorCode);
ptr = Marshal.StringToHGlobalUni(value);
errorCode = NativeMethods.RegSetValueEx(keyPtr, valueName, 0, NativeMethods.REG_SZ, ptr, (uint)((value.Length + 1) * 2));
errorCode = NativeMethods.RegSetValueEx(keyPtr, valueName, 0, REG_SZ, ptr, (uint)((value.Length + 1) * 2));
if (errorCode != 0)
throw ExceptionForError(errorCode);
} finally {
@ -143,6 +149,54 @@ namespace ICSharpCode.Profiler.Controller @@ -143,6 +149,54 @@ namespace ICSharpCode.Profiler.Controller
}
}
/// <summary>
/// Gets a value from the registry.
/// </summary>
/// <param name="subkey">The key containing the value.</param>
/// <param name="valueName">The name of the value, use null for "(Default)".</param>
/// <returns>null, if the key does not exist or the value does not exist.
/// Otherwise, the value as string (currently, only REG_SZ is supported).</returns>
public object GetValue(string subkey, string valueName)
{
if (subkey == null)
throw new ArgumentNullException("subkey");
object result;
UIntPtr keyPtr;
IntPtr buffer = IntPtr.Zero;
int errorCode = NativeMethods.RegOpenKeyEx(rootKey, subkey, 0x0, RegSAM.Read | keyType, out keyPtr);
if (errorCode == ERROR_FILE_NOT_FOUND)
return null;
if (errorCode != 0)
throw ExceptionForError(errorCode);
try {
uint type;
uint bufferLength = 0;
// detect length of string
errorCode = NativeMethods.RegQueryValueEx(keyPtr, valueName, IntPtr.Zero, out type, IntPtr.Zero, ref bufferLength);
if (errorCode == ERROR_FILE_NOT_FOUND)
return null;
if (errorCode != 0 && errorCode != ERROR_MORE_DATA)
throw ExceptionForError(errorCode);
if (type != REG_SZ)
throw new NotSupportedException("Unsupported data type: " + type);
buffer = Marshal.AllocHGlobal((int)bufferLength);
errorCode = NativeMethods.RegQueryValueEx(keyPtr, valueName, IntPtr.Zero, out type, buffer, ref bufferLength);
if (errorCode != 0)
throw ExceptionForError(errorCode);
result = Marshal.PtrToStringUni(buffer);
} finally {
if (buffer != IntPtr.Zero)
Marshal.FreeHGlobal(buffer);
errorCode = NativeMethods.RegCloseKey(keyPtr);
}
// check error code from RegCloseKey (but only if there was no other exception)
if (errorCode != 0)
throw ExceptionForError(errorCode);
return result;
}
/// <summary>
/// Deletes a key in the Windows Registry. The key must have no sub keys. All values of the key are deleted.
/// </summary>
@ -154,7 +208,7 @@ namespace ICSharpCode.Profiler.Controller @@ -154,7 +208,7 @@ namespace ICSharpCode.Profiler.Controller
int retVal = (Environment.OSVersion.Version >= new Version(5,2))
? NativeMethods.RegDeleteKeyEx(rootKey, subkey, keyType, 0)
: NativeMethods.RegDeleteKey(rootKey, subkey);
if (retVal != 0 && retVal != 2) // 2=key not found
if (retVal != 0 && retVal != ERROR_FILE_NOT_FOUND)
throw ExceptionForError(retVal);
}
@ -162,28 +216,28 @@ namespace ICSharpCode.Profiler.Controller @@ -162,28 +216,28 @@ namespace ICSharpCode.Profiler.Controller
/// Gets the 32-bit view of HKEY_CURRENT_USER.
/// </summary>
public static ExtendedRegistry CurrentUser32 {
get { return new ExtendedRegistry(ExtendedRegistry.NativeMethods.HKEY_CURRENT_USER, NativeMethods.RegSAM.WOW64_32Key); }
get { return new ExtendedRegistry(NativeMethods.HKEY_CURRENT_USER, RegSAM.WOW64_32Key); }
}
/// <summary>
/// Gets the 32-bit view of HKEY_LOCAL_MACHINE.
/// </summary>
public static ExtendedRegistry LocalMachine32 {
get { return new ExtendedRegistry(ExtendedRegistry.NativeMethods.HKEY_LOCAL_MACHINE, NativeMethods.RegSAM.WOW64_32Key); }
get { return new ExtendedRegistry(NativeMethods.HKEY_LOCAL_MACHINE, RegSAM.WOW64_32Key); }
}
/// <summary>
/// Gets the 64-bit view of HKEY_CURRENT_USER.
/// </summary>
public static ExtendedRegistry CurrentUser64 {
get { return new ExtendedRegistry(ExtendedRegistry.NativeMethods.HKEY_CURRENT_USER, NativeMethods.RegSAM.WOW64_64Key); }
get { return new ExtendedRegistry(NativeMethods.HKEY_CURRENT_USER, RegSAM.WOW64_64Key); }
}
/// <summary>
/// Gets the 64-bit view of HKEY_LOCAL_MACHINE.
/// </summary>
public static ExtendedRegistry LocalMachine64 {
get { return new ExtendedRegistry(ExtendedRegistry.NativeMethods.HKEY_LOCAL_MACHINE, NativeMethods.RegSAM.WOW64_64Key); }
get { return new ExtendedRegistry(NativeMethods.HKEY_LOCAL_MACHINE, RegSAM.WOW64_64Key); }
}
/// <summary>

15
src/AddIns/Misc/SubversionAddIn/Project/Src/Gui/SvnGuiWrapper.cs
Unescape View File

@ -5,11 +5,11 @@ @@ -5,11 +5,11 @@
// <version>$Revision$</version>
// </file>
using ICSharpCode.Profiler.Controller;
using System;
using System.Diagnostics;
using System.Text;
using System.Windows.Forms;
using ICSharpCode.Core;
using Microsoft.Win32;
@ -21,19 +21,16 @@ namespace ICSharpCode.Svn @@ -21,19 +21,16 @@ namespace ICSharpCode.Svn
/// </summary>
public static class SvnGuiWrapper
{
static string GetPathFromRegistry(RegistryKey key, string valueName)
static string GetPathFromRegistry(ExtendedRegistry registry, string valueName)
{
if (key == null) return null;
using (key) {
return key.GetValue(valueName) as string;
}
return registry.GetValue("SOFTWARE\\TortoiseSVN", valueName) as string;
}
static string GetPathFromRegistry(string valueName)
{
string r = GetPathFromRegistry(Registry.CurrentUser.OpenSubKey("SOFTWARE\\TortoiseSVN"), valueName);
if (r != null) return r;
return GetPathFromRegistry(Registry.LocalMachine.OpenSubKey("SOFTWARE\\TortoiseSVN"), valueName);
bool is64Bit = ExtendedRegistry.Is64BitWindows;
return GetPathFromRegistry(is64Bit ? ExtendedRegistry.CurrentUser64 : ExtendedRegistry.CurrentUser32, valueName)
?? GetPathFromRegistry(is64Bit ? ExtendedRegistry.LocalMachine64 : ExtendedRegistry.LocalMachine32, valueName);
}
static void Proc(string command, string fileName, MethodInvoker callback)

3
src/AddIns/Misc/SubversionAddIn/Project/SubversionAddIn.csproj
Unescape View File

@ -42,6 +42,9 @@ @@ -42,6 +42,9 @@
<None Include="ICSharpCode.Svn.addin">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<Compile Include="..\..\Profiler\Controller\ExtendedRegistry.cs">
<Link>Src\Gui\ExtendedRegistry.cs</Link>
</Compile>
<Compile Include="Src\Gui\HistoryViewDisplayBinding\InfoPanel.cs" />
<Compile Include="Src\Gui\HistoryViewDisplayBinding\InfoPanel.Designer.cs">
<DependentUpon>InfoPanel.cs</DependentUpon>

Write Preview
Loading…
Cancel
Save