wine-commits March 2021

wine-commits@winehq.org

2 participants
1163 discussions

Zebediah Figura : setupapi: Set the CabinetFile field to the name of the next cabinet.
by Alexandre Julliard 09 Mar '21

09 Mar '21

Module: wine Branch: master Commit: 811da7bf1a37fc4e3851971a7e96e28b445efebc URL: https://source.winehq.org/git/wine.git/?a=commit;h=811da7bf1a37fc4e3851971a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Mar 7 14:57:48 2021 -0600 setupapi: Set the CabinetFile field to the name of the next cabinet. Verified through manual testing. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/setupcab.c | 6 +++--- dlls/setupapi/tests/setupcab.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/setupapi/setupcab.c b/dlls/setupapi/setupcab.c index 4824170d587..daf23ad31ad 100644 --- a/dlls/setupapi/setupcab.c +++ b/dlls/setupapi/setupcab.c @@ -166,9 +166,9 @@ static INT_PTR CDECL sc_FNNOTIFY_A(FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION p switch (fdint) { case fdintCABINET_INFO: - TRACE("New cabinet, path %s, set %u, number %u, next disk %s.\n", - debugstr_a(pfdin->psz3), pfdin->setID, pfdin->iCabinet, debugstr_a(pfdin->psz2)); - ci.CabinetFile = phsc->most_recent_cabinet_name; + TRACE("New cabinet, path %s, set %u, number %u, next disk %s, next cabinet %s.\n", + debugstr_a(pfdin->psz3), pfdin->setID, pfdin->iCabinet, debugstr_a(pfdin->psz2), debugstr_a(pfdin->psz1)); + ci.CabinetFile = pfdin->psz1; ci.CabinetPath = pfdin->psz3; ci.DiskName = pfdin->psz2; ci.SetId = pfdin->setID; diff --git a/dlls/setupapi/tests/setupcab.c b/dlls/setupapi/tests/setupcab.c index 6ead90206f8..c76ca465fca 100644 --- a/dlls/setupapi/tests/setupcab.c +++ b/dlls/setupapi/tests/setupcab.c @@ -324,7 +324,7 @@ static UINT CALLBACK simple_callbackA(void *context, UINT message, UINT_PTR para GetTempPathA(ARRAY_SIZE(temp), temp); ok(!strcmp(info->CabinetPath, temp), "Got path %s.\n", debugstr_a(info->CabinetPath)); - todo_wine ok(!info->CabinetFile[0], "Got file %s.\n", debugstr_a(info->CabinetFile)); + ok(!info->CabinetFile[0], "Got file %s.\n", debugstr_a(info->CabinetFile)); ok(!info->DiskName[0], "Got disk name %s.\n", debugstr_a(info->DiskName)); ok(!info->SetId, "Got set ID %#x.\n", info->SetId); ok(!info->CabinetNumber, "Got cabinet number %u.\n", info->CabinetNumber); @@ -432,7 +432,7 @@ static UINT CALLBACK simple_callbackW(void *context, UINT message, UINT_PTR para GetTempPathW(ARRAY_SIZE(temp), temp); ok(!wcscmp(info->CabinetPath, temp), "Got path %s.\n", debugstr_w(info->CabinetPath)); - todo_wine ok(!info->CabinetFile[0], "Got file %s.\n", debugstr_w(info->CabinetFile)); + ok(!info->CabinetFile[0], "Got file %s.\n", debugstr_w(info->CabinetFile)); ok(!info->DiskName[0], "Got disk name %s.\n", debugstr_w(info->DiskName)); ok(!info->SetId, "Got set ID %#x.\n", info->SetId); ok(!info->CabinetNumber, "Got cabinet number %u.\n", info->CabinetNumber);

1 0

Zebediah Figura : setupapi/tests: Expand tests for SetupIterateCabinet().
by Alexandre Julliard 09 Mar '21

09 Mar '21

Module: wine Branch: master Commit: 978cc1d856c7f62191bf6b1b64ddecf737ea5eea URL: https://source.winehq.org/git/wine.git/?a=commit;h=978cc1d856c7f62191bf6b1b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Mar 7 14:57:47 2021 -0600 setupapi/tests: Expand tests for SetupIterateCabinet(). Partially based on a patch by Sebastian Lackner. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/tests/setupcab.c | 231 ++++++++++++++++++++++++++++++----------- 1 file changed, 169 insertions(+), 62 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=978cc1d856c7f62191bf…

1 0

Zebediah Figura : strmbase: Remove the unused "avg_render", "start", and "stop" fields from struct strmbase_renderer.
by Alexandre Julliard 09 Mar '21

09 Mar '21

Module: wine Branch: master Commit: c7d65913dac758ae15ea32c4dedc6dce7b46f61d URL: https://source.winehq.org/git/wine.git/?a=commit;h=c7d65913dac758ae15ea32c4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Mar 7 14:49:07 2021 -0600 strmbase: Remove the unused "avg_render", "start", and "stop" fields from struct strmbase_renderer. This corresponds to part of GStreamer commit dc0ed9a5ebadbc5b0e9baac215b6b1714cf23b22. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/renderer.c | 32 +------------------------------- include/wine/strmbase.h | 2 +- 2 files changed, 2 insertions(+), 32 deletions(-) diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index ffe8d3cc957..ec915a95ef8 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -59,7 +59,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(strmbase); static void QualityControlRender_Start(struct strmbase_qc *This, REFERENCE_TIME tStart) { - This->avg_render = This->last_in_time = This->last_left = This->avg_duration = This->avg_pt = -1; + This->last_in_time = This->last_left = This->avg_duration = This->avg_pt = -1; This->clockstart = tStart; This->avg_rate = -1.0; This->is_dropped = FALSE; @@ -217,8 +217,6 @@ static void QualityControlRender_DoQOS(struct strmbase_qc *priv) static void QualityControlRender_BeginRender(struct strmbase_qc *This, REFERENCE_TIME start, REFERENCE_TIME stop) { - This->start = -1; - This->current_rstart = start; This->current_rstop = max(stop, start); @@ -237,32 +235,6 @@ static void QualityControlRender_BeginRender(struct strmbase_qc *This, REFERENCE This->is_dropped = QualityControlRender_IsLate(This, This->current_jitter, start, stop); TRACE("dropped %d, start %s, stop %s, jitter %s.\n", This->is_dropped, debugstr_time(start), debugstr_time(stop), debugstr_time(This->current_jitter)); - - if (!This->pin->filter->clock) - return; - - IReferenceClock_GetTime(This->pin->filter->clock, &This->start); - - TRACE("Starting at %s.\n", debugstr_time(This->start)); -} - -static void QualityControlRender_EndRender(struct strmbase_qc *This) -{ - REFERENCE_TIME elapsed; - - TRACE("%p\n", This); - - if (!This->pin->filter->clock || This->start < 0 - || FAILED(IReferenceClock_GetTime(This->pin->filter->clock, &This->stop))) - return; - - elapsed = This->start - This->stop; - if (elapsed < 0) - return; - if (This->avg_render < 0) - This->avg_render = elapsed; - else - This->avg_render = UPDATE_RUNNING_AVG(This->avg_render, elapsed); } static inline struct strmbase_renderer *impl_from_strmbase_filter(struct strmbase_filter *iface) @@ -447,7 +419,6 @@ static HRESULT WINAPI BaseRenderer_Receive(struct strmbase_sink *pin, IMediaSamp { QualityControlRender_BeginRender(&filter->qc, start, stop); hr = filter->pFuncsTable->pfnDoRenderSample(filter, sample); - QualityControlRender_EndRender(&filter->qc); } if (need_wait) @@ -480,7 +451,6 @@ static HRESULT WINAPI BaseRenderer_Receive(struct strmbase_sink *pin, IMediaSamp { QualityControlRender_BeginRender(&filter->qc, start, stop); hr = filter->pFuncsTable->pfnDoRenderSample(filter, sample); - QualityControlRender_EndRender(&filter->qc); } QualityControlRender_DoQOS(&filter->qc); diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 3a5a0c0e25e..9df0437dd9a 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -279,7 +279,7 @@ struct strmbase_qc IQualityControl *tonotify; /* Render stuff */ - REFERENCE_TIME last_in_time, last_left, avg_duration, avg_pt, avg_render, start, stop; + REFERENCE_TIME last_in_time, last_left, avg_duration, avg_pt; REFERENCE_TIME current_jitter, current_rstart, current_rstop, clockstart; double avg_rate; BOOL is_dropped;

1 0

Zebediah Figura : strmbase: Remove the unused "dropped" field from struct strmbase_qc.
by Alexandre Julliard 09 Mar '21

09 Mar '21

Module: wine Branch: master Commit: 92aacce542402e8ac872b3b19dd0498929aea0d4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=92aacce542402e8ac872b3b1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Mar 7 14:49:06 2021 -0600 strmbase: Remove the unused "dropped" field from struct strmbase_qc. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/renderer.c | 3 --- include/wine/strmbase.h | 1 - 2 files changed, 4 deletions(-) diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index c9325e5c93d..ffe8d3cc957 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -62,7 +62,6 @@ static void QualityControlRender_Start(struct strmbase_qc *This, REFERENCE_TIME This->avg_render = This->last_in_time = This->last_left = This->avg_duration = This->avg_pt = -1; This->clockstart = tStart; This->avg_rate = -1.0; - This->dropped = 0; This->is_dropped = FALSE; } @@ -238,8 +237,6 @@ static void QualityControlRender_BeginRender(struct strmbase_qc *This, REFERENCE This->is_dropped = QualityControlRender_IsLate(This, This->current_jitter, start, stop); TRACE("dropped %d, start %s, stop %s, jitter %s.\n", This->is_dropped, debugstr_time(start), debugstr_time(stop), debugstr_time(This->current_jitter)); - if (This->is_dropped) - This->dropped++; if (!This->pin->filter->clock) return; diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index d2877477321..3a5a0c0e25e 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -282,7 +282,6 @@ struct strmbase_qc 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 dropped; BOOL is_dropped; };

1 0

Zebediah Figura : strmbase: Remove the unused "rendered" field from struct strmbase_qc.
by Alexandre Julliard 09 Mar '21

09 Mar '21

Module: wine Branch: master Commit: 09081737ef6aea41597ad8c1e8f43f9c7adf9c8a URL: https://source.winehq.org/git/wine.git/?a=commit;h=09081737ef6aea41597ad8c1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Mar 7 14:49:05 2021 -0600 strmbase: Remove the unused "rendered" field from struct strmbase_qc. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/renderer.c | 4 +--- include/wine/strmbase.h | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index 5af3fca4e5f..c9325e5c93d 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -62,7 +62,7 @@ static void QualityControlRender_Start(struct strmbase_qc *This, REFERENCE_TIME This->avg_render = This->last_in_time = This->last_left = This->avg_duration = This->avg_pt = -1; This->clockstart = tStart; This->avg_rate = -1.0; - This->rendered = This->dropped = 0; + This->dropped = 0; This->is_dropped = FALSE; } @@ -240,8 +240,6 @@ static void QualityControlRender_BeginRender(struct strmbase_qc *This, REFERENCE debugstr_time(start), debugstr_time(stop), debugstr_time(This->current_jitter)); if (This->is_dropped) This->dropped++; - else - This->rendered++; if (!This->pin->filter->clock) return; diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 848f4bac35b..d2877477321 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -282,7 +282,7 @@ struct strmbase_qc 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; + LONG64 dropped; BOOL is_dropped; };

1 0

Zebediah Figura : strmbase: Remove the unused "qos_handled" field from struct strmbase_qc.
by Alexandre Julliard 09 Mar '21

09 Mar '21

Module: wine Branch: master Commit: 4d400a71fab08a99e102117ecaf48b82ae13d51f URL: https://source.winehq.org/git/wine.git/?a=commit;h=4d400a71fab08a99e102117e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Mar 7 14:49:04 2021 -0600 strmbase: Remove the unused "qos_handled" field from struct strmbase_qc. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/renderer.c | 5 +---- include/wine/strmbase.h | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index f3869c868dc..5af3fca4e5f 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -64,7 +64,6 @@ static void QualityControlRender_Start(struct strmbase_qc *This, REFERENCE_TIME This->avg_rate = -1.0; This->rendered = This->dropped = 0; This->is_dropped = FALSE; - This->qos_handled = TRUE; /* Lie that will be corrected on first adjustment */ } static BOOL QualityControlRender_IsLate(struct strmbase_qc *This, REFERENCE_TIME jitter, @@ -187,7 +186,6 @@ static void QualityControlRender_DoQOS(struct strmbase_qc *priv) if (priv->avg_rate >= 0.0) { - HRESULT hr; Quality q; /* If we have a valid rate, start sending QoS messages. */ @@ -211,8 +209,7 @@ static void QualityControlRender_DoQOS(struct strmbase_qc *priv) q.Proportion = 5000; q.Late = priv->current_jitter; q.TimeStamp = priv->current_rstart; - hr = IQualityControl_Notify(&priv->IQualityControl_iface, &priv->pin->filter->IBaseFilter_iface, q); - priv->qos_handled = hr == S_OK; + IQualityControl_Notify(&priv->IQualityControl_iface, &priv->pin->filter->IBaseFilter_iface, q); } /* Record when this buffer will leave us. */ diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 51dcb3a8c55..848f4bac35b 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -283,7 +283,7 @@ struct strmbase_qc REFERENCE_TIME current_jitter, current_rstart, current_rstop, clockstart; double avg_rate; LONG64 rendered, dropped; - BOOL qos_handled, is_dropped; + BOOL is_dropped; }; struct strmbase_renderer

1 0

Zebediah Figura : strmbase: Merge qualitycontrol.c into renderer.c.
by Alexandre Julliard 09 Mar '21

09 Mar '21

Module: wine Branch: master Commit: 4f72fbef1197f636e4d519388121aea7f9925924 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f72fbef1197f636e4d51938… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Mar 7 14:49:03 2021 -0600 strmbase: Merge qualitycontrol.c into renderer.c. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/Makefile.in | 1 - dlls/strmbase/qualitycontrol.c | 317 ------------------------------------- dlls/strmbase/renderer.c | 326 +++++++++++++++++++++++++++++++++++++++ dlls/strmbase/strmbase_private.h | 5 - dlls/wineqtdecoder/Makefile.in | 1 - include/wine/strmbase.h | 2 - 6 files changed, 326 insertions(+), 326 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4f72fbef1197f636e4d5…

1 0

Matteo Bruni : wined3d: Disable WINED3DFMT_NULL on backbuffer ORM.
by Alexandre Julliard 09 Mar '21

09 Mar '21

Module: wine Branch: master Commit: b67e9ddbb3567b0443b3895bf496c033db04f687 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b67e9ddbb3567b0443b3895b… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Mar 5 17:06:24 2021 +0100 wined3d: Disable WINED3DFMT_NULL on backbuffer ORM. 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/utils.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 11df11fbcd9..9df51872d42 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3134,7 +3134,8 @@ static BOOL init_format_texture_info(struct wined3d_adapter *adapter, struct win && (format->f.flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_INTEGER)) continue; - if (wined3d_settings.offscreen_rendering_mode != ORM_FBO && format->f.id == WINED3DFMT_D16_LOCKABLE) + if (wined3d_settings.offscreen_rendering_mode != ORM_FBO + && (format->f.id == WINED3DFMT_D16_LOCKABLE || format->f.id == WINED3DFMT_NULL)) continue; format->internal = format_texture_info[i].gl_internal;

1 0

Matteo Bruni : wined3d: Disable WINED3DFMT_D16_LOCKABLE on backbuffer ORM.
by Alexandre Julliard 09 Mar '21

09 Mar '21

Module: wine Branch: master Commit: d06cdcd646450e91c36661726048f408cfb99bc4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d06cdcd646450e91c3666172… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Mar 5 17:06:23 2021 +0100 wined3d: Disable WINED3DFMT_D16_LOCKABLE on backbuffer ORM. 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/utils.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 233cd49209f..11df11fbcd9 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3134,6 +3134,9 @@ static BOOL init_format_texture_info(struct wined3d_adapter *adapter, struct win && (format->f.flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_INTEGER)) continue; + if (wined3d_settings.offscreen_rendering_mode != ORM_FBO && format->f.id == WINED3DFMT_D16_LOCKABLE) + continue; + format->internal = format_texture_info[i].gl_internal; format->srgb_internal = format_texture_info[i].gl_srgb_internal; format->rt_internal = format_texture_info[i].gl_rt_internal;

1 0

Matteo Bruni : wined3d: Correctly handle modifiers on instructions with multiple destination registers.
by Alexandre Julliard 09 Mar '21

09 Mar '21

Module: wine Branch: master Commit: 65b3279baed3db067f2d750af97160c787f00d6a URL: https://source.winehq.org/git/wine.git/?a=commit;h=65b3279baed3db067f2d750a… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Mar 5 17:06:22 2021 +0100 wined3d: Correctly handle modifiers on instructions with multiple destination registers. 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/glsl_shader.c | 108 ++++++++++++++++++++++++--------------------- 1 file changed, 57 insertions(+), 51 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=65b3279baed3db067f2d…

1 0

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 March 2021