1
0
Fork 0
mirror of https://github.com/eliboa/TegraRcmGUI.git synced 2024-11-08 11:51:45 +00:00

Merge pull request #50 from Pysis868/feature/add-logging-switch

Add logging switch
This commit is contained in:
eliboa 2021-11-14 08:58:21 +01:00 committed by GitHub
commit 2524968059
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 336 additions and 302 deletions

2
.gitignore vendored Normal file
View file

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

View file

@ -37,6 +37,10 @@ For other platforms, you can use :
## Issue / Suggestion ## Issue / Suggestion
Please open new [issue](https://github.com/eliboa/TegraRcmGUI/issues) to report a bug or submit a 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 ? ## How to backup/restore your Nintendo Switch's NAND ?
1) Use [memloader](https://github.com/rajkosto/memloader) v3 to mount eMMC on your computer 1) Use [memloader](https://github.com/rajkosto/memloader) v3 to mount eMMC on your computer

View file

@ -144,16 +144,16 @@ void DialogTab02::OnBnClickedMountSd()
switch (pmyComboBox->GetCurSel()) switch (pmyComboBox->GetCurSel())
{ {
case 0: 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; break;
case 1: 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; break;
case 2: 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; break;
default: 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; break;
} }

View file

@ -45,6 +45,14 @@ BOOL DialogTab03::OnInitDialog()
checkbox->SetCheck(BST_CHECKED); 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]; TCHAR szPath[MAX_PATH];
if (SUCCEEDED(SHGetFolderPath(NULL, CSIDL_APPDATA, NULL, SHGFP_TYPE_CURRENT, szPath))) if (SUCCEEDED(SHGetFolderPath(NULL, CSIDL_APPDATA, NULL, SHGFP_TYPE_CURRENT, szPath)))
{ {
@ -66,6 +74,7 @@ BEGIN_MESSAGE_MAP(DialogTab03, CDialogEx)
ON_BN_CLICKED(MIN_TO_TRAY, &DialogTab03::OnClickedMinToTray) ON_BN_CLICKED(MIN_TO_TRAY, &DialogTab03::OnClickedMinToTray)
ON_BN_CLICKED(ID_INSTALL_DRIVER, &DialogTab03::OnBnClickedInstallDriver) ON_BN_CLICKED(ID_INSTALL_DRIVER, &DialogTab03::OnBnClickedInstallDriver)
ON_BN_CLICKED(RUN_WINSTART, &DialogTab03::OnBnClickedWinstart) ON_BN_CLICKED(RUN_WINSTART, &DialogTab03::OnBnClickedWinstart)
ON_BN_CLICKED(LOGGING, &DialogTab03::OnClickedLogging)
//ON_BN_CLICKED(IDC_BUTTON2, &DialogTab03::OnBnClickedButton2) //ON_BN_CLICKED(IDC_BUTTON2, &DialogTab03::OnBnClickedButton2)
END_MESSAGE_MAP() 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() void DialogTab03::OnBnClickedInstallDriver()
{ {
m_TegraRcm->InstallDriver(); m_TegraRcm->InstallDriver();

View file

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

View file

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

View file

@ -72,6 +72,7 @@ public:
BOOL WAITING_RECONNECT = FALSE; BOOL WAITING_RECONNECT = FALSE;
BOOL ASK_FOR_DRIVER = FALSE; BOOL ASK_FOR_DRIVER = FALSE;
BOOL MIN_TO_TRAY_CURR = FALSE; BOOL MIN_TO_TRAY_CURR = FALSE;
BOOL LOGGING_CURR = FALSE;
CString csPath; CString csPath;
COLORREF LabelColor = RGB(0, 0, 0); COLORREF LabelColor = RGB(0, 0, 0);

Binary file not shown.

View file

@ -1,289 +1,292 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations"> <ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32"> <ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration> <Configuration>Debug</Configuration>
<Platform>Win32</Platform> <Platform>Win32</Platform>
</ProjectConfiguration> </ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32"> <ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration> <Configuration>Release</Configuration>
<Platform>Win32</Platform> <Platform>Win32</Platform>
</ProjectConfiguration> </ProjectConfiguration>
<ProjectConfiguration Include="Debug|x64"> <ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration> <Configuration>Debug</Configuration>
<Platform>x64</Platform> <Platform>x64</Platform>
</ProjectConfiguration> </ProjectConfiguration>
<ProjectConfiguration Include="Release|x64"> <ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration> <Configuration>Release</Configuration>
<Platform>x64</Platform> <Platform>x64</Platform>
</ProjectConfiguration> </ProjectConfiguration>
</ItemGroup> </ItemGroup>
<PropertyGroup Label="Globals"> <PropertyGroup Label="Globals">
<ProjectGuid>{2C091C5B-378F-44D0-91F2-53489BA7B83C}</ProjectGuid> <ProjectGuid>{2C091C5B-378F-44D0-91F2-53489BA7B83C}</ProjectGuid>
<RootNamespace>TegraRcmGUI</RootNamespace> <RootNamespace>TegraRcmGUI</RootNamespace>
<Keyword>MFCProj</Keyword> <Keyword>MFCProj</Keyword>
<WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion> <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
</PropertyGroup> </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType> <ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries> <UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset> <PlatformToolset>v142</PlatformToolset>
<CharacterSet>Unicode</CharacterSet> <CharacterSet>Unicode</CharacterSet>
<UseOfMfc>Dynamic</UseOfMfc> <UseOfMfc>Dynamic</UseOfMfc>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType> <ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries> <UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>false</WholeProgramOptimization> <WholeProgramOptimization>false</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet> <CharacterSet>Unicode</CharacterSet>
<UseOfMfc>Dynamic</UseOfMfc> <UseOfMfc>Dynamic</UseOfMfc>
<PlatformToolset>v141</PlatformToolset> <PlatformToolset>v142</PlatformToolset>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType> <ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries> <UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset> <PlatformToolset>v142</PlatformToolset>
<CharacterSet>Unicode</CharacterSet> <CharacterSet>Unicode</CharacterSet>
<UseOfMfc>Dynamic</UseOfMfc> <UseOfMfc>Dynamic</UseOfMfc>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType> <ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries> <UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization> <WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet> <CharacterSet>Unicode</CharacterSet>
<UseOfMfc>Dynamic</UseOfMfc> <UseOfMfc>Dynamic</UseOfMfc>
<PlatformToolset>v140</PlatformToolset> <PlatformToolset>v142</PlatformToolset>
</PropertyGroup> </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings"> <ImportGroup Label="ExtensionSettings">
</ImportGroup> </ImportGroup>
<ImportGroup Label="Shared"> <ImportGroup Label="Shared">
</ImportGroup> </ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup> </ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup> </ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup> </ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup> </ImportGroup>
<PropertyGroup Label="UserMacros" /> <PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental> <LinkIncremental>true</LinkIncremental>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LinkIncremental>true</LinkIncremental> <LinkIncremental>true</LinkIncremental>
</PropertyGroup> <OutDir>$(SolutionDir)\Output\$(Platform)\$(Configuration)\</OutDir>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <IntDir>Output\$(Platform)\$(Configuration)\</IntDir>
<LinkIncremental>false</LinkIncremental> </PropertyGroup>
</PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <LinkIncremental>false</LinkIncremental>
<LinkIncremental>false</LinkIncremental> </PropertyGroup>
</PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <OutDir>$(SolutionDir)\Output\$(Platform)\$(Configuration)\</OutDir>
<ClCompile> <IntDir>Output\$(Platform)\$(Configuration)\</IntDir>
<PrecompiledHeader>Use</PrecompiledHeader> </PropertyGroup>
<WarningLevel>Level3</WarningLevel> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Optimization>Disabled</Optimization> <ClCompile>
<PreprocessorDefinitions>WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PrecompiledHeader>Use</PrecompiledHeader>
<SDLCheck>true</SDLCheck> <WarningLevel>Level3</WarningLevel>
<AdditionalIncludeDirectories>C:\libusbK-dev-kit\includes;$(LIBUSBK_DIR)\includes\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <Optimization>Disabled</Optimization>
</ClCompile> <PreprocessorDefinitions>WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Link> <SDLCheck>true</SDLCheck>
<SubSystem>Windows</SubSystem> <AdditionalIncludeDirectories>$(LIBUSBK_DIR)\includes\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation> </ClCompile>
<AdditionalDependencies>Version.lib;libusbK.lib</AdditionalDependencies> <Link>
<AdditionalLibraryDirectories>C:\libusbK-dev-kit\bin\lib\x86;$(LIBUSBK_DIR)\bin\lib\$(PlatformShortName.Replace('x64','amd64'))\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <SubSystem>Windows</SubSystem>
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile> <GenerateDebugInformation>true</GenerateDebugInformation>
</Link> <AdditionalDependencies>Version.lib;libusbK.lib;%(AdditionalDependencies)</AdditionalDependencies>
<Midl> <AdditionalLibraryDirectories>$(LIBUSBK_DIR)\bin\lib\$(PlatformShortName.Replace('x64','amd64'))\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<MkTypLibCompatible>false</MkTypLibCompatible> <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
<ValidateAllParameters>true</ValidateAllParameters> </Link>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <Midl>
</Midl> <MkTypLibCompatible>false</MkTypLibCompatible>
<ResourceCompile> <ValidateAllParameters>true</ValidateAllParameters>
<Culture>0x0409</Culture> <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> </Midl>
<AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <ResourceCompile>
</ResourceCompile> <Culture>0x0409</Culture>
</ItemDefinitionGroup> <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<ClCompile> </ResourceCompile>
<PrecompiledHeader>Use</PrecompiledHeader> </ItemDefinitionGroup>
<WarningLevel>Level3</WarningLevel> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<Optimization>Disabled</Optimization> <ClCompile>
<PreprocessorDefinitions>_WINDOWS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PrecompiledHeader>Use</PrecompiledHeader>
<SDLCheck>true</SDLCheck> <WarningLevel>Level3</WarningLevel>
<AdditionalIncludeDirectories>C:\libusbK-dev-kit\includes\;$(LIBUSBK_DIR)\includes\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <Optimization>Disabled</Optimization>
</ClCompile> <PreprocessorDefinitions>_WINDOWS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Link> <SDLCheck>true</SDLCheck>
<SubSystem>Windows</SubSystem> <AdditionalIncludeDirectories>$(LIBUSBK_DIR)\includes\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation> </ClCompile>
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile> <Link>
<AdditionalLibraryDirectories>C:\libusbK-dev-kit\bin\lib\amd64\;$(LIBUSBK_DIR)\bin\lib\$(PlatformShortName.Replace('x64','amd64'))\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <SubSystem>Windows</SubSystem>
</Link> <GenerateDebugInformation>true</GenerateDebugInformation>
<Midl> <AdditionalLibraryDirectories>$(LIBUSBK_DIR)\bin\lib\$(PlatformShortName.Replace('x64','amd64'))\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<MkTypLibCompatible>false</MkTypLibCompatible> <AdditionalDependencies>Version.lib;libusbK.lib;%(AdditionalDependencies)</AdditionalDependencies>
<ValidateAllParameters>true</ValidateAllParameters> </Link>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <Midl>
</Midl> <MkTypLibCompatible>false</MkTypLibCompatible>
<ResourceCompile> <ValidateAllParameters>true</ValidateAllParameters>
<Culture>0x0409</Culture> <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> </Midl>
<AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <ResourceCompile>
</ResourceCompile> <Culture>0x0409</Culture>
</ItemDefinitionGroup> <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<ClCompile> </ResourceCompile>
<WarningLevel>Level3</WarningLevel> </ItemDefinitionGroup>
<PrecompiledHeader>Use</PrecompiledHeader> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Optimization>MaxSpeed</Optimization> <ClCompile>
<FunctionLevelLinking>true</FunctionLevelLinking> <WarningLevel>Level3</WarningLevel>
<IntrinsicFunctions>true</IntrinsicFunctions> <PrecompiledHeader>Use</PrecompiledHeader>
<PreprocessorDefinitions>WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <Optimization>MaxSpeed</Optimization>
<SDLCheck>true</SDLCheck> <FunctionLevelLinking>true</FunctionLevelLinking>
<AdditionalIncludeDirectories>C:\libusbK-dev-kit\includes;$(LIBUSBK_DIR)\includes\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <IntrinsicFunctions>true</IntrinsicFunctions>
</ClCompile> <PreprocessorDefinitions>WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Link> <SDLCheck>true</SDLCheck>
<SubSystem>Windows</SubSystem> <AdditionalIncludeDirectories>$(LIBUSBK_DIR)\includes\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<EnableCOMDATFolding>true</EnableCOMDATFolding> </ClCompile>
<OptimizeReferences>true</OptimizeReferences> <Link>
<GenerateDebugInformation>true</GenerateDebugInformation> <SubSystem>Windows</SubSystem>
<AdditionalLibraryDirectories>C:\libusbK-dev-kit\bin\lib\x86;$(LIBUSBK_DIR)\bin\lib\$(PlatformShortName.Replace('x64','amd64'))\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <EnableCOMDATFolding>true</EnableCOMDATFolding>
<AdditionalDependencies>Version.lib;libusbK.lib;%(AdditionalDependencies)</AdditionalDependencies> <OptimizeReferences>true</OptimizeReferences>
<UACExecutionLevel>AsInvoker</UACExecutionLevel> <GenerateDebugInformation>true</GenerateDebugInformation>
<EnableUAC>true</EnableUAC> <AdditionalLibraryDirectories>$(LIBUSBK_DIR)\bin\lib\$(PlatformShortName.Replace('x64','amd64'))\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<UACUIAccess>false</UACUIAccess> <AdditionalDependencies>Version.lib;libusbK.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link> <UACExecutionLevel>AsInvoker</UACExecutionLevel>
<Midl> <EnableUAC>true</EnableUAC>
<MkTypLibCompatible>false</MkTypLibCompatible> <UACUIAccess>false</UACUIAccess>
<ValidateAllParameters>true</ValidateAllParameters> </Link>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <Midl>
</Midl> <MkTypLibCompatible>false</MkTypLibCompatible>
<ResourceCompile> <ValidateAllParameters>true</ValidateAllParameters>
<Culture>0x0409</Culture> <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> </Midl>
<AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <ResourceCompile>
</ResourceCompile> <Culture>0x0409</Culture>
</ItemDefinitionGroup> <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<ClCompile> </ResourceCompile>
<WarningLevel>Level3</WarningLevel> </ItemDefinitionGroup>
<PrecompiledHeader>Use</PrecompiledHeader> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Optimization>MaxSpeed</Optimization> <ClCompile>
<FunctionLevelLinking>true</FunctionLevelLinking> <WarningLevel>Level3</WarningLevel>
<IntrinsicFunctions>true</IntrinsicFunctions> <PrecompiledHeader>Use</PrecompiledHeader>
<PreprocessorDefinitions>_WINDOWS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <Optimization>MaxSpeed</Optimization>
<SDLCheck>true</SDLCheck> <FunctionLevelLinking>true</FunctionLevelLinking>
<AdditionalIncludeDirectories>$(LIBUSBK_DIR)\includes\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <IntrinsicFunctions>true</IntrinsicFunctions>
</ClCompile> <PreprocessorDefinitions>_WINDOWS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Link> <SDLCheck>true</SDLCheck>
<SubSystem>Windows</SubSystem> <AdditionalIncludeDirectories>$(LIBUSBK_DIR)\includes\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<EnableCOMDATFolding>true</EnableCOMDATFolding> </ClCompile>
<OptimizeReferences>true</OptimizeReferences> <Link>
<GenerateDebugInformation>true</GenerateDebugInformation> <SubSystem>Windows</SubSystem>
<AdditionalLibraryDirectories>$(LIBUSBK_DIR)\bin\lib\$(PlatformShortName.Replace('x64','amd64'))\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <EnableCOMDATFolding>true</EnableCOMDATFolding>
<AdditionalDependencies>Version.lib;libusbK.lib;%(AdditionalDependencies)</AdditionalDependencies> <OptimizeReferences>true</OptimizeReferences>
</Link> <GenerateDebugInformation>true</GenerateDebugInformation>
<Midl> <AdditionalLibraryDirectories>$(LIBUSBK_DIR)\bin\lib\$(PlatformShortName.Replace('x64','amd64'))\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<MkTypLibCompatible>false</MkTypLibCompatible> <AdditionalDependencies>Version.lib;libusbK.lib;%(AdditionalDependencies)</AdditionalDependencies>
<ValidateAllParameters>true</ValidateAllParameters> </Link>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <Midl>
</Midl> <MkTypLibCompatible>false</MkTypLibCompatible>
<ResourceCompile> <ValidateAllParameters>true</ValidateAllParameters>
<Culture>0x0409</Culture> <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> </Midl>
<AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <ResourceCompile>
</ResourceCompile> <Culture>0x0409</Culture>
</ItemDefinitionGroup> <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ItemGroup> <AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<Text Include="ReadMe.txt" /> </ResourceCompile>
</ItemGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="DialogTab01.h" /> <Text Include="ReadMe.txt" />
<ClInclude Include="DialogTab02.h" /> </ItemGroup>
<ClInclude Include="DialogTab03.h" /> <ItemGroup>
<ClInclude Include="libusbk_int.h" /> <ClInclude Include="DialogTab01.h" />
<ClInclude Include="MyTabCtrl.h" /> <ClInclude Include="DialogTab02.h" />
<ClInclude Include="Resource.h" /> <ClInclude Include="DialogTab03.h" />
<ClInclude Include="res\BitmapPicture.h" /> <ClInclude Include="libusbk_int.h" />
<ClInclude Include="ScopeGuard.h" /> <ClInclude Include="MyTabCtrl.h" />
<ClInclude Include="stdafx.h" /> <ClInclude Include="Resource.h" />
<ClInclude Include="targetver.h" /> <ClInclude Include="res\BitmapPicture.h" />
<ClInclude Include="TegraRcm.h" /> <ClInclude Include="ScopeGuard.h" />
<ClInclude Include="TegraRcmGUI.h" /> <ClInclude Include="stdafx.h" />
<ClInclude Include="TegraRcmGUIDlg.h" /> <ClInclude Include="targetver.h" />
<ClInclude Include="TegraRcmSmash.h" /> <ClInclude Include="TegraRcm.h" />
<ClInclude Include="Types.h" /> <ClInclude Include="TegraRcmGUI.h" />
<ClInclude Include="Win32Def.h" /> <ClInclude Include="TegraRcmGUIDlg.h" />
<ClInclude Include="WinHandle.h" /> <ClInclude Include="TegraRcmSmash.h" />
</ItemGroup> <ClInclude Include="Types.h" />
<ItemGroup> <ClInclude Include="Win32Def.h" />
<ClCompile Include="DialogTab01.cpp" /> <ClInclude Include="WinHandle.h" />
<ClCompile Include="DialogTab02.cpp" /> </ItemGroup>
<ClCompile Include="DialogTab03.cpp" /> <ItemGroup>
<ClCompile Include="MyTabCtrl.cpp" /> <ClCompile Include="DialogTab01.cpp" />
<ClCompile Include="res\BitmapPicture.cpp" /> <ClCompile Include="DialogTab02.cpp" />
<ClCompile Include="stdafx.cpp"> <ClCompile Include="DialogTab03.cpp" />
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader> <ClCompile Include="MyTabCtrl.cpp" />
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader> <ClCompile Include="res\BitmapPicture.cpp" />
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader> <ClCompile Include="stdafx.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
</ClCompile> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
<ClCompile Include="TegraRcm.cpp" /> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
<ClCompile Include="TegraRcmGUI.cpp" /> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
<ClCompile Include="TegraRcmGUIDlg.cpp" /> </ClCompile>
<ClCompile Include="TegraRcmSmash.cpp" /> <ClCompile Include="TegraRcm.cpp" />
</ItemGroup> <ClCompile Include="TegraRcmGUI.cpp" />
<ItemGroup> <ClCompile Include="TegraRcmGUIDlg.cpp" />
<ResourceCompile Include="TegraRcmGUI.rc"> <ClCompile Include="TegraRcmSmash.cpp" />
<DeploymentContent>false</DeploymentContent> </ItemGroup>
</ResourceCompile> <ItemGroup>
</ItemGroup> <ResourceCompile Include="TegraRcmGUI.rc">
<ItemGroup> <DeploymentContent>false</DeploymentContent>
<None Include="res\TegraRcmGUI.rc2" /> </ResourceCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Image Include="..\..\..\..\..\..\Visual Studio 2015\Projects\TegraRcmGUI\TegraRcmGUI\res\TegraRcmGUI.ico" /> <None Include="res\TegraRcmGUI.rc2" />
<Image Include="res\add.ico" /> </ItemGroup>
<Image Include="res\bitmap2.bmp" /> <ItemGroup>
<Image Include="res\browse.ico" /> <Image Include="..\..\..\..\..\..\Visual Studio 2015\Projects\TegraRcmGUI\TegraRcmGUI\res\TegraRcmGUI.ico" />
<Image Include="res\bunch-of-keys.ico" /> <Image Include="res\add.ico" />
<Image Include="res\delete.ico" /> <Image Include="res\bitmap2.bmp" />
<Image Include="res\driver_ko.bmp" /> <Image Include="res\browse.ico" />
<Image Include="res\driver_ko_2.bmp" /> <Image Include="res\bunch-of-keys.ico" />
<Image Include="res\error.bmp" /> <Image Include="res\delete.ico" />
<Image Include="res\error_2.bmp" /> <Image Include="res\driver_ko.bmp" />
<Image Include="res\icon1.ico" /> <Image Include="res\driver_ko_2.bmp" />
<Image Include="res\init_log.bmp" /> <Image Include="res\error.bmp" />
<Image Include="res\init_logo.bmp" /> <Image Include="res\error_2.bmp" />
<Image Include="res\init_logo_2.bmp" /> <Image Include="res\icon1.ico" />
<Image Include="res\linux_icon.ico" /> <Image Include="res\init_log.bmp" />
<Image Include="res\loaded.bmp" /> <Image Include="res\init_logo.bmp" />
<Image Include="res\loaded_2.bmp" /> <Image Include="res\init_logo_2.bmp" />
<Image Include="res\loading.bmp" /> <Image Include="res\linux_icon.ico" />
<Image Include="res\loading_2.bmp" /> <Image Include="res\loaded.bmp" />
<Image Include="res\rcm_detected.bmp" /> <Image Include="res\loaded_2.bmp" />
<Image Include="res\rcm_detected_2.bmp" /> <Image Include="res\loading.bmp" />
<Image Include="res\rcm_undetected.bmp" /> <Image Include="res\loading_2.bmp" />
<Image Include="res\rcm_undetected_2.bmp" /> <Image Include="res\rcm_detected.bmp" />
<Image Include="res\status.ico" /> <Image Include="res\rcm_detected_2.bmp" />
<Image Include="res\TegraRcmGUI.ico" /> <Image Include="res\rcm_undetected.bmp" />
<Image Include="res\tray_ico_connected.ico" /> <Image Include="res\rcm_undetected_2.bmp" />
<Image Include="res\tray_ico_not_connected.ico" /> <Image Include="res\status.ico" />
<Image Include="res\usb_icon.ico" /> <Image Include="res\TegraRcmGUI.ico" />
</ItemGroup> <Image Include="res\tray_ico_connected.ico" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Image Include="res\tray_ico_not_connected.ico" />
<ImportGroup Label="ExtensionTargets"> <Image Include="res\usb_icon.ico" />
</ImportGroup> </ItemGroup>
<ProjectExtensions> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<VisualStudio> <ImportGroup Label="ExtensionTargets">
<UserProperties RESOURCE_FILE="TegraRcmGUI.rc" /> </ImportGroup>
</VisualStudio> <ProjectExtensions>
</ProjectExtensions> <VisualStudio>
<UserProperties RESOURCE_FILE="TegraRcmGUI.rc" />
</VisualStudio>
</ProjectExtensions>
</Project> </Project>

View file

@ -101,6 +101,10 @@ END_MESSAGE_MAP()
// //
BOOL CTegraRcmGUIDlg::OnInitDialog() BOOL CTegraRcmGUIDlg::OnInitDialog()
{ {
m_TegraRcm = new TegraRcm(this);
m_TegraRcm->AppendLog("new TegraRcm()");
CDialog::OnInitDialog(); CDialog::OnInitDialog();
// Accessibility // Accessibility
@ -187,9 +191,6 @@ BOOL CTegraRcmGUIDlg::OnInitDialog()
SetIcon(m_hIcon, TRUE); // Set big icon SetIcon(m_hIcon, TRUE); // Set big icon
SetIcon(m_hIcon, FALSE); // Set small icon SetIcon(m_hIcon, FALSE); // Set small icon
m_TegraRcm = new TegraRcm(this);
m_TegraRcm->AppendLog("new TegraRcm()");
// Kill other running process of app // Kill other running process of app
m_TegraRcm->KillRunningProcess(TEXT("TegraRcmGUI.exe")); m_TegraRcm->KillRunningProcess(TEXT("TegraRcmGUI.exe"));

Binary file not shown.