TAP-Win32 fixes to run on Windows Vista.

Modified installer to detect 32-bit vs.
64 bit Windows and install the correct TAP
driver.

TAP-Win32 version number is at 8.4.


git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@1229 e7ae566f-a301-0410-adde-c780ea21d3b5

1 files changed, 27 insertions, 2 deletions

diff --git a/install-win32/openvpn.nsi.in b/install-win32/openvpn.nsi.in
index 5813420..9a5b47a 100755
--- a/install-win32/openvpn.nsi.in
+++ b/install-win32/openvpn.nsi.in
@@ -266,8 +266,6 @@ SectionEnd
 Section "TAP-Win32 Virtual Ethernet Adapter" SecTAP
 
   SetOverwrite on
-  SetOutPath "$INSTDIR\bin"
-  File "${BIN}\ti3790\tapinstall.exe"
 
   FileOpen $R0 "$INSTDIR\bin\addtap.bat" w
   FileWrite $R0 "rem Add a new TAP-Win32 virtual ethernet adapter$\r$\n"
@@ -282,10 +280,37 @@ Section "TAP-Win32 Virtual Ethernet Adapter" SecTAP
   FileWrite $R0 "pause$\r$\n"
   FileClose $R0
 
+  ; Check if we are running on a 64 bit system.
+  System::Call "kernel32::GetCurrentProcess() i .s"
+  System::Call "kernel32::IsWow64Process(i s, *i .r0)"
+  IntCmp $0 0 tap-32bit
+
+; tap-64bit:
+
+  DetailPrint "We are running on a 64-bit system."
+
+  SetOutPath "$INSTDIR\bin"
+  File "${BIN}\ti3790-amd64\tapinstall.exe"
+
+  SetOutPath "$INSTDIR\driver"
+  File "${HOME}\tap-win32\amd64\OemWin2k.inf"
+  File "${HOME}\tap-win32\amd64\${TAPDRV}"
+
+  goto tapend
+
+tap-32bit:
+
+  DetailPrint "We are running on a 32-bit system."
+
+  SetOutPath "$INSTDIR\bin"
+  File "${BIN}\ti3790-i386\tapinstall.exe"
+
   SetOutPath "$INSTDIR\driver"
   File "${HOME}\tap-win32\i386\OemWin2k.inf"
   File "${HOME}\tap-win32\i386\${TAPDRV}"
 
+  tapend:
+
 SectionEnd
 
 Section "Add OpenVPN to PATH" SecAddPath