Changeset 42003 in vbox for trunk/src/VBox/Additions/WINNT

Timestamp:

Jul 3, 2012 2:57:45 PM (13 years ago)

Author:

vboxsync

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

78883

Message:

VBoxMMR: Switch to using Windows TSMF API hooking for redirection

Location:

trunk/src/VBox/Additions/WINNT

Files:

• Installer/VBoxGuestAdditionsVista.nsh (modified) (3 diffs)
• VBoxTray/Makefile.kmk (modified) (1 diff)
• VBoxTray/VBoxTray.cpp (modified) (2 diffs)

trunk/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditionsVista.nsh

@@ -77 +77 @@
 
 !ifdef VBOX_WITH_MMR
-  FILE "$%PATH_OUT%\bin\additions\VBoxMMR.dll"
+  FILE "$%PATH_OUT%\bin\additions\VBoxMMRHook.dll"
 !endif
 
@@ -90 +90 @@
 
 !ifdef VBOX_WITH_MMR
-  DetailPrint "Registering VBoxMMR.dll ..."
-  nsExec::ExecToLog '"$g_strSystemDir\regsvr32.exe" -s "$INSTDIR\VBoxMMR.dll"'
+  !insertmacro ReplaceDLL "$%PATH_OUT%\bin\additions\VBoxMMRHook.dll" "$g_strSystemDir\VBoxMMRHook.dll" "$INSTDIR"
+  AccessControl::GrantOnFile "$g_strSystemDir\VBoxMMRHook.dll" "(BU)" "GenericRead"
 !endif
 
@@ -135 +135 @@
 
 !ifdef VBOX_WITH_MMR
-   DetailPrint "Unregistering VBoxMMR.dll ..."
-   nsExec::ExecToLog '"$g_strSystemDir\regsvr32.exe" -s -u "$INSTDIR\VBoxMMR.dll"'
-
-   Delete /REBOOTOK "$INSTDIR\VBoxMMR.dll"
+   Delete /REBOOTOK "$g_strSystemDir\VBoxMMRHook.dll"
+   Delete /REBOOTOK "$INSTDIR\VBoxMMRHook.dll"
 !endif
 

trunk/src/VBox/Additions/WINNT/VBoxTray/Makefile.kmk

@@ -51 +51 @@
         mpr.lib
 endif
+ifdef VBOX_WITH_MMR
+ VBoxTray_DEFS     += VBOX_WITH_MMR
+ VBoxTray_SOURCES  += \
+        VBoxMMR.cpp
+endif
 
 VBoxTray_LIBS     = \

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

@@ -32 +32 @@
 #include "VBoxIPC.h"
 #include "VBoxLA.h"
+#include "VBoxMMR.h"
 #include <VBoxHook.h>
 #include "resource.h"
@@ -114 +115 @@
         VBoxLADestroy
     },
+#ifdef VBOX_WITH_MMR
+    {
+        "Multimedia Redirection",
+        VBoxMMRInit,
+        VBoxMMRThread,
+        VBoxMMRDestroy
+    },
+#endif
     {
         NULL