November 2021 - Wine-commits

Nikolay Sivov : d3d10/effect: Handle D3D10_SVT_UINT type when returning numeric values.
by Alexandre Julliard 02 Nov '21

02 Nov '21

Module: wine Branch: master Commit: 150796cc07a51949bb8b1ae2cbdf31d025d4656c URL: https://source.winehq.org/git/wine.git/?a=commit;h=150796cc07a51949bb8b1ae2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 1 13:51:47 2021 +0300 d3d10/effect: Handle D3D10_SVT_UINT type when returning numeric values. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/effect.c | 4 ++++ dlls/d3d10/tests/effect.c | 59 ++++++++++++++++++++--------------------------- 2 files changed, 29 insertions(+), 34 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 5da8d2065f7..5e65ad3f4be 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -4865,6 +4865,7 @@ static BOOL get_value_as_bool(void *src_data, D3D10_SHADER_VARIABLE_TYPE src_typ { case D3D10_SVT_FLOAT: case D3D10_SVT_INT: + case D3D10_SVT_UINT: case D3D10_SVT_BOOL: if (*(DWORD *)src_data) return -1; @@ -4885,6 +4886,7 @@ static int get_value_as_int(void *src_data, D3D10_SHADER_VARIABLE_TYPE src_type) return (int)(*(float *)src_data); case D3D10_SVT_INT: + case D3D10_SVT_UINT: return *(int *)src_data; case D3D10_SVT_BOOL: @@ -4903,6 +4905,7 @@ static float get_value_as_float(void *src_data, D3D10_SHADER_VARIABLE_TYPE src_t return *(float *)src_data; case D3D10_SVT_INT: + case D3D10_SVT_UINT: return (float)(*(int *)src_data); case D3D10_SVT_BOOL: @@ -4933,6 +4936,7 @@ static void get_vector_as_type(BYTE *dst_data, D3D_SHADER_VARIABLE_TYPE dst_type break; case D3D10_SVT_INT: + case D3D10_SVT_UINT: *(int *)dst_data_dword = get_value_as_int(src_data_dword, src_type); break; diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index a8a64a6ed0d..149328301e1 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -4843,43 +4843,32 @@ cbuffer cb float f0, f_a[2]; int i0, i_a[2]; bool b0, b_a[2]; + uint i1, i1_a[2]; }; #endif static DWORD fx_test_scalar_variable[] = { - 0x43425844, 0xe4da4aa6, 0x1380ddc5, 0x445edad5, - 0x08581666, 0x00000001, 0x0000020b, 0x00000001, - 0x00000024, 0x30315846, 0x000001df, 0xfeff1001, - 0x00000001, 0x00000006, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x000000d3, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x66006263, - 0x74616f6c, 0x00000700, 0x00000100, 0x00000000, - 0x00000400, 0x00001000, 0x00000400, 0x00090900, - 0x00306600, 0x00000007, 0x00000001, 0x00000002, - 0x00000014, 0x00000010, 0x00000008, 0x00000909, - 0x00615f66, 0x00746e69, 0x0000004c, 0x00000001, - 0x00000000, 0x00000004, 0x00000010, 0x00000004, - 0x00000911, 0x4c003069, 0x01000000, 0x02000000, - 0x14000000, 0x10000000, 0x08000000, 0x11000000, - 0x69000009, 0x6200615f, 0x006c6f6f, 0x0000008f, - 0x00000001, 0x00000000, 0x00000004, 0x00000010, - 0x00000004, 0x00000921, 0x8f003062, 0x01000000, - 0x02000000, 0x14000000, 0x10000000, 0x08000000, - 0x21000000, 0x62000009, 0x0400615f, 0x70000000, - 0x00000000, 0x06000000, 0xff000000, 0x00ffffff, - 0x29000000, 0x0d000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x48000000, - 0x2c000000, 0x00000000, 0x10000000, 0x00000000, - 0x00000000, 0x00000000, 0x6c000000, 0x50000000, - 0x00000000, 0x24000000, 0x00000000, 0x00000000, - 0x00000000, 0x8b000000, 0x6f000000, 0x00000000, - 0x30000000, 0x00000000, 0x00000000, 0x00000000, - 0xb0000000, 0x94000000, 0x00000000, 0x44000000, - 0x00000000, 0x00000000, 0x00000000, 0xcf000000, - 0xb3000000, 0x00000000, 0x50000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, + 0x43425844, 0x7d97f44c, 0x1da4b110, 0xb710407e, 0x26750c1c, 0x00000001, 0x00000288, 0x00000001, + 0x00000024, 0x30315846, 0x0000025c, 0xfeff1001, 0x00000001, 0x00000008, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000118, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x66006263, + 0x74616f6c, 0x00000700, 0x00000100, 0x00000000, 0x00000400, 0x00001000, 0x00000400, 0x00090900, + 0x00306600, 0x00000007, 0x00000001, 0x00000002, 0x00000014, 0x00000010, 0x00000008, 0x00000909, + 0x00615f66, 0x00746e69, 0x0000004c, 0x00000001, 0x00000000, 0x00000004, 0x00000010, 0x00000004, + 0x00000911, 0x4c003069, 0x01000000, 0x02000000, 0x14000000, 0x10000000, 0x08000000, 0x11000000, + 0x69000009, 0x6200615f, 0x006c6f6f, 0x0000008f, 0x00000001, 0x00000000, 0x00000004, 0x00000010, + 0x00000004, 0x00000921, 0x8f003062, 0x01000000, 0x02000000, 0x14000000, 0x10000000, 0x08000000, + 0x21000000, 0x62000009, 0x7500615f, 0x00746e69, 0x000000d3, 0x00000001, 0x00000000, 0x00000004, + 0x00000010, 0x00000004, 0x00000919, 0xd3003169, 0x01000000, 0x02000000, 0x14000000, 0x10000000, + 0x08000000, 0x19000000, 0x69000009, 0x00615f31, 0x00000004, 0x00000090, 0x00000000, 0x00000008, + 0xffffffff, 0x00000000, 0x00000029, 0x0000000d, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000048, 0x0000002c, 0x00000000, 0x00000010, 0x00000000, 0x00000000, 0x00000000, + 0x0000006c, 0x00000050, 0x00000000, 0x00000024, 0x00000000, 0x00000000, 0x00000000, 0x0000008b, + 0x0000006f, 0x00000000, 0x00000030, 0x00000000, 0x00000000, 0x00000000, 0x000000b0, 0x00000094, + 0x00000000, 0x00000044, 0x00000000, 0x00000000, 0x00000000, 0x000000cf, 0x000000b3, 0x00000000, + 0x00000050, 0x00000000, 0x00000000, 0x00000000, 0x000000f4, 0x000000d8, 0x00000000, 0x00000064, + 0x00000000, 0x00000000, 0x00000000, 0x00000113, 0x000000f7, 0x00000000, 0x00000070, 0x00000000, + 0x00000000, 0x00000000, }; static void test_scalar_methods(ID3D10EffectScalarVariable *var, D3D10_SHADER_VARIABLE_TYPE type, @@ -5145,9 +5134,11 @@ static void test_effect_scalar_variable(void) { {"f0", D3D10_SVT_FLOAT}, {"i0", D3D10_SVT_INT}, + {"i1", D3D10_SVT_UINT}, {"b0", D3D10_SVT_BOOL}, {"f_a", D3D10_SVT_FLOAT, TRUE}, {"i_a", D3D10_SVT_INT, TRUE}, + {"i1_a", D3D10_SVT_UINT, TRUE}, {"b_a", D3D10_SVT_BOOL, TRUE}, }; ID3D10EffectScalarVariable *s_v, *s_v2; @@ -5178,7 +5169,7 @@ static void test_effect_scalar_variable(void) effect_desc.ConstantBuffers); ok(effect_desc.SharedConstantBuffers == 0, "Unexpected shared constant buffers count %u.\n", effect_desc.SharedConstantBuffers); - ok(effect_desc.GlobalVariables == 6, "Unexpected global variables count %u.\n", + ok(effect_desc.GlobalVariables == 8, "Unexpected global variables count %u.\n", effect_desc.GlobalVariables); ok(effect_desc.SharedGlobalVariables == 0, "Unexpected shared global variables count %u.\n", effect_desc.SharedGlobalVariables);

1 0

Nikolay Sivov : d3d10/effect: Handle NULL depth stencil state assignments.
by Alexandre Julliard 02 Nov '21

02 Nov '21

Module: wine Branch: master Commit: 62ae5db72266f2e1a848987a8eb8a44b05bc2216 URL: https://source.winehq.org/git/wine.git/?a=commit;h=62ae5db72266f2e1a848987a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 1 13:51:48 2021 +0300 d3d10/effect: Handle NULL depth stencil state assignments. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/effect.c | 4 ++ dlls/d3d10/tests/effect.c | 160 +++++++++++++++++++++++++--------------------- 2 files changed, 92 insertions(+), 72 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=62ae5db72266f2e1a848…

1 0

Nikolay Sivov : d3d10/effect: Handle NULL blend state assignments.
by Alexandre Julliard 02 Nov '21

02 Nov '21

Module: wine Branch: master Commit: 75eee80705100599d3701306be697d685b6cc7a7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=75eee80705100599d3701306… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 1 13:51:49 2021 +0300 d3d10/effect: Handle NULL blend state assignments. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/effect.c | 4 ++ dlls/d3d10/tests/effect.c | 154 ++++++++++++++++++++++++---------------------- 2 files changed, 85 insertions(+), 73 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=75eee80705100599d370…

1 0

Nikolay Sivov : d3d10/effect: Add a helper to read numeric values.
by Alexandre Julliard 02 Nov '21

02 Nov '21

Module: wine Branch: master Commit: b94242622f485504f7aef800879a4f6528a3b60b URL: https://source.winehq.org/git/wine.git/?a=commit;h=b94242622f485504f7aef800… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 1 13:51:50 2021 +0300 d3d10/effect: Add a helper to read numeric values. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/effect.c | 173 ++++++++++++++++++++++++++++------------------------ 1 file changed, 93 insertions(+), 80 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 901f800b623..a9014b55bae 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -386,6 +386,85 @@ static const char *debug_d3d10_shader_variable_type(D3D10_SHADER_VARIABLE_TYPE t #undef WINE_D3D10_TO_STR +static BOOL read_float_value(uint32_t value, D3D_SHADER_VARIABLE_TYPE in_type, + float *out_data, unsigned int out_idx) +{ + switch (in_type) + { + case D3D10_SVT_FLOAT: + out_data[out_idx] = *(float *)&value; + return TRUE; + + case D3D10_SVT_INT: + out_data[out_idx] = (INT)value; + return TRUE; + + case D3D10_SVT_UINT: + out_data[out_idx] = value; + return TRUE; + + default: + FIXME("Unhandled in_type %#x.\n", in_type); + return FALSE; + } +} + +static BOOL read_int32_value(uint32_t value, D3D_SHADER_VARIABLE_TYPE in_type, + int *out_data, unsigned int out_idx) +{ + switch (in_type) + { + case D3D10_SVT_FLOAT: + out_data[out_idx] = *(float *)&value; + return TRUE; + + case D3D10_SVT_INT: + case D3D10_SVT_UINT: + case D3D10_SVT_BOOL: + out_data[out_idx] = value; + return TRUE; + + default: + FIXME("Unhandled in_type %#x.\n", in_type); + return FALSE; + } +} + +static BOOL read_int8_value(uint32_t value, D3D_SHADER_VARIABLE_TYPE in_type, + INT8 *out_data, unsigned int out_idx) +{ + switch (in_type) + { + case D3D10_SVT_INT: + case D3D10_SVT_UINT: + out_data[out_idx] = value; + return TRUE; + + default: + FIXME("Unhandled in_type %#x.\n", in_type); + return FALSE; + } +} + +static BOOL d3d10_effect_read_numeric_value(uint32_t value, D3D_SHADER_VARIABLE_TYPE in_type, + D3D_SHADER_VARIABLE_TYPE out_type, void *out_data, unsigned int out_idx) +{ + switch (out_type) + { + case D3D10_SVT_FLOAT: + return read_float_value(value, in_type, out_data, out_idx); + case D3D10_SVT_INT: + case D3D10_SVT_UINT: + case D3D10_SVT_BOOL: + return read_int32_value(value, in_type, out_data, out_idx); + case D3D10_SVT_UINT8: + return read_int8_value(value, in_type, out_data, out_idx); + default: + FIXME("Unsupported property type %u.\n", out_type); + return FALSE; + } +} + static BOOL d3d_array_reserve(void **elements, SIZE_T *capacity, SIZE_T count, SIZE_T size) { SIZE_T max_capacity, new_capacity; @@ -917,7 +996,8 @@ static D3D10_SHADER_VARIABLE_CLASS d3d10_variable_class(DWORD c, BOOL is_column_ } } -static D3D10_SHADER_VARIABLE_TYPE d3d10_variable_type(DWORD t, BOOL is_object, DWORD *flags) +static D3D10_SHADER_VARIABLE_TYPE d3d10_variable_type(DWORD t, BOOL is_object, + unsigned int *flags) { *flags = 0; @@ -1567,70 +1647,14 @@ static const struct d3d10_effect_state_storage_info *get_storage_info(D3D_SHADER return NULL; } -static BOOL read_float_value(DWORD value, D3D_SHADER_VARIABLE_TYPE in_type, float *out_data, UINT idx) -{ - switch (in_type) - { - case D3D10_SVT_FLOAT: - out_data[idx] = *(float *)&value; - return TRUE; - - case D3D10_SVT_INT: - out_data[idx] = (INT)value; - return TRUE; - - case D3D10_SVT_UINT: - out_data[idx] = value; - return TRUE; - - default: - FIXME("Unhandled in_type %#x.\n", in_type); - return FALSE; - } -} - -static BOOL read_int32_value(DWORD value, D3D_SHADER_VARIABLE_TYPE in_type, INT *out_data, UINT idx) -{ - switch (in_type) - { - case D3D10_SVT_FLOAT: - out_data[idx] = *(float *)&value; - return TRUE; - - case D3D10_SVT_INT: - case D3D10_SVT_UINT: - case D3D10_SVT_BOOL: - out_data[idx] = value; - return TRUE; - - default: - FIXME("Unhandled in_type %#x.\n", in_type); - return FALSE; - } -} - -static BOOL read_int8_value(DWORD value, D3D_SHADER_VARIABLE_TYPE in_type, INT8 *out_data, UINT idx) -{ - switch (in_type) - { - case D3D10_SVT_INT: - case D3D10_SVT_UINT: - out_data[idx] = value; - return TRUE; - - default: - FIXME("Unhandled in_type %#x.\n", in_type); - return FALSE; - } -} - -static BOOL read_value_list(const char *data, size_t data_size, DWORD offset, - D3D_SHADER_VARIABLE_TYPE out_type, UINT out_base, UINT out_size, void *out_data) +static BOOL read_value_list(const char *data, size_t data_size, uint32_t offset, + D3D_SHADER_VARIABLE_TYPE out_type, unsigned int out_base, unsigned int out_size, + void *out_data) { D3D_SHADER_VARIABLE_TYPE in_type; - DWORD t, value, type_flags; + unsigned int i, type_flags; + uint32_t t, value, count; const char *ptr; - DWORD count, i; if (offset >= data_size || !require_space(offset, 1, sizeof(count), data_size)) { @@ -1652,7 +1676,7 @@ static BOOL read_value_list(const char *data, size_t data_size, DWORD offset, TRACE("%u values:\n", count); for (i = 0; i < count; ++i) { - UINT out_idx = out_base * out_size + i; + unsigned int out_idx = out_base * out_size + i; read_dword(&ptr, &t); read_dword(&ptr, &value); @@ -1663,20 +1687,12 @@ static BOOL read_value_list(const char *data, size_t data_size, DWORD offset, switch (out_type) { case D3D10_SVT_FLOAT: - if (!read_float_value(value, in_type, out_data, out_idx)) - return FALSE; - break; - case D3D10_SVT_INT: case D3D10_SVT_UINT: - case D3D10_SVT_BOOL: - if (!read_int32_value(value, in_type, out_data, out_idx)) - return FALSE; - break; - case D3D10_SVT_UINT8: - if (!read_int8_value(value, in_type, out_data, out_idx)) - return FALSE; + case D3D10_SVT_BOOL: + if (!d3d10_effect_read_numeric_value(value, in_type, out_type, out_data, out_idx)) + return FALSE; break; case D3D10_SVT_VERTEXSHADER: @@ -1757,17 +1773,14 @@ static HRESULT parse_fx10_property_assignment(const char *data, size_t data_size const char **ptr, enum d3d10_effect_container_type container_type, struct d3d10_effect *effect, void *container) { + uint32_t id, idx, variable_idx, operation, value_offset, sodecl_offset; const struct d3d10_effect_state_property_info *property_info; - UINT value_offset, sodecl_offset, operation; struct d3d10_effect_variable *variable; - unsigned int variable_idx, *dst_index; - const char *data_ptr; - const char *name; + const char *data_ptr, *name; + unsigned int *dst_index; size_t name_len; HRESULT hr; void *dst; - UINT idx; - UINT id; read_dword(ptr, &id); read_dword(ptr, &idx);

1 0

Nikolay Sivov : d3d10/effect: Add a helper to read raw variable values.
by Alexandre Julliard 02 Nov '21

02 Nov '21

Module: wine Branch: master Commit: 6e8c2921c10a4cee123010ad818fb5f5b018a64b URL: https://source.winehq.org/git/wine.git/?a=commit;h=6e8c2921c10a4cee123010ad… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 1 13:51:51 2021 +0300 d3d10/effect: Add a helper to read raw variable values. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/effect.c | 45 ++++++++++++++++++++++++++------------------- 1 file changed, 26 insertions(+), 19 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index a9014b55bae..383d27998b9 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -386,6 +386,31 @@ static const char *debug_d3d10_shader_variable_type(D3D10_SHADER_VARIABLE_TYPE t #undef WINE_D3D10_TO_STR +static HRESULT d3d10_effect_variable_get_raw_value(struct d3d10_effect_variable *v, + void *data, unsigned int offset, unsigned int count) +{ + BOOL is_buffer; + + is_buffer = v->type->basetype == D3D10_SVT_CBUFFER || v->type->basetype == D3D10_SVT_TBUFFER; + + if (v->type->type_class == D3D10_SVC_OBJECT && !is_buffer) + { + WARN("Not supported on object variables of type %s.\n", + debug_d3d10_shader_variable_type(v->type->basetype)); + return D3DERR_INVALIDCALL; + } + + if (!is_buffer) + { + offset += v->buffer_offset; + v = v->buffer; + } + + memcpy(data, v->u.buffer.local_buffer + offset, count); + + return S_OK; +} + static BOOL read_float_value(uint32_t value, D3D_SHADER_VARIABLE_TYPE in_type, float *out_data, unsigned int out_idx) { @@ -4563,7 +4588,6 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_variable_GetRawValue(ID3D10EffectV void *data, UINT offset, UINT count) { struct d3d10_effect_variable *v = impl_from_ID3D10EffectVariable(iface); - BOOL is_buffer; TRACE("iface %p, data %p, offset %u, count %u.\n", iface, data, offset, count); @@ -4573,24 +4597,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_variable_GetRawValue(ID3D10EffectV return E_FAIL; } - is_buffer = v->type->basetype == D3D10_SVT_CBUFFER || v->type->basetype == D3D10_SVT_TBUFFER; - - if (v->type->type_class == D3D10_SVC_OBJECT && !is_buffer) - { - WARN("Not supported on object variables of type %s.\n", - debug_d3d10_shader_variable_type(v->type->basetype)); - return D3DERR_INVALIDCALL; - } - - if (!is_buffer) - { - offset += v->buffer_offset; - v = v->buffer; - } - - memcpy(data, v->u.buffer.local_buffer + offset, count); - - return S_OK; + return d3d10_effect_variable_get_raw_value(v, data, offset, count); } static const struct ID3D10EffectVariableVtbl d3d10_effect_variable_vtbl =

1 0

Nikolay Sivov : d3d10/effect: Implement numeric pass properties updates.
by Alexandre Julliard 02 Nov '21

02 Nov '21

Module: wine Branch: master Commit: 15a3da17a7043f026172275ec274a77923d9d364 URL: https://source.winehq.org/git/wine.git/?a=commit;h=15a3da17a7043f026172275e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 1 13:51:52 2021 +0300 d3d10/effect: Implement numeric pass properties updates. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/d3d10_private.h | 9 +++ dlls/d3d10/effect.c | 137 ++++++++++++++++++++++++++++++++++++----- dlls/d3d10/tests/effect.c | 149 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 280 insertions(+), 15 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=15a3da17a7043f026172…

1 0

Alexandre Julliard : faudio: Import upstream release 21.11.
by Alexandre Julliard 02 Nov '21

02 Nov '21

Module: wine Branch: master Commit: da89825f98e4f0cb3875735345a455512b36b665 URL: https://source.winehq.org/git/wine.git/?a=commit;h=da89825f98e4f0cb38757353… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 2 10:25:12 2021 +0100 faudio: Import upstream release 21.11. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/faudio/include/FAudio.h | 2 +- libs/faudio/src/FACT.c | 17 +++-------------- libs/faudio/src/FAudio.c | 4 +++- libs/faudio/src/FAudioFX_reverb.c | 6 ++++-- libs/faudio/src/FAudio_platform_win32.c | 10 ++++++---- 5 files changed, 17 insertions(+), 22 deletions(-) diff --git a/libs/faudio/include/FAudio.h b/libs/faudio/include/FAudio.h index 046e7f4098c..6f68013d79f 100644 --- a/libs/faudio/include/FAudio.h +++ b/libs/faudio/include/FAudio.h @@ -485,7 +485,7 @@ extern FAudioGUID DATAFORMAT_SUBTYPE_IEEE_FLOAT; #define FAUDIO_ABI_VERSION 0 #define FAUDIO_MAJOR_VERSION 21 -#define FAUDIO_MINOR_VERSION 10 +#define FAUDIO_MINOR_VERSION 11 #define FAUDIO_PATCH_VERSION 0 #define FAUDIO_COMPILED_VERSION ( \ diff --git a/libs/faudio/src/FACT.c b/libs/faudio/src/FACT.c index 5eca83b389f..bca46d38824 100644 --- a/libs/faudio/src/FACT.c +++ b/libs/faudio/src/FACT.c @@ -2415,20 +2415,7 @@ uint32_t FACTCue_Destroy(FACTCue *pCue) FAudio_assert(cue != NULL && "Could not find Cue reference!"); pCue->parentBank->parentEngine->pFree(pCue->variableValues); - if (pCue->notifyOnDestroy || pCue->parentBank->parentEngine->notifications & NOTIFY_CUEDESTROY) - { - note.type = FACTNOTIFICATIONTYPE_CUEDESTROYED; - note.cue.pCue = pCue; - if (pCue->parentBank->parentEngine->notifications & NOTIFY_CUEDESTROY) - { - note.pvContext = pCue->parentBank->parentEngine->cue_context; - } - else - { - note.pvContext = pCue->usercontext; - } - pCue->parentBank->parentEngine->notificationCallback(&note); - } + FACT_INTERNAL_SendCueNotification(pCue, NOTIFY_CUEDESTROY, FACTNOTIFICATIONTYPE_CUEDESTROYED); mutex = pCue->parentBank->parentEngine->apiLock; pCue->parentBank->parentEngine->pFree(pCue); @@ -2679,6 +2666,8 @@ uint32_t FACTCue_Stop(FACTCue *pCue, uint32_t dwFlags) } } + FACT_INTERNAL_SendCueNotification(pCue, NOTIFY_CUESTOP, FACTNOTIFICATIONTYPE_CUESTOP); + FAudio_PlatformUnlockMutex(pCue->parentBank->parentEngine->apiLock); return 0; } diff --git a/libs/faudio/src/FAudio.c b/libs/faudio/src/FAudio.c index 81363b983c7..ff373ef8dbb 100644 --- a/libs/faudio/src/FAudio.c +++ b/libs/faudio/src/FAudio.c @@ -2453,7 +2453,9 @@ uint32_t FAudioSourceVoice_SubmitSourceBuffer( FAudio_assert(voice->type == FAUDIO_VOICE_SOURCE); #ifdef HAVE_WMADEC - FAudio_assert( (voice->src.wmadec != NULL && (pBufferWMA != NULL || voice->src.format->wFormatTag == FAUDIO_FORMAT_XMAUDIO2)) || + FAudio_assert( (voice->src.wmadec != NULL && (pBufferWMA != NULL || + (voice->src.format->wFormatTag == FAUDIO_FORMAT_XMAUDIO2 || + voice->src.format->wFormatTag == FAUDIO_FORMAT_EXTENSIBLE))) || (voice->src.wmadec == NULL && (pBufferWMA == NULL && voice->src.format->wFormatTag != FAUDIO_FORMAT_XMAUDIO2)) ); #endif /* HAVE_WMADEC */ diff --git a/libs/faudio/src/FAudioFX_reverb.c b/libs/faudio/src/FAudioFX_reverb.c index 4d43fa4e76c..79c4151c2d9 100644 --- a/libs/faudio/src/FAudioFX_reverb.c +++ b/libs/faudio/src/FAudioFX_reverb.c @@ -507,7 +507,8 @@ static FAudio_ChannelPositionFlags FAudio_GetChannelPositionFlags(int32_t total_ case 3: return Position_Right | Position_Rear; } - + FAudio_assert(0 && "Unsupported channel count"); + break; case 5: switch (channel) { @@ -522,7 +523,8 @@ static FAudio_ChannelPositionFlags FAudio_GetChannelPositionFlags(int32_t total_ case 4: return Position_Right | Position_Rear; } - + FAudio_assert(0 && "Unsupported channel count"); + break; default: FAudio_assert(0 && "Unsupported channel count"); break; diff --git a/libs/faudio/src/FAudio_platform_win32.c b/libs/faudio/src/FAudio_platform_win32.c index f70e260c542..ccb8d8abbbf 100644 --- a/libs/faudio/src/FAudio_platform_win32.c +++ b/libs/faudio/src/FAudio_platform_win32.c @@ -228,8 +228,8 @@ void FAudio_PlatformInit( FAudio_assert(!FAILED(hr) && "Failed to create audio client!"); IMMDevice_Release(device); - if (flags & FAUDIO_1024_QUANTUM) duration = 21330; - else duration = 30000; + if (flags & FAUDIO_1024_QUANTUM) duration = 213333; + else duration = 100000; hr = IAudioClient_IsFormatSupported( data->client, @@ -250,7 +250,7 @@ void FAudio_PlatformInit( data->client, AUDCLNT_SHAREMODE_SHARED, AUDCLNT_STREAMFLAGS_EVENTCALLBACK, - duration, + duration * 3, 0, &args->format.Format, &GUID_NULL @@ -287,7 +287,8 @@ void FAudio_PlatformInit( args->events[0] = audioEvent; args->events[1] = data->stopEvent; args->audio = audio; - args->updateSize = args->format.Format.nSamplesPerSec / 100; + if (flags & FAUDIO_1024_QUANTUM) args->updateSize = args->format.Format.nSamplesPerSec / (1000.0 / (64.0 / 3.0)); + else args->updateSize = args->format.Format.nSamplesPerSec / 100; data->audioThread = CreateThread(NULL, 0, &FAudio_AudioClientThread, args, 0, NULL); FAudio_assert(!!data->audioThread && "Failed to create audio client thread!"); @@ -622,6 +623,7 @@ static int FAUDIOCALL FAudio_mem_close(void *data) { if (!data) return 0; FAudio_free(data); + return 0; } FAudioIOStream* FAudio_memopen(void *mem, int len)

1 0

Alexandre Julliard : dnsapi: Fix the DNS_KEY_DATA and DNS_SIG_DATA structure definitions.
by Alexandre Julliard 02 Nov '21

02 Nov '21

Module: wine Branch: master Commit: 0b7dba8c71ea5d9808d2108e29719328b40e6b1f URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b7dba8c71ea5d9808d2108e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 2 12:46:28 2021 +0100 dnsapi: Fix the DNS_KEY_DATA and DNS_SIG_DATA structure definitions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dnsapi/libresolv.c | 2 ++ dlls/dnsapi/record.c | 12 ++++++------ include/windns.h | 10 ++++++---- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/dlls/dnsapi/libresolv.c b/dlls/dnsapi/libresolv.c index 197ca84aeae..e5c520a0a32 100644 --- a/dlls/dnsapi/libresolv.c +++ b/dlls/dnsapi/libresolv.c @@ -581,6 +581,7 @@ static DNS_STATUS copy_rdata( ns_msg msg, const ns_rr *rr, DNS_RECORDA *r, WORD r->Data.KEY.chAlgorithm = *pos++; size = rr->rdata + rr->rdlength - pos; + r->Data.KEY.wKeyLength = size; for (i = 0; i < size; i++) r->Data.KEY.Key[i] = *pos++; @@ -668,6 +669,7 @@ static DNS_STATUS copy_rdata( ns_msg msg, const ns_rr *rr, DNS_RECORDA *r, WORD r->Data.SIG.wKeyTag = *(const WORD *)pos; size = rr->rdata + rr->rdlength - pos; + r->Data.SIG.wSignatureLength = size; for (i = 0; i < size; i++) r->Data.SIG.Signature[i] = *pos++; diff --git a/dlls/dnsapi/record.c b/dlls/dnsapi/record.c index 5a75503d892..014d788cf5e 100644 --- a/dlls/dnsapi/record.c +++ b/dlls/dnsapi/record.c @@ -221,10 +221,10 @@ BOOL WINAPI DnsRecordCompare( PDNS_RECORD r1, PDNS_RECORD r2 ) { if (r1->Data.KEY.wFlags != r2->Data.KEY.wFlags || r1->Data.KEY.chProtocol != r2->Data.KEY.chProtocol || - r1->Data.KEY.chAlgorithm != r2->Data.KEY.chAlgorithm) + r1->Data.KEY.chAlgorithm != r2->Data.KEY.chAlgorithm || + r1->Data.KEY.wKeyLength != r2->Data.KEY.wKeyLength) return FALSE; - if (memcmp( r1->Data.KEY.Key, r2->Data.KEY.Key, - r1->wDataLength - sizeof(DNS_KEY_DATA) + 1 )) + if (memcmp( r1->Data.KEY.Key, r2->Data.KEY.Key, r1->Data.KEY.wKeyLength )) return FALSE; break; } @@ -238,10 +238,10 @@ BOOL WINAPI DnsRecordCompare( PDNS_RECORD r1, PDNS_RECORD r2 ) r1->Data.SIG.dwOriginalTtl != r2->Data.SIG.dwOriginalTtl || r1->Data.SIG.dwExpiration != r2->Data.SIG.dwExpiration || r1->Data.SIG.dwTimeSigned != r2->Data.SIG.dwTimeSigned || - r1->Data.SIG.wKeyTag != r2->Data.SIG.wKeyTag) + r1->Data.SIG.wKeyTag != r2->Data.SIG.wKeyTag || + r1->Data.SIG.wSignatureLength != r2->Data.SIG.wSignatureLength) return FALSE; - if (memcmp( r1->Data.SIG.Signature, r2->Data.SIG.Signature, - r1->wDataLength - sizeof(DNS_SIG_DATAA) + 1 )) + if (memcmp( r1->Data.SIG.Signature, r2->Data.SIG.Signature, r1->Data.SIG.wSignatureLength )) return FALSE; break; } diff --git a/include/windns.h b/include/windns.h index f1f2184281c..9796a299d04 100644 --- a/include/windns.h +++ b/include/windns.h @@ -339,6 +339,8 @@ typedef struct WORD wFlags; BYTE chProtocol; BYTE chAlgorithm; + WORD wKeyLength; + WORD wPad; BYTE Key[1]; } DNS_KEY_DATA, *PDNS_KEY_DATA; @@ -355,7 +357,6 @@ typedef struct typedef struct { - PSTR pNameSigner; WORD wTypeCovered; BYTE chAlgorithm; BYTE chLabelCount; @@ -363,13 +364,13 @@ typedef struct DWORD dwExpiration; DWORD dwTimeSigned; WORD wKeyTag; - WORD Pad; + WORD wSignatureLength; + PSTR pNameSigner; BYTE Signature[1]; } DNS_SIG_DATAA, *PDNS_SIG_DATAA; typedef struct { - PWSTR pNameSigner; WORD wTypeCovered; BYTE chAlgorithm; BYTE chLabelCount; @@ -377,7 +378,8 @@ typedef struct DWORD dwExpiration; DWORD dwTimeSigned; WORD wKeyTag; - WORD Pad; + WORD wSignatureLength; + PWSTR pNameSigner; BYTE Signature[1]; } DNS_SIG_DATAW, *PDNS_SIG_DATAW;

1 0

Alexandre Julliard : dnsapi: Make type_to_str() into a proper debugstr function.
by Alexandre Julliard 02 Nov '21

02 Nov '21

Module: wine Branch: master Commit: 87f94202bb391cfcc7e65505cefa92f196e4f09b URL: https://source.winehq.org/git/wine.git/?a=commit;h=87f94202bb391cfcc7e65505… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 2 12:45:10 2021 +0100 dnsapi: Make type_to_str() into a proper debugstr function. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dnsapi/dnsapi.h | 2 +- dlls/dnsapi/libresolv.c | 2 +- dlls/dnsapi/query.c | 8 ++++---- dlls/dnsapi/record.c | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/dnsapi/dnsapi.h b/dlls/dnsapi/dnsapi.h index c598ade756e..a356d24b1f0 100644 --- a/dlls/dnsapi/dnsapi.h +++ b/dlls/dnsapi/dnsapi.h @@ -119,7 +119,7 @@ static inline char *strdup_ua( const char *src ) return dst; } -extern const char *type_to_str( unsigned short ) DECLSPEC_HIDDEN; +extern const char *debugstr_type( unsigned short ) DECLSPEC_HIDDEN; struct resolv_funcs { diff --git a/dlls/dnsapi/libresolv.c b/dlls/dnsapi/libresolv.c index e5c520a0a32..e72e86ad1b1 100644 --- a/dlls/dnsapi/libresolv.c +++ b/dlls/dnsapi/libresolv.c @@ -109,7 +109,7 @@ static DWORD dnsapi_umbstowcs( const char *src, WCHAR *dst, DWORD dstlen ) } } -static const char *debugstr_type( unsigned short type ) +const char *debugstr_type( unsigned short type ) { const char *str; diff --git a/dlls/dnsapi/query.c b/dlls/dnsapi/query.c index 3155c93b360..3f2e82eb9c1 100644 --- a/dlls/dnsapi/query.c +++ b/dlls/dnsapi/query.c @@ -110,7 +110,7 @@ static const char *debugstr_query_request(const DNS_QUERY_REQUEST *req) return "(null)"; return wine_dbg_sprintf("{%d %s %s %x%08x %p %d %p %p}", req->Version, - debugstr_w(req->QueryName), type_to_str(req->QueryType), + debugstr_w(req->QueryName), debugstr_type(req->QueryType), (UINT32)(req->QueryOptions>>32u), (UINT32)req->QueryOptions, req->pDnsServerList, req->InterfaceIndex, req->pQueryCompletionCallback, req->pQueryContext); } @@ -136,7 +136,7 @@ DNS_STATUS WINAPI DnsQuery_A( PCSTR name, WORD type, DWORD options, PVOID server DNS_RECORDW *resultW; DNS_STATUS status; - TRACE( "(%s,%s,0x%08x,%p,%p,%p)\n", debugstr_a(name), type_to_str( type ), + TRACE( "(%s,%s,0x%08x,%p,%p,%p)\n", debugstr_a(name), debugstr_type( type ), options, servers, result, reserved ); if (!name || !result) @@ -169,7 +169,7 @@ DNS_STATUS WINAPI DnsQuery_UTF8( PCSTR name, WORD type, DWORD options, PVOID ser { DNS_STATUS ret = DNS_ERROR_RCODE_NOT_IMPLEMENTED; - TRACE( "(%s,%s,0x%08x,%p,%p,%p)\n", debugstr_a(name), type_to_str( type ), + TRACE( "(%s,%s,0x%08x,%p,%p,%p)\n", debugstr_a(name), debugstr_type( type ), options, servers, result, reserved ); if (!name || !result) @@ -200,7 +200,7 @@ DNS_STATUS WINAPI DnsQuery_W( PCWSTR name, WORD type, DWORD options, PVOID serve DNS_RECORDA *resultA; DNS_STATUS status; - TRACE( "(%s,%s,0x%08x,%p,%p,%p)\n", debugstr_w(name), type_to_str( type ), + TRACE( "(%s,%s,0x%08x,%p,%p,%p)\n", debugstr_w(name), debugstr_type( type ), options, servers, result, reserved ); if (!name || !result) diff --git a/dlls/dnsapi/record.c b/dlls/dnsapi/record.c index 014d788cf5e..1fdbae523eb 100644 --- a/dlls/dnsapi/record.c +++ b/dlls/dnsapi/record.c @@ -29,7 +29,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dnsapi); -const char *type_to_str( unsigned short type ) +const char *debugstr_type( unsigned short type ) { switch (type) { @@ -91,7 +91,7 @@ const char *type_to_str( unsigned short type ) X(DNS_TYPE_WINS) X(DNS_TYPE_WINSR) #undef X - default: { static char tmp[7]; sprintf( tmp, "0x%04x", type ); return tmp; } + default: return wine_dbg_sprintf( "0x%04x", type ); } } @@ -339,7 +339,7 @@ BOOL WINAPI DnsRecordCompare( PDNS_RECORD r1, PDNS_RECORD r2 ) break; } default: - FIXME( "unknown type: %s\n", type_to_str( r1->wType ) ); + FIXME( "unknown type: %s\n", debugstr_type( r1->wType ) ); return FALSE; } return TRUE;

1 0

Alexandre Julliard : dnsapi: Implement DnsExtractRecordsFromMessage().
by Alexandre Julliard 02 Nov '21

02 Nov '21

Module: wine Branch: master Commit: aec19e86f66988aec25b258258017d648110f95b URL: https://source.winehq.org/git/wine.git/?a=commit;h=aec19e86f66988aec25b2582… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 2 12:48:15 2021 +0100 dnsapi: Implement DnsExtractRecordsFromMessage(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dnsapi/main.c | 26 --- dlls/dnsapi/record.c | 433 +++++++++++++++++++++++++++++++++++++++++++++ dlls/dnsapi/tests/record.c | 199 +++++++++++++++++++++ 3 files changed, 632 insertions(+), 26 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=aec19e86f66988aec25b…

1 0