Commit a258d78f884b59964e4e195f3822bdf27fe53f21
1 parent
561a3849
Exists in
master
Atualização das Bibliotecas Comm, Library e WMI.
git-svn-id: http://svn.softwarepublico.gov.br/svn/cacic/cacic/trunk/agente-windows@1597 fecfc0c7-e812-0410-ae72-849f08638ee7
Showing
4 changed files
with
16 additions
and
14 deletions
Show diff stats
CACIC_Comm.pas
| @@ -52,8 +52,8 @@ Begin | @@ -52,8 +52,8 @@ Begin | ||
| 52 | 52 | ||
| 53 | strWin32_ComputerSystem := fetchWmiValues('Win32_ComputerSystem' ,objCacicCOMM.getLocalFolderName); | 53 | strWin32_ComputerSystem := fetchWmiValues('Win32_ComputerSystem' ,objCacicCOMM.getLocalFolderName); |
| 54 | strWin32_NetworkAdapterConfiguration := fetchWmiValues('Win32_NetworkAdapterConfiguration',objCacicCOMM.getLocalFolderName); | 54 | strWin32_NetworkAdapterConfiguration := fetchWmiValues('Win32_NetworkAdapterConfiguration',objCacicCOMM.getLocalFolderName); |
| 55 | - strWin32_OperatingSystem := fetchWmiValues('Win32_OperatingSystem' ,objCacicCOMM.getLocalFolderName); | ||
| 56 | - strWin32_SoftwareFeature := fetchWmiValues('Win32_SoftwareFeature' ,objCacicCOMM.getLocalFolderName); | 55 | + //strWin32_OperatingSystem := fetchWmiValues('Win32_OperatingSystem' ,objCacicCOMM.getLocalFolderName); |
| 56 | + //strWin32_SoftwareFeature := fetchWmiValues('Win32_SoftwareFeature' ,objCacicCOMM.getLocalFolderName); | ||
| 57 | 57 | ||
| 58 | objCacicCOMM.writeDebugLog('Comm: Povoando lista com valores padrão para cabeçalho de comunicação'); | 58 | objCacicCOMM.writeDebugLog('Comm: Povoando lista com valores padrão para cabeçalho de comunicação'); |
| 59 | objCacicCOMM.writeDebugLog('Comm: pStrActionMessage: "' + pStrActionMessage + '"'); | 59 | objCacicCOMM.writeDebugLog('Comm: pStrActionMessage: "' + pStrActionMessage + '"'); |
| @@ -68,8 +68,8 @@ Begin | @@ -68,8 +68,8 @@ Begin | ||
| 68 | Values['ModuleFolderName' ] := objCacicCOMM.replaceInvalidHTTPChars(objCacicCOMM.enCrypt(ExtractFilePath(ParamStr(0)) )); | 68 | Values['ModuleFolderName' ] := objCacicCOMM.replaceInvalidHTTPChars(objCacicCOMM.enCrypt(ExtractFilePath(ParamStr(0)) )); |
| 69 | Values['ModuleProgramName' ] := objCacicCOMM.replaceInvalidHTTPChars(objCacicCOMM.enCrypt(ExtractFileName(ParamStr(0)) )); | 69 | Values['ModuleProgramName' ] := objCacicCOMM.replaceInvalidHTTPChars(objCacicCOMM.enCrypt(ExtractFileName(ParamStr(0)) )); |
| 70 | Values['NetworkAdapterConfiguration'] := objCacicCOMM.replaceInvalidHTTPChars(objCacicCOMM.enCrypt(strWin32_NetworkAdapterConfiguration )); | 70 | Values['NetworkAdapterConfiguration'] := objCacicCOMM.replaceInvalidHTTPChars(objCacicCOMM.enCrypt(strWin32_NetworkAdapterConfiguration )); |
| 71 | - Values['OperatingSystem' ] := objCacicCOMM.replaceInvalidHTTPChars(objCacicCOMM.enCrypt(strWin32_OperatingSystem )); | ||
| 72 | - Values['SoftwareFeature' ] := objCacicCOMM.replaceInvalidHTTPChars(objCacicCOMM.enCrypt(strWin32_SoftwareFeature )); | 71 | + //Values['OperatingSystem' ] := objCacicCOMM.replaceInvalidHTTPChars(objCacicCOMM.enCrypt(strWin32_OperatingSystem )); |
| 72 | + //Values['SoftwareFeature' ] := objCacicCOMM.replaceInvalidHTTPChars(objCacicCOMM.enCrypt(strWin32_SoftwareFeature )); | ||
| 73 | Values['PHP_AUTH_PW' ] := objCacicCOMM.replaceInvalidHTTPChars(objCacicCOMM.enCrypt('PW_CACIC',true,true )); | 73 | Values['PHP_AUTH_PW' ] := objCacicCOMM.replaceInvalidHTTPChars(objCacicCOMM.enCrypt('PW_CACIC',true,true )); |
| 74 | Values['PHP_AUTH_USER' ] := objCacicCOMM.replaceInvalidHTTPChars(objCacicCOMM.enCrypt('USER_CACIC',true,true )); | 74 | Values['PHP_AUTH_USER' ] := objCacicCOMM.replaceInvalidHTTPChars(objCacicCOMM.enCrypt('USER_CACIC',true,true )); |
| 75 | Values['te_so' ] := objCacicCOMM.replaceInvalidHTTPChars(objCacicCOMM.getWindowsStrId() ); | 75 | Values['te_so' ] := objCacicCOMM.replaceInvalidHTTPChars(objCacicCOMM.getWindowsStrId() ); |
CACIC_Library.pas
| @@ -257,6 +257,7 @@ end; | @@ -257,6 +257,7 @@ end; | ||
| 257 | destructor TCACIC.Destroy(); | 257 | destructor TCACIC.Destroy(); |
| 258 | begin | 258 | begin |
| 259 | Try | 259 | Try |
| 260 | + P_OSVersionInfo:=nil; | ||
| 260 | FreeMemory(P_OSVersionInfo); | 261 | FreeMemory(P_OSVersionInfo); |
| 261 | Except | 262 | Except |
| 262 | End; | 263 | End; |
| @@ -684,6 +685,7 @@ begin | @@ -684,6 +685,7 @@ begin | ||
| 684 | pStrSource := pStrSource + copy(pStrTags,1,1) + pStrTagLabel + copy(pStrTags,2,1) + pStrTagValue + copy(pStrTags,1,1) + '/' + pStrTagLabel + copy(pStrTags,2,1); | 685 | pStrSource := pStrSource + copy(pStrTags,1,1) + pStrTagLabel + copy(pStrTags,2,1) + pStrTagValue + copy(pStrTags,1,1) + '/' + pStrTagLabel + copy(pStrTags,2,1); |
| 685 | End; | 686 | End; |
| 686 | 687 | ||
| 688 | + | ||
| 687 | function TCACIC.getValueFromFile(pStrSectionName, pStrKeyName, pStrFileName : String; pBoolShowInDebug : boolean = true): String; | 689 | function TCACIC.getValueFromFile(pStrSectionName, pStrKeyName, pStrFileName : String; pBoolShowInDebug : boolean = true): String; |
| 688 | //Para buscar do Arquivo INF... | 690 | //Para buscar do Arquivo INF... |
| 689 | // Marreta devido a limitações do KERNEL w9x no tratamento de arquivos texto e suas seções | 691 | // Marreta devido a limitações do KERNEL w9x no tratamento de arquivos texto e suas seções |
CACIC_WMI.pas
| @@ -155,7 +155,7 @@ Begin | @@ -155,7 +155,7 @@ Begin | ||
| 155 | else if (pStrWin32ClassName = 'Win32_NetworkAdapterConfiguration') and (pStrColumnsNames = '') then | 155 | else if (pStrWin32ClassName = 'Win32_NetworkAdapterConfiguration') and (pStrColumnsNames = '') then |
| 156 | Begin | 156 | Begin |
| 157 | strColumnsNames := 'DefaultIPGateway,Description,DHCPServer,DNSDomain,DNSHostName,DNSServerSearchOrder,IPAddress,IPSubnet,MACAddress,WINSPrimaryServer,WINSSecondaryServer'; | 157 | strColumnsNames := 'DefaultIPGateway,Description,DHCPServer,DNSDomain,DNSHostName,DNSServerSearchOrder,IPAddress,IPSubnet,MACAddress,WINSPrimaryServer,WINSSecondaryServer'; |
| 158 | - strWhereClause := 'DHCPEnabled=TRUE and IPEnabled=TRUE'; | 158 | + strWhereClause := 'IPEnabled=TRUE or DHCPEnabled=TRUE'; |
| 159 | End | 159 | End |
| 160 | else if (pStrWin32ClassName = 'Win32_OperatingSystem') and (pStrColumnsNames = '') then | 160 | else if (pStrWin32ClassName = 'Win32_OperatingSystem') and (pStrColumnsNames = '') then |
| 161 | strColumnsNames := 'Caption,CSDVersion,InstallDate,LastBootUpTime,NumberOfLicensedUsers,OSArchitecture,OSLanguage,ProductType,SerialNumber,Version' | 161 | strColumnsNames := 'Caption,CSDVersion,InstallDate,LastBootUpTime,NumberOfLicensedUsers,OSArchitecture,OSLanguage,ProductType,SerialNumber,Version' |
Grupo_CACIC.groupproj
| @@ -82,22 +82,22 @@ | @@ -82,22 +82,22 @@ | ||
| 82 | <Target Name="TesteSoftware:Make"> | 82 | <Target Name="TesteSoftware:Make"> |
| 83 | <MSBuild Projects="C:\Documents and Settings\adriano\Meus documentos\RAD Studio\Projects\TesteSoftware.dproj" Targets="Make" /> | 83 | <MSBuild Projects="C:\Documents and Settings\adriano\Meus documentos\RAD Studio\Projects\TesteSoftware.dproj" Targets="Make" /> |
| 84 | </Target> | 84 | </Target> |
| 85 | - <Target Name="MapaCACICteste"> | ||
| 86 | - <MSBuild Projects="MapaTesteProj\MapaCACICteste.dproj" Targets="" /> | 85 | + <Target Name="MapaCACICpgfn"> |
| 86 | + <MSBuild Projects="MapaTesteProj\MapaCACICpgfn.dproj" Targets="" /> | ||
| 87 | </Target> | 87 | </Target> |
| 88 | - <Target Name="MapaCACICteste:Clean"> | ||
| 89 | - <MSBuild Projects="MapaTesteProj\MapaCACICteste.dproj" Targets="Clean" /> | 88 | + <Target Name="MapaCACICpgfn:Clean"> |
| 89 | + <MSBuild Projects="MapaTesteProj\MapaCACICpgfn.dproj" Targets="Clean" /> | ||
| 90 | </Target> | 90 | </Target> |
| 91 | - <Target Name="MapaCACICteste:Make"> | ||
| 92 | - <MSBuild Projects="MapaTesteProj\MapaCACICteste.dproj" Targets="Make" /> | 91 | + <Target Name="MapaCACICpgfn:Make"> |
| 92 | + <MSBuild Projects="MapaTesteProj\MapaCACICpgfn.dproj" Targets="Make" /> | ||
| 93 | </Target> | 93 | </Target> |
| 94 | <Target Name="Build"> | 94 | <Target Name="Build"> |
| 95 | - <CallTarget Targets="chksis;cacicservice;cacic280;gercols;installcacic;MapaCACICl;CacicVersionsAndHashes;TesteSoftware;MapaCACICteste" /> | 95 | + <CallTarget Targets="chksis;cacicservice;cacic280;gercols;installcacic;MapaCACICl;CacicVersionsAndHashes;TesteSoftware;MapaCACICpgfn" /> |
| 96 | </Target> | 96 | </Target> |
| 97 | <Target Name="Clean"> | 97 | <Target Name="Clean"> |
| 98 | - <CallTarget Targets="chksis:Clean;cacicservice:Clean;cacic280:Clean;gercols:Clean;installcacic:Clean;MapaCACICl:Clean;CacicVersionsAndHashes:Clean;TesteSoftware:Clean;MapaCACICteste:Clean" /> | 98 | + <CallTarget Targets="chksis:Clean;cacicservice:Clean;cacic280:Clean;gercols:Clean;installcacic:Clean;MapaCACICl:Clean;CacicVersionsAndHashes:Clean;TesteSoftware:Clean;MapaCACICpgfn:Clean" /> |
| 99 | </Target> | 99 | </Target> |
| 100 | <Target Name="Make"> | 100 | <Target Name="Make"> |
| 101 | - <CallTarget Targets="chksis:Make;cacicservice:Make;cacic280:Make;gercols:Make;installcacic:Make;MapaCACICl:Make;CacicVersionsAndHashes:Make;TesteSoftware:Make;MapaCACICteste:Make" /> | 101 | + <CallTarget Targets="chksis:Make;cacicservice:Make;cacic280:Make;gercols:Make;installcacic:Make;MapaCACICl:Make;CacicVersionsAndHashes:Make;TesteSoftware:Make;MapaCACICpgfn:Make" /> |
| 102 | </Target> | 102 | </Target> |
| 103 | </Project> | 103 | </Project> |
| 104 | \ No newline at end of file | 104 | \ No newline at end of file |