December 2022 - Wine-commits

Paul Gofman : mfplay/tests: Add MF_SD_LANGUAGE and MF_SD_STREAM_NAME value tests.
by Alexandre Julliard 02 Dec '22

02 Dec '22

Module: wine Branch: master Commit: 148f996c2f3559ff99ce40b1c6df9a05c883565e URL: https://gitlab.winehq.org/wine/wine/-/commit/148f996c2f3559ff99ce40b1c6df9a… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Nov 24 17:48:27 2022 -0600 mfplay/tests: Add MF_SD_LANGUAGE and MF_SD_STREAM_NAME value tests. --- dlls/mfplay/tests/Makefile.in | 2 +- dlls/mfplay/tests/mfplay.c | 14 +++++++++++++- dlls/mfplay/tests/test.mp4 | Bin 1554 -> 1610 bytes 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/mfplay/tests/Makefile.in b/dlls/mfplay/tests/Makefile.in index e790fa3e2ad..aabc08258f9 100644 --- a/dlls/mfplay/tests/Makefile.in +++ b/dlls/mfplay/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = mfplay.dll -IMPORTS = mfplay user32 uuid mfuuid mfplat +IMPORTS = mfplay user32 uuid mfuuid mfplat ole32 C_SRCS = \ mfplay.c diff --git a/dlls/mfplay/tests/mfplay.c b/dlls/mfplay/tests/mfplay.c index 50ecb1b09b9..6cecd3bbdd9 100644 --- a/dlls/mfplay/tests/mfplay.c +++ b/dlls/mfplay/tests/mfplay.c @@ -356,7 +356,19 @@ static void test_media_item(void) ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFPMediaItem_GetStreamAttribute(item, 0, &MF_SD_LANGUAGE, &propvar); - ok(hr == MF_E_ATTRIBUTENOTFOUND, "Unexpected hr %#lx.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(propvar.vt == VT_LPWSTR, "Unexpected vt %u.\n", propvar.vt); + ok(!wcscmp(propvar.pwszVal, L"en"), "Unexpected value %s.\n", debugstr_w(propvar.pwszVal)); + PropVariantClear(&propvar); + + hr = IMFPMediaItem_GetStreamAttribute(item, 0, &MF_SD_STREAM_NAME, &propvar); + ok(hr == S_OK || broken(hr == MF_E_ATTRIBUTENOTFOUND) /* Before Win10 1607. */, "Unexpected hr %#lx.\n", hr); + if (hr == S_OK) + { + ok(propvar.vt == VT_LPWSTR, "Unexpected vt %u.\n", propvar.vt); + ok(!wcscmp(propvar.pwszVal, L"test"), "Unexpected value %s.\n", debugstr_w(propvar.pwszVal)); + PropVariantClear(&propvar); + } hr = IMFPMediaItem_GetPresentationAttribute(item, &MF_PD_DURATION, &propvar); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); diff --git a/dlls/mfplay/tests/test.mp4 b/dlls/mfplay/tests/test.mp4 index a5bbca6bbf7..6770d064716 100644 Binary files a/dlls/mfplay/tests/test.mp4 and b/dlls/mfplay/tests/test.mp4 differ

1 0

Nikolay Sivov : d3d10/effect: Partially implement updates through value expressions.
by Alexandre Julliard 02 Dec '22

02 Dec '22

Module: wine Branch: master Commit: 7448ecae49581472e141d7329cc0cc526dfe170e URL: https://gitlab.winehq.org/wine/wine/-/commit/7448ecae49581472e141d7329cc0cc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 30 20:09:29 2022 +0300 d3d10/effect: Partially implement updates through value expressions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d10/effect.c | 29 +++++++++++++++++++++++++++++ dlls/d3d10/tests/effect.c | 6 ------ 2 files changed, 29 insertions(+), 6 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 857e3bea70d..1b4f3ee5a36 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -800,6 +800,7 @@ static void d3d10_effect_update_dependent_props(struct d3d10_effect_prop_depende struct d3d10_effect_prop_dependency *d; unsigned int i, j, count, variable_idx; struct d3d10_effect_variable *v; + struct d3d10_reg_table *table; unsigned int *dst_index; uint32_t value; HRESULT hr; @@ -864,6 +865,34 @@ static void d3d10_effect_update_dependent_props(struct d3d10_effect_prop_depende } break; + case D3D10_EOO_VALUE_EXPRESSION: + + if ((property_info->container_type != D3D10_C_PASS) + || ((property_info->type != D3D10_SVT_UINT) && (property_info->type != D3D10_SVT_FLOAT))) + { + FIXME("Unimplemented for property %s.\n", property_info->name); + return; + } + + if (FAILED(hr = d3d10_effect_preshader_eval(&d->value_expr.value))) + { + WARN("Failed to evaluate value expression, hr %#lx.\n", hr); + return; + } + + table = &d->value_expr.value.reg_tables[D3D10_REG_TABLE_RESULT]; + + if (property_info->size != table->count) + { + WARN("Unexpected value expression output size %u, property size %u.\n", + table->count, property_info->size); + return; + } + + memcpy(dst, table->f, property_info->size * sizeof(float)); + + break; + default: FIXME("Unsupported property update for %u.\n", d->operation); } diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index ddaf72de2fa..11aa313f8d4 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -8314,13 +8314,10 @@ static void test_effect_value_expression(void) ID3D10Device_OMGetBlendState(device, &blend_state, blend_factor, &sample_mask); ok(!blend_state, "Unexpected blend state %p.\n", blend_state); - todo_wine - { ok(blend_factor[0] == 1.0f, "Got unexpected blend_factor[0] %.8e.\n", blend_factor[0]); ok(blend_factor[1] == 1.0f, "Got unexpected blend_factor[1] %.8e.\n", blend_factor[1]); ok(blend_factor[2] == 0.1f, "Got unexpected blend_factor[2] %.8e.\n", blend_factor[2]); ok(blend_factor[3] == -3.0f, "Got unexpected blend_factor[3] %.8e.\n", blend_factor[3]); - } ok(!sample_mask, "Got unexpected sample_mask %#x.\n", sample_mask); pass = t->lpVtbl->GetPassByName(t, "p4"); @@ -8331,13 +8328,10 @@ static void test_effect_value_expression(void) ID3D10Device_OMGetBlendState(device, &blend_state, blend_factor, &sample_mask); ok(!blend_state, "Unexpected blend state %p.\n", blend_state); - todo_wine - { ok(blend_factor[0] == 2.0f, "Got unexpected blend_factor[0] %.8e.\n", blend_factor[0]); ok(blend_factor[1] == 1.1f, "Got unexpected blend_factor[1] %.8e.\n", blend_factor[1]); ok(blend_factor[2] == 1.0f, "Got unexpected blend_factor[2] %.8e.\n", blend_factor[2]); ok(blend_factor[3] == 1.0f, "Got unexpected blend_factor[3] %.8e.\n", blend_factor[3]); - } ok(!sample_mask, "Got unexpected sample_mask %#x.\n", sample_mask); effect->lpVtbl->Release(effect);

1 0

Nikolay Sivov : d3d10/effect: Add 'ftob' instruction support for expressions.
by Alexandre Julliard 02 Dec '22

02 Dec '22

Module: wine Branch: master Commit: 08e8f284f5a3faf0354e693d34c5132d2d46f5ab URL: https://gitlab.winehq.org/wine/wine/-/commit/08e8f284f5a3faf0354e693d34c513… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Dec 1 06:33:09 2022 +0300 d3d10/effect: Add 'ftob' instruction support for expressions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d10/effect.c | 20 ++++- dlls/d3d10/tests/effect.c | 221 ++++++++++++++++++++++++++++------------------ 2 files changed, 155 insertions(+), 86 deletions(-)

1 0

Nikolay Sivov : d3d10/effect: Add 'div' instruction support for expressions.
by Alexandre Julliard 02 Dec '22

02 Dec '22

Module: wine Branch: master Commit: 6cb65804a45f1ee100e38ed0c6e78be377466d03 URL: https://gitlab.winehq.org/wine/wine/-/commit/6cb65804a45f1ee100e38ed0c6e78b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Dec 1 06:49:09 2022 +0300 d3d10/effect: Add 'div' instruction support for expressions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d10/effect.c | 10 +++++++ dlls/d3d10/tests/effect.c | 68 +++++++++++++++++++++++++++++++++++------------ 2 files changed, 61 insertions(+), 17 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index cd11ae34074..f191babc576 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -294,6 +294,15 @@ static void pres_mul(float **args, unsigned int n, const struct preshader_instr retval[i] = args[0][instr->scalar ? 0 : i] * args[1][i]; } +static void pres_div(float **args, unsigned int n, const struct preshader_instr *instr) +{ + float *retval = args[2]; + unsigned int i; + + for (i = 0; i < instr->comp_count; ++i) + retval[i] = args[0][instr->scalar ? 0 : i] / args[1][i]; +} + struct preshader_op_info { int opcode; @@ -312,6 +321,7 @@ static const struct preshader_op_info preshader_ops[] = { 0x201, "max", pres_max }, { 0x204, "add", pres_add }, { 0x205, "mul", pres_mul }, + { 0x208, "div", pres_div }, }; static int __cdecl preshader_op_compare(const void *a, const void *b) diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index 7fb4f7581b1..5984a527a6a 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -8167,13 +8167,17 @@ technique10 tech { SetBlendState( NULL, max(g_var.x, g_var2), 0 ); } + pass p5 + { + SetBlendState( NULL, g_var.x / g_var, 0 ); + } } #endif static DWORD fx_test_value_expression[] = { - 0x43425844, 0xf580dcc6, 0xa9d229ae, 0x14b1f1d5, 0x3c8c456c, 0x00000001, 0x00000c34, 0x00000001, - 0x00000024, 0x30315846, 0x00000c08, 0xfeff1001, 0x00000001, 0x00000002, 0x00000001, 0x00000000, - 0x00000000, 0x00000000, 0x00000001, 0x00000a0c, 0x00000000, 0x00000000, 0x00000001, 0x00000000, + 0x43425844, 0xb3aa52e8, 0x866f7138, 0xbdef210c, 0xdf2ba297, 0x00000001, 0x00000d87, 0x00000001, + 0x00000024, 0x30315846, 0x00000d5b, 0xfeff1001, 0x00000001, 0x00000002, 0x00000001, 0x00000000, + 0x00000000, 0x00000000, 0x00000001, 0x00000b23, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x6f6c4724, 0x736c6162, 0x6f6c6600, 0x00347461, 0x0000000d, 0x00000001, 0x00000000, 0x00000010, 0x00000010, 0x00000010, 0x0000210a, 0x61765f67, 0x5f670072, 0x32726176, 0x70654400, 0x74536874, 0x69636e65, @@ -8255,20 +8259,31 @@ static DWORD fx_test_value_expression[] = 0x00000004, 0x00000000, 0x434c5846, 0x0000003c, 0x00000001, 0xa0100004, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000000, 0x00000002, 0x00000004, 0x00000000, 0x00000004, 0x00000000, 0xf0f0f0f0, 0x0f0f0f0f, 0x0000ffff, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000002, - 0x00000000, 0x00000004, 0x00000020, 0x00000000, 0x00000002, 0xffffffff, 0x00000000, 0x00000030, - 0x00000014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000036, 0x00000014, - 0x00000000, 0x00000010, 0x00000000, 0x00000000, 0x00000000, 0x0000006b, 0x0000004f, 0x00000000, - 0xffffffff, 0x00000001, 0x00000019, 0x00000000, 0x00000006, 0x00000074, 0x00000000, 0x00000164, - 0x00000005, 0x00000000, 0x00000169, 0x00000003, 0x00000000, 0x0000000a, 0x00000000, 0x00000006, - 0x0000016c, 0x0000000b, 0x00000000, 0x00000001, 0x000003b4, 0x00000002, 0x00000000, 0x00000001, - 0x000003c0, 0x000003cc, 0x00000003, 0x00000000, 0x0000000a, 0x00000000, 0x00000006, 0x000003cf, - 0x0000000b, 0x00000000, 0x00000001, 0x00000523, 0x00000002, 0x00000000, 0x00000001, 0x0000052f, - 0x0000053b, 0x00000003, 0x00000000, 0x0000000a, 0x00000000, 0x00000006, 0x0000053e, 0x0000000b, - 0x00000000, 0x00000001, 0x0000076e, 0x00000002, 0x00000000, 0x00000001, 0x0000077a, 0x00000786, - 0x00000003, 0x00000000, 0x0000000a, 0x00000000, 0x00000006, 0x00000789, 0x0000000b, 0x00000000, - 0x00000001, 0x000008b1, 0x00000002, 0x00000000, 0x00000001, 0x000008bd, 0x000008c9, 0x00000003, - 0x00000000, 0x0000000a, 0x00000000, 0x00000006, 0x000008cc, 0x0000000b, 0x00000000, 0x00000001, - 0x000009f4, 0x00000002, 0x00000000, 0x00000001, 0x00000a00, + 0x00000000, 0xf8003570, 0x44000000, 0x93434258, 0x0bf74bf8, 0x9e3d094d, 0xfff013f9, 0x0199d86f, + 0xf8000000, 0x03000000, 0x2c000000, 0xa8000000, 0xb4000000, 0x43000000, 0x74424154, 0x1c000000, + 0x4b000000, 0x00000000, 0x01465804, 0x1c000000, 0x00000000, 0x48000001, 0x30000000, 0x02000000, + 0x01000000, 0x38000000, 0x00000000, 0x67000000, 0x7261765f, 0x01abab00, 0x01000300, 0x01000400, + 0x00000000, 0x74000000, 0x694d0078, 0x736f7263, 0x2074666f, 0x20295228, 0x4c534c48, 0x61685320, + 0x20726564, 0x706d6f43, 0x72656c69, 0x2e303120, 0x43ab0031, 0x0434494c, 0x00000000, 0x46000000, + 0x3c434c58, 0x01000000, 0x04000000, 0x02a08000, 0x00000000, 0x02000000, 0x00000000, 0x00000000, + 0x02000000, 0x00000000, 0x00000000, 0x04000000, 0x00000000, 0xf0000000, 0x0ff0f0f0, 0xff0f0f0f, + 0x010000ff, 0x02000000, 0x00000000, 0x01000000, 0x02000000, 0x00000000, 0x04000000, 0x20000000, + 0x00000000, 0x02000000, 0xff000000, 0x00ffffff, 0x30000000, 0x14000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x36000000, 0x14000000, 0x00000000, 0x10000000, 0x00000000, + 0x00000000, 0x00000000, 0x6b000000, 0x4f000000, 0x00000000, 0xff000000, 0x01ffffff, 0x19000000, + 0x00000000, 0x06000000, 0x74000000, 0x00000000, 0x64000000, 0x06000001, 0x00000000, 0x69000000, + 0x03000001, 0x00000000, 0x0a000000, 0x00000000, 0x06000000, 0x6c000000, 0x0b000001, 0x00000000, + 0x01000000, 0xb4000000, 0x02000003, 0x00000000, 0x01000000, 0xc0000000, 0xcc000003, 0x03000003, + 0x00000000, 0x0a000000, 0x00000000, 0x06000000, 0xcf000000, 0x0b000003, 0x00000000, 0x01000000, + 0x23000000, 0x02000005, 0x00000000, 0x01000000, 0x2f000000, 0x3b000005, 0x03000005, 0x00000000, + 0x0a000000, 0x00000000, 0x06000000, 0x3e000000, 0x0b000005, 0x00000000, 0x01000000, 0x6e000000, + 0x02000007, 0x00000000, 0x01000000, 0x7a000000, 0x86000007, 0x03000007, 0x00000000, 0x0a000000, + 0x00000000, 0x06000000, 0x89000000, 0x0b000007, 0x00000000, 0x01000000, 0xb1000000, 0x02000008, + 0x00000000, 0x01000000, 0xbd000000, 0xc9000008, 0x03000008, 0x00000000, 0x0a000000, 0x00000000, + 0x06000000, 0xcc000000, 0x0b000008, 0x00000000, 0x01000000, 0xf4000000, 0x02000009, 0x00000000, + 0x01000000, 0x00000000, 0x0c00000a, 0x0300000a, 0x00000000, 0x0a000000, 0x00000000, 0x06000000, + 0x0f000000, 0x0b00000a, 0x00000000, 0x01000000, 0x0b000000, 0x0200000b, 0x00000000, 0x01000000, + 0x17000000, 0x0000000b, }; static void test_effect_value_expression(void) @@ -8353,6 +8368,25 @@ static void test_effect_value_expression(void) ok(blend_factor[3] == 1.0f, "Got unexpected blend_factor[3] %.8e.\n", blend_factor[3]); ok(!sample_mask, "Got unexpected sample_mask %#x.\n", sample_mask); + /* div */ + pass = t->lpVtbl->GetPassByName(t, "p5"); + ok(pass->lpVtbl->IsValid(pass), "Expected valid pass.\n"); + + f[0] = 1.0f; f[1] = 2.0f; f[2] = 3.0f; f[3] = 4.0f; + hr = g_var->lpVtbl->SetFloatVector(g_var, f); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + hr = pass->lpVtbl->Apply(pass, 0); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + ID3D10Device_OMGetBlendState(device, &blend_state, blend_factor, &sample_mask); + ok(!blend_state, "Unexpected blend state %p.\n", blend_state); + ok(blend_factor[0] == 1.0f, "Got unexpected blend_factor[0] %.8e.\n", blend_factor[0]); + ok(blend_factor[1] == 1.0f / 2.0f, "Got unexpected blend_factor[1] %.8e.\n", blend_factor[1]); + ok(blend_factor[2] == 1.0f / 3.0f, "Got unexpected blend_factor[2] %.8e.\n", blend_factor[2]); + ok(blend_factor[3] == 1.0f / 4.0f, "Got unexpected blend_factor[3] %.8e.\n", blend_factor[3]); + ok(!sample_mask, "Got unexpected sample_mask %#x.\n", sample_mask); + /* Mutable state objects. */ v = effect->lpVtbl->GetVariableByName(effect, "ds_state"); ds = v->lpVtbl->AsDepthStencil(v);

1 0

Nikolay Sivov : d3d10/effect: Add 'rcp' instruction support for expressions.
by Alexandre Julliard 02 Dec '22

02 Dec '22

Module: wine Branch: master Commit: c336ce73a98008308bfc19f320dc55ca1100d94f URL: https://gitlab.winehq.org/wine/wine/-/commit/c336ce73a98008308bfc19f320dc55… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Dec 1 06:55:19 2022 +0300 d3d10/effect: Add 'rcp' instruction support for expressions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d10/effect.c | 10 +++++++ dlls/d3d10/tests/effect.c | 76 ++++++++++++++++++++++++++++++++++------------- 2 files changed, 66 insertions(+), 20 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index f191babc576..21f41def5be 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -216,6 +216,15 @@ static void pres_neg(float **args, unsigned int n, const struct preshader_instr retval[i] = -args[0][i]; } +static void pres_rcp(float **args, unsigned int n, const struct preshader_instr *instr) +{ + float *retval = args[1]; + unsigned int i; + + for (i = 0; i < instr->comp_count; ++i) + retval[i] = 1.0f / args[0][i]; +} + static void pres_sin(float **args, unsigned int n, const struct preshader_instr *instr) { float *retval = args[1]; @@ -313,6 +322,7 @@ struct preshader_op_info static const struct preshader_op_info preshader_ops[] = { { 0x101, "neg", pres_neg }, + { 0x103, "rcp", pres_rcp }, { 0x108, "sin", pres_sin }, { 0x109, "cos", pres_cos }, { 0x133, "ftou", pres_ftou }, diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index 5984a527a6a..bdaf07be434 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -8171,13 +8171,17 @@ technique10 tech { SetBlendState( NULL, g_var.x / g_var, 0 ); } + pass p6 + { + SetBlendState( NULL, 1.0f / g_var, 0 ); + } } #endif static DWORD fx_test_value_expression[] = { - 0x43425844, 0xb3aa52e8, 0x866f7138, 0xbdef210c, 0xdf2ba297, 0x00000001, 0x00000d87, 0x00000001, - 0x00000024, 0x30315846, 0x00000d5b, 0xfeff1001, 0x00000001, 0x00000002, 0x00000001, 0x00000000, - 0x00000000, 0x00000000, 0x00000001, 0x00000b23, 0x00000000, 0x00000000, 0x00000001, 0x00000000, + 0x43425844, 0xd2081c75, 0x0e089a32, 0xcda030e3, 0xc28f5c06, 0x00000001, 0x00000f2e, 0x00000001, + 0x00000024, 0x30315846, 0x00000f02, 0xfeff1001, 0x00000001, 0x00000002, 0x00000001, 0x00000000, + 0x00000000, 0x00000000, 0x00000001, 0x00000c8e, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x6f6c4724, 0x736c6162, 0x6f6c6600, 0x00347461, 0x0000000d, 0x00000001, 0x00000000, 0x00000010, 0x00000010, 0x00000010, 0x0000210a, 0x61765f67, 0x5f670072, 0x32726176, 0x70654400, 0x74536874, 0x69636e65, @@ -8267,23 +8271,36 @@ static DWORD fx_test_value_expression[] = 0x20726564, 0x706d6f43, 0x72656c69, 0x2e303120, 0x43ab0031, 0x0434494c, 0x00000000, 0x46000000, 0x3c434c58, 0x01000000, 0x04000000, 0x02a08000, 0x00000000, 0x02000000, 0x00000000, 0x00000000, 0x02000000, 0x00000000, 0x00000000, 0x04000000, 0x00000000, 0xf0000000, 0x0ff0f0f0, 0xff0f0f0f, - 0x010000ff, 0x02000000, 0x00000000, 0x01000000, 0x02000000, 0x00000000, 0x04000000, 0x20000000, - 0x00000000, 0x02000000, 0xff000000, 0x00ffffff, 0x30000000, 0x14000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x36000000, 0x14000000, 0x00000000, 0x10000000, 0x00000000, - 0x00000000, 0x00000000, 0x6b000000, 0x4f000000, 0x00000000, 0xff000000, 0x01ffffff, 0x19000000, - 0x00000000, 0x06000000, 0x74000000, 0x00000000, 0x64000000, 0x06000001, 0x00000000, 0x69000000, - 0x03000001, 0x00000000, 0x0a000000, 0x00000000, 0x06000000, 0x6c000000, 0x0b000001, 0x00000000, - 0x01000000, 0xb4000000, 0x02000003, 0x00000000, 0x01000000, 0xc0000000, 0xcc000003, 0x03000003, - 0x00000000, 0x0a000000, 0x00000000, 0x06000000, 0xcf000000, 0x0b000003, 0x00000000, 0x01000000, - 0x23000000, 0x02000005, 0x00000000, 0x01000000, 0x2f000000, 0x3b000005, 0x03000005, 0x00000000, - 0x0a000000, 0x00000000, 0x06000000, 0x3e000000, 0x0b000005, 0x00000000, 0x01000000, 0x6e000000, - 0x02000007, 0x00000000, 0x01000000, 0x7a000000, 0x86000007, 0x03000007, 0x00000000, 0x0a000000, - 0x00000000, 0x06000000, 0x89000000, 0x0b000007, 0x00000000, 0x01000000, 0xb1000000, 0x02000008, - 0x00000000, 0x01000000, 0xbd000000, 0xc9000008, 0x03000008, 0x00000000, 0x0a000000, 0x00000000, - 0x06000000, 0xcc000000, 0x0b000008, 0x00000000, 0x01000000, 0xf4000000, 0x02000009, 0x00000000, - 0x01000000, 0x00000000, 0x0c00000a, 0x0300000a, 0x00000000, 0x0a000000, 0x00000000, 0x06000000, - 0x0f000000, 0x0b00000a, 0x00000000, 0x01000000, 0x0b000000, 0x0200000b, 0x00000000, 0x01000000, - 0x17000000, 0x0000000b, + 0x010000ff, 0x02000000, 0x00000000, 0x01000000, 0x02000000, 0x00000000, 0x70000000, 0x014c0036, + 0x58440000, 0xb50f4342, 0xfed38746, 0x4134bf74, 0x029d0616, 0x0001dbbd, 0x014c0000, 0x00030000, + 0x002c0000, 0x00a80000, 0x00b40000, 0x54430000, 0x00744241, 0x001c0000, 0x004b0000, 0x04000000, + 0x00014658, 0x001c0000, 0x01000000, 0x00480000, 0x00300000, 0x00020000, 0x00010000, 0x00380000, + 0x00000000, 0x5f670000, 0x00726176, 0x0001abab, 0x00010003, 0x00010004, 0x00000000, 0x78740000, + 0x63694d00, 0x6f736f72, 0x28207466, 0x48202952, 0x204c534c, 0x64616853, 0x43207265, 0x69706d6f, + 0x2072656c, 0x312e3031, 0x4c43ab00, 0x00043449, 0x00000000, 0x58460000, 0x0090434c, 0x00040000, + 0x00010000, 0x00011030, 0x00000000, 0x00020000, 0x00000000, 0x00000000, 0x00040000, 0x00000000, + 0x00010000, 0x00011030, 0x00000000, 0x00020000, 0x00010000, 0x00000000, 0x00040000, 0x00010000, + 0x00010000, 0x00011030, 0x00000000, 0x00020000, 0x00020000, 0x00000000, 0x00040000, 0x00020000, + 0x00010000, 0x00011030, 0x00000000, 0x00020000, 0x00030000, 0x00000000, 0x00040000, 0x00030000, + 0xf0f00000, 0x0f0ff0f0, 0xffff0f0f, 0x00010000, 0x00020000, 0x00000000, 0x00010000, 0x00020000, + 0x00000000, 0x00040000, 0x00200000, 0x00000000, 0x00020000, 0xffff0000, 0x0000ffff, 0x00300000, + 0x00140000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00360000, 0x00140000, + 0x00000000, 0x00100000, 0x00000000, 0x00000000, 0x00000000, 0x006b0000, 0x004f0000, 0x00000000, + 0xffff0000, 0x0001ffff, 0x00190000, 0x00000000, 0x00060000, 0x00740000, 0x00000000, 0x01640000, + 0x00070000, 0x00000000, 0x01690000, 0x00030000, 0x00000000, 0x000a0000, 0x00000000, 0x00060000, + 0x016c0000, 0x000b0000, 0x00000000, 0x00010000, 0x03b40000, 0x00020000, 0x00000000, 0x00010000, + 0x03c00000, 0x03cc0000, 0x00030000, 0x00000000, 0x000a0000, 0x00000000, 0x00060000, 0x03cf0000, + 0x000b0000, 0x00000000, 0x00010000, 0x05230000, 0x00020000, 0x00000000, 0x00010000, 0x052f0000, + 0x053b0000, 0x00030000, 0x00000000, 0x000a0000, 0x00000000, 0x00060000, 0x053e0000, 0x000b0000, + 0x00000000, 0x00010000, 0x076e0000, 0x00020000, 0x00000000, 0x00010000, 0x077a0000, 0x07860000, + 0x00030000, 0x00000000, 0x000a0000, 0x00000000, 0x00060000, 0x07890000, 0x000b0000, 0x00000000, + 0x00010000, 0x08b10000, 0x00020000, 0x00000000, 0x00010000, 0x08bd0000, 0x08c90000, 0x00030000, + 0x00000000, 0x000a0000, 0x00000000, 0x00060000, 0x08cc0000, 0x000b0000, 0x00000000, 0x00010000, + 0x09f40000, 0x00020000, 0x00000000, 0x00010000, 0x0a000000, 0x0a0c0000, 0x00030000, 0x00000000, + 0x000a0000, 0x00000000, 0x00060000, 0x0a0f0000, 0x000b0000, 0x00000000, 0x00010000, 0x0b0b0000, + 0x00020000, 0x00000000, 0x00010000, 0x0b170000, 0x0b230000, 0x00030000, 0x00000000, 0x000a0000, + 0x00000000, 0x00060000, 0x0b260000, 0x000b0000, 0x00000000, 0x00010000, 0x0c760000, 0x00020000, + 0x00000000, 0x00010000, 0x0c820000, 0x00000000, }; static void test_effect_value_expression(void) @@ -8387,6 +8404,25 @@ static void test_effect_value_expression(void) ok(blend_factor[3] == 1.0f / 4.0f, "Got unexpected blend_factor[3] %.8e.\n", blend_factor[3]); ok(!sample_mask, "Got unexpected sample_mask %#x.\n", sample_mask); + /* rcp */ + pass = t->lpVtbl->GetPassByName(t, "p6"); + ok(pass->lpVtbl->IsValid(pass), "Expected valid pass.\n"); + + f[0] = 2.0f; f[1] = 3.0f; f[2] = 4.0f; f[3] = 5.0f; + hr = g_var->lpVtbl->SetFloatVector(g_var, f); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + hr = pass->lpVtbl->Apply(pass, 0); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + ID3D10Device_OMGetBlendState(device, &blend_state, blend_factor, &sample_mask); + ok(!blend_state, "Unexpected blend state %p.\n", blend_state); + ok(blend_factor[0] == 1.0f / 2.0f, "Got unexpected blend_factor[0] %.8e.\n", blend_factor[0]); + ok(blend_factor[1] == 1.0f / 3.0f, "Got unexpected blend_factor[1] %.8e.\n", blend_factor[1]); + ok(blend_factor[2] == 1.0f / 4.0f, "Got unexpected blend_factor[2] %.8e.\n", blend_factor[2]); + ok(blend_factor[3] == 1.0f / 5.0f, "Got unexpected blend_factor[3] %.8e.\n", blend_factor[3]); + ok(!sample_mask, "Got unexpected sample_mask %#x.\n", sample_mask); + /* Mutable state objects. */ v = effect->lpVtbl->GetVariableByName(effect, "ds_state"); ds = v->lpVtbl->AsDepthStencil(v);

1 0

Nikolay Sivov : d3d10/effect: Add 'frc' instruction support for expressions.
by Alexandre Julliard 02 Dec '22

02 Dec '22

Module: wine Branch: master Commit: 0fe562b4ae3f66f9c0e29ab8f27a4abf2ac78501 URL: https://gitlab.winehq.org/wine/wine/-/commit/0fe562b4ae3f66f9c0e29ab8f27a4a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Dec 1 07:07:34 2022 +0300 d3d10/effect: Add 'frc' instruction support for expressions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d10/effect.c | 10 ++++++ dlls/d3d10/tests/effect.c | 80 ++++++++++++++++++++++++++++++++++------------- 2 files changed, 69 insertions(+), 21 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 21f41def5be..2b9c391023a 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -225,6 +225,15 @@ static void pres_rcp(float **args, unsigned int n, const struct preshader_instr retval[i] = 1.0f / args[0][i]; } +static void pres_frc(float **args, unsigned int n, const struct preshader_instr *instr) +{ + float *retval = args[1]; + unsigned int i; + + for (i = 0; i < instr->comp_count; ++i) + retval[i] = args[0][i] - floor(args[0][i]); +} + static void pres_sin(float **args, unsigned int n, const struct preshader_instr *instr) { float *retval = args[1]; @@ -323,6 +332,7 @@ static const struct preshader_op_info preshader_ops[] = { { 0x101, "neg", pres_neg }, { 0x103, "rcp", pres_rcp }, + { 0x104, "frc", pres_frc }, { 0x108, "sin", pres_sin }, { 0x109, "cos", pres_cos }, { 0x133, "ftou", pres_ftou }, diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index bdaf07be434..a2892efec70 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -8175,13 +8175,17 @@ technique10 tech { SetBlendState( NULL, 1.0f / g_var, 0 ); } + pass p7 + { + SetBlendState( NULL, frac(g_var), 0 ); + } } #endif static DWORD fx_test_value_expression[] = { - 0x43425844, 0xd2081c75, 0x0e089a32, 0xcda030e3, 0xc28f5c06, 0x00000001, 0x00000f2e, 0x00000001, - 0x00000024, 0x30315846, 0x00000f02, 0xfeff1001, 0x00000001, 0x00000002, 0x00000001, 0x00000000, - 0x00000000, 0x00000000, 0x00000001, 0x00000c8e, 0x00000000, 0x00000000, 0x00000001, 0x00000000, + 0x43425844, 0x52c4c6e1, 0x3efe62d7, 0xce564377, 0x35213200, 0x00000001, 0x00001075, 0x00000001, + 0x00000024, 0x30315846, 0x00001049, 0xfeff1001, 0x00000001, 0x00000002, 0x00000001, 0x00000000, + 0x00000000, 0x00000000, 0x00000001, 0x00000d99, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x6f6c4724, 0x736c6162, 0x6f6c6600, 0x00347461, 0x0000000d, 0x00000001, 0x00000000, 0x00000010, 0x00000010, 0x00000010, 0x0000210a, 0x61765f67, 0x5f670072, 0x32726176, 0x70654400, 0x74536874, 0x69636e65, @@ -8283,26 +8287,41 @@ static DWORD fx_test_value_expression[] = 0x00010000, 0x00011030, 0x00000000, 0x00020000, 0x00020000, 0x00000000, 0x00040000, 0x00020000, 0x00010000, 0x00011030, 0x00000000, 0x00020000, 0x00030000, 0x00000000, 0x00040000, 0x00030000, 0xf0f00000, 0x0f0ff0f0, 0xffff0f0f, 0x00010000, 0x00020000, 0x00000000, 0x00010000, 0x00020000, - 0x00000000, 0x00040000, 0x00200000, 0x00000000, 0x00020000, 0xffff0000, 0x0000ffff, 0x00300000, - 0x00140000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00360000, 0x00140000, - 0x00000000, 0x00100000, 0x00000000, 0x00000000, 0x00000000, 0x006b0000, 0x004f0000, 0x00000000, - 0xffff0000, 0x0001ffff, 0x00190000, 0x00000000, 0x00060000, 0x00740000, 0x00000000, 0x01640000, - 0x00070000, 0x00000000, 0x01690000, 0x00030000, 0x00000000, 0x000a0000, 0x00000000, 0x00060000, - 0x016c0000, 0x000b0000, 0x00000000, 0x00010000, 0x03b40000, 0x00020000, 0x00000000, 0x00010000, - 0x03c00000, 0x03cc0000, 0x00030000, 0x00000000, 0x000a0000, 0x00000000, 0x00060000, 0x03cf0000, - 0x000b0000, 0x00000000, 0x00010000, 0x05230000, 0x00020000, 0x00000000, 0x00010000, 0x052f0000, - 0x053b0000, 0x00030000, 0x00000000, 0x000a0000, 0x00000000, 0x00060000, 0x053e0000, 0x000b0000, - 0x00000000, 0x00010000, 0x076e0000, 0x00020000, 0x00000000, 0x00010000, 0x077a0000, 0x07860000, - 0x00030000, 0x00000000, 0x000a0000, 0x00000000, 0x00060000, 0x07890000, 0x000b0000, 0x00000000, - 0x00010000, 0x08b10000, 0x00020000, 0x00000000, 0x00010000, 0x08bd0000, 0x08c90000, 0x00030000, - 0x00000000, 0x000a0000, 0x00000000, 0x00060000, 0x08cc0000, 0x000b0000, 0x00000000, 0x00010000, - 0x09f40000, 0x00020000, 0x00000000, 0x00010000, 0x0a000000, 0x0a0c0000, 0x00030000, 0x00000000, - 0x000a0000, 0x00000000, 0x00060000, 0x0a0f0000, 0x000b0000, 0x00000000, 0x00010000, 0x0b0b0000, - 0x00020000, 0x00000000, 0x00010000, 0x0b170000, 0x0b230000, 0x00030000, 0x00000000, 0x000a0000, - 0x00000000, 0x00060000, 0x0b260000, 0x000b0000, 0x00000000, 0x00010000, 0x0c760000, 0x00020000, - 0x00000000, 0x00010000, 0x0c820000, 0x00000000, + 0x00000000, 0x37700000, 0x0000ec00, 0x42584400, 0x67aa4243, 0xe24a7796, 0x86419cce, 0xdf743a20, + 0x000001e1, 0x0000ec00, 0x00000300, 0x00002c00, 0x0000a800, 0x0000b400, 0x41544300, 0x00007442, + 0x00001c00, 0x00004b00, 0x58040000, 0x00000146, 0x00001c00, 0x00010000, 0x00004800, 0x00003000, + 0x00000200, 0x00000100, 0x00003800, 0x00000000, 0x765f6700, 0xab007261, 0x030001ab, 0x04000100, + 0x00000100, 0x00000000, 0x00787400, 0x7263694d, 0x666f736f, 0x52282074, 0x4c482029, 0x53204c53, + 0x65646168, 0x6f432072, 0x6c69706d, 0x31207265, 0x00312e30, 0x494c43ab, 0x00000434, 0x00000000, + 0x4c584600, 0x00003043, 0x00000100, 0x40000400, 0x00000110, 0x00000000, 0x00000200, 0x00000000, + 0x00000000, 0x00000400, 0x00000000, 0xf0f0f000, 0x0f0f0ff0, 0x00ffff0f, 0x00000100, 0x00000200, + 0x00000000, 0x00000100, 0x00000200, 0x00000000, 0x00000400, 0x00002000, 0x00000000, 0x00000200, + 0xffffff00, 0x000000ff, 0x00003000, 0x00001400, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00003600, 0x00001400, 0x00000000, 0x00001000, 0x00000000, 0x00000000, 0x00000000, + 0x00006b00, 0x00004f00, 0x00000000, 0xffffff00, 0x000001ff, 0x00001900, 0x00000000, 0x00000600, + 0x00007400, 0x00000000, 0x00016400, 0x00000800, 0x00000000, 0x00016900, 0x00000300, 0x00000000, + 0x00000a00, 0x00000000, 0x00000600, 0x00016c00, 0x00000b00, 0x00000000, 0x00000100, 0x0003b400, + 0x00000200, 0x00000000, 0x00000100, 0x0003c000, 0x0003cc00, 0x00000300, 0x00000000, 0x00000a00, + 0x00000000, 0x00000600, 0x0003cf00, 0x00000b00, 0x00000000, 0x00000100, 0x00052300, 0x00000200, + 0x00000000, 0x00000100, 0x00052f00, 0x00053b00, 0x00000300, 0x00000000, 0x00000a00, 0x00000000, + 0x00000600, 0x00053e00, 0x00000b00, 0x00000000, 0x00000100, 0x00076e00, 0x00000200, 0x00000000, + 0x00000100, 0x00077a00, 0x00078600, 0x00000300, 0x00000000, 0x00000a00, 0x00000000, 0x00000600, + 0x00078900, 0x00000b00, 0x00000000, 0x00000100, 0x0008b100, 0x00000200, 0x00000000, 0x00000100, + 0x0008bd00, 0x0008c900, 0x00000300, 0x00000000, 0x00000a00, 0x00000000, 0x00000600, 0x0008cc00, + 0x00000b00, 0x00000000, 0x00000100, 0x0009f400, 0x00000200, 0x00000000, 0x00000100, 0x000a0000, + 0x000a0c00, 0x00000300, 0x00000000, 0x00000a00, 0x00000000, 0x00000600, 0x000a0f00, 0x00000b00, + 0x00000000, 0x00000100, 0x000b0b00, 0x00000200, 0x00000000, 0x00000100, 0x000b1700, 0x000b2300, + 0x00000300, 0x00000000, 0x00000a00, 0x00000000, 0x00000600, 0x000b2600, 0x00000b00, 0x00000000, + 0x00000100, 0x000c7600, 0x00000200, 0x00000000, 0x00000100, 0x000c8200, 0x000c8e00, 0x00000300, + 0x00000000, 0x00000a00, 0x00000000, 0x00000600, 0x000c9100, 0x00000b00, 0x00000000, 0x00000100, + 0x000d8100, 0x00000200, 0x00000000, 0x00000100, 0x000d8d00, 0x00000000, }; +static float get_frc(float v) +{ + return v - floor(v); +} + static void test_effect_value_expression(void) { ID3D10EffectVectorVariable *g_var, *g_var2; @@ -8423,6 +8442,25 @@ static void test_effect_value_expression(void) ok(blend_factor[3] == 1.0f / 5.0f, "Got unexpected blend_factor[3] %.8e.\n", blend_factor[3]); ok(!sample_mask, "Got unexpected sample_mask %#x.\n", sample_mask); + /* frc */ + pass = t->lpVtbl->GetPassByName(t, "p7"); + ok(pass->lpVtbl->IsValid(pass), "Expected valid pass.\n"); + + f[0] = 0.0f; f[1] = 3.1f; f[2] = -4.2f; f[3] = 0.1f; + hr = g_var->lpVtbl->SetFloatVector(g_var, f); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + hr = pass->lpVtbl->Apply(pass, 0); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + ID3D10Device_OMGetBlendState(device, &blend_state, blend_factor, &sample_mask); + ok(!blend_state, "Unexpected blend state %p.\n", blend_state); + ok(blend_factor[0] == get_frc(f[0]), "Got unexpected blend_factor[0] %.8e.\n", blend_factor[0]); + ok(blend_factor[1] == get_frc(f[1]), "Got unexpected blend_factor[1] %.8e.\n", blend_factor[1]); + ok(blend_factor[2] == get_frc(f[2]), "Got unexpected blend_factor[2] %.8e.\n", blend_factor[2]); + ok(blend_factor[3] == get_frc(f[3]), "Got unexpected blend_factor[3] %.8e.\n", blend_factor[3]); + ok(!sample_mask, "Got unexpected sample_mask %#x.\n", sample_mask); + /* Mutable state objects. */ v = effect->lpVtbl->GetVariableByName(effect, "ds_state"); ds = v->lpVtbl->AsDepthStencil(v);

1 0

Rémi Bernon : msvcrt: Use operator_delete to free _Condition_variable queue nodes.
by Alexandre Julliard 02 Dec '22

02 Dec '22

Module: wine Branch: master Commit: 996c115217f18654747cd1c4baeda54d9342c808 URL: https://gitlab.winehq.org/wine/wine/-/commit/996c115217f18654747cd1c4baeda5… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Dec 2 08:16:30 2022 +0100 msvcrt: Use operator_delete to free _Condition_variable queue nodes. --- dlls/msvcrt/concurrency.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/concurrency.c b/dlls/msvcrt/concurrency.c index f7f7adb86ed..c5db2868d58 100644 --- a/dlls/msvcrt/concurrency.c +++ b/dlls/msvcrt/concurrency.c @@ -2656,7 +2656,7 @@ void __thiscall _Condition_variable_dtor(_Condition_variable *this) cv_queue *next = this->queue->next; if(!this->queue->expired) ERR("there's an active wait\n"); - HeapFree(GetProcessHeap(), 0, this->queue); + operator_delete(this->queue); this->queue = next; } critical_section_dtor(&this->lock); @@ -2753,7 +2753,7 @@ void __thiscall _Condition_variable_notify_one(_Condition_variable *this) RtlWakeAddressSingle(&node->next); return; } else { - HeapFree(GetProcessHeap(), 0, node); + operator_delete(node); } } } @@ -2782,7 +2782,7 @@ void __thiscall _Condition_variable_notify_all(_Condition_variable *this) if(!InterlockedExchange(&ptr->expired, TRUE)) RtlWakeAddressSingle(&ptr->next); else - HeapFree(GetProcessHeap(), 0, ptr); + operator_delete(ptr); ptr = next; } }

1 0

Alex Henrie : rpcrt4/tests: Don't use an array of pointers in test_conf_complex_struct.
by Alexandre Julliard 02 Dec '22

02 Dec '22

Module: wine Branch: master Commit: e09c93de7bd4f27b41f572a4a79d9df190c63c6f URL: https://gitlab.winehq.org/wine/wine/-/commit/e09c93de7bd4f27b41f572a4a79d9d… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Nov 30 21:23:54 2022 -0700 rpcrt4/tests: Don't use an array of pointers in test_conf_complex_struct. An array of pointers isn't conformant on 64-bit and will overrun the destination buffer when unmarshalling. Since the purpose of this function is to test a conformant FC_BOGUS_STRUCT, use one that is conformant on both 32-bit and 64-bit. The revised test coincidentally reveals that there is a problem with the padding or alignment after a marshalled 16-bit enum, which will need to be addressed separately. Co-authored-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/rpcrt4/tests/ndr_marshall.c | 92 +++++++++++++++++++--------------------- 1 file changed, 44 insertions(+), 48 deletions(-) diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index bae9b12f7ab..52e432e6436 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -2327,49 +2327,43 @@ static void test_conf_complex_struct(void) unsigned int i; struct conf_complex { - unsigned int size; - unsigned int *array[1]; + enum {dummy} enum16; + unsigned int size; + unsigned int array[1]; }; struct conf_complex *memsrc; struct conf_complex *mem; + /* + struct conf_complex + { + enum {dummy} enum16; + int size; + [size_is(size), unique] int array[]; + }; + */ static const unsigned char fmtstr_complex_struct[] = { -/* 0 */ - 0x1b, /* FC_CARRAY */ - 0x3, /* 3 */ -/* 2 */ NdrFcShort( 0x4 ), /* 4 */ -/* 4 */ 0x8, /* Corr desc: FC_LONG */ - 0x0, /* */ -/* 6 */ NdrFcShort( 0xfffc ), /* -4 */ -/* 8 */ - 0x4b, /* FC_PP */ - 0x5c, /* FC_PAD */ -/* 10 */ - 0x48, /* FC_VARIABLE_REPEAT */ - 0x49, /* FC_FIXED_OFFSET */ -/* 12 */ NdrFcShort( 0x4 ), /* 4 */ -/* 14 */ NdrFcShort( 0x0 ), /* 0 */ -/* 16 */ NdrFcShort( 0x1 ), /* 1 */ -/* 18 */ NdrFcShort( 0x0 ), /* 0 */ -/* 20 */ NdrFcShort( 0x0 ), /* 0 */ -/* 22 */ 0x12, 0x8, /* FC_UP [simple_pointer] */ -/* 24 */ 0x8, /* FC_LONG */ - 0x5c, /* FC_PAD */ -/* 26 */ - 0x5b, /* FC_END */ - - 0x8, /* FC_LONG */ -/* 28 */ 0x5c, /* FC_PAD */ - 0x5b, /* FC_END */ -/* 30 */ - 0x1a, /* FC_BOGUS_STRUCT */ - 0x3, /* 3 */ -/* 32 */ NdrFcShort( 0x4 ), /* 4 */ -/* 34 */ NdrFcShort( 0xffffffde ), /* Offset= -34 (0) */ -/* 36 */ NdrFcShort( 0x0 ), /* Offset= 0 (36) */ -/* 38 */ 0x8, /* FC_LONG */ - 0x5b, /* FC_END */ + NdrFcShort(0x0), +/* 2 (int[]) */ + 0x1b, /* FC_CARRAY */ + 0x3, /* 3 */ + NdrFcShort(0x4), /* 4 */ + 0x8, /* Corr desc: field size, FC_LONG */ + 0x0, /* no operators */ + NdrFcShort(0xfffc), /* offset = -4 */ + 0x08, /* FC_LONG */ + 0x5b, /* FC_END */ +/* 12 (struct conf_complex) */ + 0x1a, /* FC_BOGUS_STRUCT */ + 0x3, /* 3 */ + NdrFcShort(0x8), /* 8 */ + NdrFcShort(0xfff2), /* Offset= -14 (2) */ + NdrFcShort(0x0), /* Offset= 0 (18) */ + 0x0d, /* FC_ENUM16 */ + 0x08, /* FC_LONG */ + 0x5c, /* FC_PAD */ + 0x5b, /* FC_END */ }; memsrc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, @@ -2386,32 +2380,34 @@ static void test_conf_complex_struct(void) 0); StubMsg.BufferLength = 0; - NdrComplexStructBufferSize( &StubMsg, - (unsigned char *)memsrc, - &fmtstr_complex_struct[30] ); - ok(StubMsg.BufferLength >= 28, "length %ld\n", StubMsg.BufferLength); + NdrComplexStructBufferSize(&StubMsg, (unsigned char *)memsrc, &fmtstr_complex_struct[12]); + ok(StubMsg.BufferLength >= 92, "length %ld\n", StubMsg.BufferLength); /*NdrGetBuffer(&_StubMsg, _StubMsg.BufferLength, NULL);*/ StubMsg.RpcMsg->Buffer = StubMsg.BufferStart = StubMsg.Buffer = HeapAlloc(GetProcessHeap(), 0, StubMsg.BufferLength); StubMsg.BufferEnd = StubMsg.BufferStart + StubMsg.BufferLength; - ptr = NdrComplexStructMarshall( &StubMsg, (unsigned char *)memsrc, - &fmtstr_complex_struct[30] ); + ptr = NdrComplexStructMarshall(&StubMsg, (unsigned char *)memsrc, &fmtstr_complex_struct[12]); ok(ptr == NULL, "ret %p\n", ptr); - ok(*(unsigned int *)StubMsg.BufferStart == 20, "Conformance should have been 20 instead of %d\n", *(unsigned int *)StubMsg.BufferStart); - ok(*(unsigned int *)(StubMsg.BufferStart + 4) == 20, "conf_complex.size should have been 20 instead of %d\n", *(unsigned int *)(StubMsg.BufferStart + 4)); + ok(*(unsigned int *)StubMsg.BufferStart == 20, "Conformance should have been 20 instead of %u\n", + *(unsigned int *)StubMsg.BufferStart); + todo_wine + ok(*(unsigned int *)(StubMsg.BufferStart + 8) == 20, "conf_complex.size should have been 20 instead of %u\n", + *(unsigned int *)(StubMsg.BufferStart + 8)); for (i = 0; i < 20; i++) - ok(*(unsigned int *)(StubMsg.BufferStart + 8 + i * 4) == 0, "pointer id for conf_complex.array[%d] should have been 0 instead of 0x%x\n", i, *(unsigned int *)(StubMsg.BufferStart + 8 + i * 4)); + ok(*(unsigned int *)(StubMsg.BufferStart + 12 + i * 4) == 0, + "pointer id for conf_complex.array[%u] should have been 0 instead of 0x%x\n", i, + *(unsigned int *)(StubMsg.BufferStart + 12 + i * 4)); /* Server */ my_alloc_called = 0; StubMsg.IsClient = 0; mem = NULL; StubMsg.Buffer = StubMsg.BufferStart; - ptr = NdrComplexStructUnmarshall( &StubMsg, (unsigned char **)&mem, &fmtstr_complex_struct[30], 0); + ptr = NdrComplexStructUnmarshall(&StubMsg, (unsigned char **)&mem, &fmtstr_complex_struct[12], 0); ok(ptr == NULL, "ret %p\n", ptr); ok(mem->size == 20, "mem->size wasn't unmarshalled correctly (%d)\n", mem->size); - ok(mem->array[0] == NULL, "mem->array[0] wasn't unmarshalled correctly (%p)\n", mem->array[0]); + ok(mem->array[0] == 0, "mem->array[0] wasn't unmarshalled correctly (%u)\n", mem->array[0]); StubMsg.pfnFree(mem); HeapFree(GetProcessHeap(), 0, StubMsg.RpcMsg->Buffer);

1 0

Piotr Caban : localspl: Fix error handling in printer_alloc_handle helper.
by Alexandre Julliard 02 Dec '22

02 Dec '22

Module: wine Branch: master Commit: 5954a7f3cdc1239abbb8fc98b3f01826e0c08fcb URL: https://gitlab.winehq.org/wine/wine/-/commit/5954a7f3cdc1239abbb8fc98b3f018… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Dec 1 13:42:28 2022 +0100 localspl: Fix error handling in printer_alloc_handle helper. --- dlls/localspl/provider.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index 4b557e15a9c..2a5a453fddf 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -1573,9 +1573,10 @@ static HANDLE printer_alloc_handle(LPCWSTR name, LPPRINTER_DEFAULTSW pDefault) /* clone the full name */ printer->name = wcsdup(name); - if (name && (!printer->name)) { + if (name && !printer->name) { printer_free(printer); printer = NULL; + goto end; } if (printername) { len = ARRAY_SIZE(L",XcvMonitor ") - 1;

1 0

Piotr Caban : localspl: Preparation for using handle type specific structures.
by Alexandre Julliard 02 Dec '22

02 Dec '22

Module: wine Branch: master Commit: aa7cedbc1261ed5b8c13957c1d4b3836b9067e37 URL: https://gitlab.winehq.org/wine/wine/-/commit/aa7cedbc1261ed5b8c13957c1d4b38… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Dec 1 13:53:13 2022 +0100 localspl: Preparation for using handle type specific structures. --- dlls/localspl/provider.c | 31 ++++++++++++++++++++++--------- 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index 2a5a453fddf..e927edb7b28 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -240,6 +240,16 @@ typedef struct { } printer_info_t; typedef struct { + enum + { + HANDLE_SERVER, + HANDLE_PRINTER, + HANDLE_XCV, + } type; +} handle_header_t; + +typedef struct { + handle_header_t header; printer_info_t *info; LPWSTR name; monitor_t * pm; @@ -1618,6 +1628,7 @@ static HANDLE printer_alloc_handle(LPCWSTR name, LPPRINTER_DEFAULTSW pDefault) printer = NULL; goto end; } + printer->header.type = HANDLE_XCV; } else { @@ -1629,11 +1640,13 @@ static HANDLE printer_alloc_handle(LPCWSTR name, LPPRINTER_DEFAULTSW pDefault) printer = NULL; goto end; } + printer->header.type = HANDLE_PRINTER; } } else { TRACE("using the local printserver\n"); + printer->header.type = HANDLE_SERVER; } if (pDefault && pDefault->pDevMode) @@ -2679,13 +2692,13 @@ static BOOL WINAPI fpXcvData(HANDLE hXcv, LPCWSTR pszDataName, PBYTE pInputData, DWORD cbInputData, PBYTE pOutputData, DWORD cbOutputData, PDWORD pcbOutputNeeded, PDWORD pdwStatus) { - printer_t *printer = (printer_t * ) hXcv; + printer_t *printer = (printer_t *)hXcv; TRACE("(%p, %s, %p, %ld, %p, %ld, %p, %p)\n", hXcv, debugstr_w(pszDataName), pInputData, cbInputData, pOutputData, cbOutputData, pcbOutputNeeded, pdwStatus); - if (!printer || (!printer->hXcv)) { + if (!printer || printer->header.type != HANDLE_XCV) { SetLastError(ERROR_INVALID_HANDLE); return FALSE; } @@ -2952,7 +2965,7 @@ static BOOL WINAPI fpAddJob(HANDLE hprinter, DWORD level, BYTE *data, DWORD size TRACE("(%p %ld %p %ld %p)\n", hprinter, level, data, size, needed); - if (!printer || !printer->info) + if (!printer || printer->header.type != HANDLE_PRINTER) { SetLastError(ERROR_INVALID_HANDLE); return FALSE; @@ -2999,7 +3012,7 @@ static DWORD WINAPI fpStartDocPrinter(HANDLE hprinter, DWORD level, BYTE *doc_in hprinter, level, doc_info, debugstr_w(info->pDocName), debugstr_w(info->pOutputFile), debugstr_w(info->pDatatype)); - if (!printer || !printer->info) + if (!printer || printer->header.type != HANDLE_PRINTER) { SetLastError(ERROR_INVALID_HANDLE); return 0; @@ -3027,7 +3040,7 @@ static BOOL WINAPI fpWritePrinter(HANDLE hprinter, void *buf, DWORD size, DWORD TRACE("(%p, %p, %ld, %p)\n", hprinter, buf, size, written); - if(!printer || !printer->info) + if(!printer || printer->header.type != HANDLE_PRINTER) { SetLastError(ERROR_INVALID_HANDLE); return FALSE; @@ -3064,7 +3077,7 @@ static BOOL WINAPI fpSetJob(HANDLE hprinter, DWORD job_id, TRACE("(%p, %ld, %ld, %p, %ld)\n", hprinter, job_id, level, data, command); FIXME("Ignoring everything other than document title\n"); - if (!printer || !printer->info) + if (!printer || printer->header.type != HANDLE_PRINTER) { SetLastError(ERROR_INVALID_HANDLE); return 0; @@ -3141,7 +3154,7 @@ static BOOL WINAPI fpGetJob(HANDLE hprinter, DWORD job_id, DWORD level, TRACE("%p %ld %ld %p %ld %p\n", hprinter, job_id, level, data, size, needed); - if (!printer || !printer->info) + if (!printer || printer->header.type != HANDLE_PRINTER) { SetLastError(ERROR_INVALID_HANDLE); return FALSE; @@ -3270,7 +3283,7 @@ static BOOL WINAPI fpScheduleJob(HANDLE hprinter, DWORD job_id) TRACE("%p %ld\n", hprinter, job_id); - if (!printer || !printer->info) + if (!printer || printer->header.type != HANDLE_PRINTER) { SetLastError(ERROR_INVALID_HANDLE); return FALSE; @@ -3363,7 +3376,7 @@ static BOOL WINAPI fpEndDocPrinter(HANDLE hprinter) TRACE("%p\n", hprinter); - if (!printer || !printer->info) + if (!printer || printer->header.type != HANDLE_PRINTER) { SetLastError(ERROR_INVALID_HANDLE); return FALSE;

1 0