Changeset 80573 in vbox for trunk/src

Timestamp:

Sep 4, 2019 5:54:47 AM (5 years ago)

Author:

vboxsync

Message:

Main: bugref:9341: Fixed some scm errors

Location:

trunk/src/VBox

Files:

• Frontends/Common/PasswordInput.h (modified) (2 diffs)
• Frontends/VBoxAutostart/Makefile.kmk (modified) (1 diff)
• Frontends/VBoxAutostart/VBoxAutostart-win.cpp (modified) (1 diff)
• Frontends/VBoxAutostart/VBoxAutostart.h (modified) (1 diff)
• Main/src-all/MachineLaunchVMCommonWorker.cpp (modified) (1 diff)
• Main/src-server/MachineImpl.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/Common/PasswordInput.h

@@ -16 +16 @@
  */
 
-#ifndef VBOX_INCLUDED_SRC_Common_PasswordFileImpl_h
-#define VBOX_INCLUDED_SRC_Common_PasswordFileImpl_h
+#ifndef VBOX_INCLUDED_SRC_Common_PasswordInput_h
+#define VBOX_INCLUDED_SRC_Common_PasswordInput_h
 #ifndef RT_WITHOUT_PRAGMA_ONCE
 # pragma once
@@ -32 +32 @@
 RTEXITCODE settingsPasswordFile(ComPtr<IVirtualBox> virtualBox, const char *pszFilename);
 
-#endif /* !VBOX_INCLUDED_SRC_VBoxAutostart_VBoxAutostart_h */
+#endif /* !VBOX_INCLUDED_SRC_Common_PasswordInput_h */

trunk/src/VBox/Frontends/VBoxAutostart/Makefile.kmk

@@ -30 +30 @@
         VBoxAutostart-win.cpp \
         ../Common/PasswordInput.cpp
- VBoxAutostartSvc_LIBS.win += Secur32.lib       
+ VBoxAutostartSvc_LIBS.win += Secur32.lib
 else
  PROGRAMS += VBoxAutostart

trunk/src/VBox/Frontends/VBoxAutostart/VBoxAutostart-win.cpp

@@ -488 +488 @@
     int vrc = autostartGetServiceName(pszUser, sServiceName);
     if (!RT_FAILURE(vrc))
-        return autostartSvcDisplayError("delete - DeleteService failed, service name for user %s can not be constructed.\n", 
+        return autostartSvcDisplayError("delete - DeleteService failed, service name for user %s can not be constructed.\n",
                                         pszUser);
     /*

trunk/src/VBox/Frontends/VBoxAutostart/VBoxAutostart.h

@@ -322 +322 @@
 
 #endif /* !VBOX_INCLUDED_SRC_VBoxAutostart_VBoxAutostart_h */
-

trunk/src/VBox/Main/src-all/MachineLaunchVMCommonWorker.cpp

@@ -127 +127 @@
         {
             /** @todo r=bird: Broken escaping rule, how to end a variable with '\\'?
-              * E.g. TMP=C:\TEMP\  */
+              * E.g. TMP=C:\\TEMP\\  */
             char const ch = *psz;
             if (   (ch == '\n' && (psz == pszEnvMutable || psz[-1] != '\\'))

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

@@ -7491 +7491 @@
          * sessions and the caller in the interactive one.
          */
-        fUseVBoxSDS = false; 
+        fUseVBoxSDS = false;
 
         /* Get windows session of the current process.  The process token used
@@ -7497 +7497 @@
            1. The token is absent for the current thread except someone set it
               for us.
-           2. Needs to get the id of the session where the process is started. 
+           2. Needs to get the id of the session where the process is started.
            We only need to do this once, though. */
         static DWORD s_idCurrentSession = ~(DWORD)0;