Download as
Browse Code »

Commit 2606d1287ae09ef666063e3696d51666755d8618

Authored by anderson.peterle@previdencia.gov.br
1 parent 1484da02
Exists in master

ajuste de versoes de arquivos e produtos 

git-svn-id: http://svn.softwarepublico.gov.br/svn/cacic/cacic/trunk/agente-windows@906 fecfc0c7-e812-0410-ae72-849f08638ee7
Showing 26 changed files with 841 additions and 483 deletions   Show diff stats
srcacic/RFB/rfbproto.h
  Diff comments   View file @2606d12
... ... @@ -289,6 +289,7 @@ typedef struct {
289 289  
290 290 /* client -> server */
291 291  
  292 +#define rfbNoLogout 100
292 293 #define rfbSetPixelFormat 0
293 294 #define rfbFixColourMapEntries 1 /* not currently supported */
294 295 #define rfbSetEncodings 2
... ... @@ -877,6 +878,11 @@ typedef struct {
877 878 *
878 879 *****************************************************************************/
879 880  
  881 +typedef struct {
  882 + CARD8 type;
  883 +} rfbNoLogoutMsg;
  884 +
  885 +#define sz_rfbNoLogoutMsg 3
880 886  
881 887 /*-----------------------------------------------------------------------------
882 888 * SetPixelFormat - tell the RFB server the format in which the client wants
... ... @@ -1091,6 +1097,7 @@ typedef struct _rfbSetSWMsg {
1091 1097  
1092 1098 typedef union {
1093 1099 CARD8 type;
  1100 + rfbNoLogoutMsg nl;
1094 1101 rfbSetPixelFormatMsg spf;
1095 1102 rfbFixColourMapEntriesMsg fcme;
1096 1103 rfbSetEncodingsMsg se;
... ...
srcacic/VNCViewer/ClientConnection.cpp
  Diff comments   View file @2606d12
... ... @@ -69,7 +69,8 @@ extern "C" {
69 69  
70 70 #include <DSMPlugin/DSMPlugin.h> // sf@2002
71 71  
72   -#include "CACIC_Crypt.h"
  72 +#include "../WinVNC/WinVNC/CACIC_Crypt.h"
  73 +#include "../WinVNC/WinVNC/CACIC_Utils.h"
73 74  
74 75 // [v1.0.2-jp1 fix]
75 76 #pragma comment(lib, "imm32.lib")
... ... @@ -1802,7 +1803,7 @@ void ClientConnection::NegotiateProtocolVersion()
1802 1803 m_fServerKnowsFileTransfer = true;
1803 1804 }*/
1804 1805  
1805   - else if ((m_majorVersion == 15) && (m_minorVersion < 17)) {
  1806 + else if ((m_majorVersion == 3) && (m_minorVersion < 3)) {
1806 1807  
1807 1808 /* if server is 3.2 we can't use the new authentication */
1808 1809 vnclog.Print(0, _T("Can't use IDEA authentication\n"));
... ... @@ -5666,6 +5667,19 @@ LRESULT CALLBACK ClientConnection::WndProc(HWND hwnd, UINT iMsg, WPARAM wParam,
5666 5667  
5667 5668 // 8 April 2008 jdp hide window while shutting down
5668 5669 ::ShowWindow(hwnd, SW_HIDE);
  5670 +
  5671 + // TODO: quando o cliente é removido pelo servidor ou cai, a janela sobre o logout aparece assim mesmo.
  5672 + if (_this->m_running) {
  5673 + int doLogout = MessageBox(hwnd, "Deseja efetuar logout na máquina remota?", "srCACICcli", MB_YESNO);
  5674 + if (doLogout == IDNO) {
  5675 + // CACIC: Envia mensagem dizendo que o servidor deve efetuar o logout.
  5676 + rfbNoLogoutMsg nl;
  5677 + nl.type = rfbNoLogout;
  5678 +
  5679 + _this->WriteExact((char *)&nl, sz_rfbNoLogoutMsg, rfbNoLogout);
  5680 + }
  5681 + }
  5682 +
5669 5683 // Close the worker thread
5670 5684 _this->KillThread();
5671 5685  
... ... @@ -5690,6 +5704,7 @@ LRESULT CALLBACK ClientConnection::WndProc(HWND hwnd, UINT iMsg, WPARAM wParam,
5690 5704 _this->SuspendThread();
5691 5705 _this->Reconnect();
5692 5706 }
  5707 +
5693 5708 return 0;
5694 5709 }
5695 5710  
... ... @@ -6379,6 +6394,7 @@ LRESULT CALLBACK ClientConnection::WndProchwnd(HWND hwnd, UINT iMsg, WPARAM wPar
6379 6394  
6380 6395 // 8 April 2008 jdp
6381 6396 ::ShowWindow(hwnd, SW_HIDE);
  6397 +
6382 6398 // Close the worker thread as well
6383 6399 _this->KillThread();
6384 6400  
... ...
srcacic/VNCViewer/Res/vncviewer.rc
  Diff comments   View file @2606d12
... ... @@ -535,8 +535,8 @@ IDB_VNC32 BITMAP &quot;vnc32.BMP&quot;
535 535 //
536 536  
537 537 VS_VERSION_INFO VERSIONINFO
538   - FILEVERSION 2,5,0,804
539   - PRODUCTVERSION 2,5,0,804
  538 + FILEVERSION 2,5,9,0
  539 + PRODUCTVERSION 2,6,0,0
540 540 FILEFLAGSMASK 0x37L
541 541 #ifdef _DEBUG
542 542 FILEFLAGS 0x25L
... ... @@ -549,20 +549,21 @@ VS_VERSION_INFO VERSIONINFO
549 549 BEGIN
550 550 BLOCK "StringFileInfo"
551 551 BEGIN
552   - BLOCK "000004b0"
  552 + BLOCK "080004b0"
553 553 BEGIN
554   - VALUE "CompanyName", "Dataprev - Unidade Regional Espírito Santo"
555   - VALUE "FileDescription", "Visualizador do Suporte Remoto Seguro do Sistema CACIC"
556   - VALUE "FileVersion", "2, 5, 0, 804"
  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"
557 558 VALUE "InternalName", "srCACICcli"
558 559 VALUE "LegalCopyright", "Copyright © 2008 DATAPREV"
559   - VALUE "LegalTrademarks", "srCACIC"
560   - VALUE "ProductVersion", "2, 5, 0, 804"
  560 + VALUE "ProductName", "srCACIC"
  561 + VALUE "ProductVersion", "2.6.0.0"
561 562 END
562 563 END
563 564 BLOCK "VarFileInfo"
564 565 BEGIN
565   - VALUE "Translation", 0x0, 1200
  566 + VALUE "Translation", 0x800, 1200
566 567 END
567 568 END
568 569  
... ...
srcacic/VNCViewer/SessionDialog.h
  Diff comments   View file @2606d12
... ... @@ -29,7 +29,7 @@
29 29 #include "MRU.h"
30 30 #include <DSMPlugin/DSMPlugin.h>
31 31  
32   -class SessionDialog
  32 +class SessionDialog
33 33 {
34 34 public:
35 35  
... ...
srcacic/VNCViewer/VNCViewer.vcproj
  Diff comments   View file @2606d12
... ... @@ -117,9 +117,9 @@
117 117 />
118 118 </Configuration>
119 119 <Configuration
120   - Name="Release|Win32"
121   - OutputDirectory=".\Release"
122   - IntermediateDirectory=".\Release"
  120 + Name="Debug|x64"
  121 + OutputDirectory="$(PlatformName)\$(ConfigurationName)"
  122 + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
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="NDEBUG"
  141 + PreprocessorDefinitions="_DEBUG"
142 142 MkTypLibCompatible="true"
143 143 SuppressStartupBanner="true"
144   - TargetEnvironment="1"
145   - TypeLibraryName=".\Release/vncviewer.tlb"
  144 + TargetEnvironment="3"
  145 + TypeLibraryName=".\Debug/vncviewer.tlb"
146 146 HeaderFileName=""
147 147 />
148 148 <Tool
149 149 Name="VCCLCompilerTool"
150   - Optimization="3"
151   - InlineFunctionExpansion="2"
152   - EnableIntrinsicFunctions="true"
153   - FavorSizeOrSpeed="1"
154   - EnableFiberSafeOptimizations="true"
155   - WholeProgramOptimization="true"
  150 + Optimization="0"
156 151 AdditionalIncludeDirectories="omnithread,.."
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/"
  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"
163 160 WarningLevel="3"
164 161 SuppressStartupBanner="true"
  162 + DebugInformationFormat="3"
165 163 />
166 164 <Tool
167 165 Name="VCManagedResourceCompilerTool"
168 166 />
169 167 <Tool
170 168 Name="VCResourceCompilerTool"
171   - PreprocessorDefinitions="NDEBUG"
  169 + PreprocessorDefinitions="_DEBUG"
172 170 Culture="1033"
173 171 />
174 172 <Tool
175 173 Name="VCPreLinkEventTool"
176 174 Description="Setting build time..."
177   - CommandLine="cl /nologo /MT /FoRelease\ /FdRelease\ /c buildtime.cpp"
  175 + CommandLine="cl /nologo /MTd /FoDebug\ /FdDebug\ /c buildtime.cpp"
178 176 />
179 177 <Tool
180 178 Name="VCLinkerTool"
181   - AdditionalOptions="/LTCG"
182 179 AdditionalDependencies="comctl32.lib winmm.lib omnithread.lib wsock32.lib"
183   - OutputFile=".\Release/srcaciccli.exe"
  180 + OutputFile=".\Debug/vncviewer.exe"
184 181 LinkIncremental="2"
185 182 SuppressStartupBanner="true"
186   - AdditionalLibraryDirectories="omnithread/Release"
187   - ProgramDatabaseFile=".\Release/vncviewer.pdb"
  183 + AdditionalLibraryDirectories="./omnithread/Debug"
  184 + GenerateDebugInformation="true"
  185 + ProgramDatabaseFile=".\Debug/vncviewer.pdb"
  186 + GenerateMapFile="true"
  187 + MapFileName=".\Debug/vncviewer.map"
188 188 SubSystem="2"
189 189 RandomizedBaseAddress="1"
190 190 DataExecutionPrevention="0"
191   - TargetMachine="1"
  191 + TargetMachine="17"
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=".\Release/vncviewer.bsc"
  205 + OutputFile=".\Debug/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="Debug|x64"
219   - OutputDirectory="$(PlatformName)\$(ConfigurationName)"
220   - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
  218 + Name="Release|Win32"
  219 + OutputDirectory=".\Release"
  220 + IntermediateDirectory=".\Release"
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="_DEBUG"
  239 + PreprocessorDefinitions="NDEBUG"
240 240 MkTypLibCompatible="true"
241 241 SuppressStartupBanner="true"
242   - TargetEnvironment="3"
243   - TypeLibraryName=".\Debug/vncviewer.tlb"
  242 + TargetEnvironment="1"
  243 + TypeLibraryName=".\Release/vncviewer.tlb"
244 244 HeaderFileName=""
245 245 />
246 246 <Tool
247 247 Name="VCCLCompilerTool"
248   - Optimization="0"
  248 + Optimization="3"
  249 + InlineFunctionExpansion="2"
  250 + EnableIntrinsicFunctions="true"
  251 + FavorSizeOrSpeed="1"
  252 + EnableFiberSafeOptimizations="true"
  253 + WholeProgramOptimization="true"
249 254 AdditionalIncludeDirectories="omnithread,.."
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"
  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/"
258 261 WarningLevel="3"
259 262 SuppressStartupBanner="true"
260   - DebugInformationFormat="3"
261 263 />
262 264 <Tool
263 265 Name="VCManagedResourceCompilerTool"
264 266 />
265 267 <Tool
266 268 Name="VCResourceCompilerTool"
267   - PreprocessorDefinitions="_DEBUG"
  269 + PreprocessorDefinitions="NDEBUG"
268 270 Culture="1033"
269 271 />
270 272 <Tool
271 273 Name="VCPreLinkEventTool"
272 274 Description="Setting build time..."
273   - CommandLine="cl /nologo /MTd /FoDebug\ /FdDebug\ /c buildtime.cpp"
  275 + CommandLine="cl /nologo /MT /FoRelease\ /FdRelease\ /c buildtime.cpp"
274 276 />
275 277 <Tool
276 278 Name="VCLinkerTool"
  279 + AdditionalOptions="/LTCG"
277 280 AdditionalDependencies="comctl32.lib winmm.lib omnithread.lib wsock32.lib"
278   - OutputFile=".\Debug/vncviewer.exe"
  281 + OutputFile=".\Release/srcaciccli.exe"
279 282 LinkIncremental="2"
280 283 SuppressStartupBanner="true"
281   - AdditionalLibraryDirectories="./omnithread/Debug"
282   - GenerateDebugInformation="true"
283   - ProgramDatabaseFile=".\Debug/vncviewer.pdb"
284   - GenerateMapFile="true"
285   - MapFileName=".\Debug/vncviewer.map"
  284 + AdditionalLibraryDirectories="omnithread/Release"
  285 + ProgramDatabaseFile=".\Release/vncviewer.pdb"
286 286 SubSystem="2"
287 287 RandomizedBaseAddress="1"
288 288 DataExecutionPrevention="0"
289   - TargetMachine="17"
  289 + TargetMachine="1"
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=".\Debug/vncviewer.bsc"
  303 + OutputFile=".\Release/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="Release|Win32"
  601 + Name="Debug|x64"
602 602 >
603 603 <Tool
604 604 Name="VCResourceCompilerTool"
... ... @@ -607,7 +607,7 @@
607 607 />
608 608 </FileConfiguration>
609 609 <FileConfiguration
610   - Name="Debug|x64"
  610 + Name="Release|Win32"
611 611 >
612 612 <Tool
613 613 Name="VCResourceCompilerTool"
... ... @@ -642,7 +642,7 @@
642 642 />
643 643 </FileConfiguration>
644 644 <FileConfiguration
645   - Name="Release|Win32"
  645 + Name="Debug|x64"
646 646 >
647 647 <Tool
648 648 Name="VCCLCompilerTool"
... ... @@ -651,7 +651,7 @@
651 651 />
652 652 </FileConfiguration>
653 653 <FileConfiguration
654   - Name="Debug|x64"
  654 + Name="Release|Win32"
655 655 >
656 656 <Tool
657 657 Name="VCCLCompilerTool"
... ... @@ -682,7 +682,7 @@
682 682 />
683 683 </FileConfiguration>
684 684 <FileConfiguration
685   - Name="Release|Win32"
  685 + Name="Debug|x64"
686 686 >
687 687 <Tool
688 688 Name="VCCLCompilerTool"
... ... @@ -691,7 +691,7 @@
691 691 />
692 692 </FileConfiguration>
693 693 <FileConfiguration
694   - Name="Debug|x64"
  694 + Name="Release|Win32"
695 695 >
696 696 <Tool
697 697 Name="VCCLCompilerTool"
... ... @@ -722,7 +722,7 @@
722 722 />
723 723 </FileConfiguration>
724 724 <FileConfiguration
725   - Name="Release|Win32"
  725 + Name="Debug|x64"
726 726 >
727 727 <Tool
728 728 Name="VCCLCompilerTool"
... ... @@ -731,7 +731,7 @@
731 731 />
732 732 </FileConfiguration>
733 733 <FileConfiguration
734   - Name="Debug|x64"
  734 + Name="Release|Win32"
735 735 >
736 736 <Tool
737 737 Name="VCCLCompilerTool"
... ... @@ -750,7 +750,7 @@
750 750 </FileConfiguration>
751 751 </File>
752 752 <File
753   - RelativePath=".\base64.cpp"
  753 + RelativePath="..\WinVNC\WinVNC\base64.cpp"
754 754 >
755 755 </File>
756 756 <File
... ... @@ -766,7 +766,7 @@
766 766 />
767 767 </FileConfiguration>
768 768 <FileConfiguration
769   - Name="Release|Win32"
  769 + Name="Debug|x64"
770 770 >
771 771 <Tool
772 772 Name="VCCLCompilerTool"
... ... @@ -775,7 +775,7 @@
775 775 />
776 776 </FileConfiguration>
777 777 <FileConfiguration
778   - Name="Debug|x64"
  778 + Name="Release|Win32"
779 779 >
780 780 <Tool
781 781 Name="VCCLCompilerTool"
... ... @@ -794,11 +794,11 @@
794 794 </FileConfiguration>
795 795 </File>
796 796 <File
797   - RelativePath=".\CACIC_Crypt.cpp"
  797 + RelativePath="..\WinVNC\WinVNC\CACIC_Crypt.cpp"
798 798 >
799 799 </File>
800 800 <File
801   - RelativePath=".\CACIC_Utils.cpp"
  801 + RelativePath="..\WinVNC\WinVNC\CACIC_Utils.cpp"
802 802 >
803 803 </File>
804 804 <File
... ... @@ -814,7 +814,7 @@
814 814 />
815 815 </FileConfiguration>
816 816 <FileConfiguration
817   - Name="Release|Win32"
  817 + Name="Debug|x64"
818 818 >
819 819 <Tool
820 820 Name="VCCLCompilerTool"
... ... @@ -823,7 +823,7 @@
823 823 />
824 824 </FileConfiguration>
825 825 <FileConfiguration
826   - Name="Debug|x64"
  826 + Name="Release|Win32"
827 827 >
828 828 <Tool
829 829 Name="VCCLCompilerTool"
... ... @@ -854,7 +854,7 @@
854 854 />
855 855 </FileConfiguration>
856 856 <FileConfiguration
857   - Name="Release|Win32"
  857 + Name="Debug|x64"
858 858 >
859 859 <Tool
860 860 Name="VCCLCompilerTool"
... ... @@ -863,7 +863,7 @@
863 863 />
864 864 </FileConfiguration>
865 865 <FileConfiguration
866   - Name="Debug|x64"
  866 + Name="Release|Win32"
867 867 >
868 868 <Tool
869 869 Name="VCCLCompilerTool"
... ... @@ -894,7 +894,7 @@
894 894 />
895 895 </FileConfiguration>
896 896 <FileConfiguration
897   - Name="Release|Win32"
  897 + Name="Debug|x64"
898 898 >
899 899 <Tool
900 900 Name="VCCLCompilerTool"
... ... @@ -903,7 +903,7 @@
903 903 />
904 904 </FileConfiguration>
905 905 <FileConfiguration
906   - Name="Debug|x64"
  906 + Name="Release|Win32"
907 907 >
908 908 <Tool
909 909 Name="VCCLCompilerTool"
... ... @@ -934,7 +934,7 @@
934 934 />
935 935 </FileConfiguration>
936 936 <FileConfiguration
937   - Name="Release|Win32"
  937 + Name="Debug|x64"
938 938 >
939 939 <Tool
940 940 Name="VCCLCompilerTool"
... ... @@ -943,7 +943,7 @@
943 943 />
944 944 </FileConfiguration>
945 945 <FileConfiguration
946   - Name="Debug|x64"
  946 + Name="Release|Win32"
947 947 >
948 948 <Tool
949 949 Name="VCCLCompilerTool"
... ... @@ -974,7 +974,7 @@
974 974 />
975 975 </FileConfiguration>
976 976 <FileConfiguration
977   - Name="Release|Win32"
  977 + Name="Debug|x64"
978 978 >
979 979 <Tool
980 980 Name="VCCLCompilerTool"
... ... @@ -983,7 +983,7 @@
983 983 />
984 984 </FileConfiguration>
985 985 <FileConfiguration
986   - Name="Debug|x64"
  986 + Name="Release|Win32"
987 987 >
988 988 <Tool
989 989 Name="VCCLCompilerTool"
... ... @@ -1014,7 +1014,7 @@
1014 1014 />
1015 1015 </FileConfiguration>
1016 1016 <FileConfiguration
1017   - Name="Release|Win32"
  1017 + Name="Debug|x64"
1018 1018 >
1019 1019 <Tool
1020 1020 Name="VCCLCompilerTool"
... ... @@ -1023,7 +1023,7 @@
1023 1023 />
1024 1024 </FileConfiguration>
1025 1025 <FileConfiguration
1026   - Name="Debug|x64"
  1026 + Name="Release|Win32"
1027 1027 >
1028 1028 <Tool
1029 1029 Name="VCCLCompilerTool"
... ... @@ -1054,7 +1054,7 @@
1054 1054 />
1055 1055 </FileConfiguration>
1056 1056 <FileConfiguration
1057   - Name="Release|Win32"
  1057 + Name="Debug|x64"
1058 1058 >
1059 1059 <Tool
1060 1060 Name="VCCLCompilerTool"
... ... @@ -1063,7 +1063,7 @@
1063 1063 />
1064 1064 </FileConfiguration>
1065 1065 <FileConfiguration
1066   - Name="Debug|x64"
  1066 + Name="Release|Win32"
1067 1067 >
1068 1068 <Tool
1069 1069 Name="VCCLCompilerTool"
... ... @@ -1094,7 +1094,7 @@
1094 1094 />
1095 1095 </FileConfiguration>
1096 1096 <FileConfiguration
1097   - Name="Release|Win32"
  1097 + Name="Debug|x64"
1098 1098 >
1099 1099 <Tool
1100 1100 Name="VCCLCompilerTool"
... ... @@ -1103,7 +1103,7 @@
1103 1103 />
1104 1104 </FileConfiguration>
1105 1105 <FileConfiguration
1106   - Name="Debug|x64"
  1106 + Name="Release|Win32"
1107 1107 >
1108 1108 <Tool
1109 1109 Name="VCCLCompilerTool"
... ... @@ -1134,7 +1134,7 @@
1134 1134 />
1135 1135 </FileConfiguration>
1136 1136 <FileConfiguration
1137   - Name="Release|Win32"
  1137 + Name="Debug|x64"
1138 1138 >
1139 1139 <Tool
1140 1140 Name="VCCLCompilerTool"
... ... @@ -1143,7 +1143,7 @@
1143 1143 />
1144 1144 </FileConfiguration>
1145 1145 <FileConfiguration
1146   - Name="Debug|x64"
  1146 + Name="Release|Win32"
1147 1147 >
1148 1148 <Tool
1149 1149 Name="VCCLCompilerTool"
... ... @@ -1174,7 +1174,7 @@
1174 1174 />
1175 1175 </FileConfiguration>
1176 1176 <FileConfiguration
1177   - Name="Release|Win32"
  1177 + Name="Debug|x64"
1178 1178 >
1179 1179 <Tool
1180 1180 Name="VCCLCompilerTool"
... ... @@ -1183,7 +1183,7 @@
1183 1183 />
1184 1184 </FileConfiguration>
1185 1185 <FileConfiguration
1186   - Name="Debug|x64"
  1186 + Name="Release|Win32"
1187 1187 >
1188 1188 <Tool
1189 1189 Name="VCCLCompilerTool"
... ... @@ -1214,7 +1214,7 @@
1214 1214 />
1215 1215 </FileConfiguration>
1216 1216 <FileConfiguration
1217   - Name="Release|Win32"
  1217 + Name="Debug|x64"
1218 1218 >
1219 1219 <Tool
1220 1220 Name="VCCLCompilerTool"
... ... @@ -1223,7 +1223,7 @@
1223 1223 />
1224 1224 </FileConfiguration>
1225 1225 <FileConfiguration
1226   - Name="Debug|x64"
  1226 + Name="Release|Win32"
1227 1227 >
1228 1228 <Tool
1229 1229 Name="VCCLCompilerTool"
... ... @@ -1254,7 +1254,7 @@
1254 1254 />
1255 1255 </FileConfiguration>
1256 1256 <FileConfiguration
1257   - Name="Release|Win32"
  1257 + Name="Debug|x64"
1258 1258 >
1259 1259 <Tool
1260 1260 Name="VCCLCompilerTool"
... ... @@ -1263,7 +1263,7 @@
1263 1263 />
1264 1264 </FileConfiguration>
1265 1265 <FileConfiguration
1266   - Name="Debug|x64"
  1266 + Name="Release|Win32"
1267 1267 >
1268 1268 <Tool
1269 1269 Name="VCCLCompilerTool"
... ... @@ -1294,7 +1294,7 @@
1294 1294 />
1295 1295 </FileConfiguration>
1296 1296 <FileConfiguration
1297   - Name="Release|Win32"
  1297 + Name="Debug|x64"
1298 1298 >
1299 1299 <Tool
1300 1300 Name="VCCLCompilerTool"
... ... @@ -1303,7 +1303,7 @@
1303 1303 />
1304 1304 </FileConfiguration>
1305 1305 <FileConfiguration
1306   - Name="Debug|x64"
  1306 + Name="Release|Win32"
1307 1307 >
1308 1308 <Tool
1309 1309 Name="VCCLCompilerTool"
... ... @@ -1334,7 +1334,7 @@
1334 1334 />
1335 1335 </FileConfiguration>
1336 1336 <FileConfiguration
1337   - Name="Release|Win32"
  1337 + Name="Debug|x64"
1338 1338 >
1339 1339 <Tool
1340 1340 Name="VCCLCompilerTool"
... ... @@ -1343,7 +1343,7 @@
1343 1343 />
1344 1344 </FileConfiguration>
1345 1345 <FileConfiguration
1346   - Name="Debug|x64"
  1346 + Name="Release|Win32"
1347 1347 >
1348 1348 <Tool
1349 1349 Name="VCCLCompilerTool"
... ... @@ -1374,7 +1374,7 @@
1374 1374 />
1375 1375 </FileConfiguration>
1376 1376 <FileConfiguration
1377   - Name="Release|Win32"
  1377 + Name="Debug|x64"
1378 1378 >
1379 1379 <Tool
1380 1380 Name="VCCLCompilerTool"
... ... @@ -1383,7 +1383,7 @@
1383 1383 />
1384 1384 </FileConfiguration>
1385 1385 <FileConfiguration
1386   - Name="Debug|x64"
  1386 + Name="Release|Win32"
1387 1387 >
1388 1388 <Tool
1389 1389 Name="VCCLCompilerTool"
... ... @@ -1414,7 +1414,7 @@
1414 1414 />
1415 1415 </FileConfiguration>
1416 1416 <FileConfiguration
1417   - Name="Release|Win32"
  1417 + Name="Debug|x64"
1418 1418 >
1419 1419 <Tool
1420 1420 Name="VCCLCompilerTool"
... ... @@ -1423,7 +1423,7 @@
1423 1423 />
1424 1424 </FileConfiguration>
1425 1425 <FileConfiguration
1426   - Name="Debug|x64"
  1426 + Name="Release|Win32"
1427 1427 >
1428 1428 <Tool
1429 1429 Name="VCCLCompilerTool"
... ... @@ -1454,7 +1454,7 @@
1454 1454 />
1455 1455 </FileConfiguration>
1456 1456 <FileConfiguration
1457   - Name="Release|Win32"
  1457 + Name="Debug|x64"
1458 1458 >
1459 1459 <Tool
1460 1460 Name="VCCLCompilerTool"
... ... @@ -1463,7 +1463,7 @@
1463 1463 />
1464 1464 </FileConfiguration>
1465 1465 <FileConfiguration
1466   - Name="Debug|x64"
  1466 + Name="Release|Win32"
1467 1467 >
1468 1468 <Tool
1469 1469 Name="VCCLCompilerTool"
... ... @@ -1494,7 +1494,7 @@
1494 1494 />
1495 1495 </FileConfiguration>
1496 1496 <FileConfiguration
1497   - Name="Release|Win32"
  1497 + Name="Debug|x64"
1498 1498 >
1499 1499 <Tool
1500 1500 Name="VCCLCompilerTool"
... ... @@ -1503,7 +1503,7 @@
1503 1503 />
1504 1504 </FileConfiguration>
1505 1505 <FileConfiguration
1506   - Name="Debug|x64"
  1506 + Name="Release|Win32"
1507 1507 >
1508 1508 <Tool
1509 1509 Name="VCCLCompilerTool"
... ... @@ -1534,7 +1534,7 @@
1534 1534 />
1535 1535 </FileConfiguration>
1536 1536 <FileConfiguration
1537   - Name="Release|Win32"
  1537 + Name="Debug|x64"
1538 1538 >
1539 1539 <Tool
1540 1540 Name="VCCLCompilerTool"
... ... @@ -1543,7 +1543,7 @@
1543 1543 />
1544 1544 </FileConfiguration>
1545 1545 <FileConfiguration
1546   - Name="Debug|x64"
  1546 + Name="Release|Win32"
1547 1547 >
1548 1548 <Tool
1549 1549 Name="VCCLCompilerTool"
... ... @@ -1574,7 +1574,7 @@
1574 1574 />
1575 1575 </FileConfiguration>
1576 1576 <FileConfiguration
1577   - Name="Release|Win32"
  1577 + Name="Debug|x64"
1578 1578 >
1579 1579 <Tool
1580 1580 Name="VCCLCompilerTool"
... ... @@ -1583,7 +1583,7 @@
1583 1583 />
1584 1584 </FileConfiguration>
1585 1585 <FileConfiguration
1586   - Name="Debug|x64"
  1586 + Name="Release|Win32"
1587 1587 >
1588 1588 <Tool
1589 1589 Name="VCCLCompilerTool"
... ... @@ -1614,7 +1614,7 @@
1614 1614 />
1615 1615 </FileConfiguration>
1616 1616 <FileConfiguration
1617   - Name="Release|Win32"
  1617 + Name="Debug|x64"
1618 1618 >
1619 1619 <Tool
1620 1620 Name="VCCLCompilerTool"
... ... @@ -1623,7 +1623,7 @@
1623 1623 />
1624 1624 </FileConfiguration>
1625 1625 <FileConfiguration
1626   - Name="Debug|x64"
  1626 + Name="Release|Win32"
1627 1627 >
1628 1628 <Tool
1629 1629 Name="VCCLCompilerTool"
... ... @@ -1654,7 +1654,7 @@
1654 1654 />
1655 1655 </FileConfiguration>
1656 1656 <FileConfiguration
1657   - Name="Release|Win32"
  1657 + Name="Debug|x64"
1658 1658 >
1659 1659 <Tool
1660 1660 Name="VCCLCompilerTool"
... ... @@ -1663,7 +1663,7 @@
1663 1663 />
1664 1664 </FileConfiguration>
1665 1665 <FileConfiguration
1666   - Name="Debug|x64"
  1666 + Name="Release|Win32"
1667 1667 >
1668 1668 <Tool
1669 1669 Name="VCCLCompilerTool"
... ... @@ -1694,7 +1694,7 @@
1694 1694 />
1695 1695 </FileConfiguration>
1696 1696 <FileConfiguration
1697   - Name="Release|Win32"
  1697 + Name="Debug|x64"
1698 1698 >
1699 1699 <Tool
1700 1700 Name="VCCLCompilerTool"
... ... @@ -1703,7 +1703,7 @@
1703 1703 />
1704 1704 </FileConfiguration>
1705 1705 <FileConfiguration
1706   - Name="Debug|x64"
  1706 + Name="Release|Win32"
1707 1707 >
1708 1708 <Tool
1709 1709 Name="VCCLCompilerTool"
... ... @@ -1734,7 +1734,7 @@
1734 1734 />
1735 1735 </FileConfiguration>
1736 1736 <FileConfiguration
1737   - Name="Release|Win32"
  1737 + Name="Debug|x64"
1738 1738 >
1739 1739 <Tool
1740 1740 Name="VCCLCompilerTool"
... ... @@ -1743,7 +1743,7 @@
1743 1743 />
1744 1744 </FileConfiguration>
1745 1745 <FileConfiguration
1746   - Name="Debug|x64"
  1746 + Name="Release|Win32"
1747 1747 >
1748 1748 <Tool
1749 1749 Name="VCCLCompilerTool"
... ... @@ -1778,7 +1778,7 @@
1778 1778 />
1779 1779 </FileConfiguration>
1780 1780 <FileConfiguration
1781   - Name="Release|Win32"
  1781 + Name="Debug|x64"
1782 1782 >
1783 1783 <Tool
1784 1784 Name="VCCLCompilerTool"
... ... @@ -1787,7 +1787,7 @@
1787 1787 />
1788 1788 </FileConfiguration>
1789 1789 <FileConfiguration
1790   - Name="Debug|x64"
  1790 + Name="Release|Win32"
1791 1791 >
1792 1792 <Tool
1793 1793 Name="VCCLCompilerTool"
... ... @@ -1818,7 +1818,7 @@
1818 1818 />
1819 1819 </FileConfiguration>
1820 1820 <FileConfiguration
1821   - Name="Release|Win32"
  1821 + Name="Debug|x64"
1822 1822 >
1823 1823 <Tool
1824 1824 Name="VCCLCompilerTool"
... ... @@ -1827,7 +1827,7 @@
1827 1827 />
1828 1828 </FileConfiguration>
1829 1829 <FileConfiguration
1830   - Name="Debug|x64"
  1830 + Name="Release|Win32"
1831 1831 >
1832 1832 <Tool
1833 1833 Name="VCCLCompilerTool"
... ... @@ -1862,7 +1862,7 @@
1862 1862 />
1863 1863 </FileConfiguration>
1864 1864 <FileConfiguration
1865   - Name="Release|Win32"
  1865 + Name="Debug|x64"
1866 1866 >
1867 1867 <Tool
1868 1868 Name="VCCLCompilerTool"
... ... @@ -1871,7 +1871,7 @@
1871 1871 />
1872 1872 </FileConfiguration>
1873 1873 <FileConfiguration
1874   - Name="Debug|x64"
  1874 + Name="Release|Win32"
1875 1875 >
1876 1876 <Tool
1877 1877 Name="VCCLCompilerTool"
... ... @@ -1902,7 +1902,7 @@
1902 1902 />
1903 1903 </FileConfiguration>
1904 1904 <FileConfiguration
1905   - Name="Release|Win32"
  1905 + Name="Debug|x64"
1906 1906 >
1907 1907 <Tool
1908 1908 Name="VCCLCompilerTool"
... ... @@ -1911,7 +1911,7 @@
1911 1911 />
1912 1912 </FileConfiguration>
1913 1913 <FileConfiguration
1914   - Name="Debug|x64"
  1914 + Name="Release|Win32"
1915 1915 >
1916 1916 <Tool
1917 1917 Name="VCCLCompilerTool"
... ... @@ -1930,7 +1930,7 @@
1930 1930 </FileConfiguration>
1931 1931 </File>
1932 1932 <File
1933   - RelativePath=".\Rijndael.cpp"
  1933 + RelativePath="..\WinVNC\WinVNC\Rijndael.cpp"
1934 1934 >
1935 1935 </File>
1936 1936 <File
... ... @@ -1946,7 +1946,7 @@
1946 1946 />
1947 1947 </FileConfiguration>
1948 1948 <FileConfiguration
1949   - Name="Release|Win32"
  1949 + Name="Debug|x64"
1950 1950 >
1951 1951 <Tool
1952 1952 Name="VCCLCompilerTool"
... ... @@ -1955,7 +1955,7 @@
1955 1955 />
1956 1956 </FileConfiguration>
1957 1957 <FileConfiguration
1958   - Name="Debug|x64"
  1958 + Name="Release|Win32"
1959 1959 >
1960 1960 <Tool
1961 1961 Name="VCCLCompilerTool"
... ... @@ -1988,23 +1988,23 @@
1988 1988 />
1989 1989 </FileConfiguration>
1990 1990 <FileConfiguration
1991   - Name="Release|Win32"
  1991 + Name="Debug|x64"
1992 1992 >
1993 1993 <Tool
1994 1994 Name="VCCLCompilerTool"
1995 1995 AdditionalIncludeDirectories=""
1996 1996 PreprocessorDefinitions=""
  1997 + UsePrecompiledHeader="1"
  1998 + PrecompiledHeaderThrough="stdhdrs.h"
1997 1999 />
1998 2000 </FileConfiguration>
1999 2001 <FileConfiguration
2000   - Name="Debug|x64"
  2002 + Name="Release|Win32"
2001 2003 >
2002 2004 <Tool
2003 2005 Name="VCCLCompilerTool"
2004 2006 AdditionalIncludeDirectories=""
2005 2007 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="Release|Win32"
  2033 + Name="Debug|x64"
2034 2034 >
2035 2035 <Tool
2036 2036 Name="VCCLCompilerTool"
... ... @@ -2039,7 +2039,7 @@
2039 2039 />
2040 2040 </FileConfiguration>
2041 2041 <FileConfiguration
2042   - Name="Debug|x64"
  2042 + Name="Release|Win32"
2043 2043 >
2044 2044 <Tool
2045 2045 Name="VCCLCompilerTool"
... ... @@ -2070,7 +2070,7 @@
2070 2070 />
2071 2071 </FileConfiguration>
2072 2072 <FileConfiguration
2073   - Name="Release|Win32"
  2073 + Name="Debug|x64"
2074 2074 >
2075 2075 <Tool
2076 2076 Name="VCCLCompilerTool"
... ... @@ -2079,7 +2079,7 @@
2079 2079 />
2080 2080 </FileConfiguration>
2081 2081 <FileConfiguration
2082   - Name="Debug|x64"
  2082 + Name="Release|Win32"
2083 2083 >
2084 2084 <Tool
2085 2085 Name="VCCLCompilerTool"
... ... @@ -2110,7 +2110,7 @@
2110 2110 />
2111 2111 </FileConfiguration>
2112 2112 <FileConfiguration
2113   - Name="Release|Win32"
  2113 + Name="Debug|x64"
2114 2114 >
2115 2115 <Tool
2116 2116 Name="VCCLCompilerTool"
... ... @@ -2119,7 +2119,7 @@
2119 2119 />
2120 2120 </FileConfiguration>
2121 2121 <FileConfiguration
2122   - Name="Debug|x64"
  2122 + Name="Release|Win32"
2123 2123 >
2124 2124 <Tool
2125 2125 Name="VCCLCompilerTool"
... ... @@ -2150,7 +2150,7 @@
2150 2150 />
2151 2151 </FileConfiguration>
2152 2152 <FileConfiguration
2153   - Name="Release|Win32"
  2153 + Name="Debug|x64"
2154 2154 >
2155 2155 <Tool
2156 2156 Name="VCCLCompilerTool"
... ... @@ -2159,7 +2159,7 @@
2159 2159 />
2160 2160 </FileConfiguration>
2161 2161 <FileConfiguration
2162   - Name="Debug|x64"
  2162 + Name="Release|Win32"
2163 2163 >
2164 2164 <Tool
2165 2165 Name="VCCLCompilerTool"
... ... @@ -2190,7 +2190,7 @@
2190 2190 />
2191 2191 </FileConfiguration>
2192 2192 <FileConfiguration
2193   - Name="Release|Win32"
  2193 + Name="Debug|x64"
2194 2194 >
2195 2195 <Tool
2196 2196 Name="VCCLCompilerTool"
... ... @@ -2199,7 +2199,7 @@
2199 2199 />
2200 2200 </FileConfiguration>
2201 2201 <FileConfiguration
2202   - Name="Debug|x64"
  2202 + Name="Release|Win32"
2203 2203 >
2204 2204 <Tool
2205 2205 Name="VCCLCompilerTool"
... ... @@ -2230,7 +2230,7 @@
2230 2230 />
2231 2231 </FileConfiguration>
2232 2232 <FileConfiguration
2233   - Name="Release|Win32"
  2233 + Name="Debug|x64"
2234 2234 >
2235 2235 <Tool
2236 2236 Name="VCCLCompilerTool"
... ... @@ -2239,7 +2239,7 @@
2239 2239 />
2240 2240 </FileConfiguration>
2241 2241 <FileConfiguration
2242   - Name="Debug|x64"
  2242 + Name="Release|Win32"
2243 2243 >
2244 2244 <Tool
2245 2245 Name="VCCLCompilerTool"
... ... @@ -2270,7 +2270,7 @@
2270 2270 />
2271 2271 </FileConfiguration>
2272 2272 <FileConfiguration
2273   - Name="Release|Win32"
  2273 + Name="Debug|x64"
2274 2274 >
2275 2275 <Tool
2276 2276 Name="VCCLCompilerTool"
... ... @@ -2279,7 +2279,7 @@
2279 2279 />
2280 2280 </FileConfiguration>
2281 2281 <FileConfiguration
2282   - Name="Debug|x64"
  2282 + Name="Release|Win32"
2283 2283 >
2284 2284 <Tool
2285 2285 Name="VCCLCompilerTool"
... ... @@ -2310,7 +2310,7 @@
2310 2310 />
2311 2311 </FileConfiguration>
2312 2312 <FileConfiguration
2313   - Name="Release|Win32"
  2313 + Name="Debug|x64"
2314 2314 >
2315 2315 <Tool
2316 2316 Name="VCCLCompilerTool"
... ... @@ -2319,7 +2319,7 @@
2319 2319 />
2320 2320 </FileConfiguration>
2321 2321 <FileConfiguration
2322   - Name="Debug|x64"
  2322 + Name="Release|Win32"
2323 2323 >
2324 2324 <Tool
2325 2325 Name="VCCLCompilerTool"
... ... @@ -2354,15 +2354,15 @@
2354 2354 >
2355 2355 </File>
2356 2356 <File
2357   - RelativePath=".\base64.h"
  2357 + RelativePath="..\WinVNC\WinVNC\base64.h"
2358 2358 >
2359 2359 </File>
2360 2360 <File
2361   - RelativePath=".\CACIC_Crypt.h"
  2361 + RelativePath="..\WinVNC\WinVNC\CACIC_Crypt.h"
2362 2362 >
2363 2363 </File>
2364 2364 <File
2365   - RelativePath=".\CACIC_Utils.h"
  2365 + RelativePath="..\WinVNC\WinVNC\CACIC_Utils.h"
2366 2366 >
2367 2367 </File>
2368 2368 <File
... ... @@ -2450,7 +2450,7 @@
2450 2450 >
2451 2451 </File>
2452 2452 <File
2453   - RelativePath=".\Rijndael.h"
  2453 + RelativePath="..\WinVNC\WinVNC\Rijndael.h"
2454 2454 >
2455 2455 </File>
2456 2456 <File
... ...
srcacic/WinVNC/WinVNC/CACIC_Auth.cpp
  Diff comments   View file @2606d12
... ... @@ -6,13 +6,22 @@
6 6  
7 7 #include "CACIC_Auth.h"
8 8  
  9 +#include <sstream>
  10 +
  11 +#include "vncPassDlg.h"
  12 +
  13 +#include "CACIC_Con.h"
  14 +#include "CACIC_Crypt.h"
  15 +#include "CACIC_Exception.h"
  16 +#include "CACIC_Utils.h"
  17 +
9 18 const string CACIC_Auth::GET_CONFIG_SCRIPT = "srcacic_get_config.php";
10 19 const string CACIC_Auth::SET_SESSION_SCRIPT = "srcacic_set_session.php";
11 20 const string CACIC_Auth::AUTH_CLIENT_SCRIPT = "srcacic_auth_client.php";
12 21 const unsigned int CACIC_Auth::TAMANHO_RESPOSTA = 1025;
13 22 const string CACIC_Auth::AGUARDE_FILENAME = "aguarde_srCACIC.txt";
14 23 const string CACIC_Auth::COOKIE_FILENAME = "cacic_ck.txt";
15   -const UINT CACIC_Auth::TEMPO_IDLE = 5;
  24 +const UINT CACIC_Auth::TEMPO_IDLE = 15;
16 25  
17 26 bool CACIC_Auth::autentica()
18 27 {
... ... @@ -93,7 +102,7 @@ bool CACIC_Auth::autenticaUsuario(vector&lt;Dominio&gt; &amp;listaDominios)
93 102  
94 103 bool CACIC_Auth::validaTecnico(char nm_usuario_cli[], char te_senha_cli[], char te_node_address_cli[],
95 104 char te_documento_referencial[], char te_motivo_conexao[], char te_so_cli[],
96   - const vncClientId vncCID, const char peerName[])
  105 + const short vncCID, const char peerName[])
97 106 {
98 107 string post = getPostComum();
99 108  
... ... @@ -122,6 +131,7 @@ bool CACIC_Auth::validaTecnico(char nm_usuario_cli[], char te_senha_cli[], char
122 131 if (!verificaAuthTecnico(resposta, te_node_address_cli, te_documento_referencial,
123 132 te_motivo_conexao, te_so_cli, vncCID, peerName))
124 133 {
  134 + m_efetuarLogout = false;
125 135 return false;
126 136 }
127 137  
... ... @@ -135,26 +145,20 @@ bool CACIC_Auth::verificaAuthChave(char resposta[], vector&lt;Dominio&gt; &amp;listaDomini
135 145 if (!verificaStatus(resposta)) throw SRCException("Falha na verificação da chave!");
136 146  
137 147 string dominios;
138   - dominios = CACIC_Utils::leTag(resposta, "SERVIDORES_AUTENTICACAO");
  148 + CACIC_Utils::leTag(resposta, "SERVIDORES_AUTENTICACAO", dominios);
139 149  
140 150 string dominios_dec;
141 151 dominios_dec = CACIC_Crypt::decodifica(dominios.c_str());
142 152  
143   - char* dominios_dec_str = (char*)malloc(sizeof(char)*(dominios_dec.length() + 1));
144   - string::traits_type::copy(dominios_dec_str, dominios_dec.c_str(), dominios_dec.length() + 1);
145   - char* id_dominio = strtok(dominios_dec_str, ";");
146   - char* nm_dominio = strtok(NULL, ";");
147   -
148   - while (id_dominio != NULL)
149   - {
150   - listaDominios.push_back(Dominio(id_dominio, nm_dominio));
  153 + stringstream dominiosStream(dominios_dec);
  154 + string id_dominio;
  155 + string nm_dominio;
151 156  
152   - id_dominio = strtok(NULL, ";");
153   - nm_dominio = strtok(NULL, ";");
  157 + while (getline(dominiosStream, id_dominio, ';') &&
  158 + getline(dominiosStream, nm_dominio, ';'))
  159 + {
  160 + listaDominios.push_back(Dominio(id_dominio, nm_dominio));
154 161 }
155   - delete dominios_dec_str;
156   - delete id_dominio;
157   - delete nm_dominio;
158 162  
159 163 if (listaDominios.empty()) throw SRCException("A lista de domínios está vazia.");
160 164  
... ... @@ -175,13 +179,13 @@ bool CACIC_Auth::verificaAuthDominio(char resposta[])
175 179 if (!verificaStatus(resposta)) return false;//throw SRCException("Falha na autenticação do usuário.");
176 180  
177 181 string nm_completo;
178   - nm_completo = CACIC_Utils::leTag(resposta, "NM_COMPLETO");
  182 + CACIC_Utils::leTag(resposta, "NM_COMPLETO", nm_completo);
179 183  
180 184 string nome_dec;
181 185 nome_dec.append(CACIC_Crypt::decodifica(nm_completo.c_str()));
182 186  
183 187 string id_sessao;
184   - id_sessao = CACIC_Utils::leTag(resposta, "ID_SESSAO");
  188 + CACIC_Utils::leTag(resposta, "ID_SESSAO", id_sessao);
185 189  
186 190 m_usuario = nome_dec;
187 191 m_idSessao = id_sessao;
... ... @@ -197,12 +201,12 @@ bool CACIC_Auth::verificaAuthDominio(char resposta[])
197 201 }
198 202  
199 203 bool CACIC_Auth::verificaAuthTecnico(char resposta[], char te_node_address_cli[], char te_documento_referencial[],
200   - char te_motivo_conexao[], char te_so_cli[], const vncClientId vncCID, const char peerName[])
  204 + char te_motivo_conexao[], char te_so_cli[], const short vncCID, const char peerName[])
201 205 {
202 206 try
203 207 {
204 208 string status;
205   - status = CACIC_Utils::leTag(resposta, "STATUS");
  209 + CACIC_Utils::leTag(resposta, "STATUS", status);
206 210  
207 211 string status_dec;
208 212 status_dec = CACIC_Crypt::decodifica(status.c_str());
... ... @@ -212,16 +216,16 @@ bool CACIC_Auth::verificaAuthTecnico(char resposta[], char te_node_address_cli[]
212 216 if (status_dec.compare("OK") != 0) throw SRCException(status_dec.c_str());
213 217  
214 218 string id_usuario_cli;
215   - id_usuario_cli = CACIC_Utils::leTag(resposta, "ID_USUARIO_CLI");
  219 + CACIC_Utils::leTag(resposta, "ID_USUARIO_CLI", id_usuario_cli);
216 220  
217 221 string id_conexao;
218   - id_conexao = CACIC_Utils::leTag(resposta, "ID_CONEXAO");
  222 + CACIC_Utils::leTag(resposta, "ID_CONEXAO", id_conexao);
219 223  
220 224 string nm_usuario_completo;
221   - nm_usuario_completo = CACIC_Utils::leTag(resposta, "NM_USUARIO_COMPLETO");
  225 + CACIC_Utils::leTag(resposta, "NM_USUARIO_COMPLETO", nm_usuario_completo);
222 226  
223 227 string dt_hr_inicio_sessao;
224   - dt_hr_inicio_sessao = CACIC_Utils::leTag(resposta, "DT_HR_INICIO_SESSAO");
  228 + CACIC_Utils::leTag(resposta, "DT_HR_INICIO_SESSAO", dt_hr_inicio_sessao);
225 229  
226 230 string nm_usuario_completo_dec;
227 231 nm_usuario_completo_dec.append(CACIC_Crypt::decodifica(nm_usuario_completo.c_str()));
... ... @@ -262,7 +266,7 @@ bool CACIC_Auth::verificaAuthTecnico(char resposta[], char te_node_address_cli[]
262 266 }
263 267 catch(SRCException ex)
264 268 {
265   - MessageBox(NULL, ex.getMessage().c_str(), "Erro!", MB_OK | MB_ICONERROR);
  269 + //MessageBox(NULL, ex.getMessage().c_str(), "Erro!", MB_OK | MB_ICONERROR);
266 270 vnclog.Print(LL_SRLOG, VNCLOG(ex.getMessage().c_str()));
267 271 return false;
268 272 }
... ... @@ -313,10 +317,13 @@ void CACIC_Auth::atualizaSessao()
313 317 {
314 318 listaIDUsuario += m_listaClientes[i].id_usuario_visitante;
315 319 if (i < m_listaClientes.size() - 1) listaIDUsuario += "<REG>";
  320 +
316 321 listaIDConexao += m_listaClientes[i].id_conexao;
317 322 if (i < m_listaClientes.size() - 1) listaIDConexao += "<REG>";
  323 +
318 324 listaNodeAddress += m_listaClientes[i].te_node_address_visitante;
319 325 if (i < m_listaClientes.size() - 1) listaNodeAddress += "<REG>";
  326 +
320 327 listaID_SO += m_listaClientes[i].te_so_visitante;
321 328 if (i < m_listaClientes.size() - 1) listaID_SO += "<REG>";
322 329 }
... ... @@ -364,7 +371,7 @@ void CACIC_Auth::sendChatText(char te_mensagem[], char cs_origem[])
364 371 post += "id_sessao=";
365 372 post += m_idSessao;
366 373 post += "&id_conexao=";
367   - post += m_novoCliente.id_conexao;
  374 + post += m_novoCliente.id_conexao;
368 375 post += "&te_mensagem=";
369 376 post += te_mensagem_enc;
370 377 post += "&cs_origem=";
... ... @@ -377,24 +384,35 @@ void CACIC_Auth::sendChatText(char te_mensagem[], char cs_origem[])
377 384 CACIC_Con::sendHtppPost(m_servidorWeb, session_script, post, resposta, TAMANHO_RESPOSTA);
378 385 }
379 386  
380   -void CACIC_Auth::removeCliente(vncClientId vncCID)
  387 +void CACIC_Auth::removeCliente(short vncCID)
381 388 {
382 389 // Atualiza a sessão antes de remover o cliente.
383 390 atualizaSessao();
384   - m_infoDlg.closeInfoDialog();
385 391  
386 392 for (int i = 0; i < m_listaClientes.size(); i++)
387 393 {
388 394 if (m_listaClientes[i].vncCID == vncCID)
389 395 {
390 396 m_listaClientes.erase(m_listaClientes.begin() + i);
391   - return;
  397 + break;
392 398 }
393 399 }
394 400  
395 401 // Apagando os dados do último cliente conectado.
396 402 ClienteSRC novoCliente = {0};
397 403 m_novoCliente = novoCliente;
  404 +
  405 + if (m_efetuarLogout == true) {
  406 + // Envia uma mensagem para o diáligo, dizendo para ele
  407 + // trocar o label que é mostrado.
  408 + PostMessage(m_infoDlg.hwInfoDlg, WM_LOGOUT_WARNING, 0, 0);
  409 +
  410 + Sleep(20000);
  411 + CACIC_Auth::getInstance()->finalizaServidor();
  412 + ExitWindowsEx(EWX_LOGOFF | EWX_FORCE, 0);
  413 + }
  414 + m_infoDlg.closeInfoDialog();
  415 + m_efetuarLogout = true;
398 416 }
399 417  
400 418 string CACIC_Auth::getPostComum()
... ... @@ -413,7 +431,7 @@ string CACIC_Auth::getPostComum()
413 431 bool CACIC_Auth::verificaStatus(char resposta[])
414 432 {
415 433 string status;
416   - status = CACIC_Utils::leTag(resposta, "STATUS");
  434 + CACIC_Utils::leTag(resposta, "STATUS", status);
417 435  
418 436 string status_dec;
419 437 status_dec = CACIC_Crypt::decodifica(status.c_str());
... ...
srcacic/WinVNC/WinVNC/CACIC_Auth.h
  Diff comments   View file @2606d12
... ... @@ -7,45 +7,12 @@
7 7 #ifndef _CACIC_AUTH_
8 8 #define _CACIC_AUTH_
9 9  
10   -#include "stdhdrs.h"
11   -
12 10 #include <vector>
13   -using namespace std;
14   -#include <sstream>
15 11 #include <string>
16 12 using namespace std;
17 13  
18   -#include <math.h>
19   -
20   -#include "vncPassDlg.h"
21 14 #include "supInfoDlg.h"
22 15  
23   -#include "CACIC_Con.h"
24   -#include "CACIC_Crypt.h"
25   -#include "CACIC_Exception.h"
26   -#include "CACIC_Utils.h"
27   -
28   -#include "vncClient.h"
29   -
30   -/**
31   - * Struct referente a um usuário cliente.
32   - */
33   -struct ClienteSRC {
34   - vncClientId vncCID;
35   - string peerName;
36   - string id_usuario_visitante;
37   - string id_usuario_cli;
38   - string id_conexao;
39   - string nm_usuario_completo;
40   - string te_node_address_visitante;
41   - string te_node_address_cli;
42   - string te_documento_referencial;
43   - string te_motivo_conexao;
44   - string te_so_visitante;
45   - string te_so_cli;
46   - string dt_hr_inicio_sessao;
47   -};
48   -
49 16 class CACIC_Auth {
50 17  
51 18 public:
... ... @@ -73,6 +40,11 @@ public:
73 40 */
74 41 supInfoDlg m_infoDlg;
75 42  
  43 + /**
  44 + * Variável de decisão sobre o logout do sistema após o suporte.
  45 + */
  46 + bool m_efetuarLogout;
  47 +
76 48 /** Singleton. */
77 49 static CACIC_Auth* getInstance()
78 50 {
... ... @@ -107,7 +79,7 @@ public:
107 79 * @param vncCID ID do cliente VNC, utilizado para
108 80 * diferenciar os clientes, caso haja mais de um.
109 81 */
110   - void removeCliente(vncClientId vncCID);
  82 + void removeCliente(short vncCID);
111 83  
112 84 /**
113 85 * Faz a comunicação com o gerente web para validar a palavra chave
... ... @@ -130,7 +102,7 @@ public:
130 102 */
131 103 bool validaTecnico(char nm_usuario_cli[], char te_senha_cli[], char te_node_address_cli[],
132 104 char te_documento_referencial[], char te_motivo_conexao[], char te_so_cli[],
133   - const vncClientId vncCID, const char peerName[]);
  105 + const short vncCID, const char peerName[]);
134 106  
135 107 /**
136 108 * Se comunica com o gerente web para atualizar a sessão de suporte.
... ... @@ -154,6 +126,7 @@ private:
154 126  
155 127 CACIC_Auth() {
156 128 m_idleTime = TEMPO_IDLE;
  129 + m_efetuarLogout = true;
157 130 }
158 131  
159 132 virtual ~CACIC_Auth() {}
... ... @@ -229,7 +202,7 @@ private:
229 202 */
230 203 bool verificaAuthTecnico(char resposta[], char te_node_address_cli[], char te_documento_referencial[],
231 204 char te_motivo_conexao[], char te_so_cli[],
232   - const vncClientId vncCID, const char peerName[]);
  205 + const short vncCID, const char peerName[]);
233 206  
234 207 /**
235 208 * Verifica o valor de retorno STATUS que é enviado pelo gerente web
... ...
srcacic/WinVNC/WinVNC/CACIC_Crypt.cpp
  Diff comments   View file @2606d12
... ... @@ -6,6 +6,13 @@
6 6  
7 7 #include "CACIC_Crypt.h"
8 8  
  9 +#include "CACIC_Utils.h"
  10 +
  11 +#include <math.h>
  12 +
  13 +#include "Rijndael.h"
  14 +#include "base64.h"
  15 +
9 16 const unsigned int CACIC_Crypt::SRCACIC_BLOCK_SIZE = 16;
10 17 const unsigned int CACIC_Crypt::SRCACIC_KEY_SIZE = 16;
11 18 const char CACIC_Crypt::SRCACIC_KEY[17] = "CacicBrasil";
... ... @@ -20,41 +27,40 @@ string CACIC_Crypt::decodifica(const char* entrada)
20 27  
21 28 decode_base64 = base64_decode(entradaStr);
22 29  
23   - unsigned int saida_len = decode_base64.length();
  30 + const unsigned int saidaLen = decode_base64.length();
24 31  
25   - char* saida = new char[saida_len + 1];
26   - memset(saida, 0, saida_len + 1);
  32 + const unsigned int buffLen = saidaLen + 1;
  33 + char* saidaBuff = new char[buffLen];
  34 + memset(saidaBuff, 0, buffLen);
27 35  
28 36 CRijndael oRijndael;
29 37 oRijndael.MakeKey(SRCACIC_KEY, SRCACIC_IV, SRCACIC_KEY_SIZE, SRCACIC_BLOCK_SIZE);
30   - oRijndael.Decrypt(decode_base64.c_str(), saida, saida_len, CRijndael::CBC);
  38 + oRijndael.Decrypt(decode_base64.c_str(), saidaBuff, saidaLen, CRijndael::CBC);
31 39  
32   - string out(saida);
33   -
34   - delete []saida;
35   - return out;
  40 + string saida = string(saidaBuff);
  41 + delete []saidaBuff;
  42 + return saida;
36 43 }
37 44  
38 45 string CACIC_Crypt::codifica(const char* entrada)
39 46 {
40   - unsigned int entrada_len = strlen(entrada);
41   - unsigned int saida_len = (int)ceil((float)(entrada_len)/SRCACIC_BLOCK_SIZE)*SRCACIC_BLOCK_SIZE;
  47 + const unsigned int entradaLen = strlen(entrada);
  48 + const unsigned int saidaLen = (int)ceil((float)(entradaLen)/SRCACIC_BLOCK_SIZE)*SRCACIC_BLOCK_SIZE;
42 49  
43   - char* saida = new char[saida_len + 1];
44   - memset(saida, 0, saida_len + 1);
45   - char* zerof_entrada = new char[saida_len + 1];
46   - memset(zerof_entrada, 0, saida_len + 1);
  50 + const unsigned int buffLen = saidaLen + 1;
  51 + char* saidaBuff = new char[buffLen];
  52 + memset(saidaBuff, 0, buffLen);
  53 + char* zerofEntrada = new char[buffLen];
  54 + memset(zerofEntrada, 0, buffLen);
47 55  
48   - strncpy(zerof_entrada, entrada, entrada_len);
  56 + strncpy(zerofEntrada, entrada, entradaLen);
49 57  
50 58 CRijndael oRijndael;
51 59 oRijndael.MakeKey(SRCACIC_KEY, SRCACIC_IV, SRCACIC_KEY_SIZE, SRCACIC_BLOCK_SIZE);
52   - oRijndael.Encrypt(zerof_entrada, saida, saida_len, CRijndael::CBC);
53   -
54   - string encode_base64;
55   - encode_base64 = base64_encode(reinterpret_cast<const unsigned char*>(saida), saida_len);
  60 + oRijndael.Encrypt(zerofEntrada, saidaBuff, saidaLen, CRijndael::CBC);
56 61  
57   - delete []saida;
58   - delete []zerof_entrada;
59   - return encode_base64;
  62 + string saida = base64_encode(reinterpret_cast<const unsigned char*>(saidaBuff), saidaLen);
  63 + delete []saidaBuff;
  64 + delete []zerofEntrada;
  65 + return saida;
60 66 }
... ...
srcacic/WinVNC/WinVNC/CACIC_Crypt.h
  Diff comments   View file @2606d12
... ... @@ -7,12 +7,8 @@
7 7 #ifndef _CACIC_CRYPT_
8 8 #define _CACIC_CRYPT_
9 9  
10   -#include <math.h>
11   -
12   -#include "CACIC_Utils.h"
13   -
14   -#include "Rijndael.h"
15   -#include "base64.h"
  10 +#include <string>
  11 +using namespace std;
16 12  
17 13 class CACIC_Crypt {
18 14  
... ... @@ -22,14 +18,14 @@ public:
22 18 * Remove da String de entrada os caracteres colocados pela URLEncode,
23 19 * tira do Base64 e depois decodifica usando o Rijndael.
24 20 * @param entrada String a ser decodificada.
25   - * @return string String decodificada.
  21 + * @param saida String decodificada.
26 22 */
27 23 static string decodifica(const char* entrada);
28 24  
29 25 /**
30 26 * Codifica a String passada com o algoritmo Rijndael e coloca no Base64.
31 27 * @param entrada String a ser codificada.
32   - * @return string String codificada.
  28 + * @param saida String codificada.
33 29 */
34 30 static string codifica(const char* entrada);
35 31  
... ...
srcacic/WinVNC/WinVNC/CACIC_Utils.cpp
  Diff comments   View file @2606d12
... ... @@ -6,13 +6,25 @@
6 6  
7 7 #include "CACIC_Utils.h"
8 8  
  9 +#include <Iphlpapi.h>
  10 +#pragma comment(lib, "iphlpapi.lib")
  11 +
  12 +#include <math.h>
  13 +
  14 +#include <sstream>
  15 +#include <iostream>
  16 +
  17 +#include "CACIC_Exception.h"
  18 +
9 19 const string CACIC_Utils::F_SANS_SERIF = "Microsoft Sans Serif";
10 20  
11   -string CACIC_Utils::leTag(char xml[], char tagname[])
  21 +void CACIC_Utils::leTag(char xml[], char tagname[], string &conteudo)
12 22 {
13   - char* tag;
14   - char* a_xml = new char[strlen(xml)];
  23 + // 1 posição maior por causa do null character
  24 + const int xmlLen = strlen(xml) + 1;
  25 + char* a_xml = new char[xmlLen];
15 26 strcpy(a_xml, xml);
  27 + char* tag;
16 28  
17 29 // pega o conteudo da tag de resposta tagname
18 30 tag = strtok(a_xml, "<>");
... ... @@ -21,17 +33,16 @@ string CACIC_Utils::leTag(char xml[], char tagname[])
21 33 tag = strtok(NULL, "<>");
22 34 }
23 35  
24   - string errorMsg = "Falha ao ler arquivo xml.";
  36 + string errorMsg = "Falha na comunicação com o módulo Gerente WEB.";
25 37 //string errorMsg = "Tag ";
26 38 //errorMsg.append(tagname);
27 39 //errorMsg.append(" não encontrada!");
28 40 if (tag == NULL) throw SRCException(errorMsg);
29 41  
30 42 tag = strtok(NULL, "<>");
31   - string content;
32   - content = tag;
33   -
34   - return content;
  43 +
  44 + conteudo = string(tag);
  45 + delete a_xml;
35 46 }
36 47  
37 48 void CACIC_Utils::replaceAll(string &str, string key, string newkey)
... ... @@ -162,3 +173,107 @@ void CACIC_Utils::changeFont(HWND dlgHandle, int dlgItem, int fontSize, string f
162 173  
163 174 SendMessage(GetDlgItem(dlgHandle, dlgItem), WM_SETFONT, (int)hFont, MAKELONG(TRUE, 0));
164 175 }
  176 +
  177 +//void tokenize(const string &str, vector<string> &tokens, const string &delimiters)
  178 +//{
  179 +// string::size_type lastPos = str.find_first_not_of(delimiters, 0);
  180 +// string::size_type pos = str.find_first_of(delimiters, lastPos);
  181 +//
  182 +// while (string::npos != pos || string::npos != lastPos)
  183 +// {
  184 +// tokens.push_back(str.substr(lastPos, pos - lastPos));
  185 +//
  186 +// lastPos = str.find_first_not_of(delimiters, pos);
  187 +// pos = str.find_first_of(delimiters, lastPos);
  188 +// }
  189 +//}
  190 +
  191 +string CACIC_Utils::getMACAddress() {
  192 +
  193 + IP_ADAPTER_INFO AdapterInfo[16]; // Allocate information for up to 16 NICs
  194 + DWORD dwBufLen = sizeof(AdapterInfo); // Save the memory size of buffer
  195 +
  196 + DWORD dwStatus = GetAdaptersInfo( // Call GetAdapterInfo
  197 + AdapterInfo, // [out] buffer to receive data
  198 + &dwBufLen); // [in] size of receive data buffer
  199 + //assert(dwStatus == ERROR_SUCCESS); // Verify return value is valid, no buffer overflow
  200 +
  201 + PIP_ADAPTER_INFO pAdapterInfo = AdapterInfo;// Contains pointer to current adapter info
  202 + //do {
  203 + // PrintMACaddress(pAdapterInfo->Address); // Print MAC address
  204 + // pAdapterInfo = pAdapterInfo->Next; // Progress through linked list
  205 + //} while(pAdapterInfo); // Terminate if last adapter
  206 +
  207 + char mac[18];
  208 +
  209 + sprintf(mac, "%02X-%02X-%02X-%02X-%02X-%02X",
  210 + pAdapterInfo->Address[0], pAdapterInfo->Address[1], pAdapterInfo->Address[2],
  211 + pAdapterInfo->Address[3], pAdapterInfo->Address[4], pAdapterInfo->Address[5]);
  212 +
  213 + string macstr = mac;
  214 +
  215 + return macstr;
  216 +
  217 +}
  218 +
  219 +string CACIC_Utils::getSOID() {
  220 + OSVERSIONINFO osver;
  221 + ZeroMemory(&osver, sizeof(OSVERSIONINFO));
  222 + osver.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
  223 + GetVersionEx(&osver);
  224 +
  225 + std::stringstream spid;
  226 + std::stringstream smajorv;
  227 + std::stringstream sminorv;
  228 + std::stringstream csd;
  229 +
  230 + std::string soIDStr;
  231 +
  232 + spid << osver.dwPlatformId;
  233 + soIDStr = spid.str();
  234 + smajorv << osver.dwMajorVersion;
  235 + soIDStr += ".";
  236 + soIDStr += smajorv.str();
  237 + sminorv << osver.dwMinorVersion;
  238 + soIDStr += ".";
  239 + soIDStr += sminorv.str();
  240 +
  241 + int major;
  242 + smajorv >> major;
  243 + int minor;
  244 + sminorv >> minor;
  245 + if (major <= 4)
  246 + {// Win95 Win98 WinME
  247 + if (minor == 0 || minor == 10 || minor == 90)
  248 + {
  249 + if (osver.szCSDVersion != NULL)
  250 + {
  251 + csd << osver.szCSDVersion;
  252 + soIDStr += ".";
  253 + soIDStr += csd.str();
  254 + }
  255 + }
  256 + }
  257 + else
  258 + {// Win2K acima
  259 + OSVERSIONINFOEX osverex;
  260 + ZeroMemory(&osverex, sizeof(OSVERSIONINFOEX));
  261 + osverex.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX);
  262 + GetVersionEx((LPOSVERSIONINFOA) &osverex);
  263 +
  264 + soIDStr += ".";
  265 + switch (osverex.wProductType)
  266 + {
  267 + case VER_NT_WORKSTATION: soIDStr += "1"; break;
  268 + case VER_NT_DOMAIN_CONTROLLER: soIDStr += "2"; break;
  269 + case VER_NT_SERVER: soIDStr += "3"; break;
  270 + }
  271 +
  272 + std::stringstream scsd;
  273 + scsd << osverex.wSuiteMask;
  274 + soIDStr += ".";
  275 + soIDStr += scsd.str();
  276 + }
  277 +
  278 + return soIDStr;
  279 +}
... ...
srcacic/WinVNC/WinVNC/CACIC_Utils.h
  Diff comments   View file @2606d12
... ... @@ -9,10 +9,38 @@
9 9  
10 10 #include <string>
11 11 using namespace std;
12   -#include <sstream>
13   -#include <iostream>
14 12  
15   -#include "CACIC_Exception.h"
  13 +#include "windows.h"
  14 +
  15 +/**
  16 + * Struct referente a um usuário cliente.
  17 + */
  18 +struct ClienteSRC {
  19 + short vncCID;
  20 + string peerName;
  21 + string id_usuario_visitante;
  22 + string id_usuario_cli;
  23 + string id_conexao;
  24 + string nm_usuario_completo;
  25 + string te_node_address_visitante;
  26 + string te_node_address_cli;
  27 + string te_documento_referencial;
  28 + string te_motivo_conexao;
  29 + string te_so_visitante;
  30 + string te_so_cli;
  31 + string dt_hr_inicio_sessao;
  32 +};
  33 +
  34 +/**
  35 + * Struct referente a um domínio de autenticação.
  36 + */
  37 +struct Dominio {
  38 + Dominio(string p_id, string p_nome) : id(p_id), nome(p_nome) {}
  39 + Dominio() : id(""), nome("") {}
  40 + Dominio(const Dominio& d) : id(d.id), nome(d.nome) {}
  41 + string id;
  42 + string nome;
  43 +};
16 44  
17 45 class CACIC_Utils {
18 46  
... ... @@ -25,10 +53,10 @@ public:
25 53 * Método bruto para ler uma tag específica de um arquivo xml.
26 54 * @param xml String no formato de arquivo xml.
27 55 * @param tagname String com o nome da tag a ser pesquisada.
28   - * @return String com o conteúdo da tag pesquisada.
  56 + * @param conteudo String com o conteúdo da tag pesquisada.
29 57 * @trows CACIC_Exception caso a tag não seja encontrada.
30 58 */
31   - static string leTag(char xml[], char tagname[]);
  59 + static void leTag(char xml[], char tagname[], string &conteudo);
32 60  
33 61 /**
34 62 * Troca caracteres específicos de uma string.
... ... @@ -90,6 +118,30 @@ public:
90 118 int fontSize, string fontName,
91 119 bool fontIsBold = false);
92 120  
  121 + /**
  122 + * Método para separar a string em partes delimitadas por um, ou um conjunto,
  123 + * de caracteres.
  124 + * @param str String a ser tokenizada.
  125 + * @param tokens Vetor de saída dos tokens gerados.
  126 + * @param delimiters Delimitadores que serão usados para separar a string.
  127 + * @note http://www.linuxselfhelp.com/HOWTO/C++Programming-HOWTO-7.html
  128 + */
  129 + //static void tokenize(const string &str, vector<string> &tokens, const string &delimiters = " ");
  130 +
  131 + /**
  132 + * Obtém o MAC Address da placa de rede.<br />
  133 + * TODO: Quando houver mais de uma placa de rede no pc, verificar qual
  134 + * está se comunicando com o servidor para enviar o MAC certo.
  135 + */
  136 + static string getMACAddress();
  137 +
  138 + /**
  139 + * Obtém a identificação do sistema operacional.<br />
  140 + * Artigo sobre SOID:<br />
  141 + * http://www.codeguru.com/cpp/w-p/system/systeminformation/article.php/c8973__2/
  142 + */
  143 + static string getSOID();
  144 +
93 145 private:
94 146  
95 147 /**
... ...
srcacic/WinVNC/WinVNC/Res/on-line_logo.bmp
View file @2606d12
No preview for this file type
srcacic/WinVNC/WinVNC/WinVNC.vcproj
  Diff comments   View file @2606d12
... ... @@ -116,9 +116,9 @@
116 116 />
117 117 </Configuration>
118 118 <Configuration
119   - Name="Release|Win32"
120   - OutputDirectory=".\..\Release"
121   - IntermediateDirectory=".\..\Release"
  119 + Name="Debug|x64"
  120 + OutputDirectory="$(PlatformName)\$(ConfigurationName)"
  121 + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
122 122 ConfigurationType="1"
123 123 UseOfMFC="0"
124 124 ATLMinimizesCRunTimeLibraryUsage="false"
... ... @@ -138,30 +138,27 @@
138 138 />
139 139 <Tool
140 140 Name="VCMIDLTool"
141   - PreprocessorDefinitions="NDEBUG"
  141 + PreprocessorDefinitions="_DEBUG"
142 142 MkTypLibCompatible="true"
143 143 SuppressStartupBanner="true"
144   - TargetEnvironment="1"
145   - TypeLibraryName=".\..\Release/winvnc.tlb"
  144 + TargetEnvironment="3"
  145 + TypeLibraryName=".\..\Debug/winvnc.tlb"
146 146 HeaderFileName=""
147 147 />
148 148 <Tool
149 149 Name="VCCLCompilerTool"
150   - Optimization="3"
151   - InlineFunctionExpansion="2"
152   - EnableIntrinsicFunctions="true"
153   - FavorSizeOrSpeed="1"
154   - EnableFiberSafeOptimizations="true"
155   - WholeProgramOptimization="true"
  150 + Optimization="0"
156 151 AdditionalIncludeDirectories="..\omnithread,..,..\.."
157   - PreprocessorDefinitions="NDEBUG;__x86__;__WIN32__;WIN32;_WINDOWS;_WIN32_WINNT=0x501;XMD_H;_WINSTATIC;_VC80;_CRT_SECURE_NO_WARNINGS"
158   - StringPooling="true"
159   - RuntimeLibrary="0"
160   - EnableFunctionLevelLinking="true"
161   - PrecompiledHeaderFile=".\..\Release/winvnc.pch"
162   - AssemblerListingLocation=".\..\Release/"
163   - ObjectFile=".\..\Release/"
164   - ProgramDataBaseFileName=".\..\Release/"
  152 + PreprocessorDefinitions="_DEBUG;__x86__;__WIN32__;WIN32;_WINDOWS;_WIN32_WINNT=0x501;XMD_H;_WINSTATIC;_CRT_SECURE_NO_WARNINGS;_VC80;_X64"
  153 + MinimalRebuild="true"
  154 + BasicRuntimeChecks="3"
  155 + RuntimeLibrary="1"
  156 + PrecompiledHeaderFile=".\..\Debug/winvnc.pch"
  157 + AssemblerListingLocation=".\..\Debug/"
  158 + ObjectFile=".\..\Debug/"
  159 + ProgramDataBaseFileName=".\..\Debug/"
  160 + BrowseInformation="1"
  161 + BrowseInformationFile=".\..\Debug/"
165 162 WarningLevel="3"
166 163 SuppressStartupBanner="true"
167 164 DebugInformationFormat="3"
... ... @@ -171,26 +168,25 @@
171 168 />
172 169 <Tool
173 170 Name="VCResourceCompilerTool"
174   - PreprocessorDefinitions="NDEBUG"
  171 + PreprocessorDefinitions="_DEBUG"
175 172 Culture="2057"
176 173 />
177 174 <Tool
178 175 Name="VCPreLinkEventTool"
179   - CommandLine="cl /nologo /MT /Fo..\Release\ /Fd..\Release\ /c buildtime.cpp"
  176 + CommandLine="cl /nologo /MTd /Fo..\Debug\ /Fd..\Debug\ /c buildtime.cpp"
180 177 />
181 178 <Tool
182 179 Name="VCLinkerTool"
183   - AdditionalOptions="/LTCG"
184   - AdditionalDependencies="wsock32.lib winmm.lib version.lib comctl32.lib wtsapi32.lib userenv.lib wininet.lib"
185   - OutputFile=".\..\Release/srcacicsrv.exe"
186   - LinkIncremental="1"
  180 + AdditionalDependencies="ws2_32.lib winmm.lib version.lib wtsapi32.lib userenv.lib"
  181 + OutputFile=".\..\Debug/winvnc.exe"
  182 + LinkIncremental="2"
187 183 SuppressStartupBanner="true"
188   - GenerateManifest="true"
189   - ProgramDatabaseFile=".\..\Release/winvnc.pdb"
  184 + GenerateDebugInformation="true"
  185 + ProgramDatabaseFile=".\..\Debug/winvnc.pdb"
190 186 SubSystem="2"
191 187 RandomizedBaseAddress="1"
192 188 DataExecutionPrevention="0"
193   - TargetMachine="1"
  189 + TargetMachine="17"
194 190 />
195 191 <Tool
196 192 Name="VCALinkTool"
... ... @@ -204,7 +200,7 @@
204 200 <Tool
205 201 Name="VCBscMakeTool"
206 202 SuppressStartupBanner="true"
207   - OutputFile=".\..\Release/winvnc.bsc"
  203 + OutputFile=".\..\Debug/winvnc.bsc"
208 204 />
209 205 <Tool
210 206 Name="VCFxCopTool"
... ... @@ -217,9 +213,9 @@
217 213 />
218 214 </Configuration>
219 215 <Configuration
220   - Name="Debug|x64"
221   - OutputDirectory="$(PlatformName)\$(ConfigurationName)"
222   - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
  216 + Name="Release|Win32"
  217 + OutputDirectory=".\..\Release"
  218 + IntermediateDirectory=".\..\Release"
223 219 ConfigurationType="1"
224 220 UseOfMFC="0"
225 221 ATLMinimizesCRunTimeLibraryUsage="false"
... ... @@ -239,27 +235,30 @@
239 235 />
240 236 <Tool
241 237 Name="VCMIDLTool"
242   - PreprocessorDefinitions="_DEBUG"
  238 + PreprocessorDefinitions="NDEBUG"
243 239 MkTypLibCompatible="true"
244 240 SuppressStartupBanner="true"
245   - TargetEnvironment="3"
246   - TypeLibraryName=".\..\Debug/winvnc.tlb"
  241 + TargetEnvironment="1"
  242 + TypeLibraryName=".\..\Release/winvnc.tlb"
247 243 HeaderFileName=""
248 244 />
249 245 <Tool
250 246 Name="VCCLCompilerTool"
251   - Optimization="0"
  247 + Optimization="3"
  248 + InlineFunctionExpansion="2"
  249 + EnableIntrinsicFunctions="true"
  250 + FavorSizeOrSpeed="1"
  251 + EnableFiberSafeOptimizations="true"
  252 + WholeProgramOptimization="true"
252 253 AdditionalIncludeDirectories="..\omnithread,..,..\.."
253   - PreprocessorDefinitions="_DEBUG;__x86__;__WIN32__;WIN32;_WINDOWS;_WIN32_WINNT=0x501;XMD_H;_WINSTATIC;_CRT_SECURE_NO_WARNINGS;_VC80;_X64"
254   - MinimalRebuild="true"
255   - BasicRuntimeChecks="3"
256   - RuntimeLibrary="1"
257   - PrecompiledHeaderFile=".\..\Debug/winvnc.pch"
258   - AssemblerListingLocation=".\..\Debug/"
259   - ObjectFile=".\..\Debug/"
260   - ProgramDataBaseFileName=".\..\Debug/"
261   - BrowseInformation="1"
262   - BrowseInformationFile=".\..\Debug/"
  254 + PreprocessorDefinitions="NDEBUG;__x86__;__WIN32__;WIN32;_WINDOWS;_WIN32_WINNT=0x501;XMD_H;_WINSTATIC;_VC80;_CRT_SECURE_NO_WARNINGS"
  255 + StringPooling="true"
  256 + RuntimeLibrary="0"
  257 + EnableFunctionLevelLinking="true"
  258 + PrecompiledHeaderFile=".\..\Release/winvnc.pch"
  259 + AssemblerListingLocation=".\..\Release/"
  260 + ObjectFile=".\..\Release/"
  261 + ProgramDataBaseFileName=".\..\Release/"
263 262 WarningLevel="3"
264 263 SuppressStartupBanner="true"
265 264 DebugInformationFormat="3"
... ... @@ -269,25 +268,26 @@
269 268 />
270 269 <Tool
271 270 Name="VCResourceCompilerTool"
272   - PreprocessorDefinitions="_DEBUG"
  271 + PreprocessorDefinitions="NDEBUG"
273 272 Culture="2057"
274 273 />
275 274 <Tool
276 275 Name="VCPreLinkEventTool"
277   - CommandLine="cl /nologo /MTd /Fo..\Debug\ /Fd..\Debug\ /c buildtime.cpp"
  276 + CommandLine="cl /nologo /MT /Fo..\Release\ /Fd..\Release\ /c buildtime.cpp"
278 277 />
279 278 <Tool
280 279 Name="VCLinkerTool"
281   - AdditionalDependencies="ws2_32.lib winmm.lib version.lib wtsapi32.lib userenv.lib"
282   - OutputFile=".\..\Debug/winvnc.exe"
283   - LinkIncremental="2"
  280 + AdditionalOptions="/LTCG"
  281 + AdditionalDependencies="wsock32.lib winmm.lib version.lib comctl32.lib wtsapi32.lib userenv.lib wininet.lib"
  282 + OutputFile=".\..\Release/srcacicsrv.exe"
  283 + LinkIncremental="1"
284 284 SuppressStartupBanner="true"
285   - GenerateDebugInformation="true"
286   - ProgramDatabaseFile=".\..\Debug/winvnc.pdb"
  285 + GenerateManifest="true"
  286 + ProgramDatabaseFile=".\..\Release/winvnc.pdb"
287 287 SubSystem="2"
288 288 RandomizedBaseAddress="1"
289 289 DataExecutionPrevention="0"
290   - TargetMachine="17"
  290 + TargetMachine="1"
291 291 />
292 292 <Tool
293 293 Name="VCALinkTool"
... ... @@ -301,7 +301,7 @@
301 301 <Tool
302 302 Name="VCBscMakeTool"
303 303 SuppressStartupBanner="true"
304   - OutputFile=".\..\Debug/winvnc.bsc"
  304 + OutputFile=".\..\Release/winvnc.bsc"
305 305 />
306 306 <Tool
307 307 Name="VCFxCopTool"
... ... @@ -433,7 +433,7 @@
433 433 />
434 434 </FileConfiguration>
435 435 <FileConfiguration
436   - Name="Release|Win32"
  436 + Name="Debug|x64"
437 437 >
438 438 <Tool
439 439 Name="VCCLCompilerTool"
... ... @@ -442,7 +442,7 @@
442 442 />
443 443 </FileConfiguration>
444 444 <FileConfiguration
445   - Name="Debug|x64"
  445 + Name="Release|Win32"
446 446 >
447 447 <Tool
448 448 Name="VCCLCompilerTool"
... ... @@ -473,7 +473,7 @@
473 473 />
474 474 </FileConfiguration>
475 475 <FileConfiguration
476   - Name="Release|Win32"
  476 + Name="Debug|x64"
477 477 >
478 478 <Tool
479 479 Name="VCCLCompilerTool"
... ... @@ -482,7 +482,7 @@
482 482 />
483 483 </FileConfiguration>
484 484 <FileConfiguration
485   - Name="Debug|x64"
  485 + Name="Release|Win32"
486 486 >
487 487 <Tool
488 488 Name="VCCLCompilerTool"
... ... @@ -529,7 +529,7 @@
529 529 />
530 530 </FileConfiguration>
531 531 <FileConfiguration
532   - Name="Release|Win32"
  532 + Name="Debug|x64"
533 533 >
534 534 <Tool
535 535 Name="VCCLCompilerTool"
... ... @@ -538,7 +538,7 @@
538 538 />
539 539 </FileConfiguration>
540 540 <FileConfiguration
541   - Name="Debug|x64"
  541 + Name="Release|Win32"
542 542 >
543 543 <Tool
544 544 Name="VCCLCompilerTool"
... ... @@ -569,7 +569,7 @@
569 569 />
570 570 </FileConfiguration>
571 571 <FileConfiguration
572   - Name="Release|Win32"
  572 + Name="Debug|x64"
573 573 >
574 574 <Tool
575 575 Name="VCCLCompilerTool"
... ... @@ -578,7 +578,7 @@
578 578 />
579 579 </FileConfiguration>
580 580 <FileConfiguration
581   - Name="Debug|x64"
  581 + Name="Release|Win32"
582 582 >
583 583 <Tool
584 584 Name="VCCLCompilerTool"
... ... @@ -609,7 +609,7 @@
609 609 />
610 610 </FileConfiguration>
611 611 <FileConfiguration
612   - Name="Release|Win32"
  612 + Name="Debug|x64"
613 613 >
614 614 <Tool
615 615 Name="VCCLCompilerTool"
... ... @@ -618,7 +618,7 @@
618 618 />
619 619 </FileConfiguration>
620 620 <FileConfiguration
621   - Name="Debug|x64"
  621 + Name="Release|Win32"
622 622 >
623 623 <Tool
624 624 Name="VCCLCompilerTool"
... ... @@ -653,7 +653,7 @@
653 653 />
654 654 </FileConfiguration>
655 655 <FileConfiguration
656   - Name="Release|Win32"
  656 + Name="Debug|x64"
657 657 >
658 658 <Tool
659 659 Name="VCCLCompilerTool"
... ... @@ -662,7 +662,7 @@
662 662 />
663 663 </FileConfiguration>
664 664 <FileConfiguration
665   - Name="Debug|x64"
  665 + Name="Release|Win32"
666 666 >
667 667 <Tool
668 668 Name="VCCLCompilerTool"
... ... @@ -701,7 +701,7 @@
701 701 />
702 702 </FileConfiguration>
703 703 <FileConfiguration
704   - Name="Release|Win32"
  704 + Name="Debug|x64"
705 705 >
706 706 <Tool
707 707 Name="VCCLCompilerTool"
... ... @@ -710,7 +710,7 @@
710 710 />
711 711 </FileConfiguration>
712 712 <FileConfiguration
713   - Name="Debug|x64"
  713 + Name="Release|Win32"
714 714 >
715 715 <Tool
716 716 Name="VCCLCompilerTool"
... ... @@ -745,7 +745,7 @@
745 745 />
746 746 </FileConfiguration>
747 747 <FileConfiguration
748   - Name="Release|Win32"
  748 + Name="Debug|x64"
749 749 >
750 750 <Tool
751 751 Name="VCCLCompilerTool"
... ... @@ -754,7 +754,7 @@
754 754 />
755 755 </FileConfiguration>
756 756 <FileConfiguration
757   - Name="Debug|x64"
  757 + Name="Release|Win32"
758 758 >
759 759 <Tool
760 760 Name="VCCLCompilerTool"
... ... @@ -785,7 +785,7 @@
785 785 />
786 786 </FileConfiguration>
787 787 <FileConfiguration
788   - Name="Release|Win32"
  788 + Name="Debug|x64"
789 789 >
790 790 <Tool
791 791 Name="VCCLCompilerTool"
... ... @@ -794,7 +794,7 @@
794 794 />
795 795 </FileConfiguration>
796 796 <FileConfiguration
797   - Name="Debug|x64"
  797 + Name="Release|Win32"
798 798 >
799 799 <Tool
800 800 Name="VCCLCompilerTool"
... ... @@ -829,7 +829,7 @@
829 829 />
830 830 </FileConfiguration>
831 831 <FileConfiguration
832   - Name="Release|Win32"
  832 + Name="Debug|x64"
833 833 >
834 834 <Tool
835 835 Name="VCCLCompilerTool"
... ... @@ -838,7 +838,7 @@
838 838 />
839 839 </FileConfiguration>
840 840 <FileConfiguration
841   - Name="Debug|x64"
  841 + Name="Release|Win32"
842 842 >
843 843 <Tool
844 844 Name="VCCLCompilerTool"
... ... @@ -877,7 +877,7 @@
877 877 />
878 878 </FileConfiguration>
879 879 <FileConfiguration
880   - Name="Release|Win32"
  880 + Name="Debug|x64"
881 881 >
882 882 <Tool
883 883 Name="VCCLCompilerTool"
... ... @@ -886,7 +886,7 @@
886 886 />
887 887 </FileConfiguration>
888 888 <FileConfiguration
889   - Name="Debug|x64"
  889 + Name="Release|Win32"
890 890 >
891 891 <Tool
892 892 Name="VCCLCompilerTool"
... ... @@ -922,7 +922,7 @@
922 922 />
923 923 </FileConfiguration>
924 924 <FileConfiguration
925   - Name="Release|Win32"
  925 + Name="Debug|x64"
926 926 ExcludedFromBuild="true"
927 927 >
928 928 <Tool
... ... @@ -932,7 +932,7 @@
932 932 />
933 933 </FileConfiguration>
934 934 <FileConfiguration
935   - Name="Debug|x64"
  935 + Name="Release|Win32"
936 936 ExcludedFromBuild="true"
937 937 >
938 938 <Tool
... ... @@ -966,7 +966,7 @@
966 966 />
967 967 </FileConfiguration>
968 968 <FileConfiguration
969   - Name="Release|Win32"
  969 + Name="Debug|x64"
970 970 ExcludedFromBuild="true"
971 971 >
972 972 <Tool
... ... @@ -976,7 +976,7 @@
976 976 />
977 977 </FileConfiguration>
978 978 <FileConfiguration
979   - Name="Debug|x64"
  979 + Name="Release|Win32"
980 980 ExcludedFromBuild="true"
981 981 >
982 982 <Tool
... ... @@ -1010,7 +1010,7 @@
1010 1010 />
1011 1011 </FileConfiguration>
1012 1012 <FileConfiguration
1013   - Name="Release|Win32"
  1013 + Name="Debug|x64"
1014 1014 ExcludedFromBuild="true"
1015 1015 >
1016 1016 <Tool
... ... @@ -1020,7 +1020,7 @@
1020 1020 />
1021 1021 </FileConfiguration>
1022 1022 <FileConfiguration
1023   - Name="Debug|x64"
  1023 + Name="Release|Win32"
1024 1024 ExcludedFromBuild="true"
1025 1025 >
1026 1026 <Tool
... ... @@ -1053,7 +1053,7 @@
1053 1053 />
1054 1054 </FileConfiguration>
1055 1055 <FileConfiguration
1056   - Name="Release|Win32"
  1056 + Name="Debug|x64"
1057 1057 >
1058 1058 <Tool
1059 1059 Name="VCCLCompilerTool"
... ... @@ -1062,7 +1062,7 @@
1062 1062 />
1063 1063 </FileConfiguration>
1064 1064 <FileConfiguration
1065   - Name="Debug|x64"
  1065 + Name="Release|Win32"
1066 1066 >
1067 1067 <Tool
1068 1068 Name="VCCLCompilerTool"
... ... @@ -1093,7 +1093,7 @@
1093 1093 />
1094 1094 </FileConfiguration>
1095 1095 <FileConfiguration
1096   - Name="Release|Win32"
  1096 + Name="Debug|x64"
1097 1097 >
1098 1098 <Tool
1099 1099 Name="VCCLCompilerTool"
... ... @@ -1102,7 +1102,7 @@
1102 1102 />
1103 1103 </FileConfiguration>
1104 1104 <FileConfiguration
1105   - Name="Debug|x64"
  1105 + Name="Release|Win32"
1106 1106 >
1107 1107 <Tool
1108 1108 Name="VCCLCompilerTool"
... ... @@ -1133,7 +1133,7 @@
1133 1133 />
1134 1134 </FileConfiguration>
1135 1135 <FileConfiguration
1136   - Name="Release|Win32"
  1136 + Name="Debug|x64"
1137 1137 >
1138 1138 <Tool
1139 1139 Name="VCCLCompilerTool"
... ... @@ -1142,7 +1142,7 @@
1142 1142 />
1143 1143 </FileConfiguration>
1144 1144 <FileConfiguration
1145   - Name="Debug|x64"
  1145 + Name="Release|Win32"
1146 1146 >
1147 1147 <Tool
1148 1148 Name="VCCLCompilerTool"
... ... @@ -1173,7 +1173,7 @@
1173 1173 />
1174 1174 </FileConfiguration>
1175 1175 <FileConfiguration
1176   - Name="Release|Win32"
  1176 + Name="Debug|x64"
1177 1177 >
1178 1178 <Tool
1179 1179 Name="VCCLCompilerTool"
... ... @@ -1182,7 +1182,7 @@
1182 1182 />
1183 1183 </FileConfiguration>
1184 1184 <FileConfiguration
1185   - Name="Debug|x64"
  1185 + Name="Release|Win32"
1186 1186 >
1187 1187 <Tool
1188 1188 Name="VCCLCompilerTool"
... ... @@ -1217,7 +1217,7 @@
1217 1217 />
1218 1218 </FileConfiguration>
1219 1219 <FileConfiguration
1220   - Name="Release|Win32"
  1220 + Name="Debug|x64"
1221 1221 >
1222 1222 <Tool
1223 1223 Name="VCCLCompilerTool"
... ... @@ -1226,7 +1226,7 @@
1226 1226 />
1227 1227 </FileConfiguration>
1228 1228 <FileConfiguration
1229   - Name="Debug|x64"
  1229 + Name="Release|Win32"
1230 1230 >
1231 1231 <Tool
1232 1232 Name="VCCLCompilerTool"
... ... @@ -1257,7 +1257,7 @@
1257 1257 />
1258 1258 </FileConfiguration>
1259 1259 <FileConfiguration
1260   - Name="Release|Win32"
  1260 + Name="Debug|x64"
1261 1261 >
1262 1262 <Tool
1263 1263 Name="VCCLCompilerTool"
... ... @@ -1266,7 +1266,7 @@
1266 1266 />
1267 1267 </FileConfiguration>
1268 1268 <FileConfiguration
1269   - Name="Debug|x64"
  1269 + Name="Release|Win32"
1270 1270 >
1271 1271 <Tool
1272 1272 Name="VCCLCompilerTool"
... ... @@ -1297,7 +1297,7 @@
1297 1297 />
1298 1298 </FileConfiguration>
1299 1299 <FileConfiguration
1300   - Name="Release|Win32"
  1300 + Name="Debug|x64"
1301 1301 >
1302 1302 <Tool
1303 1303 Name="VCCLCompilerTool"
... ... @@ -1306,7 +1306,7 @@
1306 1306 />
1307 1307 </FileConfiguration>
1308 1308 <FileConfiguration
1309   - Name="Debug|x64"
  1309 + Name="Release|Win32"
1310 1310 >
1311 1311 <Tool
1312 1312 Name="VCCLCompilerTool"
... ... @@ -1337,7 +1337,7 @@
1337 1337 />
1338 1338 </FileConfiguration>
1339 1339 <FileConfiguration
1340   - Name="Release|Win32"
  1340 + Name="Debug|x64"
1341 1341 >
1342 1342 <Tool
1343 1343 Name="VCCLCompilerTool"
... ... @@ -1346,7 +1346,7 @@
1346 1346 />
1347 1347 </FileConfiguration>
1348 1348 <FileConfiguration
1349   - Name="Debug|x64"
  1349 + Name="Release|Win32"
1350 1350 >
1351 1351 <Tool
1352 1352 Name="VCCLCompilerTool"
... ... @@ -1377,7 +1377,7 @@
1377 1377 />
1378 1378 </FileConfiguration>
1379 1379 <FileConfiguration
1380   - Name="Release|Win32"
  1380 + Name="Debug|x64"
1381 1381 >
1382 1382 <Tool
1383 1383 Name="VCCLCompilerTool"
... ... @@ -1386,7 +1386,7 @@
1386 1386 />
1387 1387 </FileConfiguration>
1388 1388 <FileConfiguration
1389   - Name="Debug|x64"
  1389 + Name="Release|Win32"
1390 1390 >
1391 1391 <Tool
1392 1392 Name="VCCLCompilerTool"
... ... @@ -1417,7 +1417,7 @@
1417 1417 />
1418 1418 </FileConfiguration>
1419 1419 <FileConfiguration
1420   - Name="Release|Win32"
  1420 + Name="Debug|x64"
1421 1421 >
1422 1422 <Tool
1423 1423 Name="VCCLCompilerTool"
... ... @@ -1426,7 +1426,7 @@
1426 1426 />
1427 1427 </FileConfiguration>
1428 1428 <FileConfiguration
1429   - Name="Debug|x64"
  1429 + Name="Release|Win32"
1430 1430 >
1431 1431 <Tool
1432 1432 Name="VCCLCompilerTool"
... ... @@ -1457,7 +1457,7 @@
1457 1457 />
1458 1458 </FileConfiguration>
1459 1459 <FileConfiguration
1460   - Name="Release|Win32"
  1460 + Name="Debug|x64"
1461 1461 >
1462 1462 <Tool
1463 1463 Name="VCCLCompilerTool"
... ... @@ -1466,7 +1466,7 @@
1466 1466 />
1467 1467 </FileConfiguration>
1468 1468 <FileConfiguration
1469   - Name="Debug|x64"
  1469 + Name="Release|Win32"
1470 1470 >
1471 1471 <Tool
1472 1472 Name="VCCLCompilerTool"
... ... @@ -1497,7 +1497,7 @@
1497 1497 />
1498 1498 </FileConfiguration>
1499 1499 <FileConfiguration
1500   - Name="Release|Win32"
  1500 + Name="Debug|x64"
1501 1501 >
1502 1502 <Tool
1503 1503 Name="VCCLCompilerTool"
... ... @@ -1506,7 +1506,7 @@
1506 1506 />
1507 1507 </FileConfiguration>
1508 1508 <FileConfiguration
1509   - Name="Debug|x64"
  1509 + Name="Release|Win32"
1510 1510 >
1511 1511 <Tool
1512 1512 Name="VCCLCompilerTool"
... ... @@ -1537,7 +1537,7 @@
1537 1537 />
1538 1538 </FileConfiguration>
1539 1539 <FileConfiguration
1540   - Name="Release|Win32"
  1540 + Name="Debug|x64"
1541 1541 >
1542 1542 <Tool
1543 1543 Name="VCCLCompilerTool"
... ... @@ -1546,7 +1546,7 @@
1546 1546 />
1547 1547 </FileConfiguration>
1548 1548 <FileConfiguration
1549   - Name="Debug|x64"
  1549 + Name="Release|Win32"
1550 1550 >
1551 1551 <Tool
1552 1552 Name="VCCLCompilerTool"
... ... @@ -1577,7 +1577,7 @@
1577 1577 />
1578 1578 </FileConfiguration>
1579 1579 <FileConfiguration
1580   - Name="Release|Win32"
  1580 + Name="Debug|x64"
1581 1581 >
1582 1582 <Tool
1583 1583 Name="VCCLCompilerTool"
... ... @@ -1586,7 +1586,7 @@
1586 1586 />
1587 1587 </FileConfiguration>
1588 1588 <FileConfiguration
1589   - Name="Debug|x64"
  1589 + Name="Release|Win32"
1590 1590 >
1591 1591 <Tool
1592 1592 Name="VCCLCompilerTool"
... ... @@ -1617,7 +1617,7 @@
1617 1617 />
1618 1618 </FileConfiguration>
1619 1619 <FileConfiguration
1620   - Name="Release|Win32"
  1620 + Name="Debug|x64"
1621 1621 >
1622 1622 <Tool
1623 1623 Name="VCCLCompilerTool"
... ... @@ -1626,7 +1626,7 @@
1626 1626 />
1627 1627 </FileConfiguration>
1628 1628 <FileConfiguration
1629   - Name="Debug|x64"
  1629 + Name="Release|Win32"
1630 1630 >
1631 1631 <Tool
1632 1632 Name="VCCLCompilerTool"
... ... @@ -1657,7 +1657,7 @@
1657 1657 />
1658 1658 </FileConfiguration>
1659 1659 <FileConfiguration
1660   - Name="Release|Win32"
  1660 + Name="Debug|x64"
1661 1661 >
1662 1662 <Tool
1663 1663 Name="VCCLCompilerTool"
... ... @@ -1666,7 +1666,7 @@
1666 1666 />
1667 1667 </FileConfiguration>
1668 1668 <FileConfiguration
1669   - Name="Debug|x64"
  1669 + Name="Release|Win32"
1670 1670 >
1671 1671 <Tool
1672 1672 Name="VCCLCompilerTool"
... ... @@ -1697,7 +1697,7 @@
1697 1697 />
1698 1698 </FileConfiguration>
1699 1699 <FileConfiguration
1700   - Name="Release|Win32"
  1700 + Name="Debug|x64"
1701 1701 >
1702 1702 <Tool
1703 1703 Name="VCCLCompilerTool"
... ... @@ -1706,7 +1706,7 @@
1706 1706 />
1707 1707 </FileConfiguration>
1708 1708 <FileConfiguration
1709   - Name="Debug|x64"
  1709 + Name="Release|Win32"
1710 1710 >
1711 1711 <Tool
1712 1712 Name="VCCLCompilerTool"
... ... @@ -1737,7 +1737,7 @@
1737 1737 />
1738 1738 </FileConfiguration>
1739 1739 <FileConfiguration
1740   - Name="Release|Win32"
  1740 + Name="Debug|x64"
1741 1741 >
1742 1742 <Tool
1743 1743 Name="VCCLCompilerTool"
... ... @@ -1746,7 +1746,7 @@
1746 1746 />
1747 1747 </FileConfiguration>
1748 1748 <FileConfiguration
1749   - Name="Debug|x64"
  1749 + Name="Release|Win32"
1750 1750 >
1751 1751 <Tool
1752 1752 Name="VCCLCompilerTool"
... ... @@ -1777,7 +1777,7 @@
1777 1777 />
1778 1778 </FileConfiguration>
1779 1779 <FileConfiguration
1780   - Name="Release|Win32"
  1780 + Name="Debug|x64"
1781 1781 >
1782 1782 <Tool
1783 1783 Name="VCCLCompilerTool"
... ... @@ -1786,7 +1786,7 @@
1786 1786 />
1787 1787 </FileConfiguration>
1788 1788 <FileConfiguration
1789   - Name="Debug|x64"
  1789 + Name="Release|Win32"
1790 1790 >
1791 1791 <Tool
1792 1792 Name="VCCLCompilerTool"
... ... @@ -1817,7 +1817,7 @@
1817 1817 />
1818 1818 </FileConfiguration>
1819 1819 <FileConfiguration
1820   - Name="Release|Win32"
  1820 + Name="Debug|x64"
1821 1821 >
1822 1822 <Tool
1823 1823 Name="VCCLCompilerTool"
... ... @@ -1826,7 +1826,7 @@
1826 1826 />
1827 1827 </FileConfiguration>
1828 1828 <FileConfiguration
1829   - Name="Debug|x64"
  1829 + Name="Release|Win32"
1830 1830 >
1831 1831 <Tool
1832 1832 Name="VCCLCompilerTool"
... ... @@ -1857,7 +1857,7 @@
1857 1857 />
1858 1858 </FileConfiguration>
1859 1859 <FileConfiguration
1860   - Name="Release|Win32"
  1860 + Name="Debug|x64"
1861 1861 >
1862 1862 <Tool
1863 1863 Name="VCCLCompilerTool"
... ... @@ -1866,7 +1866,7 @@
1866 1866 />
1867 1867 </FileConfiguration>
1868 1868 <FileConfiguration
1869   - Name="Debug|x64"
  1869 + Name="Release|Win32"
1870 1870 >
1871 1871 <Tool
1872 1872 Name="VCCLCompilerTool"
... ... @@ -1897,7 +1897,7 @@
1897 1897 />
1898 1898 </FileConfiguration>
1899 1899 <FileConfiguration
1900   - Name="Release|Win32"
  1900 + Name="Debug|x64"
1901 1901 >
1902 1902 <Tool
1903 1903 Name="VCCLCompilerTool"
... ... @@ -1906,7 +1906,7 @@
1906 1906 />
1907 1907 </FileConfiguration>
1908 1908 <FileConfiguration
1909   - Name="Debug|x64"
  1909 + Name="Release|Win32"
1910 1910 >
1911 1911 <Tool
1912 1912 Name="VCCLCompilerTool"
... ... @@ -1937,7 +1937,7 @@
1937 1937 />
1938 1938 </FileConfiguration>
1939 1939 <FileConfiguration
1940   - Name="Release|Win32"
  1940 + Name="Debug|x64"
1941 1941 >
1942 1942 <Tool
1943 1943 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"
... ... @@ -1977,7 +1977,7 @@
1977 1977 />
1978 1978 </FileConfiguration>
1979 1979 <FileConfiguration
1980   - Name="Release|Win32"
  1980 + Name="Debug|x64"
1981 1981 >
1982 1982 <Tool
1983 1983 Name="VCCLCompilerTool"
... ... @@ -1986,7 +1986,7 @@
1986 1986 />
1987 1987 </FileConfiguration>
1988 1988 <FileConfiguration
1989   - Name="Debug|x64"
  1989 + Name="Release|Win32"
1990 1990 >
1991 1991 <Tool
1992 1992 Name="VCCLCompilerTool"
... ... @@ -2017,7 +2017,7 @@
2017 2017 />
2018 2018 </FileConfiguration>
2019 2019 <FileConfiguration
2020   - Name="Release|Win32"
  2020 + Name="Debug|x64"
2021 2021 >
2022 2022 <Tool
2023 2023 Name="VCCLCompilerTool"
... ... @@ -2026,7 +2026,7 @@
2026 2026 />
2027 2027 </FileConfiguration>
2028 2028 <FileConfiguration
2029   - Name="Debug|x64"
  2029 + Name="Release|Win32"
2030 2030 >
2031 2031 <Tool
2032 2032 Name="VCCLCompilerTool"
... ... @@ -2057,7 +2057,7 @@
2057 2057 />
2058 2058 </FileConfiguration>
2059 2059 <FileConfiguration
2060   - Name="Release|Win32"
  2060 + Name="Debug|x64"
2061 2061 >
2062 2062 <Tool
2063 2063 Name="VCCLCompilerTool"
... ... @@ -2066,7 +2066,7 @@
2066 2066 />
2067 2067 </FileConfiguration>
2068 2068 <FileConfiguration
2069   - Name="Debug|x64"
  2069 + Name="Release|Win32"
2070 2070 >
2071 2071 <Tool
2072 2072 Name="VCCLCompilerTool"
... ... @@ -2097,7 +2097,7 @@
2097 2097 />
2098 2098 </FileConfiguration>
2099 2099 <FileConfiguration
2100   - Name="Release|Win32"
  2100 + Name="Debug|x64"
2101 2101 >
2102 2102 <Tool
2103 2103 Name="VCCLCompilerTool"
... ... @@ -2106,7 +2106,7 @@
2106 2106 />
2107 2107 </FileConfiguration>
2108 2108 <FileConfiguration
2109   - Name="Debug|x64"
  2109 + Name="Release|Win32"
2110 2110 >
2111 2111 <Tool
2112 2112 Name="VCCLCompilerTool"
... ... @@ -2137,7 +2137,7 @@
2137 2137 />
2138 2138 </FileConfiguration>
2139 2139 <FileConfiguration
2140   - Name="Release|Win32"
  2140 + Name="Debug|x64"
2141 2141 >
2142 2142 <Tool
2143 2143 Name="VCCLCompilerTool"
... ... @@ -2146,7 +2146,7 @@
2146 2146 />
2147 2147 </FileConfiguration>
2148 2148 <FileConfiguration
2149   - Name="Debug|x64"
  2149 + Name="Release|Win32"
2150 2150 >
2151 2151 <Tool
2152 2152 Name="VCCLCompilerTool"
... ... @@ -2177,7 +2177,7 @@
2177 2177 />
2178 2178 </FileConfiguration>
2179 2179 <FileConfiguration
2180   - Name="Release|Win32"
  2180 + Name="Debug|x64"
2181 2181 >
2182 2182 <Tool
2183 2183 Name="VCCLCompilerTool"
... ... @@ -2186,7 +2186,7 @@
2186 2186 />
2187 2187 </FileConfiguration>
2188 2188 <FileConfiguration
2189   - Name="Debug|x64"
  2189 + Name="Release|Win32"
2190 2190 >
2191 2191 <Tool
2192 2192 Name="VCCLCompilerTool"
... ... @@ -2217,7 +2217,7 @@
2217 2217 />
2218 2218 </FileConfiguration>
2219 2219 <FileConfiguration
2220   - Name="Release|Win32"
  2220 + Name="Debug|x64"
2221 2221 >
2222 2222 <Tool
2223 2223 Name="VCCLCompilerTool"
... ... @@ -2226,7 +2226,7 @@
2226 2226 />
2227 2227 </FileConfiguration>
2228 2228 <FileConfiguration
2229   - Name="Debug|x64"
  2229 + Name="Release|Win32"
2230 2230 >
2231 2231 <Tool
2232 2232 Name="VCCLCompilerTool"
... ... @@ -2257,7 +2257,7 @@
2257 2257 />
2258 2258 </FileConfiguration>
2259 2259 <FileConfiguration
2260   - Name="Release|Win32"
  2260 + Name="Debug|x64"
2261 2261 >
2262 2262 <Tool
2263 2263 Name="VCCLCompilerTool"
... ... @@ -2266,7 +2266,7 @@
2266 2266 />
2267 2267 </FileConfiguration>
2268 2268 <FileConfiguration
2269   - Name="Debug|x64"
  2269 + Name="Release|Win32"
2270 2270 >
2271 2271 <Tool
2272 2272 Name="VCCLCompilerTool"
... ... @@ -2301,7 +2301,7 @@
2301 2301 />
2302 2302 </FileConfiguration>
2303 2303 <FileConfiguration
2304   - Name="Release|Win32"
  2304 + Name="Debug|x64"
2305 2305 >
2306 2306 <Tool
2307 2307 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"
... ... @@ -2341,7 +2341,7 @@
2341 2341 />
2342 2342 </FileConfiguration>
2343 2343 <FileConfiguration
2344   - Name="Release|Win32"
  2344 + Name="Debug|x64"
2345 2345 >
2346 2346 <Tool
2347 2347 Name="VCCLCompilerTool"
... ... @@ -2350,7 +2350,7 @@
2350 2350 />
2351 2351 </FileConfiguration>
2352 2352 <FileConfiguration
2353   - Name="Debug|x64"
  2353 + Name="Release|Win32"
2354 2354 >
2355 2355 <Tool
2356 2356 Name="VCCLCompilerTool"
... ... @@ -2381,7 +2381,7 @@
2381 2381 />
2382 2382 </FileConfiguration>
2383 2383 <FileConfiguration
2384   - Name="Release|Win32"
  2384 + Name="Debug|x64"
2385 2385 >
2386 2386 <Tool
2387 2387 Name="VCCLCompilerTool"
... ... @@ -2390,7 +2390,7 @@
2390 2390 />
2391 2391 </FileConfiguration>
2392 2392 <FileConfiguration
2393   - Name="Debug|x64"
  2393 + Name="Release|Win32"
2394 2394 >
2395 2395 <Tool
2396 2396 Name="VCCLCompilerTool"
... ... @@ -2421,7 +2421,7 @@
2421 2421 />
2422 2422 </FileConfiguration>
2423 2423 <FileConfiguration
2424   - Name="Release|Win32"
  2424 + Name="Debug|x64"
2425 2425 >
2426 2426 <Tool
2427 2427 Name="VCCLCompilerTool"
... ... @@ -2430,7 +2430,7 @@
2430 2430 />
2431 2431 </FileConfiguration>
2432 2432 <FileConfiguration
2433   - Name="Debug|x64"
  2433 + Name="Release|Win32"
2434 2434 >
2435 2435 <Tool
2436 2436 Name="VCCLCompilerTool"
... ... @@ -2461,7 +2461,7 @@
2461 2461 />
2462 2462 </FileConfiguration>
2463 2463 <FileConfiguration
2464   - Name="Release|Win32"
  2464 + Name="Debug|x64"
2465 2465 >
2466 2466 <Tool
2467 2467 Name="VCCLCompilerTool"
... ... @@ -2470,7 +2470,7 @@
2470 2470 />
2471 2471 </FileConfiguration>
2472 2472 <FileConfiguration
2473   - Name="Debug|x64"
  2473 + Name="Release|Win32"
2474 2474 >
2475 2475 <Tool
2476 2476 Name="VCCLCompilerTool"
... ... @@ -2501,7 +2501,7 @@
2501 2501 />
2502 2502 </FileConfiguration>
2503 2503 <FileConfiguration
2504   - Name="Release|Win32"
  2504 + Name="Debug|x64"
2505 2505 >
2506 2506 <Tool
2507 2507 Name="VCCLCompilerTool"
... ... @@ -2510,7 +2510,7 @@
2510 2510 />
2511 2511 </FileConfiguration>
2512 2512 <FileConfiguration
2513   - Name="Debug|x64"
  2513 + Name="Release|Win32"
2514 2514 >
2515 2515 <Tool
2516 2516 Name="VCCLCompilerTool"
... ... @@ -2541,7 +2541,7 @@
2541 2541 />
2542 2542 </FileConfiguration>
2543 2543 <FileConfiguration
2544   - Name="Release|Win32"
  2544 + Name="Debug|x64"
2545 2545 >
2546 2546 <Tool
2547 2547 Name="VCCLCompilerTool"
... ... @@ -2550,7 +2550,7 @@
2550 2550 />
2551 2551 </FileConfiguration>
2552 2552 <FileConfiguration
2553   - Name="Debug|x64"
  2553 + Name="Release|Win32"
2554 2554 >
2555 2555 <Tool
2556 2556 Name="VCCLCompilerTool"
... ... @@ -2581,7 +2581,7 @@
2581 2581 />
2582 2582 </FileConfiguration>
2583 2583 <FileConfiguration
2584   - Name="Release|Win32"
  2584 + Name="Debug|x64"
2585 2585 >
2586 2586 <Tool
2587 2587 Name="VCCLCompilerTool"
... ... @@ -2590,7 +2590,7 @@
2590 2590 />
2591 2591 </FileConfiguration>
2592 2592 <FileConfiguration
2593   - Name="Debug|x64"
  2593 + Name="Release|Win32"
2594 2594 >
2595 2595 <Tool
2596 2596 Name="VCCLCompilerTool"
... ... @@ -2926,7 +2926,7 @@
2926 2926 />
2927 2927 </FileConfiguration>
2928 2928 <FileConfiguration
2929   - Name="Release|Win32"
  2929 + Name="Debug|x64"
2930 2930 >
2931 2931 <Tool
2932 2932 Name="VCResourceCompilerTool"
... ... @@ -2934,7 +2934,7 @@
2934 2934 />
2935 2935 </FileConfiguration>
2936 2936 <FileConfiguration
2937   - Name="Debug|x64"
  2937 + Name="Release|Win32"
2938 2938 >
2939 2939 <Tool
2940 2940 Name="VCResourceCompilerTool"
... ... @@ -2951,6 +2951,10 @@
2951 2951 </FileConfiguration>
2952 2952 </File>
2953 2953 </Filter>
  2954 + <File
  2955 + RelativePath=".\ClassDiagram.cd"
  2956 + >
  2957 + </File>
2954 2958 </Files>
2955 2959 <Globals>
2956 2960 <Global
... ...
srcacic/WinVNC/WinVNC/resource.h
  Diff comments   View file @2606d12
... ... @@ -148,7 +148,12 @@
148 148 #define IDC_INFO_IP 1153
149 149 #define IDC_INFO_INICIO 1154
150 150 #define IDC_STATIC_INFO_REF 1155
  151 +#define IDC_DOC_LBL 1155
151 152 #define IDC_INFO_REFERENCIA 1156
  153 +#define IDC_AVISO_LOGOUT 1157
  154 +#define IDC_NOME_LBL 1158
  155 +#define IDC_IP_LBL 1159
  156 +#define IDC_INICIO_LBL 1160
152 157 #define IDC_FINGER 9000
153 158 #define IDC_GAMMAGRAY 9001
154 159 #define IDC_STATIC_SPLIT 9002
... ... @@ -230,7 +235,7 @@
230 235 #ifndef APSTUDIO_READONLY_SYMBOLS
231 236 #define _APS_NEXT_RESOURCE_VALUE 164
232 237 #define _APS_NEXT_COMMAND_VALUE 40019
233   -#define _APS_NEXT_CONTROL_VALUE 1157
  238 +#define _APS_NEXT_CONTROL_VALUE 1161
234 239 #define _APS_NEXT_SYMED_VALUE 101
235 240 #endif
236 241 #endif
... ...
srcacic/WinVNC/WinVNC/supInfoDlg.cpp
  Diff comments   View file @2606d12
... ... @@ -3,6 +3,7 @@
3 3 extern HINSTANCE hInstResDLL;
4 4  
5 5 supInfoDlg::supInfoDlg() {
  6 + m_timeoutCount = 20;
6 7 }
7 8  
8 9 supInfoDlg::~supInfoDlg()
... ... @@ -61,9 +62,22 @@ BOOL CALLBACK supInfoDlg::supInfoDlgProc(HWND hwnd, UINT uMsg, WPARAM wParam, LP
61 62 #endif
62 63  
63 64 supInfoDlg *_this = (supInfoDlg *) lParam;
  65 + _this->hwInfoDlg = hwnd;
64 66  
65 67 vrsBkColor = CreateSolidBrush(RGB(255, 255, 160));
66 68  
  69 + ShowWindow(GetDlgItem(hwnd, IDC_ATENCAO_STATIC), TRUE);
  70 + ShowWindow(GetDlgItem(hwnd, IDC_AVISO_SUPORTE), TRUE);
  71 + ShowWindow(GetDlgItem(hwnd, IDC_NOME_LBL), TRUE);
  72 + ShowWindow(GetDlgItem(hwnd, IDC_IP_LBL), TRUE);
  73 + ShowWindow(GetDlgItem(hwnd, IDC_INICIO_LBL), TRUE);
  74 + ShowWindow(GetDlgItem(hwnd, IDC_DOC_LBL), TRUE);
  75 + ShowWindow(GetDlgItem(hwnd, IDC_INFO_NOME), TRUE);
  76 + ShowWindow(GetDlgItem(hwnd, IDC_INFO_IP), TRUE);
  77 + ShowWindow(GetDlgItem(hwnd, IDC_INFO_INICIO), TRUE);
  78 + ShowWindow(GetDlgItem(hwnd, IDC_INFO_REFERENCIA), TRUE);
  79 + ShowWindow(GetDlgItem(hwnd, IDC_AVISO_LOGOUT), FALSE);
  80 +
67 81 // Fazendo o diálogo ficar transparente.
68 82 // Fonte: http://weseetips.com/2008/10/07/how-to-set-transparent-dialogs/
69 83 LONG ExtendedStyle = GetWindowLong(hwnd, GWL_EXSTYLE);
... ... @@ -100,6 +114,47 @@ BOOL CALLBACK supInfoDlg::supInfoDlgProc(HWND hwnd, UINT uMsg, WPARAM wParam, LP
100 114 }
101 115 break;
102 116  
  117 + // Timer event
  118 + case WM_TIMER:
  119 + {
  120 + _this->m_timeoutCount--;
  121 +
  122 + // Update the displayed count
  123 + char temp[256];
  124 + sprintf(temp, "ATENÇÃO: O sistema efetuará logout em %u segundos!", (_this->m_timeoutCount));
  125 + SetDlgItemText(hwnd, IDC_AVISO_LOGOUT, temp);
  126 + }
  127 + break;
  128 +
  129 + case WM_LOGOUT_WARNING:
  130 + {
  131 + // Fazendo o diálogo ficar opaco novamente.
  132 + // Fonte: http://weseetips.com/2008/10/07/how-to-set-transparent-dialogs/
  133 + LONG ExtendedStyle = GetWindowLong(hwnd, GWL_EXSTYLE);
  134 + SetWindowLong(hwnd, GWL_EXSTYLE, ExtendedStyle | WS_EX_LAYERED);
  135 + double TransparencyPercentage = 100.0;
  136 + double fAlpha = TransparencyPercentage * (255.0 /100);
  137 + BYTE byAlpha = static_cast<BYTE>(fAlpha);
  138 + SetLayeredWindowAttributes(hwnd, 0, byAlpha, LWA_ALPHA);
  139 +
  140 + CACIC_Utils::changeFont(hwnd, IDC_AVISO_LOGOUT, 26, CACIC_Utils::F_SANS_SERIF, true);
  141 +
  142 + ShowWindow(GetDlgItem(hwnd, IDC_ATENCAO_STATIC), FALSE);
  143 + ShowWindow(GetDlgItem(hwnd, IDC_AVISO_SUPORTE), FALSE);
  144 + ShowWindow(GetDlgItem(hwnd, IDC_NOME_LBL), FALSE);
  145 + ShowWindow(GetDlgItem(hwnd, IDC_IP_LBL), FALSE);
  146 + ShowWindow(GetDlgItem(hwnd, IDC_INICIO_LBL), FALSE);
  147 + ShowWindow(GetDlgItem(hwnd, IDC_DOC_LBL), FALSE);
  148 + ShowWindow(GetDlgItem(hwnd, IDC_INFO_NOME), FALSE);
  149 + ShowWindow(GetDlgItem(hwnd, IDC_INFO_IP), FALSE);
  150 + ShowWindow(GetDlgItem(hwnd, IDC_INFO_INICIO), FALSE);
  151 + ShowWindow(GetDlgItem(hwnd, IDC_INFO_REFERENCIA), FALSE);
  152 + ShowWindow(GetDlgItem(hwnd, IDC_AVISO_LOGOUT), TRUE);
  153 +
  154 + SetTimer(hwnd, 1, 1000, NULL);
  155 + }
  156 + break;
  157 +
103 158 case WM_COMMAND:
104 159 {
105 160 switch (LOWORD(wParam))
... ... @@ -125,8 +180,12 @@ BOOL CALLBACK supInfoDlg::supInfoDlgProc(HWND hwnd, UINT uMsg, WPARAM wParam, LP
125 180 HDC hdc = (HDC)wParam;
126 181 HWND hwndStatic = (HWND)lParam;
127 182  
128   - SetBkMode(hdc, TRANSPARENT);
129   - return (LRESULT)vrsBkColor;
  183 + if (hwndStatic == GetDlgItem(hwnd, IDC_AVISO_LOGOUT))
  184 + {
  185 + SetTextColor(hdc, RGB(255, 0, 0));
  186 + //SetBkMode(hdc, TRANSPARENT);
  187 + //return (BOOL)GetStockObject(NULL_BRUSH);
  188 + }
130 189  
131 190 /*if (hwndStatic == GetDlgItem(hwnd, IDC_AVISO_SUPORTE))
132 191 {
... ... @@ -138,6 +197,9 @@ BOOL CALLBACK supInfoDlg::supInfoDlgProc(HWND hwnd, UINT uMsg, WPARAM wParam, LP
138 197 SetBkMode(hdc, TRANSPARENT);
139 198 return (LRESULT)vrsBkColor;
140 199 }*/
  200 +
  201 + SetBkMode(hdc, TRANSPARENT);
  202 + return (LRESULT)vrsBkColor;
141 203 }
142 204 break;
143 205  
... ...
srcacic/WinVNC/WinVNC/supInfoDlg.h
  Diff comments   View file @2606d12
... ... @@ -12,6 +12,8 @@ using namespace std;
12 12  
13 13 #include "CACIC_Utils.h"
14 14  
  15 +#define WM_LOGOUT_WARNING 1001
  16 +
15 17 #pragma once
16 18  
17 19 class supInfoDlg {
... ... @@ -28,6 +30,10 @@ public:
28 30 string m_dataInicio;
29 31 string m_documentoReferencia;
30 32  
  33 + int m_timeoutCount;
  34 +
  35 + HWND hwInfoDlg;
  36 +
31 37 private:
32 38 HANDLE m_hInfoDlgThread;
33 39  
... ...
srcacic/WinVNC/WinVNC/vncListDlg.cpp
  Diff comments   View file @2606d12
... ... @@ -135,6 +135,8 @@ BOOL CALLBACK vncListDlg::DialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM
135 135 if (nSelected != LB_ERR)
136 136 {
137 137 char szClient[128];
  138 + // CACIC:
  139 + CACIC_Auth::getInstance()->m_efetuarLogout = false;
138 140 if (SendMessage(hList, LB_GETTEXT, nSelected, (LPARAM)szClient) > 0)
139 141 _this->m_pServer->KillClient(szClient);
140 142 }
... ...
srcacic/WinVNC/WinVNC/vncPassDlg.cpp
  Diff comments   View file @2606d12
... ... @@ -54,7 +54,14 @@ BOOL CALLBACK vncPassDlg::vncAuthDlgProc(HWND hwnd, UINT uMsg, WPARAM wParam, LP
54 54  
55 55 switch (uMsg)
56 56 {
  57 + /** Os cases desse switch se referem as mensagens de notificação lançadas
  58 + por processos de threads.*/
  59 +
57 60 case WM_INITDIALOG:
  61 + /** Case 1: Case de construção da janela de Autenticação. É um estado
  62 + estático. Aqui a primeira janela de dialogo do suporte remoto é
  63 + montada. De acordo com as respostas obtidas pela interação do usuario,
  64 + essa janela é tambem aqui, reformulada.*/
58 65 {
59 66 // Save the lParam into our user data so that subsequent calls have
60 67 // access to the parent C++ object
... ... @@ -91,7 +98,7 @@ BOOL CALLBACK vncPassDlg::vncAuthDlgProc(HWND hwnd, UINT uMsg, WPARAM wParam, LP
91 98 }
92 99  
93 100 if (_this->m_authStat == vncPassDlg::FALHA_AUTENTICACAO)
94   - {
  101 + { // Mensagem da faixa na cor vermelha, informando falha.
95 102 msgBkColor = CreateSolidBrush(RGB(242, 0, 28));
96 103  
97 104 SendMessage(hDominios, CB_SELECTSTRING, 0, (LPARAM) _this->m_listaDominios.at(_this->m_indiceDominio).nome.c_str());
... ... @@ -101,7 +108,7 @@ BOOL CALLBACK vncPassDlg::vncAuthDlgProc(HWND hwnd, UINT uMsg, WPARAM wParam, LP
101 108 SetDlgItemText(hwnd, IDC_MSG, (LPSTR) "Falha na Autenticação!");
102 109 }
103 110 else if (_this->m_authStat == vncPassDlg::AUTENTICADO)
104   - {
  111 + { // Mensagem da faixa na cor verde, validando o suporte.
105 112 msgBkColor = CreateSolidBrush(RGB(102, 255, 0));
106 113  
107 114 SendMessage(hDominios, CB_SELECTSTRING, 0, (LPARAM) _this->m_listaDominios.at(_this->m_indiceDominio).nome.c_str());
... ... @@ -116,13 +123,18 @@ BOOL CALLBACK vncPassDlg::vncAuthDlgProc(HWND hwnd, UINT uMsg, WPARAM wParam, LP
116 123 EnableWindow( hSenha, FALSE );
117 124  
118 125 SetDlgItemText( hwnd, IDC_MSG, (LPSTR)_this->m_msgInfo.c_str() );
119   - }
120 126  
  127 + //Lança um timeout sobre o botao de OK, confirmando a autenticação.
  128 + _this->m_timeoutPassDlg = (UINT)5;
  129 + SetTimer(hwnd,1,1000,NULL);
  130 + }
121 131 return TRUE;
122 132 }
123 133 break;
124 134  
125 135 case WM_COMMAND:
  136 + /** Case 2: Estado dinâmico interativo, onde os comandos são captados e exibidos
  137 + em tempo de uso.*/
126 138 {
127 139 switch (LOWORD(wParam))
128 140 {
... ... @@ -163,7 +175,25 @@ BOOL CALLBACK vncPassDlg::vncAuthDlgProc(HWND hwnd, UINT uMsg, WPARAM wParam, LP
163 175 }
164 176 }
165 177 break;
166   -
  178 +
  179 + case WM_TIMER:
  180 + /** Case 3: Estado de detecção de um timeout. Ele verifica que um timeout
  181 + ocorreu em algum momento e a partir dele, toma as devidas ações.*/
  182 + {
  183 + //Atualiza a Mensagem no botão de OK da janela de Autenticação.
  184 + char temp[256];
  185 + sprintf(temp, "OK [%u]", (_this->m_timeoutPassDlg));
  186 + SetDlgItemText(hwnd, ID_POK, temp);
  187 +
  188 + /** Fecha a janela de autenticação "clicando automaticamente
  189 + no botao OK".*/
  190 + if (!(_this->m_timeoutPassDlg)) EndDialog(hwnd, ID_POK);
  191 + _this->m_timeoutPassDlg--;
  192 + }
  193 + break;
  194 +
  195 + /** Case 4: Estado de atualização da janela. De acordo com a interação
  196 + com o menu, os campos mudam de layout, se tornando transparentes.*/
167 197 case WM_CTLCOLORSTATIC:
168 198 {
169 199 HDC hdc = (HDC)wParam;
... ...
srcacic/WinVNC/WinVNC/vncPassDlg.h
  Diff comments   View file @2606d12
... ... @@ -23,17 +23,6 @@ using namespace std;
23 23  
24 24 #pragma once
25 25  
26   -/**
27   - * Struct referente a um domínio de autenticação.
28   - */
29   -struct Dominio {
30   - Dominio(string p_id, string p_nome) : id(p_id), nome(p_nome) {}
31   - Dominio() : id(""), nome("") {}
32   -
33   - string id;
34   - string nome;
35   -};
36   -
37 26 class vncPassDlg {
38 27  
39 28 public:
... ... @@ -54,6 +43,9 @@ public:
54 43 EAuthCode m_authStat;
55 44 string m_msgInfo;
56 45  
  46 + // Campo extra para fazer o timeout da janela!
  47 + UINT m_timeoutPassDlg;
  48 +
57 49 BOOL DoDialog();
58 50  
59 51 private:
... ...
srcacic/WinVNC/WinVNC/vncacceptdialog.cpp
  Diff comments   View file @2606d12
... ... @@ -37,6 +37,9 @@
37 37 // [v1.0.2-jp1 fix] Load resouce from dll
38 38 extern HINSTANCE hInstResDLL;
39 39  
  40 +DWORD WINAPI makeWndBlink(LPVOID lParam);
  41 +HANDLE isWindowActivated = 0;
  42 +
40 43 // Constructor
41 44  
42 45 vncAcceptDialog::vncAcceptDialog(UINT timeoutSecs,BOOL acceptOnTimeout, const char *ipAddress)
... ... @@ -149,6 +152,18 @@ BOOL CALLBACK vncAcceptDialog::vncAcceptDlgProc(HWND hwnd,
149 152  
150 153 // Beep
151 154 MessageBeep(MB_ICONEXCLAMATION);
  155 +
  156 + // Faz a janela piscar na barra de tarefas
  157 + PFLASHWINFO fhwInfo = new FLASHWINFO();
  158 + fhwInfo->cbSize = sizeof (FLASHWINFO);
  159 + fhwInfo->dwFlags = FLASHW_ALL | FLASHW_TIMERNOFG;
  160 + fhwInfo->dwTimeout = 1000;
  161 + fhwInfo->hwnd = hwnd;
  162 + fhwInfo->uCount = 60;
  163 + FlashWindowEx(fhwInfo);
  164 +
  165 + DWORD threadID;
  166 + CreateThread(NULL, 0, makeWndBlink, (LPVOID) hwnd, 0, &threadID);
152 167  
153 168 // Return success!
154 169 return TRUE;
... ... @@ -207,6 +222,10 @@ BOOL CALLBACK vncAcceptDialog::vncAcceptDlgProc(HWND hwnd,
207 222  
208 223 break;
209 224  
  225 + case WM_ACTIVATE:
  226 + case WM_MOUSEACTIVATE:
  227 + SetEvent(isWindowActivated);
  228 + break;
210 229 // Window is being destroyed! (Should never happen)
211 230 case WM_DESTROY:
212 231 EndDialog(hwnd, IDREJECT);
... ... @@ -215,3 +234,29 @@ BOOL CALLBACK vncAcceptDialog::vncAcceptDlgProc(HWND hwnd,
215 234 return 0;
216 235 }
217 236  
  237 +DWORD WINAPI makeWndBlink(LPVOID lParam) {
  238 + HWND hwnd = (HWND) lParam;
  239 + int percentage = 100;
  240 + int flip = -1;
  241 + isWindowActivated = CreateEvent(0, FALSE, FALSE, 0);
  242 +
  243 + while (WaitForSingleObject(isWindowActivated, 10)) {
  244 + if (percentage == 25) {
  245 + flip = 1;
  246 + } else if (percentage == 100) {
  247 + flip = -1;
  248 + Sleep(1000);
  249 + }
  250 + percentage += (1 * flip);
  251 +
  252 + LONG ExtendedStyle = GetWindowLong(hwnd, GWL_EXSTYLE);
  253 + SetWindowLong(hwnd, GWL_EXSTYLE, ExtendedStyle | WS_EX_LAYERED);
  254 + double TransparencyPercentage = (double) percentage;
  255 + double fAlpha = TransparencyPercentage * (255.0 /100);
  256 + BYTE byAlpha = static_cast<BYTE>(fAlpha);
  257 + SetLayeredWindowAttributes(hwnd, 0, byAlpha, LWA_ALPHA);
  258 + }
  259 + SetLayeredWindowAttributes(hwnd, 0, static_cast<BYTE>(100 * (255.0 /100)), LWA_ALPHA);
  260 +
  261 + return 0;
  262 +}
... ...
srcacic/WinVNC/WinVNC/vncclient.cpp
  Diff comments   View file @2606d12
... ... @@ -609,8 +609,8 @@ vncClientThread::InitAuthenticate()
609 609 // TODO: aqui é o local provável para o recebimento do usuario e senha do técnico.
610 610 vnclog.Print(LL_INTINFO, "password authentication");
611 611  
612   - // Tirando o timeout do socket para esperar o cliente enviar as informações do técnico.
613   - if (!m_socket->SetTimeout(0))
  612 + // Alterando o timeout para que o cliente tenha tempo de enviar as informações do técnico.
  613 + if (!m_socket->SetTimeout(60000))
614 614 vnclog.Print(LL_INTERR, VNCLOG("failed to set socket timeout(%d)\n"), GetLastError());
615 615  
616 616 // Lê o username
... ... @@ -634,7 +634,7 @@ vncClientThread::InitAuthenticate()
634 634 if (!m_socket->ReadExact(te_so_cli, sizeof(te_so_cli)))
635 635 return FALSE;
636 636  
637   - // Colocando o timeout denovo.
  637 + // Voltando o timeout ao normal.
638 638 if (!m_socket->SetTimeout(30000))
639 639 vnclog.Print(LL_INTERR, VNCLOG("failed to set socket timeout(%d)\n"), GetLastError());
640 640  
... ... @@ -1059,7 +1059,6 @@ vncClientThread::run(void *arg)
1059 1059 if (!InitVersion())
1060 1060 {
1061 1061 m_server->RemoveClient(m_client->GetClientId());
1062   - CACIC_Auth::getInstance()->removeCliente(m_client->GetClientId());
1063 1062  
1064 1063 // wa@2005 - AutoReconnection attempt if required
1065 1064 if (m_server->AutoReconnect())
... ... @@ -1073,7 +1072,6 @@ vncClientThread::run(void *arg)
1073 1072 if (!InitAuthenticate())
1074 1073 {
1075 1074 m_server->RemoveClient(m_client->GetClientId());
1076   - CACIC_Auth::getInstance()->removeCliente(m_client->GetClientId());
1077 1075 return;
1078 1076 }
1079 1077 CACIC_Auth::getInstance()->m_infoDlg.showInfoDialog();
... ... @@ -1153,13 +1151,11 @@ vncClientThread::run(void *arg)
1153 1151 if (!m_socket->SendExact((char *)&server_ini, sizeof(server_ini)))
1154 1152 {
1155 1153 m_server->RemoveClient(m_client->GetClientId());
1156   - CACIC_Auth::getInstance()->removeCliente(m_client->GetClientId());
1157 1154 return;
1158 1155 }
1159 1156 if (!m_socket->SendExact(desktopname, strlen(desktopname)))
1160 1157 {
1161 1158 m_server->RemoveClient(m_client->GetClientId());
1162   - CACIC_Auth::getInstance()->removeCliente(m_client->GetClientId());
1163 1159 return;
1164 1160 }
1165 1161 vnclog.Print(LL_INTINFO, VNCLOG("sent pixel format to client\n"));
... ... @@ -1185,6 +1181,11 @@ vncClientThread::run(void *arg)
1185 1181 // added jeff
1186 1182 BOOL need_to_disable_input = m_server->LocalInputsDisabled();
1187 1183 bool need_to_clear_keyboard = true;
  1184 +
  1185 + // TODO CACIC tirando o timeout do socket. Quando o chat está aberto sem mensagens,
  1186 + // não há fluxo no socket, fazendo com que ele de timeout,
  1187 + if (!m_socket->SetTimeout(0))
  1188 + vnclog.Print(LL_INTERR, VNCLOG("failed to set socket timeout(%d)\n"), GetLastError());
1188 1189 while (connected)
1189 1190 {
1190 1191 rfbClientToServerMsg msg;
... ... @@ -1237,6 +1238,10 @@ vncClientThread::run(void *arg)
1237 1238 switch(msg.type)
1238 1239 {
1239 1240  
  1241 + case rfbNoLogout:
  1242 + CACIC_Auth::getInstance()->m_efetuarLogout = false;
  1243 + break;
  1244 +
1240 1245 case rfbSetPixelFormat:
1241 1246 // Read the rest of the message:
1242 1247 if (!m_socket->ReadExact(((char *) &msg)+nTO, sz_rfbSetPixelFormatMsg-nTO))
... ... @@ -2674,6 +2679,9 @@ vncClientThread::run(void *arg)
2674 2679 }
2675 2680  
2676 2681 }
  2682 + // TODO CACIC voltando o timeout ao normal
  2683 + if (!m_socket->SetTimeout(30000))
  2684 + vnclog.Print(LL_INTERR, VNCLOG("failed to set socket timeout(%d)\n"), GetLastError());
2677 2685  
2678 2686 // Move into the thread's original desktop
2679 2687 // TAG 14
... ...
srcacic/WinVNC/WinVNC/vnclog.cpp
  Diff comments   View file @2606d12
... ... @@ -185,10 +185,9 @@ inline void VNCLog::ReallyPrintLine(const char* line)
185 185 struct tm ts;
186 186 char data_buf[20];
187 187  
188   - // Formata a data, "ddd yyyy-mm-dd hh:mm:ss zzz"
189 188 ts = *localtime(&now);
190   - strftime(data_buf, sizeof(data_buf), "%Y-%m-%d %H:%M:%S", &ts);
191   -
  189 + strftime(data_buf, sizeof(data_buf), "%d/%m %X", &ts);
  190 +
192 191 if (m_toscript) enviaLog(data_buf, (char*)line, SCRIPT); // ADICIONADO
193 192 if (m_todebug) OutputDebugString(line);
194 193 if (m_toconsole) {
... ... @@ -196,9 +195,21 @@ inline void VNCLog::ReallyPrintLine(const char* line)
196 195 WriteConsole(GetStdHandle(STD_OUTPUT_HANDLE), line, strlen(line), &byteswritten, NULL);
197 196 };
198 197 if (m_tofile && (hlogfile != NULL)) {
  198 + string strLine;
  199 + strLine.append(data_buf);
  200 + strLine.append(" : ");
  201 + strLine.append("[Suporte Remoto]");
  202 + //if (/*Verificar modo DEBUG!*/){
  203 + // strLine.append(" (");
  204 + // strLine.append(/*Funcao de retorno da Versao: v.2.6.0.0*/);
  205 + // strLine.append(")");
  206 + // strLine.append(" DEBUG -");
  207 + //}
  208 + strLine.append(" ");
  209 + strLine.append(line);
199 210 DWORD byteswritten;
200   - WriteFile(hlogfile, line, strlen(line), &byteswritten, NULL);
201   - }
  211 + WriteFile(hlogfile, strLine.c_str(), strLine.length(), &byteswritten, NULL);
  212 + }
202 213 }
203 214  
204 215 void VNCLog::ReallyPrint(const char* format, va_list ap)
... ... @@ -226,6 +237,7 @@ void VNCLog::ReallyPrint(const char* format, va_list ap)
226 237 ReallyPrintLine(line);
227 238 }
228 239  
  240 +
229 241 VNCLog::~VNCLog()
230 242 {
231 243 if (m_filename != NULL)
... ...
srcacic/WinVNC/WinVNC/vnclog.h
  Diff comments   View file @2606d12
... ... @@ -84,6 +84,11 @@ public:
84 84 // the log mode includes ToFile
85 85 void SetFile(const char* filename, bool append = false);
86 86  
  87 + /**
  88 + * Verifica a existencia do diretorio debugs.
  89 + */
  90 +
  91 +
87 92 virtual ~VNCLog();
88 93  
89 94 private:
... ...
srcacic/WinVNC/WinVNC/vncserver.cpp
  Diff comments   View file @2606d12
... ... @@ -131,7 +131,7 @@ vncServer::vncServer()
131 131  
132 132 m_querysetting = 4;
133 133 m_queryaccept = 0;
134   - m_querytimeout = 30;
  134 + m_querytimeout = 60;
135 135 m_retry_timeout = 0;
136 136  
137 137 // Autolock settings
... ... @@ -994,7 +994,6 @@ vncServer::RemoveClient(vncClientId clientid)
994 994  
995 995 // Notify anyone interested of the change
996 996 DoNotify(WM_SRV_CLIENT_DISCONNECT, 0, 0);
997   -
998 997 vnclog.Print(LL_INTINFO, VNCLOG("RemoveClient() done\n"));
999 998 }
1000 999  
... ...
srcacic/WinVNC/WinVNC/winvnc.cpp
  Diff comments   View file @2606d12
... ... @@ -47,6 +47,8 @@
47 47 #include "vncOSVersion.h"
48 48 #include "videodriver.h"
49 49  
  50 +#include "CACIC_Crypt.h"
  51 +
50 52 FILE *pFile;
51 53 MMRESULT mmCRes;
52 54 // Allocating and initializing GlobalClass's
... ... @@ -195,8 +197,8 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, PSTR szCmdLine,
195 197 strcat(WORKDIR,"srCACIC.log");
196 198  
197 199 vnclog.SetFile(WORKDIR, true);
198   - vnclog.SetMode(VNCLog::ToScript);
199   - vnclog.SetLevel(LL_SRLOG);
  200 + vnclog.SetMode(VNCLog::ToFile);
  201 + vnclog.SetLevel(LL_ALL);
200 202  
201 203 #ifdef _DEBUG
202 204 {
... ... @@ -296,7 +298,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, PSTR szCmdLine,
296 298 CACIC_Auth::getInstance()->setTimeout(timeout);
297 299  
298 300 if (CACIC_Auth::getInstance()->autentica()) {
299   - iniciaTimer();
  301 + iniciaTimer(); // inicia o timer de atualização da sessão
300 302 if (!Myinit(hInstance)) return 0;
301 303 return WinVNCAppMain();
302 304 }
... ...
srcacic/WinVNC/WinVNC/winvnc.rc
  Diff comments   View file @2606d12
... ... @@ -117,15 +117,16 @@ FONT 8, &quot;MS Shell Dlg&quot;, 400, 0, 0x0
117 117 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   - LTEXT "Nome:",IDC_STATIC,54,22,24,8
121   - LTEXT "IP:",IDC_STATIC,54,32,10,8
122   - LTEXT "Início:",IDC_STATIC,54,42,20,8
  120 + LTEXT "Nome:",IDC_NOME_LBL,54,22,24,8
  121 + LTEXT "IP:",IDC_IP_LBL,54,32,10,8
  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
125 125 LTEXT "",IDC_INFO_INICIO,78,41,181,8,0,WS_EX_TRANSPARENT
126   - LTEXT "Doc. Referência:",IDC_STATIC_INFO_REF,54,51,57,8
  126 + LTEXT "Doc. Referência:",IDC_DOC_LBL,54,51,57,8
127 127 LTEXT "",IDC_INFO_REFERENCIA,111,51,148,8
128 128 CONTROL 163,IDC_SRCACIC_IMG,"Static",SS_BITMAP,0,0,54,62
  129 + CTEXT "ATENÇÃO: O sistema efetuará logout em 20 segundos!",IDC_AVISO_LOGOUT,54,2,205,58,NOT WS_VISIBLE,WS_EX_TRANSPARENT
129 130 END
130 131  
131 132  
... ... @@ -222,8 +223,8 @@ END
222 223 //
223 224  
224 225 VS_VERSION_INFO VERSIONINFO
225   - FILEVERSION 2,5,0,804
226   - PRODUCTVERSION 2,5,0,804
  226 + FILEVERSION 2,5,9,0
  227 + PRODUCTVERSION 2,6,0,0
227 228 FILEFLAGSMASK 0x37L
228 229 #ifdef _DEBUG
229 230 FILEFLAGS 0x25L
... ... @@ -236,20 +237,21 @@ VS_VERSION_INFO VERSIONINFO
236 237 BEGIN
237 238 BLOCK "StringFileInfo"
238 239 BEGIN
239   - BLOCK "000004b0"
  240 + BLOCK "080004b0"
240 241 BEGIN
241   - VALUE "CompanyName", "Dataprev - Unidade Regional Espírito Santo"
242   - VALUE "FileDescription", "Módulo Suporte Remoto Seguro do Sistema CACIC"
243   - VALUE "FileVersion", "2, 5, 0, 804"
  242 + VALUE "Comments", "Licença: GNU/LGPL"
  243 + VALUE "CompanyName", "Dataprev-Emp. de TI da Prev Social - UDSL/SSLC"
  244 + VALUE "FileDescription", "Sistema CACIC - Módulo Suporte Remoto Seguro"
  245 + VALUE "FileVersion", "2.5.9.0"
244 246 VALUE "InternalName", "srCACICsrv"
245 247 VALUE "LegalCopyright", "Copyright © 2008 DATAPREV"
246   - VALUE "LegalTrademarks", "srCACIC"
247   - VALUE "ProductVersion", "2, 5, 0, 804"
  248 + VALUE "ProductName", "srCACIC"
  249 + VALUE "ProductVersion", "2.6.0.0"
248 250 END
249 251 END
250 252 BLOCK "VarFileInfo"
251 253 BEGIN
252   - VALUE "Translation", 0x0, 1200
  254 + VALUE "Translation", 0x800, 1200
253 255 END
254 256 END
255 257  
... ... @@ -393,7 +395,7 @@ BEGIN
393 395 DEFPUSHBUTTON "OK",ID_POK,55,130,50,13
394 396 PUSHBUTTON "Cancelar",ID_PCANCELAR,117,130,50,13
395 397 COMBOBOX IDC_DOMAIN_CB,84,59,83,30,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
396   - CTEXT "v2.5.0.804",IDC_AUTHDLG_VERSION,187,145,36,8,SS_CENTERIMAGE,WS_EX_STATICEDGE
  398 + CTEXT "v2.6.0.0",IDC_AUTHDLG_VERSION,187,145,36,8,SS_CENTERIMAGE,WS_EX_STATICEDGE
397 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
398 400 EDITTEXT IDC_MSG,3,111,216,17,ES_CENTER | ES_MULTILINE | ES_READONLY | NOT WS_BORDER
399 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
... ... @@ -409,7 +411,7 @@ BEGIN
409 411 EDITTEXT IDC_USER_EDIT,69,58,83,12,ES_AUTOHSCROLL
410 412 DEFPUSHBUTTON "OK",ID_POK,45,76,45,13
411 413 PUSHBUTTON "Cancelar",ID_PCANCELAR,102,76,45,13
412   - CTEXT "v2.5.0.804",IDC_AUTHDLG_VERSION,159,90,36,8,SS_CENTERIMAGE,WS_EX_STATICEDGE
  414 + CTEXT "v2.6.0.0",IDC_AUTHDLG_VERSION,159,90,36,8,SS_CENTERIMAGE,WS_EX_STATICEDGE
413 415 CTEXT "Por favor, digite seu nome no campo abaixo.",IDC_AUTH_INFO,3,46,188,10
414 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
415 417 END
... ...