December 2022 - Wine-Commits

Paul Gofman : mfplay/tests: Add MF_SD_LANGUAGE and MF_SD_STREAM_NAME value tests.
by Alexandre Julliard Dec. 2, 2022

Dec. 2, 2022

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

Paul Gofman : winegstreamer: Extract stream name from QT demuxer private data.
by Alexandre Julliard Dec. 2, 2022

Dec. 2, 2022

Module: wine Branch: master Commit: 05c99cd6da97d9cb12932df917237b8954d076f2 URL: https://gitlab.winehq.org/wine/wine/-/commit/05c99cd6da97d9cb12932df917237b… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Nov 24 18:38:35 2022 -0600 winegstreamer: Extract stream name from QT demuxer private data. --- dlls/winegstreamer/media_source.c | 1 + dlls/winegstreamer/unixlib.h | 1 + dlls/winegstreamer/wg_parser.c | 33 +++++++++++++++++++++++++++++++++ 3 files changed, 35 insertions(+) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index 59047a5ef82..542189b28f5 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -1489,6 +1489,7 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_ tags[] = { {WG_PARSER_TAG_LANGUAGE, &MF_SD_LANGUAGE}, + {WG_PARSER_TAG_NAME, &MF_SD_STREAM_NAME}, }; unsigned int j; WCHAR *strW; diff --git a/dlls/winegstreamer/unixlib.h b/dlls/winegstreamer/unixlib.h index f048426b27a..2b5b8af37d5 100644 --- a/dlls/winegstreamer/unixlib.h +++ b/dlls/winegstreamer/unixlib.h @@ -255,6 +255,7 @@ struct wg_parser_stream_get_duration_params enum wg_parser_tag { WG_PARSER_TAG_LANGUAGE, + WG_PARSER_TAG_NAME, WG_PARSER_TAG_COUNT }; diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index dc98901c226..d2db1f039e4 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -1275,14 +1275,47 @@ static gboolean src_event_cb(GstPad *pad, GstObject *parent, GstEvent *event) static void query_tags(struct wg_parser_stream *stream) { + const gchar *struct_name; GstTagList *tag_list; GstEvent *tag_event; + guint i, tag_count; + const GValue *val; + GstSample *sample; + GstBuffer *buf; + gsize size; if (!(tag_event = gst_pad_get_sticky_event(stream->their_src, GST_EVENT_TAG, 0))) return; gst_event_parse_tag(tag_event, &tag_list); gst_tag_list_get_string(tag_list, "language-code", &stream->tags[WG_PARSER_TAG_LANGUAGE]); + + /* Extract stream name from Quick Time demuxer private tag where it puts unrecognized chunks. */ + tag_count = gst_tag_list_get_tag_size(tag_list, "private-qt-tag"); + for (i = 0; i < tag_count; ++i) + { + if (!(val = gst_tag_list_get_value_index(tag_list, "private-qt-tag", i))) + continue; + if (!GST_VALUE_HOLDS_SAMPLE(val) || !(sample = gst_value_get_sample(val))) + continue; + struct_name = gst_structure_get_name(gst_sample_get_info(sample)); + if (!struct_name || strcmp(struct_name, "application/x-gst-qt-name-tag")) + continue; + if (!(buf = gst_sample_get_buffer(sample))) + continue; + if ((size = gst_buffer_get_size(buf)) < 8) + continue; + size -= 8; + if (!(stream->tags[WG_PARSER_TAG_NAME] = g_malloc(size + 1))) + continue; + if (gst_buffer_extract(buf, 8, stream->tags[WG_PARSER_TAG_NAME], size) != size) + { + g_free(stream->tags[WG_PARSER_TAG_NAME]); + stream->tags[WG_PARSER_TAG_NAME] = NULL; + continue; + } + stream->tags[WG_PARSER_TAG_NAME][size] = 0; + } gst_event_unref(tag_event); }

1 0

Nikolay Sivov : d3d10/effect: Partially implement updates through value expressions.
by Alexandre Julliard Dec. 2, 2022

Dec. 2, 2022

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 'div' instruction support for expressions.
by Alexandre Julliard Dec. 2, 2022

Dec. 2, 2022

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

Paul Gofman : winegstreamer: Query stream tags and set MF_SD_LANGUAGE attribute.
by Alexandre Julliard Dec. 2, 2022

Dec. 2, 2022

Module: wine Branch: master Commit: 3dd56dd6064ca4dae7ee075b58574854f6c18d56 URL: https://gitlab.winehq.org/wine/wine/-/commit/3dd56dd6064ca4dae7ee075b585748… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Nov 24 16:28:12 2022 -0600 winegstreamer: Query stream tags and set MF_SD_LANGUAGE attribute. Loosely based on a patch by Derek Lesho and Rémi Bernon. --- dlls/winegstreamer/gst_private.h | 2 +- dlls/winegstreamer/main.c | 31 ++++++++++++++++++++ dlls/winegstreamer/media_source.c | 30 +++++++++++++++++++ dlls/winegstreamer/unixlib.h | 15 ++++++++++ dlls/winegstreamer/wg_parser.c | 62 +++++++++++++++++++++++++++++++++++++-- dlls/winegstreamer/wm_reader.c | 2 ++ 6 files changed, 139 insertions(+), 3 deletions(-) diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index ee5e6dae3cf..3890db543ff 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -33,7 +33,6 @@ #define NONAMELESSUNION #include "dshow.h" #include "mfidl.h" -#include "wmsdk.h" #include "wine/debug.h" #include "wine/strmbase.h" @@ -96,6 +95,7 @@ void wg_parser_stream_notify_qos(struct wg_parser_stream *stream, /* Returns the duration in 100-nanosecond units. */ uint64_t wg_parser_stream_get_duration(struct wg_parser_stream *stream); +char *wg_parser_stream_get_tag(struct wg_parser_stream *stream, enum wg_parser_tag tag); /* start_pos and stop_pos are in 100-nanosecond units. */ void wg_parser_stream_seek(struct wg_parser_stream *stream, double rate, uint64_t start_pos, uint64_t stop_pos, DWORD start_flags, DWORD stop_flags); diff --git a/dlls/winegstreamer/main.c b/dlls/winegstreamer/main.c index 9e54780ac4e..2675430019f 100644 --- a/dlls/winegstreamer/main.c +++ b/dlls/winegstreamer/main.c @@ -21,6 +21,9 @@ #define WINE_NO_NAMELESS_EXTENSION #define EXTERN_GUID DEFINE_GUID + +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "initguid.h" #include "gst_private.h" #include "winternl.h" @@ -273,6 +276,34 @@ uint64_t wg_parser_stream_get_duration(struct wg_parser_stream *stream) return params.duration; } +char *wg_parser_stream_get_tag(struct wg_parser_stream *stream, enum wg_parser_tag tag) +{ + uint32_t size = 0; + struct wg_parser_stream_get_tag_params params = + { + .stream = stream, + .tag = tag, + .size = &size, + }; + char *buffer; + + if (WINE_UNIX_CALL(unix_wg_parser_stream_get_tag, &params) != STATUS_BUFFER_TOO_SMALL) + return NULL; + if (!(buffer = malloc(size))) + { + ERR("No memory.\n"); + return NULL; + } + params.buffer = buffer; + if (WINE_UNIX_CALL(unix_wg_parser_stream_get_tag, &params)) + { + ERR("wg_parser_stream_get_tag failed unexpectedly.\n"); + free(buffer); + return NULL; + } + return buffer; +} + void wg_parser_stream_seek(struct wg_parser_stream *stream, double rate, uint64_t start_pos, uint64_t stop_pos, DWORD start_flags, DWORD stop_flags) { diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index 9bb7a441a8f..59047a5ef82 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -1481,7 +1481,37 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_ descriptors = malloc(object->stream_count * sizeof(IMFStreamDescriptor *)); for (i = 0; i < object->stream_count; i++) { + static const struct + { + enum wg_parser_tag tag; + const GUID *mf_attr; + } + tags[] = + { + {WG_PARSER_TAG_LANGUAGE, &MF_SD_LANGUAGE}, + }; + unsigned int j; + WCHAR *strW; + DWORD len; + char *str; + IMFMediaStream_GetStreamDescriptor(&object->streams[i]->IMFMediaStream_iface, &descriptors[i]); + + for (j = 0; j < ARRAY_SIZE(tags); ++j) + { + if (!(str = wg_parser_stream_get_tag(object->streams[i]->wg_stream, tags[j].tag))) + continue; + if (!(len = MultiByteToWideChar(CP_UTF8, 0, str, -1, NULL, 0))) + { + free(str); + continue; + } + strW = malloc(len * sizeof(*strW)); + if (MultiByteToWideChar(CP_UTF8, 0, str, -1, strW, len)) + IMFStreamDescriptor_SetString(descriptors[i], tags[j].mf_attr, strW); + free(strW); + free(str); + } } if (FAILED(hr = MFCreatePresentationDescriptor(object->stream_count, descriptors, &object->pres_desc))) diff --git a/dlls/winegstreamer/unixlib.h b/dlls/winegstreamer/unixlib.h index 09aa68eb4cc..f048426b27a 100644 --- a/dlls/winegstreamer/unixlib.h +++ b/dlls/winegstreamer/unixlib.h @@ -252,6 +252,20 @@ struct wg_parser_stream_get_duration_params UINT64 duration; }; +enum wg_parser_tag +{ + WG_PARSER_TAG_LANGUAGE, + WG_PARSER_TAG_COUNT +}; + +struct wg_parser_stream_get_tag_params +{ + struct wg_parser_stream *stream; + enum wg_parser_tag tag; + char *buffer; + UINT32 *size; +}; + struct wg_parser_stream_seek_params { struct wg_parser_stream *stream; @@ -312,6 +326,7 @@ enum unix_funcs unix_wg_parser_stream_notify_qos, unix_wg_parser_stream_get_duration, + unix_wg_parser_stream_get_tag, unix_wg_parser_stream_seek, unix_wg_transform_create, diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index 14970d327c8..dc98901c226 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -34,6 +34,8 @@ #include <gst/video/video.h> #include <gst/audio/audio.h> +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "winternl.h" #include "dshow.h" @@ -107,9 +109,10 @@ struct wg_parser_stream GstBuffer *buffer; GstMapInfo map_info; - bool flushing, eos, enabled, has_caps; + bool flushing, eos, enabled, has_caps, has_tags, has_buffer; uint64_t duration; + gchar *tags[WG_PARSER_TAG_COUNT]; }; static NTSTATUS wg_parser_get_stream_count(void *args) @@ -397,6 +400,24 @@ static NTSTATUS wg_parser_stream_get_duration(void *args) return S_OK; } +static NTSTATUS wg_parser_stream_get_tag(void *args) +{ + struct wg_parser_stream_get_tag_params *params = args; + uint32_t len; + + if (params->tag >= WG_PARSER_TAG_COUNT) + return STATUS_INVALID_PARAMETER; + if (!params->stream->tags[params->tag]) + return STATUS_NOT_FOUND; + if ((len = strlen(params->stream->tags[params->tag]) + 1) > *params->size) + { + *params->size = len; + return STATUS_BUFFER_TOO_SMALL; + } + memcpy(params->buffer, params->stream->tags[params->tag], len); + return STATUS_SUCCESS; +} + static NTSTATUS wg_parser_stream_seek(void *args) { GstSeekType start_type = GST_SEEK_TYPE_SET, stop_type = GST_SEEK_TYPE_SET; @@ -574,6 +595,13 @@ static gboolean sink_event_cb(GstPad *pad, GstObject *parent, GstEvent *event) break; } + case GST_EVENT_TAG: + pthread_mutex_lock(&parser->mutex); + stream->has_tags = true; + pthread_cond_signal(&parser->init_cond); + pthread_mutex_unlock(&parser->mutex); + break; + default: GST_WARNING("Ignoring \"%s\" event.", GST_EVENT_TYPE_NAME(event)); } @@ -590,6 +618,12 @@ static GstFlowReturn sink_chain_cb(GstPad *pad, GstObject *parent, GstBuffer *bu pthread_mutex_lock(&parser->mutex); + if (!stream->has_buffer) + { + stream->has_buffer = true; + pthread_cond_signal(&parser->init_cond); + } + /* Allow this buffer to be flushed by GStreamer. We are effectively * implementing a queue object here. */ @@ -756,6 +790,8 @@ static struct wg_parser_stream *create_stream(struct wg_parser *parser) static void free_stream(struct wg_parser_stream *stream) { + unsigned int i; + if (stream->their_src) { if (stream->post_sink) @@ -771,6 +807,11 @@ static void free_stream(struct wg_parser_stream *stream) pthread_cond_destroy(&stream->event_cond); pthread_cond_destroy(&stream->event_empty_cond); + for (i = 0; i < ARRAY_SIZE(stream->tags); ++i) + { + if (stream->tags[i]) + g_free(stream->tags[i]); + } free(stream); } @@ -1232,6 +1273,19 @@ static gboolean src_event_cb(GstPad *pad, GstObject *parent, GstEvent *event) return ret; } +static void query_tags(struct wg_parser_stream *stream) +{ + GstTagList *tag_list; + GstEvent *tag_event; + + if (!(tag_event = gst_pad_get_sticky_event(stream->their_src, GST_EVENT_TAG, 0))) + return; + + gst_event_parse_tag(tag_event, &tag_list); + gst_tag_list_get_string(tag_list, "language-code", &stream->tags[WG_PARSER_TAG_LANGUAGE]); + gst_event_unref(tag_event); +} + static NTSTATUS wg_parser_connect(void *args) { GstStaticPadTemplate src_template = GST_STATIC_PAD_TEMPLATE("quartz_src", @@ -1290,7 +1344,8 @@ static NTSTATUS wg_parser_connect(void *args) struct wg_parser_stream *stream = parser->streams[i]; gint64 duration; - while (!stream->has_caps && !parser->error) + /* If we receieved a buffer waiting for tags or caps does not make sense anymore. */ + while ((!stream->has_caps || !stream->has_tags) && !parser->error && !stream->has_buffer) pthread_cond_wait(&parser->init_cond, &parser->mutex); /* GStreamer doesn't actually provide any guarantees about when duration @@ -1354,6 +1409,8 @@ static NTSTATUS wg_parser_connect(void *args) } } + query_tags(stream); + /* Now that we're fully initialized, enable the stream so that further * samples get queued instead of being discarded. We don't actually need * the samples (in particular, the frontend should seek before @@ -1676,6 +1733,7 @@ const unixlib_entry_t __wine_unix_call_funcs[] = X(wg_parser_stream_notify_qos), X(wg_parser_stream_get_duration), + X(wg_parser_stream_get_tag), X(wg_parser_stream_seek), X(wg_transform_create), diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c index 804af4a9aed..0e9e7927549 100644 --- a/dlls/winegstreamer/wm_reader.c +++ b/dlls/winegstreamer/wm_reader.c @@ -17,6 +17,8 @@ */ #include "gst_private.h" +#include "initguid.h" +#include "wmsdk.h" WINE_DEFAULT_DEBUG_CHANNEL(wmvcore);

1 0

Nikolay Sivov : d3d10/effect: Add 'ftob' instruction support for expressions.
by Alexandre Julliard Dec. 2, 2022

Dec. 2, 2022

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

Rémi Bernon : mfplat: Clear the clsid pointer in MFTEnum to avoid invalid free.
by Alexandre Julliard Dec. 2, 2022

Dec. 2, 2022

Module: wine Branch: master Commit: 2dad3edf7c6e4d009899721189f95c332067f9e3 URL: https://gitlab.winehq.org/wine/wine/-/commit/2dad3edf7c6e4d009899721189f95c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Dec 2 01:35:38 2022 +0100 mfplat: Clear the clsid pointer in MFTEnum to avoid invalid free. --- dlls/mfplat/main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index ebab4ed6f1f..e1315de125a 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -1350,6 +1350,7 @@ HRESULT WINAPI MFTEnum(GUID category, UINT32 flags, MFT_REGISTER_TYPE_INFO *inpu return E_INVALIDARG; *count = 0; + *clsids = NULL; list_init(&mfts);

1 0

Piotr Caban : winspool: Call providor in ReadPrinter implementation.
by Alexandre Julliard Dec. 2, 2022

Dec. 2, 2022

Module: wine Branch: master Commit: 056d570d498a5fbc7f56e021ea0d3d66d008dddd URL: https://gitlab.winehq.org/wine/wine/-/commit/056d570d498a5fbc7f56e021ea0d3d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Dec 1 19:26:52 2022 +0100 winspool: Call providor in ReadPrinter implementation. --- dlls/winspool.drv/info.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 656477553ba..e58ae925c2b 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -3229,11 +3229,19 @@ BOOL WINAPI SetFormW( HANDLE printer, WCHAR *name, DWORD level, BYTE *form ) /***************************************************************************** * ReadPrinter [WINSPOOL.@] */ -BOOL WINAPI ReadPrinter(HANDLE hPrinter, LPVOID pBuf, DWORD cbBuf, - LPDWORD pNoBytesRead) +BOOL WINAPI ReadPrinter(HANDLE printer, void *buf, DWORD size, DWORD *bytes_read) { - FIXME("(%p,%p,%ld,%p): stub\n",hPrinter,pBuf,cbBuf,pNoBytesRead); - return FALSE; + HANDLE handle = get_backend_handle(printer); + + TRACE("(%p,%p,%ld,%p)\n", printer, buf, size, bytes_read); + + if (!handle) + { + SetLastError( ERROR_INVALID_HANDLE ); + return FALSE; + } + + return backend->fpReadPrinter(handle, buf, size, bytes_read); } /*****************************************************************************

1 0

Piotr Caban : localspl: Add support for Job handles.
by Alexandre Julliard Dec. 2, 2022

Dec. 2, 2022

Module: wine Branch: master Commit: f4dbb3e8a4b2c25f0549f0fb37bb48bc9e8ce5e4 URL: https://gitlab.winehq.org/wine/wine/-/commit/f4dbb3e8a4b2c25f0549f0fb37bb48… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Dec 1 19:24:38 2022 +0100 localspl: Add support for Job handles. --- dlls/localspl/provider.c | 135 ++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 117 insertions(+), 18 deletions(-) diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index 5b0b6b339a2..4cb30afd076 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -245,6 +245,7 @@ typedef struct { HANDLE_SERVER, HANDLE_PRINTER, HANDLE_XCV, + HANDLE_JOB, } type; } handle_header_t; @@ -256,6 +257,11 @@ typedef struct { HANDLE hxcv; } xcv_t; +typedef struct { + handle_header_t header; + HANDLE hf; +} job_t; + typedef struct { handle_header_t header; printer_info_t *info; @@ -490,24 +496,39 @@ static void monitor_unloadall(void) LeaveCriticalSection(&monitor_handles_cs); } -static printer_info_t* get_printer_info(const WCHAR *name) +static printer_info_t *find_printer_info(const WCHAR *name, unsigned int len) { - HKEY hkey, hprinter = NULL; printer_info_t *info; - WCHAR port[MAX_PATH]; - LSTATUS ret; - DWORD size; EnterCriticalSection(&printers_cs); LIST_FOR_EACH_ENTRY(info, &printers, printer_info_t, entry) { - if (!wcscmp(info->name, name)) + if (!wcsncmp(info->name, name, len) && (len == -1 || !info->name[len])) { InterlockedIncrement(&info->ref); LeaveCriticalSection(&printers_cs); return info; } } + LeaveCriticalSection(&printers_cs); + return NULL; +} + +static printer_info_t* get_printer_info(const WCHAR *name) +{ + HKEY hkey, hprinter = NULL; + printer_info_t *info; + WCHAR port[MAX_PATH]; + LSTATUS ret; + DWORD size; + + EnterCriticalSection(&printers_cs); + info = find_printer_info(name, -1); + if (info) + { + LeaveCriticalSection(&printers_cs); + return info; + } ret = RegCreateKeyW(HKEY_LOCAL_MACHINE, printersW, &hkey); if (ret == ERROR_SUCCESS) @@ -1538,6 +1559,18 @@ static HMODULE driver_load(const printenv_t * env, LPWSTR dllname) return hui; } +static job_info_t * get_job(printer_info_t *info, DWORD job_id) +{ + job_info_t *job; + + LIST_FOR_EACH_ENTRY(job, &info->jobs, job_info_t, entry) + { + if(job->id == job_id) + return job; + } + return NULL; +} + static HANDLE server_alloc_handle(const WCHAR *name, BOOL *stop_search) { server_t *server; @@ -1615,6 +1648,75 @@ static HANDLE xcv_alloc_handle(const WCHAR *name, PRINTER_DEFAULTSW *def, BOOL * return (HANDLE)xcv; } +static HANDLE job_alloc_handle(const WCHAR *name, BOOL *stop_search) +{ + static const WCHAR jobW[] = L"Job "; + + unsigned int name_len, job_id; + printer_info_t *printer_info; + job_info_t *job_info; + job_t *job; + + *stop_search = FALSE; + name_len = 0; + for (name_len = 0; name[name_len] != ','; name_len++) + { + if (!name[name_len]) + return NULL; + } + + for (job_id = name_len + 1; name[job_id] == ' '; job_id++); + if (!name[job_id]) + return NULL; + + if (wcsncmp(name + job_id, jobW, ARRAY_SIZE(jobW) - 1)) + return NULL; + + *stop_search = TRUE; + job_id += ARRAY_SIZE(jobW) - 1; + job_id = wcstoul(name + job_id, NULL, 10); + + printer_info = find_printer_info(name, name_len); + if (!printer_info) + { + SetLastError(ERROR_INVALID_PRINTER_NAME); + return NULL; + } + + EnterCriticalSection(&printer_info->jobs_cs); + + job_info = get_job(printer_info, job_id); + if (!job_info) + { + LeaveCriticalSection(&printer_info->jobs_cs); + release_printer_info(printer_info); + SetLastError(ERROR_INVALID_PRINTER_NAME); + return NULL; + } + + job = malloc(sizeof(*job)); + if (!job) + { + LeaveCriticalSection(&printer_info->jobs_cs); + release_printer_info(printer_info); + return NULL; + } + job->header.type = HANDLE_JOB; + job->hf = CreateFileW(job_info->filename, GENERIC_READ, + FILE_SHARE_WRITE | FILE_SHARE_READ | FILE_SHARE_DELETE, + NULL, OPEN_EXISTING, 0, NULL); + + LeaveCriticalSection(&printer_info->jobs_cs); + release_printer_info(printer_info); + + if (job->hf == INVALID_HANDLE_VALUE) + { + free(job); + return NULL; + } + return (HANDLE)job; +} + static HANDLE printer_alloc_handle(const WCHAR *name, const WCHAR *basename, PRINTER_DEFAULTSW *def) { @@ -2662,6 +2764,8 @@ static BOOL WINAPI fpOpenPrinter(WCHAR *name, HANDLE *hprinter, *hprinter = server_alloc_handle(basename, &stop_search); if (!*hprinter && !stop_search) *hprinter = xcv_alloc_handle(basename, def, &stop_search); + if (!*hprinter && !stop_search) + *hprinter = job_alloc_handle(basename, &stop_search); if (!*hprinter && !stop_search) *hprinter = printer_alloc_handle(name, basename, def); @@ -3070,18 +3174,6 @@ static BOOL WINAPI fpWritePrinter(HANDLE hprinter, void *buf, DWORD size, DWORD return WriteFile(printer->doc->hf, buf, size, written, NULL); } -static job_info_t * get_job(printer_info_t *info, DWORD job_id) -{ - job_info_t *job; - - LIST_FOR_EACH_ENTRY(job, &info->jobs, job_info_t, entry) - { - if(job->id == job_id) - return job; - } - return NULL; -} - static BOOL WINAPI fpSetJob(HANDLE hprinter, DWORD job_id, DWORD level, BYTE *data, DWORD command) { @@ -3446,6 +3538,13 @@ static BOOL WINAPI fpClosePrinter(HANDLE hprinter) monitor_unload(xcv->pm); free(xcv); } + else if (header->type == HANDLE_JOB) + { + job_t *job = (job_t *)hprinter; + + CloseHandle(job->hf); + free(job); + } else if (header->type == HANDLE_PRINTER) { printer_t *printer = (printer_t *)hprinter;

1 0

Piotr Caban : localspl: Rename job_t structure to job_info_t.
by Alexandre Julliard Dec. 2, 2022

Dec. 2, 2022

Module: wine Branch: master Commit: 4d74944a62c3ee0fc6212e310e4fc40bc77fb1cd URL: https://gitlab.winehq.org/wine/wine/-/commit/4d74944a62c3ee0fc6212e310e4fc4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Dec 1 16:08:01 2022 +0100 localspl: Rename job_t structure to job_info_t. --- dlls/localspl/provider.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index 236cf7aaf6e..5b0b6b339a2 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -226,7 +226,7 @@ typedef struct { WCHAR *document_title; DEVMODEW *devmode; HANDLE hf; -} job_t; +} job_info_t; typedef struct { WCHAR *name; @@ -261,7 +261,7 @@ typedef struct { printer_info_t *info; LPWSTR name; DEVMODEW *devmode; - job_t *doc; + job_info_t *doc; } printer_t; /* ############################### */ @@ -542,7 +542,7 @@ static printer_info_t* get_printer_info(const WCHAR *name) return info; } -static void free_job(job_t *job) +static void free_job(job_info_t *job) { list_remove(&job->entry); free(job->filename); @@ -569,7 +569,7 @@ static void release_printer_info(printer_info_t *info) DeleteCriticalSection(&info->jobs_cs); while (!list_empty(&info->jobs)) { - job_t *job = LIST_ENTRY(list_head(&info->jobs), job_t, entry); + job_info_t *job = LIST_ENTRY(list_head(&info->jobs), job_info_t, entry); free_job(job); } free(info); @@ -2912,11 +2912,11 @@ static size_t get_spool_filename(DWORD job_id, WCHAR *buf, size_t len) return ret; } -static job_t* add_job(printer_t *printer, DOC_INFO_1W *info, BOOL create) +static job_info_t* add_job(printer_t *printer, DOC_INFO_1W *info, BOOL create) { DWORD job_id, last_id; size_t len; - job_t *job; + job_info_t *job; job = calloc(1, sizeof(*job)); if (!job) @@ -2975,7 +2975,7 @@ static BOOL WINAPI fpAddJob(HANDLE hprinter, DWORD level, BYTE *data, DWORD size ADDJOB_INFO_1W *addjob = (ADDJOB_INFO_1W *)data; printer_t *printer = (printer_t *)hprinter; DOC_INFO_1W doc_info; - job_t *job; + job_info_t *job; size_t len; TRACE("(%p %ld %p %ld %p)\n", hprinter, level, data, size, needed); @@ -3070,11 +3070,11 @@ static BOOL WINAPI fpWritePrinter(HANDLE hprinter, void *buf, DWORD size, DWORD return WriteFile(printer->doc->hf, buf, size, written, NULL); } -static job_t * get_job(printer_info_t *info, DWORD job_id) +static job_info_t * get_job(printer_info_t *info, DWORD job_id) { - job_t *job; + job_info_t *job; - LIST_FOR_EACH_ENTRY(job, &info->jobs, job_t, entry) + LIST_FOR_EACH_ENTRY(job, &info->jobs, job_info_t, entry) { if(job->id == job_id) return job; @@ -3087,7 +3087,7 @@ static BOOL WINAPI fpSetJob(HANDLE hprinter, DWORD job_id, { printer_t *printer = (printer_t *)hprinter; BOOL ret = FALSE; - job_t *job; + job_info_t *job; TRACE("(%p, %ld, %ld, %p, %ld)\n", hprinter, job_id, level, data, command); FIXME("Ignoring everything other than document title\n"); @@ -3164,7 +3164,7 @@ static BOOL WINAPI fpGetJob(HANDLE hprinter, DWORD job_id, DWORD level, printer_t *printer = (printer_t *)hprinter; BOOL ret = TRUE; DWORD s = 0; - job_t *job; + job_info_t *job; WCHAR *p; TRACE("%p %ld %ld %p %ld %p\n", hprinter, job_id, level, data, size, needed); @@ -3288,11 +3288,11 @@ static BOOL WINAPI fpScheduleJob(HANDLE hprinter, DWORD job_id) const WCHAR *port_name, *port; WCHAR output[1024]; DOC_INFO_1W info; + job_info_t *job; monitor_t *mon; BYTE buf[4096]; HANDLE hport; DWORD r, w; - job_t *job; HANDLE hf; HKEY hkey;

1 0