--- trunk/xvidextra/src/installer/xvid.xml	2011/05/19 12:48:59	2006
+++ trunk/xvidextra/src/installer/xvid.xml	2011/05/19 19:17:56	2007
@@ -7,6 +7,7 @@
     <licenseFile>../../LICENSE</licenseFile>
     <logoImage>xvid.png</logoImage>
     <splashImage>xvid_logo.png</splashImage>
+    <allowLanguageSelection>1</allowLanguageSelection>
     <initializationActionList>
         <registryGet>
             <key>HKEY_LOCAL_MACHINE\Software\${project.windowsSoftwareRegistryPrefix}</key>
@@ -243,17 +244,22 @@
             <type>REG_SZ</type>
             <value>Fraunhofer IIS MPEG Layer-3 Codec (professional)</value>
             <wowMode>32</wowMode>
+            <ruleList>
+                <fileExists>
+                    <path>${windows_folder_system}/l3codecp.acm</path>
+                </fileExists>
+            </ruleList>
         </registrySet>
         <registryDelete>
             <abortOnError>0</abortOnError>
             <key>HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\drivers.desc</key>
-            <name>C:\Windows\SysWOW64\l3codeca.acm</name>
+            <name>l3codeca.acm</name>
             <showMessageOnError>0</showMessageOnError>
             <wowMode>32</wowMode>
             <ruleList>
-                <platformTest>
-                    <type>windows-x64</type>
-                </platformTest>
+                <fileExists>
+                    <path>${windows_folder_system}/l3codecp.acm</path>
+                </fileExists>
             </ruleList>
         </registryDelete>
         <registryDelete>
@@ -263,6 +269,9 @@
             <showMessageOnError>0</showMessageOnError>
             <wowMode>32</wowMode>
             <ruleList>
+                <fileExists>
+                    <path>${windows_folder_system}/l3codecp.acm</path>
+                </fileExists>
                 <platformTest>
                     <type>windows-x86</type>
                 </platformTest>
@@ -287,8 +296,24 @@
                 <platformTest>
                     <type>windows-xp</type>
                 </platformTest>
+                <fileExists>
+                    <path>${windows_folder_system}/l3codecp.acm</path>
+                </fileExists>
             </ruleList>
         </registrySet>
+        <showWarning>
+            <abortOnError>0</abortOnError>
+            <showMessageOnError>0</showMessageOnError>
+            <text>Xvid MiniConvert will run only in feature-restricted mode!
+
+Reason: Your installed version of Windows Media Player is too old! To make full use of Xvid MiniConvert, please update your Windows Media Player to Version 11 or higher and re-run the Xvid installer.</text>
+            <ruleList>
+                <fileExists>
+                    <negate>1</negate>
+                    <path>${windows_folder_system}/l3codecp.acm</path>
+                </fileExists>
+            </ruleList>
+        </showWarning>
         <wow64FsRedirection>
             <action>disable</action>
             <ruleList>
@@ -297,6 +322,21 @@
                 </platformTest>
             </ruleList>
         </wow64FsRedirection>
+        <registryDelete>
+            <abortOnError>0</abortOnError>
+            <key>HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\drivers.desc</key>
+            <name>C:\Windows\SysWOW64\l3codeca.acm</name>
+            <showMessageOnError>0</showMessageOnError>
+            <wowMode>32</wowMode>
+            <ruleList>
+                <fileExists>
+                    <path>${windows_folder_system}/l3codecp.acm</path>
+                </fileExists>
+                <platformTest>
+                    <type>windows-x64</type>
+                </platformTest>
+            </ruleList>
+        </registryDelete>
         <copyFile>
             <abortOnError>0</abortOnError>
             <destination>${system_temp_directory}/xvid_x64/xvid.ax</destination>
@@ -755,29 +795,15 @@
         <registrySet>
             <abortOnError>0</abortOnError>
             <key>HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\drivers.desc</key>
-            <name>C:\Windows\System32\l3codeca.acm</name>
-            <showMessageOnError>0</showMessageOnError>
-            <type>REG_SZ</type>
-            <value>Fraunhofer IIS MPEG Layer-3 Codec</value>
-            <wowMode>32</wowMode>
-            <ruleList>
-                <platformTest>
-                    <type>windows-x86</type>
-                </platformTest>
-            </ruleList>
-        </registrySet>
-        <registrySet>
-            <abortOnError>0</abortOnError>
-            <key>HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\drivers.desc</key>
-            <name>C:\Windows\SysWOW64\l3codeca.acm</name>
+            <name>l3codeca.acm</name>
             <showMessageOnError>0</showMessageOnError>
             <type>REG_SZ</type>
             <value>Fraunhofer IIS MPEG Layer-3 Codec</value>
             <wowMode>32</wowMode>
             <ruleList>
-                <platformTest>
-                    <type>windows-x64</type>
-                </platformTest>
+                <fileExists>
+                    <path>${windows_folder_system}/l3codeca.acm</path>
+                </fileExists>
             </ruleList>
         </registrySet>
         <registryDelete>
@@ -786,6 +812,11 @@
             <name>l3codecp.acm</name>
             <showMessageOnError>0</showMessageOnError>
             <wowMode>32</wowMode>
+            <ruleList>
+                <fileExists>
+                    <path>${windows_folder_system}/l3codeca.acm</path>
+                </fileExists>
+            </ruleList>
         </registryDelete>
         <registrySet>
             <abortOnError>0</abortOnError>
@@ -806,6 +837,9 @@
                 <platformTest>
                     <type>windows-xp</type>
                 </platformTest>
+                <fileExists>
+                    <path>${windows_folder_system}/l3codeca.acm</path>
+                </fileExists>
             </ruleList>
         </registrySet>
         <wow64FsRedirection>
@@ -905,7 +939,6 @@
             </ruleList>
         </deleteFile>
     </postUninstallationActionList>
-    <checkForUpdates>1</checkForUpdates>
     <compressionAlgorithm>lzma</compressionAlgorithm>
     <enableRollback>1</enableRollback>
     <enableTimestamp>1</enableTimestamp>
@@ -914,8 +947,10 @@
     <startMenuGroupName>${product_shortname}</startMenuGroupName>
     <updateInformationURL>http://update.xvid.org/update.xml</updateInformationURL>
     <vendor>Xvid Team</vendor>
-    <versionId>131</versionId>
+    <versionId>132</versionId>
     <windowsExecutableIcon>xvid.ico</windowsExecutableIcon>
+    <windowsResourceFileVersion>1.3.2.0</windowsResourceFileVersion>
+    <windowsResourceOriginalFilename>${product_shortname}-${product_version}-${platform_name}.${platform_exec_suffix}</windowsResourceOriginalFilename>
     <componentList>
         <component>
             <name>default</name>
@@ -974,7 +1009,7 @@
                             <origin>OGMCalc.exe</origin>
                         </distributionFile>
                         <distributionFile>
-                            <origin>../installer_work/releasenotes.txt</origin>
+                            <origin>releasenotes.txt</origin>
                         </distributionFile>
                         <distributionFile>
                             <origin>vidccleaner.exe</origin>
@@ -1009,16 +1044,6 @@
                     </distributionFileList>
                     <shortcutList>
                         <linkShortcut>
-                            <comment>Xvid support forum on doom9</comment>
-                            <icon></icon>
-                            <name>doom9forum</name>
-                            <platforms>windows</platforms>
-                            <runAsAdmin>0</runAsAdmin>
-                            <runInTerminal>0</runInTerminal>
-                            <url>http://forum.doom9.org/forumdisplay.php?s=&amp;forumid=52</url>
-                            <windowsIcon></windowsIcon>
-                        </linkShortcut>
-                        <linkShortcut>
                             <comment>Xvid Website</comment>
                             <icon></icon>
                             <name>xvidhomepage</name>