Changeset 46593 in vbox for trunk/src/VBox/Additions/WINNT/VBoxMMR

Timestamp:

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

Author:

vboxsync

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

86471

Message:

updates

Location:

trunk/src/VBox/Additions/WINNT/VBoxMMR

Files:

• dllmain.cpp (modified) (1 diff)
• tsmfhook.cpp (modified) (2 diffs)

trunk/src/VBox/Additions/WINNT/VBoxMMR/dllmain.cpp

@@ -45 +45 @@
             if (isWMP)
             {
-                RTR3InitDll(0);
+                RTR3InitDll(RTR3INIT_FLAGS_UNOBTRUSIVE);
                 VbglR3Init();
                 VBoxMMRHookLog("VBoxMMR: Hooking wmplayer process\n");

trunk/src/VBox/Additions/WINNT/VBoxMMR/tsmfhook.cpp

@@ -1343 +1343 @@
 }
 
-void InstallHooksForModule(const char *pszName, HookEntry hooks[])
-{
-    HMODULE hMod = LoadLibraryA(pszName);
-    if (hMod != NULL)
-    {
-        VBoxMMRHookLog("VBoxMMR: Hooking %s -> %x \n", pszName, hMod);
-        const IMAGE_IMPORT_DESCRIPTOR *pDescriptor = GetImportDescriptor(hMod);
-        InstallHooks(pDescriptor, (PBYTE) hMod, hooks);
+void InstallHooksForSystemModule(const char *pszName, HookEntry hooks[])
+{
+    /* Construct the full path to the given module and load it. */
+    char   szPath[MAX_PATH];
+    UINT   cchPath = GetSystemDirectoryA(szPath, MAX_PATH);
+    size_t cbName  = strlen(pszName) + 1;
+    if (cchPath + 1 + cbName <= sizeof(szPath))
+    {
+        szPath[cchPath] = '\\';
+        memcpy(&szPath[cchPath + 1], pszName, cbName);
+
+        HMODULE hMod = LoadLibraryA(szPath);
+        if (hMod != NULL)
+        {
+            VBoxMMRHookLog("VBoxMMR: Hooking %s -> %x \n", pszName, hMod);
+            const IMAGE_IMPORT_DESCRIPTOR *pDescriptor = GetImportDescriptor(hMod);
+            InstallHooks(pDescriptor, (PBYTE) hMod, hooks);
+        }
+        else
+            VBoxMMRHookLog("VBoxMMR: Error hooking %s -> not found (last error %u)\n", pszName, GetLastError());
     }
     else
-    {
         VBoxMMRHookLog("VBoxMMR: Error hooking %s -> not found\n", pszName);
-    }
 }
 
@@ -1382 +1392 @@
         }
 
-        InstallHooksForModule("winmm.dll", g_WinMMHooks);
-        InstallHooksForModule("tsmf.dll", g_TSMFHooks);
-        InstallHooksForModule("DSHOWRDPFILTER.dll", g_TSMFHooks);
-        InstallHooksForModule("MSMPEG2VDEC.dll", g_DShowHooks);
-        InstallHooksForModule("MFDS.dll", g_DShowHooks);
-        InstallHooksForModule("mf.dll", g_MFHooks);
+        InstallHooksForSystemModule("winmm.dll", g_WinMMHooks);
+        InstallHooksForSystemModule("tsmf.dll", g_TSMFHooks);
+        InstallHooksForSystemModule("DSHOWRDPFILTER.dll", g_TSMFHooks);
+        InstallHooksForSystemModule("MSMPEG2VDEC.dll", g_DShowHooks);
+        InstallHooksForSystemModule("MFDS.dll", g_DShowHooks);
+        InstallHooksForSystemModule("mf.dll", g_MFHooks);
 
         ULONG ret = RegisterTraceGuids(