Selaa lähdekoodia

修复DSN比较失败的Bug。

JeffWang 3 vuotta sitten
vanhempi
commit
fa3e2017ab

+ 1 - 1
FATP_FQC/FATP_FQC/FATP_FQCDlg.cpp

@@ -250,7 +250,7 @@ void CFATP_FQCDlg::OnBnClickedGetLog()
 			m_strDSN = strDSN.Mid(strDSN.Find(strFindStr) + strFindStr.GetLength());
 			m_strDSN.Trim();
 
-			strFindStr.Format(_T("[%s][PASS]radar fan data collection"), strDSN);
+			strFindStr.Format(_T("[%s][PASS]radar fan data collection"), m_strDSN);
 			if ( GLOBAL::FindString(listDSN, strFindStr, strTemp) )
 			{
 				CString strLogDir;

+ 6 - 3
FATP_FQC/FATP_FQC/Global.cpp

@@ -42,21 +42,23 @@ namespace GLOBAL
 		ZeroMemory(&si,sizeof(STARTUPINFO)); 
 		si.cb = sizeof(STARTUPINFO);  
 		GetStartupInfo(&si);  
-		//si.hStdError = hWrite;  
+		si.hStdError = hWrite;  
 		si.hStdOutput = hWrite; //新创建进程的标准输出连在写管道一端  
 		si.wShowWindow = SW_HIDE; //隐藏窗口  
 		si.dwFlags = STARTF_USESHOWWINDOW | STARTF_USESTDHANDLES;  
+		//si.hStdInput = GetStdHandle(STD_INPUT_HANDLE);
 
 		TCHAR szCommandLine[MAX_PATH] = {0};
 		if ( lpCommandLine ) _stprintf_s(szCommandLine, _T("%s"), lpCommandLine);
-		if (!CreateProcess(lpApplicationName, lpCommandLine ? szCommandLine : NULL, NULL, NULL, TRUE, NULL, NULL, NULL, &si, &pi)) //创建子进程  
+		if (!CreateProcess(lpApplicationName, lpCommandLine ? szCommandLine : NULL, NULL, NULL, TRUE, CREATE_NO_WINDOW, NULL, NULL, &si, &pi)) //创建子进程  
 		{  
 			MessageBox(NULL, _T("CreateProcess Failed!"), _T("提示"), MB_OK | MB_ICONWARNING);  
 			return FALSE;  
 		}  
 
+		dprintf("进程ID=%ld", pi.dwProcessId);
 		// 等待进程完成退出.
-		WaitForSingleObject(pi.hProcess,INFINITE);
+		WaitForSingleObject(pi.hProcess,INFINITE);	
 
 		CloseHandle(hWrite); //关闭管道句柄  
 
@@ -69,6 +71,7 @@ namespace GLOBAL
 			strStdOutput += szBuffer;  
 			Sleep(100);  
 		}  
+		dprintf("输出内容=%s", strStdOutput.GetString());
 		CloseHandle(hRead); 
 
 		return TRUE;

+ 2 - 2
FATP_FQC/FATP_FQC/stdafx.cpp

@@ -13,9 +13,9 @@ void dprintf(TCHAR* pszStr, ...)
 	 struct tm gmtm = { 0 };
 	 localtime_s(&gmtm, &gmt); // Ęąźä´ÁתłÉąžľŘĘąźä;
 #if _MSC_VER >= 1200 && _MSC_VER < 1500
-	 sprintf(szData, _T("[Assist-Client] %04d-%02d-%02d %02d:%02d:%02d "), gmtm.tm_year + 1900, gmtm.tm_mon + 1, gmtm.tm_mday, gmtm.tm_hour, gmtm.tm_min, gmtm.tm_sec);
+	 sprintf(szData, _T("[FQC] %04d-%02d-%02d %02d:%02d:%02d "), gmtm.tm_year + 1900, gmtm.tm_mon + 1, gmtm.tm_mday, gmtm.tm_hour, gmtm.tm_min, gmtm.tm_sec);
 #else
-	 _stprintf_s(szData, _T("[Assist-Client] %04d-%02d-%02d %02d:%02d:%02d "), gmtm.tm_year + 1900, gmtm.tm_mon + 1, gmtm.tm_mday, gmtm.tm_hour, gmtm.tm_min, gmtm.tm_sec);
+	 _stprintf_s(szData, _T("[FQC] %04d-%02d-%02d %02d:%02d:%02d "), gmtm.tm_year + 1900, gmtm.tm_mon + 1, gmtm.tm_mday, gmtm.tm_hour, gmtm.tm_min, gmtm.tm_sec);
 #endif
 	 int len = _tcslen(szData);
 	 va_list args;