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

Sven Baars : msrle32: Fix a memory leak (Valgrind).
by Alexandre Julliard June 3, 2019

June 3, 2019

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

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

June 3, 2019

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 : dmstyle: Build with msvcrt.
by Alexandre Julliard June 3, 2019

June 3, 2019

Module: wine Branch: master Commit: 33ec6fd86f14801e8ab536b732669c8965e2abb0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=33ec6fd86f14801e8ab536b7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 3 10:30:30 2019 +0200 dmstyle: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmstyle/Makefile.in | 2 ++ dlls/dmstyle/dmstyle_private.h | 1 - dlls/dmstyle/dmutils.c | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dmstyle/Makefile.in b/dlls/dmstyle/Makefile.in index a95a524..934cab6 100644 --- a/dlls/dmstyle/Makefile.in +++ b/dlls/dmstyle/Makefile.in @@ -1,6 +1,8 @@ MODULE = dmstyle.dll IMPORTS = dxguid uuid ole32 advapi32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ auditiontrack.c \ chordtrack.c \ diff --git a/dlls/dmstyle/dmstyle_private.h b/dlls/dmstyle/dmstyle_private.h index 978d75f..7d18e9c 100644 --- a/dlls/dmstyle/dmstyle_private.h +++ b/dlls/dmstyle/dmstyle_private.h @@ -34,7 +34,6 @@ #include "wine/debug.h" #include "wine/list.h" -#include "wine/unicode.h" #include "winreg.h" #include "objbase.h" diff --git a/dlls/dmstyle/dmutils.c b/dlls/dmstyle/dmutils.c index 23cddc0..0432e76 100644 --- a/dlls/dmstyle/dmutils.c +++ b/dlls/dmstyle/dmutils.c @@ -31,7 +31,6 @@ #include "winuser.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "objbase.h" #include "dmusici.h"

1 0

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

June 3, 2019

Module: wine Branch: master Commit: c3dde5d548e89ab0749a4d9db2f21a90b0c6f7b4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c3dde5d548e89ab0749a4d9d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 3 10:30:14 2019 +0200 dmscript: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmscript/Makefile.in | 2 ++ dlls/dmscript/dmscript_main.c | 2 -- dlls/dmscript/dmscript_private.h | 1 - dlls/dmscript/script.c | 8 ++------ 4 files changed, 4 insertions(+), 9 deletions(-) diff --git a/dlls/dmscript/Makefile.in b/dlls/dmscript/Makefile.in index 55107e1..c5dc1a2 100644 --- a/dlls/dmscript/Makefile.in +++ b/dlls/dmscript/Makefile.in @@ -1,6 +1,8 @@ MODULE = dmscript.dll IMPORTS = dxguid uuid ole32 advapi32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ dmobject.c \ dmscript_main.c \ diff --git a/dlls/dmscript/dmscript_main.c b/dlls/dmscript/dmscript_main.c index ec9026b..7a96679 100644 --- a/dlls/dmscript/dmscript_main.c +++ b/dlls/dmscript/dmscript_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 <stdarg.h> diff --git a/dlls/dmscript/dmscript_private.h b/dlls/dmscript/dmscript_private.h index 00b469f..1ff88a9 100644 --- a/dlls/dmscript/dmscript_private.h +++ b/dlls/dmscript/dmscript_private.h @@ -34,7 +34,6 @@ #include "wine/debug.h" #include "wine/list.h" -#include "wine/unicode.h" #include "winreg.h" #include "objbase.h" diff --git a/dlls/dmscript/script.c b/dlls/dmscript/script.c index 2a10fb2..94fd282 100644 --- a/dlls/dmscript/script.c +++ b/dlls/dmscript/script.c @@ -18,12 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" -#ifdef HAVE_UNISTD_H -#include <unistd.h> -#endif +#include <stdio.h> #include "dmscript_private.h" #include "dmobject.h" @@ -313,7 +309,7 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS WideCharToMultiByte(CP_ACP, 0, This->pwzSource, -1, str, count, NULL, NULL); str[count-1] = '\n'; TRACE("source:\n"); - write( 2, str, count ); + fwrite( str, 1, count, stderr ); HeapFree(GetProcessHeap(), 0, str); } break;

1 0

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

June 3, 2019

Module: wine Branch: master Commit: 51994cb64d09c4bcfbc59a814e2db293d804586c URL: https://source.winehq.org/git/wine.git/?a=commit;h=51994cb64d09c4bcfbc59a81… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 3 10:30:44 2019 +0200 dmsynth: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmsynth/Makefile.in | 2 ++ dlls/dmsynth/dmsynth_main.c | 2 -- dlls/dmsynth/dmsynth_private.h | 1 - dlls/dmsynth/synth.c | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/dmsynth/Makefile.in b/dlls/dmsynth/Makefile.in index 276597d..7547148 100644 --- a/dlls/dmsynth/Makefile.in +++ b/dlls/dmsynth/Makefile.in @@ -1,6 +1,8 @@ MODULE = dmsynth.dll IMPORTS = dxguid uuid ole32 advapi32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ dmsynth_main.c \ synth.c \ diff --git a/dlls/dmsynth/dmsynth_main.c b/dlls/dmsynth/dmsynth_main.c index 9568cb6..d6718a2 100644 --- a/dlls/dmsynth/dmsynth_main.c +++ b/dlls/dmsynth/dmsynth_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> diff --git a/dlls/dmsynth/dmsynth_private.h b/dlls/dmsynth/dmsynth_private.h index db61e46..bcc866e 100644 --- a/dlls/dmsynth/dmsynth_private.h +++ b/dlls/dmsynth/dmsynth_private.h @@ -32,7 +32,6 @@ #include "wine/debug.h" #include "wine/list.h" -#include "wine/unicode.h" #include "winreg.h" #include "objbase.h" diff --git a/dlls/dmsynth/synth.c b/dlls/dmsynth/synth.c index afeebda..ebc92af 100644 --- a/dlls/dmsynth/synth.c +++ b/dlls/dmsynth/synth.c @@ -600,7 +600,7 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicSynthImpl(REFIID riid, void **ppobj) obj->pCaps.dwMaxVoices = 1000; obj->pCaps.dwMaxAudioChannels = 2; obj->pCaps.dwEffectFlags = DMUS_EFFECT_REVERB; - strcpyW(obj->pCaps.wszDescription, descrW); + lstrcpyW(obj->pCaps.wszDescription, descrW); DMSYNTH_LockModule(); hr = IDirectMusicSynth8_QueryInterface(&obj->IDirectMusicSynth8_iface, riid, ppobj);

1 0