- Wine-Devel - list.winehq.org

[PATCH v3 0/4] Console support & CreateProcess
by Eric Pouech April 11, 2022

April 11, 2022

The following series is the result of work from - Torge Matties, Jacek Caban and myself - and went through various convergence, merges, rewrite and improvements (especially patch #2 for various authors) it provides: - support for CREATE_NO_WINDOW flag in CreateProcess - a solution for regression introduced in f034084d49b354811096524d472ae5172ac1cebf (when a Wine initial process isn't attached to a unix console, it can generates lots new console window creation, with unwanted side effects) - with the correspondings non regression tests Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- Eric Pouech (4): dlls/kernel32/tests: Add more CreateProcess console management tests. dlls/{ntdll, kernel*}: Add support for CREATE_NO_WINDOW flag in CreateProcess. dlls/{ntdll,kernel*}: provide a pseudo console environment for initial CUI processes not tied to an Unix tty dlls/kernel32/tests: added tests for CreateProcess on a shell_no_window console dlls/kernel32/tests/console.c | 126 ++++++++++++++++++++++++++++++---- dlls/kernelbase/console.c | 44 +++++++++--- dlls/kernelbase/process.c | 11 +-- dlls/ntdll/unix/env.c | 2 + dlls/ntdll/unix/process.c | 2 + include/wine/condrv.h | 6 +- programs/conhost/conhost.c | 11 ++- programs/conhost/conhost.h | 1 + server/process.c | 4 +- 9 files changed, 172 insertions(+), 35 deletions(-)

4 13

[PATCH] win32u: Avoid iterating over a NULL window list when broadcasting.
by Alexandros Frantzis April 11, 2022

April 11, 2022

Signed-off-by: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> --- dlls/win32u/message.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index 46c42188d70..9479595ae53 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -2508,9 +2508,11 @@ static BOOL is_message_broadcastable( UINT msg ) */ static BOOL broadcast_message( struct send_message_info *info, DWORD_PTR *res_ptr ) { - if (is_message_broadcastable( info->msg )) + HWND *list; + + if (is_message_broadcastable( info->msg ) && + (list = list_window_children( 0, get_desktop_window(), NULL, 0 ))) { - HWND *list = list_window_children( 0, get_desktop_window(), NULL, 0 ); int i; for (i = 0; list[i]; i++) -- 2.35.1

2 1

[PATCH 1/6] winex11: Directly use ntdll for registry access in setup_options.
by Jacek Caban April 11, 2022

April 11, 2022

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winex11.drv/x11drv.h | 16 ++++- dlls/winex11.drv/x11drv_main.c | 118 ++++++++++++++++++++++++++++----- dlls/winex11.drv/xim.c | 13 ++-- 3 files changed, 124 insertions(+), 23 deletions(-)

3 3

[PATCH] mf: Implement MFCreateNetSchemePlugin().
by Nikolay Sivov April 11, 2022

April 11, 2022

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/main.c | 10 ++++++++++ dlls/mf/mf.spec | 2 +- dlls/mf/tests/mf.c | 23 +++++++++++++++++++++++ include/mfidl.idl | 1 + 4 files changed, 35 insertions(+), 1 deletion(-) diff --git a/dlls/mf/main.c b/dlls/mf/main.c index 6b1d9293c8a..55e071d23f4 100644 --- a/dlls/mf/main.c +++ b/dlls/mf/main.c @@ -1419,3 +1419,13 @@ HRESULT WINAPI MFRequireProtectedEnvironment(IMFPresentationDescriptor *pd) return protected ? S_OK : S_FALSE; } + +/*********************************************************************** + * MFCreateNetSchemePlugin (mf.@) + */ +HRESULT WINAPI MFCreateNetSchemePlugin(REFIID riid, void **out) +{ + TRACE("%s, %p.\n", debugstr_guid(riid), out); + + return CoCreateInstance(&CLSID_NetSchemePlugin, NULL, CLSCTX_INPROC_SERVER, riid, (void **)out); +} diff --git a/dlls/mf/mf.spec b/dlls/mf/mf.spec index 8f340243fc2..162feac4b34 100644 --- a/dlls/mf/mf.spec +++ b/dlls/mf/mf.spec @@ -41,7 +41,7 @@ @ stub MFCreateMediaProcessor @ stdcall MFCreateMediaSession(ptr ptr) @ stub MFCreateNSCByteStreamPlugin -@ stub MFCreateNetSchemePlugin +@ stdcall MFCreateNetSchemePlugin(ptr ptr) @ stub MFCreatePMPHost @ stub MFCreatePMPMediaSession @ stub MFCreatePMPServer diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 31a84e47bc1..4015ca79910 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -6971,6 +6971,28 @@ failed: CoUninitialize(); } +static void test_MFCreateNetSchemePlugin(void) +{ + IMFSchemeHandler *handler; + HRESULT hr; + + hr = MFCreateNetSchemePlugin(&IID_IMFSchemeHandler, (void **)&handler); + todo_wine + ok(hr == CO_E_NOTINITIALIZED, "Unexpected hr %#lx.\n", hr); + + hr = CoInitialize(NULL); + ok(hr == S_OK, "Failed to initialize, hr %#lx.\n", hr); + + hr = MFCreateNetSchemePlugin(&IID_IMFSchemeHandler, (void **)&handler); + todo_wine + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + if (SUCCEEDED(hr)) + IMFSchemeHandler_Release(handler); + + CoUninitialize(); +} + START_TEST(mf) { init_functions(); @@ -7004,6 +7026,7 @@ START_TEST(mf) test_sample_copier_output_processing(); test_MFGetTopoNodeCurrentType(); test_MFRequireProtectedEnvironment(); + test_MFCreateNetSchemePlugin(); test_wma_encoder(); test_wma_decoder(); test_h264_decoder(); diff --git a/include/mfidl.idl b/include/mfidl.idl index 7034378f585..68057de54c8 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -673,6 +673,7 @@ cpp_quote("HRESULT WINAPI MFCreateAudioRendererActivate(IMFActivate **activate); cpp_quote("HRESULT WINAPI MFCreateMediaSession(IMFAttributes *config, IMFMediaSession **session);") cpp_quote("HRESULT WINAPI MFCreateMFByteStreamOnStream(IStream *stream, IMFByteStream **bytestream);" ) cpp_quote("HRESULT WINAPI MFCreateMFByteStreamOnStreamEx(IUnknown *stream, IMFByteStream **bytestream);") +cpp_quote("HRESULT WINAPI MFCreateNetSchemePlugin(REFIID riid, void **obj);") cpp_quote("HRESULT WINAPI MFCreatePresentationClock(IMFPresentationClock **clock);") cpp_quote("HRESULT WINAPI MFCreatePresentationDescriptor(DWORD count, IMFStreamDescriptor **descriptors,") cpp_quote(" IMFPresentationDescriptor **presentation_desc);") -- 2.35.1

2 1

[PATCH 6/6] winex11: Directly use ntdll for registry access in write_registry_settings.
by Jacek Caban April 11, 2022

April 11, 2022

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winex11.drv/Makefile.in | 2 +- dlls/winex11.drv/settings.c | 33 +++++++++++++++++---------------- 2 files changed, 18 insertions(+), 17 deletions(-)

2 1

[PATCH 5/6] winex11: Directly use ntdll for registry access in read_registry_settings.
by Jacek Caban April 11, 2022

April 11, 2022

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winex11.drv/settings.c | 44 +++++++++++++++++++++---------------- 1 file changed, 25 insertions(+), 19 deletions(-)

2 1

[PATCH 4/6] winex11: Directly use ntdll for registry access in get_display_device_reg_key.
by Jacek Caban April 11, 2022

April 11, 2022

Also just open the key in write_registry_settings, it should be already created by win32u. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winex11.drv/settings.c | 64 ++++++++++++++++++------------------- 1 file changed, 31 insertions(+), 33 deletions(-)

2 1

[PATCH 3/6] winex11: Directly use ntdll for registry access in X11DRV_GetICMProfile.
by Jacek Caban April 11, 2022

April 11, 2022

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winex11.drv/graphics.c | 32 ++++++++++++++++++++------------ dlls/winex11.drv/x11drv.h | 1 + dlls/winex11.drv/x11drv_main.c | 2 +- 3 files changed, 22 insertions(+), 13 deletions(-)

2 1

[PATCH 2/6] winex11: Directly use ntdll for registry access in create_xcursor_system_cursor.
by Jacek Caban April 11, 2022

April 11, 2022

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winex11.drv/mouse.c | 15 ++++++++------- dlls/winex11.drv/x11drv.h | 6 ++++++ dlls/winex11.drv/x11drv_main.c | 5 ++--- 3 files changed, 16 insertions(+), 10 deletions(-)

2 1

[PATCH] mfplat: Fix alignment used by audio buffers created with MFCreateMediaBufferFromMediaType().
by Nikolay Sivov April 11, 2022

April 11, 2022

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/buffer.c | 6 ++--- dlls/mfplat/tests/mfplat.c | 54 +++++++++++++++++++++++++++++++------- 2 files changed, 48 insertions(+), 12 deletions(-) diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index 8ea2283e24b..eada3df18ad 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -1596,6 +1596,8 @@ HRESULT WINAPI MFCreateMediaBufferFromMediaType(IMFMediaType *media_type, LONGLO if (FAILED(IMFMediaType_GetUINT32(media_type, &MF_MT_AUDIO_BLOCK_ALIGNMENT, &block_alignment))) WARN("Block alignment was not specified.\n"); + alignment = max(16, alignment); + if (block_alignment) { avg_length = 0; @@ -1610,8 +1612,6 @@ HRESULT WINAPI MFCreateMediaBufferFromMediaType(IMFMediaType *media_type, LONGLO } } - alignment = max(16, alignment); - length = buffer_get_aligned_length(avg_length + 1, alignment); length = buffer_get_aligned_length(length, block_alignment); } @@ -1620,7 +1620,7 @@ HRESULT WINAPI MFCreateMediaBufferFromMediaType(IMFMediaType *media_type, LONGLO length = max(length, min_length); - return create_1d_buffer(length, MF_1_BYTE_ALIGNMENT, buffer); + return create_1d_buffer(length, alignment - 1, buffer); } else FIXME("Major type %s is not supported.\n", debugstr_guid(&major)); diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 16d24bbff51..8d21f2ed60e 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -6057,18 +6057,21 @@ static void test_MFCreateMediaBufferFromMediaType(void) unsigned int buffer_length; } audio_tests[] = { - { 0, 0, 0, 4, 0, 20 }, - { 0, 16, 0, 4, 0, 20 }, - { 0, 0, 32, 4, 0, 36 }, - { 0, 64, 32, 4, 0, 64 }, - { 1, 0, 0, 4, 16, 36 }, - { 2, 0, 0, 4, 16, 52 }, + { 0, 0, 0, 4, 0, 20 }, + { 0, 16, 0, 4, 0, 20 }, + { 0, 0, 32, 4, 0, 36 }, + { 0, 64, 32, 4, 0, 64 }, + { 1, 0, 0, 4, 16, 36 }, + { 2, 0, 0, 4, 16, 52 }, + { 2, 0, 64, 4, 16, 68 }, + { 2, 0, 128, 4, 16,132 }, }; + IMFMediaType *media_type, *media_type2; + unsigned int i, alignment; IMFMediaBuffer *buffer; - DWORD length; + DWORD length, max; + BYTE *data; HRESULT hr; - IMFMediaType *media_type; - unsigned int i; if (!pMFCreateMediaBufferFromMediaType) { @@ -6082,9 +6085,15 @@ static void test_MFCreateMediaBufferFromMediaType(void) hr = MFCreateMediaType(&media_type); ok(hr == S_OK, "Failed to create media type, hr %#lx.\n", hr); + hr = MFCreateMediaType(&media_type2); + ok(hr == S_OK, "Failed to create media type, hr %#lx.\n", hr); + hr = IMFMediaType_SetGUID(media_type, &MF_MT_MAJOR_TYPE, &MFMediaType_Audio); ok(hr == S_OK, "Failed to set attribute, hr %#lx.\n", hr); + hr = IMFMediaType_CopyAllItems(media_type, (IMFAttributes *)media_type2); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + for (i = 0; i < ARRAY_SIZE(audio_tests); ++i) { const struct audio_buffer_test *ptr = &audio_tests[i]; @@ -6107,10 +6116,37 @@ static void test_MFCreateMediaBufferFromMediaType(void) ok(hr == S_OK, "Failed to get length, hr %#lx.\n", hr); ok(ptr->buffer_length == length, "%d: unexpected buffer length %lu, expected %u.\n", i, length, ptr->buffer_length); + alignment = ptr->min_alignment ? ptr->min_alignment - 1 : MF_16_BYTE_ALIGNMENT; + hr = IMFMediaBuffer_Lock(buffer, &data, &max, &length); + ok(hr == S_OK, "Failed to lock, hr %#lx.\n", hr); + ok(ptr->buffer_length == max && !length, "Unexpected length.\n"); + ok(!((uintptr_t)data & alignment), "%u: data at %p is misaligned.\n", i, data); + hr = IMFMediaBuffer_Unlock(buffer); + ok(hr == S_OK, "Failed to unlock, hr %#lx.\n", hr); + + IMFMediaBuffer_Release(buffer); + + /* Only major type is set. */ + hr = pMFCreateMediaBufferFromMediaType(media_type2, ptr->duration * 10000000, ptr->min_length, + ptr->min_alignment, &buffer); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + hr = IMFMediaBuffer_GetMaxLength(buffer, &length); + ok(hr == S_OK, "Failed to get length, hr %#lx.\n", hr); + ok(ptr->min_length == length, "%u: unexpected buffer length %lu, expected %u.\n", i, length, ptr->min_length); + + hr = IMFMediaBuffer_Lock(buffer, &data, &max, &length); + ok(hr == S_OK, "Failed to lock, hr %#lx.\n", hr); + ok(ptr->min_length == max && !length, "Unexpected length.\n"); + ok(!((uintptr_t)data & alignment), "%u: data at %p is misaligned.\n", i, data); + hr = IMFMediaBuffer_Unlock(buffer); + ok(hr == S_OK, "Failed to unlock, hr %#lx.\n", hr); + IMFMediaBuffer_Release(buffer); } IMFMediaType_Release(media_type); + IMFMediaType_Release(media_type2); } static void validate_media_type(IMFMediaType *mediatype, const WAVEFORMATEX *format) -- 2.35.1

1 0