July 2019 - Wine-Devel - list.winehq.org

Re: [PATCH] quartz: Remove unused function.

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=54394 Your paranoid android. === debian9 (build log) === Task errors: The task timed out

July 3, 2019

Re: [PATCH] kernel32: Remove unused functions.

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=54393 Your paranoid android. === debian9 (build log) === Task errors: The task timed out

July 3, 2019

Re: [PATCH] devenum: Don't free with uninitialized pointer value.

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=54392 Your paranoid android. === debian9 (build log) === Task errors: The task timed out

July 3, 2019

Re: [PATCH] d3d10core/tests: Use d3d10 enumeration types.

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=54391 Your paranoid android. === debian9 (32 bit report) === d3d10core: d3d10core.c:4779: Test failed: Got unexpected CPrimitives count: 3. === debian9 (32 bit French report) === d3d10core: d3d10core.c:4972: Test succeeded inside todo block: Got unexpected PrimitivesStorageNeeded: 0. Report errors: d3d10core:d3d10core has no test summary line (early exit of the main process?) d3d10core:d3d10core has unaccounted for failure messages d3d10core:d3d10core has unaccounted for todo messages d3d10core:d3d10core has unaccounted for skip messages d3d10core:d3d10core returned success despite having failures === debian9 (build log) === X Error of failed request: GLXBadFBConfig Major opcode of failed request: 154 (GLX) Minor opcode of failed request: 34 () === debian9 (build log) === Task errors: The task timed out

July 3, 2019

[PATCH] quartz: Remove unused function.

by Nikolay Sivov

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/quartz/filesource.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index a7063fea78..9ab5d3e3cb 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -647,11 +647,6 @@ static inline AsyncReader *impl_from_BaseOutputPin(BaseOutputPin *iface) return CONTAINING_RECORD(iface, AsyncReader, source); } -static inline BaseOutputPin *impl_BaseOutputPin_from_BasePin(BasePin *iface) -{ - return CONTAINING_RECORD(iface, BaseOutputPin, pin); -} - static inline AsyncReader *impl_from_IAsyncReader(IAsyncReader *iface) { return CONTAINING_RECORD(iface, AsyncReader, IAsyncReader_iface); -- 2.20.1

July 3, 2019

[PATCH] kernel32: Remove unused functions.

by Nikolay Sivov

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/kernel32/sync.c | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index 49374ccd62..d8d0f20ce6 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -50,12 +50,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(sync); -/* check if current version is NT or Win95 */ -static inline BOOL is_version_nt(void) -{ - return !(GetVersion() & 0x80000000); -} - static void get_create_object_attributes( OBJECT_ATTRIBUTES *attr, UNICODE_STRING *nameW, SECURITY_ATTRIBUTES *sa, const WCHAR *name ) { @@ -89,14 +83,6 @@ static BOOL get_open_object_attributes( OBJECT_ATTRIBUTES *attr, UNICODE_STRING return TRUE; } -/* helper for kernel32->ntdll timeout format conversion */ -static inline PLARGE_INTEGER get_nt_timeout( PLARGE_INTEGER pTime, DWORD timeout ) -{ - if (timeout == INFINITE) return NULL; - pTime->QuadPart = (ULONGLONG)timeout * -10000; - return pTime; -} - /*********************************************************************** * SwitchToThread (KERNEL32.@) */ -- 2.20.1

July 3, 2019

[PATCH] devenum: Don't free with uninitialized pointer value.

by Nikolay Sivov

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/devenum/createdevenum.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/devenum/createdevenum.c b/dlls/devenum/createdevenum.c index 76bb0c249a..8e82fcdeac 100644 --- a/dlls/devenum/createdevenum.c +++ b/dlls/devenum/createdevenum.c @@ -379,9 +379,9 @@ static void free_regfilter2(REGFILTER2 *rgf) static void write_filter_data(IPropertyBag *prop_bag, REGFILTER2 *rgf) { + BYTE *data = NULL, *array; IAMFilterData *fildata; SAFEARRAYBOUND sabound; - BYTE *data, *array; VARIANT var = {}; ULONG size; HRESULT hr; -- 2.20.1

July 3, 2019

[PATCH] d3d10core/tests: Use d3d10 enumeration types.

by Nikolay Sivov

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d10core/tests/d3d10core.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index a395467125..f65bd34a79 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -1835,7 +1835,7 @@ static void test_texture1d_interfaces(void) desc.MipLevels = 1; desc.ArraySize = 1; desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; - desc.Usage = D3D11_USAGE_DEFAULT; + desc.Usage = D3D10_USAGE_DEFAULT; desc.BindFlags = current->bind_flags; desc.CPUAccessFlags = 0; desc.MiscFlags = current->misc_flags; @@ -17524,8 +17524,8 @@ static void test_multiple_viewports(void) /* Two viewports, only first scissor rectangle set. */ memset(&rasterizer_desc, 0, sizeof(rasterizer_desc)); - rasterizer_desc.FillMode = D3D11_FILL_SOLID; - rasterizer_desc.CullMode = D3D11_CULL_BACK; + rasterizer_desc.FillMode = D3D10_FILL_SOLID; + rasterizer_desc.CullMode = D3D10_CULL_BACK; rasterizer_desc.DepthClipEnable = TRUE; rasterizer_desc.ScissorEnable = TRUE; hr = ID3D10Device_CreateRasterizerState(device, &rasterizer_desc, &rasterizer_state); -- 2.20.1

July 3, 2019

[PATCH 5/5] strmbase: Rename pfnOnStopStreaming to renderer_stop_stream.

by Zebediah Figura

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/dsoundrender.c | 4 ++-- dlls/quartz/videorenderer.c | 4 ++-- dlls/quartz/vmr9.c | 4 ++-- dlls/strmbase/renderer.c | 8 ++++---- include/wine/strmbase.h | 3 +-- 5 files changed, 11 insertions(+), 12 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index a4e374b5897..8db7263d1e1 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -424,7 +424,7 @@ static HRESULT WINAPI DSoundRender_CheckMediaType(BaseRenderer *iface, const AM_ return S_OK; } -static VOID WINAPI DSoundRender_OnStopStreaming(BaseRenderer * iface) +static void dsound_render_stop_stream(BaseRenderer *iface) { DSoundRenderImpl *This = impl_from_BaseRenderer(iface); @@ -606,7 +606,7 @@ static const BaseRendererFuncTable BaseFuncTable = .pfnCheckMediaType = DSoundRender_CheckMediaType, .pfnDoRenderSample = DSoundRender_DoRenderSample, .renderer_start_stream = dsound_render_start_stream, - .pfnOnStopStreaming = DSoundRender_OnStopStreaming, + .renderer_stop_stream = dsound_render_stop_stream, .pfnShouldDrawSampleNow = DSoundRender_ShouldDrawSampleNow, .pfnPrepareReceive = DSoundRender_PrepareReceive, .pfnCompleteConnect = DSoundRender_CompleteConnect, diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 970e9f411f1..00abfdf6370 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -405,7 +405,7 @@ static HRESULT video_renderer_query_interface(BaseRenderer *iface, REFIID iid, v return S_OK; } -static VOID WINAPI VideoRenderer_OnStopStreaming(BaseRenderer* iface) +static void video_renderer_stop_stream(BaseRenderer *iface) { VideoRendererImpl *This = impl_from_BaseRenderer(iface); @@ -474,7 +474,7 @@ static const BaseRendererFuncTable BaseFuncTable = .pfnCheckMediaType = VideoRenderer_CheckMediaType, .pfnDoRenderSample = VideoRenderer_DoRenderSample, .renderer_start_stream = video_renderer_start_stream, - .pfnOnStopStreaming = VideoRenderer_OnStopStreaming, + .renderer_stop_stream = video_renderer_stop_stream, .pfnShouldDrawSampleNow = VideoRenderer_ShouldDrawSampleNow, .pfnEndFlush = VideoRenderer_EndFlush, .renderer_destroy = video_renderer_destroy, diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 6c0d6a5ffc7..55fb171a176 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -447,7 +447,7 @@ static void vmr_start_stream(BaseRenderer *iface) GetClientRect(This->baseControlWindow.baseWindow.hWnd, &This->target_rect); } -static VOID WINAPI VMR9_OnStopStreaming(BaseRenderer* iface) +static void vmr_stop_stream(BaseRenderer *iface) { struct quartz_vmr *This = impl_from_IBaseFilter(&iface->filter.IBaseFilter_iface); @@ -563,7 +563,7 @@ static const BaseRendererFuncTable BaseFuncTable = .pfnCheckMediaType = VMR9_CheckMediaType, .pfnDoRenderSample = VMR9_DoRenderSample, .renderer_start_stream = vmr_start_stream, - .pfnOnStopStreaming = VMR9_OnStopStreaming, + .renderer_stop_stream = vmr_stop_stream, .pfnShouldDrawSampleNow = VMR9_ShouldDrawSampleNow, .pfnCompleteConnect = VMR9_CompleteConnect, .pfnBreakConnect = VMR9_BreakConnect, diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index 6a6119afdd1..0972f499c5a 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -399,8 +399,8 @@ HRESULT WINAPI BaseRendererImpl_Stop(IBaseFilter * iface) EnterCriticalSection(&This->csRenderLock); { RendererPosPassThru_ResetMediaTime(This->pPosition); - if (This->pFuncsTable->pfnOnStopStreaming) - This->pFuncsTable->pfnOnStopStreaming(This); + if (This->pFuncsTable->renderer_stop_stream) + This->pFuncsTable->renderer_stop_stream(This); This->filter.state = State_Stopped; SetEvent(This->state_event); SetEvent(This->flush_event); @@ -469,8 +469,8 @@ HRESULT WINAPI BaseRendererImpl_Pause(IBaseFilter * iface) ResetEvent(This->state_event); This->sink.end_of_stream = FALSE; } - else if (This->pFuncsTable->pfnOnStopStreaming) - This->pFuncsTable->pfnOnStopStreaming(This); + else if (This->pFuncsTable->renderer_stop_stream) + This->pFuncsTable->renderer_stop_stream(This); if (This->filter.state == State_Stopped) BaseRendererImpl_ClearPendingSample(This); diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 942f7806294..b1483fc26c9 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -562,7 +562,6 @@ typedef HRESULT (WINAPI *BaseRenderer_DoRenderSample)(BaseRenderer *This, IMedia typedef VOID (WINAPI *BaseRenderer_OnReceiveFirstSample)(BaseRenderer *This, IMediaSample *pMediaSample); typedef VOID (WINAPI *BaseRenderer_OnRenderEnd)(BaseRenderer *This, IMediaSample *pMediaSample); typedef VOID (WINAPI *BaseRenderer_OnRenderStart)(BaseRenderer *This, IMediaSample *pMediaSample); -typedef VOID (WINAPI *BaseRenderer_OnStopStreaming)(BaseRenderer *This); typedef VOID (WINAPI *BaseRenderer_OnWaitEnd)(BaseRenderer *This); typedef VOID (WINAPI *BaseRenderer_OnWaitStart)(BaseRenderer *This); typedef VOID (WINAPI *BaseRenderer_PrepareRender)(BaseRenderer *This); @@ -578,7 +577,7 @@ typedef struct BaseRendererFuncTable { BaseRenderer_CheckMediaType pfnCheckMediaType; BaseRenderer_DoRenderSample pfnDoRenderSample; void (*renderer_start_stream)(BaseRenderer *iface); - BaseRenderer_OnStopStreaming pfnOnStopStreaming; + void (*renderer_stop_stream)(BaseRenderer *iface); BaseRenderer_ShouldDrawSampleNow pfnShouldDrawSampleNow; BaseRenderer_PrepareReceive pfnPrepareReceive; BaseRenderer_CompleteConnect pfnCompleteConnect; -- 2.22.0

July 3, 2019

[PATCH 4/5] strmbase: Rename pfnOnStartStreaming to renderer_start_stream.

by Zebediah Figura

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/dsoundrender.c | 4 ++-- dlls/quartz/videorenderer.c | 4 ++-- dlls/quartz/vmr9.c | 4 ++-- dlls/strmbase/renderer.c | 4 ++-- include/wine/strmbase.h | 3 +-- 5 files changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 5cd5e11f9fe..a4e374b5897 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -434,7 +434,7 @@ static VOID WINAPI DSoundRender_OnStopStreaming(BaseRenderer * iface) This->writepos = This->buf_size; } -static VOID WINAPI DSoundRender_OnStartStreaming(BaseRenderer * iface) +static void dsound_render_start_stream(BaseRenderer *iface) { DSoundRenderImpl *This = impl_from_BaseRenderer(iface); @@ -605,7 +605,7 @@ static const BaseRendererFuncTable BaseFuncTable = { .pfnCheckMediaType = DSoundRender_CheckMediaType, .pfnDoRenderSample = DSoundRender_DoRenderSample, - .pfnOnStartStreaming = DSoundRender_OnStartStreaming, + .renderer_start_stream = dsound_render_start_stream, .pfnOnStopStreaming = DSoundRender_OnStopStreaming, .pfnShouldDrawSampleNow = DSoundRender_ShouldDrawSampleNow, .pfnPrepareReceive = DSoundRender_PrepareReceive, diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index ae866c8c62e..970e9f411f1 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -417,7 +417,7 @@ static VOID WINAPI VideoRenderer_OnStopStreaming(BaseRenderer* iface) RedrawWindow(This->baseControlWindow.baseWindow.hWnd, NULL, NULL, RDW_INVALIDATE|RDW_ERASE); } -static VOID WINAPI VideoRenderer_OnStartStreaming(BaseRenderer* iface) +static void video_renderer_start_stream(BaseRenderer *iface) { VideoRendererImpl *This = impl_from_BaseRenderer(iface); @@ -473,7 +473,7 @@ static const BaseRendererFuncTable BaseFuncTable = { .pfnCheckMediaType = VideoRenderer_CheckMediaType, .pfnDoRenderSample = VideoRenderer_DoRenderSample, - .pfnOnStartStreaming = VideoRenderer_OnStartStreaming, + .renderer_start_stream = video_renderer_start_stream, .pfnOnStopStreaming = VideoRenderer_OnStopStreaming, .pfnShouldDrawSampleNow = VideoRenderer_ShouldDrawSampleNow, .pfnEndFlush = VideoRenderer_EndFlush, diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index bafe91da36a..6c0d6a5ffc7 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -429,7 +429,7 @@ static HRESULT VMR9_maybe_init(struct quartz_vmr *This, BOOL force) return hr; } -static VOID WINAPI VMR9_OnStartStreaming(BaseRenderer* iface) +static void vmr_start_stream(BaseRenderer *iface) { struct quartz_vmr *This = impl_from_IBaseFilter(&iface->filter.IBaseFilter_iface); @@ -562,7 +562,7 @@ static const BaseRendererFuncTable BaseFuncTable = { .pfnCheckMediaType = VMR9_CheckMediaType, .pfnDoRenderSample = VMR9_DoRenderSample, - .pfnOnStartStreaming = VMR9_OnStartStreaming, + .renderer_start_stream = vmr_start_stream, .pfnOnStopStreaming = VMR9_OnStopStreaming, .pfnShouldDrawSampleNow = VMR9_ShouldDrawSampleNow, .pfnCompleteConnect = VMR9_CompleteConnect, diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index b73ce5469cd..6a6119afdd1 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -441,8 +441,8 @@ HRESULT WINAPI BaseRendererImpl_Run(IBaseFilter * iface, REFERENCE_TIME tStart) if (SUCCEEDED(hr)) { QualityControlRender_Start(This->qcimpl, This->filter.rtStreamStart); - if (This->pFuncsTable->pfnOnStartStreaming) - This->pFuncsTable->pfnOnStartStreaming(This); + if (This->pFuncsTable->renderer_start_stream) + This->pFuncsTable->renderer_start_stream(This); if (This->filter.state == State_Stopped) BaseRendererImpl_ClearPendingSample(This); This->filter.state = State_Running; diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 6e369b872f9..942f7806294 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -562,7 +562,6 @@ typedef HRESULT (WINAPI *BaseRenderer_DoRenderSample)(BaseRenderer *This, IMedia typedef VOID (WINAPI *BaseRenderer_OnReceiveFirstSample)(BaseRenderer *This, IMediaSample *pMediaSample); typedef VOID (WINAPI *BaseRenderer_OnRenderEnd)(BaseRenderer *This, IMediaSample *pMediaSample); typedef VOID (WINAPI *BaseRenderer_OnRenderStart)(BaseRenderer *This, IMediaSample *pMediaSample); -typedef VOID (WINAPI *BaseRenderer_OnStartStreaming)(BaseRenderer *This); typedef VOID (WINAPI *BaseRenderer_OnStopStreaming)(BaseRenderer *This); typedef VOID (WINAPI *BaseRenderer_OnWaitEnd)(BaseRenderer *This); typedef VOID (WINAPI *BaseRenderer_OnWaitStart)(BaseRenderer *This); @@ -578,7 +577,7 @@ typedef HRESULT (WINAPI *BaseRenderer_CompleteConnect) (BaseRenderer *This, IPin typedef struct BaseRendererFuncTable { BaseRenderer_CheckMediaType pfnCheckMediaType; BaseRenderer_DoRenderSample pfnDoRenderSample; - BaseRenderer_OnStartStreaming pfnOnStartStreaming; + void (*renderer_start_stream)(BaseRenderer *iface); BaseRenderer_OnStopStreaming pfnOnStopStreaming; BaseRenderer_ShouldDrawSampleNow pfnShouldDrawSampleNow; BaseRenderer_PrepareReceive pfnPrepareReceive; -- 2.22.0

July 3, 2019