From 31a1cf718f5f6948edb4f69e3c626d7d23b2a8fc Mon Sep 17 00:00:00 2001 From: stansmith Date: Fri, 10 Oct 2008 15:39:10 +0000 Subject: [PATCH] [WinOF] RC3 updates git-svn-id: svn://openib.tc.cornell.edu/gen1@1641 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86 --- .../branches/WinOF/WIX/CustomActions.vbs | 331 +++++++++++------- .../branches/WinOF/WIX/README_release.txt | 4 +- .../branches/WinOF/WIX/Release_notes.htm | 6 +- .../branches/WinOF/WIX/wlh/ia64/wof.wxs | 2 +- .../WOF2-0/branches/WinOF/WIX/wlh/x64/wof.wxs | 2 +- .../WOF2-0/branches/WinOF/WIX/wlh/x86/wof.wxs | 2 +- .../branches/WinOF/WIX/wnet/ia64/wof.wxs | 2 +- .../branches/WinOF/WIX/wnet/x64/wof.wxs | 2 +- .../branches/WinOF/WIX/wnet/x86/wof.wxs | 2 +- .../WOF2-0/branches/WinOF/WIX/wxp/x86/wof.wxs | 2 +- 10 files changed, 213 insertions(+), 142 deletions(-) diff --git a/branches/WOF2-0/branches/WinOF/WIX/CustomActions.vbs b/branches/WOF2-0/branches/WinOF/WIX/CustomActions.vbs index 7e9c5aae..caa69b5a 100644 --- a/branches/WOF2-0/branches/WinOF/WIX/CustomActions.vbs +++ b/branches/WOF2-0/branches/WinOF/WIX/CustomActions.vbs @@ -109,6 +109,22 @@ Function FileMove(filename,destination) End Function +Function DriverFileDelete(fso,WshShell,filename) + Err.clear + If fso.FileExists(filename) Then + On Error Resume Next + ' unlock the driver file by deleting PnPLocked reg entry. + base = "reg delete HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Setup\PnpLockdownFiles /v " + Return = WshShell.Run (base & filename & " /f", 0, true) + fso.DeleteFile(filename),True + If (Err And Err.Number <> 70) Then ' tolerate protection errors + ErrMsg ("Could not delete: " & filename) + End If + End If +End Function + + + Function FileMDelete(src,file) Dim rc,cmd On Error Resume Next @@ -189,9 +205,9 @@ End Sub ' when the driver is uninstalled. Win2K3/x64 files persist, XP & Win2K3/x86 ' the driver files are correctly remove? -Function RemoveDriverFiles() +Function RemoveDriverFiles(WshShell) Dim Win, sDRIVERS, sSystem64Folder, sInstalldir, sSYS32, sSYSWOW64 - Dim sSystemFolder, CheckMode, PropArray, dllCache + Dim sSystemFolder, CheckMode, PropArray, dllCache, fso, sTemp ' Function can be called from the Driver{Install/Uninstall} rtns. ' (properties are different). @@ -208,7 +224,10 @@ Function RemoveDriverFiles() sInstalldir = Session.Property("INSTALLDIR") sSystemFolder = Session.Property("SystemFolder") End if - + + Set WshShell = CreateObject("WScript.Shell") + Set fso = CreateObject("Scripting.FileSystemObject") + MTARCH = Architecture ' this is screw-ball: on 64-bit systems: SystemFolder == %windir%\SysWOW64 @@ -225,91 +244,93 @@ Function RemoveDriverFiles() End If sDRIVERS = sSYS32 & "drivers\" - FileDelete(sDRIVERS & "ibbus.sys") + DriverFileDelete fso,WshShell,sDRIVERS & "ibbus.sys" FileDelete(sDRIVERS & "ibbus.sy1") - FileDelete(sDRIVERS & "ibiou.sys") - FileDelete(sDRIVERS & "mthca.sys") + DriverFileDelete fso,WshShell,sDRIVERS & "ibiou.sys" + DriverFileDelete fso,WshShell,sDRIVERS & "mthca.sys" FileDelete(sDRIVERS & "mthca.sy1") - FileDelete(sDRIVERS & "mlx4_bus.sys") - FileDelete(sDRIVERS & "mlx4_hca.sys") + DriverFileDelete fso,WshShell,sDRIVERS & "mlx4_bus.sys" + DriverFileDelete fso,WshShell,sDRIVERS & "mlx4_hca.sys" - FileDelete(sDRIVERS & "ipoib.sys") - FileDelete(sDRIVERS & "ibsrp.sys") - FileDelete(sDRIVERS & "vnic.sys") - FileDelete(sDRIVERS & "qlgcvnic.sys") + DriverFileDelete fso,WshShell,sDRIVERS & "ipoib.sys" + DriverFileDelete fso,WshShell,sDRIVERS & "ibsrp.sys" + DriverFileDelete fso,WshShell,sDRIVERS & "vnic.sys" + DriverFileDelete fso,WshShell,sDRIVERS & "qlgcvnic.sys" dllCache = sSystem64Folder & "dllcache\" - FileDelete(dllCache & "ibal.dll") - FileDelete(dllCache & "ibald.dll") - FileDelete(dllCache & "complib.dll") - FileDelete(dllCache & "complibd.dll") - FileDelete(dllCache & "mthcau.dll") - FileDelete(dllCache & "mthcaud.dll") - FileDelete(dllCache & "mlx4u.dll") - FileDelete(dllCache & "mlx4ud.dll") - FileDelete(dllCache & "IbInstaller.dll") - FileDelete(dllCache & "ibwsd.dll") - FileDelete(dllCache & "ibsrp.dll") - FileDelete(dllCache & "ibsrpd.dll") + If fso.FolderExists(dllCache) Then + FileDelete(dllCache & "ibal.dll") + FileDelete(dllCache & "ibald.dll") + FileDelete(dllCache & "complib.dll") + FileDelete(dllCache & "complibd.dll") + FileDelete(dllCache & "mthcau.dll") + FileDelete(dllCache & "mthcaud.dll") + FileDelete(dllCache & "mlx4u.dll") + FileDelete(dllCache & "mlx4ud.dll") + FileDelete(dllCache & "IbInstaller.dll") + FileDelete(dllCache & "ibwsd.dll") + FileDelete(dllCache & "ibsrp.dll") + FileDelete(dllCache & "ibsrpd.dll") + End if - FileDelete(sSYS32 & "ibal.dll") - FileDelete(sSYS32 & "ibald.dll") - FileDelete(sSYS32 & "ibal32.dll") - FileDelete(sSYS32 & "ibal32d.dll") - FileDelete(sSYS32 & "complib.dll") - FileDelete(sSYS32 & "complibd.dll") - FileDelete(sSYS32 & "cl32.dll") - FileDelete(sSYS32 & "cl32d.dll") - FileDelete(sSYS32 & "mthcau.dll") - FileDelete(sSYS32 & "mthcaud.dll") - FileDelete(sSYS32 & "mthca32.dll") - FileDelete(sSYS32 & "mthca32d.dll") - FileDelete(sSYS32 & "mlx4u.dll") - FileDelete(sSYS32 & "mlx4ud.dll") - FileDelete(sSYS32 & "mlx4u32.dll") - FileDelete(sSYS32 & "mlx4u32d.dll") - FileDelete(sSYS32 & "ibsrp.dll") - FileDelete(sSYS32 & "ibsrpd.dll") - FileDelete(sSYS32 & "IbInstaller.dll") - FileDelete(sSYS32 & "ibwsd.dll") - FileDelete(sSYS32 & "ibndprov.dll") - FileDelete(sSYS32 & "ibndprov32.dll") - FileDelete(sSYS32 & "ndinstall.exe") - - If (MTARCH <> "x86") Then - FileDelete(sSYSWOW64 & "ibal.dll") - FileDelete(sSYSWOW64 & "ibald.dll") - FileDelete(sSYSWOW64 & "complib.dll") - FileDelete(sSYSWOW64 & "complibd.dll") - FileDelete(sSYSWOW64 & "mthcau.dll") - FileDelete(sSYSWOW64 & "mthcaud.dll") - FileDelete(sSYSWOW64 & "mlx4u.dll") - FileDelete(sSYSWOW64 & "mlx4ud.dll") - FileDelete(sSYSWOW64 & "ibsrp.dll") - FileDelete(sSYSWOW64 & "ibsrpd.dll") - FileDelete(sSYSWOW64 & "IbInstaller.dll") - FileDelete(sSYSWOW64 & "ibwsd.dll") + DriverFileDelete fso,WshShell,sSYS32 & "ibal.dll" + DriverFileDelete fso,WshShell,sSYS32 & "ibald.dll" + DriverFileDelete fso,WshShell,sSYS32 & "ibal32.dll" + DriverFileDelete fso,WshShell,sSYS32 & "ibal32d.dll" + DriverFileDelete fso,WshShell,sSYS32 & "complib.dll" + DriverFileDelete fso,WshShell,sSYS32 & "complibd.dll" + DriverFileDelete fso,WshShell,sSYS32 & "cl32.dll" + DriverFileDelete fso,WshShell,sSYS32 & "cl32d.dll" + DriverFileDelete fso,WshShell,sSYS32 & "mthcau.dll" + DriverFileDelete fso,WshShell,sSYS32 & "mthcaud.dll" + DriverFileDelete fso,WshShell,sSYS32 & "mthca32.dll" + DriverFileDelete fso,WshShell,sSYS32 & "mthca32d.dll" + DriverFileDelete fso,WshShell,sSYS32 & "mlx4u.dll" + DriverFileDelete fso,WshShell,sSYS32 & "mlx4ud.dll" + DriverFileDelete fso,WshShell,sSYS32 & "mlx4u32.dll" + DriverFileDelete fso,WshShell,sSYS32 & "mlx4u32d.dll" + DriverFileDelete fso,WshShell,sSYS32 & "ibsrp.dll" + DriverFileDelete fso,WshShell,sSYS32 & "ibsrpd.dll" + DriverFileDelete fso,WshShell,sSYS32 & "IbInstaller.dll" + DriverFileDelete fso,WshShell,sSYS32 & "ibwsd.dll" + DriverFileDelete fso,WshShell,sSYS32 & "ibndprov.dll" + DriverFileDelete fso,WshShell,sSYS32 & "ibndprov32.dll" + DriverFileDelete fso,WshShell,sSYS32 & "ndinstall.exe" + + If fso.FolderExists(sSYSWOW64) Then + DriverFileDelete fso,WshShell,sSYSWOW64 & "ibal.dll" + DriverFileDelete fso,WshShell,sSYSWOW64 & "ibald.dll" + DriverFileDelete fso,WshShell,sSYSWOW64 & "complib.dll" + DriverFileDelete fso,WshShell,sSYSWOW64 & "complibd.dll" + DriverFileDelete fso,WshShell,sSYSWOW64 & "mthcau.dll" + DriverFileDelete fso,WshShell,sSYSWOW64 & "mthcaud.dll" + DriverFileDelete fso,WshShell,sSYSWOW64 & "mlx4u.dll" + DriverFileDelete fso,WshShell,sSYSWOW64 & "mlx4ud.dll" + DriverFileDelete fso,WshShell,sSYSWOW64 & "ibsrp.dll" + DriverFileDelete fso,WshShell,sSYSWOW64 & "ibsrpd.dll" + DriverFileDelete fso,WshShell,sSYSWOW64 & "IbInstaller.dll" + DriverFileDelete fso,WshShell,sSYSWOW64 & "ibwsd.dll" + DriverFileDelete fso,WshShell,sSYSWOW64 & "ibndprov.dll" End If - FileDelete(Win & "lastgood\system32\ibwsd.dll") - FileDelete(Win & "lastgood\SysWOW64\ibwsd.dll") - FileDelete(Win & "lastgood\SysWOW64\mthcau.dll") - FileDelete(Win & "lastgood\SysWOW64\mthcaud.dll") - FileDelete(Win & "lastgood\system32\mthcau.dll") - FileDelete(Win & "lastgood\system32\mthcaud.dll") - FileDelete(Win & "lastgood\system32\drivers\mthcau.dll") - FileDelete(Win & "lastgood\system32\drivers\mthcaud.dll") - FileDelete(Win & "lastgood\system32\drivers\mthca.sys") + If fso.FolderExists(Win & "lastgood" ) Then + FileDelete(Win & "lastgood\system32\ibwsd.dll") + FileDelete(Win & "lastgood\SysWOW64\ibwsd.dll") + FileDelete(Win & "lastgood\SysWOW64\mthcau.dll") + FileDelete(Win & "lastgood\SysWOW64\mthcaud.dll") + FileDelete(Win & "lastgood\system32\mthcau.dll") + FileDelete(Win & "lastgood\system32\mthcaud.dll") + FileDelete(Win & "lastgood\system32\drivers\mthcau.dll") + FileDelete(Win & "lastgood\system32\drivers\mthcaud.dll") + FileDelete(Win & "lastgood\system32\drivers\mthca.sys") + End If FileDelete(Win & "winverbs.lib") - FileDelete(sDRIVERS & "winverbs.sys") - FileDelete(sSYS32 & "winverbs.dll") - FileDelete(sSYS32 & "winverbsd.dll") + DriverFileDelete fso,WshShell,sDRIVERS & "winverbs.sys" + DriverFileDelete fso,WshShell,sSYS32 & "winverbs.dll" + DriverFileDelete fso,WshShell,sSYS32 & "winverbsd.dll" ' delete opensm files - Dim fso - Dim sTemp - Set fso = CreateObject("Scripting.FileSystemObject") sTemp = fso.GetSpecialFolder(0) & "\temp\" ' remove files from %SystemRoot%\temp FileDelete(sTemp & "guid2lid") @@ -319,7 +340,6 @@ Function RemoveDriverFiles() ' Delete oem*.inf and oem*.pnf files dim InfFiles, PnfFiles, IFILES, PFILES - Set WshShell = CreateObject("WScript.Shell") Set infFilesExec = WshShell.Exec ("cmd.exe /c for /f %i in ('findstr /m Mellanox %WINDIR%\inf\oem*.*') do @echo %i") ' Display error number and description if applicable If Err Then ShowError @@ -551,7 +571,7 @@ End Function ' Function to add registry DWORD val. Function AddRegDWORDValue(strKeyPath, strValueName, dwValue) - const HKEY_LOCAL_MACHINE = &H80000002 + Const HKEY_LOCAL_MACHINE = &H80000002 strComputer = "." Set oReg=GetObject("winmgmts:{impersonationLevel=impersonate}!\\" &_ @@ -569,7 +589,7 @@ End Function ' Function to add registry Expanded string val. Function AddRegExpandValue(strKeyPath, strValueName, dwValue) - const HKEY_LOCAL_MACHINE = &H80000002 + Const HKEY_LOCAL_MACHINE = &H80000002 strComputer = "." Set oReg=GetObject("winmgmts:{impersonationLevel=impersonate}!\\" &_ @@ -588,7 +608,7 @@ End Function ' Function to add registry string val. Function AddRegStringValue(strKeyPath, strValueName, dwValue) -const HKEY_LOCAL_MACHINE = &H80000002 +Const HKEY_LOCAL_MACHINE = &H80000002 strComputer = "." Set oReg=GetObject("winmgmts:{impersonationLevel=impersonate}!\\" &_ @@ -717,11 +737,13 @@ End Sub ' For installer error codes see ' http://msdn2.microsoft.com/en-us/library/aa368542(VS.85).aspx -const ERROR_INSTALL_SOURCE_ABSENT = 1612 ' missing files to install, +Const ERROR_INSTALL_SOURCE_ABSENT = 1612 ' missing files to install, ' invalid feature selection. -const ERROR_INSTALL_FAILURE = 1603 ' fatal error during installation -const ERROR_FUNCTION_FAILED = 1627 ' function failed during execution -const ERROR_SUCCESS_REBOOT_REQUIRED = 3010 ' restart required +Const ERROR_INSTALL_FAILURE = 1603 ' fatal error during installation +Const ERROR_FUNCTION_FAILED = 1627 ' function failed during execution +Const ERROR_SUCCESS_REBOOT_REQUIRED = 3010 ' restart required + +Const DPINST_ERR = &H80000000 ''''''''''' Device Driver Install '''''''''''' @@ -859,7 +881,7 @@ Function DriverInstall() ' Display error number and description if applicable If Return <> 0 Then msgbox "mlx4_hca Install Err(" & Return & ") " & cmd - remove_INF_file WshShell,dpinst,"mlx4_" + remove_INF_file WshShell,devmanEXE,"mlx4_" DriverInstall=ERROR_INSTALL_FAILURE Exit Function End if @@ -897,7 +919,7 @@ Function DriverInstall() If DrvInstalled <> true Then msgbox "InfiniHost(mthca) Install Err(" & Return & ") " & cmd - remove_INF_file WshShell,dpinst,"mthca" + remove_INF_file WshShell,devmanEXE,"mthca" DriverInstall=ERROR_INSTALL_FAILURE Exit Function End if @@ -970,6 +992,7 @@ End Function ' Find IBA devices using Devcon Function Find_IBA_Devices(WshShell,sInstalldir) + Dim dev Set ibaDevicesExec = WshShell.Exec ("cmd.exe /c cd " & sInstalldir & "IBcore & devman.exe findall * | FIND ""IBA""") ibaDevices = split(ibaDevicesExec.StdOut.ReadAll, vbCrLF) @@ -977,8 +1000,8 @@ Function Find_IBA_Devices(WshShell,sInstalldir) ' Getting the array Size dim arrSize arrSize = 0 - for each deviceCan in ibaDevices - if (Instr(deviceCan,"IBA\") = 1) Then + for each dev in ibaDevices + if (Instr(dev,"IBA\") = 1) Then arrSize = arrSize + 1 End if next @@ -986,9 +1009,9 @@ Function Find_IBA_Devices(WshShell,sInstalldir) dim ibaDev() Redim ibaDev(arrSize - 1) index = 0 - for each deviceCan in ibaDevices - if (Instr(deviceCan,"IBA\") = 1) Then - ibaDev(index) = deviceCan + for each dev in ibaDevices + if (Instr(dev,"IBA\") = 1) Then + ibaDev(index) = dev index = index + 1 End if next @@ -1002,33 +1025,59 @@ End Function ' were created for IPoIB. Function Find_IPOIB_LAC() - Set WshShell = CreateObject("WScript.Shell") - - If (Session.Property("VersionNT") <> 501) Then - ' Win2K3 style - cmd = "cmd.exe /c reg query HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Network /f ""IBA\IPOIB"" /s /d | FIND ""Connection"" " - Else - ' XP style - cmd = "reg.exe query HKLM\SYSTEM\CurrentControlSet\Control\Network /s | FIND ""}\Connection"" " - End if + Dim WinOS,cmd,base,dev - Set ibaDevicesExec = WshShell.Exec ("cmd.exe /C " & cmd) + Set WshShell = CreateObject("WScript.Shell") + base = "cmd.exe /c reg query HKLM\SYSTEM\CurrentControlSet\Control\Network" + WinOS = Session.Property("VersionNT") + + If (WinOS <> 501) Then + ' Win2K3 style + cmd = base & " /f ""IBA\IPOIB"" /s /d | FIND ""Connection"" " + Else + ' XP style + cmd = base & " /s | FIND ""}\Connection"" " + End if + + Set ibaDevicesExec = WshShell.Exec ("cmd.exe /C " & cmd) ibaDevices = split(ibaDevicesExec.StdOut.ReadAll, vbCrLF) ' determine the array Size dim arrSize arrSize = 0 - for each deviceCan in ibaDevices + for each dev in ibaDevices arrSize = arrSize + 1 next 'Creating array of Local Area Connections based on IPoIB dim ibaDev() Redim ibaDev(arrSize - 1) index = 0 - for each deviceCan in ibaDevices - ibaDev(index) = deviceCan - index = index + 1 + + For each dev in ibaDevices + If dev = "" Then + ElseIf WinOS <> 501 then + ' ibaDev(index) = dev + delstr = Left(dev,Len(dev)-Len("\Connection")) + ibaDev(index) = delstr + index = index + 1 + Else + ' XP reg.exe format sucks, unable to filter IBA\IPOIB, so we do + ' it here....sigh. + Set rex = WshShell.Exec ("cmd.exe /C reg.exe query " & dev & _ + " /v PnpInstanceID | FIND ""IBA\IPOIB"" ") + resp = split(rex.StdOut.ReadAll, vbCrLF) + For each re in resp +' msgbox "XP dev " & dev +' msgbox "XP re " & re + if Instr(re,"IPOIB") Then + delstr = Left(dev,Len(dev)-Len("\Connection")) + ibaDev(index) = delstr + index = index + 1 + Exit For + End If + next + End if next Find_IPOIB_LAC=ibaDev @@ -1084,7 +1133,7 @@ End Function ' Remove QLogic VNIC instances -Sub Uninstall_VNIC(WshShell,devices,sInstalldir) +Sub Uninstall_VNIC(fso,WshShell,devices,sInstalldir) Dim devman,devmanRMAT,devmanDAAT,Return,device,dt,sDRIVERS @@ -1112,13 +1161,13 @@ Sub Uninstall_VNIC(WshShell,devices,sInstalldir) remove_INF_file WshShell,devman,"qlgcvnic.sys" sDRIVERS = Session.Property("WindowsFolder") & "system32\drivers\" - FileDelete sDRIVERS & "vnic.sys" - FileDelete sDRIVERS & "qlgcvnic.sys" + DriverFileDelete fso,WshShell,sDRIVERS & "vnic.sys" + DriverFileDelete fso,WshShell,sDRIVERS & "qlgcvnic.sys" End Sub -Sub Uninstall_SRP(WshShell,devices,sInstalldir) +Sub Uninstall_SRP(fso,WshShell,devices,sInstalldir) Dim devman,devmanRMAT,devmanDAAT,Return,device,sDRIVERS @@ -1157,7 +1206,7 @@ Sub Uninstall_SRP(WshShell,devices,sInstalldir) remove_INF_file WshShell,devman,"ibsrp.sys" sDRIVERS = Session.Property("WindowsFolder") & "system32\drivers\" - FileDelete sDRIVERS & "ibsrp.sys" + DriverFileDelete fso,WshShell,sDRIVERS & "ibsrp.sys" End Sub @@ -1187,9 +1236,9 @@ Function Uninstall_IB_Devices(sInstalldir,sVersionNT,sRemove) devices = Find_IBA_Devices(WshShell,sInstalldir) - Uninstall_SRP WshShell,devices,sInstalldir + Uninstall_SRP fso,WshShell,devices,sInstalldir - Uninstall_VNIC WshShell,devices,sInstalldir + Uninstall_VNIC fso,WshShell,devices,sInstalldir ' remove any lingering IB I/O Units For each devTarget in devices @@ -1289,35 +1338,57 @@ Sub DriverUninstall() DeleteRegKey "System\CurrentControlSet\Services\mlx4_bus" DeleteRegKey "System\CurrentControlSet\Services\mlx4_hca" DeleteRegKey "System\CurrentControlSet\Services\ipoib" - DeleteRegKey "System\CurrentControlSet\Services\srp" + DeleteRegKey "System\CurrentControlSet\Services\ibiou" + DeleteRegKey "System\CurrentControlSet\Services\ibsrp" DeleteRegKey "System\CurrentControlSet\Services\qlgcvnic" - DeleteRegKey "System\CurrentControlSet\Services\vnic" + DeleteRegKey "System\CurrentControlSet\Services\winverbs" ' Mthca DeleteRegValue "SYSTEM\CurrentControlSet\Control\CoDeviceInstallers" ,_ "{58517E00-D3CF-40c9-A679-CEE5752F4491}" + DeleteRegKey "SYSTEM\CurrentControlSet\Control\Class\{58517E00-D3CF-40C9-A679-CEE5752F4491}" ' Connectx (mlx4) DeleteRegValue "SYSTEM\CurrentControlSet\Control\CoDeviceInstallers" ,_ "{31B0B28A-26FF-4dca-A6FA-E767C7DFBA20}" + DeleteRegKey "SYSTEM\CurrentControlSet\Control\Class\{31B0B28A-26FF-4dca-A6FA-E767C7DFBA20}" + DeleteRegKey "SYSTEM\CurrentControlSet\Control\Class\{714995B2-CD65-4a47-BCFE-95AC73A0D780}" + ' In livefish mode, the above does not always work - just in case. + ' remove reg entries for ConnectX, mthca, ibbus, mlx4 & ipoib + nukem = Array(_ + "Control\Class\{58517E00-D3CF-40C9-A679-CEE5752F4491}",_ + "Control\Class\{31B0B28A-26FF-4dca-A6FA-E767C7DFBA20}",_ + "Control\Class\{714995B2-CD65-4a47-BCFE-95AC73A0D780}",_ + "Services\ibbus",_ + "Services\mthca",_ + "Services\mlx4_bus",_ + "Services\mlx4_hca",_ + "Services\ipoib",_ + "Services\EventLog\System\ipoib",_ + "Services\ibiou",_ + "Services\qlgcvnic",_ + "Services\ibsrp",_ + "Services\winverbs" ) + + base = "reg.exe delete HKLM\SYSTEM\CurrentControlSet\" + ' in livefish mode the delete didn't suceed, delete it in another way - Return = WshShell.Run ("reg.exe delete HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Class\{58517E00-D3CF-40C9-A679-CEE5752F4491} /f", 0, true) - If Err Then ShowError + For each ID in nukem + If ID <> "" Then + Return = WshShell.Run (base & ID & " /f", 0, true) + End if + Next - ' ConnectX - Return = WshShell.Run ("reg.exe delete HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Class\{31B0B28A-26FF-4dca-A6FA-E767C7DFBA20} /f", 0, true) - Return = WshShell.Run ("reg.exe delete HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Class\{714995B2-CD65-4a47-BCFE-95AC73A0D780} /f", 0, true) - - ' mthca, ibbus, mlx4 & ipoib - Return = WshShell.Run ("reg.exe delete HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\ibbus /f", 0, true) - Return = WshShell.Run ("reg.exe delete HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\mthca /f", 0, true) - Return = WshShell.Run ("reg.exe delete HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\mlx4_bus /f", 0, true) - Return = WshShell.Run ("reg.exe delete HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\mlx4_hca /f", 0, true) - Return = WshShell.Run ("reg.exe delete HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\ipoib /f", 0, true) + Return = WshShell.Run (base & "Control\Wdf\Kmdf\kmdflibrary\versions\1\driverservices /v mlx4_bus /f", 0, true) + +' Not yet +' Return = WshShell.Run ("reg.exe delete HKLM\Software\Microsoft\Windows\currentVersion\DIFx\DriverStore\WinVerbs_* /f", 0, true) +' Return = WshShell.Run ("reg.exe delete HKLM\Software\Microsoft\Windows\currentVersion\DIFx\DriverStore\ipoib_* /f", 0, true) +' ' remove all Local Area Connection which were constructed for IPoIB ' create a list of IBA\IPOIB Local Area Connections via 'reg query' @@ -1332,7 +1403,7 @@ Sub DriverUninstall() Next ' remove driver installed files - RemoveDriverFiles + RemoveDriverFiles WshShell Session.Property("REBOOT") = "FORCE" err.clear @@ -1532,7 +1603,7 @@ Function ChkInstallAndReboot() status = 0 Set WshShell = CreateObject("WScript.Shell") - Return = WshShell.Run ("reg.exe query HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\ibbus /v ImagePath", 0, true) + Return = WshShell.Run ("reg.exe query HKLM\SYSTEM\CurrentControlSet\Services\ibbus /v ImagePath", 0, true) If (Return = 0) And (Err.Number = 0) Then Status = Status + 1 End if @@ -1770,12 +1841,12 @@ Function InstallChanged If (Not IsNull(sRemove)) AND (sRemove <> "") Then If Instr(sRemove,"fSRP") Then - Uninstall_SRP WshShell,Null,sInstalldir + Uninstall_SRP fso,WshShell,Null,sInstalldir NeedReboot = NeedReboot + 1 End If If Instr(sRemove,"fVNIC") Then - Uninstall_VNIC WshShell,Null,sInstalldir + Uninstall_VNIC fso,WshShell,Null,sInstalldir NeedReboot = NeedReboot + 1 End If End If diff --git a/branches/WOF2-0/branches/WinOF/WIX/README_release.txt b/branches/WOF2-0/branches/WinOF/WIX/README_release.txt index cd6dbfb0..459f4fdf 100644 --- a/branches/WOF2-0/branches/WinOF/WIX/README_release.txt +++ b/branches/WOF2-0/branches/WinOF/WIX/README_release.txt @@ -1,5 +1,5 @@ -[9-24-08] WinOF 2.0 (RC2) release +[10-08-08] WinOF 2.0 (RC2) release Downloads available at http://www.openfabrics.org/downloads/WinOF/v2.0_rc2 @@ -8,7 +8,7 @@ WinOF 2.0 Summary Changes ------------------------- 1) WinOF 2.0 release based on openib-windows svn source revision - (branches\WOF2-0 svn.1620). + (branches\WOF2-0 svn.1638). Last WinOF release (1.1) based on svn 1177. diff --git a/branches/WOF2-0/branches/WinOF/WIX/Release_notes.htm b/branches/WOF2-0/branches/WinOF/WIX/Release_notes.htm index 1d89ffa2..06733c23 100644 --- a/branches/WOF2-0/branches/WinOF/WIX/Release_notes.htm +++ b/branches/WOF2-0/branches/WinOF/WIX/Release_notes.htm @@ -92,7 +92,7 @@ src=openfabrics.gif>

2.0 Release Notes

-09/24/2008

+10/08/2008
@@ -145,7 +145,7 @@ InfiniBand fabric.

 Binary files generated from the OpenIB-windows developers subversion (svn) source tree 'svn://openib.tc.cornell.edu' -(branches\WOF2-0 svn revision 1620) +(branches\WOF2-0 svn revision 1638) are packaged into a WIX 2.0 (Windows Installer Xml) single file install package referred to as the Windows OpenFabrics (WinOF) release 2.0.
@@ -750,7 +750,7 @@ the file version; the 4th field is the svn revision number.

  • WinOF 1.1 is based on openib-windows (svn revision 1177 branches\WOF1-1).
     
    • -
  • WinOF 2.0 is based on (svn.1620 branches\WOF2-0)
    • +
  • WinOF 2.0 is based on (svn.1638 branches\WOF2-0)

    • <Return-to-Top>

     

    diff --git a/branches/WOF2-0/branches/WinOF/WIX/wlh/ia64/wof.wxs b/branches/WOF2-0/branches/WinOF/WIX/wlh/ia64/wof.wxs index 3d033653..76188589 100644 --- a/branches/WOF2-0/branches/WinOF/WIX/wlh/ia64/wof.wxs +++ b/branches/WOF2-0/branches/WinOF/WIX/wlh/ia64/wof.wxs @@ -3,7 +3,7 @@ WinOF (Windows OpenFabrics) for IA64/IPF Itanium on Windows Server 2008 --> - - - - - - -