Changeset 63418 in vbox

Timestamp:

Aug 13, 2016 4:58:12 PM (8 years ago)

Author:

vboxsync

Message:

main: warnings in weird configs

Location:

trunk/src/VBox/Main

Files:

• src-client/ConsoleImpl2.cpp (modified) (3 diffs)
• src-client/DisplayImpl.cpp (modified) (3 diffs)
• src-client/GuestImpl.cpp (modified) (2 diffs)
• src-server/MediumImpl.cpp (modified) (2 diffs)

trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp

@@ -528 +528 @@
 HRESULT Console::i_attachRawPCIDevices(PUVM pUVM, BusAssignmentManager *pBusMgr, PCFGMNODE pDevices)
 {
+# ifndef VBOX_WITH_EXTPACK
+    RT_NOREF(pUVM);
+# endif
     HRESULT hrc = S_OK;
     PCFGMNODE pInst, pCfg, pLunL0, pLunL1;
@@ -1886 +1889 @@
                      * introduced by the new distribution model.
                      */
+# ifdef VBOX_WITH_EXTPACK
                     static const char *s_pszUsbExtPackName = "Oracle VM VirtualBox Extension Pack";
-# ifdef VBOX_WITH_EXTPACK
                     if (mptrExtPackManager->i_isExtPackUsable(s_pszUsbExtPackName))
 # endif
@@ -1934 +1937 @@
                      * introduced by the new distribution model.
                      */
+# ifdef VBOX_WITH_EXTPACK
                     static const char *s_pszUsbExtPackName = "Oracle VM VirtualBox Extension Pack";
-# ifdef VBOX_WITH_EXTPACK
                     if (mptrExtPackManager->i_isExtPackUsable(s_pszUsbExtPackName))
 # endif

trunk/src/VBox/Main/src-client/DisplayImpl.cpp

@@ -882 +882 @@
         return rc;
     }
-#endif /* #if defined(VBOX_WITH_HGCM) && defined(VBOX_WITH_CROGL) */
+#else /* !VBOX_WITH_HGCM || !VBOX_WITH_CROGL */
+    RT_NOREF(pScreen, pvVRAM);
+#endif
     return VINF_SUCCESS;
 }
@@ -3676 +3678 @@
 
     return hr;
-#else
+
+#else /* !VBOX_WITH_HGCM || !VBOX_WITH_CROGL */
+    RT_NOREF(aScreenId, aScaleFactorWMultiplied, aScaleFactorHMultiplied);
     AssertMsgFailed(("Attempt to specify OpenGL content scale factor while corresponding functionality is disabled."));
     return E_UNEXPECTED;
-#endif /* VBOX_WITH_HGCM && VBOX_WITH_CROGL */
+#endif /* !VBOX_WITH_HGCM || !VBOX_WITH_CROGL */
 }
 
@@ -3741 +3745 @@
 
     return hr;
-#else
+
+#else /* !VBOX_WITH_HGCM || !VBOX_WITH_CROGL */
+    RT_NOREF(fUnscaledHiDPI);
     AssertMsgFailed(("Attempt to notify OpenGL about HiDPI output scaling policy change while corresponding functionality is disabled."));
     return E_UNEXPECTED;
-#endif /* VBOX_WITH_HGCM && VBOX_WITH_CROGL */
+#endif /* !VBOX_WITH_HGCM || !VBOX_WITH_CROGL */
 }
 

trunk/src/VBox/Main/src-client/GuestImpl.cpp

@@ -492 +492 @@
 {
 #ifndef VBOX_WITH_DRAG_AND_DROP
+    RT_NOREF(aDnDSource);
     ReturnComNotImplemented();
 #else
@@ -507 +508 @@
 {
 #ifndef VBOX_WITH_DRAG_AND_DROP
+    RT_NOREF(aDnDTarget);
     ReturnComNotImplemented();
 #else

trunk/src/VBox/Main/src-server/MediumImpl.cpp

@@ -3567 +3567 @@
 HRESULT Medium::getEncryptionSettings(com::Utf8Str &aCipher, com::Utf8Str &aPasswordId)
 {
+#ifndef VBOX_WITH_EXTPACK
+    RT_NOREF(aCipher, aPasswordId);
+#endif
     HRESULT rc = S_OK;
 
@@ -9886 +9889 @@
 HRESULT Medium::i_taskEncryptHandler(Medium::EncryptTask &task)
 {
+# ifndef VBOX_WITH_EXTPACK
+    RT_NOREF(task);
+# endif
     HRESULT rc = S_OK;