Changeset 98341 in vbox for trunk/src

Timestamp:

Jan 30, 2023 3:09:52 AM (2 years ago)

Author:

vboxsync

Message:

Main: bugref:4784: rename MachineSharedFolder to SharedFolder [build fix]

Location:

trunk/src/VBox/Main

Files:

• Makefile.kmk (modified) (1 diff)
• include/ConsoleSharedFolderImpl.h (modified) (1 diff)
• include/MachineSharedFolderImpl.h (deleted)
• include/SharedFolderImpl.h (modified) (3 diffs)
• src-all/MachineSharedFolderImpl.cpp (deleted)
• src-all/SharedFolderImpl.cpp (modified) (7 diffs)
• src-server/MachineImpl.cpp (modified) (1 diff)

trunk/src/VBox/Main/Makefile.kmk

@@ -614 +614 @@
         src-all/Logging.cpp \
         src-all/NvramStoreImpl.cpp \
-  src-all/MachineSharedFolderImpl.cpp \
         src-all/PCIDeviceAttachmentImpl.cpp \
         src-all/ProgressImpl.cpp \
         src-all/SecretKeyStore.cpp \
+  src-all/SharedFolderImpl.cpp \
         src-all/AutoCaller.cpp \
         src-all/ThreadTask.cpp \

trunk/src/VBox/Main/include/ConsoleSharedFolderImpl.h

@@ -121 +121 @@
 };
 
-#endif /* !MAIN_INCLUDED_SharedFolderImpl_h */
+#endif /* !MAIN_INCLUDED_ConsoleSharedFolderImpl_h */
 /* vi: set tabstop=4 shiftwidth=4 expandtab: */

trunk/src/VBox/Main/include/SharedFolderImpl.h

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2023 Oracle and/or its affiliates.
+ * Copyright (C) 2006-2022 Oracle and/or its affiliates.
  *
  * This file is part of VirtualBox base platform packages, as
@@ -51 +51 @@
                  bool aWritable, bool aAutoMount, const com::Utf8Str &aAutoMountPoint, bool fFailOnError);
     HRESULT initCopy(Machine *aMachine, SharedFolder *aThat);
-    HRESULT init(Console *aConsole, const com::Utf8Str &aName, const com::Utf8Str &aHostPath,
-                 bool aWritable, bool aAutoMount, const com::Utf8Str &aAutoMountPoint, bool fFailOnError);
+//    HRESULT init(Console *aConsole, const com::Utf8Str &aName, const com::Utf8Str &aHostPath,
+//                 bool aWritable, bool aAutoMount, const com::Utf8Str &aAutoMountPoint, bool fFailOnError);
 //     HRESULT init(VirtualBox *aVirtualBox, const Utf8Str &aName, const Utf8Str &aHostPath,
 //                  bool aWritable, const com::Utf8Str &aAutoMountPoint, bool aAutoMount, bool fFailOnError);
@@ -115 +115 @@
 
     /* weak parents (only one of them is not null) */
-#if !defined(VBOX_COM_INPROC)
     Machine        * const mMachine;
     VirtualBox     * const mVirtualBox;
-#else
-    Console        * const mConsole;
-#endif
 
-    struct Data;            // opaque data struct, defined in SharedFolderImpl.cpp
+    struct Data;            // opaque data struct, defined in MachineSharedFolderImpl.cpp
     Data *m;
 };

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2023 Oracle and/or its affiliates.
+ * Copyright (C) 2006-2022 Oracle and/or its affiliates.
  *
  * This file is part of VirtualBox base platform packages, as
@@ -28 +28 @@
 #define LOG_GROUP LOG_GROUP_MAIN_SHAREDFOLDER
 #include "SharedFolderImpl.h"
-#if !defined(VBOX_COM_INPROC)
-# include "VirtualBoxImpl.h"
-# include "MachineImpl.h"
-#endif
+#include "VirtualBoxImpl.h"
+#include "MachineImpl.h"
 #include "ConsoleImpl.h"
 
@@ -64 +62 @@
 SharedFolder::SharedFolder()
     : mParent(NULL),
-#if !defined(VBOX_COM_INPROC)
       mMachine(NULL),
       mVirtualBox(NULL)
-#else
-      mConsole(NULL)
-#endif
 {
     m = new Data;
@@ -94 +88 @@
 /////////////////////////////////////////////////////////////////////////////
 
-#if !defined(VBOX_COM_INPROC)
 /**
  *  Initializes the shared folder object.
@@ -189 +182 @@
                            bool aWritable,
                            bool aAutoMount,
-                           const Utf8Str &aAutoMountPoint
+                           const Utf8Str &aAutoMountPoint,
                            bool fFailOnError)
 {
@@ -208 +201 @@
 
 # endif
-
-#else
-
-/**
- *  Initializes the shared folder object.
- *
- *  This variant initializes an instance that lives in the console address space.
- *
- *  @param aConsole     Console parent object
- *  @param aName        logical name of the shared folder
- *  @param aHostPath    full path to the shared folder on the host
- *  @param aWritable    writable if true, readonly otherwise
- *  @param aAutoMountPoint Where the guest should try auto mount it.
- *  @param fFailOnError Whether to fail with an error if the shared folder path is bad.
- *
- *  @return          COM result indicator
- */
-HRESULT SharedFolder::init(Console *aConsole,
-                           const Utf8Str &aName,
-                           const Utf8Str &aHostPath,
-                           bool aWritable,
-                           bool aAutoMount,
-                           const Utf8Str &aAutoMountPoint,
-                           bool fFailOnError)
-{
-    /* Enclose the state transition NotReady->InInit->Ready */
-    AutoInitSpan autoInitSpan(this);
-    AssertReturn(autoInitSpan.isOk(), E_FAIL);
-
-    unconst(mConsole) = aConsole;
-
-    HRESULT hrc = i_protectedInit(aConsole, aName, aHostPath, aWritable, aAutoMount, aAutoMountPoint, fFailOnError);
-
-    /* Confirm a successful initialization when it's the case */
-    if (SUCCEEDED(hrc))
-        autoInitSpan.setSucceeded();
-
-    return hrc;
-}
-#endif
 
 /**
@@ -336 +289 @@
 
     unconst(mParent) = NULL;
-
-#if !defined(VBOX_COM_INPROC)
     unconst(mMachine) = NULL;
     unconst(mVirtualBox) = NULL;
-#else
-    unconst(mConsole) = NULL;
-#endif
 }
 

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

@@ -49 +49 @@
 #include "USBDeviceFiltersImpl.h"
 #include "HostImpl.h"
-#include "MachineSharedFolderImpl.h"
+#include "SharedFolderImpl.h"
 #include "GuestOSTypeImpl.h"
 #include "VirtualBoxErrorInfoImpl.h"