Download as
Browse Code »

Commit fd7c18236b80e540cc1c1957223cac8fdff742f9

Authored by Eric Menezes Noronha
1 parent c9d7fbbb
Exists in master

Correção de bug ao coletar registro em máquinas de 64 bits.

Showing 7 changed files with 62 additions and 144 deletions   Show diff stats
Mapa/Mapa.dfm
  Diff comments   View file @fd7c182
... ... @@ -162,7 +162,7 @@ object frmMapaCacic: TfrmMapaCacic
162 162 780
163 163 374)
164 164 object lbEtiqueta2: TLabel
165   - Left = 277
  165 + Left = 420
166 166 Top = 33
167 167 Width = 250
168 168 Height = 13
... ... @@ -180,8 +180,8 @@ object frmMapaCacic: TfrmMapaCacic
180 180 Visible = False
181 181 end
182 182 object lbEtiqueta3: TLabel
183   - Left = 511
184   - Top = 33
  183 + Left = 420
  184 + Top = 82
185 185 Width = 250
186 186 Height = 13
187 187 Hint = 'Insira o n'#250'mero do patrim'#244'nio do segundo monitor, se o tiver.'
... ... @@ -199,7 +199,7 @@ object frmMapaCacic: TfrmMapaCacic
199 199 end
200 200 object lbEtiqueta4: TLabel
201 201 Left = 43
202   - Top = 80
  202 + Top = 82
203 203 Width = 250
204 204 Height = 13
205 205 Hint = 'Este '#233' o usu'#225'rio logado atualmente'
... ... @@ -268,8 +268,8 @@ object frmMapaCacic: TfrmMapaCacic
268 268 Visible = False
269 269 end
270 270 object lbEtiqueta5: TLabel
271   - Left = 420
272   - Top = 82
  271 + Left = 43
  272 + Top = 133
273 273 Width = 250
274 274 Height = 13
275 275 Hint = 'Nome do usu'#225'rio logado.'
... ... @@ -284,7 +284,7 @@ object frmMapaCacic: TfrmMapaCacic
284 284 Visible = False
285 285 end
286 286 object lbEtiqueta7: TLabel
287   - Left = 420
  287 + Left = 661
288 288 Top = 129
289 289 Width = 69
290 290 Height = 13
... ... @@ -302,7 +302,7 @@ object frmMapaCacic: TfrmMapaCacic
302 302 Visible = False
303 303 end
304 304 object lbEtiqueta6: TLabel
305   - Left = 43
  305 + Left = 420
306 306 Top = 129
307 307 Width = 175
308 308 Height = 13
... ... @@ -321,42 +321,6 @@ object frmMapaCacic: TfrmMapaCacic
321 321 ShowHint = True
322 322 Visible = False
323 323 end
324   - object lbEtiquetaTel: TLabel
325   - Left = 514
326   - Top = 129
327   - Width = 69
328   - Height = 13
329   - Hint = 'Digite o telefone do seu local de trabalho.'
330   - AutoSize = False
331   - Caption = 'Telefone'
332   - Font.Charset = DEFAULT_CHARSET
333   - Font.Color = clWindowText
334   - Font.Height = -11
335   - Font.Name = 'MS Sans Serif'
336   - Font.Style = []
337   - ParentFont = False
338   - ParentShowHint = False
339   - ShowHint = True
340   - Visible = False
341   - end
342   - object lbEtiqueta8: TLabel
343   - Left = 632
344   - Top = 129
345   - Width = 69
346   - Height = 13
347   - Hint = 'Digite o ramal do seu local de trabalho.'
348   - AutoSize = False
349   - Caption = 'Ramal'
350   - Font.Charset = DEFAULT_CHARSET
351   - Font.Color = clWindowText
352   - Font.Height = -11
353   - Font.Name = 'MS Sans Serif'
354   - Font.Style = []
355   - ParentFont = False
356   - ParentShowHint = False
357   - ShowHint = True
358   - Visible = False
359   - end
360 324 object edTeInfoPatrimonio4: TEdit
361 325 Left = 43
362 326 Top = 99
... ... @@ -376,9 +340,9 @@ object frmMapaCacic: TfrmMapaCacic
376 340 Visible = False
377 341 end
378 342 object edTeInfoPatrimonio3: TEdit
379   - Left = 509
380   - Top = 52
381   - Width = 221
  343 + Left = 420
  344 + Top = 99
  345 + Width = 312
382 346 Height = 24
383 347 Font.Charset = DEFAULT_CHARSET
384 348 Font.Color = clWindowText
... ... @@ -399,13 +363,13 @@ object frmMapaCacic: TfrmMapaCacic
399 363 Height = 20
400 364 Caption = 'Recarregar'
401 365 Enabled = False
402   - TabOrder = 13
  366 + TabOrder = 11
403 367 OnClick = btCombosUpdateClick
404 368 end
405 369 object edTeInfoPatrimonio2: TEdit
406   - Left = 277
  370 + Left = 420
407 371 Top = 52
408   - Width = 221
  372 + Width = 312
409 373 Height = 24
410 374 Font.Charset = DEFAULT_CHARSET
411 375 Font.Color = clWindowText
... ... @@ -419,23 +383,6 @@ object frmMapaCacic: TfrmMapaCacic
419 383 TabOrder = 1
420 384 Visible = False
421 385 end
422   - object edTeInfoPatrimonio8: TEdit
423   - Left = 632
424   - Top = 148
425   - Width = 98
426   - Height = 24
427   - Font.Charset = DEFAULT_CHARSET
428   - Font.Color = clWindowText
429   - Font.Height = -13
430   - Font.Name = 'MS Sans Serif'
431   - Font.Style = []
432   - MaxLength = 10
433   - ParentFont = False
434   - ParentShowHint = False
435   - ShowHint = True
436   - TabOrder = 8
437   - Visible = False
438   - end
439 386 object edTeInfoPatrimonio9: TEdit
440 387 Left = 43
441 388 Top = 201
... ... @@ -451,13 +398,13 @@ object frmMapaCacic: TfrmMapaCacic
451 398 ParentFont = False
452 399 ParentShowHint = False
453 400 ShowHint = True
454   - TabOrder = 9
  401 + TabOrder = 7
455 402 Visible = False
456 403 end
457 404 object edTeInfoPatrimonio1: TEdit
458 405 Left = 43
459 406 Top = 52
460   - Width = 221
  407 + Width = 310
461 408 Height = 24
462 409 Font.Charset = DEFAULT_CHARSET
463 410 Font.Color = clWindowText
... ... @@ -472,8 +419,8 @@ object frmMapaCacic: TfrmMapaCacic
472 419 Visible = False
473 420 end
474 421 object edTeInfoPatrimonio5: TEdit
475   - Left = 420
476   - Top = 99
  422 + Left = 43
  423 + Top = 152
477 424 Width = 310
478 425 Height = 24
479 426 Enabled = False
... ... @@ -495,7 +442,7 @@ object frmMapaCacic: TfrmMapaCacic
495 442 Width = 774
496 443 Height = 83
497 444 Caption = 'Termo de Responsabilidade'
498   - TabOrder = 11
  445 + TabOrder = 9
499 446 object rdConcordaTermos: TRadioButton
500 447 Left = 3
501 448 Top = 23
... ... @@ -527,14 +474,14 @@ object frmMapaCacic: TfrmMapaCacic
527 474 Font.Name = 'Arial'
528 475 Font.Style = [fsBold]
529 476 ParentFont = False
530   - TabOrder = 12
  477 + TabOrder = 10
531 478 Visible = False
532 479 OnClick = AtualizaPatrimonio
533 480 end
534 481 object edTeInfoPatrimonio6: TEdit
535   - Left = 43
536   - Top = 148
537   - Width = 310
  482 + Left = 420
  483 + Top = 152
  484 + Width = 229
538 485 Height = 24
539 486 Font.Charset = DEFAULT_CHARSET
540 487 Font.Color = clWindowText
... ... @@ -549,8 +496,8 @@ object frmMapaCacic: TfrmMapaCacic
549 496 Visible = False
550 497 end
551 498 object edTeInfoPatrimonio7: TEdit
552   - Left = 420
553   - Top = 148
  499 + Left = 663
  500 + Top = 152
554 501 Width = 67
555 502 Height = 24
556 503 Font.Charset = DEFAULT_CHARSET
... ... @@ -580,23 +527,7 @@ object frmMapaCacic: TfrmMapaCacic
580 527 ParentFont = False
581 528 ParentShowHint = False
582 529 ShowHint = True
583   - TabOrder = 10
584   - Visible = False
585   - end
586   - object edTeInfoPatrimonioTel: TMaskEdit
587   - Left = 514
588   - Top = 148
589   - Width = 89
590   - Height = 24
591   - EditMask = '!\(999\)99999-9999;0;_'
592   - Font.Charset = DEFAULT_CHARSET
593   - Font.Color = clBlack
594   - Font.Height = -11
595   - Font.Name = 'MS Sans Serif'
596   - Font.Style = []
597   - MaxLength = 15
598   - ParentFont = False
599   - TabOrder = 7
  530 + TabOrder = 8
600 531 Visible = False
601 532 end
602 533 end
... ... @@ -644,13 +575,13 @@ object frmMapaCacic: TfrmMapaCacic
644 575 Width = 40
645 576 Height = 20
646 577 BevelWidth = 2
647   - Caption = 'X'
  578 + Caption = 'Close'
648 579 Color = clRed
649 580 Enabled = False
650   - Font.Charset = DEFAULT_CHARSET
  581 + Font.Charset = ANSI_CHARSET
651 582 Font.Color = clInfoBk
652   - Font.Height = 20
653   - Font.Name = 'Arial Black'
  583 + Font.Height = -13
  584 + Font.Name = 'Tahoma'
654 585 Font.Style = []
655 586 ParentBackground = False
656 587 ParentFont = False
... ...
Mapa/Mapa.pas
  Diff comments   View file @fd7c182
... ... @@ -85,7 +85,6 @@ type
85 85 edTeInfoPatrimonio3: TEdit;
86 86 btCombosUpdate: TButton;
87 87 edTeInfoPatrimonio2: TEdit;
88   - edTeInfoPatrimonio8: TEdit;
89 88 edTeInfoPatrimonio9: TEdit;
90 89 edTeInfoPatrimonio1: TEdit;
91 90 edTeInfoPatrimonio5: TEdit;
... ... @@ -97,9 +96,6 @@ type
97 96 lbEtiqueta6: TLabel;
98 97 edTeInfoPatrimonio7: TEdit;
99 98 btKonamiCode: TPanel;
100   - edTeInfoPatrimonioTel: TMaskEdit;
101   - lbEtiquetaTel: TLabel;
102   - lbEtiqueta8: TLabel;
103 99 edTeInfoPatrimonio10: TEdit;
104 100  
105 101 procedure FormCreate(Sender: TObject);
... ... @@ -170,7 +166,7 @@ End;
170 166 procedure TfrmMapaCacic.Finalizar;
171 167 Begin
172 168 Visible := false;
173   -
  169 +
174 170 if FileExists(objCACIC.getLocalFolderName + '\temp\aguarde_MAPACACIC.txt') then
175 171 objCACIC.deleteFileOrFolder(objCacic.getLocalFolderName +
176 172 '\temp\aguarde_MAPACACIC.txt');
... ... @@ -401,8 +397,6 @@ if edTeInfoPatrimonio5.text <> '' then
401 397 '[UserName]' + edTeInfoPatrimonio5.Text + '[/UserName]' +
402 398 '[Coordenacao_Setor]' + edTeInfoPatrimonio6.Text + '[/Coordenacao_Setor]' +
403 399 '[Sala]' + edTeInfoPatrimonio7.Text + '[/Sala]' +
404   - '[Tel]' + edTeInfoPatrimonioTel.text + '[/Tel]' +
405   - '[Ramal]' + edTeInfoPatrimonio8.text + '[/Ramal]' +
406 400 '[ComputerName]' + edTeInfoPatrimonio9.text + '[/ComputerName]' +
407 401 '[IPComputer]' + edTeInfoPatrimonio10.text + '[/IPComputer]'
408 402 , ',','[[COMMA]]',[rfReplaceAll]);
... ... @@ -553,19 +547,6 @@ Begin
553 547 edTeInfoPatrimonio7.visible := True;
554 548 // end;
555 549  
556   - lbEtiquetaTel.Visible := true;
557   - edTeInfoPatrimonioTel.Hint := objCacic.getValueFromTags('te_help_etiqueta_tel', strConfigsPatrimonioInterface);
558   - edTeInfoPatrimonioTel.Text := strTeInfoPatrimonioTel;
559   - edTeInfoPatrimonioTel.visible := True;
560   -
561   - edTeInfoPatrimonio8.Text := strTeInfoPatrimonio8;
562   - if edTeInfoPatrimonio8.Text <> '' then
563   - begin
564   - lbEtiqueta8.Visible := true;
565   - edTeInfoPatrimonio8.Visible := true;
566   - end;
567   - lbEtiqueta8.Visible := true;
568   - edTeInfoPatrimonio8.Visible := true;
569 550 //-----------------------NOME DO COMPUTADOR PARA O EDTEXT-----------------------
570 551 edTeInfoPatrimonio9.Text := NomeComputador;
571 552 if edTeInfoPatrimonio9.Text <> '' then
... ... @@ -729,8 +710,14 @@ begin
729 710 objCacic.writeDailyLog('SEM PRIVILÉGIOS: Necessário ser administrador "local" ou de Domínio!');
730 711 Finalizar;
731 712 End;
732   - Finally
733   - End;
  713 + Except
  714 + on E:Exception do
  715 + Begin
  716 + objCacic.writeExceptionLog(E.Message,e.ClassName + 'Erro ao criar formulario.');
  717 + objCACIC.writeDailyLog('Erro ao criar formulario.');
  718 + Finalizar;
  719 + End; //on E:Exception do
  720 + end;
734 721 end;
735 722  
736 723  
... ... @@ -957,8 +944,6 @@ begin
957 944 ldap.Timeout := 5000;
958 945 if ldap.Login and ldap.Bind then //Loga no LDAP e autentica no LDAP com Usuário e senha repassado. (BindSasl é mais seguro que Bind)
959 946 begin
960   - // 41680200020
961   -
962 947 ldap.Search(base, False, identificador+ '=' + strTeInfoPatrimonio2, retorno); //Faz a pesquisa, com o CPF repassado.
963 948 result := LDAPResultdump(ldap.SearchResult);
964 949 objCACIC.writeDailyLog('Nome Usuário: Conexão estabelecida, pesquisa realizada.');
... ... @@ -971,8 +956,6 @@ begin
971 956 Except
972 957 on E:Exception do
973 958 Begin
974   - MessageDlg(#13#13+'Problemas para pegar nome do usuário.'+#13#13+
975   - 'Por favor, digite seu nome no campo solicitado',mtError, [mbOK], 0);
976 959 objCacic.writeExceptionLog(E.Message,e.ClassName);
977 960 objCACIC.writeDailyLog('Nome Usuário: Falha ao tentar recuperar o nome.');
978 961 End; //on E:Exception do
... ...
gercols/gercols.dpr
  Diff comments   View file @fd7c182
... ... @@ -677,8 +677,8 @@ var
677 677 SubRegistry: TRegistry;
678 678 saida: String;
679 679 begin
680   - Registry := TRegistry.Create;
681   - SubRegistry := TRegistry.Create;
  680 + Registry := TRegistry.Create(KEY_WOW64_64KEY);
  681 + SubRegistry := TRegistry.Create(KEY_WOW64_64KEY);
682 682 Registry.RootKey := HKEY_LOCAL_MACHINE;
683 683 if Registry.OpenKeyReadOnly(Key) then begin
684 684 Try
... ... @@ -736,16 +736,22 @@ end;
736 736 Function SoftwareList: String;
737 737 var
738 738 strChave: String;
  739 + strChave6432: String;
739 740 outString: String;
  741 + outString6432: String;
740 742 begin
741 743 // Esse registro é onde vamos buscar a chave do SO
742   - strChave := '\Software\Microsoft\Windows\CurrentVersion\Uninstall';
743   -
  744 + strChave := '\Software\Microsoft\Windows\CurrentVersion\Uninstall';
  745 + strChave6432 := '\Software\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall';
744 746 // Passo aqui o registro e a profundidade dos campos que quero ver
  747 + outString6432 := DisplayKeys(strChave6432, 3);
745 748 outString := DisplayKeys(strChave, 3);
746 749 // objCacic.setValueToFile('collects', 'colsoft_puro', outString, 'c:\Cacic\colsoft.inf');
747 750 // Retorno uma string com todas as tags coletadas do registro
748   - Result := outString;
  751 + if ((outString <> outString6432) and (outString6432 <> '')) then
  752 + Result := outString + outString6432
  753 + else
  754 + result := outString;
749 755 end;
750 756  
751 757 // Procedimento que executa a coleta de hardware
... ...
gercols/gercols.dproj
  Diff comments   View file @fd7c182
... ... @@ -38,7 +38,7 @@
38 38 <Borland.Personality>Delphi.Personality</Borland.Personality>
39 39 <Borland.ProjectType>VCLApplication</Borland.ProjectType>
40 40 <BorlandProject>
41   -<BorlandProject><Delphi.Personality><Parameters><Parameters Name="DebugSourceDirs">C:\vendors_lib\JVCL345CompleteJCL231-Build4197\jcl\lib\d7\debug</Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">8</VersionInfo><VersionInfo Name="Release">1</VersionInfo><VersionInfo Name="Build">7</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">1046</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Dataprev-Emp. de TI da Prev Social - URES/SESS</VersionInfoKeys><VersionInfoKeys Name="FileDescription">Sistema CACIC - Módulo Gerente de Coletas</VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.8.1.7</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">Ger_COLS</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">3.0</VersionInfoKeys><VersionInfoKeys Name="Comments">Licença: GNU/LGPL</VersionInfoKeys></VersionInfoKeys><Source><Source Name="MainSource">gercols.dpr</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
  41 +<BorlandProject><Delphi.Personality><Parameters><Parameters Name="DebugSourceDirs">C:\vendors_lib\JVCL345CompleteJCL231-Build4197\jcl\lib\d7\debug</Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">8</VersionInfo><VersionInfo Name="Release">1</VersionInfo><VersionInfo Name="Build">8</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">1046</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Dataprev-Emp. de TI da Prev Social - URES/SESS</VersionInfoKeys><VersionInfoKeys Name="FileDescription">Sistema CACIC - Módulo Gerente de Coletas</VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.8.1.8</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">Ger_COLS</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">3.0</VersionInfoKeys><VersionInfoKeys Name="Comments">Licença: GNU/LGPL</VersionInfoKeys></VersionInfoKeys><Source><Source Name="MainSource">gercols.dpr</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
42 42 </ProjectExtensions>
43 43 <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
44 44 <ItemGroup>
... ...
gercols/gercols.res
View file @fd7c182
No preview for this file type
main.dfm
  Diff comments   View file @fd7c182
... ... @@ -1376,13 +1376,6 @@ object FormularioGeral: TFormularioGeral
1376 1376 Spacing = 1
1377 1377 end
1378 1378 end
1379   - object timerNuIntervalo: TTimer
1380   - Enabled = False
1381   - Interval = 5000
1382   - OnTimer = timerNuIntervaloTimer
1383   - Left = 226
1384   - Top = 570
1385   - end
1386 1379 object timerNuExecApos: TTimer
1387 1380 Enabled = False
1388 1381 Interval = 1
... ... @@ -1755,7 +1748,7 @@ object FormularioGeral: TFormularioGeral
1755 1748 000000000000}
1756 1749 end
1757 1750 object timerCheckNoMinuto: TTimer
1758   - Interval = 60000
  1751 + Interval = 600000
1759 1752 OnTimer = timerCheckNoMinutoTimer
1760 1753 Left = 36
1761 1754 Top = 566
... ... @@ -1776,4 +1769,10 @@ object FormularioGeral: TFormularioGeral
1776 1769 Left = 392
1777 1770 Top = 568
1778 1771 end
  1772 + object timerNuIntervalo: TTimer
  1773 + Enabled = False
  1774 + Interval = 1
  1775 + Left = 232
  1776 + Top = 568
  1777 + end
1779 1778 end
... ...
main.pas
  Diff comments   View file @fd7c182
1   -(**
  1 +(**
2 2 ---------------------------------------------------------------------------------------------------------------------------------------------------------------
3 3 Copyright 2000, 2001, 2002, 2003, 2004, 2005 Dataprev - Empresa de Tecnologia e Informa��es da Previd�ncia Social, Brasil
4 4  
... ... @@ -114,7 +114,6 @@ type
114 114 Pn_Linha4_TCPIP: TPanel;
115 115 Pn_Linha6_TCPIP: TPanel;
116 116 Pn_Linha5_TCPIP: TPanel;
117   - timerNuIntervalo: TTimer;
118 117 timerNuExecApos: TTimer;
119 118 Popup_Menu_Contexto: TPopupMenu;
120 119 Mnu_LogAtividades: TMenuItem;
... ... @@ -173,6 +172,7 @@ type
173 172 cn: TSHChangeNotify;
174 173 imgIconList: TImageList;
175 174 timerCheckNoMinuto: TTimer;
  175 + timerNuIntervalo: TTimer;
176 176 TrayIcon1: TTrayIcon;
177 177 ApplicationEvents1: TApplicationEvents;
178 178 Panel1: TPanel;
... ... @@ -1350,7 +1350,6 @@ begin
1350 1350 End
1351 1351 else
1352 1352 objCACIC.writeDailyLog('Não foi possível invocar o Mapa Cacic!');
1353   - End;
1354 1353 End;
1355 1354 End;
1356 1355 end;
... ... @@ -2656,7 +2655,7 @@ begin
2656 2655 ARect.Left := LEFT_MENU_ITEM;
2657 2656 ACanvas.FillRect(ARect);
2658 2657  
2659   - DrawText(ACanvas.Handle, PChar('Configura��es'), -1, ARect, DT_LEFT or DT_VCENTER or DT_SINGLELINE{ or DT_NOCLIP});
  2658 + DrawText(ACanvas.Handle, PChar('Configuracoes'), -1, ARect, DT_LEFT or DT_VCENTER or DT_SINGLELINE{ or DT_NOCLIP});
2660 2659 end;
2661 2660  
2662 2661 procedure TFormularioGeral.Mnu_ExecutarAgoraDrawItem(Sender: TObject;
... ... @@ -2684,7 +2683,7 @@ begin
2684 2683 ARect.Left := LEFT_MENU_ITEM;
2685 2684 ACanvas.FillRect(ARect);
2686 2685  
2687   - DrawText(ACanvas.Handle, PChar('Informa��es Gerais'), -1, ARect, DT_LEFT or DT_VCENTER or DT_SINGLELINE{ or DT_NOCLIP});
  2686 + DrawText(ACanvas.Handle, PChar('Informacoes Gerais'), -1, ARect, DT_LEFT or DT_VCENTER or DT_SINGLELINE{ or DT_NOCLIP});
2688 2687 end;
2689 2688  
2690 2689 procedure TFormularioGeral.Mnu_SuporteRemotoDrawItem(Sender: TObject;
... ...