Преглед на файлове

1、修复首次读取SATHelper.ini失败造成的问题:遥控器获取xml文件失败;

sat23 преди 4 години
родител
ревизия
9ff8b494d4
променени са 2 файла, в които са добавени 16 реда и са изтрити 16 реда
  1. 14 14
      SATHelper/SATHelper/SATHelper.cpp
  2. 2 2
      SATHelper/SATHelper/UpgradeWnd.cpp

+ 14 - 14
SATHelper/SATHelper/SATHelper.cpp

@@ -113,6 +113,20 @@ BOOL CSATHelperApp::InitInstance()
 	EnableTaskbarInteraction(FALSE);
 #endif
 
+	// 获取模块的目录;
+	TCHAR szDrive[MAX_PATH] = { 0 };
+	TCHAR szDir[MAX_PATH] = { 0 };
+	TCHAR szExt[MAX_PATH] = { 0 };
+	::GetModuleFileName(NULL, Global::g_szCurModulePath, sizeof(Global::g_szCurModulePath) / sizeof(TCHAR));
+	_tsplitpath_s(Global::g_szCurModulePath, szDrive, szDir, Global::g_szFna, szExt);
+#ifdef _DEBUG
+	::GetCurrentDirectory(MAX_PATH, Global::g_szCurModuleDir);
+	_tcscat_s(Global::g_szCurModuleDir, _T("\\"));
+#else
+	_tcscpy_s(Global::g_szCurModuleDir, szDrive);
+	_tcscat_s(Global::g_szCurModuleDir, szDir);
+#endif
+
 	Global::GetConfig();
 	std::thread t([]() {
 		while (true) {
@@ -141,20 +155,6 @@ BOOL CSATHelperApp::InitInstance()
 #if 1
 	GdiplusStartupInput gdiplusStartupInput;
 	GdiplusStartup(&m_gdiplusToken, &gdiplusStartupInput, NULL);
-
-	// 获取模块的目录;
-	TCHAR szDrive[MAX_PATH] = { 0 };
-	TCHAR szDir[MAX_PATH] = { 0 };
-	TCHAR szExt[MAX_PATH] = { 0 };
-	::GetModuleFileName(NULL, Global::g_szCurModulePath, sizeof(Global::g_szCurModulePath) / sizeof(TCHAR));
-	_tsplitpath_s(Global::g_szCurModulePath, szDrive, szDir, Global::g_szFna, szExt);
-#ifdef _DEBUG
-	::GetCurrentDirectory(MAX_PATH, Global::g_szCurModuleDir);
-	_tcscat_s(Global::g_szCurModuleDir, _T("\\"));
-#else
-	_tcscpy_s(Global::g_szCurModuleDir, szDrive);
-	_tcscat_s(Global::g_szCurModuleDir, szDir);
-#endif
 #endif
 
 	CSVNMgr::GetInstance()->Load();

+ 2 - 2
SATHelper/SATHelper/UpgradeWnd.cpp

@@ -363,11 +363,11 @@ HBRUSH CUpgradeWnd::OnCtlColor(CDC* pDC, CWnd* pWnd, UINT nCtlColor)
 	// TODO:  在此更改 DC 的任何特性
 	if (nCtlColor == CTLCOLOR_STATIC ) //静态文本颜色,并且指定控件ID号    && pWnd->GetDlgCtrlID() == IDC_STATIC   
 	{
-		pDC->SetTextColor(RGB(255, 0, 0));
+		//pDC->SetTextColor(RGB(255, 0, 0));
 		//pDC->SetBkColor(RGB(191,219,255));     //静态控件的背景颜色设置,红字蓝底。          
 		pDC->SetBkMode(TRANSPARENT);  //静态文本框背景设置为透明
 		HBRUSH brush;
-		brush = CreateSolidBrush(0xFFEFD5);//对话框的RGB值
+		brush = CreateSolidBrush(0xFFEFD5);//控件背景色
 		hbr = (HBRUSH)brush;
 	}