Changeset 28931 in vbox

Timestamp:

Apr 30, 2010 12:04:06 PM (15 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

60900

Message:

Frontends: Use VBOX_E_DONT_CALL_AGAIN where appropriate with IVirtualBoxCallback.

Location:

trunk/src/VBox/Frontends

Files:

• VBoxHeadless/VBoxHeadless.cpp (modified) (4 diffs)
• VBoxManage/VBoxManageGuestProp.cpp (modified) (8 diffs)
• VBoxSDL/VBoxSDL.cpp (modified) (4 diffs)
• VirtualBox/src/globals/VBoxGlobal.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VBoxHeadless/VBoxHeadless.cpp

@@ -142 +142 @@
     STDMETHOD(OnMachineStateChange)(IN_BSTR machineId, MachineState_T state)
     {
-        return S_OK;
+        return VBOX_E_DONT_CALL_AGAIN;
     }
 
     STDMETHOD(OnMachineDataChange)(IN_BSTR machineId)
     {
-        return S_OK;
+        return VBOX_E_DONT_CALL_AGAIN;
     }
 
@@ -157 +157 @@
             return E_INVALIDARG;
         *changeAllowed = TRUE;
-        return S_OK;
+        return VBOX_E_DONT_CALL_AGAIN;
     }
 
     STDMETHOD(OnExtraDataChange)(IN_BSTR machineId, IN_BSTR key, IN_BSTR value)
     {
-        return S_OK;
+        return VBOX_E_DONT_CALL_AGAIN;
     }
 
@@ -168 +168 @@
                                   BOOL registered)
     {
-        return S_OK;
+        return VBOX_E_DONT_CALL_AGAIN;
     }
 
     STDMETHOD(OnMachineRegistered)(IN_BSTR machineId, BOOL registered)
     {
-        return S_OK;
+        return VBOX_E_DONT_CALL_AGAIN;
     }
 
     STDMETHOD(OnSessionStateChange)(IN_BSTR machineId, SessionState_T state)
     {
-        return S_OK;
+        return VBOX_E_DONT_CALL_AGAIN;
     }
 
     STDMETHOD(OnSnapshotTaken)(IN_BSTR aMachineId, IN_BSTR aSnapshotId)
     {
-        return S_OK;
+        return VBOX_E_DONT_CALL_AGAIN;
     }
 
     STDMETHOD(OnSnapshotDeleted)(IN_BSTR aMachineId, IN_BSTR aSnapshotId)
     {
-        return S_OK;
+        return VBOX_E_DONT_CALL_AGAIN;
     }
 
     STDMETHOD(OnSnapshotChange)(IN_BSTR aMachineId, IN_BSTR aSnapshotId)
     {
-        return S_OK;
+        return VBOX_E_DONT_CALL_AGAIN;
     }
 
@@ -256 +256 @@
             }
         }
-#endif /* VBOX_WITH_GUEST_PROPS */
-        return S_OK;
+        return S_OK;
+#else  /* !VBOX_WITH_GUEST_PROPS */
+        return VBOX_E_DONT_CALL_AGAIN;
+#endif /* !VBOX_WITH_GUEST_PROPS */
     }
 

trunk/src/VBox/Frontends/VBoxManage/VBoxManageGuestProp.cpp

@@ -89 +89 @@
                                     MachineState_T state)
     {
-        return S_OK;
+        return VBOX_E_DONT_CALL_AGAIN;
     }
 
     STDMETHOD(OnMachineDataChange)(IN_BSTR machineId)
     {
-        return S_OK;
+        return VBOX_E_DONT_CALL_AGAIN;
     }
 
@@ -105 +105 @@
             return E_INVALIDARG;
         *changeAllowed = TRUE;
-        return S_OK;
+        return VBOX_E_DONT_CALL_AGAIN;
     }
 
@@ -111 +111 @@
                                  IN_BSTR value)
     {
-        return S_OK;
+        return VBOX_E_DONT_CALL_AGAIN;
     }
 
@@ -120 +120 @@
         NOREF(mediaType);
         NOREF(registered);
-        return S_OK;
+        return VBOX_E_DONT_CALL_AGAIN;
     }
 
     STDMETHOD(OnMachineRegistered)(IN_BSTR machineId, BOOL registered)
     {
-        return S_OK;
+        return VBOX_E_DONT_CALL_AGAIN;
     }
 
@@ -131 +131 @@
                                     SessionState_T state)
     {
-        return S_OK;
+        return VBOX_E_DONT_CALL_AGAIN;
     }
 
@@ -137 +137 @@
                                IN_BSTR aSnapshotId)
     {
-        return S_OK;
+        return VBOX_E_DONT_CALL_AGAIN;
     }
 
@@ -143 +143 @@
                                  IN_BSTR aSnapshotId)
     {
-        return S_OK;
+        return VBOX_E_DONT_CALL_AGAIN;
     }
 
@@ -149 +149 @@
                                 IN_BSTR aSnapshotId)
     {
-        return S_OK;
+        return VBOX_E_DONT_CALL_AGAIN;
     }
 

trunk/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp

@@ -269 +269 @@
     STDMETHOD(OnMachineStateChange)(IN_BSTR machineId, MachineState_T state)
     {
-        return S_OK;
+        return VBOX_E_DONT_CALL_AGAIN;
     }
 
     STDMETHOD(OnMachineDataChange)(IN_BSTR machineId)
     {
-        return S_OK;
+        return VBOX_E_DONT_CALL_AGAIN;
     }
 
@@ -284 +284 @@
             return E_INVALIDARG;
         *changeAllowed = TRUE;
-        return S_OK;
+        return VBOX_E_DONT_CALL_AGAIN;
     }
 
@@ -313 +313 @@
             }
         }
+        return S_OK;
+#else
+        return VBOX_E_DONT_CALL_AGAIN;
 #endif /* VBOX_SECURELABEL */
-        return S_OK;
     }
 
@@ -323 +325 @@
         NOREF(mediaType);
         NOREF(registered);
-        return S_OK;
+        return VBOX_E_DONT_CALL_AGAIN;
     }
 
     STDMETHOD(OnMachineRegistered)(IN_BSTR machineId, BOOL registered)
     {
-        return S_OK;
+        return VBOX_E_DONT_CALL_AGAIN;
     }
 
     STDMETHOD(OnSessionStateChange)(IN_BSTR machineId, SessionState_T state)
     {
-        return S_OK;
+        return VBOX_E_DONT_CALL_AGAIN;
     }
 
     STDMETHOD(OnSnapshotTaken)(IN_BSTR aMachineId, IN_BSTR aSnapshotId)
     {
-        return S_OK;
+        return VBOX_E_DONT_CALL_AGAIN;
     }
 
     STDMETHOD(OnSnapshotDeleted)(IN_BSTR aMachineId, IN_BSTR aSnapshotId)
     {
-        return S_OK;
+        return VBOX_E_DONT_CALL_AGAIN;
     }
 
     STDMETHOD(OnSnapshotChange)(IN_BSTR aMachineId, IN_BSTR aSnapshotId)
     {
-        return S_OK;
+        return VBOX_E_DONT_CALL_AGAIN;
     }
 
     STDMETHOD(OnGuestPropertyChange)(IN_BSTR machineId, IN_BSTR key, IN_BSTR value, IN_BSTR flags)
     {
-        return S_OK;
+        return VBOX_E_DONT_CALL_AGAIN;
     }
 

trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp

@@ -423 +423 @@
         Q_UNUSED (type);
         Q_UNUSED (registered);
-        return S_OK;
+        return VBOX_E_DONT_CALL_AGAIN;
     }
 
@@ -469 +469 @@
                                       IN_BSTR /* flags */)
     {
-        return S_OK;
+        return VBOX_E_DONT_CALL_AGAIN;
     }