April 2022 - Wine-Commits - list.winehq.org

Bernhard Kölbl : include/winerror.h: Add missing WinRT HRESULT codes.
by Alexandre Julliard April 6, 2022

April 6, 2022

Module: wine Branch: master Commit: 9912eb407dd26a32c0a67d1f3a36bb7fb8907797 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9912eb407dd26a32c0a67d1f… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Wed Apr 6 18:28:39 2022 +0200 include/winerror.h: Add missing WinRT HRESULT codes. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winerror.h | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/include/winerror.h b/include/winerror.h index b63b74a5b18..d51d5648cdb 100644 --- a/include/winerror.h +++ b/include/winerror.h @@ -2578,6 +2578,25 @@ static inline HRESULT HRESULT_FROM_WIN32(unsigned int x) #define E_CHANGED_STATE _HRESULT_TYPEDEF_(0x8000000C) #define E_ILLEGAL_STATE_CHANGE _HRESULT_TYPEDEF_(0x8000000D) #define E_ILLEGAL_METHOD_CALL _HRESULT_TYPEDEF_(0x8000000E) +#define RO_E_METADATA_NAME_NOT_FOUND _HRESULT_TYPEDEF_(0x8000000F) +#define RO_E_METADATA_NAME_IS_NAMESPACE _HRESULT_TYPEDEF_(0x80000010) +#define RO_E_METADATA_INVALID_TYPE_FORMAT _HRESULT_TYPEDEF_(0x80000011) +#define RO_E_INVALID_METADATA_FILE _HRESULT_TYPEDEF_(0x80000012) +#define RO_E_CLOSED _HRESULT_TYPEDEF_(0x80000013) +#define RO_E_EXCLUSIVE_WRITE _HRESULT_TYPEDEF_(0x80000014) +#define RO_E_CHANGE_NOTIFICATION_IN_PROGRESS _HRESULT_TYPEDEF_(0x80000015) +#define RO_E_ERROR_STRING_NOT_FOUND _HRESULT_TYPEDEF_(0x80000016) +#define E_STRING_NOT_NULL_TERMINATED _HRESULT_TYPEDEF_(0x80000017) +#define E_ILLEGAL_DELEGATE_ASSIGNMENT _HRESULT_TYPEDEF_(0x80000018) +#define E_ASYNC_OPERATION_NOT_STARTED _HRESULT_TYPEDEF_(0x80000019) +#define E_APPLICATION_EXITING _HRESULT_TYPEDEF_(0x8000001A) +#define E_APPLICATION_VIEW_EXITING _HRESULT_TYPEDEF_(0x8000001B) +#define RO_E_MUST_BE_AGILE _HRESULT_TYPEDEF_(0x8000001C) +#define RO_E_UNSUPPORTED_FROM_MTA _HRESULT_TYPEDEF_(0x8000001D) +#define RO_E_COMMITTED _HRESULT_TYPEDEF_(0x8000001E) +#define RO_E_BLOCKED_CROSS_ASTA_CALL _HRESULT_TYPEDEF_(0x8000001F) +#define RO_E_CANNOT_ACTIVATE_FULL_TRUST_SERVER _HRESULT_TYPEDEF_(0x80000020) +#define RO_E_CANNOT_ACTIVATE_UNIVERSAL_APPLICATION_SERVER _HRESULT_TYPEDEF_(0x80000021) #define E_NOTIMPL _HRESULT_TYPEDEF_(0x80004001) #define E_NOINTERFACE _HRESULT_TYPEDEF_(0x80004002)

1 0

Bernhard Kölbl : windows.media.speech: Add IAsyncInfo stub to IAsyncOperation<Inspectable*>.
by Alexandre Julliard April 6, 2022

April 6, 2022

Module: wine Branch: master Commit: 5a815669e8e7a3f0a37648510494f8b36c29c1f6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a815669e8e7a3f0a3764851… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Wed Apr 6 18:28:43 2022 +0200 windows.media.speech: Add IAsyncInfo stub to IAsyncOperation<Inspectable*>. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.media.speech/async.c | 64 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/dlls/windows.media.speech/async.c b/dlls/windows.media.speech/async.c index f701306e4f0..94d0b35d9c1 100644 --- a/dlls/windows.media.speech/async.c +++ b/dlls/windows.media.speech/async.c @@ -32,6 +32,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(speech); struct async_operation { IAsyncOperation_IInspectable IAsyncOperation_IInspectable_iface; + IAsyncInfo IAsyncInfo_iface; const GUID *iid; LONG ref; }; @@ -56,6 +57,12 @@ static HRESULT WINAPI async_operation_QueryInterface( IAsyncOperation_IInspectab return S_OK; } + if (IsEqualGUID(iid, &IID_IAsyncInfo)) + { + IInspectable_AddRef((*out = &impl->IAsyncInfo_iface)); + return S_OK; + } + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); *out = NULL; return E_NOINTERFACE; @@ -136,6 +143,62 @@ static const struct IAsyncOperation_IInspectableVtbl async_operation_vtbl = async_operation_GetResults }; +/* + * + * IAsyncInfo + * + */ + +DEFINE_IINSPECTABLE(async_operation_info, IAsyncInfo, struct async_operation, IAsyncOperation_IInspectable_iface) + +static HRESULT WINAPI async_operation_info_get_Id( IAsyncInfo *iface, UINT32 *id ) +{ + FIXME("iface %p, id %p stub!\n", iface, id); + return E_NOTIMPL; +} + +static HRESULT WINAPI async_operation_info_get_Status( IAsyncInfo *iface, AsyncStatus *status ) +{ + FIXME("iface %p, status %p stub!\n", iface, status); + return E_NOTIMPL; +} + +static HRESULT WINAPI async_operation_info_get_ErrorCode( IAsyncInfo *iface, HRESULT *error_code ) +{ + FIXME("iface %p, error_code %p stub!\n", iface, error_code); + return E_NOTIMPL; +} + +static HRESULT WINAPI async_operation_info_Cancel( IAsyncInfo *iface ) +{ + FIXME("iface %p stub!\n", iface); + return E_NOTIMPL; +} + +static HRESULT WINAPI async_operation_info_Close( IAsyncInfo *iface ) +{ + FIXME("iface %p stub!\n", iface); + return E_NOTIMPL; +} + +static const struct IAsyncInfoVtbl async_operation_info_vtbl = +{ + /* IUnknown methods */ + async_operation_info_QueryInterface, + async_operation_info_AddRef, + async_operation_info_Release, + /* IInspectable methods */ + async_operation_info_GetIids, + async_operation_info_GetRuntimeClassName, + async_operation_info_GetTrustLevel, + /* IAsyncInfo */ + async_operation_info_get_Id, + async_operation_info_get_Status, + async_operation_info_get_ErrorCode, + async_operation_info_Cancel, + async_operation_info_Close +}; + HRESULT async_operation_create( const GUID *iid, IAsyncOperation_IInspectable **out ) { struct async_operation *impl; @@ -147,6 +210,7 @@ HRESULT async_operation_create( const GUID *iid, IAsyncOperation_IInspectable ** } impl->IAsyncOperation_IInspectable_iface.lpVtbl = &async_operation_vtbl; + impl->IAsyncInfo_iface.lpVtbl = &async_operation_info_vtbl; impl->iid = iid; impl->ref = 1;

1 0

Rémi Bernon : ntdll: Support activatableClass activation context elements.
by Alexandre Julliard April 6, 2022

April 6, 2022

Module: wine Branch: master Commit: c944f64166fd8e5f0b7a233d76b3e11292ea3870 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c944f64166fd8e5f0b7a233d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Apr 6 16:09:29 2022 +0200 ntdll: Support activatableClass activation context elements. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/actctx.c | 1 - dlls/ntdll/actctx.c | 297 ++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 296 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c944f64166fd8e5f0b7a…

1 0

Rémi Bernon : kernel32/tests: Add some activatableClass manifest attribute tests.
by Alexandre Julliard April 6, 2022

April 6, 2022

Module: wine Branch: master Commit: c7f72cc4003cc2714bf219d9d595ce9f87c30a98 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c7f72cc4003cc2714bf219d9… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Apr 6 16:09:28 2022 +0200 kernel32/tests: Add some activatableClass manifest attribute tests. And the matching ACTIVATION_CONTEXT_SECTION_WINRT_ACTIVATABLE_CLASSES activation context section. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/actctx.c | 85 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 85 insertions(+) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index 8f925b0500f..e296ac40ced 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -120,6 +120,12 @@ static const char manifest3[] = " numMethods=\"10\"" " baseInterface=\"{66666666-8888-7777-6666-555555555557}\"" " />" +" <activatableClass name=\"Wine.Test.Class1\" threadingModel=\"mta\" xmlns=\"urn:schemas-microsoft-com:winrt.v1\"/>" +" <activatableClass name=\"Wine.Test.Class2\" threadingModel=\"both\" xmlns=\"urn:schemas-microsoft-com:winrt.v1\"/>" +" <activatableClass name=\"Wine.Test.Class3\" threadingModel=\"sta\" xmlns=\"urn:schemas-microsoft-com:winrt.v1\"/>" +"</file>" +"<file name=\"Wine.Test.dll\">" +" <activatableClass name=\"Wine.Test.Class4\" threadingModel=\"sta\" xmlns=\"urn:schemas-microsoft-com:winrt.v1\"/>" "</file>" " <comInterfaceExternalProxyStub " " name=\"Iifaceps2\"" @@ -395,6 +401,15 @@ static const char wrong_manifest10[] = "</trustInfo>" "</assembly>"; +/* activatableClass with the wrong xmlns is invalid */ +static const char wrong_manifest11[] = +"<assembly xmlns=\"urn:schemas-microsoft-com:asm.v1\" manifestVersion=\"1.0\">" +"<assemblyIdentity version=\"1.0.0.0\" name=\"Wine.Test\" type=\"win32\" />" +"<file name=\"testlib.dll\">" +" <activatableClass name=\"Wine.Test.Class1\" threadingModel=\"both\" />" +"</file>" +"</assembly>"; + static const char wrong_depmanifest1[] = "<assembly xmlns=\"urn:schemas-microsoft-com:asm.v1\" manifestVersion=\"1.0\">" "<assemblyIdentity type=\"win32\" name=\"testdep\" version=\"6.5.4.4\" processorArchitecture=\"" ARCH "\" />" @@ -1092,6 +1107,8 @@ static void test_create_fail(void) test_create_and_fail(wrong_manifest9, NULL, 0, TRUE /* WinXP */); trace("wrong_manifest10\n"); test_create_and_fail(wrong_manifest10, NULL, 0, TRUE /* WinXP */); + trace("wrong_manifest11\n"); + test_create_and_fail(wrong_manifest11, NULL, 1, FALSE); trace("UTF-16 manifest1 without BOM\n"); test_create_wide_and_fail(manifest1, FALSE ); trace("manifest2\n"); @@ -1352,6 +1369,70 @@ static void test_find_window_class(HANDLE handle, LPCWSTR clsname, ULONG exid, i ReleaseActCtx(handle); } +enum winrt_threading_model +{ + WINRT_THREADING_MODEL_BOTH = 0, + WINRT_THREADING_MODEL_STA = 1, + WINRT_THREADING_MODEL_MTA = 2, +}; + +struct activatable_class_data +{ + ULONG size; + DWORD unk; + DWORD module_len; + DWORD module_offset; + DWORD threading_model; +}; + +static void test_find_activatable_class(HANDLE handle, const WCHAR *classid, enum winrt_threading_model threading_model, + const WCHAR *file, ULONG exid, int line) +{ + struct activatable_class_data *activatable_class; + struct strsection_header *header; + ACTCTX_SECTION_KEYED_DATA data; + void *ptr; + BOOL ret; + + memset(&data, 0xfe, sizeof(data)); + data.cbSize = sizeof(data); + + ret = FindActCtxSectionStringW(0, NULL, ACTIVATION_CONTEXT_SECTION_WINRT_ACTIVATABLE_CLASSES, classid, &data); + todo_wine + ok_(__FILE__, line)(ret || broken(!ret) /* <= Win10 v1809 */, "FindActCtxSectionStringW failed, error %lu\n", GetLastError()); + if (!ret) + { + ok_(__FILE__, line)(GetLastError() == ERROR_SXS_SECTION_NOT_FOUND, "got error %lu\n", GetLastError()); + return; + } + + ok_(__FILE__, line)(data.cbSize == sizeof(data), "got cbSize %lu\n", data.cbSize); + ok_(__FILE__, line)(data.ulDataFormatVersion == 1, "got ulDataFormatVersion %lu\n", data.ulDataFormatVersion); + ok_(__FILE__, line)(data.lpData != NULL, "got lpData %p\n", data.lpData); + + header = (struct strsection_header *)data.lpSectionBase; + ok_(__FILE__, line)(header->magic == 0x64487353, "got wrong magic 0x%08lx\n", header->magic); + ok_(__FILE__, line)(data.lpSectionBase != NULL, "got lpSectionBase %p\n", data.lpSectionBase); + ok_(__FILE__, line)(data.ulSectionTotalLength > 0, "got ulSectionTotalLength %lu\n", data.ulSectionTotalLength); + ok_(__FILE__, line)(data.lpSectionGlobalData == (BYTE *)header + header->global_offset, + "got lpSectionGlobalData %p\n", data.lpSectionGlobalData); + ok_(__FILE__, line)(data.ulSectionGlobalDataLength == header->global_len, + "got ulSectionGlobalDataLength %lu\n", data.ulSectionGlobalDataLength); + ok_(__FILE__, line)(data.hActCtx == NULL, "got hActCtx %p\n", data.hActCtx); + ok_(__FILE__, line)(data.ulAssemblyRosterIndex == exid, "got ulAssemblyRosterIndex %lu\n", data.ulAssemblyRosterIndex); + + activatable_class = (struct activatable_class_data *)data.lpData; + ok_(__FILE__, line)(activatable_class->size == sizeof(*activatable_class), "got size %lu\n", + activatable_class->size); + ok_(__FILE__, line)(activatable_class->threading_model == threading_model, "got threading_model %lu\n", + activatable_class->threading_model); + + ptr = (BYTE *)header + activatable_class->module_offset; + ok_(__FILE__, line)(wcslen(ptr) * sizeof(WCHAR) == activatable_class->module_len, + "got module_len %lu\n", activatable_class->module_len); + ok_(__FILE__, line)(!wcscmp(ptr, file), "got data.lpSectionGlobalData %s\n", debugstr_w(ptr)); +} + static void test_find_string_fail(void) { ACTCTX_SECTION_KEYED_DATA data = {sizeof(data)}; @@ -2180,6 +2261,10 @@ static void test_actctx(void) test_find_ifaceps_redirection(handle, &IID_Iifaceps2, &IID_TlibTest4, &IID_Ibifaceps, &IID_PS32, 1, __LINE__); test_find_ifaceps_redirection(handle, &IID_Iifaceps3, &IID_TlibTest4, &IID_Ibifaceps, NULL, 1, __LINE__); test_find_string_fail(); + test_find_activatable_class(handle, L"Wine.Test.Class1", WINRT_THREADING_MODEL_MTA, L"testlib.dll", 1, __LINE__); + test_find_activatable_class(handle, L"Wine.Test.Class2", WINRT_THREADING_MODEL_BOTH, L"testlib.dll", 1, __LINE__); + test_find_activatable_class(handle, L"Wine.Test.Class3", WINRT_THREADING_MODEL_STA, L"testlib.dll", 1, __LINE__); + test_find_activatable_class(handle, L"Wine.Test.Class4", WINRT_THREADING_MODEL_STA, L"Wine.Test.dll", 1, __LINE__); b = DeactivateActCtx(0, cookie); ok(b, "DeactivateActCtx failed: %lu\n", GetLastError());

1 0

Bernhard Kölbl : windows.media.speech: Add tests for IAsyncOperation.
by Alexandre Julliard April 6, 2022

April 6, 2022

Module: wine Branch: master Commit: 4926bb148b049f1b60e57091f4aa87a3957aa69e URL: https://source.winehq.org/git/wine.git/?a=commit;h=4926bb148b049f1b60e57091… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Wed Apr 6 18:28:41 2022 +0200 windows.media.speech: Add tests for IAsyncOperation. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.media.speech/tests/speech.c | 241 ++++++++++++++++++++++++++++++- 1 file changed, 239 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4926bb148b049f1b60e5…

1 0

Nikolay Sivov : evr/presenter: Make GetCurrentImage() work without output window.
by Alexandre Julliard April 6, 2022

April 6, 2022

Module: wine Branch: master Commit: 74e0985e1bfb22853b75b95dbc795c46ce907e56 URL: https://source.winehq.org/git/wine.git/?a=commit;h=74e0985e1bfb22853b75b95d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 6 17:41:59 2022 +0300 evr/presenter: Make GetCurrentImage() work without output window. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/presenter.c | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index e70e25a19a7..d8bdbee3915 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -492,27 +492,28 @@ static void video_presenter_sample_present(struct video_presenter *presenter, IM IDirect3DDevice9 *device; HRESULT hr; - if (!presenter->swapchain) - return; - if (FAILED(hr = video_presenter_get_sample_surface(sample, &surface))) { WARN("Failed to get sample surface, hr %#lx.\n", hr); return; } - if (FAILED(hr = IDirect3DSwapChain9_GetBackBuffer(presenter->swapchain, 0, D3DBACKBUFFER_TYPE_MONO, &backbuffer))) + if (presenter->swapchain) { - WARN("Failed to get a backbuffer, hr %#lx.\n", hr); - IDirect3DSurface9_Release(surface); - return; - } + if (SUCCEEDED(hr = IDirect3DSwapChain9_GetBackBuffer(presenter->swapchain, 0, D3DBACKBUFFER_TYPE_MONO, &backbuffer))) + { + IDirect3DSwapChain9_GetDevice(presenter->swapchain, &device); + IDirect3DDevice9_StretchRect(device, surface, NULL, backbuffer, NULL, D3DTEXF_POINT); - IDirect3DSwapChain9_GetDevice(presenter->swapchain, &device); - IDirect3DDevice9_StretchRect(device, surface, NULL, backbuffer, NULL, D3DTEXF_POINT); + IDirect3DSwapChain9_Present(presenter->swapchain, NULL, NULL, NULL, NULL, 0); + presenter->frame_stats.presented++; - IDirect3DSwapChain9_Present(presenter->swapchain, NULL, NULL, NULL, NULL, 0); - presenter->frame_stats.presented++; + IDirect3DDevice9_Release(device); + IDirect3DSurface9_Release(backbuffer); + } + else + WARN("Failed to get a backbuffer, hr %#lx.\n", hr); + } EnterCriticalSection(&presenter->cs); if (presenter->thread.queue.last_presented) @@ -521,8 +522,6 @@ static void video_presenter_sample_present(struct video_presenter *presenter, IM IMFSample_AddRef(presenter->thread.queue.last_presented); LeaveCriticalSection(&presenter->cs); - IDirect3DDevice9_Release(device); - IDirect3DSurface9_Release(backbuffer); IDirect3DSurface9_Release(surface); } @@ -1493,13 +1492,13 @@ static HRESULT WINAPI video_presenter_control_GetCurrentImage(IMFVideoDisplayCon sample = presenter->thread.queue.last_presented; presenter->thread.queue.last_presented = NULL; - if (!presenter->swapchain || !sample) + if (!sample) { hr = MF_E_INVALIDREQUEST; } else if (SUCCEEDED(hr = video_presenter_get_sample_surface(sample, &surface))) { - IDirect3DSwapChain9_GetDevice(presenter->swapchain, &device); + IDirect3DSurface9_GetDevice(surface, &device); IDirect3DSurface9_GetDesc(surface, &surface_desc); if (surface_desc.Format != D3DFMT_X8R8G8B8)

1 0

Andrew Eikum : evr/presenter: Place early samples back to the front of the queue.
by Alexandre Julliard April 6, 2022

April 6, 2022

Module: wine Branch: master Commit: 2bf3a585185d4e594793d87bb93b364a4c772bf2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2bf3a585185d4e594793d87b… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Apr 6 17:41:58 2022 +0300 evr/presenter: Place early samples back to the front of the queue. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/presenter.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index 1b119ce9cab..e70e25a19a7 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -429,15 +429,20 @@ static HRESULT video_presenter_sample_queue_init(struct video_presenter *present return S_OK; } -static void video_presenter_sample_queue_push(struct video_presenter *presenter, IMFSample *sample) +static void video_presenter_sample_queue_push(struct video_presenter *presenter, IMFSample *sample, + BOOL at_front) { struct sample_queue *queue = &presenter->thread.queue; + unsigned int idx; EnterCriticalSection(&presenter->cs); if (queue->used != queue->size) { - queue->back = (queue->back + 1) % queue->size; - queue->samples[queue->back] = sample; + if (at_front) + idx = queue->front = (queue->size + queue->front - 1) % queue->size; + else + idx = queue->back = (queue->back + 1) % queue->size; + queue->samples[idx] = sample; queue->used++; IMFSample_AddRef(sample); } @@ -556,7 +561,7 @@ static void video_presenter_check_queue(struct video_presenter *presenter, if (present) video_presenter_sample_present(presenter, sample); else - video_presenter_sample_queue_push(presenter, sample); + video_presenter_sample_queue_push(presenter, sample, TRUE); IMFSample_Release(sample); @@ -580,7 +585,7 @@ static void video_presenter_schedule_sample(struct video_presenter *presenter, I if (presenter->clock) { - video_presenter_sample_queue_push(presenter, sample); + video_presenter_sample_queue_push(presenter, sample, FALSE); PostThreadMessageW(presenter->thread.tid, EVRM_PRESENT, 0, 0); } else

1 0

Andrew Eikum : evr/presenter: Fix hns-to-msec conversion multiplier.
by Alexandre Julliard April 6, 2022

April 6, 2022

Module: wine Branch: master Commit: 09572681038c344c9ebf15705f4ac4b47ea1589d URL: https://source.winehq.org/git/wine.git/?a=commit;h=09572681038c344c9ebf1570… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Apr 6 17:41:57 2022 +0300 evr/presenter: Fix hns-to-msec conversion multiplier. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/presenter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index 7e14cb2f720..1b119ce9cab 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -548,7 +548,7 @@ static void video_presenter_check_queue(struct video_presenter *presenter, if (delta > 3 * presenter->frame_time_threshold) { /* Convert 100ns -> msec */ - wait = (delta - 3 * presenter->frame_time_threshold) / 100000; + wait = (delta - 3 * presenter->frame_time_threshold) / 10000; present = FALSE; } }

1 0

Eric Pouech : mciavi32: Use I width modifier instead of casting to DWORD.
by Alexandre Julliard April 6, 2022

April 6, 2022

Module: wine Branch: master Commit: 2f2e3ea50b638f482018c1eddcaa8e44efe079c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2f2e3ea50b638f482018c1ed… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Apr 6 08:35:03 2022 +0200 mciavi32: Use I width modifier instead of casting to DWORD. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mciavi32/mciavi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mciavi32/mciavi.c b/dlls/mciavi32/mciavi.c index 64a1a0fbd7d..dcd07032fec 100644 --- a/dlls/mciavi32/mciavi.c +++ b/dlls/mciavi32/mciavi.c @@ -1063,11 +1063,11 @@ LRESULT CALLBACK MCIAVI_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, case MCI_SAVE: case MCI_UNDO: case MCI_UNFREEZE: - TRACE("Unsupported function [0x%x] flags=%08lx\n", wMsg, (DWORD)dwParam1); + TRACE("Unsupported function [0x%x] flags=%08Ix\n", wMsg, dwParam1); return MCIERR_UNSUPPORTED_FUNCTION; case MCI_SPIN: case MCI_ESCAPE: - WARN("Unsupported command [0x%x] %08lx\n", wMsg, (DWORD)dwParam1); + WARN("Unsupported command [0x%x] %08Ix\n", wMsg, dwParam1); break; case MCI_OPEN: case MCI_CLOSE:

1 0

Mohamad Al-Jaf : ncrypt: Map STATUS_NOT_SUPPORTED to NTE_NOT_SUPPORTED.
by Alexandre Julliard April 6, 2022

April 6, 2022

Module: wine Branch: master Commit: dec096934a2a30864f92446de317ef491d8d3bad URL: https://source.winehq.org/git/wine.git/?a=commit;h=dec096934a2a30864f92446d… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Wed Apr 6 03:19:52 2022 -0400 ncrypt: Map STATUS_NOT_SUPPORTED to NTE_NOT_SUPPORTED. Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ncrypt/main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ncrypt/main.c b/dlls/ncrypt/main.c index cc979a539d2..13909a2dd9e 100644 --- a/dlls/ncrypt/main.c +++ b/dlls/ncrypt/main.c @@ -40,6 +40,7 @@ static SECURITY_STATUS map_ntstatus(NTSTATUS status) case STATUS_INVALID_SIGNATURE: return NTE_BAD_SIGNATURE; case STATUS_SUCCESS: return ERROR_SUCCESS; case STATUS_INVALID_PARAMETER: return NTE_INVALID_PARAMETER; + case STATUS_NOT_SUPPORTED: return NTE_NOT_SUPPORTED; case NTE_BAD_DATA: return NTE_BAD_DATA; default: FIXME("unhandled status %#lx\n", status);

1 0