March 2021 - Wine-commits - list.winehq.org

Hugh McMaster : reg/tests: Always specify the expected exit code in error messages.
by Alexandre Julliard 09 Mar '21

09 Mar '21

Module: wine Branch: master Commit: 73f69d66b342af4c8339c23739ebeb1ff359e78b URL: https://source.winehq.org/git/wine.git/?a=commit;h=73f69d66b342af4c8339c237… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Mar 8 23:32:03 2021 +1100 reg/tests: Always specify the expected exit code in error messages. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/add.c | 70 ++++++++++++++++++++++++------------------------ 1 file changed, 35 insertions(+), 35 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=73f69d66b342af4c8339…

1 0

Roman Pišl : ntdll: Don't set error status if volume serial number is missing.
by Alexandre Julliard 09 Mar '21

09 Mar '21

Module: wine Branch: master Commit: dabba3cc86aa3ba6e7ba1d0863fb378828fef9f3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dabba3cc86aa3ba6e7ba1d08… Author: Roman Pišl <rpisl(a)seznam.cz> Date: Sun Mar 7 11:50:11 2021 +0100 ntdll: Don't set error status if volume serial number is missing. Fixes regression from b14eee69c7240658252bc96b6302e98948f2c62c. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50781 Signed-off-by: Roman Pišl <rpisl(a)seznam.cz> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index bcaf03a2d02..c169b49343f 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -4108,7 +4108,7 @@ NTSTATUS WINAPI NtQueryInformationFile( HANDLE handle, IO_STATUS_BLOCK *io, FILE_ID_INFORMATION *info = ptr; info->VolumeSerialNumber = 0; - if (!(io->u.Status = get_mountmgr_fs_info( handle, fd, &drive, sizeof(drive) ))) + if (!get_mountmgr_fs_info( handle, fd, &drive, sizeof(drive) )) info->VolumeSerialNumber = drive.serial; memset( &info->FileId, 0, sizeof(info->FileId) ); *(ULONGLONG *)&info->FileId = st.st_ino;

1 0

Gijs Vermeulen : kernelbase: Support FileRenameInfo in SetFileInformationByHandle.
by Alexandre Julliard 09 Mar '21

09 Mar '21

Module: wine Branch: master Commit: 5c86b9f1dc56927d8e69f84d410596b786ed8c46 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5c86b9f1dc56927d8e69f84d… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Sat Mar 6 18:30:37 2021 +0100 kernelbase: Support FileRenameInfo in SetFileInformationByHandle. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50756 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/file.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/kernelbase/file.c b/dlls/kernelbase/file.c index abfdade04ed..765bb41ab98 100644 --- a/dlls/kernelbase/file.c +++ b/dlls/kernelbase/file.c @@ -3526,7 +3526,6 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetFileInformationByHandle( HANDLE file, FILE_INFO switch (class) { case FileNameInfo: - case FileRenameInfo: case FileAllocationInfo: case FileStreamInfo: case FileIdBothDirectoryInfo: @@ -3554,6 +3553,9 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetFileInformationByHandle( HANDLE file, FILE_INFO case FileIoPriorityHintInfo: status = NtSetInformationFile( file, &io, info, size, FileIoPriorityHintInformation ); break; + case FileRenameInfo: + status = NtSetInformationFile( file, &io, info, size, FileRenameInformation ); + break; case FileStandardInfo: case FileCompressionInfo: case FileAttributeTagInfo:

1 0

Paul Gofman : kernel32: Implement GetUserDefaultGeoName().
by Alexandre Julliard 09 Mar '21

09 Mar '21

Module: wine Branch: master Commit: e610a56734f72f114c2233efc65c93f9223db358 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e610a56734f72f114c2233ef… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Mar 8 19:34:38 2021 +0300 kernel32: Implement GetUserDefaultGeoName(). Fixes crash on launch in Outriders demo. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 1 + dlls/kernelbase/kernelbase.spec | 1 + dlls/kernelbase/locale.c | 50 +++++++++++++++++++++++++++++++++++++++++ include/winnls.h | 1 + 4 files changed, 53 insertions(+) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index ee2e3f8ad31..5dee1d9b906 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -763,6 +763,7 @@ @ stdcall -import GetOEMCP() @ stdcall -import GetOverlappedResult(long ptr ptr long) @ stdcall -import GetOverlappedResultEx(long ptr ptr long long) +@ stdcall -import GetUserDefaultGeoName(ptr long) @ stdcall -import GetUserPreferredUILanguages(long ptr ptr ptr) @ stdcall GetPackageFamilyName(long ptr ptr) kernelbase.GetPackageFamilyName @ stdcall GetPackageFullName(long ptr ptr) kernelbase.GetPackageFullName diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 543961d2ce6..a0cd5f82a18 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -741,6 +741,7 @@ @ stub GetUILanguageInfo # @ stub GetUnicodeStringToEightBitSizeRoutine # @ stub GetUnicodeStringToEightBitStringRoutine +@ stdcall GetUserDefaultGeoName(ptr long) @ stdcall GetUserDefaultLCID() @ stdcall GetUserDefaultLangID() @ stdcall GetUserDefaultLocaleName(ptr long) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index b746feca639..7126dc74d01 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -5740,6 +5740,12 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetUserGeoID( GEOID id ) const WCHAR *name = geoinfo->kind == LOCATION_NATION ? L"Nation" : L"Region"; swprintf( bufferW, ARRAY_SIZE(bufferW), L"%u", geoinfo->id ); RegSetValueExW( hkey, name, 0, REG_SZ, (BYTE *)bufferW, (lstrlenW(bufferW) + 1) * sizeof(WCHAR) ); + + if (geoinfo->kind == LOCATION_NATION || geoinfo->kind == LOCATION_BOTH) + lstrcpyW( bufferW, geoinfo->iso2W ); + else + swprintf( bufferW, ARRAY_SIZE(bufferW), L"%03u", geoinfo->uncode ); + RegSetValueExW( hkey, L"Name", 0, REG_SZ, (BYTE *)bufferW, (lstrlenW(bufferW) + 1) * sizeof(WCHAR) ); RegCloseKey( hkey ); } return TRUE; @@ -5877,3 +5883,47 @@ INT WINAPI DECLSPEC_HOTPATCH WideCharToMultiByte( UINT codepage, DWORD flags, LP TRACE( "cp %d %s -> %s, ret = %d\n", codepage, debugstr_wn(src, srclen), debugstr_an(dst, ret), ret ); return ret; } + + +/*********************************************************************** + * GetUserDefaultGeoName (kernelbase.@) + */ +INT WINAPI GetUserDefaultGeoName(LPWSTR geo_name, int count) +{ + const struct geoinfo *geoinfo; + WCHAR buffer[32]; + LSTATUS status; + DWORD size; + HKEY key; + + TRACE( "geo_name %p, count %d.\n", geo_name, count ); + + if (count && !geo_name) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return 0; + } + if (!(status = RegOpenKeyExW( intl_key, L"Geo", 0, KEY_ALL_ACCESS, &key ))) + { + size = sizeof(buffer); + status = RegQueryValueExW( key, L"Name", NULL, NULL, (BYTE *)buffer, &size ); + RegCloseKey( key ); + } + if (status) + { + if ((geoinfo = get_geoinfo_ptr( GetUserGeoID( GEOCLASS_NATION ))) && geoinfo->id != 39070) + lstrcpyW( buffer, geoinfo->iso2W ); + else + lstrcpyW( buffer, L"001" ); + } + size = lstrlenW( buffer ) + 1; + if (count < size) + { + if (!count) + return size; + SetLastError( ERROR_INSUFFICIENT_BUFFER ); + return 0; + } + lstrcpyW( geo_name, buffer ); + return size; +} diff --git a/include/winnls.h b/include/winnls.h index 07a31cfde88..04838cfa8d7 100644 --- a/include/winnls.h +++ b/include/winnls.h @@ -946,6 +946,7 @@ WINBASEAPI INT WINAPI GetTimeFormatA(LCID,DWORD,const SYSTEMTIME*,LPCSTR WINBASEAPI INT WINAPI GetTimeFormatEx(LPCWSTR,DWORD,const SYSTEMTIME*,LPCWSTR,LPWSTR,INT); WINBASEAPI INT WINAPI GetTimeFormatW(LCID,DWORD,const SYSTEMTIME*,LPCWSTR,LPWSTR,INT); #define GetTimeFormat WINELIB_NAME_AW(GetTimeFormat) +WINBASEAPI INT WINAPI GetUserDefaultGeoName(LPWSTR,int); WINBASEAPI LANGID WINAPI GetUserDefaultLangID(void); WINBASEAPI LCID WINAPI GetUserDefaultLCID(void); WINBASEAPI INT WINAPI GetUserDefaultLocaleName(LPWSTR,int);

1 0

Paul Gofman : kernel32: Implement SetUserGeoName().
by Alexandre Julliard 09 Mar '21

09 Mar '21

Module: wine Branch: master Commit: a430a69f8ba5372e478b8dd463f1347b6c35c38e URL: https://source.winehq.org/git/wine.git/?a=commit;h=a430a69f8ba5372e478b8dd4… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Mar 8 19:34:39 2021 +0300 kernel32: Implement SetUserGeoName(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 1 + dlls/kernelbase/kernelbase.spec | 1 + dlls/kernelbase/locale.c | 46 +++++++++++++++++++++++++++++++++++++++++ include/winnls.h | 1 + 4 files changed, 49 insertions(+) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 5dee1d9b906..0eb66a0e3b0 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1482,6 +1482,7 @@ @ stdcall -arch=x86_64 SetUmsThreadInformation(ptr long ptr long) @ stdcall -import SetUnhandledExceptionFilter(ptr) @ stdcall -import SetUserGeoID(long) +@ stdcall -import SetUserGeoName(wstr) @ stub SetVDMCurrentDirectories @ stdcall SetVolumeLabelA(str str) @ stdcall SetVolumeLabelW(wstr wstr) diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index a0cd5f82a18..08a2f726817 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1509,6 +1509,7 @@ @ stdcall SetTokenInformation(long long ptr long) @ stdcall SetUnhandledExceptionFilter(ptr) @ stdcall SetUserGeoID(long) +@ stdcall SetUserGeoName(wstr) @ stdcall SetWaitableTimer(long ptr long ptr ptr long) @ stdcall SetWaitableTimerEx(long ptr long ptr ptr ptr long) @ stdcall -arch=i386,x86_64 SetXStateFeaturesMask(ptr int64) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 7126dc74d01..24e8cd3f338 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -5927,3 +5927,49 @@ INT WINAPI GetUserDefaultGeoName(LPWSTR geo_name, int count) lstrcpyW( geo_name, buffer ); return size; } + + +/*********************************************************************** + * SetUserDefaultGeoName (kernelbase.@) + */ +BOOL WINAPI SetUserGeoName(PWSTR geo_name) +{ + unsigned int i; + WCHAR *endptr; + int uncode; + + TRACE( "geo_name %s.\n", debugstr_w( geo_name )); + + if (!geo_name) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } + + if (lstrlenW( geo_name ) == 3) + { + uncode = wcstol( geo_name, &endptr, 10 ); + if (!uncode || endptr != geo_name + 3) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } + for (i = 0; i < ARRAY_SIZE(geoinfodata); ++i) + if (geoinfodata[i].uncode == uncode) + break; + } + else + { + if (!lstrcmpiW( geo_name, L"XX" )) + return SetUserGeoID( 39070 ); + for (i = 0; i < ARRAY_SIZE(geoinfodata); ++i) + if (!lstrcmpiW( geo_name, geoinfodata[i].iso2W )) + break; + } + if (i == ARRAY_SIZE(geoinfodata)) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } + return SetUserGeoID( geoinfodata[i].id ); +} diff --git a/include/winnls.h b/include/winnls.h index 04838cfa8d7..4b1323cc694 100644 --- a/include/winnls.h +++ b/include/winnls.h @@ -983,6 +983,7 @@ WINBASEAPI BOOL WINAPI SetThreadLocale(LCID); WINBASEAPI BOOL WINAPI SetThreadPreferredUILanguages(DWORD,PCZZWSTR,PULONG); WINBASEAPI LANGID WINAPI SetThreadUILanguage(LANGID); WINBASEAPI BOOL WINAPI SetUserGeoID(GEOID); +WINBASEAPI BOOL WINAPI SetUserGeoName(PWSTR); WINBASEAPI INT WINAPI WideCharToMultiByte(UINT,DWORD,LPCWSTR,INT,LPSTR,INT,LPCSTR,LPBOOL); WINBASEAPI INT WINAPI FindNLSStringEx(const WCHAR *,DWORD,const WCHAR *,INT,const WCHAR *,INT,INT *,NLSVERSIONINFO *,void *,LPARAM);

1 0

Paul Gofman : kernel32/tests: Add tests for {Get|Set}UserDefaultGeoName().
by Alexandre Julliard 09 Mar '21

09 Mar '21

Module: wine Branch: master Commit: 9396d3b3426f9db908ff7ee0bd7e1c3911881c6a URL: https://source.winehq.org/git/wine.git/?a=commit;h=9396d3b3426f9db908ff7ee0… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Mar 8 19:34:40 2021 +0300 kernel32/tests: Add tests for {Get|Set}UserDefaultGeoName(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 215 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 215 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9396d3b3426f9db908ff…

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: 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 "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 "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