Download as
Browse Code »

Commit d92773ea567992bb5c895c918949b05939e9b483

Authored by anderson.peterle@previdencia.gov.br
1 parent 6663eb4f
Exists in master

Ajustes no srCACIC para retomada de conexão em caso de queda, ajustes para versã… 

…o 2.6.0.2, pequenas correções.

git-svn-id: http://svn.softwarepublico.gov.br/svn/cacic/cacic/trunk/agente-windows@950 fecfc0c7-e812-0410-ae72-849f08638ee7
Showing 20 changed files with 920 additions and 380 deletions   Show diff stats
srcacic/VNCViewer/AuthDialog.cpp
  Diff comments   View file @d92773e
... ... @@ -70,6 +70,26 @@ BOOL CALLBACK AuthDialog::DlgProc( HWND hwnd, UINT uMsg,
70 70 AuthDialog *_this = (AuthDialog *) GetWindowLongPtr(hwnd, GWLP_USERDATA);
71 71 #endif
72 72  
  73 + // Anderson PETERLE]
  74 +HFONT myfont;
  75 + myfont=CreateFont
  76 + (
  77 + 14, // logical height of font
  78 + 0, // logical average character width
  79 + 0, // angle of escapement
  80 + 0, // base-line orientation angle
  81 + FW_BOLD,// font weight
  82 + 0, // italic attribute flag
  83 + 0, // underline attribute flag
  84 + 0, // strikeout attribute flag
  85 + ANSI_CHARSET, // character set identifier
  86 + 0, // output precision
  87 + 0, // clipping precision
  88 + 0, // output quality
  89 + 0, // pitch and family
  90 + "Arial" // pointer to typeface name string
  91 + );
  92 + //
73 93 switch (uMsg)
74 94 {
75 95  
... ... @@ -82,8 +102,10 @@ BOOL CALLBACK AuthDialog::DlgProc( HWND hwnd, UINT uMsg,
82 102 #endif
83 103 _this = (AuthDialog *) lParam;
84 104  
  105 + HDC hdc = (HDC)wParam;
85 106 CentreWindow(hwnd);
86 107 SetForegroundWindow(hwnd);
  108 + COLORREF NewColor = RGB(255, 255,0);
87 109  
88 110 // Limitando o tamanho dos campos.
89 111 SendMessage(GetDlgItem(hwnd, IDC_USER_EDIT), EM_LIMITTEXT, WPARAM(32), 0);
... ... @@ -91,6 +113,13 @@ BOOL CALLBACK AuthDialog::DlgProc( HWND hwnd, UINT uMsg,
91 113 SendMessage(GetDlgItem(hwnd, IDC_MOTIVO_EDIT), EM_LIMITTEXT, WPARAM(5120), 0);
92 114 SendMessage(GetDlgItem(hwnd, IDC_DOC_REF_EDIT), EM_LIMITTEXT, WPARAM(128), 0);
93 115  
  116 + // Testes ANDERSON PETERLE
  117 + SendMessage(GetDlgItem(hwnd, IDD_AUTH_DIALOG_LOGIN_TEXT),WM_SETFONT, WPARAM(myfont), (LPARAM)0);
  118 + //SendMessage(GetDlgItem(hwnd, IDD_AUTH_DIALOG_LOGIN_TEXT),WM_SETFONT, NewColor, (LPARAM)0);
  119 + //PostMessage(GetDlgItem(hwnd, IDD_AUTH_DIALOG_LOGIN_TEXT),WM_CTLCOLORSTATIC, RGB(255,0,0),RGB(255,0,0));
  120 +
  121 +
  122 +
94 123 //DefEditProc = (WNDPROC) SetWindowLong(GetDlgItem(hwnd, IDC_MOTIVO_EDIT), GWL_WNDPROC, (long) motivoEditProc);
95 124  
96 125 return TRUE;
... ... @@ -162,9 +191,16 @@ BOOL CALLBACK AuthDialog::DlgProc( HWND hwnd, UINT uMsg,
162 191 if (hwndStatic == GetDlgItem(hwnd, IDC_CHAR_COUNT))
163 192 {
164 193 SetTextColor(hdc, RGB(0, 0, 160));
165   - SetBkMode(hdc, TRANSPARENT);
  194 + SetBkMode(hdc, RGB(212, 208, 200));
  195 +
  196 + return (DWORD)GetStockObject(RGB(212, 208, 200));
  197 + }
  198 + else if(hwndStatic == GetDlgItem(hwnd, IDD_AUTH_DIALOG_LOGIN_TEXT)){
166 199  
167   - return NULL_BRUSH;
  200 + SetTextColor(hdc, RGB(178 ,34, 34 ));
  201 + SetBkMode(hdc, RGB(212, 208, 200));
  202 +
  203 + return (DWORD)GetStockObject(NULL_BRUSH);
168 204 }
169 205 }
170 206 break;
... ...
srcacic/VNCViewer/ClientConnection.cpp
  Diff comments   View file @d92773e
... ... @@ -530,8 +530,9 @@ void ClientConnection::Run()
530 530 // The rest of the processing continues in run_undetached.
531 531 LowLevelHook::Initialize(m_hwndMain);
532 532 start_undetached();
533   -
  533 +
534 534 EndDialog(m_hwndStatus,0);
  535 +
535 536 }
536 537  
537 538 // sf@2007 - Autoreconnect
... ... @@ -612,13 +613,15 @@ void ClientConnection::CreateButtons(BOOL mini,BOOL ultra)
612 613 {
613 614 if (ultra)
614 615 {
615   - int nr_buttons = 14;
  616 + // alterando a quantidade de botões (14-1)
  617 + int nr_buttons = 13;
616 618 TBADDBITMAP tbab;
617 619 TBBUTTON tbButtons []=
618 620 {
619 621 {0,ID_BUTTON_CAD,TBSTATE_ENABLED,TBSTYLE_BUTTON,0L,0},
620 622 {1,ID_BUTTON_FULLSCREEN,TBSTATE_ENABLED,TBSTYLE_BUTTON,0L,1},
621   - {2,ID_BUTTON_PROPERTIES,TBSTATE_ENABLED,TBSTYLE_BUTTON,0L,2},
  623 + // desativando botão "Opções da Conexão"
  624 + //{2,ID_BUTTON_PROPERTIES,TBSTATE_ENABLED,TBSTYLE_BUTTON,0L,2},
622 625 {3,ID_BUTTON_REFRESH,TBSTATE_ENABLED,TBSTYLE_BUTTON,0L,3},
623 626 {4,ID_BUTTON_STRG_ESC,TBSTATE_ENABLED,TBSTYLE_BUTTON,0L,4},
624 627 {5,ID_BUTTON_SEP,TBSTATE_ENABLED,TBSTYLE_BUTTON,0L,5},
... ... @@ -632,11 +635,13 @@ void ClientConnection::CreateButtons(BOOL mini,BOOL ultra)
632 635 {13,ID_BUTTON_TEXTCHAT,TBSTATE_ENABLED,TBSTYLE_BUTTON,0L,13},
633 636  
634 637 };
635   - static char *szTips[14] =
  638 + // reduz a quantidade de mensagens relacionadas aos botões (14-1)
  639 + static char *szTips[13] =
636 640 {
637 641 sz_L2,
638 642 sz_L3,
639   - sz_L4,
  643 + // desativando a mensagem relacionadas ao botão "Opções da Conexão"
  644 + //sz_L4,
640 645 sz_L5,
641 646 sz_L6,
642 647 sz_L7,
... ... @@ -846,7 +851,7 @@ void ClientConnection::CreateButtons(BOOL mini,BOOL ultra)
846 851  
847 852 SendMessage(m_hwndTT, TTM_ADDTOOL, 0,
848 853 (LPARAM) (LPTOOLINFO) &ti);
849   -
  854 +
850 855 }
851 856 SendMessage(m_hwndTB,TB_SETTOOLTIPS,(WPARAM)(HWND)m_hwndTT,(LPARAM)0);
852 857 SendMessage(m_hwndTT,TTM_SETTIPBKCOLOR,(WPARAM)(COLORREF)0x00404040,(LPARAM)0);
... ... @@ -1082,7 +1087,8 @@ void ClientConnection::GTGBS_CreateToolbar()
1082 1087 RECT r;
1083 1088  
1084 1089 GetClientRect(m_hwndTBwin,&r);
1085   - m_TrafficMonitor = CreateWindowEx(WS_EX_NOPARENTNOTIFY | WS_EX_CLIENTEDGE,
  1090 + // Removendo o monitoramento de tráfego
  1091 + /*m_TrafficMonitor = CreateWindowEx(WS_EX_NOPARENTNOTIFY | WS_EX_CLIENTEDGE,
1086 1092 "Static",
1087 1093 NULL,
1088 1094 WS_CHILD | WS_VISIBLE ,
... ... @@ -1093,7 +1099,7 @@ void ClientConnection::GTGBS_CreateToolbar()
1093 1099 m_hwndTBwin,
1094 1100 NULL,
1095 1101 m_pApp->m_instance,
1096   - NULL);
  1102 + NULL);*/
1097 1103  
1098 1104 m_bitmapNONE = LoadImage(m_pApp->m_instance,MAKEINTRESOURCE(IDB_STAT_NONE),IMAGE_BITMAP,22,20,LR_SHARED);
1099 1105 m_bitmapFRONT = LoadImage(m_pApp->m_instance,MAKEINTRESOURCE(IDB_STAT_FRONT),IMAGE_BITMAP,22,20,LR_SHARED);
... ... @@ -1108,7 +1114,8 @@ void ClientConnection::GTGBS_CreateToolbar()
1108 1114 ReleaseDC(m_TrafficMonitor,hdc);
1109 1115  
1110 1116 ///////////////////////////////////////////////////
1111   - m_logo_wnd = CreateWindow(
  1117 + // Removendo opção de nova conexão a partir da barra de ferramentas
  1118 + /*m_logo_wnd = CreateWindow(
1112 1119 "combobox",
1113 1120 "",
1114 1121 WS_CHILD | WS_VISIBLE | WS_TABSTOP|CBS_SIMPLE | CBS_AUTOHSCROLL | WS_VSCROLL,
... ... @@ -1131,7 +1138,7 @@ void ClientConnection::GTGBS_CreateToolbar()
1131 1138 m_hwndTBwin,
1132 1139 (HMENU)9998,
1133 1140 m_pApp->m_instance,
1134   - NULL);
  1141 + NULL);*/
1135 1142 TCHAR valname[256];
1136 1143 MRU *m_pMRU;
1137 1144 m_pMRU = new MRU(SESSION_MRU_KEY_NAME,26);
... ... @@ -1267,9 +1274,9 @@ void ClientConnection::CreateDisplay()
1267 1274 AppendMenu(hsysmenu, MF_STRING, ID_HALFSCREEN, sz_L26);
1268 1275 AppendMenu(hsysmenu, MF_STRING, ID_FUZZYSCREEN, sz_L27);
1269 1276 AppendMenu(hsysmenu, MF_STRING, ID_NORMALSCREEN, sz_L28);
1270   - AppendMenu(hsysmenu, MF_SEPARATOR, NULL, NULL);
1271   - AppendMenu(hsysmenu, MF_STRING, ID_MAXCOLORS, sz_L29);
1272   - AppendMenu(hsysmenu, MF_STRING, ID_256COLORS, sz_L30);
  1277 + //AppendMenu(hsysmenu, MF_SEPARATOR, NULL, NULL);
  1278 + //AppendMenu(hsysmenu, MF_STRING, ID_MAXCOLORS, sz_L29);
  1279 + //AppendMenu(hsysmenu, MF_STRING, ID_256COLORS, sz_L30);
1273 1280 AppendMenu(hsysmenu, MF_SEPARATOR, NULL, NULL);
1274 1281 AppendMenu(hsysmenu, MF_STRING, ID_CONN_CTLALTDEL, sz_L31);
1275 1282 AppendMenu(hsysmenu, MF_STRING, ID_CONN_CTLESC, sz_L32);
... ... @@ -1278,7 +1285,7 @@ void ClientConnection::CreateDisplay()
1278 1285 AppendMenu(hsysmenu, MF_STRING, ID_CONN_ALTDOWN, sz_L35);
1279 1286 AppendMenu(hsysmenu, MF_STRING, ID_CONN_ALTUP, sz_L36);
1280 1287 AppendMenu(hsysmenu, MF_SEPARATOR, NULL, NULL);
1281   - AppendMenu(hsysmenu, MF_STRING, ID_NEWCONN, sz_L37);
  1288 + //AppendMenu(hsysmenu, MF_STRING, ID_NEWCONN, sz_L37);
1282 1289 AppendMenu(hsysmenu, MF_STRING | (m_serverInitiated ? MF_GRAYED : 0),
1283 1290 ID_CONN_SAVE_AS, sz_L38);
1284 1291 }
... ... @@ -1425,7 +1432,7 @@ void ClientConnection::HandleQuickOption()
1425 1432 {
1426 1433 switch (m_opts.m_quickoption)
1427 1434 {
1428   - case 1:
  1435 + /*case 1:
1429 1436 m_opts.m_PreferredEncoding = rfbEncodingZRLE;
1430 1437 m_opts.m_Use8Bit = rfbPFFullColors; //false;
1431 1438 m_opts.m_fEnableCache = true;
... ... @@ -1480,15 +1487,18 @@ void ClientConnection::HandleQuickOption()
1480 1487 m_opts.m_requestShapeUpdates = false;
1481 1488 m_opts.m_ignoreShapeUpdates = true;
1482 1489 // m_opts.m_localCursor = NOCURSOR;
1483   - break;
  1490 + break;*/
  1491 +
  1492 +
1484 1493  
  1494 + //Set Cor e modo de cache
1485 1495 default: // 0 can be set by noauto command line option. Do not chnage any setting in this case
1486   - /* sf@2005
  1496 + //sf@2005
1487 1497 m_opts.m_PreferredEncoding = rfbEncodingZRLE;
1488 1498 m_opts.m_Use8Bit = rfbPF256Colors; //false;
1489 1499 m_opts.m_fEnableCache = true;
1490 1500 m_opts.autoDetect = false;
1491   - */
  1501 +
1492 1502 break;
1493 1503 }
1494 1504  
... ... @@ -2336,6 +2346,7 @@ void ClientConnection::SizeWindow()
2336 2346 else
2337 2347 m_winheight = min(m_fullwinheight, workheight);
2338 2348  
  2349 + // cria a janela de suporte remoto
2339 2350 SetWindowPos(m_hwndMain, HWND_TOP,
2340 2351 workrect.left + (workwidth-m_winwidth) / 2,
2341 2352 workrect.top + (workheight-m_winheight) / 2,
... ... @@ -5670,14 +5681,14 @@ LRESULT CALLBACK ClientConnection::WndProc(HWND hwnd, UINT iMsg, WPARAM wParam,
5670 5681  
5671 5682 // TODO: quando o cliente é removido pelo servidor ou cai, a janela sobre o logout aparece assim mesmo.
5672 5683 if (_this->m_running) {
5673   - int doLogout = MessageBox(hwnd, "Deseja efetuar logout na máquina remota?", "srCACICcli", MB_YESNO);
5674   - if (doLogout == IDNO) {
  5684 + //int doLogout = MessageBox(hwnd, "Deseja efetuar logout na máquina remota?", "srCACICcli", MB_YESNO);
  5685 + //if (doLogout == IDNO) {
5675 5686 // CACIC: Envia mensagem dizendo que o servidor deve efetuar o logout.
5676 5687 rfbNoLogoutMsg nl;
5677 5688 nl.type = rfbNoLogout;
5678 5689  
5679 5690 _this->WriteExact((char *)&nl, sz_rfbNoLogoutMsg, rfbNoLogout);
5680   - }
  5691 + //}
5681 5692 }
5682 5693  
5683 5694 // Close the worker thread
... ...
srcacic/VNCViewer/Res/resource.h
  Diff comments   View file @d92773e
... ... @@ -107,6 +107,7 @@
107 107 #define IDC_ALTGR 1043
108 108 #define IDD_AUTH_DIALOG1 1043
109 109 #define IDD_AUTH_DIALOG 1043
  110 +#define IDD_AUTH_DIALOG_LOGIN_TEXT 1043
110 111 #define IDC_DOWNLOAD_B 1044
111 112 #define IDC_STRG 1044
112 113 #define IDC_PROGRESS 1045
... ... @@ -212,6 +213,8 @@
212 213 #define IDC_DOC_REF_EDIT 1165
213 214 #define IDC_KEY_COUNT 1166
214 215 #define IDC_CHAR_COUNT 1166
  216 +#define IDC_MIDOCVIEW1 1167
  217 +#define IDC_EDIT4 1168
215 218 #define IDC_ENCODING_BASE 1999
216 219 #define IDC_RAWRADIO 2000
217 220 #define IDC_RRERADIO 2002
... ... @@ -514,7 +517,7 @@
514 517 #ifndef APSTUDIO_READONLY_SYMBOLS
515 518 #define _APS_NEXT_RESOURCE_VALUE 199
516 519 #define _APS_NEXT_COMMAND_VALUE 50025
517   -#define _APS_NEXT_CONTROL_VALUE 1167
  520 +#define _APS_NEXT_CONTROL_VALUE 1169
518 521 #define _APS_NEXT_SYMED_VALUE 154
519 522 #endif
520 523 #endif
... ...
srcacic/VNCViewer/Res/vncviewer.rc
  Diff comments   View file @d92773e
... ... @@ -101,7 +101,7 @@ BEGIN
101 101 MENUITEM "Nova Conexão", ID_NEWCONN
102 102 MENUITEM "Opções Padrão", IDC_OPTIONBUTTON
103 103 MENUITEM SEPARATOR
104   - MENUITEM "Sobre o CacicRC...", IDD_ABOUT
  104 + MENUITEM "Sobre o srCACIC...", IDD_ABOUT
105 105 MENUITEM SEPARATOR
106 106 MENUITEM "Ativar/Desativar Modo Escuta", ID_LISTEN_MODE
107 107 MENUITEM "Fechar o srCACIC Cliente", ID_CLOSEAPP
... ... @@ -232,18 +232,16 @@ BEGIN
232 232 PUSHBUTTON "Renomear",IDC_RENAME_B,248,239,60,14,BS_FLAT
233 233 END
234 234  
235   -IDD_SESSION_DLG DIALOGEX 0, 0, 186, 86
  235 +IDD_SESSION_DLG DIALOGEX 0, 0, 195, 50
236 236 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
237 237 CAPTION "Sistema CACIC - Módulo srCACICcli - Conexão"
238 238 FONT 8, "MS Shell Dlg", 0, 0, 0x0
239 239 BEGIN
240   - COMBOBOX IDC_HOSTNAME_EDIT,5,38,176,66,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
241   - DEFPUSHBUTTON "Conectar",IDOK,50,62,40,19
242   - PUSHBUTTON "Cancelar",IDCANCEL,94,62,40,19
243   - CONTROL 108,IDC_STATIC,"Static",SS_BITMAP,5,6,21,20
244   - CONTROL "Observar Somente",IDC_VIEWONLY_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,32,5,77,12
245   - CONTROL "Auto Ajuste da Tela",IDC_AUTOSCALING_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,32,14,80,15
246   - LTEXT "Servidor:",IDC_STATIC,5,29,30,8
  240 + COMBOBOX IDC_HOSTNAME_EDIT,37,14,146,66,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
  241 + DEFPUSHBUTTON "Conectar",IDOK,51,31,40,14
  242 + PUSHBUTTON "Cancelar",IDCANCEL,100,31,40,14
  243 + CONTROL 108,IDC_STATIC,"Static",SS_BITMAP,5,11,21,20
  244 + LTEXT "Servidor:",IDC_STATIC,39,5,30,8
247 245 END
248 246  
249 247 IDD_SERVINFO_DLG DIALOG 0, 0, 224, 170
... ... @@ -298,23 +296,23 @@ BEGIN
298 296 LTEXT "Encoder:",IDC_STATIC,13,45,63,8
299 297 END
300 298  
301   -IDD_AUTH_DIALOG DIALOGEX 101, 66, 217, 164
  299 +IDD_AUTH_DIALOG DIALOGEX 101, 66, 229, 165
302 300 STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION
303 301 CAPTION "Sistema CACIC - Módulo srCACICcli - Autenticação"
304 302 FONT 8, "MS Shell Dlg", 0, 0, 0x0
305 303 BEGIN
306   - EDITTEXT IDC_USER_EDIT,119,21,91,14,ES_AUTOHSCROLL
307   - EDITTEXT IDC_PASSWD_EDIT,119,38,91,14,ES_PASSWORD | ES_AUTOHSCROLL
308   - EDITTEXT IDC_DOC_REF_EDIT,119,55,91,14,ES_AUTOHSCROLL
309   - EDITTEXT IDC_MOTIVO_EDIT,7,80,203,56,ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_WANTRETURN
310   - DEFPUSHBUTTON "C&onectar",IDOK,102,142,54,15
311   - PUSHBUTTON "&Cancelar",IDCANCEL,160,142,50,15
  304 + EDITTEXT IDC_USER_EDIT,124,21,98,14,ES_AUTOHSCROLL
  305 + EDITTEXT IDC_PASSWD_EDIT,124,38,98,14,ES_PASSWORD | ES_AUTOHSCROLL
  306 + EDITTEXT IDC_DOC_REF_EDIT,123,55,99,14,ES_AUTOHSCROLL
  307 + EDITTEXT IDC_MOTIVO_EDIT,7,80,215,56,ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_WANTRETURN | WS_VSCROLL
  308 + DEFPUSHBUTTON "C&onectar",IDOK,102,143,54,15
  309 + PUSHBUTTON "&Cancelar",IDCANCEL,172,143,50,15
312 310 RTEXT "Usuário:",IDC_STATIC,76,24,39,10
313 311 RTEXT "Senha:",IDC_STATIC,80,41,35,8
314 312 LTEXT "Doc. Referência:",IDC_DOC_REF,61,58,55,8
315 313 LTEXT "Motivo do Suporte: (tamanho máximo 5120 caracteres)",IDC_MOTIVO_SUPORTE,7,70,179,8
316 314 CONTROL 156,IDC_STATIC,"Static",SS_BITMAP | SS_CENTERIMAGE | SS_SUNKEN,7,21,50,45
317   - LTEXT "Por favor, digite seu nome de usuário e senha no gerente web.",IDC_STATIC,7,7,203,11
  315 + CTEXT "Digite usuário e senha utilizados no Gerente Web CACIC",IDD_AUTH_DIALOG_LOGIN_TEXT,7,2,215,10
318 316 LTEXT "",IDC_CHAR_COUNT,7,136,43,8,0,WS_EX_TRANSPARENT
319 317 END
320 318  
... ... @@ -408,9 +406,9 @@ BEGIN
408 406 IDD_SESSION_DLG, DIALOG
409 407 BEGIN
410 408 LEFTMARGIN, 5
411   - RIGHTMARGIN, 181
  409 + RIGHTMARGIN, 190
412 410 TOPMARGIN, 5
413   - BOTTOMMARGIN, 81
  411 + BOTTOMMARGIN, 45
414 412 END
415 413  
416 414 IDD_SERVINFO_DLG, DIALOG
... ... @@ -440,10 +438,10 @@ BEGIN
440 438 IDD_AUTH_DIALOG, DIALOG
441 439 BEGIN
442 440 LEFTMARGIN, 7
443   - RIGHTMARGIN, 210
  441 + RIGHTMARGIN, 222
444 442 VERTGUIDE, 102
445 443 TOPMARGIN, 7
446   - BOTTOMMARGIN, 157
  444 + BOTTOMMARGIN, 158
447 445 END
448 446  
449 447 IDD_FTPARAM_DLG, DIALOG
... ... @@ -535,8 +533,8 @@ IDB_VNC32 BITMAP "vnc32.BMP"
535 533 //
536 534  
537 535 VS_VERSION_INFO VERSIONINFO
538   - FILEVERSION 2,5,9,0
539   - PRODUCTVERSION 2,6,0,0
  536 + FILEVERSION 2,6,0,2
  537 + PRODUCTVERSION 2,6,0,2
540 538 FILEFLAGSMASK 0x37L
541 539 #ifdef _DEBUG
542 540 FILEFLAGS 0x25L
... ... @@ -549,21 +547,20 @@ VS_VERSION_INFO VERSIONINFO
549 547 BEGIN
550 548 BLOCK "StringFileInfo"
551 549 BEGIN
552   - BLOCK "080004b0"
  550 + BLOCK "000004b0"
553 551 BEGIN
554   - VALUE "Comments", "Licença: GNU/LGPL"
555   - VALUE "CompanyName", "Dataprev-Emp. de TI da Prev Social - UDSL/SSLC"
556   - VALUE "FileDescription", "Sistema CACIC - Módulo Cliente para Suporte Remoto Seguro"
557   - VALUE "FileVersion", "2.5.9.0"
  552 + VALUE "CompanyName", "Dataprev - Unidade Regional Espírito Santo"
  553 + VALUE "FileDescription", "Visualizador do Suporte Remoto Seguro do Sistema CACIC"
  554 + VALUE "FileVersion", "2, 5, 0, 991"
558 555 VALUE "InternalName", "srCACICcli"
559 556 VALUE "LegalCopyright", "Copyright © 2008 DATAPREV"
560   - VALUE "ProductName", "srCACIC"
561   - VALUE "ProductVersion", "2.6.0.0"
  557 + VALUE "LegalTrademarks", "srCACIC"
  558 + VALUE "ProductVersion", "2, 5, 0, 991"
562 559 END
563 560 END
564 561 BLOCK "VarFileInfo"
565 562 BEGIN
566   - VALUE "Translation", 0x800, 1200
  563 + VALUE "Translation", 0x0, 1200
567 564 END
568 565 END
569 566  
... ... @@ -777,7 +774,7 @@ BEGIN
777 774 IDS_L18 "Mostrar Barra de Ferramentas \tCtrl+Alt+F9"
778 775 IDS_L19 "Desabilitar Remote Input/Monitor"
779 776 IDS_L20 "Habilitar Remote Input/Monitor "
780   - IDS_L21 "&Opções da Conexão... \tCtrl+Alt+F6"
  777 + IDS_L21 "&Opções da Conexão..."
781 778 IDS_L22 "&Informações da Conexão"
782 779 IDS_L23 "Solicita&r Atualização da Tela"
783 780 IDS_L24 "&Full Screen \tCtrl+Alt+F12"
... ... @@ -789,8 +786,6 @@ END
789 786  
790 787 STRINGTABLE
791 788 BEGIN
792   - IDS_L29 "&Todas Cores"
793   - IDS_L30 "&256 Cores"
794 789 IDS_L31 "Enviar Ctrl+Alt+Del \tCtrl+Alt+F4"
795 790 IDS_L32 "Enviar Ctrl+Esc (Start menu)"
796 791 IDS_L33 "Ctrl Key Down"
... ...
srcacic/VNCViewer/VNCOptions.cpp
  Diff comments   View file @d92773e
... ... @@ -892,8 +892,10 @@ void VNCOptions::ShowUsage(LPTSTR info) {
892 892 int VNCOptions::DoDialog(bool running)
893 893 {
894 894 m_running = running;
895   - return DialogBoxParam(pApp->m_instance, DIALOG_MAKEINTRESOURCE(IDD_OPTIONDIALOG),
896   - NULL, (DLGPROC) OptDlgProc, (LONG) this);
  895 + //desativa a instanciação janela de opções
  896 + /*return DialogBoxParam(pApp->m_instance, DIALOG_MAKEINTRESOURCE(IDD_OPTIONDIALOG),
  897 + NULL, (DLGPROC) OptDlgProc, (LONG) this);*/
  898 + return NULL;
897 899 }
898 900  
899 901 BOOL CALLBACK VNCOptions::OptDlgProc( HWND hwnd, UINT uMsg,
... ...
srcacic/VNCViewer/VNCViewer.vcproj
  Diff comments   View file @d92773e
... ... @@ -117,9 +117,9 @@
117 117 />
118 118 </Configuration>
119 119 <Configuration
120   - Name="Debug|x64"
121   - OutputDirectory="$(PlatformName)\$(ConfigurationName)"
122   - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
  120 + Name="Release|Win32"
  121 + OutputDirectory=".\Release"
  122 + IntermediateDirectory=".\Release"
123 123 ConfigurationType="1"
124 124 UseOfMFC="0"
125 125 ATLMinimizesCRunTimeLibraryUsage="false"
... ... @@ -138,57 +138,57 @@
138 138 />
139 139 <Tool
140 140 Name="VCMIDLTool"
141   - PreprocessorDefinitions="_DEBUG"
  141 + PreprocessorDefinitions="NDEBUG"
142 142 MkTypLibCompatible="true"
143 143 SuppressStartupBanner="true"
144   - TargetEnvironment="3"
145   - TypeLibraryName=".\Debug/vncviewer.tlb"
  144 + TargetEnvironment="1"
  145 + TypeLibraryName=".\Release/vncviewer.tlb"
146 146 HeaderFileName=""
147 147 />
148 148 <Tool
149 149 Name="VCCLCompilerTool"
150   - Optimization="0"
  150 + Optimization="3"
  151 + InlineFunctionExpansion="2"
  152 + EnableIntrinsicFunctions="true"
  153 + FavorSizeOrSpeed="1"
  154 + EnableFiberSafeOptimizations="true"
  155 + WholeProgramOptimization="true"
151 156 AdditionalIncludeDirectories="omnithread,.."
152   - PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;__NT__;_WINSTATIC;__WIN32__;_CRT_SECURE_NO_WARNINGS;_X64"
153   - MinimalRebuild="true"
154   - RuntimeLibrary="1"
155   - PrecompiledHeaderFile=".\Debug/vncviewer.pch"
156   - AssemblerListingLocation=".\Debug/"
157   - ObjectFile=".\Debug/"
158   - ProgramDataBaseFileName=".\Debug/"
159   - BrowseInformation="1"
  157 + PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;__NT__;_WINSTATIC;__WIN32__;_CRT_SECURE_NO_WARNINGS"
  158 + RuntimeLibrary="0"
  159 + PrecompiledHeaderFile=".\Release/vncviewer.pch"
  160 + AssemblerListingLocation=".\Release/"
  161 + ObjectFile=".\Release/"
  162 + ProgramDataBaseFileName=".\Release/"
160 163 WarningLevel="3"
161 164 SuppressStartupBanner="true"
162   - DebugInformationFormat="3"
163 165 />
164 166 <Tool
165 167 Name="VCManagedResourceCompilerTool"
166 168 />
167 169 <Tool
168 170 Name="VCResourceCompilerTool"
169   - PreprocessorDefinitions="_DEBUG"
  171 + PreprocessorDefinitions="NDEBUG"
170 172 Culture="1033"
171 173 />
172 174 <Tool
173 175 Name="VCPreLinkEventTool"
174 176 Description="Setting build time..."
175   - CommandLine="cl /nologo /MTd /FoDebug\ /FdDebug\ /c buildtime.cpp"
  177 + CommandLine="cl /nologo /MT /FoRelease\ /FdRelease\ /c buildtime.cpp"
176 178 />
177 179 <Tool
178 180 Name="VCLinkerTool"
  181 + AdditionalOptions="/LTCG"
179 182 AdditionalDependencies="comctl32.lib winmm.lib omnithread.lib wsock32.lib"
180   - OutputFile=".\Debug/vncviewer.exe"
  183 + OutputFile=".\Release/srcaciccli.exe"
181 184 LinkIncremental="2"
182 185 SuppressStartupBanner="true"
183   - AdditionalLibraryDirectories="./omnithread/Debug"
184   - GenerateDebugInformation="true"
185   - ProgramDatabaseFile=".\Debug/vncviewer.pdb"
186   - GenerateMapFile="true"
187   - MapFileName=".\Debug/vncviewer.map"
  186 + AdditionalLibraryDirectories="omnithread/Release"
  187 + ProgramDatabaseFile=".\Release/vncviewer.pdb"
188 188 SubSystem="2"
189 189 RandomizedBaseAddress="1"
190 190 DataExecutionPrevention="0"
191   - TargetMachine="17"
  191 + TargetMachine="1"
192 192 />
193 193 <Tool
194 194 Name="VCALinkTool"
... ... @@ -202,7 +202,7 @@
202 202 <Tool
203 203 Name="VCBscMakeTool"
204 204 SuppressStartupBanner="true"
205   - OutputFile=".\Debug/vncviewer.bsc"
  205 + OutputFile=".\Release/vncviewer.bsc"
206 206 />
207 207 <Tool
208 208 Name="VCFxCopTool"
... ... @@ -215,9 +215,9 @@
215 215 />
216 216 </Configuration>
217 217 <Configuration
218   - Name="Release|Win32"
219   - OutputDirectory=".\Release"
220   - IntermediateDirectory=".\Release"
  218 + Name="Debug|x64"
  219 + OutputDirectory="$(PlatformName)\$(ConfigurationName)"
  220 + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
221 221 ConfigurationType="1"
222 222 UseOfMFC="0"
223 223 ATLMinimizesCRunTimeLibraryUsage="false"
... ... @@ -236,57 +236,57 @@
236 236 />
237 237 <Tool
238 238 Name="VCMIDLTool"
239   - PreprocessorDefinitions="NDEBUG"
  239 + PreprocessorDefinitions="_DEBUG"
240 240 MkTypLibCompatible="true"
241 241 SuppressStartupBanner="true"
242   - TargetEnvironment="1"
243   - TypeLibraryName=".\Release/vncviewer.tlb"
  242 + TargetEnvironment="3"
  243 + TypeLibraryName=".\Debug/vncviewer.tlb"
244 244 HeaderFileName=""
245 245 />
246 246 <Tool
247 247 Name="VCCLCompilerTool"
248   - Optimization="3"
249   - InlineFunctionExpansion="2"
250   - EnableIntrinsicFunctions="true"
251   - FavorSizeOrSpeed="1"
252   - EnableFiberSafeOptimizations="true"
253   - WholeProgramOptimization="true"
  248 + Optimization="0"
254 249 AdditionalIncludeDirectories="omnithread,.."
255   - PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;__NT__;_WINSTATIC;__WIN32__;_CRT_SECURE_NO_WARNINGS"
256   - RuntimeLibrary="0"
257   - PrecompiledHeaderFile=".\Release/vncviewer.pch"
258   - AssemblerListingLocation=".\Release/"
259   - ObjectFile=".\Release/"
260   - ProgramDataBaseFileName=".\Release/"
  250 + PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;__NT__;_WINSTATIC;__WIN32__;_CRT_SECURE_NO_WARNINGS;_X64"
  251 + MinimalRebuild="true"
  252 + RuntimeLibrary="1"
  253 + PrecompiledHeaderFile=".\Debug/vncviewer.pch"
  254 + AssemblerListingLocation=".\Debug/"
  255 + ObjectFile=".\Debug/"
  256 + ProgramDataBaseFileName=".\Debug/"
  257 + BrowseInformation="1"
261 258 WarningLevel="3"
262 259 SuppressStartupBanner="true"
  260 + DebugInformationFormat="3"
263 261 />
264 262 <Tool
265 263 Name="VCManagedResourceCompilerTool"
266 264 />
267 265 <Tool
268 266 Name="VCResourceCompilerTool"
269   - PreprocessorDefinitions="NDEBUG"
  267 + PreprocessorDefinitions="_DEBUG"
270 268 Culture="1033"
271 269 />
272 270 <Tool
273 271 Name="VCPreLinkEventTool"
274 272 Description="Setting build time..."
275   - CommandLine="cl /nologo /MT /FoRelease\ /FdRelease\ /c buildtime.cpp"
  273 + CommandLine="cl /nologo /MTd /FoDebug\ /FdDebug\ /c buildtime.cpp"
276 274 />
277 275 <Tool
278 276 Name="VCLinkerTool"
279   - AdditionalOptions="/LTCG"
280 277 AdditionalDependencies="comctl32.lib winmm.lib omnithread.lib wsock32.lib"
281   - OutputFile=".\Release/srcaciccli.exe"
  278 + OutputFile=".\Debug/vncviewer.exe"
282 279 LinkIncremental="2"
283 280 SuppressStartupBanner="true"
284   - AdditionalLibraryDirectories="omnithread/Release"
285   - ProgramDatabaseFile=".\Release/vncviewer.pdb"
  281 + AdditionalLibraryDirectories="./omnithread/Debug"
  282 + GenerateDebugInformation="true"
  283 + ProgramDatabaseFile=".\Debug/vncviewer.pdb"
  284 + GenerateMapFile="true"
  285 + MapFileName=".\Debug/vncviewer.map"
286 286 SubSystem="2"
287 287 RandomizedBaseAddress="1"
288 288 DataExecutionPrevention="0"
289   - TargetMachine="1"
  289 + TargetMachine="17"
290 290 />
291 291 <Tool
292 292 Name="VCALinkTool"
... ... @@ -300,7 +300,7 @@
300 300 <Tool
301 301 Name="VCBscMakeTool"
302 302 SuppressStartupBanner="true"
303   - OutputFile=".\Release/vncviewer.bsc"
  303 + OutputFile=".\Debug/vncviewer.bsc"
304 304 />
305 305 <Tool
306 306 Name="VCFxCopTool"
... ... @@ -598,7 +598,7 @@
598 598 />
599 599 </FileConfiguration>
600 600 <FileConfiguration
601   - Name="Debug|x64"
  601 + Name="Release|Win32"
602 602 >
603 603 <Tool
604 604 Name="VCResourceCompilerTool"
... ... @@ -607,7 +607,7 @@
607 607 />
608 608 </FileConfiguration>
609 609 <FileConfiguration
610   - Name="Release|Win32"
  610 + Name="Debug|x64"
611 611 >
612 612 <Tool
613 613 Name="VCResourceCompilerTool"
... ... @@ -642,7 +642,7 @@
642 642 />
643 643 </FileConfiguration>
644 644 <FileConfiguration
645   - Name="Debug|x64"
  645 + Name="Release|Win32"
646 646 >
647 647 <Tool
648 648 Name="VCCLCompilerTool"
... ... @@ -651,7 +651,7 @@
651 651 />
652 652 </FileConfiguration>
653 653 <FileConfiguration
654   - Name="Release|Win32"
  654 + Name="Debug|x64"
655 655 >
656 656 <Tool
657 657 Name="VCCLCompilerTool"
... ... @@ -682,7 +682,7 @@
682 682 />
683 683 </FileConfiguration>
684 684 <FileConfiguration
685   - Name="Debug|x64"
  685 + Name="Release|Win32"
686 686 >
687 687 <Tool
688 688 Name="VCCLCompilerTool"
... ... @@ -691,7 +691,7 @@
691 691 />
692 692 </FileConfiguration>
693 693 <FileConfiguration
694   - Name="Release|Win32"
  694 + Name="Debug|x64"
695 695 >
696 696 <Tool
697 697 Name="VCCLCompilerTool"
... ... @@ -722,7 +722,7 @@
722 722 />
723 723 </FileConfiguration>
724 724 <FileConfiguration
725   - Name="Debug|x64"
  725 + Name="Release|Win32"
726 726 >
727 727 <Tool
728 728 Name="VCCLCompilerTool"
... ... @@ -731,7 +731,7 @@
731 731 />
732 732 </FileConfiguration>
733 733 <FileConfiguration
734   - Name="Release|Win32"
  734 + Name="Debug|x64"
735 735 >
736 736 <Tool
737 737 Name="VCCLCompilerTool"
... ... @@ -766,7 +766,7 @@
766 766 />
767 767 </FileConfiguration>
768 768 <FileConfiguration
769   - Name="Debug|x64"
  769 + Name="Release|Win32"
770 770 >
771 771 <Tool
772 772 Name="VCCLCompilerTool"
... ... @@ -775,7 +775,7 @@
775 775 />
776 776 </FileConfiguration>
777 777 <FileConfiguration
778   - Name="Release|Win32"
  778 + Name="Debug|x64"
779 779 >
780 780 <Tool
781 781 Name="VCCLCompilerTool"
... ... @@ -814,7 +814,7 @@
814 814 />
815 815 </FileConfiguration>
816 816 <FileConfiguration
817   - Name="Debug|x64"
  817 + Name="Release|Win32"
818 818 >
819 819 <Tool
820 820 Name="VCCLCompilerTool"
... ... @@ -823,7 +823,7 @@
823 823 />
824 824 </FileConfiguration>
825 825 <FileConfiguration
826   - Name="Release|Win32"
  826 + Name="Debug|x64"
827 827 >
828 828 <Tool
829 829 Name="VCCLCompilerTool"
... ... @@ -854,7 +854,7 @@
854 854 />
855 855 </FileConfiguration>
856 856 <FileConfiguration
857   - Name="Debug|x64"
  857 + Name="Release|Win32"
858 858 >
859 859 <Tool
860 860 Name="VCCLCompilerTool"
... ... @@ -863,7 +863,7 @@
863 863 />
864 864 </FileConfiguration>
865 865 <FileConfiguration
866   - Name="Release|Win32"
  866 + Name="Debug|x64"
867 867 >
868 868 <Tool
869 869 Name="VCCLCompilerTool"
... ... @@ -894,7 +894,7 @@
894 894 />
895 895 </FileConfiguration>
896 896 <FileConfiguration
897   - Name="Debug|x64"
  897 + Name="Release|Win32"
898 898 >
899 899 <Tool
900 900 Name="VCCLCompilerTool"
... ... @@ -903,7 +903,7 @@
903 903 />
904 904 </FileConfiguration>
905 905 <FileConfiguration
906   - Name="Release|Win32"
  906 + Name="Debug|x64"
907 907 >
908 908 <Tool
909 909 Name="VCCLCompilerTool"
... ... @@ -934,7 +934,7 @@
934 934 />
935 935 </FileConfiguration>
936 936 <FileConfiguration
937   - Name="Debug|x64"
  937 + Name="Release|Win32"
938 938 >
939 939 <Tool
940 940 Name="VCCLCompilerTool"
... ... @@ -943,7 +943,7 @@
943 943 />
944 944 </FileConfiguration>
945 945 <FileConfiguration
946   - Name="Release|Win32"
  946 + Name="Debug|x64"
947 947 >
948 948 <Tool
949 949 Name="VCCLCompilerTool"
... ... @@ -974,7 +974,7 @@
974 974 />
975 975 </FileConfiguration>
976 976 <FileConfiguration
977   - Name="Debug|x64"
  977 + Name="Release|Win32"
978 978 >
979 979 <Tool
980 980 Name="VCCLCompilerTool"
... ... @@ -983,7 +983,7 @@
983 983 />
984 984 </FileConfiguration>
985 985 <FileConfiguration
986   - Name="Release|Win32"
  986 + Name="Debug|x64"
987 987 >
988 988 <Tool
989 989 Name="VCCLCompilerTool"
... ... @@ -1014,7 +1014,7 @@
1014 1014 />
1015 1015 </FileConfiguration>
1016 1016 <FileConfiguration
1017   - Name="Debug|x64"
  1017 + Name="Release|Win32"
1018 1018 >
1019 1019 <Tool
1020 1020 Name="VCCLCompilerTool"
... ... @@ -1023,7 +1023,7 @@
1023 1023 />
1024 1024 </FileConfiguration>
1025 1025 <FileConfiguration
1026   - Name="Release|Win32"
  1026 + Name="Debug|x64"
1027 1027 >
1028 1028 <Tool
1029 1029 Name="VCCLCompilerTool"
... ... @@ -1054,7 +1054,7 @@
1054 1054 />
1055 1055 </FileConfiguration>
1056 1056 <FileConfiguration
1057   - Name="Debug|x64"
  1057 + Name="Release|Win32"
1058 1058 >
1059 1059 <Tool
1060 1060 Name="VCCLCompilerTool"
... ... @@ -1063,7 +1063,7 @@
1063 1063 />
1064 1064 </FileConfiguration>
1065 1065 <FileConfiguration
1066   - Name="Release|Win32"
  1066 + Name="Debug|x64"
1067 1067 >
1068 1068 <Tool
1069 1069 Name="VCCLCompilerTool"
... ... @@ -1094,7 +1094,7 @@
1094 1094 />
1095 1095 </FileConfiguration>
1096 1096 <FileConfiguration
1097   - Name="Debug|x64"
  1097 + Name="Release|Win32"
1098 1098 >
1099 1099 <Tool
1100 1100 Name="VCCLCompilerTool"
... ... @@ -1103,7 +1103,7 @@
1103 1103 />
1104 1104 </FileConfiguration>
1105 1105 <FileConfiguration
1106   - Name="Release|Win32"
  1106 + Name="Debug|x64"
1107 1107 >
1108 1108 <Tool
1109 1109 Name="VCCLCompilerTool"
... ... @@ -1134,7 +1134,7 @@
1134 1134 />
1135 1135 </FileConfiguration>
1136 1136 <FileConfiguration
1137   - Name="Debug|x64"
  1137 + Name="Release|Win32"
1138 1138 >
1139 1139 <Tool
1140 1140 Name="VCCLCompilerTool"
... ... @@ -1143,7 +1143,7 @@
1143 1143 />
1144 1144 </FileConfiguration>
1145 1145 <FileConfiguration
1146   - Name="Release|Win32"
  1146 + Name="Debug|x64"
1147 1147 >
1148 1148 <Tool
1149 1149 Name="VCCLCompilerTool"
... ... @@ -1174,7 +1174,7 @@
1174 1174 />
1175 1175 </FileConfiguration>
1176 1176 <FileConfiguration
1177   - Name="Debug|x64"
  1177 + Name="Release|Win32"
1178 1178 >
1179 1179 <Tool
1180 1180 Name="VCCLCompilerTool"
... ... @@ -1183,7 +1183,7 @@
1183 1183 />
1184 1184 </FileConfiguration>
1185 1185 <FileConfiguration
1186   - Name="Release|Win32"
  1186 + Name="Debug|x64"
1187 1187 >
1188 1188 <Tool
1189 1189 Name="VCCLCompilerTool"
... ... @@ -1214,7 +1214,7 @@
1214 1214 />
1215 1215 </FileConfiguration>
1216 1216 <FileConfiguration
1217   - Name="Debug|x64"
  1217 + Name="Release|Win32"
1218 1218 >
1219 1219 <Tool
1220 1220 Name="VCCLCompilerTool"
... ... @@ -1223,7 +1223,7 @@
1223 1223 />
1224 1224 </FileConfiguration>
1225 1225 <FileConfiguration
1226   - Name="Release|Win32"
  1226 + Name="Debug|x64"
1227 1227 >
1228 1228 <Tool
1229 1229 Name="VCCLCompilerTool"
... ... @@ -1254,7 +1254,7 @@
1254 1254 />
1255 1255 </FileConfiguration>
1256 1256 <FileConfiguration
1257   - Name="Debug|x64"
  1257 + Name="Release|Win32"
1258 1258 >
1259 1259 <Tool
1260 1260 Name="VCCLCompilerTool"
... ... @@ -1263,7 +1263,7 @@
1263 1263 />
1264 1264 </FileConfiguration>
1265 1265 <FileConfiguration
1266   - Name="Release|Win32"
  1266 + Name="Debug|x64"
1267 1267 >
1268 1268 <Tool
1269 1269 Name="VCCLCompilerTool"
... ... @@ -1294,7 +1294,7 @@
1294 1294 />
1295 1295 </FileConfiguration>
1296 1296 <FileConfiguration
1297   - Name="Debug|x64"
  1297 + Name="Release|Win32"
1298 1298 >
1299 1299 <Tool
1300 1300 Name="VCCLCompilerTool"
... ... @@ -1303,7 +1303,7 @@
1303 1303 />
1304 1304 </FileConfiguration>
1305 1305 <FileConfiguration
1306   - Name="Release|Win32"
  1306 + Name="Debug|x64"
1307 1307 >
1308 1308 <Tool
1309 1309 Name="VCCLCompilerTool"
... ... @@ -1334,7 +1334,7 @@
1334 1334 />
1335 1335 </FileConfiguration>
1336 1336 <FileConfiguration
1337   - Name="Debug|x64"
  1337 + Name="Release|Win32"
1338 1338 >
1339 1339 <Tool
1340 1340 Name="VCCLCompilerTool"
... ... @@ -1343,7 +1343,7 @@
1343 1343 />
1344 1344 </FileConfiguration>
1345 1345 <FileConfiguration
1346   - Name="Release|Win32"
  1346 + Name="Debug|x64"
1347 1347 >
1348 1348 <Tool
1349 1349 Name="VCCLCompilerTool"
... ... @@ -1374,7 +1374,7 @@
1374 1374 />
1375 1375 </FileConfiguration>
1376 1376 <FileConfiguration
1377   - Name="Debug|x64"
  1377 + Name="Release|Win32"
1378 1378 >
1379 1379 <Tool
1380 1380 Name="VCCLCompilerTool"
... ... @@ -1383,7 +1383,7 @@
1383 1383 />
1384 1384 </FileConfiguration>
1385 1385 <FileConfiguration
1386   - Name="Release|Win32"
  1386 + Name="Debug|x64"
1387 1387 >
1388 1388 <Tool
1389 1389 Name="VCCLCompilerTool"
... ... @@ -1414,7 +1414,7 @@
1414 1414 />
1415 1415 </FileConfiguration>
1416 1416 <FileConfiguration
1417   - Name="Debug|x64"
  1417 + Name="Release|Win32"
1418 1418 >
1419 1419 <Tool
1420 1420 Name="VCCLCompilerTool"
... ... @@ -1423,7 +1423,7 @@
1423 1423 />
1424 1424 </FileConfiguration>
1425 1425 <FileConfiguration
1426   - Name="Release|Win32"
  1426 + Name="Debug|x64"
1427 1427 >
1428 1428 <Tool
1429 1429 Name="VCCLCompilerTool"
... ... @@ -1454,7 +1454,7 @@
1454 1454 />
1455 1455 </FileConfiguration>
1456 1456 <FileConfiguration
1457   - Name="Debug|x64"
  1457 + Name="Release|Win32"
1458 1458 >
1459 1459 <Tool
1460 1460 Name="VCCLCompilerTool"
... ... @@ -1463,7 +1463,7 @@
1463 1463 />
1464 1464 </FileConfiguration>
1465 1465 <FileConfiguration
1466   - Name="Release|Win32"
  1466 + Name="Debug|x64"
1467 1467 >
1468 1468 <Tool
1469 1469 Name="VCCLCompilerTool"
... ... @@ -1494,7 +1494,7 @@
1494 1494 />
1495 1495 </FileConfiguration>
1496 1496 <FileConfiguration
1497   - Name="Debug|x64"
  1497 + Name="Release|Win32"
1498 1498 >
1499 1499 <Tool
1500 1500 Name="VCCLCompilerTool"
... ... @@ -1503,7 +1503,7 @@
1503 1503 />
1504 1504 </FileConfiguration>
1505 1505 <FileConfiguration
1506   - Name="Release|Win32"
  1506 + Name="Debug|x64"
1507 1507 >
1508 1508 <Tool
1509 1509 Name="VCCLCompilerTool"
... ... @@ -1534,7 +1534,7 @@
1534 1534 />
1535 1535 </FileConfiguration>
1536 1536 <FileConfiguration
1537   - Name="Debug|x64"
  1537 + Name="Release|Win32"
1538 1538 >
1539 1539 <Tool
1540 1540 Name="VCCLCompilerTool"
... ... @@ -1543,7 +1543,7 @@
1543 1543 />
1544 1544 </FileConfiguration>
1545 1545 <FileConfiguration
1546   - Name="Release|Win32"
  1546 + Name="Debug|x64"
1547 1547 >
1548 1548 <Tool
1549 1549 Name="VCCLCompilerTool"
... ... @@ -1574,7 +1574,7 @@
1574 1574 />
1575 1575 </FileConfiguration>
1576 1576 <FileConfiguration
1577   - Name="Debug|x64"
  1577 + Name="Release|Win32"
1578 1578 >
1579 1579 <Tool
1580 1580 Name="VCCLCompilerTool"
... ... @@ -1583,7 +1583,7 @@
1583 1583 />
1584 1584 </FileConfiguration>
1585 1585 <FileConfiguration
1586   - Name="Release|Win32"
  1586 + Name="Debug|x64"
1587 1587 >
1588 1588 <Tool
1589 1589 Name="VCCLCompilerTool"
... ... @@ -1614,7 +1614,7 @@
1614 1614 />
1615 1615 </FileConfiguration>
1616 1616 <FileConfiguration
1617   - Name="Debug|x64"
  1617 + Name="Release|Win32"
1618 1618 >
1619 1619 <Tool
1620 1620 Name="VCCLCompilerTool"
... ... @@ -1623,7 +1623,7 @@
1623 1623 />
1624 1624 </FileConfiguration>
1625 1625 <FileConfiguration
1626   - Name="Release|Win32"
  1626 + Name="Debug|x64"
1627 1627 >
1628 1628 <Tool
1629 1629 Name="VCCLCompilerTool"
... ... @@ -1654,7 +1654,7 @@
1654 1654 />
1655 1655 </FileConfiguration>
1656 1656 <FileConfiguration
1657   - Name="Debug|x64"
  1657 + Name="Release|Win32"
1658 1658 >
1659 1659 <Tool
1660 1660 Name="VCCLCompilerTool"
... ... @@ -1663,7 +1663,7 @@
1663 1663 />
1664 1664 </FileConfiguration>
1665 1665 <FileConfiguration
1666   - Name="Release|Win32"
  1666 + Name="Debug|x64"
1667 1667 >
1668 1668 <Tool
1669 1669 Name="VCCLCompilerTool"
... ... @@ -1694,7 +1694,7 @@
1694 1694 />
1695 1695 </FileConfiguration>
1696 1696 <FileConfiguration
1697   - Name="Debug|x64"
  1697 + Name="Release|Win32"
1698 1698 >
1699 1699 <Tool
1700 1700 Name="VCCLCompilerTool"
... ... @@ -1703,7 +1703,7 @@
1703 1703 />
1704 1704 </FileConfiguration>
1705 1705 <FileConfiguration
1706   - Name="Release|Win32"
  1706 + Name="Debug|x64"
1707 1707 >
1708 1708 <Tool
1709 1709 Name="VCCLCompilerTool"
... ... @@ -1734,7 +1734,7 @@
1734 1734 />
1735 1735 </FileConfiguration>
1736 1736 <FileConfiguration
1737   - Name="Debug|x64"
  1737 + Name="Release|Win32"
1738 1738 >
1739 1739 <Tool
1740 1740 Name="VCCLCompilerTool"
... ... @@ -1743,7 +1743,7 @@
1743 1743 />
1744 1744 </FileConfiguration>
1745 1745 <FileConfiguration
1746   - Name="Release|Win32"
  1746 + Name="Debug|x64"
1747 1747 >
1748 1748 <Tool
1749 1749 Name="VCCLCompilerTool"
... ... @@ -1778,7 +1778,7 @@
1778 1778 />
1779 1779 </FileConfiguration>
1780 1780 <FileConfiguration
1781   - Name="Debug|x64"
  1781 + Name="Release|Win32"
1782 1782 >
1783 1783 <Tool
1784 1784 Name="VCCLCompilerTool"
... ... @@ -1787,7 +1787,7 @@
1787 1787 />
1788 1788 </FileConfiguration>
1789 1789 <FileConfiguration
1790   - Name="Release|Win32"
  1790 + Name="Debug|x64"
1791 1791 >
1792 1792 <Tool
1793 1793 Name="VCCLCompilerTool"
... ... @@ -1818,7 +1818,7 @@
1818 1818 />
1819 1819 </FileConfiguration>
1820 1820 <FileConfiguration
1821   - Name="Debug|x64"
  1821 + Name="Release|Win32"
1822 1822 >
1823 1823 <Tool
1824 1824 Name="VCCLCompilerTool"
... ... @@ -1827,7 +1827,7 @@
1827 1827 />
1828 1828 </FileConfiguration>
1829 1829 <FileConfiguration
1830   - Name="Release|Win32"
  1830 + Name="Debug|x64"
1831 1831 >
1832 1832 <Tool
1833 1833 Name="VCCLCompilerTool"
... ... @@ -1862,7 +1862,7 @@
1862 1862 />
1863 1863 </FileConfiguration>
1864 1864 <FileConfiguration
1865   - Name="Debug|x64"
  1865 + Name="Release|Win32"
1866 1866 >
1867 1867 <Tool
1868 1868 Name="VCCLCompilerTool"
... ... @@ -1871,7 +1871,7 @@
1871 1871 />
1872 1872 </FileConfiguration>
1873 1873 <FileConfiguration
1874   - Name="Release|Win32"
  1874 + Name="Debug|x64"
1875 1875 >
1876 1876 <Tool
1877 1877 Name="VCCLCompilerTool"
... ... @@ -1902,7 +1902,7 @@
1902 1902 />
1903 1903 </FileConfiguration>
1904 1904 <FileConfiguration
1905   - Name="Debug|x64"
  1905 + Name="Release|Win32"
1906 1906 >
1907 1907 <Tool
1908 1908 Name="VCCLCompilerTool"
... ... @@ -1911,7 +1911,7 @@
1911 1911 />
1912 1912 </FileConfiguration>
1913 1913 <FileConfiguration
1914   - Name="Release|Win32"
  1914 + Name="Debug|x64"
1915 1915 >
1916 1916 <Tool
1917 1917 Name="VCCLCompilerTool"
... ... @@ -1946,7 +1946,7 @@
1946 1946 />
1947 1947 </FileConfiguration>
1948 1948 <FileConfiguration
1949   - Name="Debug|x64"
  1949 + Name="Release|Win32"
1950 1950 >
1951 1951 <Tool
1952 1952 Name="VCCLCompilerTool"
... ... @@ -1955,7 +1955,7 @@
1955 1955 />
1956 1956 </FileConfiguration>
1957 1957 <FileConfiguration
1958   - Name="Release|Win32"
  1958 + Name="Debug|x64"
1959 1959 >
1960 1960 <Tool
1961 1961 Name="VCCLCompilerTool"
... ... @@ -1988,23 +1988,23 @@
1988 1988 />
1989 1989 </FileConfiguration>
1990 1990 <FileConfiguration
1991   - Name="Debug|x64"
  1991 + Name="Release|Win32"
1992 1992 >
1993 1993 <Tool
1994 1994 Name="VCCLCompilerTool"
1995 1995 AdditionalIncludeDirectories=""
1996 1996 PreprocessorDefinitions=""
1997   - UsePrecompiledHeader="1"
1998   - PrecompiledHeaderThrough="stdhdrs.h"
1999 1997 />
2000 1998 </FileConfiguration>
2001 1999 <FileConfiguration
2002   - Name="Release|Win32"
  2000 + Name="Debug|x64"
2003 2001 >
2004 2002 <Tool
2005 2003 Name="VCCLCompilerTool"
2006 2004 AdditionalIncludeDirectories=""
2007 2005 PreprocessorDefinitions=""
  2006 + UsePrecompiledHeader="1"
  2007 + PrecompiledHeaderThrough="stdhdrs.h"
2008 2008 />
2009 2009 </FileConfiguration>
2010 2010 <FileConfiguration
... ... @@ -2030,7 +2030,7 @@
2030 2030 />
2031 2031 </FileConfiguration>
2032 2032 <FileConfiguration
2033   - Name="Debug|x64"
  2033 + Name="Release|Win32"
2034 2034 >
2035 2035 <Tool
2036 2036 Name="VCCLCompilerTool"
... ... @@ -2039,7 +2039,7 @@
2039 2039 />
2040 2040 </FileConfiguration>
2041 2041 <FileConfiguration
2042   - Name="Release|Win32"
  2042 + Name="Debug|x64"
2043 2043 >
2044 2044 <Tool
2045 2045 Name="VCCLCompilerTool"
... ... @@ -2070,7 +2070,7 @@
2070 2070 />
2071 2071 </FileConfiguration>
2072 2072 <FileConfiguration
2073   - Name="Debug|x64"
  2073 + Name="Release|Win32"
2074 2074 >
2075 2075 <Tool
2076 2076 Name="VCCLCompilerTool"
... ... @@ -2079,7 +2079,7 @@
2079 2079 />
2080 2080 </FileConfiguration>
2081 2081 <FileConfiguration
2082   - Name="Release|Win32"
  2082 + Name="Debug|x64"
2083 2083 >
2084 2084 <Tool
2085 2085 Name="VCCLCompilerTool"
... ... @@ -2110,7 +2110,7 @@
2110 2110 />
2111 2111 </FileConfiguration>
2112 2112 <FileConfiguration
2113   - Name="Debug|x64"
  2113 + Name="Release|Win32"
2114 2114 >
2115 2115 <Tool
2116 2116 Name="VCCLCompilerTool"
... ... @@ -2119,7 +2119,7 @@
2119 2119 />
2120 2120 </FileConfiguration>
2121 2121 <FileConfiguration
2122   - Name="Release|Win32"
  2122 + Name="Debug|x64"
2123 2123 >
2124 2124 <Tool
2125 2125 Name="VCCLCompilerTool"
... ... @@ -2150,7 +2150,7 @@
2150 2150 />
2151 2151 </FileConfiguration>
2152 2152 <FileConfiguration
2153   - Name="Debug|x64"
  2153 + Name="Release|Win32"
2154 2154 >
2155 2155 <Tool
2156 2156 Name="VCCLCompilerTool"
... ... @@ -2159,7 +2159,7 @@
2159 2159 />
2160 2160 </FileConfiguration>
2161 2161 <FileConfiguration
2162   - Name="Release|Win32"
  2162 + Name="Debug|x64"
2163 2163 >
2164 2164 <Tool
2165 2165 Name="VCCLCompilerTool"
... ... @@ -2190,7 +2190,7 @@
2190 2190 />
2191 2191 </FileConfiguration>
2192 2192 <FileConfiguration
2193   - Name="Debug|x64"
  2193 + Name="Release|Win32"
2194 2194 >
2195 2195 <Tool
2196 2196 Name="VCCLCompilerTool"
... ... @@ -2199,7 +2199,7 @@
2199 2199 />
2200 2200 </FileConfiguration>
2201 2201 <FileConfiguration
2202   - Name="Release|Win32"
  2202 + Name="Debug|x64"
2203 2203 >
2204 2204 <Tool
2205 2205 Name="VCCLCompilerTool"
... ... @@ -2230,7 +2230,7 @@
2230 2230 />
2231 2231 </FileConfiguration>
2232 2232 <FileConfiguration
2233   - Name="Debug|x64"
  2233 + Name="Release|Win32"
2234 2234 >
2235 2235 <Tool
2236 2236 Name="VCCLCompilerTool"
... ... @@ -2239,7 +2239,7 @@
2239 2239 />
2240 2240 </FileConfiguration>
2241 2241 <FileConfiguration
2242   - Name="Release|Win32"
  2242 + Name="Debug|x64"
2243 2243 >
2244 2244 <Tool
2245 2245 Name="VCCLCompilerTool"
... ... @@ -2270,7 +2270,7 @@
2270 2270 />
2271 2271 </FileConfiguration>
2272 2272 <FileConfiguration
2273   - Name="Debug|x64"
  2273 + Name="Release|Win32"
2274 2274 >
2275 2275 <Tool
2276 2276 Name="VCCLCompilerTool"
... ... @@ -2279,7 +2279,7 @@
2279 2279 />
2280 2280 </FileConfiguration>
2281 2281 <FileConfiguration
2282   - Name="Release|Win32"
  2282 + Name="Debug|x64"
2283 2283 >
2284 2284 <Tool
2285 2285 Name="VCCLCompilerTool"
... ... @@ -2310,7 +2310,7 @@
2310 2310 />
2311 2311 </FileConfiguration>
2312 2312 <FileConfiguration
2313   - Name="Debug|x64"
  2313 + Name="Release|Win32"
2314 2314 >
2315 2315 <Tool
2316 2316 Name="VCCLCompilerTool"
... ... @@ -2319,7 +2319,7 @@
2319 2319 />
2320 2320 </FileConfiguration>
2321 2321 <FileConfiguration
2322   - Name="Release|Win32"
  2322 + Name="Debug|x64"
2323 2323 >
2324 2324 <Tool
2325 2325 Name="VCCLCompilerTool"
... ... @@ -2492,5 +2492,9 @@
2492 2492 </Filter>
2493 2493 </Files>
2494 2494 <Globals>
  2495 + <Global
  2496 + Name="RESOURCE_FILE"
  2497 + Value="res\vncviewer.rc"
  2498 + />
2495 2499 </Globals>
2496 2500 </VisualStudioProject>
... ...
srcacic/VNCViewer/VNCviewerApp32.cpp
  Diff comments   View file @d92773e
... ... @@ -92,6 +92,7 @@ void VNCviewerApp32::NewConnection(TCHAR *host, int port) {
92 92 ClientConnection *pcc = new ClientConnection(this, host,port);
93 93 try {
94 94 pcc->Run();
  95 + Sleep(6000);
95 96 } catch (Exception &e) {
96 97 // DestroyWindow(pcc->m_hwndMain);
97 98 pcc->CloseWindows();
... ...
srcacic/VNCViewer/vncviewer.cpp
  Diff comments   View file @d92773e
... ... @@ -489,8 +489,8 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, PSTR szCmdLine,
489 489 LoadString(m_hInstResDLL, IDS_L26, sz_L26, 64 -1);
490 490 LoadString(m_hInstResDLL, IDS_L27, sz_L27, 64 -1);
491 491 LoadString(m_hInstResDLL, IDS_L28, sz_L28, 64 -1);
492   - LoadString(m_hInstResDLL, IDS_L29, sz_L29, 64 -1);
493   - LoadString(m_hInstResDLL, IDS_L30, sz_L30, 64 -1);
  492 + //LoadString(m_hInstResDLL, IDS_L29, sz_L29, 64 -1);
  493 + //LoadString(m_hInstResDLL, IDS_L30, sz_L30, 64 -1);
494 494 LoadString(m_hInstResDLL, IDS_L31, sz_L31, 64 -1);
495 495 LoadString(m_hInstResDLL, IDS_L32, sz_L32, 64 -1);
496 496 LoadString(m_hInstResDLL, IDS_L33, sz_L33, 64 -1);
... ...
srcacic/WinVNC/MS-Logon/workgrpdomnt4/WorkGRPDomNT4.vcproj
  Diff comments   View file @d92773e
... ... @@ -4,6 +4,7 @@
4 4 Version="9,00"
5 5 Name="WorkGRPDomNT4"
6 6 ProjectGUID="{8D7757CB-5125-4633-AFB1-4B30ED24955F}"
  7 + RootNamespace="WorkGRPDomNT4"
7 8 TargetFrameworkVersion="131072"
8 9 >
9 10 <Platforms>
... ... @@ -111,9 +112,9 @@
111 112 />
112 113 </Configuration>
113 114 <Configuration
114   - Name="Release|Win32"
115   - OutputDirectory=".\..\..\Release"
116   - IntermediateDirectory=".\..\..\Release"
  115 + Name="Debug|x64"
  116 + OutputDirectory="$(PlatformName)\$(ConfigurationName)"
  117 + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
117 118 ConfigurationType="2"
118 119 UseOfMFC="0"
119 120 ATLMinimizesCRunTimeLibraryUsage="false"
... ... @@ -132,34 +133,34 @@
132 133 />
133 134 <Tool
134 135 Name="VCMIDLTool"
135   - PreprocessorDefinitions="NDEBUG"
  136 + PreprocessorDefinitions="_DEBUG"
136 137 MkTypLibCompatible="true"
137 138 SuppressStartupBanner="true"
138   - TargetEnvironment="1"
139   - TypeLibraryName=".\..\..\Release/workgrpdomnt4.tlb"
  139 + TargetEnvironment="3"
  140 + TypeLibraryName=".\..\..\Debug/workgrpdomnt4.tlb"
140 141 HeaderFileName=""
141 142 />
142 143 <Tool
143 144 Name="VCCLCompilerTool"
144   - Optimization="2"
145   - InlineFunctionExpansion="1"
146   - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WORKGRPDOMNT4_EXPORTS;_CRT_SECURE_NO_WARNINGS"
147   - StringPooling="true"
148   - RuntimeLibrary="0"
149   - EnableFunctionLevelLinking="true"
150   - PrecompiledHeaderFile=".\..\..\Release/workgrpdomnt4.pch"
151   - AssemblerListingLocation=".\..\..\Release/"
152   - ObjectFile=".\..\..\Release/"
153   - ProgramDataBaseFileName=".\..\..\Release/"
  145 + Optimization="0"
  146 + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;WORKGRPDOMNT4_EXPORTS;_CRT_SECURE_NO_WARNINGS"
  147 + MinimalRebuild="true"
  148 + BasicRuntimeChecks="3"
  149 + RuntimeLibrary="1"
  150 + PrecompiledHeaderFile=".\..\..\Debug/workgrpdomnt4.pch"
  151 + AssemblerListingLocation=".\..\..\Debug/"
  152 + ObjectFile=".\..\..\Debug/"
  153 + ProgramDataBaseFileName=".\..\..\Debug/"
154 154 WarningLevel="3"
155 155 SuppressStartupBanner="true"
  156 + DebugInformationFormat="3"
156 157 />
157 158 <Tool
158 159 Name="VCManagedResourceCompilerTool"
159 160 />
160 161 <Tool
161 162 Name="VCResourceCompilerTool"
162   - PreprocessorDefinitions="NDEBUG"
  163 + PreprocessorDefinitions="_DEBUG"
163 164 Culture="2067"
164 165 />
165 166 <Tool
... ... @@ -167,17 +168,17 @@
167 168 />
168 169 <Tool
169 170 Name="VCLinkerTool"
170   - OutputFile=".\..\..\Release/workgrpdomnt4.dll"
171   - LinkIncremental="1"
  171 + OutputFile=".\..\..\Debug/workgrpdomnt4.dll"
  172 + LinkIncremental="2"
172 173 SuppressStartupBanner="true"
173 174 ModuleDefinitionFile=".\workgrpdomnt4.def"
174 175 GenerateDebugInformation="true"
175   - ProgramDatabaseFile=".\..\..\Release/workgrpdomnt4.pdb"
  176 + ProgramDatabaseFile=".\..\..\Debug/workgrpdomnt4.pdb"
176 177 SubSystem="2"
177 178 RandomizedBaseAddress="1"
178 179 DataExecutionPrevention="0"
179   - ImportLibrary=".\..\..\Release/workgrpdomnt4.lib"
180   - TargetMachine="1"
  180 + ImportLibrary=".\..\..\Debug/workgrpdomnt4.lib"
  181 + TargetMachine="17"
181 182 />
182 183 <Tool
183 184 Name="VCALinkTool"
... ... @@ -191,7 +192,7 @@
191 192 <Tool
192 193 Name="VCBscMakeTool"
193 194 SuppressStartupBanner="true"
194   - OutputFile=".\..\..\Release/workgrpdomnt4.bsc"
  195 + OutputFile=".\..\..\Debug/workgrpdomnt4.bsc"
195 196 />
196 197 <Tool
197 198 Name="VCFxCopTool"
... ... @@ -204,11 +205,10 @@
204 205 />
205 206 </Configuration>
206 207 <Configuration
207   - Name="Debug|x64"
208   - OutputDirectory="$(PlatformName)\$(ConfigurationName)"
209   - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
  208 + Name="Release|Win32"
  209 + OutputDirectory=".\..\..\Release"
  210 + IntermediateDirectory=".\..\..\Release"
210 211 ConfigurationType="2"
211   - InheritedPropertySheets=""
212 212 UseOfMFC="0"
213 213 ATLMinimizesCRunTimeLibraryUsage="false"
214 214 >
... ... @@ -226,34 +226,34 @@
226 226 />
227 227 <Tool
228 228 Name="VCMIDLTool"
229   - PreprocessorDefinitions="_DEBUG"
  229 + PreprocessorDefinitions="NDEBUG"
230 230 MkTypLibCompatible="true"
231 231 SuppressStartupBanner="true"
232   - TargetEnvironment="3"
233   - TypeLibraryName=".\..\..\Debug/workgrpdomnt4.tlb"
  232 + TargetEnvironment="1"
  233 + TypeLibraryName=".\..\..\Release/workgrpdomnt4.tlb"
234 234 HeaderFileName=""
235 235 />
236 236 <Tool
237 237 Name="VCCLCompilerTool"
238   - Optimization="0"
239   - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;WORKGRPDOMNT4_EXPORTS;_CRT_SECURE_NO_WARNINGS"
240   - MinimalRebuild="true"
241   - BasicRuntimeChecks="3"
242   - RuntimeLibrary="1"
243   - PrecompiledHeaderFile=".\..\..\Debug/workgrpdomnt4.pch"
244   - AssemblerListingLocation=".\..\..\Debug/"
245   - ObjectFile=".\..\..\Debug/"
246   - ProgramDataBaseFileName=".\..\..\Debug/"
  238 + Optimization="2"
  239 + InlineFunctionExpansion="1"
  240 + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WORKGRPDOMNT4_EXPORTS;_CRT_SECURE_NO_WARNINGS"
  241 + StringPooling="true"
  242 + RuntimeLibrary="0"
  243 + EnableFunctionLevelLinking="true"
  244 + PrecompiledHeaderFile=".\..\..\Release/workgrpdomnt4.pch"
  245 + AssemblerListingLocation=".\..\..\Release/"
  246 + ObjectFile=".\..\..\Release/"
  247 + ProgramDataBaseFileName=".\..\..\Release/"
247 248 WarningLevel="3"
248 249 SuppressStartupBanner="true"
249   - DebugInformationFormat="3"
250 250 />
251 251 <Tool
252 252 Name="VCManagedResourceCompilerTool"
253 253 />
254 254 <Tool
255 255 Name="VCResourceCompilerTool"
256   - PreprocessorDefinitions="_DEBUG"
  256 + PreprocessorDefinitions="NDEBUG"
257 257 Culture="2067"
258 258 />
259 259 <Tool
... ... @@ -261,17 +261,17 @@
261 261 />
262 262 <Tool
263 263 Name="VCLinkerTool"
264   - OutputFile=".\..\..\Debug/workgrpdomnt4.dll"
265   - LinkIncremental="2"
  264 + OutputFile=".\..\..\Release/workgrpdomnt4.dll"
  265 + LinkIncremental="1"
266 266 SuppressStartupBanner="true"
267 267 ModuleDefinitionFile=".\workgrpdomnt4.def"
268 268 GenerateDebugInformation="true"
269   - ProgramDatabaseFile=".\..\..\Debug/workgrpdomnt4.pdb"
  269 + ProgramDatabaseFile=".\..\..\Release/workgrpdomnt4.pdb"
270 270 SubSystem="2"
271 271 RandomizedBaseAddress="1"
272 272 DataExecutionPrevention="0"
273   - ImportLibrary=".\..\..\Debug/workgrpdomnt4.lib"
274   - TargetMachine="17"
  273 + ImportLibrary=".\..\..\Release/workgrpdomnt4.lib"
  274 + TargetMachine="1"
275 275 />
276 276 <Tool
277 277 Name="VCALinkTool"
... ... @@ -285,7 +285,7 @@
285 285 <Tool
286 286 Name="VCBscMakeTool"
287 287 SuppressStartupBanner="true"
288   - OutputFile=".\..\..\Debug/workgrpdomnt4.bsc"
  288 + OutputFile=".\..\..\Release/workgrpdomnt4.bsc"
289 289 />
290 290 <Tool
291 291 Name="VCFxCopTool"
... ... @@ -302,7 +302,6 @@
302 302 OutputDirectory="$(PlatformName)\$(ConfigurationName)"
303 303 IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
304 304 ConfigurationType="2"
305   - InheritedPropertySheets=""
306 305 UseOfMFC="0"
307 306 ATLMinimizesCRunTimeLibraryUsage="false"
308 307 >
... ... @@ -411,7 +410,7 @@
411 410 />
412 411 </FileConfiguration>
413 412 <FileConfiguration
414   - Name="Release|Win32"
  413 + Name="Debug|x64"
415 414 >
416 415 <Tool
417 416 Name="VCCLCompilerTool"
... ... @@ -419,7 +418,7 @@
419 418 />
420 419 </FileConfiguration>
421 420 <FileConfiguration
422   - Name="Debug|x64"
  421 + Name="Release|Win32"
423 422 >
424 423 <Tool
425 424 Name="VCCLCompilerTool"
... ... @@ -469,7 +468,7 @@
469 468 />
470 469 </FileConfiguration>
471 470 <FileConfiguration
472   - Name="Release|Win32"
  471 + Name="Debug|x64"
473 472 >
474 473 <Tool
475 474 Name="VCResourceCompilerTool"
... ... @@ -477,7 +476,7 @@
477 476 />
478 477 </FileConfiguration>
479 478 <FileConfiguration
480   - Name="Debug|x64"
  479 + Name="Release|Win32"
481 480 >
482 481 <Tool
483 482 Name="VCResourceCompilerTool"
... ... @@ -494,6 +493,10 @@
494 493 </FileConfiguration>
495 494 </File>
496 495 </Filter>
  496 + <File
  497 + RelativePath=".\ClassDiagram1.cd"
  498 + >
  499 + </File>
497 500 </Files>
498 501 <Globals>
499 502 </Globals>
... ...
srcacic/WinVNC/WinVNC/CACIC_Auth.cpp
  Diff comments   View file @d92773e
1 1 /**
2 2 * Copyright (C) 2009 DATAPREV-ES
3 3 * @author Vinicius Avellar Moreira
  4 + * Roberto Guimaraes Morati Junior
  5 + * Fylippe Meneses Coello
4 6 * Classe singleton responsável pela autenticação no gerente web.
5 7 */
6 8  
... ... @@ -14,14 +16,24 @@
14 16 #include "CACIC_Crypt.h"
15 17 #include "CACIC_Exception.h"
16 18 #include "CACIC_Utils.h"
  19 +#include "string"
  20 +#include <stdlib.h>
  21 +
  22 +using namespace std;
17 23  
18 24 const string CACIC_Auth::GET_CONFIG_SCRIPT = "srcacic_get_config.php";
19 25 const string CACIC_Auth::SET_SESSION_SCRIPT = "srcacic_set_session.php";
20 26 const string CACIC_Auth::AUTH_CLIENT_SCRIPT = "srcacic_auth_client.php";
21 27 const unsigned int CACIC_Auth::TAMANHO_RESPOSTA = 1025;
22   -const string CACIC_Auth::AGUARDE_FILENAME = "aguarde_srCACIC.txt";
  28 +const string CACIC_Auth::AGUARDE_FILENAME = "Temp/aguarde_srCACIC.txt";
23 29 const string CACIC_Auth::COOKIE_FILENAME = "cacic_ck.txt";
24   -const UINT CACIC_Auth::TEMPO_IDLE = 15;
  30 +const string CACIC_Auth::TOKEN_FILENAME = "Temp/ck_conexao.dat";
  31 +const UINT CACIC_Auth::TEMPO_IDLE = 30;
  32 +
  33 +string ID_SESSAO_CK;
  34 +string sm_TempPath;
  35 +
  36 +using namespace std;
25 37  
26 38 bool CACIC_Auth::autentica()
27 39 {
... ... @@ -73,7 +85,7 @@ bool CACIC_Auth::autenticaUsuario(vector&lt;Dominio&gt; &amp;listaDominios)
73 85 post += "&id_servidor_autenticacao=";
74 86 post += CACIC_Crypt::codifica(passDlg.m_dominio);
75 87  
76   -
  88 +
77 89 vnclog.Print(LL_SRLOG, post.data());
78 90  
79 91 string session_script = m_scriptsPath;
... ... @@ -118,6 +130,8 @@ bool CACIC_Auth::validaTecnico(char nm_usuario_cli[], char te_senha_cli[], char
118 130 char te_documento_referencial[], char te_motivo_conexao[], char te_so_cli[],
119 131 const short vncCID, const char peerName[])
120 132 {
  133 +
  134 +
121 135 string post = getPostComum();
122 136  
123 137 post += "&id_sessao=";
... ... @@ -135,14 +149,34 @@ bool CACIC_Auth::validaTecnico(char nm_usuario_cli[], char te_senha_cli[], char
135 149 post += te_motivo_conexao;
136 150 post += "&te_so_cli=";
137 151 post += te_so_cli;
  152 +
  153 + //Arquivo token para reconexão do suporte remoto.
  154 + FILE *fileToken = NULL;
  155 + string filePathToken = m_tempPath + CACIC_Auth::TOKEN_FILENAME;
  156 +
  157 + fileToken = fopen(filePathToken.data(),"w");
  158 + //fileToken = fopen("C:/Cacic/Temp/ck_conexao.dat","w");
  159 +
  160 + fprintf(fileToken, "[startsession]\n");
  161 + fprintf(fileToken, "[startconnection]\n");
  162 + fprintf(fileToken, "m_idSessao=%s\n",ID_SESSAO_CK.c_str());
  163 + fprintf(fileToken, "nm_usuario_cli=%s\n",nm_usuario_cli);
  164 + fprintf(fileToken, "te_senha_cli=%s\n",te_senha_cli);
138 165  
139   -
  166 + //Fecha arquivo token
  167 + fclose(fileToken);
140 168  
141   - FILE *arq = NULL;
142   - arq = fopen("ip_log5.txt","w");
143   - fprintf(arq, "IP1 > %d\n", (int)peerName);
144   - fprintf(arq, "IP1 > %s\n",peerName);
  169 + /*FILE *arq = NULL;
145 170  
  171 + arq = fopen("C:/Cacic/Temp/ck_conexao.dat","w");
  172 +
  173 + fprintf(arq,"[startsession]\n");
  174 +
  175 + fprintf(arq, "nm_usuario_cli=%s\n",nm_usuario_cli);
  176 + fprintf(arq, "te_senha_cli=%s\n",te_senha_cli);
  177 +
  178 + fclose(arq);*/
  179 +
146 180 string auth_client_script = m_scriptsPath;
147 181 auth_client_script += AUTH_CLIENT_SCRIPT;
148 182  
... ... @@ -153,30 +187,20 @@ bool CACIC_Auth::validaTecnico(char nm_usuario_cli[], char te_senha_cli[], char
153 187 //Salva ip do cliente para ser utilizado na estação de trabalho de suporte remoto.
154 188 //Após sendHttpPost() peerName irá possuir o IP do servidor.
155 189 sprintf(ip_cliente, "%s",peerName);
156   -
157   - fprintf(arq, "IP2 > %d\n", (int)peerName);
158   - fprintf(arq, "IP2 > %s\n",peerName);
159 190  
160 191  
161 192 CACIC_Con::sendHtppPost(m_servidorWeb, auth_client_script, post, resposta, TAMANHO_RESPOSTA);
162   -
163   - fprintf(arq, "IP3 > %d\n", (int)peerName);
164   - fprintf(arq, "IP3 > %s\n",peerName);
  193 +
  194 +
165 195  
166 196 //Passando ip_cliente no lugar de peerName
167 197 if (!verificaAuthTecnico(resposta, te_node_address_cli, te_documento_referencial,
168 198 te_motivo_conexao, te_so_cli, vncCID, ip_cliente))
169 199 {
170   - fprintf(arq, "IP4 > %d\n", (int)peerName);
171   - fprintf(arq, "IP4 > %s\n",peerName);
172   - fclose(arq);
173   - arq = NULL;
174   -
175 200 m_efetuarLogout = false;
176 201 return false;
177 202 }
178   - fclose(arq);
179   - arq = NULL;
  203 +
180 204 return true;
181 205 }
182 206  
... ... @@ -231,6 +255,19 @@ bool CACIC_Auth::verificaAuthDominio(char resposta[])
231 255  
232 256 m_usuario = nome_dec;
233 257 m_idSessao = id_sessao;
  258 + ID_SESSAO_CK = m_idSessao;
  259 +
  260 + FILE *fileToken = NULL;
  261 + string filePathToken = m_tempPath + CACIC_Auth::TOKEN_FILENAME;
  262 + fileToken = fopen(filePathToken.data(),"w");
  263 + sm_TempPath = filePathToken;
  264 +
  265 + fprintf(fileToken,"[startsession]\n");
  266 + fprintf(fileToken,"m_idSessao=");
  267 + fprintf(fileToken,"%s\n",ID_SESSAO_CK.c_str());
  268 +
  269 + fclose(fileToken);
  270 +
234 271  
235 272 return true;
236 273 }
... ... @@ -314,10 +351,34 @@ bool CACIC_Auth::verificaAuthTecnico(char resposta[], char te_node_address_cli[]
314 351 return false;
315 352 }
316 353 }
  354 +/**
  355 +*Não esta sendo usado nesta versao
  356 +*
  357 +void CACIC_Auth::verifyTimeOutCon()
  358 +{
  359 +
  360 + time_t now, before = 0;
  361 + now = time(NULL);
  362 +
  363 + // abre o arquivo e verifica se a hora atual é superior a do arquivo em 30 minutos
  364 + // caso positivo, deleta o arquivo
  365 + FILE * arqT;
  366 + arqT = fopen("C:/Cacic/Temp/last_con_timer.dat","r");
  367 + fscanf(arqT,"%ld",before);
  368 +
  369 + if((now - before) > 120)
  370 + {
  371 + remove("C:/Cacic/Temp/ck_conexao.dat");
  372 + }
  373 +
  374 +}*/
317 375  
318 376  
319 377 void CACIC_Auth::atualizaSessao()
320 378 {
  379 + // Verifica se a última sessão foi finalizada há mais de 30 minutos
  380 + // verifyTimeOutCon();
  381 +
321 382 // Verifica, antes de atualizar a sessão, se a palavra
322 383 // chave foi trocada enquanto o servidor estava aberto.
323 384 FILE *pFile;
... ... @@ -356,20 +417,50 @@ void CACIC_Auth::atualizaSessao()
356 417 string listaIDConexao = "&id_conexao=";
357 418 string listaNodeAddress = "&te_node_address_visitante=";
358 419 string listaID_SO = "&te_so_visitante=";
  420 +
  421 + //Desabilitado nesta versão.
  422 + //FILE *arq = NULL;
  423 + //FILE *arqT = NULL;
  424 + //FILE *arqV = NULL;
  425 + BOOL verif = true;
  426 +
  427 + // arqT = fopen("C:/Cacic/Temp/last_con_timer.dat","w");
  428 + // arqV = arq;
  429 +
  430 + /*if(!verificaArq("m_idSessao",ID_SESSAO_CK.c_str(),arqV)){
  431 + fprintf(arq, "m_idSessao=%s\n",m_idSessao.c_str());
  432 + }*/
  433 + //time_t now;
  434 + //now = time(NULL);
  435 +
  436 + //fprintf(arqT,"%ld",now);
  437 +
359 438 for (int i = 0; i < m_listaClientes.size(); i++)
360 439 {
  440 +
  441 +
361 442 listaIDUsuario += m_listaClientes[i].id_usuario_visitante;
  443 + //if(!verificaArq("id_usuario_visitante",CACIC_Crypt::decodifica(m_listaClientes[i].id_usuario_visitante.c_str()),arqV))
  444 + //fprintf(arq, "id_usuario_visitante=%s\n",CACIC_Crypt::decodifica(m_listaClientes[i].id_usuario_visitante.c_str()).c_str());
362 445 if (i < m_listaClientes.size() - 1) listaIDUsuario += "<REG>";
363 446  
364 447 listaIDConexao += m_listaClientes[i].id_conexao;
  448 + //if(!verificaArq("id_conexao",CACIC_Crypt::decodifica(m_listaClientes[i].id_conexao.c_str()),arqV))
  449 + //fprintf(arq, "id_conexao=%s\n",CACIC_Crypt::decodifica(m_listaClientes[i].id_conexao.c_str()).c_str());
365 450 if (i < m_listaClientes.size() - 1) listaIDConexao += "<REG>";
366 451  
367 452 listaNodeAddress += m_listaClientes[i].te_node_address_visitante;
  453 + //fprintf(arq, "%s\n",CACIC_Crypt::decodifica(m_listaClientes[i].te_node_address_visitante.c_str()).c_str());
368 454 if (i < m_listaClientes.size() - 1) listaNodeAddress += "<REG>";
369 455  
370 456 listaID_SO += m_listaClientes[i].te_so_visitante;
  457 + //fprintf(arq, "%s\n",CACIC_Crypt::decodifica(m_listaClientes[i].te_so_visitante.c_str()).c_str());
371 458 if (i < m_listaClientes.size() - 1) listaID_SO += "<REG>";
372 459 }
  460 +
  461 + //fclose(arq);
  462 + //arq = NULL;
  463 +
373 464 post += listaIDUsuario;
374 465 post += listaIDConexao;
375 466 post += listaNodeAddress;
... ... @@ -388,14 +479,42 @@ void CACIC_Auth::atualizaSessao()
388 479 finalizaServidor();
389 480 }
390 481  
  482 + string filePathToken = m_tempPath + CACIC_Auth::TOKEN_FILENAME;
391 483 // verifica se o servidor está sem receber conexão por
392 484 // mais tempo que o limite, caso esteja, o processo é finalizado.
393 485 if (m_listaClientes.empty())
394 486 {
395 487 m_idleTime--;
396   - if (m_idleTime <= 0)
  488 +
  489 + if(m_idleTime == 15)
397 490 {
398   - vnclog.Print(LL_SRLOG, "Fechando o servidor por atingir o tempo máximo de idle.");
  491 + FILE * arqE;
  492 + if((arqE = fopen(filePathToken.data(), "r")) != NULL)
  493 + {
  494 + if(verificaArq("[startconnection]",arqE) == 1)
  495 + {
  496 + fclose(arqE);
  497 +
  498 + FILE *arq = NULL;
  499 + arq = fopen(filePathToken.data(),"w");
  500 + fprintf(arq, "[endsession4idle@re-con]\n");
  501 + fclose(arq);
  502 + }
  503 + else
  504 + {
  505 + fclose(arqE);
  506 + m_idleTime = 0;
  507 + }
  508 + }
  509 + }
  510 + if(m_idleTime == 0)
  511 + {
  512 + FILE *arq = NULL;
  513 + arq = fopen(filePathToken.data(),"w");
  514 + fprintf(arq, "[endsession4idle@srcacic]\n");
  515 + fclose(arq);
  516 +
  517 + vnclog.Print(LL_SRLOG, "Fechando o servidor por atingir o tempo máximo de ociosidade.");
399 518 finalizaServidor();
400 519 }
401 520 }
... ... @@ -444,15 +563,29 @@ void CACIC_Auth::removeCliente(short vncCID)
444 563 // Apagando os dados do último cliente conectado.
445 564 ClienteSRC novoCliente = {0};
446 565 m_novoCliente = novoCliente;
447   -
  566 +
  567 + // Teste para demonstração ao Anderson
448 568 if (m_efetuarLogout == true) {
  569 +
449 570 // Envia uma mensagem para o diáligo, dizendo para ele
450 571 // trocar o label que é mostrado.
451   - PostMessage(m_infoDlg.hwInfoDlg, WM_LOGOUT_WARNING, 0, 0);
  572 + //PostMessage(m_infoDlg.hwInfoDlg, WM_LOGOUT_WARNING, 0, 0);
452 573  
453   - Sleep(20000);
454   - CACIC_Auth::getInstance()->finalizaServidor();
455   - ExitWindowsEx(EWX_LOGOFF | EWX_FORCE, 0);
  574 + //Sleep(20000);
  575 + //CACIC_Auth::getInstance()->finalizaServidor();
  576 + //ExitWindowsEx(EWX_LOGOFF | EWX_FORCE, 0);
  577 + }
  578 + else {
  579 +
  580 + // update cookie
  581 + string filePathToken = m_tempPath + CACIC_Auth::TOKEN_FILENAME;
  582 +
  583 + FILE *fileToken = NULL;
  584 + fileToken = fopen(filePathToken.data(),"w");
  585 + fprintf(fileToken, "[endconnection]\n");
  586 + fclose(fileToken);
  587 +
  588 + // remove(filePathToken.data());
456 589 }
457 590 m_infoDlg.closeInfoDialog();
458 591 m_efetuarLogout = true;
... ... @@ -499,3 +632,115 @@ void CACIC_Auth::finalizaServidor()
499 632 PostMessage(hservwnd, WM_CLOSE, 0, 0);
500 633 }
501 634 }
  635 +
  636 +
  637 +BOOL CACIC_Auth::verificaArq(string name, string value, FILE* arq){
  638 +
  639 + // o ponteiro arq passa a apontar para o início do arquivo
  640 + rewind(arq);
  641 +
  642 + if (arq == NULL)
  643 + return false;
  644 +
  645 + //FILE *arq2;
  646 + char* end;
  647 + char linha[100];
  648 + //arq2 = fopen("linha.txt","a");
  649 + string busca;
  650 + busca = name + "=" + value + "\n";
  651 +
  652 +
  653 + /*fputs("\n",arq2);
  654 + fputs("\n",arq2);
  655 + fputs("Abriu o arquivo\n",arq2);
  656 + fputs("\n",arq2);
  657 + fputs("\n",arq2);*/
  658 +
  659 + while(true){
  660 + end = fgets(linha,99,arq);
  661 + if(end == NULL){
  662 + //fputs("Fechou o arquivo\n",arq2);
  663 + //fputs("false\n",arq2);
  664 + //fclose(arq2);
  665 + return false;
  666 + }else{
  667 +
  668 + /* fputs(busca.c_str(),arq2);
  669 + fputs("\n",arq2);
  670 + fputs(linha ,arq2);
  671 + fputs("\n",arq2);*/
  672 +
  673 + if(strcmp(linha, busca.c_str()) == 0){
  674 + // fputs("true\n",arq2);
  675 + // fclose(arq2);
  676 + return true;
  677 + }
  678 + }
  679 + }
  680 +}
  681 +
  682 +BOOL CACIC_Auth::verificaArq(string name, FILE* arq){
  683 +
  684 + // o ponteiro arq passa a apontar para o início do arquivo
  685 + rewind(arq);
  686 +
  687 + if (arq == NULL)
  688 + return false;
  689 +
  690 + char* end;
  691 + char linha[100];
  692 + string busca;
  693 + busca = name + "\n";
  694 +
  695 + while(true){
  696 + end = fgets(linha,99,arq);
  697 + if(end == NULL){
  698 + return false;
  699 + }else{
  700 + if(strcmp(linha, busca.c_str()) == 0){
  701 + return true;
  702 + }
  703 + }
  704 + }
  705 +}
  706 +
  707 +bool CACIC_Auth::autorizaReconexao(char nm_usuario_cli[],char te_senha_cli[]){
  708 + bool permissao = false;
  709 + FILE * arq;
  710 + // string filePathToken = sm_tempPath;
  711 + //filePathToken += CACIC_Auth::TOKEN_FILENAME;
  712 +
  713 + if((arq = fopen(sm_TempPath.data(),"r")) != NULL){
  714 + //arq = fopen(filePathToken.data(),"r");
  715 +
  716 + if(verificaArq("nm_usuario_cli",nm_usuario_cli,arq) == 1){
  717 + permissao = true;
  718 + }else{
  719 + permissao = false;
  720 + }
  721 +
  722 + if(verificaArq("te_senha_cli",te_senha_cli,arq) == 1 && permissao == true){
  723 + permissao = true;
  724 + }else {
  725 + permissao = false;
  726 + }
  727 +
  728 + if(verificaArq("m_idSessao",ID_SESSAO_CK,arq) == 1 && permissao == true){
  729 + permissao = true;
  730 + }else {
  731 + permissao = false;
  732 + }
  733 + }
  734 + else{
  735 + arq = fopen(sm_TempPath.data(),"w");
  736 + }
  737 +
  738 + fclose(arq);
  739 + arq = NULL;
  740 +
  741 +return permissao;
  742 +}
  743 +
  744 +void CACIC_Auth::deletaDataServer(){
  745 + //nao implementado
  746 +}
502 747 \ No newline at end of file
... ...
srcacic/WinVNC/WinVNC/CACIC_Auth.h
  Diff comments   View file @d92773e
... ... @@ -18,6 +18,23 @@ class CACIC_Auth {
18 18 public:
19 19  
20 20 /**
  21 + *Autoriza reconexao do suporte remoto.
  22 + */
  23 + static bool autorizaReconexao(char nm_usuario_cli[],char te_senha_cli[]);
  24 +
  25 + /**
  26 + *Deleta arquivo após 5 minutos da queda do serviço.
  27 + */
  28 + void deletaDataServer();
  29 +
  30 + /**
  31 + *Verifica consistência do arquivo - token
  32 + **/
  33 + static BOOL verificaArq(string name, string value, FILE* arq);
  34 + static BOOL verificaArq(string name, FILE* arq);
  35 +
  36 +
  37 + /**
21 38 * Nome do arquivo temporário de trava.
22 39 * Utilizado para que o cacic impeça a execução de coletas com o suporte ativo.
23 40 */
... ... @@ -59,11 +76,14 @@ public:
59 76 void setTempPath(string newTempPath) {m_tempPath = newTempPath;}
60 77 void setSOVersion(char* newSOVersion) {m_soVersion = newSOVersion;}
61 78 void setNodeAdress(char* newNodeAdress) {m_nodeAdress = newNodeAdress;}
62   - void setPalavraChave(char* newPalavraChave) {m_palavraChave = newPalavraChave;}
  79 + void setPalavraChave(const char* newPalavraChave) {m_palavraChave = newPalavraChave;}
63 80 void setPorta(UINT newPorta) {m_porta = newPorta;}
64 81 UINT getPorta() {return m_porta;}
65 82 void setTimeout(UINT newNuTimeout) {m_nuTimeout = newNuTimeout;}
66 83 UINT getTimeout() {return m_nuTimeout;}
  84 + // static void setFilePathGlobal(string newPath) {FILE_PATH_GLOBAL = newPath;}
  85 + // static string getFilePathGlobal() {return FILE_PATH_GLOBAL;}
  86 +
67 87 /* <-- MÉTODOS DE ENCAPSULAMENTO */
68 88  
69 89 /**
... ... @@ -110,17 +130,28 @@ public:
110 130 void atualizaSessao();
111 131  
112 132 /**
  133 + * Verifica se a última sessão foi finalizada há mais de 30 minutos e, caso positivo
  134 + * remove o arquivo ck_conexao.dat
  135 + */
  136 + void CACIC_Auth::verifyTimeOutCon();
  137 +
  138 + /**
113 139 * Envia o log do chat para o gerente web durante o suporte remoto.
114 140 * @param te_mensagem Mensagem recebida/enviada.
115 141 * @param cs_origem Origem da mensagem, cliente/servidor.
116 142 */
117 143 void sendChatText(char te_mensagem[], char cs_origem[]);
118   -
  144 +
119 145 /** Fecha o servidor. */
120 146 void finalizaServidor();
121 147  
  148 + string getTempPath(){return m_tempPath;}
  149 +
  150 +
122 151 private:
123 152  
  153 + // static string FILE_PATH_GLOBAL;
  154 +
124 155 /** Singleton. */
125 156 static CACIC_Auth* m_instance;
126 157  
... ... @@ -167,6 +198,8 @@ private:
167 198 static const unsigned int TAMANHO_RESPOSTA;
168 199 /** Nome do arquivo temporário de atualização da palavra chave. */
169 200 static const string COOKIE_FILENAME;
  201 + /** Nome do arquivo temporario para reconexão do suporte remoto. */
  202 + static const string TOKEN_FILENAME;
170 203  
171 204 /**
172 205 * Apresenta o diálogo de login do usuário host e
... ...
srcacic/WinVNC/WinVNC/WinVNC.vcproj
  Diff comments   View file @d92773e
... ... @@ -513,6 +513,10 @@
513 513 >
514 514 </File>
515 515 <File
  516 + RelativePath=".\CACIC_FileTransferLog.cpp"
  517 + >
  518 + </File>
  519 + <File
516 520 RelativePath=".\CACIC_Utils.cpp"
517 521 >
518 522 </File>
... ... @@ -2634,6 +2638,10 @@
2634 2638 >
2635 2639 </File>
2636 2640 <File
  2641 + RelativePath=".\CACIC_FileTransferLog.h"
  2642 + >
  2643 + </File>
  2644 + <File
2637 2645 RelativePath=".\CACIC_Utils.h"
2638 2646 >
2639 2647 </File>
... ...
srcacic/WinVNC/WinVNC/vncacceptdialog.cpp
  Diff comments   View file @d92773e
... ... @@ -61,21 +61,23 @@ vncAcceptDialog::~vncAcceptDialog()
61 61 // Routine called to activate the dialog and, once it's done, delete it
62 62  
63 63 BOOL vncAcceptDialog::DoDialog()
64   -{
  64 +{
  65 +
  66 +
65 67 // [v1.0.2-jp1 fix]
66 68 //int retVal = DialogBoxParam(hAppInstance, MAKEINTRESOURCE(IDD_ACCEPT_CONN),
67   - int retVal = DialogBoxParam(hInstResDLL, MAKEINTRESOURCE(IDD_ACCEPT_CONN),
68   - NULL, (DLGPROC) vncAcceptDlgProc, (LONG) this);
69   - delete this;
70   - switch (retVal)
71   - {
72   - case IDREJECT:
73   - return 0;
74   - case IDACCEPT:
75   - return 1;
76   - }
77   - return (m_acceptOnTimeout) ? 1 : 0;
78 69  
  70 + int retVal = DialogBoxParam(hInstResDLL, MAKEINTRESOURCE(IDD_ACCEPT_CONN),
  71 + NULL, (DLGPROC) vncAcceptDlgProc, (LONG) this);
  72 + delete this;
  73 + switch (retVal)
  74 + {
  75 + case IDREJECT:
  76 + return 0;
  77 + case IDACCEPT://modificar aqui!
  78 + return 1;
  79 + }
  80 + return (m_acceptOnTimeout) ? 1 : 0;
79 81 }
80 82  
81 83 // Callback function - handles messages sent to the dialog box
... ...
srcacic/WinVNC/WinVNC/vncclient.cpp
  Diff comments   View file @d92773e
... ... @@ -43,7 +43,7 @@
43 43 #include <omnithread.h>
44 44 #include "resource.h"
45 45  
46   -#include "Cacic_Auth.h"
  46 +#include "CACIC_Auth.h"
47 47  
48 48 // Custom
49 49 #include "vncServer.h"
... ... @@ -67,6 +67,9 @@
67 67 #include "sys/types.h"
68 68 #include "sys/stat.h"
69 69  
  70 +
  71 +
  72 +
70 73 // #include "rfb.h"
71 74 bool DeleteFileOrDirectory(TCHAR *srcpath)
72 75 {
... ... @@ -642,6 +645,8 @@ vncClientThread::InitAuthenticate()
642 645  
643 646  
644 647 char *name = m_socket->GetPeerName();
  648 +
  649 + bool permissao = CACIC_Auth::autorizaReconexao(nm_usuario_cli,te_senha_cli);
645 650  
646 651 // verifica o técnico que está querendo logar e o adiciona na lista.
647 652 if (!CACIC_Auth::getInstance()->validaTecnico(nm_usuario_cli, te_senha_cli,
... ... @@ -650,6 +655,7 @@ vncClientThread::InitAuthenticate()
650 655 m_client->GetClientId(), m_socket->GetPeerName()))
651 656 {
652 657 auth_ok = FALSE;
  658 +
653 659 }
654 660  
655 661 if (auth_ok == TRUE)
... ... @@ -701,8 +707,20 @@ vncClientThread::InitAuthenticate()
701 707  
702 708  
703 709 SetThreadDesktop(desktop);
704   -
705   - if ( !(acceptDlg->DoDialog()) ) verified = vncServer::aqrReject;
  710 +
  711 + /*if ( !(acceptDlg->DoDialog()) ){
  712 + verified = vncServer::aqrReject;
  713 + }*/
  714 + // Desativado nesta versão.
  715 + //pede autorização para reconexao
  716 + if(permissao == false){
  717 + //se autorização nao for valida
  718 + //abre caixa dedialogo
  719 +
  720 + if ( !(acceptDlg->DoDialog()) ){
  721 + verified = vncServer::aqrReject;
  722 + }
  723 + }
706 724  
707 725 CloseDesktop(desktop);
708 726 SetThreadDesktop(old_desktop);
... ... @@ -711,9 +729,17 @@ vncClientThread::InitAuthenticate()
711 729 }
712 730  
713 731 if (verified == vncServer::aqrReject) {
  732 +
714 733 CARD32 auth_val = Swap32IfLE(rfbConnFailed);
715 734 char *errmsg = "Sua conexão foi rejeitada pelo servidor.";
716 735 CARD32 errlen = Swap32IfLE(strlen(errmsg));
  736 +
  737 + FILE *fileToken = NULL;
  738 + string filePathToken = CACIC_Auth::getInstance()->getTempPath() + "Temp/ck_conexao.dat";
  739 + fileToken = fopen(filePathToken.data(),"w");
  740 + fprintf(fileToken, "[endconnection]\n");
  741 + fclose(fileToken);
  742 +
717 743 if (!m_socket->SendExact((char *)&auth_val, sizeof(auth_val)))
718 744 return FALSE;
719 745 if (!m_socket->SendExact((char *)&errlen, sizeof(errlen)))
... ... @@ -2699,6 +2725,7 @@ vncClientThread::run(void *arg)
2699 2725 }
2700 2726  
2701 2727 }
  2728 +
2702 2729 // TODO CACIC voltando o timeout ao normal
2703 2730 if (!m_socket->SetTimeout(30000))
2704 2731 vnclog.Print(LL_INTERR, VNCLOG("failed to set socket timeout(%d)"), GetLastError());
... ... @@ -2919,6 +2946,14 @@ vncClient::~vncClient()
2919 2946 if (m_clipboard_text) {
2920 2947 free(m_clipboard_text);
2921 2948 }
  2949 +
  2950 +/* string filePathToken = "C:/Cacic/" + CACIC_Auth::TOKEN_FILENAME;
  2951 +
  2952 + FILE *fileToken = NULL;
  2953 + fileToken = fopen(filePathToken.data(),"w");
  2954 + fprintf(fileToken, "[endsession2]\n");
  2955 + fclose(fileToken);*/
  2956 +
2922 2957 // Modif cs@2005
2923 2958 #ifdef DSHOW
2924 2959 CloseHandle(m_hmtxEncodeAccess);
... ...
srcacic/WinVNC/WinVNC/vnclog.cpp
  Diff comments   View file @d92773e
... ... @@ -47,7 +47,7 @@ static const int LINE_BUFFER_SIZE = 1024;
47 47  
48 48  
49 49  
50   -//static const string srVersion = "2.6.0.0";
  50 +//static const string srVersion = "2.6.0.2";
51 51  
52 52 VNCLog::VNCLog()
53 53 : m_tofile(false)
... ... @@ -208,7 +208,7 @@ inline void VNCLog::ReallyPrintLine(const char* line)
208 208  
209 209 //if (/*Verificar modo DEBUG!*/){
210 210 // strLine.append(" (");
211   - // strLine.append(/*Funcao de retorno da Versao: v.2.6.0.0*/);
  211 + // strLine.append(/*Funcao de retorno da Versao: v.2.6.0.2*/);
212 212 // strLine.append(")");
213 213 // strLine.append(" DEBUG -");
214 214 //}
... ...
srcacic/WinVNC/WinVNC/vnclog.h
  Diff comments   View file @d92773e
... ... @@ -46,7 +46,7 @@
46 46  
47 47 #define SCRIPT "srcacic_set_session.php"
48 48  
49   -#define SRVERSION "2.6.0.0"
  49 +#define SRVERSION "2.6.0.2"
50 50  
51 51 class VNCLog
52 52 {
... ...
srcacic/WinVNC/WinVNC/winvnc.cpp
  Diff comments   View file @d92773e
... ... @@ -268,12 +268,15 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, PSTR szCmdLine,
268 268 return 0;
269 269 }
270 270  
  271 + // seta o caminho da pasta de instalação do cacic
  272 + filePathGlobal = string(cmdln[4]);
  273 +
271 274 // seta o caminho da pasta temp do cacic
272   - CACIC_Auth::getInstance()->setTempPath(cmdln[5]);
  275 + CACIC_Auth::getInstance()->setTempPath(cmdln[4]);
273 276  
274 277 // Cria o arquivo temporário de travamento do CACIC
275   - string filePath = string(cmdln[5]);
276   - filePath += CACIC_Auth::AGUARDE_FILENAME;
  278 + string filePath = filePathGlobal + CACIC_Auth::AGUARDE_FILENAME;
  279 +
277 280 pFile = fopen(filePath.data(), "w+");
278 281 vnclog.Print(LL_SRLOG, VNCLOG("Criando arquivo temporário: aguarde_SRCACIC.txt!"));
279 282  
... ... @@ -288,13 +291,14 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, PSTR szCmdLine,
288 291 CACIC_Auth::getInstance()->setScriptsPath(te_end_ws_dec);
289 292 CACIC_Auth::getInstance()->setSOVersion(cmdln[2]);
290 293 CACIC_Auth::getInstance()->setNodeAdress(cmdln[3]);
291   - CACIC_Auth::getInstance()->setPalavraChave(cmdln[4]);
  294 + // CACIC_Auth::getInstance()->setPalavraChave(cmdln[4]);
  295 + CACIC_Auth::getInstance()->setPalavraChave(getPalavraChave().c_str());
292 296 UINT porta;
293   - stringstream portBuffer(cmdln[6]);
  297 + stringstream portBuffer(cmdln[5]);
294 298 portBuffer >> porta;
295 299 CACIC_Auth::getInstance()->setPorta(porta);
296 300 UINT timeout;
297   - stringstream timeoutBuffer(cmdln[7]);
  301 + stringstream timeoutBuffer(cmdln[6]);
298 302 timeoutBuffer >> timeout;
299 303 CACIC_Auth::getInstance()->setTimeout(timeout);
300 304  
... ... @@ -316,6 +320,47 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, PSTR szCmdLine,
316 320 return 0;
317 321 }
318 322  
  323 +string getPalavraChave()
  324 +{
  325 + ifstream file;
  326 + string dat = filePathGlobal + "cacic2.dat";
  327 + file.open(dat.c_str());
  328 +
  329 + if(!file.is_open()){
  330 + return "";
  331 + }
  332 + else
  333 + {
  334 + // descriptografar texto
  335 + string texto;
  336 +
  337 + getline(file,texto,'\n');
  338 + texto = CACIC_Crypt::decodifica(texto.c_str());
  339 +
  340 + file.close();
  341 +
  342 + size_t pos_ini = texto.find("Configs.te_palavra_chave=CacicIsFree=");
  343 +
  344 + pos_ini+=37;
  345 +
  346 + char* chave = new char[50];
  347 +
  348 + char c = texto.at(pos_ini);
  349 + int i=0;
  350 +
  351 + while((c!='=') && (c!= EOF))
  352 + {
  353 + chave[i] = c;
  354 + i++;
  355 + c = texto.at(pos_ini+i);
  356 + }
  357 +
  358 + chave[i] = '\0';
  359 + return CACIC_Crypt::codifica(chave);
  360 + }
  361 +}
  362 +
  363 +
319 364 // rdv&sf@2007 - New TrayIcon impuDEsktop/impersonation thread stuff
320 365 // Todo: cleanup
321 366 HINSTANCE hInst_;
... ... @@ -579,6 +624,7 @@ void iniciaTimer()
579 624 {
580 625 if (mmCRes != -1) mmCRes = -1;
581 626 mmCRes = timeSetEvent( 60000, 0, (LPTIMECALLBACK) atualizaSessao, NULL, TIME_PERIODIC );
  627 +
582 628 }
583 629  
584 630 void paraTimer()
... ...
srcacic/WinVNC/WinVNC/winvnc.h
  Diff comments   View file @d92773e
... ... @@ -78,6 +78,7 @@ const char winvncSecurityEditorHelper[] = &quot;-securityeditorhelper&quot;;
78 78 const char winvncSecurityEditor[] = "-securityeditor";
79 79 const char winvncKill[] = "-kill";
80 80 const char winvncStart[] = "-start";
  81 +static string filePathGlobal = "";
81 82  
82 83 // Usage string
83 84 const char winvncUsageText[] = "winvnc [-run] [-autoreconnect[ ID:????]] [-connect host[:display]] [-connect host[::port]] \n";
... ... @@ -85,3 +86,4 @@ const char winvncUsageText[] = &quot;winvnc [-run] [-autoreconnect[ ID:????]] [-conn
85 86 void CALLBACK atualizaSessao(UINT uID, UINT uMsg, DWORD dwUser, DWORD dw1, DWORD dw2);
86 87 void iniciaTimer();
87 88 void paraTimer();
  89 +string getPalavraChave();
... ...
srcacic/WinVNC/WinVNC/winvnc.rc
  Diff comments   View file @d92773e
... ... @@ -57,7 +57,7 @@ BEGIN
57 57 PUSHBUTTON "Cancelar",IDCANCEL,106,78,50,14,NOT WS_VISIBLE
58 58 LTEXT "Clientes conectados:",IDC_STATIC,5,4,152,8
59 59 LISTBOX IDC_VIEWERS_LISTBOX,7,16,91,93,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP,WS_EX_STATICEDGE
60   - PUSHBUTTON "Remover",IDC_KILL_B,107,16,50,23
  60 + PUSHBUTTON "Remover",IDC_KILL_B,107,16,50,23,WS_DISABLED
61 61 PUSHBUTTON "Iniciar Chat",IDC_TEXTCHAT_B,107,42,50,22,BS_MULTILINE
62 62 END
63 63  
... ... @@ -97,12 +97,12 @@ FONT 8, &quot;MS Shell Dlg&quot;, 0, 0, 0x0
97 97 BEGIN
98 98 DEFPUSHBUTTON "&Aceitar",IDACCEPT,7,142,57,21
99 99 PUSHBUTTON "&Rejeitar",IDREJECT,178,142,53,21
100   - CTEXT "srCACICsrv recebeu uma tentativa de conexão de:",IDC_STATIC_TEXT1,7,3,224,16,SS_CENTERIMAGE
  100 + CTEXT "Há uma tentativa de conexão de:",IDC_STATIC_TEXT1,7,3,224,16,SS_CENTERIMAGE
101 101 LTEXT "<desconhecido>",IDC_ACCEPT_IP,69,28,162,10,SS_CENTERIMAGE
102   - CTEXT "Você deseja aceitar a conexão?",IDC_STATIC_TEXT,7,126,224,16,SS_CENTERIMAGE
  102 + CTEXT "Deseja Aceitar ou Rejeitar a conexão?",IDC_STATIC_TEXT,7,126,224,16,SS_CENTERIMAGE
103 103 CTEXT "Rejeitar:",IDC_ACCEPT_TIMEOUT,64,142,114,21,SS_CENTERIMAGE
104 104 LTEXT "<desconhecido>",IDC_UVIS_NAME,69,17,162,8
105   - EDITTEXT IDC_MOTIVO_SUPORTE,7,64,224,62,ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_READONLY | ES_WANTRETURN
  105 + EDITTEXT IDC_MOTIVO_SUPORTE,7,64,224,62,ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_READONLY | ES_WANTRETURN | WS_VSCROLL
106 106 LTEXT "Motivo do Suporte:",IDC_STATIC,7,54,62,8
107 107 LTEXT "Endereço IP:",IDC_STATIC,7,29,42,8
108 108 LTEXT "Nome do Técnico:",IDC_STATIC,7,17,57,8
... ... @@ -118,7 +118,7 @@ BEGIN
118 118 CTEXT "ESTAÇÃO DE TRABALHO EM SUPORTE REMOTO",IDC_AVISO_SUPORTE,54,12,205,11
119 119 CTEXT "ATENÇÃO",IDC_ATENCAO_STATIC,54,2,205,10
120 120 LTEXT "Nome:",IDC_NOME_LBL,54,22,24,8
121   - LTEXT "IP:",IDC_IP_LBL,54,32,10,8 //IDC_IP_LBL
  121 + LTEXT "IP:",IDC_IP_LBL,54,32,10,8
122 122 LTEXT "Início:",IDC_INICIO_LBL,54,42,20,8
123 123 LTEXT "",IDC_INFO_NOME,78,23,181,8,0,WS_EX_TRANSPARENT
124 124 LTEXT "",IDC_INFO_IP,78,32,181,8,0,WS_EX_TRANSPARENT
... ... @@ -223,8 +223,8 @@ END
223 223 //
224 224  
225 225 VS_VERSION_INFO VERSIONINFO
226   - FILEVERSION 2,6,0,0
227   - PRODUCTVERSION 2,6,0,0
  226 + FILEVERSION 2,6,0,2
  227 + PRODUCTVERSION 2,6,0,2
228 228 FILEFLAGSMASK 0x37L
229 229 #ifdef _DEBUG
230 230 FILEFLAGS 0x25L
... ... @@ -242,11 +242,11 @@ BEGIN
242 242 VALUE "Comments", "Licença: GNU/LGPL"
243 243 VALUE "CompanyName", "Dataprev-Emp. de TI da Prev Social - UDSL/SSLC"
244 244 VALUE "FileDescription", "Sistema CACIC - Módulo Suporte Remoto Seguro"
245   - VALUE "FileVersion", "2.6.0.0"
  245 + VALUE "FileVersion", "2.6.0.2"
246 246 VALUE "InternalName", "srCACICsrv"
247 247 VALUE "LegalCopyright", "Copyright © 2008 DATAPREV"
248 248 VALUE "ProductName", "srCACIC"
249   - VALUE "ProductVersion", "2.6.0.0"
  249 + VALUE "ProductVersion", "2.6.0.2"
250 250 END
251 251 END
252 252 BLOCK "VarFileInfo"
... ... @@ -395,7 +395,7 @@ BEGIN
395 395 DEFPUSHBUTTON "OK",ID_POK,55,130,50,13
396 396 PUSHBUTTON "Cancelar",ID_PCANCELAR,117,130,50,13
397 397 COMBOBOX IDC_DOMAIN_CB,84,59,83,30,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
398   - CTEXT "v2.6.0.0",IDC_AUTHDLG_VERSION,187,145,36,8,SS_CENTERIMAGE,WS_EX_STATICEDGE
  398 + CTEXT "v2.6.0.2",IDC_AUTHDLG_VERSION,187,145,36,8,SS_CENTERIMAGE,WS_EX_STATICEDGE
399 399 CTEXT "Por favor, preencha as informações solicitadas abaixo, para a autenticação de seu usuário.",IDC_AUTH_INFO,3,38,216,18
400 400 EDITTEXT IDC_MSG,3,111,216,17,ES_CENTER | ES_MULTILINE | ES_READONLY | NOT WS_BORDER
401 401 CTEXT "ATENÇÃO: Esta autenticação, que precede a abertura de sessão para suporte remoto, atribui ao usuário a total responsabilidade por todo e qualquer tipo de dano lógico à estação que porventura seja causado por acesso externo indevido.",IDC_ATT_MSG,3,3,216,33
... ... @@ -411,7 +411,7 @@ BEGIN
411 411 EDITTEXT IDC_USER_EDIT,69,58,83,12,ES_AUTOHSCROLL
412 412 DEFPUSHBUTTON "OK",ID_POK,45,76,45,13
413 413 PUSHBUTTON "Cancelar",ID_PCANCELAR,102,76,45,13
414   - CTEXT "v2.6.0.0",IDC_AUTHDLG_VERSION,159,90,36,8,SS_CENTERIMAGE,WS_EX_STATICEDGE
  414 + CTEXT "v2.6.0.2",IDC_AUTHDLG_VERSION,159,90,36,8,SS_CENTERIMAGE,WS_EX_STATICEDGE
415 415 CTEXT "Por favor, digite seu nome no campo abaixo.",IDC_AUTH_INFO,3,46,188,10
416 416 CTEXT "ATENÇÃO: Esta autenticação, que precede a abertura de sessão para suporte remoto, atribui ao usuário a total responsabilidade por todo e qualquer tipo de dano lógico à estação que porventura seja causado por acesso externo indevido.",IDC_ATT_MSG,3,3,188,40
417 417 END
... ...
srcacic/ZLib/ZLib.vcproj
  Diff comments   View file @d92773e
... ... @@ -91,9 +91,9 @@
91 91 />
92 92 </Configuration>
93 93 <Configuration
94   - Name="Release|Win32"
95   - OutputDirectory=".\Release"
96   - IntermediateDirectory=".\Release"
  94 + Name="Debug|x64"
  95 + OutputDirectory="$(PlatformName)\$(ConfigurationName)"
  96 + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
97 97 ConfigurationType="4"
98 98 UseOfMFC="0"
99 99 ATLMinimizesCRunTimeLibraryUsage="false"
... ... @@ -113,42 +113,37 @@
113 113 />
114 114 <Tool
115 115 Name="VCMIDLTool"
  116 + TargetEnvironment="3"
116 117 />
117 118 <Tool
118 119 Name="VCCLCompilerTool"
119   - Optimization="3"
120   - InlineFunctionExpansion="2"
121   - EnableIntrinsicFunctions="true"
122   - FavorSizeOrSpeed="1"
123   - EnableFiberSafeOptimizations="true"
124   - WholeProgramOptimization="true"
125   - PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS"
126   - StringPooling="true"
127   - RuntimeLibrary="0"
128   - EnableFunctionLevelLinking="true"
129   - PrecompiledHeaderFile=".\Release/zlib.pch"
130   - AssemblerListingLocation=".\Release/"
131   - ObjectFile=".\Release/"
132   - ProgramDataBaseFileName=".\Release/"
  120 + Optimization="0"
  121 + PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS"
  122 + MinimalRebuild="true"
  123 + BasicRuntimeChecks="3"
  124 + RuntimeLibrary="1"
  125 + PrecompiledHeaderFile=".\Debug/zlib.pch"
  126 + AssemblerListingLocation=".\Debug/"
  127 + ObjectFile=".\Debug/"
  128 + ProgramDataBaseFileName=".\Debug/"
133 129 WarningLevel="3"
134 130 SuppressStartupBanner="true"
  131 + DebugInformationFormat="3"
135 132 />
136 133 <Tool
137 134 Name="VCManagedResourceCompilerTool"
138 135 />
139 136 <Tool
140 137 Name="VCResourceCompilerTool"
141   - PreprocessorDefinitions="NDEBUG"
  138 + PreprocessorDefinitions="_DEBUG"
142 139 Culture="2057"
143 140 />
144 141 <Tool
145 142 Name="VCPreLinkEventTool"
146   - CommandLine=""
147 143 />
148 144 <Tool
149 145 Name="VCLibrarianTool"
150   - AdditionalOptions="/LTCG"
151   - OutputFile=".\Release\zlib.lib"
  146 + OutputFile=".\Debug\zlib.lib"
152 147 SuppressStartupBanner="true"
153 148 />
154 149 <Tool
... ... @@ -160,7 +155,7 @@
160 155 <Tool
161 156 Name="VCBscMakeTool"
162 157 SuppressStartupBanner="true"
163   - OutputFile=".\Release/zlib.bsc"
  158 + OutputFile=".\Debug/zlib.bsc"
164 159 />
165 160 <Tool
166 161 Name="VCFxCopTool"
... ... @@ -170,9 +165,9 @@
170 165 />
171 166 </Configuration>
172 167 <Configuration
173   - Name="Debug|x64"
174   - OutputDirectory="$(PlatformName)\$(ConfigurationName)"
175   - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
  168 + Name="Release|Win32"
  169 + OutputDirectory=".\Release"
  170 + IntermediateDirectory=".\Release"
176 171 ConfigurationType="4"
177 172 UseOfMFC="0"
178 173 ATLMinimizesCRunTimeLibraryUsage="false"
... ... @@ -192,37 +187,42 @@
192 187 />
193 188 <Tool
194 189 Name="VCMIDLTool"
195   - TargetEnvironment="3"
196 190 />
197 191 <Tool
198 192 Name="VCCLCompilerTool"
199   - Optimization="0"
200   - PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS"
201   - MinimalRebuild="true"
202   - BasicRuntimeChecks="3"
203   - RuntimeLibrary="1"
204   - PrecompiledHeaderFile=".\Debug/zlib.pch"
205   - AssemblerListingLocation=".\Debug/"
206   - ObjectFile=".\Debug/"
207   - ProgramDataBaseFileName=".\Debug/"
  193 + Optimization="3"
  194 + InlineFunctionExpansion="2"
  195 + EnableIntrinsicFunctions="true"
  196 + FavorSizeOrSpeed="1"
  197 + EnableFiberSafeOptimizations="true"
  198 + WholeProgramOptimization="true"
  199 + PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS"
  200 + StringPooling="true"
  201 + RuntimeLibrary="0"
  202 + EnableFunctionLevelLinking="true"
  203 + PrecompiledHeaderFile=".\Release/zlib.pch"
  204 + AssemblerListingLocation=".\Release/"
  205 + ObjectFile=".\Release/"
  206 + ProgramDataBaseFileName=".\Release/"
208 207 WarningLevel="3"
209 208 SuppressStartupBanner="true"
210   - DebugInformationFormat="3"
211 209 />
212 210 <Tool
213 211 Name="VCManagedResourceCompilerTool"
214 212 />
215 213 <Tool
216 214 Name="VCResourceCompilerTool"
217   - PreprocessorDefinitions="_DEBUG"
  215 + PreprocessorDefinitions="NDEBUG"
218 216 Culture="2057"
219 217 />
220 218 <Tool
221 219 Name="VCPreLinkEventTool"
  220 + CommandLine=""
222 221 />
223 222 <Tool
224 223 Name="VCLibrarianTool"
225   - OutputFile=".\Debug\zlib.lib"
  224 + AdditionalOptions="/LTCG"
  225 + OutputFile=".\Release\zlib.lib"
226 226 SuppressStartupBanner="true"
227 227 />
228 228 <Tool
... ... @@ -234,7 +234,7 @@
234 234 <Tool
235 235 Name="VCBscMakeTool"
236 236 SuppressStartupBanner="true"
237   - OutputFile=".\Debug/zlib.bsc"
  237 + OutputFile=".\Release/zlib.bsc"
238 238 />
239 239 <Tool
240 240 Name="VCFxCopTool"
... ... @@ -317,6 +317,120 @@
317 317 Name="VCPostBuildEventTool"
318 318 />
319 319 </Configuration>
  320 + <Configuration
  321 + Name="debug - roberto|Win32"
  322 + OutputDirectory="$(SolutionDir)$(ConfigurationName)"
  323 + IntermediateDirectory="$(ConfigurationName)"
  324 + ConfigurationType="1"
  325 + >
  326 + <Tool
  327 + Name="VCPreBuildEventTool"
  328 + />
  329 + <Tool
  330 + Name="VCCustomBuildTool"
  331 + />
  332 + <Tool
  333 + Name="VCXMLDataGeneratorTool"
  334 + />
  335 + <Tool
  336 + Name="VCWebServiceProxyGeneratorTool"
  337 + />
  338 + <Tool
  339 + Name="VCMIDLTool"
  340 + />
  341 + <Tool
  342 + Name="VCCLCompilerTool"
  343 + />
  344 + <Tool
  345 + Name="VCManagedResourceCompilerTool"
  346 + />
  347 + <Tool
  348 + Name="VCResourceCompilerTool"
  349 + />
  350 + <Tool
  351 + Name="VCPreLinkEventTool"
  352 + />
  353 + <Tool
  354 + Name="VCLinkerTool"
  355 + />
  356 + <Tool
  357 + Name="VCALinkTool"
  358 + />
  359 + <Tool
  360 + Name="VCManifestTool"
  361 + />
  362 + <Tool
  363 + Name="VCXDCMakeTool"
  364 + />
  365 + <Tool
  366 + Name="VCBscMakeTool"
  367 + />
  368 + <Tool
  369 + Name="VCFxCopTool"
  370 + />
  371 + <Tool
  372 + Name="VCAppVerifierTool"
  373 + />
  374 + <Tool
  375 + Name="VCPostBuildEventTool"
  376 + />
  377 + </Configuration>
  378 + <Configuration
  379 + Name="debug - roberto|x64"
  380 + ConfigurationType="1"
  381 + >
  382 + <Tool
  383 + Name="VCPreBuildEventTool"
  384 + />
  385 + <Tool
  386 + Name="VCCustomBuildTool"
  387 + />
  388 + <Tool
  389 + Name="VCXMLDataGeneratorTool"
  390 + />
  391 + <Tool
  392 + Name="VCWebServiceProxyGeneratorTool"
  393 + />
  394 + <Tool
  395 + Name="VCMIDLTool"
  396 + />
  397 + <Tool
  398 + Name="VCCLCompilerTool"
  399 + />
  400 + <Tool
  401 + Name="VCManagedResourceCompilerTool"
  402 + />
  403 + <Tool
  404 + Name="VCResourceCompilerTool"
  405 + />
  406 + <Tool
  407 + Name="VCPreLinkEventTool"
  408 + />
  409 + <Tool
  410 + Name="VCLinkerTool"
  411 + />
  412 + <Tool
  413 + Name="VCALinkTool"
  414 + />
  415 + <Tool
  416 + Name="VCManifestTool"
  417 + />
  418 + <Tool
  419 + Name="VCXDCMakeTool"
  420 + />
  421 + <Tool
  422 + Name="VCBscMakeTool"
  423 + />
  424 + <Tool
  425 + Name="VCFxCopTool"
  426 + />
  427 + <Tool
  428 + Name="VCAppVerifierTool"
  429 + />
  430 + <Tool
  431 + Name="VCPostBuildEventTool"
  432 + />
  433 + </Configuration>
320 434 </Configurations>
321 435 <References>
322 436 </References>
... ... @@ -337,7 +451,7 @@
337 451 />
338 452 </FileConfiguration>
339 453 <FileConfiguration
340   - Name="Release|Win32"
  454 + Name="Debug|x64"
341 455 >
342 456 <Tool
343 457 Name="VCCLCompilerTool"
... ... @@ -345,7 +459,7 @@
345 459 />
346 460 </FileConfiguration>
347 461 <FileConfiguration
348   - Name="Debug|x64"
  462 + Name="Release|Win32"
349 463 >
350 464 <Tool
351 465 Name="VCCLCompilerTool"
... ... @@ -373,7 +487,7 @@
373 487 />
374 488 </FileConfiguration>
375 489 <FileConfiguration
376   - Name="Release|Win32"
  490 + Name="Debug|x64"
377 491 >
378 492 <Tool
379 493 Name="VCCLCompilerTool"
... ... @@ -381,7 +495,7 @@
381 495 />
382 496 </FileConfiguration>
383 497 <FileConfiguration
384   - Name="Debug|x64"
  498 + Name="Release|Win32"
385 499 >
386 500 <Tool
387 501 Name="VCCLCompilerTool"
... ... @@ -409,7 +523,7 @@
409 523 />
410 524 </FileConfiguration>
411 525 <FileConfiguration
412   - Name="Release|Win32"
  526 + Name="Debug|x64"
413 527 >
414 528 <Tool
415 529 Name="VCCLCompilerTool"
... ... @@ -417,7 +531,7 @@
417 531 />
418 532 </FileConfiguration>
419 533 <FileConfiguration
420   - Name="Debug|x64"
  534 + Name="Release|Win32"
421 535 >
422 536 <Tool
423 537 Name="VCCLCompilerTool"
... ... @@ -445,7 +559,7 @@
445 559 />
446 560 </FileConfiguration>
447 561 <FileConfiguration
448   - Name="Release|Win32"
  562 + Name="Debug|x64"
449 563 >
450 564 <Tool
451 565 Name="VCCLCompilerTool"
... ... @@ -453,7 +567,7 @@
453 567 />
454 568 </FileConfiguration>
455 569 <FileConfiguration
456   - Name="Debug|x64"
  570 + Name="Release|Win32"
457 571 >
458 572 <Tool
459 573 Name="VCCLCompilerTool"
... ... @@ -481,7 +595,7 @@
481 595 />
482 596 </FileConfiguration>
483 597 <FileConfiguration
484   - Name="Release|Win32"
  598 + Name="Debug|x64"
485 599 >
486 600 <Tool
487 601 Name="VCCLCompilerTool"
... ... @@ -489,7 +603,7 @@
489 603 />
490 604 </FileConfiguration>
491 605 <FileConfiguration
492   - Name="Debug|x64"
  606 + Name="Release|Win32"
493 607 >
494 608 <Tool
495 609 Name="VCCLCompilerTool"
... ... @@ -517,7 +631,7 @@
517 631 />
518 632 </FileConfiguration>
519 633 <FileConfiguration
520   - Name="Release|Win32"
  634 + Name="Debug|x64"
521 635 >
522 636 <Tool
523 637 Name="VCCLCompilerTool"
... ... @@ -525,7 +639,7 @@
525 639 />
526 640 </FileConfiguration>
527 641 <FileConfiguration
528   - Name="Debug|x64"
  642 + Name="Release|Win32"
529 643 >
530 644 <Tool
531 645 Name="VCCLCompilerTool"
... ... @@ -553,7 +667,7 @@
553 667 />
554 668 </FileConfiguration>
555 669 <FileConfiguration
556   - Name="Release|Win32"
  670 + Name="Debug|x64"
557 671 >
558 672 <Tool
559 673 Name="VCCLCompilerTool"
... ... @@ -561,7 +675,7 @@
561 675 />
562 676 </FileConfiguration>
563 677 <FileConfiguration
564   - Name="Debug|x64"
  678 + Name="Release|Win32"
565 679 >
566 680 <Tool
567 681 Name="VCCLCompilerTool"
... ... @@ -589,7 +703,7 @@
589 703 />
590 704 </FileConfiguration>
591 705 <FileConfiguration
592   - Name="Release|Win32"
  706 + Name="Debug|x64"
593 707 >
594 708 <Tool
595 709 Name="VCCLCompilerTool"
... ... @@ -597,7 +711,7 @@
597 711 />
598 712 </FileConfiguration>
599 713 <FileConfiguration
600   - Name="Debug|x64"
  714 + Name="Release|Win32"
601 715 >
602 716 <Tool
603 717 Name="VCCLCompilerTool"
... ... @@ -625,7 +739,7 @@
625 739 />
626 740 </FileConfiguration>
627 741 <FileConfiguration
628   - Name="Release|Win32"
  742 + Name="Debug|x64"
629 743 >
630 744 <Tool
631 745 Name="VCCLCompilerTool"
... ... @@ -633,7 +747,7 @@
633 747 />
634 748 </FileConfiguration>
635 749 <FileConfiguration
636   - Name="Debug|x64"
  750 + Name="Release|Win32"
637 751 >
638 752 <Tool
639 753 Name="VCCLCompilerTool"
... ... @@ -661,7 +775,7 @@
661 775 />
662 776 </FileConfiguration>
663 777 <FileConfiguration
664   - Name="Release|Win32"
  778 + Name="Debug|x64"
665 779 >
666 780 <Tool
667 781 Name="VCCLCompilerTool"
... ... @@ -669,7 +783,7 @@
669 783 />
670 784 </FileConfiguration>
671 785 <FileConfiguration
672   - Name="Debug|x64"
  786 + Name="Release|Win32"
673 787 >
674 788 <Tool
675 789 Name="VCCLCompilerTool"
... ... @@ -697,7 +811,7 @@
697 811 />
698 812 </FileConfiguration>
699 813 <FileConfiguration
700   - Name="Release|Win32"
  814 + Name="Debug|x64"
701 815 >
702 816 <Tool
703 817 Name="VCCLCompilerTool"
... ... @@ -705,7 +819,7 @@
705 819 />
706 820 </FileConfiguration>
707 821 <FileConfiguration
708   - Name="Debug|x64"
  822 + Name="Release|Win32"
709 823 >
710 824 <Tool
711 825 Name="VCCLCompilerTool"
... ...