July 2020 - Wine-Commits - list.winehq.org

Tag wine-5.13 : Alexandre Julliard : Release 5.13
by Alexandre Julliard July 17, 2020

July 17, 2020

Module: wine Branch: refs/tags/wine-5.13 Tag: ca73d7efceff2251cecfc738372c83245ad7c97f URL: https://source.winehq.org/git/wine.git/?a=tag;h=ca73d7efceff2251cecfc738372… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 17 23:29:13 2020 +0200 Release 5.13

1 0

Zebediah Figura : strmbase: Store the quality control object directly in strmbase_renderer.
by Alexandre Julliard July 17, 2020

July 17, 2020

Module: wine Branch: master Commit: a9fbbda429f28ba74de207b1bd2fd1ce32133bfb URL: https://source.winehq.org/git/wine.git/?a=commit;h=a9fbbda429f28ba74de207b1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jul 17 14:51:24 2020 -0500 strmbase: Store the quality control object directly in strmbase_renderer. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/qualitycontrol.c | 22 +++++----------------- dlls/strmbase/renderer.c | 16 +++++++--------- dlls/strmbase/strmbase_private.h | 18 ------------------ include/wine/strmbase.h | 20 +++++++++++++++++--- 4 files changed, 29 insertions(+), 47 deletions(-) diff --git a/dlls/strmbase/qualitycontrol.c b/dlls/strmbase/qualitycontrol.c index c4e055858e..d0bd070d44 100644 --- a/dlls/strmbase/qualitycontrol.c +++ b/dlls/strmbase/qualitycontrol.c @@ -27,11 +27,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(strmbase_qc); -void QualityControlImpl_Destroy(struct strmbase_qc *This) -{ - HeapFree(GetProcessHeap(),0,This); -} - static inline struct strmbase_qc *impl_from_IQualityControl(IQualityControl *iface) { return CONTAINING_RECORD(iface, struct strmbase_qc, IQualityControl_iface); @@ -313,17 +308,10 @@ void QualityControlRender_EndRender(struct strmbase_qc *This) This->avg_render = UPDATE_RUNNING_AVG (This->avg_render, elapsed); } -HRESULT QualityControlImpl_Create(struct strmbase_pin *pin, struct strmbase_qc **ppv) +void strmbase_qc_init(struct strmbase_qc *qc, struct strmbase_pin *pin) { - struct strmbase_qc *This; - *ppv = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(struct strmbase_qc)); - if (!*ppv) - return E_OUTOFMEMORY; - This = *ppv; - This->pin = pin; - This->tonotify = NULL; - This->current_rstart = This->current_rstop = -1; - This->IQualityControl_iface.lpVtbl = &quality_control_vtbl; - TRACE("-> %p\n", This); - return S_OK; + memset(qc, 0, sizeof(*qc)); + qc->pin = pin; + qc->current_rstart = qc->current_rstop = -1; + qc->IQualityControl_iface.lpVtbl = &quality_control_vtbl; } diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index 3895cb3119..939811bfa9 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -63,7 +63,7 @@ static HRESULT renderer_query_interface(struct strmbase_filter *iface, REFIID ii else if (IsEqualGUID(iid, &IID_IMediaSeeking)) *out = &filter->passthrough.IMediaSeeking_iface; else if (IsEqualGUID(iid, &IID_IQualityControl)) - *out = &filter->qcimpl->IQualityControl_iface; + *out = &filter->qc.IQualityControl_iface; else return E_NOINTERFACE; @@ -93,7 +93,7 @@ static HRESULT renderer_start_stream(struct strmbase_filter *iface, REFERENCE_TI SetEvent(filter->state_event); if (filter->sink.pin.peer) filter->eos = FALSE; - QualityControlRender_Start(filter->qcimpl, filter->stream_start); + QualityControlRender_Start(&filter->qc, filter->stream_start); if (filter->sink.pin.peer && filter->pFuncsTable->renderer_start_stream) filter->pFuncsTable->renderer_start_stream(filter); @@ -234,7 +234,7 @@ static HRESULT sink_end_flush(struct strmbase_sink *iface) EnterCriticalSection(&filter->csRenderLock); filter->eos = FALSE; - QualityControlRender_Start(filter->qcimpl, filter->stream_start); + QualityControlRender_Start(&filter->qc, filter->stream_start); strmbase_passthrough_invalidate_time(&filter->passthrough); ResetEvent(filter->flush_event); @@ -272,7 +272,6 @@ void strmbase_renderer_cleanup(struct strmbase_renderer *filter) CloseHandle(filter->state_event); CloseHandle(filter->advise_event); CloseHandle(filter->flush_event); - QualityControlImpl_Destroy(filter->qcimpl); strmbase_filter_cleanup(&filter->filter); } @@ -367,12 +366,12 @@ HRESULT WINAPI BaseRendererImpl_Receive(struct strmbase_renderer *This, IMediaSa if (SUCCEEDED(hr)) { - QualityControlRender_BeginRender(This->qcimpl, start, stop); + QualityControlRender_BeginRender(&This->qc, start, stop); hr = This->pFuncsTable->pfnDoRenderSample(This, pSample); - QualityControlRender_EndRender(This->qcimpl); + QualityControlRender_EndRender(&This->qc); } - QualityControlRender_DoQOS(This->qcimpl); + QualityControlRender_DoQOS(&This->qc); LeaveCriticalSection(&This->csRenderLock); @@ -386,6 +385,7 @@ void strmbase_renderer_init(struct strmbase_renderer *filter, IUnknown *outer, strmbase_filter_init(&filter->filter, outer, clsid, &filter_ops); strmbase_passthrough_init(&filter->passthrough, (IUnknown *)&filter->filter.IBaseFilter_iface); ISeekingPassThru_Init(&filter->passthrough.ISeekingPassThru_iface, TRUE, &filter->sink.pin.IPin_iface); + strmbase_qc_init(&filter->qc, &filter->sink.pin); filter->pFuncsTable = ops; @@ -396,6 +396,4 @@ void strmbase_renderer_init(struct strmbase_renderer *filter, IUnknown *outer, filter->state_event = CreateEventW(NULL, TRUE, TRUE, NULL); filter->advise_event = CreateEventW(NULL, FALSE, FALSE, NULL); filter->flush_event = CreateEventW(NULL, TRUE, TRUE, NULL); - - QualityControlImpl_Create(&filter->sink.pin, &filter->qcimpl); } diff --git a/dlls/strmbase/strmbase_private.h b/dlls/strmbase/strmbase_private.h index 15be9498e7..d589213b71 100644 --- a/dlls/strmbase/strmbase_private.h +++ b/dlls/strmbase/strmbase_private.h @@ -53,24 +53,6 @@ static inline const char *debugstr_time(REFERENCE_TIME time) return wine_dbg_sprintf("%s", rev); } -/* Quality Control */ -struct strmbase_qc -{ - IQualityControl IQualityControl_iface; - struct strmbase_pin *pin; - IQualityControl *tonotify; - - /* Render stuff */ - REFERENCE_TIME last_in_time, last_left, avg_duration, avg_pt, avg_render, start, stop; - REFERENCE_TIME current_jitter, current_rstart, current_rstop, clockstart; - double avg_rate; - LONG64 rendered, dropped; - BOOL qos_handled, is_dropped; -}; - -HRESULT QualityControlImpl_Create(struct strmbase_pin *pin, struct strmbase_qc **out); -void QualityControlImpl_Destroy(struct strmbase_qc *qc); - void QualityControlRender_Start(struct strmbase_qc *This, REFERENCE_TIME tStart); void QualityControlRender_DoQOS(struct strmbase_qc *priv); void QualityControlRender_BeginRender(struct strmbase_qc *This, REFERENCE_TIME start, REFERENCE_TIME stop); diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index b0fa68ecf1..2e84edb7cd 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -271,10 +271,27 @@ struct strmbase_passthrough void strmbase_passthrough_init(struct strmbase_passthrough *passthrough, IUnknown *outer); void strmbase_passthrough_cleanup(struct strmbase_passthrough *passthrough); +struct strmbase_qc +{ + IQualityControl IQualityControl_iface; + struct strmbase_pin *pin; + IQualityControl *tonotify; + + /* Render stuff */ + REFERENCE_TIME last_in_time, last_left, avg_duration, avg_pt, avg_render, start, stop; + REFERENCE_TIME current_jitter, current_rstart, current_rstop, clockstart; + double avg_rate; + LONG64 rendered, dropped; + BOOL qos_handled, is_dropped; +}; + +void strmbase_qc_init(struct strmbase_qc *qc, struct strmbase_pin *pin); + struct strmbase_renderer { struct strmbase_filter filter; struct strmbase_passthrough passthrough; + struct strmbase_qc qc; struct strmbase_sink sink; @@ -290,9 +307,6 @@ struct strmbase_renderer HANDLE flush_event; REFERENCE_TIME stream_start; - IQualityControl *pQSink; - struct strmbase_qc *qcimpl; - const struct strmbase_renderer_ops *pFuncsTable; BOOL eos;

1 0

Zebediah Figura : strmbase: Set the IQualityControl vtbl in QualityControlImpl_Create().
by Alexandre Julliard July 17, 2020

July 17, 2020

Module: wine Branch: master Commit: 461a928f14fffe74c3de0adb626212c315b504de URL: https://source.winehq.org/git/wine.git/?a=commit;h=461a928f14fffe74c3de0adb… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jul 17 14:51:23 2020 -0500 strmbase: Set the IQualityControl vtbl in QualityControlImpl_Create(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/qualitycontrol.c | 48 ++++++++++++++++++++++++---------------- dlls/strmbase/renderer.c | 9 -------- dlls/strmbase/strmbase_private.h | 5 ----- 3 files changed, 29 insertions(+), 33 deletions(-) diff --git a/dlls/strmbase/qualitycontrol.c b/dlls/strmbase/qualitycontrol.c index 918757caa8..c4e055858e 100644 --- a/dlls/strmbase/qualitycontrol.c +++ b/dlls/strmbase/qualitycontrol.c @@ -27,20 +27,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(strmbase_qc); -HRESULT QualityControlImpl_Create(struct strmbase_pin *pin, struct strmbase_qc **ppv) -{ - struct strmbase_qc *This; - *ppv = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(struct strmbase_qc)); - if (!*ppv) - return E_OUTOFMEMORY; - This = *ppv; - This->pin = pin; - This->tonotify = NULL; - This->current_rstart = This->current_rstop = -1; - TRACE("-> %p\n", This); - return S_OK; -} - void QualityControlImpl_Destroy(struct strmbase_qc *This) { HeapFree(GetProcessHeap(),0,This); @@ -51,25 +37,25 @@ static inline struct strmbase_qc *impl_from_IQualityControl(IQualityControl *ifa return CONTAINING_RECORD(iface, struct strmbase_qc, IQualityControl_iface); } -HRESULT WINAPI QualityControlImpl_QueryInterface(IQualityControl *iface, REFIID riid, void **ppv) +static HRESULT WINAPI quality_control_QueryInterface(IQualityControl *iface, REFIID riid, void **ppv) { struct strmbase_qc *This = impl_from_IQualityControl(iface); return IBaseFilter_QueryInterface(&This->pin->filter->IBaseFilter_iface, riid, ppv); } -ULONG WINAPI QualityControlImpl_AddRef(IQualityControl *iface) +static ULONG WINAPI quality_control_AddRef(IQualityControl *iface) { struct strmbase_qc *This = impl_from_IQualityControl(iface); return IBaseFilter_AddRef(&This->pin->filter->IBaseFilter_iface); } -ULONG WINAPI QualityControlImpl_Release(IQualityControl *iface) +static ULONG WINAPI quality_control_Release(IQualityControl *iface) { struct strmbase_qc *This = impl_from_IQualityControl(iface); return IBaseFilter_Release(&This->pin->filter->IBaseFilter_iface); } -HRESULT WINAPI QualityControlImpl_Notify(IQualityControl *iface, IBaseFilter *sender, Quality qm) +static HRESULT WINAPI quality_control_Notify(IQualityControl *iface, IBaseFilter *sender, Quality qm) { struct strmbase_qc *This = impl_from_IQualityControl(iface); HRESULT hr = S_FALSE; @@ -94,7 +80,7 @@ HRESULT WINAPI QualityControlImpl_Notify(IQualityControl *iface, IBaseFilter *se return hr; } -HRESULT WINAPI QualityControlImpl_SetSink(IQualityControl *iface, IQualityControl *tonotify) +static HRESULT WINAPI quality_control_SetSink(IQualityControl *iface, IQualityControl *tonotify) { struct strmbase_qc *This = impl_from_IQualityControl(iface); TRACE("%p %p\n", This, tonotify); @@ -102,6 +88,15 @@ HRESULT WINAPI QualityControlImpl_SetSink(IQualityControl *iface, IQualityContro return S_OK; } +static const IQualityControlVtbl quality_control_vtbl = +{ + quality_control_QueryInterface, + quality_control_AddRef, + quality_control_Release, + quality_control_Notify, + quality_control_SetSink, +}; + /* Macros copied from gstreamer, weighted average between old average and new ones */ #define DO_RUNNING_AVG(avg,val,size) (((val) + ((size)-1) * (avg)) / (size)) @@ -317,3 +312,18 @@ void QualityControlRender_EndRender(struct strmbase_qc *This) else This->avg_render = UPDATE_RUNNING_AVG (This->avg_render, elapsed); } + +HRESULT QualityControlImpl_Create(struct strmbase_pin *pin, struct strmbase_qc **ppv) +{ + struct strmbase_qc *This; + *ppv = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(struct strmbase_qc)); + if (!*ppv) + return E_OUTOFMEMORY; + This = *ppv; + This->pin = pin; + This->tonotify = NULL; + This->current_rstart = This->current_rstop = -1; + This->IQualityControl_iface.lpVtbl = &quality_control_vtbl; + TRACE("-> %p\n", This); + return S_OK; +} diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index f1e74f6476..3895cb3119 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -27,14 +27,6 @@ static inline struct strmbase_renderer *impl_from_strmbase_filter(struct strmbas return CONTAINING_RECORD(iface, struct strmbase_renderer, filter); } -static const IQualityControlVtbl Renderer_QualityControl_Vtbl = { - QualityControlImpl_QueryInterface, - QualityControlImpl_AddRef, - QualityControlImpl_Release, - QualityControlImpl_Notify, - QualityControlImpl_SetSink -}; - static inline struct strmbase_renderer *impl_from_IPin(IPin *iface) { return CONTAINING_RECORD(iface, struct strmbase_renderer, sink.pin.IPin_iface); @@ -406,5 +398,4 @@ void strmbase_renderer_init(struct strmbase_renderer *filter, IUnknown *outer, filter->flush_event = CreateEventW(NULL, TRUE, TRUE, NULL); QualityControlImpl_Create(&filter->sink.pin, &filter->qcimpl); - filter->qcimpl->IQualityControl_iface.lpVtbl = &Renderer_QualityControl_Vtbl; } diff --git a/dlls/strmbase/strmbase_private.h b/dlls/strmbase/strmbase_private.h index 8df1cac71e..15be9498e7 100644 --- a/dlls/strmbase/strmbase_private.h +++ b/dlls/strmbase/strmbase_private.h @@ -70,11 +70,6 @@ struct strmbase_qc HRESULT QualityControlImpl_Create(struct strmbase_pin *pin, struct strmbase_qc **out); void QualityControlImpl_Destroy(struct strmbase_qc *qc); -HRESULT WINAPI QualityControlImpl_QueryInterface(IQualityControl *iface, REFIID riid, void **ppv); -ULONG WINAPI QualityControlImpl_AddRef(IQualityControl *iface); -ULONG WINAPI QualityControlImpl_Release(IQualityControl *iface); -HRESULT WINAPI QualityControlImpl_Notify(IQualityControl *iface, IBaseFilter *sender, Quality qm); -HRESULT WINAPI QualityControlImpl_SetSink(IQualityControl *iface, IQualityControl *tonotify); void QualityControlRender_Start(struct strmbase_qc *This, REFERENCE_TIME tStart); void QualityControlRender_DoQOS(struct strmbase_qc *priv);

1 0

Zebediah Figura : quartz/tests: Add tests for DirectSound renderer filter state.
by Alexandre Julliard July 17, 2020

July 17, 2020

Module: wine Branch: master Commit: 98390d9c2d2ce53239d3fa2d71c961e2c7ce5a84 URL: https://source.winehq.org/git/wine.git/?a=commit;h=98390d9c2d2ce53239d3fa2d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jul 17 14:51:20 2020 -0500 quartz/tests: Add tests for DirectSound renderer filter state. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/dsoundrender.c | 233 +++++++++++++++++++++++++++++---------- 1 file changed, 176 insertions(+), 57 deletions(-) diff --git a/dlls/quartz/tests/dsoundrender.c b/dlls/quartz/tests/dsoundrender.c index d5c18d389a..35f935bcad 100644 --- a/dlls/quartz/tests/dsoundrender.c +++ b/dlls/quartz/tests/dsoundrender.c @@ -20,6 +20,7 @@ */ #define COBJMACROS +#include <math.h> #include "dshow.h" #include "initguid.h" #include "dsound.h" @@ -674,8 +675,164 @@ static void test_allocator(IMemInputPin *input) IMemAllocator_Release(ret_allocator); } +struct frame_thread_params +{ + IMemInputPin *sink; + IMediaSample *sample; +}; + +static DWORD WINAPI frame_thread(void *arg) +{ + struct frame_thread_params *params = arg; + HRESULT hr; + + if (winetest_debug > 1) trace("%04x: Sending frame.\n", GetCurrentThreadId()); + hr = IMemInputPin_Receive(params->sink, params->sample); + if (winetest_debug > 1) trace("%04x: Returned %#x.\n", GetCurrentThreadId(), hr); + IMediaSample_Release(params->sample); + free(params); + return hr; +} + +static HRESULT send_frame(IMemInputPin *sink) +{ + struct frame_thread_params *params = malloc(sizeof(*params)); + REFERENCE_TIME start_time, end_time; + IMemAllocator *allocator; + unsigned short *words; + IMediaSample *sample; + unsigned int i; + HANDLE thread; + HRESULT hr; + BYTE *data; + DWORD ret; + + hr = IMemInputPin_GetAllocator(sink, &allocator); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMemAllocator_GetBuffer(allocator, &sample, NULL, NULL, 0); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaSample_GetPointer(sample, &data); + ok(hr == S_OK, "Got hr %#x.\n", hr); + words = (unsigned short *)data; + for (i = 0; i < 44100 * 2; i += 2) + words[i] = words[i+1] = sinf(i / 20.0f) * 0x7fff; + + hr = IMediaSample_SetActualDataLength(sample, 44100 * 4); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + start_time = 0; + end_time = start_time + 10000000; + hr = IMediaSample_SetTime(sample, &start_time, &end_time); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + params->sink = sink; + params->sample = sample; + thread = CreateThread(NULL, 0, frame_thread, params, 0, NULL); + ret = WaitForSingleObject(thread, 500); + todo_wine_if (ret) ok(!ret, "Wait failed.\n"); + GetExitCodeThread(thread, &ret); + CloseHandle(thread); + + IMemAllocator_Release(allocator); + return ret; +} + +static void test_filter_state(IMemInputPin *input, IFilterGraph2 *graph) +{ + IMediaControl *control; + OAFilterState state; + HRESULT hr; + + IFilterGraph2_QueryInterface(graph, &IID_IMediaControl, (void **)&control); + + hr = send_frame(input); + ok(hr == VFW_E_WRONG_STATE, "Got hr %#x.\n", hr); + + /* The renderer is not fully paused until it receives a sample. The + * DirectSound renderer never blocks in Receive(), despite returning S_OK + * from ReceiveCanBlock(). Instead it holds on to each sample until its + * presentation time, then writes it into the buffer. This is more work + * than it's worth to emulate, so for now, we'll ignore this behaviour. */ + + hr = IMediaControl_Pause(control); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + /* It's possible to queue multiple samples while paused. The number of + * samples that can be queued depends on the length of each sample, but + * it's not particularly clear how. */ + + hr = IMediaControl_GetState(control, 0, &state); + ok(hr == VFW_S_STATE_INTERMEDIATE, "Got hr %#x.\n", hr); + + hr = send_frame(input); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaControl_GetState(control, 1000, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = send_frame(input); + ok(hr == VFW_E_WRONG_STATE, "Got hr %#x.\n", hr); + + hr = IMediaControl_Pause(control); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IMediaControl_GetState(control, 0, &state); + ok(hr == VFW_S_STATE_INTERMEDIATE, "Got hr %#x.\n", hr); + + hr = send_frame(input); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaControl_GetState(control, 1000, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaControl_Run(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaControl_GetState(control, 0, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = send_frame(input); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = send_frame(input); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaControl_GetState(control, 0, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaControl_Run(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaControl_GetState(control, 0, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaControl_Pause(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaControl_GetState(control, 0, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaControl_GetState(control, 0, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + /* The DirectSound renderer will silently refuse to transition to running + * if it hasn't finished pausing yet. Once it does it reports itself as + * completely paused. */ + + IMediaControl_Release(control); +} + static void test_connect_pin(void) { + ALLOCATOR_PROPERTIES req_props = {1, 4 * 44100, 1, 0}, ret_props; WAVEFORMATEX wfx = { .wFormatTag = WAVE_FORMAT_PCM, @@ -695,6 +852,7 @@ static void test_connect_pin(void) }; IBaseFilter *filter = create_dsound_render(); struct testfilter source; + IMemAllocator *allocator; IFilterGraph2 *graph; IMemInputPin *input; AM_MEDIA_TYPE mt; @@ -734,6 +892,22 @@ static void test_connect_pin(void) test_allocator(input); + hr = CoCreateInstance(&CLSID_MemoryAllocator, NULL, CLSCTX_INPROC_SERVER, + &IID_IMemAllocator, (void **)&allocator); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMemAllocator_SetProperties(allocator, &req_props, &ret_props); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!memcmp(&ret_props, &req_props, sizeof(req_props)), "Properties did not match.\n"); + hr = IMemInputPin_NotifyAllocator(input, allocator, TRUE); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMemAllocator_Commit(allocator); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMemInputPin_ReceiveCanBlock(input); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + test_filter_state(input, graph); + hr = IFilterGraph2_Disconnect(graph, pin); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IFilterGraph2_Disconnect(graph, pin); @@ -749,6 +923,8 @@ static void test_connect_pin(void) hr = IPin_ConnectionMediaType(pin, &mt); ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#x.\n", hr); + ref = IMemAllocator_Release(allocator); + ok(!ref, "Got outstanding refcount %d.\n", ref); IMemInputPin_Release(input); IPin_Release(pin); ref = IFilterGraph2_Release(graph); @@ -759,62 +935,6 @@ static void test_connect_pin(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } -static void test_pin(IPin *pin) -{ - IMemInputPin *mpin = NULL; - - IPin_QueryInterface(pin, &IID_IMemInputPin, (void **)&mpin); - - ok(mpin != NULL, "No IMemInputPin found!\n"); - if (mpin) - { - ok(IMemInputPin_ReceiveCanBlock(mpin) == S_OK, "Receive can't block for pin!\n"); - ok(IMemInputPin_NotifyAllocator(mpin, NULL, 0) == E_POINTER, "NotifyAllocator likes a NULL pointer argument\n"); - IMemInputPin_Release(mpin); - } - /* TODO */ -} - -static void test_basefilter(void) -{ - IEnumPins *pin_enum = NULL; - IBaseFilter *base = create_dsound_render(); - IPin *pins[2]; - ULONG ref; - HRESULT hr; - - hr = IBaseFilter_EnumPins(base, NULL); - ok(hr == E_POINTER, "hr = %08x and not E_POINTER\n", hr); - - hr= IBaseFilter_EnumPins(base, &pin_enum); - ok(hr == S_OK, "hr = %08x and not S_OK\n", hr); - - hr = IEnumPins_Next(pin_enum, 1, NULL, NULL); - ok(hr == E_POINTER, "hr = %08x and not E_POINTER\n", hr); - - hr = IEnumPins_Next(pin_enum, 2, pins, NULL); - ok(hr == E_INVALIDARG, "hr = %08x and not E_INVALIDARG\n", hr); - - pins[0] = (void *)0xdead; - pins[1] = (void *)0xdeed; - - hr = IEnumPins_Next(pin_enum, 2, pins, &ref); - ok(hr == S_FALSE, "hr = %08x instead of S_FALSE\n", hr); - ok(pins[0] != (void *)0xdead && pins[0] != NULL, "pins[0] = %p\n", pins[0]); - if (pins[0] != (void *)0xdead && pins[0] != NULL) - { - test_pin(pins[0]); - IPin_Release(pins[0]); - } - - ok(pins[1] == (void *)0xdeed, "pins[1] = %p\n", pins[1]); - - ref = IEnumPins_Release(pin_enum); - ok(ref == 0, "ref is %u and not 0!\n", ref); - - IBaseFilter_Release(base); -} - static void test_unconnected_filter_state(void) { IBaseFilter *filter = create_dsound_render(); @@ -1016,7 +1136,6 @@ START_TEST(dsoundrender) test_unconnected_filter_state(); test_media_types(); test_connect_pin(); - test_basefilter(); CoUninitialize(); }

1 0

Piotr Caban : comctl32: Offset client area when toolbar divider is present.
by Alexandre Julliard July 17, 2020

July 17, 2020

Module: wine Branch: master Commit: 378548581d8799e7f9453f93ed4a7d6faa0377a7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=378548581d8799e7f9453f93… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jul 17 16:17:29 2020 +0200 comctl32: Offset client area when toolbar divider is present. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/toolbar.c | 5 +++++ dlls/comctl32/toolbar.c | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index f973d9cfff..b1ac1cd8bf 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -1649,6 +1649,11 @@ static void test_sizes(void) ok(rect.top == 0, "rect.top = %d\n", rect.top); ok(rect.bottom == 26, "rect.bottom = %d\n", rect.bottom); + rebuild_toolbar_ex(&hToolbar, WS_EX_DLGMODALFRAME); + GetClientRect(hToolbar, &rect); + ok(rect.top == 0, "rect.top = %d\n", rect.top); + ok(rect.bottom == 26, "rect.bottom = %d\n", rect.bottom); + free_tbsize_results(); DestroyWindow(hToolbar); } diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index b2711a3eb8..c9ea56c078 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -3104,9 +3104,9 @@ TOOLBAR_AutoSize (TOOLBAR_INFO *infoPtr) if (infoPtr->dwStyle & CCS_NOPARENTALIGN) uPosFlags |= SWP_NOMOVE; - - if (!(infoPtr->dwStyle & CCS_NODIVIDER)) - cy += GetSystemMetrics(SM_CYEDGE); + + if (!(infoPtr->dwStyle & CCS_NOMOVEY) && !(infoPtr->dwStyle & CCS_NODIVIDER)) + y += GetSystemMetrics(SM_CYEDGE); x += border.left; y += border.top;

1 0

Jacek Caban : server: Introduce IOCTL_CONDRV_ACTIVATE ioctl.
by Alexandre Julliard July 17, 2020

July 17, 2020

Module: wine Branch: master Commit: b68138a62e849036b75954f7a406c64be5d86e21 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b68138a62e849036b75954f7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 17 13:55:40 2020 +0200 server: Introduce IOCTL_CONDRV_ACTIVATE ioctl. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/condrv.h | 1 + server/console.c | 15 +++++++++++++++ server/trace.c | 1 + 3 files changed, 17 insertions(+) diff --git a/include/wine/condrv.h b/include/wine/condrv.h index bf00262d70..fedf3f308c 100644 --- a/include/wine/condrv.h +++ b/include/wine/condrv.h @@ -37,6 +37,7 @@ /* console output ioctls */ #define IOCTL_CONDRV_GET_OUTPUT_INFO CTL_CODE(FILE_DEVICE_CONSOLE, 32, METHOD_BUFFERED, FILE_READ_PROPERTIES) #define IOCTL_CONDRV_SET_OUTPUT_INFO CTL_CODE(FILE_DEVICE_CONSOLE, 33, METHOD_BUFFERED, FILE_WRITE_PROPERTIES) +#define IOCTL_CONDRV_ACTIVATE CTL_CODE(FILE_DEVICE_CONSOLE, 34, METHOD_BUFFERED, FILE_WRITE_DATA) #define IOCTL_CONDRV_FILL_OUTPUT CTL_CODE(FILE_DEVICE_CONSOLE, 35, METHOD_BUFFERED, FILE_WRITE_DATA) /* console renderer ioctls */ diff --git a/server/console.c b/server/console.c index 2785669deb..149a31dd57 100644 --- a/server/console.c +++ b/server/console.c @@ -1694,6 +1694,21 @@ static int screen_buffer_ioctl( struct fd *fd, ioctl_code_t code, struct async * return set_output_info( screen_buffer, params, get_req_data_size() - sizeof(*params) ); } + case IOCTL_CONDRV_ACTIVATE: + if (!screen_buffer->input) + { + set_error( STATUS_INVALID_HANDLE ); + return 0; + } + + if (screen_buffer != screen_buffer->input->active) + { + if (screen_buffer->input->active) release_object( screen_buffer->input->active ); + screen_buffer->input->active = (struct screen_buffer *)grab_object( screen_buffer ); + generate_sb_initial_events( screen_buffer->input ); + } + return 1; + case IOCTL_CONDRV_FILL_OUTPUT: { const struct condrv_fill_output_params *params = get_req_data(); diff --git a/server/trace.c b/server/trace.c index a2ee9c10b7..c3cfd7de12 100644 --- a/server/trace.c +++ b/server/trace.c @@ -114,6 +114,7 @@ static void dump_ioctl_code( const char *prefix, const ioctl_code_t *code ) switch(*code) { #define CASE(c) case c: fprintf( stderr, "%s%s", prefix, #c ); break + CASE(IOCTL_CONDRV_ACTIVATE); CASE(IOCTL_CONDRV_ATTACH_RENDERER); CASE(IOCTL_CONDRV_FILL_OUTPUT); CASE(IOCTL_CONDRV_GET_INPUT_INFO);

1 0

Francois Gouget : msvcrt: Fix the spelling of a TRACE() message.
by Alexandre Julliard July 17, 2020

July 17, 2020

Module: wine Branch: master Commit: f16a631c2a4fb8c156834f36e772cd4b87b7fa3e URL: https://source.winehq.org/git/wine.git/?a=commit;h=f16a631c2a4fb8c156834f36… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Jul 17 13:22:39 2020 +0200 msvcrt: Fix the spelling of a TRACE() message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/printf.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcrt/printf.h b/dlls/msvcrt/printf.h index 46df340839..f776a1fa4b 100644 --- a/dlls/msvcrt/printf.h +++ b/dlls/msvcrt/printf.h @@ -585,7 +585,7 @@ static inline int FUNC_NAME(pf_output_fp)(FUNC_NAME(puts_clbk) pf_puts, void *pu ULONGLONG m; DWORD l; - TRACE("floting point argument: %.16le\n", v); + TRACE("floating point argument: %.16le\n", v); if(flags->Precision == -1) flags->Precision = 6;

1 0

Matteo Bruni : wined3d: Add GPU information for AMD Raven Ridge.
by Alexandre Julliard July 17, 2020

July 17, 2020

Module: wine Branch: master Commit: 435f7fb2f2c511068b1e64c373fb0f1900ddd669 URL: https://source.winehq.org/git/wine.git/?a=commit;h=435f7fb2f2c511068b1e64c3… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Jul 16 18:50:05 2020 +0200 wined3d: Add GPU information for AMD Raven Ridge. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 1 + dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 2 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 1f892a9d48..533d99f026 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -507,6 +507,7 @@ static const struct wined3d_gpu_description gpu_description_table[] = {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_480, "Radeon (TM) RX 480 Graphics", DRIVER_AMD_RX, 4096}, {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_VEGA_10, "Radeon RX Vega", DRIVER_AMD_RX, 8192}, {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_VEGA_12, "Radeon Pro Vega 20", DRIVER_AMD_RX, 4096}, + {HW_VENDOR_AMD, CARD_AMD_RADEON_RAVEN, "AMD Radeon(TM) Vega 10 Mobile Graphics", DRIVER_AMD_RX, 1024}, {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_VEGA_20, "Radeon RX Vega 20", DRIVER_AMD_RX, 4096}, {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_NAVI_10, "Radeon RX 5700 / 5700 XT", DRIVER_AMD_RX, 8192}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index bb79173c38..82dfd50775 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2814,6 +2814,7 @@ enum wined3d_pci_device CARD_AMD_RADEON_RX_480 = 0x67df, CARD_AMD_RADEON_RX_VEGA_10 = 0x687f, CARD_AMD_RADEON_RX_VEGA_12 = 0x69af, + CARD_AMD_RADEON_RAVEN = 0x15dd, CARD_AMD_RADEON_RX_VEGA_20 = 0x66af, CARD_AMD_RADEON_RX_NAVI_10 = 0x731f,

1 0

Brendan Shanks : user32: Create separate FIXME() messages for each packet type in DisplayConfigGetDeviceInfo().
by Alexandre Julliard July 17, 2020

July 17, 2020

Module: wine Branch: master Commit: 27ed9c95a2bbdbf7d86309cf1b9c9fefc157a0fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=27ed9c95a2bbdbf7d86309cf… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Tue Jul 14 13:34:23 2020 -0700 user32: Create separate FIXME() messages for each packet type in DisplayConfigGetDeviceInfo(). Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 8b2b3381dc..3ec6c54023 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -4815,7 +4815,7 @@ done: */ LONG WINAPI DisplayConfigGetDeviceInfo(DISPLAYCONFIG_DEVICE_INFO_HEADER *packet) { - FIXME("stub: %p\n", packet); + TRACE("(%p)\n", packet); if (!packet || packet->size < sizeof(*packet)) return ERROR_GEN_FAILURE; @@ -4825,6 +4825,9 @@ LONG WINAPI DisplayConfigGetDeviceInfo(DISPLAYCONFIG_DEVICE_INFO_HEADER *packet) case DISPLAYCONFIG_DEVICE_INFO_GET_SOURCE_NAME: { DISPLAYCONFIG_SOURCE_DEVICE_NAME *source_name = (DISPLAYCONFIG_SOURCE_DEVICE_NAME *)packet; + + FIXME("DISPLAYCONFIG_DEVICE_INFO_GET_SOURCE_NAME: stub\n"); + if (packet->size < sizeof(*source_name)) return ERROR_INVALID_PARAMETER; @@ -4833,6 +4836,9 @@ LONG WINAPI DisplayConfigGetDeviceInfo(DISPLAYCONFIG_DEVICE_INFO_HEADER *packet) case DISPLAYCONFIG_DEVICE_INFO_GET_TARGET_NAME: { DISPLAYCONFIG_TARGET_DEVICE_NAME *target_name = (DISPLAYCONFIG_TARGET_DEVICE_NAME *)packet; + + FIXME("DISPLAYCONFIG_DEVICE_INFO_GET_TARGET_NAME: stub\n"); + if (packet->size < sizeof(*target_name)) return ERROR_INVALID_PARAMETER; @@ -4841,6 +4847,9 @@ LONG WINAPI DisplayConfigGetDeviceInfo(DISPLAYCONFIG_DEVICE_INFO_HEADER *packet) case DISPLAYCONFIG_DEVICE_INFO_GET_TARGET_PREFERRED_MODE: { DISPLAYCONFIG_TARGET_PREFERRED_MODE *preferred_mode = (DISPLAYCONFIG_TARGET_PREFERRED_MODE *)packet; + + FIXME("DISPLAYCONFIG_DEVICE_INFO_GET_TARGET_PREFERRED_MODE: stub\n"); + if (packet->size < sizeof(*preferred_mode)) return ERROR_INVALID_PARAMETER; @@ -4849,6 +4858,9 @@ LONG WINAPI DisplayConfigGetDeviceInfo(DISPLAYCONFIG_DEVICE_INFO_HEADER *packet) case DISPLAYCONFIG_DEVICE_INFO_GET_ADAPTER_NAME: { DISPLAYCONFIG_ADAPTER_NAME *adapter_name = (DISPLAYCONFIG_ADAPTER_NAME *)packet; + + FIXME("DISPLAYCONFIG_DEVICE_INFO_GET_ADAPTER_NAME: stub\n"); + if (packet->size < sizeof(*adapter_name)) return ERROR_INVALID_PARAMETER;

1 0

Alex Henrie : ws2_32: Avoid depending on system getprotoby(name|number) functions.
by Alexandre Julliard July 17, 2020

July 17, 2020

Module: wine Branch: master Commit: a16f91ae366b9f3f8e371598e13f4ef242f50af3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a16f91ae366b9f3f8e371598… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Jul 15 01:19:04 2020 -0600 ws2_32: Avoid depending on system getprotoby(name|number) functions. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 - configure.ac | 2 - dlls/ws2_32/socket.c | 79 ++++++---------------------------- dlls/ws2_32/tests/protocol.c | 100 +++++++++++++++++++++++++++++++++++++++++++ include/config.h.in | 6 --- 5 files changed, 114 insertions(+), 75 deletions(-) diff --git a/configure b/configure index 24d0a1d8b4..35f8b63ae0 100755 --- a/configure +++ b/configure @@ -18332,8 +18332,6 @@ for ac_func in \ getaddrinfo \ getnameinfo \ getnetbyname \ - getprotobyname \ - getprotobynumber \ getservbyport \ do : diff --git a/configure.ac b/configure.ac index d914e3eca8..928f8ebd1b 100644 --- a/configure.ac +++ b/configure.ac @@ -2245,8 +2245,6 @@ AC_CHECK_FUNCS(\ getaddrinfo \ getnameinfo \ getnetbyname \ - getprotobyname \ - getprotobynumber \ getservbyport \ ) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index d7eddde44d..12126372d5 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -6509,56 +6509,23 @@ static const struct { int prot; const char *names[3]; } protocols[] = { { 0, { "ip", "IP" }}, { 1, { "icmp", "ICMP" }}, - { 2, { "igmp", "IGMP" }}, { 3, { "ggp", "GGP" }}, { 6, { "tcp", "TCP" }}, { 8, { "egp", "EGP" }}, - { 9, { "igp", "IGP" }}, { 12, { "pup", "PUP" }}, { 17, { "udp", "UDP" }}, { 20, { "hmp", "HMP" }}, { 22, { "xns-idp", "XNS-IDP" }}, { 27, { "rdp", "RDP" }}, - { 29, { "iso-tp4", "ISO-TP4" }}, - { 33, { "dccp", "DCCP" }}, - { 36, { "xtp", "XTP" }}, - { 37, { "ddp", "DDP" }}, - { 38, { "idpr-cmtp", "IDPR-CMTP" }}, { 41, { "ipv6", "IPv6" }}, { 43, { "ipv6-route", "IPv6-Route" }}, { 44, { "ipv6-frag", "IPv6-Frag" }}, - { 45, { "idrp", "IDRP" }}, - { 46, { "rsvp", "RSVP" }}, - { 47, { "gre", "GRE" }}, { 50, { "esp", "ESP" }}, { 51, { "ah", "AH" }}, - { 57, { "skip", "SKIP" }}, { 58, { "ipv6-icmp", "IPv6-ICMP" }}, { 59, { "ipv6-nonxt", "IPv6-NoNxt" }}, { 60, { "ipv6-opts", "IPv6-Opts" }}, { 66, { "rvd", "RVD" }}, - { 73, { "rspf", "RSPF" }}, - { 81, { "vmtp", "VMTP" }}, - { 88, { "eigrp", "EIGRP" }}, - { 89, { "ospf", "OSPFIGP" }}, - { 93, { "ax.25", "AX.25" }}, - { 94, { "ipip", "IPIP" }}, - { 97, { "etherip", "ETHERIP" }}, - { 98, { "encap", "ENCAP" }}, - { 103, { "pim", "PIM" }}, - { 108, { "ipcomp", "IPCOMP" }}, - { 112, { "vrrp", "VRRP" }}, - { 115, { "l2tp", "L2TP" }}, - { 124, { "isis", "ISIS" }}, - { 132, { "sctp", "SCTP" }}, - { 133, { "fc", "FC" }}, - { 135, { "mobility-header", "Mobility-Header" }}, - { 136, { "udplite", "UDPLite" }}, - { 137, { "mpls-in-ip", "MPLS-in-IP" }}, - { 139, { "hip", "HIP" }}, - { 140, { "shim6", "Shim6" }}, - { 141, { "wesp", "WESP" }}, - { 142, { "rohc", "ROHC" }}, }; /*********************************************************************** @@ -6567,23 +6534,14 @@ static const struct { int prot; const char *names[3]; } protocols[] = struct WS_protoent* WINAPI WS_getprotobyname(const char* name) { struct WS_protoent* retval = NULL; -#ifdef HAVE_GETPROTOBYNAME - struct protoent* proto; - EnterCriticalSection( &csWSgetXXXbyYYY ); - if( (proto = getprotobyname(name)) != NULL ) - retval = WS_create_pe( proto->p_name, proto->p_aliases, proto->p_proto ); - LeaveCriticalSection( &csWSgetXXXbyYYY ); -#endif - if (!retval) + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(protocols); i++) { - unsigned int i; - for (i = 0; i < ARRAY_SIZE(protocols); i++) - { - if (_strnicmp( protocols[i].names[0], name, -1 )) continue; - retval = WS_create_pe( protocols[i].names[0], (char **)protocols[i].names + 1, - protocols[i].prot ); - break; - } + if (_strnicmp( protocols[i].names[0], name, -1 )) continue; + retval = WS_create_pe( protocols[i].names[0], (char **)protocols[i].names + 1, + protocols[i].prot ); + break; } if (!retval) { @@ -6601,23 +6559,14 @@ struct WS_protoent* WINAPI WS_getprotobyname(const char* name) struct WS_protoent* WINAPI WS_getprotobynumber(int number) { struct WS_protoent* retval = NULL; -#ifdef HAVE_GETPROTOBYNUMBER - struct protoent* proto; - EnterCriticalSection( &csWSgetXXXbyYYY ); - if( (proto = getprotobynumber(number)) != NULL ) - retval = WS_create_pe( proto->p_name, proto->p_aliases, proto->p_proto ); - LeaveCriticalSection( &csWSgetXXXbyYYY ); -#endif - if (!retval) + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(protocols); i++) { - unsigned int i; - for (i = 0; i < ARRAY_SIZE(protocols); i++) - { - if (protocols[i].prot != number) continue; - retval = WS_create_pe( protocols[i].names[0], (char **)protocols[i].names + 1, - protocols[i].prot ); - break; - } + if (protocols[i].prot != number) continue; + retval = WS_create_pe( protocols[i].names[0], (char **)protocols[i].names + 1, + protocols[i].prot ); + break; } if (!retval) { diff --git a/dlls/ws2_32/tests/protocol.c b/dlls/ws2_32/tests/protocol.c index 99bd1373a9..de5fe36d45 100644 --- a/dlls/ws2_32/tests/protocol.c +++ b/dlls/ws2_32/tests/protocol.c @@ -192,6 +192,104 @@ static void test_WSAEnumProtocolsW(void) } } +struct protocol +{ + int prot; + const char *names[2]; + BOOL missing_from_xp; +}; + +static const struct protocol protocols[] = +{ + { 0, { "ip", "IP" }}, + { 1, { "icmp", "ICMP" }}, + { 3, { "ggp", "GGP" }}, + { 6, { "tcp", "TCP" }}, + { 8, { "egp", "EGP" }}, + { 12, { "pup", "PUP" }}, + { 17, { "udp", "UDP" }}, + { 20, { "hmp", "HMP" }}, + { 22, { "xns-idp", "XNS-IDP" }}, + { 27, { "rdp", "RDP" }}, + { 41, { "ipv6", "IPv6" }, TRUE}, + { 43, { "ipv6-route", "IPv6-Route" }, TRUE}, + { 44, { "ipv6-frag", "IPv6-Frag" }, TRUE}, + { 50, { "esp", "ESP" }}, + { 51, { "ah", "AH" }}, + { 58, { "ipv6-icmp", "IPv6-ICMP" }, TRUE}, + { 59, { "ipv6-nonxt", "IPv6-NoNxt" }, TRUE}, + { 60, { "ipv6-opts", "IPv6-Opts" }, TRUE}, + { 66, { "rvd", "RVD" }}, +}; + +static const struct protocol *find_protocol(int number) +{ + int i; + for (i = 0; i < ARRAY_SIZE(protocols); i++) + { + if (protocols[i].prot == number) + return &protocols[i]; + } + return NULL; +} + +static void test_getprotobyname(void) +{ + struct protoent *ent; + char all_caps_name[16]; + int i, j; + + for (i = 0; i < ARRAY_SIZE(protocols); i++) + { + for (j = 0; j < ARRAY_SIZE(protocols[0].names); j++) + { + ent = getprotobyname(protocols[i].names[j]); + ok((ent && ent->p_proto == protocols[i].prot) || broken(!ent && protocols[i].missing_from_xp), + "Expected %s to be protocol number %d, got %d\n", + wine_dbgstr_a(protocols[i].names[j]), protocols[i].prot, ent ? ent->p_proto : -1); + } + + for (j = 0; protocols[i].names[0][j]; j++) + all_caps_name[j] = toupper(protocols[i].names[0][j]); + all_caps_name[j] = 0; + ent = getprotobyname(all_caps_name); + ok((ent && ent->p_proto == protocols[i].prot) || broken(!ent && protocols[i].missing_from_xp), + "Expected %s to be protocol number %d, got %d\n", + wine_dbgstr_a(all_caps_name), protocols[i].prot, ent ? ent->p_proto : -1); + } +} + +static void test_getprotobynumber(void) +{ + struct protoent *ent; + const struct protocol *ref; + int i; + + for (i = -1; i <= 256; i++) + { + ent = getprotobynumber(i); + ref = find_protocol(i); + + if (!ref) + { + ok(!ent, "Expected protocol number %d to be undefined, got %s\n", + i, wine_dbgstr_a(ent ? ent->p_name : NULL)); + continue; + } + + ok((ent && ent->p_name && strcmp(ent->p_name, ref->names[0]) == 0) || + broken(!ent && ref->missing_from_xp), + "Expected protocol number %d to be %s, got %s\n", + i, ref->names[0], wine_dbgstr_a(ent ? ent->p_name : NULL)); + + ok((ent && ent->p_aliases && ent->p_aliases[0] && + strcmp(ent->p_aliases[0], ref->names[1]) == 0) || + broken(!ent && ref->missing_from_xp), + "Expected protocol number %d alias 0 to be %s, got %s\n", + i, ref->names[0], wine_dbgstr_a(ent && ent->p_aliases ? ent->p_aliases[0] : NULL)); + } +} + START_TEST( protocol ) { WSADATA data; @@ -201,4 +299,6 @@ START_TEST( protocol ) test_WSAEnumProtocolsA(); test_WSAEnumProtocolsW(); + test_getprotobyname(); + test_getprotobynumber(); } diff --git a/include/config.h.in b/include/config.h.in index 720cbd4a5d..3a3277e613 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -245,12 +245,6 @@ /* Define to 1 if you have the `getopt_long_only' function. */ #undef HAVE_GETOPT_LONG_ONLY -/* Define to 1 if you have the `getprotobyname' function. */ -#undef HAVE_GETPROTOBYNAME - -/* Define to 1 if you have the `getprotobynumber' function. */ -#undef HAVE_GETPROTOBYNUMBER - /* Define to 1 if you have the `getservbyport' function. */ #undef HAVE_GETSERVBYPORT

1 0