[ros-diffs] [akhaldi] 70598: [0.4.0] * Merge the MCI Extensions fixes by Hermès in r70597.

Author: akhaldi
Date: Sat Jan 16 10:11:58 2016
New Revision: 70598

URL: http://svn.reactos.org/svn/reactos?rev=70598&view=rev
Log:
[0.4.0] * Merge the MCI Extensions fixes by Hermès in r70597.

Modified:
    branches/ros-branch-0_4_0/   (props changed)
    branches/ros-branch-0_4_0/reactos/   (props changed)
    branches/ros-branch-0_4_0/reactos/boot/bootdata/hivesft.inf

Propchange: branches/ros-branch-0_4_0/
------------------------------------------------------------------------------
--- svn:mergeinfo	(original)
+++ svn:mergeinfo	Sat Jan 16 10:11:58 2016
@@ -1 +1 @@
-/trunk:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70408,70424,70433-70437,70443,70445-70449,70454,70464,70468,70470,70480,70497,70499-70501,70507-70510,70512-70513,70523,70527-70530,70536-70537,70545-70548,70552-70554,70557-70558,70576-70578,70583
+/trunk:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70408,70424,70433-70437,70443,70445-70449,70454,70464,70468,70470,70480,70497,70499-70501,70507-70510,70512-70513,70523,70527-70530,70536-70537,70545-70548,70552-70554,70557-70558,70576-70578,70583,70597

Propchange: branches/ros-branch-0_4_0/reactos/
------------------------------------------------------------------------------
--- svn:mergeinfo	(original)
+++ svn:mergeinfo	Sat Jan 16 10:11:58 2016
@@ -20,4 +20,4 @@

/branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859
 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567
 /branches/wlan-bringup:54809-54998
-/trunk/reactos:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70408,70424,70433-70437,70443,70445-70449,70454,70464,70468,70470,70480,70497,70501,70507-70510,70523,70527-70530,70536-70537,70545-70548,70552-70554,70557-70558,70576-70578,70583
+/trunk/reactos:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70408,70424,70433-70437,70443,70445-70449,70454,70464,70468,70470,70480,70497,70501,70507-70510,70523,70527-70530,70536-70537,70545-70548,70552-70554,70557-70558,70576-70578,70583,70597

Modified: branches/ros-branch-0_4_0/reactos/boot/bootdata/hivesft.inf
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/boot/b…
==============================================================================
--- branches/ros-branch-0_4_0/reactos/boot/bootdata/hivesft.inf	[iso-8859-1] (original)
+++ branches/ros-branch-0_4_0/reactos/boot/bootdata/hivesft.inf	[iso-8859-1] Sat Jan 16
10:11:58 2016
@@ -225,7 +225,9 @@
 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","aif",0x00000002,"MPEGVideo"
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\MCI
Extensions","aifc",0x00000002,"MPEGVideo"
+HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\MCI
Extensions","aiff",0x00000002,"MPEGVideo"
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\MCI
Extensions","asf",0x00000002,"MPEGVideo"
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\MCI
Extensions","asx",0x00000002,"MPEGVideo"
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\MCI
Extensions","au",0x00000002,"MPEGVideo"
@@ -246,7 +248,6 @@
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\MCI
Extensions","mpg",0x00000002,"MPEGVideo"
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\MCI
Extensions","mpv",0x00000002,"MPEGVideo"
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\MCI
Extensions","mpv2",0x00000002,"MPEGVideo"
-HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\MCI
Extensions","rmi",0x00000002,"MPEGVideo"
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\MCI
Extensions","rmi",0x00000002,"Sequencer"
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\MCI
Extensions","snd",0x00000002,"MPEGVideo"
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\MCI
Extensions","wav",0x00000002,"WaveAudio"