March 2021 - Wine-Commits - list.winehq.org

Zebediah Figura : vkd3d-shader: Inline declare_variable() into its caller.
by Alexandre Julliard March 24, 2021

March 24, 2021

Module: vkd3d Branch: master Commit: 7d8491516a3dc59f2380dbdebb799ec76dc73bbd URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=7d8491516a3dc59f2380dbd… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Mar 22 17:02:36 2021 -0500 vkd3d-shader: Inline declare_variable() into its caller. 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/hlsl.y | 94 +++++++++++++++++++----------------------------- 1 file changed, 37 insertions(+), 57 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 4b0ddea..41fea19 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -292,60 +292,6 @@ static struct hlsl_ir_node *add_implicit_conversion(struct hlsl_ctx *ctx, struct return &cast->node; } -static bool declare_variable(struct hlsl_ctx *ctx, struct hlsl_ir_var *decl, bool local) -{ - struct hlsl_ir_function_decl *func; - bool ret; - - if (decl->data_type->type != HLSL_CLASS_MATRIX) - check_invalid_matrix_modifiers(ctx, decl->modifiers, decl->loc); - - if (local) - { - DWORD invalid = decl->modifiers & (HLSL_STORAGE_EXTERN | HLSL_STORAGE_SHARED - | HLSL_STORAGE_GROUPSHARED | HLSL_STORAGE_UNIFORM); - - if (invalid) - { - struct vkd3d_string_buffer *string; - - if ((string = hlsl_modifiers_to_string(&ctx->string_buffers, invalid))) - hlsl_error(ctx, decl->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_MODIFIER, - "Modifiers '%s' are not allowed on local variables.", string->buffer); - vkd3d_string_buffer_release(&ctx->string_buffers, string); - } - - if (decl->semantic) - { - hlsl_error(ctx, decl->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_SEMANTIC, - "Semantics are not allowed on local variables."); - return false; - } - } - else - { - if ((func = hlsl_get_func_decl(ctx, decl->name))) - { - hlsl_error(ctx, decl->loc, VKD3D_SHADER_ERROR_HLSL_REDEFINED, - "Variable '%s' is already defined as a function.", decl->name); - hlsl_note(ctx, func->loc, VKD3D_SHADER_LOG_ERROR, - "\"%s\" was previously defined here.", decl->name); - return false; - } - } - ret = hlsl_add_var(ctx, decl, local); - if (!ret) - { - struct hlsl_ir_var *old = hlsl_get_var(ctx->cur_scope, decl->name); - - hlsl_error(ctx, decl->loc, VKD3D_SHADER_ERROR_HLSL_REDEFINED, - "Variable \"%s\" was already declared in this scope.", decl->name); - hlsl_note(ctx, old->loc, VKD3D_SHADER_LOG_ERROR, "\"%s\" was previously declared here.", old->name); - return false; - } - return true; -} - static DWORD add_modifiers(struct hlsl_ctx *ctx, DWORD modifiers, DWORD mod, const struct vkd3d_shader_location loc) { if (modifiers & mod) @@ -1431,10 +1377,11 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t DWORD modifiers, struct list *var_list) { struct parse_variable_def *v, *v_next; + struct hlsl_ir_function_decl *func; struct list *statements_list; struct hlsl_ir_var *var; struct hlsl_type *type; - bool ret, local = true; + bool local = true; if (basic_type->type == HLSL_CLASS_MATRIX) assert(basic_type->modifiers & HLSL_MODIFIERS_MAJORITY_MASK); @@ -1464,10 +1411,39 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t continue; } + if (var->data_type->type != HLSL_CLASS_MATRIX) + check_invalid_matrix_modifiers(ctx, var->modifiers, var->loc); + if (ctx->cur_scope == ctx->globals) { var->modifiers |= HLSL_STORAGE_UNIFORM; local = false; + + if ((func = hlsl_get_func_decl(ctx, var->name))) + { + hlsl_error(ctx, var->loc, VKD3D_SHADER_ERROR_HLSL_REDEFINED, + "'%s' is already defined as a function.", var->name); + hlsl_note(ctx, func->loc, VKD3D_SHADER_LOG_ERROR, + "'%s' was previously defined here.", var->name); + } + } + else + { + static const unsigned int invalid = HLSL_STORAGE_EXTERN | HLSL_STORAGE_SHARED + | HLSL_STORAGE_GROUPSHARED | HLSL_STORAGE_UNIFORM; + + if (var->modifiers & invalid) + { + struct vkd3d_string_buffer *string; + + if ((string = hlsl_modifiers_to_string(&ctx->string_buffers, var->modifiers & invalid))) + hlsl_error(ctx, var->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_MODIFIER, + "Modifiers '%s' are not allowed on local variables.", string->buffer); + vkd3d_string_buffer_release(&ctx->string_buffers, string); + } + if (var->semantic) + hlsl_error(ctx, var->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_SEMANTIC, + "Semantics are not allowed on local variables."); } if ((type->modifiers & HLSL_MODIFIER_CONST) && !v->initializer.args_count @@ -1480,9 +1456,13 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t continue; } - ret = declare_variable(ctx, var, local); - if (!ret) + if (!hlsl_add_var(ctx, var, local)) { + struct hlsl_ir_var *old = hlsl_get_var(ctx->cur_scope, var->name); + + hlsl_error(ctx, var->loc, VKD3D_SHADER_ERROR_HLSL_REDEFINED, + "Variable \"%s\" was already declared in this scope.", var->name); + hlsl_note(ctx, old->loc, VKD3D_SHADER_LOG_ERROR, "\"%s\" was previously declared here.", old->name); hlsl_free_var(var); vkd3d_free(v); continue;

1 0

Francois Gouget : testbot/reporttest: Remove the revision placeholder from start lines.
by Alexandre Julliard March 24, 2021

March 24, 2021

Module: tools Branch: master Commit: 73f7e3c5140f34cfd81e4e5d7441ffc9690ce31a URL: https://source.winehq.org/git/tools.git/?a=commit;h=73f7e3c5140f34cfd81e4e5… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 24 14:31:07 2021 +0100 testbot/reporttest: Remove the revision placeholder from start lines. Back in the CVS days the start line contained the revision of the test file. But it has been replaced by a placeholder since the switch to Git. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/src/reporttest/report.template | 99 +++++++++++++++++----------------- testbot/src/reporttest/reporttest.c | 2 +- 2 files changed, 51 insertions(+), 50 deletions(-) Diff: https://source.winehq.org/git/tools.git/?a=commitdiff;h=73f7e3c5140f34cfd81…

1 0

Francois Gouget : testbot/TestLauncher: Remove the revision placeholder from start lines.
by Alexandre Julliard March 24, 2021

March 24, 2021

Module: tools Branch: master Commit: 0bcbe8440ec24cc8101d156943304a54d17298c8 URL: https://source.winehq.org/git/tools.git/?a=commit;h=0bcbe8440ec24cc8101d156… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 24 14:31:02 2021 +0100 testbot/TestLauncher: Remove the revision placeholder from start lines. Back in the CVS days the start line contained the revision of the test file. But it has been replaced by a placeholder since the switch to Git. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/src/TestLauncher/TestLauncher.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/src/TestLauncher/TestLauncher.c b/testbot/src/TestLauncher/TestLauncher.c index dd34a76..58eed76 100644 --- a/testbot/src/TestLauncher/TestLauncher.c +++ b/testbot/src/TestLauncher/TestLauncher.c @@ -231,7 +231,7 @@ int main(int argc, char *argv[]) } Start = GetTickCount(); - printf("%s:%s start - -\n", TestName, Subtest); + printf("%s:%s start -\n", TestName, Subtest); fflush(stdout); StartupInfo.cb = sizeof(STARTUPINFOA);

1 0

Jeremy Newman : load mailman key from file
by Jeremy Newman March 24, 2021

March 24, 2021

Module: website Branch: master Commit: 692a99ed0750a01f6db35a0d630c555242d5b508 URL: https://source.winehq.org/git/website.git/?a=commit;h=692a99ed0750a01f6db35… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Wed Mar 24 13:34:51 2021 -0500 load mailman key from file --- include/plugins/mailman_key.php | 14 ++++++++++++++ include/winehq.conf.sample | 3 +++ templates/en/forums.template | 9 ++++++--- templates/nl/forums.template | 2 +- templates/zh-cn/forums.template | 7 ++++--- 5 files changed, 28 insertions(+), 7 deletions(-) diff --git a/include/plugins/mailman_key.php b/include/plugins/mailman_key.php new file mode 100644 index 00000000..89de3fee --- /dev/null +++ b/include/plugins/mailman_key.php @@ -0,0 +1,14 @@ +<?php + +/* + WineHQ Mailman Key + by Jeremy Newman <jnewman(a)codeweavers.com> +*/ + +if (file_exists($config->mailman_key)) + echo base64_encode(trim(file_get_contents($config->mailman_key))); +else + echo "ERROR: Unable to load key!"; + +// done +?> diff --git a/include/winehq.conf.sample b/include/winehq.conf.sample index 7cbc760f..d301675f 100644 --- a/include/winehq.conf.sample +++ b/include/winehq.conf.sample @@ -40,3 +40,6 @@ bug_system: https://bugs.winehq.org/show_bug.cgi?id= # URL for git tree git_tree: https://source.winehq.org/git + +# Filename of Mailman Key for forums page +mailman_key: \ No newline at end of file diff --git a/templates/en/forums.template b/templates/en/forums.template index 62cd68eb..81d333dd 100644 --- a/templates/en/forums.template +++ b/templates/en/forums.template @@ -39,12 +39,15 @@ or just use <a href="//www.winehq.org/mailman/listinfo">the Mailman web interfac </p> <p> <b>Username:</b> <code>mailman</code><br> - <b>Password:</b> <code class="getForumKey bold cursor" data-code="RnljREw3S2tDdmhXUmJiRQ== + <b>Password:</b> <code class="getForumKey bold cursor" data-code=" ">**********************</code> </p> <p> - Click the code to reveal the actual password.<br> - This password may change from time to time, so check back here for changes. + Click the code to reveal the actual password. + </p> + <p> + <b>Note:</b> This password updates regularly, so check back here for changes.<br> + <b>Warning:</b> Entering the password wrong multiple times will result in a 24 hour ban from the website. </p> </div> diff --git a/templates/nl/forums.template b/templates/nl/forums.template index 41ee86fe..ffe6e2d4 100644 --- a/templates/nl/forums.template +++ b/templates/nl/forums.template @@ -45,7 +45,7 @@ Mailman gebruikersomgeving</a> website.</p> </tr> <tr> <td><b>Wachtwoord:</b></td> - <td><code class="getForumKey bold cursor" data-code="RnljREw3S2tDdmhXUmJiRQ== + <td><code class="getForumKey bold cursor" data-code=" ">**********************</code></td> <tr> </table> diff --git a/templates/zh-cn/forums.template b/templates/zh-cn/forums.template index 7304801e..b38cafe8 100644 --- a/templates/zh-cn/forums.template +++ b/templates/zh-cn/forums.template @@ -32,7 +32,8 @@ WWW</a>，或者发送一封标题为 <code>"subscribe"</code> 的邮件到 <cod </p> <p> <b>用户名：</b> <code>mailman</code><br> - <b>密码：</b> <code>getalist</code> + <b>密码：</b> <code class="getForumKey bold cursor" data-code=" +">**********************</code> </p> <p>密码会时不时更新，请从这里获取最新的密码。</p> </div> @@ -42,8 +43,8 @@ WWW</a>，或者发送一封标题为 <code>"subscribe"</code> 的邮件到 <cod <ul class="roomy"> <li> <b><a href="mailto:wine-announce(a)winehq.org">wine-announce(a)winehq.org</a></b><br> - [<a href="//www.winehq.org/mailman/listinfo/wine-announce">（取消）订阅</a>] - [<a href="//www.winehq.org/pipermail/wine-announce/">存档 1</a>] + [<a href="//www.winehq.org/mailman/listinfo/wine-announce">（取消）订阅</a>] + [<a href="//www.winehq.org/pipermail/wine-announce/">存档 1</a>] [<a href="http://news.gmane.org/gmane.comp.emulators.wine.announce">存档 2</a>]<br> 一个低流量（2封/月）的只读列表，用于宣布发布和其他主要的 Wine 或者 WineHQ 消息。 </li>

1 0

Jeremy Newman : base_url: detect https
by Jeremy Newman March 24, 2021

March 24, 2021

Module: website Branch: master Commit: 8fb5a208ca5b78e43d5a017ae6eb803cabcd70fb URL: https://source.winehq.org/git/website.git/?a=commit;h=8fb5a208ca5b78e43d5a0… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Wed Mar 24 13:12:12 2021 -0500 base_url: detect https --- include/html.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/html.php b/include/html.php index eb65ed4f..ca744580 100644 --- a/include/html.php +++ b/include/html.php @@ -257,7 +257,7 @@ class html } // return constructed URL - if (!empty($GLOBALS['config']->use_https)) + if (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] != 'off') return "https://{$url_domain}{$this->_web_root}"; else return "http://{$url_domain}{$this->_web_root}";

1 0

Jeremy Newman : remove google analytics
by Jeremy Newman March 24, 2021

March 24, 2021

Module: website Branch: master Commit: da6f641ceca7502e6a7f667feb108072e67515ac URL: https://source.winehq.org/git/website.git/?a=commit;h=da6f641ceca7502e6a7f6… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Wed Mar 24 13:13:25 2021 -0500 remove google analytics --- include/plugins/google_analytics.php | 19 ------------------- templates/en/global/google_analytics.template | 8 -------- templates/en/global/layout/content.template | 6 ++---- templates/zh-cn/global/layout/content.template | 6 ++---- 4 files changed, 4 insertions(+), 35 deletions(-) diff --git a/include/plugins/google_analytics.php b/include/plugins/google_analytics.php deleted file mode 100644 index 2850afb7..00000000 --- a/include/plugins/google_analytics.php +++ /dev/null @@ -1,19 +0,0 @@ -<?php - -/* - * WineHQ.org - * by Jeremy Newman <jnewman(a)codeweavers.com> - */ - -/* - Loads Google Analytics Statistics -*/ - -if (!empty($config->google_analytics)) -{ - // display the google analytics code - echo $html->template("local", "global/google_analytics", array('gcode' => $config->google_analytics)); -} - -// done -?> diff --git a/templates/en/global/google_analytics.template b/templates/en/global/google_analytics.template deleted file mode 100644 index 9b55ba3f..00000000 --- a/templates/en/global/google_analytics.template +++ /dev/null @@ -1,8 +0,0 @@ - <script> - (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){ - (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o), - m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m) - })(window,document,'script','//www.google-analytics.com/analytics.js','ga'); - ga('create', '{$gcode}', 'auto'); - ga('send', 'pageview'); - </script> diff --git a/templates/en/global/layout/content.template b/templates/en/global/layout/content.template index 03961319..9641b1ec 100644 --- a/templates/en/global/layout/content.template +++ b/templates/en/global/layout/content.template @@ -1,8 +1,8 @@ <!doctype html> <html lang="{$html_lang}">  - <link rel="shortcut icon" type="image/png" href="https://dl.winehq.org/share/images/winehq_logo_16.png"> {$rss_link} </head> diff --git a/templates/zh-cn/global/layout/content.template b/templates/zh-cn/global/layout/content.template index 715f36e4..a7705992 100644 --- a/templates/zh-cn/global/layout/content.template +++ b/templates/zh-cn/global/layout/content.template @@ -1,8 +1,8 @@ <!doctype html> <html lang="{$html_lang}">  - <link rel="shortcut icon" type="image/png" href="https://dl.winehq.org/share/images/winehq_logo_16.png"> {$rss_link} </head>

1 0

Jeremy Newman : update with latest defaults
by Jeremy Newman March 24, 2021

March 24, 2021

Module: website Branch: master Commit: 375867c364da53377241b55bee1804b7c5386046 URL: https://source.winehq.org/git/website.git/?a=commit;h=375867c364da53377241b… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Wed Mar 24 13:13:06 2021 -0500 update with latest defaults --- include/winehq.conf.sample | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/include/winehq.conf.sample b/include/winehq.conf.sample index 4d3376a5..7cbc760f 100644 --- a/include/winehq.conf.sample +++ b/include/winehq.conf.sample @@ -20,13 +20,13 @@ site_name: WineHQ lang: en # available languages -(a)languages: en, de, es, fr, ko, pl, pt, tr, uk, zh-cn +(a)languages: en, de, es, fr, ko, nl, pl, pt, tr, uk, zh-cn # pages that use PATH_INFO @stop_pages: announce, interview, lang, news, wwn # default base URLS -base_root: +base_root: base_url: https://www.winehq.org{$base_root}/ # Path to WWN XML files @@ -36,10 +36,7 @@ news_xml_path: ./news wwn_xml_path: ./wwn # URL for bugs -bug_system: http://bugs.winehq.org/show_bug.cgi?id= +bug_system: https://bugs.winehq.org/show_bug.cgi?id= # URL for git tree -git_tree: http://source.winehq.org/git - -# Google Analytics Tracking Code -google_analytics: +git_tree: https://source.winehq.org/git

1 0

Nikolay Sivov : mfplat: Remove duplicated GUID entry from attribute tracing.
by Alexandre Julliard March 23, 2021

March 23, 2021

Module: wine Branch: master Commit: 80b6555ed4b0315046f84ad2ab339e0131989f92 URL: https://source.winehq.org/git/wine.git/?a=commit;h=80b6555ed4b0315046f84ad2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 23 19:07:51 2021 +0300 mfplat: Remove duplicated GUID entry from attribute tracing. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index f8d965522fd..6fb8661dba4 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -1511,6 +1511,7 @@ const char *debugstr_attr(const GUID *guid) static const struct guid_def guid_defs[] = { #define X(g) { &(g), #g } +#define MF_READER_WRITER_D3D_MANAGER MF_SOURCE_READER_D3D_MANAGER X(MF_READWRITE_MMCSS_CLASS), X(MF_TOPONODE_MARKIN_HERE), X(MF_MT_H264_SUPPORTED_SYNC_FRAME_TYPES), @@ -1728,8 +1729,7 @@ const char *debugstr_attr(const GUID *guid) X(MF_SA_D3D11_ALLOW_DYNAMIC_YUV_TEXTURE), X(MF_MT_VIDEO_3D_FORMAT), X(MF_EVENT_STREAM_METADATA_KEYDATA), - X(MF_SINK_WRITER_D3D_MANAGER), - X(MF_SOURCE_READER_D3D_MANAGER), + X(MF_READER_WRITER_D3D_MANAGER), X(MFSampleExtension_3DVideo), X(MF_MT_H264_USAGE), X(MF_MEDIA_ENGINE_EME_CALLBACK), @@ -1863,6 +1863,7 @@ const char *debugstr_attr(const GUID *guid) X(MF_AUDIO_RENDERER_ATTRIBUTE_ENDPOINT_ROLE), X(MF_MT_VIDEO_3D_LEFT_IS_BASE), X(MF_TOPONODE_WORKQUEUE_MMCSS_TASKID), +#undef MF_READER_WRITER_D3D_MANAGER #undef X }; struct guid_def *ret = NULL;

1 0

Arkadiusz Hiler : ntoskrnl.exe: Use correct name format when sending WM_DEVICECHANGE.
by Alexandre Julliard March 23, 2021

March 23, 2021

Module: wine Branch: master Commit: f69c8f018188af49d5a3916f7bb7e3ab984fd3ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=f69c8f018188af49d5a3916f… Author: Arkadiusz Hiler <ahiler(a)codeweavers.com> Date: Tue Mar 23 20:10:10 2021 +0200 ntoskrnl.exe: Use correct name format when sending WM_DEVICECHANGE. This fixes controller hotplug with FarCry Primal. Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/pnp.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntoskrnl.exe/pnp.c b/dlls/ntoskrnl.exe/pnp.c index 4a1fbf001a4..6652be73c47 100644 --- a/dlls/ntoskrnl.exe/pnp.c +++ b/dlls/ntoskrnl.exe/pnp.c @@ -776,6 +776,7 @@ NTSTATUS WINAPI IoSetDeviceInterfaceState( UNICODE_STRING *name, BOOLEAN enable broadcast->dbcc_reserved = 0; broadcast->dbcc_classguid = iface->interface_class; lstrcpynW( broadcast->dbcc_name, name->Buffer, namelen + 1 ); + if (namelen > 1) broadcast->dbcc_name[1] = '\\'; send_devicechange( enable ? DBT_DEVICEARRIVAL : DBT_DEVICEREMOVECOMPLETE, broadcast, len ); heap_free( broadcast ); }

1 0

Nikolay Sivov : mfreadwrite/reader: Use current stream type to set up sample allocator.
by Alexandre Julliard March 23, 2021

March 23, 2021

Module: wine Branch: master Commit: 482f977b343e51d220025400b9b0f0f6f1722f88 URL: https://source.winehq.org/git/wine.git/?a=commit;h=482f977b343e51d220025400… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 23 19:04:47 2021 +0300 mfreadwrite/reader: Use current stream type to set up sample allocator. It's normal to have incomplete type description for SetCurrentMediaType(), with just major/subtype attributes. Allocator will need at least frame size. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/reader.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/mfreadwrite/reader.c b/dlls/mfreadwrite/reader.c index f1fbba94e51..7cb7e1e40eb 100644 --- a/dlls/mfreadwrite/reader.c +++ b/dlls/mfreadwrite/reader.c @@ -1629,15 +1629,14 @@ static HRESULT source_reader_set_compatible_media_type(struct source_reader *rea return type_set ? S_OK : S_FALSE; } -static HRESULT source_reader_setup_sample_allocator(struct source_reader *reader, unsigned int index, - IMFMediaType *media_type) +static HRESULT source_reader_setup_sample_allocator(struct source_reader *reader, unsigned int index) { struct media_stream *stream = &reader->streams[index]; IMFVideoSampleAllocatorCallback *callback; GUID major = { 0 }; HRESULT hr; - IMFMediaType_GetMajorType(media_type, &major); + IMFMediaType_GetMajorType(stream->current, &major); if (!IsEqualGUID(&major, &MFMediaType_Video)) return S_OK; @@ -1666,7 +1665,7 @@ static HRESULT source_reader_setup_sample_allocator(struct source_reader *reader return hr; } - if (FAILED(hr = IMFVideoSampleAllocatorEx_InitializeSampleAllocatorEx(stream->allocator, 2, 8, NULL, media_type))) + if (FAILED(hr = IMFVideoSampleAllocatorEx_InitializeSampleAllocatorEx(stream->allocator, 2, 8, NULL, stream->current))) WARN("Failed to initialize sample allocator, hr %#x.\n", hr); if (SUCCEEDED(IMFVideoSampleAllocatorEx_QueryInterface(stream->allocator, &IID_IMFVideoSampleAllocatorCallback, (void **)&callback))) @@ -1837,7 +1836,7 @@ static HRESULT WINAPI src_reader_SetCurrentMediaType(IMFSourceReader *iface, DWO if (hr == S_FALSE) hr = source_reader_create_decoder_for_stream(reader, index, type); if (SUCCEEDED(hr)) - hr = source_reader_setup_sample_allocator(reader, index, type); + hr = source_reader_setup_sample_allocator(reader, index); LeaveCriticalSection(&reader->cs);

1 0