1.1 --- a/installer.wxs	Wed Mar 04 13:39:13 2009 +1100
     1.2 +++ b/installer.wxs	Wed Mar 04 13:39:31 2009 +1100
     1.3 @@ -38,15 +38,17 @@
     1.4            <Directory Id='DriversDir' Name='drivers'>
     1.5              <Directory Id='XenPciDir' Name='xenpci'>
     1.6                <Component Id='XenPci' Guid='D6BB9B5F-61F9-4b6e-8FAD-289706F5EBEB'>
     1.7 +                <File Id='xenpci.cat' Name='xenpci.cat' DiskId='1' Source='xenpci\obj$(env.BUILD_ALT_DIR)\$(var.ARCHDIR)\xenpci.cat' />
     1.8                  <File Id='xenpci.inf' Name='xenpci.inf' DiskId='1' Source='xenpci\obj$(env.BUILD_ALT_DIR)\$(var.ARCHDIR)\xenpci.inf' />
     1.9                  <File Id='xenpci.sys' Name='xenpci.sys' DiskId='1' Source='xenpci\obj$(env.BUILD_ALT_DIR)\$(var.ARCHDIR)\xenpci.sys' />
    1.10 -                <File Id='xenhide.sys' Name='xenhide.sys' DiskId='1' Source='xenhide\obj$(env.BUILD_ALT_DIR)\$(var.ARCHDIR)\xenhide.sys' />
    1.11 -                <File Id='WdfCoInstaller01007.dll' Name='WdfCoInstaller01007.dll' DiskId='1' Source='$(env.BASEDIR)\redist\wdf\$(env._BUILDARCH)\WdfCoInstaller01007.dll' />
    1.12 +                <File Id='xenhide.sys' Name='xenhide.sys' DiskId='1' Source='xenpci\obj$(env.BUILD_ALT_DIR)\$(var.ARCHDIR)\xenhide.sys' />
    1.13 +                <File Id='WdfCoInstaller01007.dll' Name='WdfCoInstaller01007.dll' DiskId='1' Source='xenpci\obj$(env.BUILD_ALT_DIR)\$(var.ARCHDIR)\WdfCoInstaller01007.dll' />
    1.14                  <difx:Driver Sequence='99' Legacy='yes' PlugAndPlayPrompt='no' ForceInstall='yes' />
    1.15                </Component>
    1.16              </Directory>
    1.17              <Directory Id='XenVbdDir' Name='xenvbd'>
    1.18                <Component Id='XenVbd' Guid='1F05DC54-974C-40f6-BF41-0EFDB3EBD1DC'>
    1.19 +                <File Id='xenvbd.cat' Name='xenvbd.cat' DiskId='1' Source='xenvbd\obj$(env.BUILD_ALT_DIR)\$(var.ARCHDIR)\xenvbd.cat' />
    1.20                  <File Id='xenvbd.inf' Name='xenvbd.inf' DiskId='1' Source='xenvbd\obj$(env.BUILD_ALT_DIR)\$(var.ARCHDIR)\xenvbd.inf' />
    1.21                  <File Id='xenvbd.sys' Name='xenvbd.sys' DiskId='1' Source='xenvbd\obj$(env.BUILD_ALT_DIR)\$(var.ARCHDIR)\xenvbd.sys' />
    1.22                  <difx:Driver Sequence='1' Legacy='yes' PlugAndPlayPrompt='no' ForceInstall='yes'/>
    1.23 @@ -54,6 +56,7 @@
    1.24              </Directory>
    1.25              <Directory Id='XenScsiDir' Name='xenscsi'>
    1.26                <Component Id='XenScsi' Guid='47C9AB48-3A7D-42b2-AE2C-7F9235C8B7B4'>
    1.27 +                <File Id='xenscsi.cat' Name='xenscsi.cat' DiskId='1' Source='xenscsi\obj$(env.BUILD_ALT_DIR)\$(var.ARCHDIR)\xenscsi.cat' />
    1.28                  <File Id='xenscsi.inf' Name='xenscsi.inf' DiskId='1' Source='xenscsi\obj$(env.BUILD_ALT_DIR)\$(var.ARCHDIR)\xenscsi.inf' />
    1.29                  <File Id='xenscsi.sys' Name='xenscsi.sys' DiskId='1' Source='xenscsi\obj$(env.BUILD_ALT_DIR)\$(var.ARCHDIR)\xenscsi.sys' />
    1.30                  <difx:Driver Sequence='2' Legacy='yes' PlugAndPlayPrompt='no' ForceInstall='yes' />
    1.31 @@ -61,6 +64,7 @@
    1.32              </Directory>
    1.33              <Directory Id='XenNetDir' Name='xennet'>
    1.34                <Component Id='XenNet' Guid='F16B1EC7-35B1-42c2-9017-22DC23D80BE7'>
    1.35 +                <File Id='xennet.cat' Name='xennet.cat' DiskId='1' Source='xennet\obj$(env.BUILD_ALT_DIR)\$(var.ARCHDIR)\xennet.cat' />
    1.36                  <File Id='xennet.inf' Name='xennet.inf' DiskId='1' Source='xennet\obj$(env.BUILD_ALT_DIR)\$(var.ARCHDIR)\xennet.inf' />
    1.37                  <File Id='xennet.sys' Name='xennet.sys' DiskId='1' Source='xennet\obj$(env.BUILD_ALT_DIR)\$(var.ARCHDIR)\xennet.sys' />
    1.38                  <difx:Driver Sequence='3' Legacy='yes' PlugAndPlayPrompt='no' ForceInstall='yes' />

     2.1 --- a/makedist.bat	Wed Mar 04 13:39:13 2009 +1100
     2.2 +++ b/makedist.bat	Wed Mar 04 13:39:31 2009 +1100
     2.3 @@ -14,47 +14,22 @@ ECHO BUILDING %GPLPV_VERSION%
     2.4  
     2.5  CALL set_ddk_path.bat
     2.6  
     2.7 -cmd /C "%DDK_PATH%\bin\setenv.bat %DDK_PATH%\ fre WXP && CD \Projects\win-pvdrivers.hg && build -cZg && call wix.bat"
     2.8 -rem CALL sign_sys.bat winxp i386 XP_X86
     2.9 -rem CALL sign_inf.bat winxp XP_X86
    2.10 +cmd /C "%DDK_PATH%\bin\setenv.bat %DDK_PATH%\ fre WXP && CD \Projects\win-pvdrivers.hg && build -cZg && call sign.bat && call wix.bat"
    2.11  
    2.12 -cmd /C "%DDK_PATH%\bin\setenv.bat %DDK_PATH%\ fre WNET && CD \Projects\win-pvdrivers.hg && build -cZg && call wix.bat"
    2.13 -rem CALL sign_sys.bat winnet i386 Server2003_X86
    2.14 -rem CALL sign_inf.bat winnet Server2003_X64
    2.15 +cmd /C "%DDK_PATH%\bin\setenv.bat %DDK_PATH%\ fre WNET && CD \Projects\win-pvdrivers.hg && build -cZg && call sign.bat && call wix.bat"
    2.16  
    2.17 -cmd /C "%DDK_PATH%\bin\setenv.bat %DDK_PATH%\ fre x64 WNET && CD \Projects\win-pvdrivers.hg && build -cZg && call wix.bat"
    2.18 -rem CALL sign_sys.bat winnet amd64 Server2003_X64
    2.19 -rem CALL sign_inf.bat winnet Server2003_X64
    2.20 +cmd /C "%DDK_PATH%\bin\setenv.bat %DDK_PATH%\ fre x64 WNET && CD \Projects\win-pvdrivers.hg && build -cZg && call sign.bat && call wix.bat"
    2.21  
    2.22 -cmd /C "%DDK_PATH%\bin\setenv.bat %DDK_PATH%\ fre WLH && CD \Projects\win-pvdrivers.hg && build -cZg && call wix.bat"
    2.23 -rem CALL sign_sys.bat winlh i386 Server2008_X86
    2.24 -rem CALL sign_inf.bat winlh Server2008_X64
    2.25 +cmd /C "%DDK_PATH%\bin\setenv.bat %DDK_PATH%\ fre WLH && CD \Projects\win-pvdrivers.hg && build -cZg && call sign.bat && call wix.bat"
    2.26  
    2.27 -cmd /C "%DDK_PATH%\bin\setenv.bat %DDK_PATH%\ fre x64 WLH && CD \Projects\win-pvdrivers.hg && build -cZg && call wix.bat"
    2.28 -rem CALL sign_sys.bat winlh amd64 Server2008_X64
    2.29 -rem CALL sign_inf.bat winlh Server2008_X64
    2.30 +cmd /C "%DDK_PATH%\bin\setenv.bat %DDK_PATH%\ fre x64 WLH && CD \Projects\win-pvdrivers.hg && build -cZg && call sign.bat && call wix.bat"
    2.31  
    2.32 -cmd /C "%DDK_PATH%\bin\setenv.bat %DDK_PATH%\ chk WXP && CD \Projects\win-pvdrivers.hg && build -cZg && call wix.bat"
    2.33 -rem CALL sign_sys.bat winxp i386 XP_X86
    2.34 -rem CALL sign_inf.bat winxp XP_X86
    2.35 +cmd /C "%DDK_PATH%\bin\setenv.bat %DDK_PATH%\ chk WXP && CD \Projects\win-pvdrivers.hg && build -cZg && call sign.bat && call wix.bat"
    2.36  
    2.37 -cmd /C "%DDK_PATH%\bin\setenv.bat %DDK_PATH%\ chk WNET && CD \Projects\win-pvdrivers.hg && build -cZg && call wix.bat"
    2.38 -rem CALL sign_sys.bat winnet i386 Server2003_X86
    2.39 -rem CALL sign_inf.bat winnet Server2003_X64
    2.40 -
    2.41 -cmd /C "%DDK_PATH%\bin\setenv.bat %DDK_PATH%\ chk x64 WNET && CD \Projects\win-pvdrivers.hg && build -cZg && call wix.bat"
    2.42 -rem CALL sign_sys.bat winnet amd64 Server2003_X64
    2.43 -rem CALL sign_inf.bat winnet Server2003_X64
    2.44 +cmd /C "%DDK_PATH%\bin\setenv.bat %DDK_PATH%\ chk WNET && CD \Projects\win-pvdrivers.hg && build -cZg && call sign.bat && call wix.bat"
    2.45  
    2.46 -cmd /C "%DDK_PATH%\bin\setenv.bat %DDK_PATH%\ chk WLH && CD \Projects\win-pvdrivers.hg && build -cZg && call wix.bat"
    2.47 -rem CALL sign_sys.bat winlh i386 Server2008_X86
    2.48 -rem CALL sign_inf.bat winlh Server2008_X64
    2.49 +cmd /C "%DDK_PATH%\bin\setenv.bat %DDK_PATH%\ chk x64 WNET && CD \Projects\win-pvdrivers.hg && build -cZg && call sign.bat && call wix.bat"
    2.50  
    2.51 -cmd /C "%DDK_PATH%\bin\setenv.bat %DDK_PATH%\ chk x64 WLH && CD \Projects\win-pvdrivers.hg && build -cZg && call wix.bat"
    2.52 -rem CALL sign_sys.bat winlh amd64 Server2008_X64
    2.53 -rem CALL sign_inf.bat winlh Server2008_X64
    2.54 +cmd /C "%DDK_PATH%\bin\setenv.bat %DDK_PATH%\ chk WLH && CD \Projects\win-pvdrivers.hg && build -cZg && && call sign.bat call wix.bat"
    2.55  
    2.56 -rem IF NOT EXIST SIGN_CONFIG.BAT GOTO DONT_SIGN
    2.57 -rem CALL SIGN_CONFIG.BAT
    2.58 -rem %DDK_PATH%\bin\selfsign\certmgr -put -r %CA_CERT_LOCATION% -c -s %CA_CERT_STORE% -n %CA_CERT_NAME% ca.cer
    2.59 -rem :DONT_SIGN
    2.60 +cmd /C "%DDK_PATH%\bin\setenv.bat %DDK_PATH%\ chk x64 WLH && CD \Projects\win-pvdrivers.hg && build -cZg && call sign.bat && call wix.bat"

     3.1 --- a/sign_inf.bat	Wed Mar 04 13:39:13 2009 +1100
     3.2 +++ b/sign_inf.bat	Wed Mar 04 13:39:31 2009 +1100
     3.3 @@ -1,6 +1,9 @@
     3.4  @ECHO OFF
     3.5  IF NOT EXIST SIGN_CONFIG.BAT GOTO DONT_SIGN
     3.6  CALL SIGN_CONFIG.BAT
     3.7 -%DDK_PATH%\bin\selfsign\inf2cat /driver:target/%1 /os:%2
     3.8 +IF %_BUILDARCH%==x86 SET BUILDDIR=%BUILD_ALT_DIR%\i386 ELSE SET BUILDDIR=%BUILD_ALT_DIR%\amd64
     3.9 +%DDK_PATH%\bin\selfsign\inf2cat /driver:%BUILD_ALT_DIR%/xenpci.inf /os:%2
    3.10 +%DDK_PATH%\bin\selfsign\signtool sign /v /n %CERT_NAME% /t http://timestamp.verisign.com/scripts/timestamp.dll target\%1\%2\xennet.sys target\%1\%2\xenpci.sys target\%1\%2\xenvbd.sys target\%1\%2\xenstub.sys target\%1\%2\xenhide.sys target\%1\%2\xenscsi.sys
    3.11  %DDK_PATH%\bin\selfsign\signtool sign /v /n %CERT_NAME% /t http://timestamp.verisign.com/scripts/timestamp.dll target\%1\xengplpv.cat
    3.12  :DONT_SIGN
    3.13 +(env.BUILD_ALT_DIR)\$(var.ARCHDIR)
    3.14 \ No newline at end of file

     4.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.2 +++ b/wix.bat	Wed Mar 04 13:39:31 2009 +1100
     4.3 @@ -0,0 +1,4 @@
     4.4 +@ECHO OFF
     4.5 +IF "%_BUILDARCH%"=="x86" (SET DIFXLIB=%WIX%bin\difxapp_x86.wixlib) ELSE (SET DIFXLIB=%WIX%bin\difxapp_x64.wixlib)
     4.6 +"%WIX%\bin\candle" installer.wxs -ext "%WIX%\bin\WixUIExtension.dll" -ext "%WIX%\bin\WixDifxAppExtension.dll" -ext "%WIX%\bin\WixIIsExtension.dll"
     4.7 +"%WIX%\bin\light.exe" -o gplpv_%BUILD_ALT_DIR%.msi installer.wixobj "%DIFXLIB%" -ext "%WIX%\bin\WixUIExtension.dll" -ext "%WIX%\bin\WixDifxAppExtension.dll" -ext "%WIX%\bin\WixIIsExtension.dll"

     5.1 --- a/xennet/xennet.inx	Wed Mar 04 13:39:13 2009 +1100
     5.2 +++ b/xennet/xennet.inx	Wed Mar 04 13:39:31 2009 +1100
     5.3 @@ -3,7 +3,7 @@ Signature="$WINDOWS NT$"
     5.4  Class=Net
     5.5  ClassGuid={4D36E972-E325-11CE-BFC1-08002BE10318}
     5.6  Provider=%XenGplPv%
     5.7 -CatalogFile="XenGPLPV.cat"
     5.8 +CatalogFile="xennet.cat"
     5.9  
    5.10  [DestinationDirs]
    5.11  DefaultDestDir = 12

     6.1 --- a/xenpci/sources	Wed Mar 04 13:39:13 2009 +1100
     6.2 +++ b/xenpci/sources	Wed Mar 04 13:39:31 2009 +1100
     6.3 @@ -3,7 +3,7 @@ TARGETNAME=xenpci
     6.4  TARGETTYPE=DRIVER
     6.5  KMDF_VERSION_MAJOR=1
     6.6  NTTARGETFILES=$(NTTARGETFILES) $(OBJ_PATH)\$(O)\$(TARGETNAME).inf
     6.7 -TARGETLIBS=$(TARGETLIBS) $(DDK_LIB_PATH)\wdmsec.lib $(DDK_LIB_PATH)\Rtlver.lib $(DDK_LIB_PATH)\aux_klib.lib
     6.8 +TARGETLIBS=$(TARGETLIBS) $(DDK_LIB_PATH)\wdmsec.lib $(DDK_LIB_PATH)\Rtlver.lib $(DDK_LIB_PATH)\..\..\wlh\*\aux_klib.lib
     6.9  AMD64_SOURCES=hypercall.asm
    6.10  I386_SOURCES=tpr_emulate.asm
    6.11  SOURCES=xenpci.c xenpci_fdo.c xenpci_pdo.c evtchn.c gnttbl.c xenbus.c memory.c xenbus_device_interface.c xenpci_highsync.c xenpci_patch_kernel.c

     7.1 --- a/xenpci/xenpci.inx	Wed Mar 04 13:39:13 2009 +1100
     7.2 +++ b/xenpci/xenpci.inx	Wed Mar 04 13:39:31 2009 +1100
     7.3 @@ -3,7 +3,7 @@ Signature="$WINDOWS NT$"
     7.4  Class=System
     7.5  ClassGuid={4D36E97D-E325-11CE-BFC1-08002BE10318}
     7.6  Provider=%XenGplPv%
     7.7 -CatalogFile="XenGPLPV.cat"
     7.8 +CatalogFile="xenpci.cat"
     7.9  DriverPackageType=PlugAndPlay
    7.10  DriverPackageDisplayName=%XenPCI.DRVDESC%
    7.11  
    7.12 @@ -34,7 +34,7 @@ xenpci.sys=1
    7.13  xenhide.sys=1
    7.14  
    7.15  [SourceDisksNames]
    7.16 -1 = %DISK_NAME%,,,.
    7.17 +1 = %DISK_NAME%
    7.18  
    7.19  [XenPCI_Device.NT.Services]
    7.20  AddService=XenPCI,3,XenPCI_Service

     8.1 --- a/xenscsi/xenscsi.inx	Wed Mar 04 13:39:13 2009 +1100
     8.2 +++ b/xenscsi/xenscsi.inx	Wed Mar 04 13:39:31 2009 +1100
     8.3 @@ -3,7 +3,7 @@ Signature="$WINDOWS NT$"
     8.4  Class=SCSIAdapter
     8.5  ClassGuid={4D36E97B-E325-11CE-BFC1-08002BE10318}
     8.6  Provider=%XenGplPv%
     8.7 -CatalogFile="XenGPLPV.cat"
     8.8 +CatalogFile="xenscsi.cat"
     8.9  
    8.10  [DestinationDirs]
    8.11  DefaultDestDir = 12
    8.12 @@ -12,13 +12,9 @@ DefaultDestDir = 12
    8.13  ExcludeFromSelect=*
    8.14  
    8.15  [Manufacturer]
    8.16 -%XenGplPv%=XenGplPv,NTx86
    8.17 -%XenGplPv%=XenGplPv,NTamd64
    8.18 +%XenGplPv%=XenGplPv,NT$ARCH$
    8.19  
    8.20 -[XenGplPv.NTx86]
    8.21 -%XenScsi.DRVDESC%=XenScsi_Inst, XEN\VSCSI
    8.22 -
    8.23 -[XenGplPv.NTamd64]
    8.24 +[XenGplPv.NT$ARCH$]
    8.25  %XenScsi.DRVDESC%=XenScsi_Inst, XEN\VSCSI
    8.26  
    8.27  [XenScsi_Inst.NT]
    8.28 @@ -52,11 +48,8 @@ HKR,,TypesSupported,0x00010001,7
    8.29  [SourceDisksFiles]
    8.30  xenscsi.sys=1
    8.31  
    8.32 -[SourceDisksNames.x86]
    8.33 -1 = %DISK_NAME%,,,.\i386
    8.34 -
    8.35 -[SourceDisksNames.amd64]
    8.36 -1 = %DISK_NAME%,,,.\amd64
    8.37 +[SourceDisksNames]
    8.38 +1 = %DISK_NAME%
    8.39  
    8.40  [Strings]
    8.41  XenGplPv = "Xen GPL PV Driver Developers"

     9.1 --- a/xenvbd/xenvbd.inx	Wed Mar 04 13:39:13 2009 +1100
     9.2 +++ b/xenvbd/xenvbd.inx	Wed Mar 04 13:39:31 2009 +1100
     9.3 @@ -3,7 +3,7 @@ Signature="$WINDOWS NT$"
     9.4  Class=SCSIAdapter
     9.5  ClassGuid={4D36E97B-E325-11CE-BFC1-08002BE10318}
     9.6  Provider=%XenGplPv%
     9.7 -CatalogFile="XenGPLPV.cat"
     9.8 +CatalogFile="xenvbd.cat"
     9.9  
    9.10  [DestinationDirs]
    9.11  DefaultDestDir = 12