Changeset 64291 in vbox

Timestamp:

Oct 17, 2016 10:17:49 AM (8 years ago)

Author:

vboxsync

Message:

Reverted r111300 and subsequent changes since the fix is to use RTLOCALIPC_FLAGS_NATIVE_NAME.

Location:

trunk

Files:

• include/iprt/localipc.h (modified) (1 diff)
• include/iprt/mangling.h (modified) (1 diff)
• src/VBox/Additions/WINNT/Installer/InstallHelper/VBoxGuestInstallHelper.cpp (modified) (2 diffs)
• src/VBox/Additions/WINNT/VBoxTray/VBoxIPC.cpp (modified) (2 diffs)
• src/VBox/Additions/WINNT/VBoxTray/VBoxTray.cpp (modified) (1 diff)
• src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo-win.cpp (modified) (2 diffs)
• src/VBox/Runtime/Makefile.kmk (modified) (1 diff)
• src/VBox/Runtime/r3/localipc.cpp (deleted)

trunk/include/iprt/localipc.h

@@ -317 +317 @@
 RTDECL(int) RTLocalIpcSessionQueryGroupId(RTLOCALIPCSESSION hSession, PRTGID pGid);
 
-/**
- * Make the IPC pipe name unique for user
- * in a form like 'VBoxTrayIPC-6a4500cb7c726949'
- *
- * @returns IPRT status code.
- * @retval  VINF_SUCCESS and *pcbDst if pipe name created successfully.
- * @retval  VERR_INVALID_PARAMETER in case of invalid parameter value.
- * @retval  VERR_BUFFER_OVERFLOW if the pszDst is too small.
- *
- * @param   pszPrefix        Pipe name prefix, for example 'VBoxTrayIPC-'
- * @param   pszUsername      Username.
- * @param   pszDst           Destination buffer to store created pipe name
- * @param   pcbDst           IN  - size of destination buffer in bytes,
- *                           OUT - length of created pipe name in bytes without trailing zero
- */
-RTDECL(int) RTLocalIpcMakeNameUniqueUser(const char *pszPrefix, const char *pszUserName, char *pszDst, size_t *pcbDst);
-
 /** @} */
 RT_C_DECLS_END

trunk/include/iprt/mangling.h

@@ -1045 +1045 @@
 # define RTLinuxSysFsWriteU64File                       RT_MANGLER(RTLinuxSysFsWriteU64File)
 # define RTLinuxSysFsWriteU64FileV                      RT_MANGLER(RTLinuxSysFsWriteU64FileV)
-# define RTLocalIpcMakeNameUniqueUser                   RT_MANGLER(RTLocalIpcMakeNameUniqueUser)
 # define RTLocalIpcServerCreate                         RT_MANGLER(RTLocalIpcServerCreate)
 # define RTLocalIpcServerDestroy                        RT_MANGLER(RTLocalIpcServerDestroy)

trunk/src/VBox/Additions/WINNT/Installer/InstallHelper/VBoxGuestInstallHelper.cpp

@@ -34 +34 @@
 #include <iprt/mem.h>
 #include <iprt/string.h>
-#include <iprt/localipc.h>
 
 /* Required structures/defines of VBoxTray. */
@@ -153 +152 @@
         if (RT_SUCCESS(rc))
         {
-            char szPipeName[80];
-            size_t cbPipeName = sizeof(szPipeName);
-            rc = RTLocalIpcMakeNameUniqueUser(VBOXTRAY_IPC_PIPE_PREFIX, pszUserName, szPipeName, &cbPipeName);
-            if (RT_SUCCESS(rc))
+            char szPipeName[255];
+            if (RTStrPrintf(szPipeName, sizeof(szPipeName), "%s%s",
+                            VBOXTRAY_IPC_PIPE_PREFIX, pszUserName))
             {
                 rc = RTLocalIpcSessionConnect(phSession, szPipeName, 0 /* Flags */);
             }
+            else
+                rc = VERR_NO_MEMORY;
 
             RTStrFree(pszUserName);

trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxIPC.cpp

@@ -175 +175 @@
 }
 
-
 /**
  * Initializes the IPC communication.
@@ -196 +195 @@
     if (RT_SUCCESS(rc))
     {
-        char szUserName[512];
+        char szPipeName[512 + sizeof(VBOXTRAY_IPC_PIPE_PREFIX)];
+        strcpy(szPipeName, VBOXTRAY_IPC_PIPE_PREFIX);
         rc = RTProcQueryUsername(NIL_RTPROCESS,
-                                 szUserName,
-                                 sizeof(szUserName),
+                                 &szPipeName[sizeof(VBOXTRAY_IPC_PIPE_PREFIX) - 1],
+                                 sizeof(szPipeName) - sizeof(VBOXTRAY_IPC_PIPE_PREFIX) + 1,
                                  NULL /*pcbUser*/);
         if (RT_SUCCESS(rc))
         {
-            char szPipeName[80];
-            size_t cbPipeName = sizeof(szPipeName);
-            rc = RTLocalIpcMakeNameUniqueUser(VBOXTRAY_IPC_PIPE_PREFIX, szUserName, szPipeName, &cbPipeName);
+            rc = RTLocalIpcServerCreate(&pCtx->hServer, szPipeName, 0 /*fFlags*/);
             if (RT_SUCCESS(rc))
             {
-
-                rc = RTLocalIpcServerCreate(&pCtx->hServer, szPipeName, 0 /*fFlags*/);
-                if (RT_SUCCESS(rc))
-                {
-                    pCtx->pEnv = pEnv;
-                    RTListInit(&pCtx->SessionList);
-
-                    *ppInstance = pCtx;
-
-                    /* GetLastInputInfo only is available starting at Windows 2000 -- might fail. */
-                    g_pfnGetLastInputInfo = (PFNGETLASTINPUTINFO)
-                        RTLdrGetSystemSymbol("User32.dll", "GetLastInputInfo");
-
-                    LogRelFunc(("Local IPC server now running at \"%s\"\n", szPipeName));
-                    return VINF_SUCCESS;
-                }
-
-            }
+                pCtx->pEnv = pEnv;
+                RTListInit(&pCtx->SessionList);
+
+                *ppInstance = pCtx;
+
+                /* GetLastInputInfo only is available starting at Windows 2000 -- might fail. */
+                g_pfnGetLastInputInfo = (PFNGETLASTINPUTINFO)
+                    RTLdrGetSystemSymbol("User32.dll", "GetLastInputInfo");
+
+                LogRelFunc(("Local IPC server now running at \"%s\"\n", szPipeName));
+                return VINF_SUCCESS;
+            }
+
         }
 

trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxTray.cpp

@@ -308 +308 @@
             LogRel(("Failed to initialize service '%s', rc=%Rrc\n", pSvc->pDesc->pszName, rc2));
             if (rc2 == VERR_NOT_SUPPORTED)
+            {
                 LogRel(("Service '%s' is not supported on this system\n", pSvc->pDesc->pszName));
-            rc2 = VINF_SUCCESS;
+                rc2 = VINF_SUCCESS;
+            }
             /* Keep going. */
         }

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo-win.cpp

@@ -39 +39 @@
 #include <iprt/time.h>
 #include <iprt/thread.h>
-
 
 #include <VBox/VBoxGuestLib.h>
@@ -956 +955 @@
 
     int rc = VINF_SUCCESS;
-    char szPipeName[80];
-    size_t cbPipeName = sizeof(szPipeName);
-    rc = RTLocalIpcMakeNameUniqueUser(VBOXTRAY_IPC_PIPE_PREFIX, pszUser, szPipeName, &cbPipeName);
+
+    char szPipeName[255];
 /** @todo r=bird:  Pointless if.  */
-    if (RT_SUCCESS(rc))
+    if (RTStrPrintf(szPipeName, sizeof(szPipeName), "%s%s", VBOXTRAY_IPC_PIPE_PREFIX, pszUser))
     {
         bool fReportToHost = false;

trunk/src/VBox/Runtime/Makefile.kmk

@@ -658 +658 @@
         r3/generic/semspinmutex-r3-generic.cpp \
         r3/xml.cpp \
-        common/zip/xarvfs.cpp \
-        r3/localipc.cpp
+        common/zip/xarvfs.cpp