Index: /trunk/src/VBox/Main/src-client/GuestCtrlImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/src-client/GuestCtrlImpl.cpp	(revision 37631)
+++ /trunk/src/VBox/Main/src-client/GuestCtrlImpl.cpp	(revision 37632)
@@ -2874,4 +2874,11 @@
                                   ULONG aFlags, IProgress **aProgress)
 {
+    ReturnComNotImplemented();
+}
+
+STDMETHODIMP Guest::CopyToGuest(IN_BSTR aSource, IN_BSTR aDest,
+                                IN_BSTR aUserName, IN_BSTR aPassword,
+                                ULONG aFlags, IProgress **aProgress)
+{
 #ifndef VBOX_WITH_GUEST_CONTROL
     ReturnComNotImplemented();
@@ -2908,79 +2915,4 @@
 
         rc = progress->init(static_cast<IGuest*>(this),
-                            Bstr(tr("Copying file from guest to host")).raw(),
-                            TRUE /* aCancelable */);
-        if (FAILED(rc)) throw rc;
-
-        /* Initialize our worker task. */
-        TaskGuest *pTask = new TaskGuest(TaskGuest::CopyFileFromGuest, this, progress);
-        AssertPtr(pTask);
-        std::auto_ptr<TaskGuest> task(pTask);
-
-        /* Assign data - aSource is the source file on the guest,
-         * aDest reflects the full path on the host. */
-        task->strSource   = (Utf8Str(aSource));
-        task->strDest     = (Utf8Str(aDest));
-        task->strUserName = (Utf8Str(aUserName));
-        task->strPassword = (Utf8Str(aPassword));
-        task->uFlags      = aFlags;
-
-        rc = task->startThread();
-        if (FAILED(rc)) throw rc;
-
-        /* Don't destruct on success. */
-        task.release();
-    }
-    catch (HRESULT aRC)
-    {
-        rc = aRC;
-    }
-
-    if (SUCCEEDED(rc))
-    {
-        /* Return progress to the caller. */
-        progress.queryInterfaceTo(aProgress);
-    }
-    return rc;
-#endif /* VBOX_WITH_GUEST_CONTROL */
-}
-
-STDMETHODIMP Guest::CopyToGuest(IN_BSTR aSource, IN_BSTR aDest,
-                                IN_BSTR aUserName, IN_BSTR aPassword,
-                                ULONG aFlags, IProgress **aProgress)
-{
-#ifndef VBOX_WITH_GUEST_CONTROL
-    ReturnComNotImplemented();
-#else /* VBOX_WITH_GUEST_CONTROL */
-    CheckComArgStrNotEmptyOrNull(aSource);
-    CheckComArgStrNotEmptyOrNull(aDest);
-    CheckComArgStrNotEmptyOrNull(aUserName);
-    CheckComArgStrNotEmptyOrNull(aPassword);
-    CheckComArgOutPointerValid(aProgress);
-
-    AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
-
-    /* Validate flags. */
-    if (aFlags != CopyFileFlag_None)
-    {
-        if (   !(aFlags & CopyFileFlag_Recursive)
-            && !(aFlags & CopyFileFlag_Update)
-            && !(aFlags & CopyFileFlag_FollowLinks))
-        {
-            return setError(E_INVALIDARG, tr("Unknown flags (%#x)"), aFlags);
-        }
-    }
-
-    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
-
-    HRESULT rc = S_OK;
-
-    ComObjPtr<Progress> progress;
-    try
-    {
-        /* Create the progress object. */
-        progress.createObject();
-
-        rc = progress->init(static_cast<IGuest*>(this),
                             Bstr(tr("Copying file from host to guest")).raw(),
                             TRUE /* aCancelable */);
@@ -3022,11 +2954,5 @@
 STDMETHODIMP Guest::DirectoryClose(ULONG aHandle)
 {
-#ifndef VBOX_WITH_GUEST_CONTROL
     ReturnComNotImplemented();
-#else /* VBOX_WITH_GUEST_CONTROL */
-    using namespace guestControl;
-
-    return VBOX_E_NOT_SUPPORTED;
-#endif
 }
 
@@ -3165,22 +3091,10 @@
                                   ULONG *aHandle)
 {
-#ifndef VBOX_WITH_GUEST_CONTROL
     ReturnComNotImplemented();
-#else /* VBOX_WITH_GUEST_CONTROL */
-    using namespace guestControl;
-
-    return VBOX_E_NOT_SUPPORTED;
-#endif
 }
 
 STDMETHODIMP Guest::DirectoryRead(ULONG aHandle, IGuestDirEntry **aDirEntry)
 {
-#ifndef VBOX_WITH_GUEST_CONTROL
     ReturnComNotImplemented();
-#else /* VBOX_WITH_GUEST_CONTROL */
-    using namespace guestControl;
-
-    return VBOX_E_NOT_SUPPORTED;
-#endif
 }