June 2021 - Wine-Devel - list.winehq.org

[PATCH] mf: Use CRT allocation functions.
by Nikolay Sivov June 17, 2021

June 17, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/clock.c | 26 ++++++++---------- dlls/mf/copier.c | 6 ++-- dlls/mf/evr.c | 18 ++++++------ dlls/mf/main.c | 57 ++++++++++++-------------------------- dlls/mf/mf_private.h | 3 +- dlls/mf/samplegrabber.c | 17 +++++------- dlls/mf/sar.c | 11 ++++---- dlls/mf/session.c | 61 ++++++++++++++++++++--------------------- dlls/mf/topology.c | 32 ++++++++------------- 9 files changed, 93 insertions(+), 138 deletions(-) diff --git a/dlls/mf/clock.c b/dlls/mf/clock.c index a9ca9b4528b..4a3ad7ec7c1 100644 --- a/dlls/mf/clock.c +++ b/dlls/mf/clock.c @@ -19,7 +19,6 @@ #define COBJMACROS #include "wine/debug.h" -#include "wine/heap.h" #include "wine/list.h" #include "mf_private.h" @@ -174,7 +173,7 @@ static ULONG WINAPI sink_notification_Release(IUnknown *iface) if (!refcount) { IMFClockStateSink_Release(notification->sink); - heap_free(notification); + free(notification); } return refcount; @@ -194,8 +193,7 @@ static void clock_notify_async_sink(struct presentation_clock *clock, MFTIME sys IMFAsyncResult *result; HRESULT hr; - object = heap_alloc(sizeof(*object)); - if (!object) + if (!(object = malloc(sizeof(*object)))) return; object->IUnknown_iface.lpVtbl = &sinknotificationvtbl; @@ -279,7 +277,7 @@ static ULONG WINAPI present_clock_Release(IMFPresentationClock *iface) { list_remove(&sink->entry); IMFClockStateSink_Release(sink->state_sink); - heap_free(sink); + free(sink); } LIST_FOR_EACH_ENTRY_SAFE(timer, timer2, &clock->timers, struct clock_timer, entry) { @@ -287,7 +285,7 @@ static ULONG WINAPI present_clock_Release(IMFPresentationClock *iface) IUnknown_Release(&timer->IUnknown_iface); } DeleteCriticalSection(&clock->cs); - heap_free(clock); + free(clock); } return refcount; @@ -456,8 +454,7 @@ static HRESULT WINAPI present_clock_AddClockStateSink(IMFPresentationClock *ifac if (!state_sink) return E_INVALIDARG; - sink = heap_alloc(sizeof(*sink)); - if (!sink) + if (!(sink = malloc(sizeof(*sink)))) return E_OUTOFMEMORY; sink->state_sink = state_sink; @@ -496,7 +493,7 @@ static HRESULT WINAPI present_clock_AddClockStateSink(IMFPresentationClock *ifac if (FAILED(hr)) { IMFClockStateSink_Release(sink->state_sink); - heap_free(sink); + free(sink); } return hr; @@ -520,7 +517,7 @@ static HRESULT WINAPI present_clock_RemoveClockStateSink(IMFPresentationClock *i { IMFClockStateSink_Release(sink->state_sink); list_remove(&sink->entry); - heap_free(sink); + free(sink); break; } } @@ -868,7 +865,7 @@ static ULONG WINAPI clock_timer_Release(IUnknown *iface) { IMFAsyncResult_Release(timer->result); IMFAsyncCallback_Release(timer->callback); - heap_free(timer); + free(timer); } return refcount; @@ -890,12 +887,12 @@ static HRESULT WINAPI present_clock_timer_SetTimer(IMFTimer *iface, DWORD flags, TRACE("%p, %#x, %s, %p, %p, %p.\n", iface, flags, debugstr_time(time), callback, state, cancel_key); - if (!(clock_timer = heap_alloc_zero(sizeof(*clock_timer)))) + if (!(clock_timer = calloc(1, sizeof(*clock_timer)))) return E_OUTOFMEMORY; if (FAILED(hr = MFCreateAsyncResult(NULL, NULL, state, &clock_timer->result))) { - heap_free(clock_timer); + free(clock_timer); return hr; } @@ -1140,8 +1137,7 @@ HRESULT WINAPI MFCreatePresentationClock(IMFPresentationClock **clock) TRACE("%p.\n", clock); - object = heap_alloc_zero(sizeof(*object)); - if (!object) + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; object->IMFPresentationClock_iface.lpVtbl = &presentationclockvtbl; diff --git a/dlls/mf/copier.c b/dlls/mf/copier.c index 1a07d6abefd..b05ae3383ab 100644 --- a/dlls/mf/copier.c +++ b/dlls/mf/copier.c @@ -23,7 +23,6 @@ #include "mf_private.h" #include "wine/debug.h" -#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(mfplat); @@ -92,7 +91,7 @@ static ULONG WINAPI sample_copier_transform_Release(IMFTransform *iface) if (transform->buffer_type) IMFMediaType_Release(transform->buffer_type); DeleteCriticalSection(&transform->cs); - heap_free(transform); + free(transform); } return refcount; @@ -576,8 +575,7 @@ HRESULT WINAPI MFCreateSampleCopierMFT(IMFTransform **transform) TRACE("%p.\n", transform); - object = heap_alloc_zero(sizeof(*object)); - if (!object) + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; object->IMFTransform_iface.lpVtbl = &sample_copier_transform_vtbl; diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index 6a4332965b6..d048ea59681 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -286,7 +286,7 @@ static ULONG WINAPI video_stream_sink_Release(IMFStreamSink *iface) if (stream->allocator) IMFVideoSampleAllocator_Release(stream->allocator); DeleteCriticalSection(&stream->cs); - heap_free(stream); + free(stream); } return refcount; @@ -1053,7 +1053,7 @@ static HRESULT video_renderer_stream_create(struct video_renderer *renderer, uns unsigned int value; HRESULT hr; - if (!(stream = heap_alloc_zero(sizeof(*stream)))) + if (!(stream = calloc(1, sizeof(*stream)))) return E_OUTOFMEMORY; stream->IMFStreamSink_iface.lpVtbl = &video_stream_sink_vtbl; @@ -1179,7 +1179,7 @@ static ULONG WINAPI video_renderer_sink_Release(IMFMediaSink *iface) if (renderer->attributes) IMFAttributes_Release(renderer->attributes); DeleteCriticalSection(&renderer->cs); - heap_free(renderer); + free(renderer); } return refcount; @@ -1456,7 +1456,7 @@ static HRESULT WINAPI video_renderer_sink_Shutdown(IMFMediaSink *iface) IMFMediaSink_Release(iface); renderer->streams[i] = NULL; } - heap_free(renderer->streams); + free(renderer->streams); renderer->stream_count = 0; renderer->stream_size = 0; IMFMediaEventQueue_Shutdown(renderer->event_queue); @@ -1637,8 +1637,8 @@ static HRESULT video_renderer_configure_mixer(struct video_renderer *renderer) /* Create stream sinks for inputs that mixer already has by default. */ if (SUCCEEDED(IMFTransform_GetStreamCount(renderer->mixer, &input_count, &output_count))) { - ids = heap_calloc(input_count, sizeof(*ids)); - oids = heap_calloc(output_count, sizeof(*oids)); + ids = calloc(input_count, sizeof(*ids)); + oids = calloc(output_count, sizeof(*oids)); if (ids && oids) { @@ -1652,8 +1652,8 @@ static HRESULT video_renderer_configure_mixer(struct video_renderer *renderer) } - heap_free(ids); - heap_free(oids); + free(ids); + free(oids); } } @@ -2766,7 +2766,7 @@ static HRESULT evr_create_object(IMFAttributes *attributes, void *user_context, TRACE("%p, %p, %p.\n", attributes, user_context, obj); - if (!(object = heap_alloc_zero(sizeof(*object)))) + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; object->IMFMediaSink_iface.lpVtbl = &video_renderer_sink_vtbl; diff --git a/dlls/mf/main.c b/dlls/mf/main.c index 236bc45c9ec..acbb8377e52 100644 --- a/dlls/mf/main.c +++ b/dlls/mf/main.c @@ -29,7 +29,6 @@ #include "mf_private.h" #include "wine/debug.h" -#include "wine/heap.h" #include "wine/list.h" WINE_DEFAULT_DEBUG_CHANNEL(mfplat); @@ -93,7 +92,7 @@ static ULONG WINAPI activate_object_Release(IMFActivate *iface) if (activate->object) IUnknown_Release(activate->object); IMFAttributes_Release(activate->attributes); - heap_free(activate); + free(activate); } return refcount; @@ -461,15 +460,14 @@ HRESULT create_activation_object(void *context, const struct activate_funcs *fun struct activate_object *object; HRESULT hr; - object = heap_alloc_zero(sizeof(*object)); - if (!object) + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; object->IMFActivate_iface.lpVtbl = &activate_object_vtbl; object->refcount = 1; if (FAILED(hr = MFCreateAttributes(&object->attributes, 0))) { - heap_free(object); + free(object); return hr; } object->funcs = funcs; @@ -620,12 +618,12 @@ static ULONG WINAPI file_scheme_handler_Release(IMFSchemeHandler *iface) IMFAsyncResult_Release(result->result); if (result->object) IUnknown_Release(result->object); - heap_free(result); + free(result); } DeleteCriticalSection(&handler->cs); if (handler->resolver) IMFSourceResolver_Release(handler->resolver); - heap_free(handler); + free(handler); } return refcount; @@ -683,8 +681,8 @@ static ULONG WINAPI create_object_context_Release(IUnknown *iface) { if (context->props) IPropertyStore_Release(context->props); - heap_free(context->url); - heap_free(context); + free(context->url); + free(context); } return refcount; @@ -697,23 +695,6 @@ static const IUnknownVtbl create_object_context_vtbl = create_object_context_Release, }; -static WCHAR *heap_strdupW(const WCHAR *str) -{ - WCHAR *ret = NULL; - - if (str) - { - unsigned int size; - - size = (lstrlenW(str) + 1) * sizeof(WCHAR); - ret = heap_alloc(size); - if (ret) - memcpy(ret, str, size); - } - - return ret; -} - static HRESULT WINAPI file_scheme_handler_BeginCreateObject(IMFSchemeHandler *iface, const WCHAR *url, DWORD flags, IPropertyStore *props, IUnknown **cancel_cookie, IMFAsyncCallback *callback, IUnknown *state) { @@ -730,8 +711,7 @@ static HRESULT WINAPI file_scheme_handler_BeginCreateObject(IMFSchemeHandler *if if (FAILED(hr = MFCreateAsyncResult(NULL, callback, state, &caller))) return hr; - context = heap_alloc(sizeof(*context)); - if (!context) + if (!(context = malloc(sizeof(*context)))) { IMFAsyncResult_Release(caller); return E_OUTOFMEMORY; @@ -743,7 +723,7 @@ static HRESULT WINAPI file_scheme_handler_BeginCreateObject(IMFSchemeHandler *if if (context->props) IPropertyStore_AddRef(context->props); context->flags = flags; - context->url = heap_strdupW(url); + context->url = wcsdup(url); if (!context->url) { IMFAsyncResult_Release(caller); @@ -800,7 +780,7 @@ static HRESULT WINAPI file_scheme_handler_EndCreateObject(IMFSchemeHandler *ifac *object = found->object; hr = IMFAsyncResult_GetStatus(found->result); IMFAsyncResult_Release(found->result); - heap_free(found); + free(found); } else { @@ -838,7 +818,7 @@ static HRESULT WINAPI file_scheme_handler_CancelObjectCreation(IMFSchemeHandler IMFAsyncResult_Release(found->result); if (found->object) IUnknown_Release(found->object); - heap_free(found); + free(found); } return found ? S_OK : MF_E_UNEXPECTED; @@ -957,7 +937,7 @@ static HRESULT WINAPI file_scheme_handler_callback_Invoke(IMFAsyncCallback *ifac } } - handler_result = heap_alloc(sizeof(*handler_result)); + handler_result = malloc(sizeof(*handler_result)); if (handler_result) { handler_result->result = caller; @@ -1000,8 +980,7 @@ static HRESULT file_scheme_handler_construct(REFIID riid, void **obj) TRACE("%s, %p.\n", debugstr_guid(riid), obj); - handler = heap_alloc_zero(sizeof(*handler)); - if (!handler) + if (!(handler = calloc(1, sizeof(*handler)))) return E_OUTOFMEMORY; handler->IMFSchemeHandler_iface.lpVtbl = &file_scheme_handler_vtbl; @@ -1098,8 +1077,7 @@ static HRESULT mf_get_handler_strings(const WCHAR *path, WCHAR filter, unsigned int i, index; WCHAR *buffW; - buffW = heap_calloc(maxlen, sizeof(*buffW)); - if (!buffW) + if (!(buffW = calloc(maxlen, sizeof(*buffW)))) return E_OUTOFMEMORY; memset(dst, 0, sizeof(*dst)); @@ -1135,7 +1113,7 @@ static HRESULT mf_get_handler_strings(const WCHAR *path, WCHAR filter, unsigned if (FAILED(hr)) PropVariantClear(dst); - heap_free(buffW); + free(buffW); return hr; } @@ -1276,7 +1254,7 @@ static ULONG WINAPI simple_type_handler_Release(IMFMediaTypeHandler *iface) if (handler->media_type) IMFMediaType_Release(handler->media_type); DeleteCriticalSection(&handler->cs); - heap_free(handler); + free(handler); } return refcount; @@ -1410,8 +1388,7 @@ HRESULT WINAPI MFCreateSimpleTypeHandler(IMFMediaTypeHandler **handler) TRACE("%p.\n", handler); - object = heap_alloc_zero(sizeof(*object)); - if (!object) + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; object->IMFMediaTypeHandler_iface.lpVtbl = &simple_type_handler_vtbl; diff --git a/dlls/mf/mf_private.h b/dlls/mf/mf_private.h index cc270a8cf57..2f81eaa13b0 100644 --- a/dlls/mf/mf_private.h +++ b/dlls/mf/mf_private.h @@ -20,7 +20,6 @@ #include "mfidl.h" #include "mfapi.h" -#include "wine/heap.h" #include "wine/debug.h" static inline BOOL mf_array_reserve(void **elements, size_t *capacity, size_t count, size_t size) @@ -41,7 +40,7 @@ static inline BOOL mf_array_reserve(void **elements, size_t *capacity, size_t co if (new_capacity < count) new_capacity = max_capacity; - if (!(new_elements = heap_realloc(*elements, new_capacity * size))) + if (!(new_elements = realloc(*elements, new_capacity * size))) return FALSE; *elements = new_elements; diff --git a/dlls/mf/samplegrabber.c b/dlls/mf/samplegrabber.c index 4a0be291015..e0287e1e1db 100644 --- a/dlls/mf/samplegrabber.c +++ b/dlls/mf/samplegrabber.c @@ -24,7 +24,6 @@ #include "mf_private.h" #include "wine/debug.h" -#include "wine/heap.h" #include "wine/list.h" WINE_DEFAULT_DEBUG_CHANNEL(mfplat); @@ -105,7 +104,7 @@ static void sample_grabber_free_private(void *user_context) struct sample_grabber_activate_context *context = user_context; IMFMediaType_Release(context->media_type); IMFSampleGrabberSinkCallback_Release(context->callback); - heap_free(context); + free(context); } static struct sample_grabber *impl_from_IMFMediaSink(IMFMediaSink *iface) @@ -194,7 +193,7 @@ static void stream_release_pending_item(struct scheduled_item *item) PropVariantClear(&item->u.marker.context); break; } - heap_free(item); + free(item); } static ULONG WINAPI sample_grabber_stream_Release(IMFStreamSink *iface) @@ -386,7 +385,7 @@ static HRESULT stream_queue_sample(struct sample_grabber *grabber, IMFSample *sa if (FAILED(hr = IMFSample_GetSampleTime(sample, &sampletime))) return hr; - if (!(item = heap_alloc_zero(sizeof(*item)))) + if (!(item = calloc(1, sizeof(*item)))) return E_OUTOFMEMORY; item->type = ITEM_TYPE_SAMPLE; @@ -467,7 +466,7 @@ static HRESULT stream_place_marker(struct sample_grabber *grabber, MFSTREAMSINK_ return S_OK; } - if (!(item = heap_alloc_zero(sizeof(*item)))) + if (!(item = calloc(1, sizeof(*item)))) return E_OUTOFMEMORY; item->type = ITEM_TYPE_MARKER; @@ -866,7 +865,7 @@ static ULONG WINAPI sample_grabber_sink_Release(IMFMediaSink *iface) IMFAttributes_Release(grabber->sample_attributes); sample_grabber_release_pending_items(grabber); DeleteCriticalSection(&grabber->cs); - heap_free(grabber); + free(grabber); } return refcount; @@ -1401,8 +1400,7 @@ static HRESULT sample_grabber_create_object(IMFAttributes *attributes, void *use if (FAILED(IMFMediaType_GetMajorType(context->media_type, &guid))) return MF_E_INVALIDMEDIATYPE; - object = heap_alloc_zero(sizeof(*object)); - if (!object) + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; object->IMFMediaSink_iface.lpVtbl = &sample_grabber_sink_vtbl; @@ -1478,8 +1476,7 @@ HRESULT WINAPI MFCreateSampleGrabberSinkActivate(IMFMediaType *media_type, IMFSa if (!media_type || !callback || !activate) return E_POINTER; - context = heap_alloc_zero(sizeof(*context)); - if (!context) + if (!(context = calloc(1, sizeof(*context)))) return E_OUTOFMEMORY; context->media_type = media_type; diff --git a/dlls/mf/sar.c b/dlls/mf/sar.c index 9030b3a81c0..77cbfcb21da 100644 --- a/dlls/mf/sar.c +++ b/dlls/mf/sar.c @@ -26,7 +26,6 @@ #include "audioclient.h" #include "wine/debug.h" -#include "wine/heap.h" #include "wine/list.h" WINE_DEFAULT_DEBUG_CHANNEL(mfplat); @@ -121,7 +120,7 @@ static void release_pending_object(struct queued_object *object) PropVariantClear(&object->u.marker.context); break; } - heap_free(object); + free(object); } static struct audio_renderer *impl_from_IMFMediaSink(IMFMediaSink *iface) @@ -279,7 +278,7 @@ static ULONG WINAPI audio_renderer_sink_Release(IMFMediaSink *iface) audio_renderer_release_audio_client(renderer); CloseHandle(renderer->buffer_ready_event); DeleteCriticalSection(&renderer->cs); - heap_free(renderer); + free(renderer); } return refcount; @@ -1332,7 +1331,7 @@ static HRESULT stream_queue_sample(struct audio_renderer *renderer, IMFSample *s { struct queued_object *object; - if (!(object = heap_alloc_zero(sizeof(*object)))) + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; object->type = OBJECT_TYPE_SAMPLE; @@ -1372,7 +1371,7 @@ static HRESULT stream_place_marker(struct audio_renderer *renderer, MFSTREAMSINK struct queued_object *marker; HRESULT hr = S_OK; - if (!(marker = heap_alloc_zero(sizeof(*marker)))) + if (!(marker = calloc(1, sizeof(*marker)))) return E_OUTOFMEMORY; marker->type = OBJECT_TYPE_MARKER; @@ -1843,7 +1842,7 @@ static HRESULT sar_create_object(IMFAttributes *attributes, void *user_context, TRACE("%p, %p, %p.\n", attributes, user_context, obj); - if (!(renderer = heap_alloc_zero(sizeof(*renderer)))) + if (!(renderer = calloc(1, sizeof(*renderer)))) return E_OUTOFMEMORY; renderer->IMFMediaSink_iface.lpVtbl = &audio_renderer_sink_vtbl; diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 24aae77ac3a..8d9325abc53 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -28,7 +28,6 @@ #include "evr.h" #include "wine/debug.h" -#include "wine/heap.h" #include "wine/list.h" #include "mf_private.h" @@ -431,7 +430,7 @@ static ULONG WINAPI session_op_Release(IUnknown *iface) default: ; } - heap_free(op); + free(op); } return refcount; @@ -448,7 +447,7 @@ static HRESULT create_session_op(enum session_command command, struct session_op { struct session_op *op; - if (!(op = heap_alloc_zero(sizeof(*op)))) + if (!(op = calloc(1, sizeof(*op)))) return E_OUTOFMEMORY; op->IUnknown_iface.lpVtbl = &session_op_vtbl; @@ -511,7 +510,7 @@ static void session_clear_topologies(struct media_session *session) { list_remove(&ptr->entry); IMFTopology_Release(ptr->topology); - heap_free(ptr); + free(ptr); } } @@ -640,7 +639,7 @@ static void transform_release_sample(struct sample *sample) list_remove(&sample->entry); if (sample->sample) IMFSample_Release(sample->sample); - heap_free(sample); + free(sample); } static void transform_stream_drop_samples(struct transform_stream *stream) @@ -666,10 +665,10 @@ static void release_topo_node(struct topo_node *node) transform_stream_drop_samples(&node->u.transform.inputs[i]); for (i = 0; i < node->u.transform.output_count; ++i) transform_stream_drop_samples(&node->u.transform.outputs[i]); - heap_free(node->u.transform.inputs); - heap_free(node->u.transform.outputs); - heap_free(node->u.transform.input_map); - heap_free(node->u.transform.output_map); + free(node->u.transform.inputs); + free(node->u.transform.outputs); + free(node->u.transform.input_map); + free(node->u.transform.output_map); break; case MF_TOPOLOGY_OUTPUT_NODE: if (node->u.sink.allocator) @@ -688,7 +687,7 @@ static void release_topo_node(struct topo_node *node) IUnknown_Release(node->object.object); if (node->node) IMFTopologyNode_Release(node->node); - heap_free(node); + free(node); } static void session_shutdown_current_topology(struct media_session *session) @@ -771,7 +770,7 @@ static void session_clear_presentation(struct media_session *session) IMFMediaSource_Release(source->source); if (source->pd) IMFPresentationDescriptor_Release(source->pd); - heap_free(source); + free(source); } LIST_FOR_EACH_ENTRY_SAFE(node, node2, &session->presentation.nodes, struct topo_node, entry) @@ -790,7 +789,7 @@ static void session_clear_presentation(struct media_session *session) IMFMediaSinkPreroll_Release(sink->preroll); if (sink->event_generator) IMFMediaEventGenerator_Release(sink->event_generator); - heap_free(sink); + free(sink); } } @@ -1078,7 +1077,7 @@ static void session_release_media_source(struct media_source *source) IMFMediaSource_Release(source->source); if (source->pd) IMFPresentationDescriptor_Release(source->pd); - heap_free(source); + free(source); } static HRESULT session_add_media_source(struct media_session *session, IMFTopologyNode *node, IMFMediaSource *source) @@ -1089,7 +1088,7 @@ static HRESULT session_add_media_source(struct media_session *session, IMFTopolo if (session_get_media_source(session, source)) return S_FALSE; - if (!(media_source = heap_alloc_zero(sizeof(*media_source)))) + if (!(media_source = calloc(1, sizeof(*media_source)))) return E_OUTOFMEMORY; media_source->source = source; @@ -1150,7 +1149,7 @@ static HRESULT session_add_media_sink(struct media_session *session, IMFTopology return S_FALSE; } - if (!(media_sink = heap_alloc_zero(sizeof(*media_sink)))) + if (!(media_sink = calloc(1, sizeof(*media_sink)))) return E_OUTOFMEMORY; media_sink->sink = sink; @@ -1188,14 +1187,14 @@ static HRESULT session_set_transform_stream_info(struct topo_node *node) hr = IMFTransform_GetStreamCount(node->object.transform, &input_count, &output_count); if (SUCCEEDED(hr) && (input_count > 1 || output_count > 1)) { - input_map = heap_calloc(input_count, sizeof(*input_map)); - output_map = heap_calloc(output_count, sizeof(*output_map)); + input_map = calloc(input_count, sizeof(*input_map)); + output_map = calloc(output_count, sizeof(*output_map)); if (FAILED(IMFTransform_GetStreamIDs(node->object.transform, input_count, input_map, output_count, output_map))) { /* Assume sequential identifiers. */ - heap_free(input_map); - heap_free(output_map); + free(input_map); + free(output_map); input_map = output_map = NULL; } } @@ -1205,13 +1204,13 @@ static HRESULT session_set_transform_stream_info(struct topo_node *node) node->u.transform.input_map = input_map; node->u.transform.output_map = output_map; - streams = heap_calloc(input_count, sizeof(*streams)); + streams = calloc(input_count, sizeof(*streams)); for (i = 0; i < input_count; ++i) list_init(&streams[i].samples); node->u.transform.inputs = streams; node->u.transform.input_count = input_count; - streams = heap_calloc(output_count, sizeof(*streams)); + streams = calloc(output_count, sizeof(*streams)); for (i = 0; i < output_count; ++i) { list_init(&streams[i].samples); @@ -1306,7 +1305,7 @@ static HRESULT session_append_node(struct media_session *session, IMFTopologyNod IMFStreamDescriptor *sd; HRESULT hr = S_OK; - if (!(topo_node = heap_alloc_zero(sizeof(*topo_node)))) + if (!(topo_node = calloc(1, sizeof(*topo_node)))) return E_OUTOFMEMORY; IMFTopologyNode_GetNodeType(node, &topo_node->type); @@ -1573,7 +1572,7 @@ static void session_set_topology(struct media_session *session, DWORD flags, IMF { struct queued_topology *queued_topology; - if ((queued_topology = heap_alloc_zero(sizeof(*queued_topology)))) + if ((queued_topology = calloc(1, sizeof(*queued_topology)))) { queued_topology->topology = topology; IMFTopology_AddRef(queued_topology->topology); @@ -1655,7 +1654,7 @@ static ULONG WINAPI mfsession_Release(IMFMediaSession *iface) if (session->quality_manager) IMFQualityManager_Release(session->quality_manager); DeleteCriticalSection(&session->cs); - heap_free(session); + free(session); } return refcount; @@ -2596,7 +2595,7 @@ static void session_set_sink_stream_state(struct media_session *session, IMFStre static struct sample *transform_create_sample(IMFSample *sample) { - struct sample *sample_entry = heap_alloc_zero(sizeof(*sample_entry)); + struct sample *sample_entry = calloc(1, sizeof(*sample_entry)); if (sample_entry) { @@ -2660,7 +2659,7 @@ static HRESULT transform_node_pull_samples(const struct media_session *session, unsigned int i; HRESULT hr = E_UNEXPECTED; - if (!(buffers = heap_calloc(node->u.transform.output_count, sizeof(*buffers)))) + if (!(buffers = calloc(node->u.transform.output_count, sizeof(*buffers)))) return E_OUTOFMEMORY; for (i = 0; i < node->u.transform.output_count; ++i) @@ -2703,7 +2702,7 @@ static HRESULT transform_node_pull_samples(const struct media_session *session, IMFSample_Release(buffers[i].pSample); } - heap_free(buffers); + free(buffers); return hr; } @@ -3611,8 +3610,7 @@ HRESULT WINAPI MFCreateMediaSession(IMFAttributes *config, IMFMediaSession **ses TRACE("%p, %p.\n", config, session); - object = heap_alloc_zero(sizeof(*object)); - if (!object) + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; object->IMFMediaSession_iface.lpVtbl = &mfmediasessionvtbl; @@ -3749,7 +3747,7 @@ static ULONG WINAPI standard_quality_manager_Release(IMFQualityManager *iface) if (manager->topology) IMFTopology_Release(manager->topology); DeleteCriticalSection(&manager->cs); - heap_free(manager); + free(manager); } return refcount; @@ -3941,8 +3939,7 @@ HRESULT WINAPI MFCreateStandardQualityManager(IMFQualityManager **manager) TRACE("%p.\n", manager); - object = heap_alloc_zero(sizeof(*object)); - if (!object) + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; object->IMFQualityManager_iface.lpVtbl = &standard_quality_manager_vtbl; diff --git a/dlls/mf/topology.c b/dlls/mf/topology.c index a054eca27e1..f97c0cc75d3 100644 --- a/dlls/mf/topology.c +++ b/dlls/mf/topology.c @@ -256,7 +256,7 @@ static void topology_clear(struct topology *topology) topology_node_disconnect(topology->nodes.nodes[i]); IMFTopologyNode_Release(&topology->nodes.nodes[i]->IMFTopologyNode_iface); } - heap_free(topology->nodes.nodes); + free(topology->nodes.nodes); topology->nodes.nodes = NULL; topology->nodes.count = 0; topology->nodes.size = 0; @@ -274,7 +274,7 @@ static ULONG WINAPI topology_Release(IMFTopology *iface) if (topology->attributes) IMFAttributes_Release(topology->attributes); topology_clear(topology); - heap_free(topology); + free(topology); } return refcount; @@ -885,8 +885,7 @@ HRESULT WINAPI MFCreateTopology(IMFTopology **topology) if (!topology) return E_POINTER; - object = heap_alloc_zero(sizeof(*object)); - if (!object) + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; object->IMFTopology_iface.lpVtbl = &topologyvtbl; @@ -961,11 +960,11 @@ static ULONG WINAPI topology_node_Release(IMFTopologyNode *iface) if (node->outputs.streams[i].preferred_type) IMFMediaType_Release(node->outputs.streams[i].preferred_type); } - heap_free(node->inputs.streams); - heap_free(node->outputs.streams); + free(node->inputs.streams); + free(node->outputs.streams); IMFAttributes_Release(node->attributes); DeleteCriticalSection(&node->cs); - heap_free(node); + free(node); } return refcount; @@ -1767,8 +1766,7 @@ static HRESULT create_topology_node(MF_TOPOLOGY_TYPE node_type, struct topology_ { HRESULT hr; - *node = heap_alloc_zero(sizeof(**node)); - if (!*node) + if (!(*node = calloc(1, sizeof(**node)))) return E_OUTOFMEMORY; (*node)->IMFTopologyNode_iface.lpVtbl = &topologynodevtbl; @@ -1777,7 +1775,7 @@ static HRESULT create_topology_node(MF_TOPOLOGY_TYPE node_type, struct topology_ hr = MFCreateAttributes(&(*node)->attributes, 0); if (FAILED(hr)) { - heap_free(*node); + free(*node); return hr; } (*node)->id = ((TOPOID)GetCurrentProcessId() << 32) | InterlockedIncrement(&next_node_id); @@ -1931,9 +1929,7 @@ static ULONG WINAPI topology_loader_Release(IMFTopoLoader *iface) TRACE("%p, refcount %u.\n", iface, refcount); if (!refcount) - { - heap_free(loader); - } + free(loader); return refcount; } @@ -2692,8 +2688,7 @@ HRESULT WINAPI MFCreateTopoLoader(IMFTopoLoader **loader) if (!loader) return E_POINTER; - object = heap_alloc(sizeof(*object)); - if (!object) + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; object->IMFTopoLoader_iface.lpVtbl = &topologyloadervtbl; @@ -2751,9 +2746,7 @@ static ULONG WINAPI seq_source_Release(IMFSequencerSource *iface) TRACE("%p, refcount %u.\n", iface, refcount); if (!refcount) - { - heap_free(seq_source); - } + free(seq_source); return refcount; } @@ -2855,8 +2848,7 @@ HRESULT WINAPI MFCreateSequencerSource(IUnknown *reserved, IMFSequencerSource ** if (!seq_source) return E_POINTER; - object = heap_alloc(sizeof(*object)); - if (!object) + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; object->IMFSequencerSource_iface.lpVtbl = &seqsourcevtbl; -- 2.30.2

1 0

[PATCH 1/6] hidclass.sys: Simplify signed / unsigned item value parsing.
by Rémi Bernon June 17, 2021

June 17, 2021

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/hidclass.sys/descriptor.c | 109 ++++++++++++++------------------- 1 file changed, 46 insertions(+), 63 deletions(-) diff --git a/dlls/hidclass.sys/descriptor.c b/dlls/hidclass.sys/descriptor.c index 65c2f9aadae..cf0e8436b91 100644 --- a/dlls/hidclass.sys/descriptor.c +++ b/dlls/hidclass.sys/descriptor.c @@ -256,29 +256,6 @@ static void debug_print_preparsed(WINE_HIDP_PREPARSED_DATA *data) } } -static int getValue(int bsize, int source, BOOL allow_negative) -{ - int mask = 0xff; - int negative = 0x80; - int outofrange = 0x100; - int value; - unsigned int i; - - if (bsize == 4) - return source; - - for (i = 1; i < bsize; i++) - { - mask = (mask<<8) + 0xff; - negative = (negative<<8); - outofrange = (outofrange<<8); - } - value = (source&mask); - if (allow_negative && value&negative) - value = -1 * (outofrange - value); - return value; -} - static void parse_io_feature(unsigned int bSize, int itemVal, int bTag, unsigned int *feature_index, struct feature *feature) @@ -342,17 +319,35 @@ static int parse_descriptor(BYTE *descriptor, unsigned int index, unsigned int l int usages_top = 0; USAGE usages[256]; int i; + UINT32 value; + INT32 signed_value; for (i = index; i < length;) { BYTE b0 = descriptor[i++]; - int bSize = b0 & 0x03; + int size = b0 & 0x03; int bType = (b0 >> 2) & 0x03; int bTag = (b0 >> 4) & 0x0F; - bSize = (bSize == 3) ? 4 : bSize; - if (bType == TAG_TYPE_RESERVED && bTag == 0x0F && bSize == 2 && - i + 2 < length) + if (size == 3) size = 4; + if (length - i < size) + { + ERR("Need %d bytes to read item value\n", size); + return -1; + } + + if (size == 0) signed_value = value = 0; + else if (size == 1) signed_value = (INT8)(value = *(UINT8 *)(descriptor + i)); + else if (size == 2) signed_value = (INT16)(value = *(UINT16 *)(descriptor + i)); + else if (size == 4) signed_value = (INT32)(value = *(UINT32 *)(descriptor + i)); + else + { + ERR("Unexpected item value size %d.\n", size); + return -1; + } + i += size; + + if (bType == TAG_TYPE_RESERVED && bTag == 0x0F && size == 2) { /* Long data items: Should be unused */ ERR("Long Data Item, should be unused\n"); @@ -360,19 +355,9 @@ static int parse_descriptor(BYTE *descriptor, unsigned int index, unsigned int l } else { - int bSizeActual = 0; - int itemVal = 0; unsigned int j; - for (j = 0; j < bSize; j++) - { - if (i + j < length) - { - itemVal += descriptor[i + j] << (8 * j); - bSizeActual++; - } - } - TRACE(" 0x%x[%i], type %i , tag %i, size %i, val %i\n",b0,i-1,bType, bTag, bSize, itemVal ); + TRACE(" 0x%x[%i], type %i , tag %i, size %i, val %i\n",b0,i-size-1,bType, bTag, size, value ); if (bType == TAG_TYPE_MAIN) { @@ -392,7 +377,7 @@ static int parse_descriptor(BYTE *descriptor, unsigned int index, unsigned int l feature->type = HidP_Output; else feature->type = HidP_Feature; - parse_io_feature(bSize, itemVal, bTag, feature_index, feature); + parse_io_feature(size, value, bTag, feature_index, feature); if (j < usages_top) caps->NotRange.Usage = usages[j]; feature->caps = *caps; @@ -429,9 +414,9 @@ static int parse_descriptor(BYTE *descriptor, unsigned int index, unsigned int l list_init(&subcollection->collections); new_caps(caps); - parse_collection(bSize, itemVal, subcollection); + parse_collection(size, value, subcollection); - if ((i = parse_descriptor(descriptor, i+1, length, feature_index, collection_index, subcollection, caps, stack)) < 0) return i; + if ((i = parse_descriptor(descriptor, i, length, feature_index, collection_index, subcollection, caps, stack)) < 0) return i; continue; } case TAG_MAIN_END_COLLECTION: @@ -446,34 +431,34 @@ static int parse_descriptor(BYTE *descriptor, unsigned int index, unsigned int l switch(bTag) { case TAG_GLOBAL_USAGE_PAGE: - caps->UsagePage = getValue(bSize, itemVal, FALSE); + caps->UsagePage = value; break; case TAG_GLOBAL_LOGICAL_MINIMUM: - caps->LogicalMin = getValue(bSize, itemVal, TRUE); + caps->LogicalMin = signed_value; break; case TAG_GLOBAL_LOGICAL_MAXIMUM: - caps->LogicalMax = getValue(bSize, itemVal, TRUE); + caps->LogicalMax = signed_value; break; case TAG_GLOBAL_PHYSICAL_MINIMUM: - caps->PhysicalMin = getValue(bSize, itemVal, TRUE); + caps->PhysicalMin = signed_value; break; case TAG_GLOBAL_PHYSICAL_MAXIMUM: - caps->PhysicalMax = getValue(bSize, itemVal, TRUE); + caps->PhysicalMax = signed_value; break; case TAG_GLOBAL_UNIT_EXPONENT: - caps->UnitsExp = getValue(bSize, itemVal, TRUE); + caps->UnitsExp = signed_value; break; case TAG_GLOBAL_UNIT: - caps->Units = getValue(bSize, itemVal, TRUE); + caps->Units = signed_value; break; case TAG_GLOBAL_REPORT_SIZE: - caps->BitSize = getValue(bSize, itemVal, FALSE); + caps->BitSize = value; break; case TAG_GLOBAL_REPORT_ID: - caps->ReportID = getValue(bSize, itemVal, FALSE); + caps->ReportID = value; break; case TAG_GLOBAL_REPORT_COUNT: - caps->ReportCount = getValue(bSize, itemVal, FALSE); + caps->ReportCount = value; break; case TAG_GLOBAL_PUSH: { @@ -521,44 +506,44 @@ static int parse_descriptor(BYTE *descriptor, unsigned int index, unsigned int l } else { - usages[usages_top++] = getValue(bSize, itemVal, FALSE); + usages[usages_top++] = value; caps->IsRange = FALSE; } break; case TAG_LOCAL_USAGE_MINIMUM: - caps->Range.UsageMin = getValue(bSize, itemVal, FALSE); + caps->Range.UsageMin = value; caps->IsRange = TRUE; break; case TAG_LOCAL_USAGE_MAXIMUM: - caps->Range.UsageMax = getValue(bSize, itemVal, FALSE); + caps->Range.UsageMax = value; caps->IsRange = TRUE; break; case TAG_LOCAL_DESIGNATOR_INDEX: - caps->NotRange.DesignatorIndex = getValue(bSize, itemVal, FALSE); + caps->NotRange.DesignatorIndex = value; caps->IsDesignatorRange = FALSE; break; case TAG_LOCAL_DESIGNATOR_MINIMUM: - caps->Range.DesignatorMin = getValue(bSize, itemVal, FALSE); + caps->Range.DesignatorMin = value; caps->IsDesignatorRange = TRUE; break; case TAG_LOCAL_DESIGNATOR_MAXIMUM: - caps->Range.DesignatorMax = getValue(bSize, itemVal, FALSE); + caps->Range.DesignatorMax = value; caps->IsDesignatorRange = TRUE; break; case TAG_LOCAL_STRING_INDEX: - caps->NotRange.StringIndex = getValue(bSize, itemVal, FALSE); + caps->NotRange.StringIndex = value; caps->IsStringRange = FALSE; break; case TAG_LOCAL_STRING_MINIMUM: - caps->Range.StringMin = getValue(bSize, itemVal, FALSE); + caps->Range.StringMin = value; caps->IsStringRange = TRUE; break; case TAG_LOCAL_STRING_MAXIMUM: - caps->Range.StringMax = getValue(bSize, itemVal, FALSE); + caps->Range.StringMax = value; caps->IsStringRange = TRUE; break; case TAG_LOCAL_DELIMITER: - FIXME("delimiter %d not implemented!\n", itemVal); + FIXME("delimiter %d not implemented!\n", value); return -1; default: ERR("Unknown (bTag: 0x%x, bType: 0x%x)\n", bTag, bType); @@ -570,8 +555,6 @@ static int parse_descriptor(BYTE *descriptor, unsigned int index, unsigned int l ERR("Unknown (bTag: 0x%x, bType: 0x%x)\n", bTag, bType); return -1; } - - i += bSize; } } return i; -- 2.31.0

2 7

[PATCH v6] iphlpapi: Fix the field 'AdapterName' of IP_ADAPTER_INFO returned by GetAdaptersInfo.
by Yeshun Ye June 17, 2021

June 17, 2021

Signed-off-by: Yeshun Ye <yeyeshun(a)uniontech.com> --- dlls/iphlpapi/iphlpapi_main.c | 9 ++++++++- dlls/iphlpapi/tests/iphlpapi.c | 10 ++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 09414d26dde..21edd9ee128 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -706,9 +706,16 @@ DWORD WINAPI GetAdaptersInfo(PIP_ADAPTER_INFO pAdapterInfo, PULONG pOutBufLen) DWORD i; PIP_ADDR_STRING currentIPAddr = &ptr->IpAddressList; BOOL firstIPAddr = TRUE; + NET_LUID luid; + GUID guid; /* on Win98 this is left empty, but whatever */ - getInterfaceNameByIndex(table->indexes[ndx], ptr->AdapterName); + ConvertInterfaceIndexToLuid(table->indexes[ndx], &luid); + ConvertInterfaceLuidToGuid(&luid, &guid); + sprintf(ptr->AdapterName, "{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", + guid.Data1, guid.Data2, guid.Data3, guid.Data4[0], guid.Data4[1], + guid.Data4[2], guid.Data4[3], guid.Data4[4], guid.Data4[5], + guid.Data4[6], guid.Data4[7]); getInterfaceNameByIndex(table->indexes[ndx], ptr->Description); ptr->AddressLength = sizeof(ptr->Address); getInterfacePhysicalByIndex(table->indexes[ndx], diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 358084fde68..b6e62138256 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -1115,6 +1115,9 @@ static void testGetAdaptersInfo(void) ; /* no adapter's, that's okay */ else if (apiReturn == ERROR_BUFFER_OVERFLOW) { PIP_ADAPTER_INFO ptr, buf = HeapAlloc(GetProcessHeap(), 0, len); + NET_LUID luid; + GUID guid; + char AdapterName[ARRAY_SIZE(ptr->AdapterName)]; apiReturn = GetAdaptersInfo(buf, &len); ok(apiReturn == NO_ERROR, @@ -1122,6 +1125,13 @@ static void testGetAdaptersInfo(void) apiReturn); ptr = buf; while (ptr) { + ConvertInterfaceIndexToLuid(ptr->Index, &luid); + ConvertInterfaceLuidToGuid(&luid, &guid); + sprintf(AdapterName, "{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", + guid.Data1, guid.Data2, guid.Data3, guid.Data4[0], guid.Data4[1], + guid.Data4[2], guid.Data4[3], guid.Data4[4], guid.Data4[5], + guid.Data4[6], guid.Data4[7]); + ok(!strcmp(ptr->AdapterName, AdapterName), "expected '%s' got '%s'\n", ptr->AdapterName, AdapterName); ok(ptr->IpAddressList.IpAddress.String[0], "A valid IP address must be present\n"); ok(ptr->IpAddressList.IpMask.String[0], "A valid mask must be present\n"); ok(ptr->GatewayList.IpAddress.String[0], "A valid IP address must be present\n"); -- 2.20.1

2 1

[PATCH v3] winegstreamer: Expose the MF_MT_VIDEO_ROTATION attribute.
by Giovanni Mascellani June 17, 2021

June 17, 2021

The stricter checks imposed by commit ac39b313b618ab8d1613302c3604ba505afff0df, while being valid in general, require that media source attaches to media types the attributes that application can request. This patch exposes the MF_MT_VIDEO_ROTATION attribute, which is for example requested by Legend of Keepers. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- Currently MFVideoRotationFormat_0 is always set, because I couldn't find anyway to query this property in GStreamer. The obvious place for this metadata item would probably be GstVideoInfo, but I cannot see anything related there. Can some GStreamer wizard help? v2: * add test; * reformat enumeration in a way which, I hope, is more correct. v3: * tweak enumeration again. dlls/mfplat/tests/mfplat.c | 7 +++++++ dlls/winegstreamer/mfplat.c | 1 + include/mfapi.h | 8 ++++++++ 3 files changed, 16 insertions(+) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index ff24c2c0ec0..f1c041b7eb4 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -664,6 +664,7 @@ static void test_source_resolver(void) HRESULT hr; GUID guid; float rate; + UINT32 rotation; if (!pMFCreateSourceResolver) { @@ -849,6 +850,12 @@ static void test_source_resolver(void) ok(hr == S_OK, "Failed to get media sub type, hr %#x.\n", hr); todo_wine ok(IsEqualGUID(&guid, &MFVideoFormat_M4S2), "Unexpected sub type %s.\n", debugstr_guid(&guid)); + + hr = IMFMediaType_GetUINT32(media_type, &MF_MT_VIDEO_ROTATION, &rotation); + ok(hr == S_OK || broken(hr == MF_E_ATTRIBUTENOTFOUND) /* Win7 */, "Failed to get rotation, hr %#x.\n", hr); + if (hr == S_OK) + ok(rotation == MFVideoRotationFormat_0, "Got wrong rotation %u.\n", rotation); + IMFMediaType_Release(media_type); hr = IMFPresentationDescriptor_SelectStream(descriptor, 0); diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c index bb632c2cc2c..dfa448afcfe 100644 --- a/dlls/winegstreamer/mfplat.c +++ b/dlls/winegstreamer/mfplat.c @@ -596,6 +596,7 @@ static IMFMediaType *mf_media_type_from_wg_format_video(const struct wg_format * make_uint64(format->u.video.fps_n, format->u.video.fps_d)); IMFMediaType_SetUINT32(type, &MF_MT_COMPRESSED, FALSE); IMFMediaType_SetUINT32(type, &MF_MT_ALL_SAMPLES_INDEPENDENT, TRUE); + IMFMediaType_SetUINT32(type, &MF_MT_VIDEO_ROTATION, MFVideoRotationFormat_0); return type; } diff --git a/include/mfapi.h b/include/mfapi.h index e4a1f6a3dc0..04431648842 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -449,6 +449,14 @@ typedef enum _MFWaveFormatExConvertFlags MFWaveFormatExConvertFlag_ForceExtensible = 1, } MFWaveFormatExConvertFlags; +typedef enum _MFVideoRotationFormat +{ + MFVideoRotationFormat_0 = 0, + MFVideoRotationFormat_90 = 1, + MFVideoRotationFormat_180 = 2, + MFVideoRotationFormat_270 = 3 +} MFVideoRotationFormat; + enum _MFT_ENUM_FLAG { MFT_ENUM_FLAG_SYNCMFT = 0x00000001, -- 2.32.0

1 0

[PATCH v2] winegstreamer: Expose the MF_MT_VIDEO_ROTATION attribute.
by Giovanni Mascellani June 17, 2021

June 17, 2021

The stricter checks imposed by commit ac39b313b618ab8d1613302c3604ba505afff0df, while being valid in general, require that media source attaches to media types the attributes that application can request. This patch exposes the MF_MT_VIDEO_ROTATION attribute, which is for example requested by Legend of Keepers. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- The same attribute is also set by Windows for media sources obtained from the standard source resolver. Currently MFVideoRotationFormat_0 is always set, because I couldn't find anyway to query this property in GStreamer. The obvious place for this metadata item would probably be GstVideoInfo, but I cannot see anything related there. Can some GStreamer wizard help? v2: * add test; * reformat enumeration in a way which, I hope, is more correct. dlls/mfplat/tests/mfplat.c | 7 +++++++ dlls/winegstreamer/mfplat.c | 1 + include/mfapi.h | 7 +++++++ 3 files changed, 15 insertions(+) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index ff24c2c0ec0..f1c041b7eb4 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -664,6 +664,7 @@ static void test_source_resolver(void) HRESULT hr; GUID guid; float rate; + UINT32 rotation; if (!pMFCreateSourceResolver) { @@ -849,6 +850,12 @@ static void test_source_resolver(void) ok(hr == S_OK, "Failed to get media sub type, hr %#x.\n", hr); todo_wine ok(IsEqualGUID(&guid, &MFVideoFormat_M4S2), "Unexpected sub type %s.\n", debugstr_guid(&guid)); + + hr = IMFMediaType_GetUINT32(media_type, &MF_MT_VIDEO_ROTATION, &rotation); + ok(hr == S_OK || broken(hr == MF_E_ATTRIBUTENOTFOUND) /* Win7 */, "Failed to get rotation, hr %#x.\n", hr); + if (hr == S_OK) + ok(rotation == MFVideoRotationFormat_0, "Got wrong rotation %u.\n", rotation); + IMFMediaType_Release(media_type); hr = IMFPresentationDescriptor_SelectStream(descriptor, 0); diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c index bb632c2cc2c..dfa448afcfe 100644 --- a/dlls/winegstreamer/mfplat.c +++ b/dlls/winegstreamer/mfplat.c @@ -596,6 +596,7 @@ static IMFMediaType *mf_media_type_from_wg_format_video(const struct wg_format * make_uint64(format->u.video.fps_n, format->u.video.fps_d)); IMFMediaType_SetUINT32(type, &MF_MT_COMPRESSED, FALSE); IMFMediaType_SetUINT32(type, &MF_MT_ALL_SAMPLES_INDEPENDENT, TRUE); + IMFMediaType_SetUINT32(type, &MF_MT_VIDEO_ROTATION, MFVideoRotationFormat_0); return type; } diff --git a/include/mfapi.h b/include/mfapi.h index e4a1f6a3dc0..28798f734a5 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -449,6 +449,13 @@ typedef enum _MFWaveFormatExConvertFlags MFWaveFormatExConvertFlag_ForceExtensible = 1, } MFWaveFormatExConvertFlags; +typedef enum _MFVideoRotationFormat { + MFVideoRotationFormat_0 = 0, + MFVideoRotationFormat_90 = 1, + MFVideoRotationFormat_180 = 2, + MFVideoRotationFormat_270 = 3 +} MFVideoRotationFormat; + enum _MFT_ENUM_FLAG { MFT_ENUM_FLAG_SYNCMFT = 0x00000001, -- 2.32.0

2 1

[PATCH v3 1/6] jscript: Parse 'let' and 'const' variable declarations.
by Paul Gofman June 16, 2021

June 16, 2021

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- v2: - don't allow 'const' variable declaration in compat mode. dlls/jscript/compile.c | 5 +++++ dlls/jscript/lex.c | 2 ++ dlls/jscript/parser.h | 1 + dlls/jscript/parser.y | 37 ++++++++++++++++++++++++++++++++----- dlls/jscript/tests/lang.js | 34 ++++++++++++++++++++++++++++++++++ dlls/mshtml/tests/es5.js | 17 +++++++++++++++++ 6 files changed, 91 insertions(+), 5 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 9bb9ff13d14..2a17639641f 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -1138,6 +1138,11 @@ static HRESULT compile_variable_list(compiler_ctx_t *ctx, variable_declaration_t if(!iter->expr) continue; + if (iter->block_scope) + FIXME("Block scope variables are not supported.\n"); + if (iter->constant) + FIXME("Constant variables are not supported.\n"); + hres = emit_identifier_ref(ctx, iter->identifier, 0); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/lex.c b/dlls/jscript/lex.c index efed1038a95..695615721a7 100644 --- a/dlls/jscript/lex.c +++ b/dlls/jscript/lex.c @@ -41,6 +41,7 @@ static const struct { {L"break", kBREAK, TRUE}, {L"case", kCASE}, {L"catch", kCATCH}, + {L"const", kCONST}, {L"continue", kCONTINUE, TRUE}, {L"default", kDEFAULT}, {L"delete", kDELETE}, @@ -54,6 +55,7 @@ static const struct { {L"if", kIF}, {L"in", kIN}, {L"instanceof", kINSTANCEOF}, + {L"let", kLET, FALSE, SCRIPTLANGUAGEVERSION_ES5}, {L"new", kNEW}, {L"null", kNULL}, {L"return", kRETURN, TRUE}, diff --git a/dlls/jscript/parser.h b/dlls/jscript/parser.h index b88a52af242..c4dd0752ee9 100644 --- a/dlls/jscript/parser.h +++ b/dlls/jscript/parser.h @@ -95,6 +95,7 @@ literal_t *new_boolean_literal(parser_ctx_t*,BOOL) DECLSPEC_HIDDEN; typedef struct _variable_declaration_t { const WCHAR *identifier; + BOOL block_scope, constant; expression_t *expr; struct _variable_declaration_t *next; diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index f11119143b8..fd8ea7e7aa7 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -87,7 +87,7 @@ static variable_list_t *variable_list_add(parser_ctx_t*,variable_list_t*,variabl static void *new_statement(parser_ctx_t*,statement_type_t,size_t,unsigned); static statement_t *new_block_statement(parser_ctx_t*,unsigned,statement_list_t*); -static statement_t *new_var_statement(parser_ctx_t*,unsigned,variable_list_t*); +static statement_t *new_var_statement(parser_ctx_t*,BOOL,BOOL,unsigned,variable_list_t*); static statement_t *new_expression_statement(parser_ctx_t*,unsigned,expression_t*); static statement_t *new_if_statement(parser_ctx_t*,unsigned,expression_t*,statement_t*,statement_t*); static statement_t *new_while_statement(parser_ctx_t*,unsigned,BOOL,expression_t*,statement_t*); @@ -168,8 +168,9 @@ static source_elements_t *source_elements_add_statement(source_elements_t*,state } /* keywords */ -%token <identifier> kBREAK kCASE kCATCH kCONTINUE kDEFAULT kDELETE kDO kELSE kFUNCTION kIF kFINALLY kFOR kGET kIN kSET -%token <identifier> kINSTANCEOF kNEW kNULL kRETURN kSWITCH kTHIS kTHROW kTRUE kFALSE kTRY kTYPEOF kVAR kVOID kWHILE kWITH +%token <identifier> kBREAK kCASE kCATCH kCONST kCONTINUE kDEFAULT kDELETE kDO kELSE kFUNCTION kIF kFINALLY kFOR +%token <identifier> kGET kIN kLET kSET kINSTANCEOF kNEW kNULL kRETURN kSWITCH kTHIS kTHROW kTRUE kFALSE +%token <identifier> kTRY kTYPEOF kVAR kVOID kWHILE kWITH %token tANDAND tOROR tINC tDEC tHTMLCOMMENT kDIVEQ kDCOL /* tokens */ @@ -182,6 +183,7 @@ static source_elements_t *source_elements_add_statement(source_elements_t*,state %type <source_elements> FunctionBody %type <statement> Statement %type <statement> Block +%type <statement> LexicalDeclaration %type <statement> VariableStatement %type <statement> EmptyStatement %type <statement> ExpressionStatement @@ -291,6 +293,7 @@ FormalParameterList_opt /* ECMA-262 3rd Edition 12 */ Statement : Block { $$ = $1; } + | LexicalDeclaration { $$ = $1; } | VariableStatement { $$ = $1; } | EmptyStatement { $$ = $1; } | FunctionExpression { $$ = new_expression_statement(ctx, @$, $1); } @@ -322,10 +325,25 @@ Block : '{' StatementList '}' { $$ = new_block_statement(ctx, @2, $2); } | '{' '}' { $$ = new_block_statement(ctx, @$, NULL); } +/* ECMA-262 10th Edition 13.3.1, TODO: BindingList*/ +LexicalDeclaration + : kLET VariableDeclarationList semicolon_opt + { $$ = new_var_statement(ctx, TRUE, FALSE, @$, $2); } + | kCONST VariableDeclarationList semicolon_opt + { + if(ctx->script->version < SCRIPTLANGUAGEVERSION_ES5) { + WARN("const var declaration in legacy mode.\n", + debugstr_w($1)); + set_error(ctx, @$, JS_E_SYNTAX); + YYABORT; + } + $$ = new_var_statement(ctx, TRUE, TRUE, @$, $2); + } + /* ECMA-262 3rd Edition 12.2 */ VariableStatement : kVAR VariableDeclarationList semicolon_opt - { $$ = new_var_statement(ctx, @$, $2); } + { $$ = new_var_statement(ctx, FALSE, FALSE, @$, $2); } /* ECMA-262 3rd Edition 12.2 */ VariableDeclarationList @@ -834,6 +852,7 @@ ReservedAsIdentifier : kBREAK { $$ = $1; } | kCASE { $$ = $1; } | kCATCH { $$ = $1; } + | kCONST { $$ = $1; } | kCONTINUE { $$ = $1; } | kDEFAULT { $$ = $1; } | kDELETE { $$ = $1; } @@ -847,6 +866,7 @@ ReservedAsIdentifier | kIF { $$ = $1; } | kIN { $$ = $1; } | kINSTANCEOF { $$ = $1; } + | kLET { $$ = $1; } | kNEW { $$ = $1; } | kNULL { $$ = $1; } | kRETURN { $$ = $1; } @@ -1144,8 +1164,10 @@ static variable_list_t *variable_list_add(parser_ctx_t *ctx, variable_list_t *li return list; } -static statement_t *new_var_statement(parser_ctx_t *ctx, unsigned loc, variable_list_t *variable_list) +static statement_t *new_var_statement(parser_ctx_t *ctx, BOOL block_scope, BOOL constant, unsigned loc, + variable_list_t *variable_list) { + variable_declaration_t *var; var_statement_t *ret; ret = new_statement(ctx, STAT_VAR, sizeof(*ret), loc); @@ -1153,6 +1175,11 @@ static statement_t *new_var_statement(parser_ctx_t *ctx, unsigned loc, variable_ return NULL; ret->variable_list = variable_list->head; + for (var = ret->variable_list; var; var = var->next) + { + var->block_scope = block_scope; + var->constant = constant; + } return &ret->stat; } diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 9e6e6ad239f..0db86c89985 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -2030,3 +2030,37 @@ Math = 6; ok(Math === 6, "NaN !== 6"); reportSuccess(); + +function test_es5_keywords() { + var let = 1 + var tmp + ok(let == 1, "let != 1"); + + tmp = false + try { + eval('var var = 1;'); + } + catch(e) { + tmp = true + } + ok(tmp === true, "Expected exception for 'var var = 1;'"); + + tmp = false + try { + eval('var const = 1;'); + } + catch(e) { + tmp = true + } + ok(tmp === true, "Expected exception for 'var const = 1;'"); + + tmp = false + try { + eval('const c1 = 1;'); + } + catch(e) { + tmp = true + } + ok(tmp === true, "Expected exception for 'const c1 = 1;'"); +} +test_es5_keywords(); diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index 7e46848d40e..24906de5231 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -1207,3 +1207,20 @@ sync_test("head_setter", function() { document.head = ""; ok(typeof(document.head) === "object", "typeof(document.head) = " + typeof(document.head)); }); + + +sync_test("declaration_let", function() { + ok(a === undefined, "a is not undefined"); + var a = 3; + + { + let a = 2; + + ok(a == 2, "a != 2"); + + a = 4; + ok(a == 4, "a != 4"); + } + + todo_wine.ok(a == 3, "a != 3"); +}); -- 2.31.1

3 13

[PATCH] shell32: Don't specify the startup directory for CreateProcessW() in SHELL_ExecuteW().
by Paul Gofman June 16, 2021

June 16, 2021

Doing so fails process creation for relative current directory as the directory already made current. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/shell32/shlexec.c | 17 ++++++----------- dlls/shell32/tests/shlexec.c | 12 ++++++++++++ 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index ee1e832df33..49f7867ef7e 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -318,7 +318,6 @@ static UINT_PTR SHELL_ExecuteW(const WCHAR *lpCmd, WCHAR *env, BOOL shWait, UINT gcdret = 0; WCHAR curdir[MAX_PATH]; DWORD dwCreationFlags; - const WCHAR *lpDirectory = NULL; TRACE("Execute %s from directory %s\n", debugstr_w(lpCmd), debugstr_w(psei->lpDirectory)); @@ -326,17 +325,13 @@ static UINT_PTR SHELL_ExecuteW(const WCHAR *lpCmd, WCHAR *env, BOOL shWait, * a bad working directory */ if (psei->lpDirectory && psei->lpDirectory[0]) { - DWORD attr = GetFileAttributesW(psei->lpDirectory); - if (attr != INVALID_FILE_ATTRIBUTES && attr & FILE_ATTRIBUTE_DIRECTORY) - lpDirectory = psei->lpDirectory; + /* ShellExecute specifies the command from psei->lpDirectory + * if present. Not from the current dir as CreateProcess does */ + if( ( gcdret = GetCurrentDirectoryW( MAX_PATH, curdir ))) + if( !SetCurrentDirectoryW( psei->lpDirectory )) + ERR("cannot set directory %s\n", debugstr_w(psei->lpDirectory )); } - /* ShellExecute specifies the command from psei->lpDirectory - * if present. Not from the current dir as CreateProcess does */ - if( lpDirectory ) - if( ( gcdret = GetCurrentDirectoryW( MAX_PATH, curdir))) - if( !SetCurrentDirectoryW( lpDirectory)) - ERR("cannot set directory %s\n", debugstr_w(lpDirectory)); ZeroMemory(&startup,sizeof(STARTUPINFOW)); startup.cb = sizeof(STARTUPINFOW); startup.dwFlags = STARTF_USESHOWWINDOW; @@ -345,7 +340,7 @@ static UINT_PTR SHELL_ExecuteW(const WCHAR *lpCmd, WCHAR *env, BOOL shWait, if (!(psei->fMask & SEE_MASK_NO_CONSOLE)) dwCreationFlags |= CREATE_NEW_CONSOLE; if (CreateProcessW(NULL, (LPWSTR)lpCmd, NULL, NULL, FALSE, dwCreationFlags, env, - lpDirectory, &startup, &info)) + NULL, &startup, &info)) { /* Give 30 seconds to the app to come up, if desired. Probably only needed when starting app immediately before making a DDE connection. */ diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 2481fb6faa2..968953f9abb 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -2816,6 +2816,7 @@ static void test_directory(void) char path[MAX_PATH + 10], curdir[MAX_PATH]; char params[1024], dirpath[1024]; INT_PTR rc; + BOOL ret; sprintf(path, "%s\\test2.exe", tmpdir); CopyFileA(argv0, path, FALSE); @@ -2876,7 +2877,18 @@ static void test_directory(void) okChildString("argvA0", path); okChildString("argvA3", "Exec"); okChildPath("longPath", path); + + SetCurrentDirectoryA(tmpdir); + ret = CreateDirectoryA( "tmp", NULL ); + ok(ret || GetLastError() == ERROR_ALREADY_EXISTS, "Failed to create 'tmp' err %u\n", GetLastError()); + rc=shell_execute_ex(SEE_MASK_NOZONECHECKS|SEE_MASK_FLAG_NO_UI, + NULL, path, params, "tmp", NULL); + okShell(rc > 32, "returned %lu\n", rc); + DeleteFileA(path); + + RemoveDirectoryA("tmp"); + SetCurrentDirectoryA(curdir); } START_TEST(shlexec) -- 2.31.1

1 0

[PATCH resend] msdrm: Add stub DRMRegisterContent function.
by Vijay Kiran Kamuju June 16, 2021

June 16, 2021

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50595 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Please send the review comments, this just went off the list.

1 0

[PATCH] windowscodecs/tests: Use winetest_push_context for DDS tests.
by Ziqing Hui June 16, 2021

June 16, 2021

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/tests/ddsformat.c | 291 ++++++++++++++------------- 1 file changed, 151 insertions(+), 140 deletions(-)

2 1

[PATCH resend 1/5] ntoskrnl.exe/tests: Add tests with and without report IDs.
by Rémi Bernon June 16, 2021

June 16, 2021

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- Resending to run the tests again. The w864 crash should be fixed but I still expect spurious test failures on w7u_qxl, which sometimes misses bus message arrival, in the PnP driver test so unrelated to these changes, as well as some even less frequent spurious failures. dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 4 +- dlls/ntoskrnl.exe/tests/driver_hid.c | 108 +++++++++++++++++---------- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 56 +++++++++++--- 3 files changed, 114 insertions(+), 54 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 2f7e27e0d87..5fdaa922f45 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1436,7 +1436,7 @@ @ stdcall -private ZwOpenEvent(ptr long ptr) NtOpenEvent @ stdcall ZwOpenFile(ptr long ptr ptr long long) NtOpenFile @ stdcall -private ZwOpenJobObject(ptr long ptr) NtOpenJobObject -@ stdcall -private ZwOpenKey(ptr long ptr) NtOpenKey +@ stdcall ZwOpenKey(ptr long ptr) NtOpenKey @ stdcall -private ZwOpenKeyEx(ptr long ptr long) NtOpenKeyEx @ stdcall -private ZwOpenKeyTransacted(ptr long ptr long) NtOpenKeyTransacted @ stdcall -private ZwOpenKeyTransactedEx(ptr long ptr long long) NtOpenKeyTransactedEx @@ -1476,7 +1476,7 @@ @ stdcall -private ZwQuerySystemInformation(long ptr long ptr) NtQuerySystemInformation @ stdcall -private ZwQuerySystemInformationEx(long ptr long ptr long ptr) NtQuerySystemInformationEx @ stdcall -private ZwQueryTimerResolution(ptr ptr ptr) NtQueryTimerResolution -@ stdcall -private ZwQueryValueKey(long ptr long ptr long ptr) NtQueryValueKey +@ stdcall ZwQueryValueKey(long ptr long ptr long ptr) NtQueryValueKey @ stdcall -private ZwQueryVirtualMemory(long ptr long ptr long ptr) NtQueryVirtualMemory @ stdcall -private ZwQueryVolumeInformationFile(long ptr ptr long long) NtQueryVolumeInformationFile @ stdcall -private ZwReadFile(long long ptr ptr ptr ptr long ptr ptr) NtReadFile diff --git a/dlls/ntoskrnl.exe/tests/driver_hid.c b/dlls/ntoskrnl.exe/tests/driver_hid.c index 1fe644250f7..3a9f4867de4 100644 --- a/dlls/ntoskrnl.exe/tests/driver_hid.c +++ b/dlls/ntoskrnl.exe/tests/driver_hid.c @@ -40,6 +40,7 @@ static UNICODE_STRING control_symlink; static unsigned int got_start_device; +static DWORD report_id; static NTSTATUS WINAPI driver_pnp(DEVICE_OBJECT *device, IRP *irp) { @@ -85,49 +86,54 @@ static NTSTATUS WINAPI driver_power(DEVICE_OBJECT *device, IRP *irp) return PoCallDriver(ext->NextDeviceObject, irp); } -#include "psh_hid_macros.h" - -static const unsigned char report_descriptor[] = +static NTSTATUS WINAPI driver_internal_ioctl(DEVICE_OBJECT *device, IRP *irp) { - USAGE_PAGE(1, HID_USAGE_PAGE_GENERIC), - USAGE(1, HID_USAGE_GENERIC_JOYSTICK), - COLLECTION(1, Application), - USAGE_PAGE(1, HID_USAGE_PAGE_GENERIC), - USAGE(1, HID_USAGE_GENERIC_X), - USAGE(1, HID_USAGE_GENERIC_Y), - LOGICAL_MINIMUM(1, -128), - LOGICAL_MAXIMUM(1, 127), - REPORT_SIZE(1, 8), - REPORT_COUNT(1, 2), - INPUT(1, Data|Var|Abs), - - USAGE_PAGE(1, HID_USAGE_PAGE_BUTTON), - USAGE_MINIMUM(1, 1), - USAGE_MAXIMUM(1, 8), - LOGICAL_MINIMUM(1, 0), - LOGICAL_MAXIMUM(1, 1), - PHYSICAL_MINIMUM(1, 0), - PHYSICAL_MAXIMUM(1, 1), - REPORT_COUNT(1, 8), - REPORT_SIZE(1, 1), - INPUT(1, Data|Var|Abs), - +#include "psh_hid_macros.h" +/* Replace REPORT_ID with USAGE_PAGE when id is 0 */ +#define REPORT_ID_OR_USAGE_PAGE(size, id) SHORT_ITEM_1((id ? 8 : 0), 1, id) + const unsigned char report_descriptor[] = + { USAGE_PAGE(1, HID_USAGE_PAGE_GENERIC), - USAGE(1, HID_USAGE_GENERIC_HATSWITCH), - LOGICAL_MINIMUM(1, 1), - LOGICAL_MAXIMUM(1, 8), - PHYSICAL_MINIMUM(1, 0), - PHYSICAL_MAXIMUM(1, 8), - REPORT_SIZE(1, 4), - REPORT_COUNT(1, 2), - INPUT(1, Data|Var|Abs), - END_COLLECTION, -}; - + USAGE(1, HID_USAGE_GENERIC_JOYSTICK), + COLLECTION(1, Application), + USAGE(1, HID_USAGE_GENERIC_JOYSTICK), + COLLECTION(1, Logical), + REPORT_ID_OR_USAGE_PAGE(1, report_id), + USAGE_PAGE(1, HID_USAGE_PAGE_GENERIC), + USAGE(1, HID_USAGE_GENERIC_X), + USAGE(1, HID_USAGE_GENERIC_Y), + LOGICAL_MINIMUM(1, -128), + LOGICAL_MAXIMUM(1, 127), + REPORT_SIZE(1, 8), + REPORT_COUNT(1, 2), + INPUT(1, Data|Var|Abs), + + USAGE_PAGE(1, HID_USAGE_PAGE_BUTTON), + USAGE_MINIMUM(1, 1), + USAGE_MAXIMUM(1, 8), + LOGICAL_MINIMUM(1, 0), + LOGICAL_MAXIMUM(1, 1), + PHYSICAL_MINIMUM(1, 0), + PHYSICAL_MAXIMUM(1, 1), + REPORT_COUNT(1, 8), + REPORT_SIZE(1, 1), + INPUT(1, Data|Var|Abs), + + USAGE_PAGE(1, HID_USAGE_PAGE_GENERIC), + USAGE(1, HID_USAGE_GENERIC_HATSWITCH), + LOGICAL_MINIMUM(1, 1), + LOGICAL_MAXIMUM(1, 8), + PHYSICAL_MINIMUM(1, 0), + PHYSICAL_MAXIMUM(1, 8), + REPORT_SIZE(1, 4), + REPORT_COUNT(1, 2), + INPUT(1, Data|Var|Abs), + END_COLLECTION, + END_COLLECTION, + }; +#undef REPORT_ID_OR_USAGE_PAGE #include "pop_hid_macros.h" -static NTSTATUS WINAPI driver_internal_ioctl(DEVICE_OBJECT *device, IRP *irp) -{ static BOOL test_failed; IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation(irp); const ULONG in_size = stack->Parameters.DeviceIoControl.InputBufferLength; @@ -202,9 +208,13 @@ static NTSTATUS WINAPI driver_internal_ioctl(DEVICE_OBJECT *device, IRP *irp) case IOCTL_HID_READ_REPORT: { - ULONG expected_size = 4; + ULONG expected_size = report_id ? 5 : 4; ok(!in_size, "got input size %u\n", in_size); - if (!test_failed) todo_wine ok(out_size == expected_size, "got output size %u\n", out_size); + if (!test_failed) + { + todo_wine_if(!report_id) + ok(out_size == expected_size, "got output size %u\n", out_size); + } if (out_size != expected_size) test_failed = TRUE; ret = STATUS_NOT_IMPLEMENTED; @@ -278,17 +288,33 @@ static void WINAPI driver_unload(DRIVER_OBJECT *driver) NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, UNICODE_STRING *registry) { + static const int info_size = offsetof( KEY_VALUE_PARTIAL_INFORMATION, Data ); + char buffer[offsetof( KEY_VALUE_PARTIAL_INFORMATION, Data ) + sizeof(DWORD)]; HID_MINIDRIVER_REGISTRATION params = { .Revision = HID_REVISION, .DriverObject = driver, .RegistryPath = registry, }; + UNICODE_STRING name_str; + OBJECT_ATTRIBUTES attr; NTSTATUS ret; + HANDLE hkey; + DWORD size; if ((ret = winetest_init())) return ret; + InitializeObjectAttributes(&attr, registry, 0, NULL, NULL); + ret = ZwOpenKey(&hkey, KEY_ALL_ACCESS, &attr); + ok(!ret, "ZwOpenKey returned %#x\n", ret); + + RtlInitUnicodeString(&name_str, L"ReportID"); + size = info_size + sizeof(report_id); + ret = ZwQueryValueKey(hkey, &name_str, KeyValuePartialInformation, buffer, size, &size); + ok(!ret, "ZwQueryValueKey returned %#x\n", ret); + memcpy(&report_id, buffer + info_size, size - info_size); + driver->DriverExtension->AddDevice = driver_add_device; driver->DriverUnload = driver_unload; driver->MajorFunction[IRP_MJ_PNP] = driver_pnp; diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 4b744d813d8..e9390698fc6 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -1634,25 +1634,27 @@ static inline void check_hidp_value_caps_(int line, HIDP_VALUE_CAPS *caps, const } } -static void test_hidp(HANDLE file) +static void test_hidp(HANDLE file, int report_id) { - static const HIDP_CAPS expect_hidp_caps = + const HIDP_CAPS expect_hidp_caps = { .Usage = HID_USAGE_GENERIC_JOYSTICK, .UsagePage = HID_USAGE_PAGE_GENERIC, .InputReportByteLength = 5, - .NumberLinkCollectionNodes = 1, + .NumberLinkCollectionNodes = 2, .NumberInputButtonCaps = 1, .NumberInputValueCaps = 3, .NumberInputDataIndices = 11, }; - static const HIDP_BUTTON_CAPS expect_button_caps[] = + const HIDP_BUTTON_CAPS expect_button_caps[] = { { .UsagePage = HID_USAGE_PAGE_BUTTON, + .ReportID = report_id, .BitField = 2, .LinkUsage = HID_USAGE_GENERIC_JOYSTICK, .LinkUsagePage = HID_USAGE_PAGE_GENERIC, + .LinkCollection = 1, .IsRange = TRUE, .IsAbsolute = TRUE, .Range.UsageMin = 1, @@ -1661,13 +1663,15 @@ static void test_hidp(HANDLE file) .Range.DataIndexMax = 9, }, }; - static const HIDP_VALUE_CAPS expect_value_caps[] = + const HIDP_VALUE_CAPS expect_value_caps[] = { { .UsagePage = HID_USAGE_PAGE_GENERIC, + .ReportID = report_id, .BitField = 2, .LinkUsage = HID_USAGE_GENERIC_JOYSTICK, .LinkUsagePage = HID_USAGE_PAGE_GENERIC, + .LinkCollection = 1, .IsAbsolute = TRUE, .BitSize = 8, .ReportCount = 1, @@ -1677,9 +1681,11 @@ static void test_hidp(HANDLE file) }, { .UsagePage = HID_USAGE_PAGE_GENERIC, + .ReportID = report_id, .BitField = 2, .LinkUsage = HID_USAGE_GENERIC_JOYSTICK, .LinkUsagePage = HID_USAGE_PAGE_GENERIC, + .LinkCollection = 1, .IsAbsolute = TRUE, .BitSize = 8, .ReportCount = 1, @@ -1690,9 +1696,11 @@ static void test_hidp(HANDLE file) }, { .UsagePage = HID_USAGE_PAGE_GENERIC, + .ReportID = report_id, .BitField = 2, .LinkUsage = HID_USAGE_GENERIC_JOYSTICK, .LinkUsagePage = HID_USAGE_PAGE_GENERIC, + .LinkCollection = 1, .IsAbsolute = TRUE, .BitSize = 4, .ReportCount = 2, @@ -1709,6 +1717,13 @@ static void test_hidp(HANDLE file) .LinkUsage = HID_USAGE_GENERIC_JOYSTICK, .LinkUsagePage = HID_USAGE_PAGE_GENERIC, .CollectionType = 1, + .NumberOfChildren = 1, + .FirstChild = 1, + }, + { + .LinkUsage = HID_USAGE_GENERIC_JOYSTICK, + .LinkUsagePage = HID_USAGE_PAGE_GENERIC, + .CollectionType = 2, }, }; @@ -1956,20 +1971,26 @@ static void test_hidp(HANDLE file) ok(status == HIDP_STATUS_INVALID_REPORT_LENGTH, "HidP_InitializeReportForID returned %#x\n", status); status = HidP_InitializeReportForID(HidP_Input, 0, preparsed_data, report, caps.InputReportByteLength + 1); ok(status == HIDP_STATUS_INVALID_REPORT_LENGTH, "HidP_InitializeReportForID returned %#x\n", status); + status = HidP_InitializeReportForID(HidP_Input, 1 - report_id, preparsed_data, report, caps.InputReportByteLength); + todo_wine_if(!report_id) + ok(status == HIDP_STATUS_REPORT_DOES_NOT_EXIST, "HidP_InitializeReportForID returned %#x\n", status); memset(report, 0xcd, sizeof(report)); - status = HidP_InitializeReportForID(HidP_Input, 0, preparsed_data, report, caps.InputReportByteLength); + status = HidP_InitializeReportForID(HidP_Input, report_id, preparsed_data, report, caps.InputReportByteLength); + todo_wine_if(report_id) ok(status == HIDP_STATUS_SUCCESS, "HidP_InitializeReportForID returned %#x\n", status); memset(buffer, 0xcd, sizeof(buffer)); memset(buffer, 0, caps.InputReportByteLength); + buffer[0] = report_id; + todo_wine_if(report_id) ok(!memcmp(buffer, report, sizeof(buffer)), "unexpected report data\n"); HidD_FreePreparsedData(preparsed_data); CloseHandle(file); } -static void test_hid_device(void) +static void test_hid_device(DWORD report_id) { char buffer[200]; SP_DEVICE_INTERFACE_DETAIL_DATA_A *iface_detail = (void *)buffer; @@ -1984,6 +2005,8 @@ static void test_hid_device(void) HDEVINFO set; HANDLE file; + winetest_push_context("report %d", report_id); + set = SetupDiGetClassDevsA(&GUID_DEVINTERFACE_HID, NULL, NULL, DIGCF_DEVICEINTERFACE | DIGCF_PRESENT); ok(set != INVALID_HANDLE_VALUE, "failed to get device list, error %#x\n", GetLastError()); @@ -2014,7 +2037,7 @@ static void test_hid_device(void) FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, NULL); ok(file != INVALID_HANDLE_VALUE, "got error %u\n", GetLastError()); - test_hidp(file); + test_hidp(file, report_id); CloseHandle(file); @@ -2022,9 +2045,11 @@ static void test_hid_device(void) InitializeObjectAttributes(&attr, &string, OBJ_CASE_INSENSITIVE, NULL, NULL); status = NtOpenFile(&file, SYNCHRONIZE, &attr, &io, 0, FILE_SYNCHRONOUS_IO_NONALERT); todo_wine ok(status == STATUS_UNSUCCESSFUL, "got %#x\n", status); + + winetest_pop_context(); } -static void test_hid_driver(struct testsign_context *ctx) +static void test_hid_driver(struct testsign_context *ctx, DWORD report_id) { static const char hardware_id[] = "test_hardware_id\0"; char path[MAX_PATH], dest[MAX_PATH], *filepart; @@ -2034,13 +2059,21 @@ static void test_hid_driver(struct testsign_context *ctx) SC_HANDLE manager, service; BOOL ret, need_reboot; HANDLE catalog, file; + LSTATUS status; HDEVINFO set; + HKEY hkey; FILE *f; GetCurrentDirectoryA(ARRAY_SIZE(cwd), cwd); GetTempPathA(ARRAY_SIZE(tempdir), tempdir); SetCurrentDirectoryA(tempdir); + status = RegCreateKeyExW(HKEY_LOCAL_MACHINE, L"System\\CurrentControlSet\\Services\\winetest", 0, NULL, REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &hkey, NULL); + ok(!status, "RegCreateKeyExW returned %#x\n", status); + + status = RegSetValueExW(hkey, L"ReportID", 0, REG_DWORD, (void *)&report_id, sizeof(report_id)); + ok(!status, "RegSetValueExW returned %#x\n", status); + load_resource(L"driver_hid.dll", driver_filename); ret = MoveFileExW(driver_filename, L"winetest.sys", MOVEFILE_COPY_ALLOWED | MOVEFILE_REPLACE_EXISTING); ok(ret, "failed to move file, error %u\n", GetLastError()); @@ -2088,7 +2121,7 @@ static void test_hid_driver(struct testsign_context *ctx) /* Tests. */ - test_hid_device(); + test_hid_device(report_id); /* Clean up. */ @@ -2219,7 +2252,8 @@ START_TEST(ntoskrnl) test_pnp_driver(&ctx); subtest("driver_hid"); - test_hid_driver(&ctx); + test_hid_driver(&ctx, 0); + test_hid_driver(&ctx, 1); out: testsign_cleanup(&ctx); -- 2.31.0

3 12