December 2020 - Wine-Commits

Jactry Zeng : po: Update Simplified Chinese translation.
by Alexandre Julliard Dec. 15, 2020

Dec. 15, 2020

Module: wine Branch: master Commit: 25b6b2b7e8b49fb06c84122237ddd08d711c58c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=25b6b2b7e8b49fb06c841222… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Tue Dec 15 17:00:50 2020 +0800 po: Update Simplified Chinese translation. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/zh_CN.po | 228 +++++++++++++++++++----------------------------------------- 1 file changed, 70 insertions(+), 158 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=25b6b2b7e8b49fb06c84…

1 0

Can Taşan : po: Update Turkish translation.
by Alexandre Julliard Dec. 15, 2020

Dec. 15, 2020

Module: wine Branch: master Commit: 6fd2ef8cd1efc86511365e6a2435b83a4be58bb1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6fd2ef8cd1efc86511365e6a… Author: Can Taşan <betax34(a)hotmail.com> Date: Tue Dec 15 15:35:47 2020 +0100 po: Update Turkish translation. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/tr.po | 530 +++++++++++++++++++++++---------------------------------------- 1 file changed, 191 insertions(+), 339 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6fd2ef8cd1efc8651136…

1 0

Akihiro Sagawa : po: Update Japanese translation.
by Alexandre Julliard Dec. 15, 2020

Dec. 15, 2020

Module: wine Branch: master Commit: 8a3a67efd4496d6dc711fece3900bda772b74f4d URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a3a67efd4496d6dc711fece… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Dec 15 22:31:29 2020 +0900 po: Update Japanese translation. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ja.po | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/po/ja.po b/po/ja.po index 8955cb2ebe7..30005ba56ad 100644 --- a/po/ja.po +++ b/po/ja.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2020-12-14 21:46+0900\n" +"PO-Revision-Date: 2020-12-15 21:26+0900\n" "Last-Translator: Akihiro Sagawa <sagawa.aki(a)gmail.com>\n" "Language-Team: Japanese\n" "Language: ja\n" @@ -580,7 +580,7 @@ msgstr "ページ設定(&P)" #: dlls/comdlg32/comdlg32.rc:213 dlls/comdlg32/comdlg32.rc:235 msgid "&Setup" -msgstr "プリンタの設定(&S)" +msgstr "プリンターの設定(&S)" #: dlls/comdlg32/comdlg32.rc:214 msgid "&From:" @@ -7316,7 +7316,7 @@ msgstr "サンプルがシンクに処理されませんでした。\n" #: dlls/mferror/mferror.mc:620 msgid "Sink was not provided with required headers.\n" -msgstr "シンクにて必須ヘッダが提供されませんでした。\n" +msgstr "シンクにて必須ヘッダーが提供されませんでした。\n" #: dlls/mferror/mferror.mc:627 msgid "Optional node is invalid.\n" @@ -11051,7 +11051,7 @@ msgstr "URL スキームを認識できなかったかサポートしていま #: dlls/wininet/winineterror.mc:46 msgid "The server name could not be resolved.\n" -msgstr "サーバー名をを解決できませんでした。\n" +msgstr "サーバー名を解決できませんでした。\n" #: dlls/wininet/winineterror.mc:51 msgid "The requested operation is invalid.\n" @@ -11169,15 +11169,15 @@ msgid "" "The wave header was not prepared. Use the Prepare function to prepare the " "header, and then try again." msgstr "" -"waveヘッダが準備されていません。Prepare関数を使用してヘッダを準備してやり直し" -"て下さい。" +"wave ヘッダーが準備されていません。Prepare 関数を使用してヘッダーを準備してや" +"り直して下さい。" #: dlls/winmm/winmm.rc:49 msgid "" "Cannot open the device without using the WAVE_ALLOWSYNC flag. Use the flag, " "and then try again." msgstr "" -"WAVE_ALLOWSYNCフラグなしではデバイスをオープンできません。フラグを指定してや" +"WAVE_ALLOWSYNC フラグなしではデバイスをオープンできません。フラグを指定してや" "り直して下さい。" #: dlls/winmm/winmm.rc:52 @@ -11185,16 +11185,16 @@ msgid "" "The MIDI header was not prepared. Use the Prepare function to prepare the " "header, and then try again." msgstr "" -"MIDIヘッダが準備されていません。Prepare関数を使用してヘッダを準備してやり直し" -"て下さい。" +"MIDI ヘッダーが準備されていません。Prepare 関数を使用してヘッダーを準備してや" +"り直して下さい。" #: dlls/winmm/winmm.rc:54 msgid "" "A MIDI map was not found. There may be a problem with the driver, or the " "MIDIMAP.CFG file may be corrupt or missing." msgstr "" -"MIDIマップが見つかりません。ドライバーの問題か、MIDIMAP.CFGファイルが破損して" -"いるか存在しない可能性があります。" +"MIDI マップが見つかりません。ドライバーの問題か、MIDIMAP.CFG ファイルが破損し" +"ているか存在しない可能性があります。" #: dlls/winmm/winmm.rc:55 msgid "" @@ -11332,7 +11332,7 @@ msgstr "" #: dlls/winmm/winmm.rc:80 msgid "Cannot use 'all' as the device name with the specified command." msgstr "" -"指定されたコマンドは「all」をデバイス名として使用することができません。" +"指定されたコマンドは 'all' をデバイス名として使用することができません。" #: dlls/winmm/winmm.rc:81 msgid "" @@ -11476,8 +11476,8 @@ msgid "" "The filename is invalid. Make sure the filename is not longer than 8 " "characters, followed by a period and an extension." msgstr "" -"ファイル名が無効です。ファイル名が半角8文字以内で、ピリオドに続いて拡張子が付" -"いていることを確認して下さい。" +"ファイル名が無効です。ファイル名が半角 8 文字以内で、ピリオドに続いて拡張子が" +"付いていることを確認して下さい。" #: dlls/winmm/winmm.rc:104 msgid "" @@ -12290,8 +12290,8 @@ msgstr "" "$q 等号 $t 現在の時刻 $v cmdのバージョン\n" "\n" "注意：PROMPTコマンドをプロンプト文字列なしで実行すると、既定値にリセット\n" -"されます。デフォルト値はカレントディレクトリ(ドライブ名を含みます)\n" -"に続いて大なり(>)記号です。\n" +"されます。既定値はカレントディレクトリ (ドライブ名を含みます) に続いて\n" +"大なり (>) 記号です。\n" "(PROMPT $p$g を実行した時と同様です)\n" "\n" "プロンプトはPROMPT環境変数を編集することでも変更できます。したがって、\n" @@ -13488,7 +13488,7 @@ msgstr "ページ設定" #: programs/notepad/notepad.rc:102 msgid "&Header:" -msgstr "ヘッダ(&H):" +msgstr "ヘッダー(&H):" #: programs/notepad/notepad.rc:104 msgid "&Footer:"

1 0

Biswapriyo Nath : include: Add AMBISONICS_PARAMS structure in audioclient.idl.
by Alexandre Julliard Dec. 15, 2020

Dec. 15, 2020

Module: wine Branch: master Commit: 38c21c3395ebbf391b78ef800cc65e73dd6b1d8e URL: https://source.winehq.org/git/wine.git/?a=commit;h=38c21c3395ebbf391b78ef80… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Tue Dec 15 15:26:54 2020 +0530 include: Add AMBISONICS_PARAMS structure in audioclient.idl. Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/audioclient.idl | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/include/audioclient.idl b/include/audioclient.idl index 311c01c8eab..e1a4200730f 100644 --- a/include/audioclient.idl +++ b/include/audioclient.idl @@ -333,6 +333,34 @@ interface IAudioStreamVolume : IUnknown ); } +typedef enum AMBISONICS_TYPE +{ + AMBISONICS_TYPE_FULL3D = 0x0, +} AMBISONICS_TYPE; + +typedef enum AMBISONICS_CHANNEL_ORDERING +{ + AMBISONICS_CHANNEL_ORDERING_ACN = 0x0, +} AMBISONICS_CHANNEL_ORDERING; + +typedef enum AMBISONICS_NORMALIZATION +{ + AMBISONICS_NORMALIZATION_SN3D = 0x0, + AMBISONICS_NORMALIZATION_N3D = 0x1, +} AMBISONICS_NORMALIZATION; + +typedef struct AMBISONICS_PARAMS +{ + UINT32 u32Size; + UINT32 u32Version; + AMBISONICS_TYPE u32Type; + AMBISONICS_CHANNEL_ORDERING u32ChannelOrdering; + AMBISONICS_NORMALIZATION u32Normalization; + UINT32 u32Order; + UINT32 u32NumChannels; + UINT32 *pu32ChannelMap; +} AMBISONICS_PARAMS; + [ local, pointer_default(unique),

1 0

Henri Verbeet : wine.inf: Store Dynamic DST data for Asia/Tehran as "relative" dates.
by Alexandre Julliard Dec. 15, 2020

Dec. 15, 2020

Module: wine Branch: master Commit: e389f11137526301b4e34e75331ae02a7113ef1d URL: https://source.winehq.org/git/wine.git/?a=commit;h=e389f11137526301b4e34e75… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 16 00:19:24 2020 +0330 wine.inf: Store Dynamic DST data for Asia/Tehran as "relative" dates. I.e., the "Nth <weekday> of <month>" form. This form is much less convenient for timezones where the DST change happens on specific dates, but some applications distribute old versions of Mono that don't bother checking the "wYear" fields of the SYSTEMTIME fields in the TIME_ZONE_INFORMATION structure returned by GetTimeZoneInformation(), and instead always convert the presumed "relative" dates to "absolute" dates. Unsurprisingly, the resulting dates are invalid, and these applications then end up throwing "System.NotSupportedException: Can't get timezone name." when run in such a timezone, typically early during startup. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 90 +++++++++++++++++++++++++++--------------------------- 1 file changed, 45 insertions(+), 45 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e389f11137526301b4e3…

1 0

Henri Verbeet : wined3d: Avoid referencing empty command buffers in wined3d_query_event_vk_issue().
by Alexandre Julliard Dec. 15, 2020

Dec. 15, 2020

Module: wine Branch: master Commit: 619c87bb59dbad74c51db2d3e490113c0e9c03ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=619c87bb59dbad74c51db2d3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 15 17:02:21 2020 +0330 wined3d: Avoid referencing empty command buffers in wined3d_query_event_vk_issue(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/query.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 9e0e22b32e5..4670bbfddff 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -1720,6 +1720,14 @@ static BOOL wined3d_query_event_vk_issue(struct wined3d_query *query, uint32_t f { context_vk = wined3d_context_vk(context_acquire(&device_vk->d, NULL, 0)); wined3d_context_vk_reference_query(context_vk, query_vk); + /* Because we don't actually submit any commands to the command buffer + * for event queries, the context's current command buffer may still + * be empty, and we should wait on the preceding command buffer + * instead. That's not merely an optimisation; if the command buffer + * referenced by the query is still empty by the time the application + * waits for it, that wait will never complete. */ + if (!context_vk->current_command_buffer.vk_command_buffer) + --query_vk->command_buffer_id; context_release(&context_vk->c); return TRUE;

1 0

Biswapriyo Nath : include: Add error codes in audioclient.idl.
by Alexandre Julliard Dec. 15, 2020

Dec. 15, 2020

Module: wine Branch: master Commit: e0a2692a4b3dc0b42a55bf52849420610f737127 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e0a2692a4b3dc0b42a55bf52… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Tue Dec 15 15:26:54 2020 +0530 include: Add error codes in audioclient.idl. Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/audioclient.idl | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/audioclient.idl b/include/audioclient.idl index 48bdbdcdcd4..311c01c8eab 100644 --- a/include/audioclient.idl +++ b/include/audioclient.idl @@ -399,6 +399,11 @@ cpp_quote("#define AUDCLNT_E_OUT_OF_OFFLOAD_RESOURCES AUDCLNT_ERR(0x023)") cpp_quote("#define AUDCLNT_E_OFFLOAD_MODE_ONLY AUDCLNT_ERR(0x024)") cpp_quote("#define AUDCLNT_E_NONOFFLOAD_MODE_ONLY AUDCLNT_ERR(0x025)") cpp_quote("#define AUDCLNT_E_RESOURCES_INVALIDATED AUDCLNT_ERR(0x026)") +cpp_quote("#define AUDCLNT_E_RAW_MODE_UNSUPPORTED AUDCLNT_ERR(0x027)") +cpp_quote("#define AUDCLNT_E_ENGINE_PERIODICITY_LOCKED AUDCLNT_ERR(0x028)") +cpp_quote("#define AUDCLNT_E_ENGINE_FORMAT_LOCKED AUDCLNT_ERR(0x029)") +cpp_quote("#define AUDCLNT_E_HEADTRACKING_ENABLED AUDCLNT_ERR(0x030)") +cpp_quote("#define AUDCLNT_E_HEADTRACKING_UNSUPPORTED AUDCLNT_ERR(0x040)") cpp_quote("#define AUDCLNT_S_BUFFER_EMPTY AUDCLNT_SUCCESS(0x1)") cpp_quote("#define AUDCLNT_S_THREAD_ALREADY_REGISTERED AUDCLNT_SUCCESS(0x2)")

1 0

Michael Stefaniuc : qcap/tests: Use wide-char string literals.
by Alexandre Julliard Dec. 15, 2020

Dec. 15, 2020

Module: wine Branch: master Commit: e23fd8e6278d8e1c00434c89fc416c4192471572 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e23fd8e6278d8e1c00434c89… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Dec 15 00:12:11 2020 +0100 qcap/tests: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/tests/audiorecord.c | 9 +++---- dlls/qcap/tests/avico.c | 54 ++++++++++++++++------------------------ dlls/qcap/tests/avimux.c | 31 +++++++++++------------ dlls/qcap/tests/smartteefilter.c | 36 ++++++++++++--------------- 4 files changed, 55 insertions(+), 75 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e23fd8e6278d8e1c0043…

1 0

Zebediah Figura : vkd3d-shader: Introduce a helper to report errors while scanning.
by Alexandre Julliard Dec. 15, 2020

Dec. 15, 2020

Module: vkd3d Branch: master Commit: e34213d0d5a7e5c1aa8c99cddcf3fe442bc35779 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=e34213d0d5a7e5c1aa8c99c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Dec 14 22:49:15 2020 -0600 vkd3d-shader: Introduce a helper to report errors while scanning. 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> --- libs/vkd3d-shader/vkd3d_shader_main.c | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index eed0316..2ea233b 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -600,6 +600,16 @@ static void vkd3d_shader_scan_typed_resource_declaration(struct vkd3d_shader_sca semantic->resource_type, resource_data_type); } +static void vkd3d_shader_scan_error(struct vkd3d_shader_scan_context *context, + enum vkd3d_shader_error error, const char *format, ...) +{ + va_list args; + + va_start(args, format); + vkd3d_shader_verror(context->message_context, error, format, args); + va_end(args); +} + static int vkd3d_shader_scan_instruction(struct vkd3d_shader_scan_context *context, const struct vkd3d_shader_instruction *instruction) { @@ -636,7 +646,7 @@ static int vkd3d_shader_scan_instruction(struct vkd3d_shader_scan_context *conte case VKD3DSIH_ELSE: if (!(cf_info = vkd3d_shader_scan_get_current_cf_info(context)) || cf_info->type != VKD3D_SHADER_BLOCK_IF) { - vkd3d_shader_error(context->message_context, VKD3D_SHADER_ERROR_TPF_MISMATCHED_CF, + vkd3d_shader_scan_error(context, VKD3D_SHADER_ERROR_TPF_MISMATCHED_CF, "Encountered ‘else’ instruction without corresponding ‘if’ block."); return VKD3D_ERROR_INVALID_SHADER; } @@ -645,7 +655,7 @@ static int vkd3d_shader_scan_instruction(struct vkd3d_shader_scan_context *conte case VKD3DSIH_ENDIF: if (!(cf_info = vkd3d_shader_scan_get_current_cf_info(context)) || cf_info->type != VKD3D_SHADER_BLOCK_IF) { - vkd3d_shader_error(context->message_context, VKD3D_SHADER_ERROR_TPF_MISMATCHED_CF, + vkd3d_shader_scan_error(context, VKD3D_SHADER_ERROR_TPF_MISMATCHED_CF, "Encountered ‘endif’ instruction without corresponding ‘if’ block."); return VKD3D_ERROR_INVALID_SHADER; } @@ -658,7 +668,7 @@ static int vkd3d_shader_scan_instruction(struct vkd3d_shader_scan_context *conte case VKD3DSIH_ENDLOOP: if (!(cf_info = vkd3d_shader_scan_get_current_cf_info(context)) || cf_info->type != VKD3D_SHADER_BLOCK_LOOP) { - vkd3d_shader_error(context->message_context, VKD3D_SHADER_ERROR_TPF_MISMATCHED_CF, + vkd3d_shader_scan_error(context, VKD3D_SHADER_ERROR_TPF_MISMATCHED_CF, "Encountered ‘endloop’ instruction without corresponding ‘loop’ block."); return VKD3D_ERROR_INVALID_SHADER; } @@ -672,7 +682,7 @@ static int vkd3d_shader_scan_instruction(struct vkd3d_shader_scan_context *conte if (!(cf_info = vkd3d_shader_scan_get_current_cf_info(context)) || cf_info->type != VKD3D_SHADER_BLOCK_SWITCH || cf_info->inside_block) { - vkd3d_shader_error(context->message_context, VKD3D_SHADER_ERROR_TPF_MISMATCHED_CF, + vkd3d_shader_scan_error(context, VKD3D_SHADER_ERROR_TPF_MISMATCHED_CF, "Encountered ‘endswitch’ instruction without corresponding ‘switch’ block."); return VKD3D_ERROR_INVALID_SHADER; } @@ -682,7 +692,7 @@ static int vkd3d_shader_scan_instruction(struct vkd3d_shader_scan_context *conte if (!(cf_info = vkd3d_shader_scan_get_current_cf_info(context)) || cf_info->type != VKD3D_SHADER_BLOCK_SWITCH) { - vkd3d_shader_error(context->message_context, VKD3D_SHADER_ERROR_TPF_MISMATCHED_CF, + vkd3d_shader_scan_error(context, VKD3D_SHADER_ERROR_TPF_MISMATCHED_CF, "Encountered ‘case’ instruction outside switch block."); return VKD3D_ERROR_INVALID_SHADER; } @@ -692,13 +702,13 @@ static int vkd3d_shader_scan_instruction(struct vkd3d_shader_scan_context *conte if (!(cf_info = vkd3d_shader_scan_get_current_cf_info(context)) || cf_info->type != VKD3D_SHADER_BLOCK_SWITCH) { - vkd3d_shader_error(context->message_context, VKD3D_SHADER_ERROR_TPF_MISMATCHED_CF, + vkd3d_shader_scan_error(context, VKD3D_SHADER_ERROR_TPF_MISMATCHED_CF, "Encountered ‘default’ instruction outside switch block."); return VKD3D_ERROR_INVALID_SHADER; } if (cf_info->has_default) { - vkd3d_shader_error(context->message_context, VKD3D_SHADER_ERROR_TPF_MISMATCHED_CF, + vkd3d_shader_scan_error(context, VKD3D_SHADER_ERROR_TPF_MISMATCHED_CF, "Encountered duplicate ‘default’ instruction inside the current switch block."); return VKD3D_ERROR_INVALID_SHADER; } @@ -708,7 +718,7 @@ static int vkd3d_shader_scan_instruction(struct vkd3d_shader_scan_context *conte case VKD3DSIH_BREAK: if (!(cf_info = vkd3d_shader_scan_find_innermost_breakable_cf_info(context))) { - vkd3d_shader_error(context->message_context, VKD3D_SHADER_ERROR_TPF_MISMATCHED_CF, + vkd3d_shader_scan_error(context, VKD3D_SHADER_ERROR_TPF_MISMATCHED_CF, "Encountered ‘break’ instruction outside breakable block."); return VKD3D_ERROR_INVALID_SHADER; } @@ -717,7 +727,7 @@ static int vkd3d_shader_scan_instruction(struct vkd3d_shader_scan_context *conte case VKD3DSIH_BREAKP: if (!(cf_info = vkd3d_shader_scan_find_innermost_loop_cf_info(context))) { - vkd3d_shader_error(context->message_context, VKD3D_SHADER_ERROR_TPF_MISMATCHED_CF, + vkd3d_shader_scan_error(context, VKD3D_SHADER_ERROR_TPF_MISMATCHED_CF, "Encountered ‘breakp’ instruction outside loop."); return VKD3D_ERROR_INVALID_SHADER; } @@ -725,7 +735,7 @@ static int vkd3d_shader_scan_instruction(struct vkd3d_shader_scan_context *conte case VKD3DSIH_CONTINUE: if (!(cf_info = vkd3d_shader_scan_find_innermost_loop_cf_info(context))) { - vkd3d_shader_error(context->message_context, VKD3D_SHADER_ERROR_TPF_MISMATCHED_CF, + vkd3d_shader_scan_error(context, VKD3D_SHADER_ERROR_TPF_MISMATCHED_CF, "Encountered ‘continue’ instruction outside loop."); return VKD3D_ERROR_INVALID_SHADER; } @@ -734,7 +744,7 @@ static int vkd3d_shader_scan_instruction(struct vkd3d_shader_scan_context *conte case VKD3DSIH_CONTINUEP: if (!(cf_info = vkd3d_shader_scan_find_innermost_loop_cf_info(context))) { - vkd3d_shader_error(context->message_context, VKD3D_SHADER_ERROR_TPF_MISMATCHED_CF, + vkd3d_shader_scan_error(context, VKD3D_SHADER_ERROR_TPF_MISMATCHED_CF, "Encountered ‘continue’ instruction outside loop."); return VKD3D_ERROR_INVALID_SHADER; }

1 0

Zebediah Figura : vkd3d-shader: Move location tracking out of the vkd3d_shader_message_context structure.
by Alexandre Julliard Dec. 15, 2020

Dec. 15, 2020

Module: vkd3d Branch: master Commit: cdfca2fab75b105442c293d33c4ddffa55c36cb4 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=cdfca2fab75b105442c293d… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Dec 15 11:01:32 2020 -0600 vkd3d-shader: Move location tracking out of the vkd3d_shader_message_context structure. 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> --- libs/vkd3d-shader/dxbc.c | 63 +++++++++++++++++--------------- libs/vkd3d-shader/spirv.c | 6 ++- libs/vkd3d-shader/vkd3d_shader_main.c | 61 +++++++++++++++++-------------- libs/vkd3d-shader/vkd3d_shader_private.h | 19 ++++++---- 4 files changed, 83 insertions(+), 66 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=cdfca2fab75b105442c…

1 0