--- trunk/xvidextra/src/installer/xvid.xml	2011/05/19 09:35:09	1999
+++ trunk/xvidextra/src/installer/xvid.xml	2011/05/20 15:46:28	2009
@@ -6,7 +6,8 @@
     <readmeFile>releasenotes.txt</readmeFile>
     <licenseFile>../../LICENSE</licenseFile>
     <logoImage>xvid.png</logoImage>
-    <splashImage>Xvid_logo.png</splashImage>
+    <splashImage>xvid_logo.png</splashImage>
+    <allowLanguageSelection>1</allowLanguageSelection>
     <initializationActionList>
         <registryGet>
             <key>HKEY_LOCAL_MACHINE\Software\${project.windowsSoftwareRegistryPrefix}</key>
@@ -41,12 +42,172 @@
                 </platformTest>
             </ruleList>
         </runProgram>
+        <if>
+            <abortOnError>0</abortOnError>
+            <showMessageOnError>0</showMessageOnError>
+            <actionList>
+                <if>
+                    <abortOnError>0</abortOnError>
+                    <showMessageOnError>0</showMessageOnError>
+                    <actionList>
+                        <if>
+                            <abortOnError>0</abortOnError>
+                            <showMessageOnError>0</showMessageOnError>
+                            <actionList>
+                                <setInstallerVariable>
+                                    <abortOnError>0</abortOnError>
+                                    <name>generic_mpeg4</name>
+                                    <showMessageOnError>0</showMessageOnError>
+                                    <value>7</value>
+                                </setInstallerVariable>
+                            </actionList>
+                            <conditionRuleList>
+                                <compareValues>
+                                    <logic>equals</logic>
+                                    <negate>1</negate>
+                                    <value1>${decode_other}</value1>
+                                    <value2>0</value2>
+                                </compareValues>
+                            </conditionRuleList>
+                            <elseActionList>
+                                <setInstallerVariable>
+                                    <abortOnError>0</abortOnError>
+                                    <name>generic_mpeg4</name>
+                                    <showMessageOnError>0</showMessageOnError>
+                                    <value>3</value>
+                                </setInstallerVariable>
+                            </elseActionList>
+                        </if>
+                    </actionList>
+                    <conditionRuleList>
+                        <compareValues>
+                            <logic>equals</logic>
+                            <negate>1</negate>
+                            <value1>${decode_3ivx}</value1>
+                            <value2>0</value2>
+                        </compareValues>
+                    </conditionRuleList>
+                    <elseActionList>
+                        <if>
+                            <abortOnError>0</abortOnError>
+                            <showMessageOnError>0</showMessageOnError>
+                            <actionList>
+                                <setInstallerVariable>
+                                    <abortOnError>0</abortOnError>
+                                    <name>generic_mpeg4</name>
+                                    <showMessageOnError>0</showMessageOnError>
+                                    <value>6</value>
+                                </setInstallerVariable>
+                            </actionList>
+                            <conditionRuleList>
+                                <compareValues>
+                                    <logic>equals</logic>
+                                    <negate>1</negate>
+                                    <value1>${decode_other}</value1>
+                                    <value2>0</value2>
+                                </compareValues>
+                            </conditionRuleList>
+                            <elseActionList>
+                                <setInstallerVariable>
+                                    <abortOnError>0</abortOnError>
+                                    <name>generic_mpeg4</name>
+                                    <showMessageOnError>0</showMessageOnError>
+                                    <value>2</value>
+                                </setInstallerVariable>
+                            </elseActionList>
+                        </if>
+                    </elseActionList>
+                </if>
+            </actionList>
+            <conditionRuleList>
+                <compareValues>
+                    <logic>equals</logic>
+                    <negate>1</negate>
+                    <value1>${decode_divx}</value1>
+                    <value2>0</value2>
+                </compareValues>
+            </conditionRuleList>
+            <elseActionList>
+                <if>
+                    <abortOnError>0</abortOnError>
+                    <showMessageOnError>0</showMessageOnError>
+                    <actionList>
+                        <if>
+                            <abortOnError>0</abortOnError>
+                            <showMessageOnError>0</showMessageOnError>
+                            <actionList>
+                                <setInstallerVariable>
+                                    <abortOnError>0</abortOnError>
+                                    <name>generic_mpeg4</name>
+                                    <showMessageOnError>0</showMessageOnError>
+                                    <value>5</value>
+                                </setInstallerVariable>
+                            </actionList>
+                            <conditionRuleList>
+                                <compareValues>
+                                    <logic>equals</logic>
+                                    <negate>1</negate>
+                                    <value1>${decode_other}</value1>
+                                    <value2>0</value2>
+                                </compareValues>
+                            </conditionRuleList>
+                            <elseActionList>
+                                <setInstallerVariable>
+                                    <abortOnError>0</abortOnError>
+                                    <name>generic_mpeg4</name>
+                                    <showMessageOnError>0</showMessageOnError>
+                                    <value>1</value>
+                                </setInstallerVariable>
+                            </elseActionList>
+                        </if>
+                    </actionList>
+                    <conditionRuleList>
+                        <compareValues>
+                            <logic>equals</logic>
+                            <negate>1</negate>
+                            <value1>${decode_3IVX}</value1>
+                            <value2>0</value2>
+                        </compareValues>
+                    </conditionRuleList>
+                    <elseActionList>
+                        <if>
+                            <abortOnError>0</abortOnError>
+                            <showMessageOnError>0</showMessageOnError>
+                            <actionList>
+                                <setInstallerVariable>
+                                    <abortOnError>0</abortOnError>
+                                    <name>generic_mpeg4</name>
+                                    <showMessageOnError>0</showMessageOnError>
+                                    <value>4</value>
+                                </setInstallerVariable>
+                            </actionList>
+                            <conditionRuleList>
+                                <compareValues>
+                                    <logic>equals</logic>
+                                    <negate>1</negate>
+                                    <value1>${decode_other}</value1>
+                                    <value2>0</value2>
+                                </compareValues>
+                            </conditionRuleList>
+                            <elseActionList>
+                                <setInstallerVariable>
+                                    <abortOnError>0</abortOnError>
+                                    <name>generic_mpeg4</name>
+                                    <showMessageOnError>0</showMessageOnError>
+                                    <value>0</value>
+                                </setInstallerVariable>
+                            </elseActionList>
+                        </if>
+                    </elseActionList>
+                </if>
+            </elseActionList>
+        </if>
     </readyToInstallActionList>
     <postInstallationActionList>
         <copyFile>
             <abortOnError>0</abortOnError>
             <destination>${system_temp_directory}/xvid_x86/xvid.ax</destination>
-            <origin>${system_temp_directory}/xvid_x86/xvid.ax_mft</origin>
+            <origin>${system_temp_directory}/xvid_x86/xvid_mft.ax</origin>
             <showMessageOnError>0</showMessageOnError>
             <ruleList>
                 <platformTest>
@@ -243,17 +404,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 +429,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 +456,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,10 +482,25 @@
                 </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>
-            <origin>${system_temp_directory}/xvid_x64/xvid.ax_mft</origin>
+            <origin>${system_temp_directory}/xvid_x64/xvid_mft.ax</origin>
             <showMessageOnError>0</showMessageOnError>
             <ruleList>
                 <platformTest>
@@ -489,26 +689,6 @@
                 </platformTest>
             </ruleList>
         </runProgram>
-        <deleteFile>
-            <abortOnError>0</abortOnError>
-            <path>${system_temp_directory}/xvid_x64</path>
-            <showMessageOnError>0</showMessageOnError>
-            <ruleList>
-                <platformTest>
-                    <type>windows</type>
-                </platformTest>
-            </ruleList>
-        </deleteFile>
-        <deleteFile>
-            <abortOnError>0</abortOnError>
-            <path>${system_temp_directory}/xvid_x86</path>
-            <showMessageOnError>0</showMessageOnError>
-            <ruleList>
-                <platformTest>
-                    <type>windows</type>
-                </platformTest>
-            </ruleList>
-        </deleteFile>
         <registrySet>
             <key>HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Run</key>
             <name>Xvid</name>
@@ -664,6 +844,97 @@
                 </quickLaunchShortcut>
             </shortcutList>
         </createShortcuts>
+        <registryDelete>
+            <abortOnError>0</abortOnError>
+            <key>HKEY_CLASSES_ROOT\Media Type\Extensions\.avi</key>
+            <name></name>
+            <showMessageOnError>0</showMessageOnError>
+            <wowMode>64</wowMode>
+            <ruleList>
+                <platformTest>
+                    <type>windows-x64</type>
+                </platformTest>
+            </ruleList>
+        </registryDelete>
+        <registryDelete>
+            <abortOnError>0</abortOnError>
+            <key>HKEY_CLASSES_ROOT\Media Type\Extensions\.avi</key>
+            <name></name>
+            <showMessageOnError>0</showMessageOnError>
+            <wowMode>32</wowMode>
+        </registryDelete>
+        <registrySet>
+            <abortOnError>0</abortOnError>
+            <key>HKEY_CLASSES_ROOT\Media Type\Extensions\.avi</key>
+            <name></name>
+            <showMessageOnError>0</showMessageOnError>
+            <type>REG_NONE</type>
+            <value></value>
+            <wowMode>64</wowMode>
+            <ruleList>
+                <platformTest>
+                    <type>windows-x64</type>
+                </platformTest>
+            </ruleList>
+        </registrySet>
+        <registrySet>
+            <abortOnError>0</abortOnError>
+            <key>HKEY_CLASSES_ROOT\Media Type\Extensions\.avi</key>
+            <name></name>
+            <showMessageOnError>0</showMessageOnError>
+            <type>REG_NONE</type>
+            <value></value>
+            <wowMode>32</wowMode>
+        </registrySet>
+        <runProgram>
+            <abortOnError>0</abortOnError>
+            <program>${system_temp_directory}/xvid_x86/setavi32.exe</program>
+            <programArguments></programArguments>
+            <show>0</show>
+            <showMessageOnError>0</showMessageOnError>
+            <workingDirectory>${system_temp_directory}/xvid_x86</workingDirectory>
+        </runProgram>
+        <runProgram>
+            <abortOnError>0</abortOnError>
+            <program>${system_temp_directory}/xvid_x64/setavi64.exe</program>
+            <programArguments></programArguments>
+            <show>0</show>
+            <showMessageOnError>0</showMessageOnError>
+            <workingDirectory>${system_temp_directory}/xvid_x64</workingDirectory>
+            <ruleList>
+                <platformTest>
+                    <type>windows-x64</type>
+                </platformTest>
+            </ruleList>
+        </runProgram>
+        <deleteFile>
+            <abortOnError>0</abortOnError>
+            <path>${system_temp_directory}/xvid_x64</path>
+            <showMessageOnError>0</showMessageOnError>
+            <ruleList>
+                <platformTest>
+                    <type>windows</type>
+                </platformTest>
+            </ruleList>
+        </deleteFile>
+        <deleteFile>
+            <abortOnError>0</abortOnError>
+            <path>${system_temp_directory}/xvid_x86</path>
+            <showMessageOnError>0</showMessageOnError>
+            <ruleList>
+                <platformTest>
+                    <type>windows</type>
+                </platformTest>
+            </ruleList>
+        </deleteFile>
+        <registrySet>
+            <abortOnError>0</abortOnError>
+            <key>HKEY_CURRENT_USER\Software\GNU\XviD</key>
+            <name>Supported_4CC</name>
+            <showMessageOnError>0</showMessageOnError>
+            <type>REG_DWORD</type>
+            <value>${generic_mpeg4}</value>
+        </registrySet>
     </postInstallationActionList>
     <preUninstallationActionList>
         <runProgram>
@@ -755,29 +1026,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 +1043,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 +1068,9 @@
                 <platformTest>
                     <type>windows-xp</type>
                 </platformTest>
+                <fileExists>
+                    <path>${windows_folder_system}/l3codeca.acm</path>
+                </fileExists>
             </ruleList>
         </registrySet>
         <wow64FsRedirection>
@@ -905,7 +1170,6 @@
             </ruleList>
         </deleteFile>
     </postUninstallationActionList>
-    <checkForUpdates>1</checkForUpdates>
     <compressionAlgorithm>lzma</compressionAlgorithm>
     <enableRollback>1</enableRollback>
     <enableTimestamp>1</enableTimestamp>
@@ -914,8 +1178,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>
@@ -959,7 +1225,7 @@
                     <platforms>windows</platforms>
                     <distributionFileList>
                         <distributionFile>
-                            <origin>../src/xvid.ico</origin>
+                            <origin>../../../xvidcore/vfw/src/xvid.ico</origin>
                         </distributionFile>
                         <distributionFile>
                             <origin>AviC.exe</origin>
@@ -1009,16 +1275,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>
@@ -1043,22 +1299,25 @@
                     <platforms>windows</platforms>
                     <distributionFileList>
                         <distributionFile>
-                            <origin>../bin/xvidvfw.dll</origin>
+                            <origin>../../../xvidcore/vfw/bin/xvidvfw.dll</origin>
                         </distributionFile>
                         <distributionFile>
-                            <origin>../bin/xvidcore.dll</origin>
+                            <origin>../../../xvidcore/vfw/bin/xvidcore.dll</origin>
                         </distributionFile>
                         <distributionFile>
                             <origin>xvid.inf</origin>
                         </distributionFile>
                         <distributionFile>
-                            <origin>../../dshow/bin/xvid.ax</origin>
+                            <origin>../../../xvidcore/dshow/bin/xvid.ax</origin>
                         </distributionFile>
                         <distributionFile>
                             <origin>setpriv32.exe</origin>
                         </distributionFile>
                         <distributionFile>
-                            <origin>../../dshow/bin/xvid.ax_mft</origin>
+                            <origin>../../../xvidcore/dshow/bin/xvid_mft.ax</origin>
+                        </distributionFile>
+                        <distributionFile>
+                            <origin>setavi32.exe</origin>
                         </distributionFile>
                     </distributionFileList>
                 </folder>
@@ -1069,13 +1328,13 @@
                     <platforms>windows</platforms>
                     <distributionFileList>
                         <distributionFile>
-                            <origin>../../dshow/bin/x64/xvid.ax</origin>
+                            <origin>../../../xvidcore/dshow/bin/x64/xvid.ax</origin>
                         </distributionFile>
                         <distributionFile>
-                            <origin>../bin/x64/xvidcore.dll</origin>
+                            <origin>../../../xvidcore/vfw/bin/x64/xvidcore.dll</origin>
                         </distributionFile>
                         <distributionFile>
-                            <origin>../bin/x64/xvidvfw.dll</origin>
+                            <origin>../../../xvidcore/vfw/bin/x64/xvidvfw.dll</origin>
                         </distributionFile>
                         <distributionFile>
                             <origin>xvid.inf</origin>
@@ -1084,7 +1343,10 @@
                             <origin>setpriv64.exe</origin>
                         </distributionFile>
                         <distributionFile>
-                            <origin>../../dshow/bin/x64/xvid.ax_mft</origin>
+                            <origin>../../../xvidcore/dshow/bin/x64/xvid_mft.ax</origin>
+                        </distributionFile>
+                        <distributionFile>
+                            <origin>setavi64.exe</origin>
                         </distributionFile>
                     </distributionFileList>
                     <ruleList>
@@ -1267,6 +1529,48 @@
                 </registryTest>
             </ruleList>
         </choiceParameter>
+        <parameterGroup>
+            <name>decoder_configuration</name>
+            <title>Decoder Configuration</title>
+            <explanation>Use Xvid to play back also the following media types:</explanation>
+            <value></value>
+            <default></default>
+            <parameterList>
+                <booleanParameter>
+                    <name>decode_divx</name>
+                    <title>DIVX</title>
+                    <description>DIVX</description>
+                    <explanation></explanation>
+                    <value></value>
+                    <default></default>
+                    <displayStyle>checkbox-left</displayStyle>
+                </booleanParameter>
+                <booleanParameter>
+                    <name>decode_3ivx</name>
+                    <title>3IVX</title>
+                    <description>3IVX</description>
+                    <explanation></explanation>
+                    <value></value>
+                    <default></default>
+                    <displayStyle>checkbox-left</displayStyle>
+                </booleanParameter>
+                <booleanParameter>
+                    <name>decode_other</name>
+                    <title>Other MPEG-4</title>
+                    <description>Other MPEG-4</description>
+                    <explanation></explanation>
+                    <value></value>
+                    <default></default>
+                    <displayStyle>checkbox-left</displayStyle>
+                </booleanParameter>
+            </parameterList>
+            <ruleList>
+                <fileExists>
+                    <negate>1</negate>
+                    <path>${installdir}/update.ini</path>
+                </fileExists>
+            </ruleList>
+        </parameterGroup>
     </parameterList>
     <platformOptionsList>
         <platformOptions>