January 2020 - Wine-Commits

Michael Cronenworth : wbemprox: Global variable compatibility update for gcc 10.
by Alexandre Julliard Jan. 24, 2020

Jan. 24, 2020

Module: wine Branch: master Commit: da21c305164c3e585e29e20242afc5a31f91989f URL: https://source.winehq.org/git/wine.git/?a=commit;h=da21c305164c3e585e29e202… Author: Michael Cronenworth <mike(a)cchtml.com> Date: Thu Jan 23 17:05:27 2020 -0600 wbemprox: Global variable compatibility update for gcc 10. Signed-off-by: Michael Cronenworth <mike(a)cchtml.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/main.c | 2 ++ dlls/wbemprox/wbemprox_private.h | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/main.c b/dlls/wbemprox/main.c index d90f4f8cc6..0908441498 100644 --- a/dlls/wbemprox/main.c +++ b/dlls/wbemprox/main.c @@ -35,6 +35,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(wbemprox); static HINSTANCE instance; +struct list *table_list; + typedef HRESULT (*fnCreateInstance)( LPVOID *ppObj ); typedef struct diff --git a/dlls/wbemprox/wbemprox_private.h b/dlls/wbemprox/wbemprox_private.h index 9d39a7c92b..9096b392e3 100644 --- a/dlls/wbemprox/wbemprox_private.h +++ b/dlls/wbemprox/wbemprox_private.h @@ -20,8 +20,8 @@ #include "wine/heap.h" #include "wine/list.h" -IClientSecurity client_security DECLSPEC_HIDDEN; -struct list *table_list DECLSPEC_HIDDEN; +extern IClientSecurity client_security DECLSPEC_HIDDEN; +extern struct list *table_list DECLSPEC_HIDDEN; enum param_direction {

1 0

Jacek Caban : ddraw/tests: Don't use log2f to avoid mingwex dependency.
by Alexandre Julliard Jan. 24, 2020

Jan. 24, 2020

Module: wine Branch: master Commit: e7a2e45c703123b143324cf88e690ce0865a5790 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e7a2e45c703123b143324cf8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 24 11:08:23 2020 +0100 ddraw/tests: Don't use log2f to avoid mingwex dependency. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 2 +- dlls/ddraw/tests/ddraw2.c | 2 +- dlls/ddraw/tests/ddraw4.c | 2 +- dlls/ddraw/tests/ddraw7.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index d85d31343f..16c0cfb4e5 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -8205,7 +8205,7 @@ static void test_color_fill(void) float f, g; expected = tests[i].result & mask; - f = ceilf(log2f(expected + 1.0f)); + f = ceilf(logf(expected + 1.0f) / logf(2.0f)); g = (f + 1.0f) / 2.0f; g -= (int)g; expected_broken = (expected / exp2f(f) - g) * 256; diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 9ca6b44eb8..f0ae458d85 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -8953,7 +8953,7 @@ static void test_color_fill(void) float f, g; expected = tests[i].result & mask; - f = ceilf(log2f(expected + 1.0f)); + f = ceilf(logf(expected + 1.0f) / logf(2.0f)); g = (f + 1.0f) / 2.0f; g -= (int)g; expected_broken = (expected / exp2f(f) - g) * 256; diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 39b4aca657..7ce33ab406 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -10601,7 +10601,7 @@ static void test_color_fill(void) float f, g; expected = tests[i].result & U3(z_fmt).dwZBitMask; - f = ceilf(log2f(expected + 1.0f)); + f = ceilf(logf(expected + 1.0f) / logf(2.0f)); g = (f + 1.0f) / 2.0f; g -= (int)g; expected_broken = (expected / exp2f(f) - g) * 256; diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index c34d939486..cde5d2b5ba 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -10575,7 +10575,7 @@ static void test_color_fill(void) float f, g; expected = tests[i].result & U3(z_fmt).dwZBitMask; - f = ceilf(log2f(expected + 1.0f)); + f = ceilf(logf(expected + 1.0f) / logf(2.0f)); g = (f + 1.0f) / 2.0f; g -= (int)g; expected_broken = (expected / exp2f(f) - g) * 256;

1 0

Michael Cronenworth : crypt32: Global variable compatibility update for gcc 10.
by Alexandre Julliard Jan. 24, 2020

Jan. 24, 2020

Module: wine Branch: master Commit: 5740b735cdb44fb89a41f3090dcc3dabf360ab41 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5740b735cdb44fb89a41f309… Author: Michael Cronenworth <mike(a)cchtml.com> Date: Thu Jan 23 17:05:19 2020 -0600 crypt32: Global variable compatibility update for gcc 10. Signed-off-by: Michael Cronenworth <mike(a)cchtml.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/crypt32_private.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/crypt32/crypt32_private.h b/dlls/crypt32/crypt32_private.h index 3d0129e7d4..d92eb1a157 100644 --- a/dlls/crypt32/crypt32_private.h +++ b/dlls/crypt32/crypt32_private.h @@ -152,7 +152,7 @@ BOOL WINAPI CRYPT_AsnEncodePubKeyInfoNoNull(DWORD dwCertEncodingType, */ HCRYPTPROV WINAPI I_CryptGetDefaultCryptProv(ALG_ID); -HINSTANCE hInstance DECLSPEC_HIDDEN; +extern HINSTANCE hInstance DECLSPEC_HIDDEN; void crypt_oid_init(void) DECLSPEC_HIDDEN; void crypt_oid_free(void) DECLSPEC_HIDDEN;

1 0

Stefan Dösinger : ddraw/tests: Don't rely on the implicit vertex color in test_viewport.
by Alexandre Julliard Jan. 24, 2020

Jan. 24, 2020

Module: wine Branch: master Commit: 97ee54e9d631af3a919acd5596e87ab9e11ef27d URL: https://source.winehq.org/git/wine.git/?a=commit;h=97ee54e9d631af3a919acd55… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Jan 23 10:45:43 2020 +0100 ddraw/tests: Don't rely on the implicit vertex color in test_viewport. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw7.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 2f2ac29a08..c34d939486 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -15015,6 +15015,16 @@ static void test_viewport(void) hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_LIGHTING, FALSE); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + /* Well, by default the vertices without color info should be white, and without any texture + * ops this should just show up in the output, but the r200 driver begs to differ and draws a + * random color. */ + hr = IDirect3DDevice7_SetTextureStageState(device, 0, D3DTSS_COLOROP, D3DTOP_SELECTARG1); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice7_SetTextureStageState(device, 0, D3DTSS_COLORARG1, D3DTA_TFACTOR); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_TEXTUREFACTOR, 0x00ffffff); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice7_SetViewport(device, NULL); ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);

1 0

Zebediah Figura : winegstreamer: Fix pin enumeration order for the AVI and WAVE parsers.
by Alexandre Julliard Jan. 24, 2020

Jan. 24, 2020

Module: wine Branch: master Commit: 0a9acdefe8db58818397d5d19fb21715cebca795 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0a9acdefe8db58818397d5d1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jan 24 09:56:00 2020 -0600 winegstreamer: Fix pin enumeration order for the AVI and WAVE parsers. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/avisplit.c | 2 -- dlls/quartz/tests/waveparser.c | 2 -- dlls/winegstreamer/gstdemux.c | 20 ++++++++++++++++---- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/dlls/quartz/tests/avisplit.c b/dlls/quartz/tests/avisplit.c index 91f43e9790..0f5302c7d3 100644 --- a/dlls/quartz/tests/avisplit.c +++ b/dlls/quartz/tests/avisplit.c @@ -427,7 +427,6 @@ static void test_find_pin(void) hr = IBaseFilter_FindPin(filter, L"Stream 00", &pin); ok(hr == S_OK, "Got hr %#x.\n", hr); -todo_wine ok(pin == pin2, "Expected pin %p, got %p.\n", pin2, pin); IPin_Release(pin); IPin_Release(pin2); @@ -437,7 +436,6 @@ todo_wine hr = IBaseFilter_FindPin(filter, L"input pin", &pin); ok(hr == S_OK, "Got hr %#x.\n", hr); -todo_wine ok(pin == pin2, "Expected pin %p, got %p.\n", pin2, pin); IPin_Release(pin); IPin_Release(pin2); diff --git a/dlls/quartz/tests/waveparser.c b/dlls/quartz/tests/waveparser.c index 39e0b52d4b..b1980c5ea5 100644 --- a/dlls/quartz/tests/waveparser.c +++ b/dlls/quartz/tests/waveparser.c @@ -421,7 +421,6 @@ static void test_find_pin(void) hr = IBaseFilter_FindPin(filter, L"output", &pin); ok(hr == S_OK, "Got hr %#x.\n", hr); -todo_wine ok(pin == pin2, "Expected pin %p, got %p.\n", pin2, pin); IPin_Release(pin); IPin_Release(pin2); @@ -431,7 +430,6 @@ todo_wine hr = IBaseFilter_FindPin(filter, L"input pin", &pin); ok(hr == S_OK, "Got hr %#x.\n", hr); -todo_wine ok(pin == pin2, "Expected pin %p, got %p.\n", pin2, pin); IPin_Release(pin); IPin_Release(pin2); diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 350e50e359..901ed80dfe 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -60,6 +60,7 @@ struct gstdemux struct gstdemux_source **sources; unsigned int source_count; + BOOL enum_sink_first; LONGLONG filesize; @@ -1214,10 +1215,20 @@ static struct strmbase_pin *gstdemux_get_pin(struct strmbase_filter *base, unsig { struct gstdemux *filter = impl_from_strmbase_filter(base); - if (!index) - return &filter->sink.pin; - else if (index <= filter->source_count) - return &filter->sources[index - 1]->pin.pin; + if (filter->enum_sink_first) + { + if (!index) + return &filter->sink.pin; + else if (index <= filter->source_count) + return &filter->sources[index - 1]->pin.pin; + } + else + { + if (index < filter->source_count) + return &filter->sources[index]->pin.pin; + else if (index == filter->source_count) + return &filter->sink.pin; + } return NULL; } @@ -2510,6 +2521,7 @@ IUnknown * CALLBACK mpeg_splitter_create(IUnknown *outer, HRESULT *phr) object->duration_event = CreateEventW(NULL, FALSE, FALSE, NULL); object->error_event = CreateEventW(NULL, TRUE, FALSE, NULL); object->init_gst = mpeg_splitter_init_gst; + object->enum_sink_first = TRUE; *phr = S_OK; TRACE("Created MPEG-1 splitter %p.\n", object);

1 0

Zebediah Figura : winegstreamer: Rename the "cStreams" element of struct gstdemux to "source_count".
by Alexandre Julliard Jan. 24, 2020

Jan. 24, 2020

Module: wine Branch: master Commit: 0897293b9950914dfff5bea7be64ccc25aa1f86d URL: https://source.winehq.org/git/wine.git/?a=commit;h=0897293b9950914dfff5bea7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jan 24 09:55:59 2020 -0600 winegstreamer: Rename the "cStreams" element of struct gstdemux to "source_count". Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 73 ++++++++++++++++++++++--------------------- 1 file changed, 37 insertions(+), 36 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 8831066854..350e50e359 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -59,7 +59,7 @@ struct gstdemux IMemAllocator *alloc; struct gstdemux_source **sources; - LONG cStreams; + unsigned int source_count; LONGLONG filesize; @@ -836,33 +836,32 @@ static DWORD CALLBACK push_data_init(LPVOID iface) static void removed_decoded_pad(GstElement *bin, GstPad *pad, gpointer user) { - struct gstdemux *This = user; - int x; - struct gstdemux_source *pin; + struct gstdemux *filter = user; + unsigned int i; + char *name; - TRACE("%p %p %p\n", This, bin, pad); + TRACE("filter %p, bin %p, pad %p.\n", filter, bin, pad); - for (x = 0; x < This->cStreams; ++x) { - if (This->sources[x]->their_src == pad) - break; - } - if (x == This->cStreams) + for (i = 0; i < filter->source_count; ++i) { - char *name = gst_pad_get_name(pad); - WARN("No pin matching pad %s found.\n", debugstr_a(name)); - g_free(name); - return; - } + struct gstdemux_source *pin = filter->sources[i]; - pin = This->sources[x]; + if (pin->their_src == pad) + { + if(pin->flipfilter) + gst_pad_unlink(pin->their_src, pin->flip_sink); + else + gst_pad_unlink(pin->their_src, pin->my_sink); - if(pin->flipfilter) - gst_pad_unlink(pin->their_src, pin->flip_sink); - else - gst_pad_unlink(pin->their_src, pin->my_sink); + gst_object_unref(pin->their_src); + pin->their_src = NULL; + return; + } + } - gst_object_unref(pin->their_src); - pin->their_src = NULL; + name = gst_pad_get_name(pad); + WARN("No pin matching pad %s found.\n", debugstr_a(name)); + g_free(name); } static void init_new_decoded_pad(GstElement *bin, GstPad *pad, struct gstdemux *This) @@ -878,7 +877,7 @@ static void init_new_decoded_pad(GstElement *bin, GstPad *pad, struct gstdemux * TRACE("%p %p %p\n", This, bin, pad); - sprintfW(nameW, formatW, This->cStreams); + sprintfW(nameW, formatW, This->source_count); name = gst_pad_get_name(pad); TRACE("Name: %s\n", name); @@ -981,7 +980,8 @@ exit: static void existing_new_pad(GstElement *bin, GstPad *pad, gpointer user) { struct gstdemux *This = user; - int x, ret; + unsigned int i; + int ret; TRACE("%p %p %p\n", This, bin, pad); @@ -994,8 +994,9 @@ static void existing_new_pad(GstElement *bin, GstPad *pad, gpointer user) return; } - for (x = 0; x < This->cStreams; ++x) { - struct gstdemux_source *pin = This->sources[x]; + for (i = 0; i < This->source_count; ++i) + { + struct gstdemux_source *pin = This->sources[i]; if (!pin->their_src) { gst_segment_init(pin->segment, GST_FORMAT_TIME); @@ -1215,7 +1216,7 @@ static struct strmbase_pin *gstdemux_get_pin(struct strmbase_filter *base, unsig if (!index) return &filter->sink.pin; - else if (index <= filter->cStreams) + else if (index <= filter->source_count) return &filter->sources[index - 1]->pin.pin; return NULL; } @@ -1279,7 +1280,7 @@ static HRESULT gstdemux_init_stream(struct strmbase_filter *iface) if (filter->no_more_pads_event) WaitForSingleObject(filter->no_more_pads_event, INFINITE); - for (i = 0; i < filter->cStreams; ++i) + for (i = 0; i < filter->source_count; ++i) { if (SUCCEEDED(pin_hr = BaseOutputPinImpl_Active(&filter->sources[i]->pin))) hr = pin_hr; @@ -1498,7 +1499,7 @@ static BOOL gstdecoder_init_gst(struct gstdemux *filter) WaitForSingleObject(filter->no_more_pads_event, INFINITE); gst_pad_query_duration(filter->sources[0]->their_src, GST_FORMAT_TIME, &duration); - for (i = 0; i < filter->cStreams; ++i) + for (i = 0; i < filter->source_count; ++i) { struct gstdemux_source *pin = filter->sources[i]; const HANDLE events[2] = {pin->caps_event, filter->error_event}; @@ -1948,7 +1949,7 @@ static struct gstdemux_source *create_pin(struct gstdemux *filter, const WCHAR * struct gstdemux_source *pin, **new_array; char pad_name[19]; - if (!(new_array = heap_realloc(filter->sources, (filter->cStreams + 1) * sizeof(*new_array)))) + if (!(new_array = heap_realloc(filter->sources, (filter->source_count + 1) * sizeof(*new_array)))) return NULL; filter->sources = new_array; @@ -1964,20 +1965,20 @@ static struct gstdemux_source *create_pin(struct gstdemux *filter, const WCHAR * GST_ChangeCurrent, GST_ChangeRate); BaseFilterImpl_IncrementPinVersion(&filter->filter); - sprintf(pad_name, "qz_sink_%u", filter->cStreams); + sprintf(pad_name, "qz_sink_%u", filter->source_count); pin->my_sink = gst_pad_new(pad_name, GST_PAD_SINK); gst_pad_set_element_private(pin->my_sink, pin); gst_pad_set_chain_function(pin->my_sink, got_data_sink_wrapper); gst_pad_set_event_function(pin->my_sink, event_sink_wrapper); gst_pad_set_query_function(pin->my_sink, query_sink_wrapper); - filter->sources[filter->cStreams++] = pin; + filter->sources[filter->source_count++] = pin; return pin; } static HRESULT GST_RemoveOutputPins(struct gstdemux *This) { - ULONG i; + unsigned int i; TRACE("(%p)\n", This); mark_wine_thread(); @@ -1990,10 +1991,10 @@ static HRESULT GST_RemoveOutputPins(struct gstdemux *This) gst_object_unref(This->their_sink); This->my_src = This->their_sink = NULL; - for (i = 0; i < This->cStreams; ++i) + for (i = 0; i < This->source_count; ++i) free_source_pin(This->sources[i]); - This->cStreams = 0; + This->source_count = 0; heap_free(This->sources); This->sources = NULL; gst_element_set_bus(This->container, NULL); @@ -2319,7 +2320,7 @@ static BOOL avi_splitter_init_gst(struct gstdemux *filter) WaitForSingleObject(filter->no_more_pads_event, INFINITE); gst_pad_query_duration(filter->sources[0]->their_src, GST_FORMAT_TIME, &duration); - for (i = 0; i < filter->cStreams; ++i) + for (i = 0; i < filter->source_count; ++i) { struct gstdemux_source *pin = filter->sources[i]; const HANDLE events[2] = {pin->caps_event, filter->error_event};

1 0

Zebediah Figura : quartz/tests: Add more tests for parser media types.
by Alexandre Julliard Jan. 24, 2020

Jan. 24, 2020

Module: wine Branch: master Commit: 44ef5177127de811f9992a7d7cbf8ab8bbfa3fd0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=44ef5177127de811f9992a7d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jan 24 09:56:01 2020 -0600 quartz/tests: Add more tests for parser media types. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/avisplit.c | 33 ++++++++++++++++++++++++-- dlls/quartz/tests/mpegsplit.c | 53 +++++++++++++++++++++++++++++++++++------- dlls/quartz/tests/waveparser.c | 16 +++++++++++++ 3 files changed, 91 insertions(+), 11 deletions(-) diff --git a/dlls/quartz/tests/avisplit.c b/dlls/quartz/tests/avisplit.c index 0f5302c7d3..befcac404c 100644 --- a/dlls/quartz/tests/avisplit.c +++ b/dlls/quartz/tests/avisplit.c @@ -526,14 +526,21 @@ static void test_media_types(void) { static const VIDEOINFOHEADER expect_vih = { - {0}, {0}, 0, 0, 1000 * 10000, - {sizeof(BITMAPINFOHEADER), 32, 24, 1, 12, mmioFOURCC('I','4','2','0'), 32*24*12/8} + .AvgTimePerFrame = 1000 * 10000, + .bmiHeader.biSize = sizeof(BITMAPINFOHEADER), + .bmiHeader.biWidth = 32, + .bmiHeader.biHeight = 24, + .bmiHeader.biPlanes = 1, + .bmiHeader.biBitCount = 12, + .bmiHeader.biCompression = mmioFOURCC('I','4','2','0'), + .bmiHeader.biSizeImage = 32 * 24 * 12 / 8, }; const WCHAR *filename = load_resource(L"test.avi"); IBaseFilter *filter = create_avi_splitter(); AM_MEDIA_TYPE mt = {{0}}, *pmt; IEnumMediaTypes *enummt; + VIDEOINFOHEADER *vih; IFilterGraph2 *graph; HRESULT hr; ULONG ref; @@ -630,6 +637,28 @@ static void test_media_types(void) todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); pmt->formattype = FORMAT_VideoInfo; + vih = (VIDEOINFOHEADER *)pmt->pbFormat; + + vih->AvgTimePerFrame = 10000; + hr = IPin_QueryAccept(pin, pmt); + todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + vih->AvgTimePerFrame = 1000 * 10000; + + vih->dwBitRate = 1000000; + hr = IPin_QueryAccept(pin, pmt); + todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + vih->dwBitRate = 0; + + SetRect(&vih->rcSource, 0, 0, 32, 24); + hr = IPin_QueryAccept(pin, pmt); + todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + SetRect(&vih->rcSource, 0, 0, 0, 0); + + vih->bmiHeader.biCompression = BI_RGB; + hr = IPin_QueryAccept(pin, pmt); + todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + vih->bmiHeader.biCompression = mmioFOURCC('I','4','2','0'); + CoTaskMemFree(pmt->pbFormat); CoTaskMemFree(pmt); diff --git a/dlls/quartz/tests/mpegsplit.c b/dlls/quartz/tests/mpegsplit.c index 06c8cdaeb6..627f4f21ef 100644 --- a/dlls/quartz/tests/mpegsplit.c +++ b/dlls/quartz/tests/mpegsplit.c @@ -529,7 +529,9 @@ static void test_media_types(void) const WCHAR *filename = load_resource(L"test.mp3"); AM_MEDIA_TYPE mt = {{0}}, *pmt, expect_mt = {{0}}; IBaseFilter *filter = create_mpeg_splitter(); + MPEGLAYER3WAVEFORMAT *mp3wfx; IEnumMediaTypes *enummt; + MPEG1WAVEFORMAT *wfx; IFilterGraph2 *graph; HRESULT hr; ULONG ref; @@ -595,41 +597,47 @@ static void test_media_types(void) mt.subtype = MEDIASUBTYPE_MPEG1Video; hr = IPin_QueryAccept(pin, &mt); todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); - mt.subtype = MEDIASUBTYPE_MPEG1VideoCD; hr = IPin_QueryAccept(pin, &mt); todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); - mt.subtype = MEDIASUBTYPE_MPEG1System; hr = IPin_QueryAccept(pin, &mt); todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); - mt.subtype = MEDIASUBTYPE_MPEG1AudioPayload; hr = IPin_QueryAccept(pin, &mt); ok(hr == S_FALSE, "Got hr %#x.\n", hr); - mt.subtype = MEDIASUBTYPE_MPEG1Payload; hr = IPin_QueryAccept(pin, &mt); ok(hr == S_FALSE, "Got hr %#x.\n", hr); - mt.subtype = MEDIASUBTYPE_MPEG1Packet; hr = IPin_QueryAccept(pin, &mt); ok(hr == S_FALSE, "Got hr %#x.\n", hr); - mt.subtype = GUID_NULL; hr = IPin_QueryAccept(pin, &mt); ok(hr == S_FALSE, "Got hr %#x.\n", hr); + mt.subtype = MEDIASUBTYPE_MPEG1Audio; mt.majortype = MEDIATYPE_Audio; - mt.subtype = MEDIASUBTYPE_MPEG1Audio; hr = IPin_QueryAccept(pin, &mt); ok(hr == S_FALSE, "Got hr %#x.\n", hr); - + mt.majortype = GUID_NULL; + hr = IPin_QueryAccept(pin, &mt); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); mt.majortype = MEDIATYPE_Stream; + + mt.formattype = FORMAT_None; + hr = IPin_QueryAccept(pin, &mt); + todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + mt.formattype = FORMAT_VideoInfo; + hr = IPin_QueryAccept(pin, &mt); + todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + mt.formattype = FORMAT_WaveFormatEx; + hr = IPin_QueryAccept(pin, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + mt.bFixedSizeSamples = TRUE; mt.bTemporalCompression = TRUE; mt.lSampleSize = 123; - mt.formattype = FORMAT_WaveFormatEx; hr = IPin_QueryAccept(pin, &mt); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -688,6 +696,9 @@ static void test_media_types(void) pmt->majortype = MEDIATYPE_Video; hr = IPin_QueryAccept(pin, pmt); todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + pmt->majortype = GUID_NULL; + hr = IPin_QueryAccept(pin, pmt); + todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); pmt->majortype = MEDIATYPE_Audio; pmt->subtype = MEDIASUBTYPE_MPEG1Audio; @@ -709,6 +720,18 @@ static void test_media_types(void) todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); pmt->formattype = FORMAT_WaveFormatEx; + wfx = (MPEG1WAVEFORMAT *)pmt->pbFormat; + + wfx->fwHeadLayer = ACM_MPEG_LAYER2; + hr = IPin_QueryAccept(pin, pmt); + todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + wfx->fwHeadLayer = ACM_MPEG_LAYER3; + + wfx->wfx.wFormatTag = WAVE_FORMAT_MPEGLAYER3; + hr = IPin_QueryAccept(pin, pmt); + todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + wfx->wfx.wFormatTag = WAVE_FORMAT_MPEG; + CoTaskMemFree(pmt->pbFormat); CoTaskMemFree(pmt); @@ -786,6 +809,18 @@ static void test_media_types(void) ok(hr == S_FALSE, "Got hr %#x.\n", hr); pmt->formattype = FORMAT_WaveFormatEx; + mp3wfx = (MPEGLAYER3WAVEFORMAT *)pmt->pbFormat; + + mp3wfx->fdwFlags = MPEGLAYER3_FLAG_PADDING_OFF; + hr = IPin_QueryAccept(pin, pmt); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + mp3wfx->fdwFlags = MPEGLAYER3_FLAG_PADDING_ISO; + + mp3wfx->wfx.wFormatTag = WAVE_FORMAT_MPEG; + hr = IPin_QueryAccept(pin, pmt); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + mp3wfx->wfx.wFormatTag = WAVE_FORMAT_MPEGLAYER3; + CoTaskMemFree(pmt->pbFormat); CoTaskMemFree(pmt); diff --git a/dlls/quartz/tests/waveparser.c b/dlls/quartz/tests/waveparser.c index b1980c5ea5..5c09f6d121 100644 --- a/dlls/quartz/tests/waveparser.c +++ b/dlls/quartz/tests/waveparser.c @@ -20,6 +20,7 @@ #define COBJMACROS #include "dshow.h" +#include "mmreg.h" #include "wine/test.h" static IBaseFilter *create_wave_parser(void) @@ -525,6 +526,7 @@ static void test_media_types(void) AM_MEDIA_TYPE mt = {{0}}, *pmt; IEnumMediaTypes *enummt; IFilterGraph2 *graph; + WAVEFORMATEX *wfx; HRESULT hr; ULONG ref; IPin *pin; @@ -619,6 +621,20 @@ static void test_media_types(void) hr = IPin_QueryAccept(pin, pmt); todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + wfx = (WAVEFORMATEX *)pmt->pbFormat; + + wfx->nChannels = wfx->nBlockAlign = 2; + wfx->nAvgBytesPerSec = 44100 * 2; + wfx->nBlockAlign = 2; + hr = IPin_QueryAccept(pin, pmt); + todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + *wfx = expect_wfx; + + wfx->wFormatTag = WAVE_FORMAT_IMA_ADPCM; + hr = IPin_QueryAccept(pin, pmt); + todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + *wfx = expect_wfx; + CoTaskMemFree(pmt->pbFormat); CoTaskMemFree(pmt);

1 0

Henri Verbeet : wined3d: Get gl_info from the context in wined3d_device_create_primary_opengl_context_cs().
by Alexandre Julliard Jan. 24, 2020

Jan. 24, 2020

Module: wine Branch: master Commit: 3918547cc688e11efd25e997036a0d990981f269 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3918547cc688e11efd25e997… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 24 19:50:06 2020 +0330 wined3d: Get gl_info from the context in wined3d_device_create_primary_opengl_context_cs(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 8913420724..cdc65a6fa7 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1002,13 +1002,15 @@ void wined3d_device_create_primary_opengl_context_cs(void *object) context_release(context); return; } - wined3d_ffp_blitter_create(&device->blitter, &device->adapter->gl_info); + + context_gl = wined3d_context_gl(context); + + wined3d_ffp_blitter_create(&device->blitter, context_gl->gl_info); if (!wined3d_glsl_blitter_create(&device->blitter, device)) wined3d_arbfp_blitter_create(&device->blitter, device); - wined3d_fbo_blitter_create(&device->blitter, &device->adapter->gl_info); - wined3d_raw_blitter_create(&device->blitter, &device->adapter->gl_info); + wined3d_fbo_blitter_create(&device->blitter, context_gl->gl_info); + wined3d_raw_blitter_create(&device->blitter, context_gl->gl_info); - context_gl = wined3d_context_gl(context); wined3d_device_gl_create_dummy_textures(wined3d_device_gl(device), context_gl); wined3d_device_create_default_samplers(device, context); context_release(context);

1 0

Henri Verbeet : wined3d: Create Vulkan buffers.
by Alexandre Julliard Jan. 24, 2020

Jan. 24, 2020

Module: wine Branch: master Commit: dd03e37f9fdd8e5264a60308f28e07f05d9a26f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dd03e37f9fdd8e5264a60308… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 24 19:50:03 2020 +0330 wined3d: Create Vulkan buffers. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_vk.c | 17 ++++++++++ dlls/wined3d/buffer.c | 66 ++++++++++++++++++++++++++++++++++++-- dlls/wined3d/context.c | 72 ++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 21 ++++++++++++ 4 files changed, 173 insertions(+), 3 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=dd03e37f9fdd8e5264a6…

1 0

Zebediah Figura : winegstreamer: Implement IPin::QueryAccept() for the WAVE parser source.
by Alexandre Julliard Jan. 24, 2020

Jan. 24, 2020

Module: wine Branch: master Commit: 71967608a3ed49d2d0c2207599e3498c184534f5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=71967608a3ed49d2d0c22075… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jan 24 09:56:02 2020 -0600 winegstreamer: Implement IPin::QueryAccept() for the WAVE parser source. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/waveparser.c | 12 ++++++------ dlls/winegstreamer/gstdemux.c | 41 ++++++++++++++++++++++++++++++++++++++--- 2 files changed, 44 insertions(+), 9 deletions(-) diff --git a/dlls/quartz/tests/waveparser.c b/dlls/quartz/tests/waveparser.c index 5c09f6d121..61ba2018e4 100644 --- a/dlls/quartz/tests/waveparser.c +++ b/dlls/quartz/tests/waveparser.c @@ -606,20 +606,20 @@ static void test_media_types(void) pmt->majortype = GUID_NULL; hr = IPin_QueryAccept(pin, pmt); - todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); pmt->majortype = MEDIATYPE_Audio; pmt->subtype = GUID_NULL; hr = IPin_QueryAccept(pin, pmt); - todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); pmt->subtype = MEDIASUBTYPE_WAVE; pmt->formattype = GUID_NULL; hr = IPin_QueryAccept(pin, pmt); - todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); pmt->formattype = FORMAT_None; hr = IPin_QueryAccept(pin, pmt); - todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); wfx = (WAVEFORMATEX *)pmt->pbFormat; @@ -627,12 +627,12 @@ static void test_media_types(void) wfx->nAvgBytesPerSec = 44100 * 2; wfx->nBlockAlign = 2; hr = IPin_QueryAccept(pin, pmt); - todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); *wfx = expect_wfx; wfx->wFormatTag = WAVE_FORMAT_IMA_ADPCM; hr = IPin_QueryAccept(pin, pmt); - todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); *wfx = expect_wfx; CoTaskMemFree(pmt->pbFormat); diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 901ed80dfe..dadad69beb 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -75,6 +75,7 @@ struct gstdemux HANDLE push_thread; BOOL (*init_gst)(struct gstdemux *filter); + HRESULT (*source_query_accept)(struct gstdemux_source *pin, const AM_MEDIA_TYPE *mt); }; struct gstdemux_source @@ -1531,6 +1532,11 @@ static BOOL gstdecoder_init_gst(struct gstdemux *filter) return TRUE; } +static HRESULT gstdecoder_source_query_accept(struct gstdemux_source *pin, const AM_MEDIA_TYPE *mt) +{ + return S_OK; +} + IUnknown * CALLBACK Gstreamer_Splitter_create(IUnknown *outer, HRESULT *phr) { struct gstdemux *object; @@ -1555,6 +1561,7 @@ IUnknown * CALLBACK Gstreamer_Splitter_create(IUnknown *outer, HRESULT *phr) object->no_more_pads_event = CreateEventW(NULL, FALSE, FALSE, NULL); object->error_event = CreateEventW(NULL, TRUE, FALSE, NULL); object->init_gst = gstdecoder_init_gst; + object->source_query_accept = gstdecoder_source_query_accept; *phr = S_OK; TRACE("Created GStreamer demuxer %p.\n", object); @@ -1859,10 +1866,11 @@ static HRESULT source_query_interface(struct strmbase_pin *iface, REFIID iid, vo return S_OK; } -static HRESULT source_query_accept(struct strmbase_pin *base, const AM_MEDIA_TYPE *amt) +static HRESULT source_query_accept(struct strmbase_pin *iface, const AM_MEDIA_TYPE *mt) { - FIXME("(%p) stub\n", base); - return S_OK; + struct gstdemux_source *pin = impl_source_from_IPin(&iface->IPin_iface); + struct gstdemux *filter = impl_from_strmbase_filter(iface->filter); + return filter->source_query_accept(pin, mt); } static HRESULT source_get_media_type(struct strmbase_pin *iface, unsigned int iPosition, AM_MEDIA_TYPE *pmt) @@ -2164,6 +2172,15 @@ void start_dispatch_thread(void) CloseHandle(CreateThread(NULL, 0, &dispatch_thread, NULL, 0, NULL)); } +static BOOL compare_media_types(const AM_MEDIA_TYPE *a, const AM_MEDIA_TYPE *b) +{ + return IsEqualGUID(&a->majortype, &b->majortype) + && IsEqualGUID(&a->subtype, &b->subtype) + && IsEqualGUID(&a->formattype, &b->formattype) + && a->cbFormat == b->cbFormat + && !memcmp(a->pbFormat, b->pbFormat, a->cbFormat); +} + static HRESULT wave_parser_sink_query_accept(struct strmbase_pin *iface, const AM_MEDIA_TYPE *mt) { if (!IsEqualGUID(&mt->majortype, &MEDIATYPE_Stream)) @@ -2246,6 +2263,11 @@ static BOOL wave_parser_init_gst(struct gstdemux *filter) return TRUE; } +static HRESULT wave_parser_source_query_accept(struct gstdemux_source *pin, const AM_MEDIA_TYPE *mt) +{ + return compare_media_types(mt, &pin->mt) ? S_OK : S_FALSE; +} + IUnknown * CALLBACK wave_parser_create(IUnknown *outer, HRESULT *phr) { static const WCHAR sink_name[] = {'i','n','p','u','t',' ','p','i','n',0}; @@ -2269,6 +2291,7 @@ IUnknown * CALLBACK wave_parser_create(IUnknown *outer, HRESULT *phr) strmbase_sink_init(&object->sink, &object->filter, sink_name, &wave_parser_sink_ops, NULL); object->init_gst = wave_parser_init_gst; object->error_event = CreateEventW(NULL, TRUE, FALSE, NULL); + object->source_query_accept = wave_parser_source_query_accept; *phr = S_OK; TRACE("Created WAVE parser %p.\n", object); @@ -2352,6 +2375,11 @@ static BOOL avi_splitter_init_gst(struct gstdemux *filter) return TRUE; } +static HRESULT avi_splitter_source_query_accept(struct gstdemux_source *pin, const AM_MEDIA_TYPE *mt) +{ + return S_OK; +} + IUnknown * CALLBACK avi_splitter_create(IUnknown *outer, HRESULT *phr) { static const WCHAR sink_name[] = {'i','n','p','u','t',' ','p','i','n',0}; @@ -2376,6 +2404,7 @@ IUnknown * CALLBACK avi_splitter_create(IUnknown *outer, HRESULT *phr) object->no_more_pads_event = CreateEventW(NULL, FALSE, FALSE, NULL); object->error_event = CreateEventW(NULL, TRUE, FALSE, NULL); object->init_gst = avi_splitter_init_gst; + object->source_query_accept = avi_splitter_source_query_accept; *phr = S_OK; TRACE("Created AVI splitter %p.\n", object); @@ -2469,6 +2498,11 @@ static BOOL mpeg_splitter_init_gst(struct gstdemux *filter) return TRUE; } +static HRESULT mpeg_splitter_source_query_accept(struct gstdemux_source *pin, const AM_MEDIA_TYPE *mt) +{ + return S_OK; +} + static HRESULT mpeg_splitter_query_interface(struct strmbase_filter *iface, REFIID iid, void **out) { struct gstdemux *filter = impl_from_strmbase_filter(iface); @@ -2521,6 +2555,7 @@ IUnknown * CALLBACK mpeg_splitter_create(IUnknown *outer, HRESULT *phr) object->duration_event = CreateEventW(NULL, FALSE, FALSE, NULL); object->error_event = CreateEventW(NULL, TRUE, FALSE, NULL); object->init_gst = mpeg_splitter_init_gst; + object->source_query_accept = mpeg_splitter_source_query_accept; object->enum_sink_first = TRUE; *phr = S_OK;

1 0