Alexandre Julliard : msvfw32: Build with msvcrt.
Alexandre Julliard
julliard at winehq.org
Fri Jun 14 16:52:16 CDT 2019
Module: wine
Branch: master
Commit: 85faa431139da7ccf377eb4267d9ad97c8d660f0
URL: https://source.winehq.org/git/wine.git/?a=commit;h=85faa431139da7ccf377eb4267d9ad97c8d660f0
Author: Alexandre Julliard <julliard at winehq.org>
Date: Fri Jun 14 09:18:08 2019 +0200
msvfw32: Build with msvcrt.
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/msvfw32/Makefile.in | 2 ++
dlls/msvfw32/mciwnd.c | 25 ++++++++++++-------------
2 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/dlls/msvfw32/Makefile.in b/dlls/msvfw32/Makefile.in
index 9247fb8..d62259f 100644
--- a/dlls/msvfw32/Makefile.in
+++ b/dlls/msvfw32/Makefile.in
@@ -2,6 +2,8 @@ MODULE = msvfw32.dll
IMPORTLIB = msvfw32
IMPORTS = winmm version comctl32 user32 gdi32 advapi32
+EXTRADLLFLAGS = -mno-cygwin
+
C_SRCS = \
drawdib.c \
mciwnd.c \
diff --git a/dlls/msvfw32/mciwnd.c b/dlls/msvfw32/mciwnd.c
index 50899e1..0b35bad 100644
--- a/dlls/msvfw32/mciwnd.c
+++ b/dlls/msvfw32/mciwnd.c
@@ -32,7 +32,6 @@
#include "vfw.h"
#include "digitalv.h"
#include "commctrl.h"
-#include "wine/unicode.h"
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(mci);
@@ -200,7 +199,7 @@ static void MCIWND_UpdateState(MCIWndInfo *mwi)
return;
if ((mwi->dwStyle & MCIWNDF_SHOWNAME) && mwi->lpName)
- strcpyW(buffer, mwi->lpName);
+ lstrcpyW(buffer, mwi->lpName);
else
*buffer = 0;
@@ -209,8 +208,8 @@ static void MCIWND_UpdateState(MCIWndInfo *mwi)
static const WCHAR spaceW[] = {' ',0};
static const WCHAR l_braceW[] = {'(',0};
- if (*buffer) strcatW(buffer, spaceW);
- strcatW(buffer, l_braceW);
+ if (*buffer) lstrcatW(buffer, spaceW);
+ lstrcatW(buffer, l_braceW);
}
if (mwi->dwStyle & MCIWNDF_SHOWPOS)
@@ -219,13 +218,13 @@ static void MCIWND_UpdateState(MCIWndInfo *mwi)
posW[0] = 0;
SendMessageW(mwi->hWnd, MCIWNDM_GETPOSITIONW, 64, (LPARAM)posW);
- strcatW(buffer, posW);
+ lstrcatW(buffer, posW);
}
if ((mwi->dwStyle & (MCIWNDF_SHOWPOS|MCIWNDF_SHOWMODE)) == (MCIWNDF_SHOWPOS|MCIWNDF_SHOWMODE))
{
static const WCHAR dashW[] = {' ','-',' ',0};
- strcatW(buffer, dashW);
+ lstrcatW(buffer, dashW);
}
if (mwi->dwStyle & MCIWNDF_SHOWMODE)
@@ -234,13 +233,13 @@ static void MCIWND_UpdateState(MCIWndInfo *mwi)
modeW[0] = 0;
SendMessageW(mwi->hWnd, MCIWNDM_GETMODEW, 64, (LPARAM)modeW);
- strcatW(buffer, modeW);
+ lstrcatW(buffer, modeW);
}
if (mwi->dwStyle & (MCIWNDF_SHOWPOS|MCIWNDF_SHOWMODE))
{
static const WCHAR r_braceW[] = {')',0};
- strcatW(buffer, r_braceW);
+ lstrcatW(buffer, r_braceW);
}
TRACE("=> %s\n", debugstr_w(buffer));
@@ -590,8 +589,8 @@ static LRESULT WINAPI MCIWndProc(HWND hWnd, UINT wMsg, WPARAM wParam, LPARAM lPa
mwi->mci = mci_open.wDeviceID;
mwi->alias = HandleToLong(hWnd) + 1;
- mwi->lpName = HeapAlloc(GetProcessHeap(), 0, (strlenW((LPWSTR)lParam) + 1) * sizeof(WCHAR));
- strcpyW(mwi->lpName, (LPWSTR)lParam);
+ mwi->lpName = HeapAlloc(GetProcessHeap(), 0, (lstrlenW((LPWSTR)lParam) + 1) * sizeof(WCHAR));
+ lstrcpyW(mwi->lpName, (LPWSTR)lParam);
MCIWND_UpdateState(mwi);
@@ -987,7 +986,7 @@ end_of_mci_open:
TRACE("MCIWNDM_SENDSTRINGW %s\n", debugstr_w((LPCWSTR)lParam));
- p = strchrW((LPCWSTR)lParam, ' ');
+ p = wcschr((LPCWSTR)lParam, ' ');
if (p)
{
static const WCHAR formatW[] = {'%','d',' ',0};
@@ -1000,7 +999,7 @@ end_of_mci_open:
memcpy(cmdW, (void *)lParam, pos * sizeof(WCHAR));
wsprintfW(cmdW + pos, formatW, mwi->alias);
- strcatW(cmdW, (WCHAR *)lParam + pos);
+ lstrcatW(cmdW, (WCHAR *)lParam + pos);
}
else
cmdW = (LPWSTR)lParam;
@@ -1182,7 +1181,7 @@ end_of_mci_open:
{
cmdW = HeapAlloc(GetProcessHeap(), 0, (lstrlenW((LPCWSTR)lParam) + 64) * sizeof(WCHAR));
wsprintfW(cmdW, formatW, mwi->alias);
- strcatW(cmdW, (WCHAR *)lParam);
+ lstrcatW(cmdW, (WCHAR *)lParam);
mwi->lasterror = mciSendStringW(cmdW, NULL, 0, 0);
More information about the wine-cvs
mailing list