February 2020 - Wine-commits

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

24 Feb '20

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

Jacek Caban : include: Add corecrt_wstdlib.h header.
by Alexandre Julliard 24 Feb '20

24 Feb '20

Module: wine Branch: master Commit: 1e5522ab78f11fb032ba44a66e73f349f5d6f6a1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1e5522ab78f11fb032ba44a6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 24 16:35:44 2020 +0100 include: Add corecrt_wstdlib.h header. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/msvcrt/corecrt_wstdlib.h | 60 ++++++++++++++++++++++++++++++++++++++++ include/msvcrt/stdlib.h | 46 +----------------------------- include/msvcrt/wchar.h | 43 ++-------------------------- 4 files changed, 64 insertions(+), 86 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index 694828ab71..f5e2ba665b 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -428,6 +428,7 @@ SOURCES = \ msvcrt/corecrt_wctype.h \ msvcrt/corecrt_wio.h \ msvcrt/corecrt_wstdio.h \ + msvcrt/corecrt_wstdlib.h \ msvcrt/corecrt_wtime.h \ msvcrt/crtdbg.h \ msvcrt/crtdefs.h \ diff --git a/include/msvcrt/corecrt_wstdlib.h b/include/msvcrt/corecrt_wstdlib.h new file mode 100644 index 0000000000..da97e42bb9 --- /dev/null +++ b/include/msvcrt/corecrt_wstdlib.h @@ -0,0 +1,60 @@ +/** + * This file has no copyright assigned and is placed in the Public Domain. + * This file is part of the Wine project. + */ + +#ifndef _WSTDLIB_DEFINED +#define _WSTDLIB_DEFINED + +#include <corecrt.h> + +#ifdef __cplusplus +extern "C" { +#endif + +wchar_t* __cdecl _itow(int,wchar_t*,int); +errno_t __cdecl _itow_s(int,wchar_t*,int, int); +wchar_t* __cdecl _i64tow(__int64,wchar_t*,int); +errno_t __cdecl _i64tow_s(__int64, wchar_t*, size_t, int); +wchar_t* __cdecl _ltow(__msvcrt_long,wchar_t*,int); +errno_t __cdecl _ltow_s(__msvcrt_long,wchar_t*,int,int); +wchar_t* __cdecl _ui64tow(unsigned __int64,wchar_t*,int); +errno_t __cdecl _ui64tow_s(unsigned __int64, wchar_t*, size_t, int); +wchar_t* __cdecl _ultow(__msvcrt_ulong,wchar_t*,int); +errno_t __cdecl _ultow_s(__msvcrt_ulong, wchar_t*, size_t, int); +wchar_t* __cdecl _wfullpath(wchar_t*,const wchar_t*,size_t); +wchar_t* __cdecl _wgetenv(const wchar_t*); +void __cdecl _wmakepath(wchar_t*,const wchar_t*,const wchar_t*,const wchar_t*,const wchar_t*); +int __cdecl _wmakepath_s(wchar_t*,size_t,const wchar_t*,const wchar_t*,const wchar_t*,const wchar_t*); +void __cdecl _wperror(const wchar_t*); +int __cdecl _wputenv(const wchar_t*); +void __cdecl _wsearchenv(const wchar_t*,const wchar_t*,wchar_t*); +void __cdecl _wsplitpath(const wchar_t*,wchar_t*,wchar_t*,wchar_t*,wchar_t*); +errno_t __cdecl _wsplitpath_s(const wchar_t*,wchar_t*,size_t,wchar_t*,size_t, + wchar_t*,size_t,wchar_t*,size_t); +int __cdecl _wsystem(const wchar_t*); +double __cdecl _wtof(const wchar_t*); +int __cdecl _wtoi(const wchar_t*); +__int64 __cdecl _wtoi64(const wchar_t*); +__msvcrt_long __cdecl _wtol(const wchar_t*); + +size_t __cdecl mbstowcs(wchar_t*,const char*,size_t); +errno_t __cdecl mbstowcs_s(size_t*,wchar_t*,size_t,const char*,size_t); +int __cdecl mbtowc(wchar_t*,const char*,size_t); +float __cdecl wcstof(const wchar_t*,wchar_t**); +double __cdecl wcstod(const wchar_t*,wchar_t**); +__msvcrt_long __cdecl wcstol(const wchar_t*,wchar_t**,int); +size_t __cdecl wcstombs(char*,const wchar_t*,size_t); +errno_t __cdecl wcstombs_s(size_t*,char*,size_t,const wchar_t*,size_t); +__msvcrt_ulong __cdecl wcstoul(const wchar_t*,wchar_t**,int); +int __cdecl wctomb(char*,wchar_t); +__int64 __cdecl _wcstoi64(const wchar_t*,wchar_t**,int); +__int64 __cdecl _wcstoi64_l(const wchar_t*,wchar_t**,int,_locale_t); +unsigned __int64 __cdecl _wcstoui64(const wchar_t*,wchar_t**,int); +unsigned __int64 __cdecl _wcstoui64_l(const wchar_t*,wchar_t**,int,_locale_t); + +#ifdef __cplusplus +} +#endif + +#endif /* _WSTDLIB_DEFINED */ diff --git a/include/msvcrt/stdlib.h b/include/msvcrt/stdlib.h index 78fc5fba75..5bcc2e4455 100644 --- a/include/msvcrt/stdlib.h +++ b/include/msvcrt/stdlib.h @@ -8,7 +8,7 @@ #ifndef __WINE_STDLIB_H #define __WINE_STDLIB_H -#include <corecrt.h> +#include <corecrt_wstdlib.h> #include <pshpack8.h> @@ -222,50 +222,6 @@ int __cdecl system(const char*); void* __cdecl bsearch(const void*,const void*,size_t,size_t,int (__cdecl *)(const void*,const void*)); void __cdecl qsort(void*,size_t,size_t,int (__cdecl *)(const void*,const void*)); -#ifndef _WSTDLIB_DEFINED -#define _WSTDLIB_DEFINED -wchar_t* __cdecl _itow(int,wchar_t*,int); -errno_t __cdecl _itow_s(int,wchar_t*,int, int); -wchar_t* __cdecl _i64tow(__int64,wchar_t*,int); -errno_t __cdecl _i64tow_s(__int64, wchar_t*, size_t, int); -wchar_t* __cdecl _ltow(__msvcrt_long,wchar_t*,int); -errno_t __cdecl _ltow_s(__msvcrt_long,wchar_t*,int,int); -wchar_t* __cdecl _ui64tow(unsigned __int64,wchar_t*,int); -errno_t __cdecl _ui64tow_s(unsigned __int64, wchar_t*, size_t, int); -wchar_t* __cdecl _ultow(__msvcrt_ulong,wchar_t*,int); -errno_t __cdecl _ultow_s(__msvcrt_ulong, wchar_t*, size_t, int); -wchar_t* __cdecl _wfullpath(wchar_t*,const wchar_t*,size_t); -wchar_t* __cdecl _wgetenv(const wchar_t*); -void __cdecl _wmakepath(wchar_t*,const wchar_t*,const wchar_t*,const wchar_t*,const wchar_t*); -int __cdecl _wmakepath_s(wchar_t*,size_t,const wchar_t*,const wchar_t*,const wchar_t*,const wchar_t*); -void __cdecl _wperror(const wchar_t*); -int __cdecl _wputenv(const wchar_t*); -void __cdecl _wsearchenv(const wchar_t*,const wchar_t*,wchar_t*); -void __cdecl _wsplitpath(const wchar_t*,wchar_t*,wchar_t*,wchar_t*,wchar_t*); -errno_t __cdecl _wsplitpath_s(const wchar_t*,wchar_t*,size_t,wchar_t*,size_t, - wchar_t*,size_t,wchar_t*,size_t); -int __cdecl _wsystem(const wchar_t*); -double __cdecl _wtof(const wchar_t*); -int __cdecl _wtoi(const wchar_t*); -__int64 __cdecl _wtoi64(const wchar_t*); -__msvcrt_long __cdecl _wtol(const wchar_t*); - -size_t __cdecl mbstowcs(wchar_t*,const char*,size_t); -errno_t __cdecl mbstowcs_s(size_t*,wchar_t*,size_t,const char*,size_t); -int __cdecl mbtowc(wchar_t*,const char*,size_t); -float __cdecl wcstof(const wchar_t*,wchar_t**); -double __cdecl wcstod(const wchar_t*,wchar_t**); -__msvcrt_long __cdecl wcstol(const wchar_t*,wchar_t**,int); -size_t __cdecl wcstombs(char*,const wchar_t*,size_t); -errno_t __cdecl wcstombs_s(size_t*,char*,size_t,const wchar_t*,size_t); -__msvcrt_ulong __cdecl wcstoul(const wchar_t*,wchar_t**,int); -int __cdecl wctomb(char*,wchar_t); -__int64 __cdecl _wcstoi64(const wchar_t*,wchar_t**,int); -__int64 __cdecl _wcstoi64_l(const wchar_t*,wchar_t**,int,_locale_t); -unsigned __int64 __cdecl _wcstoui64(const wchar_t*,wchar_t**,int); -unsigned __int64 __cdecl _wcstoui64_l(const wchar_t*,wchar_t**,int,_locale_t); -#endif /* _WSTDLIB_DEFINED */ - typedef void (__cdecl *_invalid_parameter_handler)(const wchar_t*, const wchar_t*, const wchar_t*, unsigned, uintptr_t); _invalid_parameter_handler __cdecl _set_invalid_parameter_handler(_invalid_parameter_handler); _invalid_parameter_handler __cdecl _get_invalid_parameter_handler(void); diff --git a/include/msvcrt/wchar.h b/include/msvcrt/wchar.h index 6b30645dc0..2daa6de169 100644 --- a/include/msvcrt/wchar.h +++ b/include/msvcrt/wchar.h @@ -8,9 +8,10 @@ #ifndef __WINE_WCHAR_H #define __WINE_WCHAR_H -#include <corecrt_wstdio.h> #include <corecrt_wctype.h> #include <corecrt_wio.h> +#include <corecrt_wstdio.h> +#include <corecrt_wstdlib.h> #include <corecrt_wtime.h> #include <string.h> #include <sys/stat.h> @@ -61,46 +62,6 @@ int __cdecl _wspawnvpe(int,const wchar_t*,const wchar_t* const *,const wcha int __cdecl _wsystem(const wchar_t*); #endif /* _WPROCESS_DEFINED */ -#ifndef _WSTDLIB_DEFINED -#define _WSTDLIB_DEFINED -wchar_t* __cdecl _itow(int,wchar_t*,int); -errno_t __cdecl _itow_s(int,wchar_t*,int, int); -wchar_t* __cdecl _i64tow(__int64,wchar_t*,int); -errno_t __cdecl _i64tow_s(__int64, wchar_t*, size_t, int); -wchar_t* __cdecl _ltow(__msvcrt_long,wchar_t*,int); -errno_t __cdecl _ltow_s(__msvcrt_long,wchar_t*,int,int); -wchar_t* __cdecl _ui64tow(unsigned __int64,wchar_t*,int); -errno_t __cdecl _ui64tow_s(unsigned __int64, wchar_t*, size_t, int); -wchar_t* __cdecl _ultow(__msvcrt_ulong,wchar_t*,int); -errno_t __cdecl _ultow_s(__msvcrt_ulong, wchar_t*, size_t, int); -wchar_t* __cdecl _wfullpath(wchar_t*,const wchar_t*,size_t); -wchar_t* __cdecl _wgetenv(const wchar_t*); -void __cdecl _wmakepath(wchar_t*,const wchar_t*,const wchar_t*,const wchar_t*,const wchar_t*); -int __cdecl _wmakepath_s(wchar_t*,size_t,const wchar_t*,const wchar_t*,const wchar_t*,const wchar_t*); -void __cdecl _wperror(const wchar_t*); -int __cdecl _wputenv(const wchar_t*); -void __cdecl _wsearchenv(const wchar_t*,const wchar_t*,wchar_t*); -void __cdecl _wsplitpath(const wchar_t*,wchar_t*,wchar_t*,wchar_t*,wchar_t*); -errno_t __cdecl _wsplitpath_s(const wchar_t*,wchar_t*,size_t,wchar_t*,size_t, - wchar_t*,size_t,wchar_t*,size_t); -int __cdecl _wsystem(const wchar_t*); -double __cdecl _wtof(const wchar_t*); -int __cdecl _wtoi(const wchar_t*); -__int64 __cdecl _wtoi64(const wchar_t*); -__msvcrt_long __cdecl _wtol(const wchar_t*); - -size_t __cdecl mbstowcs(wchar_t*,const char*,size_t); -errno_t __cdecl mbstowcs_s(size_t*,wchar_t*,size_t,const char*,size_t); -int __cdecl mbtowc(wchar_t*,const char*,size_t); -float __cdecl wcstof(const wchar_t*,wchar_t**); -double __cdecl wcstod(const wchar_t*,wchar_t**); -__msvcrt_long __cdecl wcstol(const wchar_t*,wchar_t**,int); -size_t __cdecl wcstombs(char*,const wchar_t*,size_t); -errno_t __cdecl wcstombs_s(size_t*,char*,size_t,const wchar_t*,size_t); -__msvcrt_ulong __cdecl wcstoul(const wchar_t*,wchar_t**,int); -int __cdecl wctomb(char*,wchar_t); -#endif /* _WSTDLIB_DEFINED */ - #ifndef _WSTRING_DEFINED #define _WSTRING_DEFINED int __cdecl _wcscoll_l(const wchar_t*,const wchar_t*,_locale_t);

1 0

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

24 Feb '20

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

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

24 Feb '20

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

Zebediah Figura : d3d8: Retrieve pixel shader constants from the primary stateblock.
by Alexandre Julliard 24 Feb '20

24 Feb '20

Module: wine Branch: master Commit: a7afb912d99d1467dcb6b4b5695f1a37b412468a URL: https://source.winehq.org/git/wine.git/?a=commit;h=a7afb912d99d1467dcb6b4b5… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Feb 21 17:04:45 2020 -0600 d3d8: Retrieve pixel shader constants 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 | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 957f663174..d9f914f125 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -3298,19 +3298,22 @@ static HRESULT WINAPI d3d8_device_SetPixelShaderConstant(IDirect3DDevice8 *iface } static HRESULT WINAPI d3d8_device_GetPixelShaderConstant(IDirect3DDevice8 *iface, - DWORD start_register, void *data, DWORD count) + DWORD start_idx, void *constants, DWORD count) { struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); - HRESULT hr; + const struct wined3d_vec4 *src; - TRACE("iface %p, start_register %u, data %p, count %u.\n", - iface, start_register, data, count); + TRACE("iface %p, start_idx %u, constants %p, count %u.\n", iface, start_idx, constants, count); + + if (!constants || start_idx >= WINED3D_MAX_PS_CONSTS_F || count > WINED3D_MAX_PS_CONSTS_F - start_idx) + return WINED3DERR_INVALIDCALL; wined3d_mutex_lock(); - hr = wined3d_device_get_ps_consts_f(device->wined3d_device, start_register, count, data); + src = wined3d_stateblock_get_state(device->state)->ps_consts_f; + memcpy(constants, &src[start_idx], count * sizeof(*src)); wined3d_mutex_unlock(); - return hr; + return D3D_OK; } static HRESULT WINAPI d3d8_device_GetPixelShaderFunction(IDirect3DDevice8 *iface,

1 0

Zebediah Figura : d3d8: Stop setting the device state in d3d8_device_SetPixelShaderConstant().
by Alexandre Julliard 24 Feb '20

24 Feb '20

Module: wine Branch: master Commit: 84f9bc17161f6c2bf1be7516ca206da94b225f1c URL: https://source.winehq.org/git/wine.git/?a=commit;h=84f9bc17161f6c2bf1be7516… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Feb 21 17:04:46 2020 -0600 d3d8: Stop setting the device state in d3d8_device_SetPixelShaderConstant(). 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 | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index d9f914f125..19dc844ee2 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -3290,8 +3290,6 @@ static HRESULT WINAPI d3d8_device_SetPixelShaderConstant(IDirect3DDevice8 *iface wined3d_mutex_lock(); hr = wined3d_stateblock_set_ps_consts_f(device->update_state, start_register, count, data); - if (SUCCEEDED(hr) && !device->recording) - hr = wined3d_device_set_ps_consts_f(device->wined3d_device, start_register, count, data); wined3d_mutex_unlock(); return hr;

1 0

Zebediah Figura : d3d8: Retrieve textures from the primary stateblock.
by Alexandre Julliard 24 Feb '20

24 Feb '20

Module: wine Branch: master Commit: 19e5693c91be1442d5105427b0badd6ef4a28fd6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=19e5693c91be1442d5105427… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Feb 21 17:04:47 2020 -0600 d3d8: Retrieve textures 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 | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 19dc844ee2..481f4f3846 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2165,8 +2165,18 @@ static HRESULT WINAPI d3d8_device_GetTexture(IDirect3DDevice8 *iface, DWORD stag if (!texture) return D3DERR_INVALIDCALL; + if (stage >= WINED3DVERTEXTEXTURESAMPLER0 && stage <= WINED3DVERTEXTEXTURESAMPLER3) + stage -= (WINED3DVERTEXTEXTURESAMPLER0 - WINED3D_MAX_FRAGMENT_SAMPLERS); + + if (stage >= WINED3D_MAX_COMBINED_SAMPLERS) + { + WARN("Ignoring invalid stage %u.\n", stage); + *texture = NULL; + return D3D_OK; + } + wined3d_mutex_lock(); - if ((wined3d_texture = wined3d_device_get_texture(device->wined3d_device, stage))) + if ((wined3d_texture = wined3d_stateblock_get_state(device->state)->textures[stage])) { texture_impl = wined3d_texture_get_parent(wined3d_texture); *texture = &texture_impl->IDirect3DBaseTexture8_iface;

1 0

Zebediah Figura : d3d8: Stop setting the device state in d3d8_device_SetTexture().
by Alexandre Julliard 24 Feb '20

24 Feb '20

Module: wine Branch: master Commit: 27e8a5dd63aa9b0dea83ceea2355364fe89d6488 URL: https://source.winehq.org/git/wine.git/?a=commit;h=27e8a5dd63aa9b0dea83ceea… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Feb 21 17:04:48 2020 -0600 d3d8: Stop setting the device state in d3d8_device_SetTexture(). 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 | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 481f4f3846..7c1a6fe9fd 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2203,9 +2203,6 @@ static HRESULT WINAPI d3d8_device_SetTexture(IDirect3DDevice8 *iface, DWORD stag wined3d_mutex_lock(); wined3d_stateblock_set_texture(device->update_state, stage, texture_impl ? texture_impl->wined3d_texture : NULL); - if (!device->recording) - wined3d_device_set_texture(device->wined3d_device, stage, - texture_impl ? texture_impl->wined3d_texture : NULL); wined3d_mutex_unlock(); return D3D_OK;

1 0

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

24 Feb '20

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

Zebediah Figura : d3d8: Stop setting the device state in d3d8_device_SetTextureStageState().
by Alexandre Julliard 24 Feb '20

24 Feb '20

Module: wine Branch: master Commit: c4ebd986b86b04da665e241142a6e14ddb65566d URL: https://source.winehq.org/git/wine.git/?a=commit;h=c4ebd986b86b04da665e2411… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Feb 21 17:04:50 2020 -0600 d3d8: Stop setting the device state in d3d8_device_SetTextureStageState(). 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 | 8 -------- 1 file changed, 8 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 41384d84bc..5e18f64550 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2306,17 +2306,9 @@ static HRESULT WINAPI d3d8_device_SetTextureStageState(IDirect3DDevice8 *iface, wined3d_mutex_lock(); if (l->sampler_state) - { wined3d_stateblock_set_sampler_state(device->update_state, stage, l->u.sampler_state, value); - if (!device->recording) - wined3d_device_set_sampler_state(device->wined3d_device, stage, l->u.sampler_state, value); - } else - { wined3d_stateblock_set_texture_stage_state(device->update_state, stage, l->u.texture_state, value); - if (!device->recording) - wined3d_device_set_texture_stage_state(device->wined3d_device, stage, l->u.texture_state, value); - } wined3d_mutex_unlock(); return D3D_OK;

1 0