August 2016 - Wine-commits - list.winehq.org

David Woodhouse : secur32: Fix handling of ANSI NTLM credentials.
by Alexandre Julliard 22 Aug '16

22 Aug '16

Module: wine Branch: stable Commit: fd8284f2993b5f22f6164976d3e7216010d3f8b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd8284f2993b5f22f6164976d… Author: David Woodhouse <dwmw2(a)infradead.org> Date: Thu May 26 10:45:22 2016 +0000 secur32: Fix handling of ANSI NTLM credentials. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 5cc400ed60668e1739e82da1cf90ac8d6c22400b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/secur32/ntlm.c | 92 ++++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 80 insertions(+), 12 deletions(-) diff --git a/dlls/secur32/ntlm.c b/dlls/secur32/ntlm.c index 0fe64ed..a9de3bd 100644 --- a/dlls/secur32/ntlm.c +++ b/dlls/secur32/ntlm.c @@ -131,6 +131,8 @@ SECURITY_STATUS SEC_ENTRY ntlm_AcquireCredentialsHandleW( { SECURITY_STATUS ret; PNtlmCredentials ntlm_cred; + LPWSTR domain = NULL, user = NULL, password = NULL; + PSEC_WINNT_AUTH_IDENTITY_W auth_data = NULL; TRACE("(%s, %s, 0x%08x, %p, %p, %p, %p, %p, %p)\n", debugstr_w(pszPrincipal), debugstr_w(pszPackage), fCredentialUse, @@ -158,6 +160,7 @@ SECURITY_STATUS SEC_ENTRY ntlm_AcquireCredentialsHandleW( break; case SECPKG_CRED_OUTBOUND: { + auth_data = pAuthData; ntlm_cred = HeapAlloc(GetProcessHeap(), 0, sizeof(*ntlm_cred)); if (!ntlm_cred) { @@ -173,26 +176,84 @@ SECURITY_STATUS SEC_ENTRY ntlm_AcquireCredentialsHandleW( if(pAuthData != NULL) { - PSEC_WINNT_AUTH_IDENTITY_W auth_data = pAuthData; + int domain_len = 0, user_len = 0, password_len = 0; - TRACE("Username is %s\n", debugstr_wn(auth_data->User, auth_data->UserLength)); - TRACE("Domain name is %s\n", debugstr_wn(auth_data->Domain, auth_data->DomainLength)); + if (auth_data->Flags & SEC_WINNT_AUTH_IDENTITY_ANSI) + { + if (auth_data->DomainLength) + { + domain_len = MultiByteToWideChar(CP_ACP, 0, (char *)auth_data->Domain, + auth_data->DomainLength, NULL, 0); + domain = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR) * domain_len); + if(!domain) + { + ret = SEC_E_INSUFFICIENT_MEMORY; + break; + } + MultiByteToWideChar(CP_ACP, 0, (char *)auth_data->Domain, auth_data->DomainLength, + domain, domain_len); + } + + if (auth_data->UserLength) + { + user_len = MultiByteToWideChar(CP_ACP, 0, (char *)auth_data->User, + auth_data->UserLength, NULL, 0); + user = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR) * user_len); + if(!user) + { + ret = SEC_E_INSUFFICIENT_MEMORY; + break; + } + MultiByteToWideChar(CP_ACP, 0, (char *)auth_data->User, auth_data->UserLength, + user, user_len); + } + + if (auth_data->PasswordLength) + { + password_len = MultiByteToWideChar(CP_ACP, 0,(char *)auth_data->Password, + auth_data->PasswordLength, NULL, 0); + password = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR) * password_len); + if(!password) + { + ret = SEC_E_INSUFFICIENT_MEMORY; + break; + } + MultiByteToWideChar(CP_ACP, 0, (char *)auth_data->Password, auth_data->PasswordLength, + password, password_len); + } + } + else + { + domain = auth_data->Domain; + domain_len = auth_data->DomainLength; + + user = auth_data->User; + user_len = auth_data->UserLength; + + password = auth_data->Password; + password_len = auth_data->PasswordLength; + } + + TRACE("Username is %s\n", debugstr_wn(user, user_len)); + TRACE("Domain name is %s\n", debugstr_wn(domain, domain_len)); - ntlm_cred->username_arg = ntlm_GetUsernameArg(auth_data->User, auth_data->UserLength); - ntlm_cred->domain_arg = ntlm_GetDomainArg(auth_data->Domain, auth_data->DomainLength); + ntlm_cred->username_arg = ntlm_GetUsernameArg(user, user_len); + ntlm_cred->domain_arg = ntlm_GetDomainArg(domain, domain_len); - if(auth_data->PasswordLength != 0) + if(password_len != 0) { - ntlm_cred->pwlen = WideCharToMultiByte(CP_UNIXCP, - WC_NO_BEST_FIT_CHARS, auth_data->Password, - auth_data->PasswordLength, NULL, 0, NULL, - NULL); + ntlm_cred->pwlen = WideCharToMultiByte(CP_UNIXCP, WC_NO_BEST_FIT_CHARS, password, + password_len, NULL, 0, NULL, NULL); ntlm_cred->password = HeapAlloc(GetProcessHeap(), 0, ntlm_cred->pwlen); + if(!ntlm_cred->password) + { + ret = SEC_E_INSUFFICIENT_MEMORY; + break; + } - WideCharToMultiByte(CP_UNIXCP, WC_NO_BEST_FIT_CHARS, - auth_data->Password, auth_data->PasswordLength, + WideCharToMultiByte(CP_UNIXCP, WC_NO_BEST_FIT_CHARS, password, password_len, ntlm_cred->password, ntlm_cred->pwlen, NULL, NULL); } } @@ -213,6 +274,13 @@ SECURITY_STATUS SEC_ENTRY ntlm_AcquireCredentialsHandleW( phCredential = NULL; ret = SEC_E_UNKNOWN_CREDENTIALS; } + + if (auth_data && auth_data->Flags & SEC_WINNT_AUTH_IDENTITY_ANSI) + { + HeapFree(GetProcessHeap(), 0, domain); + HeapFree(GetProcessHeap(), 0, user); + HeapFree(GetProcessHeap(), 0, password); + } return ret; }

1 0

Sebastian Lackner : comctl32/syslink: Fix a blocks leak (Valgrind).
by Alexandre Julliard 22 Aug '16

22 Aug '16

Module: wine Branch: stable Commit: 6784577606cd284f4e366cc91640321fa881bee4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6784577606cd284f4e366cc91… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri May 20 08:04:21 2016 +0300 comctl32/syslink: Fix a blocks leak (Valgrind). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit f4640b04925e0044f6e32bb7d48c85117052a599) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/syslink.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/comctl32/syslink.c b/dlls/comctl32/syslink.c index 233169c..5e0f791 100644 --- a/dlls/comctl32/syslink.c +++ b/dlls/comctl32/syslink.c @@ -122,6 +122,8 @@ static VOID SYSLINK_FreeDocItem (PDOC_ITEM DocItem) Free(DocItem->u.Link.szUrl); } + Free(DocItem->Blocks); + /* we don't free Text because it's just a pointer to a character in the entire window text string */

1 0

Matteo Bruni : wined3d: Add a setting to check relative addressing indices when accessing uniforms.
by Alexandre Julliard 22 Aug '16

22 Aug '16

Module: wine Branch: stable Commit: 3ca87c937e0cfc5f19ee0cd8aafcba2ad140d33e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ca87c937e0cfc5f19ee0cd8a… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Mar 2 00:50:00 2016 +0100 wined3d: Add a setting to check relative addressing indices when accessing uniforms. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 8e696dee5ff05377c8ccc59b4d204eb42d4cdeca) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 7 ++++++- dlls/wined3d/wined3d_main.c | 7 +++++++ dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 973b4a0..a980c5b 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2233,7 +2233,12 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * /* Relative addressing */ if (reg->idx[0].rel_addr) { - if (reg->idx[0].offset) + if (wined3d_settings.check_float_constants) + sprintf(register_name, "(%s + %u >= 0 && %s + %u < %u ? %s_c[%s + %u] : vec4(0.0))", + rel_param0.param_str, reg->idx[0].offset, + rel_param0.param_str, reg->idx[0].offset, shader->limits->constant_float, + prefix, rel_param0.param_str, reg->idx[0].offset); + else if (reg->idx[0].offset) sprintf(register_name, "%s_c[%s + %u]", prefix, rel_param0.param_str, reg->idx[0].offset); else sprintf(register_name, "%s_c[%s]", prefix, rel_param0.param_str); diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 0543d97..45e41ad 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -82,6 +82,7 @@ struct wined3d_settings wined3d_settings = TRUE, /* Multisampling enabled by default. */ FALSE, /* No strict draw ordering. */ TRUE, /* Don't try to render onscreen by default. */ + FALSE, /* Don't range check relative addressing indices in float constants. */ ~0U, /* No VS shader model limit by default. */ ~0U, /* No GS shader model limit by default. */ ~0U, /* No PS shader model limit by default. */ @@ -302,6 +303,12 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) TRACE("Not always rendering backbuffers offscreen.\n"); wined3d_settings.always_offscreen = FALSE; } + if (!get_config_key(hkey, appkey, "CheckFloatConstants", buffer, size) + && !strcmp(buffer, "enabled")) + { + TRACE("Checking relative addressing indices in float constants.\n"); + wined3d_settings.check_float_constants = TRUE; + } if (!get_config_key_dword(hkey, appkey, "MaxShaderModelVS", &wined3d_settings.max_sm_vs)) TRACE("Limiting VS shader model to %u.\n", wined3d_settings.max_sm_vs); if (!get_config_key_dword(hkey, appkey, "MaxShaderModelGS", &wined3d_settings.max_sm_gs)) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7183195..76a0559 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -278,6 +278,7 @@ struct wined3d_settings int allow_multisampling; BOOL strict_draw_ordering; BOOL always_offscreen; + BOOL check_float_constants; unsigned int max_sm_vs; unsigned int max_sm_gs; unsigned int max_sm_ps;

1 0

Fabian Maurer : msacm32: Added converter for ADPCM to PCM 8 bit mono.
by Alexandre Julliard 22 Aug '16

22 Aug '16

Module: wine Branch: stable Commit: d7eab9a4f863c43019ffd710aefccf2dbd5211f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7eab9a4f863c43019ffd710a… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Mon May 23 22:35:30 2016 +0200 msacm32: Added converter for ADPCM to PCM 8 bit mono. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 351bd33f2cd1edd680176ef777d77a3d1256ab6d) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/imaadp32.acm/imaadp32.c | 85 ++++++++++++++++++++++++++++---------------- 1 file changed, 55 insertions(+), 30 deletions(-) diff --git a/dlls/imaadp32.acm/imaadp32.c b/dlls/imaadp32.acm/imaadp32.c index c5c65f6..4684f30 100644 --- a/dlls/imaadp32.acm/imaadp32.c +++ b/dlls/imaadp32.acm/imaadp32.c @@ -179,6 +179,25 @@ static inline void W16(unsigned char* dst, short s) dst[1] = HIBYTE(s); } +/*********************************************************************** + * W8 + * + * Write a 8 bit sample + */ +static inline void W8(unsigned char* dst, short s) +{ + dst[0] = (unsigned char)((s + 32768) >> 8); +} + + +static inline void W8_16(unsigned char* dst, short s, int bytes) +{ + if(bytes == 1) + W8(dst, s); + else + W16(dst, s); +} + /* IMA (or DVI) APDCM codec routines */ static const unsigned IMA_StepTable[89] = @@ -339,43 +358,43 @@ static void cvtSSima16K(PACMDRVSTREAMINSTANCE adsi, } } -static void cvtMMima16K(PACMDRVSTREAMINSTANCE adsi, - const unsigned char* src, LPDWORD nsrc, - unsigned char* dst, LPDWORD ndst) +static void cvtMMimaK(PACMDRVSTREAMINSTANCE adsi, + const unsigned char* src, LPDWORD nsrc, + unsigned char* dst, LPDWORD ndst) { - int sample; - int stepIndex; - int nsamp_blk = ((LPIMAADPCMWAVEFORMAT)adsi->pwfxSrc)->wSamplesPerBlock; - int nsamp; + int sample; + int stepIndex; + int nsamp_blk = ((LPIMAADPCMWAVEFORMAT)adsi->pwfxSrc)->wSamplesPerBlock; + int nsamp; + int bytesPerSample = adsi->pwfxDst->wBitsPerSample / 8; /* compute the number of entire blocks we can decode... * it's the min of the number of entire blocks in source buffer and the number * of entire blocks in destination buffer */ - DWORD nblock = min(*nsrc / adsi->pwfxSrc->nBlockAlign, - *ndst / (nsamp_blk * 2)); + DWORD nblock = min(*nsrc / adsi->pwfxSrc->nBlockAlign, *ndst / (nsamp_blk * bytesPerSample)); *nsrc = nblock * adsi->pwfxSrc->nBlockAlign; - *ndst = nblock * nsamp_blk * 2; + *ndst = nblock * nsamp_blk * bytesPerSample; nsamp_blk--; /* remove the sample in block header */ for (; nblock > 0; nblock--) { - const unsigned char* in_src = src; + const unsigned char* in_src = src; - /* handle header first */ - sample = R16(src); - stepIndex = (unsigned)*(src + 2); + /* handle header first */ + sample = R16(src); + stepIndex = (unsigned)*(src + 2); clamp_step_index(&stepIndex); - src += 4; - W16(dst, sample); dst += 2; + src += 4; + W8_16(dst, sample, bytesPerSample); dst += bytesPerSample; - for (nsamp = nsamp_blk; nsamp > 0; nsamp -= 2) + for (nsamp = nsamp_blk; nsamp > 0; nsamp -= 2) { process_nibble(*src, &stepIndex, &sample); - W16(dst, sample); dst += 2; + W8_16(dst, sample, bytesPerSample); dst += bytesPerSample; process_nibble(*src++ >> 4, &stepIndex, &sample); - W16(dst, sample); dst += 2; - } + W8_16(dst, sample, bytesPerSample); dst += bytesPerSample; + } /* we have now to realign the source pointer on block */ src = in_src + adsi->pwfxSrc->nBlockAlign; } @@ -733,13 +752,14 @@ static LRESULT ADPCM_StreamOpen(PACMDRVSTREAMINSTANCE adsi) else if (adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_IMA_ADPCM && adsi->pwfxDst->wFormatTag == WAVE_FORMAT_PCM) { - /* resampling or mono <=> stereo not available + /* resampling or mono <=> stereo not available * ADPCM algo only define 16 bit per sample output + * (The API seems to still allow 8 bit per sample output) */ - if (adsi->pwfxSrc->nSamplesPerSec != adsi->pwfxDst->nSamplesPerSec || - adsi->pwfxSrc->nChannels != adsi->pwfxDst->nChannels || - adsi->pwfxDst->wBitsPerSample != 16) - goto theEnd; + if (adsi->pwfxSrc->nSamplesPerSec != adsi->pwfxDst->nSamplesPerSec || + adsi->pwfxSrc->nChannels != adsi->pwfxDst->nChannels || + (adsi->pwfxDst->wBitsPerSample != 16 && adsi->pwfxDst->wBitsPerSample != 8)) + goto theEnd; nspb = ((LPIMAADPCMWAVEFORMAT)adsi->pwfxSrc)->wSamplesPerBlock; TRACE("spb=%u\n", nspb); @@ -752,11 +772,16 @@ static LRESULT ADPCM_StreamOpen(PACMDRVSTREAMINSTANCE adsi) if ((((nspb - 1) / 2) + 4) * adsi->pwfxSrc->nChannels < adsi->pwfxSrc->nBlockAlign) goto theEnd; - /* adpcm decoding... */ - if (adsi->pwfxDst->wBitsPerSample == 16 && adsi->pwfxDst->nChannels == 2) - aad->convert = cvtSSima16K; - if (adsi->pwfxDst->wBitsPerSample == 16 && adsi->pwfxDst->nChannels == 1) - aad->convert = cvtMMima16K; + /* adpcm decoding... */ + if (adsi->pwfxDst->wBitsPerSample == 16 && adsi->pwfxDst->nChannels == 2) + aad->convert = cvtSSima16K; + if (adsi->pwfxDst->wBitsPerSample == 16 && adsi->pwfxDst->nChannels == 1) + aad->convert = cvtMMimaK; + if (adsi->pwfxDst->wBitsPerSample == 8 && adsi->pwfxDst->nChannels == 1) + aad->convert = cvtMMimaK; + /* FIXME: Stereo support for 8bit samples*/ + if (adsi->pwfxDst->wBitsPerSample == 8 && adsi->pwfxDst->nChannels == 2) + goto theEnd; } else if (adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_PCM && adsi->pwfxDst->wFormatTag == WAVE_FORMAT_IMA_ADPCM)

1 0

Alex Henrie : msvcrt: Stub out _(get|set) _thread_local_invalid_parameter_handler.
by Alexandre Julliard 22 Aug '16

22 Aug '16

Module: wine Branch: stable Commit: 48bd49e8cc62d1156a393e26c8c38a44d7adbb00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48bd49e8cc62d1156a393e26c… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Jun 7 16:36:50 2016 -0600 msvcrt: Stub out _(get|set)_thread_local_invalid_parameter_handler. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit a88c35d0dc91b4f28baf656c65667f5ddff53ade) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- .../api-ms-win-crt-runtime-l1-1-0.spec | 4 ++-- dlls/msvcrt/errno.c | 19 +++++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 4 ++-- 3 files changed, 23 insertions(+), 4 deletions(-) diff --git a/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec b/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec index 6afa042..b8ae54b 100644 --- a/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec +++ b/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec @@ -46,7 +46,7 @@ @ stub _get_narrow_winmain_command_line @ cdecl _get_pgmptr(ptr) ucrtbase._get_pgmptr @ cdecl _get_terminate() ucrtbase._get_terminate -@ stub _get_thread_local_invalid_parameter_handler +@ cdecl _get_thread_local_invalid_parameter_handler() ucrtbase._get_thread_local_invalid_parameter_handler @ stub _get_wide_winmain_command_line @ cdecl _get_wpgmptr(ptr) ucrtbase._get_wpgmptr @ cdecl _getdllprocaddr(long str long) ucrtbase._getdllprocaddr @@ -73,7 +73,7 @@ @ cdecl _set_error_mode(long) ucrtbase._set_error_mode @ cdecl _set_invalid_parameter_handler(ptr) ucrtbase._set_invalid_parameter_handler @ cdecl _set_new_handler(ptr) ucrtbase._set_new_handler -@ stub _set_thread_local_invalid_parameter_handler +@ cdecl _set_thread_local_invalid_parameter_handler(ptr) ucrtbase._set_thread_local_invalid_parameter_handler @ cdecl _seterrormode(long) ucrtbase._seterrormode @ cdecl _sleep(long) ucrtbase._sleep @ cdecl _statusfp() ucrtbase._statusfp diff --git a/dlls/msvcrt/errno.c b/dlls/msvcrt/errno.c index 6c1a912..75e211e 100644 --- a/dlls/msvcrt/errno.c +++ b/dlls/msvcrt/errno.c @@ -473,3 +473,22 @@ MSVCRT_invalid_parameter_handler CDECL _set_invalid_parameter_handler( invalid_parameter_handler = handler; return old; } + +/********************************************************************* + * _get_thread_local_invalid_parameter_handler (UCRTBASE.@) + */ +MSVCRT_invalid_parameter_handler CDECL _get_thread_local_invalid_parameter_handler(void) +{ + FIXME(" stub\n"); + return NULL; +} + +/********************************************************************* + * _set_thread_local_invalid_parameter_handler (UCRTBASE.@) + */ +MSVCRT_invalid_parameter_handler CDECL _set_thread_local_invalid_parameter_handler( + MSVCRT_invalid_parameter_handler handler) +{ + FIXME("(%p) stub\n", handler); + return NULL; +} diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index c4c6510..661d657 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -375,7 +375,7 @@ @ stub _get_purecall_handler @ cdecl _get_stream_buffer_pointers(ptr ptr ptr ptr) MSVCRT__get_stream_buffer_pointers @ cdecl _get_terminate() MSVCRT__get_terminate -@ stub _get_thread_local_invalid_parameter_handler +@ cdecl _get_thread_local_invalid_parameter_handler() @ cdecl _get_timezone(ptr) @ cdecl _get_tzname(ptr str long long) MSVCRT__get_tzname @ cdecl _get_unexpected() MSVCRT__get_unexpected @@ -1893,7 +1893,7 @@ @ cdecl _set_printf_count_output(long) MSVCRT__set_printf_count_output @ cdecl _set_purecall_handler(ptr) @ stub _set_se_translator -@ stub _set_thread_local_invalid_parameter_handler +@ cdecl _set_thread_local_invalid_parameter_handler(ptr) @ cdecl _seterrormode(long) @ cdecl -arch=i386 -norelay _setjmp3(ptr long) MSVCRT__setjmp3 @ cdecl _setmaxstdio(long) MSVCRT__setmaxstdio

1 0

Rob Walker : setupapi: Add stub for setupapi.dll.CM_Get_DevNode_Status.
by Alexandre Julliard 22 Aug '16

22 Aug '16

Module: wine Branch: stable Commit: ac8732a6a20d82ba60999fedf07569ff32e573ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac8732a6a20d82ba60999fedf… Author: Rob Walker <bob.mt.wya(a)gmail.com> Date: Thu Jun 2 18:08:11 2016 +0100 setupapi: Add stub for setupapi.dll.CM_Get_DevNode_Status. Signed-off-by: Rob Walker <bob.mt.wya(a)gmail.com> Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 10058e7c4efb472a372b09705c16d312d62d6b0c) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/cfgmgr32/cfgmgr32.spec | 4 ++-- dlls/setupapi/setupapi.spec | 4 ++-- dlls/setupapi/stubs.c | 20 ++++++++++++++++++++ 3 files changed, 24 insertions(+), 4 deletions(-) diff --git a/dlls/cfgmgr32/cfgmgr32.spec b/dlls/cfgmgr32/cfgmgr32.spec index f442157..90a05ab 100644 --- a/dlls/cfgmgr32/cfgmgr32.spec +++ b/dlls/cfgmgr32/cfgmgr32.spec @@ -60,8 +60,8 @@ @ stdcall CM_Get_DevNode_Registry_PropertyW(long long ptr ptr long long) setupapi.CM_Get_DevNode_Registry_PropertyW @ stdcall CM_Get_DevNode_Registry_Property_ExA(long long ptr ptr ptr long ptr) setupapi.CM_Get_DevNode_Registry_Property_ExA @ stdcall CM_Get_DevNode_Registry_Property_ExW(long long ptr ptr ptr long ptr) setupapi.CM_Get_DevNode_Registry_Property_ExW -@ stub CM_Get_DevNode_Status -@ stub CM_Get_DevNode_Status_Ex +@ stdcall CM_Get_DevNode_Status(ptr ptr long long) setupapi.CM_Get_DevNode_Status +@ stdcall CM_Get_DevNode_Status_Ex(ptr ptr long long ptr) setupapi.CM_Get_DevNode_Status_Ex @ stdcall CM_Get_Device_IDA(ptr ptr long long) setupapi.CM_Get_Device_IDA @ stdcall CM_Get_Device_IDW(ptr ptr long long) setupapi.CM_Get_Device_IDW @ stdcall CM_Get_Device_ID_ExA(ptr ptr long long ptr) setupapi.CM_Get_Device_ID_ExA diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index c1dbed5..29065fc 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -71,8 +71,8 @@ @ stdcall CM_Get_DevNode_Registry_PropertyW(long long ptr ptr long long) @ stdcall CM_Get_DevNode_Registry_Property_ExA(long long ptr ptr ptr long ptr) @ stdcall CM_Get_DevNode_Registry_Property_ExW(long long ptr ptr ptr long ptr) -@ stub CM_Get_DevNode_Status -@ stub CM_Get_DevNode_Status_Ex +@ stdcall CM_Get_DevNode_Status(ptr ptr long long) +@ stdcall CM_Get_DevNode_Status_Ex(ptr ptr long long ptr) @ stdcall CM_Get_Device_IDA(ptr ptr long long) @ stdcall CM_Get_Device_IDW(ptr ptr long long) @ stdcall CM_Get_Device_ID_ExA(ptr ptr long long ptr) diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index a57f5fe..e5061fb 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -419,6 +419,26 @@ CONFIGRET WINAPI CM_Get_DevNode_Registry_PropertyW(DEVINST dev, ULONG prop, PULO } /*********************************************************************** + * CM_Get_DevNode_Status (SETUPAPI.@) + */ +CONFIGRET WINAPI CM_Get_DevNode_Status(ULONG *status, ULONG *problem, DEVINST dev, + ULONG flags) +{ + FIXME("%p %p 0x%08x 0x%08x: stub\n", status, problem, dev, flags); + return CR_FAILURE; +} + +/*********************************************************************** + * CM_Get_DevNode_Status_Ex (SETUPAPI.@) + */ +CONFIGRET WINAPI CM_Get_DevNode_Status_Ex(ULONG *status, ULONG *problem, DEVINST dev, + ULONG flags, HMACHINE machine) +{ + FIXME("%p %p 0x%08x 0x%08x %p: stub\n", status, problem, dev, flags, machine); + return CR_FAILURE; +} + +/*********************************************************************** * CM_Enumerate_Classes (SETUPAPI.@) */ CONFIGRET WINAPI CM_Enumerate_Classes(ULONG index, LPGUID class, ULONG flags)

1 0

Piotr Caban : msvcr120: Add __ExceptionPtrToBool implementation.
by Alexandre Julliard 22 Aug '16

22 Aug '16

Module: wine Branch: stable Commit: 25f2d99933bec4130f9e65793196d39b3f6c594d URL: http://source.winehq.org/git/wine.git/?a=commit;h=25f2d99933bec4130f9e65793… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Apr 26 20:39:41 2016 +0200 msvcr120: Add __ExceptionPtrToBool implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 4f8aafbe2891d16aeb1aa7916405b5efb862d7af) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcr110/msvcr110.spec | 4 ++-- dlls/msvcr120/msvcr120.spec | 4 ++-- dlls/msvcr120_app/msvcr120_app.spec | 4 ++-- dlls/msvcrt/cpp.c | 9 +++++++++ 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index aaf67ec..a0e9a31 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -704,8 +704,8 @@ @ cdecl -arch=win64 ?__ExceptionPtrRethrow@@YAXPEBX(a)Z(ptr) __ExceptionPtrRethrow @ stub -arch=win32 ?__ExceptionPtrSwap@@YAXPAX0(a)Z @ stub -arch=win64 ?__ExceptionPtrSwap@@YAXPEAX0(a)Z -@ stub -arch=win32 ?__ExceptionPtrToBool@@YA_NPBX(a)Z -@ stub -arch=win64 ?__ExceptionPtrToBool@@YA_NPEBX(a)Z +@ cdecl -arch=win32 ?__ExceptionPtrToBool@@YA_NPBX(a)Z(ptr) __ExceptionPtrToBool +@ cdecl -arch=win64 ?__ExceptionPtrToBool@@YA_NPEBX(a)Z(ptr) __ExceptionPtrToBool @ cdecl __uncaught_exception() MSVCRT___uncaught_exception @ stub ?_inconsistency@@YAXXZ @ cdecl -arch=win32 ?_invalid_parameter@@YAXPBG00II(a)Z(wstr wstr wstr long long) MSVCRT__invalid_parameter diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 8159f0a..129ba27 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -686,8 +686,8 @@ @ cdecl -arch=win64 ?__ExceptionPtrRethrow@@YAXPEBX(a)Z(ptr) __ExceptionPtrRethrow @ stub -arch=win32 ?__ExceptionPtrSwap@@YAXPAX0(a)Z @ stub -arch=win64 ?__ExceptionPtrSwap@@YAXPEAX0(a)Z -@ stub -arch=win32 ?__ExceptionPtrToBool@@YA_NPBX(a)Z -@ stub -arch=win64 ?__ExceptionPtrToBool@@YA_NPEBX(a)Z +@ cdecl -arch=win32 ?__ExceptionPtrToBool@@YA_NPBX(a)Z(ptr) __ExceptionPtrToBool +@ cdecl -arch=win64 ?__ExceptionPtrToBool@@YA_NPEBX(a)Z(ptr) __ExceptionPtrToBool @ cdecl __uncaught_exception() MSVCRT___uncaught_exception @ stub ?_inconsistency@@YAXXZ @ cdecl -arch=win32 ?_invalid_parameter@@YAXPBG00II(a)Z(wstr wstr wstr long long) MSVCRT__invalid_parameter diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 5087e9c..8aeaec8 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -682,8 +682,8 @@ @ cdecl -arch=win64 ?__ExceptionPtrRethrow@@YAXPEBX(a)Z(ptr) msvcr120.?__ExceptionPtrRethrow@@YAXPEBX(a)Z @ stub -arch=win32 ?__ExceptionPtrSwap@@YAXPAX0(a)Z @ stub -arch=win64 ?__ExceptionPtrSwap@@YAXPEAX0(a)Z -@ stub -arch=win32 ?__ExceptionPtrToBool@@YA_NPBX(a)Z -@ stub -arch=win64 ?__ExceptionPtrToBool@@YA_NPEBX(a)Z +@ cdecl -arch=win32 ?__ExceptionPtrToBool@@YA_NPBX(a)Z(ptr) msvcr120.?__ExceptionPtrToBool@@YA_NPBX(a)Z +@ cdecl -arch=win64 ?__ExceptionPtrToBool@@YA_NPEBX(a)Z(ptr) msvcr120.?__ExceptionPtrToBool@@YA_NPEBX(a)Z @ cdecl __uncaught_exception() msvcr120.__uncaught_exception @ stub ?_inconsistency@@YAXXZ @ cdecl -arch=win32 ?_invalid_parameter@@YAXPBG00II(a)Z(wstr wstr wstr long long) msvcr120.?_invalid_parameter@@YAXPBG00II(a)Z diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index 7cffa00..0e21415 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -1487,6 +1487,15 @@ void __cdecl __ExceptionPtrCurrentException(exception_ptr *ep) } #endif +/********************************************************************* + * ?__ExceptionPtrToBool@@YA_NPBX(a)Z + * ?__ExceptionPtrToBool@@YA_NPEBX(a)Z + */ +MSVCRT_bool __cdecl __ExceptionPtrToBool(exception_ptr *ep) +{ + return !!ep->rec; +} + void* __cdecl __AdjustPointer(void *obj, const this_ptr_offsets *off) { return get_this_pointer(off, obj);

1 0

Luis Sahagun : winevdm: Tell dosbox to read the current user's config.
by Alexandre Julliard 22 Aug '16

22 Aug '16

Module: wine Branch: stable Commit: a7704487daf1d70bf3a0a19ef45c4ac50f558f9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7704487daf1d70bf3a0a19ef… Author: Luis Sahagun <shankao(a)gmail.com> Date: Thu Jun 2 17:48:38 2016 +0800 winevdm: Tell dosbox to read the current user's config. Signed-off-by: Luis Sahagun <shankao(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 6a05abed484cdfbb75956508a5837dbf58424f88) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/winevdm/winevdm.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/programs/winevdm/winevdm.c b/programs/winevdm/winevdm.c index 290ad25..08bfcfe 100644 --- a/programs/winevdm/winevdm.c +++ b/programs/winevdm/winevdm.c @@ -192,12 +192,13 @@ static void start_dosbox( const char *appname, const char *args ) p += sprintf( p, "exit\n" ); if (WriteFile( file, buffer, strlen(buffer), &written, NULL ) && written == strlen(buffer)) { - const char *args[4]; + const char *args[5]; char *config_file = wine_get_unix_file_name( config ); args[0] = dosbox; - args[1] = "-conf"; - args[2] = config_file; - args[3] = NULL; + args[1] = "-userconf"; + args[2] = "-conf"; + args[3] = config_file; + args[4] = NULL; ret = _spawnvp( _P_WAIT, args[0], args ); } CloseHandle( file );

1 0

Andrew Eikum : dsound: Support downmixing 5.1 to stereo.
by Alexandre Julliard 22 Aug '16

22 Aug '16

Module: wine Branch: stable Commit: 37e715f58143924c05cf31b9ceb89ec78d2b861b URL: http://source.winehq.org/git/wine.git/?a=commit;h=37e715f58143924c05cf31b9c… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu May 19 09:11:13 2016 -0500 dsound: Support downmixing 5.1 to stereo. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 88dd3b4f6e4ed10413b8d93055801a6e60fbc5e8) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dsound/dsound_convert.c | 46 ++++++++++++++++++++++++++++++++++++++++++++ dlls/dsound/dsound_private.h | 2 ++ dlls/dsound/mixer.c | 8 ++++++++ 3 files changed, 56 insertions(+) diff --git a/dlls/dsound/dsound_convert.c b/dlls/dsound/dsound_convert.c index 5accba6..43a306d 100644 --- a/dlls/dsound/dsound_convert.c +++ b/dlls/dsound/dsound_convert.c @@ -157,6 +157,13 @@ void putieee32(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, floa *fbuf = value; } +void putieee32_sum(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value) +{ + BYTE *buf = (BYTE *)dsb->device->tmp_buffer; + float *fbuf = (float*)(buf + pos + sizeof(float) * channel); + *fbuf += value; +} + void put_mono2stereo(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value) { dsb->put_aux(dsb, pos, 0, value); @@ -206,6 +213,45 @@ void put_stereo2surround51(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD c } } +void put_surround512stereo(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value) +{ + /* based on pulseaudio's downmix algorithm */ + switch(channel){ + + case 4: /* back left */ + value *= 0.056f; /* (1/9) / (sum of left volumes) */ + dsb->put_aux(dsb, pos, 0, value); + break; + + case 0: /* front left */ + value *= 0.503; /* 1 / (sum of left volumes) */ + dsb->put_aux(dsb, pos, 0, value); + break; + + case 5: /* back right */ + value *= 0.056f; /* (1/9) / (sum of right volumes) */ + dsb->put_aux(dsb, pos, 1, value); + break; + + case 1: /* front right */ + value *= 0.503f; /* 1 / (sum of right volumes) */ + dsb->put_aux(dsb, pos, 1, value); + break; + + case 2: /* front centre */ + value *= 0.252f; /* 0.5 / (sum of left/right volumes) */ + dsb->put_aux(dsb, pos, 0, value); + dsb->put_aux(dsb, pos, 1, value); + break; + + case 3: /* LFE */ + value *= 0.189f; /* 0.375 / (sum of left/right volumes) */ + dsb->put_aux(dsb, pos, 0, value); + dsb->put_aux(dsb, pos, 1, value); + break; + } +} + void mixieee32(float *src, float *dst, unsigned samples) { TRACE("%p - %p %d\n", src, dst, samples); diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index 9c001ed..29fd494 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -48,6 +48,7 @@ typedef float (*bitsgetfunc)(const IDirectSoundBufferImpl *, DWORD, DWORD); typedef void (*bitsputfunc)(const IDirectSoundBufferImpl *, DWORD, DWORD, float); extern const bitsgetfunc getbpp[5] DECLSPEC_HIDDEN; void putieee32(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value) DECLSPEC_HIDDEN; +void putieee32_sum(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value) DECLSPEC_HIDDEN; void mixieee32(float *src, float *dst, unsigned samples) DECLSPEC_HIDDEN; typedef void (*normfunc)(const void *, void *, unsigned); extern const normfunc normfunctions[5] DECLSPEC_HIDDEN; @@ -181,6 +182,7 @@ void put_mono2quad(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, void put_stereo2quad(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value) DECLSPEC_HIDDEN; void put_mono2surround51(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value) DECLSPEC_HIDDEN; void put_stereo2surround51(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value) DECLSPEC_HIDDEN; +void put_surround512stereo(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value) DECLSPEC_HIDDEN; HRESULT IDirectSoundBufferImpl_Create( DirectSoundDevice *device, diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index 85ab14a..80b6550 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -173,6 +173,12 @@ void DSOUND_RecalcFormat(IDirectSoundBufferImpl *dsb) dsb->mix_channels = 2; dsb->put = put_stereo2surround51; } + else if (ichannels == 6 && ochannels == 2) + { + dsb->mix_channels = 6; + dsb->put = put_surround512stereo; + dsb->put_aux = putieee32_sum; + } else { if (ichannels > 2) @@ -487,6 +493,8 @@ static DWORD DSOUND_MixInBuffer(IDirectSoundBufferImpl *dsb, DWORD writepos, DWO /* Resample buffer to temporary buffer specifically allocated for this purpose, if needed */ oldpos = dsb->sec_mixpos; + if(dsb->put_aux == putieee32_sum) + memset(dsb->device->tmp_buffer, 0, dsb->device->tmp_buffer_len); DSOUND_MixToTemporary(dsb, frames); ibuf = dsb->device->tmp_buffer;

1 0

Austin English : kernel32: Add FreeUserPhysicalPages stub.
by Alexandre Julliard 22 Aug '16

22 Aug '16

Module: wine Branch: stable Commit: a0d5c547ede55d1dd7ccebdb8e539bc2ed4856d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0d5c547ede55d1dd7ccebdb8… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Apr 28 05:41:38 2016 +0200 kernel32: Add FreeUserPhysicalPages stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit b0ce049cbbfecf747ffab6815bccbd59a20a2130) Conflicts: dlls/api-ms-win-core-memory-l1-1-2/api-ms-win-core-memory-l1-1-2.spec Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/heap.c | 8 ++++++++ dlls/kernel32/kernel32.spec | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index eeed785..fffd0e4 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -1491,3 +1491,11 @@ BOOL WINAPI AllocateUserPhysicalPages(HANDLE process, ULONG_PTR *pages, ULONG_PT SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } + +BOOL WINAPI FreeUserPhysicalPages(HANDLE process, ULONG_PTR *pages, ULONG_PTR *userarray) +{ + FIXME("stub: %p %p %p\n", process, pages, userarray); + *pages = 0; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index d29c5cb..bcbc50ed 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -154,7 +154,7 @@ @ stdcall AllocConsole() @ stub -i386 AllocLSCallback @ stdcall -i386 -private AllocSLCallback(ptr ptr) krnl386.exe16.AllocSLCallback -@ stdcall AllocateUserPhysicalPages(ptr ptr ptr) +@ stdcall AllocateUserPhysicalPages(long ptr ptr) @ stdcall ApplicationRecoveryFinished(long) @ stdcall ApplicationRecoveryInProgress(ptr) @ stdcall AreFileApisANSI() @@ -535,7 +535,7 @@ @ stdcall FreeLibraryWhenCallbackReturns(ptr ptr) ntdll.TpCallbackUnloadDllOnCompletion @ stdcall FreeResource(long) @ stdcall -i386 -private FreeSLCallback(long) krnl386.exe16.FreeSLCallback -@ stub FreeUserPhysicalPages +@ stdcall FreeUserPhysicalPages(long ptr ptr) @ stub FreeVirtualBuffer @ stdcall GenerateConsoleCtrlEvent(long long) @ stdcall -i386 -private Get16DLLAddress(long str) krnl386.exe16.Get16DLLAddress

1 0