Module: wine Branch: master Commit: cdf1e763bf75efc400136d34455e8125f843da7c URL: https://source.winehq.org/git/wine.git/?a=commit;h=cdf1e763bf75efc400136d344...
Author: Alexandre Julliard julliard@winehq.org Date: Tue May 28 07:35:57 2019 +0200
avifil32: Build with msvcrt.
Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/avifil32/Makefile.in | 2 ++ dlls/avifil32/api.c | 3 +-- dlls/avifil32/avifile.c | 3 +-- dlls/avifil32/wavfile.c | 3 +-- 4 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/dlls/avifil32/Makefile.in b/dlls/avifil32/Makefile.in index 4030514..630aa88 100644 --- a/dlls/avifil32/Makefile.in +++ b/dlls/avifil32/Makefile.in @@ -2,6 +2,8 @@ MODULE = avifil32.dll IMPORTLIB = avifil32 IMPORTS = uuid msacm32 msvfw32 winmm ole32 user32 advapi32 rpcrt4
+EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ acmstream.c \ api.c \ diff --git a/dlls/avifil32/api.c b/dlls/avifil32/api.c index 37fa941..a7f84ba 100644 --- a/dlls/avifil32/api.c +++ b/dlls/avifil32/api.c @@ -38,7 +38,6 @@ #include "avifile_private.h"
#include "wine/debug.h" -#include "wine/unicode.h"
WINE_DEFAULT_DEBUG_CHANNEL(avifile);
@@ -155,7 +154,7 @@ static BOOL AVIFILE_GetFileHandlerByExtension(LPCWSTR szFile, LPCLSID lpclsid) { CHAR szRegKey[25]; CHAR szValue[100]; - LPWSTR szExt = strrchrW(szFile, '.'); + LPWSTR szExt = wcsrchr(szFile, '.'); LONG len = ARRAY_SIZE(szValue);
if (szExt == NULL) diff --git a/dlls/avifil32/avifile.c b/dlls/avifil32/avifile.c index 33c28b1..f3cf484 100644 --- a/dlls/avifil32/avifile.c +++ b/dlls/avifil32/avifile.c @@ -46,7 +46,6 @@ #include "avifile_private.h" #include "extrachunk.h"
-#include "wine/unicode.h" #include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(avifile); @@ -625,7 +624,7 @@ static HRESULT WINAPI IPersistFile_fnGetCurFile(IPersistFile *iface, LPOLESTR *p if (*ppszFileName == NULL) return AVIERR_MEMORY;
- strcpyW(*ppszFileName, This->szFileName); + lstrcpyW(*ppszFileName, This->szFileName); }
return AVIERR_OK; diff --git a/dlls/avifil32/wavfile.c b/dlls/avifil32/wavfile.c index 6294ecd..8581a51 100644 --- a/dlls/avifil32/wavfile.c +++ b/dlls/avifil32/wavfile.c @@ -33,7 +33,6 @@ #include "avifile_private.h" #include "extrachunk.h"
-#include "wine/unicode.h" #include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(avifile); @@ -575,7 +574,7 @@ static HRESULT WINAPI IPersistFile_fnGetCurFile(IPersistFile *iface, LPOLESTR *p if (*ppszFileName == NULL) return AVIERR_MEMORY;
- strcpyW(*ppszFileName, This->szFileName); + lstrcpyW(*ppszFileName, This->szFileName); }
return AVIERR_OK;