Changeset 85124 in vbox for trunk/src/VBox/HostDrivers/Support

Timestamp:

Jul 8, 2020 9:13:30 PM (5 years ago)

Author:

vboxsync

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

139064

Message:

*: Use DECL_HIDDEN_DATA for data, DECLHIDDEN will soon be exclusively for functions. bugref:9794

Location:

trunk/src/VBox/HostDrivers/Support

Files:

• SUPLib.cpp (modified) (2 diffs)
• SUPLibInternal.h (modified) (1 diff)
• darwin/SUPDrv-darwin.cpp (modified) (1 diff)
• posix/SUPR3HardenedMain-posix.cpp (modified) (1 diff)

trunk/src/VBox/HostDrivers/Support/SUPLib.cpp

@@ -97 +97 @@
  * Well, at least parts of it, specifically the parts that are being handed over
  * via the pre-init mechanism from the hardened executable stub.  */
-SUPLIBDATA                      g_supLibData =
+DECL_HIDDEN_DATA(SUPLIBDATA)    g_supLibData =
 {
     /*.hDevice              = */    SUP_HDEVICE_NIL,
@@ -116 +116 @@
  * @todo This will probably deserve it's own session or some other good solution...
  */
-DECLEXPORT(PSUPGLOBALINFOPAGE)  g_pSUPGlobalInfoPage;
+DECLEXPORT(PSUPGLOBALINFOPAGE)      g_pSUPGlobalInfoPage;
 /** Address of the ring-0 mapping of the GIP. */
-PSUPGLOBALINFOPAGE              g_pSUPGlobalInfoPageR0;
+PSUPGLOBALINFOPAGE                  g_pSUPGlobalInfoPageR0;
 /** The physical address of the GIP. */
-static RTHCPHYS                 g_HCPhysSUPGlobalInfoPage = NIL_RTHCPHYS;
+static RTHCPHYS                     g_HCPhysSUPGlobalInfoPage = NIL_RTHCPHYS;
 
 /** The negotiated cookie. */
-uint32_t                        g_u32Cookie = 0;
+DECL_HIDDEN_DATA(uint32_t)          g_u32Cookie = 0;
 /** The negotiated session cookie. */
-uint32_t                        g_u32SessionCookie;
+DECL_HIDDEN_DATA(uint32_t)          g_u32SessionCookie;
 /** Session handle. */
-PSUPDRVSESSION                  g_pSession;
+DECL_HIDDEN_DATA(PSUPDRVSESSION)    g_pSession;
 /** R0 SUP Functions used for resolving referenced to the SUPR0 module. */
-PSUPQUERYFUNCS                  g_pSupFunctions;
+DECL_HIDDEN_DATA(PSUPQUERYFUNCS)    g_pSupFunctions;
 
 /** PAGE_ALLOC_EX sans kernel mapping support indicator. */
-static bool                     g_fSupportsPageAllocNoKernel = true;
+static bool                         g_fSupportsPageAllocNoKernel = true;
 /** Fake mode indicator. (~0 at first, 0 or 1 after first test) */
-uint32_t                        g_uSupFakeMode = UINT32_MAX;
+DECL_HIDDEN_DATA(uint32_t)          g_uSupFakeMode = UINT32_MAX;
 
 

trunk/src/VBox/HostDrivers/Support/SUPLibInternal.h

@@ -339 +339 @@
 *   Global Variables                                                           *
 *******************************************************************************/
-extern DECLHIDDEN(uint32_t)             g_u32Cookie;
-extern DECLHIDDEN(uint32_t)             g_u32SessionCookie;
-extern DECLHIDDEN(SUPLIBDATA)           g_supLibData;
-extern DECLHIDDEN(uint32_t)             g_uSupFakeMode;
-extern DECLHIDDEN(PSUPGLOBALINFOPAGE)   g_pSUPGlobalInfoPageR0;
+extern DECL_HIDDEN_DATA(uint32_t)               g_u32Cookie;
+extern DECL_HIDDEN_DATA(uint32_t)               g_u32SessionCookie;
+extern DECL_HIDDEN_DATA(SUPLIBDATA)             g_supLibData;
+extern DECL_HIDDEN_DATA(uint32_t)               g_uSupFakeMode;
+extern DECL_HIDDEN_DATA(PSUPGLOBALINFOPAGE)     g_pSUPGlobalInfoPageR0;
 #ifdef VBOX_INCLUDED_SRC_Support_SUPDrvIOC_h
-extern DECLHIDDEN(PSUPQUERYFUNCS)       g_pSupFunctions;
-#endif
-extern DECLHIDDEN(SUPR3HARDENEDMAINSTATE) g_enmSupR3HardenedMainState;
+extern DECL_HIDDEN_DATA(PSUPQUERYFUNCS)         g_pSupFunctions;
+#endif
+extern DECL_HIDDEN_DATA(SUPR3HARDENEDMAINSTATE) g_enmSupR3HardenedMainState;
 #ifdef RT_OS_WINDOWS
-extern DECLHIDDEN(bool)                 g_fSupEarlyProcessInit;
+extern DECL_HIDDEN_DATA(bool)                   g_fSupEarlyProcessInit;
 #endif
 

trunk/src/VBox/HostDrivers/Support/darwin/SUPDrv-darwin.cpp

@@ -199 +199 @@
 
 KMOD_EXPLICIT_DECL(VBoxDrv, VBOX_VERSION_STRING, _start, _stop)
-DECLHIDDEN(kmod_start_func_t *) _realmain = VBoxDrvDarwinStart;
-DECLHIDDEN(kmod_stop_func_t *)  _antimain = VBoxDrvDarwinStop;
-DECLHIDDEN(int)                 _kext_apple_cc = __APPLE_CC__;
+DECL_HIDDEN_DATA(kmod_start_func_t *) _realmain = VBoxDrvDarwinStart;
+DECL_HIDDEN_DATA(kmod_stop_func_t *)  _antimain = VBoxDrvDarwinStop;
+DECL_HIDDEN_DATA(int)                 _kext_apple_cc = __APPLE_CC__;
 RT_C_DECLS_END
 

trunk/src/VBox/HostDrivers/Support/posix/SUPR3HardenedMain-posix.cpp

@@ -139 +139 @@
 RT_C_DECLS_BEGIN
 /** Resume patch for dlopen(), jumped to form assembly stub. */
-DECLHIDDEN(PFNDLOPEN)  g_pfnDlopenReal  = NULL;
+DECL_HIDDEN_DATA(PFNDLOPEN)     g_pfnDlopenReal  = NULL;
 #ifdef SUP_HARDENED_WITH_DLMOPEN
 /** Resume patch for dlmopen(), jumped to form assembly stub. */
-DECLHIDDEN(PFNDLMOPEN) g_pfnDlmopenReal = NULL;
+DECL_HIDDEN_DATA(PFNDLMOPEN)    g_pfnDlmopenReal = NULL;
 #endif
 RT_C_DECLS_END