From fa896b7c3914458494acbe61cc1c6b245ac8248c Mon Sep 17 00:00:00 2001 From: Gustave Monce Date: Wed, 25 Dec 2019 13:41:06 +0100 Subject: [PATCH] Fixing Sahara issues & .NET Framework project files --- App.xaml.cs | 2 + FilePickerControl.xaml.cs | 45 +- Models/QualcommSahara.cs | 4 +- Properties/AssemblyInfo.cs | 4 +- Properties/Resources.Designer.cs | 4 +- Properties/Settings.Designer.cs | 4 +- ViewModels/LumiaV2UnlockBootViewModel.cs | 24 + ViewModels/PhoneNotifierViewModel.cs | 1 + Views/About.xaml | 2 +- WPinternals.Core.csproj | 3 +- WPinternals.csproj | 1283 ++++++++++++++++++++++ WPinternals.csproj.user | 117 ++ WPinternals.sln | 89 ++ app.config | 12 + packages.config | 4 + 15 files changed, 1587 insertions(+), 11 deletions(-) create mode 100644 WPinternals.csproj create mode 100644 WPinternals.csproj.user create mode 100644 app.config create mode 100644 packages.config diff --git a/App.xaml.cs b/App.xaml.cs index 31ff73b..eb6f4d7 100644 --- a/App.xaml.cs +++ b/App.xaml.cs @@ -45,7 +45,9 @@ namespace WPinternals { AppDomain.CurrentDomain.UnhandledException += CurrentDomain_UnhandledException; +#if NETCORE System.Text.Encoding.RegisterProvider(System.Text.CodePagesEncodingProvider.Instance); +#endif if (Environment.GetCommandLineArgs().Count() > 1) CommandLine.OpenConsole(); diff --git a/FilePickerControl.xaml.cs b/FilePickerControl.xaml.cs index 334b177..de68fd5 100644 --- a/FilePickerControl.xaml.cs +++ b/FilePickerControl.xaml.cs @@ -149,6 +149,7 @@ namespace WPinternals { var resultSize = new Size(availableSize.Width, 0); +#if NETCORE FormattedText formatted = new FormattedText( "TEST", CultureInfo.CurrentCulture, @@ -158,6 +159,16 @@ namespace WPinternals Foreground, 100 / 96 ); +#else + FormattedText formatted = new FormattedText( + "TEST", + CultureInfo.CurrentCulture, + FlowDirection.LeftToRight, + new Typeface(PathTextBlock.FontFamily, PathTextBlock.FontStyle, PathTextBlock.FontWeight, PathTextBlock.FontStretch), + FontSize, + Foreground + ); +#endif resultSize.Height = formatted.Height; @@ -170,6 +181,7 @@ namespace WPinternals return; CaptionTextBlock.Text = Caption; +#if NETCORE FormattedText formatted = new FormattedText( CaptionTextBlock.Text, CultureInfo.CurrentCulture, @@ -179,6 +191,16 @@ namespace WPinternals Foreground, 100 / 96 ); +#else + FormattedText formatted = new FormattedText( + CaptionTextBlock.Text, + CultureInfo.CurrentCulture, + FlowDirection.LeftToRight, + new Typeface(CaptionTextBlock.FontFamily, CaptionTextBlock.FontStyle, CaptionTextBlock.FontWeight, CaptionTextBlock.FontStretch), + FontSize, + Foreground + ); +#endif double CaptionWidth = formatted.Width; if (CaptionWidth > 0) CaptionWidth += 10; @@ -199,6 +221,7 @@ namespace WPinternals // Calculate the new ActualWidth // We can't use PathTextBlock.ActualWidth yet, because LayoutUpdated event has not yet been triggered +#if NETCORE formatted = new FormattedText( PathTextBlock.Text, CultureInfo.CurrentCulture, @@ -208,7 +231,16 @@ namespace WPinternals Foreground, 100 / 96 ); - +#else + formatted = new FormattedText( + PathTextBlock.Text, + CultureInfo.CurrentCulture, + FlowDirection.LeftToRight, + new Typeface(PathTextBlock.FontFamily, PathTextBlock.FontStyle, PathTextBlock.FontWeight, PathTextBlock.FontStretch), + FontSize, + Foreground + ); +#endif if (NewWidth < 0) PathTextBlock.Width = 0; else if (formatted.Width > NewWidth) @@ -272,6 +304,7 @@ namespace WPinternals do { +#if NETCORE formatted = new FormattedText( "{0}...\\{1}".FormatWith(directory, filename), CultureInfo.CurrentCulture, @@ -281,6 +314,16 @@ namespace WPinternals Foreground, 100 / 96 ); +#else + formatted = new FormattedText( + "{0}...\\{1}".FormatWith(directory, filename), + CultureInfo.CurrentCulture, + FlowDirection.LeftToRight, + new Typeface(PathTextBlock.FontFamily, PathTextBlock.FontStyle, PathTextBlock.FontWeight, PathTextBlock.FontStretch), + FontSize, + Foreground + ); +#endif widthOK = formatted.Width < MaxWidth; diff --git a/Models/QualcommSahara.cs b/Models/QualcommSahara.cs index e75dca8..889abe1 100644 --- a/Models/QualcommSahara.cs +++ b/Models/QualcommSahara.cs @@ -310,9 +310,9 @@ namespace WPinternals int count = 0; do { + count++; try { - count++; byte[] DoneResponse = Serial.SendCommand(DoneCommand, new byte[] { 0x06, 0x00, 0x00, 0x00 }); Started = true; } @@ -320,7 +320,7 @@ namespace WPinternals { LogFile.Log("Problem while starting programmer. Attempting again.", LogType.FileAndConsole); } - } while (!Started || count < 3); + } while (!Started && count < 3); if (count >= 3 && !Started) { LogFile.Log("Maximum number of attempts to start the programmer exceeded.", LogType.FileAndConsole); diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs index 0ed7563..3664302 100644 --- a/Properties/AssemblyInfo.cs +++ b/Properties/AssemblyInfo.cs @@ -10,7 +10,7 @@ using System.Windows; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] [assembly: AssemblyProduct("WPinternals")] -[assembly: AssemblyCopyright("Copyright © 2018")] +[assembly: AssemblyCopyright("Copyright © 2018-2019")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -49,5 +49,5 @@ using System.Windows; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.8.*")] +[assembly: AssemblyVersion("2.9.*")] // [assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/Properties/Resources.Designer.cs b/Properties/Resources.Designer.cs index 1e8273e..f03dbb4 100644 --- a/Properties/Resources.Designer.cs +++ b/Properties/Resources.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.18449 +// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -19,7 +19,7 @@ namespace WPinternals.Properties { // 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.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { diff --git a/Properties/Settings.Designer.cs b/Properties/Settings.Designer.cs index 063ceab..9c0c94f 100644 --- a/Properties/Settings.Designer.cs +++ b/Properties/Settings.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.18449 +// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -12,7 +12,7 @@ namespace WPinternals.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.5.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); diff --git a/ViewModels/LumiaV2UnlockBootViewModel.cs b/ViewModels/LumiaV2UnlockBootViewModel.cs index 3c57b90..653c4aa 100644 --- a/ViewModels/LumiaV2UnlockBootViewModel.cs +++ b/ViewModels/LumiaV2UnlockBootViewModel.cs @@ -610,6 +610,12 @@ namespace WPinternals { FailedToStartProgrammer = true; } + catch (Exception ex) + { + LogFile.Log("An unexpected error happened", LogType.FileAndConsole); + LogFile.Log(ex.GetType().ToString(), LogType.FileAndConsole); + FailedToStartProgrammer = true; + } } if (ProgrammerPath == null || FailedToStartProgrammer) @@ -627,6 +633,12 @@ namespace WPinternals { Timeout = true; } + catch (Exception ex) + { + LogFile.Log("An unexpected error happened", LogType.FileAndConsole); + LogFile.Log(ex.GetType().ToString(), LogType.FileAndConsole); + FailedToStartProgrammer = true; + } } if (!AutoEmergencyReset || Timeout) { @@ -1287,6 +1299,12 @@ namespace WPinternals { Timeout = true; } + catch (Exception ex) + { + LogFile.Log("An unexpected error happened", LogType.FileAndConsole); + LogFile.Log(ex.GetType().ToString(), LogType.FileAndConsole); + FailedToStartProgrammer = true; + } } if (!AutoEmergencyReset || Timeout) { @@ -1540,6 +1558,12 @@ namespace WPinternals { Timeout = true; } + catch (Exception ex) + { + LogFile.Log("An unexpected error happened", LogType.FileAndConsole); + LogFile.Log(ex.GetType().ToString(), LogType.FileAndConsole); + FailedToStartProgrammer = true; + } } if (!AutoEmergencyReset || Timeout) { diff --git a/ViewModels/PhoneNotifierViewModel.cs b/ViewModels/PhoneNotifierViewModel.cs index bdb3a53..563f8a9 100644 --- a/ViewModels/PhoneNotifierViewModel.cs +++ b/ViewModels/PhoneNotifierViewModel.cs @@ -149,6 +149,7 @@ namespace WPinternals void LumiaNotifier_Arrival(object sender, USBEvent e) { + LogFile.Log("A device arrived: " + e.DevicePath, LogType.FileOnly); try { if ((e.DevicePath.IndexOf("VID_0421&PID_0660&MI_04", StringComparison.OrdinalIgnoreCase) >= 0) || diff --git a/Views/About.xaml b/Views/About.xaml index 672f276..1b2fb46 100644 --- a/Views/About.xaml +++ b/Views/About.xaml @@ -53,7 +53,7 @@ DEALINGS IN THE SOFTWARE. - + www.wpinternals.net diff --git a/WPinternals.Core.csproj b/WPinternals.Core.csproj index 53284b1..f4d8c3a 100644 --- a/WPinternals.Core.csproj +++ b/WPinternals.Core.csproj @@ -32,10 +32,11 @@ - + + diff --git a/WPinternals.csproj b/WPinternals.csproj new file mode 100644 index 0000000..58e5679 --- /dev/null +++ b/WPinternals.csproj @@ -0,0 +1,1283 @@ + + + + + Debug + AnyCPU + {AED6DEB8-F54C-4B41-9655-793E7096AE6E} + WinExe + Properties + WPinternals + WPinternals + v4.5 + 512 + {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + 4 + false + + + publish\ + true + Disk + false + Foreground + 7 + Days + false + false + true + 0 + 1.0.0.%2a + false + true + + + AnyCPU + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + true + false + false + + + AnyCPU + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + true + false + true + Heathcliff74.snk + + + WPinternals.ico + + + WPinternals.App + + + + app.manifest + + + true + bin\Debug-CustomFlash\ + DEBUG;TRACE + true + full + AnyCPU + prompt + MinimumRecommendedRules.ruleset + false + + + true + bin\Debug-CustomFlash-930\ + DEBUG;TRACE + true + full + AnyCPU + prompt + MinimumRecommendedRules.ruleset + true + false + + + true + bin\Debug-Test\ + DEBUG;TRACE + true + full + AnyCPU + prompt + MinimumRecommendedRules.ruleset + false + + + true + bin\Debug-CustomFlash-950 %28no restart%29\ + DEBUG;TRACE + true + full + AnyCPU + prompt + MinimumRecommendedRules.ruleset + true + false + + + true + bin\Debug-ReadGPT\ + DEBUG;TRACE + true + full + AnyCPU + prompt + MinimumRecommendedRules.ruleset + true + false + + + true + bin\Debug-DumpFFU\ + DEBUG;TRACE + true + full + AnyCPU + prompt + MinimumRecommendedRules.ruleset + true + false + + + true + bin\Debug-TestProgrammer-930\ + DEBUG;TRACE + true + full + AnyCPU + prompt + MinimumRecommendedRules.ruleset + true + false + + + true + bin\Debug-FindFlashingProfile\ + DEBUG;TRACE + true + full + AnyCPU + prompt + MinimumRecommendedRules.ruleset + false + + + true + bin\Debug-DisableSecureBoot\ + DEBUG;TRACE + true + full + AnyCPU + prompt + MinimumRecommendedRules.ruleset + false + + + true + bin\Debug-FlashRaw\ + DEBUG;TRACE + true + full + AnyCPU + prompt + MinimumRecommendedRules.ruleset + true + false + + + true + bin\Debug-FindFlashingProfileNoRestart\ + DEBUG;TRACE + true + full + AnyCPU + prompt + MinimumRecommendedRules.ruleset + true + false + + + true + bin\Debug-DisableSecureBoot %28no restart%29\ + DEBUG;TRACE + true + full + AnyCPU + prompt + MinimumRecommendedRules.ruleset + true + false + + + true + bin\Debug-ClearNV\ + DEBUG;TRACE + true + full + AnyCPU + prompt + MinimumRecommendedRules.ruleset + true + false + + + true + bin\Debug-DumpUEFI\ + DEBUG;TRACE + true + full + AnyCPU + prompt + MinimumRecommendedRules.ruleset + true + false + + + true + bin\Debug-MSM\ + DEBUG;TRACE + true + full + AnyCPU + prompt + MinimumRecommendedRules.ruleset + true + false + + + true + bin\Debug-SwitchToMSM\ + DEBUG;TRACE + true + full + AnyCPU + prompt + MinimumRecommendedRules.ruleset + true + false + + + true + bin\Debug-UnlockBootloader\ + DEBUG;TRACE + true + full + AnyCPU + prompt + MinimumRecommendedRules.ruleset + false + + + true + bin\Debug-DLEmergency\ + DEBUG;TRACE + true + full + AnyCPU + prompt + MinimumRecommendedRules.ruleset + false + + + true + bin\Debug-ShowPhoneInfo\ + DEBUG;TRACE + true + full + AnyCPU + prompt + MinimumRecommendedRules.ruleset + false + + + true + bin\Debug-RelockPhone\ + DEBUG;TRACE + true + full + AnyCPU + prompt + MinimumRecommendedRules.ruleset + false + + + true + bin\Debug-EnableRootAccess\ + DEBUG;TRACE + true + full + AnyCPU + prompt + MinimumRecommendedRules.ruleset + false + + + bin\Debug-TestProgrammer-950\ + true + TRACE;DEBUG + true + full + true + false + + + true + bin\Debug-EnableRootAccessOnImage\ + DEBUG;TRACE + true + full + AnyCPU + prompt + MinimumRecommendedRules.ruleset + false + + + true + bin\Debug-FixBoot\ + DEBUG;TRACE + true + full + AnyCPU + prompt + MinimumRecommendedRules.ruleset + false + + + true + bin\Debug-DLFFU\ + DEBUG;TRACE + true + full + AnyCPU + prompt + MinimumRecommendedRules.ruleset + false + + + true + bin\Debug-FlashFFU-RM1085\ + DEBUG;TRACE + true + full + AnyCPU + prompt + MinimumRecommendedRules.ruleset + false + + + bin\Release-Test\ + TRACE + true + true + pdbonly + AnyCPU + prompt + MinimumRecommendedRules.ruleset + false + + + true + bin\Debug-TestProgrammer-630\ + DEBUG;TRACE + true + full + AnyCPU + prompt + MinimumRecommendedRules.ruleset + false + + + true + bin\Debug-DLall\ + DEBUG;TRACE + true + full + AnyCPU + prompt + MinimumRecommendedRules.ruleset + false + + + true + bin\Debug-AddEmergency\ + DEBUG;TRACE + true + full + AnyCPU + prompt + MinimumRecommendedRules.ruleset + false + + + true + bin\Debug-TestProgrammer-640\ + DEBUG;TRACE + true + full + AnyCPU + prompt + MinimumRecommendedRules.ruleset + false + + + true + bin\Debug-FlashCustomRom-640\ + DEBUG;TRACE + true + full + AnyCPU + prompt + MinimumRecommendedRules.ruleset + false + + + true + bin\Debug-TestProgrammer-550\ + DEBUG;TRACE + true + full + AnyCPU + prompt + MinimumRecommendedRules.ruleset + false + + + true + bin\Debug-TestProgrammer-650\ + DEBUG;TRACE + true + full + AnyCPU + prompt + MinimumRecommendedRules.ruleset + false + + + true + bin\Debug-FlashFFU-RM1073\ + DEBUG;TRACE + true + full + AnyCPU + prompt + MinimumRecommendedRules.ruleset + false + + + true + bin\Debug-Help\ + DEBUG;TRACE + true + full + AnyCPU + prompt + MinimumRecommendedRules.ruleset + false + + + bin\Release\ + TRACE;PREVIEW + true + true + pdbonly + AnyCPU + prompt + MinimumRecommendedRules.ruleset + true + + + true + bin\Debug-ShowFFU\ + DEBUG;TRACE + true + full + AnyCPU + prompt + MinimumRecommendedRules.ruleset + true + false + + + true + bin\Debug-BackupGPT\ + DEBUG;TRACE + true + full + AnyCPU + prompt + MinimumRecommendedRules.ruleset + false + + + true + bin\Debug-RestoreGPT\ + DEBUG;TRACE + true + full + AnyCPU + prompt + MinimumRecommendedRules.ruleset + false + + + true + bin\Debug-MergeGptXmlXml\ + DEBUG;TRACE + true + full + AnyCPU + prompt + MinimumRecommendedRules.ruleset + false + + + true + bin\Debug-MergeGptXmlZip\ + DEBUG;TRACE + true + full + AnyCPU + prompt + MinimumRecommendedRules.ruleset + false + + + bin\Preview-Test\ + TRACE;PREVIEW + true + true + pdbonly + x64 + prompt + MinimumRecommendedRules.ruleset + true + false + + + Heathcliff74.snk + + + + False + packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll + + + + + + + + + + + + + + + + 4.0 + + + + + + + + MSBuild:Compile + Designer + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + FilePickerControl.xaml + + + + + + + + + + + + + Code + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + About.xaml + + + + + BackupView.xaml + + + BootRestoreResourcesView.xaml + + + ContextView.xaml + + + DisclaimerAndNdaView.xaml + + + RegistrationView.xaml + + + DisclaimerView.xaml + + + DumpRomView.xaml + + + Empty.xaml + + + + + FlashResourcesView.xaml + + + FlashRomView.xaml + + + GettingStartedView.xaml + + + LumiaDownloadView.xaml + + + LumiaUndoRootTargetSelectionView.xaml + + + LumiaUnlockRootTargetSelectionView.xaml + + + MessageView.xaml + + + NokiaFlashView.xaml + + + NokiaLabelView.xaml + + + + NokiaMassStorageView.xaml + + + NokiaModeFlashView.xaml + + + + NokiaModeLabelView.xaml + + + + NokiaModeMassStorageView.xaml + + + + NokiaModeNormalView.xaml + + + + NokiaNormalView.xaml + + + + NotImplementedView.xaml + + + + BusyView.xaml + + + RestoreView.xaml + + + StartupWindow.xaml + + + + + + + + + + + + + + + + + + + + + + + + MSBuild:Compile + Designer + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + MSBuild:Compile + Designer + + + App.xaml + Code + + + MainWindow.xaml + Code + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + + + + Code + + + True + True + Resources.resx + + + True + Settings.settings + True + + + ResXFileCodeGenerator + Resources.Designer.cs + + + + Designer + + + + + + SettingsSingleFileGenerator + Settings.Designer.cs + + + + + + + + + + + + + + + False + Microsoft .NET Framework 4.5 %28x86 and x64%29 + true + + + False + .NET Framework 3.5 SP1 Client Profile + false + + + False + .NET Framework 3.5 SP1 + false + + + + + + + + + + + + + + Designer + + + + + + "C:\Program Files\PsTools\pskill.exe" XDesProc.exe 2>nul 1>nul + EXIT 0 + + + + \ No newline at end of file diff --git a/WPinternals.csproj.user b/WPinternals.csproj.user new file mode 100644 index 0000000..c130c5b --- /dev/null +++ b/WPinternals.csproj.user @@ -0,0 +1,117 @@ + + + + ProjectFiles + publish\ + + + + + + en-US + false + + + -test + + + -ReadGPT + + + -DumpFFU "C:\ProgramData\WPinternals\Repository\RM-1085\RM1085_1078.0038.10586.13080.12547.033139_retail_prod_signed.ffu" "C:\ProgramData\WPinternals\Repository\RM-1085" "mainos" + + + -TestProgrammer "C:\ProgramData\WPInternals\Repository\RM-1045\MPRG8974_fh.ede" + + + -FindFlashingProfile + + + -EnableTestSigning + + + -FindFlashingProfileNoRestart + + + -EnableTestSigningNoRestart + + + -ClearNV + + + -DumpUEFI "C:\ProgramData\WPinternals\Repository\RM-1085\UEFI.bin" "C:\ProgramData\WPinternals\Repository\RM-1085\UEFI" + + + -SwitchToMassStorageMode + + + -test + + + Project + -UnlockBootloader + + + -DownloadEmergencyByProductType RM-1085 + + + -ShowPhoneInfo + + + -RelockPhone + + + -EnableRootAccess + + + -TestProgrammer "C:\ProgramData\WPInternals\Repository\RM-1085\MPRG8994_fh.ede" + + + -FixBootAfterUnlockingBootloader + + + -downloadffubyproductcode 059R016 + + + -FlashFFU "C:\ProgramData\WPinternals\Repository\RM-1085\RM1085_1078.0038.10586.13080.12547.033139_retail_prod_signed.ffu" + + + -Test + + + -TestProgrammer "C:\ProgramData\WPInternals\Repository\RM-976\MPRG8x26_fh.ede" + + + -DownloadAll C:\Temp + + + -AddEmergency RM-1085 "C:\ProgramData\WPinternals\Repository\RM-1085\MPRG8994_fh.ede" "C:\ProgramData\WPinternals\Repository\RM-1085\RM1085_fh.edp" + + + -TestProgrammer "C:\ProgramData\WPInternals\Repository\RM-1073\MPRG8x26_fh.ede" + + + -TestProgrammer "C:\ProgramData\WPInternals\Repository\RM-1127\MPRG8909_fh.ede" + + + -TestProgrammer "C:\ProgramData\WPInternals\Repository\RM-1152\MPRG8909_fh.ede" + + + -%3f + + + -ShowFFU "C:\ProgramData\WPInternals\Repository\RM-1152\RM1152_1078.0042.10586.13333.15672.0352EF_retail_prod_signed.ffu" + + + /BackupGPT "C:\Temp\Partitions.xml" + + + -MergeGPT "C:\Temp\Partitions.xml" "C:\Temp\MergePartitions.xml" + + + -MergeGPT "C:\Temp\OriginalGPT.xml" "C:\Temp\TestROM.zip" + + + /Test + + \ No newline at end of file diff --git a/WPinternals.sln b/WPinternals.sln index 7269661..a21f15d 100644 --- a/WPinternals.sln +++ b/WPinternals.sln @@ -3,6 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.29123.89 MinimumVisualStudioVersion = 10.0.40219.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WPinternals", "WPinternals.csproj", "{AED6DEB8-F54C-4B41-9655-793E7096AE6E}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WPinternals.Core", "WPinternals.Core.csproj", "{AED6DEB8-F54C-4B41-9655-793E7096AE6F}" EndProject Global @@ -141,6 +142,94 @@ Global {AED6DEB8-F54C-4B41-9655-793E7096AE6F}.Release|Any CPU.Build.0 = Release|Any CPU {AED6DEB8-F54C-4B41-9655-793E7096AE6F}.Release-Test|Any CPU.ActiveCfg = Release|Any CPU {AED6DEB8-F54C-4B41-9655-793E7096AE6F}.Release-Test|Any CPU.Build.0 = Release|Any CPU + {AED6DEB8-F54C-4B41-9655-793E7096AE6E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {AED6DEB8-F54C-4B41-9655-793E7096AE6E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {AED6DEB8-F54C-4B41-9655-793E7096AE6E}.Debug-AddEmergency|Any CPU.ActiveCfg = Debug|Any CPU + {AED6DEB8-F54C-4B41-9655-793E7096AE6E}.Debug-AddEmergency|Any CPU.Build.0 = Debug|Any CPU + {AED6DEB8-F54C-4B41-9655-793E7096AE6E}.Debug-BackupGPT|Any CPU.ActiveCfg = Debug|Any CPU + {AED6DEB8-F54C-4B41-9655-793E7096AE6E}.Debug-BackupGPT|Any CPU.Build.0 = Debug|Any CPU + {AED6DEB8-F54C-4B41-9655-793E7096AE6E}.Debug-ClearNV|Any CPU.ActiveCfg = Debug|Any CPU + {AED6DEB8-F54C-4B41-9655-793E7096AE6E}.Debug-ClearNV|Any CPU.Build.0 = Debug|Any CPU + {AED6DEB8-F54C-4B41-9655-793E7096AE6E}.Debug-CustomFlash-930|Any CPU.ActiveCfg = Debug|Any CPU + {AED6DEB8-F54C-4B41-9655-793E7096AE6E}.Debug-CustomFlash-930|Any CPU.Build.0 = Debug|Any CPU + {AED6DEB8-F54C-4B41-9655-793E7096AE6E}.Debug-CustomFlash-950 (no restart)|Any CPU.ActiveCfg = Debug|Any CPU + {AED6DEB8-F54C-4B41-9655-793E7096AE6E}.Debug-CustomFlash-950 (no restart)|Any CPU.Build.0 = Debug|Any CPU + {AED6DEB8-F54C-4B41-9655-793E7096AE6E}.Debug-CustomFlash-950|Any CPU.ActiveCfg = Debug|Any CPU + {AED6DEB8-F54C-4B41-9655-793E7096AE6E}.Debug-CustomFlash-950|Any CPU.Build.0 = Debug|Any CPU + {AED6DEB8-F54C-4B41-9655-793E7096AE6E}.Debug-DLall|Any CPU.ActiveCfg = Debug|Any CPU + {AED6DEB8-F54C-4B41-9655-793E7096AE6E}.Debug-DLall|Any CPU.Build.0 = Debug|Any CPU + {AED6DEB8-F54C-4B41-9655-793E7096AE6E}.Debug-DLEmergency|Any CPU.ActiveCfg = Debug|Any CPU + {AED6DEB8-F54C-4B41-9655-793E7096AE6E}.Debug-DLEmergency|Any CPU.Build.0 = Debug|Any CPU + {AED6DEB8-F54C-4B41-9655-793E7096AE6E}.Debug-DLFFU|Any CPU.ActiveCfg = Debug|Any CPU + {AED6DEB8-F54C-4B41-9655-793E7096AE6E}.Debug-DLFFU|Any CPU.Build.0 = Debug|Any CPU + {AED6DEB8-F54C-4B41-9655-793E7096AE6E}.Debug-DumpFFU|Any CPU.ActiveCfg = Debug|Any CPU + {AED6DEB8-F54C-4B41-9655-793E7096AE6E}.Debug-DumpFFU|Any CPU.Build.0 = Debug|Any CPU + {AED6DEB8-F54C-4B41-9655-793E7096AE6E}.Debug-DumpUEFI|Any CPU.ActiveCfg = Debug|Any CPU + {AED6DEB8-F54C-4B41-9655-793E7096AE6E}.Debug-DumpUEFI|Any CPU.Build.0 = Debug|Any CPU + {AED6DEB8-F54C-4B41-9655-793E7096AE6E}.Debug-EnableRootAccess|Any CPU.ActiveCfg = Debug|Any CPU + {AED6DEB8-F54C-4B41-9655-793E7096AE6E}.Debug-EnableRootAccess|Any CPU.Build.0 = Debug|Any CPU + {AED6DEB8-F54C-4B41-9655-793E7096AE6E}.Debug-EnableRootAccessOnImage|Any CPU.ActiveCfg = Debug|Any CPU + {AED6DEB8-F54C-4B41-9655-793E7096AE6E}.Debug-EnableRootAccessOnImage|Any CPU.Build.0 = Debug|Any CPU + {AED6DEB8-F54C-4B41-9655-793E7096AE6E}.Debug-EnableTestSigning (no restart)|Any CPU.ActiveCfg = Debug|Any CPU + {AED6DEB8-F54C-4B41-9655-793E7096AE6E}.Debug-EnableTestSigning (no restart)|Any CPU.Build.0 = Debug|Any CPU + {AED6DEB8-F54C-4B41-9655-793E7096AE6E}.Debug-EnableTestSigning|Any CPU.ActiveCfg = Debug|Any CPU + {AED6DEB8-F54C-4B41-9655-793E7096AE6E}.Debug-EnableTestSigning|Any CPU.Build.0 = Debug|Any CPU + {AED6DEB8-F54C-4B41-9655-793E7096AE6E}.Debug-FindFlashingProfile|Any CPU.ActiveCfg = Debug|Any CPU + {AED6DEB8-F54C-4B41-9655-793E7096AE6E}.Debug-FindFlashingProfile|Any CPU.Build.0 = Debug|Any CPU + {AED6DEB8-F54C-4B41-9655-793E7096AE6E}.Debug-FindFlashingProfileNoRestart|Any CPU.ActiveCfg = Debug|Any CPU + {AED6DEB8-F54C-4B41-9655-793E7096AE6E}.Debug-FindFlashingProfileNoRestart|Any CPU.Build.0 = Debug|Any CPU + {AED6DEB8-F54C-4B41-9655-793E7096AE6E}.Debug-FixBoot|Any CPU.ActiveCfg = Debug|Any CPU + {AED6DEB8-F54C-4B41-9655-793E7096AE6E}.Debug-FixBoot|Any CPU.Build.0 = Debug|Any CPU + {AED6DEB8-F54C-4B41-9655-793E7096AE6E}.Debug-FlashCustomRom-640|Any CPU.ActiveCfg = Debug|Any CPU + {AED6DEB8-F54C-4B41-9655-793E7096AE6E}.Debug-FlashCustomRom-640|Any CPU.Build.0 = Debug|Any CPU + {AED6DEB8-F54C-4B41-9655-793E7096AE6E}.Debug-FlashFFU-RM1073|Any CPU.ActiveCfg = Debug|Any CPU + {AED6DEB8-F54C-4B41-9655-793E7096AE6E}.Debug-FlashFFU-RM1073|Any CPU.Build.0 = Debug|Any CPU + {AED6DEB8-F54C-4B41-9655-793E7096AE6E}.Debug-FlashFFU-RM1085|Any CPU.ActiveCfg = Debug|Any CPU + {AED6DEB8-F54C-4B41-9655-793E7096AE6E}.Debug-FlashFFU-RM1085|Any CPU.Build.0 = Debug|Any CPU + {AED6DEB8-F54C-4B41-9655-793E7096AE6E}.Debug-FlashRaw|Any CPU.ActiveCfg = Debug|Any CPU + {AED6DEB8-F54C-4B41-9655-793E7096AE6E}.Debug-FlashRaw|Any CPU.Build.0 = Debug|Any CPU + {AED6DEB8-F54C-4B41-9655-793E7096AE6E}.Debug-Help|Any CPU.ActiveCfg = Debug|Any CPU + {AED6DEB8-F54C-4B41-9655-793E7096AE6E}.Debug-Help|Any CPU.Build.0 = Debug|Any CPU + {AED6DEB8-F54C-4B41-9655-793E7096AE6E}.Debug-MergeGptXmlXml|Any CPU.ActiveCfg = Debug|Any CPU + {AED6DEB8-F54C-4B41-9655-793E7096AE6E}.Debug-MergeGptXmlXml|Any CPU.Build.0 = Debug|Any CPU + {AED6DEB8-F54C-4B41-9655-793E7096AE6E}.Debug-MergeGptXmlZip|Any CPU.ActiveCfg = Debug|Any CPU + {AED6DEB8-F54C-4B41-9655-793E7096AE6E}.Debug-MergeGptXmlZip|Any CPU.Build.0 = Debug|Any CPU + {AED6DEB8-F54C-4B41-9655-793E7096AE6E}.Debug-MSM|Any CPU.ActiveCfg = Debug|Any CPU + {AED6DEB8-F54C-4B41-9655-793E7096AE6E}.Debug-MSM|Any CPU.Build.0 = Debug|Any CPU + {AED6DEB8-F54C-4B41-9655-793E7096AE6E}.Debug-ReadGPT|Any CPU.ActiveCfg = Debug|Any CPU + {AED6DEB8-F54C-4B41-9655-793E7096AE6E}.Debug-ReadGPT|Any CPU.Build.0 = Debug|Any CPU + {AED6DEB8-F54C-4B41-9655-793E7096AE6E}.Debug-RelockPhone|Any CPU.ActiveCfg = Debug|Any CPU + {AED6DEB8-F54C-4B41-9655-793E7096AE6E}.Debug-RelockPhone|Any CPU.Build.0 = Debug|Any CPU + {AED6DEB8-F54C-4B41-9655-793E7096AE6E}.Debug-RestoreGPT|Any CPU.ActiveCfg = Debug|Any CPU + {AED6DEB8-F54C-4B41-9655-793E7096AE6E}.Debug-RestoreGPT|Any CPU.Build.0 = Debug|Any CPU + {AED6DEB8-F54C-4B41-9655-793E7096AE6E}.Debug-ShowFFU|Any CPU.ActiveCfg = Debug|Any CPU + {AED6DEB8-F54C-4B41-9655-793E7096AE6E}.Debug-ShowFFU|Any CPU.Build.0 = Debug|Any CPU + {AED6DEB8-F54C-4B41-9655-793E7096AE6E}.Debug-ShowPhoneInfo|Any CPU.ActiveCfg = Debug|Any CPU + {AED6DEB8-F54C-4B41-9655-793E7096AE6E}.Debug-ShowPhoneInfo|Any CPU.Build.0 = Debug|Any CPU + {AED6DEB8-F54C-4B41-9655-793E7096AE6E}.Debug-Test|Any CPU.ActiveCfg = Debug|Any CPU + {AED6DEB8-F54C-4B41-9655-793E7096AE6E}.Debug-Test|Any CPU.Build.0 = Debug|Any CPU + {AED6DEB8-F54C-4B41-9655-793E7096AE6E}.Debug-TestProgrammer-550|Any CPU.ActiveCfg = Debug|Any CPU + {AED6DEB8-F54C-4B41-9655-793E7096AE6E}.Debug-TestProgrammer-550|Any CPU.Build.0 = Debug|Any CPU + {AED6DEB8-F54C-4B41-9655-793E7096AE6E}.Debug-TestProgrammer-630|Any CPU.ActiveCfg = Debug|Any CPU + {AED6DEB8-F54C-4B41-9655-793E7096AE6E}.Debug-TestProgrammer-630|Any CPU.Build.0 = Debug|Any CPU + {AED6DEB8-F54C-4B41-9655-793E7096AE6E}.Debug-TestProgrammer-640|Any CPU.ActiveCfg = Debug|Any CPU + {AED6DEB8-F54C-4B41-9655-793E7096AE6E}.Debug-TestProgrammer-640|Any CPU.Build.0 = Debug|Any CPU + {AED6DEB8-F54C-4B41-9655-793E7096AE6E}.Debug-TestProgrammer-650|Any CPU.ActiveCfg = Debug|Any CPU + {AED6DEB8-F54C-4B41-9655-793E7096AE6E}.Debug-TestProgrammer-650|Any CPU.Build.0 = Debug|Any CPU + {AED6DEB8-F54C-4B41-9655-793E7096AE6E}.Debug-TestProgrammer-930|Any CPU.ActiveCfg = Debug|Any CPU + {AED6DEB8-F54C-4B41-9655-793E7096AE6E}.Debug-TestProgrammer-930|Any CPU.Build.0 = Debug|Any CPU + {AED6DEB8-F54C-4B41-9655-793E7096AE6E}.Debug-TestProgrammer-950|Any CPU.ActiveCfg = Debug|Any CPU + {AED6DEB8-F54C-4B41-9655-793E7096AE6E}.Debug-TestProgrammer-950|Any CPU.Build.0 = Debug|Any CPU + {AED6DEB8-F54C-4B41-9655-793E7096AE6E}.Debug-UnlockBootloader|Any CPU.ActiveCfg = Debug|Any CPU + {AED6DEB8-F54C-4B41-9655-793E7096AE6E}.Debug-UnlockBootloader|Any CPU.Build.0 = Debug|Any CPU + {AED6DEB8-F54C-4B41-9655-793E7096AE6E}.Preview|Any CPU.ActiveCfg = Release|Any CPU + {AED6DEB8-F54C-4B41-9655-793E7096AE6E}.Preview|Any CPU.Build.0 = Release|Any CPU + {AED6DEB8-F54C-4B41-9655-793E7096AE6E}.Preview-Test|Any CPU.ActiveCfg = Release|Any CPU + {AED6DEB8-F54C-4B41-9655-793E7096AE6E}.Preview-Test|Any CPU.Build.0 = Release|Any CPU + {AED6DEB8-F54C-4B41-9655-793E7096AE6E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {AED6DEB8-F54C-4B41-9655-793E7096AE6E}.Release|Any CPU.Build.0 = Release|Any CPU + {AED6DEB8-F54C-4B41-9655-793E7096AE6E}.Release-Test|Any CPU.ActiveCfg = Release|Any CPU + {AED6DEB8-F54C-4B41-9655-793E7096AE6E}.Release-Test|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/app.config b/app.config new file mode 100644 index 0000000..02f5a52 --- /dev/null +++ b/app.config @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/packages.config b/packages.config new file mode 100644 index 0000000..e1fae9c --- /dev/null +++ b/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file