April 2023 - Wine-Commits - list.winehq.org

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard April 27, 2023

April 27, 2023

Module: wine Branch: master Commit: 0c4e69ec5bb3a90a43fb0d050a164f354c365270 URL: https://gitlab.winehq.org/wine/wine/-/commit/0c4e69ec5bb3a90a43fb0d050a164f… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Thu Apr 27 09:31:39 2023 +0300 po: Update Lithuanian translation. --- po/lt.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/lt.po b/po/lt.po index 2560b727e14..d6f9eb04340 100644 --- a/po/lt.po +++ b/po/lt.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: 2023-04-01 17:37+0300\n" +"PO-Revision-Date: 2023-04-27 09:31+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -325,7 +325,7 @@ msgstr "" #: dlls/appwiz.cpl/appwiz.rc:47 msgid "Please wait until the current uninstall/modify process is complete." -msgstr "" +msgstr "Palaukite, kol dabartinis šalinimo/modifikavimo procesas bus baigtas." #: dlls/avifil32/avifil32.rc:42 msgid "Compress options"

1 0

Francois Gouget : msi/tests: Ok_() takes printf-style arguments.
by Alexandre Julliard April 27, 2023

April 27, 2023

Module: wine Branch: master Commit: a80b183af74194a06af3281ee272590a7134b7f1 URL: https://gitlab.winehq.org/wine/wine/-/commit/a80b183af74194a06af3281ee27259… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Apr 21 13:13:59 2023 +0200 msi/tests: Ok_() takes printf-style arguments. This lets the compiler check that the format and argument sizes match. --- dlls/msi/tests/custom.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index 6c73687b3c5..5b81deb2c94 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -32,9 +32,15 @@ #include <msiquery.h> #include <msidefs.h> +#if defined(__MINGW32__) || (!defined(__WINE_USE_MSVCRT) && (defined(__GNUC__) || defined(__clang__))) +#define __WINE_PRINTF_ATTR(fmt,args) __attribute__((format (printf,fmt,args))) +#else +#define __WINE_PRINTF_ATTR(fmt,args) +#endif + static int todo_level, todo_do_loop; -static void WINAPIV ok_(MSIHANDLE hinst, int todo, const char *file, int line, int condition, const char *msg, ...) +static void WINAPIV __WINE_PRINTF_ATTR(6,7) ok_(MSIHANDLE hinst, int todo, const char *file, int line, int condition, const char *msg, ...) { static char buffer[2000]; MSIHANDLE record;

1 0

Francois Gouget : msi/tests: Fix the ok() formats so they match the size of their arguments.
by Alexandre Julliard April 27, 2023

April 27, 2023

Module: wine Branch: master Commit: b6fb1b8983af7644b78bb0ba5fb9d18a1f0822f1 URL: https://gitlab.winehq.org/wine/wine/-/commit/b6fb1b8983af7644b78bb0ba5fb9d1… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Apr 21 13:16:08 2023 +0200 msi/tests: Fix the ok() formats so they match the size of their arguments. --- dlls/msi/tests/custom.c | 298 ++++++++++++++++++++++++------------------------ 1 file changed, 149 insertions(+), 149 deletions(-)

1 0

Jactry Zeng : appwiz.cpl: Handle WM_CLOSE and WM_COMMAND(IDCANCEL) in the support info dialog.
by Alexandre Julliard April 26, 2023

April 26, 2023

Module: wine Branch: master Commit: 619e34500fc43f1103fddd91e86d581660d2ae4b URL: https://gitlab.winehq.org/wine/wine/-/commit/619e34500fc43f1103fddd91e86d58… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Tue Apr 4 02:42:31 2023 -0500 appwiz.cpl: Handle WM_CLOSE and WM_COMMAND(IDCANCEL) in the support info dialog. --- dlls/appwiz.cpl/appwiz.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/appwiz.cpl/appwiz.c b/dlls/appwiz.cpl/appwiz.c index 14917c14795..3359d5c4a2b 100644 --- a/dlls/appwiz.cpl/appwiz.c +++ b/dlls/appwiz.cpl/appwiz.c @@ -608,9 +608,14 @@ static INT_PTR CALLBACK SupportInfoDlgProc(HWND hWnd, UINT msg, WPARAM wParam, L case WM_DESTROY: return 0; + case WM_CLOSE: + EndDialog(hWnd, TRUE); + return TRUE; + case WM_COMMAND: switch (LOWORD(wParam)) { + case IDCANCEL: case IDOK: EndDialog(hWnd, TRUE); break;

1 0

Jactry Zeng : appwiz.cpl: Process messages while waiting for the uninstaller to terminate.
by Alexandre Julliard April 26, 2023

April 26, 2023

Module: wine Branch: master Commit: 3e6779867a62e3e7a3562ed802191e3e309ff0b7 URL: https://gitlab.winehq.org/wine/wine/-/commit/3e6779867a62e3e7a3562ed802191e… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Mon Apr 3 09:09:06 2023 -0500 appwiz.cpl: Process messages while waiting for the uninstaller to terminate. In the current implementation, the main UI will be blocked after the uninstaller is launched. So using MsgWaitForMultipleObjects() to wait the process and process new messages from GUI. Also popup a message dialog while trying to launch multiple uninstallers. --- dlls/appwiz.cpl/appwiz.c | 45 ++++++++++++++++++++++++------------ dlls/appwiz.cpl/appwiz.rc | 1 + dlls/appwiz.cpl/res.h | 1 + po/ar.po | 58 +++++++++++++++++++++++++---------------------- po/ast.po | 58 +++++++++++++++++++++++++---------------------- po/bg.po | 58 +++++++++++++++++++++++++---------------------- po/ca.po | 58 +++++++++++++++++++++++++---------------------- po/cs.po | 58 +++++++++++++++++++++++++---------------------- po/da.po | 58 +++++++++++++++++++++++++---------------------- po/de.po | 58 +++++++++++++++++++++++++---------------------- po/el.po | 58 +++++++++++++++++++++++++---------------------- po/en.po | 58 +++++++++++++++++++++++++---------------------- po/en_US.po | 58 +++++++++++++++++++++++++---------------------- po/eo.po | 58 +++++++++++++++++++++++++---------------------- po/es.po | 58 +++++++++++++++++++++++++---------------------- po/fa.po | 58 +++++++++++++++++++++++++---------------------- po/fi.po | 58 +++++++++++++++++++++++++---------------------- po/fr.po | 58 +++++++++++++++++++++++++---------------------- po/he.po | 58 +++++++++++++++++++++++++---------------------- po/hi.po | 58 +++++++++++++++++++++++++---------------------- po/hr.po | 58 +++++++++++++++++++++++++---------------------- po/hu.po | 58 +++++++++++++++++++++++++---------------------- po/it.po | 58 +++++++++++++++++++++++++---------------------- po/ja.po | 58 +++++++++++++++++++++++++---------------------- po/ko.po | 58 +++++++++++++++++++++++++---------------------- po/lt.po | 58 +++++++++++++++++++++++++---------------------- po/ml.po | 58 +++++++++++++++++++++++++---------------------- po/nb_NO.po | 58 +++++++++++++++++++++++++---------------------- po/nl.po | 58 +++++++++++++++++++++++++---------------------- po/or.po | 58 +++++++++++++++++++++++++---------------------- po/pa.po | 58 +++++++++++++++++++++++++---------------------- po/pl.po | 58 +++++++++++++++++++++++++---------------------- po/pt_BR.po | 58 +++++++++++++++++++++++++---------------------- po/pt_PT.po | 58 +++++++++++++++++++++++++---------------------- po/rm.po | 58 +++++++++++++++++++++++++---------------------- po/ro.po | 58 +++++++++++++++++++++++++---------------------- po/ru.po | 58 +++++++++++++++++++++++++---------------------- po/si.po | 58 +++++++++++++++++++++++++---------------------- po/sk.po | 58 +++++++++++++++++++++++++---------------------- po/sl.po | 58 +++++++++++++++++++++++++---------------------- po/sr_RS(a)cyrillic.po | 58 +++++++++++++++++++++++++---------------------- po/sr_RS(a)latin.po | 58 +++++++++++++++++++++++++---------------------- po/sv.po | 58 +++++++++++++++++++++++++---------------------- po/ta.po | 58 +++++++++++++++++++++++++---------------------- po/te.po | 58 +++++++++++++++++++++++++---------------------- po/th.po | 58 +++++++++++++++++++++++++---------------------- po/tr.po | 58 +++++++++++++++++++++++++---------------------- po/uk.po | 58 +++++++++++++++++++++++++---------------------- po/wa.po | 58 +++++++++++++++++++++++++---------------------- po/wine.pot | 58 +++++++++++++++++++++++++---------------------- po/zh_CN.po | 58 +++++++++++++++++++++++++---------------------- po/zh_TW.po | 58 +++++++++++++++++++++++++---------------------- 52 files changed, 1552 insertions(+), 1337 deletions(-)

1 0

Nikolay Sivov : vkd3d-shader/hlsl: Implement SampleBias() method.
by Alexandre Julliard April 26, 2023

April 26, 2023

Module: vkd3d Branch: master Commit: af4bb037959a7aa7981444f4be0e8ff9854e8c0d URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/af4bb037959a7aa7981444f4be0e8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 19 19:24:14 2023 +0200 vkd3d-shader/hlsl: Implement SampleBias() method. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.c | 1 + libs/vkd3d-shader/hlsl.h | 1 + libs/vkd3d-shader/hlsl.y | 23 +++++++++++++++++------ libs/vkd3d-shader/tpf.c | 34 ++++++++++++++++++++++++++++------ tests/sampler.shader_test | 13 +++++++++++++ 5 files changed, 60 insertions(+), 12 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 32511590..f0b6a5ef 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -2383,6 +2383,7 @@ static void dump_ir_resource_load(struct vkd3d_string_buffer *buffer, const stru [HLSL_RESOURCE_LOAD] = "load_resource", [HLSL_RESOURCE_SAMPLE] = "sample", [HLSL_RESOURCE_SAMPLE_LOD] = "sample_lod", + [HLSL_RESOURCE_SAMPLE_LOD_BIAS] = "sample_biased", [HLSL_RESOURCE_GATHER_RED] = "gather_red", [HLSL_RESOURCE_GATHER_GREEN] = "gather_green", [HLSL_RESOURCE_GATHER_BLUE] = "gather_blue", diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 974252d4..2ff18536 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -588,6 +588,7 @@ enum hlsl_resource_load_type HLSL_RESOURCE_LOAD, HLSL_RESOURCE_SAMPLE, HLSL_RESOURCE_SAMPLE_LOD, + HLSL_RESOURCE_SAMPLE_LOD_BIAS, HLSL_RESOURCE_GATHER_RED, HLSL_RESOURCE_GATHER_GREEN, HLSL_RESOURCE_GATHER_BLUE, diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index a7237f1d..10deda75 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -3819,21 +3819,26 @@ static bool add_gather_method_call(struct hlsl_ctx *ctx, struct list *instrs, st return true; } -static bool add_sample_level_method_call(struct hlsl_ctx *ctx, struct list *instrs, struct hlsl_ir_node *object, +static bool add_sample_lod_method_call(struct hlsl_ctx *ctx, struct list *instrs, struct hlsl_ir_node *object, const char *name, const struct parse_initializer *params, const struct vkd3d_shader_location *loc) { const struct hlsl_type *object_type = object->data_type; - struct hlsl_resource_load_params load_params = {.type = HLSL_RESOURCE_SAMPLE_LOD}; + struct hlsl_resource_load_params load_params = { 0 }; const unsigned int sampler_dim = hlsl_sampler_dim_count(object_type->sampler_dim); const unsigned int offset_dim = hlsl_offset_dim_count(object_type->sampler_dim); const struct hlsl_type *sampler_type; struct hlsl_ir_resource_load *load; + if (!strcmp(name, "SampleLevel")) + load_params.type = HLSL_RESOURCE_SAMPLE_LOD; + else + load_params.type = HLSL_RESOURCE_SAMPLE_LOD_BIAS; + if (params->args_count < 3 || params->args_count > 4 + !!offset_dim) { hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT, - "Wrong number of arguments to method 'SampleLevel': expected from 3 to %u, but got %u.", - 4 + !!offset_dim, params->args_count); + "Wrong number of arguments to method '%s': expected from 3 to %u, but got %u.", + name, 4 + !!offset_dim, params->args_count); return false; } @@ -3845,7 +3850,7 @@ static bool add_sample_level_method_call(struct hlsl_ctx *ctx, struct list *inst if ((string = hlsl_type_to_string(ctx, sampler_type))) hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, - "Wrong type for argument 0 of SampleLevel(): expected 'sampler', but got '%s'.", string->buffer); + "Wrong type for argument 0 of %s(): expected 'sampler', but got '%s'.", name, string->buffer); hlsl_release_string_buffer(ctx, string); return false; } @@ -3920,7 +3925,13 @@ static bool add_method_call(struct hlsl_ctx *ctx, struct list *instrs, struct hl && object_type->sampler_dim != HLSL_SAMPLER_DIM_2DMS && object_type->sampler_dim != HLSL_SAMPLER_DIM_2DMSARRAY) { - return add_sample_level_method_call(ctx, instrs, object, name, params, loc); + return add_sample_lod_method_call(ctx, instrs, object, name, params, loc); + } + else if (!strcmp(name, "SampleBias") + && object_type->sampler_dim != HLSL_SAMPLER_DIM_2DMS + && object_type->sampler_dim != HLSL_SAMPLER_DIM_2DMSARRAY) + { + return add_sample_lod_method_call(ctx, instrs, object, name, params, loc); } else { diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index f3a15305..d104c078 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -3700,14 +3700,30 @@ static void write_sm4_ld(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buf } static void write_sm4_sample(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buffer, - const struct hlsl_type *resource_type, const struct hlsl_ir_node *dst, - const struct hlsl_deref *resource, const struct hlsl_deref *sampler, - const struct hlsl_ir_node *coords, const struct hlsl_ir_node *texel_offset) + const struct hlsl_ir_resource_load *load) { + const struct hlsl_type *resource_type = load->resource.var->data_type; + const struct hlsl_ir_node *texel_offset = load->texel_offset.node; + const struct hlsl_ir_node *coords = load->coords.node; + const struct hlsl_deref *resource = &load->resource; + const struct hlsl_deref *sampler = &load->sampler; + const struct hlsl_ir_node *dst = &load->node; struct sm4_instruction instr; memset(&instr, 0, sizeof(instr)); - instr.opcode = VKD3D_SM4_OP_SAMPLE; + switch (load->load_type) + { + case HLSL_RESOURCE_SAMPLE: + instr.opcode = VKD3D_SM4_OP_SAMPLE; + break; + + case HLSL_RESOURCE_SAMPLE_LOD_BIAS: + instr.opcode = VKD3D_SM4_OP_SAMPLE_B; + break; + + default: + vkd3d_unreachable(); + } if (texel_offset) { @@ -3727,6 +3743,12 @@ static void write_sm4_sample(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer sm4_src_from_deref(ctx, &instr.srcs[2], sampler, sampler->var->data_type, VKD3DSP_WRITEMASK_ALL); instr.src_count = 3; + if (load->load_type == HLSL_RESOURCE_SAMPLE_LOD_BIAS) + { + sm4_src_from_node(&instr.srcs[3], load->lod.node, VKD3DSP_WRITEMASK_ALL); + ++instr.src_count; + } + write_sm4_instruction(buffer, &instr); } @@ -4478,13 +4500,13 @@ static void write_sm4_resource_load(struct hlsl_ctx *ctx, break; case HLSL_RESOURCE_SAMPLE: + case HLSL_RESOURCE_SAMPLE_LOD_BIAS: if (!load->sampler.var) { hlsl_fixme(ctx, &load->node.loc, "SM4 combined sample expression."); return; } - write_sm4_sample(ctx, buffer, resource_type, &load->node, - &load->resource, &load->sampler, coords, texel_offset); + write_sm4_sample(ctx, buffer, load); break; case HLSL_RESOURCE_GATHER_RED: diff --git a/tests/sampler.shader_test b/tests/sampler.shader_test index 3970fb51..2cb70a0b 100644 --- a/tests/sampler.shader_test +++ b/tests/sampler.shader_test @@ -32,3 +32,16 @@ float4 main() : sv_target [test] draw quad probe all rgba (0.25, 0, 0.25, 0) + +[pixel shader] +SamplerState s; +Texture2D t; + +float4 main() : sv_target +{ + return t.SampleBias(s, float2(0.5, 0.5), 0.0); +} + +[test] +draw quad +probe all rgba (0.25, 0, 0.25, 0)

1 0

Nikolay Sivov : vkd3d-shader/hlsl: Add separate helpers to generate object methods.
by Alexandre Julliard April 26, 2023

April 26, 2023

Module: vkd3d Branch: master Commit: c166ab97278ea42a0726275bc494a5824b7a9092 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/c166ab97278ea42a0726275bc494a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 19 19:13:46 2023 +0200 vkd3d-shader/hlsl: Add separate helpers to generate object methods. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 484 +++++++++++++++++++++++++---------------------- 1 file changed, 256 insertions(+), 228 deletions(-)

1 0

Shaun Ren : include: Add more sapi structs and enums.
by Alexandre Julliard April 26, 2023

April 26, 2023

Module: wine Branch: master Commit: 5f977d2fa878297748839eb767857d5a84954688 URL: https://gitlab.winehq.org/wine/wine/-/commit/5f977d2fa878297748839eb767857d… Author: Shaun Ren <sren(a)codeweavers.com> Date: Tue Apr 25 19:15:59 2023 -0400 include: Add more sapi structs and enums. --- include/sapi.idl | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/include/sapi.idl b/include/sapi.idl index cd5d6044bdf..92a2881501c 100644 --- a/include/sapi.idl +++ b/include/sapi.idl @@ -574,6 +574,59 @@ typedef [restricted, hidden] struct SPAUDIOBUFFERINFO ULONG ulMsEventBias; } SPAUDIOBUFFERINFO; +typedef [hidden] enum SPPARTOFSPEECH +{ + SPPS_NotOverriden = -1, + SPPS_Unknown = 0, + SPPS_Noun = 0x1000, + SPPS_Verb = 0x2000, + SPPS_Modifier = 0x3000, + SPPS_Function = 0x4000, + SPPS_Interjection = 0x5000, + SPPS_Noncontent = 0x6000, + SPPS_LMA = 0x7000, + SPPS_SuppressWord = 0xF000 +} SPPARTOFSPEECH; + +typedef [restricted, hidden] struct SPVPITCH +{ + long MiddleAdj; + long RangeAdj; +} SPVPITCH; + +typedef [hidden] enum SPVACTIONS +{ + SPVA_Speak = 0, + SPVA_Silence, + SPVA_Pronounce, + SPVA_Bookmark, + SPVA_SpellOut, + SPVA_Section, + SPVA_ParseUnknownTag +} SPVACTIONS; + +typedef [restricted, hidden] struct SPVCONTEXT +{ + LPCWSTR pCategory; + LPCWSTR pBefore; + LPCWSTR pAfter; +} SPVCONTEXT; + +typedef [restricted, hidden] struct SPVSTATE +{ + SPVACTIONS eAction; + LANGID LangID; + WORD wReserved; + long EmphAdj; + long RateAdj; + ULONG Volume; + SPVPITCH PitchAdj; + ULONG SilenceMSecs; + SPPHONEID *pPhoneIds; + SPPARTOFSPEECH ePartOfSpeech; + SPVCONTEXT Context; +} SPVSTATE; + cpp_quote("#if defined(__GNUC__)") cpp_quote("#define SPCAT_AUDIOOUT (const WCHAR []){ 'H','K','E','Y','_','L','O','C','A','L','_','M','A','C','H','I','N','E','\\\\','S','O','F','T','W','A','R','E','\\\\','M','i','c','r','o','s','o','f','t','\\\\','S','p','e','e','c','h','\\\\','A','u','d','i','o','O','u','t','p','u','t',0 }")

1 0

Shaun Ren : include: Add ISpTTSEngineSite and ISpTTSEngine interfaces.
by Alexandre Julliard April 26, 2023

April 26, 2023

Module: wine Branch: master Commit: 7f1df4b27dde3d79a6d5f0b709c1e5c32582b20b URL: https://gitlab.winehq.org/wine/wine/-/commit/7f1df4b27dde3d79a6d5f0b709c1e5… Author: Shaun Ren <sren(a)codeweavers.com> Date: Tue Apr 25 19:17:50 2023 -0400 include: Add ISpTTSEngineSite and ISpTTSEngine interfaces. --- include/sapiddk.idl | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/include/sapiddk.idl b/include/sapiddk.idl index 670b8c0dce5..46aebbb9a12 100644 --- a/include/sapiddk.idl +++ b/include/sapiddk.idl @@ -49,6 +49,69 @@ interface ISpObjectTokenEnumBuilder : IEnumSpObjectTokens HRESULT Sort([in] LPCWSTR pszTokenIdToListFirst); } +typedef enum SPVSKIPTYPE +{ + SPVST_SENTENCE = (1L << 0) +} SPVSKIPTYPE; + +typedef enum SPVESACTIONS +{ + SPVES_CONTINUE = 0, + SPVES_ABORT = (1L << 0), + SPVES_SKIP = (1L << 1), + SPVES_RATE = (1L << 2), + SPVES_VOLUME = (1L << 3) +} SPVESACTIONS; + +[ + object, + uuid(9880499b-cce9-11d2-b503-00c04f797396), + helpstring("ISpTTSEngineSite"), + pointer_default(unique), + local +] +interface ISpTTSEngineSite : ISpEventSink +{ + HRESULT GetActions(); + HRESULT Write([in] const void *pBuff, + [in] ULONG cb, + [out] ULONG *pcbWritten); + HRESULT GetRate([out] long *pRateAdjust); + HRESULT GetVolume([out] USHORT *pusVolume); + HRESULT GetSkipInfo([out] SPVSKIPTYPE *peType, + [out] long *plNumItems); + HRESULT CompleteSkip([in] long lNumSkipped); +}; + +typedef struct SPVTEXTFRAG +{ + struct SPVTEXTFRAG* pNext; + SPVSTATE State; + LPCWSTR pTextStart; + ULONG ulTextLen; + ULONG ulTextSrcOffset; +} SPVTEXTFRAG; + +[ + object, + uuid(a74d7c8e-4cc5-4f2f-a6eb-804dee18500e), + helpstring("ISpTTSEngine"), + pointer_default(unique), + local +] +interface ISpTTSEngine : IUnknown +{ + HRESULT Speak([in] DWORD dwSpeakFlags, + [in] REFGUID rguidFormatId, + [in] const WAVEFORMATEX *pWaveFormatEx, + [in] const SPVTEXTFRAG *pTextFragList, + [in] ISpTTSEngineSite *pOutputSite); + HRESULT GetOutputFormat([in] const GUID *pTargetFmtId, + [in] const WAVEFORMATEX *pTargetWaveFormatEx, + [out] GUID *pOutputFormatId, + [out] WAVEFORMATEX **ppCoMemOutputWaveFormatEx); +}; + [ helpstring("Speech Object DDK Library"), uuid(9903f14c-12ce-4c99-9986-2ee3d7d588a8),

1 0

Zebediah Figura : d3d9: Pass the container to d3d9_surface_create().
by Alexandre Julliard April 26, 2023

April 26, 2023

Module: wine Branch: master Commit: ba99b0d77baeab2a4741d38aa43648d9c27c3e81 URL: https://gitlab.winehq.org/wine/wine/-/commit/ba99b0d77baeab2a4741d38aa43648… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Apr 10 18:56:49 2023 -0500 d3d9: Pass the container to d3d9_surface_create(). --- dlls/d3d9/d3d9_private.h | 2 +- dlls/d3d9/device.c | 14 ++++++-------- dlls/d3d9/surface.c | 5 +++-- dlls/d3d9/swapchain.c | 6 ++++-- 4 files changed, 14 insertions(+), 13 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index 36cf8f68c83..53c73853e46 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -180,7 +180,7 @@ struct d3d9_surface struct wined3d_rendertarget_view *d3d9_surface_acquire_rendertarget_view(struct d3d9_surface *surface) DECLSPEC_HIDDEN; struct d3d9_surface *d3d9_surface_create(struct wined3d_texture *wined3d_texture, - unsigned int sub_resource_idx) DECLSPEC_HIDDEN; + unsigned int sub_resource_idx, IUnknown *container) DECLSPEC_HIDDEN; struct d3d9_device *d3d9_surface_get_device(const struct d3d9_surface *surface) DECLSPEC_HIDDEN; void d3d9_surface_release_rendertarget_view(struct d3d9_surface *surface, struct wined3d_rendertarget_view *rtv) DECLSPEC_HIDDEN; diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index ed88a4c2def..b5a16177e37 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1148,7 +1148,8 @@ static HRESULT d3d9_device_reset(struct d3d9_device *device, struct wined3d_resource *resource = wined3d_rendertarget_view_get_resource(rtv); struct d3d9_surface *surface; - if ((surface = d3d9_surface_create(wined3d_texture_from_resource(resource), 0))) + if ((surface = d3d9_surface_create(wined3d_texture_from_resource(resource), 0, + (IUnknown *)&device->IDirect3DDevice9Ex_iface))) surface->parent_device = &device->IDirect3DDevice9Ex_iface; } } @@ -1353,7 +1354,7 @@ static HRESULT WINAPI d3d9_device_CreateTexture(IDirect3DDevice9Ex *iface, levels = wined3d_texture_get_level_count(object->wined3d_texture); for (i = 0; i < levels; ++i) { - if (!d3d9_surface_create(object->wined3d_texture, i)) + if (!d3d9_surface_create(object->wined3d_texture, i, (IUnknown *)&object->IDirect3DBaseTexture9_iface)) { IDirect3DTexture9_Release(&object->IDirect3DBaseTexture9_iface); return E_OUTOFMEMORY; @@ -1456,7 +1457,7 @@ static HRESULT WINAPI d3d9_device_CreateCubeTexture(IDirect3DDevice9Ex *iface, levels = wined3d_texture_get_level_count(object->wined3d_texture); for (i = 0; i < levels * 6; ++i) { - if (!d3d9_surface_create(object->wined3d_texture, i)) + if (!d3d9_surface_create(object->wined3d_texture, i, (IUnknown *)&object->IDirect3DBaseTexture9_iface)) { IDirect3DTexture9_Release(&object->IDirect3DBaseTexture9_iface); return E_OUTOFMEMORY; @@ -1599,7 +1600,7 @@ static HRESULT d3d9_device_create_surface(struct d3d9_device *device, unsigned i return hr; } - if (!(surface_impl = d3d9_surface_create(texture, 0))) + if (!(surface_impl = d3d9_surface_create(texture, 0, NULL))) { wined3d_texture_decref(texture); wined3d_mutex_unlock(); @@ -4564,11 +4565,8 @@ static HRESULT CDECL device_parent_create_swapchain_texture(struct wined3d_devic TRACE("device_parent %p, container_parent %p, desc %p, texture flags %#lx, texture %p.\n", device_parent, container_parent, desc, texture_flags, texture); - if (container_parent == device_parent) - container_parent = &device->IDirect3DDevice9Ex_iface; - if (FAILED(hr = wined3d_texture_create(device->wined3d_device, desc, 1, 1, - texture_flags, NULL, container_parent, &d3d9_null_wined3d_parent_ops, texture))) + texture_flags, NULL, NULL, &d3d9_null_wined3d_parent_ops, texture))) { WARN("Failed to create texture, hr %#lx.\n", hr); return hr; diff --git a/dlls/d3d9/surface.c b/dlls/d3d9/surface.c index 4503c360120..df94aad3c59 100644 --- a/dlls/d3d9/surface.c +++ b/dlls/d3d9/surface.c @@ -347,7 +347,8 @@ static const struct wined3d_parent_ops d3d9_surface_wined3d_parent_ops = surface_wined3d_object_destroyed, }; -struct d3d9_surface *d3d9_surface_create(struct wined3d_texture *wined3d_texture, unsigned int sub_resource_idx) +struct d3d9_surface *d3d9_surface_create(struct wined3d_texture *wined3d_texture, + unsigned int sub_resource_idx, IUnknown *container) { IDirect3DBaseTexture9 *texture; struct d3d9_surface *surface; @@ -359,7 +360,7 @@ struct d3d9_surface *d3d9_surface_create(struct wined3d_texture *wined3d_texture d3d9_resource_init(&surface->resource); surface->resource.refcount = 0; list_init(&surface->rtv_entry); - surface->container = wined3d_texture_get_parent(wined3d_texture); + surface->container = container; surface->wined3d_texture = wined3d_texture; surface->sub_resource_idx = sub_resource_idx; diff --git a/dlls/d3d9/swapchain.c b/dlls/d3d9/swapchain.c index 951fee75015..0c8b12dce91 100644 --- a/dlls/d3d9/swapchain.c +++ b/dlls/d3d9/swapchain.c @@ -411,7 +411,8 @@ HRESULT d3d9_swapchain_create(struct d3d9_device *device, struct wined3d_swapcha for (i = 0; i < desc->backbuffer_count; ++i) { - if (!(surface = d3d9_surface_create(wined3d_swapchain_get_back_buffer(object->wined3d_swapchain, i), 0))) + if (!(surface = d3d9_surface_create(wined3d_swapchain_get_back_buffer(object->wined3d_swapchain, i), 0, + (IUnknown *)&object->IDirect3DSwapChain9Ex_iface))) { IDirect3DSwapChain9Ex_Release(&object->IDirect3DSwapChain9Ex_iface); return E_OUTOFMEMORY; @@ -424,7 +425,8 @@ HRESULT d3d9_swapchain_create(struct d3d9_device *device, struct wined3d_swapcha { struct wined3d_resource *resource = wined3d_rendertarget_view_get_resource(wined3d_dsv); - if (!(surface = d3d9_surface_create(wined3d_texture_from_resource(resource), 0))) + if (!(surface = d3d9_surface_create(wined3d_texture_from_resource(resource), 0, + (IUnknown *)&device->IDirect3DDevice9Ex_iface))) { IDirect3DSwapChain9Ex_Release(&object->IDirect3DSwapChain9Ex_iface); return E_OUTOFMEMORY;

1 0