commit d19d25a0ea7410b4c557242919ab4dffd9bbad55
author Eric Pouech <Eric.Pouech@wanadoo.fr> Mon Sep 27 13:38:57 1999 +0000
committer Alexandre Julliard <julliard@winehq.org> Mon Sep 27 13:38:57 1999 +0000
tree d0f8f5bbf6cf8678ca963197f5a1322be07e0e8f
parent c26cccbe4bf82138b3e299aa458013f725ffb31d

Removed last dependancies between MCI drivers and WINMM/MMSYSTEM
DLLs.

multimedia/mciavi.c

diff --git a/multimedia/mciavi.c b/multimedia/mciavi.c
index a108d7c..6903a04 100644
--- a/multimedia/mciavi.c
+++ b/multimedia/mciavi.c
@@ -502,7 +502,8 @@
 {
     LPSTR		str = 0;
     WINE_MCIAVI*	wma = AVI_mciGetOpenDev(wDevID);
-    
+    DWORD		ret = 0;
+
     TRACE("(%04X, %08lX, %p) : stub;\n", wDevID, dwFlags, lpParms);
     
     if (lpParms == NULL || lpParms->lpstrReturn == NULL)
@@ -529,7 +530,17 @@
 	WARN("Don't know this info command (%lu)\n", dwFlags);
 	return MCIERR_UNRECOGNIZED_COMMAND;
     }
-    return MCI_WriteString(lpParms->lpstrReturn, lpParms->dwRetSize, str);
+    if (str) {
+	if (lpParms->dwRetSize <= strlen(str)) {
+	    lstrcpynA(lpParms->lpstrReturn, str, lpParms->dwRetSize - 1);
+	    ret = MCIERR_PARAM_OVERFLOW;
+	} else {
+	    strcpy(lpParms->lpstrReturn, str);
+	}	
+    } else {
+	*lpParms->lpstrReturn = 0;
+    }
+    return ret;
 }
 
 /***************************************************************************
@@ -1025,14 +1036,14 @@
 	
     case MCI_SPIN:
     case MCI_ESCAPE:		
-	WARN("Unsupported command=%s\n", MCI_MessageToString(wMsg));
+	WARN("Unsupported command [%lu]\n", wMsg);
 	break;
     case MCI_OPEN:
     case MCI_CLOSE:
 	FIXME("Shouldn't receive a MCI_OPEN or CLOSE message\n");
 	break;
     default:			
-	TRACE("Sending msg=%s to default driver proc\n", MCI_MessageToString(wMsg));
+	TRACE("Sending msg [%lu] to default driver proc\n", wMsg);
 	return DefDriverProc(dwDevID, hDriv, wMsg, dwParam1, dwParam2);
     }
     return MCIERR_UNRECOGNIZED_COMMAND;