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

Alexandre Julliard : ntdll: Add a global constant for the system directory.
by Alexandre Julliard March 19, 2021

March 19, 2021

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

March 19, 2021

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

Huw Davies : riched20: Remove always false conditions.
by Alexandre Julliard March 19, 2021

March 19, 2021

Module: wine Branch: master Commit: 5b3816c0b213c19d5e57f2f1a88a38a203f5cbf3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5b3816c0b213c19d5e57f2f1… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Mar 19 09:14:13 2021 +0000 riched20: Remove always false conditions. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/paint.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 607ced52089..b9173196aa2 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -1198,11 +1198,7 @@ void ME_UpdateScrollBar(ME_TextEditor *editor) if (editor->scrollbars & WS_HSCROLL) { - if (si.fMask & SIF_DISABLENOSCROLL) { - bScrollBarWillBeVisible = TRUE; - } else if (!(editor->scrollbars & WS_HSCROLL)) { - bScrollBarWillBeVisible = FALSE; - } + if (si.fMask & SIF_DISABLENOSCROLL) bScrollBarWillBeVisible = TRUE; if (bScrollBarWasVisible != bScrollBarWillBeVisible) ITextHost_TxShowScrollBar(editor->texthost, SB_HORZ, bScrollBarWillBeVisible); @@ -1253,11 +1249,7 @@ void ME_UpdateScrollBar(ME_TextEditor *editor) if (editor->scrollbars & WS_VSCROLL) { - if (si.fMask & SIF_DISABLENOSCROLL) { - bScrollBarWillBeVisible = TRUE; - } else if (!(editor->scrollbars & WS_VSCROLL)) { - bScrollBarWillBeVisible = FALSE; - } + if (si.fMask & SIF_DISABLENOSCROLL) bScrollBarWillBeVisible = TRUE; if (bScrollBarWasVisible != bScrollBarWillBeVisible) ITextHost_TxShowScrollBar(editor->texthost, SB_VERT,

1 0

Rémi Bernon : widl: Always check the runtimeclass interfaces presence.
by Alexandre Julliard March 19, 2021

March 19, 2021

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 : include: Add RawGameController runtimeclass to windows.gaming.input.idl.
by Alexandre Julliard March 19, 2021

March 19, 2021

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 IAsyncOperation and TypedEventHandler in windows.foundation.collections.idl.
by Alexandre Julliard March 19, 2021

March 19, 2021

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

Huw Davies : riched20: Update editor's wordwrap state.
by Alexandre Julliard March 19, 2021

March 19, 2021

Module: wine Branch: master Commit: 68c5f747db3757e637f4e37b630ff0757b6dd360 URL: https://source.winehq.org/git/wine.git/?a=commit;h=68c5f747db3757e637f4e37b… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Mar 19 09:14:16 2021 +0000 riched20: Update editor's wordwrap state. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/txtsrv.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/riched20/txtsrv.c b/dlls/riched20/txtsrv.c index eee55462ef2..5a8929e6c67 100644 --- a/dlls/riched20/txtsrv.c +++ b/dlls/riched20/txtsrv.c @@ -358,6 +358,8 @@ DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_OnTxPropertyBitsChange( ITextServic TRACE( "%p, mask %08x, bits %08x\n", services, mask, bits ); services->editor->props = (services->editor->props & ~mask) | (bits & mask); + if (mask & (TXTBIT_WORDWRAP | TXTBIT_MULTILINE)) + services->editor->bWordWrap = (services->editor->props & TXTBIT_WORDWRAP) && (services->editor->props & TXTBIT_MULTILINE); if (mask & TXTBIT_SCROLLBARCHANGE) {

1 0

Zebediah Figura : opencl: Avoid calling clSetCommandQueueProperty().
by Alexandre Julliard March 19, 2021

March 19, 2021

Module: wine Branch: master Commit: ed44832c7d586ab52dab08b0a40d36c9a08ff2b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed44832c7d586ab52dab08b0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 18 23:06:32 2021 -0500 opencl: Avoid calling clSetCommandQueueProperty(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opencl/make_opencl | 4 ++++ dlls/opencl/pe_thunks.c | 6 ------ dlls/opencl/pe_wrappers.c | 9 +++++++++ dlls/opencl/unix_thunks.c | 6 ------ dlls/opencl/unixlib.h | 1 - 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/opencl/make_opencl b/dlls/opencl/make_opencl index 72b7386d1e2..f30967ff384 100755 --- a/dlls/opencl/make_opencl +++ b/dlls/opencl/make_opencl @@ -216,6 +216,9 @@ sub needs_pe_wrapper($) # needs function pointer conversion "clGetExtensionFunctionAddress" => 1, + + # deprecated and absent from headers + "clSetCommandQueueProperty" => 1, ); my $name = shift; @@ -244,6 +247,7 @@ sub needs_unix_function($) my %funcs = ( "clGetExtensionFunctionAddress" => 1, + "clSetCommandQueueProperty" => 1, ); my $name = shift; diff --git a/dlls/opencl/pe_thunks.c b/dlls/opencl/pe_thunks.c index b3b08688d16..eb0466b6286 100644 --- a/dlls/opencl/pe_thunks.c +++ b/dlls/opencl/pe_thunks.c @@ -360,12 +360,6 @@ cl_int WINAPI clRetainSampler( cl_sampler sampler ) return opencl_funcs->pclRetainSampler( sampler ); } -cl_int WINAPI clSetCommandQueueProperty( cl_command_queue command_queue, cl_command_queue_properties properties, cl_bool enable, cl_command_queue_properties* old_properties ) -{ - TRACE( "(%p, %s, %u, %p)\n", command_queue, wine_dbgstr_longlong(properties), enable, old_properties ); - return opencl_funcs->pclSetCommandQueueProperty( command_queue, properties, enable, old_properties ); -} - cl_int WINAPI clSetKernelArg( cl_kernel kernel, cl_uint arg_index, size_t arg_size, const void* arg_value ) { TRACE( "(%p, %u, %Iu, %p)\n", kernel, arg_index, arg_size, arg_value ); diff --git a/dlls/opencl/pe_wrappers.c b/dlls/opencl/pe_wrappers.c index 37be38c728f..35c78181580 100644 --- a/dlls/opencl/pe_wrappers.c +++ b/dlls/opencl/pe_wrappers.c @@ -118,6 +118,15 @@ void * WINAPI clGetExtensionFunctionAddress( const char *func_name ) return ret; } + +cl_int WINAPI clSetCommandQueueProperty( cl_command_queue command_queue, cl_command_queue_properties properties, + cl_bool enable, cl_command_queue_properties *old_properties ) +{ + FIXME( "(%p, %s, %u, %p) deprecated\n", command_queue, wine_dbgstr_longlong(properties), enable, old_properties ); + return CL_INVALID_QUEUE_PROPERTIES; +} + + BOOL WINAPI DllMain( HINSTANCE instance, DWORD reason, void *reserved ) { if (reason == DLL_PROCESS_ATTACH) diff --git a/dlls/opencl/unix_thunks.c b/dlls/opencl/unix_thunks.c index 0fe3a081e0b..579c12eed79 100644 --- a/dlls/opencl/unix_thunks.c +++ b/dlls/opencl/unix_thunks.c @@ -292,11 +292,6 @@ static cl_int WINAPI wrap_clRetainSampler( cl_sampler sampler ) return clRetainSampler( sampler ); } -static cl_int WINAPI wrap_clSetCommandQueueProperty( cl_command_queue command_queue, cl_command_queue_properties properties, cl_bool enable, cl_command_queue_properties* old_properties ) -{ - return clSetCommandQueueProperty( command_queue, properties, enable, old_properties ); -} - static cl_int WINAPI wrap_clSetKernelArg( cl_kernel kernel, cl_uint arg_index, size_t arg_size, const void* arg_value ) { return clSetKernelArg( kernel, arg_index, arg_size, arg_value ); @@ -375,7 +370,6 @@ const struct opencl_funcs funcs = wrap_clRetainMemObject, wrap_clRetainProgram, wrap_clRetainSampler, - wrap_clSetCommandQueueProperty, wrap_clSetKernelArg, wrap_clUnloadCompiler, wrap_clWaitForEvents, diff --git a/dlls/opencl/unixlib.h b/dlls/opencl/unixlib.h index e0d01317db7..d5b1da1b99e 100644 --- a/dlls/opencl/unixlib.h +++ b/dlls/opencl/unixlib.h @@ -63,7 +63,6 @@ struct opencl_funcs cl_int (WINAPI *pclRetainMemObject)( cl_mem memobj ); cl_int (WINAPI *pclRetainProgram)( cl_program program ); cl_int (WINAPI *pclRetainSampler)( cl_sampler sampler ); - cl_int (WINAPI *pclSetCommandQueueProperty)( cl_command_queue command_queue, cl_command_queue_properties properties, cl_bool enable, cl_command_queue_properties* old_properties ); cl_int (WINAPI *pclSetKernelArg)( cl_kernel kernel, cl_uint arg_index, size_t arg_size, const void* arg_value ); cl_int (WINAPI *pclUnloadCompiler)( void ); cl_int (WINAPI *pclWaitForEvents)( cl_uint num_events, const cl_event* event_list );

1 0

Nikolay Sivov : mf/session: Consider audio block alignment when creating output buffers for transforms.
by Alexandre Julliard March 19, 2021

March 19, 2021

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

Huw Davies : include: Fix spelling of the InPlace methods.
by Alexandre Julliard March 19, 2021

March 19, 2021

Module: wine Branch: master Commit: 61ce905bc459725b3e1ee2cf6d54f9947db003d0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=61ce905bc459725b3e1ee2cf… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Mar 19 09:14:17 2021 +0000 include: Fix spelling of the InPlace methods. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.h | 4 ++-- dlls/riched20/tests/txtsrv.c | 4 ++-- dlls/riched20/txtsrv.c | 20 ++++++++++---------- include/textserv.h | 4 ++-- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index e7d392c71c6..bad48ba54da 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -394,8 +394,8 @@ extern const struct ITextServicesVtbl text_services_stdcall_vtbl DECLSPEC_HIDDEN #define ITextServices_TxGetVScroll(This,a,b,c,d,e) TXTSERV_VTABLE(This)->TxGetVScroll(This,a,b,c,d,e) #define ITextServices_OnTxSetCursor(This,a,b,c,d,e,f,g,h,i) TXTSERV_VTABLE(This)->OnTxSetCursor(This,a,b,c,d,e,f,g,h,i) #define ITextServices_TxQueryHitPoint(This,a,b,c,d,e,f,g,h,i,j) TXTSERV_VTABLE(This)->TxQueryHitPoint(This,a,b,c,d,e,f,g,h,i,j) -#define ITextServices_OnTxInplaceActivate(This,a) TXTSERV_VTABLE(This)->OnTxInplaceActivate(This,a) -#define ITextServices_OnTxInplaceDeactivate(This) TXTSERV_VTABLE(This)->OnTxInplaceDeactivate(This) +#define ITextServices_OnTxInPlaceActivate(This,a) TXTSERV_VTABLE(This)->OnTxInPlaceActivate(This,a) +#define ITextServices_OnTxInPlaceDeactivate(This) TXTSERV_VTABLE(This)->OnTxInPlaceDeactivate(This) #define ITextServices_OnTxUIActivate(This) TXTSERV_VTABLE(This)->OnTxUIActivate(This) #define ITextServices_OnTxUIDeactivate(This) TXTSERV_VTABLE(This)->OnTxUIDeactivate(This) #define ITextServices_TxGetText(This,a) TXTSERV_VTABLE(This)->TxGetText(This,a) diff --git a/dlls/riched20/tests/txtsrv.c b/dlls/riched20/tests/txtsrv.c index f41375d871a..de6d8a8df24 100644 --- a/dlls/riched20/tests/txtsrv.c +++ b/dlls/riched20/tests/txtsrv.c @@ -61,8 +61,8 @@ static ITextServicesVtbl itextServicesStdcallVtbl; #define ITextServices_TxGetVScroll(This,a,b,c,d,e) TXTSERV_VTABLE(This)->TxGetVScroll(This,a,b,c,d,e) #define ITextServices_OnTxSetCursor(This,a,b,c,d,e,f,g,h,i) TXTSERV_VTABLE(This)->OnTxSetCursor(This,a,b,c,d,e,f,g,h,i) #define ITextServices_TxQueryHitPoint(This,a,b,c,d,e,f,g,h,i,j) TXTSERV_VTABLE(This)->TxQueryHitPoint(This,a,b,c,d,e,f,g,h,i,j) -#define ITextServices_OnTxInplaceActivate(This,a) TXTSERV_VTABLE(This)->OnTxInplaceActivate(This,a) -#define ITextServices_OnTxInplaceDeactivate(This) TXTSERV_VTABLE(This)->OnTxInplaceDeactivate(This) +#define ITextServices_OnTxInPlaceActivate(This,a) TXTSERV_VTABLE(This)->OnTxInPlaceActivate(This,a) +#define ITextServices_OnTxInPlaceDeactivate(This) TXTSERV_VTABLE(This)->OnTxInPlaceDeactivate(This) #define ITextServices_OnTxUIActivate(This) TXTSERV_VTABLE(This)->OnTxUIActivate(This) #define ITextServices_OnTxUIDeactivate(This) TXTSERV_VTABLE(This)->OnTxUIDeactivate(This) #define ITextServices_TxGetText(This,a) TXTSERV_VTABLE(This)->TxGetText(This,a) diff --git a/dlls/riched20/txtsrv.c b/dlls/riched20/txtsrv.c index 5a8929e6c67..d637d52ea3b 100644 --- a/dlls/riched20/txtsrv.c +++ b/dlls/riched20/txtsrv.c @@ -232,8 +232,8 @@ static HRESULT update_client_rect( struct text_services *services, const RECT *c return hr; } -DEFINE_THISCALL_WRAPPER(fnTextSrv_OnTxInplaceActivate,8) -DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_OnTxInplaceActivate(ITextServices *iface, LPCRECT prcClient) +DEFINE_THISCALL_WRAPPER(fnTextSrv_OnTxInPlaceActivate,8) +DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_OnTxInPlaceActivate(ITextServices *iface, LPCRECT prcClient) { struct text_services *services = impl_from_ITextServices( iface ); @@ -241,8 +241,8 @@ DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_OnTxInplaceActivate(ITextServices * return E_NOTIMPL; } -DEFINE_THISCALL_WRAPPER(fnTextSrv_OnTxInplaceDeactivate,4) -DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_OnTxInplaceDeactivate(ITextServices *iface) +DEFINE_THISCALL_WRAPPER(fnTextSrv_OnTxInPlaceDeactivate,4) +DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_OnTxInPlaceDeactivate(ITextServices *iface) { struct text_services *services = impl_from_ITextServices( iface ); @@ -450,8 +450,8 @@ DEFINE_STDCALL_WRAPPER(5, ITextServices_TxGetHScroll) DEFINE_STDCALL_WRAPPER(6, ITextServices_TxGetVScroll) DEFINE_STDCALL_WRAPPER(7, ITextServices_OnTxSetCursor) DEFINE_STDCALL_WRAPPER(8, ITextServices_TxQueryHitPoint) -DEFINE_STDCALL_WRAPPER(9, ITextServices_OnTxInplaceActivate) -DEFINE_STDCALL_WRAPPER(10, ITextServices_OnTxInplaceDeactivate) +DEFINE_STDCALL_WRAPPER(9, ITextServices_OnTxInPlaceActivate) +DEFINE_STDCALL_WRAPPER(10, ITextServices_OnTxInPlaceDeactivate) DEFINE_STDCALL_WRAPPER(11, ITextServices_OnTxUIActivate) DEFINE_STDCALL_WRAPPER(12, ITextServices_OnTxUIDeactivate) DEFINE_STDCALL_WRAPPER(13, ITextServices_TxGetText) @@ -474,8 +474,8 @@ const ITextServicesVtbl text_services_stdcall_vtbl = STDCALL(ITextServices_TxGetVScroll), STDCALL(ITextServices_OnTxSetCursor), STDCALL(ITextServices_TxQueryHitPoint), - STDCALL(ITextServices_OnTxInplaceActivate), - STDCALL(ITextServices_OnTxInplaceDeactivate), + STDCALL(ITextServices_OnTxInPlaceActivate), + STDCALL(ITextServices_OnTxInPlaceDeactivate), STDCALL(ITextServices_OnTxUIActivate), STDCALL(ITextServices_OnTxUIDeactivate), STDCALL(ITextServices_TxGetText), @@ -501,8 +501,8 @@ static const ITextServicesVtbl textservices_vtbl = THISCALL(fnTextSrv_TxGetVScroll), THISCALL(fnTextSrv_OnTxSetCursor), THISCALL(fnTextSrv_TxQueryHitPoint), - THISCALL(fnTextSrv_OnTxInplaceActivate), - THISCALL(fnTextSrv_OnTxInplaceDeactivate), + THISCALL(fnTextSrv_OnTxInPlaceActivate), + THISCALL(fnTextSrv_OnTxInPlaceDeactivate), THISCALL(fnTextSrv_OnTxUIActivate), THISCALL(fnTextSrv_OnTxUIDeactivate), THISCALL(fnTextSrv_TxGetText), diff --git a/include/textserv.h b/include/textserv.h index 1272a6bba00..3abdcee6a30 100644 --- a/include/textserv.h +++ b/include/textserv.h @@ -103,10 +103,10 @@ DECLARE_INTERFACE_(ITextServices,IUnknown) INT y, DWORD* pHitResult) PURE; - THISCALLMETHOD_(HRESULT,OnTxInplaceActivate)( THIS_ + THISCALLMETHOD_(HRESULT,OnTxInPlaceActivate)( THIS_ LPCRECT prcClient) PURE; - THISCALLMETHOD_(HRESULT,OnTxInplaceDeactivate)( THIS ) PURE; + THISCALLMETHOD_(HRESULT,OnTxInPlaceDeactivate)( THIS ) PURE; THISCALLMETHOD_(HRESULT,OnTxUIActivate)( THIS ) PURE;

1 0