Changeset 43

Show
Ignore:
Timestamp:
02/15/12 20:19:03 (9 years ago)
Author:
vsilva
Message:

Implement Check SOD; Resolve some fixes; Remove Auto load library from sdk(cause problems on windows); PINPAD ACR Plugin; Firefox Certificates Extension on MSI

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • middleware-offline/trunk/_src/eidmw/misc/Wix_MW35/MW35Wix/Product.wxs

    r41 r43  
    3838                      IncludeMinimum="no" 
    3939                      OnlyDetect="yes" 
    40                       Property="NEWPRODUCTFOUND"  
     40                      Property="NEWPRODUCTFOUND" 
    4141      /> 
    4242      <UpgradeVersion Minimum="3.5.0" 
     
    4444                      Maximum="$(var.ProductVersion)" 
    4545                      IncludeMaximum="no" 
    46                       Property="UPGRADEFOUND"  
     46                      Property="UPGRADEFOUND" 
    4747      /> 
    4848    </Upgrade> 
     
    5959    <?define var.PTEID_DIR_QT_450_DYNAMIC=$(env.PTEID_DIR_QT_450_DYNAMIC)?> 
    6060    <?endif?> 
    61      
     61 
    6262    <?ifndef env.PTEID_DIR_MSM?> 
    6363    <?define var.PTEID_DIR_MSM=..\..\..\..\ThirdParty\wix\Merge Modules?> 
     
    7171    <?define var.PTEID_DIR_OPENSSL_098G=$(env.PTEID_DIR_OPENSSL_098G)?> 
    7272    <?endif?> 
    73      
     73 
    7474    <?ifndef env.PTEID_DIR_XERCES_310?> 
    7575    <?define var.PTEID_DIR_XERCES_310=..\..\..\..\ThirdParty\Xerces\Xerces-3.1.0?> 
     
    103103 
    104104    <Icon Id="eid.ico" SourceFile="..\..\..\eidgui\eid.ico"/> 
    105      
     105 
    106106    <Property Id="ARPPRODUCTICON" Value="eid.ico" /> 
    107107    <Property Id="ARPURLINFOABOUT" Value="http://www.cartaodecidadao.pt"/> 
    108      
     108 
    109109    <Property Id="ALLUSERS" Value="1" /> 
    110110 
     
    119119      <Directory Id="ProgramFilesFolder"> 
    120120        <Directory Id="APPLICATIONROOTFOLDER" Name="Portugal Identity Card"> 
    121            
    122          <!-- <Directory Id="IMAGEFORMATS" Name="imageformats" /> --> 
     121 
     122          <!-- <Directory Id="IMAGEFORMATS" Name="imageformats" /> --> 
    123123          <Directory Id="EIDSTORE" Name="eidstore"> 
    124124            <Directory Id="CERTSDIR" Name="certs"/> 
     
    144144                <Directory Id="XPILOCALEFRFOLDER" Name="fr-FR"/> 
    145145                <Directory Id="XPILOCALENLFOLDER" Name="nl-NL"/> 
    146                                 <Directory Id="XPILOCALEDEFOLDER" Name="de-DE"/> 
     146                <Directory Id="XPILOCALEDEFOLDER" Name="de-DE"/> 
    147147              </Directory> 
    148148              <Directory Id="XPISKINFOLDER" Name="skin"/> 
    149149            </Directory> 
     150            <Directory Id="CERTINSTALLROOTFOLDER" Name="pteidcertinstall@caixamagica.pt"> 
     151              <Directory Id="CERTINSTALLCONTENTFOLDER" Name="chrome"/> 
     152              <Directory Id="CERTINSTALLCOMPONENTSFOLDER" Name="components"/> 
     153              <Directory Id="CERTINSTALLMODULESFOLDER" Name="modules"/> 
     154              <Directory Id="CERTINSTALLDEFAULTSFOLDER" Name="defaults"> 
     155                <Directory Id="CERTINSTALLPREFERENCESFOLDER" Name="preferences"/> 
     156              </Directory> 
     157 
     158 
     159            </Directory> 
    150160          </Directory> 
    151            
     161 
    152162        </Directory> 
    153163        <Directory Id="MINIDRIVERROOTFOLDER" Name="PTeID Minidriver"/> 
     
    163173      </Directory> 
    164174 
    165        
     175 
    166176      <Merge Id="VCRT"  SourceFile="$(var.PTEID_DIR_MSM)\Microsoft_VC80_CRT_x86.msm" Language="0" DiskId="1" /> 
    167177      <Merge Id="VCRT_POLICY" SourceFile="$(var.PTEID_DIR_MSM)\policy_8_0_Microsoft_VC80_CRT_x86.msm" Language="0" DiskId="1" /> 
    168178 
    169179    </Directory> 
    170      
     180 
    171181    <DirectoryRef Id="EIDSTORE"> 
    172182      <Component Id="EidStore" Guid="{F30FFFBD-4F50-4e4d-86D2-90F192A3F01B}" KeyPath="yes"> 
     
    181191    <DirectoryRef Id="CERTSDIR"> 
    182192      <Component Id="Certs" Guid="{750F471B-6A83-4118-A0AF-2A138B770AC6}"> 
    183         <File Id="CartaodeCidadao001.der" Name="CartaodeCidadao001.der" KeyPath="yes" Source="..\..\certs\CartaodeCidadao001.der" /> 
    184         <File Id="ECRaizEstado_novo_assinado_GTE.der" Name="ECRaizEstado_novo_assinado_GTE.der" KeyPath="no" Source="..\..\certs\ECRaizEstado_novo_assinado_GTE.der" /> 
    185         <File Id="GTEGlobalRoot.der" Name="GTEGlobalRoot.der" KeyPath="no" Source="..\..\certs\GTEGlobalRoot.der" /> 
     193        <File Id="CartaodeCidadao001.der" Name="CartaodeCidadao001.der" KeyPath="yes" Source="..\..\certs\CartaodeCidadao001.der" /> 
     194        <File Id="ECRaizEstado_novo_assinado_GTE.der" Name="ECRaizEstado_novo_assinado_GTE.der" KeyPath="no" Source="..\..\certs\ECRaizEstado_novo_assinado_GTE.der" /> 
     195        <File Id="GTEGlobalRoot.der" Name="GTEGlobalRoot.der" KeyPath="no" Source="..\..\certs\GTEGlobalRoot.der" /> 
    186196      </Component> 
    187197    </DirectoryRef> 
     
    260270        <File Id="chrome.manifest" Name="chrome.manifest" KeyPath="no" Source="..\..\..\xpi\src\chrome.manifest" /> 
    261271        <File Id="icon.png.root" Name="icon.png" KeyPath="no" Source="..\..\..\xpi\src\icon.png" /> 
    262         <File Id="install.rdf" Name="install.rdf" KeyPath="no" Source="..\..\..\xpi\src\install.rdf" /> 
     272        <File Id="install_xpi.rdf" Name="install.rdf" KeyPath="no" Source="..\..\..\xpi\src\install.rdf" /> 
    263273      </Component> 
    264274    </DirectoryRef> 
     
    317327          <util:PermissionEx GenericAll="yes" User="Users" /> 
    318328        </CreateFolder> 
    319           <File Id="portugaleid.properties.en" Name="portugaleid.properties" KeyPath="no" Source="..\..\..\xpi\src\locale\en-US\portugaleid.properties" /> 
     329        <File Id="portugaleid.properties.en" Name="portugaleid.properties" KeyPath="no" Source="..\..\..\xpi\src\locale\en-US\portugaleid.properties" /> 
    320330      </Component> 
    321331    </DirectoryRef> 
     
    326336          <util:PermissionEx GenericAll="yes" User="Users" /> 
    327337        </CreateFolder> 
    328           <File Id="portugaleid.properties.fr" Name="portugaleid.properties" KeyPath="no" Source="..\..\..\xpi\src\locale\fr-FR\portugaleid.properties" /> 
     338        <File Id="portugaleid.properties.fr" Name="portugaleid.properties" KeyPath="no" Source="..\..\..\xpi\src\locale\fr-FR\portugaleid.properties" /> 
    329339      </Component> 
    330340    </DirectoryRef> 
     
    339349    </DirectoryRef> 
    340350 
    341         <DirectoryRef Id="XPILOCALEDEFOLDER"> 
     351    <DirectoryRef Id="XPILOCALEDEFOLDER"> 
    342352      <Component Id="XPIlocalede" Guid="{54BC660D-7C9D-4ddc-AA96-29D7A5DD0E53}" KeyPath="no"> 
    343353        <CreateFolder> 
     
    347357      </Component> 
    348358    </DirectoryRef> 
    349          
     359 
    350360    <DirectoryRef Id="XPISKINFOLDER"> 
    351361      <Component Id="XPIskin" Guid="{7FF22F5F-E42E-47af-91EE-9A9491B196AC}" KeyPath="no"> 
     
    355365        <File Id="overlay.css" Name="overlay.css" KeyPath="no" Source="..\..\..\xpi\src\skin\overlay.css" /> 
    356366        <File Id="icon.png" Name="icon.png" KeyPath="no" Source="..\..\..\xpi\src\skin\icon.png" /> 
    357                 <File Id="icon40x40.png" Name="icon40x40.png" KeyPath="no" Source="..\..\..\xpi\src\skin\icon40x40.png" /> 
     367        <File Id="icon40x40.png" Name="icon40x40.png" KeyPath="no" Source="..\..\..\xpi\src\skin\icon40x40.png" /> 
     368      </Component> 
     369    </DirectoryRef> 
     370 
     371 
     372    <DirectoryRef Id="CERTINSTALLROOTFOLDER"> 
     373      <Component Id="pteidcertinstallroot" Guid="9a02e931-4d7c-4dc5-aaf1-788e2f282941"> 
     374        <File Id="cck.config" Name="cck.config" KeyPath="yes" Source="..\..\..\ffpteidcertinstall\xpi\cck.config" /> 
     375        <File Id="install_certinstall.rdf" Name="install.rdf" KeyPath="no" Source="..\..\..\ffpteidcertinstall\xpi\install.rdf" /> 
     376        <File Id="chrome_certinstall.manifest" Name="chrome.manifest" KeyPath="no" Source="..\..\..\ffpteidcertinstall\xpi\chrome.manifest" /> 
     377      </Component> 
     378    </DirectoryRef> 
     379 
     380    <DirectoryRef Id="CERTINSTALLCONTENTFOLDER"> 
     381      <Component Id="pteidcertinstallchrome" Guid="9a02e931-4d7c-4dc5-aaf1-788e2f282942"> 
     382        <File Id="cck.jar" Name="cck.jar" KeyPath="yes" Source="..\..\..\ffpteidcertinstall\xpi\chrome\cck.jar"></File> 
     383      </Component> 
     384    </DirectoryRef> 
     385 
     386    <DirectoryRef Id="CERTINSTALLCOMPONENTSFOLDER"> 
     387      <Component Id="pteidcertinstallcomponents" Guid="9a02e931-4d7c-4dc5-aaf1-788e2f282945"> 
     388        <File Id="cckService.js" Name="cckService.js" KeyPath="yes" Source="..\..\..\ffpteidcertinstall\xpi\components\cckService.js"></File> 
     389      </Component> 
     390    </DirectoryRef> 
     391 
     392    <DirectoryRef Id="CERTINSTALLMODULESFOLDER"> 
     393      <Component Id="pteidcertinstallmodules" Guid="9a02e931-4d7c-4dc5-aaf1-788e2f282943"> 
     394        <File Id="cckModule.jsm" Name="cckModule.jsm" KeyPath="yes" Source="..\..\..\ffpteidcertinstall\xpi\modules\cckModule.jsm"></File> 
     395      </Component> 
     396    </DirectoryRef> 
     397 
     398    <DirectoryRef Id="CERTINSTALLPREFERENCESFOLDER"> 
     399      <Component Id="pteidcertinstallpreferences" Guid="9a02e931-4d7c-4dc5-aaf1-788e2f282944"> 
     400        <File Id="firefoxcck.js" Name="firefox-cck.js" KeyPath="yes" Source="..\..\..\ffpteidcertinstall\xpi\defaults\preferences\firefox-cck.js"></File> 
    358401      </Component> 
    359402    </DirectoryRef> 
     
    367410        <difx:Driver ForceInstall="no" PlugAndPlayPrompt="no" DeleteFiles="yes"  /> 
    368411      </Component> 
    369         <!-- Certificate Propagation Service is a standard Windows service available in from Windows Vista on. In order to use the minidriver 
     412      <!-- Certificate Propagation Service is a standard Windows service available in from Windows Vista on. In order to use the minidriver 
    370413                           it is necessary that this service is running. When a smart card reader is inserted this service should be started  by the smart card 
    371414                           driver. As not all drivers are following this guidance, we start CertPropSvc during the minidriver install --> 
     
    377420      </Component> 
    378421    </DirectoryRef> 
    379      
     422 
    380423    <DirectoryRef Id="APPLICATIONROOTFOLDER"> 
    381        
     424 
    382425      <Component Id="RootFolder" Guid="{2FB5D279-50BD-49ed-98D9-3D043520F450}"> 
    383426        <CreateFolder/> 
     
    389432        <File Id="eid.ico" Name="eid.ico" KeyPath="yes" Source="..\..\..\eidgui\eid.ico" /> 
    390433      </Component> 
    391        
     434 
    392435      <!-- It needs NSI to build from Source --> 
    393436      <Component Id="OutlookTool" Guid="{F36A543C-CB17-4D91-BF0C-2EAEFEC3CB3A}"> 
    394437        <File Id="pteidoutlooksnc.exe" Name="pteidoutlooksnc.exe" KeyPath="yes" Source="..\..\..\misc\setup_win\pteidoutlooksnc.exe" /> 
    395438      </Component> 
    396        
     439 
    397440      <Component Id="GUI" Guid="{E45C85CA-0A5A-400C-9B86-7038C82B254D}" SharedDllRefCount="yes"> 
    398441        <RemoveFolder Id='APPLICATIONROOTFOLDER' On='uninstall' /> 
     
    417460        <File Id="zlib1.dll" Name="zlib1.dll" KeyPath="no" Source="..\..\..\..\ThirdParty\cairo\bin\zlib1.dll" ></File> 
    418461      </Component> 
    419          
     462 
    420463 
    421464      <Component Id="Qt" Guid="{AF5AF018-EE70-4EA9-98BA-9C2947F19060}" SharedDllRefCount="yes"> 
     
    424467        <File Id="QtNetwork4.dll" Name="QtNetwork4.dll" KeyPath="no" Source="$(var.PTEID_DIR_QT_450_DYNAMIC)\bin\QtNetwork4.dll" /> 
    425468      </Component> 
    426        
     469 
    427470      <Component Id="License" Guid="{C00AF621-E882-4805-BA9C-B90AA5DBBCB6}" SharedDllRefCount="yes"> 
    428471        <File Id="License_en.rtf" Name="License_en.rtf" KeyPath="yes" Source="..\..\..\misc\licenses_files\License_en.rtf" /> 
     
    432475        <File Id="THIRDPARTY_LICENSES.txt" Name="THIRDPARTY-LICENSES.txt" KeyPath="no" Source="..\..\..\misc\licenses_files\THIRDPARTY-LICENSES.txt" /> 
    433476      </Component> 
    434        
     477 
    435478    </DirectoryRef> 
    436479 
     
    445488        <IniFile Id="pteidguiconf2" Directory="WindowsFolder" Name="pteidgui.conf" 
    446489          Section="PTEID_default" Action="addLine" Key="crl"  Value="[ProgramFilesFolder]Portugal Identity Card\eidstore\crl\http\crl.eid.portugal.be\" /> 
    447            
     490 
    448491      </Component> 
    449492 
     
    476519        <File Id="system32_pteidmdrv32.dll" Name="pteidmdrv32.dll" Source="..\..\..\minidriver\makemsi\Release\pteidmdrv32.dll" KeyPath="yes" DiskId="1" /> 
    477520      </Component> 
    478          
    479                 <Component Id="CSP" Guid="{54153442-D4CE-4DE6-9321-1BAC5DE4C725}" SharedDllRefCount="yes"> 
     521 
     522      <Component Id="CSP" Guid="{54153442-D4CE-4DE6-9321-1BAC5DE4C725}" SharedDllRefCount="yes"> 
    480523        <File Id="beidCSP.dll" Name="beidCSP.dll" KeyPath="yes" Source="..\..\..\_Binaries35\Release\beidCSP.dll" /> 
    481524        <File Id="beidCSPlib.dll" Name="beidCSPlib.dll" KeyPath="no" Source="..\..\..\_Binaries35\Release\beidCSPlib.dll" /> 
    482525      </Component> 
    483526 
    484                 <Component Id="FreeImage" Guid="EF7A30DC-47CC-4385-832A-8E871EF69F64" SharedDllRefCount="yes"> 
    485                                   <File Id="FreeImage.dll" Name="FreeImage.dll" KeyPath="yes" Source="..\..\..\_Binaries35\Release\FreeImage.dll" /> 
    486            </Component> 
    487        
     527      <Component Id="FreeImage" Guid="EF7A30DC-47CC-4385-832A-8E871EF69F64" SharedDllRefCount="yes"> 
     528        <File Id="FreeImage.dll" Name="FreeImage.dll" KeyPath="yes" Source="..\..\..\_Binaries35\Release\FreeImage.dll" /> 
     529      </Component> 
     530 
    488531      <Component Id="XMLSecurity" Guid="EF7A30DC-47CC-4385-832A-8E871EF69F65" SharedDllRefCount="yes"> 
    489532        <File Id="xsec_1_6.dll" Name="xsec_1_6.dll" KeyPath="yes" Source="..\..\..\_Binaries35\Release\xsec_1_6.dll" /> 
     
    494537        <File Id="PortugalIdentityCardPKCS11.dll" Name="Portugal Identity Card PKCS11.dll" KeyPath="no" Source="..\..\..\_Binaries35\Release\Portugal Identity Card PKCS11.dll" /> 
    495538      </Component> 
    496      
     539 
    497540    </DirectoryRef> 
    498541    <Binary Id="PTeIDWin32CertificateImport" SourceFile="..\..\..\_Binaries35\Release\PTeIDWin32CertificateImport.exe" /> 
    499          
     542 
    500543 
    501544    <DirectoryRef Id="PTEIDPPDIR"> 
    502545      <Component Id="PinpadLib" Guid="{9ADA6D75-5DCC-467E-A0CE-B84A482B2115}" SharedDllRefCount="yes"> 
    503        <File Id="pteidpp2gempc.dll" Name="pteidpp2-gempc.dll" Source="..\..\..\_Binaries35\Release\pteidpp2-gempc.dll" /> 
    504        <File Id="pteidpp2-acr83-plugin.dll" Name="pteidpp2-acr83-plugin.dll" Source="..\..\..\_Binaries35\Release\pteidpp2-acr83-plugin.dll" /> 
    505       </Component> 
    506     </DirectoryRef> 
    507      
     546        <File Id="pteidpp2gempc.dll" Name="pteidpp2-gempc.dll" Source="..\..\..\_Binaries35\Release\pteidpp2-gempc.dll" /> 
     547        <File Id="pteidpp2acr83plugin.dll" Name="pteidpp2-acr83-plugin.dll" Source="..\..\..\_Binaries35\Release\pteidpp2-acr83-plugin.dll" /> 
     548      </Component> 
     549    </DirectoryRef> 
     550 
    508551    <DirectoryRef Id="TARGETDIR"> 
    509552      <Component Id="SCardSvrService" Guid="{C3BC9746-0843-41b2-BDDA-3192772974CE}" Permanent="yes"> 
     
    513556        <!--<ServiceControl Id="StartSCardSvrService" Name="SCardSvr" Start="install" />--> 
    514557      </Component> 
    515    
    516           <Component Id="REGISTERXPI" Guid="{946B85B6-99CC-4893-8A42-E7EC6FFE0D87}"> 
     558 
     559      <Component Id="REGISTERXPI" Guid="{946B85B6-99CC-4893-8A42-E7EC6FFE0D87}"> 
    517560        <RegistryKey Root="HKLM" 
    518561                     Key="SOFTWARE\Mozilla\Firefox\Extensions" 
    519562                     Action="createAndRemoveOnUninstall"> 
    520563          <RegistryValue Type="string" Name="portugaleid@eid.portugal.be" Value="C:\Program Files\Mozilla Firefox\extensions\portugaleid@eid.portugal.be" KeyPath="yes"/> 
    521                 </RegistryKey> 
    522       </Component>  
    523            
     564        </RegistryKey> 
     565      </Component> 
     566 
    524567      <Component Id="REGISTERMINIDRIVER" Guid="{B9980C19-883E-49f9-BDD2-AB3D75187C8F}"> 
    525568        <RegistryKey Root="HKLM" 
     
    532575          <RegistryValue Type="string" Name="Smart Card Key Storage Provider" Value="Microsoft Smart Card Key Storage Provider" KeyPath="no"/> 
    533576        </RegistryKey> 
    534                       <RegistryKey Root="HKLM" 
    535                      Key="SOFTWARE\Microsoft\Cryptography\Calais\SmartCards\Pteid (Gemsafe)" 
    536                      Action="createAndRemoveOnUninstall"> 
     577        <RegistryKey Root="HKLM" 
     578                   Key="SOFTWARE\Microsoft\Cryptography\Calais\SmartCards\Pteid (Gemsafe)" 
     579                   Action="createAndRemoveOnUninstall"> 
    537580          <RegistryValue Type="string" Name="80000001" Value="pteidmdrv32.dll" KeyPath="no"/> 
    538581          <RegistryValue Type="binary" Name="ATR" Value="3B7D95000080318065B08311000083009000" KeyPath="no"/> 
     
    541584          <RegistryValue Type="string" Name="Smart Card Key Storage Provider" Value="Microsoft Smart Card Key Storage Provider" KeyPath="no"/> 
    542585        </RegistryKey> 
    543       </Component>  
     586      </Component> 
    544587 
    545588      <Component Id="REGISTERCSP" Guid="{3DF6D19A-C268-4D97-B605-1F3E29DC15DC}"> 
     
    562605          <RegistryValue Type="binary" Name="ATRMask" Value="fffffffffffffffffffc" KeyPath="no"/> 
    563606        </RegistryKey> 
    564                 <RegistryKey Root="HKLM" 
    565                      Key="SOFTWARE\Microsoft\Cryptography\Calais\SmartCards\Portugal Identity Card (Gemsafe)" 
    566                      Action="createAndRemoveOnUninstall"> 
     607        <RegistryKey Root="HKLM" 
     608                         Key="SOFTWARE\Microsoft\Cryptography\Calais\SmartCards\Portugal Identity Card (Gemsafe)" 
     609                         Action="createAndRemoveOnUninstall"> 
    567610          <RegistryValue Type="string" Name="Crypto Provider" Value="Portugal Identity Card CSP"/> 
    568611          <RegistryValue Type="string" Name="80000001" Value="beidcsp.dll" KeyPath="no"/> 
     
    580623            <RegistryValue Type="integer" Name="cert_validation_crl" Value="0"/> 
    581624          </RegistryKey> 
    582            
     625 
    583626          <RegistryKey Key="certificatecache" Action="createAndRemoveOnUninstall"> 
    584627            <RegistryValue Type="string" Name="cert_cachefile" Value="[ProgramFilesFolder]Portugal Identity Card\eidstore\crl\.cache.csc"/> 
    585628          </RegistryKey> 
    586            
     629 
    587630          <RegistryKey Key="crl" Action="createAndRemoveOnUninstall"> 
    588631            <RegistryValue Type="string" Name="crl_cachedir" Value="[ProgramFilesFolder]Portugal Identity Card\eidstore\crl"/> 
    589632          </RegistryKey> 
    590            
     633 
    591634          <RegistryKey Key="general" Action="createAndRemoveOnUninstall"> 
    592635            <RegistryValue Type="string" Name="language" Value="!(loc.Langpref)"/> 
     
    594637            <RegistryValue Type="string" Name="install_dirname" Value="[ProgramFilesFolder]Portugal Identity Card"/> 
    595638          </RegistryKey> 
    596            
     639 
    597640          <RegistryKey Key="logging" Action="createAndRemoveOnUninstall"> 
    598641            <RegistryValue Type="string" Name="log_dirname" Value="[ProgramFilesFolder]Portugal Identity Card\log"/> 
    599642          </RegistryKey> 
    600            
     643 
    601644          <RegistryKey Key="configuretool" Action="createAndRemoveOnUninstall"> 
    602645            <RegistryValue Type="integer" Name="start_with_windows" Value="1"/> 
     
    610653          </RegistryKey> 
    611654        </RegistryKey> 
    612          
     655 
    613656        <RegistryKey Root="HKLM" 
    614657                    Key="SOFTWARE\Microsoft\Windows\CurrentVersion\Run"> 
     
    653696             Title="!(loc.PteidRuntime)" 
    654697             Description="!(loc.PteidRuntimeDesc)" 
    655              Absent="disallow"  
     698             Absent="disallow" 
    656699             Level="1" 
    657700             > 
    658        
     701 
    659702      <Feature Id="VCRedist" Title="VC++ 8.0 runtime" AllowAdvertise="no" Display="hidden" Level="1"> 
    660703        <MergeRef Id="VCRT" /> 
     
    685728      <ComponentRef Id="XPIlocalenl"/> 
    686729      <ComponentRef Id="XPIlocalede"/> 
    687       <ComponentRef Id="XPIskin"/>          
     730      <ComponentRef Id="XPIskin"/> 
     731      <ComponentRef Id="pteidcertinstallroot"/> 
     732      <ComponentRef Id="pteidcertinstallchrome"/> 
     733      <ComponentRef Id="pteidcertinstallcomponents"/> 
     734      <ComponentRef Id="pteidcertinstallmodules"/> 
     735      <ComponentRef Id="pteidcertinstallpreferences"/> 
    688736 
    689737      <!-- System32 --> 
     
    702750      <ComponentRef Id="RegistryPteidSystem"/> 
    703751 
    704       <Feature Id="GUI"  
    705                 Title="!(loc.PteidGui)"  
     752      <Feature Id="GUI" 
     753                Title="!(loc.PteidGui)" 
    706754                Description="!(loc.PteidGuiDescr)" 
    707755                Level="1" 
     
    725773        <ComponentRef Id="SCardSvrService"/> 
    726774        <ComponentRef Id="pkcs11"/> 
    727                 <ComponentRef Id="REGISTERXPI"/> 
     775        <ComponentRef Id="REGISTERXPI"/> 
    728776        <!--<ComponentRef Id="pkcs11_cfg"/> 
    729777        <ComponentRef Id="pkcs11_register" />--> 
     
    747795    </Feature> 
    748796 
    749     <CustomAction Id="LaunchApplication"  
    750                   FileKey="pteid35gui.exe"  
    751                   ExeCommand=""  
    752                   Execute="immediate"  
    753                   Impersonate="yes"  
     797    <CustomAction Id="LaunchApplication" 
     798                  FileKey="pteid35gui.exe" 
     799                  ExeCommand="" 
     800                  Execute="immediate" 
     801                  Impersonate="yes" 
    754802                  Return="asyncNoWait" /> 
    755803 
    756 <!--    <Property Id="WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT" Value="!(loc.StartApp)" />--> 
     804    <!--    <Property Id="WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT" Value="!(loc.StartApp)" />--> 
    757805 
    758806    <UI> 
     
    761809      <UIRef Id="WixUI_ErrorProgressText" /> 
    762810 
    763 <!-- 
     811      <!-- 
    764812      <Publish Dialog="ExitDialog" Control="Finish"  Event="DoAction" 
    765813               Value="LaunchApplication" Order="1">WIXUI_EXITDIALOGOPTIONALCHECKBOX = 1 and NOT Installed</Publish> 
    766814--> 
    767815    </UI> 
    768      
     816 
    769817    <CustomAction Id="SetARPINSTALLLOCATION" Property="ARPINSTALLLOCATION" Value="[APPLICATIONROOTFOLDER]" /> 
    770      
     818 
    771819    <CustomAction Id="SetCacheDirHidden" 
    772820                  Impersonate="no" 
    773                   BinaryKey="MarkHidden"  
     821                  BinaryKey="MarkHidden" 
    774822                  ExeCommand="&quot;[ProgramFilesFolder]Portugal Identity Card\.cache&quot;" 
    775823                  Execute="deferred" 
     
    777825                  /> 
    778826 
    779 <!--  
     827    <!--  
    780828    <CustomAction Id="StopGui" 
    781829                  BinaryKey="KILLPROCESS" 
     
    838886    <Binary Id="MarkHidden" SourceFile="..\..\..\misc\Wix_MW35\MarkHidden\Release\MarkHidden.exe"/> 
    839887    <Binary Id="PTEID_CLEANUP" SourceFile="..\..\..\misc\Wix_MW35\pteidcleanup\Release\pteidcleanup.exe"/> 
    840   
    841 <!-- 
     888 
     889    <!-- 
    842890    Cleanup parameters supported: 
    843891    - Avoid to run the cleanup process              =>  CLEANUP_NO=1 
     
    853901    <CustomAction Id="IsQuietMode" Property="QuietMode" Value="-q " /> 
    854902    <CustomAction Id="NotIsQuietMode" Property="QuietMode" Value="" /> 
    855         <!--     
     903    <!--     
    856904    <CustomAction Id="PteidCleanup" 
    857905              BinaryKey="PTEID_CLEANUP" 
     
    861909              Execute="deferred" 
    862910    /> --> 
    863         <CustomAction Id="CertificateRegistration" 
    864                                         BinaryKey="PTeIDWin32CertificateImport" 
    865                                     ExeCommand=""  
    866                                         Impersonate="no" 
    867                                         Return="check" 
    868                                         Execute="deferred" /> 
    869                                          
    870  
    871         <CustomAction Id="IsPrivileged" Error="!(loc.AdminNeeded)" /> 
     911    <CustomAction Id="CertificateRegistration" 
     912            BinaryKey="PTeIDWin32CertificateImport" 
     913              ExeCommand="" 
     914            Impersonate="no" 
     915            Return="check" 
     916            Execute="deferred" /> 
     917 
     918 
     919    <CustomAction Id="IsPrivileged" Error="!(loc.AdminNeeded)" /> 
    872920    <CustomAction Id="PreventDowngrading" Error="!(loc.NoDowngrade)" /> 
    873921 
     
    879927      <Custom Action="PreventDowngrading" After="FindRelatedProducts">NEWPRODUCTFOUND</Custom> 
    880928      <RemoveExistingProducts After="InstallFinalize" /> 
    881        
     929 
    882930      <Custom Action="SetARPINSTALLLOCATION" After="InstallValidate"></Custom> 
    883931 
    884932      <Custom Action="IsPrivileged" Before="LaunchConditions">Not Privileged</Custom> 
    885 <!--- 
     933      <!--- 
    886934      <Custom Action="StopGui"         Before="InstallFiles">1</Custom> 
    887935      <Custom Action="StopGui35"       Before="InstallFiles">1</Custom> 
     
    893941      <Custom Action="StopXSign35_Remove"     Before="RemoveFiles">1</Custom> 
    894942--> 
    895        
     943 
    896944      <Custom Action="SetCacheDirHidden"  After="InstallFiles">NOT Installed</Custom> 
    897           <Custom Action="CertificateRegistration" After="InstallFiles">NOT Installed</Custom> 
     945      <Custom Action="CertificateRegistration" After="InstallFiles">NOT Installed</Custom> 
    898946 
    899947      <ScheduleReboot After="InstallFinalize">NOT Installed</ScheduleReboot>