Index: /trunk/src/VBox/Additions/common/VBoxService/VBoxServiceExec.cpp =================================================================== --- /trunk/src/VBox/Additions/common/VBoxService/VBoxServiceExec.cpp (revision 23574) +++ /trunk/src/VBox/Additions/common/VBoxService/VBoxServiceExec.cpp (revision 23575) @@ -137,6 +137,13 @@ void *pvBuf = NULL; int rc; - *ppszValue = NULL; + + char *pszPropNameUTF8; + rc = RTStrCurrentCPToUtf8(&pszPropNameUTF8, pszPropName); + if (RT_FAILURE(rc)) + { + VBoxServiceError("Exec: Failed to convert property name \"%s\" to UTF-8!\n", pszPropName); + return rc; + } for (unsigned cTries = 0; cTries < 10; cTries++) @@ -156,5 +163,5 @@ char *pszFlags; uint64_t uTimestamp; - rc = VbglR3GuestPropRead(g_uExecGuestPropSvcClientID, pszPropName, + rc = VbglR3GuestPropRead(g_uExecGuestPropSvcClientID, pszPropNameUTF8, pvBuf, cbBuf, &pszValue, &uTimestamp, &pszFlags, NULL); @@ -200,6 +207,6 @@ break; /* done */ } - RTMemFree(pvBuf); + RTStrFree(pszPropNameUTF8); return rc; } @@ -399,7 +406,7 @@ * Store the result in Set return value so the host knows what happend. */ - rc = VbglR3GuestPropWriteValueF(g_uExecGuestPropSvcClientID, - "/VirtualBox/HostGuest/SysprepRet", - "%d", Status.iStatus); + rc = VBoxServiceWritePropF(g_uExecGuestPropSvcClientID, + "/VirtualBox/HostGuest/SysprepRet", + "%d", Status.iStatus); if (RT_FAILURE(rc)) VBoxServiceError("Exec: Failed to write SysprepRet: rc=%Rrc\n", rc); @@ -446,5 +453,5 @@ if (rc != VERR_NOT_FOUND) { - rc = VbglR3GuestPropWriteValueF(g_uExecGuestPropSvcClientID, "/VirtualBox/HostGuest/SysprepVBoxRC", "%d", rc); + rc = VBoxServiceWritePropF(g_uExecGuestPropSvcClientID, "/VirtualBox/HostGuest/SysprepVBoxRC", "%d", rc); if (RT_FAILURE(rc)) VBoxServiceError("Exec: Failed to write SysprepVBoxRC: rc=%Rrc\n", rc); Index: /trunk/src/VBox/Additions/common/VBoxService/VBoxServiceInternal.h =================================================================== --- /trunk/src/VBox/Additions/common/VBoxService/VBoxServiceInternal.h (revision 23574) +++ /trunk/src/VBox/Additions/common/VBoxService/VBoxServiceInternal.h (revision 23575) @@ -148,10 +148,10 @@ #ifdef VBOX_WITH_GUEST_PROPS /** Detects wheter a user is logged on based on the enumerated processes. */ -extern BOOL VboxServiceVMInfoWinIsLoggedIn(VBOXSERVICEVMINFOUSER* a_pUserInfo, +extern BOOL VBoxServiceVMInfoWinIsLoggedIn(VBOXSERVICEVMINFOUSER* a_pUserInfo, PLUID a_pSession, PLUID a_pLuid, DWORD a_dwNumOfProcLUIDs); /** Gets logon user IDs from enumerated processes. */ -extern DWORD VboxServiceVMInfoWinGetLUIDsFromProcesses(PLUID *ppLuid); +extern DWORD VBoxServiceVMInfoWinGetLUIDsFromProcesses(PLUID *ppLuid); #endif /* VBOX_WITH_GUEST_PROPS */ #endif /* RT_OS_WINDOWS */ Index: /trunk/src/VBox/Additions/common/VBoxService/VBoxServiceUtils.cpp =================================================================== --- /trunk/src/VBox/Additions/common/VBoxService/VBoxServiceUtils.cpp (revision 23574) +++ /trunk/src/VBox/Additions/common/VBoxService/VBoxServiceUtils.cpp (revision 23575) @@ -37,58 +37,31 @@ #ifdef VBOX_WITH_GUEST_PROPS -int VboxServiceWriteProp(uint32_t uiClientID, const char *pszKey, const char *pszValue) -{ - int rc = VINF_SUCCESS; - Assert(pszKey); - /* Not checking for a valid pszValue is intentional. */ - - char szKeyTemp [FILENAME_MAX] = {0}; - char *pszValueTemp = NULL; - - /* Append base path. */ - RTStrPrintf(szKeyTemp, sizeof(szKeyTemp), "/VirtualBox/%s", pszKey); /** @todo r=bird: Why didn't you hardcode this into the strings before calling this function? */ - - if (pszValue != NULL) - { - rc = RTStrCurrentCPToUtf8(&pszValueTemp, pszValue); - if (!RT_SUCCESS(rc)) - { - VBoxServiceError("vboxVMInfoThread: Failed to convert the value name \"%s\" to Utf8! Error: %Rrc\n", pszValue, rc); - goto cleanup; - } - } - - rc = VbglR3GuestPropWriteValue(uiClientID, szKeyTemp, ((pszValue == NULL) || (0 == strlen(pszValue))) ? NULL : pszValueTemp); - if (!RT_SUCCESS(rc)) - { - VBoxServiceError("Failed to store the property \"%s\"=\"%s\"! ClientID: %d, Error: %Rrc\n", szKeyTemp, pszValueTemp, uiClientID, rc); - goto cleanup; - } - - if ((pszValueTemp != NULL) && (strlen(pszValueTemp) > 0)) - VBoxServiceVerbose(3, "Property written: %s = %s\n", szKeyTemp, pszValueTemp); - else - VBoxServiceVerbose(3, "Property deleted: %s\n", szKeyTemp); - -cleanup: - - RTStrFree(pszValueTemp); +int VBoxServiceWritePropF(uint32_t u32ClientId, const char *pszName, const char *pszValueFormat, ...) +{ + char *pszNameUTF8; + int rc = RTStrCurrentCPToUtf8(&pszNameUTF8, pszName); + if (RT_SUCCESS(rc)) + { + if (pszValueFormat != NULL) + { + va_list va; + va_start(va, pszValueFormat); + VBoxServiceVerbose(3, "Writing guest property \"%s\"=\"%s\"\n", pszNameUTF8, pszValueFormat); + rc = VbglR3GuestPropWriteValueV(u32ClientId, pszNameUTF8, pszValueFormat, va); + if(RT_FAILURE(rc)) + VBoxServiceError("Error writing guest property \"%s\"=\"%s\" (rc=%Rrc)\n", pszNameUTF8, pszValueFormat, rc); + va_end(va); + } + else + rc = VbglR3GuestPropWriteValue(u32ClientId, pszNameUTF8, NULL); + RTStrFree(pszNameUTF8); + } return rc; } - - -int VboxServiceWritePropInt(uint32_t uiClientID, const char *pszKey, int32_t iValue) -{ - Assert(pszKey); - - char szBuffer[32] = {0}; - RTStrPrintf(szBuffer, sizeof(szBuffer), "%ld", iValue); - return VboxServiceWriteProp(uiClientID, pszKey, szBuffer); -} #endif /* VBOX_WITH_GUEST_PROPS */ #ifdef RT_OS_WINDOWS -BOOL VboxServiceGetFileString(const char* pszFileName, +BOOL VBoxServiceGetFileString(const char* pszFileName, char* pszBlock, char* pszString, @@ -146,5 +119,5 @@ -BOOL VboxServiceGetFileVersion(const char* pszFileName, +BOOL VBoxServiceGetFileVersion(const char* pszFileName, DWORD* pdwMajor, DWORD* pdwMinor, @@ -174,5 +147,5 @@ int r = 0; - bRet = VboxServiceGetFileString(pszFileName, "\\StringFileInfo\\040904b0\\FileVersion", szValue, &uiSize); + bRet = VBoxServiceGetFileString(pszFileName, "\\StringFileInfo\\040904b0\\FileVersion", szValue, &uiSize); if (bRet) { @@ -208,5 +181,5 @@ -BOOL VboxServiceGetFileVersionString(const char* pszPath, const char* pszFileName, char* pszVersion, UINT uiSize) +BOOL VBoxServiceGetFileVersionString(const char* pszPath, const char* pszFileName, char* pszVersion, UINT uiSize) { BOOL bRet = FALSE; @@ -219,5 +192,5 @@ DWORD dwMajor, dwMinor, dwBuild, dwRev; - bRet = VboxServiceGetFileVersion(szFullPath, &dwMajor, &dwMinor, &dwBuild, &dwRev); + bRet = VBoxServiceGetFileVersion(szFullPath, &dwMajor, &dwMinor, &dwBuild, &dwRev); if (bRet) RTStrPrintf(pszVersion, uiSize, "%ld.%ld.%ldr%ld", dwMajor, dwMinor, dwBuild, dwRev); Index: /trunk/src/VBox/Additions/common/VBoxService/VBoxServiceUtils.h =================================================================== --- /trunk/src/VBox/Additions/common/VBoxService/VBoxServiceUtils.h (revision 23574) +++ /trunk/src/VBox/Additions/common/VBoxService/VBoxServiceUtils.h (revision 23575) @@ -26,10 +26,9 @@ #ifdef VBOX_WITH_GUEST_PROPS -int VboxServiceWritePropInt(uint32_t uiClientID, const char *pszKey, int iValue); -int VboxServiceWriteProp(uint32_t uiClientID, const char *pszKey, const char *pszValue); +int VBoxServiceWritePropF(uint32_t u32ClientId, const char *pszName, const char *pszValueFormat, ...); #endif #ifdef RT_OS_WINDOWS /** Gets a pre-formatted version string from the VS_FIXEDFILEINFO table. */ -BOOL VboxServiceGetFileVersionString(const char* pszPath, const char* pszFileName, char* pszVersion, UINT uiSize); +BOOL VBoxServiceGetFileVersionString(const char* pszPath, const char* pszFileName, char* pszVersion, UINT uiSize); #endif Index: /trunk/src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo-win.cpp =================================================================== --- /trunk/src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo-win.cpp (revision 23574) +++ /trunk/src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo-win.cpp (revision 23575) @@ -54,5 +54,5 @@ #ifndef TARGET_NT4 /* Function GetLUIDsFromProcesses() written by Stefan Kuhr. */ -DWORD VboxServiceVMInfoWinGetLUIDsFromProcesses(PLUID *ppLuid) +DWORD VBoxServiceVMInfoWinGetLUIDsFromProcesses(PLUID *ppLuid) { DWORD dwSize, dwSize2, dwIndex ; @@ -166,5 +166,5 @@ } -BOOL VboxServiceVMInfoWinIsLoggedIn(VBOXSERVICEVMINFOUSER* a_pUserInfo, +BOOL VBoxServiceVMInfoWinIsLoggedIn(VBOXSERVICEVMINFOUSER* a_pUserInfo, PLUID a_pSession, PLUID a_pLuid, @@ -330,5 +330,5 @@ #endif /* TARGET_NT4 */ -int VboxServiceWinGetAddsVersion(uint32_t uiClientID) +int VBoxServiceWinGetAddsVersion(uint32_t uiClientID) { char szInstDir[_MAX_PATH] = {0}; @@ -401,7 +401,7 @@ /* Write information to host. */ - VboxServiceWriteProp(uiClientID, "GuestAdd/InstallDir", szInstDir); - VboxServiceWriteProp(uiClientID, "GuestAdd/Revision", szRev); - VboxServiceWriteProp(uiClientID, "GuestAdd/Version", szVer); + rc = VBoxServiceWritePropF(uiClientID, "/VirtualBox/GuestAdd/InstallDir", szInstDir); + rc = VBoxServiceWritePropF(uiClientID, "/VirtualBox/GuestAdd/Revision", szRev); + rc = VBoxServiceWritePropF(uiClientID, "/VirtualBox/GuestAdd/Version", szVer); if (NULL != hKey) @@ -411,5 +411,5 @@ } -int VboxServiceWinGetComponentVersions(uint32_t uiClientID) +int VBoxServiceWinGetComponentVersions(uint32_t uiClientID) { int rc; @@ -492,7 +492,7 @@ while (pTable->pszFileName) { - rc = VboxServiceGetFileVersionString(pTable->pszFilePath, pTable->pszFileName, szVer, sizeof(szVer)); - RTStrPrintf(szPropPath, sizeof(szPropPath), "GuestAdd/Components/%s", pTable->pszFileName); - VboxServiceWriteProp(uiClientID, szPropPath, szVer); + rc = VBoxServiceGetFileVersionString(pTable->pszFilePath, pTable->pszFileName, szVer, sizeof(szVer)); + RTStrPrintf(szPropPath, sizeof(szPropPath), "/VirtualBox/GuestAdd/Components/%s", pTable->pszFileName); + rc = VBoxServiceWritePropF(uiClientID, szPropPath, szVer); pTable++; } Index: /trunk/src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo.cpp =================================================================== --- /trunk/src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo.cpp (revision 23574) +++ /trunk/src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo.cpp (revision 23575) @@ -73,6 +73,6 @@ fnWTSGetActiveConsoleSessionId g_pfnWTSGetActiveConsoleSessionId = NULL; /** External functions. */ -extern int VboxServiceWinGetAddsVersion(uint32_t uiClientID); -extern int VboxServiceWinGetComponentVersions(uint32_t uiClientID); +extern int VBoxServiceWinGetAddsVersion(uint32_t uiClientID); +extern int VBoxServiceWinGetComponentVersions(uint32_t uiClientID); #endif @@ -159,26 +159,26 @@ char szInfo[256] = {0}; rc = RTSystemQueryOSInfo(RTSYSOSINFO_PRODUCT, szInfo, sizeof(szInfo)); - VboxServiceWriteProp(g_VMInfoGuestPropSvcClientID, "GuestInfo/OS/Product", szInfo); + VBoxServiceWritePropF(g_VMInfoGuestPropSvcClientID, "/VirtualBox/GuestInfo/OS/Product", szInfo); rc = RTSystemQueryOSInfo(RTSYSOSINFO_RELEASE, szInfo, sizeof(szInfo)); - VboxServiceWriteProp(g_VMInfoGuestPropSvcClientID, "GuestInfo/OS/Release", szInfo); + VBoxServiceWritePropF(g_VMInfoGuestPropSvcClientID, "/VirtualBox/GuestInfo/OS/Release", szInfo); rc = RTSystemQueryOSInfo(RTSYSOSINFO_VERSION, szInfo, sizeof(szInfo)); - VboxServiceWriteProp(g_VMInfoGuestPropSvcClientID, "GuestInfo/OS/Version", szInfo); + VBoxServiceWritePropF(g_VMInfoGuestPropSvcClientID, "/VirtualBox/GuestInfo/OS/Version", szInfo); rc = RTSystemQueryOSInfo(RTSYSOSINFO_SERVICE_PACK, szInfo, sizeof(szInfo)); - VboxServiceWriteProp(g_VMInfoGuestPropSvcClientID, "GuestInfo/OS/ServicePack", szInfo); + VBoxServiceWritePropF(g_VMInfoGuestPropSvcClientID, "/VirtualBox/GuestInfo/OS/ServicePack", szInfo); /* Retrieve version information about Guest Additions and installed files (components). */ #ifdef RT_OS_WINDOWS - rc = VboxServiceWinGetAddsVersion(g_VMInfoGuestPropSvcClientID); - rc = VboxServiceWinGetComponentVersions(g_VMInfoGuestPropSvcClientID); -#else - /* VboxServiceGetAddsVersion !RT_OS_WINDOWS */ - VboxServiceWriteProp(g_VMInfoGuestPropSvcClientID, "GuestAdd/Version", VBOX_VERSION_STRING); + rc = VBoxServiceWinGetAddsVersion(g_VMInfoGuestPropSvcClientID); + rc = VBoxServiceWinGetComponentVersions(g_VMInfoGuestPropSvcClientID); +#else + /* VBoxServiceGetAddsVersion !RT_OS_WINDOWS */ + VBoxServiceWritePropF(g_VMInfoGuestPropSvcClientID, "/VirtualBox/GuestAdd/Version", VBOX_VERSION_STRING); char szRevision[32]; RTStrPrintf(szRevision, sizeof(szRevision), "%u", VBOX_SVN_REV); - VboxServiceWriteProp(g_VMInfoGuestPropSvcClientID, "GuestAdd/Revision", szRevision); + VBoxServiceWritePropF(g_VMInfoGuestPropSvcClientID, "/VirtualBox/GuestAdd/Revision", szRevision); #endif @@ -211,5 +211,5 @@ PLUID pLuid = NULL; - DWORD dwNumOfProcLUIDs = VboxServiceVMInfoWinGetLUIDsFromProcesses(&pLuid); + DWORD dwNumOfProcLUIDs = VBoxServiceVMInfoWinGetLUIDsFromProcesses(&pLuid); VBOXSERVICEVMINFOUSER userInfo; @@ -218,5 +218,5 @@ for (int i = 0; i<(int)ulCount; i++) { - if (VboxServiceVMInfoWinIsLoggedIn(&userInfo, &pSessions[i], pLuid, dwNumOfProcLUIDs)) + if (VBoxServiceVMInfoWinIsLoggedIn(&userInfo, &pSessions[i], pLuid, dwNumOfProcLUIDs)) { if (uiUserCount > 0) @@ -263,6 +263,6 @@ #endif /* !RT_OS_WINDOWS */ - VboxServiceWriteProp(g_VMInfoGuestPropSvcClientID, "GuestInfo/OS/LoggedInUsersList", (uiUserCount > 0) ? szUserList : NULL); - VboxServiceWritePropInt(g_VMInfoGuestPropSvcClientID, "GuestInfo/OS/LoggedInUsers", uiUserCount); + VBoxServiceWritePropF(g_VMInfoGuestPropSvcClientID, "/VirtualBox/GuestInfo/OS/LoggedInUsersList", (uiUserCount > 0) ? szUserList : NULL); + VBoxServiceWritePropF(g_VMInfoGuestPropSvcClientID, "/VirtualBox/GuestInfo/OS/LoggedInUsers", "%u", uiUserCount); if (g_VMInfoLoggedInUsers != uiUserCount || g_VMInfoLoggedInUsers == UINT32_MAX) { @@ -272,7 +272,7 @@ * settings even if the VM aborted previously. */ if (uiUserCount == 0) - VboxServiceWriteProp(g_VMInfoGuestPropSvcClientID, "GuestInfo/OS/NoLoggedInUsers", "true"); + VBoxServiceWritePropF(g_VMInfoGuestPropSvcClientID, "/VirtualBox/GuestInfo/OS/NoLoggedInUsers", "true"); else if (g_VMInfoLoggedInUsers == 0) - VboxServiceWriteProp(g_VMInfoGuestPropSvcClientID, "GuestInfo/OS/NoLoggedInUsers", "false"); + VBoxServiceWritePropF(g_VMInfoGuestPropSvcClientID, "/VirtualBox/GuestInfo/OS/NoLoggedInUsers", "false"); } g_VMInfoLoggedInUsers = uiUserCount; @@ -327,10 +327,9 @@ nNumInterfaces = ifcfg.ifc_len / sizeof(ifreq); #endif - char szPropPath [FILENAME_MAX] = {0}; - char szTemp [FILENAME_MAX] = {0}; + char szPropPath [FILENAME_MAX]; + char szTemp [FILENAME_MAX]; int iCurIface = 0; - RTStrPrintf(szPropPath, sizeof(szPropPath), "GuestInfo/Net/Count"); - VboxServiceWritePropInt(g_VMInfoGuestPropSvcClientID, szPropPath, (nNumInterfaces > 1 ? nNumInterfaces-1 : 0)); + VBoxServiceWritePropF(g_VMInfoGuestPropSvcClientID, "/VirtualBox/GuestInfo/Net/Count", "%d", (nNumInterfaces > 1 ? nNumInterfaces-1 : 0)); /** @todo Use GetAdaptersInfo() and GetAdapterAddresses (IPv4 + IPv6) for more information. */ @@ -356,6 +355,6 @@ #endif Assert(pAddress); - RTStrPrintf(szPropPath, sizeof(szPropPath), "GuestInfo/Net/%d/V4/IP", iCurIface); - VboxServiceWriteProp(g_VMInfoGuestPropSvcClientID, szPropPath, inet_ntoa(pAddress->sin_addr)); + RTStrPrintf(szPropPath, sizeof(szPropPath), "/VirtualBox/GuestInfo/Net/%d/V4/IP", iCurIface); + VBoxServiceWritePropF(g_VMInfoGuestPropSvcClientID, szPropPath, "%s", inet_ntoa(pAddress->sin_addr)); #ifdef RT_OS_WINDOWS @@ -369,6 +368,6 @@ pAddress = (sockaddr_in *)&ifrequest[i].ifr_broadaddr; #endif - RTStrPrintf(szPropPath, sizeof(szPropPath), "GuestInfo/Net/%d/V4/Broadcast", iCurIface); - VboxServiceWriteProp(g_VMInfoGuestPropSvcClientID, szPropPath, inet_ntoa(pAddress->sin_addr)); + RTStrPrintf(szPropPath, sizeof(szPropPath), "/VirtualBox/GuestInfo/Net/%d/V4/Broadcast", iCurIface); + VBoxServiceWritePropF(g_VMInfoGuestPropSvcClientID, szPropPath, inet_ntoa(pAddress->sin_addr)); #ifdef RT_OS_WINDOWS @@ -387,6 +386,6 @@ #endif - RTStrPrintf(szPropPath, sizeof(szPropPath), "GuestInfo/Net/%d/V4/Netmask", iCurIface); - VboxServiceWriteProp(g_VMInfoGuestPropSvcClientID, szPropPath, inet_ntoa(pAddress->sin_addr)); + RTStrPrintf(szPropPath, sizeof(szPropPath), "/VirtualBox/GuestInfo/Net/%d/V4/Netmask", iCurIface); + VBoxServiceWritePropF(g_VMInfoGuestPropSvcClientID, szPropPath, inet_ntoa(pAddress->sin_addr)); if (nFlags & IFF_UP) @@ -395,6 +394,6 @@ RTStrPrintf(szTemp, sizeof(szTemp), "Down"); - RTStrPrintf(szPropPath, sizeof(szPropPath), "GuestInfo/Net/%d/Status", iCurIface); - VboxServiceWriteProp(g_VMInfoGuestPropSvcClientID, szPropPath, szTemp); + RTStrPrintf(szPropPath, sizeof(szPropPath), "/VirtualBox/GuestInfo/Net/%d/Status", iCurIface); + VBoxServiceWritePropF(g_VMInfoGuestPropSvcClientID, szPropPath, szTemp); iCurIface++; @@ -456,12 +455,12 @@ * a more formal way of shutting down the service for that to work. */ - rc = VboxServiceWriteProp(g_VMInfoGuestPropSvcClientID, "GuestInfo/OS/LoggedInUsersList", NULL); - rc = VboxServiceWritePropInt(g_VMInfoGuestPropSvcClientID, "GuestInfo/OS/LoggedInUsers", 0); + rc = VBoxServiceWritePropF(g_VMInfoGuestPropSvcClientID, "/VirtualBox/GuestInfo/OS/LoggedInUsersList", NULL); + rc = VBoxServiceWritePropF(g_VMInfoGuestPropSvcClientID, "/VirtualBox/GuestInfo/OS/LoggedInUsers", "%d", 0); if (g_VMInfoLoggedInUsers > 0) - VboxServiceWriteProp(g_VMInfoGuestPropSvcClientID, "GuestInfo/OS/NoLoggedInUsers", "true"); + VBoxServiceWritePropF(g_VMInfoGuestPropSvcClientID, "/VirtualBox/GuestInfo/OS/NoLoggedInUsers", "true"); const char *apszPat[1] = { "/VirtualBox/GuestInfo/Net/*" }; rc = VbglR3GuestPropDelSet(g_VMInfoGuestPropSvcClientID, &apszPat[0], RT_ELEMENTS(apszPat)); - rc = VboxServiceWritePropInt(g_VMInfoGuestPropSvcClientID, "GuestInfo/Net/Count", 0); + rc = VBoxServiceWritePropF(g_VMInfoGuestPropSvcClientID, "/VirtualBox/GuestInfo/Net/Count", "%d", 0); /* Disconnect from guest properties service. */