February 2020 - Wine-Commits

Alexandre Julliard : ver: Use the 16-bit resource function in GetFileVersionInfo16().
by Alexandre Julliard Feb. 24, 2020

Feb. 24, 2020

Module: wine Branch: master Commit: f4ebe20b2ba33e3c366407f58cbc7421e422eea1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f4ebe20b2ba33e3c366407f5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 24 19:15:40 2020 +0100 ver: Use the 16-bit resource function in GetFileVersionInfo16(). The 32-bit functions no longer support LZ compression. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48557 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ver.dll16/version.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/ver.dll16/version.c b/dlls/ver.dll16/version.c index 269e2c9b2a..dac9ff28dd 100644 --- a/dlls/ver.dll16/version.c +++ b/dlls/ver.dll16/version.c @@ -30,6 +30,7 @@ #include "windef.h" #include "wine/winbase16.h" #include "winternl.h" +#include "winuser.h" #include "winver.h" #include "lzexpand.h" #include "wine/debug.h" @@ -461,22 +462,23 @@ DWORD WINAPI GetFileResource16( LPCSTR lpszFileName, LPCSTR lpszResType, /************************************************************************* * GetFileVersionInfoSize [VER.6] */ -DWORD WINAPI GetFileVersionInfoSize16( LPCSTR lpszFileName, LPDWORD lpdwHandle ) +DWORD WINAPI GetFileVersionInfoSize16( LPCSTR filename, LPDWORD handle ) { - TRACE("(%s, %p)\n", debugstr_a(lpszFileName), lpdwHandle ); - return GetFileVersionInfoSizeA( lpszFileName, lpdwHandle ); + DWORD offset; + + TRACE("(%s, %p)\n", debugstr_a(filename), handle ); + + return GetFileResourceSize16( filename, (LPCSTR)RT_VERSION, (LPCSTR)VS_VERSION_INFO, &offset ); } /************************************************************************* * GetFileVersionInfo [VER.7] */ -DWORD WINAPI GetFileVersionInfo16( LPCSTR lpszFileName, DWORD handle, - DWORD cbBuf, LPVOID lpvData ) +DWORD WINAPI GetFileVersionInfo16( LPCSTR filename, DWORD handle, DWORD datasize, LPVOID data ) { - TRACE("(%s, %08x, %d, %p)\n", - debugstr_a(lpszFileName), handle, cbBuf, lpvData ); + TRACE("(%s, %08x, %d, %p)\n", debugstr_a(filename), handle, datasize, data ); - return GetFileVersionInfoA( lpszFileName, handle, cbBuf, lpvData ); + return GetFileResource16( filename, (LPCSTR)RT_VERSION, (LPCSTR)VS_VERSION_INFO, 0, datasize, data ); } /*************************************************************************

1 0

Jacek Caban : corecrt_wstdio.h: Add ucrt _scwprintf and _vscwprintf declarations.
by Alexandre Julliard Feb. 24, 2020

Feb. 24, 2020

Module: wine Branch: master Commit: 449959f4118b9d536dff2d5a64b70f640aee699f URL: https://source.winehq.org/git/wine.git/?a=commit;h=449959f4118b9d536dff2d5a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 24 15:33:48 2020 +0100 corecrt_wstdio.h: Add ucrt _scwprintf and _vscwprintf declarations. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/corecrt_wstdio.h | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/include/msvcrt/corecrt_wstdio.h b/include/msvcrt/corecrt_wstdio.h index 65334ca0f9..a371d54cff 100644 --- a/include/msvcrt/corecrt_wstdio.h +++ b/include/msvcrt/corecrt_wstdio.h @@ -55,9 +55,7 @@ wint_t __cdecl _getwc_nolock(FILE*); wchar_t* __cdecl _getws(wchar_t*); wint_t __cdecl _putwc_nolock(wint_t,FILE*); int __cdecl _putws(const wchar_t*); -int WINAPIV _scwprintf(const wchar_t*,...); wint_t __cdecl _ungetwc_nolock(wint_t,FILE*); -int __cdecl _vscwprintf(const wchar_t*,__ms_va_list); int __cdecl _vscwprintf_p_l(const wchar_t*,_locale_t,__ms_va_list); int __cdecl _vswprintf_p_l(wchar_t*,size_t,const wchar_t*,_locale_t,__ms_va_list); FILE* __cdecl _wfdopen(int,const wchar_t*); @@ -173,10 +171,31 @@ static inline int WINAPIV _swprintf(wchar_t *buffer, const wchar_t *format, ...) return ret < 0 ? -1 : ret; } +static inline int __cdecl _vscwprintf(const wchar_t *format, __ms_va_list args) +{ + int ret = __stdio_common_vswprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS | _CRT_INTERNAL_PRINTF_STANDARD_SNPRINTF_BEHAVIOR, + NULL, 0, format, NULL, args); + return ret < 0 ? -1 : ret; +} + +static inline int WINAPIV _scwprintf(const wchar_t *format, ...) +{ + int ret; + __ms_va_list args; + + __ms_va_start(args, format); + ret = __stdio_common_vswprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS | _CRT_INTERNAL_PRINTF_STANDARD_SNPRINTF_BEHAVIOR, + NULL, 0, format, NULL, args); + __ms_va_end(args); + return ret; +} + #else /* _UCRT */ +_ACRTIMP int WINAPIV _scwprintf(const wchar_t*,...); _ACRTIMP int WINAPIV _snwprintf(wchar_t*,size_t,const wchar_t*,...); _ACRTIMP int WINAPIV _snwprintf_s(wchar_t*,size_t,size_t,const wchar_t*,...); +_ACRTIMP int __cdecl _vscwprintf(const wchar_t*,__ms_va_list); _ACRTIMP int __cdecl _vsnwprintf(wchar_t*,size_t,const wchar_t*,__ms_va_list); _ACRTIMP int __cdecl _vsnwprintf_s(wchar_t*,size_t,size_t,const wchar_t*,__ms_va_list);

1 0

Jacek Caban : corecrt_wstdio.h: Add ucrt swprintf_s and vswprintf_s declarations.
by Alexandre Julliard Feb. 24, 2020

Feb. 24, 2020

Module: wine Branch: master Commit: 2a33bacc039fc5d858c9509105924895fa15d680 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a33bacc039fc5d858c95091… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 24 15:34:37 2020 +0100 corecrt_wstdio.h: Add ucrt swprintf_s and vswprintf_s declarations. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/corecrt_wstdio.h | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/include/msvcrt/corecrt_wstdio.h b/include/msvcrt/corecrt_wstdio.h index d0d8ed952c..5b751b47f9 100644 --- a/include/msvcrt/corecrt_wstdio.h +++ b/include/msvcrt/corecrt_wstdio.h @@ -78,11 +78,9 @@ wchar_t* __cdecl getws(wchar_t*); wint_t __cdecl putwc(wint_t,FILE*); wint_t __cdecl putwchar(wint_t); int __cdecl putws(const wchar_t*); -int WINAPIV swprintf_s(wchar_t*,size_t,const wchar_t*,...); int WINAPIV swscanf(const wchar_t*,const wchar_t*,...); int WINAPIV swscanf_s(const wchar_t*,const wchar_t*,...); wint_t __cdecl ungetwc(wint_t,FILE*); -int __cdecl vswprintf_s(wchar_t*,size_t,const wchar_t*,__ms_va_list); int __cdecl vwprintf(const wchar_t*,__ms_va_list); int __cdecl vwprintf_s(const wchar_t*,__ms_va_list); int WINAPIV wprintf(const wchar_t*,...); @@ -97,6 +95,7 @@ _ACRTIMP int __cdecl __stdio_common_vfwprintf_s(unsigned __int64,FILE*,const wch _ACRTIMP int __cdecl __stdio_common_vsnwprintf_s(unsigned __int64,wchar_t*,size_t,size_t,const wchar_t*,_locale_t,__ms_va_list); _ACRTIMP int __cdecl __stdio_common_vswprintf(unsigned __int64,wchar_t*,size_t,const wchar_t*,_locale_t,__ms_va_list); _ACRTIMP int __cdecl __stdio_common_vswprintf_p(unsigned __int64,wchar_t*,size_t,const wchar_t*,_locale_t,__ms_va_list); +_ACRTIMP int __cdecl __stdio_common_vswprintf_s(unsigned __int64,wchar_t*,size_t,const wchar_t*,_locale_t,__ms_va_list); _ACRTIMP int __cdecl __stdio_common_vfwscanf(unsigned __int64,FILE*,const wchar_t*,_locale_t,__ms_va_list); @@ -168,6 +167,23 @@ static inline int WINAPIV _swprintf(wchar_t *buffer, const wchar_t *format, ...) return ret < 0 ? -1 : ret; } +static inline int WINAPIV vswprintf_s(wchar_t *buffer, size_t size, const wchar_t *format, __ms_va_list args) +{ + int ret = __stdio_common_vswprintf_s(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, buffer, size, format, NULL, args); + return ret < 0 ? -1 : ret; +} + +static inline int WINAPIV swprintf_s(wchar_t *buffer, size_t size, const wchar_t* format, ...) +{ + int ret; + __ms_va_list args; + + __ms_va_start(args, format); + ret = __stdio_common_vswprintf_s(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, buffer, size, format, NULL, args); + __ms_va_end(args); + return ret; +} + static inline int __cdecl _vscwprintf(const wchar_t *format, __ms_va_list args) { int ret = __stdio_common_vswprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS | _CRT_INTERNAL_PRINTF_STANDARD_SNPRINTF_BEHAVIOR, @@ -288,6 +304,8 @@ static inline int WINAPIV swprintf(wchar_t *buffer, size_t size, const wchar_t * _ACRTIMP int WINAPIV fwscanf(FILE*,const wchar_t*,...); _ACRTIMP int WINAPIV fwscanf_s(FILE*,const wchar_t*,...); +_ACRTIMP int WINAPIV swprintf_s(wchar_t*,size_t,const wchar_t*,...); +_ACRTIMP int __cdecl vswprintf_s(wchar_t*,size_t,const wchar_t*,__ms_va_list); #endif /* _UCRT */

1 0

Alex Henrie : ntdll/tests: Add more tests for RtlIpv6StringToAddress.
by Alexandre Julliard Feb. 24, 2020

Feb. 24, 2020

Module: wine Branch: master Commit: 9c11de6b79472378be9af5b72dbca5db804fa670 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9c11de6b79472378be9af5b7… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Feb 24 00:39:51 2020 -0700 ntdll/tests: Add more tests for RtlIpv6StringToAddress. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/rtl.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c index 559a7d625c..445f3538d8 100644 --- a/dlls/ntdll/tests/rtl.c +++ b/dlls/ntdll/tests/rtl.c @@ -1539,6 +1539,8 @@ static const struct { 0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0x6666, 0, 0x8888 } }, { "1111:2222:3333:4444:5555:6666::7777:8888", STATUS_SUCCESS, 35, { 0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0x6666, 0, 0x7777 }, ex_fail_6 }, + { "1111:2222:3333:4444:5555:6666:7777::8888", STATUS_SUCCESS, 36, + { 0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0x6666, 0x7777, 0 }, ex_fail_6|win_broken_6 }, { "1111:2222:3333:4444:5555::", STATUS_SUCCESS, 26, { 0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0, 0, 0 } }, { "1111:2222:3333:4444:5555::123.123.123.123", STATUS_SUCCESS, 41, @@ -1555,8 +1557,30 @@ static const struct { 0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0, 0, 0x8800 }, ex_fail_6 }, { "1111:2222:3333:4444:5555::0x8888", STATUS_SUCCESS, 27, { 0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0, 0, 0x8888 }, ex_fail_6 }, + { "1111:2222:3333:4444:5555::0x80000000", STATUS_SUCCESS, 27, + { 0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0, 0, 0xffff }, ex_fail_6 }, + { "1111:2222:3333:4444::5555:0x012345678", STATUS_SUCCESS, 27, + { 0x1111, 0x2222, 0x3333, 0x4444, 0, 0, 0x5555, 0x7856 }, ex_fail_6 }, + { "1111:2222:3333:4444::5555:0x123456789", STATUS_SUCCESS, 27, + { 0x1111, 0x2222, 0x3333, 0x4444, 0, 0, 0x5555, 0xffff }, ex_fail_6 }, + { "1111:2222:3333:4444:5555:6666:0x12345678", STATUS_INVALID_PARAMETER, 31, + { 0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0x6666, 0xabab, 0xabab }, ex_fail_6 }, + { "1111:2222:3333:4444:5555:6666:7777:0x80000000", STATUS_SUCCESS, 36, + { 0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0x6666, 0x7777, 0xffff }, ex_fail_6 }, + { "1111:2222:3333:4444:5555:6666:7777:0x012345678", STATUS_SUCCESS, 36, + { 0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0x6666, 0x7777, 0x7856 }, ex_fail_6 }, + { "1111:2222:3333:4444:5555:6666:7777:0x123456789", STATUS_SUCCESS, 36, + { 0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0x6666, 0x7777, 0xffff }, ex_fail_6 }, + { "111:222:333:444:555:666:777:0x123456789abcdef0", STATUS_SUCCESS, 29, + { 0x1101, 0x2202, 0x3303, 0x4404, 0x5505, 0x6606, 0x7707, 0xffff }, ex_fail_6 }, { "1111:2222:3333:4444:5555::08888", STATUS_INVALID_PARAMETER, 31, { 0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0xabab, 0xabab, 0xabab } }, + { "1111:2222:3333:4444:5555::08888::", STATUS_INVALID_PARAMETER, 31, + { 0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0xabab, 0xabab, 0xabab } }, + { "1111:2222:3333:4444:5555:6666:7777:fffff:", STATUS_INVALID_PARAMETER, 40, + { 0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0x6666, 0x7777, 0xabab } }, + { "1111:2222:3333:4444:5555:6666::fffff:", STATUS_INVALID_PARAMETER, 36, + { 0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0x6666, 0xabab, 0xabab } }, { "1111:2222:3333:4444:5555::fffff", STATUS_INVALID_PARAMETER, 31, { 0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0xabab, 0xabab, 0xabab } }, { "1111:2222:3333:4444::fffff", STATUS_INVALID_PARAMETER, 26, @@ -1672,16 +1696,24 @@ static const struct { -1 } }, { "1111", STATUS_INVALID_PARAMETER, 4, { -1 } }, + { "0x1111", STATUS_INVALID_PARAMETER, 1, + { -1 } }, { "1111:22223333:4444:5555:6666:1.2.3.4", STATUS_INVALID_PARAMETER, -1, { 0x1111, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab } }, { "1111:22223333:4444:5555:6666:7777:8888", STATUS_INVALID_PARAMETER, -1, { 0x1111, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab } }, + { "1111:123456789:4444:5555:6666:7777:8888", STATUS_INVALID_PARAMETER, -1, + { 0x1111, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab } }, + { "1111:1234567890abcdef0:4444:5555:6666:7777:888", STATUS_INVALID_PARAMETER, -1, + { 0x1111, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab } }, { "1111:2222:", STATUS_INVALID_PARAMETER, 10, { 0x1111, 0x2222, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab } }, { "1111:2222:1.2.3.4", STATUS_INVALID_PARAMETER, 17, { 0x1111, 0x2222, 0x201, 0xab03, 0xabab, 0xabab, 0xabab, 0xabab } }, { "1111:2222:3333", STATUS_INVALID_PARAMETER, 14, { 0x1111, 0x2222, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab } }, + { "1111:2222:3333:4444:5555:6666::1.2.3.4", STATUS_SUCCESS, 32, + { 0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0x6666, 0, 0x100 }, ex_fail_6 }, { "1111:2222:3333:4444:5555:6666:7777:1.2.3.4", STATUS_SUCCESS, 36, { 0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0x6666, 0x7777, 0x100 }, ex_fail_6 }, { "1111:2222:3333:4444:5555:6666:7777:8888:", STATUS_SUCCESS, 39, @@ -1702,12 +1734,30 @@ static const struct { 0x1111, 0, 0, 0, 0, 0, 0, 0x3333 }, ex_fail_6 }, { "12345::6:7:8", STATUS_INVALID_PARAMETER, -1, { -1 } }, + { "1::001.2.3.4", STATUS_SUCCESS, 12, + { 0x100, 0, 0, 0, 0, 0, 0x201, 0x403 } }, + { "1::1.002.3.4", STATUS_SUCCESS, 12, + { 0x100, 0, 0, 0, 0, 0, 0x201, 0x403 } }, + { "1::0001.2.3.4", STATUS_INVALID_PARAMETER, -1, + { 0x100, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab } }, + { "1::1.0002.3.4", STATUS_INVALID_PARAMETER, -1, + { 0x100, 0xab01, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab } }, { "1::1.2.256.4", STATUS_INVALID_PARAMETER, -1, { 0x100, 0x201, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab } }, + { "1::1.2.4294967296.4", STATUS_INVALID_PARAMETER, -1, + { 0x100, 0x201, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab } }, + { "1::1.2.18446744073709551616.4", STATUS_INVALID_PARAMETER, -1, + { 0x100, 0x201, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab } }, { "1::1.2.3.256", STATUS_INVALID_PARAMETER, 12, { 0x100, 0x201, 0xab03, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab } }, + { "1::1.2.3.4294967296", STATUS_INVALID_PARAMETER, 19, + { 0x100, 0x201, 0xab03, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab } }, + { "1::1.2.3.18446744073709551616", STATUS_INVALID_PARAMETER, 29, + { 0x100, 0x201, 0xab03, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab } }, { "1::1.2.3.300", STATUS_INVALID_PARAMETER, 12, { 0x100, 0x201, 0xab03, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab } }, + { "1::1.2.3.300.", STATUS_INVALID_PARAMETER, 12, + { 0x100, 0x201, 0xab03, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab } }, { "1::1.2::1", STATUS_INVALID_PARAMETER, 6, { 0x100, 0xab01, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab } }, { "1::1.2.3.4::1", STATUS_SUCCESS, 10, @@ -1758,6 +1808,20 @@ static const struct { -1 } }, { "::-1", STATUS_SUCCESS, 2, { 0, 0, 0, 0, 0, 0, 0, 0 }, ex_fail_6 }, + { "::12345678", STATUS_INVALID_PARAMETER, 10, + { 0, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab } }, + { "::123456789", STATUS_INVALID_PARAMETER, 11, + { 0, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab } }, + { "::1234567890abcdef0", STATUS_INVALID_PARAMETER, 19, + { 0, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab } }, + { "::0x80000000", STATUS_SUCCESS, 3, + { 0, 0, 0, 0, 0, 0, 0, 0xffff }, ex_fail_6 }, + { "::0x012345678", STATUS_SUCCESS, 3, + { 0, 0, 0, 0, 0, 0, 0, 0x7856 }, ex_fail_6 }, + { "::0x123456789", STATUS_SUCCESS, 3, + { 0, 0, 0, 0, 0, 0, 0, 0xffff }, ex_fail_6 }, + { "::0x1234567890abcdef0", STATUS_SUCCESS, 3, + { 0, 0, 0, 0, 0, 0, 0, 0xffff }, ex_fail_6 }, { "::.", STATUS_SUCCESS, 2, { 0, 0, 0, 0, 0, 0, 0, 0 }, ex_fail_6 }, { "::..", STATUS_SUCCESS, 2,

1 0

Francois Gouget : kernel32/tests: Check if CreateProcess() resets STARTUPINFO/PROCESS_INFORMATION.
by Alexandre Julliard Feb. 24, 2020

Feb. 24, 2020

Module: wine Branch: master Commit: 8adca32727ff40b845f4a517c43ed40da0143e4d URL: https://source.winehq.org/git/wine.git/?a=commit;h=8adca32727ff40b845f4a517… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Feb 24 05:04:00 2020 +0100 kernel32/tests: Check if CreateProcess() resets STARTUPINFO/PROCESS_INFORMATION. Our test framework depends on CreateProcess() initializing the hProcess field in case of a failure. The process tests depend on it not modifying the STARTUPINFO fields. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/process.c | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 46d7245777..b32560358d 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -895,10 +895,31 @@ static void test_CommandLine(void) startup.dwFlags = STARTF_USESHOWWINDOW; startup.wShowWindow = SW_SHOWNORMAL; + /* failure case */ + strcpy(buffer, "\"t:\\NotADir\\NotAFile.exe\""); + memset(&info, 0xa, sizeof(info)); + ok(!CreateProcessA(buffer, buffer, NULL, NULL, FALSE, 0L, NULL, NULL, &startup, &info), "CreateProcess unexpectedly succeeded\n"); + /* Check that the effective STARTUPINFOA parameters are not modified */ + ok(startup.cb == sizeof(startup), "unexpected cb %d\n", startup.cb); + ok(startup.lpDesktop == NULL, "lpDesktop is not NULL\n"); + ok(startup.lpTitle == NULL, "lpTitle is not NULL\n"); + ok(startup.dwFlags == STARTF_USESHOWWINDOW, "unexpected dwFlags %04x\n", startup.dwFlags); + ok(startup.wShowWindow == SW_SHOWNORMAL, "unexpected wShowWindow %d\n", startup.wShowWindow); + ok(!info.hProcess, "unexpected hProcess %p\n", info.hProcess); + ok(!info.hThread, "unexpected hThread %p\n", info.hThread); + ok(!info.dwProcessId, "unexpected dwProcessId %04x\n", info.dwProcessId); + ok(!info.dwThreadId, "unexpected dwThreadId %04x\n", info.dwThreadId); + /* the basics */ get_file_name(resfile); sprintf(buffer, "\"%s\" process dump \"%s\" \"C:\\Program Files\\my nice app.exe\" \"\"\"\"", selfname, resfile); ok(CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0L, NULL, NULL, &startup, &info), "CreateProcess\n"); + /* Check that the effective STARTUPINFOA parameters are not modified */ + ok(startup.cb == sizeof(startup), "unexpected cb %d\n", startup.cb); + ok(startup.lpDesktop == NULL, "lpDesktop is not NULL\n"); + ok(startup.lpTitle == NULL, "lpTitle is not NULL\n"); + ok(startup.dwFlags == STARTF_USESHOWWINDOW, "unexpected dwFlags %04x\n", startup.dwFlags); + ok(startup.wShowWindow == SW_SHOWNORMAL, "unexpected wShowWindow %d\n", startup.wShowWindow); /* wait for child to terminate */ ok(WaitForSingleObject(info.hProcess, 30000) == WAIT_OBJECT_0, "Child process termination\n"); /* child process has changed result file, so let profile functions know about it */ @@ -914,11 +935,6 @@ static void test_CommandLine(void) release_memory(); DeleteFileA(resfile); - memset(&startup, 0, sizeof(startup)); - startup.cb = sizeof(startup); - startup.dwFlags = STARTF_USESHOWWINDOW; - startup.wShowWindow = SW_SHOWNORMAL; - /* test main()'s quotes handling */ get_file_name(resfile); sprintf(buffer, "\"%s\" process dump \"%s\" \"a\\\"b\\\\\" c\\\" d", selfname, resfile);

1 0

Nikolay Sivov : ole32/tests: Link to activation context API directly.
by Alexandre Julliard Feb. 24, 2020

Feb. 24, 2020

Module: wine Branch: master Commit: 7eb6321466ccc4a7687f21d30c2a5b967a862cd3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7eb6321466ccc4a7687f21d3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 24 13:20:00 2020 +0300 ole32/tests: Link to activation context API directly. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/compobj.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 624120890d..cc2737bdd1 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -81,8 +81,6 @@ static HRESULT (WINAPI * pCoDecrementMTAUsage)(CO_MTA_USAGE_COOKIE cookie); static LONG (WINAPI * pRegDeleteKeyExA)(HKEY, LPCSTR, REGSAM, DWORD); static LONG (WINAPI * pRegOverridePredefKey)(HKEY key, HKEY override); -static BOOL (WINAPI *pActivateActCtx)(HANDLE,ULONG_PTR*); -static HANDLE (WINAPI *pCreateActCtxW)(PCACTCTXW); static BOOL (WINAPI *pIsWow64Process)(HANDLE, LPBOOL); #define ok_ole_success(hr, func) ok(hr == S_OK, func " failed with error 0x%08x\n", hr) @@ -242,8 +240,6 @@ static HANDLE activate_context(const char *manifest, ULONG_PTR *cookie) HANDLE handle; BOOL ret; - if (!pCreateActCtxW) return NULL; - create_manifest_file("file.manifest", manifest); MultiByteToWideChar( CP_ACP, 0, "file.manifest", -1, path, MAX_PATH ); @@ -251,7 +247,7 @@ static HANDLE activate_context(const char *manifest, ULONG_PTR *cookie) actctx.cbSize = sizeof(ACTCTXW); actctx.lpSource = path; - handle = pCreateActCtxW(&actctx); + handle = CreateActCtxW(&actctx); ok(handle != INVALID_HANDLE_VALUE || broken(handle == INVALID_HANDLE_VALUE) /* some old XP/2k3 versions */, "handle == INVALID_HANDLE_VALUE, error %u\n", GetLastError()); if (handle == INVALID_HANDLE_VALUE) @@ -274,7 +270,7 @@ static HANDLE activate_context(const char *manifest, ULONG_PTR *cookie) if (handle) { - ret = pActivateActCtx(handle, cookie); + ret = ActivateActCtx(handle, cookie); ok(ret, "ActivateActCtx failed: %u\n", GetLastError()); } @@ -3826,8 +3822,6 @@ static void init_funcs(void) pRegDeleteKeyExA = (void*)GetProcAddress(hAdvapi32, "RegDeleteKeyExA"); pRegOverridePredefKey = (void*)GetProcAddress(hAdvapi32, "RegOverridePredefKey"); - pActivateActCtx = (void*)GetProcAddress(hkernel32, "ActivateActCtx"); - pCreateActCtxW = (void*)GetProcAddress(hkernel32, "CreateActCtxW"); pIsWow64Process = (void*)GetProcAddress(hkernel32, "IsWow64Process"); } @@ -3966,9 +3960,6 @@ START_TEST(compobj) lstrcatA(testlib, "\\testlib.dll"); extract_resource("testlib.dll", "TESTDLL", testlib); - if (!pCreateActCtxW) - win_skip("Activation contexts are not supported, some tests will be skipped.\n"); - test_ProgIDFromCLSID(); test_CLSIDFromProgID(); test_CLSIDFromString();

1 0

Daniel Lehman : include: Update wcstok declarations.
by Alexandre Julliard Feb. 24, 2020

Feb. 24, 2020

Module: wine Branch: master Commit: 7aa1f6ee1c62b0cf39565dca14d71b405fd06203 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7aa1f6ee1c62b0cf39565dca… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Thu Feb 20 22:40:24 2020 -0800 include: Update wcstok declarations. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/string.h | 16 +++++++++++++++- include/msvcrt/wchar.h | 16 +++++++++++++++- include/tchar.h | 2 +- 3 files changed, 31 insertions(+), 3 deletions(-) diff --git a/include/msvcrt/string.h b/include/msvcrt/string.h index f8bc40fb2a..a8bf04d5b4 100644 --- a/include/msvcrt/string.h +++ b/include/msvcrt/string.h @@ -119,8 +119,22 @@ _ACRTIMP wchar_t* __cdecl wcspbrk(const wchar_t*,const wchar_t*); _ACRTIMP wchar_t* __cdecl wcsrchr(const wchar_t*,wchar_t wcFor); _ACRTIMP size_t __cdecl wcsspn(const wchar_t*,const wchar_t*); _ACRTIMP wchar_t* __cdecl wcsstr(const wchar_t*,const wchar_t*); -_ACRTIMP wchar_t* __cdecl wcstok(wchar_t*,const wchar_t*); +_ACRTIMP wchar_t* __cdecl wcstok_s(wchar_t*,const wchar_t*,wchar_t**); _ACRTIMP size_t __cdecl wcsxfrm(wchar_t*,const wchar_t*,size_t); + +#ifdef _UCRT +_ACRTIMP wchar_t* __cdecl wcstok(wchar_t*,const wchar_t*,wchar_t**); +static inline wchar_t* _wcstok(wchar_t* str, const wchar_t *delim) { return wcstok(str, delim, NULL); } +# ifdef __cplusplus +extern "C++" inline wchar_t* wcstok(wchar_t* str, const wchar_t *delim) { return wcstok(str, delim, NULL); } +# elif defined(_CRT_NON_CONFORMING_WCSTOK) +# define wcstok _wcstok +# endif +#else /* _UCRT */ +_ACRTIMP wchar_t* __cdecl wcstok(wchar_t*,const wchar_t*); +# define _wcstok wcstok +#endif /* _UCRT */ + #endif /* _WSTRING_DEFINED */ #ifdef __cplusplus diff --git a/include/msvcrt/wchar.h b/include/msvcrt/wchar.h index ade970b6f3..6b30645dc0 100644 --- a/include/msvcrt/wchar.h +++ b/include/msvcrt/wchar.h @@ -140,8 +140,22 @@ wchar_t* __cdecl wcspbrk(const wchar_t*,const wchar_t*); wchar_t* __cdecl wcsrchr(const wchar_t*,wchar_t wcFor); size_t __cdecl wcsspn(const wchar_t*,const wchar_t*); wchar_t* __cdecl wcsstr(const wchar_t*,const wchar_t*); -wchar_t* __cdecl wcstok(wchar_t*,const wchar_t*); +wchar_t* __cdecl wcstok_s(wchar_t*,const wchar_t*,wchar_t**); size_t __cdecl wcsxfrm(wchar_t*,const wchar_t*,size_t); + +#ifdef _UCRT +wchar_t* __cdecl wcstok(wchar_t*,const wchar_t*,wchar_t**); +static inline wchar_t* _wcstok(wchar_t* str, const wchar_t *delim) { return wcstok(str, delim, NULL); } +# ifdef __cplusplus +extern "C++" inline wchar_t* wcstok(wchar_t* str, const wchar_t *delim) { return wcstok(str, delim, NULL); } +# elif defined(_CRT_NON_CONFORMING_WCSTOK) +# define wcstok _wcstok +# endif +#else /* _UCRT */ +wchar_t* __cdecl wcstok(wchar_t*,const wchar_t*); +# define _wcstok wcstok +#endif /* _UCRT */ + #endif /* _WSTRING_DEFINED */ wchar_t __cdecl btowc(int); diff --git a/include/tchar.h b/include/tchar.h index e14aaf3884..9fc4c72099 100644 --- a/include/tchar.h +++ b/include/tchar.h @@ -148,7 +148,7 @@ extern "C" { #define _tcsspn WINE_tchar_routine(strspn, _mbsspn, wcsspn) #define _tcsstr WINE_tchar_routine(strstr, _mbsstr, wcsstr) #define _tcstod WINE_tchar_routine(strtod, strtod, wcstod) -#define _tcstok WINE_tchar_routine(strtok, _mbstok, wcstok) +#define _tcstok WINE_tchar_routine(strtok, _mbstok, _wcstok) #define _tcstol WINE_tchar_routine(strtol, strtol, wcstol) #define _tcstoul WINE_tchar_routine(strtoul, strtoul, wcstoul) #define _tcsupr WINE_tchar_routine(_strupr, _mbsupr, _wcsupr)

1 0

Zebediah Figura : mp3dmod: Implement IMediaObject::GetOutputStreamInfo().
by Alexandre Julliard Feb. 24, 2020

Feb. 24, 2020

Module: wine Branch: master Commit: 5d4ff5594cc9bb1a9c88b62da09ea671bbd36168 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d4ff5594cc9bb1a9c88b62d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Feb 21 19:34:56 2020 -0600 mp3dmod: Implement IMediaObject::GetOutputStreamInfo(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mp3dmod/mp3dmod.c | 6 ++++-- dlls/mp3dmod/tests/mp3dmod.c | 5 +++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/mp3dmod/mp3dmod.c b/dlls/mp3dmod/mp3dmod.c index 8afc128d80..9e86bcc31d 100644 --- a/dlls/mp3dmod/mp3dmod.c +++ b/dlls/mp3dmod/mp3dmod.c @@ -154,9 +154,11 @@ static HRESULT WINAPI MediaObject_GetInputStreamInfo(IMediaObject *iface, DWORD static HRESULT WINAPI MediaObject_GetOutputStreamInfo(IMediaObject *iface, DWORD index, DWORD *flags) { - FIXME("(%p)->(%d, %p) stub!\n", iface, index, flags); + TRACE("iface %p, index %u, flags %p.\n", iface, index, flags); - return E_NOTIMPL; + *flags = 0; + + return S_OK; } static HRESULT WINAPI MediaObject_GetInputType(IMediaObject *iface, DWORD index, DWORD type_index, DMO_MEDIA_TYPE *type) diff --git a/dlls/mp3dmod/tests/mp3dmod.c b/dlls/mp3dmod/tests/mp3dmod.c index 713623b244..211731db9a 100644 --- a/dlls/mp3dmod/tests/mp3dmod.c +++ b/dlls/mp3dmod/tests/mp3dmod.c @@ -306,6 +306,11 @@ static void test_stream_info(void) ok(hr == S_OK, "Got hr %#x.\n", hr); ok(!flags, "Got flags %#x.\n", flags); + flags = 0xdeadbeef; + hr = IMediaObject_GetOutputStreamInfo(dmo, 0, &flags); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!flags, "Got flags %#x.\n", flags); + IMediaObject_Release(dmo); }

1 0

Zebediah Figura : mp3dmod: Implement IMediaObject::GetStreamCount().
by Alexandre Julliard Feb. 24, 2020

Feb. 24, 2020

Module: wine Branch: master Commit: 06fa9bd3f7c538c59ac60d8c5758b80ce3404a53 URL: https://source.winehq.org/git/wine.git/?a=commit;h=06fa9bd3f7c538c59ac60d8c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Feb 21 19:34:54 2020 -0600 mp3dmod: Implement IMediaObject::GetStreamCount(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mp3dmod/mp3dmod.c | 6 ++++-- dlls/mp3dmod/tests/mp3dmod.c | 19 +++++++++++++++++++ 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/mp3dmod/mp3dmod.c b/dlls/mp3dmod/mp3dmod.c index c9da2b8a35..1f3b0126b8 100644 --- a/dlls/mp3dmod/mp3dmod.c +++ b/dlls/mp3dmod/mp3dmod.c @@ -136,9 +136,11 @@ static ULONG WINAPI MediaObject_Release(IMediaObject *iface) static HRESULT WINAPI MediaObject_GetStreamCount(IMediaObject *iface, DWORD *input, DWORD *output) { - FIXME("(%p)->(%p, %p) stub!\n", iface, input, output); + TRACE("iface %p, input %p, output %p.\n", iface, input, output); - return E_NOTIMPL; + *input = *output = 1; + + return S_OK; } static HRESULT WINAPI MediaObject_GetInputStreamInfo(IMediaObject *iface, DWORD index, DWORD *flags) diff --git a/dlls/mp3dmod/tests/mp3dmod.c b/dlls/mp3dmod/tests/mp3dmod.c index 75fd0e2c40..33cc6f3754 100644 --- a/dlls/mp3dmod/tests/mp3dmod.c +++ b/dlls/mp3dmod/tests/mp3dmod.c @@ -286,6 +286,24 @@ static void test_aggregation(void) ok(hr == E_NOINTERFACE, "got %#x\n", hr); } +static void test_stream_info(void) +{ + DWORD input_count, output_count, flags; + IMediaObject *dmo; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_CMP3DecMediaObject, NULL, CLSCTX_INPROC_SERVER, + &IID_IMediaObject, (void **)&dmo); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaObject_GetStreamCount(dmo, &input_count, &output_count); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(input_count == 1, "Got input count %u.\n", input_count); + ok(output_count == 1, "Got output count %u.\n", output_count); + + IMediaObject_Release(dmo); +} + START_TEST(mp3dmod) { IMediaObject *dmo; @@ -304,6 +322,7 @@ START_TEST(mp3dmod) test_convert(); test_aggregation(); + test_stream_info(); CoUninitialize(); }

1 0

Zebediah Figura : d3d8: Retrieve texture states from the primary stateblock.
by Alexandre Julliard Feb. 24, 2020

Feb. 24, 2020

Module: wine Branch: master Commit: 942e21003781c787a26571ae65776bb036374f2d URL: https://source.winehq.org/git/wine.git/?a=commit;h=942e21003781c787a26571ae… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Feb 21 17:04:49 2020 -0600 d3d8: Retrieve texture states from the primary stateblock. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 7c1a6fe9fd..41384d84bc 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2251,26 +2251,38 @@ tss_lookup[] = }; static HRESULT WINAPI d3d8_device_GetTextureStageState(IDirect3DDevice8 *iface, - DWORD stage, D3DTEXTURESTAGESTATETYPE Type, DWORD *value) + DWORD stage, D3DTEXTURESTAGESTATETYPE state, DWORD *value) { struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); + const struct wined3d_stateblock_state *device_state; const struct tss_lookup *l; - TRACE("iface %p, stage %u, state %#x, value %p.\n", iface, stage, Type, value); + TRACE("iface %p, stage %u, state %#x, value %p.\n", iface, stage, state, value); + + if (stage >= WINED3DVERTEXTEXTURESAMPLER0 && stage <= WINED3DVERTEXTEXTURESAMPLER3) + stage -= (WINED3DVERTEXTEXTURESAMPLER0 - WINED3D_MAX_FRAGMENT_SAMPLERS); + + if (stage >= WINED3D_MAX_COMBINED_SAMPLERS) + { + WARN("Invalid stage %u.\n", stage); + *value = 0; + return D3D_OK; + } - if (Type >= ARRAY_SIZE(tss_lookup)) + if (state >= ARRAY_SIZE(tss_lookup)) { - WARN("Invalid Type %#x passed.\n", Type); + WARN("Invalid state %#x.\n", state); return D3D_OK; } - l = &tss_lookup[Type]; + l = &tss_lookup[state]; wined3d_mutex_lock(); + device_state = wined3d_stateblock_get_state(device->state); if (l->sampler_state) - *value = wined3d_device_get_sampler_state(device->wined3d_device, stage, l->u.sampler_state); + *value = device_state->sampler_states[stage][l->u.sampler_state]; else - *value = wined3d_device_get_texture_stage_state(device->wined3d_device, stage, l->u.texture_state); + *value = device_state->texture_states[stage][l->u.texture_state]; wined3d_mutex_unlock(); return D3D_OK;

1 0