wine-commits July 2019

wine-commits@winehq.org

2 participants
228 discussions

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to shader_glsl_find_ffp_fragment_shader ().
by Alexandre Julliard 03 Jul '19

03 Jul '19

Module: wine Branch: master Commit: d86f6a4ab735d8aeab4964036d5cc72e5a1900a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d86f6a4ab735d8aeab496403… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jul 3 16:37:03 2019 +0430 wined3d: Pass a wined3d_context_gl structure to shader_glsl_find_ffp_fragment_shader(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index ed3ff54..88f1cae 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -9793,9 +9793,8 @@ static struct glsl_ffp_vertex_shader *shader_glsl_find_ffp_vertex_shader(struct } static struct glsl_ffp_fragment_shader *shader_glsl_find_ffp_fragment_shader(struct shader_glsl_priv *priv, - const struct ffp_frag_settings *args, const struct wined3d_context *context) + const struct ffp_frag_settings *args, const struct wined3d_context_gl *context_gl) { - const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); struct glsl_ffp_fragment_shader *glsl_desc; const struct ffp_frag_desc *desc; @@ -10207,7 +10206,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const struct ffp_frag_settings settings; gen_ffp_frag_op(context, state, &settings, FALSE); - ffp_shader = shader_glsl_find_ffp_fragment_shader(priv, &settings, context); + ffp_shader = shader_glsl_find_ffp_fragment_shader(priv, &settings, context_gl); ps_id = ffp_shader->id; ps_list = &ffp_shader->linked_programs; }

1 0

Nikolay Sivov : d3d10core/tests: Use d3d10 enumeration types.
by Alexandre Julliard 03 Jul '19

03 Jul '19

Module: wine Branch: master Commit: b8f032e6c0504bed6367b7afa83a87166f87e25c URL: https://source.winehq.org/git/wine.git/?a=commit;h=b8f032e6c0504bed6367b7af… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jul 3 11:11:03 2019 +0300 d3d10core/tests: Use d3d10 enumeration types. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 a395467..f65bd34 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);

1 0

Alexandre Julliard : configure: Error on unused command line argument to catch unknown options with clang.
by Alexandre Julliard 03 Jul '19

03 Jul '19

Module: wine Branch: master Commit: 3b5f48abc5bd84b153649deabbfcadf6161d3689 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b5f48abc5bd84b153649dea… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 3 11:00:17 2019 +0200 configure: Error on unused command line argument to catch unknown options with clang. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 29 +++++++++++++++++++++++++++-- configure.ac | 5 +++-- 2 files changed, 30 insertions(+), 4 deletions(-) diff --git a/configure b/configure index 3b6d744..20d8ced 100755 --- a/configure +++ b/configure @@ -16737,6 +16737,31 @@ $as_echo "$ac_cv_cflags__Werror_unknown_warning_option" >&6; } if test "x$ac_cv_cflags__Werror_unknown_warning_option" = xyes; then : CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking whether the compiler supports -Werror=unused-command-line-argument... " >&6; } +if ${ac_cv_cflags__Werror_unused_command_line_argument+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_wine_try_cflags_saved=$CFLAGS +CFLAGS="$CFLAGS -Werror=unused-command-line-argument" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int main(int argc, char **argv) { return 0; } +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_cflags__Werror_unused_command_line_argument=yes +else + ac_cv_cflags__Werror_unused_command_line_argument=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +CFLAGS=$ac_wine_try_cflags_saved +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Werror_unused_command_line_argument" >&5 +$as_echo "$ac_cv_cflags__Werror_unused_command_line_argument" >&6; } +if test "x$ac_cv_cflags__Werror_unused_command_line_argument" = xyes; then : + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" +fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wdeclaration-after-statement" >&5 $as_echo_n "checking whether the compiler supports -Wdeclaration-after-statement... " >&6; } if ${ac_cv_cflags__Wdeclaration_after_statement+:} false; then : @@ -17122,8 +17147,6 @@ $as_echo "$ac_cv_c_logicalop_noisy" >&6; } test "$ac_cv_c_logicalop_noisy" = yes || EXTRACFLAGS="$EXTRACFLAGS -Wlogical-op" fi - CFLAGS=$saved_CFLAGS - for ac_flag in $CFLAGS; do case $ac_flag in -g) { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -gdwarf-2" >&5 @@ -17316,6 +17339,8 @@ fi ;; esac ;; esac + CFLAGS=$saved_CFLAGS + if test "x$enable_maintainer_mode" = "xyes" then { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Werror" >&5 diff --git a/configure.ac b/configure.ac index 709b43b..a7c45ac 100644 --- a/configure.ac +++ b/configure.ac @@ -1975,6 +1975,7 @@ then dnl clang needs to be told to fail on unknown options saved_CFLAGS=$CFLAGS WINE_TRY_CFLAGS([-Werror=unknown-warning-option],[CFLAGS="$CFLAGS -Werror=unknown-warning-option"]) + WINE_TRY_CFLAGS([-Werror=unused-command-line-argument],[CFLAGS="$CFLAGS -Werror=unused-command-line-argument"]) WINE_TRY_CFLAGS([-Wdeclaration-after-statement]) WINE_TRY_CFLAGS([-Wempty-body]) WINE_TRY_CFLAGS([-Wignored-qualifiers]) @@ -2006,8 +2007,6 @@ char*f(const char *h,char n) {return strchr(h,n);}]])],[ac_cv_c_logicalop_noisy= CFLAGS=$saved_string_h_CFLAGS test "$ac_cv_c_logicalop_noisy" = yes || EXTRACFLAGS="$EXTRACFLAGS -Wlogical-op"]) - CFLAGS=$saved_CFLAGS - dnl Default to dwarf-2 debug info for ac_flag in $CFLAGS; do case $ac_flag in @@ -2036,6 +2035,8 @@ char*f(const char *h,char n) {return strchr(h,n);}]])],[ac_cv_c_logicalop_noisy= esac ;; esac + CFLAGS=$saved_CFLAGS + dnl Enable -Werror for maintainer mode if test "x$enable_maintainer_mode" = "xyes" then

1 0

Nikolay Sivov : quartz: Remove unused function.
by Alexandre Julliard 03 Jul '19

03 Jul '19

Module: wine Branch: master Commit: 5d7d940114767c4b12f7694c2e7e3a59590cdc43 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d7d940114767c4b12f7694c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jul 3 11:11:48 2019 +0300 quartz: Remove unused function. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filesource.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index a7063fe..9ab5d3e 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);

1 0

Nikolay Sivov : kernel32: Remove unused functions.
by Alexandre Julliard 03 Jul '19

03 Jul '19

Module: wine Branch: master Commit: 8f1caca469781ea23d0c8868b93b627196447d64 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8f1caca469781ea23d0c8868… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jul 3 11:11:36 2019 +0300 kernel32: Remove unused functions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/sync.c | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index 49374cc..d8d0f20 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.@) */

1 0

Nikolay Sivov : devenum: Don't free uninitialized pointer value.
by Alexandre Julliard 03 Jul '19

03 Jul '19

Module: wine Branch: master Commit: 57c6b9fd41ec306fb10a01a36e4347f7f08451d8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=57c6b9fd41ec306fb10a01a3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jul 3 11:11:23 2019 +0300 devenum: Don't free uninitialized pointer value. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 76bb0c2..8e82fcd 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;

1 0

Zebediah Figura : strmbase: Rename pfnOnStopStreaming to renderer_stop_stream.
by Alexandre Julliard 03 Jul '19

03 Jul '19

Module: wine Branch: master Commit: 444f9b7ba2fda3f2c32cd4674eb78186505352d7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=444f9b7ba2fda3f2c32cd467… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jul 2 22:25:47 2019 -0500 strmbase: Rename pfnOnStopStreaming to renderer_stop_stream. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 0759d7f..930b7a9 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 6f95fb6..37c30ba 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 e40ae6e..f210d2c 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 e6fb024..e823e6b 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 86aee4b..0c2c9db 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;

1 0

Zebediah Figura : strmbase: Rename pfnOnStartStreaming to renderer_start_stream.
by Alexandre Julliard 03 Jul '19

03 Jul '19

Module: wine Branch: master Commit: fa5c24e9330bf94fc9cf84ce604e2d289bb6dac4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fa5c24e9330bf94fc9cf84ce… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jul 2 22:25:46 2019 -0500 strmbase: Rename pfnOnStartStreaming to renderer_start_stream. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 e44b455..0759d7f 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 decbe83..6f95fb6 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 6761fbf..e40ae6e 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 41a0e28..e6fb024 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 f7f8741..86aee4b 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;

1 0

Zebediah Figura : strmbase: Remove several unused callbacks.
by Alexandre Julliard 03 Jul '19

03 Jul '19

Module: wine Branch: master Commit: 48b475ad008adfdc831ab1e9cd90ea806d649237 URL: https://source.winehq.org/git/wine.git/?a=commit;h=48b475ad008adfdc831ab1e9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jul 2 22:25:45 2019 -0500 strmbase: Remove several unused callbacks. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/nullrenderer.c | 26 +++++--------------------- dlls/quartz/dsoundrender.c | 36 ++++++++++++++---------------------- dlls/quartz/videorenderer.c | 32 ++++++++++---------------------- dlls/quartz/vmr9.c | 33 +++++++++++---------------------- dlls/strmbase/renderer.c | 23 ++--------------------- include/wine/strmbase.h | 34 ++++++++++++---------------------- 6 files changed, 54 insertions(+), 130 deletions(-) diff --git a/dlls/qedit/nullrenderer.c b/dlls/qedit/nullrenderer.c index 74055d7..aeae6be 100644 --- a/dlls/qedit/nullrenderer.c +++ b/dlls/qedit/nullrenderer.c @@ -55,27 +55,11 @@ static void null_renderer_destroy(BaseRenderer *iface) CoTaskMemFree(filter); } -static const BaseRendererFuncTable RendererFuncTable = { - NullRenderer_CheckMediaType, - NullRenderer_DoRenderSample, - /**/ - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - /**/ - NULL, - NULL, - NULL, - NULL, - NULL, - null_renderer_destroy, +static const BaseRendererFuncTable RendererFuncTable = +{ + .pfnCheckMediaType = NullRenderer_CheckMediaType, + .pfnDoRenderSample = NullRenderer_DoRenderSample, + .renderer_destroy = null_renderer_destroy, }; static const IBaseFilterVtbl NullRenderer_Vtbl = diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index a5ebf1d..e44b455 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -601,28 +601,20 @@ static HRESULT dsound_render_query_interface(BaseRenderer *iface, REFIID iid, vo return S_OK; } -static const BaseRendererFuncTable BaseFuncTable = { - DSoundRender_CheckMediaType, - DSoundRender_DoRenderSample, - /**/ - NULL, - NULL, - NULL, - DSoundRender_OnStartStreaming, - DSoundRender_OnStopStreaming, - NULL, - NULL, - NULL, - DSoundRender_ShouldDrawSampleNow, - DSoundRender_PrepareReceive, - /**/ - DSoundRender_CompleteConnect, - DSoundRender_BreakConnect, - DSoundRender_EndOfStream, - NULL, - DSoundRender_EndFlush, - dsound_render_destroy, - dsound_render_query_interface, +static const BaseRendererFuncTable BaseFuncTable = +{ + .pfnCheckMediaType = DSoundRender_CheckMediaType, + .pfnDoRenderSample = DSoundRender_DoRenderSample, + .pfnOnStartStreaming = DSoundRender_OnStartStreaming, + .pfnOnStopStreaming = DSoundRender_OnStopStreaming, + .pfnShouldDrawSampleNow = DSoundRender_ShouldDrawSampleNow, + .pfnPrepareReceive = DSoundRender_PrepareReceive, + .pfnCompleteConnect = DSoundRender_CompleteConnect, + .pfnBreakConnect = DSoundRender_BreakConnect, + .pfnEndOfStream = DSoundRender_EndOfStream, + .pfnEndFlush = DSoundRender_EndFlush, + .renderer_destroy = dsound_render_destroy, + .renderer_query_interface = dsound_render_query_interface, }; HRESULT DSoundRender_create(IUnknown *outer, void **out) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 2a18015..decbe83 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -469,28 +469,16 @@ static BOOL WINAPI VideoRenderer_OnSize(BaseWindow *iface, LONG Width, LONG Heig return BaseWindowImpl_OnSize(iface, Width, Height); } -static const BaseRendererFuncTable BaseFuncTable = { - VideoRenderer_CheckMediaType, - VideoRenderer_DoRenderSample, - /**/ - NULL, - NULL, - NULL, - VideoRenderer_OnStartStreaming, - VideoRenderer_OnStopStreaming, - NULL, - NULL, - NULL, - VideoRenderer_ShouldDrawSampleNow, - NULL, - /**/ - NULL, - NULL, - NULL, - NULL, - VideoRenderer_EndFlush, - video_renderer_destroy, - video_renderer_query_interface, +static const BaseRendererFuncTable BaseFuncTable = +{ + .pfnCheckMediaType = VideoRenderer_CheckMediaType, + .pfnDoRenderSample = VideoRenderer_DoRenderSample, + .pfnOnStartStreaming = VideoRenderer_OnStartStreaming, + .pfnOnStopStreaming = VideoRenderer_OnStopStreaming, + .pfnShouldDrawSampleNow = VideoRenderer_ShouldDrawSampleNow, + .pfnEndFlush = VideoRenderer_EndFlush, + .renderer_destroy = video_renderer_destroy, + .renderer_query_interface = video_renderer_query_interface, }; static const BaseWindowFuncTable renderer_BaseWindowFuncTable = { diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index e5efc16..6761fbf 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -558,28 +558,17 @@ static HRESULT vmr_query_interface(BaseRenderer *iface, REFIID iid, void **out) return S_OK; } -static const BaseRendererFuncTable BaseFuncTable = { - VMR9_CheckMediaType, - VMR9_DoRenderSample, - /**/ - NULL, - NULL, - NULL, - VMR9_OnStartStreaming, - VMR9_OnStopStreaming, - NULL, - NULL, - NULL, - VMR9_ShouldDrawSampleNow, - NULL, - /**/ - VMR9_CompleteConnect, - VMR9_BreakConnect, - NULL, - NULL, - NULL, - vmr_destroy, - vmr_query_interface, +static const BaseRendererFuncTable BaseFuncTable = +{ + .pfnCheckMediaType = VMR9_CheckMediaType, + .pfnDoRenderSample = VMR9_DoRenderSample, + .pfnOnStartStreaming = VMR9_OnStartStreaming, + .pfnOnStopStreaming = VMR9_OnStopStreaming, + .pfnShouldDrawSampleNow = VMR9_ShouldDrawSampleNow, + .pfnCompleteConnect = VMR9_CompleteConnect, + .pfnBreakConnect = VMR9_BreakConnect, + .renderer_destroy = vmr_destroy, + .renderer_query_interface = vmr_query_interface, }; static LPWSTR WINAPI VMR9_GetClassWindowStyles(BaseWindow *This, DWORD *pClassStyles, DWORD *pWindowStyles, DWORD *pWindowStylesEx) diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index 06adbe7..41a0e28 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -117,12 +117,7 @@ static HRESULT WINAPI BaseRenderer_InputPin_BeginFlush(IPin * iface) EnterCriticalSection(&pFilter->filter.csFilter); hr = BaseInputPinImpl_BeginFlush(iface); if (SUCCEEDED(hr)) - { - if (pFilter->pFuncsTable->pfnBeginFlush) - hr = pFilter->pFuncsTable->pfnBeginFlush(pFilter); - else - hr = BaseRendererImpl_BeginFlush(pFilter); - } + hr = BaseRendererImpl_BeginFlush(pFilter); LeaveCriticalSection(&pFilter->filter.csFilter); LeaveCriticalSection(&pFilter->csRenderLock); return hr; @@ -334,17 +329,9 @@ HRESULT WINAPI BaseRendererImpl_Receive(BaseRenderer *This, IMediaSample * pSamp return hr; } - if (This->pFuncsTable->pfnPrepareRender) - This->pFuncsTable->pfnPrepareRender(This); - EnterCriticalSection(&This->csRenderLock); - if ( This->filter.state == State_Paused ) - { - if (This->pFuncsTable->pfnOnReceiveFirstSample) - This->pFuncsTable->pfnOnReceiveFirstSample(This, pSample); - + if (This->filter.state == State_Paused) SetEvent(This->state_event); - } /* Wait for render Time */ if (This->filter.pClock && SUCCEEDED(IMediaSample_GetTime(pSample, &start, &stop))) @@ -361,9 +348,6 @@ HRESULT WINAPI BaseRendererImpl_Receive(BaseRenderer *This, IMediaSample * pSamp REFERENCE_TIME now; DWORD_PTR cookie; - if (This->pFuncsTable->pfnOnWaitStart) - This->pFuncsTable->pfnOnWaitStart(This); - IReferenceClock_GetTime(This->filter.pClock, &now); if (now - This->filter.rtStreamStart - start <= -10000) @@ -380,9 +364,6 @@ HRESULT WINAPI BaseRendererImpl_Receive(BaseRenderer *This, IMediaSample * pSamp EnterCriticalSection(&This->csRenderLock); } - - if (This->pFuncsTable->pfnOnWaitEnd) - This->pFuncsTable->pfnOnWaitEnd(This); } else { diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 22d65f8..f7f8741 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -576,28 +576,18 @@ typedef HRESULT (WINAPI *BaseRenderer_BreakConnect) (BaseRenderer *This); typedef HRESULT (WINAPI *BaseRenderer_CompleteConnect) (BaseRenderer *This, IPin *pReceivePin); typedef struct BaseRendererFuncTable { - /* Required */ - BaseRenderer_CheckMediaType pfnCheckMediaType; - BaseRenderer_DoRenderSample pfnDoRenderSample; - /* Optional, Data Handlers */ - BaseRenderer_OnReceiveFirstSample pfnOnReceiveFirstSample; - BaseRenderer_OnRenderEnd pfnOnRenderEnd; - BaseRenderer_OnRenderStart pfnOnRenderStart; - BaseRenderer_OnStartStreaming pfnOnStartStreaming; - BaseRenderer_OnStopStreaming pfnOnStopStreaming; - BaseRenderer_OnWaitEnd pfnOnWaitEnd; - BaseRenderer_OnWaitStart pfnOnWaitStart; - BaseRenderer_PrepareRender pfnPrepareRender; - BaseRenderer_ShouldDrawSampleNow pfnShouldDrawSampleNow; - BaseRenderer_PrepareReceive pfnPrepareReceive; - /* Optional, Input Pin */ - BaseRenderer_CompleteConnect pfnCompleteConnect; - BaseRenderer_BreakConnect pfnBreakConnect; - BaseRenderer_EndOfStream pfnEndOfStream; - BaseRenderer_BeginFlush pfnBeginFlush; - BaseRenderer_EndFlush pfnEndFlush; - void (*renderer_destroy)(BaseRenderer *iface); - HRESULT (*renderer_query_interface)(BaseRenderer *iface, REFIID iid, void **out); + BaseRenderer_CheckMediaType pfnCheckMediaType; + BaseRenderer_DoRenderSample pfnDoRenderSample; + BaseRenderer_OnStartStreaming pfnOnStartStreaming; + BaseRenderer_OnStopStreaming pfnOnStopStreaming; + BaseRenderer_ShouldDrawSampleNow pfnShouldDrawSampleNow; + BaseRenderer_PrepareReceive pfnPrepareReceive; + BaseRenderer_CompleteConnect pfnCompleteConnect; + BaseRenderer_BreakConnect pfnBreakConnect; + BaseRenderer_EndOfStream pfnEndOfStream; + BaseRenderer_EndFlush pfnEndFlush; + void (*renderer_destroy)(BaseRenderer *iface); + HRESULT (*renderer_query_interface)(BaseRenderer *iface, REFIID iid, void **out); } BaseRendererFuncTable; HRESULT WINAPI BaseRendererImpl_Receive(BaseRenderer *This, IMediaSample * pSample);

1 0

Zebediah Figura : quartz/dsoundrender: Use BaseRendererImpl_Pause().
by Alexandre Julliard 03 Jul '19

03 Jul '19

Module: wine Branch: master Commit: ca5a068a7b59b30ffdf81730db47c3de9dbbabb2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca5a068a7b59b30ffdf81730… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jul 2 22:25:44 2019 -0500 quartz/dsoundrender: Use BaseRendererImpl_Pause(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/dsoundrender.c | 30 +----------------------------- 1 file changed, 1 insertion(+), 29 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index fd04212..a5ebf1d 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -682,34 +682,6 @@ HRESULT DSoundRender_create(IUnknown *outer, void **out) return hr; } -static HRESULT WINAPI DSoundRender_Pause(IBaseFilter * iface) -{ - DSoundRenderImpl *This = impl_from_IBaseFilter(iface); - HRESULT hr = S_OK; - - TRACE("(%p/%p)->()\n", This, iface); - - EnterCriticalSection(&This->renderer.csRenderLock); - if (This->renderer.filter.state != State_Paused) - { - if (This->renderer.filter.state == State_Stopped) - { - if (This->renderer.sink.pin.pConnectedTo) - ResetEvent(This->renderer.state_event); - This->renderer.sink.end_of_stream = 0; - } - - hr = IDirectSoundBuffer_Stop(This->dsbuffer); - if (SUCCEEDED(hr)) - This->renderer.filter.state = State_Paused; - - ResetEvent(This->renderer.flush_event); - } - LeaveCriticalSection(&This->renderer.csRenderLock); - - return hr; -} - static const IBaseFilterVtbl DSoundRender_Vtbl = { BaseFilterImpl_QueryInterface, @@ -717,7 +689,7 @@ static const IBaseFilterVtbl DSoundRender_Vtbl = BaseFilterImpl_Release, BaseFilterImpl_GetClassID, BaseRendererImpl_Stop, - DSoundRender_Pause, + BaseRendererImpl_Pause, BaseRendererImpl_Run, BaseRendererImpl_GetState, BaseRendererImpl_SetSyncSource,

1 0

← Newer
1
...
12
13
14
15
16
17
18
...
23
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2019