Changeset 98340 in vbox for trunk/src/VBox/Main/include

Timestamp:

Jan 30, 2023 12:09:34 AM (2 years ago)

Author:

vboxsync

Message:

Main: bugref:4784: seperated SharedFolder API between VboxSVC and VM process (fixed issues from previous attempt on this)

Location:

trunk/src/VBox/Main/include

Files:

• ConsoleImpl.h (modified) (3 diffs)
• ConsoleSharedFolderImpl.h (copied) (copied from trunk/src/VBox/Main/include/SharedFolderImpl.h ) (4 diffs)
• MachineSharedFolderImpl.h (copied) (copied from trunk/src/VBox/Main/include/SharedFolderImpl.h ) (3 diffs)

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

@@ -52 +52 @@
 class OUSBDevice;
 class RemoteUSBDevice;
-class SharedFolder;
+class ConsoleSharedFolder;
 class VRDEServerInfo;
 class EmulatedUSB;
@@ -654 +654 @@
     };
 
-    typedef std::map<Utf8Str, ComObjPtr<SharedFolder> > SharedFolderMap;
+    typedef std::map<Utf8Str, ComObjPtr<ConsoleSharedFolder> > SharedFolderMap;
     typedef std::map<Utf8Str, SharedFolderData> SharedFolderDataMap;
     typedef std::map<Utf8Str, ComPtr<IMediumAttachment> > MediumAttachmentMap;
@@ -692 +692 @@
 
     HRESULT i_findSharedFolder(const Utf8Str &strName,
-                               ComObjPtr<SharedFolder> &aSharedFolder,
+                               ComObjPtr<ConsoleSharedFolder> &aSharedFolder,
                                bool aSetError = false);
 

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

@@ -26 +26 @@
  */
 
-#ifndef MAIN_INCLUDED_SharedFolderImpl_h
-#define MAIN_INCLUDED_SharedFolderImpl_h
+#ifndef MAIN_INCLUDED_ConsoleSharedFolderImpl_h
+#define MAIN_INCLUDED_ConsoleSharedFolderImpl_h
 #ifndef RT_WITHOUT_PRAGMA_ONCE
 # pragma once
@@ -37 +37 @@
 class Console;
 
-class ATL_NO_VTABLE SharedFolder :
+class ATL_NO_VTABLE ConsoleSharedFolder :
     public SharedFolderWrap
 {
 public:
 
-    DECLARE_COMMON_CLASS_METHODS (SharedFolder)
+    DECLARE_COMMON_CLASS_METHODS (ConsoleSharedFolder)
 
     HRESULT FinalConstruct();
@@ -48 +48 @@
 
     // public initializer/uninitializer for internal purposes only
-    HRESULT init(Machine *aMachine, const com::Utf8Str &aName, const com::Utf8Str &aHostPath,
-                 bool aWritable, bool aAutoMount, const com::Utf8Str &aAutoMountPoint, bool fFailOnError);
-    HRESULT initCopy(Machine *aMachine, SharedFolder *aThat);
+//    HRESULT init(Machine *aMachine, const com::Utf8Str &aName, const com::Utf8Str &aHostPath,
+//                 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);
@@ -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 ConsoleSharedFolderImpl.cpp
     Data *m;
 };

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

@@ -26 +26 @@
  */
 
-#ifndef MAIN_INCLUDED_SharedFolderImpl_h
-#define MAIN_INCLUDED_SharedFolderImpl_h
+#ifndef MAIN_INCLUDED_MachineSharedFolderImpl_h
+#define MAIN_INCLUDED_MachineSharedFolderImpl_h
 #ifndef RT_WITHOUT_PRAGMA_ONCE
 # pragma once
@@ -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;
 };