January 2021 - Wine-Commits

Zebediah Figura : vkd3d-shader: Implement #else.
by Alexandre Julliard Jan. 4, 2021

Jan. 4, 2021

Module: vkd3d Branch: master Commit: 78e31bff163940620f58c592b222148b20981f9f URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=78e31bff163940620f58c59… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Dec 15 17:13:22 2020 -0600 vkd3d-shader: Implement #else. 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.h | 4 ++++ libs/vkd3d-shader/preproc.l | 3 +++ libs/vkd3d-shader/preproc.y | 25 +++++++++++++++++++++++++ 3 files changed, 32 insertions(+) diff --git a/libs/vkd3d-shader/preproc.h b/libs/vkd3d-shader/preproc.h index 0f494fc..effcd99 100644 --- a/libs/vkd3d-shader/preproc.h +++ b/libs/vkd3d-shader/preproc.h @@ -27,6 +27,10 @@ struct preproc_if_state { /* Are we currently in a "true" block? */ bool current_true; + /* Have we seen a "true" block in this #if..#endif yet? */ + bool seen_true; + /* Have we seen an #else yet? */ + bool seen_else; }; struct preproc_ctx diff --git a/libs/vkd3d-shader/preproc.l b/libs/vkd3d-shader/preproc.l index c60970c..33860d3 100644 --- a/libs/vkd3d-shader/preproc.l +++ b/libs/vkd3d-shader/preproc.l @@ -100,6 +100,8 @@ IDENTIFIER [A-Za-z_][A-Za-z0-9_]* for (p = yytext + 1; strchr(" \t", *p); ++p) ; + if (!strcmp(p, "else")) + return T_ELSE; if (!strcmp(p, "endif")) return T_ENDIF; if (!strcmp(p, "if")) @@ -187,6 +189,7 @@ int yylex(YYSTYPE *lval, YYLTYPE *lloc, yyscan_t scanner) { switch (token) { + case T_ELSE: case T_ENDIF: case T_IF: ctx->current_directive = token; diff --git a/libs/vkd3d-shader/preproc.y b/libs/vkd3d-shader/preproc.y index 3dc7e7c..fc50860 100644 --- a/libs/vkd3d-shader/preproc.y +++ b/libs/vkd3d-shader/preproc.y @@ -81,6 +81,8 @@ static bool preproc_push_if(struct preproc_ctx *ctx, bool condition) return false; state = &ctx->if_stack[ctx->if_count++]; state->current_true = condition && preproc_was_writing(ctx); + state->seen_true = condition; + state->seen_else = false; return true; } @@ -138,6 +140,7 @@ static uint32_t preproc_parse_integer(const char *s) %token T_NEWLINE +%token T_ELSE "#else" %token T_ENDIF "#endif" %token T_IF "#if" @@ -158,6 +161,28 @@ directive if (!preproc_push_if(ctx, !!$2)) YYABORT; } + | T_ELSE T_NEWLINE + { + if (ctx->if_count) + { + struct preproc_if_state *state = &ctx->if_stack[ctx->if_count - 1]; + + if (state->seen_else) + { + preproc_warning(ctx, &@$, VKD3D_SHADER_WARNING_PP_INVALID_DIRECTIVE, "Ignoring #else after #else."); + } + else + { + state->current_true = !state->seen_true && preproc_was_writing(ctx); + state->seen_else = true; + } + } + else + { + preproc_warning(ctx, &@$, VKD3D_SHADER_WARNING_PP_INVALID_DIRECTIVE, + "Ignoring #else without prior #if."); + } + } | T_ENDIF T_NEWLINE { if (ctx->if_count)

1 0

Zebediah Figura : vkd3d-shader: Handle preprocessor parsing errors.
by Alexandre Julliard Jan. 4, 2021

Jan. 4, 2021

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 Jan. 2, 2021

Jan. 2, 2021

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

Alexandre Julliard : Release 6.0-rc5.
by Alexandre Julliard Jan. 2, 2021

Jan. 2, 2021

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

Tag wine-6.0-rc5 : Alexandre Julliard : Release 6.0-rc5
by Alexandre Julliard Jan. 2, 2021

Jan. 2, 2021

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

Nikolay Sivov : readme: Update Russian translation.
by Alexandre Julliard Jan. 2, 2021

Jan. 2, 2021

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

Zhiyi Zhang : winex11.drv: Check that there are connected outputs before using XRandR 1.4.
by Alexandre Julliard Jan. 2, 2021

Jan. 2, 2021

Module: wine Branch: master Commit: 798137dbf6eeef3b7c1ca0257b381ad7903abbf8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=798137dbf6eeef3b7c1ca025… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Jan 1 13:00:47 2021 +0800 winex11.drv: Check that there are connected outputs before using XRandR 1.4. On headless systems, Wine can still run through a VNC connection even though no outputs are connected. Fallback to using the Xinerama display device handler in this case to report at least one monitor. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49500 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/xrandr.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index 78ad98acd49..fa748c2af04 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -1555,6 +1555,38 @@ void X11DRV_XRandR_Init(void) #ifdef HAVE_XRRGETPROVIDERRESOURCES if (ret >= 4 && (major > 1 || (major == 1 && minor >= 4))) { + XRRScreenResources *screen_resources; + XRROutputInfo *output_info; + BOOL found_output = FALSE; + INT i; + + screen_resources = xrandr_get_screen_resources(); + if (!screen_resources) + return; + + for (i = 0; i < screen_resources->noutput; ++i) + { + output_info = pXRRGetOutputInfo( gdi_display, screen_resources, screen_resources->outputs[i] ); + if (!output_info) + continue; + + if (output_info->connection == RR_Connected) + { + pXRRFreeOutputInfo( output_info ); + found_output = TRUE; + break; + } + + pXRRFreeOutputInfo( output_info ); + } + pXRRFreeScreenResources( screen_resources ); + + if (!found_output) + { + WARN("No connected outputs found.\n"); + return; + } + display_handler.name = "XRandR 1.4"; display_handler.priority = 200; display_handler.get_gpus = xrandr14_get_gpus;

1 0

Akihiro Sagawa : readme: Update Japanese translation.
by Alexandre Julliard Jan. 2, 2021

Jan. 2, 2021

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

Sveinar Søpler : readme: Update Norwegian translation.
by Alexandre Julliard Jan. 2, 2021

Jan. 2, 2021

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

Anton Baskanov : winegstreamer: Unmap and unref the buffer and release the sample before returning.
by Alexandre Julliard Jan. 2, 2021

Jan. 2, 2021

Module: wine Branch: master Commit: 472adf650962bcb4623b8c387f1479b6c5d17a3f URL: https://source.winehq.org/git/wine.git/?a=commit;h=472adf650962bcb4623b8c38… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Thu Dec 31 19:52:47 2020 +0700 winegstreamer: Unmap and unref the buffer and release the sample before returning. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 9114e6610a3..805a7b8c089 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -826,6 +826,9 @@ static GstFlowReturn got_data_sink(GstPad *pad, GstObject *parent, GstBuffer *bu hr = IMediaSample_SetActualDataLength(sample, info.size); if(FAILED(hr)){ + IMediaSample_Release(sample); + gst_buffer_unmap(buf, &info); + gst_buffer_unref(buf); WARN("SetActualDataLength failed: %08x\n", hr); return GST_FLOW_FLUSHING; }

1 0