[ros-diffs] [dchapyshev] 39826: - Full path to mci*.dll is unneeded - Add system.ini

Author: dchapyshev
Date: Sun Mar  1 17:16:14 2009
New Revision: 39826

URL: http://svn.reactos.org/svn/reactos?rev=39826&view=rev
Log:
- Full path to mci*.dll is unneeded
- Add system.ini

Added:
    trunk/reactos/media/ini/   (with props)
    trunk/reactos/media/ini/system.ini   (with props)
Modified:
    trunk/reactos/boot/bootdata/hivesft_arm.inf
    trunk/reactos/boot/bootdata/hivesft_i386.inf
    trunk/reactos/boot/bootdata/packages/reactos.dff

Modified: trunk/reactos/boot/bootdata/hivesft_arm.inf
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft_arm.…
==============================================================================
--- trunk/reactos/boot/bootdata/hivesft_arm.inf [iso-8859-1] (original)
+++ trunk/reactos/boot/bootdata/hivesft_arm.inf [iso-8859-1] Sun Mar  1 17:16:14 2009
@@ -67,10 +67,10 @@
 HKLM,"SOFTWARE\Microsoft\Windows
NT\CurrentVersion\Drivers32","vidc.mrle",0x00000000,"c:\reactos\system32\msrle32.dll"
 HKLM,"SOFTWARE\Microsoft\Windows
NT\CurrentVersion\Drivers32","vidc.msvc",0x00000000,"c:\reactos\system32\msvidc32.dll"
 
-HKLM,"SOFTWARE\Microsoft\Windows
NT\CurrentVersion\MCI32","AVIVideo",0x00000002,"c:\reactos\system32\mciavi32.dll"
-HKLM,"SOFTWARE\Microsoft\Windows
NT\CurrentVersion\MCI32","CDAudio",0x00000002,"c:\reactos\system32\mcicda.dll"
-HKLM,"SOFTWARE\Microsoft\Windows
NT\CurrentVersion\MCI32","Sequencer",0x00000002,"c:\reactos\system32\mciseq.dll"
-HKLM,"SOFTWARE\Microsoft\Windows
NT\CurrentVersion\MCI32","WaveAudio",0x00000002,"c:\reactos\system32\mciwave.dll"
+HKLM,"SOFTWARE\Microsoft\Windows
NT\CurrentVersion\MCI32","AVIVideo",0x00000002,"mciavi32.dll"
+HKLM,"SOFTWARE\Microsoft\Windows
NT\CurrentVersion\MCI32","CDAudio",0x00000002,"mcicda.dll"
+HKLM,"SOFTWARE\Microsoft\Windows
NT\CurrentVersion\MCI32","Sequencer",0x00000002,"mciseq.dll"
+HKLM,"SOFTWARE\Microsoft\Windows
NT\CurrentVersion\MCI32","WaveAudio",0x00000002,"mciwave.dll"
 
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\MCI
Extensions","avi",0x00000002,"avivideo"
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\MCI
Extensions","cda",0x00000002,"CDAudio"

Modified: trunk/reactos/boot/bootdata/hivesft_i386.inf
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft_i386…
==============================================================================
--- trunk/reactos/boot/bootdata/hivesft_i386.inf [iso-8859-1] (original)
+++ trunk/reactos/boot/bootdata/hivesft_i386.inf [iso-8859-1] Sun Mar  1 17:16:14 2009
@@ -72,10 +72,10 @@
 HKLM,"SOFTWARE\Microsoft\Windows
NT\CurrentVersion\Drivers32","vidc.mrle",0x00000000,"c:\reactos\system32\msrle32.dll"
 HKLM,"SOFTWARE\Microsoft\Windows
NT\CurrentVersion\Drivers32","vidc.msvc",0x00000000,"c:\reactos\system32\msvidc32.dll"
 
-HKLM,"SOFTWARE\Microsoft\Windows
NT\CurrentVersion\MCI32","AVIVideo",0x00000002,"c:\reactos\system32\mciavi32.dll"
-HKLM,"SOFTWARE\Microsoft\Windows
NT\CurrentVersion\MCI32","CDAudio",0x00000002,"c:\reactos\system32\mcicda.dll"
-HKLM,"SOFTWARE\Microsoft\Windows
NT\CurrentVersion\MCI32","Sequencer",0x00000002,"c:\reactos\system32\mciseq.dll"
-HKLM,"SOFTWARE\Microsoft\Windows
NT\CurrentVersion\MCI32","WaveAudio",0x00000002,"c:\reactos\system32\mciwave.dll"
+HKLM,"SOFTWARE\Microsoft\Windows
NT\CurrentVersion\MCI32","AVIVideo",0x00000002,"mciavi32.dll"
+HKLM,"SOFTWARE\Microsoft\Windows
NT\CurrentVersion\MCI32","CDAudio",0x00000002,"mcicda.dll"
+HKLM,"SOFTWARE\Microsoft\Windows
NT\CurrentVersion\MCI32","Sequencer",0x00000002,"mciseq.dll"
+HKLM,"SOFTWARE\Microsoft\Windows
NT\CurrentVersion\MCI32","WaveAudio",0x00000002,"mciwave.dll"
 
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\MCI
Extensions","avi",0x00000002,"avivideo"
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\MCI
Extensions","cda",0x00000002,"CDAudio"

Modified: trunk/reactos/boot/bootdata/packages/reactos.dff
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea…
==============================================================================
--- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original)
+++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Sun Mar  1 17:16:14
2009
@@ -597,6 +597,9 @@
 media\inf\usbstor.inf                               6
 media\inf\xboxdisp.inf                              6
 
+; Ini Files
+media\ini\system.ini                                4
+
 ; Subsystems
 subsystems\win32\csrss\csrss.exe                    1
 subsystems\win32\csrss\win32csr\win32csr.dll        1

Propchange: trunk/reactos/media/ini/
------------------------------------------------------------------------------
--- bugtraq:logregex (added)
+++ bugtraq:logregex Sun Mar  1 17:16:14 2009
@@ -1,0 +1,2 @@
+([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))?
+(\d+)

Propchange: trunk/reactos/media/ini/
------------------------------------------------------------------------------
    bugtraq:message = See issue #%BUGID% for more details.

Propchange: trunk/reactos/media/ini/
------------------------------------------------------------------------------
    bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID%

Propchange: trunk/reactos/media/ini/
------------------------------------------------------------------------------
    tsvn:logminsize = 10

Added: trunk/reactos/media/ini/system.ini
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/ini/system.ini?rev=3…
==============================================================================
--- trunk/reactos/media/ini/system.ini (added)
+++ trunk/reactos/media/ini/system.ini [iso-8859-1] Sun Mar  1 17:16:14 2009
@@ -1,0 +1,19 @@
+[driver32]
+msacm.imaadpcm=imaadp32.acm
+msacm.msadpcm=msadp32.acm
+msacm.msg711=msg711.acm
+msacm.winemp3=winemp3.acm
+vidc.mrle=msrle32.dll
+vidc.msvc=msvidc32.dll
+vidc.cvid=iccvid.dll
+
+[mci]
+MPEGVideo=mciqtz.drv
+MPEGVideo2=mciqtz.drv
+AVIVideo=mciavi32.dll
+CDAudio=mcicda.dll
+Sequencer=mciseq.dll
+vcr=mcivisca.drv
+WaveAudio=mciwave.dll
+
+[386enh]

Propchange: trunk/reactos/media/ini/system.ini
------------------------------------------------------------------------------
    svn:eol-style = native