Changeset 46593 in vbox for trunk/src/VBox/Main

Timestamp:

Jun 17, 2013 2:32:51 PM (12 years ago)

Author:

vboxsync

Message:

updates

Location:

trunk/src/VBox/Main

Files:

• src-client/win/dllmain.cpp (modified) (1 diff)
• src-server/win/PerformanceWin.cpp (modified) (4 diffs)

trunk/src/VBox/Main/src-client/win/dllmain.cpp

@@ -46 +46 @@
 
         // idempotent, so doesn't harm, and needed for COM embedding scenario
-        RTR3InitDll(0);
+        RTR3InitDll(RTR3INIT_FLAGS_UNOBTRUSIVE);
     }
     else if (dwReason == DLL_PROCESS_DETACH)

trunk/src/VBox/Main/src-server/win/PerformanceWin.cpp

@@ -34 +34 @@
 
 #include <iprt/err.h>
+#include <iprt/ldr.h>
 #include <iprt/mp.h>
 #include <iprt/mem.h>
@@ -87 +88 @@
     PFNGST  mpfnGetSystemTimes;
     PFNNQSI mpfnNtQuerySystemInformation;
-    HMODULE mhNtDll;
 
     ULONG   totalRAM;
@@ -97 +97 @@
 }
 
-CollectorWin::CollectorWin() : CollectorHAL(), mhNtDll(0)
-{
-    mpfnGetSystemTimes = (PFNGST)GetProcAddress(GetModuleHandle(TEXT("kernel32.dll")),
-                                                "GetSystemTimes");
+CollectorWin::CollectorWin() : CollectorHAL(), mpfnNtQuerySystemInformation(NULL)
+{
+    /* Note! Both kernel32.dll and ntdll.dll can be assumed to always be present. */
+    mpfnGetSystemTimes = (PFNGST)RTLdrGetSystemSymbol("kernel32.dll", "GetSystemTimes");
     if (!mpfnGetSystemTimes)
     {
         /* Fall back to deprecated NtQuerySystemInformation */
-        if (!(mhNtDll = LoadLibrary(TEXT("ntdll.dll"))))
-        {
-            LogRel(("Failed to load NTDLL.DLL with error 0x%x. GetSystemTimes() is"
-                    " not available either. CPU and VM metrics will not be collected.\n",
-                    GetLastError()));
-            mpfnNtQuerySystemInformation = 0;
-        }
-        else if (!(mpfnNtQuerySystemInformation = (PFNNQSI)GetProcAddress(mhNtDll,
-                                                                          "NtQuerySystemInformation")))
-        {
-            LogRel(("Neither GetSystemTimes() nor NtQuerySystemInformation() is"
-                    " not available. CPU and VM metrics will not be collected.\n"));
-            mpfnNtQuerySystemInformation = 0;
-        }
+        mpfnNtQuerySystemInformation = (PFNNQSI)RTLdrGetSystemSymbol("ntdll.dll", "NtQuerySystemInformation");
+        if (!mpfnNtQuerySystemInformation)
+            LogRel(("Warning! Neither GetSystemTimes() nor NtQuerySystemInformation() is not available.\n"
+                    "         CPU and VM metrics will not be collected! (lasterr %u)\n", GetLastError()));
     }
 
@@ -130 +120 @@
 CollectorWin::~CollectorWin()
 {
-    if (mhNtDll)
-        FreeLibrary(mhNtDll);
 }