Changeset 12724 in vbox for trunk/src/VBox/Additions/WINNT/VBoxService/VBoxVMInfo.cpp

Timestamp:

Sep 25, 2008 12:13:12 PM (16 years ago)

Author:

vboxsync

Message:

VBoxService: Implemented temporary solution for getting rid of invalid guest properties when the VM goes down (reboot/shutdown).

File:

• trunk/src/VBox/Additions/WINNT/VBoxService/VBoxVMInfo.cpp (modified) (5 diffs)

trunk/src/VBox/Additions/WINNT/VBoxService/VBoxVMInfo.cpp

@@ -23 +23 @@
 {
     int rc = VINF_SUCCESS;
-    if((!a_pCtx) || (!a_pszKey))
-       return VERR_INVALID_PARAMETER;
+    Assert(a_pCtx);
+    Assert(a_pszKey);
+    /* Not checking for a valid a_pszValue is intentional. */
 
     char szKeyTemp [_MAX_PATH] = {0};
@@ -59 +60 @@
 }
 
-int vboxVMInfoWritePropInt(VBOXINFORMATIONCONTEXT* a_pCtx, char *a_pszKey, int a_iValue )
+int vboxVMInfoWritePropInt(VBOXINFORMATIONCONTEXT* a_pCtx, char *a_pszKey, int a_iValue)
 {
+    Assert(a_pCtx);
+    Assert(a_pszKey);
+
     char szBuffer[_MAX_PATH] = {0}; /** @todo r=bird: this is a bit excessive (the size) */
     itoa(a_iValue, szBuffer, 10);
@@ -69 +73 @@
 int vboxVMInfoInit(const VBOXSERVICEENV *pEnv, void **ppInstance, bool *pfStartThread)
 {
+    Assert(pEnv);
+    Assert(ppInstance);
+
     Log(("vboxVMInfoThread: Init.\n"));
 
@@ -100 +107 @@
 void vboxVMInfoDestroy(const VBOXSERVICEENV *pEnv, void *pInstance)
 {
+    Assert(pEnv);
+
     VBOXINFORMATIONCONTEXT *pCtx = (VBOXINFORMATIONCONTEXT *)pInstance;
+    Assert(pCtx);
 
+    /* @todo Temporary solution: Zap all values which are not valid anymore when VM goes down (reboot/shutdown).
+     * Needs to be replaced with "temporary properties" later. */
+    char szPropPath [_MAX_PATH+1] = {0};
+    char*pPtr = &szPropPath[0];
+
+    vboxVMInfoWriteProp(pCtx, "GuestInfo/OS/LoggedInUsersList", "");
+    vboxVMInfoWritePropInt(pCtx, "GuestInfo/OS/LoggedInUsers", 0);
+
+    RTStrPrintf(szPropPath, sizeof(szPropPath), "/VirtualBox/GuestInfo/Net/*");
+    VbglR3GuestPropDelTree(pCtx->iInfoSvcClientID, &pPtr, 1);
+    vboxVMInfoWritePropInt(pCtx, "GuestInfo/Net/Count", 0);
+
+    /* Disconnect from guest properties API. */
     int rc = VbglR3GuestPropDisconnect(pCtx->iInfoSvcClientID);
     if (!RT_SUCCESS(rc))
@@ -112 +135 @@
 unsigned __stdcall vboxVMInfoThread(void *pInstance)
 {
+    Assert(pInstance);
+
     VBOXINFORMATIONCONTEXT *pCtx = (VBOXINFORMATIONCONTEXT *)pInstance;
     bool fTerminate = false;