儲存庫 vbox 的更動 62774

時間撮記:

2016-7-31 下午05:44:26 (8 年 以前)

作者:

vboxsync

訊息:

Main: warnings

位置:

trunk/src/VBox/Main

檔案:

• Makefile.kmk (修改) (4 筆差異)
• src-helper-apps/VBoxExtPackHelperApp.cpp (修改) (7 筆差異)

trunk/src/VBox/Main/Makefile.kmk

@@ -1145 +1145 @@
         $(QUIET)$(VBOX_XSLTPROC) -o $@ $< $(VBOX_XIDL_FILE)
 
+##
+# Edits $1 and adding #pragma directives for disabling warnings windows.h causes.
+# @param 1     The name of the file to edit.
+define def_VBoxMainDisableMscWarnings
+        $(MV) -f "$1" "$1.tmp"
+        $(APPEND) -nt "$1" \
+                '#pragma warning(push) /* -Wall and windows.h */' \
+                '#pragma warning(disable:4668 4255)' \
+               ''
+        $(CAT_EXT) "$1.tmp" >> "$1"
+        $(APPEND) -n "$1" \
+                '' \
+                '#pragma warning(pop)' \
+               ''
+        $(RM) -f "$1.tmp"
+
+endef
+
 # Note! Because we've got a different proxy stub DLL for pre windows 7 64-bit hosts, we target windows 7 for AMD64.
 #       The output is different and hopefully more efficient, at least memory wise (using more helpers in OLE32).
@@ -1161 +1179 @@
                 /I idl \
                 $(call VBOX_FN_MAKE_WIN_PATH,$<)
-        $(MV) -f "$(VBoxCOM_0_OUTDIR)/VirtualBox.h" "$(VBoxCOM_0_OUTDIR)/VirtualBox.h.tmp"
-        $(APPEND) -nt "$(VBoxCOM_0_OUTDIR)/VirtualBox.h" \
-                '#pragma warning(push) /* -Wall and windows.h */' \
-                '#pragma warning(disable:4668)' \
-               ''
-        $(CAT_EXT) "$(VBoxCOM_0_OUTDIR)/VirtualBox.h.tmp" >> "$(VBoxCOM_0_OUTDIR)/VirtualBox.h"
-        $(APPEND) -n "$(VBoxCOM_0_OUTDIR)/VirtualBox.h" \
-                '' \
-                '#pragma warning(pop)' \
-               ''
-        $(RM) -f "$(VBoxCOM_0_OUTDIR)/VirtualBox.h.tmp"
+        $(call def_VBoxMainDisableMscWarnings,$(VBoxCOM_0_OUTDIR)/VirtualBox.h)
+        $(call def_VBoxMainDisableMscWarnings,$(VBoxCOM_0_OUTDIR)/VirtualBox_i.c)
 
 if defined(VBOX_WITH_MIDL_PROXY_STUB)
@@ -1192 +1201 @@
                 /I idl \
                 $(call VBOX_FN_MAKE_WIN_PATH,$<)
+        $(call def_VBoxMainDisableMscWarnings,$(VBoxCOM_0_OUTDIR)/legacy/VirtualBox.h)
+        $(call def_VBoxMainDisableMscWarnings,$(VBoxCOM_0_OUTDIR)/legacy/VirtualBox_i.c)
 endif
 
@@ -1208 +1219 @@
                 /I idl \
                 $(call VBOX_FN_MAKE_WIN_PATH,$<)
+        $(call def_VBoxMainDisableMscWarnings,$(VBoxCOM-x86_0_OUTDIR)/VirtualBox.h)
+        $(call def_VBoxMainDisableMscWarnings,$(VBoxCOM-x86_0_OUTDIR)/VirtualBox_i.c)
 
 #

trunk/src/VBox/Main/src-helper-apps/VBoxExtPackHelperApp.cpp

@@ -48 +48 @@
 #ifdef RT_OS_WINDOWS
 # define _WIN32_WINNT 0x0501
+# include <iprt/win/windows.h>          /* ShellExecuteEx, ++ */
 # include <Objbase.h>                   /* CoInitializeEx */
-# include <iprt/win/windows.h>                   /* ShellExecuteEx, ++ */
 # ifdef DEBUG
 #  include <Sddl.h>
@@ -296 +296 @@
 #else
      /** @todo TrustedInstaller? */
+     RT_NOREF1(pszDir);
 #endif
 
@@ -339 +340 @@
 static RTEXITCODE ValidateUnpackedExtPack(const char *pszDir, const char *pszTarball, const char *pszExtPackName)
 {
+    RT_NOREF2(pszTarball, pszExtPackName);
     RTMsgInfo("Validating unpacked extension pack...");
 
@@ -490 +492 @@
                                 const char *pszTarball)
 {
+    RT_NOREF1(pszTarball);
     RTMsgInfo("Unpacking extension pack into '%s'...", pszDirDst);
 
@@ -653 +656 @@
                              const char *pszName, const char *pszMangledName, bool fReplace)
 {
+    RT_NOREF1(pszCertDir);
+
     /*
      * Do some basic validation of the tarball file.
@@ -1233 +1238 @@
                                          int iCmd, const char *pszDisplayInfoHack)
 {
+    RT_NOREF1(cMyArgs);
     RTEXITCODE rcExit = RTEXITCODE_FAILURE;
 #ifdef RT_OS_WINDOWS
@@ -1320 +1326 @@
                         if (GetExitCodeProcess(Info.hProcess, &dwExitCode))
                         {
-                            if (dwExitCode >= 0 && dwExitCode < 128)
+                            if (dwExitCode < 128)
                                 rcExit = (RTEXITCODE)dwExitCode;
                             else