From 098ba6db0d15bde7edb7a8e96452991744b98262 Mon Sep 17 00:00:00 2001 From: Eric Reed Date: Mon, 25 Feb 2013 22:52:29 -0500 Subject: [PATCH 01/11] Uninstaller stub as silent console app --- MediaBrowser.Uninstaller/App.xaml | 8 -- MediaBrowser.Uninstaller/App.xaml.cs | 17 --- MediaBrowser.Uninstaller/MainWindow.xaml | 8 -- MediaBrowser.Uninstaller/MainWindow.xaml.cs | 54 -------- .../MediaBrowser.Uninstaller.csproj | 61 ++------- MediaBrowser.Uninstaller/Program.cs | 33 +++++ .../Properties/AssemblyInfo.cs | 23 +--- .../Properties/Resources.Designer.cs | 71 ----------- .../Properties/Resources.resx | 117 ------------------ .../Properties/Settings.Designer.cs | 30 ----- .../Properties/Settings.settings | 7 -- MediaBrowser.sln | 30 ++--- 12 files changed, 59 insertions(+), 400 deletions(-) delete mode 100644 MediaBrowser.Uninstaller/App.xaml delete mode 100644 MediaBrowser.Uninstaller/App.xaml.cs delete mode 100644 MediaBrowser.Uninstaller/MainWindow.xaml delete mode 100644 MediaBrowser.Uninstaller/MainWindow.xaml.cs create mode 100644 MediaBrowser.Uninstaller/Program.cs delete mode 100644 MediaBrowser.Uninstaller/Properties/Resources.Designer.cs delete mode 100644 MediaBrowser.Uninstaller/Properties/Resources.resx delete mode 100644 MediaBrowser.Uninstaller/Properties/Settings.Designer.cs delete mode 100644 MediaBrowser.Uninstaller/Properties/Settings.settings diff --git a/MediaBrowser.Uninstaller/App.xaml b/MediaBrowser.Uninstaller/App.xaml deleted file mode 100644 index 8d0735d423..0000000000 --- a/MediaBrowser.Uninstaller/App.xaml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - diff --git a/MediaBrowser.Uninstaller/App.xaml.cs b/MediaBrowser.Uninstaller/App.xaml.cs deleted file mode 100644 index b38e27e1a9..0000000000 --- a/MediaBrowser.Uninstaller/App.xaml.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Configuration; -using System.Data; -using System.Linq; -using System.Threading.Tasks; -using System.Windows; - -namespace MediaBrowser.Uninstaller -{ - /// - /// Interaction logic for App.xaml - /// - public partial class App : Application - { - } -} diff --git a/MediaBrowser.Uninstaller/MainWindow.xaml b/MediaBrowser.Uninstaller/MainWindow.xaml deleted file mode 100644 index 645996503a..0000000000 --- a/MediaBrowser.Uninstaller/MainWindow.xaml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - diff --git a/MediaBrowser.Uninstaller/MainWindow.xaml.cs b/MediaBrowser.Uninstaller/MainWindow.xaml.cs deleted file mode 100644 index fb5f32a7f1..0000000000 --- a/MediaBrowser.Uninstaller/MainWindow.xaml.cs +++ /dev/null @@ -1,54 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.IO; -using System.Linq; -using System.Reflection; -using System.Text; -using System.Threading; -using System.Threading.Tasks; -using System.Windows; -using System.Windows.Controls; -using System.Windows.Data; -using System.Windows.Documents; -using System.Windows.Input; -using System.Windows.Media; -using System.Windows.Media.Imaging; -using System.Windows.Navigation; -using System.Windows.Shapes; -using Path = System.IO.Path; - -namespace MediaBrowser.Uninstaller -{ - /// - /// Interaction logic for MainWindow.xaml - /// - public partial class MainWindow : Window - { - public MainWindow() - { - //All our work is behind the scenes - var args = Environment.GetCommandLineArgs(); - var product = args.Length > 1 ? args[1] : "server"; - //copy the real program to a temp location so we can delete everything here (including us) - var tempExe = Path.Combine(Path.GetTempPath(), "MediaBrowser.Uninstaller.Execute.exe"); - var tempConfig = Path.Combine(Path.GetTempPath(), "MediaBrowser.Uninstaller.Execute.exe.config"); - using (var file = File.Create(tempExe, 4096, FileOptions.DeleteOnClose)) - { - //copy the real uninstaller to temp location - var sourceDir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().GetName().CodeBase) ?? ""; - File.WriteAllBytes(tempExe, File.ReadAllBytes(Path.Combine(sourceDir ,"MediaBrowser.Uninstaller.Execute.exe"))); - File.Copy(tempConfig, Path.Combine(sourceDir ,"MediaBrowser.Uninstaller.Execute.exe.config")); - //kick off the copy - MessageBox.Show("About to start " + tempExe); - Process.Start(tempExe, product); - //wait for it to start up - Thread.Sleep(500); - //and shut down - Close(); - } - - //InitializeComponent(); - } - } -} diff --git a/MediaBrowser.Uninstaller/MediaBrowser.Uninstaller.csproj b/MediaBrowser.Uninstaller/MediaBrowser.Uninstaller.csproj index c9c3e537cd..3291ebdb1a 100644 --- a/MediaBrowser.Uninstaller/MediaBrowser.Uninstaller.csproj +++ b/MediaBrowser.Uninstaller/MediaBrowser.Uninstaller.csproj @@ -4,15 +4,13 @@ Debug AnyCPU - {21EC6FB8-F444-4B60-8BA5-9CA443901A0D} + {8B930005-D5B2-4A78-9377-46AC6EDAB688} WinExe Properties MediaBrowser.Uninstaller MediaBrowser.Uninstaller v4.5 512 - {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - 4 AnyCPU @@ -33,62 +31,21 @@ prompt 4 + + + - - - - - 4.0 - - - - + + + - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - App.xaml - Code - - - MainWindow.xaml - Code - - - - - Code - - - True - True - Resources.resx - - - True - Settings.settings - True - - - ResXFileCodeGenerator - Resources.Designer.cs - - - SettingsSingleFileGenerator - Settings.Designer.cs - - + + diff --git a/MediaBrowser.Uninstaller/Program.cs b/MediaBrowser.Uninstaller/Program.cs new file mode 100644 index 0000000000..bbbdba14b6 --- /dev/null +++ b/MediaBrowser.Uninstaller/Program.cs @@ -0,0 +1,33 @@ +using System; +using System.Collections.Generic; +using System.Diagnostics; +using System.IO; +using System.Linq; +using System.Reflection; +using System.Text; +using System.Threading; +using System.Threading.Tasks; + +namespace MediaBrowser.Uninstaller +{ + class Program + { + static void Main(string[] args) + { + var product = args.Length > 1 ? args[1] : "server"; + //copy the real program to a temp location so we can delete everything here (including us) + var tempExe = Path.Combine(Path.GetTempPath(), "MediaBrowser.Uninstaller.Execute.exe"); + var tempConfig = Path.Combine(Path.GetTempPath(), "MediaBrowser.Uninstaller.Execute.exe.config"); + //using (var file = File.Create(tempExe, 4096, FileOptions.DeleteOnClose)) + { + //copy the real uninstaller to temp location + var sourceDir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) ?? ""; + File.WriteAllBytes(tempExe, File.ReadAllBytes(Path.Combine(sourceDir, "MediaBrowser.Uninstaller.Execute.exe"))); + File.Copy(Path.Combine(sourceDir, "MediaBrowser.Uninstaller.Execute.exe.config"), tempConfig); + //kick off the copy + Process.Start(tempExe, product); + //and shut down + } + } + } +} diff --git a/MediaBrowser.Uninstaller/Properties/AssemblyInfo.cs b/MediaBrowser.Uninstaller/Properties/AssemblyInfo.cs index c4a6586ee8..49b4acc579 100644 --- a/MediaBrowser.Uninstaller/Properties/AssemblyInfo.cs +++ b/MediaBrowser.Uninstaller/Properties/AssemblyInfo.cs @@ -1,8 +1,6 @@ using System.Reflection; -using System.Resources; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -using System.Windows; // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information @@ -21,25 +19,8 @@ using System.Windows; // COM, set the ComVisible attribute to true on that type. [assembly: ComVisible(false)] -//In order to begin building localizable applications, set -//CultureYouAreCodingWith in your .csproj file -//inside a . For example, if you are using US english -//in your source files, set the to en-US. Then uncomment -//the NeutralResourceLanguage attribute below. Update the "en-US" in -//the line below to match the UICulture setting in the project file. - -//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)] - - -[assembly: ThemeInfo( - ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located - //(used if a resource is not found in the page, - // or application resource dictionaries) - ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located - //(used if a resource is not found in the page, - // app, or any theme specific resource dictionaries) -)] - +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("8730b84d-cebf-4e2a-9a17-4be58bd5c2dc")] // Version information for an assembly consists of the following four values: // diff --git a/MediaBrowser.Uninstaller/Properties/Resources.Designer.cs b/MediaBrowser.Uninstaller/Properties/Resources.Designer.cs deleted file mode 100644 index 3de89d4253..0000000000 --- a/MediaBrowser.Uninstaller/Properties/Resources.Designer.cs +++ /dev/null @@ -1,71 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:4.0.30319.17929 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace MediaBrowser.Uninstaller.Properties -{ - - - /// - /// A strongly-typed resource class, for looking up localized strings, etc. - /// - // This class was auto-generated by the StronglyTypedResourceBuilder - // class via a tool like ResGen or Visual Studio. - // To add or remove a member, edit your .ResX file then rerun ResGen - // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - internal class Resources - { - - private static global::System.Resources.ResourceManager resourceMan; - - private static global::System.Globalization.CultureInfo resourceCulture; - - [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] - internal Resources() - { - } - - /// - /// Returns the cached ResourceManager instance used by this class. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Resources.ResourceManager ResourceManager - { - get - { - if ((resourceMan == null)) - { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("MediaBrowser.Uninstaller.Properties.Resources", typeof(Resources).Assembly); - resourceMan = temp; - } - return resourceMan; - } - } - - /// - /// Overrides the current thread's CurrentUICulture property for all - /// resource lookups using this strongly typed resource class. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Globalization.CultureInfo Culture - { - get - { - return resourceCulture; - } - set - { - resourceCulture = value; - } - } - } -} diff --git a/MediaBrowser.Uninstaller/Properties/Resources.resx b/MediaBrowser.Uninstaller/Properties/Resources.resx deleted file mode 100644 index af7dbebbac..0000000000 --- a/MediaBrowser.Uninstaller/Properties/Resources.resx +++ /dev/null @@ -1,117 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/MediaBrowser.Uninstaller/Properties/Settings.Designer.cs b/MediaBrowser.Uninstaller/Properties/Settings.Designer.cs deleted file mode 100644 index 0cc99d90cd..0000000000 --- a/MediaBrowser.Uninstaller/Properties/Settings.Designer.cs +++ /dev/null @@ -1,30 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:4.0.30319.17929 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace MediaBrowser.Uninstaller.Properties -{ - - - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")] - internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase - { - - private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); - - public static Settings Default - { - get - { - return defaultInstance; - } - } - } -} diff --git a/MediaBrowser.Uninstaller/Properties/Settings.settings b/MediaBrowser.Uninstaller/Properties/Settings.settings deleted file mode 100644 index 033d7a5e9e..0000000000 --- a/MediaBrowser.Uninstaller/Properties/Settings.settings +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/MediaBrowser.sln b/MediaBrowser.sln index 5f94f0cbb8..3105614f88 100644 --- a/MediaBrowser.sln +++ b/MediaBrowser.sln @@ -51,7 +51,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MediaBrowser.Server.Impleme EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MediaBrowser.Uninstaller.Execute", "MediaBrowser.Uninstaller.Execute\MediaBrowser.Uninstaller.Execute.csproj", "{FACAF749-3E28-46DD-B613-654FCD434959}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MediaBrowser.Uninstaller", "MediaBrowser.Uninstaller\MediaBrowser.Uninstaller.csproj", "{21EC6FB8-F444-4B60-8BA5-9CA443901A0D}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MediaBrowser.Uninstaller", "MediaBrowser.Uninstaller\MediaBrowser.Uninstaller.csproj", "{8B930005-D5B2-4A78-9377-46AC6EDAB688}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -335,20 +335,20 @@ Global {FACAF749-3E28-46DD-B613-654FCD434959}.Release|Win32.ActiveCfg = Release|Any CPU {FACAF749-3E28-46DD-B613-654FCD434959}.Release|x64.ActiveCfg = Release|Any CPU {FACAF749-3E28-46DD-B613-654FCD434959}.Release|x86.ActiveCfg = Release|Any CPU - {21EC6FB8-F444-4B60-8BA5-9CA443901A0D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {21EC6FB8-F444-4B60-8BA5-9CA443901A0D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {21EC6FB8-F444-4B60-8BA5-9CA443901A0D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {21EC6FB8-F444-4B60-8BA5-9CA443901A0D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {21EC6FB8-F444-4B60-8BA5-9CA443901A0D}.Debug|Win32.ActiveCfg = Debug|Any CPU - {21EC6FB8-F444-4B60-8BA5-9CA443901A0D}.Debug|x64.ActiveCfg = Debug|Any CPU - {21EC6FB8-F444-4B60-8BA5-9CA443901A0D}.Debug|x86.ActiveCfg = Debug|Any CPU - {21EC6FB8-F444-4B60-8BA5-9CA443901A0D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {21EC6FB8-F444-4B60-8BA5-9CA443901A0D}.Release|Any CPU.Build.0 = Release|Any CPU - {21EC6FB8-F444-4B60-8BA5-9CA443901A0D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {21EC6FB8-F444-4B60-8BA5-9CA443901A0D}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {21EC6FB8-F444-4B60-8BA5-9CA443901A0D}.Release|Win32.ActiveCfg = Release|Any CPU - {21EC6FB8-F444-4B60-8BA5-9CA443901A0D}.Release|x64.ActiveCfg = Release|Any CPU - {21EC6FB8-F444-4B60-8BA5-9CA443901A0D}.Release|x86.ActiveCfg = Release|Any CPU + {8B930005-D5B2-4A78-9377-46AC6EDAB688}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8B930005-D5B2-4A78-9377-46AC6EDAB688}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8B930005-D5B2-4A78-9377-46AC6EDAB688}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {8B930005-D5B2-4A78-9377-46AC6EDAB688}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {8B930005-D5B2-4A78-9377-46AC6EDAB688}.Debug|Win32.ActiveCfg = Debug|Any CPU + {8B930005-D5B2-4A78-9377-46AC6EDAB688}.Debug|x64.ActiveCfg = Debug|Any CPU + {8B930005-D5B2-4A78-9377-46AC6EDAB688}.Debug|x86.ActiveCfg = Debug|Any CPU + {8B930005-D5B2-4A78-9377-46AC6EDAB688}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8B930005-D5B2-4A78-9377-46AC6EDAB688}.Release|Any CPU.Build.0 = Release|Any CPU + {8B930005-D5B2-4A78-9377-46AC6EDAB688}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {8B930005-D5B2-4A78-9377-46AC6EDAB688}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {8B930005-D5B2-4A78-9377-46AC6EDAB688}.Release|Win32.ActiveCfg = Release|Any CPU + {8B930005-D5B2-4A78-9377-46AC6EDAB688}.Release|x64.ActiveCfg = Release|Any CPU + {8B930005-D5B2-4A78-9377-46AC6EDAB688}.Release|x86.ActiveCfg = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE From d4690904fbd2733118d5a8d540105d90a202ff7a Mon Sep 17 00:00:00 2001 From: Eric Reed Date: Tue, 26 Feb 2013 07:59:57 -0500 Subject: [PATCH 02/11] Overwrite on uninstaller copy --- MediaBrowser.Uninstaller/Program.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MediaBrowser.Uninstaller/Program.cs b/MediaBrowser.Uninstaller/Program.cs index bbbdba14b6..8ea1a950aa 100644 --- a/MediaBrowser.Uninstaller/Program.cs +++ b/MediaBrowser.Uninstaller/Program.cs @@ -23,7 +23,7 @@ namespace MediaBrowser.Uninstaller //copy the real uninstaller to temp location var sourceDir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) ?? ""; File.WriteAllBytes(tempExe, File.ReadAllBytes(Path.Combine(sourceDir, "MediaBrowser.Uninstaller.Execute.exe"))); - File.Copy(Path.Combine(sourceDir, "MediaBrowser.Uninstaller.Execute.exe.config"), tempConfig); + File.Copy(Path.Combine(sourceDir, "MediaBrowser.Uninstaller.Execute.exe.config"), tempConfig, true); //kick off the copy Process.Start(tempExe, product); //and shut down From a15b6db0dccc6680e012fdbde021a364991a0d4b Mon Sep 17 00:00:00 2001 From: Eric Reed Date: Tue, 26 Feb 2013 09:13:49 -0500 Subject: [PATCH 03/11] Add native shortcut handling & dashboard shortcut to installer --- .../Code/ShellLinkNative.cs | 276 ++++++++++++++ MediaBrowser.Installer/Code/ShellShortcut.cs | 348 ++++++++++++++++++ MediaBrowser.Installer/MainWindow.xaml.cs | 26 +- .../MediaBrowser.Installer.csproj | 25 +- .../MainWindow.xaml | 11 +- .../MainWindow.xaml.cs | 56 ++- 6 files changed, 702 insertions(+), 40 deletions(-) create mode 100644 MediaBrowser.Installer/Code/ShellLinkNative.cs create mode 100644 MediaBrowser.Installer/Code/ShellShortcut.cs diff --git a/MediaBrowser.Installer/Code/ShellLinkNative.cs b/MediaBrowser.Installer/Code/ShellLinkNative.cs new file mode 100644 index 0000000000..20e0bc6c3d --- /dev/null +++ b/MediaBrowser.Installer/Code/ShellLinkNative.cs @@ -0,0 +1,276 @@ +/************************************************************************** +* +* Filename: ShellLinkNative.cs +* Author: Mattias Sjögren (mattias@mvps.org) +* http://www.msjogren.net/dotnet/ +* +* Description: Defines the native types used to manipulate shell shortcuts. +* +* Public types: enum SLR_FLAGS +* enum SLGP_FLAGS +* struct WIN32_FIND_DATA[A|W] +* interface IPersistFile +* interface IShellLink[A|W] +* class ShellLink +* +* +* Copyright ©2001-2002, Mattias Sjögren +* +**************************************************************************/ + +using System; +using System.Text; +using System.Runtime.InteropServices; + +namespace MediaBrowser.Installer.Code +{ + // IShellLink.Resolve fFlags + [Flags()] + public enum SLR_FLAGS + { + SLR_NO_UI = 0x1, + SLR_ANY_MATCH = 0x2, + SLR_UPDATE = 0x4, + SLR_NOUPDATE = 0x8, + SLR_NOSEARCH = 0x10, + SLR_NOTRACK = 0x20, + SLR_NOLINKINFO = 0x40, + SLR_INVOKE_MSI = 0x80 + } + + // IShellLink.GetPath fFlags + [Flags()] + public enum SLGP_FLAGS + { + SLGP_SHORTPATH = 0x1, + SLGP_UNCPRIORITY = 0x2, + SLGP_RAWPATH = 0x4 + } + + [StructLayoutAttribute(LayoutKind.Sequential, CharSet=CharSet.Ansi)] + public struct WIN32_FIND_DATAA + { + public int dwFileAttributes; + public FILETIME ftCreationTime; + public FILETIME ftLastAccessTime; + public FILETIME ftLastWriteTime; + public int nFileSizeHigh; + public int nFileSizeLow; + public int dwReserved0; + public int dwReserved1; + [MarshalAs(UnmanagedType.ByValTStr, SizeConst=MAX_PATH)] + public string cFileName; + [MarshalAs(UnmanagedType.ByValTStr, SizeConst=14)] + public string cAlternateFileName; + private const int MAX_PATH = 260; + } + + [StructLayoutAttribute(LayoutKind.Sequential, CharSet=CharSet.Unicode)] + public struct WIN32_FIND_DATAW + { + public int dwFileAttributes; + public FILETIME ftCreationTime; + public FILETIME ftLastAccessTime; + public FILETIME ftLastWriteTime; + public int nFileSizeHigh; + public int nFileSizeLow; + public int dwReserved0; + public int dwReserved1; + [MarshalAs(UnmanagedType.ByValTStr, SizeConst=MAX_PATH)] + public string cFileName; + [MarshalAs(UnmanagedType.ByValTStr, SizeConst=14)] + public string cAlternateFileName; + private const int MAX_PATH = 260; + } + + [ + ComImport(), + InterfaceType(ComInterfaceType.InterfaceIsIUnknown), + Guid("0000010B-0000-0000-C000-000000000046") + ] + public interface IPersistFile + { + #region Methods inherited from IPersist + + void GetClassID( + out Guid pClassID); + + #endregion + + [PreserveSig()] + int IsDirty(); + + void Load( + [MarshalAs(UnmanagedType.LPWStr)] string pszFileName, + int dwMode); + + void Save( + [MarshalAs(UnmanagedType.LPWStr)] string pszFileName, + [MarshalAs(UnmanagedType.Bool)] bool fRemember); + + void SaveCompleted( + [MarshalAs(UnmanagedType.LPWStr)] string pszFileName); + + void GetCurFile( + out IntPtr ppszFileName); + + } + + [ + ComImport(), + InterfaceType(ComInterfaceType.InterfaceIsIUnknown), + Guid("000214EE-0000-0000-C000-000000000046") + ] + public interface IShellLinkA + { + void GetPath( + [Out(), MarshalAs(UnmanagedType.LPStr)] StringBuilder pszFile, + int cchMaxPath, + out WIN32_FIND_DATAA pfd, + SLGP_FLAGS fFlags); + + void GetIDList( + out IntPtr ppidl); + + void SetIDList( + IntPtr pidl); + + void GetDescription( + [Out(), MarshalAs(UnmanagedType.LPStr)] StringBuilder pszName, + int cchMaxName); + + void SetDescription( + [MarshalAs(UnmanagedType.LPStr)] string pszName); + + void GetWorkingDirectory( + [Out(), MarshalAs(UnmanagedType.LPStr)] StringBuilder pszDir, + int cchMaxPath); + + void SetWorkingDirectory( + [MarshalAs(UnmanagedType.LPStr)] string pszDir); + + void GetArguments( + [Out(), MarshalAs(UnmanagedType.LPStr)] StringBuilder pszArgs, + int cchMaxPath); + + void SetArguments( + [MarshalAs(UnmanagedType.LPStr)] string pszArgs); + + void GetHotkey( + out short pwHotkey); + + void SetHotkey( + short wHotkey); + + void GetShowCmd( + out int piShowCmd); + + void SetShowCmd( + int iShowCmd); + + void GetIconLocation( + [Out(), MarshalAs(UnmanagedType.LPStr)] StringBuilder pszIconPath, + int cchIconPath, + out int piIcon); + + void SetIconLocation( + [MarshalAs(UnmanagedType.LPStr)] string pszIconPath, + int iIcon); + + void SetRelativePath( + [MarshalAs(UnmanagedType.LPStr)] string pszPathRel, + int dwReserved); + + void Resolve( + IntPtr hwnd, + SLR_FLAGS fFlags); + + void SetPath( + [MarshalAs(UnmanagedType.LPStr)] string pszFile); + + } + + [ + ComImport(), + InterfaceType(ComInterfaceType.InterfaceIsIUnknown), + Guid("000214F9-0000-0000-C000-000000000046") + ] + public interface IShellLinkW + { + void GetPath( + [Out(), MarshalAs(UnmanagedType.LPWStr)] StringBuilder pszFile, + int cchMaxPath, + out WIN32_FIND_DATAW pfd, + SLGP_FLAGS fFlags); + + void GetIDList( + out IntPtr ppidl); + + void SetIDList( + IntPtr pidl); + + void GetDescription( + [Out(), MarshalAs(UnmanagedType.LPWStr)] StringBuilder pszName, + int cchMaxName); + + void SetDescription( + [MarshalAs(UnmanagedType.LPWStr)] string pszName); + + void GetWorkingDirectory( + [Out(), MarshalAs(UnmanagedType.LPWStr)] StringBuilder pszDir, + int cchMaxPath); + + void SetWorkingDirectory( + [MarshalAs(UnmanagedType.LPWStr)] string pszDir); + + void GetArguments( + [Out(), MarshalAs(UnmanagedType.LPWStr)] StringBuilder pszArgs, + int cchMaxPath); + + void SetArguments( + [MarshalAs(UnmanagedType.LPWStr)] string pszArgs); + + void GetHotkey( + out short pwHotkey); + + void SetHotkey( + short wHotkey); + + void GetShowCmd( + out int piShowCmd); + + void SetShowCmd( + int iShowCmd); + + void GetIconLocation( + [Out(), MarshalAs(UnmanagedType.LPWStr)] StringBuilder pszIconPath, + int cchIconPath, + out int piIcon); + + void SetIconLocation( + [MarshalAs(UnmanagedType.LPWStr)] string pszIconPath, + int iIcon); + + void SetRelativePath( + [MarshalAs(UnmanagedType.LPWStr)] string pszPathRel, + int dwReserved); + + void Resolve( + IntPtr hwnd, + SLR_FLAGS fFlags); + + void SetPath( + [MarshalAs(UnmanagedType.LPWStr)] string pszFile); + + } + + + [ + ComImport(), + Guid("00021401-0000-0000-C000-000000000046") + ] + public class ShellLink // : IPersistFile, IShellLinkA, IShellLinkW + { + } + +} diff --git a/MediaBrowser.Installer/Code/ShellShortcut.cs b/MediaBrowser.Installer/Code/ShellShortcut.cs new file mode 100644 index 0000000000..33b60732c3 --- /dev/null +++ b/MediaBrowser.Installer/Code/ShellShortcut.cs @@ -0,0 +1,348 @@ +/************************************************************************** +* +* Filename: ShellShortcut.cs +* Author: Mattias Sjögren (mattias@mvps.org) +* http://www.msjogren.net/dotnet/ +* +* Description: Defines a .NET friendly class, ShellShortcut, for reading +* and writing shortcuts. +* Define the conditional compilation symbol UNICODE to use +* IShellLinkW internally. +* +* Public types: class ShellShortcut +* +* +* Dependencies: ShellLinkNative.cs +* +* +* Copyright ©2001-2002, Mattias Sjögren +* +**************************************************************************/ + +using System; +using System.Diagnostics; +using System.Drawing; +using System.IO; +using System.Runtime.InteropServices; +using System.Text; +using System.Windows.Forms; + + +namespace MediaBrowser.Installer.Code +{ + /// + /// .NET friendly wrapper for the ShellLink class + /// + public class ShellShortcut : IDisposable + { + private const int INFOTIPSIZE = 1024; + private const int MAX_PATH = 260; + + private const int SW_SHOWNORMAL = 1; + private const int SW_SHOWMINIMIZED = 2; + private const int SW_SHOWMAXIMIZED = 3; + private const int SW_SHOWMINNOACTIVE = 7; + + + #if UNICODE + private IShellLinkW m_Link; + #else + private IShellLinkA m_Link; + #endif + private string m_sPath; + + /// + /// + /// Path to new or existing shortcut file (.lnk). + /// + /// + public ShellShortcut(string linkPath) + { + IPersistFile pf; + + m_sPath = linkPath; + + #if UNICODE + m_Link = (IShellLinkW) new ShellLink(); + #else + m_Link = (IShellLinkA) new ShellLink(); + #endif + + if ( File.Exists( linkPath ) ) { + pf = (IPersistFile)m_Link; + pf.Load( linkPath, 0 ); + } + + } + + // + // IDisplosable implementation + // + public void Dispose() + { + if ( m_Link != null ) { + Marshal.ReleaseComObject( m_Link ); + m_Link = null; + } + } + + /// + /// Gets or sets the argument list of the shortcut. + /// + public string Arguments + { + get + { + StringBuilder sb = new StringBuilder( INFOTIPSIZE ); + m_Link.GetArguments( sb, sb.Capacity ); + return sb.ToString(); + } + set { m_Link.SetArguments( value ); } + } + + /// + /// Gets or sets a description of the shortcut. + /// + public string Description + { + get + { + StringBuilder sb = new StringBuilder( INFOTIPSIZE ); + m_Link.GetDescription( sb, sb.Capacity ); + return sb.ToString(); + } + set { m_Link.SetDescription( value ); } + } + + /// + /// Gets or sets the working directory (aka start in directory) of the shortcut. + /// + public string WorkingDirectory + { + get + { + StringBuilder sb = new StringBuilder( MAX_PATH ); + m_Link.GetWorkingDirectory( sb, sb.Capacity ); + return sb.ToString(); + } + set { m_Link.SetWorkingDirectory( value ); } + } + + // + // If Path returns an empty string, the shortcut is associated with + // a PIDL instead, which can be retrieved with IShellLink.GetIDList(). + // This is beyond the scope of this wrapper class. + // + /// + /// Gets or sets the target path of the shortcut. + /// + public string Path + { + get + { + #if UNICODE + WIN32_FIND_DATAW wfd = new WIN32_FIND_DATAW(); + #else + WIN32_FIND_DATAA wfd = new WIN32_FIND_DATAA(); + #endif + StringBuilder sb = new StringBuilder( MAX_PATH ); + + m_Link.GetPath( sb, sb.Capacity, out wfd, SLGP_FLAGS.SLGP_UNCPRIORITY ); + return sb.ToString(); + } + set { m_Link.SetPath( value ); } + } + + /// + /// Gets or sets the path of the assigned to the shortcut. + /// + /// + /// + /// + public string IconPath + { + get + { + StringBuilder sb = new StringBuilder( MAX_PATH ); + int nIconIdx; + m_Link.GetIconLocation( sb, sb.Capacity, out nIconIdx ); + return sb.ToString(); + } + set { m_Link.SetIconLocation( value, IconIndex ); } + } + + /// + /// Gets or sets the index of the assigned to the shortcut. + /// Set to zero when the property specifies a .ICO file. + /// + /// + /// + /// + public int IconIndex + { + get + { + StringBuilder sb = new StringBuilder( MAX_PATH ); + int nIconIdx; + m_Link.GetIconLocation( sb, sb.Capacity, out nIconIdx ); + return nIconIdx; + } + set { m_Link.SetIconLocation( IconPath, value ); } + } + + /// + /// Retrieves the Icon of the shortcut as it will appear in Explorer. + /// Use the and + /// properties to change it. + /// + public Icon Icon + { + get + { + StringBuilder sb = new StringBuilder( MAX_PATH ); + int nIconIdx; + IntPtr hIcon, hInst; + Icon ico, clone; + + + m_Link.GetIconLocation( sb, sb.Capacity, out nIconIdx ); + hInst = Marshal.GetHINSTANCE( this.GetType().Module ); + hIcon = Native.ExtractIcon( hInst, sb.ToString(), nIconIdx ); + if ( hIcon == IntPtr.Zero ) + return null; + + // Return a cloned Icon, because we have to free the original ourselves. + ico = Icon.FromHandle( hIcon ); + clone = (Icon)ico.Clone(); + ico.Dispose(); + Native.DestroyIcon( hIcon ); + return clone; + } + } + + /// + /// Gets or sets the System.Diagnostics.ProcessWindowStyle value + /// that decides the initial show state of the shortcut target. Note that + /// ProcessWindowStyle.Hidden is not a valid property value. + /// + public ProcessWindowStyle WindowStyle + { + get + { + int nWS; + m_Link.GetShowCmd( out nWS ); + + switch ( nWS ) { + case SW_SHOWMINIMIZED: + case SW_SHOWMINNOACTIVE: + return ProcessWindowStyle.Minimized; + + case SW_SHOWMAXIMIZED: + return ProcessWindowStyle.Maximized; + + default: + return ProcessWindowStyle.Normal; + } + } + set + { + int nWS; + + switch ( value ) { + case ProcessWindowStyle.Normal: + nWS = SW_SHOWNORMAL; + break; + + case ProcessWindowStyle.Minimized: + nWS = SW_SHOWMINNOACTIVE; + break; + + case ProcessWindowStyle.Maximized: + nWS = SW_SHOWMAXIMIZED; + break; + + default: // ProcessWindowStyle.Hidden + throw new ArgumentException("Unsupported ProcessWindowStyle value."); + } + + m_Link.SetShowCmd( nWS ); + + } + } + + /// + /// Gets or sets the hotkey for the shortcut. + /// + public Keys Hotkey + { + get + { + short wHotkey; + int dwHotkey; + + m_Link.GetHotkey( out wHotkey ); + + // + // Convert from IShellLink 16-bit format to Keys enumeration 32-bit value + // IShellLink: 0xMMVK + // Keys: 0x00MM00VK + // MM = Modifier (Alt, Control, Shift) + // VK = Virtual key code + // + dwHotkey = ((wHotkey & 0xFF00) << 8) | (wHotkey & 0xFF); + return (Keys) dwHotkey; + } + set + { + short wHotkey; + + if ( (value & Keys.Modifiers) == 0 ) + throw new ArgumentException("Hotkey must include a modifier key."); + + // + // Convert from Keys enumeration 32-bit value to IShellLink 16-bit format + // IShellLink: 0xMMVK + // Keys: 0x00MM00VK + // MM = Modifier (Alt, Control, Shift) + // VK = Virtual key code + // + wHotkey = unchecked((short) ( ((int) (value & Keys.Modifiers) >> 8) | (int) (value & Keys.KeyCode) )); + m_Link.SetHotkey( wHotkey ); + + } + } + + /// + /// Saves the shortcut to disk. + /// + public void Save() + { + IPersistFile pf = (IPersistFile) m_Link; + pf.Save( m_sPath, true ); + } + + /// + /// Returns a reference to the internal ShellLink object, + /// which can be used to perform more advanced operations + /// not supported by this wrapper class, by using the + /// IShellLink interface directly. + /// + public object ShellLink + { + get { return m_Link; } + } + + + #region Native Win32 API functions + private class Native + { + [DllImport("shell32.dll", CharSet=CharSet.Auto)] + public static extern IntPtr ExtractIcon(IntPtr hInst, string lpszExeFileName, int nIconIndex); + + [DllImport("user32.dll")] + public static extern bool DestroyIcon(IntPtr hIcon); + } + #endregion + + } +} diff --git a/MediaBrowser.Installer/MainWindow.xaml.cs b/MediaBrowser.Installer/MainWindow.xaml.cs index 01e15dfd8c..8465c6e2c7 100644 --- a/MediaBrowser.Installer/MainWindow.xaml.cs +++ b/MediaBrowser.Installer/MainWindow.xaml.cs @@ -10,7 +10,6 @@ using System.Linq; using Ionic.Zip; using MediaBrowser.Installer.Code; using ServiceStack.Text; -using IWshRuntimeLibrary; namespace MediaBrowser.Installer { @@ -124,7 +123,7 @@ namespace MediaBrowser.Installer var fullPath = Path.Combine(RootPath, "System", TargetExe); try { - CreateShortcut(fullPath); + CreateShortcuts(fullPath); } catch (Exception e) { @@ -225,21 +224,24 @@ namespace MediaBrowser.Installer /// Only do current user to avoid need for admin elevation /// /// - protected void CreateShortcut(string targetExe) + protected void CreateShortcuts(string targetExe) { // get path to all users start menu - var shell = new WshShell(); - var startMenu = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.StartMenu),"Media Browser"); + var startMenu = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.StartMenu),"Media Browser 3"); if (!Directory.Exists(startMenu)) Directory.CreateDirectory(startMenu); - var product = (IWshShortcut)shell.CreateShortcut(Path.Combine(startMenu, FriendlyName+".lnk")); - product.TargetPath = targetExe; - product.Description = "Run " + FriendlyName; + var product = new ShellShortcut(Path.Combine(startMenu, FriendlyName+".lnk")) {Path = targetExe, Description = "Run " + FriendlyName}; product.Save(); - var uninstall = (IWshShortcut)shell.CreateShortcut(Path.Combine(startMenu, "Uninstall " + FriendlyName + ".lnk")); - uninstall.TargetPath = Path.Combine(Path.GetDirectoryName(targetExe),"MediaBrowser.Uninstaller.exe"); - uninstall.Arguments = (PackageName == "MBServer" ? "server" : "mbt"); - uninstall.Description = "Uninstall " + FriendlyName; + if (PackageName == "MBServer") + { + var path = Path.Combine(startMenu, "MB Dashboard.lnk"); + var dashboard = new ShellShortcut(path) + {Path = @"http://localhost:8096/mediabrowser/dashboard/dashboard.html", Description = "Open the Media Browser Server Dashboard (configuration)"}; + dashboard.Save(); + + } + var uninstall = new ShellShortcut(Path.Combine(startMenu, "Uninstall " + FriendlyName + ".lnk")) + {Path = Path.Combine(Path.GetDirectoryName(targetExe), "MediaBrowser.Uninstaller.exe"), Arguments = (PackageName == "MBServer" ? "server" : "mbt"), Description = "Uninstall " + FriendlyName}; uninstall.Save(); } diff --git a/MediaBrowser.Installer/MediaBrowser.Installer.csproj b/MediaBrowser.Installer/MediaBrowser.Installer.csproj index 30267e76ec..075bbdc5ba 100644 --- a/MediaBrowser.Installer/MediaBrowser.Installer.csproj +++ b/MediaBrowser.Installer/MediaBrowser.Installer.csproj @@ -29,7 +29,7 @@ Media Browser Team Media Browser false - 14 + 15 0.1.1.%2a false true @@ -85,7 +85,9 @@ + + @@ -126,6 +128,8 @@ + + MainWindow.xaml Code @@ -149,7 +153,9 @@ ResXFileCodeGenerator Resources.Designer.cs - + + Designer + @@ -159,7 +165,9 @@ - + + Designer + @@ -190,17 +198,6 @@ - - - {F935DC20-1CF0-11D0-ADB9-00C04FD58A0B} - 1 - 0 - 0 - tlbimp - False - True - - diff --git a/MediaBrowser.Uninstaller.Execute/MainWindow.xaml b/MediaBrowser.Uninstaller.Execute/MainWindow.xaml index d2a093ec42..c1466f9a49 100644 --- a/MediaBrowser.Uninstaller.Execute/MainWindow.xaml +++ b/MediaBrowser.Uninstaller.Execute/MainWindow.xaml @@ -7,10 +7,13 @@