vbox的更動 60447 路徑 trunk/src/VBox/Main

時間撮記:

2016-4-12 上午10:03:09 (9 年 以前)

作者:

vboxsync

訊息:

bugref:7179. Removed auto_ptr from HostDnsServiceWin.cpp.

檔案:

• trunk/src/VBox/Main/src-server/win/HostDnsServiceWin.cpp (修改) (2 筆差異)

trunk/src/VBox/Main/src-server/win/HostDnsServiceWin.cpp

@@ -65 +65 @@
 
 HostDnsServiceWin::HostDnsServiceWin()
- : HostDnsMonitor(true),
-   m(NULL)
-{
-    std::auto_ptr<Data> data(new Data());
-    LONG lrc;
-
-    lrc = RegOpenKeyExW(HKEY_LOCAL_MACHINE,
-                        L"SYSTEM\\CurrentControlSet\\Services\\Tcpip\\Parameters",
-                        0,
-                        KEY_READ|KEY_NOTIFY,
-                        &data->hKeyTcpipParameters);
-    if (lrc != ERROR_SUCCESS)
-    {
-        LogRel(("HostDnsServiceWin: failed to open key Tcpip\\Parameters (error %d)\n", lrc));
-        return;
-    }
-
-    for (size_t i = 0; i < DATA_MAX_EVENT; ++i)
-    {
-        HANDLE h;
-
-        if (i ==  DATA_TIMER)
-            h = CreateWaitableTimer(NULL, FALSE, NULL);
-        else
-            h = CreateEvent(NULL, TRUE, FALSE, NULL);
-
-        if (h == NULL)
-        {
-            LogRel(("HostDnsServiceWin: failed to create event (error %d)\n", GetLastError()));
-            return;
-        }
-
-        data->haDataEvent[i] = h;
-    }
-
-    m = data.release();
-}
-
+ : HostDnsMonitor(true)
+{
+    m = new Data();
+}
 
 HostDnsServiceWin::~HostDnsServiceWin()
@@ -115 +81 @@
     if (m == NULL)
         return E_FAIL;
+
+    {
+        bool res = true;
+        LONG lrc = RegOpenKeyExW(HKEY_LOCAL_MACHINE,
+                            L"SYSTEM\\CurrentControlSet\\Services\\Tcpip\\Parameters",
+                            0,
+                            KEY_READ|KEY_NOTIFY,
+                            &m->hKeyTcpipParameters);
+        if (lrc != ERROR_SUCCESS)
+        {
+            LogRel(("HostDnsServiceWin: failed to open key Tcpip\\Parameters (error %d)\n", lrc));
+            res = false;
+        }
+        else
+        {
+            for (size_t i = 0; i < DATA_MAX_EVENT; ++i)
+            {
+                HANDLE h;
+
+                if (i ==  DATA_TIMER)
+                    h = CreateWaitableTimer(NULL, FALSE, NULL);
+                else
+                    h = CreateEvent(NULL, TRUE, FALSE, NULL);
+
+                if (h == NULL)
+                {
+                    LogRel(("HostDnsServiceWin: failed to create event (error %d)\n", GetLastError()));
+                    res = false;
+                    break;
+                }
+
+                m->haDataEvent[i] = h;
+            }
+        }
+        if(!res)
+            return E_FAIL;
+    }
 
     HRESULT hrc = HostDnsMonitor::init(virtualbox);