Changeset 40313 in vbox for trunk/src/VBox/Additions/WINNT

Timestamp:

Mar 1, 2012 2:27:33 PM (13 years ago)

Author:

vboxsync

Message:

VBOXSF: log the current process, cleanup.

File:

• trunk/src/VBox/Additions/WINNT/SharedFolders/driver/vbsf.c (modified) (2 diffs)

trunk/src/VBox/Additions/WINNT/SharedFolders/driver/vbsf.c

@@ -885 +885 @@
                          capFobx));
 
+                    Log(("VBOXSF: MRxDevFcbXXXControlFile: IOCTL_MRX_VBOX_START: process: current 0x%X, RDBSS 0x%X\n",
+                         IoGetCurrentProcess(), RxGetRDBSSProcess()));
+
                     switch (VBoxMRxState)
                     {
                         case MRX_VBOX_STARTABLE:
 
-                            /* The correct sequence of start events issued by the workstation
-                             * service would have avoided this. We can recover from this
-                             * by actually invoking RxStartMiniRdr.
-                             */
+                            Log(("VBOXSF: MRxDevFcbXXXControlFile: MRX_VBOX_STARTABLE\n"));
+
                             if (capFobx)
                             {
@@ -899 +900 @@
                             }
 
-                            /* Set global VBoxMRxState variable to MRX_VBOX_STARTABLE and fall through to the next case. */
-                            InterlockedCompareExchange((PLONG) & VBoxMRxState, MRX_VBOX_START_IN_PROGRESS, MRX_VBOX_STARTABLE);
-
-                            /* Lack of break is intentional. */
+                            InterlockedCompareExchange((PLONG)&VBoxMRxState, MRX_VBOX_START_IN_PROGRESS, MRX_VBOX_STARTABLE);
 
                         case MRX_VBOX_START_IN_PROGRESS:
                             Status = RxStartMinirdr(RxContext, &RxContext->PostRequest);
+
+                            Log(("VBOXSF: MRxDevFcbXXXControlFile: MRX_VBOX_START_IN_PROGRESS RxStartMiniRdr Status 0x%08X, post %d\n",
+                                 Status, RxContext->PostRequest));
 
                             if (Status == STATUS_REDIRECTOR_STARTED)
                             {
                                 Status = STATUS_SUCCESS;
+                                break;
                             }
-                            else if (Status == STATUS_PENDING && RxContext->PostRequest == TRUE)
+
+                            if (   Status == STATUS_PENDING
+                                && RxContext->PostRequest == TRUE)
                             {
+                                /* Will be restarted in RDBSS process. */
                                 Status = STATUS_MORE_PROCESSING_REQUIRED;
+                                break;
                             }