wine-commits January 2021

wine-commits@winehq.org

2 participants
472 discussions

Zebediah Figura : vkd3d-shader: Implement basic support for #if and #endif.
by Alexandre Julliard 04 Jan '21

04 Jan '21

Module: vkd3d Branch: master Commit: 86cb863bc2de7f9c61c05bae6681d39907ffc9fe URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=86cb863bc2de7f9c61c05ba… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Dec 21 14:37:06 2020 -0600 vkd3d-shader: Implement basic support for #if and #endif. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/private/vkd3d_memory.h | 11 ++++ libs/vkd3d-shader/preproc.h | 17 +++++ libs/vkd3d-shader/preproc.l | 106 ++++++++++++++++++++++++++++--- libs/vkd3d-shader/preproc.y | 102 ++++++++++++++++++++++++++++- libs/vkd3d-shader/vkd3d_shader_main.c | 24 +++++++ libs/vkd3d-shader/vkd3d_shader_private.h | 6 ++ tests/hlsl_d3d12.c | 2 +- 7 files changed, 258 insertions(+), 10 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=86cb863bc2de7f9c61c…

1 0

Zebediah Figura : vkd3d-shader: Handle preprocessor parsing errors.
by Alexandre Julliard 04 Jan '21

04 Jan '21

Module: vkd3d Branch: master Commit: 5304cabf462ec0454fa75d225473fd6f511661e5 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=5304cabf462ec0454fa75d2… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Dec 15 17:13:20 2020 -0600 vkd3d-shader: Handle preprocessor parsing errors. 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 | 4 ++++ libs/vkd3d-shader/preproc.l | 38 +++++++++++++++++++++++++++++++- libs/vkd3d-shader/preproc.y | 17 +++++++++++++- libs/vkd3d-shader/vkd3d_shader_private.h | 2 ++ 4 files changed, 59 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/preproc.h b/libs/vkd3d-shader/preproc.h index cbd9322..bd9dfdd 100644 --- a/libs/vkd3d-shader/preproc.h +++ b/libs/vkd3d-shader/preproc.h @@ -27,7 +27,11 @@ struct preproc_ctx { void *scanner; + struct vkd3d_shader_message_context *message_context; struct vkd3d_string_buffer buffer; + struct vkd3d_shader_location location; + + bool error; }; #endif diff --git a/libs/vkd3d-shader/preproc.l b/libs/vkd3d-shader/preproc.l index 4d809b8..b406af0 100644 --- a/libs/vkd3d-shader/preproc.l +++ b/libs/vkd3d-shader/preproc.l @@ -27,6 +27,10 @@ #define YY_DECL static int preproc_lexer_lex(YYSTYPE *yylval_param, YYLTYPE *yylloc_param, yyscan_t yyscanner) +static void update_location(struct preproc_ctx *ctx); + +#define YY_USER_ACTION update_location(yyget_extra(yyscanner)); + %} %option 8bit @@ -88,6 +92,27 @@ IDENTIFIER [A-Za-z_][A-Za-z0-9_]* %% +static void update_location(struct preproc_ctx *ctx) +{ + unsigned int i, leng = yyget_leng(ctx->scanner); + const char *text = yyget_text(ctx->scanner); + + /* We want to do this here, rather than before calling yylex(), because + * some tokens are skipped by the lexer. */ + + *yyget_lloc(ctx->scanner) = ctx->location; + + for (i = 0; i < leng; ++i) + { + ++ctx->location.column; + if (text[i] == '\n') + { + ctx->location.column = 1; + ++ctx->location.line; + } + } +} + int yylex(YYSTYPE *lval, YYLTYPE *lloc, yyscan_t scanner) { struct preproc_ctx *ctx = yyget_extra(scanner); @@ -101,7 +126,7 @@ int yylex(YYSTYPE *lval, YYLTYPE *lloc, yyscan_t scanner) return 0; text = yyget_text(scanner); - TRACE("Parsing token %d, string %s.\n", token, debugstr_a(text)); + TRACE("Parsing token %d, line %d, string %s.\n", token, lloc->line, debugstr_a(text)); vkd3d_string_buffer_printf(&ctx->buffer, "%s ", text); } @@ -115,6 +140,10 @@ int preproc_lexer_parse(const struct vkd3d_shader_compile_info *compile_info, void *output_code; vkd3d_string_buffer_init(&ctx.buffer); + ctx.message_context = message_context; + ctx.location.source_name = compile_info->source_name; + ctx.location.line = 1; + ctx.location.column = 1; yylex_init_extra(&ctx, &ctx.scanner); top_buffer = yy_scan_bytes(compile_info->source.code, compile_info->source.size, ctx.scanner); @@ -124,6 +153,13 @@ int preproc_lexer_parse(const struct vkd3d_shader_compile_info *compile_info, yy_delete_buffer(top_buffer, ctx.scanner); yylex_destroy(ctx.scanner); + if (ctx.error) + { + WARN("Failed to preprocess.\n"); + vkd3d_string_buffer_cleanup(&ctx.buffer); + return VKD3D_ERROR_INVALID_SHADER; + } + if (!(output_code = vkd3d_malloc(ctx.buffer.content_size))) { vkd3d_string_buffer_cleanup(&ctx.buffer); diff --git a/libs/vkd3d-shader/preproc.y b/libs/vkd3d-shader/preproc.y index 92448f2..16b84ea 100644 --- a/libs/vkd3d-shader/preproc.y +++ b/libs/vkd3d-shader/preproc.y @@ -24,6 +24,8 @@ #include "vkd3d_shader_private.h" #include "preproc.h" +#define PREPROC_YYLTYPE struct vkd3d_shader_location + } %code provides @@ -36,9 +38,22 @@ int preproc_yylex(PREPROC_YYSTYPE *yylval_param, PREPROC_YYLTYPE *yylloc_param, %code { +#define YYLLOC_DEFAULT(cur, rhs, n) (cur) = YYRHSLOC(rhs, !!n) + +static void preproc_error(struct preproc_ctx *ctx, const struct vkd3d_shader_location *loc, + enum vkd3d_shader_error error, const char *format, ...) +{ + va_list args; + + va_start(args, format); + vkd3d_shader_verror(ctx->message_context, loc, error, format, args); + va_end(args); + ctx->error = true; +} + static void yyerror(const YYLTYPE *loc, void *scanner, struct preproc_ctx *ctx, const char *string) { - FIXME("Error reporting is not implemented.\n"); + preproc_error(ctx, loc, VKD3D_SHADER_ERROR_PP_INVALID_SYNTAX, "%s", string); } } diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index e974b92..882a806 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -79,6 +79,8 @@ enum vkd3d_shader_error VKD3D_SHADER_ERROR_RS_INVALID_ROOT_PARAMETER_TYPE = 3002, VKD3D_SHADER_ERROR_RS_INVALID_DESCRIPTOR_RANGE_TYPE = 3003, VKD3D_SHADER_ERROR_RS_MIXED_DESCRIPTOR_RANGE_TYPES = 3004, + + VKD3D_SHADER_ERROR_PP_INVALID_SYNTAX = 4000, }; enum VKD3D_SHADER_INSTRUCTION_HANDLER

1 0

Alexandre Julliard : Wine release 6.0-rc5
by Alexandre Julliard 02 Jan '21

02 Jan '21

Module: website Branch: master Commit: 4ea0d5c6b3c5fdfb22db8eb0588d19cb384ce7dc URL: https://source.winehq.org/git/website.git/?a=commit;h=4ea0d5c6b3c5fdfb22db8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jan 2 21:01:40 2021 +0100 Wine release 6.0-rc5 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2021010201.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/news/en/2021010201.xml b/news/en/2021010201.xml new file mode 100644 index 00000000..1b584ed5 --- /dev/null +++ b/news/en/2021010201.xml @@ -0,0 +1,12 @@ +<news> +<date>January 2, 2021</date> +<title>Wine 6.0-rc5 Released</title> +<body> + The Wine development release 6.0-rc5 is now available. + <a href="{$root}/announce/6.0-rc5">What's new</a> in this release: +<ul> + <li>Bug fixes only, we are in code freeze.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/6.0/wine-6.0-rc5.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-6.0-rc5 : Alexandre Julliard : Release 6.0-rc5
by Alexandre Julliard 02 Jan '21

02 Jan '21

Module: wine Branch: refs/tags/wine-6.0-rc5 Tag: 38adda18066187c6dbbb17ba209374a2e2b81e39 URL: https://source.winehq.org/git/wine.git/?a=tag;h=38adda18066187c6dbbb17ba209… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jan 2 20:59:44 2021 +0100 Release 6.0-rc5

1 0

Alexandre Julliard : Release 6.0-rc5.
by Alexandre Julliard 02 Jan '21

02 Jan '21

Module: wine Branch: master Commit: 9b12eae9ea445bbdeae196312fb65d20cdf27745 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b12eae9ea445bbdeae19631… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jan 2 20:59:44 2021 +0100 Release 6.0-rc5. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 153 ++++++++++++++++++++++++++++---------------------------------- AUTHORS | 1 + VERSION | 2 +- configure | 18 ++++---- 4 files changed, 80 insertions(+), 94 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9b12eae9ea445bbdeae1…

1 0

Nikolay Sivov : readme: Update Russian translation.
by Alexandre Julliard 02 Jan '21

02 Jan '21

Module: wine Branch: master Commit: 10f7230220846ea2c9d322d2f324e8fe80056512 URL: https://source.winehq.org/git/wine.git/?a=commit;h=10f7230220846ea2c9d322d2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jan 2 22:02:51 2021 +0300 readme: Update Russian translation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- documentation/README.ru | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/documentation/README.ru b/documentation/README.ru index 5276b99bd91..f3328edd13a 100644 --- a/documentation/README.ru +++ b/documentation/README.ru @@ -31,7 +31,7 @@ make FreeBSD 8.0 или более новой Solaris x86 9 или более новой NetBSD-текущей версии - Mac OS X 10.5 или более новой + Mac OS X 10.8 или более новой Так как Wine требует для запуска поддержку потоков на уровне ядра, поддерживаются только операционные системы, перечисленные выше. Другие @@ -53,9 +53,10 @@ NetBSD: включены в вашем ядре. Mac OS X: - Вам нужен Xcode 2.4 или более новый для компоновки x86. - Драйвер Mac работает на системах OS X версии 10.6 и выше, - он исключается из сборки на системах версии 10.5. + Вам потребуется Xcode/Xcode Command Line Tools или Apple cctools. + Минимальные требования для компиляции это clang 3.8 c MacOSX10.10.sdk и + mingw-w64 v8. MacOSX10.14.sdk и новее может использоваться только для + сборки wine64. Поддерживаемые файловые системы: Wine должен работать на большинстве файловых систем. При использовании файлов

1 0

Sveinar Søpler : readme: Update Norwegian translation.
by Alexandre Julliard 02 Jan '21

02 Jan '21

Module: wine Branch: master Commit: df9e871a6d1e959b1e2a0d05adb182198810d510 URL: https://source.winehq.org/git/wine.git/?a=commit;h=df9e871a6d1e959b1e2a0d05… Author: Sveinar Søpler <cybermax(a)dexter.no> Date: Sat Jan 2 15:06:30 2021 +0100 readme: Update Norwegian translation. Signed-off-by: Sveinar Søpler <cybermax(a)dexter.no> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- documentation/README.no | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/documentation/README.no b/documentation/README.no index 443515e2550..14d7ebcd498 100644 --- a/documentation/README.no +++ b/documentation/README.no @@ -32,7 +32,7 @@ Følgende kreves for å bygge og kjøre Wine: FreeBSD 8.0 eller nyere Solaris x86 9 eller nyere NetBSD-current - Mac OS X 10.5 eller nyere + Mac OS X 10.8 eller nyere Wine krever støtte for tråder på kjernenivå, og derfor er det bare operativsystemene ovenfor som støttes. Andre operativsystemer som @@ -52,8 +52,9 @@ Informasjon for NetBSD: USER_LDT, SYSVSHM, SYSVSEM og SYSVMSG må være aktivert i kjernen. Informasjon for Mac OS X: - Du må ha Xcode 2.4 eller nyere for å bygge Wine ordentlig på x86. - Mac-driveren krever OS X 10.6 eller nyere og vil ikke bli bygget på 10.5. + Du må ha Xcode/Xcode Command Line Tools eller Apple cctools. + Minimumskravet for å bygge Wine er clang 3.8 med MacOSX10.10.sdk og + mingw-w64 v8. MacOSX10.14.sdk eller nyere kan bare bygge wine64. Støttede filsystemer:

1 0

Akihiro Sagawa : readme: Update Japanese translation.
by Alexandre Julliard 02 Jan '21

02 Jan '21

Module: wine Branch: master Commit: 6db470e38eb5396ae47f7f2b50ddeee31b2edfb0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6db470e38eb5396ae47f7f2b… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sat Jan 2 20:10:58 2021 +0900 readme: Update Japanese translation. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- documentation/README.ja | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/documentation/README.ja b/documentation/README.ja index 57b35de9915..ea584853db1 100644 --- a/documentation/README.ja +++ b/documentation/README.ja @@ -40,7 +40,7 @@ Wineをコンパイルし実行するには、以下のうち一つを持って FreeBSD 8.0以降 Solaris x86 9以降 NetBSD-current - Mac OS X 10.5以降 + Mac OS X 10.8以降動作するためにWineにはカーネルレベルのスレッドのサポートが必要なので、以上で触れたオペレーティングシステムだけがサポートされます。 @@ -63,8 +63,10 @@ NetBSD情報: かどうかを確認してください。 Mac OS X情報: - x86上で正しくビルドするにはXcode 2.4以上が必要です。 - MacドライバにはOS X 10.6以降が必要です。10.5ではビルドされないでしょう。 + Xcode/Xcode Command Line ToolsまたはApple cctoolsが必要です。Wineを + コンパイルするための最小要件はclang 3.8とMacOSX10.10.sdkおよびmingw-w64 + v8の組み合わせです。MacOSX10.14.sdkまたはそれ以降はwine64だけをビルドでき + ます。サポートされたファイルシステム:

1 0

Alexandre Julliard : Update copyright info for 2021.
by Alexandre Julliard 02 Jan '21

02 Jan '21

Module: wine Branch: master Commit: 88d7aeee342b097a68a0532d00ebff3187430f17 URL: https://source.winehq.org/git/wine.git/?a=commit;h=88d7aeee342b097a68a0532d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jan 2 14:37:47 2021 +0100 Update copyright info for 2021. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- LICENSE | 2 +- dlls/opengl32/version.rc | 2 +- include/wine/wine_common_ver.rc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/LICENSE b/LICENSE index 34528113709..1a12a1e3a92 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 1993-2020 the Wine project authors (see the file AUTHORS +Copyright (c) 1993-2021 the Wine project authors (see the file AUTHORS for a complete list) Wine is free software; you can redistribute it and/or modify it under diff --git a/dlls/opengl32/version.rc b/dlls/opengl32/version.rc index 12c377bc9f6..f17f3ce0d74 100644 --- a/dlls/opengl32/version.rc +++ b/dlls/opengl32/version.rc @@ -20,7 +20,7 @@ #define WINE_FILENAME_STR "opengl32.dll" #define WINE_FILEVERSION 5,1,2600,2082 #define WINE_FILEVERSION_STR "5.1.2600.2082" -#define WINE_LEGALCOPYRIGHT "Copyright (c) 1993-2020 the Wine project. Not Microsoft" /* CATIA needs 'Microsoft' in both CompanyName _and_ LegalCopyright */ +#define WINE_LEGALCOPYRIGHT "Copyright (c) 1993-2021 the Wine project. Not Microsoft" /* CATIA needs 'Microsoft' in both CompanyName _and_ LegalCopyright */ #define WINE_PRODUCTVERSION 5,1,2600,2082 #define WINE_PRODUCTVERSION_STR "5.1" diff --git a/include/wine/wine_common_ver.rc b/include/wine/wine_common_ver.rc index 35ea44773a2..989192dc6fc 100644 --- a/include/wine/wine_common_ver.rc +++ b/include/wine/wine_common_ver.rc @@ -76,7 +76,7 @@ never complain. #endif #ifndef WINE_LEGALCOPYRIGHT -#define WINE_LEGALCOPYRIGHT "Copyright (c) 1993-2020 the Wine project authors (see the file AUTHORS for a complete list)" +#define WINE_LEGALCOPYRIGHT "Copyright (c) 1993-2021 the Wine project authors (see the file AUTHORS for a complete list)" #endif #ifndef WINE_PRODUCTVERSION

1 0

Zebediah Figura : server: Pass the correct size to sockaddr_from_unix() (Valgrind).
by Alexandre Julliard 02 Jan '21

02 Jan '21

Module: wine Branch: master Commit: ebe20da774cf62f3241d45db135175369ed475ad URL: https://source.winehq.org/git/wine.git/?a=commit;h=ebe20da774cf62f3241d45db… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jan 1 12:01:36 2021 -0600 server: Pass the correct size to sockaddr_from_unix() (Valgrind). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50437 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/sock.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/server/sock.c b/server/sock.c index 1ff56f7bbe5..5f207e7f180 100644 --- a/server/sock.c +++ b/server/sock.c @@ -459,6 +459,7 @@ static void fill_accept_output( struct accept_req *req, struct iosb *iosb ) { union unix_sockaddr unix_addr; struct WS_sockaddr *win_addr; + unsigned int remote_len; socklen_t unix_len; int fd, size = 0; char *out_data; @@ -495,7 +496,7 @@ static void fill_accept_output( struct accept_req *req, struct iosb *iosb ) unix_len = sizeof(unix_addr); win_addr = (struct WS_sockaddr *)(out_data + req->recv_len + sizeof(int)); if (getsockname( fd, &unix_addr.addr, &unix_len ) < 0 || - (win_len = sockaddr_from_unix( &unix_addr, win_addr, req->local_len )) < 0) + (win_len = sockaddr_from_unix( &unix_addr, win_addr, req->local_len - sizeof(int) )) < 0) { set_win32_error( sock_get_error( errno ) ); free( out_data ); @@ -506,8 +507,9 @@ static void fill_accept_output( struct accept_req *req, struct iosb *iosb ) unix_len = sizeof(unix_addr); win_addr = (struct WS_sockaddr *)(out_data + req->recv_len + req->local_len + sizeof(int)); + remote_len = iosb->out_size - req->recv_len - req->local_len; if (getpeername( fd, &unix_addr.addr, &unix_len ) < 0 || - (win_len = sockaddr_from_unix( &unix_addr, win_addr, iosb->out_size - req->recv_len - req->local_len )) < 0) + (win_len = sockaddr_from_unix( &unix_addr, win_addr, remote_len - sizeof(int) )) < 0) { set_win32_error( sock_get_error( errno ) ); free( out_data );

1 0

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 2021