July 2024 - Wine-commits - list.winehq.org

Piotr Caban : xcopy: Add support for parsing concatenated switches.
by Alexandre Julliard 03 Jul '24

03 Jul '24

Module: wine Branch: master Commit: 1e1fb212ad683c11f4f01e05767154ba6e58c7ec URL: https://gitlab.winehq.org/wine/wine/-/commit/1e1fb212ad683c11f4f01e05767154… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jul 3 12:50:15 2024 +0200 xcopy: Add support for parsing concatenated switches. --- programs/xcopy/tests/xcopy.c | 6 ++++++ programs/xcopy/xcopy.c | 34 ++++++++++------------------------ 2 files changed, 16 insertions(+), 24 deletions(-) diff --git a/programs/xcopy/tests/xcopy.c b/programs/xcopy/tests/xcopy.c index 4c51f941dfc..61fbad9ccaf 100644 --- a/programs/xcopy/tests/xcopy.c +++ b/programs/xcopy/tests/xcopy.c @@ -111,6 +111,12 @@ static void test_parms_syntax(void) ok(rc == 4, "xcopy /D/S/\"E\" test failed rc=%lu\n", rc); ok(GetFileAttributesA("xcopytest2") == INVALID_FILE_ATTRIBUTES, "xcopy copied empty directory incorrectly\n"); + + rc = runcmd("xcopy xcopytest xcopytest2\\/DSE"); + ok(rc == 0, "xcopy /DSE test failed rc=%lu\n", rc); + ok(GetFileAttributesA("xcopytest2") != INVALID_FILE_ATTRIBUTES, + "xcopy failed to copy empty directory\n"); + RemoveDirectoryA("xcopytest2"); } static void test_keep_attributes(void) diff --git a/programs/xcopy/xcopy.c b/programs/xcopy/xcopy.c index 84f2d312b6f..46a2727dd49 100644 --- a/programs/xcopy/xcopy.c +++ b/programs/xcopy/xcopy.c @@ -738,13 +738,12 @@ static int XCOPY_ParseCommandLine(WCHAR *suppliedsource, Note: Windows docs say /P prompts when dest is created but tests show it is done for each src file regardless of the destination */ - int skip=0; - WCHAR *p = word, *rest; + WCHAR *p = word + 1, *rest; while (*p) { - rest = NULL; + rest = p + 1; - switch (toupper(p[1])) { + switch (toupper(*p)) { case 'I': flags |= OPT_ASSUMEDIR; break; case 'S': flags |= OPT_RECURSIVE; break; case 'Q': flags |= OPT_QUIET; break; @@ -766,14 +765,12 @@ static int XCOPY_ParseCommandLine(WCHAR *suppliedsource, /* E can be /E or /EXCLUDE */ case 'E': if (CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, - &p[1], 8, L"EXCLUDE:", -1) == CSTR_EQUAL) { - if (XCOPY_ProcessExcludeList(&p[9])) { + p, 8, L"EXCLUDE:", -1) == CSTR_EQUAL) { + if (XCOPY_ProcessExcludeList(&p[8])) { XCOPY_FailMessage(ERROR_INVALID_PARAMETER); exit(RC_INITERROR); } else { flags |= OPT_EXCLUDELIST; - - /* Do not support concatenated switches onto exclude lists yet */ rest = p + wcslen(p); } } else { @@ -782,9 +779,9 @@ static int XCOPY_ParseCommandLine(WCHAR *suppliedsource, break; /* D can be /D or /D: */ - case 'D': if (p[2]==':' && is_digit(p[3])) { + case 'D': if (p[1]==':' && is_digit(p[2])) { SYSTEMTIME st; - WCHAR *pos = &p[3]; + WCHAR *pos = &p[2]; BOOL isError = FALSE; memset(&st, 0x00, sizeof(st)); @@ -835,9 +832,9 @@ static int XCOPY_ParseCommandLine(WCHAR *suppliedsource, } break; - case '-': if (toupper(p[2])=='Y') { + case '-': if (toupper(p[1])=='Y') { flags &= ~OPT_NOPROMPT; - rest = &p[3]; /* Skip over 3 characters */ + rest = &p[2]; /* Skip over 2 characters */ } break; case '?': XCOPY_wprintf(XCOPY_LoadMessage(STRING_HELP)); @@ -851,18 +848,7 @@ static int XCOPY_ParseCommandLine(WCHAR *suppliedsource, exit(RC_INITERROR); } - /* Unless overridden above, skip over the '/' and the first character */ - if (rest == NULL) rest = &p[2]; - - /* By now, rest should point either to the null after the - switch, or the beginning of the next switch if there - was no whitespace between them */ - if (!skip && *rest && *rest != '/') { - WINE_FIXME("Unexpected characters found and ignored '%s'\n", wine_dbgstr_w(rest)); - skip=1; - } else { - p = rest; - } + p = rest; } } free(word);

1 0

Rémi Bernon : server: Move the desktop flags to the shared memory.
by Alexandre Julliard 03 Jul '24

03 Jul '24

Module: wine Branch: master Commit: d0d94195a683a8c42c14283ad4dabe836161356a URL: https://gitlab.winehq.org/wine/wine/-/commit/d0d94195a683a8c42c14283ad4dabe… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jun 21 22:27:44 2024 +0200 server: Move the desktop flags to the shared memory. --- include/wine/server_protocol.h | 3 ++- server/protocol.def | 1 + server/user.h | 1 - server/winstation.c | 25 ++++++++++++++++++------- 4 files changed, 21 insertions(+), 9 deletions(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 2598ecc1817..89a2dcb778f 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -893,6 +893,7 @@ struct shared_cursor typedef volatile struct { + unsigned int flags; struct shared_cursor cursor; unsigned char keystate[256]; } desktop_shm_t; @@ -6591,7 +6592,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 821 +#define SERVER_PROTOCOL_VERSION 822 /* ### protocol_version end ### */ diff --git a/server/protocol.def b/server/protocol.def index 21e35204ed0..39c8de7ef69 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -909,6 +909,7 @@ struct shared_cursor typedef volatile struct { + unsigned int flags; /* desktop flags */ struct shared_cursor cursor; /* global cursor information */ unsigned char keystate[256]; /* asynchronous key state */ } desktop_shm_t; diff --git a/server/user.h b/server/user.h index 4633c7dae7f..6f10f296200 100644 --- a/server/user.h +++ b/server/user.h @@ -67,7 +67,6 @@ struct key_repeat struct desktop { struct object obj; /* object header */ - unsigned int flags; /* desktop flags */ struct winstation *winstation; /* winstation this desktop belongs to */ timeout_t input_time; /* last time this desktop had the input */ struct list entry; /* entry in winstation list of desktops */ diff --git a/server/winstation.c b/server/winstation.c index 75b604ae1c3..76a23b197a4 100644 --- a/server/winstation.c +++ b/server/winstation.c @@ -274,13 +274,11 @@ static struct desktop *create_desktop( const struct unicode_str *name, unsigned { /* initialize it if it didn't already exist */ - desktop->flags = flags; - /* inherit DF_WINE_*_DESKTOP flags if none of them are specified */ if (!(flags & (DF_WINE_ROOT_DESKTOP | DF_WINE_VIRTUAL_DESKTOP)) && (current_desktop = get_thread_desktop( current, 0 ))) { - desktop->flags |= current_desktop->flags & (DF_WINE_VIRTUAL_DESKTOP | DF_WINE_ROOT_DESKTOP); + flags |= current_desktop->shared->flags & (DF_WINE_VIRTUAL_DESKTOP | DF_WINE_ROOT_DESKTOP); release_object( current_desktop ); } @@ -308,6 +306,7 @@ static struct desktop *create_desktop( const struct unicode_str *name, unsigned SHARED_WRITE_BEGIN( desktop->shared, desktop_shm_t ) { + shared->flags = flags; shared->cursor.x = 0; shared->cursor.y = 0; shared->cursor.last_change = 0; @@ -321,7 +320,12 @@ static struct desktop *create_desktop( const struct unicode_str *name, unsigned } else { - desktop->flags |= flags & (DF_WINE_VIRTUAL_DESKTOP | DF_WINE_ROOT_DESKTOP); + SHARED_WRITE_BEGIN( desktop->shared, desktop_shm_t ) + { + shared->flags |= flags & (DF_WINE_VIRTUAL_DESKTOP | DF_WINE_ROOT_DESKTOP); + } + SHARED_WRITE_END; + clear_error(); } } @@ -333,7 +337,7 @@ static void desktop_dump( struct object *obj, int verbose ) struct desktop *desktop = (struct desktop *)obj; fprintf( stderr, "Desktop flags=%x winstation=%p top_win=%p hooks=%p\n", - desktop->flags, desktop->winstation, desktop->top_window, desktop->global_hooks ); + desktop->shared->flags, desktop->winstation, desktop->top_window, desktop->global_hooks ); } static int desktop_link_name( struct object *obj, struct object_name *name, struct object *parent ) @@ -839,8 +843,15 @@ DECL_HANDLER(set_user_object_info) { struct desktop *desktop = (struct desktop *)obj; reply->is_desktop = 1; - reply->old_obj_flags = desktop->flags; - if (req->flags & SET_USER_OBJECT_SET_FLAGS) desktop->flags = req->obj_flags; + reply->old_obj_flags = desktop->shared->flags; + if (req->flags & SET_USER_OBJECT_SET_FLAGS) + { + SHARED_WRITE_BEGIN( desktop->shared, desktop_shm_t ) + { + shared->flags = req->obj_flags; + } + SHARED_WRITE_END; + } } else if (obj->ops == &winstation_ops) {

1 0

Rémi Bernon : win32u: Use the shared memory to read the desktop flags.
by Alexandre Julliard 03 Jul '24

03 Jul '24

Module: wine Branch: master Commit: 821c95aa6ad120048edeef25d6b329f95fc1b686 URL: https://gitlab.winehq.org/wine/wine/-/commit/821c95aa6ad120048edeef25d6b329… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jun 21 22:30:23 2024 +0200 win32u: Use the shared memory to read the desktop flags. --- dlls/win32u/winstation.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/win32u/winstation.c b/dlls/win32u/winstation.c index 1a1b37f6eda..0500d510fd4 100644 --- a/dlls/win32u/winstation.c +++ b/dlls/win32u/winstation.c @@ -256,12 +256,16 @@ NTSTATUS get_shared_queue( struct object_lock *lock, const queue_shm_t **queue_s BOOL is_virtual_desktop(void) { - HANDLE desktop = NtUserGetThreadDesktop( GetCurrentThreadId() ); - USEROBJECTFLAGS flags = {0}; - DWORD len; + struct object_lock lock = OBJECT_LOCK_INIT; + const desktop_shm_t *desktop_shm; + BOOL ret = FALSE; + UINT status; - if (!NtUserGetObjectInformation( desktop, UOI_FLAGS, &flags, sizeof(flags), &len )) return FALSE; - return !!(flags.dwFlags & DF_WINE_VIRTUAL_DESKTOP); + while ((status = get_shared_desktop( &lock, &desktop_shm )) == STATUS_PENDING) + ret = !!(desktop_shm->flags & DF_WINE_VIRTUAL_DESKTOP); + if (status) ret = FALSE; + + return ret; } /***********************************************************************

1 0

Ziqing Hui : mf/tests: Add more tests for h264 encoder type attributes.
by Alexandre Julliard 03 Jul '24

03 Jul '24

Module: wine Branch: master Commit: 6e66b66e6c85d15b7ebdc2e62e6b509b27cd4bbc URL: https://gitlab.winehq.org/wine/wine/-/commit/6e66b66e6c85d15b7ebdc2e62e6b50… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue Jul 2 12:07:28 2024 +0800 mf/tests: Add more tests for h264 encoder type attributes. --- dlls/mf/tests/transform.c | 49 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 47 insertions(+), 2 deletions(-) diff --git a/dlls/mf/tests/transform.c b/dlls/mf/tests/transform.c index deec2c7dd92..515b309add2 100644 --- a/dlls/mf/tests/transform.c +++ b/dlls/mf/tests/transform.c @@ -3886,6 +3886,14 @@ static void test_h264_encoder(void) ATTR_UINT32(test_attr_guid, 0), {0}, }; + static const struct attribute_desc test_attributes[] = + { + ATTR_RATIO(MF_MT_FRAME_SIZE, 1920, 1080), + ATTR_RATIO(MF_MT_FRAME_RATE, 10, 1), + ATTR_UINT32(MF_MT_INTERLACE_MODE, MFVideoInterlace_MixedInterlaceOrProgressive), + ATTR_UINT32(MF_MT_VIDEO_NOMINAL_RANGE, MFNominalRange_Normal), + ATTR_RATIO(MF_MT_PIXEL_ASPECT_RATIO, 2, 1), + }; const struct attribute_desc expect_input_type_desc[] = { ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video), @@ -3907,7 +3915,7 @@ static void test_h264_encoder(void) ATTR_UINT32(test_attr_guid, 0), {0}, }; - static const MFT_OUTPUT_STREAM_INFO expect_output_info = {.cbSize = 0x8000}; + static const MFT_OUTPUT_STREAM_INFO expect_output_info[] = {{.cbSize = 0x8000}, {.cbSize = 0x3bc400}}; MFT_REGISTER_TYPE_INFO output_type = {MFMediaType_Video, MFVideoFormat_H264}; MFT_REGISTER_TYPE_INFO input_type = {MFMediaType_Video, MFVideoFormat_NV12}; IMFMediaType *media_type; @@ -3970,7 +3978,7 @@ static void test_h264_encoder(void) check_mft_set_output_type_required(transform, output_type_desc); check_mft_set_output_type(transform, output_type_desc, S_OK); check_mft_get_output_current_type(transform, expect_output_type_desc); - check_mft_get_output_stream_info(transform, S_OK, &expect_output_info); + check_mft_get_output_stream_info(transform, S_OK, &expect_output_info[0]); /* Input types can now be enumerated. */ i = -1; @@ -3993,6 +4001,43 @@ static void test_h264_encoder(void) check_mft_get_input_current_type(transform, expect_input_type_desc); check_mft_get_input_stream_info(transform, S_OK, NULL); + hr = MFCreateMediaType(&media_type); + ok(hr == S_OK, "MFCreateMediaType returned %#lx.\n", hr); + + /* Input type attributes should match output type attributes. */ + for (i = 0; i < ARRAY_SIZE(test_attributes); ++i) + { + winetest_push_context("attr %lu", i); + + init_media_type(media_type, input_type_desc, -1); + hr = IMFMediaType_SetItem(media_type, test_attributes[i].key, &test_attributes[i].value); + ok(hr == S_OK, "SetItem returned %#lx.\n", hr); + hr = IMFTransform_SetInputType(transform, 0, media_type, MFT_SET_TYPE_TEST_ONLY); + ok(hr == MF_E_INVALIDMEDIATYPE, "SetInputType returned %#lx.\n", hr); + + winetest_pop_context(); + } + + /* Output info cbSize will change only if we change output type frame size. */ + for (i = 0; i < ARRAY_SIZE(test_attributes); ++i) + { + winetest_push_context("attr %lu", i); + + init_media_type(media_type, output_type_desc, -1); + hr = IMFMediaType_SetItem(media_type, test_attributes[i].key, &test_attributes[i].value); + ok(hr == S_OK, "SetItem returned %#lx.\n", hr); + hr = IMFTransform_SetOutputType(transform, 0, media_type, 0); + ok(hr == S_OK, "SetOutputType returned %#lx.\n", hr); + + if (IsEqualGUID(test_attributes[i].key, &MF_MT_FRAME_SIZE)) + check_mft_get_output_stream_info(transform, S_OK, &expect_output_info[1]); + else + check_mft_get_output_stream_info(transform, S_OK, &expect_output_info[0]); + + winetest_pop_context(); + } + + IMFMediaType_Release(media_type); ret = IMFTransform_Release(transform); ok(ret == 0, "Release returned %lu\n", ret);

1 0

Ziqing Hui : winegstreamer/video_encoder: Introduce create_input_type.
by Alexandre Julliard 03 Jul '24

03 Jul '24

Module: wine Branch: master Commit: 689824bdcfeed481f1d09304d352c92beff27e6d URL: https://gitlab.winehq.org/wine/wine/-/commit/689824bdcfeed481f1d09304d352c9… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue Jul 2 12:24:53 2024 +0800 winegstreamer/video_encoder: Introduce create_input_type. --- dlls/winegstreamer/video_encoder.c | 74 ++++++++++++++++++++------------------ 1 file changed, 40 insertions(+), 34 deletions(-) diff --git a/dlls/winegstreamer/video_encoder.c b/dlls/winegstreamer/video_encoder.c index cfdd5be9d50..c880cd062ce 100644 --- a/dlls/winegstreamer/video_encoder.c +++ b/dlls/winegstreamer/video_encoder.c @@ -54,6 +54,45 @@ static inline struct video_encoder *impl_from_IMFTransform(IMFTransform *iface) return CONTAINING_RECORD(iface, struct video_encoder, IMFTransform_iface); } +static HRESULT create_input_type(struct video_encoder *encoder, const GUID *subtype, IMFMediaType **out) +{ + IMFVideoMediaType *input_type; + UINT64 ratio; + UINT32 value; + HRESULT hr; + + if (FAILED(hr = MFCreateVideoMediaTypeFromSubtype(subtype, &input_type))) + return hr; + + if (FAILED(hr = IMFMediaType_GetUINT64(encoder->output_type, &MF_MT_FRAME_SIZE, &ratio)) + || FAILED(hr = IMFVideoMediaType_SetUINT64(input_type, &MF_MT_FRAME_SIZE, ratio))) + goto done; + + if (FAILED(hr = IMFMediaType_GetUINT64(encoder->output_type, &MF_MT_FRAME_RATE, &ratio)) + || FAILED(hr = IMFVideoMediaType_SetUINT64(input_type, &MF_MT_FRAME_RATE, ratio))) + goto done; + + if (FAILED(hr = IMFMediaType_GetUINT32(encoder->output_type, &MF_MT_INTERLACE_MODE, &value)) + || FAILED(hr = IMFVideoMediaType_SetUINT32(input_type, &MF_MT_INTERLACE_MODE, value))) + goto done; + + if (FAILED(IMFMediaType_GetUINT32(encoder->output_type, &MF_MT_VIDEO_NOMINAL_RANGE, &value))) + value = MFNominalRange_Wide; + if (FAILED(hr = IMFVideoMediaType_SetUINT32(input_type, &MF_MT_VIDEO_NOMINAL_RANGE, value))) + goto done; + + if (FAILED(IMFMediaType_GetUINT64(encoder->output_type, &MF_MT_PIXEL_ASPECT_RATIO, &ratio))) + ratio = (UINT64)1 << 32 | 1; + if (FAILED(hr = IMFVideoMediaType_SetUINT64(input_type, &MF_MT_PIXEL_ASPECT_RATIO, ratio))) + goto done; + + IMFMediaType_AddRef((*out = (IMFMediaType *)input_type)); + +done: + IMFVideoMediaType_Release(input_type); + return hr; +} + static HRESULT WINAPI transform_QueryInterface(IMFTransform *iface, REFIID iid, void **out) { struct video_encoder *encoder = impl_from_IMFTransform(iface); @@ -180,10 +219,6 @@ static HRESULT WINAPI transform_GetInputAvailableType(IMFTransform *iface, DWORD IMFMediaType **type) { struct video_encoder *encoder = impl_from_IMFTransform(iface); - IMFVideoMediaType *input_type; - UINT64 ratio; - UINT32 value; - HRESULT hr; TRACE("iface %p, id %#lx, index %#lx, type %p.\n", iface, id, index, type); @@ -194,36 +229,7 @@ static HRESULT WINAPI transform_GetInputAvailableType(IMFTransform *iface, DWORD if (index >= encoder->input_type_count) return MF_E_NO_MORE_TYPES; - if (!(hr = MFCreateVideoMediaTypeFromSubtype(encoder->input_types[index], &input_type))) - return hr; - - if (FAILED(hr = IMFMediaType_GetUINT64(encoder->output_type, &MF_MT_FRAME_SIZE, &ratio)) - || FAILED(hr = IMFVideoMediaType_SetUINT64(input_type, &MF_MT_FRAME_SIZE, ratio))) - goto done; - - if (FAILED(hr = IMFMediaType_GetUINT64(encoder->output_type, &MF_MT_FRAME_RATE, &ratio)) - || FAILED(hr = IMFVideoMediaType_SetUINT64(input_type, &MF_MT_FRAME_RATE, ratio))) - goto done; - - if (FAILED(hr = IMFMediaType_GetUINT32(encoder->output_type, &MF_MT_INTERLACE_MODE, &value)) - || FAILED(hr = IMFVideoMediaType_SetUINT32(input_type, &MF_MT_INTERLACE_MODE, value))) - goto done; - - if (FAILED(IMFMediaType_GetUINT32(encoder->output_type, &MF_MT_VIDEO_NOMINAL_RANGE, &value))) - value = MFNominalRange_Wide; - if (FAILED(hr = IMFVideoMediaType_SetUINT32(input_type, &MF_MT_VIDEO_NOMINAL_RANGE, value))) - goto done; - - if (FAILED(IMFMediaType_GetUINT64(encoder->output_type, &MF_MT_PIXEL_ASPECT_RATIO, &ratio))) - ratio = (UINT64)1 << 32 | 1; - if (FAILED(hr = IMFVideoMediaType_SetUINT64(input_type, &MF_MT_PIXEL_ASPECT_RATIO, ratio))) - goto done; - - IMFMediaType_AddRef((*type = (IMFMediaType *)input_type)); - -done: - IMFVideoMediaType_Release(input_type); - return hr; + return create_input_type(encoder, encoder->input_types[index], type); } static HRESULT WINAPI transform_GetOutputAvailableType(IMFTransform *iface, DWORD id,

1 0

Ziqing Hui : winegstreamer/video_encoder: Check more attributes in SetInputType.
by Alexandre Julliard 03 Jul '24

03 Jul '24

Module: wine Branch: master Commit: c45cf47a6134eb9be5745786deee2395e4133042 URL: https://gitlab.winehq.org/wine/wine/-/commit/c45cf47a6134eb9be5745786deee23… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue Jul 2 15:08:58 2024 +0800 winegstreamer/video_encoder: Check more attributes in SetInputType. --- dlls/winegstreamer/video_encoder.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/winegstreamer/video_encoder.c b/dlls/winegstreamer/video_encoder.c index c880cd062ce..d852a2d0a69 100644 --- a/dlls/winegstreamer/video_encoder.c +++ b/dlls/winegstreamer/video_encoder.c @@ -248,8 +248,10 @@ static HRESULT WINAPI transform_GetOutputAvailableType(IMFTransform *iface, DWOR static HRESULT WINAPI transform_SetInputType(IMFTransform *iface, DWORD id, IMFMediaType *type, DWORD flags) { struct video_encoder *encoder = impl_from_IMFTransform(iface); + IMFMediaType *good_input_type; GUID major, subtype; - UINT64 ratio; + BOOL result; + HRESULT hr; ULONG i; TRACE("iface %p, id %#lx, type %p, flags %#lx.\n", iface, id, type, flags); @@ -281,8 +283,12 @@ static HRESULT WINAPI transform_SetInputType(IMFTransform *iface, DWORD id, IMFM if (i == encoder->input_type_count) return MF_E_INVALIDMEDIATYPE; - if (FAILED(IMFMediaType_GetUINT64(type, &MF_MT_FRAME_SIZE, &ratio)) - || FAILED(IMFMediaType_GetUINT64(type, &MF_MT_FRAME_RATE, &ratio))) + if (FAILED(hr = create_input_type(encoder, &subtype, &good_input_type))) + return hr; + hr = IMFMediaType_Compare(good_input_type, (IMFAttributes *)type, + MF_ATTRIBUTES_MATCH_OUR_ITEMS, &result); + IMFMediaType_Release(good_input_type); + if (FAILED(hr) || !result) return MF_E_INVALIDMEDIATYPE; if (flags & MFT_SET_TYPE_TEST_ONLY)

1 0

Ziqing Hui : winegstreamer/video_encoder: Implement GetInputStreamInfo.
by Alexandre Julliard 03 Jul '24

03 Jul '24

Module: wine Branch: master Commit: 44f1af1cf45965cb42969e6a51fe6ebf9720c6fc URL: https://gitlab.winehq.org/wine/wine/-/commit/44f1af1cf45965cb42969e6a51fe6e… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue Jul 2 15:12:32 2024 +0800 winegstreamer/video_encoder: Implement GetInputStreamInfo. --- dlls/winegstreamer/video_encoder.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/video_encoder.c b/dlls/winegstreamer/video_encoder.c index d852a2d0a69..512a4dcfa4d 100644 --- a/dlls/winegstreamer/video_encoder.c +++ b/dlls/winegstreamer/video_encoder.c @@ -44,6 +44,7 @@ struct video_encoder UINT output_type_count; IMFMediaType *input_type; + MFT_INPUT_STREAM_INFO input_info; IMFMediaType *output_type; IMFAttributes *attributes; @@ -168,8 +169,12 @@ static HRESULT WINAPI transform_GetStreamIDs(IMFTransform *iface, DWORD input_si static HRESULT WINAPI transform_GetInputStreamInfo(IMFTransform *iface, DWORD id, MFT_INPUT_STREAM_INFO *info) { - FIXME("iface %p, id %#lx, info %p.\n", iface, id, info); - return E_NOTIMPL; + struct video_encoder *encoder = impl_from_IMFTransform(iface); + + TRACE("iface %p, id %#lx, info %p.\n", iface, id, info); + + *info = encoder->input_info; + return S_OK; } static HRESULT WINAPI transform_GetOutputStreamInfo(IMFTransform *iface, DWORD id, MFT_OUTPUT_STREAM_INFO *info)

1 0

Ziqing Hui : winegstreamer/video_encoder: Implement GetOutputStreamInfo.
by Alexandre Julliard 03 Jul '24

03 Jul '24

Module: wine Branch: master Commit: 3a69b0914f96acc0877a8d004cf450d14205c7c3 URL: https://gitlab.winehq.org/wine/wine/-/commit/3a69b0914f96acc0877a8d004cf450… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue Jul 2 15:32:55 2024 +0800 winegstreamer/video_encoder: Implement GetOutputStreamInfo. --- dlls/winegstreamer/video_encoder.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/video_encoder.c b/dlls/winegstreamer/video_encoder.c index 512a4dcfa4d..2cb73ca89db 100644 --- a/dlls/winegstreamer/video_encoder.c +++ b/dlls/winegstreamer/video_encoder.c @@ -46,6 +46,7 @@ struct video_encoder IMFMediaType *input_type; MFT_INPUT_STREAM_INFO input_info; IMFMediaType *output_type; + MFT_OUTPUT_STREAM_INFO output_info; IMFAttributes *attributes; }; @@ -179,8 +180,12 @@ static HRESULT WINAPI transform_GetInputStreamInfo(IMFTransform *iface, DWORD id static HRESULT WINAPI transform_GetOutputStreamInfo(IMFTransform *iface, DWORD id, MFT_OUTPUT_STREAM_INFO *info) { - FIXME("iface %p, id %#lx, info %p.\n", iface, id, info); - return E_NOTIMPL; + struct video_encoder *encoder = impl_from_IMFTransform(iface); + + TRACE("iface %p, id %#lx, info %p.\n", iface, id, info); + + *info = encoder->output_info; + return S_OK; } static HRESULT WINAPI transform_GetAttributes(IMFTransform *iface, IMFAttributes **attributes) @@ -545,6 +550,10 @@ HRESULT h264_encoder_create(REFIID riid, void **out) h264_encoder_output_types, ARRAY_SIZE(h264_encoder_output_types), &encoder))) return hr; + /* FIXME: Hardcode a size that is large enough to make things work for now. + * The right way is to calculate the size based on output frame size. */ + encoder->output_info.cbSize = 0x3bc400; + TRACE("Created h264 encoder transform %p.\n", &encoder->IMFTransform_iface); hr = IMFTransform_QueryInterface(&encoder->IMFTransform_iface, riid, out);

1 0

Eric Pouech : cmd: Add success/failure tests for dir related commands.
by Alexandre Julliard 03 Jul '24

03 Jul '24

Module: wine Branch: master Commit: 22bb6ce6e9efcbe9b440d46ee9a3475a00a1fc69 URL: https://gitlab.winehq.org/wine/wine/-/commit/22bb6ce6e9efcbe9b440d46ee9a347… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Fri May 24 13:01:32 2024 +0200 cmd: Add success/failure tests for dir related commands. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/tests/test_builtins.cmd | 42 ++++++++++++++++++++++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 24 ++++++++++++++++++ 2 files changed, 66 insertions(+) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index ccdddd289bd..d5f8cef8eab 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -524,6 +524,48 @@ call :setError 666 & (erase i\dont\exist\at\all.txt &&echo SUCCESS !errorlevel!| call :setError 666 & (erase file* i\dont\exist\at\all.txt &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) cd .. && rd /q /s foo +echo --- success/failure for MKDIR,MD command +mkdir foo & cd foo +call :setError 666 & (mkdir &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (mkdir abc &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (mkdir abc &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (mkdir @:\cba\abc &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (mkdir NUL &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +cd .. && rd /q /s foo + +echo --- success/failure for CD command +mkdir foo & cd foo +mkdir abc +call :setError 666 & (cd abc >NUL &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (cd abc >NUL &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (cd .. >NUL &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (cd >NUL &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +cd .. && rd /q /s foo + +echo --- success/failure for PUSHD/POPD commands +mkdir foo & cd foo +mkdir abc +call :setError 666 & (pushd &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (pushd abc &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (pushd abc &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (popd abc &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (popd &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +cd .. && rd /q /s foo + +echo --- success/failure for DIR command +mkdir foo & cd foo +echo a > fileA +echo b > fileB +mkdir dir +echo b > dir\fileB +call :setError 666 & (dir /e >NUL &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (dir zzz >NUL &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (dir fileA zzz >NUL &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (dir zzz fileA >NUL &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (dir dir\zzz >NUL &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (dir file* >NUL &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +cd .. && rd /q /s foo + echo --- setlocal DisableDelayedExpansion echo ------------ Testing 'set' ------------ diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 8b281907624..8be714a9158 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -496,6 +496,30 @@ FAILURE 1 SUCCESS 0 FAILURE 1 FAILURE 1 +--- success/failure for MKDIR,MD command +(a)todo_wine@FAILURE 1 +(a)todo_wine@SUCCESS 0 +(a)todo_wine@FAILURE 1 +(a)todo_wine@FAILURE 1 +(a)todo_wine@SUCCESS 0 +--- success/failure for CD command +(a)todo_wine@SUCCESS 0 +(a)todo_wine@FAILURE 1 +(a)todo_wine@SUCCESS 0 +(a)todo_wine@SUCCESS 0 +--- success/failure for PUSHD/POPD commands +(a)todo_wine@SUCCESS 0 +SUCCESS 0 +(a)todo_wine@FAILURE 1 +(a)todo_wine@SUCCESS 666 +(a)todo_wine@FAILURE 1 +(a)todo_wine@--- success/failure for DIR command +(a)todo_wine@FAILURE 1 +(a)todo_wine@FAILURE 1 +SUCCESS 0 +SUCCESS 0 +(a)todo_wine@FAILURE 1 +SUCCESS 0 @todo_wine(a)--- ------------ Testing 'set' ------------ 1

1 0

Eric Pouech : cmd: Add success/failure return code for MKDIR/MD commands.
by Alexandre Julliard 03 Jul '24

03 Jul '24

Module: wine Branch: master Commit: db929054baa61c500e3ccaf572914bd180a4c925 URL: https://gitlab.winehq.org/wine/wine/-/commit/db929054baa61c500e3ccaf572914b… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Sat Jun 29 12:00:01 2024 +0200 cmd: Add success/failure return code for MKDIR/MD commands. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/builtins.c | 21 ++++++++++++++------- programs/cmd/tests/test_builtins.cmd.exp | 10 +++++----- programs/cmd/wcmd.h | 2 +- programs/cmd/wcmdmain.c | 2 +- 4 files changed, 21 insertions(+), 14 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index faff537be73..7a023ba917c 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1158,23 +1158,30 @@ static BOOL create_full_path(WCHAR* path) return FALSE; } -void WCMD_create_dir (WCHAR *args) { +RETURN_CODE WCMD_create_dir(WCHAR *args) +{ int argno = 0; WCHAR *argN = args; + RETURN_CODE return_code; - if (param1[0] == 0x00) { + if (param1[0] == L'\0') + { WCMD_output_stderr(WCMD_LoadMessage(WCMD_NOARG)); - return; + return errorlevel = ERROR_INVALID_FUNCTION; } + return_code = NO_ERROR; /* Loop through all args */ - while (TRUE) { + for (;;) + { WCHAR *thisArg = WCMD_parameter(args, argno++, &argN, FALSE, FALSE); if (!argN) break; - if (!create_full_path(thisArg)) { - WCMD_print_error (); - errorlevel = ERROR_INVALID_FUNCTION; + if (!create_full_path(thisArg)) + { + WCMD_print_error(); + return_code = ERROR_INVALID_FUNCTION; } } + return errorlevel = return_code; } /* Parse the /A options given by the user on the commandline diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 8be714a9158..ef93def2732 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -497,11 +497,11 @@ SUCCESS 0 FAILURE 1 FAILURE 1 --- success/failure for MKDIR,MD command -(a)todo_wine@FAILURE 1 -(a)todo_wine@SUCCESS 0 -(a)todo_wine@FAILURE 1 -(a)todo_wine@FAILURE 1 -(a)todo_wine@SUCCESS 0 +FAILURE 1 +SUCCESS 0 +FAILURE 1 +FAILURE 1 +SUCCESS 0 --- success/failure for CD command @todo_wine(a)SUCCESS 0 @todo_wine(a)FAILURE 1 diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index 0b0a96c5fb8..8fe2eb3f322 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -167,7 +167,7 @@ void WCMD_choice (const WCHAR *); void WCMD_clear_screen (void); void WCMD_color (void); RETURN_CODE WCMD_copy(WCHAR *); -void WCMD_create_dir (WCHAR *); +RETURN_CODE WCMD_create_dir(WCHAR *); RETURN_CODE WCMD_delete(WCHAR *); void WCMD_directory (WCHAR *); RETURN_CODE WCMD_echo(const WCHAR *); diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index c096abe3431..ededdcd2177 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1849,7 +1849,7 @@ static RETURN_CODE execute_single_command(const WCHAR *command) break; case WCMD_MD: case WCMD_MKDIR: - WCMD_create_dir (parms_start); + return_code = WCMD_create_dir(parms_start); break; case WCMD_MOVE: return_code = WCMD_move();

1 0