Author: dchapyshev
Date: Mon Apr 6 19:45:49 2009
New Revision: 40400
URL: http://svn.reactos.org/svn/reactos?rev=40400&view=rev
Log:
- Sync mciavi32, mcicda with Wine head
Modified:
trunk/reactos/dll/win32/mciavi32/mmoutput.c
trunk/reactos/dll/win32/mcicda/mcicda.c
Modified: trunk/reactos/dll/win32/mciavi32/mmoutput.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mciavi32/mmoutput.c?rev=40400&r1=40399&r2=40400&view=diff
==============================================================================
--- trunk/reactos/dll/win32/mciavi32/mmoutput.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mciavi32/mmoutput.c [iso-8859-1] Mon Apr 6
19:45:49 2009
@@ -328,7 +328,7 @@
WARN("ignoring another video stream\n");
else
{
- wma->ash_audio = strh;
+ wma->ash_video = strh;
if (!MCIAVI_GetInfoVideo(wma, &mmckList, &mmckStream))
return FALSE;
@@ -342,7 +342,7 @@
WARN("ignoring another audio stream\n");
else
{
- wma->ash_video = strh;
+ wma->ash_audio = strh;
if (!MCIAVI_GetInfoAudio(wma, &mmckList, &mmckStream))
return FALSE;
Modified: trunk/reactos/dll/win32/mcicda/mcicda.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mcicda/mcicda.c?rev=40400&r1=40399&r2=40400&view=diff
==============================================================================
--- trunk/reactos/dll/win32/mcicda/mcicda.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mcicda/mcicda.c [iso-8859-1] Mon Apr 6 19:45:49
2009
@@ -464,7 +464,7 @@
/* now, open the handle */
root[0] = root[1] = '\\'; root[2] = '.'; root[3] = '\\'; root[4] = drive;
root[5] = ':'; root[6] = '\0';
wmcda->handle = CreateFileW(root, GENERIC_READ, FILE_SHARE_READ, NULL,
OPEN_EXISTING, 0, 0);
- if (wmcda->handle != 0)
+ if (wmcda->handle != INVALID_HANDLE_VALUE)
return 0;
the_error:
