June 2019 - Wine-Commits - list.winehq.org

Alexandre Julliard : dssenh: Build with msvcrt.
by Alexandre Julliard June 3, 2019

June 3, 2019

Module: wine Branch: master Commit: 7054e7d40afcfcb36e081c9c61924d0b755ba009 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7054e7d40afcfcb36e081c9c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 3 10:46:24 2019 +0200 dssenh: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dssenh/Makefile.in | 2 ++ dlls/dssenh/main.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/dssenh/Makefile.in b/dlls/dssenh/Makefile.in index 4580914..4f05bee 100644 --- a/dlls/dssenh/Makefile.in +++ b/dlls/dssenh/Makefile.in @@ -1,4 +1,6 @@ MODULE = dssenh.dll +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ main.c diff --git a/dlls/dssenh/main.c b/dlls/dssenh/main.c index c638724..b60b344 100644 --- a/dlls/dssenh/main.c +++ b/dlls/dssenh/main.c @@ -16,7 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" #include <stdarg.h>

1 0

Alexandre Julliard : dpwsockx: Build with msvcrt.
by Alexandre Julliard June 3, 2019

June 3, 2019

Module: wine Branch: master Commit: eeb6f69a6144ba0d0c389d1d4ed9fda24e0bd185 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eeb6f69a6144ba0d0c389d1d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 3 10:32:55 2019 +0200 dpwsockx: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dpwsockx/Makefile.in | 2 ++ dlls/dpwsockx/dpwsockx_main.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/dpwsockx/Makefile.in b/dlls/dpwsockx/Makefile.in index f519c8b..5ed3c7e 100644 --- a/dlls/dpwsockx/Makefile.in +++ b/dlls/dpwsockx/Makefile.in @@ -1,5 +1,7 @@ MODULE = dpwsockx.dll IMPORTS = dxguid ws2_32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ dpwsockx_main.c diff --git a/dlls/dpwsockx/dpwsockx_main.c b/dlls/dpwsockx/dpwsockx_main.c index 9606d73..dec3d9e 100644 --- a/dlls/dpwsockx/dpwsockx_main.c +++ b/dlls/dpwsockx/dpwsockx_main.c @@ -17,7 +17,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" #include <stdarg.h>

1 0

Alexandre Julliard : dpvoice: Build with msvcrt.
by Alexandre Julliard June 3, 2019

June 3, 2019

Module: wine Branch: master Commit: ee0b66adc482cb43e8b0e53bc1bd9825a63b1996 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee0b66adc482cb43e8b0e53b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 3 10:32:47 2019 +0200 dpvoice: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dpvoice/Makefile.in | 2 ++ dlls/dpvoice/client.c | 2 -- dlls/dpvoice/main.c | 1 - dlls/dpvoice/server.c | 2 -- 4 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/dpvoice/Makefile.in b/dlls/dpvoice/Makefile.in index 25334b5..38e934d 100644 --- a/dlls/dpvoice/Makefile.in +++ b/dlls/dpvoice/Makefile.in @@ -1,6 +1,8 @@ MODULE = dpvoice.dll IMPORTS = dxguid uuid +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ client.c \ main.c \ diff --git a/dlls/dpvoice/client.c b/dlls/dpvoice/client.c index 7f6cf4a..b611370 100644 --- a/dlls/dpvoice/client.c +++ b/dlls/dpvoice/client.c @@ -17,7 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" #include <stdarg.h> @@ -28,7 +27,6 @@ #include "winuser.h" #include "objbase.h" -#include "wine/unicode.h" #include "wine/debug.h" #include "dvoice.h" diff --git a/dlls/dpvoice/main.c b/dlls/dpvoice/main.c index 3a74e01..73441a8 100644 --- a/dlls/dpvoice/main.c +++ b/dlls/dpvoice/main.c @@ -18,7 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" #include <stdarg.h> #include "windef.h" diff --git a/dlls/dpvoice/server.c b/dlls/dpvoice/server.c index 80ef199..714863f 100644 --- a/dlls/dpvoice/server.c +++ b/dlls/dpvoice/server.c @@ -17,7 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" #include <stdarg.h> @@ -28,7 +27,6 @@ #include "winuser.h" #include "objbase.h" -#include "wine/unicode.h" #include "wine/debug.h" #include "dvoice.h"

1 0

Alexandre Julliard : dpnhpast: Build with msvcrt.
by Alexandre Julliard June 3, 2019

June 3, 2019

Module: wine Branch: master Commit: e0b0623ba4644e7b4e6e43deb3df0d062c44ecc1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e0b0623ba4644e7b4e6e43de… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 3 10:32:36 2019 +0200 dpnhpast: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dpnhpast/Makefile.in | 2 ++ dlls/dpnhpast/main.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/dpnhpast/Makefile.in b/dlls/dpnhpast/Makefile.in index 12a0443..53787fa 100644 --- a/dlls/dpnhpast/Makefile.in +++ b/dlls/dpnhpast/Makefile.in @@ -1,5 +1,7 @@ MODULE = dpnhpast.dll +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ main.c diff --git a/dlls/dpnhpast/main.c b/dlls/dpnhpast/main.c index 4e46608..0fc70cd 100644 --- a/dlls/dpnhpast/main.c +++ b/dlls/dpnhpast/main.c @@ -17,7 +17,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" #include <stdarg.h> #include "windef.h"

1 0

Alexandre Julliard : dpnet: Build with msvcrt.
by Alexandre Julliard June 3, 2019

June 3, 2019

Module: wine Branch: master Commit: c80ad80a92b4924dff10d51bbb9fac6177c8b76e URL: https://source.winehq.org/git/wine.git/?a=commit;h=c80ad80a92b4924dff10d51b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 3 10:32:20 2019 +0200 dpnet: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dpnet/Makefile.in | 2 ++ dlls/dpnet/address.c | 6 ++---- dlls/dpnet/client.c | 1 - dlls/dpnet/dpnet_main.c | 1 - dlls/dpnet/dpnet_private.h | 7 +------ dlls/dpnet/lobbiedapp.c | 1 - dlls/dpnet/peer.c | 1 - dlls/dpnet/server.c | 1 - dlls/dpnet/threadpool.c | 1 - 9 files changed, 5 insertions(+), 16 deletions(-) diff --git a/dlls/dpnet/Makefile.in b/dlls/dpnet/Makefile.in index 541e104..bcf0777 100644 --- a/dlls/dpnet/Makefile.in +++ b/dlls/dpnet/Makefile.in @@ -2,6 +2,8 @@ MODULE = dpnet.dll IMPORTLIB = dpnet IMPORTS = dxguid uuid ole32 advapi32 ws2_32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ address.c \ client.c \ diff --git a/dlls/dpnet/address.c b/dlls/dpnet/address.c index 0bfa2bc..6aa62a9 100644 --- a/dlls/dpnet/address.c +++ b/dlls/dpnet/address.c @@ -19,7 +19,6 @@ * */ -#include "config.h" #include <stdarg.h> @@ -30,7 +29,6 @@ #include "winuser.h" #include "objbase.h" -#include "wine/unicode.h" #include "wine/debug.h" #include "dpnet_private.h" @@ -417,7 +415,7 @@ static HRESULT WINAPI IDirectPlay8AddressImpl_GetComponentByIndex(IDirectPlay8Ad entry = This->components[dwComponentID]; - namesize = strlenW(entry->name); + namesize = lstrlenW(entry->name); if(*pdwBufferSize < entry->size || *pdwNameLen < namesize) { WARN("Buffer too small\n"); @@ -493,7 +491,7 @@ static HRESULT WINAPI IDirectPlay8AddressImpl_AddComponent(IDirectPlay8Address * } break; case DPNA_DATATYPE_STRING: - if (((strlenW((WCHAR*)lpvData)+1)*sizeof(WCHAR)) != dwDataSize) + if (((lstrlenW((WCHAR*)lpvData)+1)*sizeof(WCHAR)) != dwDataSize) { WARN("Invalid STRING size, returning DPNERR_INVALIDPARAM\n"); return DPNERR_INVALIDPARAM; diff --git a/dlls/dpnet/client.c b/dlls/dpnet/client.c index ea491ef..e7024e1 100644 --- a/dlls/dpnet/client.c +++ b/dlls/dpnet/client.c @@ -19,7 +19,6 @@ * */ -#include "config.h" #include <stdarg.h> diff --git a/dlls/dpnet/dpnet_main.c b/dlls/dpnet/dpnet_main.c index cc80ebc..445374c 100644 --- a/dlls/dpnet/dpnet_main.c +++ b/dlls/dpnet/dpnet_main.c @@ -19,7 +19,6 @@ * */ -#include "config.h" #include <stdarg.h> diff --git a/dlls/dpnet/dpnet_private.h b/dlls/dpnet/dpnet_private.h index 2e72360..9458a51 100644 --- a/dlls/dpnet/dpnet_private.h +++ b/dlls/dpnet/dpnet_private.h @@ -21,14 +21,9 @@ #ifndef __WINE_DPNET_PRIVATE_H #define __WINE_DPNET_PRIVATE_H -#ifndef __WINE_CONFIG_H -# error You must include config.h to use this header -#endif - #include "wine/heap.h" #include <wine/list.h> #include "winsock2.h" -#include "wine/unicode.h" #include "dplay8.h" #include "dplobby8.h" @@ -159,7 +154,7 @@ static inline WCHAR *heap_strdupW( const WCHAR *src ) { WCHAR *dst; if (!src) return NULL; - if ((dst = heap_alloc( (strlenW( src ) + 1) * sizeof(WCHAR) ))) strcpyW( dst, src ); + if ((dst = heap_alloc( (lstrlenW( src ) + 1) * sizeof(WCHAR) ))) lstrcpyW( dst, src ); return dst; } diff --git a/dlls/dpnet/lobbiedapp.c b/dlls/dpnet/lobbiedapp.c index d041e63..d58571a 100644 --- a/dlls/dpnet/lobbiedapp.c +++ b/dlls/dpnet/lobbiedapp.c @@ -19,7 +19,6 @@ * */ -#include "config.h" #include <stdarg.h> diff --git a/dlls/dpnet/peer.c b/dlls/dpnet/peer.c index 3e3cd9b..f935b2a 100644 --- a/dlls/dpnet/peer.c +++ b/dlls/dpnet/peer.c @@ -21,7 +21,6 @@ * */ -#include "config.h" #include <stdarg.h> diff --git a/dlls/dpnet/server.c b/dlls/dpnet/server.c index 46d5fe2..9777716 100644 --- a/dlls/dpnet/server.c +++ b/dlls/dpnet/server.c @@ -19,7 +19,6 @@ * */ -#include "config.h" #include <stdarg.h> diff --git a/dlls/dpnet/threadpool.c b/dlls/dpnet/threadpool.c index 7e84a5a..22d871b 100644 --- a/dlls/dpnet/threadpool.c +++ b/dlls/dpnet/threadpool.c @@ -20,7 +20,6 @@ * */ -#include "config.h" #include <stdarg.h>

1 0

Alexandre Julliard : dplayx: Build with msvcrt.
by Alexandre Julliard June 3, 2019

June 3, 2019

Module: wine Branch: master Commit: 5e5a48469c076761432cfec1885784e4c9a962ae URL: https://source.winehq.org/git/wine.git/?a=commit;h=5e5a48469c076761432cfec1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 3 10:31:26 2019 +0200 dplayx: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dplayx/Makefile.in | 2 ++ dlls/dplayx/dplay.c | 11 ++++------- dlls/dplayx/dplayx_global.c | 25 ++++++++++++------------- dlls/dplayx/name_server.c | 1 - 4 files changed, 18 insertions(+), 21 deletions(-) diff --git a/dlls/dplayx/Makefile.in b/dlls/dplayx/Makefile.in index 8d41fdb..63e8ba8 100644 --- a/dlls/dplayx/Makefile.in +++ b/dlls/dplayx/Makefile.in @@ -2,6 +2,8 @@ MODULE = dplayx.dll IMPORTLIB = dplayx IMPORTS = dxguid uuid winmm ole32 user32 advapi32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ dpclassfactory.c \ dplay.c \ diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index 65c7e4d..e7d6edc 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -18,8 +18,6 @@ */ #define COBJMACROS -#include "config.h" -#include "wine/port.h" #include <stdarg.h> #include <string.h> @@ -32,7 +30,6 @@ #include "winnt.h" #include "winreg.h" #include "winnls.h" -#include "wine/unicode.h" #include "wine/debug.h" #include "dplayx_global.h" @@ -1440,14 +1437,14 @@ static BOOL DP_CopyDPNAMEStruct( LPDPNAME lpDst, const DPNAME *lpSrc, BOOL bAnsi if( lpSrc->u1.lpszShortNameA ) { lpDst->u1.lpszShortName = HeapAlloc( GetProcessHeap(), 0, - (strlenW(lpSrc->u1.lpszShortName)+1)*sizeof(WCHAR) ); - strcpyW( lpDst->u1.lpszShortName, lpSrc->u1.lpszShortName ); + (lstrlenW(lpSrc->u1.lpszShortName)+1)*sizeof(WCHAR) ); + lstrcpyW( lpDst->u1.lpszShortName, lpSrc->u1.lpszShortName ); } if( lpSrc->u2.lpszLongNameA ) { lpDst->u2.lpszLongName = HeapAlloc( GetProcessHeap(), 0, - (strlenW(lpSrc->u2.lpszLongName)+1)*sizeof(WCHAR) ); - strcpyW( lpDst->u2.lpszLongName, lpSrc->u2.lpszLongName ); + (lstrlenW(lpSrc->u2.lpszLongName)+1)*sizeof(WCHAR) ); + lstrcpyW( lpDst->u2.lpszLongName, lpSrc->u2.lpszLongName ); } } diff --git a/dlls/dplayx/dplayx_global.c b/dlls/dplayx/dplayx_global.c index bc087c8..a544cd2 100644 --- a/dlls/dplayx/dplayx_global.c +++ b/dlls/dplayx/dplayx_global.c @@ -38,7 +38,6 @@ #include "windef.h" #include "winbase.h" #include "winerror.h" -#include "wine/unicode.h" #include "wingdi.h" #include "winuser.h" @@ -624,18 +623,18 @@ static void DPLAYX_CopyConnStructW( LPDPLCONNECTION dest, const DPLCONNECTION *s /* Session names may or may not exist */ if( src->lpSessionDesc->u1.lpszSessionName ) { - strcpyW( (LPWSTR)lpStartOfFreeSpace, src->lpSessionDesc->u1.lpszSessionName ); + lstrcpyW( (LPWSTR)lpStartOfFreeSpace, src->lpSessionDesc->u1.lpszSessionName ); dest->lpSessionDesc->u1.lpszSessionName = (LPWSTR)lpStartOfFreeSpace; lpStartOfFreeSpace += sizeof(WCHAR) * - ( strlenW( dest->lpSessionDesc->u1.lpszSessionName ) + 1 ); + ( lstrlenW( dest->lpSessionDesc->u1.lpszSessionName ) + 1 ); } if( src->lpSessionDesc->u2.lpszPassword ) { - strcpyW( (LPWSTR)lpStartOfFreeSpace, src->lpSessionDesc->u2.lpszPassword ); + lstrcpyW( (LPWSTR)lpStartOfFreeSpace, src->lpSessionDesc->u2.lpszPassword ); dest->lpSessionDesc->u2.lpszPassword = (LPWSTR)lpStartOfFreeSpace; lpStartOfFreeSpace += sizeof(WCHAR) * - ( strlenW( dest->lpSessionDesc->u2.lpszPassword ) + 1 ); + ( lstrlenW( dest->lpSessionDesc->u2.lpszPassword ) + 1 ); } } @@ -648,18 +647,18 @@ static void DPLAYX_CopyConnStructW( LPDPLCONNECTION dest, const DPLCONNECTION *s if( src->lpPlayerName->u1.lpszShortName ) { - strcpyW( (LPWSTR)lpStartOfFreeSpace, src->lpPlayerName->u1.lpszShortName ); + lstrcpyW( (LPWSTR)lpStartOfFreeSpace, src->lpPlayerName->u1.lpszShortName ); dest->lpPlayerName->u1.lpszShortName = (LPWSTR)lpStartOfFreeSpace; lpStartOfFreeSpace += sizeof(WCHAR) * - ( strlenW( dest->lpPlayerName->u1.lpszShortName ) + 1 ); + ( lstrlenW( dest->lpPlayerName->u1.lpszShortName ) + 1 ); } if( src->lpPlayerName->u2.lpszLongName ) { - strcpyW( (LPWSTR)lpStartOfFreeSpace, src->lpPlayerName->u2.lpszLongName ); + lstrcpyW( (LPWSTR)lpStartOfFreeSpace, src->lpPlayerName->u2.lpszLongName ); dest->lpPlayerName->u2.lpszLongName = (LPWSTR)lpStartOfFreeSpace; lpStartOfFreeSpace += sizeof(WCHAR) * - ( strlenW( dest->lpPlayerName->u2.lpszLongName ) + 1 ); + ( lstrlenW( dest->lpPlayerName->u2.lpszLongName ) + 1 ); } } @@ -739,13 +738,13 @@ static DWORD DPLAYX_SizeOfLobbyDataW( const DPLCONNECTION *lpConn ) if( lpConn->lpSessionDesc->u1.lpszSessionName ) { dwTotalSize += sizeof( WCHAR ) * - ( strlenW( lpConn->lpSessionDesc->u1.lpszSessionName ) + 1 ); + ( lstrlenW( lpConn->lpSessionDesc->u1.lpszSessionName ) + 1 ); } if( lpConn->lpSessionDesc->u2.lpszPassword ) { dwTotalSize += sizeof( WCHAR ) * - ( strlenW( lpConn->lpSessionDesc->u2.lpszPassword ) + 1 ); + ( lstrlenW( lpConn->lpSessionDesc->u2.lpszPassword ) + 1 ); } } @@ -756,13 +755,13 @@ static DWORD DPLAYX_SizeOfLobbyDataW( const DPLCONNECTION *lpConn ) if( lpConn->lpPlayerName->u1.lpszShortName ) { dwTotalSize += sizeof( WCHAR ) * - ( strlenW( lpConn->lpPlayerName->u1.lpszShortName ) + 1 ); + ( lstrlenW( lpConn->lpPlayerName->u1.lpszShortName ) + 1 ); } if( lpConn->lpPlayerName->u2.lpszLongName ) { dwTotalSize += sizeof( WCHAR ) * - ( strlenW( lpConn->lpPlayerName->u2.lpszLongName ) + 1 ); + ( lstrlenW( lpConn->lpPlayerName->u2.lpszLongName ) + 1 ); } } diff --git a/dlls/dplayx/name_server.c b/dlls/dplayx/name_server.c index 7ca1500..f1ebc44 100644 --- a/dlls/dplayx/name_server.c +++ b/dlls/dplayx/name_server.c @@ -27,7 +27,6 @@ #include "windef.h" #include "winbase.h" #include "winnls.h" -#include "wine/unicode.h" #include "wine/debug.h" #include "mmsystem.h"

1 0

Alexandre Julliard : dmusic: Build with msvcrt.
by Alexandre Julliard June 3, 2019

June 3, 2019

Module: wine Branch: master Commit: 3a061006688f9bd0d73d5989d882947c0bb6e601 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3a061006688f9bd0d73d5989… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 3 10:31:02 2019 +0200 dmusic: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmusic/Makefile.in | 2 ++ dlls/dmusic/collection.c | 2 +- dlls/dmusic/dmusic.c | 16 ++++++++-------- dlls/dmusic/dmusic_main.c | 2 -- dlls/dmusic/dmusic_private.h | 1 - 5 files changed, 11 insertions(+), 12 deletions(-) diff --git a/dlls/dmusic/Makefile.in b/dlls/dmusic/Makefile.in index a8955a2..8870032 100644 --- a/dlls/dmusic/Makefile.in +++ b/dlls/dmusic/Makefile.in @@ -1,6 +1,8 @@ MODULE = dmusic.dll IMPORTS = dxguid uuid ole32 advapi32 dsound user32 winmm +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ buffer.c \ clock.c \ diff --git a/dlls/dmusic/collection.c b/dlls/dmusic/collection.c index b7eb375..1fddab5 100644 --- a/dlls/dmusic/collection.c +++ b/dlls/dmusic/collection.c @@ -155,7 +155,7 @@ static HRESULT WINAPI IDirectMusicCollectionImpl_EnumInstrument(IDirectMusicColl IDirectMusicInstrumentImpl *instrument = impl_from_IDirectMusicInstrument(inst_entry->pInstrument); IDirectMusicInstrument_GetPatch(inst_entry->pInstrument, patch); if (name) { - length = min(strlenW(instrument->wszName), name_length - 1); + length = min(lstrlenW(instrument->wszName), name_length - 1); memcpy(name, instrument->wszName, length * sizeof(WCHAR)); name[length] = '\0'; } diff --git a/dlls/dmusic/dmusic.c b/dlls/dmusic/dmusic.c index fd450b8..94c0ff4 100644 --- a/dlls/dmusic/dmusic.c +++ b/dlls/dmusic/dmusic.c @@ -224,7 +224,7 @@ static HRESULT WINAPI IDirectMusic8Impl_EnumMasterClock(LPDIRECTMUSIC8 iface, DW clock_info->ctType = 0; clock_info->guidClock = guid_system_clock; - strcpyW(clock_info->wszDescription, name_system_clock); + lstrcpyW(clock_info->wszDescription, name_system_clock); } else { @@ -233,7 +233,7 @@ static HRESULT WINAPI IDirectMusic8Impl_EnumMasterClock(LPDIRECTMUSIC8 iface, DW clock_info->ctType = 0; clock_info->guidClock = guid_dsound_clock; - strcpyW(clock_info->wszDescription, name_dsound_clock); + lstrcpyW(clock_info->wszDescription, name_dsound_clock); } return S_OK; @@ -418,8 +418,8 @@ static void create_system_ports_list(IDirectMusic8Impl* object) port->device = MIDI_MAPPER; port->create = midi_out_port_create; midiOutGetDevCapsW(MIDI_MAPPER, &caps_out, sizeof(caps_out)); - strcpyW(port->caps.wszDescription, caps_out.szPname); - strcatW(port->caps.wszDescription, emulated); + lstrcpyW(port->caps.wszDescription, caps_out.szPname); + lstrcatW(port->caps.wszDescription, emulated); port->caps.dwFlags = DMUS_PC_SHAREABLE; port->caps.dwClass = DMUS_PC_OUTPUTCLASS; port++; @@ -430,8 +430,8 @@ static void create_system_ports_list(IDirectMusic8Impl* object) port->device = i; port->create = midi_out_port_create; midiOutGetDevCapsW(i, &caps_out, sizeof(caps_out)); - strcpyW(port->caps.wszDescription, caps_out.szPname); - strcatW(port->caps.wszDescription, emulated); + lstrcpyW(port->caps.wszDescription, caps_out.szPname); + lstrcatW(port->caps.wszDescription, emulated); port->caps.dwFlags = DMUS_PC_SHAREABLE | DMUS_PC_EXTERNAL; port->caps.dwClass = DMUS_PC_OUTPUTCLASS; port++; @@ -443,8 +443,8 @@ static void create_system_ports_list(IDirectMusic8Impl* object) port->device = i; port->create = midi_in_port_create; midiInGetDevCapsW(i, &caps_in, sizeof(caps_in)); - strcpyW(port->caps.wszDescription, caps_in.szPname); - strcatW(port->caps.wszDescription, emulated); + lstrcpyW(port->caps.wszDescription, caps_in.szPname); + lstrcatW(port->caps.wszDescription, emulated); port->caps.dwFlags = DMUS_PC_EXTERNAL; port->caps.dwClass = DMUS_PC_INPUTCLASS; port++; diff --git a/dlls/dmusic/dmusic_main.c b/dlls/dmusic/dmusic_main.c index 3956dc2..295cd84 100644 --- a/dlls/dmusic/dmusic_main.c +++ b/dlls/dmusic/dmusic_main.c @@ -17,8 +17,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" #include <stdio.h> #include <stdarg.h> diff --git a/dlls/dmusic/dmusic_private.h b/dlls/dmusic/dmusic_private.h index f9839ed..c59646d 100644 --- a/dlls/dmusic/dmusic_private.h +++ b/dlls/dmusic/dmusic_private.h @@ -36,7 +36,6 @@ #include "wine/debug.h" #include "wine/list.h" -#include "wine/unicode.h" #include "winreg.h" #include "objbase.h"

1 0

Alexandre Julliard : drmclien: Build with msvcrt.
by Alexandre Julliard June 3, 2019

June 3, 2019

Module: wine Branch: master Commit: 63360ad490b3a384c717aa823267614459c344f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=63360ad490b3a384c717aa82… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 3 10:33:38 2019 +0200 drmclien: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/drmclien/Makefile.in | 2 ++ dlls/drmclien/main.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/drmclien/Makefile.in b/dlls/drmclien/Makefile.in index 9c94882..ebe2df6 100644 --- a/dlls/drmclien/Makefile.in +++ b/dlls/drmclien/Makefile.in @@ -1,4 +1,6 @@ MODULE = drmclien.dll +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ main.c diff --git a/dlls/drmclien/main.c b/dlls/drmclien/main.c index 99654d5..8483f9f 100644 --- a/dlls/drmclien/main.c +++ b/dlls/drmclien/main.c @@ -17,7 +17,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" #include <stdarg.h>

1 0

Tim Schumacher : dinput/linuxinput: Remap wheel axes to X, Y, and Z.
by Alexandre Julliard June 3, 2019

June 3, 2019

Module: wine Branch: master Commit: 5d51d8a25efcfd73687f5f59e817ee92824ca4ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d51d8a25efcfd73687f5f59… Author: Tim Schumacher <timschumi(a)gmx.de> Date: Sat Jun 1 13:49:51 2019 +0200 dinput/linuxinput: Remap wheel axes to X, Y, and Z. Signed-off-by: Tim Schumacher <timschumi(a)gmx.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_linuxinput.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 8d80b34..fdfbc7f 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -502,14 +502,18 @@ static JoystickImpl *alloc_device(REFGUID rguid, IDirectInputImpl *dinput, unsig /* Count number of available axes - supported Axis & POVs */ for (i = 0; i < ABS_MAX; i++) { - if (i < WINE_JOYSTICK_MAX_AXES && + if (idx < WINE_JOYSTICK_MAX_AXES && + i < ABS_HAT0X && test_bit(newDevice->joydev->absbits, i)) { newDevice->generic.device_axis_count++; newDevice->dev_axes_to_di[i] = idx; newDevice->generic.props[idx].lDevMin = newDevice->joydev->axes[i].minimum; newDevice->generic.props[idx].lDevMax = newDevice->joydev->axes[i].maximum; - default_axis_map[idx] = i; + if (i >= 8 && i <= 10) /* If it's a wheel axis... */ + default_axis_map[idx] = i - 8; /* ... remap to X/Y/Z */ + else + default_axis_map[idx] = i; idx++; } else

1 0

Sven Baars : msvfw32: Fix copying of a BITMAPINFO structure (Valgrind).
by Alexandre Julliard June 3, 2019

June 3, 2019

Module: wine Branch: master Commit: eb69fa7e73f00238bd909985a2507c5ba46b6b78 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb69fa7e73f00238bd909985… Author: Sven Baars <sven.wine(a)gmail.com> Date: Sun Jun 2 16:21:38 2019 +0200 msvfw32: Fix copying of a BITMAPINFO structure (Valgrind). Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvfw32/msvideo_main.c | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/dlls/msvfw32/msvideo_main.c b/dlls/msvfw32/msvideo_main.c index fe140b2..346dbad 100644 --- a/dlls/msvfw32/msvideo_main.c +++ b/dlls/msvfw32/msvideo_main.c @@ -1506,6 +1506,28 @@ void VFWAPI ICSeqCompressFrameEnd(PCOMPVARS pc) clear_compvars(pc); } +static BITMAPINFO *copy_bitmapinfo(const BITMAPINFO *src) +{ + int num_colors; + unsigned int size; + BITMAPINFO *dst; + + if (src->bmiHeader.biClrUsed) + num_colors = min(src->bmiHeader.biClrUsed, 256); + else + num_colors = src->bmiHeader.biBitCount > 8 ? 0 : 1 << src->bmiHeader.biBitCount; + + size = FIELD_OFFSET(BITMAPINFO, bmiColors[num_colors]); + if (src->bmiHeader.biCompression == BI_BITFIELDS) + size += 3 * sizeof(DWORD); + + if (!(dst = heap_alloc(size))) + return NULL; + + memcpy(dst, src, size); + return dst; +} + /*********************************************************************** * ICSeqCompressFrameStart [MSVFW32.@] */ @@ -1517,11 +1539,9 @@ BOOL VFWAPI ICSeqCompressFrameStart(PCOMPVARS pc, LPBITMAPINFO lpbiIn) DWORD ret; ICCOMPRESS* icComp; - if (!(pc->lpbiIn = heap_alloc(sizeof(BITMAPINFO)))) + if (!(pc->lpbiIn = copy_bitmapinfo(lpbiIn))) return FALSE; - *pc->lpbiIn = *lpbiIn; - if (!(pc->lpState = heap_alloc(sizeof(ICCOMPRESS) + sizeof(*icComp->lpckid) + sizeof(*icComp->lpdwFlags)))) goto error;

1 0