Changeset 63090 in vbox for trunk/src

Timestamp:

Aug 6, 2016 3:07:45 PM (9 years ago)

Author:

vboxsync

Message:

GA/NT/Installer: warnings

Location:

trunk/src/VBox/Additions/WINNT/Installer

Files:

• RegCleanup.cpp (modified) (5 diffs)
• VBoxDrvInst.cpp (modified) (4 diffs)

trunk/src/VBox/Additions/WINNT/Installer/RegCleanup.cpp

@@ +1 @@
+/* $Id$ */
 /** @file
- *
  * delinvalid - remove "InvalidDisplay" key on NT4
- *
+ */
+
+/*
  * Copyright (C) 2006-2016 Oracle Corporation
  *
@@ -27 +29 @@
  */
 
+/*********************************************************************************************************************************
+*   Header Files                                                                                                                 *
+*********************************************************************************************************************************/
 //#define _UNICODE
 
@@ -39 +44 @@
 
 
-/*********************************************************************************************************************************
-*   Defined Constants And Macros                                                                                                 *
-*********************************************************************************************************************************/
-
-/////////////////////////////////////////////////////////////////////////////
-
-
-BOOL isNT4 (void)
+BOOL isNT4(void)
 {
     OSVERSIONINFO OSversion;
@@ -68 +66 @@
 }
 
-int main (int argc, char **argv)
+int main()
 {
     int rc = 0;
@@ -88 +86 @@
     return rc;
 }
+

trunk/src/VBox/Additions/WINNT/Installer/VBoxDrvInst.cpp

@@ -24 +24 @@
 #endif
 
+#include <iprt/cdefs.h>
 #include <VBox/version.h>
 
@@ -104 +105 @@
         return false;
     }
-    else
-    {
-        _TCHAR *p = _tcschr(pszMsg, _T('\r'));
-        if (p != NULL)
-            *p = _T('\0');
-    }
-
+    _TCHAR *p = _tcschr(pszMsg, _T('\r'));
+    if (p != NULL)
+        *p = _T('\0');
     return true;
 }
@@ -434 +431 @@
 int ExecuteInfFile(const _TCHAR *pszSection, int iMode, const _TCHAR *pszInf)
 {
+    RT_NOREF(iMode);
     _tprintf(_T("Installing from INF-File: %ws (Section: %ws) ...\n"),
              pszInf, pszSection);
@@ -1250 +1248 @@
             {
                 HKEY hRootKey = HKEY_LOCAL_MACHINE;  /** @todo needs to be expanded (argv[3]) */
-                DWORD dwValSize;
+                DWORD dwValSize = 0;
                 BYTE *pbVal = NULL;
                 DWORD dwVal;