Index: /trunk/include/iprt/localipc.h =================================================================== --- /trunk/include/iprt/localipc.h (revision 64290) +++ /trunk/include/iprt/localipc.h (revision 64291) @@ -317,21 +317,4 @@ 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 Index: /trunk/include/iprt/mangling.h =================================================================== --- /trunk/include/iprt/mangling.h (revision 64290) +++ /trunk/include/iprt/mangling.h (revision 64291) @@ -1045,5 +1045,4 @@ # 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) Index: /trunk/src/VBox/Additions/WINNT/Installer/InstallHelper/VBoxGuestInstallHelper.cpp =================================================================== --- /trunk/src/VBox/Additions/WINNT/Installer/InstallHelper/VBoxGuestInstallHelper.cpp (revision 64290) +++ /trunk/src/VBox/Additions/WINNT/Installer/InstallHelper/VBoxGuestInstallHelper.cpp (revision 64291) @@ -34,5 +34,4 @@ #include #include -#include /* Required structures/defines of VBoxTray. */ @@ -153,11 +152,12 @@ 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); Index: /trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxIPC.cpp =================================================================== --- /trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxIPC.cpp (revision 64290) +++ /trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxIPC.cpp (revision 64291) @@ -175,5 +175,4 @@ } - /** * Initializes the IPC communication. @@ -196,34 +195,28 @@ 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; + } + } Index: /trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxTray.cpp =================================================================== --- /trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxTray.cpp (revision 64290) +++ /trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxTray.cpp (revision 64291) @@ -308,6 +308,8 @@ 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. */ } Index: /trunk/src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo-win.cpp =================================================================== --- /trunk/src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo-win.cpp (revision 64290) +++ /trunk/src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo-win.cpp (revision 64291) @@ -39,5 +39,4 @@ #include #include - #include @@ -956,9 +955,8 @@ 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; Index: /trunk/src/VBox/Runtime/Makefile.kmk =================================================================== --- /trunk/src/VBox/Runtime/Makefile.kmk (revision 64290) +++ /trunk/src/VBox/Runtime/Makefile.kmk (revision 64291) @@ -658,6 +658,5 @@ r3/generic/semspinmutex-r3-generic.cpp \ r3/xml.cpp \ - common/zip/xarvfs.cpp \ - r3/localipc.cpp + common/zip/xarvfs.cpp Index: unk/src/VBox/Runtime/r3/localipc.cpp =================================================================== --- /trunk/src/VBox/Runtime/r3/localipc.cpp (revision 64290) +++ (revision ) @@ -1,86 +1,0 @@ -/* $Id$ */ -/** @file - * IPRT - Implements RTLocalIpcMakeNameUniqueUser - */ - -/* - * Copyright (C) 2010-2016 Oracle Corporation - * - * This file is part of VirtualBox Open Source Edition (OSE), as - * available from http://www.virtualbox.org. This file is free software; - * you can redistribute it and/or modify it under the terms of the GNU - * General Public License (GPL) as published by the Free Software - * Foundation, in version 2 as it comes in the "COPYING" file of the - * VirtualBox OSE distribution. VirtualBox OSE is distributed in the - * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. - * - * The contents of this file may alternatively be used under the terms - * of the Common Development and Distribution License Version 1.0 - * (CDDL) only, as it comes in the "COPYING.CDDL" file of the - * VirtualBox OSE distribution, in which case the provisions of the - * CDDL are applicable instead of those of the GPL. - * - * You may elect to license modified versions of this file under the - * terms and conditions of either the GPL or the CDDL or both. - */ - -/********************************************************************************************************************************* -* Header Files * -*********************************************************************************************************************************/ -#include - -#include -#include -#include - -/** - * 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 - * - * @todo r=bird: 'Unique' is a misnomer here. Doing CRC64 on a string does - * not guarentee uniqueness, not even using cryptographic hashing will - * achive this. There can be two @a pszUsername strings with the same - * CRC64 value, while still being different. - * - * Rename the function to something like RTLocalIpcMakeAsciiName and - * use a safe escape-like recoding of it. - * - * Also, pcbDst should be two parameters. - */ -RTDECL(int) RTLocalIpcMakeNameUniqueUser(const char *pszPrefix, const char *pszUsername, char *pszDst, size_t *pcbDst) -{ - AssertPtrReturn(pszPrefix, VERR_INVALID_PARAMETER); - AssertPtrReturn(pszUsername, VERR_INVALID_PARAMETER); - AssertPtrReturn(pcbDst, VERR_INVALID_PARAMETER); - AssertReturn(*pcbDst, VERR_BUFFER_OVERFLOW); - AssertPtrReturn(pszDst, VERR_INVALID_PARAMETER); - - const size_t cchPrefix = strlen(pszPrefix); - AssertReturn(*pcbDst > cchPrefix + 17, VERR_BUFFER_OVERFLOW); - - const size_t cchSrc = strlen(pszUsername); - AssertReturn(cchSrc, VERR_INVALID_PARAMETER); - - /* Use the crc of user name instead of user name to avoid localized pipe problem */ - uint64_t uCrc = RTCrc64(pszUsername, cchSrc); - AssertReturn(uCrc > 0, VERR_INVALID_PARAMETER); - - RT_BZERO(pszDst, *pcbDst); - size_t cbRes = RTStrPrintf(pszDst, *pcbDst, "%s%016RX64", pszPrefix, uCrc); - AssertReturn(cbRes, VERR_BUFFER_OVERFLOW); /** @todo r=bird: WRONG. RTStrPrintf is a very very stupid API which is almost impossible to check for overflows */ - - *pcbDst = cbRes; - return VINF_SUCCESS; -} -