Delete FUNDING.yml

Add additional alternative to RCM injectors list

.gitignore

@@ -0,0 +1,2 @@
+.vs
+Output

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "TegraRcmGUI/tools/src/biskeydump"]
+	path = TegraRcmGUI/tools/src/biskeydump
+	url = https://github.com/eliboa/biskeydump

README.md

@@ -1,8 +1,17 @@
+![Png](https://img.shields.io/badge/platform-windows-lightgrey)
+![Png](https://img.shields.io/badge/latest%20stable%20release-2.6-yellow)
+![GitHub](https://img.shields.io/github/license/eliboa/TegraRcmGUI)
+![GitHub All Releases](https://img.shields.io/github/downloads/eliboa/TegraRcmGUI/total)
+![GitHub repo size](https://img.shields.io/github/repo-size/eliboa/TegraRcmGUI)
+![GitHub issues](https://img.shields.io/github/issues/eliboa/TegraRcmGUI)
+
 # TegraRcmGUI
 C++ GUI for [TegraRcmSmash](https://github.com/rajkosto/TegraRcmSmash) by [rajkosto](https://github.com/rajkosto) (Fusée Gelée exploit for Nintendo Switch)
   
+The RCM exploit only works on "unpatched" units, i.e manufactured before July 2018. To check if your Switch is patched, use https://ismyswitchpatched.com/
+
 ## Features
-- Inject payloads (such as CFW bootloader, Nand/Key Dumper, etc)
+- Inject payloads
 - Manage favorites
 - Run Linux on your switch (ShofEL2)
 - Mount device as USB mass storage (read/write from/to SD card & NAND partitions, hold power button down for 5sec to exit)
@@ -12,7 +21,7 @@ C++ GUI for [TegraRcmSmash](https://github.com/rajkosto/TegraRcmSmash) by [rajko
 - Option - Run app at Windows startup 
 - Install APX device driver (if needed)
 
-![Png](http://tegrarcmgui.gq/TegraRcmGUI_v2.5.png)
+![Png](https://www.eliboa.com/TegraRcmGUI_v2.5.png)
 
 ## Download
 [Latest release](https://github.com/eliboa/TegraRcmGUI/releases/latest) (Windows)
@@ -22,12 +31,25 @@ This UI is **Windows-only**.
 For other platforms, you can use :
 - [Fusée Launcher](https://github.com/Cease-and-DeSwitch/fusee-launcher) (GNU/Linux)
 - [NXBoot](https://mologie.github.io/nxboot/) (OS X, iOS)
+- [JTegraNX](https://github.com/dylwedma11748/JTegraNX) (Windows, OS X, GNU/Linux)
 - [NXLoader](https://github.com/DavidBuchanan314/NXLoader) (Android)
 - [Web Fusée Launcher](https://fusee-gelee.firebaseapp.com/) (Cross-platform, only works with Chrome)
 
 ## Issue / Suggestion
 Please open new [issue](https://github.com/eliboa/TegraRcmGUI/issues) to report a bug or submit a suggestion.   
 
+## Development
+
+Install the [libusbk dev kit](https://sourceforge.net/projects/libusbk/) using the setup program, then create an environment variable `LIBUSBK_DIR` with the installation path as the value.
+
+## How to backup/restore your Nintendo Switch's NAND ?
+
+ 1) Use [memloader](https://github.com/rajkosto/memloader) v3 to mount eMMC on your computer
+ 2) Download and open [NxNandManager](https://github.com/eliboa/NxNandManager). Select "File" then "Open drive".   
+ 3) Select the mounted drive. You can now perform backup/restore operations.   
+
+![Png](https://www.eliboa.com/NxNandManager_v1.1_howto_open_drive.png)   
+
 ## Credits
 - [Rajkosto](https://github.com/rajkosto) / [TegraRcmSmash](https://github.com/rajkosto/TegraRcmSmash) (Fusée Launcher reimplementation for Windows), [memloader](https://github.com/rajkosto/memloader), SD tool, [biskeydump](https://github.com/rajkosto/biskeydump)
 - [Kate Temkin](https://github.com/ktemkin) / [Fusée Launcher](https://github.com/Cease-and-DeSwitch/fusee-launcher)

TegraRcmGUI.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
+# Visual Studio 15
-VisualStudioVersion = 14.0.24720.0
+VisualStudioVersion = 15.0.26228.9
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TegraRcmGUI", "TegraRcmGUI\TegraRcmGUI.vcxproj", "{2C091C5B-378F-44D0-91F2-53489BA7B83C}"
 EndProject

TegraRcmGUI/DialogTab02.cpp

@@ -144,16 +144,16 @@ void DialogTab02::OnBnClickedMountSd()
 	switch (pmyComboBox->GetCurSel())
 	{
 	case 0:
-		_tcscpy(args, TEXT(".\\tools\\memloader\\memloader_usb.bin -r --dataini=.\\tools\\memloader\\ums_boot0.ini"));
+		_tcscpy_s(args, 255, TEXT(".\\tools\\memloader\\memloader_usb.bin -r --dataini=.\\tools\\memloader\\ums_boot0.ini"));
 		break;
 	case 1:
-		_tcscpy(args, TEXT(".\\tools\\memloader\\memloader_usb.bin -r --dataini=.\\tools\\memloader\\ums_boot1.ini"));
+		_tcscpy_s(args, 255, TEXT(".\\tools\\memloader\\memloader_usb.bin -r --dataini=.\\tools\\memloader\\ums_boot1.ini"));
 		break;
 	case 2:
-		_tcscpy(args, TEXT(".\\tools\\memloader\\memloader_usb.bin -r --dataini=.\\tools\\memloader\\ums_emmc.ini"));
+		_tcscpy_s(args, 255, TEXT(".\\tools\\memloader\\memloader_usb.bin -r --dataini=.\\tools\\memloader\\ums_emmc.ini"));
 		break;
 	default:
-		_tcscpy(args, TEXT(".\\tools\\memloader\\memloader_usb.bin -r --dataini=.\\tools\\memloader\\ums_sd.ini"));
+		_tcscpy_s(args, 255, TEXT(".\\tools\\memloader\\memloader_usb.bin -r --dataini=.\\tools\\memloader\\ums_sd.ini"));
 		break;
 	}
 	
@@ -204,7 +204,7 @@ void DialogTab02::OnBnClickedShofel2()
 			STARTUPINFO si;
 			ZeroMemory(&si, sizeof(si));
 			si.cb = sizeof(si);
-			TCHAR *download_script = m_TegraRcm->GetAbsolutePath(TEXT("shofel2\\download.bat"), CSIDL_APPDATA);
+			TCHAR *download_script = m_TegraRcm->GetAbsolutePath(TEXT("tools\\shofel2\\download.bat"), CSIDL_APPDATA);
 			BOOL bRet = CreateProcess(download_script, NULL, NULL, NULL, FALSE, 0, NULL, exe_dir, &si, &pif);
 		}
 		return; // TO-DO : Remove return for coreboot injection after download

TegraRcmGUI/DialogTab03.cpp

@@ -45,6 +45,14 @@ BOOL DialogTab03::OnInitDialog()
 		checkbox->SetCheck(BST_CHECKED);
 	}
 
+	value = m_TegraRcm->GetPreset("LOGGING");
+	if (value == "TRUE")
+	{
+		m_TegraRcm->LOGGING_CURR = TRUE;
+		CMFCButton* checkbox = (CMFCButton*)GetDlgItem(LOGGING);
+		checkbox->SetCheck(BST_CHECKED);
+	}
+
 	TCHAR szPath[MAX_PATH];
 	if (SUCCEEDED(SHGetFolderPath(NULL, CSIDL_APPDATA, NULL, SHGFP_TYPE_CURRENT, szPath)))
 	{
@@ -66,7 +74,8 @@ BEGIN_MESSAGE_MAP(DialogTab03, CDialogEx)
 	ON_BN_CLICKED(MIN_TO_TRAY, &DialogTab03::OnClickedMinToTray)
 	ON_BN_CLICKED(ID_INSTALL_DRIVER, &DialogTab03::OnBnClickedInstallDriver)
 	ON_BN_CLICKED(RUN_WINSTART, &DialogTab03::OnBnClickedWinstart)
-	ON_BN_CLICKED(IDC_BUTTON2, &DialogTab03::OnBnClickedButton2)
+	ON_BN_CLICKED(LOGGING, &DialogTab03::OnClickedLogging)
+	//ON_BN_CLICKED(IDC_BUTTON2, &DialogTab03::OnBnClickedButton2)
 END_MESSAGE_MAP()
 
 
@@ -113,6 +122,20 @@ void DialogTab03::OnClickedMinToTray()
 }
 
 
+void DialogTab03::OnClickedLogging()
+{
+	// Get Minimize to tray checkbox value (checked, unchecked)
+	CButton* m_ctlCheck = (CButton*)GetDlgItem(LOGGING);
+	BOOL IsCheckChecked = (m_ctlCheck->GetCheck() == 1) ? true : false;
+	if (m_TegraRcm->LOGGING_CURR != IsCheckChecked)
+	{
+		if (IsCheckChecked) m_TegraRcm->SetPreset("LOGGING", "TRUE");
+		else m_TegraRcm->SetPreset("LOGGING", "FALSE");
+		m_TegraRcm->LOGGING_CURR = IsCheckChecked;
+	}
+}
+
+
 void DialogTab03::OnBnClickedInstallDriver()
 {
 	m_TegraRcm->InstallDriver();
@@ -223,8 +246,9 @@ void DialogTab03::CleanRegestry() {
 		}
 	}
 }
-
+/*
 void DialogTab03::OnBnClickedButton2()
 {
 	m_TegraRcm->SetLocale();
 }
+*/

TegraRcmGUI/DialogTab03.h

@@ -44,6 +44,7 @@ public:
 	afx_msg void OnClickedMinToTray();
 	afx_msg void OnBnClickedInstallDriver();
 	afx_msg void OnBnClickedWinstart();
+	afx_msg void OnClickedLogging();
 	void CreateLink();
 	afx_msg void CleanRegestry();
 

TegraRcmGUI/TegraRcm.cpp

@@ -37,6 +37,7 @@ TegraRcm::TegraRcm(CDialog* pParent /*=NULL*/)
 {
 	m_Parent = pParent;
 	m_hWnd = AfxGetMainWnd()->GetSafeHwnd();
+	this->LOGGING_CURR = GetPreset("LOGGING") == "TRUE";
 	GetFavorites();
 	//SendUserMessage("Waiting for device in RCM mode");
 }
@@ -259,7 +260,7 @@ void TegraRcm::ShowContextMenu(HWND hWnd)
 		DestroyMenu(hMenu);
 	}
 }
-LRESULT TegraRcm::OnTrayIconEvent(UINT wParam, LPARAM lParam)
+LRESULT TegraRcm::OnTrayIconEvent(WPARAM wParam, LPARAM lParam)
 {
 	if ((UINT)wParam != ID_SYSTEMTRAY)
 	{
@@ -543,8 +544,7 @@ void TegraRcm::SaveFavorites()
 void TegraRcm::AppendLog(string message)
 {
 
-	// DISABLED
+	if (!this->LOGGING_CURR) return;
-	return;
 
 
 	// Get time
@@ -869,10 +869,9 @@ int TegraRcm::Smasher(TCHAR args[4096], BOOL bInheritHandles)
 	CString csPath2(csPath);
 	csPath.Append(TEXT(".\\TegraRcmSmash.exe "));
 	TCHAR cmd[4096];
-	_tcscpy_s(cmd, csPath);
+	_tcscpy_s(cmd, 4095, csPath);
 	lstrcat(cmd, args);
 
-
 	SECURITY_ATTRIBUTES sa;
 	sa.nLength = sizeof(sa);
 	sa.lpSecurityDescriptor = NULL;
@@ -1126,7 +1125,7 @@ char* TegraRcm::GetRelativeFilename(char *currentDirectory, char *absoluteFilena
 	if (currentDirectory[0] != absoluteFilename[0])
 	{
 		// not on the same drive, so only absolute filename will do
-		strcpy(relativeFilename, absoluteFilename);
+		strcpy_s(relativeFilename, MAX_FILENAME_LEN, absoluteFilename);
 		return relativeFilename;
 	}
 	// they are on the same drive, find out how much of the current directory
@@ -1147,7 +1146,7 @@ char* TegraRcm::GetRelativeFilename(char *currentDirectory, char *absoluteFilena
 			// file name should not have a leading one...
 			i++;
 		}
-		strcpy(relativeFilename, &absoluteFilename[i]);
+		strcpy_s(relativeFilename, MAX_FILENAME_LEN, &absoluteFilename[i]);
 		return relativeFilename;
 	}
 	// The file is not in a child directory of the current directory, so we
@@ -1192,6 +1191,6 @@ char* TegraRcm::GetRelativeFilename(char *currentDirectory, char *absoluteFilena
 		relativeFilename[rfMarker++] = SLASH;
 	}
 	// copy the rest of the filename into the result string
-	strcpy(&relativeFilename[rfMarker], &absoluteFilename[afMarker]);
+	strcpy_s(&relativeFilename[rfMarker], MAX_FILENAME_LEN, &absoluteFilename[afMarker]);
 	return relativeFilename;
 }

TegraRcmGUI/TegraRcm.h

@@ -64,7 +64,7 @@ public:
 	BOOL SetTrayIcon(WORD wIconID);
 	void ShowContextMenu(HWND hWnd);
 	BOOL DestroyTrayIcon();
-	LRESULT OnTrayIconEvent(UINT wParam, LPARAM lParam);
+	LRESULT OnTrayIconEvent(WPARAM wParam, LPARAM lParam);
 
 	BOOL PAUSE_LKP_DEVICE = FALSE;
 	BOOL AUTOINJECT_CURR = FALSE;
@@ -72,6 +72,7 @@ public:
 	BOOL WAITING_RECONNECT = FALSE;
 	BOOL ASK_FOR_DRIVER = FALSE;
 	BOOL MIN_TO_TRAY_CURR = FALSE;
+	BOOL LOGGING_CURR = FALSE;
 
 	CString csPath;
 	COLORREF LabelColor = RGB(0, 0, 0);

TegraRcmGUI/TegraRcmGUI.vcxproj

@@ -22,13 +22,13 @@
     <ProjectGuid>{2C091C5B-378F-44D0-91F2-53489BA7B83C}</ProjectGuid>
     <RootNamespace>TegraRcmGUI</RootNamespace>
     <Keyword>MFCProj</Keyword>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <UseOfMfc>Dynamic</UseOfMfc>
   </PropertyGroup>
@@ -38,12 +38,12 @@
     <WholeProgramOptimization>false</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
     <UseOfMfc>Dynamic</UseOfMfc>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <UseOfMfc>Dynamic</UseOfMfc>
   </PropertyGroup>
@@ -53,7 +53,7 @@
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
     <UseOfMfc>Dynamic</UseOfMfc>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -78,12 +78,15 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
+    <OutDir>$(SolutionDir)\Output\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>Output\$(Platform)\$(Configuration)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
+    <OutDir>$(SolutionDir)\Output\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>Output\$(Platform)\$(Configuration)\</IntDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -97,7 +100,7 @@
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>Version.lib;libusbK.lib</AdditionalDependencies>
+      <AdditionalDependencies>Version.lib;libusbK.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(LIBUSBK_DIR)\bin\lib\$(PlatformShortName.Replace('x64','amd64'))\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
     </Link>
@@ -117,15 +120,15 @@
       <PrecompiledHeader>Use</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_WINDOWS;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_WINDOWS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
       <AdditionalIncludeDirectories>$(LIBUSBK_DIR)\includes\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
       <AdditionalLibraryDirectories>$(LIBUSBK_DIR)\bin\lib\$(PlatformShortName.Replace('x64','amd64'))\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>Version.lib;libusbK.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <Midl>
       <MkTypLibCompatible>false</MkTypLibCompatible>

TegraRcmGUI/TegraRcmGUIDlg.cpp

@@ -101,6 +101,10 @@ END_MESSAGE_MAP()
 //
 BOOL CTegraRcmGUIDlg::OnInitDialog()
 {
+
+	m_TegraRcm = new TegraRcm(this);
+	m_TegraRcm->AppendLog("new TegraRcm()");
+
 	CDialog::OnInitDialog();
 
 	// Accessibility
@@ -187,9 +191,6 @@ BOOL CTegraRcmGUIDlg::OnInitDialog()
 	SetIcon(m_hIcon, TRUE);			// Set big icon
 	SetIcon(m_hIcon, FALSE);		// Set small icon
 
-	m_TegraRcm = new TegraRcm(this);
-	m_TegraRcm->AppendLog("new TegraRcm()");
-
 	// Kill other running process of app
 	m_TegraRcm->KillRunningProcess(TEXT("TegraRcmGUI.exe"));
 	
@@ -326,7 +327,7 @@ void CTegraRcmGUIDlg::OnClose()
 	PostQuitMessage(0);
 }
 
-LRESULT CTegraRcmGUIDlg::OnTrayIconEvent(UINT wParam, LPARAM lParam)
+LRESULT CTegraRcmGUIDlg::OnTrayIconEvent(WPARAM wParam, LPARAM lParam)
 {
 	return m_TegraRcm->OnTrayIconEvent(wParam, lParam);
 }
@@ -445,7 +446,7 @@ void CTegraRcmGUIDlg::StopTimer()
 	KillTimer(ID_TIMER_MINUTE);
 	KillTimer(ID_TIMER_SECONDS);
 }
-void CTegraRcmGUIDlg::OnTimer(UINT nIDEvent)
+void CTegraRcmGUIDlg::OnTimer(UINT_PTR nIDEvent)
 {
 	// Each second
 	if (nIDEvent == ID_TIMER_SECONDS)

TegraRcmGUI/TegraRcmGUIDlg.h

@@ -90,14 +90,14 @@ protected:
 	afx_msg void OnSize(UINT nType, int cx, int cy);
 	afx_msg HCURSOR OnQueryDragIcon();
 	afx_msg void OnDestroy();
-	afx_msg LRESULT OnTrayIconEvent(UINT wParam, LPARAM lParam);
+	afx_msg LRESULT OnTrayIconEvent(WPARAM wParam, LPARAM lParam);
 	DECLARE_MESSAGE_MAP()
 	afx_msg LRESULT OnQueryEndSession(WPARAM wParm, LPARAM lParm);
 
 public:
 	void StartTimer();
 	void StopTimer();
-	void OnTimer(UINT nIDEvent);
+	void OnTimer(UINT_PTR nIDEvent);
 	int STATUS;
 	afx_msg void BitmapDisplay(int IMG);
 	

TegraRcmGUI/tools/src/biskeydump

@@ -0,0 +1 @@
+Subproject commit ed57dd5032840ab7084bcd76e8b9408dd7245958