Changeset 95960 in vbox for trunk/src/VBox/Additions

Timestamp:

Aug 1, 2022 1:54:40 PM (3 years ago)

Author:

vboxsync

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

152717

Message:

Additions/VBoxTray: More logging cleanups: don't define default stuff which is already defined by default; include files reordering (IPRT/ first, VBox/ second).

Location:

trunk/src/VBox/Additions/WINNT/VBoxTray

Files:

• Makefile.kmk (modified) (1 diff)
• VBoxDisplay.cpp (modified) (1 diff)
• VBoxDnDDataObject.cpp (modified) (2 diffs)
• VBoxDnDDropTarget.cpp (modified) (2 diffs)
• VBoxDnDEnumFormat.cpp (modified) (2 diffs)
• VBoxHostVersion.cpp (modified) (1 diff)
• VBoxIPC.cpp (modified) (1 diff)
• VBoxLA.cpp (modified) (2 diffs)
• VBoxSeamless.cpp (modified) (1 diff)
• VBoxVRDP.cpp (modified) (1 diff)

trunk/src/VBox/Additions/WINNT/VBoxTray/Makefile.kmk

@@ -86 +86 @@
 endif
 ifdef VBOX_WITH_WDDM
- VBoxTray_DEFS   += VBOX_WITH_WDDM
- # VBoxTray_DEFS   += LOG_ENABLED
+ VBoxTray_DEFS    += VBOX_WITH_WDDM
  VBoxTray_SOURCES += $(PATH_ROOT)/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/shared/VBoxDispKmt.cpp
 endif

trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxDisplay.cpp

@@ -30 +30 @@
 #endif
 #include <iprt/system.h>
-
-#ifdef DEBUG /** @todo r=bird: these are all default values. sigh. */
-# define LOG_ENABLED
-# define LOG_GROUP LOG_GROUP_DEFAULT
-#endif
-#include <VBox/log.h>
 
 #include <VBoxDisplay.h>

trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxDnDDataObject.cpp

@@ -18 +18 @@
 
 #define LOG_GROUP LOG_GROUP_GUEST_DND
+#include <VBox/log.h>
+
 #include <iprt/win/windows.h>
 #include <new> /* For bad_alloc. */
@@ -26 +28 @@
 #include <iprt/uri.h>
 #include <iprt/utf16.h>
-
-#include <VBox/log.h>
 
 #include "VBoxTray.h"

trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxDnDDropTarget.cpp

@@ -17 +17 @@
 
 #define LOG_GROUP LOG_GROUP_GUEST_DND
+#include <VBox/log.h>
+
 #include <iprt/win/windows.h>
 #include <new> /* For bad_alloc. */
@@ -31 +33 @@
 #include <iprt/utf16.h>
 #include <iprt/uri.h>
-#include <VBox/log.h>
-
 
 

trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxDnDEnumFormat.cpp

@@ -16 +16 @@
  */
 
+
+/*********************************************************************************************************************************
+*   Header Files                                                                                                                 *
+*********************************************************************************************************************************/
 #include <iprt/win/windows.h>
 #include <new> /* For bad_alloc. */
@@ -22 +26 @@
 #include "VBoxHelpers.h"
 #include "VBoxDnD.h"
-
-#ifdef DEBUG
-# define LOG_ENABLED
-# define LOG_GROUP LOG_GROUP_DEFAULT
-#endif
-#include <VBox/log.h>
-
 
 

trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxHostVersion.cpp

@@ -22 +22 @@
 
 #include <VBox/VBoxGuestLib.h>
-
-#ifdef DEBUG
-# define LOG_ENABLED
-# define LOG_GROUP LOG_GROUP_DEFAULT
-#endif
-#include <VBox/log.h>
-
 
 

trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxIPC.cpp

@@ -37 +37 @@
 #include <iprt/mem.h>
 #include <iprt/process.h>
-
-#ifdef DEBUG /** @todo r=bird: these are all default settings...  */
-# define LOG_ENABLED
-# define LOG_GROUP LOG_GROUP_DEFAULT
-#endif
-#include <VBox/log.h>
 
 

trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxLA.cpp

@@ -16 +16 @@
  */
 
-#define _WIN32_WINNT 0x0501
-#include <iprt/win/windows.h>
-
-#include "VBoxTray.h"
-#include "VBoxLA.h"
-
+
+/*********************************************************************************************************************************
+*   Header Files                                                                                                                 *
+*********************************************************************************************************************************/
 #include <iprt/assert.h>
 #include <iprt/alloc.h>
@@ -28 +26 @@
 #include <iprt/utf16.h>
 
-#ifdef DEBUG
-# define LOG_ENABLED
-# define LOG_GROUP LOG_GROUP_DEFAULT
-#endif
-#include <VBox/log.h>
-
-
-
+#define _WIN32_WINNT 0x0501
+#include <iprt/win/windows.h>
+
+#include "VBoxTray.h"
+#include "VBoxLA.h"
+
+
+/*********************************************************************************************************************************
+*   Defines                                                                                                                      *
+*********************************************************************************************************************************/
 #define REG_KEY_LEN 1024
 #define MAX_CLIENT_NAME_CHARS 1024

trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxSeamless.cpp

@@ -20 +20 @@
 *   Header Files                                                                                                                 *
 *********************************************************************************************************************************/
-#define LOG_GROUP LOG_GROUP_DEFAULT
-#define _WIN32_WINNT 0x0500
-#include <iprt/win/windows.h>
-
-#include <VBox/log.h>
-
 #include <iprt/assert.h>
 #include <iprt/ldr.h>
 #include <iprt/mem.h>
 #include <iprt/system.h>
+
+#define _WIN32_WINNT 0x0500
+#include <iprt/win/windows.h>
 
 #include <VBoxDisplay.h> /** @todo r=bird: Presumably the ../include/VBoxDisplay.h file rather than ./VBoxDisplay.h. WTF???  */

trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxVRDP.cpp

@@ -16 +16 @@
  */
 
+#include <iprt/assert.h>
+#include <iprt/ldr.h>
+
 /* 0x0501 for SPI_SETDROPSHADOW */
 #define _WIN32_WINNT 0x0501
 #include <iprt/win/windows.h>
+
+#include <VBox/VMMDev.h> /* for VMMDEV_EVENT_VRDP and VRDP_EXPERIENCE_LEVEL_XXX */
+
 #include "VBoxTray.h"
 #include "VBoxHelpers.h"
 #include "VBoxVRDP.h"
-
-#include <VBox/VMMDev.h> /* for VMMDEV_EVENT_VRDP and VRDP_EXPERIENCE_LEVEL_XXX */
-#ifdef DEBUG
-# define LOG_ENABLED
-# define LOG_GROUP LOG_GROUP_DEFAULT
-#endif
-#include <VBox/log.h>
-
-#include <iprt/assert.h>
-#include <iprt/ldr.h>