Changeset 46506 in vbox for trunk

Timestamp:

Jun 12, 2013 9:05:32 AM (12 years ago)

Author:

vboxsync

Message:

Additions/VBoxService: Don't use VBOX_WITH_PAGE_SHARING here as this is a global defined symbol (VBox/param.h). Fixed warning.

Location:

trunk/src/VBox/Additions/common/VBoxService

Files:

• Makefile.kmk (modified) (1 diff)
• VBoxService.cpp (modified) (1 diff)
• VBoxServiceControlProcess.cpp (modified) (2 diffs)
• VBoxServiceInternal.h (modified) (2 diffs)

trunk/src/VBox/Additions/common/VBoxService/Makefile.kmk

@@ -52 +52 @@
 endif
 if1of ($(KBUILD_TARGET), win)
- VBoxService_DEFS        += VBOX_WITH_PAGE_SHARING
+ VBoxService_DEFS        += VBOXSERVICE_PAGE_SHARING
  ifdef VBOX_WITH_MMR
   VBoxService_DEFS       += VBOX_WITH_MMR

trunk/src/VBox/Additions/common/VBoxService/VBoxService.cpp

@@ -131 +131 @@
     { &g_VMStatistics,  NIL_RTTHREAD, false, false, false, false, true },
 #endif
-#if defined(VBOX_WITH_PAGE_SHARING) && defined(RT_OS_WINDOWS)
+#if defined(VBOXSERVICE_PAGE_SHARING)
     { &g_PageSharing,   NIL_RTTHREAD, false, false, false, false, true },
 #endif

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceControlProcess.cpp

@@ -1601 +1601 @@
      * Prepare environment variables list.
      */
-    char **papszEnv;
+    char **papszEnv = NULL;
     uint32_t uNumEnvVars = 0; /* Initialize in case of failing ... */
     if (RT_SUCCESS(rc))
@@ -1640 +1640 @@
      */
     RTENV hEnv;
-    rc = RTEnvClone(&hEnv, RTENV_DEFAULT);
+    if (RT_SUCCESS(rc))
+        rc = RTEnvClone(&hEnv, RTENV_DEFAULT);
     if (RT_SUCCESS(rc))
     {

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceInternal.h

@@ -164 +164 @@
 extern VBOXSERVICE  g_VMStatistics;
 #endif
-#ifdef VBOX_WITH_PAGE_SHARING
+#ifdef VBOXSERVICE_PAGE_SHARING
 extern VBOXSERVICE  g_PageSharing;
 #endif
@@ -204 +204 @@
 extern uint32_t                 VBoxServiceBalloonQueryPages(uint32_t cbPage);
 #endif
-#if defined(VBOX_WITH_PAGE_SHARING) && defined(RT_OS_WINDOWS)
+#if defined(VBOXSERVICE_PAGE_SHARING)
 extern RTEXITCODE               VBoxServicePageSharingInitFork(void);
 #endif