Changeset 76380 in vbox

Timestamp:

Dec 22, 2018 10:52:41 PM (6 years ago)

Author:

vboxsync

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

127678

Message:

VBox/com/microatl.h: Include errcore.h rather than err.h for RT_FAILURE(). bugref: 9344

Location:

trunk

Files:

• include/VBox/com/microatl.h (modified) (1 diff)
• src/VBox/Main/src-client/VirtualBoxClientImpl.cpp (modified) (1 diff)
• src/VBox/Main/src-server/win/HostPowerWin.cpp (modified) (1 diff)

trunk/include/VBox/com/microatl.h

@@ -27 +27 @@
 #define ___VBox_com_microatl_h
 
-#include <VBox/cdefs.h> /* VBOX_STRICT */
+#include <VBox/cdefs.h>   /* VBOX_STRICT */
 #include <iprt/assert.h>
 #include <iprt/critsect.h>
-#include <iprt/err.h>
+#include <iprt/errcore.h> /* RT_FAILURE() */
 
 #include <iprt/win/windows.h>

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

@@ -32 +32 @@
 #include <iprt/utf16.h>
 #ifdef RT_OS_WINDOWS
+# include <iprt/err.h>
 # include <iprt/ldr.h>
 # include <msi.h>

trunk/src/VBox/Main/src-server/win/HostPowerWin.cpp

@@ -29 +29 @@
 
 #include <VBox/com/ptr.h>
+#include <iprt/err.h>
 #include "HostPower.h"
 #include "Logging.h"
 
+
+/*********************************************************************************************************************************
+*   Global Variables                                                                                                             *
+*********************************************************************************************************************************/
 static WCHAR gachWindowClassName[] = L"VBoxPowerNotifyClass";
+
 
 HostPowerServiceWin::HostPowerServiceWin(VirtualBox *aVirtualBox) : HostPowerService(aVirtualBox), mThread(NIL_RTTHREAD)