Changeset 50356 in vbox

Timestamp:

Feb 6, 2014 7:25:04 PM (11 years ago)

Author:

vboxsync

Message:

6813 - stage 7 rev 2

Location:

trunk/src/VBox/Main

Files:

• include/VirtualBoxImpl.h (modified) (1 diff)
• src-server/VirtualBoxImpl.cpp (modified) (1 diff)

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

@@ -61 +61 @@
     public VirtualBoxWrap
 #ifdef RT_OS_WINDOWS
-    , public CComCoClass<VirtualBox, &CLSID_VirtualBox>
+//     , public CComCoClass<VirtualBox, &CLSID_VirtualBox>
 #endif
 {

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

@@ -1256 +1256 @@
 static void sanitiseMachineFilename(Utf8Str &aName);
 
-STDMETHODIMP VirtualBox::composeMachineFilename(const com::Utf8Str &aName,
-                                                const com::Utf8Str &aGroup,
-                                                const com::Utf8Str &aCreateFlags,
-                                                const com::Utf8Str &aBaseFolder,
-                                                com::Utf8Str       &aFile)
+HRESULT VirtualBox::composeMachineFilename(const com::Utf8Str &aName,
+                                           const com::Utf8Str &aGroup,
+                                           const com::Utf8Str &aCreateFlags,
+                                           const com::Utf8Str &aBaseFolder,
+                                           com::Utf8Str       &aFile)
 {
     LogFlowThisFuncEnter();