wine-commits March 2021

wine-commits@winehq.org

2 participants
1163 discussions

Alexandre Julliard : ntdll: Add a global constant for the system directory.
by Alexandre Julliard 19 Mar '21

19 Mar '21

Module: wine Branch: master Commit: 74390cead33b9394c004c83f008ca13ed14213a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=74390cead33b9394c004c83f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 19 11:24:46 2021 +0100 ntdll: Add a global constant for the system directory. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/env.c | 14 +++++++------- dlls/ntdll/unix/loadorder.c | 6 ++---- dlls/ntdll/unix/process.c | 5 ++--- dlls/ntdll/unix/unix_private.h | 1 + 4 files changed, 12 insertions(+), 14 deletions(-) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index 2051ad33888..e1fb4c99544 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -76,6 +76,10 @@ static LANGID user_ui_language, system_ui_language; static char system_locale[LOCALE_NAME_MAX_LENGTH]; static char user_locale[LOCALE_NAME_MAX_LENGTH]; +/* system directory with trailing backslash */ +const WCHAR system_dir[] = {'\\','?','?','\\','C',':','\\','w','i','n','d','o','w','s','\\', + 's','y','s','t','e','m','3','2','\\',0}; + static struct { USHORT *data; @@ -149,8 +153,6 @@ static void *read_nls_file( ULONG type, ULONG id ) static NTSTATUS open_nls_data_file( ULONG type, ULONG id, HANDLE *file ) { - static const WCHAR systemdirW[] = {'\\','?','?','\\','C',':','\\','w','i','n','d','o','w','s','\\', - 's','y','s','t','e','m','3','2','\\',0}; static const WCHAR sortdirW[] = {'\\','?','?','\\','C',':','\\','w','i','n','d','o','w','s','\\', 'g','l','o','b','a','l','i','z','a','t','i','o','n','\\', 's','o','r','t','i','n','g','\\',0}; @@ -165,7 +167,7 @@ static NTSTATUS open_nls_data_file( ULONG type, ULONG id, HANDLE *file ) if (!path) return STATUS_OBJECT_NAME_NOT_FOUND; /* try to open file in system dir */ - wcscpy( buffer, type == NLS_SECTION_SORTKEYS ? sortdirW : systemdirW ); + wcscpy( buffer, type == NLS_SECTION_SORTKEYS ? sortdirW : system_dir ); p = strrchr( path, '/' ) + 1; ascii_to_unicode( buffer + wcslen(buffer), p, strlen(p) + 1 ); init_unicode_string( &valueW, buffer ); @@ -1609,8 +1611,6 @@ static void run_wineboot( WCHAR *env, SIZE_T size ) static const WCHAR cmdlineW[] = {'"','C',':','\\','w','i','n','d','o','w','s','\\', 's','y','s','t','e','m','3','2','\\','w','i','n','e','b','o','o','t','.','e','x','e','"', ' ','-','-','i','n','i','t',0}; - static const WCHAR sysdirW[] = {'C',':','\\','w','i','n','d','o','w','s', - '\\','s','y','s','t','e','m','3','2',0}; RTL_USER_PROCESS_PARAMETERS params = { sizeof(params), sizeof(params) }; PS_ATTRIBUTE_LIST ps_attr; PS_CREATE_INFO create_info; @@ -1635,8 +1635,8 @@ static void run_wineboot( WCHAR *env, SIZE_T size ) params.Flags = PROCESS_PARAMS_FLAG_NORMALIZED; params.Environment = env; params.EnvironmentSize = size; - init_unicode_string( &params.CurrentDirectory.DosPath, sysdirW ); - init_unicode_string( &params.DllPath, sysdirW ); + init_unicode_string( &params.CurrentDirectory.DosPath, system_dir + 4 ); + init_unicode_string( &params.DllPath, system_dir + 4 ); init_unicode_string( &params.ImagePathName, appnameW + 4 ); init_unicode_string( &params.CommandLine, cmdlineW ); init_unicode_string( &params.WindowTitle, appnameW + 4 ); diff --git a/dlls/ntdll/unix/loadorder.c b/dlls/ntdll/unix/loadorder.c index 0097fd73e80..f7360bdf7e1 100644 --- a/dlls/ntdll/unix/loadorder.c +++ b/dlls/ntdll/unix/loadorder.c @@ -381,8 +381,6 @@ static enum loadorder get_load_order_value( HANDLE std_key, HANDLE app_key, WCHA enum loadorder CDECL get_load_order( const WCHAR *app_name, const UNICODE_STRING *nt_name ) { static const WCHAR prefixW[] = {'\\','?','?','\\'}; - static const WCHAR system_dir[] = {'C',':','\\','w','i','n','d','o','w','s', - '\\','s','y','s','t','e','m','3','2'}; enum loadorder ret = LO_INVALID; HANDLE std_key, app_key = 0; const WCHAR *path = nt_name->Buffer; @@ -398,9 +396,9 @@ enum loadorder CDECL get_load_order( const WCHAR *app_name, const UNICODE_STRING /* Strip path information if the module resides in the system directory */ - if (!wcsnicmp( system_dir, path, ARRAY_SIZE( system_dir ))) + if (!wcsnicmp( system_dir + 4, path, wcslen(system_dir) - 4 )) { - const WCHAR *p = path + ARRAY_SIZE( system_dir ); + const WCHAR *p = path + wcslen( system_dir ) - 4; while (*p == '\\' || *p == '/') p++; if (!wcschr( p, '\\' ) && !wcschr( p, '/' )) path = p; } diff --git a/dlls/ntdll/unix/process.c b/dlls/ntdll/unix/process.c index 441b34ee9c4..d6dc893fba5 100644 --- a/dlls/ntdll/unix/process.c +++ b/dlls/ntdll/unix/process.c @@ -281,13 +281,12 @@ static startup_info_t *create_startup_info( const RTL_USER_PROCESS_PARAMETERS *p */ static BOOL is_builtin_path( UNICODE_STRING *path, BOOL *is_64bit ) { - static const WCHAR systemW[] = {'\\','?','?','\\','c',':','\\','w','i','n','d','o','w','s','\\', - 's','y','s','t','e','m','3','2','\\'}; static const WCHAR wow64W[] = {'\\','?','?','\\','c',':','\\','w','i','n','d','o','w','s','\\', 's','y','s','w','o','w','6','4'}; *is_64bit = is_win64; - if (path->Length > sizeof(systemW) && !wcsnicmp( path->Buffer, systemW, ARRAY_SIZE(systemW) )) + if (path->Length > wcslen(system_dir) * sizeof(WCHAR) && + !wcsnicmp( path->Buffer, system_dir, wcslen(system_dir) )) { #ifndef _WIN64 if (NtCurrentTeb64() && NtCurrentTeb64()->TlsSlots[WOW64_TLS_FILESYSREDIR]) *is_64bit = TRUE; diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 7e31710af70..c00a6ee6aa8 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -122,6 +122,7 @@ extern int main_argc DECLSPEC_HIDDEN; extern char **main_argv DECLSPEC_HIDDEN; extern char **main_envp DECLSPEC_HIDDEN; extern WCHAR **main_wargv DECLSPEC_HIDDEN; +extern const WCHAR system_dir[] DECLSPEC_HIDDEN; extern unsigned int server_cpus DECLSPEC_HIDDEN; extern BOOL is_wow64 DECLSPEC_HIDDEN; extern BOOL process_exiting DECLSPEC_HIDDEN;

1 0

Paul Gofman : mmdevapi: Make spatial audio objects buffer update size constant.
by Alexandre Julliard 19 Mar '21

19 Mar '21

Module: wine Branch: master Commit: 1d66a108b901ebfb11b134e9a6895b1d87333638 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d66a108b901ebfb11b134e9… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Mar 17 19:41:52 2021 +0300 mmdevapi: Make spatial audio objects buffer update size constant. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mmdevapi/spatialaudio.c | 22 +++--------- dlls/mmdevapi/tests/Makefile.in | 2 +- dlls/mmdevapi/tests/spatialaudio.c | 73 ++++++++++++++++++++++++++++++++++---- 3 files changed, 72 insertions(+), 25 deletions(-) diff --git a/dlls/mmdevapi/spatialaudio.c b/dlls/mmdevapi/spatialaudio.c index cbca57b4890..7ec09b663aa 100644 --- a/dlls/mmdevapi/spatialaudio.c +++ b/dlls/mmdevapi/spatialaudio.c @@ -41,8 +41,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(mmdevapi); -#define MAX_PERIODS 3 - static UINT32 AudioObjectType_to_index(AudioObjectType type) { UINT32 o = 0; @@ -361,7 +359,6 @@ static HRESULT WINAPI SAORS_BeginUpdatingAudioObjects(ISpatialAudioObjectRenderS static BOOL fixme_once = FALSE; SpatialAudioStreamImpl *This = impl_from_ISpatialAudioObjectRenderStream(iface); SpatialAudioObjectImpl *object; - UINT32 pad; HRESULT hr; TRACE("(%p)->(%p, %p)\n", This, dyn_count, frames); @@ -373,18 +370,7 @@ static HRESULT WINAPI SAORS_BeginUpdatingAudioObjects(ISpatialAudioObjectRenderS return SPTLAUDCLNT_E_OUT_OF_ORDER; } - hr = IAudioClient_GetCurrentPadding(This->client, &pad); - if(FAILED(hr)){ - WARN("GetCurrentPadding failed: %08x\n", hr); - LeaveCriticalSection(&This->lock); - return hr; - } - - if(pad < This->period_frames * MAX_PERIODS){ - This->update_frames = This->period_frames * MAX_PERIODS - pad; - }else{ - This->update_frames = 0; - } + This->update_frames = This->period_frames; if(This->update_frames > 0){ hr = IAudioRenderClient_GetBuffer(This->render, This->update_frames, (BYTE **)&This->buf); @@ -496,7 +482,7 @@ static HRESULT WINAPI SAORS_ActivateSpatialAudioObject(ISpatialAudioObjectRender obj->sa_stream = This; SAORS_AddRef(&This->ISpatialAudioObjectRenderStream_iface); - obj->buf = heap_alloc_zero(This->period_frames * MAX_PERIODS * This->sa_client->object_fmtex.Format.nBlockAlign); + obj->buf = heap_alloc_zero(This->period_frames * This->sa_client->object_fmtex.Format.nBlockAlign); EnterCriticalSection(&This->lock); @@ -616,7 +602,7 @@ static HRESULT WINAPI SAC_GetMaxFrameCount(ISpatialAudioClient *iface, TRACE("(%p)->(%p, %p)\n", This, format, count); - *count = MulDiv(period, format->nSamplesPerSec, 10000000) * MAX_PERIODS; + *count = MulDiv(period, format->nSamplesPerSec, 10000000); return S_OK; } @@ -731,7 +717,7 @@ static HRESULT activate_stream(SpatialAudioStreamImpl *stream) hr = IAudioClient_Initialize(stream->client, AUDCLNT_SHAREMODE_SHARED, AUDCLNT_STREAMFLAGS_EVENTCALLBACK | AUDCLNT_STREAMFLAGS_NOPERSIST, - period * MAX_PERIODS, 0, &stream->stream_fmtex.Format, NULL); + period, 0, &stream->stream_fmtex.Format, NULL); if(FAILED(hr)){ WARN("Initialize failed: %08x\n", hr); IAudioClient_Release(stream->client); diff --git a/dlls/mmdevapi/tests/Makefile.in b/dlls/mmdevapi/tests/Makefile.in index 062ad413922..dd180a253b9 100644 --- a/dlls/mmdevapi/tests/Makefile.in +++ b/dlls/mmdevapi/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = mmdevapi.dll -IMPORTS = ole32 version user32 advapi32 +IMPORTS = ole32 version user32 advapi32 winmm C_SRCS = \ capture.c \ diff --git a/dlls/mmdevapi/tests/spatialaudio.c b/dlls/mmdevapi/tests/spatialaudio.c index f2612499350..d9ccc429ce8 100644 --- a/dlls/mmdevapi/tests/spatialaudio.c +++ b/dlls/mmdevapi/tests/spatialaudio.c @@ -29,6 +29,7 @@ #include "mmdeviceapi.h" #include "spatialaudioclient.h" +#include "mmsystem.h" static IMMDeviceEnumerator *mme = NULL; static IMMDevice *dev = NULL; @@ -269,15 +270,14 @@ static BOOL is_buffer_zeroed(const BYTE *buffer, UINT32 buffer_length) static void test_audio_object_buffers(void) { - HRESULT hr; + UINT32 dyn_object_count, frame_count, max_frame_count, buffer_length; + SpatialAudioObjectRenderStreamActivationParams activation_params; ISpatialAudioObjectRenderStream *sas = NULL; + PROPVARIANT activation_params_prop; ISpatialAudioObject *sao[4]; - UINT32 dyn_object_count, frame_count, buffer_length; BYTE *buffer; - INT i; - - SpatialAudioObjectRenderStreamActivationParams activation_params; - PROPVARIANT activation_params_prop; + INT i, j, k; + HRESULT hr; PropVariantInit(&activation_params_prop); activation_params_prop.vt = VT_BLOB; @@ -288,6 +288,17 @@ static void test_audio_object_buffers(void) hr = ISpatialAudioClient_ActivateSpatialAudioStream(sac, &activation_params_prop, &IID_ISpatialAudioObjectRenderStream, (void**)&sas); ok(hr == S_OK, "Failed to activate spatial audio stream: 0x%08x\n", hr); + hr = ISpatialAudioClient_GetMaxFrameCount(sac, &format, &max_frame_count); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + frame_count = format.nSamplesPerSec / 100; /* 10ms */ + /* Most of the time the frame count matches the 10ms interval exactly. + * However (seen on some Testbot machines) it might be a bit higher for some reason. */ + ok(max_frame_count <= frame_count + frame_count / 4, "Got unexpected frame count %u.\n", frame_count); + + /* The tests below which check frame count from _BeginUpdatingAudioObjects fail on some Testbot machines + * with max_frame_count from _GetMaxFrameCount(). */ + max_frame_count = frame_count + frame_count / 4; + hr = ISpatialAudioObjectRenderStream_ActivateSpatialAudioObject(sas, AudioObjectType_FrontLeft, &sao[0]); ok(hr == S_OK, "Failed to activate spatial audio object: 0x%08x\n", hr); @@ -306,6 +317,7 @@ static void test_audio_object_buffers(void) hr = ISpatialAudioObjectRenderStream_BeginUpdatingAudioObjects(sas, &dyn_object_count, &frame_count); ok(hr == S_OK, "Failed to beging updating audio objects: 0x%08x\n", hr); ok(dyn_object_count == 0, "Unexpected dynamic objects\n"); + ok(frame_count <= max_frame_count, "Got unexpected frame count %u.\n", frame_count); hr = ISpatialAudioObjectRenderStream_ActivateSpatialAudioObject(sas, AudioObjectType_SideRight, &sao[3]); ok(hr == S_OK, "Failed to activate spatial audio object: 0x%08x\n", hr); @@ -323,6 +335,55 @@ static void test_audio_object_buffers(void) hr = ISpatialAudioObjectRenderStream_EndUpdatingAudioObjects(sas); ok(hr == S_OK, "Failed to end updating audio objects: 0x%08x\n", hr); + /* Emulate underrun and test frame count approximate limit. */ + + /* Force 1ms Sleep() timer resolution. */ + timeBeginPeriod(1); + for (j = 0; j < 20; ++j) + { + hr = WaitForSingleObject(event, 200); + ok(hr == WAIT_OBJECT_0, "Expected event to be flagged: 0x%08x, j %u.\n", hr, j); + + hr = ISpatialAudioObjectRenderStream_BeginUpdatingAudioObjects(sas, &dyn_object_count, &frame_count); + ok(hr == S_OK, "Failed to beging updating audio objects: 0x%08x\n", hr); + ok(dyn_object_count == 0, "Unexpected dynamic objects\n"); + ok(frame_count <= max_frame_count, "Got unexpected frame_count %u.\n", frame_count); + + /* Audio starts crackling with delays 10ms and above. However, setting such delay (that is, the delay + * which skips the whole quantum) breaks SA on some Testbot machines: _BeginUpdatingAudioObjects fails + * with SPTLAUDCLNT_E_INTERNAL starting from some iteration or WaitForSingleObject timeouts. That seems + * to work on the real hardware though. */ + Sleep(5); + + for (i = 0; i < ARRAYSIZE(sao); i++) + { + hr = ISpatialAudioObject_GetBuffer(sao[i], &buffer, &buffer_length); + ok(hr == S_OK, "Expected to be able to get buffers for audio object: 0x%08x, i %d\n", hr, i); + ok(buffer != NULL, "Expected to get a non-NULL buffer\n"); + ok(buffer_length == frame_count * format.wBitsPerSample / 8, + "Expected buffer length to be sample_size * frame_count = %hu but got %u\n", + frame_count * format.wBitsPerSample / 8, buffer_length); + + /* Enable to hear the test sound. */ + if (0) + { + if (format.wFormatTag == WAVE_FORMAT_IEEE_FLOAT) + { + for (k = 0; k < frame_count; ++k) + { + float time_sec = 10.0f / 1000.0f * (j + (float)k / frame_count); + + /* 440Hz tone. */ + ((float *)buffer)[k] = sinf(2.0f * M_PI * time_sec * 440.0f); + } + } + } + } + hr = ISpatialAudioObjectRenderStream_EndUpdatingAudioObjects(sas); + ok(hr == S_OK, "Failed to end updating audio objects: 0x%08x\n", hr); + } + timeEndPeriod(1); + hr = WaitForSingleObject(event, 200); ok(hr == WAIT_OBJECT_0, "Expected event to be flagged: 0x%08x\n", hr);

1 0

Rémi Bernon : include: Add RawGameController runtimeclass to windows.gaming.input.idl.
by Alexandre Julliard 19 Mar '21

19 Mar '21

Module: wine Branch: master Commit: 3a7d95135f3dafcbe736ba2ef8ce61acd921cd2f URL: https://source.winehq.org/git/wine.git/?a=commit;h=3a7d95135f3dafcbe736ba2e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Mar 19 11:06:29 2021 +0100 include: Add RawGameController runtimeclass to windows.gaming.input.idl. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/windows.gaming.input.idl | 207 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 206 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3a7d95135f3dafcbe736…

1 0

Rémi Bernon : include: Add ForceFeedbackMotor runtimeclass in windows.gaming.input.forcefeedback.idl.
by Alexandre Julliard 19 Mar '21

19 Mar '21

Module: wine Branch: master Commit: ef5b724face57650780cdb63548ad17530de4f3b URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef5b724face57650780cdb63… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Mar 19 11:06:28 2021 +0100 include: Add ForceFeedbackMotor runtimeclass in windows.gaming.input.forcefeedback.idl. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/windows.foundation.idl | 9 ++ include/windows.gaming.input.forcefeedback.idl | 116 +++++++++++++++++++++++++ 3 files changed, 126 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 32ef2cd41c1..b71de990aa2 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -751,6 +751,7 @@ SOURCES = \ windns.h \ windows.foundation.collections.idl \ windows.foundation.idl \ + windows.gaming.input.forcefeedback.idl \ windows.gaming.input.idl \ windows.h \ windows.media.speechsynthesis.idl \ diff --git a/include/windows.foundation.idl b/include/windows.foundation.idl index 595f8af69e7..b06b9eadaf4 100644 --- a/include/windows.foundation.idl +++ b/include/windows.foundation.idl @@ -114,3 +114,12 @@ namespace Windows { } } } + +namespace Windows { + namespace Foundation { + declare { + interface Windows.Foundation.AsyncOperationCompletedHandler<boolean>; + interface Windows.Foundation.IAsyncOperation<boolean>; + } + } +} diff --git a/include/windows.gaming.input.forcefeedback.idl b/include/windows.gaming.input.forcefeedback.idl new file mode 100644 index 00000000000..da153a3285a --- /dev/null +++ b/include/windows.gaming.input.forcefeedback.idl @@ -0,0 +1,116 @@ +/* + * Copyright 2021 Rémi Bernon for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifdef __WIDL__ +#pragma winrt ns_prefix +#endif + +import "inspectable.idl"; +import "asyncinfo.idl"; +import "eventtoken.idl"; +import "windowscontracts.idl"; +import "windows.foundation.idl"; + +namespace Windows { + namespace Gaming { + namespace Input { + namespace ForceFeedback { + typedef enum ForceFeedbackEffectAxes ForceFeedbackEffectAxes; + typedef enum ForceFeedbackLoadEffectResult ForceFeedbackLoadEffectResult; + interface IForceFeedbackEffect; + runtimeclass ForceFeedbackMotor; + } + } + } +} + +namespace Windows { + namespace Gaming { + namespace Input { + namespace ForceFeedback { + declare { + interface Windows.Foundation.AsyncOperationCompletedHandler<Windows.Gaming.Input.ForceFeedback.ForceFeedbackLoadEffectResult>; + interface Windows.Foundation.IAsyncOperation<Windows.Gaming.Input.ForceFeedback.ForceFeedbackLoadEffectResult>; + interface Windows.Foundation.Collections.IVectorView<Windows.Gaming.Input.ForceFeedback.ForceFeedbackMotor*>; + } + } + } + } +} + +namespace Windows { + namespace Gaming { + namespace Input { + namespace ForceFeedback { + [ + contract(Windows.Foundation.UniversalApiContract, 3.0), + flags + ] + enum ForceFeedbackEffectAxes + { + None = 0x0, + X = 0x1, + Y = 0x2, + Z = 0x4 + }; + + [contract(Windows.Foundation.UniversalApiContract, 3.0)] + enum ForceFeedbackLoadEffectResult + { + Succeeded = 0, + EffectStorageFull = 1, + EffectNotSupported = 2 + }; + + [ + contract(Windows.Foundation.UniversalApiContract, 3.0), + exclusiveto(Windows.Gaming.Input.ForceFeedback.ForceFeedbackMotor), + uuid(8d3d417c-a5ea-4516-8026-2b00f74ef6e5) + ] + interface IForceFeedbackMotor : IInspectable + { + [propget] HRESULT AreEffectsPaused([out, retval] boolean* value); + [propget] HRESULT MasterGain([out, retval] DOUBLE* value); + [propput] HRESULT MasterGain([in] DOUBLE value); + [propget] HRESULT IsEnabled([out, retval] boolean* value); + [propget] HRESULT SupportedAxes([out, retval] Windows.Gaming.Input.ForceFeedback.ForceFeedbackEffectAxes* value); + HRESULT LoadEffectAsync([in] Windows.Gaming.Input.ForceFeedback.IForceFeedbackEffect* effect, + [out, retval] Windows.Foundation.IAsyncOperation<Windows.Gaming.Input.ForceFeedback.ForceFeedbackLoadEffectResult>** async_op); + HRESULT PauseAllEffects(); + HRESULT ResumeAllEffects(); + HRESULT StopAllEffects(); + HRESULT TryDisableAsync([out, retval] Windows.Foundation.IAsyncOperation<boolean>** async_op); + HRESULT TryEnableAsync([out, retval] Windows.Foundation.IAsyncOperation<boolean>** async_op); + HRESULT TryResetAsync([out, retval] Windows.Foundation.IAsyncOperation<boolean>** async_op); + HRESULT TryUnloadEffectAsync([in] Windows.Gaming.Input.ForceFeedback.IForceFeedbackEffect* effect, + [out, retval] Windows.Foundation.IAsyncOperation<boolean>** async_op); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 3.0), + marshaling_behavior(agile), + threading(both) + ] + runtimeclass ForceFeedbackMotor + { + [default] interface Windows.Gaming.Input.ForceFeedback.IForceFeedbackMotor; + } + } + } + } +}

1 0

Rémi Bernon : include: Add User(ChangedEventArgs) runtimeclasses in windows.system.idl.
by Alexandre Julliard 19 Mar '21

19 Mar '21

Module: wine Branch: master Commit: 32a8c0f10df60ba0c4ef6a38d05c8c39124eff2a URL: https://source.winehq.org/git/wine.git/?a=commit;h=32a8c0f10df60ba0c4ef6a38… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Mar 19 11:06:27 2021 +0100 include: Add User(ChangedEventArgs) runtimeclasses in windows.system.idl. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/windows.system.idl | 73 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 74 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 115da5bd080..32ef2cd41c1 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -754,6 +754,7 @@ SOURCES = \ windows.gaming.input.idl \ windows.h \ windows.media.speechsynthesis.idl \ + windows.system.idl \ windowscontracts.idl \ windowsx.h \ wine/debug.h \ diff --git a/include/windows.system.idl b/include/windows.system.idl new file mode 100644 index 00000000000..aaf5ecd69a1 --- /dev/null +++ b/include/windows.system.idl @@ -0,0 +1,73 @@ +/* + * Copyright 2021 Rémi Bernon for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifdef __WIDL__ +#pragma winrt ns_prefix +#endif + +import "inspectable.idl"; +import "asyncinfo.idl"; +import "eventtoken.idl"; +import "windowscontracts.idl"; +import "windows.foundation.idl"; + +namespace Windows { + namespace System { + interface IUser; + interface IUserStatics; + interface IUserChangedEventArgs; + interface IUserChangedEventArgs2; + runtimeclass User; + runtimeclass UserChangedEventArgs; + } +} + +namespace Windows { + namespace System { + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.System.UserChangedEventArgs), + uuid(086459dc-18c6-48db-bc99-724fb9203ccc) + ] + interface IUserChangedEventArgs : IInspectable + { + [propget] HRESULT User([out, retval] Windows.System.User** value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(agile), + static(Windows.System.IUserStatics, Windows.Foundation.UniversalApiContract, 1.0), + threading(both), + ] + runtimeclass User + { + [default] interface Windows.System.IUser; + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(agile) + ] + runtimeclass UserChangedEventArgs + { + [default] interface Windows.System.IUserChangedEventArgs; + [contract(Windows.Foundation.UniversalApiContract, 10.0)] interface Windows.System.IUserChangedEventArgs2; + } + } +}

1 0

Rémi Bernon : include: Add IAsyncOperation and TypedEventHandler in windows.foundation.collections.idl.
by Alexandre Julliard 19 Mar '21

19 Mar '21

Module: wine Branch: master Commit: 14161788e130b54f477ed4eab1266bb2817720d7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=14161788e130b54f477ed4ea… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Mar 19 11:06:26 2021 +0100 include: Add IAsyncOperation and TypedEventHandler in windows.foundation.collections.idl. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/windows.foundation.collections.idl | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/include/windows.foundation.collections.idl b/include/windows.foundation.collections.idl index 53513b4c1ab..50a678e410c 100644 --- a/include/windows.foundation.collections.idl +++ b/include/windows.foundation.collections.idl @@ -47,6 +47,31 @@ cpp_quote("#endif") ] delegate HRESULT EventHandler<T>([in] IInspectable *sender, [in] T args); + interface IAsyncOperation<TResult>; + + [ + contract(Windows.Foundation.FoundationContract, 1.0), + uuid(fcdcf02c-e5d8-4478-915a-4d90b74b83a5) + ] + delegate HRESULT AsyncOperationCompletedHandler<TResult>([in] IAsyncOperation<TResult> *info, [in] AsyncStatus status); + + [ + contract(Windows.Foundation.FoundationContract, 1.0), + uuid(9fc2b0bb-e446-44e2-aa61-9cab8f636af2) + ] + interface IAsyncOperation<TResult> : IInspectable + { + [propput] HRESULT Completed([in] AsyncOperationCompletedHandler<TResult> *handler); + [propget] HRESULT Completed([out, retval] AsyncOperationCompletedHandler<TResult> **handler); + HRESULT GetResults([out, retval] TResult **results); + } + + [ + contract(Windows.Foundation.FoundationContract, 1.0), + uuid(9de1c534-6ae1-11e0-84e1-18a905bcc53f) + ] + delegate HRESULT TypedEventHandler<TSender, TArgs>([in] TSender sender, [in] TArgs args); + namespace Collections { [

1 0

Rémi Bernon : include: Add IAsyncInfo interface in asyncinfo.idl.
by Alexandre Julliard 19 Mar '21

19 Mar '21

Module: wine Branch: master Commit: 7179898eb249453d393c1dba50ca79184f554add URL: https://source.winehq.org/git/wine.git/?a=commit;h=7179898eb249453d393c1dba… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Mar 19 11:06:25 2021 +0100 include: Add IAsyncInfo interface in asyncinfo.idl. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/asyncinfo.idl | 45 ++++++++++++++++++++++++++++++ include/windows.foundation.collections.idl | 2 +- include/windows.foundation.idl | 2 +- 4 files changed, 48 insertions(+), 2 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index 1c80421ef6f..115da5bd080 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -20,6 +20,7 @@ SOURCES = \ appmodel.h \ asferr.h \ asptlb.idl \ + asyncinfo.idl \ asynot.idl \ asysta.idl \ atlbase.h \ diff --git a/include/asyncinfo.idl b/include/asyncinfo.idl new file mode 100644 index 00000000000..45ab9f568ec --- /dev/null +++ b/include/asyncinfo.idl @@ -0,0 +1,45 @@ +/* + * Copyright 2021 Rémi Bernon for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifdef __WIDL__ +#pragma winrt ns_prefix +#endif + +import "inspectable.idl"; + +typedef [v1_enum] enum AsyncStatus +{ + Started = 0, + Completed, + Canceled, + Error, +} AsyncStatus; + +[ + object, + uuid(00000036-0000-0000-c000-000000000046), + pointer_default(unique) +] +interface IAsyncInfo : IInspectable +{ + [propget] HRESULT Id([out, retval] unsigned __int32 *id); + [propget] HRESULT Status([out, retval] AsyncStatus *status); + [propget] HRESULT ErrorCode([out, retval] HRESULT *error_code); + HRESULT Cancel(); + HRESULT Close(); +} diff --git a/include/windows.foundation.collections.idl b/include/windows.foundation.collections.idl index ed05016b96d..53513b4c1ab 100644 --- a/include/windows.foundation.collections.idl +++ b/include/windows.foundation.collections.idl @@ -21,7 +21,7 @@ #endif import "inspectable.idl"; -/* import "asyncinfo.idl"; */ +import "asyncinfo.idl"; import "windowscontracts.idl"; /* import "eventtoken.idl"; */ diff --git a/include/windows.foundation.idl b/include/windows.foundation.idl index 3c60278cf05..595f8af69e7 100644 --- a/include/windows.foundation.idl +++ b/include/windows.foundation.idl @@ -21,7 +21,7 @@ #endif import "inspectable.idl"; -/* import "asyncinfo.idl"; */ +import "asyncinfo.idl"; import "windowscontracts.idl"; /* import "eventtoken.idl"; */ /* import "ivectorchangedeventargs.idl"; */

1 0

Rémi Bernon : widl: Always check the runtimeclass interfaces presence.
by Alexandre Julliard 19 Mar '21

19 Mar '21

Module: wine Branch: master Commit: aa119a1e065c56062c5704f4178d5b8f30d4b005 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa119a1e065c56062c5704f4… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Mar 19 09:51:44 2021 +0100 widl: Always check the runtimeclass interfaces presence. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/typetree.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tools/widl/typetree.h b/tools/widl/typetree.h index b43b6bfbf79..db723817266 100644 --- a/tools/widl/typetree.h +++ b/tools/widl/typetree.h @@ -387,8 +387,7 @@ static inline type_t *type_runtimeclass_get_default_iface(const type_t *type, in typeref_list_t *ifaces = type_runtimeclass_get_ifaces(type); typeref_t *ref; - if (!ifaces) return NULL; - LIST_FOR_EACH_ENTRY(ref, ifaces, typeref_t, entry) + if (ifaces) LIST_FOR_EACH_ENTRY(ref, ifaces, typeref_t, entry) if (is_attr(ref->attrs, ATTR_DEFAULT)) return ref->type;

1 0

Rémi Bernon : ntdll/tests: Add RtlQueryPerformanceCounter tests.
by Alexandre Julliard 19 Mar '21

19 Mar '21

Module: wine Branch: master Commit: d9d478e277bcf60e47803d00d1897e8aa649027c URL: https://source.winehq.org/git/wine.git/?a=commit;h=d9d478e277bcf60e47803d00… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Mar 18 17:22:06 2021 +0100 ntdll/tests: Add RtlQueryPerformanceCounter tests. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/time.c | 111 ++++++++++++++++++++++++++++++++++++++++++++++++ include/winternl.h | 1 + 2 files changed, 112 insertions(+) diff --git a/dlls/ntdll/tests/time.c b/dlls/ntdll/tests/time.c index 51d9115b87c..431d8cec8ca 100644 --- a/dlls/ntdll/tests/time.c +++ b/dlls/ntdll/tests/time.c @@ -19,8 +19,10 @@ */ #define NONAMELESSUNION +#define NONAMELESSSTRUCT #include "ntdll_test.h" #include "ddk/wdm.h" +#include "intrin.h" #define TICKSPERSEC 10000000 #define TICKSPERMSEC 10000 @@ -35,6 +37,9 @@ static NTSTATUS (WINAPI *pRtlQueryTimeZoneInformation)( RTL_TIME_ZONE_INFORMATIO static NTSTATUS (WINAPI *pRtlQueryDynamicTimeZoneInformation)( RTL_DYNAMIC_TIME_ZONE_INFORMATION *); static BOOL (WINAPI *pRtlQueryUnbiasedInterruptTime)( ULONGLONG *time ); +static BOOL (WINAPI *pRtlQueryPerformanceCounter)(LARGE_INTEGER*); +static BOOL (WINAPI *pRtlQueryPerformanceFrequency)(LARGE_INTEGER*); + static const int MonthLengths[2][12] = { { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }, @@ -122,6 +127,107 @@ static void test_NtQueryPerformanceCounter(void) ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %08x\n", status); } +#if defined(__i386__) || defined(__x86_64__) + +struct hypervisor_shared_data +{ + UINT64 unknown; + UINT64 QpcMultiplier; + UINT64 QpcBias; +}; + +/* 128-bit multiply a by b and return the high 64 bits, same as __umulh */ +static UINT64 multiply_tsc(UINT64 a, UINT64 b) +{ + UINT64 ah = a >> 32, al = (UINT32)a, bh = b >> 32, bl = (UINT32)b, m; + m = (ah * bl) + (bh * al) + ((al * bl) >> 32); + return (ah * bh) + (m >> 32); +} + +static void test_RtlQueryPerformanceCounter(void) +{ + struct hypervisor_shared_data *hsd; + KSHARED_USER_DATA *usd = (void *)0x7ffe0000; + LARGE_INTEGER frequency, counter; + NTSTATUS status; + UINT64 tsc0, tsc1; + ULONG len; + BOOL ret; + + if (!pRtlQueryPerformanceCounter || !pRtlQueryPerformanceFrequency) + { + win_skip( "RtlQueryPerformanceCounter/Frequency not available, skipping tests\n" ); + return; + } + + if (!(usd->u3.s.QpcBypassEnabled & SHARED_GLOBAL_FLAGS_QPC_BYPASS_ENABLED)) + { + todo_wine win_skip("QpcBypassEnabled is not set, skipping tests\n"); + return; + } + + if ((usd->u3.s.QpcBypassEnabled & SHARED_GLOBAL_FLAGS_QPC_BYPASS_USE_HV_PAGE)) + { + ok( usd->u3.s.QpcBypassEnabled == (SHARED_GLOBAL_FLAGS_QPC_BYPASS_ENABLED|SHARED_GLOBAL_FLAGS_QPC_BYPASS_USE_HV_PAGE|SHARED_GLOBAL_FLAGS_QPC_BYPASS_USE_RDTSCP), + "unexpected QpcBypassEnabled %x, expected 0x83\n", usd->u3.s.QpcBypassEnabled ); + ok( usd->QpcFrequency == 10000000, "unexpected QpcFrequency %I64d, expected 10000000\n", usd->QpcFrequency ); + ok( !usd->u3.s.QpcShift, "unexpected QpcShift %d, expected 0\n", usd->u3.s.QpcShift ); + ok( usd->QpcInterruptTimeIncrement == ((ULONGLONG)1 << 63), + "unexpected QpcInterruptTimeIncrement %I64x, expected 1<<63\n", usd->QpcInterruptTimeIncrement ); + ok( usd->QpcInterruptTimeIncrementShift == 1, + "unexpected QpcInterruptTimeIncrementShift %d, expected 1\n", usd->QpcInterruptTimeIncrementShift ); + ok( usd->QpcSystemTimeIncrement == ((ULONGLONG)1 << 63), + "unexpected QpcSystemTimeIncrement %I64x, expected 1<<63\n", usd->QpcSystemTimeIncrement ); + ok( usd->QpcSystemTimeIncrementShift == 1, + "unexpected QpcSystemTimeIncrementShift %d, expected 1\n", usd->QpcSystemTimeIncrementShift ); + + hsd = NULL; + status = pNtQuerySystemInformation( SystemHypervisorSharedPageInformation, &hsd, sizeof(void *), &len ); + ok( !status, "NtQuerySystemInformation returned %x\n", status ); + ok( len == sizeof(void *), "unexpected SystemHypervisorSharedPageInformation length %u\n", len ); + ok( !!hsd, "unexpected SystemHypervisorSharedPageInformation address %p\n", hsd ); + + tsc0 = __rdtsc(); + ret = pRtlQueryPerformanceCounter( &counter ); + tsc1 = __rdtsc(); + ok( ret, "RtlQueryPerformanceCounter failed\n" ); + + tsc0 = multiply_tsc(tsc0, hsd->QpcMultiplier) + hsd->QpcBias + usd->QpcBias; + tsc1 = multiply_tsc(tsc1, hsd->QpcMultiplier) + hsd->QpcBias + usd->QpcBias; + + ok( tsc0 <= counter.QuadPart, "rdtscp %I64d and RtlQueryPerformanceCounter %I64d are out of order\n", tsc0, counter.QuadPart ); + ok( counter.QuadPart <= tsc1, "RtlQueryPerformanceCounter %I64d and rdtscp %I64d are out of order\n", counter.QuadPart, tsc1 ); + } + else + { + ok( usd->u3.s.QpcShift == 10, "unexpected QpcShift %d, expected 10\n", usd->u3.s.QpcShift ); + ok( usd->QpcInterruptTimeIncrementShift == 2, + "unexpected QpcInterruptTimeIncrementShift %d, expected 2\n", usd->QpcInterruptTimeIncrementShift ); + ok( usd->QpcSystemTimeIncrementShift == 2, + "unexpected QpcSystemTimeIncrementShift %d, expected 2\n", usd->QpcSystemTimeIncrementShift ); + + tsc0 = __rdtsc(); + ret = pRtlQueryPerformanceCounter( &counter ); + tsc1 = __rdtsc(); + ok( ret, "RtlQueryPerformanceCounter failed\n" ); + + tsc0 += usd->QpcBias; + tsc0 >>= usd->u3.s.QpcShift; + tsc1 += usd->QpcBias; + tsc1 >>= usd->u3.s.QpcShift; + + ok( tsc0 <= counter.QuadPart, "rdtscp %I64d and RtlQueryPerformanceCounter %I64d are out of order\n", tsc0, counter.QuadPart ); + ok( counter.QuadPart <= tsc1, "RtlQueryPerformanceCounter %I64d and rdtscp %I64d are out of order\n", counter.QuadPart, tsc1 ); + } + + ret = pRtlQueryPerformanceFrequency( &frequency ); + ok( ret, "RtlQueryPerformanceFrequency failed\n" ); + ok( frequency.QuadPart == usd->QpcFrequency, + "RtlQueryPerformanceFrequency returned %I64d, expected USD QpcFrequency %I64d\n", + frequency.QuadPart, usd->QpcFrequency ); +} +#endif + static void test_RtlQueryTimeZoneInformation(void) { RTL_DYNAMIC_TIME_ZONE_INFORMATION tzinfo, tzinfo2; @@ -266,6 +372,8 @@ START_TEST(time) pRtlQueryDynamicTimeZoneInformation = (void *)GetProcAddress(mod, "RtlQueryDynamicTimeZoneInformation"); pRtlQueryUnbiasedInterruptTime = (void *)GetProcAddress(mod, "RtlQueryUnbiasedInterruptTime"); + pRtlQueryPerformanceCounter = (void *)GetProcAddress(mod, "RtlQueryPerformanceCounter"); + pRtlQueryPerformanceFrequency = (void *)GetProcAddress(mod, "RtlQueryPerformanceFrequency"); if (pRtlTimeToTimeFields && pRtlTimeFieldsToTime) test_pRtlTimeToTimeFields(); @@ -274,4 +382,7 @@ START_TEST(time) test_NtQueryPerformanceCounter(); test_RtlQueryTimeZoneInformation(); test_user_shared_data_time(); +#if defined(__i386__) || defined(__x86_64__) + test_RtlQueryPerformanceCounter(); +#endif } diff --git a/include/winternl.h b/include/winternl.h index d35d509eb41..fcdedaec8aa 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1551,6 +1551,7 @@ typedef enum _SYSTEM_INFORMATION_CLASS { SystemFileCacheInformationEx = 81, SystemDynamicTimeZoneInformation = 102, SystemLogicalProcessorInformationEx = 107, + SystemHypervisorSharedPageInformation = 197, SystemInformationClassMax } SYSTEM_INFORMATION_CLASS, *PSYSTEM_INFORMATION_CLASS;

1 0

Nikolay Sivov : mf/session: Consider audio block alignment when creating output buffers for transforms.
by Alexandre Julliard 19 Mar '21

19 Mar '21

Module: wine Branch: master Commit: ec5bd49bf85606a7a4b1a5f4146fbaabf53c1256 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec5bd49bf85606a7a4b1a5f4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 19 12:28:13 2021 +0300 mf/session: Consider audio block alignment when creating output buffers for transforms. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 44 +++++++++++++++++++++++++++++++------------- 1 file changed, 31 insertions(+), 13 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 942212d5bf2..aa96ffd33ca 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -147,6 +147,7 @@ struct transform_stream { struct list samples; unsigned int requests; + unsigned int min_buffer_size; }; enum topo_node_flags @@ -1258,11 +1259,19 @@ static HRESULT session_add_media_sink(struct media_session *session, IMFTopology return S_OK; } +static unsigned int transform_node_get_stream_id(struct topo_node *node, BOOL output, unsigned int index) +{ + unsigned int *map = output ? node->u.transform.output_map : node->u.transform.input_map; + return map ? map[index] : index; +} + static HRESULT session_set_transform_stream_info(struct topo_node *node) { unsigned int *input_map = NULL, *output_map = NULL; - unsigned int i, input_count, output_count; + unsigned int i, input_count, output_count, block_alignment; struct transform_stream *streams; + IMFMediaType *media_type; + GUID major = { 0 }; HRESULT hr; hr = IMFTransform_GetStreamCount(node->object.transform, &input_count, &output_count); @@ -1282,20 +1291,33 @@ static HRESULT session_set_transform_stream_info(struct topo_node *node) if (SUCCEEDED(hr)) { + node->u.transform.input_map = input_map; + node->u.transform.output_map = output_map; + streams = heap_calloc(input_count, sizeof(*streams)); for (i = 0; i < input_count; ++i) list_init(&streams[i].samples); node->u.transform.inputs = streams; + node->u.transform.input_count = input_count; streams = heap_calloc(output_count, sizeof(*streams)); for (i = 0; i < output_count; ++i) + { list_init(&streams[i].samples); - node->u.transform.outputs = streams; - node->u.transform.input_count = input_count; + if (SUCCEEDED(IMFTransform_GetOutputCurrentType(node->object.transform, + transform_node_get_stream_id(node, TRUE, i), &media_type))) + { + if (SUCCEEDED(IMFMediaType_GetMajorType(media_type, &major)) && IsEqualGUID(&major, &MFMediaType_Audio) + && SUCCEEDED(IMFMediaType_GetUINT32(media_type, &MF_MT_AUDIO_BLOCK_ALIGNMENT, &block_alignment))) + { + streams[i].min_buffer_size = block_alignment; + } + IMFMediaType_Release(media_type); + } + } + node->u.transform.outputs = streams; node->u.transform.output_count = output_count; - node->u.transform.input_map = input_map; - node->u.transform.output_map = output_map; } return hr; @@ -2646,12 +2668,6 @@ static void session_set_sink_stream_state(struct media_session *session, IMFStre } } -static DWORD transform_node_get_stream_id(struct topo_node *node, BOOL output, DWORD index) -{ - unsigned int *map = output ? node->u.transform.output_map : node->u.transform.input_map; - return map ? map[index] : index; -} - static struct sample *transform_create_sample(IMFSample *sample) { struct sample *sample_entry = heap_alloc_zero(sizeof(*sample_entry)); @@ -2669,8 +2685,8 @@ static struct sample *transform_create_sample(IMFSample *sample) static HRESULT transform_get_external_output_sample(const struct media_session *session, struct topo_node *transform, unsigned int output_index, const MFT_OUTPUT_STREAM_INFO *stream_info, IMFSample **sample) { + unsigned int buffer_size, downstream_input; IMFTopologyNode *downstream_node; - unsigned int downstream_input; IMFMediaBuffer *buffer = NULL; struct topo_node *topo_node; TOPOID node_id; @@ -2693,7 +2709,9 @@ static HRESULT transform_get_external_output_sample(const struct media_session * } else { - hr = MFCreateAlignedMemoryBuffer(stream_info->cbSize, stream_info->cbAlignment, &buffer); + buffer_size = max(stream_info->cbSize, transform->u.transform.outputs[output_index].min_buffer_size); + + hr = MFCreateAlignedMemoryBuffer(buffer_size, stream_info->cbAlignment, &buffer); if (SUCCEEDED(hr)) hr = MFCreateSample(sample);

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