Changeset 68828 in vbox for trunk/src/VBox/ExtPacks/VNC

Timestamp:

Sep 22, 2017 2:15:57 PM (8 years ago)

Author:

vboxsync

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

118082

Message:

ExtPack: Split up main module of extension pack, have a mandatory one for VBoxSVC and an optional one for the VM process. This finally eliminates the need to drag VBoxVMM into VBoxSVC on some platforms. Many other small cleanups, including reliably calling the unload hook from within a VM process, copy/paste with forgotten adjustments (e.g. extpacks still talking about skeleton) and spelling fixes.

File:

• trunk/src/VBox/ExtPacks/VNC/VBoxVNCMain.cpp (modified) (5 diffs)

trunk/src/VBox/ExtPacks/VNC/VBoxVNCMain.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2010-2016 Oracle Corporation
+ * Copyright (C) 2010-2017 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -24 +24 @@
 #include <VBox/err.h>
 #include <VBox/version.h>
-#include <VBox/vmm/cfgm.h>
 #include <iprt/string.h>
 #include <iprt/param.h>
@@ -40 +39 @@
 //  * @interface_method_impl{VBOXEXTPACKREG,pfnInstalled}
 //  */
-// static DECLCALLBACK(void) vboxVNCExtPack_Installed(PCVBOXEXTPACKREG pThis, VBOXEXTPACK_IF_CS(IVirtualBox) *pVirtualBox);
+// static DECLCALLBACK(void) vboxVNCExtPack_Installed(PCVBOXEXTPACKREG pThis, VBOXEXTPACK_IF_CS(IVirtualBox) *pVirtualBox, PRTERRINFO pErrInfo);
+//
 // /**
 //  * @interface_method_impl{VBOXEXTPACKREG,pfnUninstall}
@@ -55 +55 @@
 //  */
 // static DECLCALLBACK(void) vboxVNCExtPack_Unload(PCVBOXEXTPACKREG pThis);
+//
 // /**
 //  * @interface_method_impl{VBOXEXTPACKREG,pfnVMCreated}
 //  */
-// static DECLCALLBACK(int)  vboxVNCExtPack_VMCreated(PCVBOXEXTPACKREG pThis, VBOXEXTPACK_IF_CS(IVirtualBox) *pVirtualBox, IMachine *pMachine);
+// static DECLCALLBACK(int)  vboxVNCExtPack_VMCreated(PCVBOXEXTPACKREG pThis, VBOXEXTPACK_IF_CS(IVirtualBox) *pVirtualBox, VBOXEXTPACK_IF_CS(IMachine) *pMachine);
 //
 // /**
-//  * @interface_method_impl{VBOXEXTPACKREG,pfnVMConfigureVMM}
-//  */
-// static DECLCALLBACK(int)  vboxVNCExtPack_VMConfigureVMM(PCVBOXEXTPACKREG pThis, IConsole *pConsole, PVM pVM);
-//
-// /**
-//  * @interface_method_impl{VBOXEXTPACKREG,pfnVMPowerOn}
-//  */
-// static DECLCALLBACK(int)  vboxVNCExtPack_VMPowerOn(PCVBOXEXTPACKREG pThis, IConsole *pConsole, PVM pVM);
-// /**
-//  * @interface_method_impl{VBOXEXTPACKREG,pfnVMPowerOff}
-//  */
-// static DECLCALLBACK(void) vboxVNCExtPack_VMPowerOff(PCVBOXEXTPACKREG pThis, IConsole *pConsole, PVM pVM);
-// /**
-//  * @interface_method_impl{VBOXEXTPACKREG,pfnVMPowerOff}
+//  * @interface_method_impl{VBOXEXTPACKREG,pfnQueryObject}
 //  */
 // static DECLCALLBACK(void) vboxVNCExtPack_QueryObject(PCVBOXEXTPACKREG pThis, PCRTUUID pObjectId);
@@ -86 +74 @@
     /* .pfnUninstall =      */  NULL,
     /* .pfnVirtualBoxReady =*/  NULL,
-    /* .pfnConsoleReady =   */  NULL,
     /* .pfnUnload =         */  NULL,
     /* .pfnVMCreated =      */  NULL,
-    /* .pfnVMConfigureVMM = */  NULL,
-    /* .pfnVMPowerOn =      */  NULL,
-    /* .pfnVMPowerOff =     */  NULL,
     /* .pfnQueryObject =    */  NULL,
     /* .pfnReserved1 =      */  NULL,