February 2022 - Wine-commits

Zebediah Figura : wined3d: Do not allocate upload bufers for resources pinned to system memory.
by Alexandre Julliard 18 Feb '22

18 Feb '22

Module: wine Branch: master Commit: f257daf390362d88972502551b6fe2d15996f0d6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f257daf390362d8897250255… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Feb 17 23:01:36 2022 -0600 wined3d: Do not allocate upload bufers for resources pinned to system memory. 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/cs.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 9f4a39cfe7e..027a6786717 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -3092,6 +3092,12 @@ static bool wined3d_cs_map_upload_bo(struct wined3d_device_context *context, str return NULL; } + if (resource->pin_sysmem) + { + TRACE("Not allocating an upload buffer because system memory is pinned for this resource.\n"); + return NULL; + } + if (flags & WINED3D_MAP_DISCARD) { if (!device->adapter->adapter_ops->adapter_alloc_bo(device, resource, sub_resource_idx, &addr))

1 0

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

18 Feb '22

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

Zebediah Figura : wined3d: Treat NOOVERWRITE maps on a previously discarded buffer as if they were DISCARD maps.
by Alexandre Julliard 18 Feb '22

18 Feb '22

Module: wine Branch: master Commit: 83fc1807f9f85ce6c1a2e05a1d772c2e28eafd27 URL: https://source.winehq.org/git/wine.git/?a=commit;h=83fc1807f9f85ce6c1a2e05a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Feb 17 23:01:39 2022 -0600 wined3d: Treat NOOVERWRITE maps on a previously discarded buffer as if they were DISCARD maps. For the purposes of wined3d_cs_map_upload_bo(). That is, if a buffer was just created or just discarded [e.g. with wined3d_device_evict_managed_resources()], and then subsequently mapped with WINED3D_MAP_NOOVERWRITE, treat it as if it had been mapped with WINED3D_MAP_DISCARD instead, thus allowing the adapter_alloc_upload_bo callback to allocate a new buffer from the client thread. This was the source of a bunch of stalls in Grand Theft Auto V, although it's hard to measure a difference in performance. 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/buffer.c | 3 +++ dlls/wined3d/cs.c | 13 ++++++++++++- dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 16308a098e3..63afa01bb2e 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1321,6 +1321,9 @@ static HRESULT wined3d_buffer_init(struct wined3d_buffer *buffer, struct wined3d } buffer->maps_size = 1; + if (buffer->locations & WINED3D_LOCATION_DISCARDED) + buffer->resource.client.addr.buffer_object = CLIENT_BO_DISCARDED; + if (data) wined3d_buffer_init_data(buffer, device, data); diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 4a3b805c0bd..7280739b8b2 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -67,6 +67,14 @@ struct wined3d_command_list struct wined3d_deferred_query_issue *queries; }; +static void discard_client_address(struct wined3d_resource *resource) +{ + struct wined3d_client_resource *client = &resource->client; + + client->addr.buffer_object = CLIENT_BO_DISCARDED; + client->addr.addr = NULL; +} + static void invalidate_client_address(struct wined3d_resource *resource) { struct wined3d_client_resource *client = &resource->client; @@ -2430,7 +2438,7 @@ void wined3d_cs_emit_unload_resource(struct wined3d_cs *cs, struct wined3d_resou { struct wined3d_cs_unload_resource *op; - invalidate_client_address(resource); + discard_client_address(resource); op = wined3d_device_context_require_space(&cs->c, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_UNLOAD_RESOURCE; @@ -3134,6 +3142,9 @@ static bool wined3d_cs_map_upload_bo(struct wined3d_device_context *context, str return NULL; } + if ((flags & WINED3D_MAP_NOOVERWRITE) && client->addr.buffer_object == CLIENT_BO_DISCARDED) + flags = (flags & ~WINED3D_MAP_NOOVERWRITE) | WINED3D_MAP_DISCARD; + if (flags & WINED3D_MAP_DISCARD) { if (!device->adapter->adapter_ops->adapter_alloc_bo(device, resource, sub_resource_idx, &addr)) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index eff42be3aa6..989fd33d2bf 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4276,6 +4276,8 @@ static inline ULONG wined3d_atomic_decrement_mutex_lock(volatile LONG *refcount) return count - 1; } +#define CLIENT_BO_DISCARDED ((struct wined3d_bo *)~(UINT_PTR)0) + struct wined3d_client_resource { /* The resource's persistently mapped address, which we may use to perform

1 0

Nikolay Sivov : mfmediaengine: Implement GetResourceCharacteristics().
by Alexandre Julliard 18 Feb '22

18 Feb '22

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

Nikolay Sivov : mfmediaengine: Handle realtime mode flag.
by Alexandre Julliard 18 Feb '22

18 Feb '22

Module: wine Branch: master Commit: 40c992398249c039358b2bf1dcf16c075ac9ae63 URL: https://source.winehq.org/git/wine.git/?a=commit;h=40c992398249c039358b2bf1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 18 10:47:41 2022 +0300 mfmediaengine: Handle realtime mode flag. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfmediaengine/main.c | 31 ++++++++++++++++++++++---- dlls/mfmediaengine/tests/mfmediaengine.c | 38 +++++++++++++++++++++++++++++++- 2 files changed, 64 insertions(+), 5 deletions(-) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index a78cc130657..01ce8cd6437 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -1169,6 +1169,9 @@ static HRESULT media_engine_create_topology(struct media_engine *engine, IMFMedi IMFTopologyNode *sar_node = NULL, *audio_src = NULL; IMFTopologyNode *grabber_node = NULL, *video_src = NULL; + if (engine->flags & MF_MEDIA_ENGINE_REAL_TIME_MODE) + IMFTopology_SetUINT32(topology, &MF_LOW_LATENCY, TRUE); + if (sd_audio) { if (FAILED(hr = media_engine_create_source_node(source, pd, sd_audio, &audio_src))) @@ -2695,16 +2698,36 @@ static HRESULT WINAPI media_engine_SetAudioEndpointRole(IMFMediaEngineEx *iface, static HRESULT WINAPI media_engine_GetRealTimeMode(IMFMediaEngineEx *iface, BOOL *enabled) { - FIXME("%p, %p stub.\n", iface, enabled); + struct media_engine *engine = impl_from_IMFMediaEngineEx(iface); + HRESULT hr = S_OK; - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, enabled); + + EnterCriticalSection(&engine->cs); + if (engine->flags & FLAGS_ENGINE_SHUT_DOWN) + hr = MF_E_SHUTDOWN; + else + *enabled = !!(engine->flags & MF_MEDIA_ENGINE_REAL_TIME_MODE); + LeaveCriticalSection(&engine->cs); + + return hr; } static HRESULT WINAPI media_engine_SetRealTimeMode(IMFMediaEngineEx *iface, BOOL enable) { - FIXME("%p, %d stub.\n", iface, enable); + struct media_engine *engine = impl_from_IMFMediaEngineEx(iface); + HRESULT hr = S_OK; - return E_NOTIMPL; + TRACE("%p, %d.\n", iface, enable); + + EnterCriticalSection(&engine->cs); + if (engine->flags & FLAGS_ENGINE_SHUT_DOWN) + hr = MF_E_SHUTDOWN; + else + media_engine_set_flag(engine, MF_MEDIA_ENGINE_REAL_TIME_MODE, enable); + LeaveCriticalSection(&engine->cs); + + return hr; } static HRESULT WINAPI media_engine_SetCurrentTimeEx(IMFMediaEngineEx *iface, double seektime, MF_MEDIA_ENGINE_SEEK_MODE mode) diff --git a/dlls/mfmediaengine/tests/mfmediaengine.c b/dlls/mfmediaengine/tests/mfmediaengine.c index f05f24b7172..e4d9d752f20 100644 --- a/dlls/mfmediaengine/tests/mfmediaengine.c +++ b/dlls/mfmediaengine/tests/mfmediaengine.c @@ -240,12 +240,14 @@ static void test_factory(void) static void test_CreateInstance(void) { struct media_engine_notify *notify; + IMFMediaEngineEx *media_engine_ex; IMFDXGIDeviceManager *manager; IMFMediaEngine *media_engine; IMFAttributes *attributes; IUnknown *unk; UINT token; HRESULT hr; + BOOL ret; notify = create_callback(); @@ -273,7 +275,8 @@ static void test_CreateInstance(void) hr = IMFAttributes_SetUINT32(attributes, &MF_MEDIA_ENGINE_VIDEO_OUTPUT_FORMAT, DXGI_FORMAT_UNKNOWN); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - hr = IMFMediaEngineClassFactory_CreateInstance(factory, MF_MEDIA_ENGINE_WAITFORSTABLE_STATE, attributes, &media_engine); + hr = IMFMediaEngineClassFactory_CreateInstance(factory, MF_MEDIA_ENGINE_REAL_TIME_MODE + | MF_MEDIA_ENGINE_WAITFORSTABLE_STATE, attributes, &media_engine); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); check_interface(media_engine, &IID_IMFMediaEngine, TRUE); @@ -283,6 +286,29 @@ static void test_CreateInstance(void) if (SUCCEEDED(hr)) IUnknown_Release(unk); + if (SUCCEEDED(IMFMediaEngine_QueryInterface(media_engine, &IID_IMFMediaEngineEx, (void **)&media_engine_ex))) + { + hr = IMFMediaEngineEx_GetRealTimeMode(media_engine_ex, &ret); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(ret, "Unexpected value.\n"); + + hr = IMFMediaEngineEx_SetRealTimeMode(media_engine_ex, FALSE); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + hr = IMFMediaEngineEx_GetRealTimeMode(media_engine_ex, &ret); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(!ret, "Unexpected value.\n"); + + hr = IMFMediaEngineEx_SetRealTimeMode(media_engine_ex, TRUE); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + hr = IMFMediaEngineEx_GetRealTimeMode(media_engine_ex, &ret); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(ret, "Unexpected value.\n"); + + IMFMediaEngineEx_Release(media_engine_ex); + } + IMFMediaEngine_Release(media_engine); IMFAttributes_Release(attributes); IMFDXGIDeviceManager_Release(manager); @@ -301,6 +327,7 @@ static void test_Shutdown(void) double val; HRESULT hr; BSTR str; + BOOL ret; notify = create_callback(); @@ -457,6 +484,15 @@ static void test_Shutdown(void) hr = IMFMediaEngineEx_GetResourceCharacteristics(media_engine_ex, &flags); ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); + hr = IMFMediaEngineEx_GetRealTimeMode(media_engine_ex, NULL); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); + + hr = IMFMediaEngineEx_GetRealTimeMode(media_engine_ex, &ret); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); + + hr = IMFMediaEngineEx_SetRealTimeMode(media_engine_ex, TRUE); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); + IMFMediaEngineEx_Release(media_engine_ex); }

1 0

Nikolay Sivov : mfmediaengine: Implement GetPresentationAttribute().
by Alexandre Julliard 18 Feb '22

18 Feb '22

Module: wine Branch: master Commit: 2086698e7dde632e51624226a12377f42683ed1e URL: https://source.winehq.org/git/wine.git/?a=commit;h=2086698e7dde632e51624226… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 18 10:47:42 2022 +0300 mfmediaengine: Implement GetPresentationAttribute(). 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 | 8 ++++++++ 2 files changed, 27 insertions(+), 4 deletions(-) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index 01ce8cd6437..bb338a4423f 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -143,6 +143,7 @@ struct media_engine struct { IMFMediaSource *source; + IMFPresentationDescriptor *pd; } presentation; struct { @@ -1079,9 +1080,11 @@ static void media_engine_clear_presentation(struct media_engine *engine) { if (engine->presentation.source) { - IMFMediaSource_Shutdown(engine->presentation.source); - IMFMediaSource_Release(engine->presentation.source); + IMFMediaSource_Shutdown(engine->presentation.source); + IMFMediaSource_Release(engine->presentation.source); } + if (engine->presentation.pd) + IMFPresentationDescriptor_Release(engine->presentation.pd); memset(&engine->presentation, 0, sizeof(engine->presentation)); } @@ -1151,6 +1154,8 @@ static HRESULT media_engine_create_topology(struct media_engine *engine, IMFMedi engine->presentation.source = source; IMFMediaSource_AddRef(engine->presentation.source); + engine->presentation.pd = pd; + IMFPresentationDescriptor_AddRef(engine->presentation.pd); media_engine_set_flag(engine, FLAGS_ENGINE_HAS_VIDEO, !!sd_video); media_engine_set_flag(engine, FLAGS_ENGINE_HAS_AUDIO, !!sd_audio); @@ -2474,9 +2479,19 @@ static HRESULT WINAPI media_engine_GetResourceCharacteristics(IMFMediaEngineEx * static HRESULT WINAPI media_engine_GetPresentationAttribute(IMFMediaEngineEx *iface, REFGUID attribute, PROPVARIANT *value) { - FIXME("%p, %s, %p stub.\n", iface, debugstr_guid(attribute), value); + struct media_engine *engine = impl_from_IMFMediaEngineEx(iface); + HRESULT hr = E_FAIL; - return E_NOTIMPL; + TRACE("%p, %s, %p.\n", iface, debugstr_guid(attribute), value); + + EnterCriticalSection(&engine->cs); + if (engine->flags & FLAGS_ENGINE_SHUT_DOWN) + hr = MF_E_SHUTDOWN; + else if (engine->presentation.pd) + hr = IMFPresentationDescriptor_GetItem(engine->presentation.pd, attribute, value); + LeaveCriticalSection(&engine->cs); + + return hr; } static HRESULT WINAPI media_engine_GetNumberOfStreams(IMFMediaEngineEx *iface, DWORD *stream_count) diff --git a/dlls/mfmediaengine/tests/mfmediaengine.c b/dlls/mfmediaengine/tests/mfmediaengine.c index e4d9d752f20..0eaf614fc66 100644 --- a/dlls/mfmediaengine/tests/mfmediaengine.c +++ b/dlls/mfmediaengine/tests/mfmediaengine.c @@ -321,6 +321,7 @@ static void test_Shutdown(void) IMFMediaEngineEx *media_engine_ex; IMFMediaTimeRange *time_range; IMFMediaEngine *media_engine; + PROPVARIANT propvar; DWORD flags, cx, cy; unsigned int state; UINT32 value; @@ -493,6 +494,9 @@ static void test_Shutdown(void) hr = IMFMediaEngineEx_SetRealTimeMode(media_engine_ex, TRUE); ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); + hr = IMFMediaEngineEx_GetPresentationAttribute(media_engine_ex, &MF_PD_DURATION, &propvar); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); + IMFMediaEngineEx_Release(media_engine_ex); } @@ -905,6 +909,7 @@ static void test_SetSourceFromByteStream(void) { struct media_engine_notify *notify; IMFMediaEngineEx *media_engine; + PROPVARIANT propvar; DWORD flags; HRESULT hr; @@ -927,6 +932,9 @@ static void test_SetSourceFromByteStream(void) hr = IMFMediaEngineEx_GetResourceCharacteristics(media_engine, &flags); ok(hr == E_FAIL, "Unexpected hr %#lx.\n", hr); + hr = IMFMediaEngineEx_GetPresentationAttribute(media_engine, &MF_PD_DURATION, &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 GetStreamAttribute().
by Alexandre Julliard 18 Feb '22

18 Feb '22

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

Eric Pouech : sfc_os: Enable compilation with long types.
by Alexandre Julliard 18 Feb '22

18 Feb '22

Module: wine Branch: master Commit: b05bef9157958bc3da659c583c1d78243a475f3f URL: https://source.winehq.org/git/wine.git/?a=commit;h=b05bef9157958bc3da659c58… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Feb 18 09:15:57 2022 +0100 sfc_os: 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/sfc_os/Makefile.in | 1 - dlls/sfc_os/sfc_os.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/sfc_os/Makefile.in b/dlls/sfc_os/Makefile.in index 5488245195f..e3e727fc262 100644 --- a/dlls/sfc_os/Makefile.in +++ b/dlls/sfc_os/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = sfc_os.dll IMPORTLIB = sfc_os diff --git a/dlls/sfc_os/sfc_os.c b/dlls/sfc_os/sfc_os.c index f6163f5b4eb..61614264c77 100644 --- a/dlls/sfc_os/sfc_os.c +++ b/dlls/sfc_os/sfc_os.c @@ -119,7 +119,7 @@ BOOL WINAPI SfcIsKeyProtected(HKEY hKey, LPCWSTR lpSubKey, REGSAM samDesired) DWORD WINAPI SfcConnectToServer(DWORD unknown) { - FIXME("%x\n", unknown); + FIXME("%lx\n", unknown); return 0; }

1 0

Eric Pouech : shdocvw: Enable compilation with long types.
by Alexandre Julliard 18 Feb '22

18 Feb '22

Module: wine Branch: master Commit: 048084a67022f2750d1ddf002f034fef8a325493 URL: https://source.winehq.org/git/wine.git/?a=commit;h=048084a67022f2750d1ddf00… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Feb 18 09:16:03 2022 +0100 shdocvw: 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/shdocvw/Makefile.in | 2 +- dlls/shdocvw/shdocvw_main.c | 24 ++++++++++++------------ dlls/shdocvw/shlinstobj.c | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/shdocvw/Makefile.in b/dlls/shdocvw/Makefile.in index 88b5340abda..30b0a1a299c 100644 --- a/dlls/shdocvw/Makefile.in +++ b/dlls/shdocvw/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES -D_SHDOCVW_ +EXTRADEFS = -D_SHDOCVW_ MODULE = shdocvw.dll IMPORTLIB = shdocvw IMPORTS = uuid shlwapi advapi32 diff --git a/dlls/shdocvw/shdocvw_main.c b/dlls/shdocvw/shdocvw_main.c index a641bd92a73..b5b60054f2c 100644 --- a/dlls/shdocvw/shdocvw_main.c +++ b/dlls/shdocvw/shdocvw_main.c @@ -120,7 +120,7 @@ DWORD WINAPI IEWinMain(LPSTR szCommandLine, int nShowWindow) */ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD fdwReason, LPVOID fImpLoad) { - TRACE("%p 0x%x %p\n", hinst, fdwReason, fImpLoad); + TRACE("%p 0x%lx %p\n", hinst, fdwReason, fImpLoad); switch (fdwReason) { case DLL_PROCESS_ATTACH: @@ -246,7 +246,7 @@ DWORD WINAPI RunInstallUninstallStubs2(int arg) */ DWORD WINAPI SetQueryNetSessionCount(DWORD arg) { - FIXME("(%u), stub!\n", arg); + FIXME("(%lu), stub!\n", arg); return 0; } @@ -318,7 +318,7 @@ HRESULT WINAPI URLSubRegQueryA(LPCSTR regpath, LPCSTR name, DWORD type, DWORD len; LONG res; - TRACE("(%s, %s, %d, %p, %d, %d)\n", debugstr_a(regpath), debugstr_a(name), + TRACE("(%s, %s, %ld, %p, %ld, %ld)\n", debugstr_a(regpath), debugstr_a(name), type, out, outlen, unknown); if (!out) return S_OK; @@ -347,14 +347,14 @@ DWORD WINAPI ParseURLFromOutsideSourceW(LPCWSTR url, LPWSTR out, LPDWORD plen, L DWORD res = 0; - TRACE("(%s, %p, %p, %p) len: %d, unknown: 0x%x\n", debugstr_w(url), out, plen, unknown, + TRACE("(%s, %p, %p, %p) len: %ld, unknown: 0x%lx\n", debugstr_w(url), out, plen, unknown, plen ? *plen : 0, unknown ? *unknown : 0); if (!PathIsURLW(ptr)) { len = ARRAY_SIZE(buffer_in); buffer_in[0] = 0; hr = UrlApplySchemeW(ptr, buffer_in, &len, URL_APPLY_GUESSSCHEME | URL_APPLY_DEFAULT); - TRACE("got 0x%x with %s\n", hr, debugstr_w(buffer_in)); + TRACE("got 0x%lx with %s\n", hr, debugstr_w(buffer_in)); if (hr == S_OK) { /* we parsed the url to buffer_in */ ptr = buffer_in; @@ -369,7 +369,7 @@ DWORD WINAPI ParseURLFromOutsideSourceW(LPCWSTR url, LPWSTR out, LPDWORD plen, L buffer_out[0] = '\0'; hr = UrlCanonicalizeW(ptr, buffer_out, &len, URL_ESCAPE_SPACES_ONLY); needed = lstrlenW(buffer_out)+1; - TRACE("got 0x%x with %s (need %d)\n", hr, debugstr_w(buffer_out), needed); + TRACE("got 0x%lx with %s (need %ld)\n", hr, debugstr_w(buffer_out), needed); if (*plen >= needed) { if (out != NULL) { @@ -381,7 +381,7 @@ DWORD WINAPI ParseURLFromOutsideSourceW(LPCWSTR url, LPWSTR out, LPDWORD plen, L *plen = needed; - TRACE("=> %d\n", res); + TRACE("=> %ld\n", res); return res; } @@ -398,7 +398,7 @@ DWORD WINAPI ParseURLFromOutsideSourceA(LPCSTR url, LPSTR out, LPDWORD plen, LPD DWORD res; DWORD len; - TRACE("(%s, %p, %p, %p) len: %d, unknown: 0x%x\n", debugstr_a(url), out, plen, unknown, + TRACE("(%s, %p, %p, %p) len: %ld, unknown: 0x%lx\n", debugstr_a(url), out, plen, unknown, plen ? *plen : 0, unknown ? *unknown : 0); if (url) { @@ -424,7 +424,7 @@ DWORD WINAPI ParseURLFromOutsideSourceA(LPCSTR url, LPSTR out, LPDWORD plen, LPD *plen = needed; - TRACE("=> %d\n", res); + TRACE("=> %ld\n", res); return res; } @@ -434,7 +434,7 @@ DWORD WINAPI ParseURLFromOutsideSourceA(LPCSTR url, LPSTR out, LPDWORD plen, LPD HRESULT WINAPI IEParseDisplayNameWithBCW(DWORD codepage, LPCWSTR lpszDisplayName, LPBC pbc, LPITEMIDLIST *ppidl) { /* Guessing at parameter 3 based on IShellFolder's ParseDisplayName */ - FIXME("stub: 0x%x %s %p %p\n",codepage,debugstr_w(lpszDisplayName),pbc,ppidl); + FIXME("stub: 0x%lx %s %p %p\n",codepage,debugstr_w(lpszDisplayName),pbc,ppidl); return E_FAIL; } @@ -443,7 +443,7 @@ HRESULT WINAPI IEParseDisplayNameWithBCW(DWORD codepage, LPCWSTR lpszDisplayName */ DWORD WINAPI SHRestricted2W(DWORD res, LPCWSTR url, DWORD reserved) { - FIXME("(%d %s %d) stub\n", res, debugstr_w(url), reserved); + FIXME("(%ld %s %ld) stub\n", res, debugstr_w(url), reserved); return 0; } @@ -457,7 +457,7 @@ DWORD WINAPI SHRestricted2A(DWORD restriction, LPCSTR url, DWORD reserved) LPWSTR urlW = NULL; DWORD res; - TRACE("(%d, %s, %d)\n", restriction, debugstr_a(url), reserved); + TRACE("(%ld, %s, %ld)\n", restriction, debugstr_a(url), reserved); if (url) { DWORD len = MultiByteToWideChar(CP_ACP, 0, url, -1, NULL, 0); urlW = heap_alloc(len * sizeof(WCHAR)); diff --git a/dlls/shdocvw/shlinstobj.c b/dlls/shdocvw/shlinstobj.c index f148a27619e..d1405a6bb53 100644 --- a/dlls/shdocvw/shlinstobj.c +++ b/dlls/shdocvw/shlinstobj.c @@ -274,14 +274,14 @@ static HRESULT WINAPI InstanceObjectFactory_IClassFactory_CreateInstance(IClassF hr = CoCreateInstance(&This->m_clsidInstance, NULL, CLSCTX_INPROC_SERVER, &IID_IPersistPropertyBag, (LPVOID*)&pPersistPropertyBag); if (FAILED(hr)) { - TRACE("Failed to create instance of %s. hr = %08x\n", + TRACE("Failed to create instance of %s. hr = %08lx\n", debugstr_guid(&This->m_clsidInstance), hr); return hr; } hr = IPersistPropertyBag_Load(pPersistPropertyBag, This->m_pPropertyBag, NULL); if (FAILED(hr)) { - TRACE("Failed to initialize object from PropertyBag: hr = %08x\n", hr); + TRACE("Failed to initialize object from PropertyBag: hr = %08lx\n", hr); IPersistPropertyBag_Release(pPersistPropertyBag); return hr; }

1 0

Eric Pouech : shell32: Enable compilation with long types.
by Alexandre Julliard 18 Feb '22

18 Feb '22

Module: wine Branch: master Commit: 570e24a014f16dd8b5ea8d0ca45937d68276e7aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=570e24a014f16dd8b5ea8d0c… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Feb 18 09:16:09 2022 +0100 shell32: 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/shell32/Makefile.in | 2 +- dlls/shell32/appbar.c | 6 +-- dlls/shell32/assoc.c | 34 ++++++++--------- dlls/shell32/autocomplete.c | 6 +-- dlls/shell32/brsfolder.c | 16 ++++---- dlls/shell32/changenotify.c | 16 ++++---- dlls/shell32/classes.c | 2 +- dlls/shell32/control.c | 6 +-- dlls/shell32/cpanelfolder.c | 36 +++++++++--------- dlls/shell32/dataobject.c | 14 +++---- dlls/shell32/debughlp.c | 6 +-- dlls/shell32/dragdrophelper.c | 12 +++--- dlls/shell32/ebrowser.c | 38 +++++++++---------- dlls/shell32/enumidlist.c | 10 ++--- dlls/shell32/folders.c | 4 +- dlls/shell32/iconcache.c | 6 +-- dlls/shell32/pidl.c | 32 ++++++++-------- dlls/shell32/recyclebin.c | 14 +++---- dlls/shell32/shell32_main.c | 34 ++++++++--------- dlls/shell32/shelldispatch.c | 84 ++++++++++++++++++++--------------------- dlls/shell32/shellitem.c | 34 ++++++++--------- dlls/shell32/shelllink.c | 48 +++++++++++------------ dlls/shell32/shellole.c | 32 ++++++++-------- dlls/shell32/shellord.c | 64 +++++++++++++++---------------- dlls/shell32/shellpath.c | 84 ++++++++++++++++++++--------------------- dlls/shell32/shellstring.c | 8 ++-- dlls/shell32/shfldr_desktop.c | 24 ++++++------ dlls/shell32/shfldr_fs.c | 30 +++++++-------- dlls/shell32/shfldr_mycomp.c | 30 +++++++-------- dlls/shell32/shfldr_netplaces.c | 26 ++++++------- dlls/shell32/shfldr_printers.c | 16 ++++---- dlls/shell32/shlexec.c | 26 ++++++------- dlls/shell32/shlfileop.c | 16 ++++---- dlls/shell32/shlfolder.c | 24 ++++++------ dlls/shell32/shlfsbind.c | 4 +- dlls/shell32/shlmenu.c | 20 +++++----- dlls/shell32/shlview.c | 50 ++++++++++++------------ dlls/shell32/shlview_cmenu.c | 14 +++---- dlls/shell32/systray.c | 6 +-- 39 files changed, 467 insertions(+), 467 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=570e24a014f16dd8b5ea…

1 0