January 2021 - Wine-commits

Zebediah Figura : include: Move interlocked functions to winnt.h.
by Alexandre Julliard 18 Jan '21

18 Jan '21

Module: wine Branch: master Commit: aef2e01772f7856f0d6e519fdede00aa2b6ad627 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aef2e01772f7856f0d6e519f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jan 15 01:22:02 2021 -0600 include: Move interlocked functions to winnt.h. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winbase.h | 132 ------------------------------------------------------ include/winnt.h | 132 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 132 insertions(+), 132 deletions(-) diff --git a/include/winbase.h b/include/winbase.h index dc8aa081be4..0262e50d980 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2919,138 +2919,6 @@ extern char * CDECL wine_get_unix_file_name( LPCWSTR dos ); extern WCHAR * CDECL wine_get_dos_file_name( LPCSTR str ); -/* Interlocked functions */ - -#ifdef _MSC_VER - -#pragma intrinsic(_InterlockedCompareExchange) -#pragma intrinsic(_InterlockedCompareExchange64) -#pragma intrinsic(_InterlockedExchange) -#pragma intrinsic(_InterlockedExchangeAdd) -#pragma intrinsic(_InterlockedIncrement) -#pragma intrinsic(_InterlockedDecrement) - -long _InterlockedCompareExchange(long volatile*,long,long); -long long _InterlockedCompareExchange64(long long volatile*,long long,long long); -long _InterlockedDecrement(long volatile*); -long _InterlockedExchange(long volatile*,long); -long _InterlockedExchangeAdd(long volatile*,long); -long _InterlockedIncrement(long volatile*); - -static FORCEINLINE LONG WINAPI InterlockedCompareExchange( LONG volatile *dest, LONG xchg, LONG compare ) -{ - return _InterlockedCompareExchange( (long volatile *)dest, xchg, compare ); -} - -static FORCEINLINE LONGLONG WINAPI InterlockedCompareExchange64( LONGLONG volatile *dest, LONGLONG xchg, LONGLONG compare ) -{ - return _InterlockedCompareExchange64( (long long volatile *)dest, compare, xchg ); -} - -static FORCEINLINE LONG WINAPI InterlockedExchange( LONG volatile *dest, LONG val ) -{ - return _InterlockedExchange( (long volatile *)dest, val ); -} - -static FORCEINLINE LONG WINAPI InterlockedExchangeAdd( LONG volatile *dest, LONG incr ) -{ - return _InterlockedExchangeAdd( (long volatile *)dest, incr ); -} - -static FORCEINLINE LONG WINAPI InterlockedIncrement( LONG volatile *dest ) -{ - return _InterlockedIncrement( (long volatile *)dest ); -} - -static FORCEINLINE LONG WINAPI InterlockedDecrement( LONG volatile *dest ) -{ - return _InterlockedDecrement( (long volatile *)dest ); -} - -#ifndef __i386__ - -#pragma intrinsic(_InterlockedCompareExchangePointer) -#pragma intrinsic(_InterlockedExchangePointer) - -#define InterlockedCompareExchangePointer _InterlockedCompareExchangePointer -#define InterlockedExchangePointer _InterlockedExchangePointer - -void *InterlockedCompareExchangePointer(void *volatile*,void*,void*); -void *InterlockedExchangePointer(void *volatile*,void*); - -#else - -static FORCEINLINE void *WINAPI InterlockedCompareExchangePointer( void *volatile *dest, void *xchg, void *compare ) -{ - return (void *)_InterlockedCompareExchange( (long volatile*)dest, (long)xchg, (long)compare ); -} - -static FORCEINLINE void *WINAPI InterlockedExchangePointer( void *volatile *dest, void *val ) -{ - return (void *)_InterlockedExchange( (long volatile*)dest, (long)val ); -} - -#endif - -#elif defined(__GNUC__) - -static FORCEINLINE LONG WINAPI InterlockedCompareExchange( LONG volatile *dest, LONG xchg, LONG compare ) -{ - return __sync_val_compare_and_swap( dest, compare, xchg ); -} - -static FORCEINLINE PVOID WINAPI InterlockedCompareExchangePointer( PVOID volatile *dest, PVOID xchg, PVOID compare ) -{ - return __sync_val_compare_and_swap( dest, compare, xchg ); -} - -static FORCEINLINE LONGLONG WINAPI InterlockedCompareExchange64( LONGLONG volatile *dest, LONGLONG xchg, LONGLONG compare ) -{ - return __sync_val_compare_and_swap( dest, compare, xchg ); -} - -static FORCEINLINE LONG WINAPI InterlockedExchange( LONG volatile *dest, LONG val ) -{ - LONG ret; -#if defined(__i386__) || defined(__x86_64__) - __asm__ __volatile__( "lock; xchgl %0,(%1)" - : "=r" (ret) :"r" (dest), "0" (val) : "memory" ); -#else - do ret = *dest; while (!__sync_bool_compare_and_swap( dest, ret, val )); -#endif - return ret; -} - -static FORCEINLINE LONG WINAPI InterlockedExchangeAdd( LONG volatile *dest, LONG incr ) -{ - return __sync_fetch_and_add( dest, incr ); -} - -static FORCEINLINE LONG WINAPI InterlockedIncrement( LONG volatile *dest ) -{ - return __sync_add_and_fetch( dest, 1 ); -} - -static FORCEINLINE LONG WINAPI InterlockedDecrement( LONG volatile *dest ) -{ - return __sync_add_and_fetch( dest, -1 ); -} - -static FORCEINLINE PVOID WINAPI InterlockedExchangePointer( PVOID volatile *dest, PVOID val ) -{ - PVOID ret; -#ifdef __x86_64__ - __asm__ __volatile__( "lock; xchgq %0,(%1)" : "=r" (ret) :"r" (dest), "0" (val) : "memory" ); -#elif defined(__i386__) - __asm__ __volatile__( "lock; xchgl %0,(%1)" : "=r" (ret) :"r" (dest), "0" (val) : "memory" ); -#else - do ret = *dest; while (!__sync_bool_compare_and_swap( dest, ret, val )); -#endif - return ret; -} - -#endif /* __GNUC__ */ - #ifdef __WINESRC__ static FORCEINLINE HANDLE WINAPI GetCurrentProcess(void) diff --git a/include/winnt.h b/include/winnt.h index 83fcc67c85d..7bbe0185139 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -6892,6 +6892,138 @@ static inline BOOLEAN BitScanReverse(DWORD *index, DWORD mask) #endif +/* Interlocked functions */ + +#ifdef _MSC_VER + +#pragma intrinsic(_InterlockedCompareExchange) +#pragma intrinsic(_InterlockedCompareExchange64) +#pragma intrinsic(_InterlockedExchange) +#pragma intrinsic(_InterlockedExchangeAdd) +#pragma intrinsic(_InterlockedIncrement) +#pragma intrinsic(_InterlockedDecrement) + +long _InterlockedCompareExchange(long volatile*,long,long); +long long _InterlockedCompareExchange64(long long volatile*,long long,long long); +long _InterlockedDecrement(long volatile*); +long _InterlockedExchange(long volatile*,long); +long _InterlockedExchangeAdd(long volatile*,long); +long _InterlockedIncrement(long volatile*); + +static FORCEINLINE LONG WINAPI InterlockedCompareExchange( LONG volatile *dest, LONG xchg, LONG compare ) +{ + return _InterlockedCompareExchange( (long volatile *)dest, xchg, compare ); +} + +static FORCEINLINE LONGLONG WINAPI InterlockedCompareExchange64( LONGLONG volatile *dest, LONGLONG xchg, LONGLONG compare ) +{ + return _InterlockedCompareExchange64( (long long volatile *)dest, compare, xchg ); +} + +static FORCEINLINE LONG WINAPI InterlockedExchange( LONG volatile *dest, LONG val ) +{ + return _InterlockedExchange( (long volatile *)dest, val ); +} + +static FORCEINLINE LONG WINAPI InterlockedExchangeAdd( LONG volatile *dest, LONG incr ) +{ + return _InterlockedExchangeAdd( (long volatile *)dest, incr ); +} + +static FORCEINLINE LONG WINAPI InterlockedIncrement( LONG volatile *dest ) +{ + return _InterlockedIncrement( (long volatile *)dest ); +} + +static FORCEINLINE LONG WINAPI InterlockedDecrement( LONG volatile *dest ) +{ + return _InterlockedDecrement( (long volatile *)dest ); +} + +#ifndef __i386__ + +#pragma intrinsic(_InterlockedCompareExchangePointer) +#pragma intrinsic(_InterlockedExchangePointer) + +#define InterlockedCompareExchangePointer _InterlockedCompareExchangePointer +#define InterlockedExchangePointer _InterlockedExchangePointer + +void *InterlockedCompareExchangePointer(void *volatile*,void*,void*); +void *InterlockedExchangePointer(void *volatile*,void*); + +#else + +static FORCEINLINE void * WINAPI InterlockedCompareExchangePointer( void *volatile *dest, void *xchg, void *compare ) +{ + return (void *)_InterlockedCompareExchange( (long volatile*)dest, (long)xchg, (long)compare ); +} + +static FORCEINLINE void * WINAPI InterlockedExchangePointer( void *volatile *dest, void *val ) +{ + return (void *)_InterlockedExchange( (long volatile*)dest, (long)val ); +} + +#endif + +#elif defined(__GNUC__) + +static FORCEINLINE LONG WINAPI InterlockedCompareExchange( LONG volatile *dest, LONG xchg, LONG compare ) +{ + return __sync_val_compare_and_swap( dest, compare, xchg ); +} + +static FORCEINLINE void * WINAPI InterlockedCompareExchangePointer( void *volatile *dest, void *xchg, void *compare ) +{ + return __sync_val_compare_and_swap( dest, compare, xchg ); +} + +static FORCEINLINE LONGLONG WINAPI InterlockedCompareExchange64( LONGLONG volatile *dest, LONGLONG xchg, LONGLONG compare ) +{ + return __sync_val_compare_and_swap( dest, compare, xchg ); +} + +static FORCEINLINE LONG WINAPI InterlockedExchange( LONG volatile *dest, LONG val ) +{ + LONG ret; +#if defined(__i386__) || defined(__x86_64__) + __asm__ __volatile__( "lock; xchgl %0,(%1)" + : "=r" (ret) :"r" (dest), "0" (val) : "memory" ); +#else + do ret = *dest; while (!__sync_bool_compare_and_swap( dest, ret, val )); +#endif + return ret; +} + +static FORCEINLINE LONG WINAPI InterlockedExchangeAdd( LONG volatile *dest, LONG incr ) +{ + return __sync_fetch_and_add( dest, incr ); +} + +static FORCEINLINE LONG WINAPI InterlockedIncrement( LONG volatile *dest ) +{ + return __sync_add_and_fetch( dest, 1 ); +} + +static FORCEINLINE LONG WINAPI InterlockedDecrement( LONG volatile *dest ) +{ + return __sync_add_and_fetch( dest, -1 ); +} + +static FORCEINLINE void * WINAPI InterlockedExchangePointer( void *volatile *dest, void *val ) +{ + void *ret; +#ifdef __x86_64__ + __asm__ __volatile__( "lock; xchgq %0,(%1)" : "=r" (ret) :"r" (dest), "0" (val) : "memory" ); +#elif defined(__i386__) + __asm__ __volatile__( "lock; xchgl %0,(%1)" : "=r" (ret) :"r" (dest), "0" (val) : "memory" ); +#else + do ret = *dest; while (!__sync_bool_compare_and_swap( dest, ret, val )); +#endif + return ret; +} + +#endif /* __GNUC__ */ + #ifdef _WIN64 #if defined(_MSC_VER)

1 0

Paul Gofman : bcrypt: Introduce export_gnutls_datum() helper and use it in export_gnutls_pubkey_rsa().
by Alexandre Julliard 18 Jan '21

18 Jan '21

Module: wine Branch: master Commit: 88a1848ca43d9fd96841c59283416c5cf4faffce URL: https://source.winehq.org/git/wine.git/?a=commit;h=88a1848ca43d9fd96841c592… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Jan 18 12:38:23 2021 +0100 bcrypt: Introduce export_gnutls_datum() helper and use it in export_gnutls_pubkey_rsa(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/gnutls.c | 41 ++++++++++++++++++++++------------------- 1 file changed, 22 insertions(+), 19 deletions(-) diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index c065ac31fba..9e6dd4cc9a6 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -28,6 +28,7 @@ #ifdef HAVE_GNUTLS_CIPHER_INIT #include <stdarg.h> +#include <assert.h> #include <gnutls/gnutls.h> #include <gnutls/crypto.h> #include <gnutls/abstract.h> @@ -665,11 +666,27 @@ static void CDECL key_symmetric_destroy( struct key *key ) if (key_data(key)->cipher) pgnutls_cipher_deinit( key_data(key)->cipher ); } +static void export_gnutls_datum( UCHAR *buffer, ULONG length, gnutls_datum_t *d, ULONG *actual_length ) +{ + ULONG size = d->size; + UCHAR *src = d->data; + + assert( size <= length + 1 ); + if (size == length + 1) + { + assert(!src[0]); + ++src; + --size; + } + *actual_length = size; + memcpy( buffer, src, size ); +} + static NTSTATUS export_gnutls_pubkey_rsa( gnutls_privkey_t gnutls_key, ULONG bitlen, UCHAR **pubkey, ULONG *pubkey_len ) { BCRYPT_RSAKEY_BLOB *rsa_blob; gnutls_datum_t m, e; - UCHAR *dst, *src; + UCHAR *dst; int ret; if ((ret = pgnutls_privkey_export_rsa_raw( gnutls_key, &m, &e, NULL, NULL, NULL, NULL, NULL, NULL ))) @@ -686,32 +703,18 @@ static NTSTATUS export_gnutls_pubkey_rsa( gnutls_privkey_t gnutls_key, ULONG bit } dst = (UCHAR *)(rsa_blob + 1); - if (e.size == bitlen / 8 + 1 && !e.data[0]) - { - src = e.data + 1; - e.size--; - } - else src = e.data; - memcpy( dst, src, e.size ); + export_gnutls_datum( dst, bitlen / 8, &e, &rsa_blob->cbPublicExp ); - dst += e.size; - if (m.size == bitlen / 8 + 1 && !m.data[0]) - { - src = m.data + 1; - m.size--; - } - else src = m.data; - memcpy( dst, src, m.size ); + dst += rsa_blob->cbPublicExp; + export_gnutls_datum( dst, bitlen / 8, &m, &rsa_blob->cbModulus ); rsa_blob->Magic = BCRYPT_RSAPUBLIC_MAGIC; rsa_blob->BitLength = bitlen; - rsa_blob->cbPublicExp = e.size; - rsa_blob->cbModulus = m.size; rsa_blob->cbPrime1 = 0; rsa_blob->cbPrime2 = 0; *pubkey = (UCHAR *)rsa_blob; - *pubkey_len = sizeof(*rsa_blob) + e.size + m.size; + *pubkey_len = sizeof(*rsa_blob) + rsa_blob->cbPublicExp + rsa_blob->cbModulus; free( e.data ); free( m.data ); return STATUS_SUCCESS;

1 0

Zebediah Figura : vkd3d-shader: Implement __LINE__.
by Alexandre Julliard 18 Jan '21

18 Jan '21

Module: vkd3d Branch: master Commit: e72c2461cd53c27ff4b66a56ee90ad9125d1298a URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=e72c2461cd53c27ff4b66a5… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Jan 14 14:47:47 2021 -0600 vkd3d-shader: Implement __LINE__. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/preproc.l | 20 ++++++++++++++++++++ tests/hlsl_d3d12.c | 2 +- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/preproc.l b/libs/vkd3d-shader/preproc.l index 388b77f..c5c4925 100644 --- a/libs/vkd3d-shader/preproc.l +++ b/libs/vkd3d-shader/preproc.l @@ -471,6 +471,26 @@ int yylex(YYSTYPE *lval, YYLTYPE *lloc, yyscan_t scanner) } continue; } + + if (!strcmp(text, "__LINE__")) + { + const struct preproc_file *file = preproc_get_top_file(ctx); + + /* Not the current line number, but rather the line + * number before invoking any macros. */ + + if (ctx->current_directive) + { + char string[13]; + + sprintf(string, "%d", file->buffer.location.line); + return return_token(T_INTEGER, lval, string); + } + + if (preproc_is_writing(ctx)) + vkd3d_string_buffer_printf(&ctx->buffer, "%d ", file->buffer.location.line); + continue; + } } if (ctx->current_directive) diff --git a/tests/hlsl_d3d12.c b/tests/hlsl_d3d12.c index 9d8d16d..0316971 100644 --- a/tests/hlsl_d3d12.c +++ b/tests/hlsl_d3d12.c @@ -350,7 +350,7 @@ static void test_preprocess(void) for (i = 0; i < ARRAY_SIZE(tests); ++i) { vkd3d_test_set_context("Source \"%s\"", tests[i].source); - todo_if (i == 9 || (i >= 12 && i <= 14)) + todo_if (i == 9) check_preprocess(tests[i].source, NULL, NULL, tests[i].present, tests[i].absent); } vkd3d_test_set_context(NULL);

1 0

Zebediah Figura : vkd3d-shader: Implement __FILE__.
by Alexandre Julliard 18 Jan '21

18 Jan '21

Module: vkd3d Branch: master Commit: 92877f7a430e678dec7c5c9c1c1fe81edd417568 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=92877f7a430e678dec7c5c9… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Jan 14 14:47:48 2021 -0600 vkd3d-shader: Implement __FILE__. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/preproc.l | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/libs/vkd3d-shader/preproc.l b/libs/vkd3d-shader/preproc.l index c5c4925..80ac7d0 100644 --- a/libs/vkd3d-shader/preproc.l +++ b/libs/vkd3d-shader/preproc.l @@ -472,6 +472,29 @@ int yylex(YYSTYPE *lval, YYLTYPE *lloc, yyscan_t scanner) continue; } + if (!strcmp(text, "__FILE__")) + { + const struct preproc_file *file = preproc_get_top_file(ctx); + + /* Not the current file name, but rather the file name + * before invoking any macros. */ + + if (ctx->current_directive) + { + char *string; + + if (!(string = vkd3d_malloc(strlen(file->filename) + 3))) + return 0; + sprintf(string, "\"%s\"", file->filename); + lval->string = string; + return T_STRING; + } + + if (preproc_is_writing(ctx)) + vkd3d_string_buffer_printf(&ctx->buffer, "\"%s\" ", file->filename); + continue; + } + if (!strcmp(text, "__LINE__")) { const struct preproc_file *file = preproc_get_top_file(ctx);

1 0

Zebediah Figura : vkd3d-shader: Implement #pragma.
by Alexandre Julliard 18 Jan '21

18 Jan '21

Module: vkd3d Branch: master Commit: ba32e91aca044141c6e26ee068ea7766054fe8a4 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=ba32e91aca044141c6e26ee… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Jan 14 14:47:49 2021 -0600 vkd3d-shader: Implement #pragma. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/preproc.l | 13 +++++++++++++ libs/vkd3d-shader/preproc.y | 1 + tests/hlsl_d3d12.c | 3 +-- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/preproc.l b/libs/vkd3d-shader/preproc.l index 80ac7d0..f7aee19 100644 --- a/libs/vkd3d-shader/preproc.l +++ b/libs/vkd3d-shader/preproc.l @@ -129,6 +129,8 @@ IDENTIFIER [A-Za-z_][A-Za-z0-9_]* return T_IFDEF; if (!strcmp(p, "ifndef")) return T_IFNDEF; + if (!strcmp(p, "pragma")) + return T_PRAGMA; if (!strcmp(p, "undef")) return T_UNDEF; @@ -352,6 +354,7 @@ int yylex(YYSTYPE *lval, YYLTYPE *lloc, yyscan_t scanner) case T_IFDEF: case T_IFNDEF: case T_INCLUDE: + case T_PRAGMA: case T_UNDEF: ctx->current_directive = token; break; @@ -387,6 +390,16 @@ int yylex(YYSTYPE *lval, YYLTYPE *lloc, yyscan_t scanner) continue; } + if (ctx->current_directive == T_PRAGMA) + { + /* Print all tokens verbatim. */ + if (token == T_PRAGMA) + vkd3d_string_buffer_printf(&ctx->buffer, "#pragma "); + else + vkd3d_string_buffer_printf(&ctx->buffer, "%s", text); + continue; + } + switch (func_state->state) { case STATE_NONE: diff --git a/libs/vkd3d-shader/preproc.y b/libs/vkd3d-shader/preproc.y index 72d6486..4b276a9 100644 --- a/libs/vkd3d-shader/preproc.y +++ b/libs/vkd3d-shader/preproc.y @@ -326,6 +326,7 @@ static void free_parse_arg_names(struct parse_arg_names *args) %token T_IFDEF "#ifdef" %token T_IFNDEF "#ifndef" %token T_INCLUDE "#include" +%token T_PRAGMA "#pragma" %token T_UNDEF "#undef" %token T_CONCAT "##" diff --git a/tests/hlsl_d3d12.c b/tests/hlsl_d3d12.c index 0316971..837476d 100644 --- a/tests/hlsl_d3d12.c +++ b/tests/hlsl_d3d12.c @@ -350,8 +350,7 @@ static void test_preprocess(void) for (i = 0; i < ARRAY_SIZE(tests); ++i) { vkd3d_test_set_context("Source \"%s\"", tests[i].source); - todo_if (i == 9) - check_preprocess(tests[i].source, NULL, NULL, tests[i].present, tests[i].absent); + check_preprocess(tests[i].source, NULL, NULL, tests[i].present, tests[i].absent); } vkd3d_test_set_context(NULL);

1 0

Zebediah Figura : vkd3d-shader: Implement #error.
by Alexandre Julliard 18 Jan '21

18 Jan '21

Module: vkd3d Branch: master Commit: 1a326d16c6a45e750e0c74ac1e541c82e83c8fbe URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=1a326d16c6a45e750e0c74a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Jan 14 14:47:50 2021 -0600 vkd3d-shader: Implement #error. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 1 - libs/vkd3d-shader/preproc.l | 12 +++++++++++- libs/vkd3d-shader/preproc.y | 10 ++++++++++ libs/vkd3d-shader/vkd3d_shader_private.h | 1 + 4 files changed, 22 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index 22151ad..30bea62 100644 --- a/Makefile.am +++ b/Makefile.am @@ -245,7 +245,6 @@ XFAIL_TESTS = \ tests/math.shader_test \ tests/preproc-ifdef.shader_test \ tests/preproc-if-expr.shader_test \ - tests/preproc-invalid.shader_test \ tests/preproc-macro.shader_test \ tests/swizzle-0.shader_test \ tests/swizzle-1.shader_test \ diff --git a/libs/vkd3d-shader/preproc.l b/libs/vkd3d-shader/preproc.l index f7aee19..a2c1e26 100644 --- a/libs/vkd3d-shader/preproc.l +++ b/libs/vkd3d-shader/preproc.l @@ -50,6 +50,7 @@ static void update_location(struct preproc_ctx *ctx); %s C_COMMENT %s CXX_COMMENT +%s ERROR %s INCLUDE NEWLINE \r?\n @@ -70,6 +71,8 @@ IDENTIFIER [A-Za-z_][A-Za-z0-9_]* <C_COMMENT,CXX_COMMENT><<EOF>> {yy_pop_state(yyscanner);} <C_COMMENT,CXX_COMMENT>. {} +<ERROR>(\\{NEWLINE}|[^\n])* {return T_STRING;} + <INITIAL>{IDENTIFIER}/\( {return T_IDENTIFIER_PAREN;} <INITIAL>{IDENTIFIER} {return T_IDENTIFIER;} @@ -109,6 +112,12 @@ IDENTIFIER [A-Za-z_][A-Za-z0-9_]* for (p = yytext + 1; strchr(" \t", *p); ++p) ; + if (!strcmp(p, "error")) + { + BEGIN(ERROR); + return T_ERROR; + } + if (!strcmp(p, "include")) { BEGIN(INCLUDE); @@ -140,7 +149,7 @@ IDENTIFIER [A-Za-z_][A-Za-z0-9_]* } <INITIAL,INCLUDE>\\{NEWLINE} {} -<INITIAL,INCLUDE>{NEWLINE} { +<INITIAL,INCLUDE,ERROR>{NEWLINE} { BEGIN(INITIAL); return T_NEWLINE; } @@ -350,6 +359,7 @@ int yylex(YYSTYPE *lval, YYLTYPE *lloc, yyscan_t scanner) case T_ELIF: case T_ELSE: case T_ENDIF: + case T_ERROR: case T_IF: case T_IFDEF: case T_IFNDEF: diff --git a/libs/vkd3d-shader/preproc.y b/libs/vkd3d-shader/preproc.y index 4b276a9..9f65054 100644 --- a/libs/vkd3d-shader/preproc.y +++ b/libs/vkd3d-shader/preproc.y @@ -319,6 +319,7 @@ static void free_parse_arg_names(struct parse_arg_names *args) %token T_NEWLINE %token T_DEFINE "#define" +%token T_ERROR "#error" %token T_ELIF "#elif" %token T_ELSE "#else" %token T_ENDIF "#endif" @@ -534,6 +535,15 @@ directive preproc_warning(ctx, &@$, VKD3D_SHADER_WARNING_PP_INVALID_DIRECTIVE, "Ignoring #endif without prior #if."); } + | T_ERROR T_NEWLINE + { + preproc_error(ctx, &@$, VKD3D_SHADER_ERROR_PP_ERROR_DIRECTIVE, "Error directive."); + } + | T_ERROR T_STRING T_NEWLINE + { + preproc_error(ctx, &@$, VKD3D_SHADER_ERROR_PP_ERROR_DIRECTIVE, "Error directive: %s", $2); + vkd3d_free($2); + } | T_INCLUDE T_STRING T_NEWLINE { PFN_vkd3d_shader_open_include open_include = ctx->preprocess_info->pfn_open_include; diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 157dc5e..8d9821d 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -81,6 +81,7 @@ enum vkd3d_shader_error VKD3D_SHADER_ERROR_RS_MIXED_DESCRIPTOR_RANGE_TYPES = 3004, VKD3D_SHADER_ERROR_PP_INVALID_SYNTAX = 4000, + VKD3D_SHADER_ERROR_PP_ERROR_DIRECTIVE = 4001, VKD3D_SHADER_ERROR_PP_INCLUDE_FAILED = 4002, VKD3D_SHADER_WARNING_PP_ALREADY_DEFINED = 4300,

1 0

Zebediah Figura : vkd3d-shader: Implement the "defined" keyword.
by Alexandre Julliard 18 Jan '21

18 Jan '21

Module: vkd3d Branch: master Commit: d31f28811150e11f68dbf7c129f8e3d3ceff6fe0 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=d31f28811150e11f68dbf7c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Jan 14 14:47:51 2021 -0600 vkd3d-shader: Implement the "defined" keyword. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/preproc.h | 1 + libs/vkd3d-shader/preproc.l | 16 ++++++++++++++++ libs/vkd3d-shader/preproc.y | 15 +++++++++++++++ 3 files changed, 32 insertions(+) diff --git a/libs/vkd3d-shader/preproc.h b/libs/vkd3d-shader/preproc.h index 0f2d8ba..eff70f6 100644 --- a/libs/vkd3d-shader/preproc.h +++ b/libs/vkd3d-shader/preproc.h @@ -125,6 +125,7 @@ struct preproc_ctx bool last_was_newline; bool last_was_eof; + bool last_was_defined; bool error; }; diff --git a/libs/vkd3d-shader/preproc.l b/libs/vkd3d-shader/preproc.l index a2c1e26..95b043e 100644 --- a/libs/vkd3d-shader/preproc.l +++ b/libs/vkd3d-shader/preproc.l @@ -73,6 +73,8 @@ IDENTIFIER [A-Za-z_][A-Za-z0-9_]* <ERROR>(\\{NEWLINE}|[^\n])* {return T_STRING;} +<INITIAL>defined/\( {return T_DEFINED;} +<INITIAL>defined {return T_DEFINED;} <INITIAL>{IDENTIFIER}/\( {return T_IDENTIFIER_PAREN;} <INITIAL>{IDENTIFIER} {return T_IDENTIFIER;} @@ -377,6 +379,9 @@ int yylex(YYSTYPE *lval, YYLTYPE *lloc, yyscan_t scanner) ctx->last_was_newline = (token == T_NEWLINE); } + if (ctx->current_directive && token == T_DEFINED) + ctx->last_was_defined = true; + func_state = ctx->current_directive ? &ctx->directive_func : &ctx->text_func; TRACE("Parsing token %d%s, line %d, in directive %d, state %#x, string %s.\n", @@ -471,6 +476,17 @@ int yylex(YYSTYPE *lval, YYLTYPE *lloc, yyscan_t scanner) case T_UNDEF: /* Return identifiers verbatim. */ return return_token(token, lval, text); + + case T_IF: + case T_ELIF: + /* Return identifiers verbatim only if they're the + * argument to "defined". */ + if (ctx->last_was_defined) + { + ctx->last_was_defined = false; + return return_token(token, lval, text); + } + break; } /* Otherwise, expand a macro if there is one. */ diff --git a/libs/vkd3d-shader/preproc.y b/libs/vkd3d-shader/preproc.y index 9f65054..f9047c9 100644 --- a/libs/vkd3d-shader/preproc.y +++ b/libs/vkd3d-shader/preproc.y @@ -331,6 +331,7 @@ static void free_parse_arg_names(struct parse_arg_names *args) %token T_UNDEF "#undef" %token T_CONCAT "##" +%token T_DEFINED "defined" %type <integer> expr %type <string> body_token @@ -429,6 +430,10 @@ body_token_const { $$ = "##"; } + | T_DEFINED + { + $$ = "defined"; + } directive : T_DEFINE T_IDENTIFIER body_text T_NEWLINE @@ -583,3 +588,13 @@ expr $$ = preproc_parse_integer($1); vkd3d_free($1); } + | T_DEFINED T_IDENTIFIER + { + $$ = !!preproc_find_macro(ctx, $2); + vkd3d_free($2); + } + | T_DEFINED '(' T_IDENTIFIER ')' + { + $$ = !!preproc_find_macro(ctx, $3); + vkd3d_free($3); + }

1 0

Julian Rüger : German translation for release 6.0.
by Alexandre Julliard 18 Jan '21

18 Jan '21

Module: website Branch: master Commit: 7594b4845b0194397c893da77ff1e08d5fe5c21b URL: https://source.winehq.org/git/website.git/?a=commit;h=7594b4845b0194397c893… Author: Julian Rüger <jr98(a)gmx.net> Date: Fri Jan 15 09:38:08 2021 +0100 German translation for release 6.0. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/de/2021011401.xml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/news/de/2021011401.xml b/news/de/2021011401.xml new file mode 100644 index 00000000..5595e838 --- /dev/null +++ b/news/de/2021011401.xml @@ -0,0 +1,20 @@ +<news> +<date>14. Januar 2021</date> +<title>Wine 6.0 freigegeben</title> +<body> + Das Wine-Team ist stolz verkünden zu können, dass die stabile Version Wine 6.0 verfügbar ist. + Dieses Release verkörpert den Entwicklungsaufwand eines Jahres und über 8,300 individuellen Änderungen. Enthalten sind eine große Zahl +an Verbesserungen, welche in den <a href="{$root}/announce/6.0">Release Notes (en)</a> aufgeführt sind. Die Bereiche mit den nennenswertesten +Änderungen sind: + +<ul> + <li>Kernmodule im PE-Format.</li> + <li>Vulkan-Backend für WineD3D.</li> + <li>DirectShow- und Media-Foundation-Unterstützung.</li> + <li>Neugestaltung von Textkonsolen.</li> +</ul> + + Dieses Release ist dem Gedenken an Ken Thomases gewidmet, der kurz vor Weihnachten im Alter von 51 Jahren verstarb. Ken war ein außergewöhnlich brillianter Entwickler und das Mastermind hinter der macOS-Unterstützung in Wine. Wir werden sein Können, seine Geduld und seinen dunklen Sinn für Humor sehr vermissen. +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/6.0/wine-6.0.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Rémi Bernon : d2d1/tests: Retrieve the swapchain back-buffer in init_test_context_().
by Alexandre Julliard 15 Jan '21

15 Jan '21

Module: wine Branch: master Commit: 1a12eb08be86b3c805366e1dfad9d6eced168dad URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a12eb08be86b3c805366e1d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jan 15 21:47:57 2021 +0330 d2d1/tests: Retrieve the swapchain back-buffer in init_test_context_(). Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/tests/d2d1.c | 507 +++++++++++++++++++++---------------------------- 1 file changed, 212 insertions(+), 295 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1a12eb08be86b3c80536…

1 0

Rémi Bernon : d2d1/tests: Create a Direct2D render target in init_test_context_().
by Alexandre Julliard 15 Jan '21

15 Jan '21

Module: wine Branch: master Commit: 85f3ba90e520e49be32ce2118e1cab771766a94c URL: https://source.winehq.org/git/wine.git/?a=commit;h=85f3ba90e520e49be32ce211… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jan 15 21:47:58 2021 +0330 d2d1/tests: Create a Direct2D render target in init_test_context_(). Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/tests/d2d1.c | 131 +++++++++++++++---------------------------------- 1 file changed, 40 insertions(+), 91 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=85f3ba90e520e49be32c…

1 0