From d30e81daec162b357e9f01285b3e0cdd3eef1a2a Mon Sep 17 00:00:00 2001 From: Daniel Grunwald Date: Sun, 1 Apr 2007 09:53:08 +0000 Subject: [PATCH] Removed SharpDbTools from SD 2.1.x (will be supported only in SD 3.0) Fixed forum-16031. git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/branches/2.1@2461 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61 --- .../Project/Src/Project/Items/TypeLibrary.cs | 29 +++++++++++-------- src/Setup/Files.wxs | 17 +---------- src/Setup/Setup.wxs | 4 --- src/SharpDevelop.sln | 22 +------------- 4 files changed, 19 insertions(+), 53 deletions(-) diff --git a/src/Main/Base/Project/Src/Project/Items/TypeLibrary.cs b/src/Main/Base/Project/Src/Project/Items/TypeLibrary.cs index 026cd4db9f..b4b80ec593 100644 --- a/src/Main/Base/Project/Src/Project/Items/TypeLibrary.cs +++ b/src/Main/Base/Project/Src/Project/Items/TypeLibrary.cs @@ -103,7 +103,12 @@ namespace ICSharpCode.SharpDevelop.Project get { RegistryKey typeLibsKey = Registry.ClassesRoot.OpenSubKey("TypeLib"); foreach (string typeLibKeyName in typeLibsKey.GetSubKeyNames()) { - RegistryKey typeLibKey = typeLibsKey.OpenSubKey(typeLibKeyName); + RegistryKey typeLibKey = null; + try { + typeLibKey = typeLibsKey.OpenSubKey(typeLibKeyName); + } catch (System.Security.SecurityException) { + // ignore type libraries that cannot be read from the registry + } if (typeLibKey == null) { continue; } @@ -151,7 +156,7 @@ namespace ICSharpCode.SharpDevelop.Project RegistryKey win32Key = NullKey.OpenSubKey("win32"); return win32Key == null || win32Key.GetValue(null) == null ? null : GetTypeLibPath(win32Key.GetValue(null).ToString()); - } + } } return null; } @@ -168,7 +173,7 @@ namespace ICSharpCode.SharpDevelop.Project string GetTypeLibName() { string name = null; - + int typeLibLcid; if (guid != null && lcid != null && Int32.TryParse(lcid, out typeLibLcid)) { Guid typeLibGuid = new Guid(this.guid); @@ -226,7 +231,7 @@ namespace ICSharpCode.SharpDevelop.Project } finally { Marshal.ReleaseComObject(typeLib); } - } + } return null; } @@ -238,15 +243,15 @@ namespace ICSharpCode.SharpDevelop.Project [DllImport("oleaut32.dll")] static extern int LoadTypeLibEx([MarshalAs(UnmanagedType.BStr)] string szFile, - RegKind regkind, - out ITypeLib pptlib); + RegKind regkind, + out ITypeLib pptlib); [DllImport("oleaut32.dll")] - static extern int LoadRegTypeLib( - ref Guid rguid, - short wVerMajor, - short wVerMinor, - int lcid, - out ITypeLib pptlib); + static extern int LoadRegTypeLib( + ref Guid rguid, + short wVerMajor, + short wVerMinor, + int lcid, + out ITypeLib pptlib); } } diff --git a/src/Setup/Files.wxs b/src/Setup/Files.wxs index 24748a1927..8aeac9ff8d 100644 --- a/src/Setup/Files.wxs +++ b/src/Setup/Files.wxs @@ -1153,21 +1153,6 @@ - - - - - - - - - - - - - - - @@ -1254,4 +1239,4 @@ - \ No newline at end of file + diff --git a/src/Setup/Setup.wxs b/src/Setup/Setup.wxs index df7da8d00d..0d7d9155d6 100644 --- a/src/Setup/Setup.wxs +++ b/src/Setup/Setup.wxs @@ -322,10 +322,6 @@ - - - - diff --git a/src/SharpDevelop.sln b/src/SharpDevelop.sln index 5f16b3c5f5..15a0d16b10 100644 --- a/src/SharpDevelop.sln +++ b/src/SharpDevelop.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 9.00 # Visual Studio 2005 -# SharpDevelop 2.1.0.2080 +# SharpDevelop 2.1.0.2429 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AddIns", "AddIns", "{14A277EE-7DF1-4529-B639-7D1EF334C1C5}" ProjectSection(SolutionItems) = postProject EndProjectSection @@ -10,8 +10,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Display Bindings", "Display ProjectSection(SolutionItems) = postProject EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SettingsEditor", "AddIns\DisplayBindings\SettingsEditor\Project\SettingsEditor.csproj", "{85226AFB-CE71-4851-9A75-7EEC663A8E8A}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "IconEditor", "IconEditor", "{0D37CE59-B0EF-4F3C-B9EB-8557E53A448B}" ProjectSection(SolutionItems) = postProject EndProjectSection @@ -48,18 +46,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Misc", "Misc", "{CE5B42B7-6 ProjectSection(SolutionItems) = postProject EndProjectSection EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SharpServerTools", "SharpServerTools", "{6CEEC0D9-FA00-4EE3-9A1C-39B7ACC882FD}" - ProjectSection(SolutionItems) = postProject - EndProjectSection -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SQLServerDbToolsProvider", "AddIns\Misc\SharpServerTools\SQLServerDbToolsProvider\SQLServerDbToolsProvider.csproj", "{8C692BAF-108E-4346-B41E-6EE7D20E2E9D}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OracleDbToolsProvider", "AddIns\Misc\SharpServerTools\OracleDbToolsProvider\OracleDbToolsProvider.csproj", "{DFA70EAA-3285-4BC0-BCA7-EBEC4D67FC9B}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharpDbTools", "AddIns\Misc\SharpServerTools\SharpDbTools\SharpDbTools.csproj", "{93B2D6DF-7588-40C0-8A35-CA0DD7328FC3}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServerBrowserTool", "AddIns\Misc\SharpServerTools\ServerBrowserTool\ServerBrowserTool.csproj", "{D721EAA4-8A40-4EF0-A011-5862159BE621}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ResourceToolkit", "AddIns\Misc\ResourceToolkit\Project\ResourceToolkit.csproj", "{461606BD-E824-4D0A-8CBA-01810B1F5E02}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ComponentInspector", "ComponentInspector", "{BDDDCD01-D2FE-4EAD-9425-4B6B91922C7C}" @@ -417,7 +403,6 @@ Global {7D7E92DF-ACEB-4B69-92C8-8AC7A703CD57} = {4EA396ED-64AD-4AD0-A67A-AB363F3E0C79} {6B717BD1-CD5E-498C-A42E-9E6A4584DC48} = {4EA396ED-64AD-4AD0-A67A-AB363F3E0C79} {0D37CE59-B0EF-4F3C-B9EB-8557E53A448B} = {4EA396ED-64AD-4AD0-A67A-AB363F3E0C79} - {85226AFB-CE71-4851-9A75-7EEC663A8E8A} = {4EA396ED-64AD-4AD0-A67A-AB363F3E0C79} {DC1CCE11-CB91-40FA-9C47-4D9EB5D67BFD} = {0D37CE59-B0EF-4F3C-B9EB-8557E53A448B} {DFB936AD-90EE-4B4F-941E-4F4A636F0D92} = {0D37CE59-B0EF-4F3C-B9EB-8557E53A448B} {1F1AC7CD-D154-45BB-8EAF-804CA8055F5A} = {FEB825FA-4AD8-425D-8E4A-B5A18EE1B81C} @@ -446,11 +431,6 @@ Global {3EAA45A9-735C-4AC7-A799-947B93EA449D} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2} {BDDDCD01-D2FE-4EAD-9425-4B6B91922C7C} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2} {461606BD-E824-4D0A-8CBA-01810B1F5E02} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2} - {6CEEC0D9-FA00-4EE3-9A1C-39B7ACC882FD} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2} - {D721EAA4-8A40-4EF0-A011-5862159BE621} = {6CEEC0D9-FA00-4EE3-9A1C-39B7ACC882FD} - {93B2D6DF-7588-40C0-8A35-CA0DD7328FC3} = {6CEEC0D9-FA00-4EE3-9A1C-39B7ACC882FD} - {DFA70EAA-3285-4BC0-BCA7-EBEC4D67FC9B} = {6CEEC0D9-FA00-4EE3-9A1C-39B7ACC882FD} - {8C692BAF-108E-4346-B41E-6EE7D20E2E9D} = {6CEEC0D9-FA00-4EE3-9A1C-39B7ACC882FD} {000E4F64-5D0D-4EB1-B0BF-1A62ADBC6EAD} = {BDDDCD01-D2FE-4EAD-9425-4B6B91922C7C} {869951D5-A0D6-4DC6-9F1D-E6B9A12AC446} = {BDDDCD01-D2FE-4EAD-9425-4B6B91922C7C} {E6F4983F-DE41-4AEC-88E7-1FA9AFB4E6FF} = {BDDDCD01-D2FE-4EAD-9425-4B6B91922C7C}