From a258d78f884b59964e4e195f3822bdf27fe53f21 Mon Sep 17 00:00:00 2001
From: ericnoronha <ericnoronha>
Date: Mon, 6 Jan 2014 15:31:10 +0000
Subject: [PATCH] Atualização das Bibliotecas Comm, Library e WMI.

---
 CACIC_Comm.pas        |  8 ++++----
 CACIC_Library.pas     |  2 ++
 CACIC_WMI.pas         |  2 +-
 Grupo_CACIC.groupproj | 18 +++++++++---------
 4 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/CACIC_Comm.pas b/CACIC_Comm.pas
index b69388a..2e45035 100644
--- a/CACIC_Comm.pas
+++ b/CACIC_Comm.pas
@@ -52,8 +52,8 @@ Begin
 
       strWin32_ComputerSystem              := fetchWmiValues('Win32_ComputerSystem'             ,objCacicCOMM.getLocalFolderName);
       strWin32_NetworkAdapterConfiguration := fetchWmiValues('Win32_NetworkAdapterConfiguration',objCacicCOMM.getLocalFolderName);
-      strWin32_OperatingSystem             := fetchWmiValues('Win32_OperatingSystem'            ,objCacicCOMM.getLocalFolderName);
-      strWin32_SoftwareFeature             := fetchWmiValues('Win32_SoftwareFeature'            ,objCacicCOMM.getLocalFolderName);
+      //strWin32_OperatingSystem             := fetchWmiValues('Win32_OperatingSystem'            ,objCacicCOMM.getLocalFolderName);
+      //strWin32_SoftwareFeature             := fetchWmiValues('Win32_SoftwareFeature'            ,objCacicCOMM.getLocalFolderName);
 
       objCacicCOMM.writeDebugLog('Comm: Povoando lista com valores padrão para cabeçalho de comunicação');
       objCacicCOMM.writeDebugLog('Comm: pStrActionMessage: "' + pStrActionMessage + '"');
@@ -68,8 +68,8 @@ Begin
           Values['ModuleFolderName'           ] := objCacicCOMM.replaceInvalidHTTPChars(objCacicCOMM.enCrypt(ExtractFilePath(ParamStr(0))                                            ));
           Values['ModuleProgramName'          ] := objCacicCOMM.replaceInvalidHTTPChars(objCacicCOMM.enCrypt(ExtractFileName(ParamStr(0))                                            ));
           Values['NetworkAdapterConfiguration'] := objCacicCOMM.replaceInvalidHTTPChars(objCacicCOMM.enCrypt(strWin32_NetworkAdapterConfiguration                                    ));
-          Values['OperatingSystem'            ] := objCacicCOMM.replaceInvalidHTTPChars(objCacicCOMM.enCrypt(strWin32_OperatingSystem                                                ));
-          Values['SoftwareFeature'            ] := objCacicCOMM.replaceInvalidHTTPChars(objCacicCOMM.enCrypt(strWin32_SoftwareFeature                                                ));
+          //Values['OperatingSystem'            ] := objCacicCOMM.replaceInvalidHTTPChars(objCacicCOMM.enCrypt(strWin32_OperatingSystem                                                ));
+          //Values['SoftwareFeature'            ] := objCacicCOMM.replaceInvalidHTTPChars(objCacicCOMM.enCrypt(strWin32_SoftwareFeature                                                ));
           Values['PHP_AUTH_PW'                ] := objCacicCOMM.replaceInvalidHTTPChars(objCacicCOMM.enCrypt('PW_CACIC',true,true                                                    ));
           Values['PHP_AUTH_USER'              ] := objCacicCOMM.replaceInvalidHTTPChars(objCacicCOMM.enCrypt('USER_CACIC',true,true                                                  ));
           Values['te_so'                      ] := objCacicCOMM.replaceInvalidHTTPChars(objCacicCOMM.getWindowsStrId()                                                                );
diff --git a/CACIC_Library.pas b/CACIC_Library.pas
index 2a522e0..c76447d 100755
--- a/CACIC_Library.pas
+++ b/CACIC_Library.pas
@@ -257,6 +257,7 @@ end;
 destructor TCACIC.Destroy();
 begin
    Try
+     P_OSVersionInfo:=nil;
      FreeMemory(P_OSVersionInfo);
    Except
    End;
@@ -684,6 +685,7 @@ begin
   pStrSource := pStrSource + copy(pStrTags,1,1) + pStrTagLabel + copy(pStrTags,2,1) + pStrTagValue + copy(pStrTags,1,1) + '/' + pStrTagLabel + copy(pStrTags,2,1);
 End;
 
+
 function TCACIC.getValueFromFile(pStrSectionName, pStrKeyName, pStrFileName : String; pBoolShowInDebug : boolean = true): String;
 //Para buscar do Arquivo INF...
 // Marreta devido a limitações do KERNEL w9x no tratamento de arquivos texto e suas seções
diff --git a/CACIC_WMI.pas b/CACIC_WMI.pas
index 6882a8b..e29e756 100644
--- a/CACIC_WMI.pas
+++ b/CACIC_WMI.pas
@@ -155,7 +155,7 @@ Begin
       else if (pStrWin32ClassName = 'Win32_NetworkAdapterConfiguration')  and (pStrColumnsNames = '') then
         Begin
           strColumnsNames := 'DefaultIPGateway,Description,DHCPServer,DNSDomain,DNSHostName,DNSServerSearchOrder,IPAddress,IPSubnet,MACAddress,WINSPrimaryServer,WINSSecondaryServer';
-          strWhereClause  := 'DHCPEnabled=TRUE and IPEnabled=TRUE';
+          strWhereClause  := 'IPEnabled=TRUE or DHCPEnabled=TRUE';
         End
       else if (pStrWin32ClassName = 'Win32_OperatingSystem') and (pStrColumnsNames = '') then
         strColumnsNames := 'Caption,CSDVersion,InstallDate,LastBootUpTime,NumberOfLicensedUsers,OSArchitecture,OSLanguage,ProductType,SerialNumber,Version'
diff --git a/Grupo_CACIC.groupproj b/Grupo_CACIC.groupproj
index a531c5b..e8bb477 100644
--- a/Grupo_CACIC.groupproj
+++ b/Grupo_CACIC.groupproj
@@ -82,22 +82,22 @@
   <Target Name="TesteSoftware:Make">
     <MSBuild Projects="C:\Documents and Settings\adriano\Meus documentos\RAD Studio\Projects\TesteSoftware.dproj" Targets="Make" />
   </Target>
-  <Target Name="MapaCACICteste">
-    <MSBuild Projects="MapaTesteProj\MapaCACICteste.dproj" Targets="" />
+  <Target Name="MapaCACICpgfn">
+    <MSBuild Projects="MapaTesteProj\MapaCACICpgfn.dproj" Targets="" />
   </Target>
-  <Target Name="MapaCACICteste:Clean">
-    <MSBuild Projects="MapaTesteProj\MapaCACICteste.dproj" Targets="Clean" />
+  <Target Name="MapaCACICpgfn:Clean">
+    <MSBuild Projects="MapaTesteProj\MapaCACICpgfn.dproj" Targets="Clean" />
   </Target>
-  <Target Name="MapaCACICteste:Make">
-    <MSBuild Projects="MapaTesteProj\MapaCACICteste.dproj" Targets="Make" />
+  <Target Name="MapaCACICpgfn:Make">
+    <MSBuild Projects="MapaTesteProj\MapaCACICpgfn.dproj" Targets="Make" />
   </Target>
   <Target Name="Build">
-    <CallTarget Targets="chksis;cacicservice;cacic280;gercols;installcacic;MapaCACICl;CacicVersionsAndHashes;TesteSoftware;MapaCACICteste" />
+    <CallTarget Targets="chksis;cacicservice;cacic280;gercols;installcacic;MapaCACICl;CacicVersionsAndHashes;TesteSoftware;MapaCACICpgfn" />
   </Target>
   <Target Name="Clean">
-    <CallTarget Targets="chksis:Clean;cacicservice:Clean;cacic280:Clean;gercols:Clean;installcacic:Clean;MapaCACICl:Clean;CacicVersionsAndHashes:Clean;TesteSoftware:Clean;MapaCACICteste:Clean" />
+    <CallTarget Targets="chksis:Clean;cacicservice:Clean;cacic280:Clean;gercols:Clean;installcacic:Clean;MapaCACICl:Clean;CacicVersionsAndHashes:Clean;TesteSoftware:Clean;MapaCACICpgfn:Clean" />
   </Target>
   <Target Name="Make">
-    <CallTarget Targets="chksis:Make;cacicservice:Make;cacic280:Make;gercols:Make;installcacic:Make;MapaCACICl:Make;CacicVersionsAndHashes:Make;TesteSoftware:Make;MapaCACICteste:Make" />
+    <CallTarget Targets="chksis:Make;cacicservice:Make;cacic280:Make;gercols:Make;installcacic:Make;MapaCACICl:Make;CacicVersionsAndHashes:Make;TesteSoftware:Make;MapaCACICpgfn:Make" />
   </Target>
 </Project>
\ No newline at end of file
--
libgit2 0.21.2