Changeset 58306 in vbox for trunk/src/VBox/Additions/WINNT

Timestamp:

Oct 18, 2015 11:44:25 PM (9 years ago)

Author:

vboxsync

Message:

VBoxTray/VBoxIPCInit: Simplified pipe name construction, removing bogus RTStrPrintf error checking and status code.

File:

• trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxIPC.cpp (modified) (2 diffs)

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

@@ -31 +31 @@
 #include <iprt/localipc.h>
 #include <iprt/mem.h>
+#include <iprt/process.h>
+
 #include <VBoxGuestInternal.h>
 
@@ -179 +181 @@
     if (RT_SUCCESS(rc))
     {
-        RTUTF16 wszUserName[255];
-        DWORD cchUserName = sizeof(wszUserName) / sizeof(RTUTF16);
-        BOOL fRc = GetUserNameW(wszUserName, &cchUserName);
-        if (!fRc)
-            rc = RTErrConvertFromWin32(GetLastError());
-
+        char szPipeName[512 + sizeof(VBOXTRAY_IPC_PIPE_PREFIX)];
+        strcpy(szPipeName, VBOXTRAY_IPC_PIPE_PREFIX);
+        rc = RTProcQueryUsername(NIL_RTPROCESS,
+                                 &szPipeName[sizeof(VBOXTRAY_IPC_PIPE_PREFIX) - 1],
+                                 sizeof(szPipeName) - sizeof(VBOXTRAY_IPC_PIPE_PREFIX) + 1,
+                                 NULL /*pcbUser*/);
         if (RT_SUCCESS(rc))
         {
-            char *pszUserName;
-            rc = RTUtf16ToUtf8(wszUserName, &pszUserName);
+            rc = RTLocalIpcServerCreate(&pCtx->hServer, szPipeName, 0 /*fFlags*/);
             if (RT_SUCCESS(rc))
             {
-                char szPipeName[255];
-                if (RTStrPrintf(szPipeName, sizeof(szPipeName), "%s%s",
-                                VBOXTRAY_IPC_PIPE_PREFIX, pszUserName))
-                {
-                    rc = RTLocalIpcServerCreate(&pCtx->hServer, szPipeName, 0 /*fFlags*/);
-                    if (RT_SUCCESS(rc))
-                    {
-                        RTStrFree(pszUserName);
-
-                        pCtx->pEnv = pEnv;
-                        RTListInit(&pCtx->SessionList);
-
-                        *ppInstance = pCtx;
-
-                        /* GetLastInputInfo only is available starting at Windows 2000 -- might fail. */
-                        s_pfnGetLastInputInfo = (PFNGETLASTINPUTINFO)
-                            RTLdrGetSystemSymbol("User32.dll", "GetLastInputInfo");
-
-                        LogRelFunc(("Local IPC server now running at \"%s\"\n", szPipeName));
-                        return VINF_SUCCESS;
-                    }
-
-                }
-                else
-                    rc = VERR_NO_MEMORY;
-
-                RTStrFree(pszUserName);
-            }
+                pCtx->pEnv = pEnv;
+                RTListInit(&pCtx->SessionList);
+
+                *ppInstance = pCtx;
+
+                /* GetLastInputInfo only is available starting at Windows 2000 -- might fail. */
+                s_pfnGetLastInputInfo = (PFNGETLASTINPUTINFO)
+                    RTLdrGetSystemSymbol("User32.dll", "GetLastInputInfo");
+
+                LogRelFunc(("Local IPC server now running at \"%s\"\n", szPipeName));
+                return VINF_SUCCESS;
+            }
+
         }