don't access registry directly, use dedicated function

fusioninventory · Mar 4, 2012 · 24d85a6 · 24d85a6
1 parent 9fcd8bf
commit 24d85a6
Showing 1 changed file with 11 additions and 13 deletions.
diff --git a/lib/FusionInventory/Agent/Task/Inventory/Input/Win32/Printers.pm b/lib/FusionInventory/Agent/Task/Inventory/Input/Win32/Printers.pm
@@ -4,11 +4,6 @@ use strict;
 use warnings;
 
 use English qw(-no_match_vars);
-use Win32::TieRegistry (
-    Delimiter   => '/',
-    ArrayValues => 0,
-    qw/KEY_READ/
-);
 
 use FusionInventory::Agent::Tools::Win32;
 
@@ -52,6 +47,7 @@ sub doInventory {
     my (%params) = @_;
 
     my $inventory = $params{inventory};
+    my $logger    = $params{logger};
 
     foreach my $object (getWmiObjects(
         class      => 'Win32_Printer',
@@ -76,7 +72,7 @@ sub doInventory {
                 $object->{VerticalResolution};
         }
 
-        $object->{Serial} = _getUSBPrinterSerial($object->{PortName})
+        $object->{Serial} = _getUSBPrinterSerial($object->{PortName}, $logger)
             if $object->{PortName} && $object->{PortName} =~ /USB/;
 
         $inventory->addEntry(
@@ -103,22 +99,24 @@ sub doInventory {
 }
 
 sub _getUSBPrinterSerial {
-    my ($portName) = @_;
-
-    my $machKey = $Registry->Open('LMachine', { 
-        Access => KEY_READ | KEY_WOW64_64 ## no critic (ProhibitBitwise)
-    }) or die "Can't open HKEY_LOCAL_MACHINE key: $EXTENDED_OS_ERROR";
+    my ($portName, $logger) = @_;
 
     # first, find the USB container ID for this printer
     my $prefix = _getUSBPrefix(
-        $machKey->{"SYSTEM/CurrentControlSet/Enum/USBPRINT"},
+        getRegistryKey(
+            path => "HKEY_LOCAL_MACHINE/SYSTEM/CurrentControlSet/Enum/USBPRINT",
+            logger => $logger
+        ),
         $portName
     );
     return unless $prefix;
 
     # second, get the serial number from the ID container entry
     my $serial = _getUSBSerial(
-        $machKey->{"SYSTEM/CurrentControlSet/Enum/USB"},
+        getRegistryKey(
+            path => "HKEY_LOCAL_MACHINE/SYSTEM/CurrentControlSet/Enum/USB",
+            logger => $logger
+        ),
         $prefix
     );