Changeset 34619 in vbox

Timestamp:

Dec 2, 2010 3:51:06 PM (14 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

68419

Message:

Fixed the previous fix.

File:

• trunk/src/VBox/Main/GuestImpl.cpp (modified) (2 diffs)

trunk/src/VBox/Main/GuestImpl.cpp

@@ -2400 +2400 @@
                      */
                     char szOutput[RTPATH_MAX];
-                    if (RTStrPrintf(szOutput, sizeof(szOutput), "--output=%s", Utf8Dest.c_str()) >= sizeof(szOutput) - 1)
+                    if (RTStrPrintf(szOutput, sizeof(szOutput), "--output=%s", Utf8Dest.c_str()) <= sizeof(szOutput) - 1)
                     {
                         /*
@@ -2633 +2633 @@
                 {
                     rc = GetProcessStatus(uPID, &uRetExitCode, &uRetFlags, &uRetStatus);
-                    if (uRetExitCode == 0)
+                    if (SUCCEEDED(rc) && uRetExitCode != 0)
                     {
-                        progressCreate->notifyComplete(S_OK);
+                        rc = setError(VBOX_E_IPRT_ERROR,
+                                      tr("Error while creating directory"));
                     }
-                    else
-                        progressCreate->notifyComplete(VBOX_E_IPRT_ERROR,
-                                                       COM_IIDOF(IGuest),
-                                                       Guest::getStaticComponentName(),
-                                                       Guest::tr("Error while creating directory"));
                 }
             }
+            else if (fCanceled)
+                rc = setError(VBOX_E_IPRT_ERROR,
+                                      tr("Directory creation was aborted"));
+            else
+                AssertReleaseMsgFailed(("Directory creation neither completed nor canceled!?"));
+
+            if (SUCCEEDED(rc))
+                progressCreate->notifyComplete(S_OK);
             else
                 progressCreate->notifyComplete(VBOX_E_IPRT_ERROR,