January 2022 - Wine-commits

Nikolay Sivov : mfmediaengine: Implement SetSourceFromByteStream().
by Alexandre Julliard 27 Jan '22

27 Jan '22

Module: wine Branch: master Commit: 9bf8fdaa8e9bb208af4092af4ef3145f9b955253 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9bf8fdaa8e9bb208af4092af… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 27 16:46:40 2022 +0300 mfmediaengine: Implement SetSourceFromByteStream(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfmediaengine/main.c | 102 ++++++++++++++++++++----------- dlls/mfmediaengine/tests/mfmediaengine.c | 47 ++++++++++++++ 2 files changed, 114 insertions(+), 35 deletions(-) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index 3fb8e2b9433..ae844c60e54 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -1202,10 +1202,10 @@ static void media_engine_start_playback(struct media_engine *engine) static HRESULT WINAPI media_engine_load_handler_Invoke(IMFAsyncCallback *iface, IMFAsyncResult *result) { struct media_engine *engine = impl_from_load_handler_IMFAsyncCallback(iface); + IUnknown *object = NULL, *state; unsigned int start_playback; MF_OBJECT_TYPE obj_type; IMFMediaSource *source; - IUnknown *object = NULL; HRESULT hr; EnterCriticalSection(&engine->cs); @@ -1216,7 +1216,15 @@ static HRESULT WINAPI media_engine_load_handler_Invoke(IMFAsyncCallback *iface, start_playback = engine->flags & FLAGS_ENGINE_PLAY_PENDING; media_engine_set_flag(engine, FLAGS_ENGINE_SOURCE_PENDING | FLAGS_ENGINE_PLAY_PENDING, FALSE); - if (FAILED(hr = IMFSourceResolver_EndCreateObjectFromURL(engine->resolver, result, &obj_type, &object))) + if (SUCCEEDED(IMFAsyncResult_GetState(result, &state))) + { + hr = IMFSourceResolver_EndCreateObjectFromByteStream(engine->resolver, result, &obj_type, &object); + IUnknown_Release(state); + } + else + hr = IMFSourceResolver_EndCreateObjectFromURL(engine->resolver, result, &obj_type, &object); + + if (FAILED(hr)) WARN("Failed to create source object, hr %#x.\n", hr); if (object) @@ -1384,50 +1392,60 @@ static HRESULT WINAPI media_engine_SetSourceElements(IMFMediaEngineEx *iface, IM return E_NOTIMPL; } -static HRESULT WINAPI media_engine_SetSource(IMFMediaEngineEx *iface, BSTR url) +static HRESULT media_engine_set_source(struct media_engine *engine, IMFByteStream *bytestream, BSTR url) { - struct media_engine *engine = impl_from_IMFMediaEngineEx(iface); + IPropertyStore *props = NULL; + unsigned int flags; HRESULT hr = S_OK; - TRACE("%p, %s.\n", iface, debugstr_w(url)); + SysFreeString(engine->current_source); + engine->current_source = NULL; + if (url) + engine->current_source = SysAllocString(url); - EnterCriticalSection(&engine->cs); + engine->ready_state = MF_MEDIA_ENGINE_READY_HAVE_NOTHING; - if (engine->flags & FLAGS_ENGINE_SHUT_DOWN) - hr = MF_E_SHUTDOWN; - else + IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_PURGEQUEUEDEVENTS, 0, 0); + + engine->network_state = MF_MEDIA_ENGINE_NETWORK_NO_SOURCE; + + if (url || bytestream) { - SysFreeString(engine->current_source); - engine->current_source = NULL; - if (url) - engine->current_source = SysAllocString(url); + flags = MF_RESOLUTION_MEDIASOURCE; + if (engine->flags & MF_MEDIA_ENGINE_DISABLE_LOCAL_PLUGINS) + flags |= MF_RESOLUTION_DISABLE_LOCAL_PLUGINS; - engine->ready_state = MF_MEDIA_ENGINE_READY_HAVE_NOTHING; + IMFAttributes_GetUnknown(engine->attributes, &MF_MEDIA_ENGINE_SOURCE_RESOLVER_CONFIG_STORE, + &IID_IPropertyStore, (void **)&props); + if (bytestream) + hr = IMFSourceResolver_BeginCreateObjectFromByteStream(engine->resolver, bytestream, url, flags, + props, NULL, &engine->load_handler, (IUnknown *)bytestream); + else + hr = IMFSourceResolver_BeginCreateObjectFromURL(engine->resolver, url, flags, props, NULL, + &engine->load_handler, NULL); + if (SUCCEEDED(hr)) + media_engine_set_flag(engine, FLAGS_ENGINE_SOURCE_PENDING, TRUE); - IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_PURGEQUEUEDEVENTS, 0, 0); + if (props) + IPropertyStore_Release(props); + } - engine->network_state = MF_MEDIA_ENGINE_NETWORK_NO_SOURCE; + return hr; +} - if (url) - { - IPropertyStore *props = NULL; - unsigned int flags; +static HRESULT WINAPI media_engine_SetSource(IMFMediaEngineEx *iface, BSTR url) +{ + struct media_engine *engine = impl_from_IMFMediaEngineEx(iface); + HRESULT hr; - flags = MF_RESOLUTION_MEDIASOURCE; - if (engine->flags & MF_MEDIA_ENGINE_DISABLE_LOCAL_PLUGINS) - flags |= MF_RESOLUTION_DISABLE_LOCAL_PLUGINS; + TRACE("%p, %s.\n", iface, debugstr_w(url)); - IMFAttributes_GetUnknown(engine->attributes, &MF_MEDIA_ENGINE_SOURCE_RESOLVER_CONFIG_STORE, - &IID_IPropertyStore, (void **)&props); - hr = IMFSourceResolver_BeginCreateObjectFromURL(engine->resolver, url, flags, props, NULL, - &engine->load_handler, NULL); - if (SUCCEEDED(hr)) - media_engine_set_flag(engine, FLAGS_ENGINE_SOURCE_PENDING, TRUE); + EnterCriticalSection(&engine->cs); - if (props) - IPropertyStore_Release(props); - } - } + if (engine->flags & FLAGS_ENGINE_SHUT_DOWN) + hr = MF_E_SHUTDOWN; + else + hr = media_engine_set_source(engine, NULL, url); LeaveCriticalSection(&engine->cs); @@ -2257,9 +2275,23 @@ static HRESULT WINAPI media_engine_OnVideoStreamTick(IMFMediaEngineEx *iface, LO static HRESULT WINAPI media_engine_SetSourceFromByteStream(IMFMediaEngineEx *iface, IMFByteStream *bytestream, BSTR url) { - FIXME("%p, %p, %s stub.\n", iface, bytestream, debugstr_w(url)); + struct media_engine *engine = impl_from_IMFMediaEngineEx(iface); + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %p, %s.\n", iface, bytestream, debugstr_w(url)); + + EnterCriticalSection(&engine->cs); + + if (engine->flags & FLAGS_ENGINE_SHUT_DOWN) + hr = MF_E_SHUTDOWN; + else if (!bytestream || !url) + hr = E_POINTER; + else + hr = media_engine_set_source(engine, bytestream, url); + + LeaveCriticalSection(&engine->cs); + + return hr; } static HRESULT WINAPI media_engine_GetStatistics(IMFMediaEngineEx *iface, MF_MEDIA_ENGINE_STATISTIC stat_id, PROPVARIANT *stat) diff --git a/dlls/mfmediaengine/tests/mfmediaengine.c b/dlls/mfmediaengine/tests/mfmediaengine.c index 1f0a2eda1b3..3368484f58e 100644 --- a/dlls/mfmediaengine/tests/mfmediaengine.c +++ b/dlls/mfmediaengine/tests/mfmediaengine.c @@ -165,6 +165,20 @@ static IMFMediaEngine *create_media_engine(IMFMediaEngineNotify *callback) return media_engine; } +static IMFMediaEngineEx *create_media_engine_ex(IMFMediaEngineNotify *callback) +{ + IMFMediaEngine *engine = create_media_engine(callback); + IMFMediaEngineEx *engine_ex = NULL; + + if (engine) + { + IMFMediaEngine_QueryInterface(engine, &IID_IMFMediaEngineEx, (void **)&engine_ex); + IMFMediaEngine_Release(engine); + } + + return engine_ex; +} + static void test_factory(void) { IMFMediaEngineClassFactory *factory, *factory2; @@ -279,6 +293,7 @@ static void test_CreateInstance(void) static void test_Shutdown(void) { struct media_engine_notify *notify; + IMFMediaEngineEx *media_engine_ex; IMFMediaTimeRange *time_range; IMFMediaEngine *media_engine; unsigned int state; @@ -428,6 +443,14 @@ todo_wine hr = IMFMediaEngine_GetVideoAspectRatio(media_engine, &cx, &cy); ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + if (SUCCEEDED(IMFMediaEngine_QueryInterface(media_engine, &IID_IMFMediaEngineEx, (void **)&media_engine_ex))) + { + hr = IMFMediaEngineEx_SetSourceFromByteStream(media_engine_ex, NULL, NULL); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + + IMFMediaEngineEx_Release(media_engine_ex); + } + IMFMediaEngine_Release(media_engine); IMFMediaEngineNotify_Release(&notify->IMFMediaEngineNotify_iface); } @@ -754,6 +777,29 @@ todo_wine { IMFMediaTimeRange_Release(range); } +static void test_SetSourceFromByteStream(void) +{ + struct media_engine_notify *notify; + IMFMediaEngineEx *media_engine; + HRESULT hr; + + notify = create_callback(); + + media_engine = create_media_engine_ex(&notify->IMFMediaEngineNotify_iface); + if (!media_engine) + { + win_skip("IMFMediaEngineEx is not supported.\n"); + IMFMediaEngineNotify_Release(&notify->IMFMediaEngineNotify_iface); + return; + } + + hr = IMFMediaEngineEx_SetSourceFromByteStream(media_engine, NULL, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + IMFMediaEngineEx_Release(media_engine); + IMFMediaEngineNotify_Release(&notify->IMFMediaEngineNotify_iface); +} + START_TEST(mfmediaengine) { HRESULT hr; @@ -782,6 +828,7 @@ START_TEST(mfmediaengine) test_mute(); test_error(); test_time_range(); + test_SetSourceFromByteStream(); IMFMediaEngineClassFactory_Release(factory);

1 0

Nikolay Sivov : mfmediaengine: Implement audio renderer configuration methods.
by Alexandre Julliard 27 Jan '22

27 Jan '22

Module: wine Branch: master Commit: 6938f9b9031a00617856d857c2435ae5e9c30c4c URL: https://source.winehq.org/git/wine.git/?a=commit;h=6938f9b9031a00617856d857… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 27 16:46:41 2022 +0300 mfmediaengine: Implement audio renderer configuration methods. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfmediaengine/main.c | 72 ++++++++++++++++++++++++++++---- dlls/mfmediaengine/tests/mfmediaengine.c | 44 +++++++++++++++++++ 2 files changed, 108 insertions(+), 8 deletions(-) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index ae844c60e54..5c00c10f718 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -29,6 +29,8 @@ #include "mferror.h" #include "dxgi.h" #include "d3d11.h" +#include "mmdeviceapi.h" +#include "audiosessiontypes.h" #include "wine/debug.h" @@ -2495,30 +2497,78 @@ static HRESULT WINAPI media_engine_EnableHorizontalMirrorMode(IMFMediaEngineEx * static HRESULT WINAPI media_engine_GetAudioStreamCategory(IMFMediaEngineEx *iface, UINT32 *category) { - FIXME("%p, %p stub.\n", iface, category); + struct media_engine *engine = impl_from_IMFMediaEngineEx(iface); + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, category); + + EnterCriticalSection(&engine->cs); + + if (engine->flags & FLAGS_ENGINE_SHUT_DOWN) + hr = MF_E_SHUTDOWN; + else + hr = IMFAttributes_GetUINT32(engine->attributes, &MF_MEDIA_ENGINE_AUDIO_CATEGORY, category); + + LeaveCriticalSection(&engine->cs); + + return hr; } static HRESULT WINAPI media_engine_SetAudioStreamCategory(IMFMediaEngineEx *iface, UINT32 category) { - FIXME("%p, %u stub.\n", iface, category); + struct media_engine *engine = impl_from_IMFMediaEngineEx(iface); + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %u.\n", iface, category); + + EnterCriticalSection(&engine->cs); + + if (engine->flags & FLAGS_ENGINE_SHUT_DOWN) + hr = MF_E_SHUTDOWN; + else + hr = IMFAttributes_SetUINT32(engine->attributes, &MF_MEDIA_ENGINE_AUDIO_CATEGORY, category); + + LeaveCriticalSection(&engine->cs); + + return hr; } static HRESULT WINAPI media_engine_GetAudioEndpointRole(IMFMediaEngineEx *iface, UINT32 *role) { - FIXME("%p, %p stub.\n", iface, role); + struct media_engine *engine = impl_from_IMFMediaEngineEx(iface); + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, role); + + EnterCriticalSection(&engine->cs); + + if (engine->flags & FLAGS_ENGINE_SHUT_DOWN) + hr = MF_E_SHUTDOWN; + else + hr = IMFAttributes_GetUINT32(engine->attributes, &MF_MEDIA_ENGINE_AUDIO_ENDPOINT_ROLE, role); + + LeaveCriticalSection(&engine->cs); + + return hr; } static HRESULT WINAPI media_engine_SetAudioEndpointRole(IMFMediaEngineEx *iface, UINT32 role) { - FIXME("%p, %u stub.\n", iface, role); + struct media_engine *engine = impl_from_IMFMediaEngineEx(iface); + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %u.\n", iface, role); + + EnterCriticalSection(&engine->cs); + + if (engine->flags & FLAGS_ENGINE_SHUT_DOWN) + hr = MF_E_SHUTDOWN; + else + hr = IMFAttributes_SetUINT32(engine->attributes, &MF_MEDIA_ENGINE_AUDIO_ENDPOINT_ROLE, role); + + LeaveCriticalSection(&engine->cs); + + return hr; } static HRESULT WINAPI media_engine_GetRealTimeMode(IMFMediaEngineEx *iface, BOOL *enabled) @@ -2867,6 +2917,12 @@ static HRESULT init_media_engine(DWORD flags, IMFAttributes *attributes, struct if (FAILED(hr = IMFAttributes_CopyAllItems(attributes, engine->attributes))) return hr; + /* Set default audio configuration */ + if (FAILED(IMFAttributes_GetItem(engine->attributes, &MF_MEDIA_ENGINE_AUDIO_CATEGORY, NULL))) + IMFAttributes_SetUINT32(engine->attributes, &MF_MEDIA_ENGINE_AUDIO_CATEGORY, AudioCategory_Other); + if (FAILED(IMFAttributes_GetItem(engine->attributes, &MF_MEDIA_ENGINE_AUDIO_ENDPOINT_ROLE, NULL))) + IMFAttributes_SetUINT32(engine->attributes, &MF_MEDIA_ENGINE_AUDIO_ENDPOINT_ROLE, eMultimedia); + IMFAttributes_GetUINT64(attributes, &MF_MEDIA_ENGINE_PLAYBACK_HWND, &playback_hwnd); hr = IMFAttributes_GetUINT32(attributes, &MF_MEDIA_ENGINE_VIDEO_OUTPUT_FORMAT, &output_format); if (playback_hwnd) /* FIXME: handle MF_MEDIA_ENGINE_PLAYBACK_VISUAL */ diff --git a/dlls/mfmediaengine/tests/mfmediaengine.c b/dlls/mfmediaengine/tests/mfmediaengine.c index 3368484f58e..8584554a2b6 100644 --- a/dlls/mfmediaengine/tests/mfmediaengine.c +++ b/dlls/mfmediaengine/tests/mfmediaengine.c @@ -29,6 +29,8 @@ #include "mferror.h" #include "dxgi.h" #include "initguid.h" +#include "mmdeviceapi.h" +#include "audiosessiontypes.h" #include "wine/heap.h" #include "wine/test.h" @@ -297,6 +299,7 @@ static void test_Shutdown(void) IMFMediaTimeRange *time_range; IMFMediaEngine *media_engine; unsigned int state; + UINT32 value; DWORD cx, cy; double val; HRESULT hr; @@ -448,6 +451,18 @@ todo_wine hr = IMFMediaEngineEx_SetSourceFromByteStream(media_engine_ex, NULL, NULL); ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + hr = IMFMediaEngineEx_GetAudioStreamCategory(media_engine_ex, &value); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaEngineEx_GetAudioEndpointRole(media_engine_ex, &value); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaEngineEx_SetAudioStreamCategory(media_engine_ex, AudioCategory_ForegroundOnlyMedia); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaEngineEx_SetAudioEndpointRole(media_engine_ex, eConsole); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + IMFMediaEngineEx_Release(media_engine_ex); } @@ -800,6 +815,34 @@ static void test_SetSourceFromByteStream(void) IMFMediaEngineNotify_Release(&notify->IMFMediaEngineNotify_iface); } +static void test_audio_configuration(void) +{ + struct media_engine_notify *notify; + IMFMediaEngineEx *media_engine; + UINT32 value; + HRESULT hr; + + notify = create_callback(); + + media_engine = create_media_engine_ex(&notify->IMFMediaEngineNotify_iface); + if (!media_engine) + { + IMFMediaEngineNotify_Release(&notify->IMFMediaEngineNotify_iface); + return; + } + + hr = IMFMediaEngineEx_GetAudioStreamCategory(media_engine, &value); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(value == AudioCategory_Other, "Unexpected value %u.\n", value); + + hr = IMFMediaEngineEx_GetAudioEndpointRole(media_engine, &value); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(value == eMultimedia, "Unexpected value %u.\n", value); + + IMFMediaEngineEx_Release(media_engine); + IMFMediaEngineNotify_Release(&notify->IMFMediaEngineNotify_iface); +} + START_TEST(mfmediaengine) { HRESULT hr; @@ -829,6 +872,7 @@ START_TEST(mfmediaengine) test_error(); test_time_range(); test_SetSourceFromByteStream(); + test_audio_configuration(); IMFMediaEngineClassFactory_Release(factory);

1 0

Nikolay Sivov : comctl32/tests: Add some tests for TBBUTTON.iBitmap for separators.
by Alexandre Julliard 27 Jan '22

27 Jan '22

Module: wine Branch: master Commit: 0bc91a72e869e9c947a50ad663091d59de6ef745 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0bc91a72e869e9c947a50ad6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 27 16:47:09 2022 +0300 comctl32/tests: Add some tests for TBBUTTON.iBitmap for separators. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52465 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/toolbar.c | 92 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 92 insertions(+) diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index 1c52c70f2aa..cfe4f16f430 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -2705,6 +2705,96 @@ static void init_functions(void) #undef X } +static void test_BTNS_SEP(void) +{ + TBBUTTON buttons[1], button; + LRESULT ret; + HWND hwnd; + + rebuild_toolbar(&hwnd); + + /* 0 iBitmap */ + memset(buttons, 0, sizeof(buttons)); + buttons[0].idCommand = 5; + buttons[0].fsStyle = BTNS_SEP; + buttons[0].fsState = TBSTATE_ENABLED; + buttons[0].iString = -1; + + ret = SendMessageA(hwnd, TB_ADDBUTTONSA, 1, (LPARAM)buttons); + ok(ret == 1, "Unexpected return value.\n"); + ret = SendMessageA(hwnd, TB_AUTOSIZE, 0, 0); + ok(!ret, "Unexpected return value.\n"); + + memset(&button, 0, sizeof(button)); + ret = SendMessageA(hwnd, TB_GETBUTTON, 0, (LPARAM)&button); + ok(ret == 1, "Unexpected return value.\n"); +todo_wine + ok(button.iBitmap == 8, "Unexpected iBitmap value %d.\n", button.iBitmap); + + rebuild_toolbar(&hwnd); + + /* Nonzero iBitmap */ + memset(buttons, 0, sizeof(buttons)); + buttons[0].idCommand = 5; + buttons[0].fsStyle = BTNS_SEP; + buttons[0].fsState = TBSTATE_ENABLED; + buttons[0].iString = -1; + buttons[0].iBitmap = 2; + + ret = SendMessageA(hwnd, TB_ADDBUTTONSA, 1, (LPARAM)buttons); + ok(ret == 1, "Unexpected return value.\n"); + ret = SendMessageA(hwnd, TB_AUTOSIZE, 0, 0); + ok(!ret, "Unexpected return value.\n"); + + memset(&button, 0, sizeof(button)); + ret = SendMessageA(hwnd, TB_GETBUTTON, 0, (LPARAM)&button); + ok(ret == 1, "Unexpected return value.\n"); + ok(button.iBitmap == 2, "Unexpected iBitmap value %d.\n", button.iBitmap); + + rebuild_toolbar(&hwnd); + + /* Exceeds default width */ + memset(buttons, 0, sizeof(buttons)); + buttons[0].idCommand = 5; + buttons[0].fsStyle = BTNS_SEP; + buttons[0].fsState = TBSTATE_ENABLED; + buttons[0].iString = -1; + buttons[0].iBitmap = 32; + + ret = SendMessageA(hwnd, TB_ADDBUTTONSA, 1, (LPARAM)buttons); + ok(ret == 1, "Unexpected return value.\n"); + ret = SendMessageA(hwnd, TB_AUTOSIZE, 0, 0); + ok(!ret, "Unexpected return value.\n"); + + memset(&button, 0, sizeof(button)); + ret = SendMessageA(hwnd, TB_GETBUTTON, 0, (LPARAM)&button); + ok(ret == 1, "Unexpected return value.\n"); + ok(button.iBitmap == 32, "Unexpected iBitmap value %d.\n", button.iBitmap); + + rebuild_toolbar(&hwnd); + + /* Negative */ + memset(buttons, 0, sizeof(buttons)); + buttons[0].idCommand = 5; + buttons[0].fsStyle = BTNS_SEP; + buttons[0].fsState = TBSTATE_ENABLED; + buttons[0].iString = -1; + buttons[0].iBitmap = -3; + + ret = SendMessageA(hwnd, TB_ADDBUTTONSA, 1, (LPARAM)buttons); + ok(ret == 1, "Unexpected return value.\n"); + ret = SendMessageA(hwnd, TB_AUTOSIZE, 0, 0); + ok(!ret, "Unexpected return value.\n"); + + memset(&button, 0, sizeof(button)); + ret = SendMessageA(hwnd, TB_GETBUTTON, 0, (LPARAM)&button); + ok(ret == 1, "Unexpected return value.\n"); +todo_wine + ok(button.iBitmap == 8, "Unexpected iBitmap value %d.\n", button.iBitmap); + + DestroyWindow(hwnd); +} + START_TEST(toolbar) { ULONG_PTR ctx_cookie; @@ -2755,12 +2845,14 @@ START_TEST(toolbar) test_save(); test_drawtext_flags(); test_imagelist(); + test_BTNS_SEP(); if (!load_v6_module(&ctx_cookie, &ctx)) return; test_create(TRUE); test_visual(); + test_BTNS_SEP(); PostQuitMessage(0); while(GetMessageA(&msg,0,0,0)) {

1 0

Henri Verbeet : wined3d: Get rid of a superfluous cast.
by Alexandre Julliard 27 Jan '22

27 Jan '22

Module: wine Branch: master Commit: a7cd33ef5155ecb63bdf889d21f52db5099d151b URL: https://source.winehq.org/git/wine.git/?a=commit;h=a7cd33ef5155ecb63bdf889d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 27 15:57:58 2022 +0100 wined3d: Get rid of a superfluous cast. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_gl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 9fd2ed67dcc..eed27dd445d 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -2706,7 +2706,7 @@ static void *wined3d_bo_gl_map(struct wined3d_bo_gl *bo, struct wined3d_context_ map: if (bo->b.map_ptr) - return (uint8_t *)bo->b.map_ptr; + return bo->b.map_ptr; gl_info = context_gl->gl_info; wined3d_context_gl_bind_bo(context_gl, bo->binding, bo->id);

1 0

Henri Verbeet : wined3d: Use wined3d_bit_scan() in context_preload_textures().
by Alexandre Julliard 27 Jan '22

27 Jan '22

Module: wine Branch: master Commit: d89bfc39c5185d421924a746014ea0d68bebdd78 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d89bfc39c5185d421924a746… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 27 15:57:59 2022 +0100 wined3d: Use wined3d_bit_scan() in context_preload_textures(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 6aa5ae4e997..1dc691c46a0 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -390,12 +390,12 @@ void context_preload_textures(struct wined3d_context *context, const struct wine } else { - WORD ffu_map = context->fixed_function_usage_map; + uint32_t ffu_map = context->fixed_function_usage_map; - for (i = 0; ffu_map; ffu_map >>= 1, ++i) + while (ffu_map) { - if (ffu_map & 1) - context_preload_texture(context, state, i); + i = wined3d_bit_scan(&ffu_map); + context_preload_texture(context, state, i); } } }

1 0

Henri Verbeet : wined3d: Use wined3d_bit_scan() in draw_primitive_immediate_mode().
by Alexandre Julliard 27 Jan '22

27 Jan '22

Module: wine Branch: master Commit: d6a7918a46f541384ee3898a8d67151f73b2e200 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d6a7918a46f541384ee3898a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 27 15:58:00 2022 +0100 wined3d: Use wined3d_bit_scan() in draw_primitive_immediate_mode(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_gl.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index eed27dd445d..29794fe0f35 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -4708,7 +4708,7 @@ static void draw_primitive_immediate_mode(struct wined3d_context_gl *context_gl, * them is printed after decoding the vertex declaration. */ for (vertex_idx = 0; vertex_idx < vertex_count; ++vertex_idx) { - unsigned int tmp_tex_mask; + uint32_t tmp_tex_mask; stride_idx = get_stride_idx(idx_data, idx_size, base_vertex_idx, start_idx, vertex_idx); @@ -4747,11 +4747,9 @@ static void draw_primitive_immediate_mode(struct wined3d_context_gl *context_gl, } tmp_tex_mask = tex_mask; - for (texture_idx = 0; tmp_tex_mask; tmp_tex_mask >>= 1, ++texture_idx) + while (tmp_tex_mask) { - if (!(tmp_tex_mask & 1)) - continue; - + texture_idx = wined3d_bit_scan(&tmp_tex_mask); coord_idx = state->texture_states[texture_idx][WINED3D_TSS_TEXCOORD_INDEX]; ptr = tex_coords[coord_idx] + (stride_idx * si->elements[WINED3D_FFP_TEXCOORD0 + coord_idx].stride); ops->texcoord[si->elements[WINED3D_FFP_TEXCOORD0 + coord_idx].format->emit_idx](

1 0

Henri Verbeet : wined3d: Use wined3d_bit_scan() in wined3d_context_gl_map_fixed_function_samplers().
by Alexandre Julliard 27 Jan '22

27 Jan '22

Module: wine Branch: master Commit: c265f2f2ac1734350f3509b99909640514e70f0e URL: https://source.winehq.org/git/wine.git/?a=commit;h=c265f2f2ac1734350f3509b9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 27 15:58:01 2022 +0100 wined3d: Use wined3d_bit_scan() in wined3d_context_gl_map_fixed_function_samplers(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_gl.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 29794fe0f35..9236d2db90f 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -3570,18 +3570,16 @@ static void wined3d_context_gl_map_fixed_function_samplers(struct wined3d_contex { const struct wined3d_d3d_info *d3d_info = context_gl->c.d3d_info; unsigned int i, tex; - WORD ffu_map; + uint32_t ffu_map; ffu_map = context_gl->c.fixed_function_usage_map; if (d3d_info->limits.ffp_textures == d3d_info->limits.ffp_blend_stages || context_gl->c.lowest_disabled_stage <= d3d_info->limits.ffp_textures) { - for (i = 0; ffu_map; ffu_map >>= 1, ++i) + while (ffu_map) { - if (!(ffu_map & 1)) - continue; - + i = wined3d_bit_scan(&ffu_map); if (context_gl->tex_unit_map[i] != i) { wined3d_context_gl_map_stage(context_gl, i, i); @@ -3594,11 +3592,9 @@ static void wined3d_context_gl_map_fixed_function_samplers(struct wined3d_contex /* Now work out the mapping */ tex = 0; - for (i = 0; ffu_map; ffu_map >>= 1, ++i) + while (ffu_map) { - if (!(ffu_map & 1)) - continue; - + i = wined3d_bit_scan(&ffu_map); if (context_gl->tex_unit_map[i] != tex) { wined3d_context_gl_map_stage(context_gl, i, tex);

1 0

Henri Verbeet : wined3d: Use wined3d_bit_scan() in set_glsl_shader_program().
by Alexandre Julliard 27 Jan '22

27 Jan '22

Module: wine Branch: master Commit: bfac6c990d69181932e76d0667d906821843be05 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bfac6c990d69181932e76d06… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 27 15:58:02 2022 +0100 wined3d: Use wined3d_bit_scan() in set_glsl_shader_program(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index e33cd5d5fe0..c812b2d8b08 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -10231,6 +10231,7 @@ static void set_glsl_shader_program(const struct wined3d_context_gl *context_gl, struct wined3d_shader *pshader = NULL; GLuint reorder_shader_id = 0; struct glsl_program_key key; + uint32_t attribs_map; GLuint program_id; unsigned int i; GLuint vs_id = 0; @@ -10239,7 +10240,6 @@ static void set_glsl_shader_program(const struct wined3d_context_gl *context_gl, GLuint gs_id = 0; GLuint ps_id = 0; struct list *ps_list, *vs_list; - WORD attribs_map; struct wined3d_string_buffer *tmp_name; if (!(context_gl->c.shader_update_mask & (1u << WINED3D_SHADER_TYPE_VERTEX)) && ctx_data->glsl_program) @@ -10417,11 +10417,9 @@ static void set_glsl_shader_program(const struct wined3d_context_gl *context_gl, * in order to make the bindings work, and it has to be done prior * to linking the GLSL program. */ tmp_name = string_buffer_get(&priv->string_buffers); - for (i = 0; attribs_map; attribs_map >>= 1, ++i) + while (attribs_map) { - if (!(attribs_map & 1)) - continue; - + i = wined3d_bit_scan(&attribs_map); string_buffer_sprintf(tmp_name, "vs_in%u", i); GL_EXTCALL(glBindAttribLocation(program_id, i, tmp_name->buffer)); if (vshader && vshader->reg_maps.shader_version.major >= 4)

1 0

Nikolay Sivov : include: Add some ListView flags.
by Alexandre Julliard 27 Jan '22

27 Jan '22

Module: wine Branch: master Commit: e385df7d2ee8fca9f94bb4cbc95891cf996bb42c URL: https://source.winehq.org/git/wine.git/?a=commit;h=e385df7d2ee8fca9f94bb4cb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 27 19:21:21 2022 +0300 include: Add some ListView flags. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/commctrl.h | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/include/commctrl.h b/include/commctrl.h index 164de374604..944a9158371 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -3158,11 +3158,18 @@ static const WCHAR WC_LISTVIEWW[] = { 'S','y','s', #define LVNI_SELECTED 0x0002 #define LVNI_CUT 0x0004 #define LVNI_DROPHILITED 0x0008 +#define LVNI_STATEMASK (LVNI_FOCUSED | LVNI_SELECTED | LVNI_CUT | LVNI_DROPHILITED) + +#define LVNI_VISIBLEORDER 0x0010 +#define LVNI_PREVIOUS 0x0020 +#define LVNI_VISIBLEONLY 0x0040 +#define LVNI_SAMEGROUPONLY 0x0080 #define LVNI_ABOVE 0x0100 #define LVNI_BELOW 0x0200 #define LVNI_TOLEFT 0x0400 #define LVNI_TORIGHT 0x0800 +#define LVNI_DIRECTIONMASK (LVNI_ABOVE | LVNI_BELOW | LVNI_TOLEFT | LVNI_TORIGHT) #define LVHT_NOWHERE 0x0001 #define LVHT_ONITEMICON 0x0002 @@ -3201,6 +3208,12 @@ static const WCHAR WC_LISTVIEWW[] = { 'S','y','s', #define LVGS_NORMAL 0x00000000 #define LVGS_COLLAPSED 0x00000001 #define LVGS_HIDDEN 0x00000002 +#define LVGS_NOHEADER 0x00000004 +#define LVGS_COLLAPSIBLE 0x00000008 +#define LVGS_FOCUSED 0x00000010 +#define LVGS_SELECTED 0x00000020 +#define LVGS_SUBSETED 0x00000040 +#define LVGS_SUBSETLINKFOCUSED 0x00000080 #define LVGA_HEADER_LEFT 0x00000001 #define LVGA_HEADER_CENTER 0x00000002

1 0

Liam Murphy : winmm/tests: Demonstrate that WOM_DONE is not invoked reentrantly.
by Alexandre Julliard 27 Jan '22

27 Jan '22

Module: wine Branch: master Commit: bf65b96b01fc95d23d6e9a6a7b8b18f1752e83e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf65b96b01fc95d23d6e9a6a… Author: Liam Murphy <liampm32(a)gmail.com> Date: Thu Jan 27 10:22:59 2022 -0600 winmm/tests: Demonstrate that WOM_DONE is not invoked reentrantly. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/tests/wave.c | 103 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 103 insertions(+) diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index 2f0c8443363..56501367190 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -1626,6 +1626,108 @@ static void test_fragmentsize(void) CloseHandle(hevent); } +static void CALLBACK test_reentrant_callback_func(HWAVEOUT hwo, UINT uMsg, + DWORD_PTR dwInstance, + DWORD_PTR dwParam1, DWORD_PTR dwParam2) +{ + static int wom_done_count = 0; + + switch(uMsg){ + case WOM_OPEN: + case WOM_CLOSE: + ok(GetCurrentThreadId() == g_tid, "Got different thread ID\n"); + break; + + case WOM_DONE: + /* verify that WOM_DONE is not sent during the following waveOutWrite */ + todo_wine_if(wom_done_count == 1) + ok(g_tid == 0, "callback called reentrantly\n"); + + g_tid = GetCurrentThreadId(); + + if(wom_done_count++ == 0){ + Sleep(125); /* ensure 2nd header is done playing before waveOutWrite */ + waveOutWrite(hwo, (WAVEHDR *)dwParam1, sizeof(WAVEHDR)); + } + + break; + } + + g_tid = 0; + SetEvent((HANDLE)dwInstance); +} + +static void test_reentrant_callback(void) +{ + MMRESULT rc; + WAVEHDR hdr[2]; + HWAVEOUT wout; + WAVEFORMATEX fmt; + DWORD wait; + HANDLE hevent; + + if(waveOutGetNumDevs() == 0) + return; + + fmt.wFormatTag = WAVE_FORMAT_PCM; + fmt.nChannels = 2; + fmt.nSamplesPerSec = 44100; + fmt.wBitsPerSample = 16; + fmt.nBlockAlign = fmt.nChannels * fmt.wBitsPerSample / 8; + fmt.nAvgBytesPerSec = fmt.nBlockAlign * fmt.nSamplesPerSec; + fmt.cbSize = sizeof(WAVEFORMATEX); + + hevent = CreateEventW(NULL, FALSE, FALSE, NULL); + g_tid = GetCurrentThreadId(); + + rc = waveOutOpen(&wout, WAVE_MAPPER, &fmt, (DWORD_PTR)test_reentrant_callback_func, + (DWORD_PTR)hevent, CALLBACK_FUNCTION); + ok(rc == MMSYSERR_NOERROR || rc == WAVERR_BADFORMAT || + rc == MMSYSERR_INVALFLAG || rc == MMSYSERR_INVALPARAM, + "waveOutOpen(%s) failed: %s\n", dev_name(WAVE_MAPPER), wave_out_error(rc)); + if(rc != MMSYSERR_NOERROR){ + CloseHandle(hevent); + return; + } + + wait = WaitForSingleObject(hevent, 1000); + ok(wait == WAIT_OBJECT_0, "wave open callback missed\n"); + + memset(hdr, 0, sizeof(hdr)); + hdr[0].dwBufferLength = (fmt.nSamplesPerSec * fmt.nBlockAlign / 10); + hdr[1].dwBufferLength = hdr[0].dwBufferLength; + hdr[1].lpData = hdr[0].lpData = + HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, hdr[0].dwBufferLength); + + rc = waveOutPrepareHeader(wout, &hdr[0], sizeof(hdr[0])); + ok(rc == MMSYSERR_NOERROR, "waveOutPrepareHeader failed: %s\n", wave_out_error(rc)); + + rc = waveOutPrepareHeader(wout, &hdr[1], sizeof(hdr[1])); + ok(rc == MMSYSERR_NOERROR, "waveOutPrepareHeader failed: %s\n", wave_out_error(rc)); + + rc = waveOutWrite(wout, &hdr[0], sizeof(hdr[0])); + ok(rc == MMSYSERR_NOERROR, "waveOutWrite failed: %s\n", wave_out_error(rc)); + + rc = waveOutWrite(wout, &hdr[1], sizeof(hdr[1])); + ok(rc == MMSYSERR_NOERROR, "waveOutWrite failed: %s\n", wave_out_error(rc)); + + wait = WaitForSingleObject(hevent, 1000); + ok(wait == WAIT_OBJECT_0, "header 1 callback missed\n"); + + wait = WaitForSingleObject(hevent, 1000); + ok(wait == WAIT_OBJECT_0, "header 2 callback missed\n"); + + wait = WaitForSingleObject(hevent, 1000); + ok(wait == WAIT_OBJECT_0, "header 3 callback missed\n"); + + g_tid = GetCurrentThreadId(); + rc = waveOutClose(wout); + ok(rc == MMSYSERR_NOERROR, "waveOutClose failed: %s\n", wave_out_error(rc)); + + HeapFree(GetProcessHeap(), 0, hdr[0].lpData); + CloseHandle(hevent); +} + static void create_wav_file(char *temp_file) { WAVEFORMATEX format; @@ -1727,5 +1829,6 @@ START_TEST(wave) wave_out_tests(); test_sndPlaySound(); test_fragmentsize(); + test_reentrant_callback(); test_PlaySound(); }

1 0