ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msvfw32: Build with msvcrt. 

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alexandre Julliard 2019-06-14 09:18:08 +02:00
parent 9665f1d261
commit 85faa43113
2 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/msvfw32/Makefile.in
View File

@ -2,6 +2,8 @@ MODULE = msvfw32.dll
IMPORTLIB = msvfw32 IMPORTLIB = msvfw32
IMPORTS = winmm version comctl32 user32 gdi32 advapi32 IMPORTS = winmm version comctl32 user32 gdi32 advapi32
EXTRADLLFLAGS = -mno-cygwin
C_SRCS = \ C_SRCS = \
drawdib.c \ drawdib.c \
mciwnd.c \ mciwnd.c \

25
dlls/msvfw32/mciwnd.c
View File

@ -32,7 +32,6 @@
#include "vfw.h" #include "vfw.h"
#include "digitalv.h" #include "digitalv.h"
#include "commctrl.h" #include "commctrl.h"
#include "wine/unicode.h"
#include "wine/debug.h" #include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(mci); WINE_DEFAULT_DEBUG_CHANNEL(mci);
@ -200,7 +199,7 @@ static void MCIWND_UpdateState(MCIWndInfo *mwi)
return; return;
if ((mwi->dwStyle & MCIWNDF_SHOWNAME) && mwi->lpName) if ((mwi->dwStyle & MCIWNDF_SHOWNAME) && mwi->lpName)
strcpyW(buffer, mwi->lpName); lstrcpyW(buffer, mwi->lpName);
else else
*buffer = 0; *buffer = 0;
@ -209,8 +208,8 @@ static void MCIWND_UpdateState(MCIWndInfo *mwi)
static const WCHAR spaceW[] = {' ',0}; static const WCHAR spaceW[] = {' ',0};
static const WCHAR l_braceW[] = {'(',0}; static const WCHAR l_braceW[] = {'(',0};
if (*buffer) strcatW(buffer, spaceW); if (*buffer) lstrcatW(buffer, spaceW);
strcatW(buffer, l_braceW); lstrcatW(buffer, l_braceW);
} }
if (mwi->dwStyle & MCIWNDF_SHOWPOS) if (mwi->dwStyle & MCIWNDF_SHOWPOS)
@ -219,13 +218,13 @@ static void MCIWND_UpdateState(MCIWndInfo *mwi)
posW[0] = 0; posW[0] = 0;
SendMessageW(mwi->hWnd, MCIWNDM_GETPOSITIONW, 64, (LPARAM)posW); 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)) if ((mwi->dwStyle & (MCIWNDF_SHOWPOS|MCIWNDF_SHOWMODE)) == (MCIWNDF_SHOWPOS|MCIWNDF_SHOWMODE))
{ {
static const WCHAR dashW[] = {' ','-',' ',0}; static const WCHAR dashW[] = {' ','-',' ',0};
strcatW(buffer, dashW); lstrcatW(buffer, dashW);
} }
if (mwi->dwStyle & MCIWNDF_SHOWMODE) if (mwi->dwStyle & MCIWNDF_SHOWMODE)
@ -234,13 +233,13 @@ static void MCIWND_UpdateState(MCIWndInfo *mwi)
modeW[0] = 0; modeW[0] = 0;
SendMessageW(mwi->hWnd, MCIWNDM_GETMODEW, 64, (LPARAM)modeW); SendMessageW(mwi->hWnd, MCIWNDM_GETMODEW, 64, (LPARAM)modeW);
strcatW(buffer, modeW); lstrcatW(buffer, modeW);
} }
if (mwi->dwStyle & (MCIWNDF_SHOWPOS|MCIWNDF_SHOWMODE)) if (mwi->dwStyle & (MCIWNDF_SHOWPOS|MCIWNDF_SHOWMODE))
{ {
static const WCHAR r_braceW[] = {')',0}; static const WCHAR r_braceW[] = {')',0};
strcatW(buffer, r_braceW); lstrcatW(buffer, r_braceW);
} }
TRACE("=> %s\n", debugstr_w(buffer)); 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->mci = mci_open.wDeviceID;
mwi->alias = HandleToLong(hWnd) + 1; mwi->alias = HandleToLong(hWnd) + 1;
mwi->lpName = HeapAlloc(GetProcessHeap(), 0, (strlenW((LPWSTR)lParam) + 1) * sizeof(WCHAR)); mwi->lpName = HeapAlloc(GetProcessHeap(), 0, (lstrlenW((LPWSTR)lParam) + 1) * sizeof(WCHAR));
strcpyW(mwi->lpName, (LPWSTR)lParam); lstrcpyW(mwi->lpName, (LPWSTR)lParam);
MCIWND_UpdateState(mwi); MCIWND_UpdateState(mwi);
@ -987,7 +986,7 @@ end_of_mci_open:
TRACE("MCIWNDM_SENDSTRINGW %s\n", debugstr_w((LPCWSTR)lParam)); TRACE("MCIWNDM_SENDSTRINGW %s\n", debugstr_w((LPCWSTR)lParam));
p = strchrW((LPCWSTR)lParam, ' '); p = wcschr((LPCWSTR)lParam, ' ');
if (p) if (p)
{ {
static const WCHAR formatW[] = {'%','d',' ',0}; static const WCHAR formatW[] = {'%','d',' ',0};
@ -1000,7 +999,7 @@ end_of_mci_open:
memcpy(cmdW, (void *)lParam, pos * sizeof(WCHAR)); memcpy(cmdW, (void *)lParam, pos * sizeof(WCHAR));
wsprintfW(cmdW + pos, formatW, mwi->alias); wsprintfW(cmdW + pos, formatW, mwi->alias);
strcatW(cmdW, (WCHAR *)lParam + pos); lstrcatW(cmdW, (WCHAR *)lParam + pos);
} }
else else
cmdW = (LPWSTR)lParam; cmdW = (LPWSTR)lParam;
@ -1182,7 +1181,7 @@ end_of_mci_open:
{ {
cmdW = HeapAlloc(GetProcessHeap(), 0, (lstrlenW((LPCWSTR)lParam) + 64) * sizeof(WCHAR)); cmdW = HeapAlloc(GetProcessHeap(), 0, (lstrlenW((LPCWSTR)lParam) + 64) * sizeof(WCHAR));
wsprintfW(cmdW, formatW, mwi->alias); wsprintfW(cmdW, formatW, mwi->alias);
strcatW(cmdW, (WCHAR *)lParam); lstrcatW(cmdW, (WCHAR *)lParam);
mwi->lasterror = mciSendStringW(cmdW, NULL, 0, 0); mwi->lasterror = mciSendStringW(cmdW, NULL, 0, 0);