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

Alexandre Julliard : dpnet: Build with msvcrt.
by Alexandre Julliard 03 Jun '19

03 Jun '19

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 : dpnhpast: Build with msvcrt.
by Alexandre Julliard 03 Jun '19

03 Jun '19

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 : dpvoice: Build with msvcrt.
by Alexandre Julliard 03 Jun '19

03 Jun '19

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 : dpwsockx: Build with msvcrt.
by Alexandre Julliard 03 Jun '19

03 Jun '19

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 : drmclien: Build with msvcrt.
by Alexandre Julliard 03 Jun '19

03 Jun '19

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

Alexandre Julliard : dsound: Build with msvcrt.
by Alexandre Julliard 03 Jun '19

03 Jun '19

Module: wine Branch: master Commit: 3e80b93f90f8e517d51764212545650668e5a8ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=3e80b93f90f8e517d5176421… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 3 10:34:35 2019 +0200 dsound: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/Makefile.in | 2 ++ dlls/dsound/dsound_convert.c | 2 -- dlls/dsound/dsound_private.h | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/dsound/Makefile.in b/dlls/dsound/Makefile.in index 6cb653f..909b38c 100644 --- a/dlls/dsound/Makefile.in +++ b/dlls/dsound/Makefile.in @@ -2,6 +2,8 @@ MODULE = dsound.dll IMPORTLIB = dsound IMPORTS = dxguid uuid winmm ole32 advapi32 user32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ buffer.c \ capture.c \ diff --git a/dlls/dsound/dsound_convert.c b/dlls/dsound/dsound_convert.c index 3519337..6181f04 100644 --- a/dlls/dsound/dsound_convert.c +++ b/dlls/dsound/dsound_convert.c @@ -34,8 +34,6 @@ * Sound is LITTLE endian */ -#include "config.h" -#include "wine/port.h" #include <stdarg.h> #include <math.h> diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index b04ce06..69c4a2f 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -31,7 +31,6 @@ #include "uuids.h" #include "wine/list.h" -#include "wine/unicode.h" #define DS_MAX_CHANNELS 6 @@ -272,7 +271,7 @@ static inline WCHAR *strdupW( const WCHAR *str ) WCHAR *ret; if (!str) return NULL; - size = (strlenW( str ) + 1) * sizeof(WCHAR); + size = (lstrlenW( str ) + 1) * sizeof(WCHAR); ret = HeapAlloc( GetProcessHeap(), 0, size ); if (ret) memcpy( ret, str, size ); return ret;

1 0

Alexandre Julliard : dsquery: Build with msvcrt.
by Alexandre Julliard 03 Jun '19

03 Jun '19

Module: wine Branch: master Commit: 4e5dba8b874900709ef239e87fde3ee56c4471f6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e5dba8b874900709ef239e8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 3 10:34:43 2019 +0200 dsquery: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsquery/Makefile.in | 2 ++ dlls/dsquery/main.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/dsquery/Makefile.in b/dlls/dsquery/Makefile.in index 611e601..85ac989 100644 --- a/dlls/dsquery/Makefile.in +++ b/dlls/dsquery/Makefile.in @@ -1,6 +1,8 @@ MODULE = dsquery.dll IMPORTS = uuid +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ main.c diff --git a/dlls/dsquery/main.c b/dlls/dsquery/main.c index 7f58502..ea367b6 100644 --- a/dlls/dsquery/main.c +++ b/dlls/dsquery/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 : dssenh: Build with msvcrt.
by Alexandre Julliard 03 Jun '19

03 Jun '19

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 : dswave: Build with msvcrt.
by Alexandre Julliard 03 Jun '19

03 Jun '19

Module: wine Branch: master Commit: c7c0706b04ebe04ec97d59bf997179b228e1e4f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c7c0706b04ebe04ec97d59bf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 3 10:46:38 2019 +0200 dswave: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dswave/Makefile.in | 2 ++ dlls/dswave/dswave_main.c | 2 -- dlls/dswave/dswave_private.h | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/dswave/Makefile.in b/dlls/dswave/Makefile.in index 9a08518..13a957d 100644 --- a/dlls/dswave/Makefile.in +++ b/dlls/dswave/Makefile.in @@ -1,6 +1,8 @@ MODULE = dswave.dll IMPORTS = dxguid uuid ole32 advapi32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ dmobject.c \ dswave.c \ diff --git a/dlls/dswave/dswave_main.c b/dlls/dswave/dswave_main.c index a136bb8..bb554de 100644 --- a/dlls/dswave/dswave_main.c +++ b/dlls/dswave/dswave_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/dswave/dswave_private.h b/dlls/dswave/dswave_private.h index 8dea3a9..3554cde 100644 --- a/dlls/dswave/dswave_private.h +++ b/dlls/dswave/dswave_private.h @@ -32,7 +32,6 @@ #include "wine/debug.h" #include "wine/list.h" -#include "wine/unicode.h" #include "winreg.h" #include "objbase.h"

1 0

Sven Baars : msrle32: Fix a memory leak (Valgrind).
by Alexandre Julliard 03 Jun '19

03 Jun '19

Module: wine Branch: master Commit: e5857da2736dafa11f560c36044dd2b2fbe815c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e5857da2736dafa11f560c36… Author: Sven Baars <sven.wine(a)gmail.com> Date: Sun Jun 2 16:21:37 2019 +0200 msrle32: Fix a memory leak (Valgrind). Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msrle32/msrle32.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/msrle32/msrle32.c b/dlls/msrle32/msrle32.c index 5bcfa86..5b17b25 100644 --- a/dlls/msrle32/msrle32.c +++ b/dlls/msrle32/msrle32.c @@ -1544,6 +1544,11 @@ static LRESULT CompressEnd(CodecInfo *pi) pi->pCurFrame = NULL; pi->nPrevFrame = -1; pi->bCompress = FALSE; + + if (pi->palette_map != NULL) { + LocalFree(pi->palette_map); + pi->palette_map = NULL; + } } return ICERR_OK;

1 0