wine-commits January 2016

wine-commits@winehq.org

2 participants
627 discussions

Józef Kucia : wined3d: Handle swizzle type equal to 0 as NOSWIZZLE.
by Alexandre Julliard 19 Jan '16

19 Jan '16

Module: wine Branch: master Commit: 4235d59d29fa41677079d9012286a7ff18a48705 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4235d59d29fa41677079d9012… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jan 18 21:16:42 2016 +0100 wined3d: Handle swizzle type equal to 0 as NOSWIZZLE. Just to silent unnecessary FIXME messages. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/shader_sm4.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 710434b..ae148da 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -175,6 +175,7 @@ enum wined3d_sm4_input_primitive_type enum wined3d_sm4_swizzle_type { + WINED3D_SM4_SWIZZLE_NONE = 0x0, WINED3D_SM4_SWIZZLE_VEC4 = 0x1, WINED3D_SM4_SWIZZLE_SCALAR = 0x2, }; @@ -725,6 +726,10 @@ static BOOL shader_sm4_read_src_param(struct wined3d_sm4_data *priv, const DWORD switch (swizzle_type) { + case WINED3D_SM4_SWIZZLE_NONE: + src_param->swizzle = WINED3DSP_NOSWIZZLE; + break; + case WINED3D_SM4_SWIZZLE_SCALAR: src_param->swizzle = (token & WINED3D_SM4_SWIZZLE_MASK) >> WINED3D_SM4_SWIZZLE_SHIFT; src_param->swizzle = (src_param->swizzle & 0x3) * 0x55;

1 0

Piotr Caban : msvcr: Sync spec files.
by Alexandre Julliard 19 Jan '16

19 Jan '16

Module: wine Branch: master Commit: aae728eae99d706ab7f046bb07dbecf0a3428398 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aae728eae99d706ab7f046bb0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jan 19 11:45:24 2016 +0100 msvcr: Sync spec files. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-math-l1-1-0.spec | 14 +++++++------- .../api-ms-win-crt-multibyte-l1-1-0.spec | 2 +- .../api-ms-win-crt-time-l1-1-0.spec | 4 ++-- dlls/ucrtbase/ucrtbase.spec | 20 ++++++++++---------- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec index 12c9ac8..2a2ed6e 100644 --- a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec +++ b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec @@ -55,7 +55,7 @@ @ stub _dexp @ stub _dlog @ stub _dnorm -@ stub _dpcomp +@ cdecl _dpcomp(double double) ucrtbase._dpcomp @ stub _dpoly @ stub _dscale @ cdecl _dsign(double) ucrtbase._dsign @@ -69,7 +69,7 @@ @ stub _fdlog @ stub _fdnorm @ cdecl _fdopen(long str) ucrtbase._fdopen -@ stub _fdpcomp +@ cdecl _fdpcomp(float float) ucrtbase._fdpcomp @ stub _fdpoly @ stub _fdscale @ cdecl _fdsign(float) ucrtbase._fdsign @@ -93,7 +93,7 @@ @ cdecl _ldclass(double) ucrtbase._ldclass @ stub _ldexp @ stub _ldlog -@ stub _ldpcomp +@ cdecl _ldpcomp(double double) ucrtbase._ldpcomp @ stub _ldpoly @ stub _ldscale @ cdecl _ldsign(double) ucrtbase._ldsign @@ -117,7 +117,7 @@ @ cdecl -arch=arm,x86_64 _nextafterf(float float) ucrtbase._nextafterf @ cdecl _scalb(double long) ucrtbase._scalb @ cdecl -arch=arm,x86_64 _scalbf(float long) ucrtbase._scalbf -@ stub _set_FMA3_enable +@ cdecl -arch=win64 _set_FMA3_enable(long) ucrtbase._set_FMA3_enable @ cdecl -arch=i386 _set_SSE2_enable(long) ucrtbase._set_SSE2_enable @ cdecl _y0(double) ucrtbase._y0 @ cdecl _y1(double) ucrtbase._y1 @@ -246,9 +246,9 @@ @ cdecl fmax(double double) ucrtbase.fmax @ cdecl fmaxf(float float) ucrtbase.fmaxf @ cdecl fmaxl(double double) ucrtbase.fmaxl -@ stub fmin -@ stub fminf -@ stub fminl +@ cdecl fmin(double double) ucrtbase.fmin +@ cdecl fminf(float float) ucrtbase.fminf +@ cdecl fminl(double double) ucrtbase.fminl @ cdecl fmod(double double) ucrtbase.fmod @ cdecl -arch=arm,x86_64 fmodf(float float) ucrtbase.fmodf @ cdecl frexp(double ptr) ucrtbase.frexp diff --git a/dlls/api-ms-win-crt-multibyte-l1-1-0/api-ms-win-crt-multibyte-l1-1-0.spec b/dlls/api-ms-win-crt-multibyte-l1-1-0/api-ms-win-crt-multibyte-l1-1-0.spec index 568b4ef..d0adc14 100644 --- a/dlls/api-ms-win-crt-multibyte-l1-1-0/api-ms-win-crt-multibyte-l1-1-0.spec +++ b/dlls/api-ms-win-crt-multibyte-l1-1-0/api-ms-win-crt-multibyte-l1-1-0.spec @@ -104,7 +104,7 @@ @ stub _mbscspn_l @ cdecl _mbsdec(ptr ptr) ucrtbase._mbsdec @ stub _mbsdec_l -@ stub _mbsdup +@ cdecl _mbsdup(str) ucrtbase._mbsdup @ cdecl _mbsicmp(str str) ucrtbase._mbsicmp @ stub _mbsicmp_l @ cdecl _mbsicoll(str str) ucrtbase._mbsicoll diff --git a/dlls/api-ms-win-crt-time-l1-1-0/api-ms-win-crt-time-l1-1-0.spec b/dlls/api-ms-win-crt-time-l1-1-0/api-ms-win-crt-time-l1-1-0.spec index b619703..80b79cb 100644 --- a/dlls/api-ms-win-crt-time-l1-1-0/api-ms-win-crt-time-l1-1-0.spec +++ b/dlls/api-ms-win-crt-time-l1-1-0/api-ms-win-crt-time-l1-1-0.spec @@ -56,9 +56,9 @@ @ cdecl _wasctime_s(ptr long ptr) ucrtbase._wasctime_s @ stub _wcsftime_l @ cdecl _wctime32(ptr) ucrtbase._wctime32 -@ stub _wctime32_s +@ cdecl _wctime32_s(ptr long ptr) ucrtbase._wctime32_s @ cdecl _wctime64(ptr) ucrtbase._wctime64 -@ stub _wctime64_s +@ cdecl _wctime64_s(ptr long ptr) ucrtbase._wctime64_s @ cdecl _wstrdate(ptr) ucrtbase._wstrdate @ cdecl _wstrdate_s(ptr long) ucrtbase._wstrdate_s @ cdecl _wstrtime(ptr) ucrtbase._wstrtime diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 3478342..e65a1c0 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -255,7 +255,7 @@ @ cdecl _difftime64(long long) MSVCRT__difftime64 @ stub _dlog @ stub _dnorm -@ stub _dpcomp +@ cdecl _dpcomp(double double) MSVCR120__dpcomp @ stub _dpoly @ stub _dscale @ cdecl _dsign(double) MSVCR120__dsign @@ -296,7 +296,7 @@ @ stub _fdlog @ stub _fdnorm @ cdecl _fdopen(long str) MSVCRT__fdopen -@ stub _fdpcomp +@ cdecl _fdpcomp(float float) MSVCR120__fdpcomp @ stub _fdpoly @ stub _fdscale @ cdecl _fdsign(float) MSVCR120__fdsign @@ -534,7 +534,7 @@ @ cdecl _ldclass(double) MSVCR120__ldclass @ stub _ldexp @ stub _ldlog -@ stub _ldpcomp +@ cdecl _ldpcomp(double double) MSVCR120__dpcomp @ stub _ldpoly @ stub _ldscale @ cdecl _ldsign(double) MSVCR120__dsign @@ -623,7 +623,7 @@ @ stub _mbscspn_l @ cdecl _mbsdec(ptr ptr) @ stub _mbsdec_l -@ stub _mbsdup +@ stub _mbsdup(str) @ cdecl _mbsicmp(str str) @ stub _mbsicmp_l @ cdecl _mbsicoll(str str) @@ -1876,7 +1876,7 @@ @ cdecl _searchenv_s(str str ptr long) MSVCRT__searchenv_s @ cdecl -arch=i386,x86_64,arm _seh_filter_dll(long ptr) __CppXcptFilter @ cdecl _seh_filter_exe(long ptr) _XcptFilter -@ stub _set_FMA3_enable +@ cdecl -arch=win64 _set_FMA3_enable(long) MSVCRT__set_FMA3_enable @ stdcall -arch=i386 _seh_longjmp_unwind4(ptr) @ stdcall -arch=i386 _seh_longjmp_unwind(ptr) @ cdecl -arch=i386 _set_SSE2_enable(long) MSVCRT__set_SSE2_enable @@ -2057,9 +2057,9 @@ @ cdecl _wcsupr_s_l(wstr long ptr) MSVCRT__wcsupr_s_l @ cdecl _wcsxfrm_l(ptr wstr long ptr) MSVCRT__wcsxfrm_l @ cdecl _wctime32(ptr) MSVCRT__wctime32 -@ stub _wctime32_s +@ cdecl _wctime32_s(ptr long ptr) MSVCRT__wctime32_s @ cdecl _wctime64(ptr) MSVCRT__wctime64 -@ stub _wctime64_s +@ cdecl _wctime64_s(ptr long ptr) MSVCRT__wctime64_s @ cdecl _wctomb_l(ptr long ptr) MSVCRT__wctomb_l @ cdecl _wctomb_s_l(ptr ptr long long ptr) MSVCRT__wctomb_s_l @ stub _wctype @@ -2310,9 +2310,9 @@ @ cdecl fmax(double double) MSVCR120_fmax @ cdecl fmaxf(float float) MSVCR120_fmaxf @ cdecl fmaxl(double double) MSVCR120_fmax -@ stub fmin -@ stub fminf -@ stub fminl +@ cdecl fmin(double double) MSVCR120_fmin +@ cdecl fminf(float float) MSVCR120_fminf +@ cdecl fminl(double double) MSVCR120_fmin @ cdecl fmod(double double) MSVCRT_fmod @ cdecl -arch=arm,x86_64 fmodf(float float) MSVCRT_fmodf @ cdecl fopen(str str) MSVCRT_fopen

1 0

Piotr Caban : msvcr120: Add _set_FMA3_enable stub.
by Alexandre Julliard 19 Jan '16

19 Jan '16

Module: wine Branch: master Commit: 68fedc12681ecacc714c01e9a34266ef70e8d6ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=68fedc12681ecacc714c01e9a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jan 18 21:08:29 2016 +0100 msvcr120: Add _set_FMA3_enable stub. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcrt/math.c | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 361e3d2..69cb2c1 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1639,7 +1639,7 @@ @ stdcall -arch=i386 _seh_longjmp_unwind4(ptr) @ stdcall -arch=i386 _seh_longjmp_unwind(ptr) @ cdecl -arch=i386 _set_SSE2_enable(long) MSVCRT__set_SSE2_enable -@ stub -arch=win64 _set_FMA3_enable +@ cdecl -arch=win64 _set_FMA3_enable(long) MSVCRT__set_FMA3_enable @ cdecl _set_abort_behavior(long long) MSVCRT__set_abort_behavior @ cdecl _set_controlfp(long long) @ cdecl _set_doserrno(long) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index fc88f03..0a3f2da 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -73,6 +73,17 @@ int CDECL MSVCRT__set_SSE2_enable(int flag) return sse2_enabled; } +#ifdef _WIN64 +/********************************************************************* + * _set_FMA3_enable (MSVCR120.@) + */ +int CDECL MSVCRT__set_FMA3_enable(int flag) +{ + FIXME("(%x) stub\n", flag); + return 0; +} +#endif + #if defined(__x86_64__) || defined(__arm__) || _MSVCR_VER>=120 /*********************************************************************

1 0

Piotr Caban : msvcr120: Add _dpcomp implementation.
by Alexandre Julliard 18 Jan '16

18 Jan '16

Module: wine Branch: master Commit: 4083af404b2ef9e0b0928a6f685f2efa8567c80b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4083af404b2ef9e0b0928a6f6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jan 18 12:57:39 2016 +0100 msvcr120: Add _dpcomp implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr120/msvcr120.spec | 6 +++--- dlls/msvcr120/tests/msvcr120.c | 37 +++++++++++++++++++++++++++++++++++++ dlls/msvcr120_app/msvcr120_app.spec | 6 +++--- dlls/msvcrt/math.c | 21 +++++++++++++++++++++ 4 files changed, 64 insertions(+), 6 deletions(-) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index b738155..361e3d2 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1110,7 +1110,7 @@ @ cdecl _difftime32(long long) MSVCRT__difftime32 @ cdecl _difftime64(long long) MSVCRT__difftime64 @ stub _dosmaperr -@ stub _dpcomp +@ cdecl _dpcomp(double double) MSVCR120__dpcomp @ cdecl _dsign(double) MSVCR120__dsign @ extern _dstbias MSVCRT__dstbias @ cdecl _dtest(ptr) MSVCR120__dtest @@ -1144,7 +1144,7 @@ @ cdecl _fcvt_s(ptr long double long ptr ptr) MSVCRT__fcvt_s @ cdecl _fdclass(float) MSVCR120__fdclass @ cdecl _fdopen(long str) MSVCRT__fdopen -@ stub _fdpcomp +@ cdecl _fdpcomp(float float) MSVCR120__fdpcomp @ cdecl _fdsign(float) MSVCR120__fdsign @ cdecl _fdtest(ptr) MSVCR120__fdtest @ cdecl _fflush_nolock(ptr) MSVCRT__fflush_nolock @@ -1392,7 +1392,7 @@ @ cdecl _jn(long double) MSVCRT__jn @ cdecl _kbhit() @ cdecl _ldclass(double) MSVCR120__ldclass -@ stub _ldpcomp +@ cdecl _ldpcomp(double double) MSVCR120__dpcomp @ cdecl _ldsign(double) MSVCR120__dsign @ cdecl _ldtest(ptr) MSVCR120__ldtest @ cdecl _lfind(ptr ptr ptr long ptr) diff --git a/dlls/msvcr120/tests/msvcr120.c b/dlls/msvcr120/tests/msvcr120.c index 330c6b1..708fada 100644 --- a/dlls/msvcr120/tests/msvcr120.c +++ b/dlls/msvcr120/tests/msvcr120.c @@ -28,6 +28,20 @@ #include <locale.h> +static inline float __port_infinity(void) +{ + static const unsigned __inf_bytes = 0x7f800000; + return *(const float *)&__inf_bytes; +} +#define INFINITY __port_infinity() + +static inline float __port_nan(void) +{ + static const unsigned __nan_bytes = 0x7fc00000; + return *(const float *)&__nan_bytes; +} +#define NAN __port_nan() + struct MSVCRT_lconv { char* decimal_point; @@ -63,6 +77,7 @@ static struct MSVCRT_lconv* (CDECL *p_localeconv)(void); static size_t (CDECL *p_wcstombs_s)(size_t *ret, char* dest, size_t sz, const wchar_t* src, size_t max); static int (CDECL *p__dsign)(double); static int (CDECL *p__fdsign)(float); +static int (__cdecl *p__dpcomp)(double x, double y); static wchar_t** (CDECL *p____lc_locale_name_func)(void); static unsigned int (CDECL *p__GetConcurrency)(void); @@ -82,6 +97,7 @@ static BOOL init(void) p_wcstombs_s = (void*)GetProcAddress(module, "wcstombs_s"); p__dsign = (void*)GetProcAddress(module, "_dsign"); p__fdsign = (void*)GetProcAddress(module, "_fdsign"); + p__dpcomp = (void*)GetProcAddress(module, "_dpcomp"); p____lc_locale_name_func = (void*)GetProcAddress(module, "___lc_locale_name_func"); p__GetConcurrency = (void*)GetProcAddress(module,"?_GetConcurrency@details@Concurrency@@YAIXZ"); return TRUE; @@ -175,6 +191,26 @@ static void test__dsign(void) ok(ret == 0x8000, "p_fdsign(-1) = %x\n", ret); } +static void test__dpcomp(void) +{ + struct { + double x, y; + int ret; + } tests[] = { + {0, 0, 2}, {1, 1, 2}, {-1, -1, 2}, + {-2, -1, 1}, {-1, 1, 1}, {1, 2, 1}, + {1, -1, 4}, {2, 1, 4}, {-1, -2, 4}, + {NAN, NAN, 0}, {NAN, 1, 0}, {1, NAN, 0}, + {INFINITY, INFINITY, 2}, {-1, INFINITY, 1}, {1, INFINITY, 1}, + }; + int i, ret; + + for(i=0; i<sizeof(tests)/sizeof(*tests); i++) { + ret = p__dpcomp(tests[i].x, tests[i].y); + ok(ret == tests[i].ret, "%d) dpcomp(%f, %f) = %x\n", i, tests[i].x, tests[i].y, ret); + } +} + static void test____lc_locale_name_func(void) { struct { @@ -238,6 +274,7 @@ START_TEST(msvcr120) if (!init()) return; test_lconv(); test__dsign(); + test__dpcomp(); test____lc_locale_name_func(); test__GetConcurrency(); } diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index ec18f21..1e4554f 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1049,7 +1049,7 @@ @ cdecl _difftime32(long long) msvcr120._difftime32 @ cdecl _difftime64(long long) msvcr120._difftime64 @ stub _dosmaperr -@ stub _dpcomp +@ cdecl _dpcomp(double double) msvcr120._dpcomp @ cdecl _dsign(double) msvcr120._dsign @ extern _dstbias msvcr120._dstbias @ cdecl _dtest(ptr) msvcr120._dtest @@ -1072,7 +1072,7 @@ @ cdecl _fcvt_s(ptr long double long ptr ptr) msvcr120._fcvt_s @ cdecl _fdclass(float) msvcr120._fdclass @ cdecl _fdopen(long str) msvcr120._fdopen -@ stub _fdpcomp +@ cdecl _fdpcomp(float float) msvcr120._fdpcomp @ cdecl _fdsign(float) msvcr120._fdsign @ cdecl _fdtest(ptr) msvcr120._fdtest @ cdecl _fflush_nolock(ptr) msvcr120._fflush_nolock @@ -1256,7 +1256,7 @@ @ cdecl _j1(double) msvcr120._j1 @ cdecl _jn(long double) msvcr120._jn @ cdecl _ldclass(double) msvcr120._ldclass -@ stub _ldpcomp +@ cdecl _ldpcomp(double double) msvcr120._ldpcomp @ cdecl _ldsign(double) msvcr120._ldsign @ cdecl _ldtest(ptr) msvcr120._ldtest @ cdecl _lfind(ptr ptr ptr long ptr) msvcr120._lfind diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 661a1b4..fc88f03 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -2684,6 +2684,27 @@ int CDECL MSVCR120__dsign(double x) return signbit(x) ? 0x8000 : 0; } + +/********************************************************************* + * _dpcomp (MSVCR120.@) + */ +int CDECL MSVCR120__dpcomp(double x, double y) +{ + if(isnan(x) || isnan(y)) + return 0; + + if(x == y) return 2; + return x < y ? 1 : 4; +} + +/********************************************************************* + * _fdpcomp (MSVCR120.@) + */ +int CDECL MSVCR120__fdpcomp(float x, float y) +{ + return MSVCR120__dpcomp(x, y); +} + /********************************************************************* * fminf (MSVCR120.@) */

1 0

Huw Davies : bcrypt: Ensure we have gnutls_hash() available.
by Alexandre Julliard 18 Jan '16

18 Jan '16

Module: wine Branch: master Commit: 625801ed7e765a89fe98e410d6272e9ce09adeb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=625801ed7e765a89fe98e410d… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jan 18 12:52:40 2016 +0000 bcrypt: Ensure we have gnutls_hash() available. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 16 ++++++++++++++++ configure.ac | 2 ++ dlls/bcrypt/bcrypt_main.c | 10 +++++----- include/config.h.in | 3 +++ 4 files changed, 26 insertions(+), 5 deletions(-) diff --git a/configure b/configure index ab5434a..d82731e 100755 --- a/configure +++ b/configure @@ -11595,6 +11595,22 @@ CPPFLAGS=$ac_save_CPPFLAGS test -z "$GNUTLS_CFLAGS" || GNUTLS_CFLAGS=`echo " $GNUTLS_CFLAGS" | sed 's/ -I$[^/]$/ -I\$(top_builddir)\/\1/g'` test -z "$GNUTLS_LIBS" || GNUTLS_LIBS=`echo " $GNUTLS_LIBS" | sed 's/ -L$[^/]$/ -L\$(top_builddir)\/\1/g'` + ac_wine_check_funcs_save_LIBS="$LIBS" +LIBS="$LIBS $GNUTLS_LIBS" +for ac_func in gnutls_hash +do : + ac_fn_c_check_func "$LINENO" "gnutls_hash" "ac_cv_func_gnutls_hash" +if test "x$ac_cv_func_gnutls_hash" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_GNUTLS_HASH 1 +_ACEOF + +else + as_fn_append wine_notices "|libgnutls ${notice_platform}development files too old, no bcrypt hash support." +fi +done + +LIBS="$ac_wine_check_funcs_save_LIBS" fi if test "x$ac_cv_lib_soname_gnutls" = "x"; then : case "x$with_gnutls" in diff --git a/configure.ac b/configure.ac index 0766edf..d2eac29 100644 --- a/configure.ac +++ b/configure.ac @@ -1270,6 +1270,8 @@ then #include <gnutls/crypto.h>]], [[static typeof(gnutls_mac_get_key_size) *func; if (func) return 0;]])], [WINE_CHECK_SONAME(gnutls,gnutls_global_init,,[GNUTLS_CFLAGS=""],[$GNUTLS_LIBS],[[libgnutls\$-deb0\$\\{0,1\\}]])])], [GNUTLS_CFLAGS=""])]) + WINE_CHECK_LIB_FUNCS(gnutls_hash,[$GNUTLS_LIBS],, + [WINE_NOTICE([libgnutls ${notice_platform}development files too old, no bcrypt hash support.])]) fi WINE_WARNING_WITH(gnutls,[test "x$ac_cv_lib_soname_gnutls" = "x"], [libgnutls ${notice_platform}development files not found, no schannel support.]) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 227399f..fdd6911 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -43,7 +43,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(bcrypt); static HINSTANCE instance; -#if defined(SONAME_LIBGNUTLS) && !defined(HAVE_COMMONCRYPTO_COMMONDIGEST_H) +#if defined(HAVE_GNUTLS_HASH) && !defined(HAVE_COMMONCRYPTO_COMMONDIGEST_H) WINE_DECLARE_DEBUG_CHANNEL(winediag); static void *libgnutls_handle; @@ -116,7 +116,7 @@ static void gnutls_uninitialize(void) wine_dlclose( libgnutls_handle, NULL, 0 ); libgnutls_handle = NULL; } -#endif /* SONAME_LIBGNUTLS && !HAVE_COMMONCRYPTO_COMMONDIGEST_H */ +#endif /* HAVE_GNUTLS_HASH && !HAVE_COMMONCRYPTO_COMMONDIGEST_H */ NTSTATUS WINAPI BCryptEnumAlgorithms(ULONG dwAlgOperations, ULONG *pAlgCount, BCRYPT_ALGORITHM_IDENTIFIER **ppAlgList, ULONG dwFlags) @@ -338,7 +338,7 @@ static NTSTATUS hash_finish( struct hash *hash, UCHAR *output, ULONG size ) } return STATUS_SUCCESS; } -#elif defined(SONAME_LIBGNUTLS) +#elif defined(HAVE_GNUTLS_HASH) struct hash { struct object hdr; @@ -642,14 +642,14 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) case DLL_PROCESS_ATTACH: instance = hinst; DisableThreadLibraryCalls( hinst ); -#if defined(SONAME_LIBGNUTLS) && !defined(HAVE_COMMONCRYPTO_COMMONDIGEST_H) +#if defined(HAVE_GNUTLS_HASH) && !defined(HAVE_COMMONCRYPTO_COMMONDIGEST_H) gnutls_initialize(); #endif break; case DLL_PROCESS_DETACH: if (reserved) break; -#if defined(SONAME_LIBGNUTLS) && !defined(HAVE_COMMONCRYPTO_COMMONDIGEST_H) +#if defined(HAVE_GNUTLS_HASH) && !defined(HAVE_COMMONCRYPTO_COMMONDIGEST_H) gnutls_uninitialize(); #endif break; diff --git a/include/config.h.in b/include/config.h.in index 514e5fe..805374e 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -228,6 +228,9 @@ /* Define to 1 if you have the `getuid' function. */ #undef HAVE_GETUID +/* Define to 1 if you have the `gnutls_hash' function. */ +#undef HAVE_GNUTLS_HASH + /* Define if we have the libgphoto2 development environment */ #undef HAVE_GPHOTO2

1 0

Nikolay Sivov : comctl32/trackbar: Update thumb immediately on key press.
by Alexandre Julliard 18 Jan '16

18 Jan '16

Module: wine Branch: master Commit: 88ea4c520b9c4a810bf88b7053d36f7151272943 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88ea4c520b9c4a810bf88b705… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 18 19:43:57 2016 +1100 comctl32/trackbar: Update thumb immediately on key press. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/trackbar.c | 9 ++++++++- dlls/comctl32/trackbar.c | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/trackbar.c b/dlls/comctl32/tests/trackbar.c index 7c04d15..adb1b12 100644 --- a/dlls/comctl32/tests/trackbar.c +++ b/dlls/comctl32/tests/trackbar.c @@ -672,7 +672,14 @@ static void test_position(void) r = SendMessageA(hWndTrackbar, TBM_GETPOS, 0, 0); ok(r == 30, "got %d\n", r); SendMessageA(hWndTrackbar, TBM_GETTHUMBRECT, 0, (LPARAM)&rect2); - ok(rect.left != rect2.left, "got %d\n", rect.left); + ok(rect.left != rect2.left, "got %d, expected %d\n", rect2.left, rect.left); + + /* now move it with keys */ + SendMessageA(hWndTrackbar, WM_KEYDOWN, VK_END, 0); + r = SendMessageA(hWndTrackbar, TBM_GETPOS, 0, 0); + ok(r == 100, "got %d\n", r); + SendMessageA(hWndTrackbar, TBM_GETTHUMBRECT, 0, (LPARAM)&rect); + ok(rect.left != rect2.left, "got %d, expected %d\n", rect.left, rect2.left); DestroyWindow(hWndTrackbar); } diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c index c0f58db..87d955c 100644 --- a/dlls/comctl32/trackbar.c +++ b/dlls/comctl32/trackbar.c @@ -1821,7 +1821,7 @@ TRACKBAR_KeyDown (TRACKBAR_INFO *infoPtr, INT nVirtKey) } if (pos != infoPtr->lPos) { - infoPtr->flags |=TB_THUMBPOSCHANGED; + TRACKBAR_UpdateThumb (infoPtr); TRACKBAR_InvalidateThumbMove (infoPtr, pos, infoPtr->lPos); }

1 0

Józef Kucia : d3d10core/tests: Add test for SM4 resinfo instruction.
by Alexandre Julliard 18 Jan '16

18 Jan '16

Module: wine Branch: master Commit: dd294410bb160cd2eb280718d7f96719d879e5b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd294410bb160cd2eb280718d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Jan 17 22:48:51 2016 +0100 d3d10core/tests: Add test for SM4 resinfo instruction. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 68 ++++++++++++++++++------------------------- 1 file changed, 29 insertions(+), 39 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 539ded8..5d2b4c4 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -3289,54 +3289,36 @@ static void test_texture(void) 0x0000000f, 0x0300005f, 0x001010f2, 0x00000000, 0x04000067, 0x001020f2, 0x00000000, 0x00000001, 0x05000036, 0x001020f2, 0x00000000, 0x00101e46, 0x00000000, 0x0100003e, }; - static const DWORD ps_ld_0_code[] = + static const DWORD ps_ld_code[] = { #if 0 Texture2D t; - float4 main(float4 position : SV_POSITION) : SV_TARGET - { - float3 p = float3(position.x / 640.0f, position.y / 480.0f, 0.0f); - p *= float3(4.0f, 4.0f, 1.0f); - return t.Load(int3(p)); - } -#endif - 0x43425844, 0x0aef49ac, 0x02fa5594, 0xfb8a34cd, 0x8e03ee1d, 0x00000001, 0x00000168, 0x00000003, - 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, - 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000030f, 0x505f5653, 0x5449534f, 0x004e4f49, - 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, - 0x00000000, 0x0000000f, 0x545f5653, 0x45475241, 0xabab0054, 0x52444853, 0x000000cc, 0x00000040, - 0x00000033, 0x04001858, 0x00107000, 0x00000000, 0x00005555, 0x04002064, 0x00101032, 0x00000000, - 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000001, 0x05000036, 0x00100032, - 0x00000000, 0x00101046, 0x00000000, 0x08000036, 0x001000c2, 0x00000000, 0x00004002, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x0a000038, 0x001000f2, 0x00000000, 0x00100e46, 0x00000000, - 0x00004002, 0x3bcccccd, 0x3c088889, 0x3f800000, 0x3f800000, 0x0500001b, 0x001000f2, 0x00000000, - 0x00100e46, 0x00000000, 0x0700002d, 0x001020f2, 0x00000000, 0x00100e46, 0x00000000, 0x00107e46, - 0x00000000, 0x0100003e, - }; - static const DWORD ps_ld_1_code[] = - { -#if 0 - Texture2D t; + float miplevel; float4 main(float4 position : SV_POSITION) : SV_TARGET { - float3 p = float3(position.x / 640.0f, position.y / 480.0f, 1.0f); - p *= float3(2.0f, 2.0f, 1.0f); + float3 p; + t.GetDimensions(miplevel, p.x, p.y, p.z); + p.z = miplevel; + p *= float3(position.x / 640.0f, position.y / 480.0f, 1.0f); return t.Load(int3(p)); } #endif - 0x43425844, 0xd43b0155, 0x1ae5af92, 0x34e50992, 0x5e7a0d1a, 0x00000001, 0x00000154, 0x00000003, + 0x43425844, 0xbdda6bdf, 0xc6ffcdf1, 0xa58596b3, 0x822383f0, 0x00000001, 0x000001ac, 0x00000003, 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000030f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, - 0x00000000, 0x0000000f, 0x545f5653, 0x45475241, 0xabab0054, 0x52444853, 0x000000b8, 0x00000040, - 0x0000002e, 0x04001858, 0x00107000, 0x00000000, 0x00005555, 0x04002064, 0x00101032, 0x00000000, - 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000001, 0x0a000038, 0x00100032, - 0x00000000, 0x00101046, 0x00000000, 0x00004002, 0x3b4ccccd, 0x3b888889, 0x00000000, 0x00000000, - 0x0500001b, 0x00100032, 0x00000000, 0x00100046, 0x00000000, 0x08000036, 0x001000c2, 0x00000000, - 0x00004002, 0x00000000, 0x00000000, 0x00000001, 0x00000001, 0x0700002d, 0x001020f2, 0x00000000, - 0x00100e46, 0x00000000, 0x00107e46, 0x00000000, 0x0100003e, + 0x00000000, 0x0000000f, 0x545f5653, 0x45475241, 0xabab0054, 0x52444853, 0x00000110, 0x00000040, + 0x00000044, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x04001858, 0x00107000, 0x00000000, + 0x00005555, 0x04002064, 0x00101032, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, + 0x02000068, 0x00000001, 0x0600001c, 0x00100012, 0x00000000, 0x0020800a, 0x00000000, 0x00000000, + 0x0700003d, 0x001000f2, 0x00000000, 0x0010000a, 0x00000000, 0x00107e46, 0x00000000, 0x07000038, + 0x00100032, 0x00000000, 0x00100046, 0x00000000, 0x00101046, 0x00000000, 0x06000036, 0x001000c2, + 0x00000000, 0x00208006, 0x00000000, 0x00000000, 0x0a000038, 0x001000f2, 0x00000000, 0x00100e46, + 0x00000000, 0x00004002, 0x3acccccd, 0x3b088889, 0x3f800000, 0x3f800000, 0x0500001b, 0x001000f2, + 0x00000000, 0x00100e46, 0x00000000, 0x0700002d, 0x001020f2, 0x00000000, 0x00100e46, 0x00000000, + 0x00107e46, 0x00000000, 0x0100003e, }; static const DWORD ps_sample_code[] = { @@ -3393,8 +3375,7 @@ static void test_texture(void) 0x001020f2, 0x00000000, 0x00100046, 0x00000000, 0x00107e46, 0x00000000, 0x00106000, 0x00000000, 0x0020800a, 0x00000000, 0x00000000, 0x0100003e, }; - static const struct shader ps_ld_0 = {ps_ld_0_code, sizeof(ps_ld_0_code)}; - static const struct shader ps_ld_1 = {ps_ld_1_code, sizeof(ps_ld_1_code)}; + static const struct shader ps_ld = {ps_ld_code, sizeof(ps_ld_code)}; static const struct shader ps_sample = {ps_sample_code, sizeof(ps_sample_code)}; static const struct shader ps_sample_l = {ps_sample_l_code, sizeof(ps_sample_l_code)}; static const struct @@ -3485,6 +3466,7 @@ static void test_texture(void) 0xffff0000, 0xffff0000, 0xffffffff, 0xffffffff, 0xffff0000, 0xffff0000, 0xffffffff, 0xffffffff, }; + static const DWORD zero_colors[4 * 4] = {0}; static const float red[] = {1.0f, 0.0f, 0.0f, 0.5f}; static const struct test @@ -3500,8 +3482,16 @@ static void test_texture(void) } tests[] = { - {&ps_ld_0, &rgba_texture, D3D10_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, 0.0f, 0.0f, rgba_level_0}, - {&ps_ld_1, &rgba_texture, D3D10_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, 0.0f, 0.0f, level_1_colors}, + {&ps_ld, &rgba_texture, D3D10_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, 0.0f, 0.0f, rgba_level_0}, + {&ps_ld, &rgba_texture, D3D10_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, 0.0f, 1.0f, level_1_colors}, + {&ps_ld, &rgba_texture, D3D10_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, 0.0f, 2.0f, level_2_colors}, + {&ps_ld, &rgba_texture, D3D10_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, 0.0f, 3.0f, zero_colors}, + {&ps_ld, &bc1_texture, D3D10_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, 0.0f, 0.0f, bc_colors}, + {&ps_ld, &bc1_texture, D3D10_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, 0.0f, 1.0f, zero_colors}, + {&ps_ld, &bc2_texture, D3D10_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, 0.0f, 0.0f, bc_colors}, + {&ps_ld, &bc2_texture, D3D10_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, 0.0f, 1.0f, zero_colors}, + {&ps_ld, &bc3_texture, D3D10_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, 0.0f, 0.0f, bc_colors}, + {&ps_ld, &bc3_texture, D3D10_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, 0.0f, 1.0f, zero_colors}, {&ps_sample, &bc1_texture, D3D10_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, 0.0f, 0.0f, bc_colors}, {&ps_sample, &bc2_texture, D3D10_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, 0.0f, 0.0f, bc_colors}, {&ps_sample, &bc3_texture, D3D10_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, 0.0f, 0.0f, bc_colors},

1 0

Józef Kucia : d3d11/tests: Add test for SM4 resinfo instruction.
by Alexandre Julliard 18 Jan '16

18 Jan '16

Module: wine Branch: master Commit: 13f84a4b68c0227e75d62b5a83d890fbb904950f URL: http://source.winehq.org/git/wine.git/?a=commit;h=13f84a4b68c0227e75d62b5a8… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Jan 17 22:48:50 2016 +0100 d3d11/tests: Add test for SM4 resinfo instruction. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 68 +++++++++++++++++++++--------------------------- 1 file changed, 29 insertions(+), 39 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index d295f19..5c6efaf 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -2913,54 +2913,36 @@ static void test_texture(void) 0x0000000f, 0x0300005f, 0x001010f2, 0x00000000, 0x04000067, 0x001020f2, 0x00000000, 0x00000001, 0x05000036, 0x001020f2, 0x00000000, 0x00101e46, 0x00000000, 0x0100003e, }; - static const DWORD ps_ld_0_code[] = + static const DWORD ps_ld_code[] = { #if 0 Texture2D t; - float4 main(float4 position : SV_POSITION) : SV_TARGET - { - float3 p = float3(position.x / 640.0f, position.y / 480.0f, 0.0f); - p *= float3(4.0f, 4.0f, 1.0f); - return t.Load(int3(p)); - } -#endif - 0x43425844, 0x0aef49ac, 0x02fa5594, 0xfb8a34cd, 0x8e03ee1d, 0x00000001, 0x00000168, 0x00000003, - 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, - 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000030f, 0x505f5653, 0x5449534f, 0x004e4f49, - 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, - 0x00000000, 0x0000000f, 0x545f5653, 0x45475241, 0xabab0054, 0x52444853, 0x000000cc, 0x00000040, - 0x00000033, 0x04001858, 0x00107000, 0x00000000, 0x00005555, 0x04002064, 0x00101032, 0x00000000, - 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000001, 0x05000036, 0x00100032, - 0x00000000, 0x00101046, 0x00000000, 0x08000036, 0x001000c2, 0x00000000, 0x00004002, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x0a000038, 0x001000f2, 0x00000000, 0x00100e46, 0x00000000, - 0x00004002, 0x3bcccccd, 0x3c088889, 0x3f800000, 0x3f800000, 0x0500001b, 0x001000f2, 0x00000000, - 0x00100e46, 0x00000000, 0x0700002d, 0x001020f2, 0x00000000, 0x00100e46, 0x00000000, 0x00107e46, - 0x00000000, 0x0100003e, - }; - static const DWORD ps_ld_1_code[] = - { -#if 0 - Texture2D t; + float miplevel; float4 main(float4 position : SV_POSITION) : SV_TARGET { - float3 p = float3(position.x / 640.0f, position.y / 480.0f, 1.0f); - p *= float3(2.0f, 2.0f, 1.0f); + float3 p; + t.GetDimensions(miplevel, p.x, p.y, p.z); + p.z = miplevel; + p *= float3(position.x / 640.0f, position.y / 480.0f, 1.0f); return t.Load(int3(p)); } #endif - 0x43425844, 0xd43b0155, 0x1ae5af92, 0x34e50992, 0x5e7a0d1a, 0x00000001, 0x00000154, 0x00000003, + 0x43425844, 0xbdda6bdf, 0xc6ffcdf1, 0xa58596b3, 0x822383f0, 0x00000001, 0x000001ac, 0x00000003, 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000030f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, - 0x00000000, 0x0000000f, 0x545f5653, 0x45475241, 0xabab0054, 0x52444853, 0x000000b8, 0x00000040, - 0x0000002e, 0x04001858, 0x00107000, 0x00000000, 0x00005555, 0x04002064, 0x00101032, 0x00000000, - 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000001, 0x0a000038, 0x00100032, - 0x00000000, 0x00101046, 0x00000000, 0x00004002, 0x3b4ccccd, 0x3b888889, 0x00000000, 0x00000000, - 0x0500001b, 0x00100032, 0x00000000, 0x00100046, 0x00000000, 0x08000036, 0x001000c2, 0x00000000, - 0x00004002, 0x00000000, 0x00000000, 0x00000001, 0x00000001, 0x0700002d, 0x001020f2, 0x00000000, - 0x00100e46, 0x00000000, 0x00107e46, 0x00000000, 0x0100003e, + 0x00000000, 0x0000000f, 0x545f5653, 0x45475241, 0xabab0054, 0x52444853, 0x00000110, 0x00000040, + 0x00000044, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x04001858, 0x00107000, 0x00000000, + 0x00005555, 0x04002064, 0x00101032, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, + 0x02000068, 0x00000001, 0x0600001c, 0x00100012, 0x00000000, 0x0020800a, 0x00000000, 0x00000000, + 0x0700003d, 0x001000f2, 0x00000000, 0x0010000a, 0x00000000, 0x00107e46, 0x00000000, 0x07000038, + 0x00100032, 0x00000000, 0x00100046, 0x00000000, 0x00101046, 0x00000000, 0x06000036, 0x001000c2, + 0x00000000, 0x00208006, 0x00000000, 0x00000000, 0x0a000038, 0x001000f2, 0x00000000, 0x00100e46, + 0x00000000, 0x00004002, 0x3acccccd, 0x3b088889, 0x3f800000, 0x3f800000, 0x0500001b, 0x001000f2, + 0x00000000, 0x00100e46, 0x00000000, 0x0700002d, 0x001020f2, 0x00000000, 0x00100e46, 0x00000000, + 0x00107e46, 0x00000000, 0x0100003e, }; static const DWORD ps_sample_code[] = { @@ -3017,8 +2999,7 @@ static void test_texture(void) 0x001020f2, 0x00000000, 0x00100046, 0x00000000, 0x00107e46, 0x00000000, 0x00106000, 0x00000000, 0x0020800a, 0x00000000, 0x00000000, 0x0100003e, }; - static const struct shader ps_ld_0 = {ps_ld_0_code, sizeof(ps_ld_0_code)}; - static const struct shader ps_ld_1 = {ps_ld_1_code, sizeof(ps_ld_1_code)}; + static const struct shader ps_ld = {ps_ld_code, sizeof(ps_ld_code)}; static const struct shader ps_sample = {ps_sample_code, sizeof(ps_sample_code)}; static const struct shader ps_sample_l = {ps_sample_l_code, sizeof(ps_sample_l_code)}; static const struct @@ -3109,6 +3090,7 @@ static void test_texture(void) 0xffff0000, 0xffff0000, 0xffffffff, 0xffffffff, 0xffff0000, 0xffff0000, 0xffffffff, 0xffffffff, }; + static const DWORD zero_colors[4 * 4] = {0}; static const float red[] = {1.0f, 0.0f, 0.0f, 0.5f}; static const struct test @@ -3124,8 +3106,16 @@ static void test_texture(void) } tests[] = { - {&ps_ld_0, &rgba_texture, D3D11_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, 0.0f, 0.0f, rgba_level_0}, - {&ps_ld_1, &rgba_texture, D3D11_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, 0.0f, 0.0f, level_1_colors}, + {&ps_ld, &rgba_texture, D3D11_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, 0.0f, 0.0f, rgba_level_0}, + {&ps_ld, &rgba_texture, D3D11_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, 0.0f, 1.0f, level_1_colors}, + {&ps_ld, &rgba_texture, D3D11_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, 0.0f, 2.0f, level_2_colors}, + {&ps_ld, &rgba_texture, D3D11_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, 0.0f, 3.0f, zero_colors}, + {&ps_ld, &bc1_texture, D3D11_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, 0.0f, 0.0f, bc_colors}, + {&ps_ld, &bc1_texture, D3D11_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, 0.0f, 1.0f, zero_colors}, + {&ps_ld, &bc2_texture, D3D11_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, 0.0f, 0.0f, bc_colors}, + {&ps_ld, &bc2_texture, D3D11_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, 0.0f, 1.0f, zero_colors}, + {&ps_ld, &bc3_texture, D3D11_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, 0.0f, 0.0f, bc_colors}, + {&ps_ld, &bc3_texture, D3D11_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, 0.0f, 1.0f, zero_colors}, {&ps_sample, &bc1_texture, D3D11_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, 0.0f, 0.0f, bc_colors}, {&ps_sample, &bc2_texture, D3D11_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, 0.0f, 0.0f, bc_colors}, {&ps_sample, &bc3_texture, D3D11_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, 0.0f, 0.0f, bc_colors},

1 0

Józef Kucia : wined3d: Implement SM4 resinfo instruction.
by Alexandre Julliard 18 Jan '16

18 Jan '16

Module: wine Branch: master Commit: c8ce95203758f12b941be8dbcebaa6d955ea5770 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8ce95203758f12b941be8dbc… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Jan 17 22:48:49 2016 +0100 wined3d: Implement SM4 resinfo instruction. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 73 +++++++++++++++++++++++++++++++++++++++++++++- dlls/wined3d/shader.c | 3 +- 2 files changed, 74 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 0b29378..feaa9e3 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4240,6 +4240,77 @@ static unsigned int shader_glsl_find_sampler(const struct wined3d_shader_sampler return ~0u; } +static void shader_glsl_resinfo(const struct wined3d_shader_instruction *ins) +{ + static const unsigned int texture_size_component_count[] = + { + 0, /* WINED3D_SHADER_RESOURCE_NONE */ + 1, /* WINED3D_SHADER_RESOURCE_BUFFER */ + 1, /* WINED3D_SHADER_RESOURCE_TEXTURE_1D */ + 2, /* WINED3D_SHADER_RESOURCE_TEXTURE_2D */ + 2, /* WINED3D_SHADER_RESOURCE_TEXTURE_2DMS */ + 3, /* WINED3D_SHADER_RESOURCE_TEXTURE_3D */ + 2, /* WINED3D_SHADER_RESOURCE_TEXTURE_CUBE */ + 2, /* WINED3D_SHADER_RESOURCE_TEXTURE_1DARRAY */ + 3, /* WINED3D_SHADER_RESOURCE_TEXTURE_2DARRAY */ + 3, /* WINED3D_SHADER_RESOURCE_TEXTURE_2DMSARRAY */ + }; + + const struct wined3d_shader_version *version = &ins->ctx->reg_maps->shader_version; + const struct wined3d_gl_info *gl_info = ins->ctx->gl_info; + enum wined3d_shader_resource_type resource_type; + unsigned int resource_idx, sampler_idx, i; + enum wined3d_data_type dst_data_type; + struct glsl_src_param lod_param; + char dst_swizzle[6]; + DWORD write_mask; + + dst_data_type = ins->dst[0].reg.data_type; + if (ins->flags == WINED3DSI_RESINFO_UINT) + dst_data_type = WINED3D_DATA_UINT; + else if (ins->flags) + FIXME("Unhandled flags %#x.\n", ins->flags); + + write_mask = shader_glsl_append_dst_ext(ins->ctx->buffer, ins, &ins->dst[0], dst_data_type); + shader_glsl_get_swizzle(&ins->src[1], FALSE, write_mask, dst_swizzle); + + resource_idx = ins->src[1].reg.idx[0].offset; + resource_type = ins->ctx->reg_maps->resource_info[resource_idx].type; + shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_0, &lod_param); + sampler_idx = shader_glsl_find_sampler(&ins->ctx->reg_maps->sampler_map, + resource_idx, WINED3D_SAMPLER_DEFAULT); + + if (resource_type >= ARRAY_SIZE(texture_size_component_count)) + { + ERR("Unexpected resource type %#x.\n", resource_type); + resource_type = WINED3D_SHADER_RESOURCE_TEXTURE_2D; + } + + if (dst_data_type == WINED3D_DATA_UINT) + shader_addline(ins->ctx->buffer, "uvec4("); + else + shader_addline(ins->ctx->buffer, "vec4("); + + shader_addline(ins->ctx->buffer, "textureSize(%s_sampler%u, %s), ", + shader_glsl_get_prefix(version->type), sampler_idx, lod_param.param_str); + + for (i = 0; i < 3 - texture_size_component_count[resource_type]; ++i) + shader_addline(ins->ctx->buffer, "0, "); + + if (gl_info->supported[ARB_TEXTURE_QUERY_LEVELS]) + { + shader_addline(ins->ctx->buffer, "textureQueryLevels(%s_sampler%u)", + shader_glsl_get_prefix(version->type), sampler_idx); + } + else + { + FIXME("textureQueryLevels is not supported, returning 1 mipmap level.\n"); + shader_addline(ins->ctx->buffer, "1"); + } + + shader_addline(ins->ctx->buffer, ")%s);\n", dst_swizzle); +} + /* FIXME: The current implementation does not handle multisample textures correctly. */ static void shader_glsl_ld(const struct wined3d_shader_instruction *ins) { @@ -7948,7 +8019,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_POW */ shader_glsl_pow, /* WINED3DSIH_RCP */ shader_glsl_scalar_op, /* WINED3DSIH_REP */ shader_glsl_rep, - /* WINED3DSIH_RESINFO */ NULL, + /* WINED3DSIH_RESINFO */ shader_glsl_resinfo, /* WINED3DSIH_RET */ shader_glsl_ret, /* WINED3DSIH_ROUND_NI */ shader_glsl_map2gl, /* WINED3DSIH_RSQ */ shader_glsl_scalar_op, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index cb421ee..952b9f9 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1074,7 +1074,8 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st shader_record_sample(reg_maps, ins.src[1].reg.idx[0].offset, ins.src[2].reg.idx[0].offset, reg_maps->sampler_map.count); } - else if (ins.handler_idx == WINED3DSIH_LD) + else if (ins.handler_idx == WINED3DSIH_LD + || ins.handler_idx == WINED3DSIH_RESINFO) { shader_record_sample(reg_maps, ins.src[1].reg.idx[0].offset, WINED3D_SAMPLER_DEFAULT, reg_maps->sampler_map.count);

1 0

Józef Kucia : wined3d: Recognize SM4 resinfo opcode.
by Alexandre Julliard 18 Jan '16

18 Jan '16

Module: wine Branch: master Commit: e8a35314ab5921b8de5b91701144751f3cd35940 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8a35314ab5921b8de5b91701… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Jan 17 22:48:48 2016 +0100 wined3d: Recognize SM4 resinfo opcode. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 11 +++++++++++ dlls/wined3d/shader_sm4.c | 7 +++++++ dlls/wined3d/wined3d_private.h | 3 +++ 5 files changed, 23 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 074b74f..84b85c4 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5295,6 +5295,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_POW */ shader_hw_pow, /* WINED3DSIH_RCP */ shader_hw_scalar_op, /* WINED3DSIH_REP */ shader_hw_rep, + /* WINED3DSIH_RESINFO */ NULL, /* WINED3DSIH_RET */ shader_hw_ret, /* WINED3DSIH_ROUND_NI */ NULL, /* WINED3DSIH_RSQ */ shader_hw_scalar_op, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index b7d30ca..0b29378 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -7948,6 +7948,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_POW */ shader_glsl_pow, /* WINED3DSIH_RCP */ shader_glsl_scalar_op, /* WINED3DSIH_REP */ shader_glsl_rep, + /* WINED3DSIH_RESINFO */ NULL, /* WINED3DSIH_RET */ shader_glsl_ret, /* WINED3DSIH_ROUND_NI */ shader_glsl_map2gl, /* WINED3DSIH_RSQ */ shader_glsl_scalar_op, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index d747816..cb421ee 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -123,6 +123,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_POW */ "pow", /* WINED3DSIH_RCP */ "rcp", /* WINED3DSIH_REP */ "rep", + /* WINED3DSIH_RESINFO */ "resinfo", /* WINED3DSIH_RET */ "ret", /* WINED3DSIH_ROUND_NI */ "round_ni", /* WINED3DSIH_RSQ */ "rsq", @@ -1873,6 +1874,16 @@ static void shader_trace_init(const struct wined3d_shader_frontend *fe, void *fe { TRACE("p"); } + else if (ins.handler_idx == WINED3DSIH_RESINFO + && ins.flags) + { + switch (ins.flags) + { + case WINED3DSI_RESINFO_RCP_FLOAT: TRACE("_rcpFloat"); break; + case WINED3DSI_RESINFO_UINT: TRACE("_uint"); break; + default: TRACE("_unrecognized(%#x)", ins.flags); + } + } for (i = 0; i < ins.dst_count; ++i) { diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 6e02352..710434b 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -29,6 +29,9 @@ WINE_DECLARE_DEBUG_CHANNEL(d3d_bytecode); #define WINED3D_SM4_INSTRUCTION_LENGTH_SHIFT 24 #define WINED3D_SM4_INSTRUCTION_LENGTH_MASK (0x1fu << WINED3D_SM4_INSTRUCTION_LENGTH_SHIFT) +#define WINED3D_SM4_INSTRUCTION_FLAGS_SHIFT 11 +#define WINED3D_SM4_INSTRUCTION_FLAGS_MASK (0x3u << WINED3D_SM4_INSTRUCTION_FLAGS_SHIFT) + #define WINED3D_SM4_RESOURCE_TYPE_SHIFT 11 #define WINED3D_SM4_RESOURCE_TYPE_MASK (0xfu << WINED3D_SM4_RESOURCE_TYPE_SHIFT) @@ -120,6 +123,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_MUL = 0x38, WINED3D_SM4_OP_NE = 0x39, WINED3D_SM4_OP_OR = 0x3c, + WINED3D_SM4_OP_RESINFO = 0x3d, WINED3D_SM4_OP_RET = 0x3e, WINED3D_SM4_OP_ROUND_NI = 0x41, WINED3D_SM4_OP_RSQ = 0x44, @@ -296,6 +300,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_MUL, WINED3DSIH_MUL, "F", "FF"}, {WINED3D_SM4_OP_NE, WINED3DSIH_NE, "U", "FF"}, {WINED3D_SM4_OP_OR, WINED3DSIH_OR, "U", "UU"}, + {WINED3D_SM4_OP_RESINFO, WINED3DSIH_RESINFO, "F", "IR"}, {WINED3D_SM4_OP_RET, WINED3DSIH_RET, "", ""}, {WINED3D_SM4_OP_ROUND_NI, WINED3DSIH_ROUND_NI, "F", "F"}, {WINED3D_SM4_OP_RSQ, WINED3DSIH_RSQ, "F", "F"}, @@ -888,6 +893,8 @@ static void shader_sm4_read_instruction(void *data, const DWORD **ptr, struct wi } else { + ins->flags = (opcode_token & WINED3D_SM4_INSTRUCTION_FLAGS_MASK) >> WINED3D_SM4_INSTRUCTION_FLAGS_SHIFT; + for (i = 0; i < ins->dst_count; ++i) { if (!(shader_sm4_read_dst_param(priv, &p, map_data_type(opcode_info->dst_info[i]), &priv->dst_param[i]))) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 07007c0..3393d62 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -407,6 +407,8 @@ enum wined3d_shader_dst_modifier #define WINED3DSI_TEXLD_PROJECT 0x1 #define WINED3DSI_TEXLD_BIAS 0x2 #define WINED3DSI_INDEXED_DYNAMIC 0x4 +#define WINED3DSI_RESINFO_RCP_FLOAT 0x1 +#define WINED3DSI_RESINFO_UINT 0x2 enum wined3d_shader_rel_op { @@ -538,6 +540,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_POW, WINED3DSIH_RCP, WINED3DSIH_REP, + WINED3DSIH_RESINFO, WINED3DSIH_RET, WINED3DSIH_ROUND_NI, WINED3DSIH_RSQ,

1 0

← Newer
1
...
30
31
32
33
34
35
36
...
63
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2016