January 2021 - Wine-commits

Zebediah Figura : vkd3d-shader: Implement #else.
by Alexandre Julliard 04 Jan '21

04 Jan '21

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: Implement #elif.
by Alexandre Julliard 04 Jan '21

04 Jan '21

Module: vkd3d Branch: master Commit: 6b75fb7b9c56428dd7365ee6c824c0baeb82bbd5 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=6b75fb7b9c56428dd7365ee… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Dec 15 17:13:23 2020 -0600 vkd3d-shader: Implement #elif. 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 | 3 +++ libs/vkd3d-shader/preproc.y | 23 +++++++++++++++++++++++ 3 files changed, 26 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index bf1d7bf..514f050 100644 --- a/Makefile.am +++ b/Makefile.am @@ -243,7 +243,6 @@ XFAIL_TESTS = \ tests/hlsl-vector-indexing.shader_test \ tests/hlsl-vector-indexing-uniform.shader_test \ tests/math.shader_test \ - tests/preproc-if.shader_test \ tests/preproc-ifdef.shader_test \ tests/preproc-if-expr.shader_test \ tests/preproc-invalid.shader_test \ diff --git a/libs/vkd3d-shader/preproc.l b/libs/vkd3d-shader/preproc.l index 33860d3..47ad1f1 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, "elif")) + return T_ELIF; if (!strcmp(p, "else")) return T_ELSE; if (!strcmp(p, "endif")) @@ -189,6 +191,7 @@ int yylex(YYSTYPE *lval, YYLTYPE *lloc, yyscan_t scanner) { switch (token) { + case T_ELIF: case T_ELSE: case T_ENDIF: case T_IF: diff --git a/libs/vkd3d-shader/preproc.y b/libs/vkd3d-shader/preproc.y index fc50860..647bb45 100644 --- a/libs/vkd3d-shader/preproc.y +++ b/libs/vkd3d-shader/preproc.y @@ -140,6 +140,7 @@ static uint32_t preproc_parse_integer(const char *s) %token T_NEWLINE +%token T_ELIF "#elif" %token T_ELSE "#else" %token T_ENDIF "#endif" %token T_IF "#if" @@ -161,6 +162,28 @@ directive if (!preproc_push_if(ctx, !!$2)) YYABORT; } + | T_ELIF expr 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 #elif after #else."); + } + else + { + state->current_true = $2 && !state->seen_true && preproc_was_writing(ctx); + state->seen_true = $2 || state->seen_true; + } + } + else + { + preproc_warning(ctx, &@$, VKD3D_SHADER_WARNING_PP_INVALID_DIRECTIVE, + "Ignoring #elif without prior #if."); + } + } | T_ELSE T_NEWLINE { if (ctx->if_count)

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

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

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

Anton Baskanov : winegstreamer: Unmap and unref the buffer and release the sample before returning.
by Alexandre Julliard 02 Jan '21

02 Jan '21

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

Zhiyi Zhang : winex11.drv: Check that there are connected outputs before using XRandR 1.4.
by Alexandre Julliard 02 Jan '21

02 Jan '21

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

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

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

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