winmm: Build with msvcrt.

dlls/winmm/Makefile.in

@@ -3,6 +3,8 @@ MODULE    = winmm.dll
 IMPORTLIB = winmm
 IMPORTS   = uuid user32 advapi32 ole32 msacm32
 
+EXTRADLLFLAGS = -mno-cygwin
+
 C_SRCS = \
 	driver.c \
 	joystick.c \

dlls/winmm/driver.c

@@ -20,9 +20,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "config.h"
-#include "wine/port.h"
-
 #include <string.h>
 #include <stdarg.h>
 #include "windef.h"
@@ -34,7 +31,6 @@
 #include "mmddk.h"
 #include "winemm.h"
 #include "wine/debug.h"
-#include "wine/unicode.h"
 #include "excpt.h"
 #include "wine/exception.h"
 
@@ -287,7 +283,7 @@ LPWINE_DRIVER	DRIVER_TryOpenDriver32(LPCWSTR fn, LPARAM lParam2)
 
     TRACE("(%s, %08lX);\n", debugstr_w(fn), lParam2);
 
-    if ((ptr = strchrW(fn, ' ')) != NULL) {
+    if ((ptr = wcschr(fn, ' ')) != NULL) {
 	*ptr++ = '\0';
 	while (*ptr == ' ') ptr++;
 	if (*ptr == '\0') ptr = NULL;

dlls/winmm/joystick.c

@@ -21,19 +21,11 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "config.h"
-
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <fcntl.h>
-#ifdef HAVE_SYS_IOCTL_H
-#include <sys/ioctl.h>
-#endif
 
 #include "windef.h"
 #include "winbase.h"

dlls/winmm/lolvldrv.c

@@ -20,9 +20,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "config.h"
-#include "wine/port.h"
-
 #define NONAMELESSUNION
 #define COBJMACROS
 

dlls/winmm/waveform.c

@@ -674,7 +674,7 @@ static HRESULT update_mapping(WINMM_MMDevice ***map, UINT count,
     for(i = 0; i < count; ++i){
         WINMM_MMDevice *tmp;
 
-        if(!lstrcmpW((*map)[i]->dev_id, default_id)){
+        if(!wcscmp((*map)[i]->dev_id, default_id)){
             (*map)[0] = (*map)[i];
             (*map)[i] = prev;