Acrescentadas informacoes sobre usuario remoto na estacao servidora, via faixa d…

…iscreta no canto superior direito da tela. git-svn-id: http://svn.softwarepublico.gov.br/svn/cacic/cacic/trunk/agente-windows@803 fecfc0c7-e812-0410-ae72-849f08638ee7

Acrescentadas informacoes sobre usuario remoto na estacao servidora, via faixa d…
…iscreta no canto superior direito da tela. git-svn-id: http://svn.softwarepublico.gov.br/svn/cacic/cacic/trunk/agente-windows@803 fecfc0c7-e812-0410-ae72-849f08638ee7
anderson.peterle@previdencia.gov.br
1 parent 9432bc1d
Showing 10 changed files with 96 additions and 75 deletions Show diff stats
srcacic/WinVNC/WinVNC/CACIC_Auth.cpp
srcacic/WinVNC/WinVNC/CACIC_Con.cpp
srcacic/WinVNC/WinVNC/CACIC_Utils.cpp
srcacic/WinVNC/WinVNC/CACIC_Utils.h
srcacic/WinVNC/WinVNC/resource.h
srcacic/WinVNC/WinVNC/supInfoDlg.cpp
srcacic/WinVNC/WinVNC/supInfoDlg.h
srcacic/WinVNC/WinVNC/vncPassDlg.cpp
srcacic/WinVNC/WinVNC/vncPassDlg.h
srcacic/WinVNC/WinVNC/winvnc.rc
@@ -26,14 +26,12 @@ bool CACIC_Auth::autentica()
 	if (!verificaAuthChave(resposta, listaDominios)) return false;
 	vncPassDlg::EAuthCode authStat;
-	if (listaDominios.at(0).id == "0")
-	{
+	if (listaDominios.at(0).id == "0") {
 		authStat = vncPassDlg::SEM_AUTENTICACAO;
-	}
-	else
-	{
+	} else {
 		authStat = vncPassDlg::ESPERANDO_AUTENTICACAO;
 	}
+
 	// apresenta o dialogo de autenticação
 	vncPassDlg passDlg(listaDominios);
 	do
@@ -61,7 +59,6 @@ bool CACIC_Auth::autentica()
 		string session_script = m_scriptsPath.c_str();
 		session_script.append(SET_SESSION_SCRIPT);
-		memset(resposta, 0, sizeof(resposta));
 		CACIC_Con::sendHtppPost(m_servidorWeb, session_script, post, resposta, TAMANHO_RESPOSTA);
 		if(verificaAuthDominio(resposta)) {
@@ -69,7 +66,6 @@ bool CACIC_Auth::autentica()
 		} else {
 			authStat = vncPassDlg::FALHA_AUTENTICACAO;
 		}
-
 	}
 	while (authStat != vncPassDlg::AUTENTICADO);
@@ -270,8 +266,8 @@ bool CACIC_Auth::verificaAuthTecnico(char resposta[], char te_node_address_cli[]
 		m_novoCliente = novoCliente;
-		m_infoDlg.nomeVisitante = novoCliente.nm_usuario_completo;
-		m_infoDlg.dataInicio = novoCliente.dt_hr_inicio_sessao;
+		m_infoDlg.m_nomeVisitante = m_novoCliente.nm_usuario_completo;
+		m_infoDlg.m_dataInicio = m_novoCliente.dt_hr_inicio_sessao;
 		return true;
 	}
@@ -73,6 +73,8 @@ bool CACIC_Con::getResponse(char buff[], unsigned long sz)
 void CACIC_Con::sendHtppPost(const string &servidor, const string &script, string &post,
 							 char resposta[], unsigned long sz)
 {
+	memset(resposta, 0, sz);
+
 	CACIC_Con cCon;
 	cCon.setServer(servidor.c_str());
 	try
@@ -137,3 +137,25 @@ void CACIC_Utils::trim(string &amp;str)
   }
   else str.erase(str.begin(), str.end());
 }
+
+
+void CACIC_Utils::changeFont(HWND dlgHandle, int dlgItem, int fontSize, string fontName, bool fontIsBold)
+{
+	HFONT hFont ;
+	LOGFONT lfFont;
+
+	memset(&lfFont, 0x00, sizeof(lfFont));
+	memcpy(lfFont.lfFaceName, fontName.data(), 16);
+
+	lfFont.lfHeight   = fontSize;
+	lfFont.lfWeight   = (fontIsBold == true) ? FW_BOLD : FW_NORMAL;
+	lfFont.lfCharSet  = ANSI_CHARSET;
+	lfFont.lfOutPrecision = OUT_DEFAULT_PRECIS;
+	lfFont.lfClipPrecision = CLIP_DEFAULT_PRECIS;
+	lfFont.lfQuality  = DEFAULT_QUALITY;
+
+	// Create the font from the LOGFONT structure passed.
+	hFont = CreateFontIndirect (&lfFont);
+
+	SendMessage(GetDlgItem(dlgHandle, dlgItem), WM_SETFONT, (int)hFont, MAKELONG(TRUE, 0));
+}
@@ -25,6 +25,10 @@ public:
 	static char hexToAscii(char first, char second);
 	static void trim(string &str);
+	static void changeFont(HWND dlgHandle, int dlgItem, 
+						   int fontSize, string fontName, 
+						   bool fontIsBold = false);
+
 private:
 	virtual void cutils() = 0; // Truque para tornar a classe abstrata.
@@ -144,6 +144,10 @@
 #define IDC_ATENCAO_STATIC              1147
 #define IDC_ATENCAO                     1147
 #define IDC_SRCACIC_IMG                 1148
+#define IDC_EDIT3                       1150
+#define IDC_INFO_NOME                   1152
+#define IDC_INFO_IP                     1153
+#define IDC_INFO_INICIO                 1154
 #define IDC_FINGER                      9000
 #define IDC_GAMMAGRAY                   9001
 #define IDC_STATIC_SPLIT                9002
@@ -225,7 +229,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        164
 #define _APS_NEXT_COMMAND_VALUE         40019
-#define _APS_NEXT_CONTROL_VALUE         1149
+#define _APS_NEXT_CONTROL_VALUE         1155
 #define _APS_NEXT_SYMED_VALUE           101
 #endif
 #endif
@@ -12,15 +12,15 @@ supInfoDlg::~supInfoDlg()
 HWND supInfoDlg::showInfoDialog()
 {	
 	DWORD threadID;
-	infoDlgThread = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE) supInfoDlg::showDialog, (LPVOID) this, 0, &threadID);
-	ResumeThread(infoDlgThread);
+	m_hInfoDlgThread = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE) supInfoDlg::showDialog, (LPVOID) this, 0, &threadID);
+	ResumeThread(m_hInfoDlgThread);
 	return (HWND) 0;
 }
 HWND supInfoDlg::closeInfoDialog()
 {
-	TerminateThread(infoDlgThread, 0);
+	TerminateThread(m_hInfoDlgThread, 0);
 	return (HWND) 0;
 }
@@ -86,13 +86,9 @@ BOOL CALLBACK supInfoDlg::supInfoDlgProc(HWND hwnd, UINT uMsg, WPARAM wParam, LP
 				dlgRect.bottom - dlgRect.top,
 				SWP_SHOWWINDOW);
-			string text = TEXTO_SUPORTE;
-			text.append("\n\nInício: ");
-			text.append(_this->dataInicio);
-			text.append("\nUsuário Remoto: ");
-			text.append(_this->nomeVisitante);
-			SetDlgItemText(hwnd, IDC_ATENCAO_STATIC, (LPSTR) "ATENÇÃO");
-			SetDlgItemText(hwnd, IDC_AVISO_SUPORTE, (LPSTR) text.data());
+			SetDlgItemText(hwnd, IDC_INFO_NOME, (LPSTR) _this->m_nomeVisitante.data());
+			SetDlgItemText(hwnd, IDC_INFO_IP, (LPSTR) _this->m_ip.data());
+			SetDlgItemText(hwnd, IDC_INFO_INICIO, (LPSTR) _this->m_dataInicio.data());
 			changeFont(hwnd, IDC_ATENCAO_STATIC);
@@ -122,12 +118,16 @@ BOOL CALLBACK supInfoDlg::supInfoDlgProc(HWND hwnd, UINT uMsg, WPARAM wParam, LP
 		}
 		break;
+		// muda a cor de fundo dos itens do dialog
 		case WM_CTLCOLORSTATIC:
 		{
 			HDC hdc = (HDC)wParam;
 			HWND hwndStatic = (HWND)lParam;
-			if (hwndStatic == GetDlgItem(hwnd, IDC_AVISO_SUPORTE))
+			SetBkMode(hdc, TRANSPARENT);
+				return (LRESULT)vrsBkColor;
+
+			/*if (hwndStatic == GetDlgItem(hwnd, IDC_AVISO_SUPORTE))
 			{
 				SetBkMode(hdc, TRANSPARENT);
 				return (LRESULT)vrsBkColor;
@@ -136,10 +136,15 @@ BOOL CALLBACK supInfoDlg::supInfoDlgProc(HWND hwnd, UINT uMsg, WPARAM wParam, LP
 			{
 				SetBkMode(hdc, TRANSPARENT);
 				return (LRESULT)vrsBkColor;
-			}
+			}*/
 		}
 		break;
+		// muda a cor de fundo do dialog
+		case WM_CTLCOLORDLG:
+			return (LONG)vrsBkColor;
+		break;
+
 	}
 	return FALSE;
@@ -12,8 +12,6 @@ using namespace std;
 #pragma once
-#define TEXTO_SUPORTE "ESTA ESTAÇÃO ENCONTRA-SE EM SUPORTE REMOTO."
-
 class supInfoDlg {
 public:
@@ -23,11 +21,12 @@ public:
 	HWND showInfoDialog();
 	HWND closeInfoDialog();
-	string nomeVisitante;
-	string dataInicio;
+	string m_nomeVisitante;
+	string m_ip;
+	string m_dataInicio;
 private:
-	HANDLE infoDlgThread;
+	HANDLE m_hInfoDlgThread;
 	static LRESULT CALLBACK supInfoDlg::showDialog(LPVOID lpParameter);
 	static BOOL CALLBACK supInfoDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
@@ -8,19 +8,21 @@ vncPassDlg::vncPassDlg(vector&lt;Dominio&gt; &amp;listaDominios) {
 	m_listaDominios = listaDominios;
 	m_authStat = vncPassDlg::ESPERANDO_AUTENTICACAO;
-	memset(m_usuario, '\0', 32);
-	memset(m_senha, '\0', 32);
-	memset(m_dominio, '\0', 16);
+	memset(m_usuario, 0, 32);
+	memset(m_senha, 0, 32);
+	memset(m_dominio, 0, 16);
 }
-vncPassDlg::~vncPassDlg()
-{
+vncPassDlg::~vncPassDlg() {
+	memset(m_usuario, 0, 32);
+	memset(m_senha, 0, 32);
+	memset(m_dominio, 0, 16);
 }
-BOOL vncPassDlg::DoDialog(EAuthCode authStat, string msginfo)
+BOOL vncPassDlg::DoDialog(EAuthCode authStat, string msgInfo)
 {
 	m_authStat = authStat;
-	m_msgInfo = msginfo;
+	m_msgInfo = msgInfo;
 	BOOL retVal;
 	if (m_authStat == vncPassDlg::SEM_AUTENTICACAO)
@@ -34,7 +36,7 @@ BOOL vncPassDlg::DoDialog(EAuthCode authStat, string msginfo)
 	{
 		retVal = DialogBoxParam(hInstResDLL, MAKEINTRESOURCE(IDD_AUTH_DLG), 
 			NULL, (DLGPROC) vncAuthDlgProc, (LONG) this);
-	}
+	} 
 	return retVal;
 }
@@ -90,12 +92,6 @@ BOOL CALLBACK vncPassDlg::vncAuthDlgProc(HWND hwnd, UINT uMsg, WPARAM wParam, LP
 				if (found != string::npos)
 					SendMessage(hDominios, CB_SELECTSTRING, 0, (LPARAM) nm_dominio.c_str());
 			}
-			
-			//HWND num_con_cb = GetDlgItem(hwnd, IDC_NUMCON_CB);
-			//SendMessage(num_con_cb, CB_ADDSTRING, 0, (LPARAM)"1");
-			//SendMessage(num_con_cb, CB_ADDSTRING, 0, (LPARAM)"2");
-			//SendMessage(num_con_cb, CB_ADDSTRING, 0, (LPARAM)"3");
-			//SendMessage(num_con_cb, CB_SETCURSEL, 0, 0);
 			if (_this->m_authStat == vncPassDlg::FALHA_AUTENTICACAO)
 			{
@@ -104,6 +100,7 @@ BOOL CALLBACK vncPassDlg::vncAuthDlgProc(HWND hwnd, UINT uMsg, WPARAM wParam, LP
 				SendMessage(hDominios, CB_SELECTSTRING, 0, (LPARAM) _this->m_listaDominios.at(_this->m_indiceDominio).nome.c_str());
 				SetDlgItemText(hwnd, IDC_USER_EDIT, _this->m_usuario);
 				SetDlgItemText(hwnd, IDC_PASS_EDIT, _this->m_senha);
+
 				SetDlgItemText(hwnd, IDC_MSG, (LPSTR) "Falha na autenticação!");
 			}
 			else if (_this->m_authStat == vncPassDlg::AUTENTICADO)
@@ -121,11 +118,6 @@ BOOL CALLBACK vncPassDlg::vncAuthDlgProc(HWND hwnd, UINT uMsg, WPARAM wParam, LP
 				HWND hSenha = GetDlgItem(hwnd, IDC_PASS_EDIT);
 				EnableWindow( hSenha, FALSE );
-				//HWND h_num_con_lbl = GetDlgItem(hwnd, IDC_STATIC_N_CON);
-				//ShowWindow( h_num_con_lbl, TRUE );
-				//HWND h_num_con = GetDlgItem(hwnd, IDC_NUMCON_CB);
-				//ShowWindow( h_num_con, TRUE );
-
 				SetDlgItemText( hwnd, IDC_MSG, (LPSTR)_this->m_msgInfo.c_str() );
 			}
@@ -141,11 +133,6 @@ BOOL CALLBACK vncPassDlg::vncAuthDlgProc(HWND hwnd, UINT uMsg, WPARAM wParam, LP
 				{
 					if (_this->m_authStat == vncPassDlg::AUTENTICADO)
 					{
-						/*HWND numcon_cb = GetDlgItem(hwnd, IDC_NUMCON_CB);
-						int numcon = SendMessage(numcon_cb, CB_GETCURSEL, 0, 0);
-						numcon++;
-						MAX_VNC_CLIENTS = numcon;*/
-
 						EndDialog(hwnd, IDOK);
 					}
@@ -155,28 +142,18 @@ BOOL CALLBACK vncPassDlg::vncAuthDlgProc(HWND hwnd, UINT uMsg, WPARAM wParam, LP
 					HWND hDominios = GetDlgItem(hwnd, IDC_DOMAIN_CB);
 					_this->m_indiceDominio = SendMessage(hDominios, CB_GETCURSEL, 0, 0);
-					memset(_this->m_usuario, '\0', 32);
-					memset(_this->m_senha, '\0', 32);
-					memset(_this->m_dominio, '\0', 16);
+					memset(_this->m_usuario, 0, 32);
+					memset(_this->m_senha, 0, 32);
+					memset(_this->m_dominio, 0, 16);
 					GetDlgItemText(hwnd, IDC_USER_EDIT, _this->m_usuario, 32);
+					GetDlgItemText(hwnd, IDC_PASS_EDIT, _this->m_senha, 32);
+					strcpy(_this->m_dominio, _this->m_listaDominios.at(_this->m_indiceDominio).id.c_str());
-					if (_this->m_authStat == vncPassDlg::SEM_AUTENTICACAO)
-					{
-						strcpy(_this->m_senha, "0");
-						strcpy(_this->m_dominio, "0");
-					}
-					else
+					if (_this->m_usuario[0] == '\0' || _this->m_senha[0] == '\0' || _this->m_dominio[0] == '\0')
 					{
-						GetDlgItemText(hwnd, IDC_PASS_EDIT, _this->m_senha, 32);
-
-						strcpy(_this->m_dominio, _this->m_listaDominios.at(_this->m_indiceDominio).id.c_str());
-
-						if (_this->m_usuario[0] == '\0' || _this->m_senha[0] == '\0' || _this->m_dominio[0] == '\0')
-						{
-							MessageBox(hwnd, "Os campos devem ser preenchidos!", "Erro!", MB_ICONERROR | MB_OK);
-							return FALSE;
-						}
+						MessageBox(hwnd, "Os campos devem ser preenchidos!", "Erro!", MB_ICONERROR | MB_OK);
+						return FALSE;
 					}
 					EndDialog(hwnd, IDOK);
@@ -44,7 +44,7 @@ public:
 	EAuthCode m_authStat;
-	BOOL vncPassDlg::DoDialog(EAuthCode authStat, string msginfo);
+	BOOL DoDialog(EAuthCode authStat, string msgInfo);
 private:
 	static BOOL CALLBACK vncAuthDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
@@ -110,14 +110,20 @@ BEGIN
     EDITTEXT        IDC_DOC_REF,68,41,163,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
 END
-IDD_INFO_DLG DIALOGEX 0, 0, 269, 46
+IDD_INFO_DLG DIALOGEX 0, 0, 261, 51
 STYLE DS_SYSMODAL | DS_SETFONT | DS_FIXEDSYS | WS_POPUP
 EXSTYLE WS_EX_PALETTEWINDOW | WS_EX_DLGMODALFRAME | WS_EX_NOPARENTNOTIFY | WS_EX_ACCEPTFILES | WS_EX_TRANSPARENT | WS_EX_MDICHILD
 FONT 8, "MS Shell Dlg", 400, 0, 0x0
 BEGIN
-    CTEXT           "",IDC_AVISO_SUPORTE,51,11,218,35
-    CTEXT           "",IDC_ATENCAO_STATIC,52,0,217,11
-    CONTROL         163,IDC_SRCACIC_IMG,"Static",SS_BITMAP,0,0,51,47
+    CTEXT           "ESTAÇÃO DE TRABALHO EM SUPORTE REMOTO",IDC_AVISO_SUPORTE,54,12,205,11
+    CTEXT           "ATENÇÃO",IDC_ATENCAO_STATIC,54,2,205,10
+    CONTROL         163,IDC_SRCACIC_IMG,"Static",SS_BITMAP,0,2,51,47
+    LTEXT           "Nome:",IDC_STATIC,54,22,24,8
+    LTEXT           "IP:",IDC_STATIC,54,32,10,8
+    LTEXT           "Início:",IDC_STATIC,54,41,20,8
+    LTEXT           "",IDC_INFO_NOME,78,23,181,8,0,WS_EX_TRANSPARENT
+    LTEXT           "",IDC_INFO_IP,78,32,181,8,0,WS_EX_TRANSPARENT
+    LTEXT           "",IDC_INFO_INICIO,78,41,181,8,0,WS_EX_TRANSPARENT
 END
@@ -195,7 +201,13 @@ BEGIN
     IDD_INFO_DLG, DIALOG
     BEGIN
-        HORZGUIDE, 11
+        VERTGUIDE, 54
+        VERTGUIDE, 78
+        VERTGUIDE, 259
+        BOTTOMMARGIN, 49
+        HORZGUIDE, 2
+        HORZGUIDE, 10
+        HORZGUIDE, 49
     END
 END
 #endif    // APSTUDIO_INVOKED
	@@ -137,3 +137,25 @@ void CACIC_Utils::trim(string &str)		@@ -137,3 +137,25 @@ void CACIC_Utils::trim(string &str)
137	}	137	}
138	else str.erase(str.begin(), str.end());	138	else str.erase(str.begin(), str.end());
139	}	139	}
		140	+
		141	+
		142	+void CACIC_Utils::changeFont(HWND dlgHandle, int dlgItem, int fontSize, string fontName, bool fontIsBold)
		143	+{
		144	+ HFONT hFont ;
		145	+ LOGFONT lfFont;
		146	+
		147	+ memset(&lfFont, 0x00, sizeof(lfFont));
		148	+ memcpy(lfFont.lfFaceName, fontName.data(), 16);
		149	+
		150	+ lfFont.lfHeight = fontSize;
		151	+ lfFont.lfWeight = (fontIsBold == true) ? FW_BOLD : FW_NORMAL;
		152	+ lfFont.lfCharSet = ANSI_CHARSET;
		153	+ lfFont.lfOutPrecision = OUT_DEFAULT_PRECIS;
		154	+ lfFont.lfClipPrecision = CLIP_DEFAULT_PRECIS;
		155	+ lfFont.lfQuality = DEFAULT_QUALITY;
		156	+
		157	+ // Create the font from the LOGFONT structure passed.
		158	+ hFont = CreateFontIndirect (&lfFont);
		159	+
		160	+ SendMessage(GetDlgItem(dlgHandle, dlgItem), WM_SETFONT, (int)hFont, MAKELONG(TRUE, 0));
		161	+}
	@@ -44,7 +44,7 @@ public:		@@ -44,7 +44,7 @@ public:
44		44
45	EAuthCode m_authStat;	45	EAuthCode m_authStat;
46		46
47	- BOOL vncPassDlg::DoDialog(EAuthCode authStat, string msginfo);	47	+ BOOL DoDialog(EAuthCode authStat, string msgInfo);
48		48
49	private:	49	private:
50	static BOOL CALLBACK vncAuthDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);	50	static BOOL CALLBACK vncAuthDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);