|
@@ -231,9 +231,15 @@ namespace GLOBAL
|
|
|
g_stSATConfig.ulAsynConnectTimeout = _tstol(szMicrosecond);
|
|
|
|
|
|
if ( _tcslen(g_stSATConfig.szAdbRouteAddress) == 0)
|
|
|
+ {
|
|
|
_stprintf_s(g_stSATConfig.szAdbRouteAddress, _T("192.168.1.1"));
|
|
|
+ WritePrivateProfileString(_T("SATService"), _T("AdbRouteAddress"), _T("192.168.1.1"), szIniPath);
|
|
|
+ }
|
|
|
if ( g_stSATConfig.ulAsynConnectTimeout == 0 )
|
|
|
+ {
|
|
|
g_stSATConfig.ulAsynConnectTimeout = 3000;
|
|
|
+ WritePrivateProfileString(_T("SATService"), _T("AsynConnectTimeout"), _T("3000"), szIniPath);
|
|
|
+ }
|
|
|
|
|
|
GetPrivateProfileString(_T("LinuxDevice"), _T("device"), _T(""), g_stSATConfig.stLinuxDevice.szDevice, MAX_PATH, szIniPath);
|
|
|
GetPrivateProfileString(_T("LinuxDevice"), _T("manu"), _T(""), g_stSATConfig.stLinuxDevice.szManu, MAX_PATH, szIniPath);
|
|
@@ -1471,6 +1477,29 @@ namespace GLOBAL
|
|
|
return TRUE;
|
|
|
}
|
|
|
|
|
|
+ std::string GetTortoiseSVNProcPath()
|
|
|
+ {
|
|
|
+ HKEY hKey;
|
|
|
+ int ret = RegOpenKeyEx(HKEY_LOCAL_MACHINE, _T("SOFTWARE\\TortoiseSVN"), 0, KEY_QUERY_VALUE, &hKey);
|
|
|
+ if (ret != ERROR_SUCCESS)
|
|
|
+ return std::string();
|
|
|
+
|
|
|
+ //¶ÁÈ¡KEY
|
|
|
+ DWORD dwType = REG_SZ; //Êý¾ÝÀàÐÍ
|
|
|
+ DWORD cbData = MAX_PATH;
|
|
|
+ TCHAR szTortoiseSVNProcPath[MAX_PATH] = {0};
|
|
|
+ ret = RegQueryValueEx(hKey, _T("ProcPath"), NULL, &dwType, (LPBYTE)szTortoiseSVNProcPath, &cbData);
|
|
|
+ if (ret != ERROR_SUCCESS) {
|
|
|
+ RegCloseKey(hKey);
|
|
|
+ return std::string();
|
|
|
+ }
|
|
|
+
|
|
|
+ RegCloseKey(hKey);
|
|
|
+
|
|
|
+ return szTortoiseSVNProcPath;
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
void Split(std::string str1, std::string str2, std::vector<std::string> &vt)
|
|
|
{
|
|
|
if ( str1.size() == 0 || str2.size() == 0 )
|