From 4bd40572c306d30c95e654dbbad81e6c4fae2b10 Mon Sep 17 00:00:00 2001 From: Robert Jordan Date: Mon, 25 Feb 2008 21:15:44 +0000 Subject: [PATCH] 2008-02-25 Robert Jordan * Win32RegistryApi.cs (ToString): Don't emit the handle value under NET_2_0. See http://msdn2.microsoft.com/en-us/netframework/aa497241.aspx. svn path=/trunk/mcs/; revision=96593 --- mcs/class/corlib/Microsoft.Win32/ChangeLog | 6 ++++++ mcs/class/corlib/Microsoft.Win32/Win32RegistryApi.cs | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/mcs/class/corlib/Microsoft.Win32/ChangeLog b/mcs/class/corlib/Microsoft.Win32/ChangeLog index 7b55e88c4fc..ae26d3fdb7b 100644 --- a/mcs/class/corlib/Microsoft.Win32/ChangeLog +++ b/mcs/class/corlib/Microsoft.Win32/ChangeLog @@ -1,3 +1,9 @@ +2008-02-25 Robert Jordan + + * Win32RegistryApi.cs (ToString): Don't emit the handle value + under NET_2_0. + See http://msdn2.microsoft.com/en-us/netframework/aa497241.aspx. + 2008-02-01 Gert Driesen * RegistryKey.cs: Added missing checks on length of subkey and value diff --git a/mcs/class/corlib/Microsoft.Win32/Win32RegistryApi.cs b/mcs/class/corlib/Microsoft.Win32/Win32RegistryApi.cs index 1849a46f4e1..c32ac30c801 100644 --- a/mcs/class/corlib/Microsoft.Win32/Win32RegistryApi.cs +++ b/mcs/class/corlib/Microsoft.Win32/Win32RegistryApi.cs @@ -536,9 +536,13 @@ namespace Microsoft.Win32 public string ToString (RegistryKey rkey) { +#if NET_2_0 + return rkey.Name; +#else IntPtr handle = GetHandle (rkey); return String.Format ("{0} [0x{1:X}]", rkey.Name, handle.ToInt32 ()); +#endif } /// -- 2.25.1