Changeset 26354 in vbox

Timestamp:

Feb 9, 2010 11:14:54 AM (15 years ago)

Author:

vboxsync

Message:

Activated memory balloon and statistics again

Location:

trunk/src/VBox/Additions/common/VBoxService

Files:

• Makefile.kmk (modified) (3 diffs)
• VBoxService.cpp (modified) (1 diff)
• VBoxServiceStats.cpp (modified) (1 diff)

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

@@ -34 +34 @@
 VBoxService_TEMPLATE      = VBOXGUESTR3EXE
 VBoxService_DEFS          = VBOXSERVICE_TIMESYNC
-VBoxService_DEFS.win     += _WIN32_WINNT=0x0501 
-##VBOXSERVICE_MANAGEMENT
+VBoxService_DEFS.win     += _WIN32_WINNT=0x0501 VBOXSERVICE_MANAGEMENT
 VBoxService_DEFS.os2      = VBOX_WITH_HGCM VBOXSERVICE_CLIPBOARD
 ifdef VBOX_WITH_GUEST_PROPS
@@ -67 +66 @@
 VBoxService_SOURCES.win  += \
         VBoxService-win.rc \
-        VBoxService-win.cpp 
-##      VBoxServiceBalloon.cpp \
-##      VBoxServiceStats.cpp
+        VBoxService-win.cpp \
+        VBoxServiceBalloon.cpp \
+        VBoxServiceStats.cpp
 
 VBoxService_SOURCES.os2   = \
@@ -93 +92 @@
 VBoxServiceNT_TEMPLATE = VBOXGUESTR3EXE
 VBoxServiceNT_EXTENDS  = VBoxService
-VBoxServiceNT_DEFS.win = _WIN32_WINNT=0x0400 TARGET_NT4
+VBoxServiceNT_DEFS.win = _WIN32_WINNT=0x0400 TARGET_NT4 VBOXSERVICE_MANAGEMENT
 
 VBoxServiceVMInfo.cpp_DEFS = VBOX_SVN_REV=$(VBOX_SVN_REV)

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

@@ -95 +95 @@
 #endif
 #ifdef VBOXSERVICE_MANAGEMENT
-    { &g_MemBalloon, NIL_RTTHREAD, false, false, false, false },
-    { &g_VMStatistics, NIL_RTTHREAD, false, false, false, false },
+    { &g_MemBalloon, NIL_RTTHREAD, false, false, false, true },
+    { &g_VMStatistics, NIL_RTTHREAD, false, false, false, true },
 #endif
 };

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

@@ -19 +19 @@
  * additional information or have any questions.
  */
+#ifdef TARGET_NT4
+#undef _WIN32_WINNT
+#define _WIN32_WINNT 0x501
+#endif
+
 #include <windows.h>
 #include <psapi.h>