Changeset 57753 in vbox

Timestamp:

Sep 15, 2015 11:15:21 AM (9 years ago)

Author:

vboxsync

Message:

IPRT: Renamed RTPROC_FLAGS_NO_PROFILE to RTPROC_FLAGS_PROFILE.

Location:

trunk

Files:

• include/VBox/HostServices/GuestControlSvc.h (modified) (1 diff)
• include/iprt/process.h (modified) (2 diffs)
• src/VBox/Additions/common/VBoxService/VBoxServiceControlProcess.cpp (modified) (1 diff)
• src/VBox/Additions/common/VBoxService/VBoxServiceControlSession.cpp (modified) (1 diff)
• src/VBox/HostServices/DragAndDrop/service.cpp (modified) (2 diffs)
• src/VBox/Runtime/r3/win/process-win.cpp (modified) (3 diffs)

trunk/include/VBox/HostServices/GuestControlSvc.h

@@ -143 +143 @@
 #define EXECUTEPROCESSFLAG_IGNORE_ORPHANED  RT_BIT(1)
 #define EXECUTEPROCESSFLAG_HIDDEN           RT_BIT(2)
-#define EXECUTEPROCESSFLAG_NO_PROFILE       RT_BIT(3)
+#define EXECUTEPROCESSFLAG_NO_PROFILE       RT_BIT(3) /** @todo Rename to EXECUTEPROCESSFLAG_PROFILE in next API change. */
 #define EXECUTEPROCESSFLAG_WAIT_STDOUT      RT_BIT(4)
 #define EXECUTEPROCESSFLAG_WAIT_STDERR      RT_BIT(5)

trunk/include/iprt/process.h

@@ -187 +187 @@
 #define RTPROC_FLAGS_DETACHED               RT_BIT(0)
 /** Don't show the started process.
- * This is a window (and maybe OS/2) concept, do not use on other platforms. */
+ * This is a Windows (and maybe OS/2) concept, do not use on other platforms. */
 #define RTPROC_FLAGS_HIDDEN                 RT_BIT(1)
 /** Use special code path for starting child processes from a service (daemon).
@@ -198 +198 @@
  * the more frequently used case. */
 #define RTPROC_FLAGS_SAME_CONTRACT          RT_BIT(3)
-/** Do not load user profile data when executing a process.
+/** Load user profile data when executing a process.
  * This bit at the moment only is valid on Windows. */
-#define RTPROC_FLAGS_NO_PROFILE             RT_BIT(4)
+#define RTPROC_FLAGS_PROFILE                RT_BIT(4)
 /** Create process without a console window.
  * This is a Windows (and OS/2) concept, do not use on other platforms. */

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceControlProcess.cpp

@@ -1372 +1372 @@
                 if (fFlags & EXECUTEPROCESSFLAG_HIDDEN)
                     uProcFlags |= RTPROC_FLAGS_HIDDEN;
-                if (fFlags & EXECUTEPROCESSFLAG_NO_PROFILE)
-                    uProcFlags |= RTPROC_FLAGS_NO_PROFILE;
+                /** @todo Rename to EXECUTEPROCESSFLAG_PROFILE in next API change. */
+                if (!(fFlags & EXECUTEPROCESSFLAG_NO_PROFILE))
+                    uProcFlags |= RTPROC_FLAGS_PROFILE;
                 if (fFlags & EXECUTEPROCESSFLAG_UNQUOTED_ARGS)
                     uProcFlags |= RTPROC_FLAGS_UNQUOTED_ARGS;

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceControlSession.cpp

@@ -1954 +1954 @@
 
             uint32_t uProcFlags = RTPROC_FLAGS_SERVICE
+#ifdef RT_OS_WINDOWS
+                                /* Make sure to also load the profile data on a Windows guest. */
+                                | RTPROC_FLAGS_PROFILE /** @todo Not implemented for non-Windows yet. */
+#endif
                                 | RTPROC_FLAGS_HIDDEN; /** @todo More flags from startup info? */
-
             /*
              * Create the session process' environment block.

trunk/src/VBox/HostServices/DragAndDrop/service.cpp

@@ -279 +279 @@
         /* Note: New since protocol version 2. */
         case DragAndDropSvc::GUEST_DND_CONNECT:
+        {
+            /*
+             * Never block the initial connect call, as the clients do this when
+             * initializing and might get stuck if drag and drop is set to "disabled" at
+             * that time.
+             */
+            rc = VINF_SUCCESS;
+            break;
+        }
+        case DragAndDropSvc::GUEST_DND_HG_ACK_OP:
             /* Fall through is intentional. */
-        case DragAndDropSvc::GUEST_DND_HG_ACK_OP:
         case DragAndDropSvc::GUEST_DND_HG_REQ_DATA:
+            /* Fall through is intentional. */
         case DragAndDropSvc::GUEST_DND_HG_EVT_PROGRESS:
         {
@@ -681 +691 @@
     }
 
+#undef DO_HOST_CALLBACK
+
     /*
      * If async execution is requested, we didn't notify the guest yet about

trunk/src/VBox/Runtime/r3/win/process-win.cpp

@@ -868 +868 @@
                     static const char * const s_papszProcNames[] =
                     {
-#ifdef VBOX                 /* The explorer entry is a fallback in case GA aren't installed. */
+#ifdef VBOX             /* The explorer entry is a fallback in case GA aren't installed. */
                         { "VBoxTray.exe" },
 #endif
@@ -913 +913 @@
                     {
                         PROFILEINFOW profileInfo;
-                        if (!(fFlags & RTPROC_FLAGS_NO_PROFILE))
+                        if (fFlags & RTPROC_FLAGS_PROFILE)
                         {
                             RT_ZERO(profileInfo);
-                            profileInfo.dwSize = sizeof(profileInfo);
+                            profileInfo.dwSize     = sizeof(profileInfo);
                             profileInfo.lpUserName = pwszUser;
-                            profileInfo.dwFlags = PI_NOUI; /* Prevents the display of profile error messages. */
+                            profileInfo.dwFlags    = PI_NOUI; /* Prevents the display of profile error messages. */
 
                             if (!pfnLoadUserProfileW(*phToken, &profileInfo))
@@ -956 +956 @@
                             }
 
-                            if (!(fFlags & RTPROC_FLAGS_NO_PROFILE))
+                            if (fFlags & RTPROC_FLAGS_PROFILE)
                             {
                                 fRc = pfnUnloadUserProfile(*phToken, profileInfo.hProfile);