Changeset 95961 in vbox

Timestamp:

Aug 1, 2022 2:08:20 PM (2 years ago)

Author:

vboxsync

Message:

Additions/VBoxTray: Got rid of VBoxDisplay.h (renamed to VBoxTrayInternal.h, more stuff added later), as I also tripped over this several times in the past already, log include fixes.

Location:

trunk/src/VBox/Additions/WINNT/VBoxTray

Files:

• VBoxDispIf.cpp (modified) (1 diff)
• VBoxDisplay.cpp (modified) (1 diff)
• VBoxDnDEnumFormat.cpp (modified) (1 diff)
• VBoxHostVersion.cpp (modified) (1 diff)
• VBoxIPC.cpp (modified) (2 diffs)
• VBoxLA.cpp (modified) (1 diff)
• VBoxSeamless.cpp (modified) (1 diff)
• VBoxTrayInternal.h (moved) (moved from trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxDisplay.h ) (2 diffs)
• VBoxVRDP.cpp (modified) (1 diff)

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

@@ -22 +22 @@
 #define _WIN32_WINNT 0x0601
 #include "VBoxTray.h"
+#include "VBoxTrayInternal.h"
 
 #include <iprt/alloca.h>

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

@@ -29 +29 @@
 # include <iprt/asm.h>
 #endif
+#include <iprt/log.h>
 #include <iprt/system.h>
 

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

@@ -20 +20 @@
 *   Header Files                                                                                                                 *
 *********************************************************************************************************************************/
+#define LOG_GROUP LOG_GROUP_GUEST_DND
+#include <VBox/log.h>
+
 #include <iprt/win/windows.h>
 #include <new> /* For bad_alloc. */

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

@@ -17 +17 @@
  */
 
+#include <VBox/log.h>
+#include <VBox/VBoxGuestLib.h>
+
 #include "VBoxHostVersion.h"
 #include "VBoxTray.h"
 #include "VBoxHelpers.h"
 
-#include <VBox/VBoxGuestLib.h>
 
 

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

@@ -22 +22 @@
 *   Header Files                                                                                                                 *
 *********************************************************************************************************************************/
-#include <iprt/win/windows.h>
-#include "VBoxTray.h"
-#include "VBoxTrayMsg.h"
-#include "VBoxHelpers.h"
-#include "VBoxIPC.h"
-
 #include <iprt/asm.h>
 #include <iprt/assert.h>
@@ -35 +29 @@
 #include <iprt/list.h>
 #include <iprt/localipc.h>
+#include <iprt/log.h>
 #include <iprt/mem.h>
 #include <iprt/process.h>
+#include <iprt/win/windows.h>
+
+#include "VBoxTray.h"
+#include "VBoxTrayMsg.h"
+#include "VBoxHelpers.h"
+#include "VBoxIPC.h"
 
 

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

@@ -24 +24 @@
 #include <iprt/list.h>
 #include <iprt/ldr.h>
+#include <iprt/log.h>
 #include <iprt/utf16.h>
 

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

@@ -22 +22 @@
 #include <iprt/assert.h>
 #include <iprt/ldr.h>
+#include <iprt/log.h>
 #include <iprt/mem.h>
 #include <iprt/system.h>

trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxTrayInternal.h

@@ -16 +16 @@
  */
 
-#ifndef GA_INCLUDED_SRC_WINNT_VBoxTray_VBoxDisplay_h
-#define GA_INCLUDED_SRC_WINNT_VBoxTray_VBoxDisplay_h
+#ifndef GA_INCLUDED_SRC_WINNT_VBoxTray_Internal_h
+#define GA_INCLUDED_SRC_WINNT_VBoxTray_Internal_h
 #ifndef RT_WITHOUT_PRAGMA_ONCE
 # pragma once
 #endif
-
-/** @todo r=bird: This file has the same name as ../include/VBoxDisplay.h
- *        which some of the VBoxTray source files also wish to include.
- *
- *        The result is a certifiable mess. To quote a Tina Fey's character in
- *        Ponyo: "BAKA BAKA BAKA BAKA BAKA BAKA BAKA BAKA BAKA BAKA BAKA!!!"
- *
- *        There are too many 'ing header files here.  Most of them can be merged
- *        into VBoxTray.h (or a VBoxTrayInternal.h file).
- *
- */
-
 
 DWORD VBoxDisplayGetCount();
@@ -48 +36 @@
 #endif
 
-#endif /* !GA_INCLUDED_SRC_WINNT_VBoxTray_VBoxDisplay_h */
+#endif /* !GA_INCLUDED_SRC_WINNT_VBoxTray_Internal_h */

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

@@ -18 +18 @@
 #include <iprt/assert.h>
 #include <iprt/ldr.h>
+#include <VBox/log.h>
 
 /* 0x0501 for SPI_SETDROPSHADOW */