Author: akhaldi
Date: Wed Mar 25 15:59:32 2015
New Revision: 66880
URL: http://svn.reactos.org/svn/reactos?rev=66880&view=rev
Log:
[MCIAVI32] Sync with Wine Staging 1.7.37. CORE-9246
Modified:
trunk/reactos/dll/win32/mciavi32/info.c
trunk/reactos/media/doc/README.WINE
Modified: trunk/reactos/dll/win32/mciavi32/info.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mciavi32/info.c?rev=66880&r1=66879&r2=66880&view=diff
==============================================================================
--- trunk/reactos/dll/win32/mciavi32/info.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mciavi32/info.c [iso-8859-1] Wed Mar 25
15:59:32 2015
@@ -69,7 +69,7 @@
DWORD MCIAVI_mciGetDevCaps(UINT wDevID, DWORD dwFlags,
LPMCI_GETDEVCAPS_PARMS lpParms)
{
WINE_MCIAVI* wma = MCIAVI_mciGetOpenDev(wDevID);
- DWORD ret;
+ DWORD ret = MCIERR_UNSUPPORTED_FUNCTION;
TRACE("(%04x, %08X, %p)\n", wDevID, dwFlags, lpParms);
@@ -170,7 +170,6 @@
/* w2k does not know MAX_WINDOWS or MAX/MINIMUM_RATE */
default:
FIXME("Unknown capability (%08x) !\n", lpParms->dwItem);
- ret = MCIERR_UNSUPPORTED_FUNCTION;
break;
}
}
Modified: trunk/reactos/media/doc/README.WINE
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=66880&r1=66879&r2=66880&view=diff
==============================================================================
--- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Wed Mar 25 15:59:32 2015
@@ -101,7 +101,7 @@
reactos/dll/win32/localui # Synced to Wine-1.7.27
reactos/dll/win32/lz32 # Synced to Wine-1.7.27
reactos/dll/win32/mapi32 # Synced to Wine-1.7.27
-reactos/dll/win32/mciavi32 # Synced to Wine-1.7.27
+reactos/dll/win32/mciavi32 # Synced to WineStaging-1.7.37
reactos/dll/win32/mcicda # Synced to Wine-1.7.27
reactos/dll/win32/mciqtz32 # Synced to Wine-1.7.27
reactos/dll/win32/mciseq # Synced to Wine-1.7.27
