VMM,Doxyfile.Core: Doxygen fixes for .cpp.h files.

git-svn-id: https://www.virtualbox.org/svn/vbox/trunk@94620 cfe28804-0f27-0410-a406-dd0f0b0b656f

2 files changed, 44 insertions, 52 deletions

diff --git a/Doxyfile.Core b/Doxyfile.Core
index 7dfc71ec78c..bbd3937353d 100644
--- a/Doxyfile.Core
+++ b/Doxyfile.Core
@@ -559,6 +559,11 @@ PREDEFINED             =  \
     R3_ARCH_BITS=HC_ARCH_BITS \
     R0_ARCH_BITS=HC_ARCH_BITS \
     RTDECL(type)=type \
+    RTRCDECL(type)=type \
+    RTR0DECL(type)=type \
+    RTR3DECL(type)=type \
+    RTDATADECL(type)=type \
+    RT_DECL_NTAPI(type)=type \
     RT_EXPORT_SYMBOL(name)= \
     \
     RT_SRC_POS=1 \
@@ -613,27 +618,45 @@ PREDEFINED += \
     DECLNORETURN(type)=type \
     RTCALL= \
     \
-    APICBOTHCBDECL(type)=type \
     VBOXCALL= \
-    DECLVBGL(type)=type \
+    APICBOTHCBDECL(type)=type \
+    DBGDECL(type)=type \
     DECLR0VBGL(type)=type \
+    DECLSPEC_HIDDEN= \
+    DECLVBGL(type)=type \
+    DISDECL(type)=type \
+    GMMR0DECL(type)=type \
+    GMMR3DECL(type)=type \
+    GVMMR0DECL(type)=type \
+    INTNETR0DECL(type)=type \
+    INTNETR3DECL(type)=type \
+    PDMBOTHCBDECL(type)=type \
+    SUPDECL(type)=type \
+    SUPR0DECL(type)=type \
+    SUPR3DECL(type)=type \
+    SUPRCDECL(type)=type \
     USBLIB_DECL(type)=type \
+    VBGLR3DECL(type)=type \
+    VBOX_DND_FN_DECL_LOG(x)=x \
+    VBOXDDU_DECL(type)=type \
+    VMM_INT_DECL(type)=type \
     VMMDECL(type)=type \
-    VMMR0DECL(type)=type \
-    VMMR3DECL(type)=type \
-    VMMRCDECL(type)=type \
-    VMMRZDECL(type)=type \
     VMMR0_INT_DECL(type)=type \
+    VMMR0DECL(type)=type \
     VMMR3_INT_DECL(type)=type \
+    VMMR3DECL(type)=type \
     VMMRC_INT_DECL(type)=type \
+    VMMRCDECL(type)=type \
     VMMRZ_INT_DECL(type)=type \
-    GMMR0DECL(type)=type \
-    GMMR3DECL(type)=type \
-    VBOX_DND_FN_DECL_LOG(x)=x \
-    DECLSPEC_HIDDEN= \
+    VMMRZDECL(type)=type \
     VMSVGA3DCOCOA_DECL(type)=type \
     VBOX_LISTENER_DECLARE(a)= \
-    VBOX_WITH_RAW_MODE_NOT_R0
+    VBOX_WITH_RAW_MODE_NOT_R0 \
+    \
+    "PGM_BTH_DECL(type,name)=type pgmBth##name" \
+    "PGM_GST_DECL(type,name)=type pgmGst##name" \
+    "PGM_SHW_DECL(type,name)=type pgmShw##name"
+
 
 # BS3Kit
 PREDEFINED += \
@@ -786,8 +809,9 @@ PREDEFINED          += \
     "CPUM_STRUCT_NM(n)=" \
     "CPUM_UNION_NM(n)=" \
     "DECL_NO_RETURN(type)=type" \
-    VBOX_WITH_HGCM \
-    \
+    VBOX_WITH_HGCM
+
+PREDEFINED          += \
     "IEM_DECL_IMPL_DEF(a_RetType, a_Name, a_ArgList)=a_RetType a_Name a_ArgList" \
     "IEM_DECL_IMPL_TYPE(a_RetType, a_Name, a_ArgList)=a_RetType (a_Name) a_ArgList" \
     \
@@ -840,40 +864,6 @@ EXPAND_AS_DEFINED      = \
     STDMETHODIMP \
     IFACEMETHODIMP \
     \
-    DBGDECL \
-    DISDECL \
-    GMMR0DECL \
-    GVMMR0DECL \
-    INTNETDECL \
-    INTNETRCDECL \
-    INTNETR0DECL \
-    INTNETR3DECL \
-    PDMBOTHCBDECL \
-    APICBOTHCBDECL \
-    PGM_BTH_DECL \
-    PGM_GST_DECL \
-    PGM_SHW_DECL \
-    REMDECL \
-    REMRCDECL \
-    REMR0DECL \
-    REMR3DECL \
-    RTDECL \
-    RTRCDECL \
-    RTR0DECL \
-    RTR3DECL \
-    RTDATADECL \
-    RT_DECL_NTAPI \
-    SUPDECL \
-    SUPR0DECL \
-    SUPR3DECL \
-    VBGLR3DECL \
-    VBOXDDU_DECL \
-    VMMDECL \
-    VMMRCDECL \
-    VMMR0DECL \
-    VMMR3DECL \
-    VMM_INT_DECL \
-    \
     VD_BACKEND_CALLBACK_GET_COMMENT_DEF_NOT_SUPPORTED \
     VD_BACKEND_CALLBACK_SET_COMMENT_DEF_NOT_SUPPORTED \
     VD_BACKEND_CALLBACK_GET_UUID_DEF_NOT_SUPPORTED \
diff --git a/src/VBox/VMM/VMMAll/VMXAllTemplate.cpp.h b/src/VBox/VMM/VMMAll/VMXAllTemplate.cpp.h
index 0742dc110d0..105cd9f2bf1 100644
--- a/src/VBox/VMM/VMMAll/VMXAllTemplate.cpp.h
+++ b/src/VBox/VMM/VMMAll/VMXAllTemplate.cpp.h
@@ -4131,7 +4131,8 @@ DECLINLINE(void) vmxHCClearNmiWindowExitVmcs(PVMCPUCC pVCpu, PVMXVMCSINFO pVmcsI
  * @retval  VINF_EM_RESET if event injection resulted in a triple-fault.
  *
  * @param   pVCpu           The cross context virtual CPU structure.
- * @param   pVmxTransient   The VMX-transient structure.
+ * @param   pVmcsInfo       The VMCS info object.
+ * @param   fIsNestedGuest  Flag whether this is for a for a pending nested guest event.
  * @param   pEvent          The event being injected.
  * @param   pfIntrState     Pointer to the VT-x guest-interruptibility-state. This
  *                          will be updated if necessary. This cannot not be NULL.
@@ -4140,8 +4141,8 @@ DECLINLINE(void) vmxHCClearNmiWindowExitVmcs(PVMCPUCC pVCpu, PVMXVMCSINFO pVmcsI
  *                          directly (registers modified by us, not by hardware on
  *                          VM-entry).
  */
-static VBOXSTRICTRC vmxHCInjectEventVmcs(PVMCPUCC pVCpu, PVMXVMCSINFO pVmcsInfo, bool fIsNestedGuest, PCHMEVENT pEvent, bool fStepping,
-                                           uint32_t *pfIntrState)
+static VBOXSTRICTRC vmxHCInjectEventVmcs(PVMCPUCC pVCpu, PVMXVMCSINFO pVmcsInfo, bool fIsNestedGuest, PCHMEVENT pEvent,
+                                         bool fStepping, uint32_t *pfIntrState)
 {
     /* Intel spec. 24.8.3 "VM-Entry Controls for Event Injection" specifies the interruption-information field to be 32-bits. */
     AssertMsg(!RT_HI_U32(pEvent->u64IntInfo), ("%#RX64\n", pEvent->u64IntInfo));
@@ -4553,6 +4554,7 @@ static VBOXSTRICTRC vmxHCEvaluatePendingEvent(PVMCPUCC pVCpu, PVMXVMCSINFO pVmcs
  *
  * @returns Strict VBox status code (i.e. informational status codes too).
  * @param   pVCpu           The cross context virtual CPU structure.
+ * @param   pVmcsInfo       The VMCS information structure.
  * @param   fIsNestedGuest  Flag whether the event injection happens for a nested guest.
  * @param   fIntrState      The VT-x guest-interruptibility state.
  * @param   fStepping       Whether we are single-stepping the guest using the
@@ -4560,7 +4562,8 @@ static VBOXSTRICTRC vmxHCEvaluatePendingEvent(PVMCPUCC pVCpu, PVMXVMCSINFO pVmcs
  *                          VINF_EM_DBG_STEPPED if the event was dispatched
  *                          directly.
  */
-static VBOXSTRICTRC vmxHCInjectPendingEvent(PVMCPUCC pVCpu, PVMXVMCSINFO pVmcsInfo, bool fIsNestedGuest, uint32_t fIntrState, bool fStepping)
+static VBOXSTRICTRC vmxHCInjectPendingEvent(PVMCPUCC pVCpu, PVMXVMCSINFO pVmcsInfo, bool fIsNestedGuest,
+                                            uint32_t fIntrState, bool fStepping)
 {
     HMVMX_ASSERT_PREEMPT_SAFE(pVCpu);
 #ifndef IN_NEM_DARWIN
@@ -5257,7 +5260,6 @@ static uint32_t vmxHCCheckGuestState(PVMCPUCC pVCpu, PCVMXVMCSINFO pVmcsInfo)
 #undef HMVMX_ERROR_BREAK
 #undef HMVMX_CHECK_BREAK
 }
-/** @} */
 
 
 #ifndef HMVMX_USE_FUNCTION_TABLE