February 2022 - Wine-Commits

Zebediah Figura : wined3d: Try to allocate new OpenGL BOs from the client thread for DISCARD maps.
by Alexandre Julliard Feb. 18, 2022

Feb. 18, 2022

Module: wine Branch: master Commit: 1b1b03055db8bf03c6783d4fcb19abf670d53338 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b1b03055db8bf03c6783d4f… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Feb 17 23:01:37 2022 -0600 wined3d: Try to allocate new OpenGL BOs from the client thread for DISCARD maps. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 43 ++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/buffer.c | 2 +- dlls/wined3d/cs.c | 36 +++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 4 ++++ 4 files changed, 84 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index bc54f46222f..cb0c34823aa 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -4616,6 +4616,49 @@ static void adapter_gl_flush_bo_address(struct wined3d_context *context, static bool adapter_gl_alloc_bo(struct wined3d_device *device, struct wined3d_resource *resource, unsigned int sub_resource_idx, struct wined3d_bo_address *addr) { + const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; + struct wined3d_device_gl *device_gl = wined3d_device_gl(device); + + wined3d_not_from_cs(device->cs); + assert(device->context_count); + + if (resource->type == WINED3D_RTYPE_BUFFER) + { + GLenum usage = GL_STATIC_DRAW; + struct wined3d_bo_gl *bo_gl; + bool coherent = true; + + if (resource->usage & WINED3DUSAGE_DYNAMIC) + { + usage = GL_STREAM_DRAW_ARB; + coherent = false; + } + + if (!(bo_gl = heap_alloc(sizeof(*bo_gl)))) + return false; + + if (!(wined3d_device_gl_create_bo(device_gl, NULL, resource->size, + wined3d_buffer_gl_binding_from_bind_flags(gl_info, resource->bind_flags), + usage, coherent, wined3d_resource_gl_storage_flags(resource), bo_gl))) + { + WARN("Failed to create OpenGL buffer.\n"); + heap_free(bo_gl); + return false; + } + + addr->buffer_object = &bo_gl->b; + addr->addr = NULL; + + if (!bo_gl->b.map_ptr) + { + WARN_(d3d_perf)("BO %p (chunk %p) is not persistently mapped.\n", + bo_gl, bo_gl->memory ? bo_gl->memory->chunk : NULL); + wined3d_cs_map_bo_address(device->cs, addr, resource->size, WINED3D_MAP_WRITE | WINED3D_MAP_DISCARD); + } + + return true; + } + return false; } diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 3ecaa9017d0..16308a098e3 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -136,7 +136,7 @@ void wined3d_buffer_invalidate_location(struct wined3d_buffer *buffer, DWORD loc wined3d_buffer_invalidate_range(buffer, location, 0, 0); } -static GLenum wined3d_buffer_gl_binding_from_bind_flags(const struct wined3d_gl_info *gl_info, uint32_t bind_flags) +GLenum wined3d_buffer_gl_binding_from_bind_flags(const struct wined3d_gl_info *gl_info, uint32_t bind_flags) { if (!bind_flags) return GL_PIXEL_UNPACK_BUFFER; diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 027a6786717..4a3b805c0bd 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -118,6 +118,7 @@ enum wined3d_cs_op WINED3D_CS_OP_UNLOAD_RESOURCE, WINED3D_CS_OP_MAP, WINED3D_CS_OP_UNMAP, + WINED3D_CS_OP_MAP_BO_ADDRESS, WINED3D_CS_OP_BLT_SUB_RESOURCE, WINED3D_CS_OP_UPDATE_SUB_RESOURCE, WINED3D_CS_OP_ADD_DIRTY_TEXTURE_REGION, @@ -452,6 +453,14 @@ struct wined3d_cs_unmap HRESULT *hr; }; +struct wined3d_cs_map_bo_address +{ + enum wined3d_cs_op opcode; + struct wined3d_bo_address addr; + size_t size; + uint32_t flags; +}; + struct wined3d_cs_blt_sub_resource { enum wined3d_cs_op opcode; @@ -592,6 +601,7 @@ static const char *debug_cs_op(enum wined3d_cs_op op) WINED3D_TO_STR(WINED3D_CS_OP_UNLOAD_RESOURCE); WINED3D_TO_STR(WINED3D_CS_OP_MAP); WINED3D_TO_STR(WINED3D_CS_OP_UNMAP); + WINED3D_TO_STR(WINED3D_CS_OP_MAP_BO_ADDRESS); WINED3D_TO_STR(WINED3D_CS_OP_BLT_SUB_RESOURCE); WINED3D_TO_STR(WINED3D_CS_OP_UPDATE_SUB_RESOURCE); WINED3D_TO_STR(WINED3D_CS_OP_ADD_DIRTY_TEXTURE_REGION); @@ -2548,6 +2558,31 @@ HRESULT wined3d_device_context_emit_unmap(struct wined3d_device_context *context return hr; } +static void wined3d_cs_exec_map_bo_address(struct wined3d_cs *cs, const void *data) +{ + const struct wined3d_cs_map_bo_address *op = data; + struct wined3d_context *context; + + context = context_acquire(cs->c.device, NULL, 0); + wined3d_context_map_bo_address(context, &op->addr, op->size, op->flags); + context_release(context); +} + +void wined3d_cs_map_bo_address(struct wined3d_cs *cs, + struct wined3d_bo_address *addr, size_t size, unsigned int flags) +{ + struct wined3d_device_context *context = &cs->c; + struct wined3d_cs_map_bo_address *op; + + op = wined3d_device_context_require_space(context, sizeof(*op), WINED3D_CS_QUEUE_MAP); + op->opcode = WINED3D_CS_OP_MAP_BO_ADDRESS; + op->addr = *addr; + op->size = size; + op->flags = flags; + wined3d_device_context_submit(context, WINED3D_CS_QUEUE_MAP); + wined3d_device_context_finish(context, WINED3D_CS_QUEUE_MAP); +} + static void wined3d_cs_exec_blt_sub_resource(struct wined3d_cs *cs, const void *data) { const struct wined3d_cs_blt_sub_resource *op = data; @@ -2966,6 +3001,7 @@ static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void /* WINED3D_CS_OP_UNLOAD_RESOURCE */ wined3d_cs_exec_unload_resource, /* WINED3D_CS_OP_MAP */ wined3d_cs_exec_map, /* WINED3D_CS_OP_UNMAP */ wined3d_cs_exec_unmap, + /* WINED3D_CS_OP_MAP_BO_ADDRESS */ wined3d_cs_exec_map_bo_address, /* WINED3D_CS_OP_BLT_SUB_RESOURCE */ wined3d_cs_exec_blt_sub_resource, /* WINED3D_CS_OP_UPDATE_SUB_RESOURCE */ wined3d_cs_exec_update_sub_resource, /* WINED3D_CS_OP_ADD_DIRTY_TEXTURE_REGION */ wined3d_cs_exec_add_dirty_texture_region, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e190fc4285e..eff42be3aa6 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -5034,6 +5034,8 @@ void wined3d_cs_emit_set_render_state(struct wined3d_cs *cs, void wined3d_cs_emit_unload_resource(struct wined3d_cs *cs, struct wined3d_resource *resource) DECLSPEC_HIDDEN; void wined3d_cs_init_object(struct wined3d_cs *cs, void (*callback)(void *object), void *object) DECLSPEC_HIDDEN; +void wined3d_cs_map_bo_address(struct wined3d_cs *cs, + struct wined3d_bo_address *addr, size_t size, unsigned int flags) DECLSPEC_HIDDEN; static inline void wined3d_cs_finish(struct wined3d_cs *cs, enum wined3d_cs_queue_id queue_id) { @@ -5217,6 +5219,8 @@ static inline const struct wined3d_buffer_gl *wined3d_buffer_gl_const(const stru return CONTAINING_RECORD(buffer, struct wined3d_buffer_gl, b); } +GLenum wined3d_buffer_gl_binding_from_bind_flags(const struct wined3d_gl_info *gl_info, + uint32_t bind_flags) DECLSPEC_HIDDEN; HRESULT wined3d_buffer_gl_init(struct wined3d_buffer_gl *buffer_gl, struct wined3d_device *device, const struct wined3d_buffer_desc *desc, const struct wined3d_sub_resource_data *data, void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN;

1 0

Eric Pouech : toolhelp.dll16: Enable compilation with long types.
by Alexandre Julliard Feb. 18, 2022

Feb. 18, 2022

Module: wine Branch: master Commit: 66b171d2bc68bbe54edc67061514d24c90ac109e URL: https://source.winehq.org/git/wine.git/?a=commit;h=66b171d2bc68bbe54edc6706… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Feb 18 09:17:28 2022 +0100 toolhelp.dll16: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/toolhelp.dll16/Makefile.in | 1 - dlls/toolhelp.dll16/toolhelp.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/toolhelp.dll16/Makefile.in b/dlls/toolhelp.dll16/Makefile.in index 7e39aa9c7cb..64d0de31528 100644 --- a/dlls/toolhelp.dll16/Makefile.in +++ b/dlls/toolhelp.dll16/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = toolhelp.dll16 EXTRADLLFLAGS = -m16 diff --git a/dlls/toolhelp.dll16/toolhelp.c b/dlls/toolhelp.dll16/toolhelp.c index 57a95fb8d8f..1bec37c505e 100644 --- a/dlls/toolhelp.dll16/toolhelp.c +++ b/dlls/toolhelp.dll16/toolhelp.c @@ -552,7 +552,7 @@ BOOL16 WINAPI NotifyRegister16( HTASK16 htask, FARPROC16 lpfnCallback, { int i; - FIXME("(%x,%x,%x), semi-stub.\n", + FIXME("(%x,%lx,%x), semi-stub.\n", htask, (DWORD)lpfnCallback, wFlags ); if (!htask) htask = GetCurrentTask(); for (i=0;i<nrofnotifys;i++)

1 0

Eric Pouech : typelib.dll16: Enable compilation with long types.
by Alexandre Julliard Feb. 18, 2022

Feb. 18, 2022

Module: wine Branch: master Commit: ca4cc5723af03baae0c98b38dbcf4694dec2a27a URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca4cc5723af03baae0c98b38… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Feb 18 09:17:46 2022 +0100 typelib.dll16: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/typelib.dll16/Makefile.in | 1 - dlls/typelib.dll16/typelib.c | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/typelib.dll16/Makefile.in b/dlls/typelib.dll16/Makefile.in index 06adb35b296..b4d39ee6601 100644 --- a/dlls/typelib.dll16/Makefile.in +++ b/dlls/typelib.dll16/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = typelib.dll16 IMPORTS = oleaut32 advapi32 EXTRADLLFLAGS = -m16 -Wb,--main-module,oleaut32.dll diff --git a/dlls/typelib.dll16/typelib.c b/dlls/typelib.dll16/typelib.c index 4787010354c..41a4790a253 100644 --- a/dlls/typelib.dll16/typelib.c +++ b/dlls/typelib.dll16/typelib.c @@ -82,14 +82,14 @@ QueryPathOfRegTypeLib16( TRACE("\n"); if (HIWORD(guid)) { - sprintf( typelibkey, "SOFTWARE\\Classes\\Typelib\\{%08lx-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}\\%d.%d\\%x\\win16", + sprintf( typelibkey, "SOFTWARE\\Classes\\Typelib\\{%08lx-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}\\%d.%d\\%lx\\win16", 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], wMaj,wMin,lcid); } else { - sprintf(xguid,"<guid 0x%08x>",(DWORD)guid); - FIXME("(%s,%d,%d,0x%04x,%p),can't handle non-string guids.\n",xguid,wMaj,wMin,lcid,path); + sprintf(xguid,"<guid 0x%08lx>",(DWORD)guid); + FIXME("(%s,%d,%d,0x%04lx,%p),can't handle non-string guids.\n",xguid,wMaj,wMin,lcid,path); return E_FAIL; } plen = sizeof(pathname);

1 0

Eric Pouech : taskschd: Enable compilation with long types.
by Alexandre Julliard Feb. 18, 2022

Feb. 18, 2022

Module: wine Branch: master Commit: f925d0d8c4d3c0c711d6642101d800b2197cb2e3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f925d0d8c4d3c0c711d66421… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Feb 18 09:17:22 2022 +0100 taskschd: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/taskschd/Makefile.in | 1 - dlls/taskschd/folder.c | 28 ++++++------- dlls/taskschd/folder_collection.c | 10 ++--- dlls/taskschd/regtask.c | 22 +++++------ dlls/taskschd/task.c | 82 +++++++++++++++++++-------------------- 5 files changed, 71 insertions(+), 72 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f925d0d8c4d3c0c711d6…

1 0

Eric Pouech : sound.drv16: Enable compilation with long types.
by Alexandre Julliard Feb. 18, 2022

Feb. 18, 2022

Module: wine Branch: master Commit: 9c777d7e1369f6f06cb799309c862fe302188f1b URL: https://source.winehq.org/git/wine.git/?a=commit;h=9c777d7e1369f6f06cb79930… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Feb 18 09:16:34 2022 +0100 sound.drv16: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sound.drv16/Makefile.in | 1 - dlls/sound.drv16/sound.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/sound.drv16/Makefile.in b/dlls/sound.drv16/Makefile.in index 8aa1117c905..8e9b04bfa83 100644 --- a/dlls/sound.drv16/Makefile.in +++ b/dlls/sound.drv16/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = sound.drv16 EXTRADLLFLAGS = -m16 -Wb,--main-module,winmm.dll diff --git a/dlls/sound.drv16/sound.c b/dlls/sound.drv16/sound.c index 0f1386cf160..f93b96c4fa1 100644 --- a/dlls/sound.drv16/sound.c +++ b/dlls/sound.drv16/sound.c @@ -97,7 +97,7 @@ INT16 WINAPI SetSoundNoise16(INT16 nSource, INT16 nDuration) */ INT16 WINAPI SetVoiceSound16(INT16 nVoice, DWORD lFrequency, INT16 nDuration) { - FIXME("(%d, %d, %d): stub\n",nVoice,lFrequency, nDuration); + FIXME("(%d, %ld, %d): stub\n",nVoice,lFrequency, nDuration); return 0; }

1 0

Eric Pouech : sppc: Enable compilation with long types.
by Alexandre Julliard Feb. 18, 2022

Feb. 18, 2022

Module: wine Branch: master Commit: 5beaca8e23fc76384d9458ad894df4fe9b1ff5e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5beaca8e23fc76384d9458ad… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Feb 18 09:16:45 2022 +0100 sppc: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sppc/Makefile.in | 1 - dlls/sppc/sppc.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/sppc/Makefile.in b/dlls/sppc/Makefile.in index 4d31f9dc923..1cd222f6175 100644 --- a/dlls/sppc/Makefile.in +++ b/dlls/sppc/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = sppc.dll EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/sppc/sppc.c b/dlls/sppc/sppc.c index ce3183f39bd..8819961d7c6 100644 --- a/dlls/sppc/sppc.c +++ b/dlls/sppc/sppc.c @@ -60,7 +60,7 @@ HRESULT WINAPI SLClose(HSLC handle) HRESULT WINAPI SLPersistApplicationPolicies(const SLID *app, const SLID *product, DWORD flags) { - FIXME("(%s,%s,%x) stub\n", wine_dbgstr_guid(app), wine_dbgstr_guid(product), flags); + FIXME("(%s,%s,%lx) stub\n", wine_dbgstr_guid(app), wine_dbgstr_guid(product), flags); if (!app) return E_INVALIDARG;

1 0

Eric Pouech : stress.dll16: Enable compilation with long types.
by Alexandre Julliard Feb. 18, 2022

Feb. 18, 2022

Module: wine Branch: master Commit: bd575863f45cb449cb04d0d843c73d4f9c836d57 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd575863f45cb449cb04d0d8… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Feb 18 09:17:04 2022 +0100 stress.dll16: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/stress.dll16/Makefile.in | 1 - dlls/stress.dll16/stress.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/stress.dll16/Makefile.in b/dlls/stress.dll16/Makefile.in index 76731e716d6..0c93384c33e 100644 --- a/dlls/stress.dll16/Makefile.in +++ b/dlls/stress.dll16/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = stress.dll16 EXTRADLLFLAGS = -m16 diff --git a/dlls/stress.dll16/stress.c b/dlls/stress.dll16/stress.c index be292d9d58a..f3c845b988c 100644 --- a/dlls/stress.dll16/stress.c +++ b/dlls/stress.dll16/stress.c @@ -29,7 +29,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(stress); */ INT16 WINAPI AllocDiskSpace(LONG lLeft, UINT16 uDrive) { - FIXME("(%d, %d) - stub\n", + FIXME("(%d, %ld) - stub\n", uDrive, lLeft); return 1; @@ -62,7 +62,7 @@ BOOL16 WINAPI AllocGDIMem(UINT16 uLeft) */ BOOL16 WINAPI AllocMem(DWORD dwLeft) { - FIXME("(%d) - stub\n", dwLeft); + FIXME("(%ld) - stub\n", dwLeft); return TRUE; }

1 0

Eric Pouech : tapi32: Enable compilation with long types.
by Alexandre Julliard Feb. 18, 2022

Feb. 18, 2022

Module: wine Branch: master Commit: e0c75af0f65cc830079cdd2271e148514ca1d876 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e0c75af0f65cc830079cdd22… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Feb 18 09:17:16 2022 +0100 tapi32: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/tapi32/Makefile.in | 1 - dlls/tapi32/line.c | 148 ++++++++++++++++++++++++------------------------ dlls/tapi32/phone.c | 38 ++++++------- 3 files changed, 93 insertions(+), 94 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e0c75af0f65cc830079c…

1 0

Nikolay Sivov : mfmediaengine: Implement GetStreamAttribute().
by Alexandre Julliard Feb. 18, 2022

Feb. 18, 2022

Module: wine Branch: master Commit: 7608e775ab3358e0fdbff81367668990ac75945c URL: https://source.winehq.org/git/wine.git/?a=commit;h=7608e775ab3358e0fdbff813… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 18 10:47:43 2022 +0300 mfmediaengine: Implement GetStreamAttribute(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfmediaengine/main.c | 23 +++++++++++++++++++++-- dlls/mfmediaengine/tests/mfmediaengine.c | 6 ++++++ 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index bb338a4423f..a191448b69f 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -2504,9 +2504,28 @@ static HRESULT WINAPI media_engine_GetNumberOfStreams(IMFMediaEngineEx *iface, D static HRESULT WINAPI media_engine_GetStreamAttribute(IMFMediaEngineEx *iface, DWORD stream_index, REFGUID attribute, PROPVARIANT *value) { - FIXME("%p, %ld, %s, %p stub.\n", iface, stream_index, debugstr_guid(attribute), value); + struct media_engine *engine = impl_from_IMFMediaEngineEx(iface); + IMFStreamDescriptor *sd; + HRESULT hr = E_FAIL; + BOOL selected; - return E_NOTIMPL; + TRACE("%p, %ld, %s, %p.\n", iface, stream_index, debugstr_guid(attribute), value); + + EnterCriticalSection(&engine->cs); + if (engine->flags & FLAGS_ENGINE_SHUT_DOWN) + hr = MF_E_SHUTDOWN; + else if (engine->presentation.pd) + { + if (SUCCEEDED(hr = IMFPresentationDescriptor_GetStreamDescriptorByIndex(engine->presentation.pd, + stream_index, &selected, &sd))) + { + hr = IMFStreamDescriptor_GetItem(sd, attribute, value); + IMFStreamDescriptor_Release(sd); + } + } + LeaveCriticalSection(&engine->cs); + + return hr; } static HRESULT WINAPI media_engine_GetStreamSelection(IMFMediaEngineEx *iface, DWORD stream_index, BOOL *enabled) diff --git a/dlls/mfmediaengine/tests/mfmediaengine.c b/dlls/mfmediaengine/tests/mfmediaengine.c index 0eaf614fc66..ea2f570d721 100644 --- a/dlls/mfmediaengine/tests/mfmediaengine.c +++ b/dlls/mfmediaengine/tests/mfmediaengine.c @@ -497,6 +497,9 @@ static void test_Shutdown(void) hr = IMFMediaEngineEx_GetPresentationAttribute(media_engine_ex, &MF_PD_DURATION, &propvar); ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); + hr = IMFMediaEngineEx_GetStreamAttribute(media_engine_ex, 0, &MF_SD_PROTECTED, &propvar); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); + IMFMediaEngineEx_Release(media_engine_ex); } @@ -935,6 +938,9 @@ static void test_SetSourceFromByteStream(void) hr = IMFMediaEngineEx_GetPresentationAttribute(media_engine, &MF_PD_DURATION, &propvar); ok(hr == E_FAIL, "Unexpected hr %#lx.\n", hr); + hr = IMFMediaEngineEx_GetStreamAttribute(media_engine, 0, &MF_SD_PROTECTED, &propvar); + ok(hr == E_FAIL, "Unexpected hr %#lx.\n", hr); + IMFMediaEngineEx_Release(media_engine); IMFMediaEngineNotify_Release(&notify->IMFMediaEngineNotify_iface); }

1 0

Nikolay Sivov : mfmediaengine: Implement GetResourceCharacteristics().
by Alexandre Julliard Feb. 18, 2022

Feb. 18, 2022

Module: wine Branch: master Commit: 1d1eebf38a3fac115a45f7d99aaaecf1c46b8bec URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d1eebf38a3fac115a45f7d9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 18 10:47:40 2022 +0300 mfmediaengine: Implement GetResourceCharacteristics(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfmediaengine/main.c | 14 ++++++++++++-- dlls/mfmediaengine/tests/mfmediaengine.c | 15 ++++++++++++++- 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index 4a7d85348d7..a78cc130657 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -2453,9 +2453,19 @@ static HRESULT WINAPI media_engine_FrameStep(IMFMediaEngineEx *iface, BOOL forwa static HRESULT WINAPI media_engine_GetResourceCharacteristics(IMFMediaEngineEx *iface, DWORD *flags) { - FIXME("%p, %p stub.\n", iface, flags); + struct media_engine *engine = impl_from_IMFMediaEngineEx(iface); + HRESULT hr = E_FAIL; - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, flags); + + EnterCriticalSection(&engine->cs); + if (engine->flags & FLAGS_ENGINE_SHUT_DOWN) + hr = MF_E_SHUTDOWN; + else if (engine->presentation.source) + hr = IMFMediaSource_GetCharacteristics(engine->presentation.source, flags); + LeaveCriticalSection(&engine->cs); + + return hr; } static HRESULT WINAPI media_engine_GetPresentationAttribute(IMFMediaEngineEx *iface, REFGUID attribute, diff --git a/dlls/mfmediaengine/tests/mfmediaengine.c b/dlls/mfmediaengine/tests/mfmediaengine.c index f67b6512db7..f05f24b7172 100644 --- a/dlls/mfmediaengine/tests/mfmediaengine.c +++ b/dlls/mfmediaengine/tests/mfmediaengine.c @@ -295,9 +295,9 @@ static void test_Shutdown(void) IMFMediaEngineEx *media_engine_ex; IMFMediaTimeRange *time_range; IMFMediaEngine *media_engine; + DWORD flags, cx, cy; unsigned int state; UINT32 value; - DWORD cx, cy; double val; HRESULT hr; BSTR str; @@ -451,6 +451,12 @@ static void test_Shutdown(void) hr = IMFMediaEngineEx_SetAudioEndpointRole(media_engine_ex, eConsole); ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); + hr = IMFMediaEngineEx_GetResourceCharacteristics(media_engine_ex, NULL); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); + + hr = IMFMediaEngineEx_GetResourceCharacteristics(media_engine_ex, &flags); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); + IMFMediaEngineEx_Release(media_engine_ex); } @@ -863,6 +869,7 @@ static void test_SetSourceFromByteStream(void) { struct media_engine_notify *notify; IMFMediaEngineEx *media_engine; + DWORD flags; HRESULT hr; notify = create_callback(); @@ -878,6 +885,12 @@ static void test_SetSourceFromByteStream(void) hr = IMFMediaEngineEx_SetSourceFromByteStream(media_engine, NULL, NULL); ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); + hr = IMFMediaEngineEx_GetResourceCharacteristics(media_engine, NULL); + ok(hr == E_FAIL, "Unexpected hr %#lx.\n", hr); + + hr = IMFMediaEngineEx_GetResourceCharacteristics(media_engine, &flags); + ok(hr == E_FAIL, "Unexpected hr %#lx.\n", hr); + IMFMediaEngineEx_Release(media_engine); IMFMediaEngineNotify_Release(&notify->IMFMediaEngineNotify_iface); }

1 0