[ros-diffs] [akhaldi] 66976: [MCIWAVE] Sync with Wine Staging 1.7.37. CORE-9246

Author: akhaldi
Date: Mon Mar 30 11:42:30 2015
New Revision: 66976

URL: http://svn.reactos.org/svn/reactos?rev=66976&view=rev
Log:
[MCIWAVE] Sync with Wine Staging 1.7.37. CORE-9246

Modified:
    trunk/reactos/dll/win32/mciwave/mciwave.c
    trunk/reactos/media/doc/README.WINE

Modified: trunk/reactos/dll/win32/mciwave/mciwave.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mciwave/mciwave.…
==============================================================================
--- trunk/reactos/dll/win32/mciwave/mciwave.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mciwave/mciwave.c	[iso-8859-1] Mon Mar 30 11:42:30 2015
@@ -446,7 +446,7 @@
 
     TRACE("%s!\n", debugstr_w(*pszTmpFileName));
 
-    if (*pszTmpFileName && (strlenW(*pszTmpFileName) > 0)) {
+    if (*pszTmpFileName && (*pszTmpFileName)[0]) {
 
         *hFile = mmioOpenW(*pszTmpFileName, NULL,
                            MMIO_ALLOCBUF | MMIO_READWRITE | MMIO_CREATE);
@@ -472,7 +472,7 @@
     HeapFree(GetProcessHeap(), 0, wmw->lpFileName);
     wmw->lpFileName = fn;
 
-    if (strlenW(filename) > 0) {
+    if (filename[0]) {
         /* FIXME : what should be done if wmw->hFile is already != 0, or the driver is
playin' */
         TRACE("MCI_OPEN_ELEMENT %s!\n", debugstr_w(filename));
 
@@ -535,7 +535,7 @@
 
     wmw->nUseCount++;
 
-    wmw->wInput = wmw->wOutput = (WORD)WAVE_MAPPER;
+    wmw->wInput = wmw->wOutput = WAVE_MAPPER;
     wmw->fInput = FALSE;
     wmw->hWave = 0;
     wmw->dwStatus = MCI_MODE_NOT_READY;
@@ -1120,7 +1120,7 @@
 
     TRACE("Recording (normalized) from byte=%u for %u bytes\n",
wmw->dwPosition, end - wmw->dwPosition);
 
-    dwRet = waveInStart(wmw->hWave);
+    waveInStart(wmw->hWave);
 
     if (hEvent) SetEvent(hEvent);
 
@@ -1371,13 +1371,13 @@
 	TRACE("MCI_WAVE_SET_ANYINPUT\n");
 	if (wmw->wInput != (WORD)lpParms->wInput)
 	    WAVE_mciStop(wDevID, MCI_WAIT, NULL);
-	wmw->wInput = (WORD)WAVE_MAPPER;
+	wmw->wInput = WAVE_MAPPER;
     }
     if (dwFlags & MCI_WAVE_SET_ANYOUTPUT) {
 	TRACE("MCI_WAVE_SET_ANYOUTPUT\n");
 	if (wmw->wOutput != (WORD)lpParms->wOutput)
 	    WAVE_mciStop(wDevID, MCI_WAIT, NULL);
-	wmw->wOutput = (WORD)WAVE_MAPPER;
+	wmw->wOutput = WAVE_MAPPER;
     }
     /* Set wave format parameters is refused after Open or Record.*/
     if (dwFlags & MCI_WAVE_SET_FORMATTAG) {

Modified: trunk/reactos/media/doc/README.WINE
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…
==============================================================================
--- trunk/reactos/media/doc/README.WINE	[iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE	[iso-8859-1] Mon Mar 30 11:42:30 2015
@@ -105,7 +105,7 @@
 reactos/dll/win32/mcicda              # Synced to Wine-1.7.27
 reactos/dll/win32/mciqtz32            # Synced to WineStaging-1.7.37
 reactos/dll/win32/mciseq              # Synced to WineStaging-1.7.37
-reactos/dll/win32/mciwave             # Synced to Wine-1.7.27
+reactos/dll/win32/mciwave             # Synced to WineStaging-1.7.37
 reactos/dll/win32/mgmtapi             # Synced to Wine-1.7.27
 reactos/dll/win32/mlang               # Synced to Wine-1.7.27
 reactos/dll/win32/mmdevapi            # Synced to Wine-1.7.27
@@ -256,7 +256,7 @@
 
 In addition the following libs, dlls and source files are mostly based on code ported
 from Winehq CVS. If you are looking to update something in these files
-check Wine current souces first as it may already be fixed.
+check Wine current sources first as it may already be fixed.
 
 reactos/lib/3rdparty/strmbase               # Synced to Wine-1.7.27