win-pvdrivers

changeset 317:0c6ea46f2199

Trying to get shutdownmon to terminate properly
author James Harper <james.harper@bendigoit.com.au>
date Tue Jun 17 14:28:58 2008 +1000 (2008-06-17)
parents b475a6ad8b0c
children 0488ef11be09
files ShutdownMon/Program.cs installer.nsi
line diff
     1.1 --- a/ShutdownMon/Program.cs	Tue Jun 17 14:08:37 2008 +1000
     1.2 +++ b/ShutdownMon/Program.cs	Tue Jun 17 14:28:58 2008 +1000
     1.3 @@ -325,6 +325,7 @@ namespace ShutdownMon
     1.4          protected override void OnStop()
     1.5          {
     1.6              workerThread.Abort();
     1.7 +            workerThread.Join();
     1.8          }
     1.9  
    1.10          protected void Run()
     2.1 --- a/installer.nsi	Tue Jun 17 14:08:37 2008 +1000
     2.2 +++ b/installer.nsi	Tue Jun 17 14:28:58 2008 +1000
     2.3 @@ -53,7 +53,7 @@ SectionEnd
     2.4    
     2.5  Section "Windows 2000" win2k
     2.6    SetOutPath $INSTDIR
     2.7 -  File .\ca.cer
     2.8 +  File /r .\ca.cer
     2.9    SetOutPath $INSTDIR\drivers
    2.10    File .\target\win2k\xenpci.inf
    2.11    File .\target\win2k\xennet.inf
    2.12 @@ -72,7 +72,7 @@ SectionEnd
    2.13  
    2.14  Section "Windows XP" winxp
    2.15    SetOutPath $INSTDIR
    2.16 -  File .\ca.cer
    2.17 +  File /r .\ca.cer
    2.18    SetOutPath $INSTDIR\drivers
    2.19    File .\target\winxp\xenpci.inf
    2.20    File .\target\winxp\xennet.inf
    2.21 @@ -92,7 +92,7 @@ SectionEnd
    2.22  
    2.23  Section "Windows 2003 x32" win2k3x32
    2.24    SetOutPath $INSTDIR
    2.25 -  File .\ca.cer
    2.26 +  File /r .\ca.cer
    2.27    SetOutPath $INSTDIR\drivers
    2.28    File .\target\winnet\xenpci.inf
    2.29    File .\target\winnet\xennet.inf
    2.30 @@ -112,7 +112,7 @@ SectionEnd
    2.31  
    2.32  Section "Windows 2003 x64" win2k3x64
    2.33    SetOutPath $INSTDIR
    2.34 -  File .\ca.cer
    2.35 +  File /r .\ca.cer
    2.36    SetOutPath $INSTDIR\drivers
    2.37    File .\target\winnet\xenpci.inf
    2.38    File .\target\winnet\xennet.inf
    2.39 @@ -132,7 +132,7 @@ SectionEnd
    2.40  
    2.41  Section "Windows 2008 x32" win2k8x32
    2.42    SetOutPath $INSTDIR
    2.43 -  File .\ca.cer
    2.44 +  File /r .\ca.cer
    2.45    SetOutPath $INSTDIR\drivers
    2.46    File .\target\winlh\xenpci.inf
    2.47    File .\target\winlh\xennet.inf
    2.48 @@ -152,7 +152,7 @@ SectionEnd
    2.49  
    2.50  Section "Windows 2008 x64" win2k8x64
    2.51    SetOutPath $INSTDIR
    2.52 -  File .\ca.cer
    2.53 +  File /r .\ca.cer
    2.54    SetOutPath $INSTDIR\drivers
    2.55    File .\target\winlh\xenpci.inf
    2.56    File .\target\winlh\xennet.inf
    2.57 @@ -172,6 +172,7 @@ SectionEnd
    2.58  
    2.59  Section /o "Install Cert" installcert
    2.60    ExecWait 'rundll32.exe cryptext.dll,CryptExtAddCER $INSTDIR\ca.cer'
    2.61 +SectionEnd
    2.62  
    2.63  Section "Install Drivers" installdrivers
    2.64    Push "$INSTDIR\drivers"
    2.65 @@ -221,7 +222,11 @@ Function .onInit
    2.66    Call StrContains
    2.67    Pop $0
    2.68    StrCmp $0 "" no_GPLPV
    2.69 -  MessageBox MB_OK "Warning - GPLPV specified on boot. Upgrade may work but install may break things"
    2.70 +
    2.71 +  ReadRegStr $0 HKLM SYSTEM\CurrentControlSet\Services\XenHide DisplayName
    2.72 +  StrCmp $0 "" 0 no_GPLPV
    2.73 +
    2.74 +  MessageBox MB_OK "Warning - GPLPV specified on boot but drivers not installed yet. You should cancel now and boot without GPLPV"
    2.75  no_GPLPV:
    2.76    
    2.77    Call GetWindowsVersion