Update Windows.php

twilroad · Nov 22, 2017 · 899c8e3 · 899c8e3
1 parent c25bef7
commit 899c8e3
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/Linfo/OS/Windows.php b/src/Linfo/OS/Windows.php
@@ -81,7 +81,7 @@ public function getContains()
     public function getOS()
     {
         foreach ($this->wmi->ExecQuery('SELECT Caption FROM Win32_OperatingSystem') as $os) {
-            return $os->Caption;
+            return iconv("GB2312", "UTF-8", $os->Caption);
         }
 
         return 'Windows';
@@ -412,8 +412,8 @@ public function getDevs()
             $manufacturer = $pnpdev->Manufacturer;
             $caption = $pnpdev->Caption;
             if (function_exists('iconv')) {
-                $manufacturer = iconv('Windows-1252', 'UTF-8//TRANSLIT', $manufacturer);
-                $caption = iconv('Windows-1252', 'UTF-8//TRANSLIT', $caption);
+                $manufacturer = iconv('GB2312', 'UTF-8', $manufacturer);
+                $caption = iconv('GB2312', 'UTF-8', $caption);
             }
             $devs[] = array(
                 'vendor' => $manufacturer,