Alexandre Julliard : avifil32: Move extension registrations to the rgs file .

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 7372ffddb73ed9ef41031e7878fe3323d6a206d1
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=7372ffddb73ed9ef41031e7878...

Author: Alexandre Julliard <julliard(a)winehq.org>
Date:   Fri Dec 17 13:50:37 2010 +0100

avifil32: Move extension registrations to the rgs file.

---

 dlls/avifil32/avifile.rgs |   19 +++++++++++++++++++
 tools/wine.inf.in         |    7 -------
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/dlls/avifil32/avifile.rgs b/dlls/avifil32/avifile.rgs
index e9e3fb2..3e6ba98 100644
--- a/dlls/avifil32/avifile.rgs
+++ b/dlls/avifil32/avifile.rgs
@@ -8,4 +8,23 @@ HKCR
         '{0002000d-0000-0000-C000-000000000046}' { InprocServer = s 'avifile.dll' }
         '{0002000f-0000-0000-C000-000000000046}' { InprocServer = s 'avifile.dll' }
     }
+    NoRemove AVIFile
+    {
+        Compressors
+        {
+            auds = s '{0002000F-0000-0000-C000-000000000046}'
+            vids = s '{00020001-0000-0000-C000-000000000046}'
+        }
+        Extensions
+        {
+            AU  = s '{00020003-0000-0000-C000-000000000046}'
+            AVI = s '{00020000-0000-0000-C000-000000000046}'
+            WAV = s '{00020003-0000-0000-C000-000000000046}'
+        }
+        RIFFHandlers
+        {
+            AVI  = s '{00020000-0000-0000-C000-000000000046}'
+            WAVE = s '{00020003-0000-0000-C000-000000000046}'
+        }
+    }
 }
diff --git a/tools/wine.inf.in b/tools/wine.inf.in
index aa3b354..8dbe0b7 100644
--- a/tools/wine.inf.in
+++ b/tools/wine.inf.in
@@ -225,13 +225,6 @@ HKCR,https\shell\open\ddeexec\Application,,2,"IExplore"
 HKCR,https\shell\open\ddeexec\Topic,,2,"WWW_OpenURL"
 HKCR,mailto\shell\open\command,,2,"%11%\winebrowser %1"
 ; FIXME: the following should be done by the dll registration
-HKCR,AVIFile\Compressors\auds,,,"{0002000F-0000-0000-C000-000000000046}"
-HKCR,AVIFile\Compressors\vids,,,"{00020001-0000-0000-C000-000000000046}"
-HKCR,AVIFile\Extensions\AU,,,"{00020003-0000-0000-C000-000000000046}"
-HKCR,AVIFile\Extensions\AVI,,,"{00020000-0000-0000-C000-000000000046}"
-HKCR,AVIFile\Extensions\WAV,,,"{00020003-0000-0000-C000-000000000046}"
-HKCR,AVIFile\RIFFHandlers\AVI,,,"{00020000-0000-0000-C000-000000000046}"
-HKCR,AVIFile\RIFFHandlers\WAVE,,,"{00020003-0000-0000-C000-000000000046}"
 HKCR,TypeLib\{00020430-0000-0000-C000-000000000046}\1.0\0\win16,,,"stdole.tlb"
 HKCR,TypeLib\{00020430-0000-0000-C000-000000000046}\1.0\FLAGS,,,"1"