Changeset 106411 in vbox for trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxIPC.cpp

Timestamp:

Oct 17, 2024 7:44:43 AM (4 months ago)

Author:

vboxsync

Message:

Additions/VBoxTray: Implemented ability for easier user-controllable logging (also via verbose levels), support for running in foreground mode (with a console window attached to) and selective starting of sub services to easier pinpoint errors in release builds. Cleaned up initialization / termination code a little. See command line help for new options. bugref:10763

File:

• trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxIPC.cpp (modified) (8 diffs)

trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxIPC.cpp

@@ -59 +59 @@
 {
     /** Pointer to the service environment. */
-    const VBOXSERVICEENV      *pEnv;
+    const VBOXTRAYSVCENV      *pEnv;
     /** Handle for the local IPC server. */
     RTLOCALIPCSERVER           hServer;
@@ -170 +170 @@
      * Showing the balloon tooltip is not critical.
      */
-    int rc2 = hlpShowBalloonTip(g_hInstance, g_hwndToolWindow, ID_TRAYICON,
+    VBoxTrayHlpShowBalloonTipEx(g_hInstance, g_hwndToolWindow, ID_TRAYICON,
                                 pszMsg, pszTitle, Payload.s.cMsTimeout, Payload.s.uType);
-    LogFlowFunc(("Showing \"%s\" - \"%s\" (type %RU32, %RU32ms), rc=%Rrc\n",
-                 pszTitle, pszMsg, Payload.s.cMsTimeout, Payload.s.uType, rc2));
-    RT_NOREF_PV(rc2);
 
     return VINF_SUCCESS;
@@ -207 +204 @@
 
 /**
- * Initializes the IPC communication.
- *
- * @return  IPRT status code.
- * @param   pEnv                        The IPC service's environment.
- * @param   ppInstance                  The instance pointer which refers to this object.
- */
-DECLCALLBACK(int) VBoxIPCInit(const PVBOXSERVICEENV pEnv, void **ppInstance)
+ * @interface_method_impl{VBOXSERVICEDESC,pfnPreInit}
+ */
+static DECLCALLBACK(int) vbtrIPCPreInit(void)
+{
+    return VINF_SUCCESS;
+}
+
+
+/**
+ * @interface_method_impl{VBOXSERVICEDESC,pfnOption}
+ */
+static DECLCALLBACK(int) vbtrIPCOption(const char **ppszShort, int argc, char **argv, int *pi)
+{
+    RT_NOREF(ppszShort, argc, argv, pi);
+
+    return -1;
+}
+
+/**
+ * @interface_method_impl{VBOXSERVICEDESC,pfnInit}
+ */
+DECLCALLBACK(int) vbtrIPCInit(const PVBOXTRAYSVCENV pEnv, void **ppInstance)
 {
     AssertPtrReturn(pEnv, VERR_INVALID_POINTER);
@@ -260 +272 @@
 }
 
+/**
+ * @interface_method_impl{VBOXSERVICEDESC,pfnStop}
+ */
 DECLCALLBACK(void) VBoxIPCStop(void *pInstance)
 {
@@ -298 +313 @@
 }
 
-DECLCALLBACK(void) VBoxIPCDestroy(void *pInstance)
+/**
+ * @interface_method_impl{VBOXSERVICEDESC,pfnDestroy}
+ */
+DECLCALLBACK(void) vbtrIPCDestroy(void *pInstance)
 {
     AssertPtrReturnVoid(pInstance);
@@ -552 +570 @@
  * requests
  */
-DECLCALLBACK(int) VBoxIPCWorker(void *pInstance, bool volatile *pfShutdown)
+DECLCALLBACK(int) vbtrIPCWorker(void *pInstance, bool volatile *pfShutdown)
 {
     AssertPtr(pInstance);
@@ -606 +624 @@
  * The service description.
  */
-VBOXSERVICEDESC g_SvcDescIPC =
+VBOXTRAYSVCDESC g_SvcDescIPC =
 {
     /* pszName. */
@@ -612 +630 @@
     /* pszDescription. */
     "Inter-Process Communication",
+    /* pszUsage. */
+    NULL,
+    /* pszOptions. */
+    NULL,
     /* methods */
-    VBoxIPCInit,
-    VBoxIPCWorker,
+    vbtrIPCPreInit,
+    vbtrIPCOption,
+    vbtrIPCInit,
+    vbtrIPCWorker,
     NULL /* pfnStop */,
-    VBoxIPCDestroy
+    vbtrIPCDestroy
 };