Alexandre Julliard : midimap: Build with msvcrt.

Alexandre Julliard julliard at winehq.org
Tue Jun 11 16:54:05 CDT 2019


Module: wine
Branch: master
Commit: d86b02958d70557f489b49a53335a389f8c3a0b5
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=d86b02958d70557f489b49a53335a389f8c3a0b5

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Tue Jun 11 08:26:30 2019 +0200

midimap: Build with msvcrt.

Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/midimap/Makefile.in | 2 ++
 dlls/midimap/midimap.c   | 7 +++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/dlls/midimap/Makefile.in b/dlls/midimap/Makefile.in
index c0e66f4..d36c408 100644
--- a/dlls/midimap/Makefile.in
+++ b/dlls/midimap/Makefile.in
@@ -1,5 +1,7 @@
 MODULE    = midimap.dll
 IMPORTS   = winmm user32 advapi32
 
+EXTRADLLFLAGS = -mno-cygwin
+
 C_SRCS = \
 	midimap.c
diff --git a/dlls/midimap/midimap.c b/dlls/midimap/midimap.c
index 540dac3..d15e3d7 100644
--- a/dlls/midimap/midimap.c
+++ b/dlls/midimap/midimap.c
@@ -31,7 +31,6 @@
 #include "winuser.h"
 #include "mmddk.h"
 #include "winreg.h"
-#include "wine/unicode.h"
 #include "wine/debug.h"
 
 /*
@@ -113,7 +112,7 @@ static BOOL	MIDIMAP_FindPort(const WCHAR* name, unsigned* dev)
     for (*dev = 0; *dev < numMidiOutPorts; (*dev)++)
     {
 	TRACE("%s\n", wine_dbgstr_w(midiOutPorts[*dev].name));
-	if (strcmpW(midiOutPorts[*dev].name, name) == 0)
+	if (lstrcmpW(midiOutPorts[*dev].name, name) == 0)
 	    return TRUE;
     }
     /* try the form #nnn */
@@ -568,14 +567,14 @@ static LRESULT MIDIMAP_drvOpen(void)
     {
 	if (midiOutGetDevCapsW(dev, &moc, sizeof(moc)) == 0L)
 	{
-	    strcpyW(midiOutPorts[dev].name, moc.szPname);
+	    lstrcpyW(midiOutPorts[dev].name, moc.szPname);
 	    midiOutPorts[dev].loaded = 0;
 	    midiOutPorts[dev].hMidi = 0;
 	    midiOutPorts[dev].uDevID = dev;
 	    midiOutPorts[dev].lpbPatch = NULL;
 	    for (i = 0; i < 16; i++)
 		midiOutPorts[dev].aChn[i] = i;
-	    if (strncmpW(midiOutPorts[dev].name, throughportW, strlenW(throughportW)) != 0)
+	    if (wcsncmp(midiOutPorts[dev].name, throughportW, lstrlenW(throughportW)) != 0)
 	        found_valid_port = TRUE;
 	}
 	else




More information about the wine-cvs mailing list