fix: Don't cleanup cpu on win32 from (R) trademark

to keep cpu naming coherent between OS
Closes #1017

Author: g-bougard

Changes

@@ -19,6 +19,8 @@ inventory:
 * PR #1010: Update vCpu support for Qemu virtualization
 * fix #957: Support Qemu virtualization inventory on windows
 * fix #955: Add support for SimpleHelp remote_management inventory
+* fix #1017: Don't cleanup cpu on win32 from (R) trademark to keep cpu naming
+  the same between OS
 
 remoteinventory:
 * fix RedHat RHN systemid set as WINPRODID

lib/GLPI/Agent/Task/Inventory/Win32/CPU.pm

@@ -97,7 +97,6 @@ sub _getCPUs {
         my $name = $dmidecodeInfo->{NAME};
         unless ($name) {
             $name = trimWhitespace($registryInfo->{'/ProcessorNameString'} || $object->{Name});
-            $name =~ s/\((R|TM)\)//gi if $name;
         }
 
         my $cpu = {

t/tasks/inventory/windows/cpu.t

@@ -49,7 +49,7 @@ my %tests = (
     '2003' => [
         {
             ID           => 'BFEBFBFF00000F29',
-            NAME         => 'Intel Xeon CPU 3.06GHz',
+            NAME         => 'Intel(R) Xeon(TM) CPU 3.06GHz',
             SERIAL       => undef,
             MANUFACTURER => 'Intel',
             DESCRIPTION  => 'x86 Family 15 Model 2 Stepping 9',
@@ -62,7 +62,7 @@ my %tests = (
         },
         {
             ID           => '0000000000000000',
-            NAME         => 'Intel Xeon CPU 3.06GHz',
+            NAME         => 'Intel(R) Xeon(TM) CPU 3.06GHz',
             SERIAL       => undef,
             MANUFACTURER => 'Intel',
             DESCRIPTION  => 'x86 Family 15 Model 2 Stepping 9',
@@ -77,7 +77,7 @@ my %tests = (
     '2003SP2' => [
         {
             ID           => '0FEBBBFF00010676',
-            NAME         => 'Intel Xeon CPU E5440 @ 2.83GHz',
+            NAME         => 'Intel(R) Xeon(R) CPU E5440 @ 2.83GHz',
             SERIAL       => undef,
             MANUFACTURER => 'Intel',
             DESCRIPTION  => 'x86 Family 6 Model 23 Stepping 6',
@@ -90,7 +90,7 @@ my %tests = (
         },
         {
             ID           => '0FEBBBFF00000676',
-            NAME         => 'Intel Xeon CPU E5440 @ 2.83GHz',
+            NAME         => 'Intel(R) Xeon(R) CPU E5440 @ 2.83GHz',
             SERIAL       => undef,
             MANUFACTURER => 'Intel',
             DESCRIPTION  => 'x86 Family 6 Model 23 Stepping 6',