Changeset 1651 in vbox for trunk

Timestamp:

Mar 23, 2007 9:21:54 AM (18 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

19784

Message:

create the named pipe only once

File:

• trunk/src/VBox/Devices/Serial/DrvNamedPipe.cpp (modified) (3 diffs)

trunk/src/VBox/Devices/Serial/DrvNamedPipe.cpp

@@ -258 +258 @@
     {
 #ifdef __WIN__
-        HANDLE hPipe = CreateNamedPipe(pData->pszLocation, PIPE_ACCESS_DUPLEX, PIPE_TYPE_BYTE | PIPE_READMODE_BYTE | PIPE_WAIT, 1, 32, 32, 10000, NULL);
-        if (hPipe == INVALID_HANDLE_VALUE)
-        {
-            rc = RTErrConvertFromWin32(GetLastError());
-            LogRel(("NamedPipe%d: CreateNamedPipe failed rc=%Vrc\n", pData->pDrvIns->iInstance));
-            break;
-        }
-        BOOL fConnected = ConnectNamedPipe(hPipe, NULL);
+        BOOL fConnected = ConnectNamedPipe((HANDLE)pData->NamedPipe, NULL);
         if (!fConnected)
         {
@@ -276 +269 @@
             }
         }
-        pData->NamedPipe = (RTFILE)hPipe;
 #else /* !__WIN__ */
         if (listen(pData->LocalSocketServer, 0) == -1)
@@ -370 +362 @@
     if (fIsServer)
     {
+        HANDLE hPipe = CreateNamedPipe(pData->pszLocation, PIPE_ACCESS_DUPLEX, PIPE_TYPE_BYTE | PIPE_READMODE_BYTE | PIPE_WAIT, 1, 32, 32, 10000, NULL);
+        if (hPipe == INVALID_HANDLE_VALUE)
+        {
+            rc = RTErrConvertFromWin32(GetLastError());
+            LogRel(("NamedPipe%d: CreateNamedPipe failed rc=%Vrc\n", pData->pDrvIns->iInstance));
+            return PDMDrvHlpVMSetError(pDrvIns, rc, RT_SRC_POS, N_("NamedPipe#%d failed to create named pipe %s"), pDrvIns->iInstance, pszLocation);
+        }
+        pData->NamedPipe = (HFILE)hPipe;
+
         rc = RTThreadCreate(&pData->ListenThread, drvNamedPipeListenLoop, (void *)pData, 0, RTTHREADTYPE_IO, 0, "NamedPipe");
         if VBOX_FAILURE(rc)