Changeset 78967 in vbox for trunk/src

Timestamp:

Jun 4, 2019 2:39:36 PM (6 years ago)

Author:

vboxsync

Message:

Main,GUI: S_FALSE is defined by com/defs.h now.

Location:

trunk/src/VBox

Files:

• Frontends/VirtualBox/src/VBoxFBOverlay.h (modified) (1 diff)
• Main/src-client/DisplayImpl.cpp (modified) (2 diffs)
• Main/src-server/UnattendedImpl.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/VBoxFBOverlay.h

@@ -57 +57 @@
 # include <iprt/stream.h>
 #endif /* VBOXVHWA_PROFILE_FPS */
-
-#ifndef S_FALSE
-# define S_FALSE ((HRESULT)1L)
-#endif
 
 #ifdef DEBUG_misha

trunk/src/VBox/Main/src-client/DisplayImpl.cpp

@@ -3644 +3644 @@
 #ifdef VBOX_WITH_VIDEOHWACCEL
 
-#ifndef S_FALSE
-# define S_FALSE ((HRESULT)1L)
-#endif
-
 int Display::i_handleVHWACommandProcess(int enmCmd, bool fGuestCmd, VBOXVHWACMD RT_UNTRUSTED_VOLATILE_GUEST *pCommand)
 {
@@ -3682 +3678 @@
     return pDrv->pDisplay->i_handleVHWACommandProcess(enmCmd, fGuestCmd, pCommand);
 }
-#endif
-
+
+#endif /* VBOX_WITH_VIDEOHWACCEL */
 #ifdef VBOX_WITH_CRHGSMI
+
 void Display::i_handleCrHgsmiCommandCompletion(int32_t result, uint32_t u32Function, PVBOXHGCMSVCPARM pParam)
 {

trunk/src/VBox/Main/src-server/UnattendedImpl.cpp

@@ -40 +40 @@
 
 using namespace std;
-
-/* XPCOM doesn't define S_FALSE. */
-#ifndef S_FALSE
-# define S_FALSE ((HRESULT)1)
-#endif