diff --git a/TegraRcmGUI.sln b/TegraRcmGUI.sln
index 9427233..68c179a 100644
--- a/TegraRcmGUI.sln
+++ b/TegraRcmGUI.sln
@@ -1,7 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.24720.0
+# Visual Studio 15
+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
diff --git a/TegraRcmGUI/DialogTab02.cpp b/TegraRcmGUI/DialogTab02.cpp
index 5141d69..261060b 100644
--- a/TegraRcmGUI/DialogTab02.cpp
+++ b/TegraRcmGUI/DialogTab02.cpp
@@ -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
diff --git a/TegraRcmGUI/DialogTab03.cpp b/TegraRcmGUI/DialogTab03.cpp
index 2e40db7..aa857b2 100644
--- a/TegraRcmGUI/DialogTab03.cpp
+++ b/TegraRcmGUI/DialogTab03.cpp
@@ -66,7 +66,7 @@ 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(IDC_BUTTON2, &DialogTab03::OnBnClickedButton2)
END_MESSAGE_MAP()
@@ -223,8 +223,9 @@ void DialogTab03::CleanRegestry() {
}
}
}
-
+/*
void DialogTab03::OnBnClickedButton2()
{
m_TegraRcm->SetLocale();
}
+*/
diff --git a/TegraRcmGUI/TegraRcm.cpp b/TegraRcmGUI/TegraRcm.cpp
index 891355a..ca247ad 100644
--- a/TegraRcmGUI/TegraRcm.cpp
+++ b/TegraRcmGUI/TegraRcm.cpp
@@ -259,7 +259,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)
{
diff --git a/TegraRcmGUI/TegraRcm.h b/TegraRcmGUI/TegraRcm.h
index a82cc4b..ec926f9 100644
--- a/TegraRcmGUI/TegraRcm.h
+++ b/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;
diff --git a/TegraRcmGUI/TegraRcmGUI.rc b/TegraRcmGUI/TegraRcmGUI.rc
index 15eb8dc..6468d51 100644
Binary files a/TegraRcmGUI/TegraRcmGUI.rc and b/TegraRcmGUI/TegraRcmGUI.rc differ
diff --git a/TegraRcmGUI/TegraRcmGUI.vcxproj b/TegraRcmGUI/TegraRcmGUI.vcxproj
index cd78887..adcbfdd 100644
--- a/TegraRcmGUI/TegraRcmGUI.vcxproj
+++ b/TegraRcmGUI/TegraRcmGUI.vcxproj
@@ -22,13 +22,13 @@
{2C091C5B-378F-44D0-91F2-53489BA7B83C}
TegraRcmGUI
MFCProj
- 8.1
+ 10.0.14393.0
Application
true
- v140
+ v141
Unicode
Dynamic
@@ -38,12 +38,12 @@
false
Unicode
Dynamic
- v140
+ v141
Application
true
- v140
+ v141
Unicode
Dynamic
@@ -92,13 +92,13 @@
Disabled
WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;_DEBUG;%(PreprocessorDefinitions)
true
- $(LIBUSBK_DIR)\includes\;%(AdditionalIncludeDirectories)
+ C:\libusbK-dev-kit\includes;$(LIBUSBK_DIR)\includes\;%(AdditionalIncludeDirectories)
Windows
true
Version.lib;libusbK.lib
- $(LIBUSBK_DIR)\bin\lib\$(PlatformShortName.Replace('x64','amd64'))\;%(AdditionalLibraryDirectories)
+ C:\libusbK-dev-kit\bin\lib\x86;$(LIBUSBK_DIR)\bin\lib\$(PlatformShortName.Replace('x64','amd64'))\;%(AdditionalLibraryDirectories)
$(OutDir)$(TargetName)$(TargetExt)
@@ -117,15 +117,15 @@
Use
Level3
Disabled
- _WINDOWS;_DEBUG;%(PreprocessorDefinitions)
+ _WINDOWS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)
true
- $(LIBUSBK_DIR)\includes\;%(AdditionalIncludeDirectories)
+ C:\libusbK-dev-kit\includes\;$(LIBUSBK_DIR)\includes\;%(AdditionalIncludeDirectories)
Windows
true
$(OutDir)$(TargetName)$(TargetExt)
- $(LIBUSBK_DIR)\bin\lib\$(PlatformShortName.Replace('x64','amd64'))\;%(AdditionalLibraryDirectories)
+ C:\libusbK-dev-kit\bin\lib\amd64\;$(LIBUSBK_DIR)\bin\lib\$(PlatformShortName.Replace('x64','amd64'))\;%(AdditionalLibraryDirectories)
false
@@ -147,14 +147,14 @@
true
WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)
true
- $(LIBUSBK_DIR)\includes\;%(AdditionalIncludeDirectories)
+ C:\libusbK-dev-kit\includes;$(LIBUSBK_DIR)\includes\;%(AdditionalIncludeDirectories)
Windows
true
true
true
- $(LIBUSBK_DIR)\bin\lib\$(PlatformShortName.Replace('x64','amd64'))\;%(AdditionalLibraryDirectories)
+ C:\libusbK-dev-kit\bin\lib\x86;$(LIBUSBK_DIR)\bin\lib\$(PlatformShortName.Replace('x64','amd64'))\;%(AdditionalLibraryDirectories)
Version.lib;libusbK.lib;%(AdditionalDependencies)
AsInvoker
true
diff --git a/TegraRcmGUI/TegraRcmGUIDlg.cpp b/TegraRcmGUI/TegraRcmGUIDlg.cpp
index b75794f..5f6321a 100644
--- a/TegraRcmGUI/TegraRcmGUIDlg.cpp
+++ b/TegraRcmGUI/TegraRcmGUIDlg.cpp
@@ -326,7 +326,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 +445,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)
diff --git a/TegraRcmGUI/TegraRcmGUIDlg.h b/TegraRcmGUI/TegraRcmGUIDlg.h
index ef55ac9..59265db 100644
--- a/TegraRcmGUI/TegraRcmGUIDlg.h
+++ b/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);
diff --git a/TegraRcmGUI/res/bunch-of-keys.ico b/TegraRcmGUI/res/bunch-of-keys.ico
new file mode 100644
index 0000000..ec46937
Binary files /dev/null and b/TegraRcmGUI/res/bunch-of-keys.ico differ
diff --git a/TegraRcmGUI/tools/biskeydump_usb.bin b/TegraRcmGUI/tools/biskeydump_usb.bin
index 4e40938..82aef0d 100644
Binary files a/TegraRcmGUI/tools/biskeydump_usb.bin and b/TegraRcmGUI/tools/biskeydump_usb.bin differ