Alexandre Julliard : mciavi32: Build with msvcrt.

[Alexandre Julliard]

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

Author: Alexandre Julliard 
Date:   Mon Jun 10 10:58:05 2019 +0200

mciavi32: Build with msvcrt.

Signed-off-by: Alexandre Julliard

---

dlls/mciavi32/Makefile.in | 2 ++
 dlls/mciavi32/info.c      | 1 -
 dlls/mciavi32/mciavi.c    | 7 +++----
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dlls/mciavi32/Makefile.in b/dlls/mciavi32/Makefile.in
index e7fe6ba..f880b09 100644
--- a/dlls/mciavi32/Makefile.in
+++ b/dlls/mciavi32/Makefile.in
@@ -1,6 +1,8 @@
 MODULE    = mciavi32.dll
 IMPORTS   = msvfw32 winmm user32 gdi32

+EXTRADLLFLAGS = -mno-cygwin
+
 C_SRCS = \
    info.c \
    mciavi.c \
diff --git a/dlls/mciavi32/info.c b/dlls/mciavi32/info.c
index 3d138b1..d516c4d 100644
--- a/dlls/mciavi32/info.c
+++ b/dlls/mciavi32/info.c
@@ -21,7 +21,6 @@
 #include <string.h>
 #include "private_mciavi.h"
 #include "wine/debug.h"
-#include "wine/unicode.h"

WINE_DEFAULT_DEBUG_CHANNEL(mciavi);

diff --git a/dlls/mciavi32/mciavi.c b/dlls/mciavi32/mciavi.c
index 9aa6cd8..d8df240 100644
--- a/dlls/mciavi32/mciavi.c
+++ b/dlls/mciavi32/mciavi.c
@@ -40,7 +40,6 @@
 #include <string.h>
 #include "private_mciavi.h"
 #include "wine/debug.h"
-#include "wine/unicode.h"

WINE_DEFAULT_DEBUG_CHANNEL(mciavi);

@@ -253,13 +252,13 @@ static	DWORD	MCIAVI_mciOpen(UINT wDevID, DWORD dwFlags,
        /* FIXME : what should be done id wma->hFile is already != 0, or the driver is playin' */
        TRACE("MCI_OPEN_ELEMENT %s!\n", debugstr_w(lpOpenParms->lpstrElementName));

-            wma->lpFileName = HeapAlloc(GetProcessHeap(), 0, (strlenW(lpOpenParms->lpstrElementName) + 1) * sizeof(WCHAR));
-            strcpyW(wma->lpFileName, lpOpenParms->lpstrElementName);
+            wma->lpFileName = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(lpOpenParms->lpstrElementName) + 1) * sizeof(WCHAR));
+            lstrcpyW(wma->lpFileName, lpOpenParms->lpstrElementName);

if (lpOpenParms->lpstrElementName[0] == '@') {
    	/* The file name @11223344 encodes an AVIFile handle in decimal notation
    	 * in Win3.1 and w2k/NT, but this feature is absent in win95 (KB140750).
-		 * wma->hFile = LongToHandle(strtolW(lpOpenParms->lpstrElementName+1, NULL, 10)); */
+		 * wma->hFile = LongToHandle(wcstol(lpOpenParms->lpstrElementName+1, NULL, 10)); */
    	FIXME("Using AVIFile/Stream %s NIY\n", debugstr_w(lpOpenParms->lpstrElementName));
        }
        wma->hFile = mmioOpenW(lpOpenParms->lpstrElementName, NULL,