Changeset 76389 in vbox for trunk/src/VBox/HostServices

Timestamp:

Dec 23, 2018 1:39:48 AM (6 years ago)

Author:

vboxsync

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

127688

Message:

VBox/sup.h: Don't include VBox/err.h for no good reason. bugref:9344

Location:

trunk/src/VBox/HostServices

Files:

• DragAndDrop/service.cpp (modified) (1 diff)
• GuestProperties/service.cpp (modified) (1 diff)
• GuestProperties/testcase/tstGuestPropSvc.cpp (modified) (1 diff)
• SharedClipboard/service.cpp (modified) (1 diff)
• SharedClipboard/x11-clipboard.cpp (modified) (2 diffs)
• SharedOpenGL/crserver/crservice.cpp (modified) (4 diffs)

trunk/src/VBox/HostServices/DragAndDrop/service.cpp

@@ -25 +25 @@
 *   Header Files                                                                                                                 *
 *********************************************************************************************************************************/
-#ifdef LOG_GROUP
- #undef LOG_GROUP
-#endif
 #define LOG_GROUP LOG_GROUP_GUEST_DND
-
-#include <algorithm>
-#include <list>
-#include <map>
-
 #include <VBox/GuestHost/DragAndDrop.h>
 #include <VBox/GuestHost/DragAndDropDefs.h>
 #include <VBox/HostServices/Service.h>
 #include <VBox/HostServices/DragAndDropSvc.h>
+
+#include <VBox/err.h>
+
+#include <algorithm>
+#include <list>
+#include <map>
 
 #include "dndmanager.h"

trunk/src/VBox/HostServices/GuestProperties/service.cpp

@@ -49 +49 @@
 #include <iprt/cpp/utils.h>
 #include <iprt/cpp/ministring.h>
-#include <iprt/err.h>
+#include <VBox/err.h>
 #include <iprt/mem.h>
 #include <iprt/req.h>

trunk/src/VBox/HostServices/GuestProperties/testcase/tstGuestPropSvc.cpp

@@ -22 +22 @@
 *********************************************************************************************************************************/
 #include <VBox/HostServices/GuestPropertySvc.h>
+#include <VBox/err.h>
 #include <iprt/test.h>
 #include <iprt/time.h>

trunk/src/VBox/HostServices/SharedClipboard/service.cpp

@@ -82 +82 @@
 #include <iprt/assert.h>
 #include <iprt/critsect.h>
+#include <VBox/err.h>
 #include <VBox/vmm/ssm.h>
 

trunk/src/VBox/HostServices/SharedClipboard/x11-clipboard.cpp

@@ -30 +30 @@
 #include <VBox/GuestHost/SharedClipboard.h>
 #include <VBox/HostServices/VBoxClipboardSvc.h>
+#include <VBox/err.h>
 
 #include "VBoxClipboard.h"
 
+
+/*********************************************************************************************************************************
+*   Structures and Typedefs                                                                                                      *
+*********************************************************************************************************************************/
 struct _VBOXCLIPBOARDREQFROMVBOX;
 typedef struct _VBOXCLIPBOARDREQFROMVBOX VBOXCLIPBOARDREQFROMVBOX;
@@ -60 +65 @@
     bool fShuttingDown;
 };
+
+
 
 /**

trunk/src/VBox/HostServices/SharedOpenGL/crserver/crservice.cpp

@@ -16 +16 @@
  */
 
+/*********************************************************************************************************************************
+*   Header Files                                                                                                                 *
+*********************************************************************************************************************************/
+#define LOG_GROUP LOG_GROUP_SHARED_CROPENGL
+
 #define __STDC_CONSTANT_MACROS  /* needed for a definition in iprt/string.h */
-
-#define LOG_GROUP LOG_GROUP_SHARED_CROPENGL
 
 #include <iprt/assert.h>
@@ -29 +32 @@
 #include <iprt/thread.h>
 
+#include <VBox/err.h>
 #include <VBox/hgcmsvc.h>
 #include <VBox/log.h>
@@ -42 +46 @@
 #include "cr_server.h"
 
+#ifndef RT_OS_WINDOWS
+# define DWORD int
+# define WINAPI
+#endif
+
+
+/*********************************************************************************************************************************
+*   Global Variables                                                                                                             *
+*********************************************************************************************************************************/
 PVBOXHGCMSVCHELPERS g_pHelpers;
 static IConsole* g_pConsole = NULL;
@@ -48 +61 @@
 static uint32_t g_u32fCrHgcmDisabled = 0;
 
-#ifndef RT_OS_WINDOWS
-# define DWORD int
-# define WINAPI
-#endif
-
-static const char* gszVBoxOGLSSMMagic = "***OpenGL state data***";
+static const char *gszVBoxOGLSSMMagic = "***OpenGL state data***";
 
 /* Used to process guest calls exceeding maximum allowed HGCM call size in a sequence of smaller calls */