- wine-devel - winehq.org

[PATCH] include: Add structure padding for aarch64 in dbghelp.h.
by Biswapriyo Nath 21 Jul '21

21 Jul '21

1 0

Wine staging 6.13 release
by Alistair Leslie-Hughes 21 Jul '21

21 Jul '21

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary since last release * Rebased to current wine 6.13 (608 patches are applied to wine vanilla) Upstreamed (Either directly from staging or fixed with a similar patch). * mfplat: Fix copy/paste error * server: Explicitly forbid connecting a listening or connected socket. Added: * None Updated: * None Where can you help * Run Steam/Battle.net/GOG/UPlay/Epic * Test your favorite game. * Test your favorite applications. * Improve staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

1 0

[PATCH 1/2] mfmediaengine: Handle shutdown state in SetSource().
by Nikolay Sivov 20 Jul '21

20 Jul '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfmediaengine/main.c | 46 +++++++++++++----------- dlls/mfmediaengine/tests/mfmediaengine.c | 1 - 2 files changed, 26 insertions(+), 21 deletions(-) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index e4263febe5e..36365f2a3cc 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -1352,29 +1352,35 @@ static HRESULT WINAPI media_engine_SetSource(IMFMediaEngine *iface, BSTR url) EnterCriticalSection(&engine->cs); - SysFreeString(engine->current_source); - engine->current_source = NULL; - if (url) - engine->current_source = SysAllocString(url); - - engine->ready_state = MF_MEDIA_ENGINE_READY_HAVE_NOTHING; - - IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_PURGEQUEUEDEVENTS, 0, 0); - - if (url) + if (engine->flags & FLAGS_ENGINE_SHUT_DOWN) + hr = MF_E_SHUTDOWN; + else { - IPropertyStore *props = NULL; - unsigned int flags; + SysFreeString(engine->current_source); + engine->current_source = NULL; + if (url) + engine->current_source = SysAllocString(url); + + engine->ready_state = MF_MEDIA_ENGINE_READY_HAVE_NOTHING; - flags = MF_RESOLUTION_MEDIASOURCE; - if (engine->flags & MF_MEDIA_ENGINE_DISABLE_LOCAL_PLUGINS) - flags |= MF_RESOLUTION_DISABLE_LOCAL_PLUGINS; + IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_PURGEQUEUEDEVENTS, 0, 0); - IMFAttributes_GetUnknown(engine->attributes, &MF_MEDIA_ENGINE_SOURCE_RESOLVER_CONFIG_STORE, - &IID_IPropertyStore, (void **)&props); - hr = IMFSourceResolver_BeginCreateObjectFromURL(engine->resolver, url, flags, props, NULL, &engine->load_handler, NULL); - if (props) - IPropertyStore_Release(props); + if (url) + { + IPropertyStore *props = NULL; + unsigned int flags; + + flags = MF_RESOLUTION_MEDIASOURCE; + if (engine->flags & MF_MEDIA_ENGINE_DISABLE_LOCAL_PLUGINS) + flags |= MF_RESOLUTION_DISABLE_LOCAL_PLUGINS; + + IMFAttributes_GetUnknown(engine->attributes, &MF_MEDIA_ENGINE_SOURCE_RESOLVER_CONFIG_STORE, + &IID_IPropertyStore, (void **)&props); + hr = IMFSourceResolver_BeginCreateObjectFromURL(engine->resolver, url, flags, props, NULL, + &engine->load_handler, NULL); + if (props) + IPropertyStore_Release(props); + } } LeaveCriticalSection(&engine->cs); diff --git a/dlls/mfmediaengine/tests/mfmediaengine.c b/dlls/mfmediaengine/tests/mfmediaengine.c index 66984595d3b..096f6e3f2a5 100644 --- a/dlls/mfmediaengine/tests/mfmediaengine.c +++ b/dlls/mfmediaengine/tests/mfmediaengine.c @@ -253,7 +253,6 @@ static void test_Shutdown(void) ok(hr == MF_E_SHUTDOWN || broken(hr == S_OK) /* before win10 */, "Unexpected hr %#x.\n", hr); hr = IMFMediaEngine_SetSource(media_engine, NULL); -todo_wine ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); hr = IMFMediaEngine_GetCurrentSource(media_engine, &str); -- 2.30.2

1 1

[PATCH] msvcrt: Don't set x87 control word in x86_64 fesetenv.
by Piotr Caban 20 Jul '21

20 Jul '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51215 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/math.c | 4 ++++ 1 file changed, 4 insertions(+)

1 0

[PATCH 1/6] wined3d: Implement constant buffer offsetting for Vulkan.
by Zebediah Figura 20 Jul '21

20 Jul '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/wined3d/buffer.c | 14 +++------- dlls/wined3d/context_vk.c | 49 ++++++++++++++++++++++------------ dlls/wined3d/wined3d_private.h | 4 +-- 3 files changed, 38 insertions(+), 29 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 4c5e2054fe0..2dbff2310ad 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1431,17 +1431,11 @@ static BOOL wined3d_buffer_vk_create_buffer_object(struct wined3d_buffer_vk *buf return TRUE; } -const VkDescriptorBufferInfo *wined3d_buffer_vk_get_buffer_info(struct wined3d_buffer_vk *buffer_vk) +void wined3d_buffer_vk_get_buffer_info(struct wined3d_buffer_vk *buffer_vk, VkDescriptorBufferInfo *buffer_info) { - if (buffer_vk->bo_user.valid) - return &buffer_vk->buffer_info; - - buffer_vk->buffer_info.buffer = buffer_vk->bo.vk_buffer; - buffer_vk->buffer_info.offset = buffer_vk->bo.buffer_offset; - buffer_vk->buffer_info.range = buffer_vk->b.resource.size; - buffer_vk->bo_user.valid = true; - - return &buffer_vk->buffer_info; + buffer_info->buffer = buffer_vk->bo.vk_buffer; + buffer_info->offset = buffer_vk->bo.buffer_offset; + buffer_info->range = buffer_vk->b.resource.size; } static BOOL wined3d_buffer_vk_prepare_location(struct wined3d_buffer *buffer, diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index d1a113d1f81..7a2a9d2bfb3 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -2418,8 +2418,8 @@ static void wined3d_context_vk_bind_vertex_buffers(struct wined3d_context_vk *co VkDeviceSize offsets[ARRAY_SIZE(state->streams)] = {0}; VkBuffer buffers[ARRAY_SIZE(state->streams)]; const struct wined3d_stream_state *stream; - const VkDescriptorBufferInfo *buffer_info; struct wined3d_buffer_vk *buffer_vk; + VkDescriptorBufferInfo buffer_info; struct wined3d_buffer *buffer; unsigned int i, first, count; @@ -2432,10 +2432,10 @@ static void wined3d_context_vk_bind_vertex_buffers(struct wined3d_context_vk *co if ((buffer = stream->buffer)) { buffer_vk = wined3d_buffer_vk(buffer); - buffer_info = wined3d_buffer_vk_get_buffer_info(buffer_vk); + wined3d_buffer_vk_get_buffer_info(buffer_vk, &buffer_info); wined3d_context_vk_reference_bo(context_vk, &buffer_vk->bo); - buffers[count] = buffer_info->buffer; - offsets[count] = buffer_info->offset + stream->offset; + buffers[count] = buffer_info.buffer; + offsets[count] = buffer_info.offset + stream->offset; ++count; continue; } @@ -2457,8 +2457,8 @@ static void wined3d_context_vk_bind_stream_output_buffers(struct wined3d_context VkDeviceSize sizes[ARRAY_SIZE(state->stream_output)]; VkBuffer buffers[ARRAY_SIZE(state->stream_output)]; const struct wined3d_stream_output *stream; - const VkDescriptorBufferInfo *buffer_info; struct wined3d_buffer_vk *buffer_vk; + VkDescriptorBufferInfo buffer_info; struct wined3d_buffer *buffer; unsigned int i, first, count; @@ -2471,16 +2471,16 @@ static void wined3d_context_vk_bind_stream_output_buffers(struct wined3d_context if ((buffer = stream->buffer)) { buffer_vk = wined3d_buffer_vk(buffer); - buffer_info = wined3d_buffer_vk_get_buffer_info(buffer_vk); + wined3d_buffer_vk_get_buffer_info(buffer_vk, &buffer_info); wined3d_context_vk_reference_bo(context_vk, &buffer_vk->bo); - buffers[count] = buffer_info->buffer; + buffers[count] = buffer_info.buffer; if ((offsets[count] = stream->offset) == ~0u) { FIXME("Appending to stream output buffers not implemented.\n"); offsets[count] = 0; } - sizes[count] = buffer_info->range - offsets[count]; - offsets[count] += buffer_info->offset; + sizes[count] = buffer_info.range - offsets[count]; + offsets[count] += buffer_info.offset; ++count; continue; } @@ -2654,6 +2654,7 @@ static bool wined3d_context_vk_update_descriptors(struct wined3d_context_vk *con VkCommandBuffer vk_command_buffer, const struct wined3d_state *state, enum wined3d_pipeline pipeline) { struct wined3d_shader_descriptor_writes_vk *writes = &context_vk->descriptor_writes; + VkDescriptorBufferInfo buffers[WINED3D_SHADER_TYPE_COUNT][MAX_CONSTANT_BUFFERS]; struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); const struct wined3d_vk_info *vk_info = context_vk->vk_info; const struct wined3d_shader_resource_binding *binding; @@ -2661,7 +2662,6 @@ static bool wined3d_context_vk_update_descriptors(struct wined3d_context_vk *con struct wined3d_unordered_access_view_vk *uav_vk; struct wined3d_shader_resource_view_vk *srv_vk; struct wined3d_unordered_access_view *uav; - const VkDescriptorBufferInfo *buffer_info; struct wined3d_shader_resource_view *srv; const VkDescriptorImageInfo *image_info; struct wined3d_buffer_vk *buffer_vk; @@ -2713,7 +2713,13 @@ static bool wined3d_context_vk_update_descriptors(struct wined3d_context_vk *con switch (binding->shader_descriptor_type) { case WINED3D_SHADER_DESCRIPTOR_TYPE_CBV: - if (!(buffer = state->cb[binding->shader_type][binding->resource_idx].buffer)) + { + enum wined3d_shader_type shader_type = binding->shader_type; + size_t resource_idx = binding->resource_idx; + const struct wined3d_constant_buffer_state *cb_state = &state->cb[shader_type][resource_idx]; + VkDescriptorBufferInfo *buffer_info = &buffers[shader_type][resource_idx]; + + if (!(buffer = cb_state->buffer)) { if (!wined3d_shader_descriptor_writes_vk_add_write(writes, vk_descriptor_set, binding->binding_idx, VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, @@ -2722,12 +2728,16 @@ static bool wined3d_context_vk_update_descriptors(struct wined3d_context_vk *con break; } buffer_vk = wined3d_buffer_vk(buffer); - buffer_info = wined3d_buffer_vk_get_buffer_info(buffer_vk); + wined3d_buffer_vk_get_buffer_info(buffer_vk, buffer_info); + buffer_info->offset += cb_state->offset; + buffer_info->range = cb_state->size; + if (!wined3d_shader_descriptor_writes_vk_add_write(writes, vk_descriptor_set, binding->binding_idx, VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, buffer_info, NULL, NULL)) return false; wined3d_context_vk_reference_bo(context_vk, &buffer_vk->bo); break; + } case WINED3D_SHADER_DESCRIPTOR_TYPE_SRV: if (!(srv = state->shader_resource_view[binding->shader_type][binding->resource_idx])) @@ -2988,7 +2998,11 @@ static void wined3d_context_vk_load_shader_resources(struct wined3d_context_vk * switch (binding->shader_descriptor_type) { case WINED3D_SHADER_DESCRIPTOR_TYPE_CBV: - if (!(buffer = state->cb[binding->shader_type][binding->resource_idx].buffer)) + { + const struct wined3d_constant_buffer_state *cb_state + = &state->cb[binding->shader_type][binding->resource_idx]; + + if (!(buffer = cb_state->buffer)) break; buffer_vk = wined3d_buffer_vk(buffer); @@ -3002,6 +3016,7 @@ static void wined3d_context_vk_load_shader_resources(struct wined3d_context_vk * } wined3d_buffer_vk_barrier(buffer_vk, context_vk, WINED3D_BIND_CONSTANT_BUFFER); break; + } case WINED3D_SHADER_DESCRIPTOR_TYPE_SRV: if (!(srv = state->shader_resource_view[binding->shader_type][binding->resource_idx])) @@ -3250,7 +3265,7 @@ VkCommandBuffer wined3d_context_vk_apply_draw_state(struct wined3d_context_vk *c if (wined3d_context_is_graphics_state_dirty(&context_vk->c, STATE_INDEXBUFFER) && state->index_buffer) { - const VkDescriptorBufferInfo *buffer_info; + VkDescriptorBufferInfo buffer_info; VkIndexType idx_type; if (state->index_format == WINED3DFMT_R16_UINT) @@ -3258,10 +3273,10 @@ VkCommandBuffer wined3d_context_vk_apply_draw_state(struct wined3d_context_vk *c else idx_type = VK_INDEX_TYPE_UINT32; buffer_vk = wined3d_buffer_vk(state->index_buffer); - buffer_info = wined3d_buffer_vk_get_buffer_info(buffer_vk); + wined3d_buffer_vk_get_buffer_info(buffer_vk, &buffer_info); wined3d_context_vk_reference_bo(context_vk, &buffer_vk->bo); - VK_CALL(vkCmdBindIndexBuffer(vk_command_buffer, buffer_info->buffer, - buffer_info->offset + state->index_offset, idx_type)); + VK_CALL(vkCmdBindIndexBuffer(vk_command_buffer, buffer_info.buffer, + buffer_info.offset + state->index_offset, idx_type)); } if (wined3d_context_is_graphics_state_dirty(&context_vk->c, STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_PIXEL)) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a2048fc6ea6..ca85f811673 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4971,7 +4971,6 @@ struct wined3d_buffer_vk struct wined3d_bo_vk bo; struct wined3d_bo_user bo_user; - VkDescriptorBufferInfo buffer_info; uint32_t bind_mask; }; @@ -4982,7 +4981,8 @@ static inline struct wined3d_buffer_vk *wined3d_buffer_vk(struct wined3d_buffer void wined3d_buffer_vk_barrier(struct wined3d_buffer_vk *buffer_vk, struct wined3d_context_vk *context_vk, uint32_t bind_mask) DECLSPEC_HIDDEN; -const VkDescriptorBufferInfo *wined3d_buffer_vk_get_buffer_info(struct wined3d_buffer_vk *buffer_vk) DECLSPEC_HIDDEN; +void wined3d_buffer_vk_get_buffer_info(struct wined3d_buffer_vk *buffer_vk, + VkDescriptorBufferInfo *buffer_info) DECLSPEC_HIDDEN; HRESULT wined3d_buffer_vk_init(struct wined3d_buffer_vk *buffer_vk, 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; -- 2.32.0

2 7

WoW64 on Catalina
by Theodore Dubois 20 Jul '21

20 Jul '21

The latest I've found is that Alexandre's favorite solution is to insert thunks between 32-bit PE libraries and 64 bit host interface libraries. At the time PE libraries weren't really a thing yet, but they seem to be now. Is the PE work in a state where it would be possible to start generating thunks? Is anyone working on this? ~Theodore

2 1

[PATCH 4/4] d2d1: Implement d2d_effect_GetOutput().
by Henri Verbeet 20 Jul '21

20 Jul '21

From: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 209629. dlls/d2d1/effect.c | 6 +++++- dlls/d2d1/tests/d2d1.c | 7 +++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/d2d1/effect.c b/dlls/d2d1/effect.c index 7487c4c4539..40dd2187953 100644 --- a/dlls/d2d1/effect.c +++ b/dlls/d2d1/effect.c @@ -190,7 +190,11 @@ static UINT32 STDMETHODCALLTYPE d2d_effect_GetInputCount(ID2D1Effect *iface) static void STDMETHODCALLTYPE d2d_effect_GetOutput(ID2D1Effect *iface, ID2D1Image **output) { - FIXME("iface %p, output %p stub!\n", iface, output); + struct d2d_effect *effect = impl_from_ID2D1Effect(iface); + + TRACE("iface %p, output %p.\n", iface, output); + + ID2D1Image_AddRef(*output = &effect->ID2D1Image_iface); } static const ID2D1EffectVtbl d2d_effect_vtbl = diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 5ac4aed7c4c..1ee4941da99 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -9680,7 +9680,7 @@ static void test_mt_factory(BOOL d3d11) static void test_effect(BOOL d3d11) { - ID2D1Image *image_a, *image_b = NULL; + ID2D1Image *image_a, *image_b; struct d2d1_test_context ctx; ID2D1DeviceContext *context; ID2D1Factory1 *factory; @@ -9705,9 +9705,8 @@ static void test_effect(BOOL d3d11) hr = ID2D1Effect_QueryInterface(effect, &IID_ID2D1Image, (void **)&image_a); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); ID2D1Effect_GetOutput(effect, &image_b); - todo_wine ok(image_b == image_a, "Got unexpected image_b %p, expected %p.\n", image_b, image_a); - if (image_b) - ID2D1Image_Release(image_b); + ok(image_b == image_a, "Got unexpected image_b %p, expected %p.\n", image_b, image_a); + ID2D1Image_Release(image_b); ID2D1Image_Release(image_a); ID2D1Effect_Release(effect); -- 2.20.1

1 0

[PATCH 3/4] d2d1: Add a ID2D1Image interface for effects.
by Henri Verbeet 20 Jul '21

20 Jul '21

From: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 209630. dlls/d2d1/d2d1_private.h | 5 +++- dlls/d2d1/device.c | 3 +- dlls/d2d1/effect.c | 65 +++++++++++++++++++++++++++++++++++++++- dlls/d2d1/tests/d2d1.c | 5 +--- 4 files changed, 71 insertions(+), 7 deletions(-) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index f25a7809b17..ce99e7c3432 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -568,10 +568,13 @@ void d2d_device_init(struct d2d_device *device, ID2D1Factory1 *factory, IDXGIDev struct d2d_effect { ID2D1Effect ID2D1Effect_iface; + ID2D1Image ID2D1Image_iface; LONG refcount; + + ID2D1Factory *factory; }; -void d2d_effect_init(struct d2d_effect *effect) DECLSPEC_HIDDEN; +void d2d_effect_init(struct d2d_effect *effect, ID2D1Factory *factory) DECLSPEC_HIDDEN; static inline BOOL d2d_array_reserve(void **elements, size_t *capacity, size_t count, size_t size) { diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index 44840f0010f..0647bc57fc3 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -1885,6 +1885,7 @@ static HRESULT STDMETHODCALLTYPE d2d_device_context_CreateBitmapFromDxgiSurface( static HRESULT STDMETHODCALLTYPE d2d_device_context_CreateEffect(ID2D1DeviceContext *iface, REFCLSID effect_id, ID2D1Effect **effect) { + struct d2d_device_context *context = impl_from_ID2D1DeviceContext(iface); struct d2d_effect *object; FIXME("iface %p, effect_id %s, effect %p stub!\n", iface, debugstr_guid(effect_id), effect); @@ -1892,7 +1893,7 @@ static HRESULT STDMETHODCALLTYPE d2d_device_context_CreateEffect(ID2D1DeviceCont if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; - d2d_effect_init(object); + d2d_effect_init(object, context->factory); TRACE("Created effect %p.\n", object); *effect = &object->ID2D1Effect_iface; diff --git a/dlls/d2d1/effect.c b/dlls/d2d1/effect.c index fb1e66a3d9b..7487c4c4539 100644 --- a/dlls/d2d1/effect.c +++ b/dlls/d2d1/effect.c @@ -27,6 +27,7 @@ static inline struct d2d_effect *impl_from_ID2D1Effect(ID2D1Effect *iface) static HRESULT STDMETHODCALLTYPE d2d_effect_QueryInterface(ID2D1Effect *iface, REFIID iid, void **out) { + struct d2d_effect *effect = impl_from_ID2D1Effect(iface); TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); if (IsEqualGUID(iid, &IID_ID2D1Effect) @@ -38,6 +39,14 @@ static HRESULT STDMETHODCALLTYPE d2d_effect_QueryInterface(ID2D1Effect *iface, R return S_OK; } + if (IsEqualGUID(iid, &IID_ID2D1Image) + || IsEqualGUID(iid, &IID_ID2D1Resource)) + { + ID2D1Image_AddRef(&effect->ID2D1Image_iface); + *out = &effect->ID2D1Image_iface; + return S_OK; + } + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); *out = NULL; @@ -62,7 +71,10 @@ static ULONG STDMETHODCALLTYPE d2d_effect_Release(ID2D1Effect *iface) TRACE("%p decreasing refcount to %u.\n", iface, refcount); if (!refcount) + { + ID2D1Factory_Release(effect->factory); heap_free(effect); + } return refcount; } @@ -204,8 +216,59 @@ static const ID2D1EffectVtbl d2d_effect_vtbl = d2d_effect_GetOutput, }; -void d2d_effect_init(struct d2d_effect *effect) +static inline struct d2d_effect *impl_from_ID2D1Image(ID2D1Image *iface) +{ + return CONTAINING_RECORD(iface, struct d2d_effect, ID2D1Image_iface); +} + +static HRESULT STDMETHODCALLTYPE d2d_effect_image_QueryInterface(ID2D1Image *iface, REFIID iid, void **out) +{ + struct d2d_effect *effect = impl_from_ID2D1Image(iface); + + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); + + return d2d_effect_QueryInterface(&effect->ID2D1Effect_iface, iid, out); +} + +static ULONG STDMETHODCALLTYPE d2d_effect_image_AddRef(ID2D1Image *iface) +{ + struct d2d_effect *effect = impl_from_ID2D1Image(iface); + + TRACE("iface %p.\n", iface); + + return d2d_effect_AddRef(&effect->ID2D1Effect_iface); +} + +static ULONG STDMETHODCALLTYPE d2d_effect_image_Release(ID2D1Image *iface) +{ + struct d2d_effect *effect = impl_from_ID2D1Image(iface); + + TRACE("iface %p.\n", iface); + + return d2d_effect_Release(&effect->ID2D1Effect_iface); +} + +static void STDMETHODCALLTYPE d2d_effect_image_GetFactory(ID2D1Image *iface, ID2D1Factory **factory) +{ + struct d2d_effect *effect = impl_from_ID2D1Image(iface); + + TRACE("iface %p, factory %p.\n", iface, factory); + + ID2D1Factory_AddRef(*factory = effect->factory); +} + +static const ID2D1ImageVtbl d2d_effect_image_vtbl = +{ + d2d_effect_image_QueryInterface, + d2d_effect_image_AddRef, + d2d_effect_image_Release, + d2d_effect_image_GetFactory, +}; + +void d2d_effect_init(struct d2d_effect *effect, ID2D1Factory *factory) { effect->ID2D1Effect_iface.lpVtbl = &d2d_effect_vtbl; + effect->ID2D1Image_iface.lpVtbl = &d2d_effect_image_vtbl; effect->refcount = 1; + ID2D1Factory_AddRef(effect->factory = factory); } diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 41203f85019..5ac4aed7c4c 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -9703,16 +9703,13 @@ static void test_effect(BOOL d3d11) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); hr = ID2D1Effect_QueryInterface(effect, &IID_ID2D1Image, (void **)&image_a); - todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - if (hr != S_OK) - goto done; + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); ID2D1Effect_GetOutput(effect, &image_b); todo_wine ok(image_b == image_a, "Got unexpected image_b %p, expected %p.\n", image_b, image_a); if (image_b) ID2D1Image_Release(image_b); ID2D1Image_Release(image_a); -done: ID2D1Effect_Release(effect); ID2D1DeviceContext_Release(context); ID2D1Factory1_Release(factory); -- 2.20.1

1 0

[PATCH 2/4] d2d1/tests: Add an effects test.
by Henri Verbeet 20 Jul '21

20 Jul '21

From: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 209628. dlls/d2d1/tests/d2d1.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index e60128b38f2..41203f85019 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -9678,6 +9678,47 @@ static void test_mt_factory(BOOL d3d11) ID2D1Factory_Release(factory); } +static void test_effect(BOOL d3d11) +{ + ID2D1Image *image_a, *image_b = NULL; + struct d2d1_test_context ctx; + ID2D1DeviceContext *context; + ID2D1Factory1 *factory; + ID2D1Effect *effect; + HRESULT hr; + + if (!init_test_context(&ctx, d3d11)) + return; + + if (FAILED(D2D1CreateFactory(D2D1_FACTORY_TYPE_SINGLE_THREADED, &IID_ID2D1Factory1, NULL, (void **)&factory))) + { + win_skip("ID2D1Factory1 is not supported.\n"); + release_test_context(&ctx); + return; + } + + hr = ID2D1RenderTarget_QueryInterface(ctx.rt, &IID_ID2D1DeviceContext, (void **)&context); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ID2D1DeviceContext_CreateEffect(context, &CLSID_D2D12DAffineTransform, &effect); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + hr = ID2D1Effect_QueryInterface(effect, &IID_ID2D1Image, (void **)&image_a); + todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + if (hr != S_OK) + goto done; + ID2D1Effect_GetOutput(effect, &image_b); + todo_wine ok(image_b == image_a, "Got unexpected image_b %p, expected %p.\n", image_b, image_a); + if (image_b) + ID2D1Image_Release(image_b); + ID2D1Image_Release(image_a); + +done: + ID2D1Effect_Release(effect); + ID2D1DeviceContext_Release(context); + ID2D1Factory1_Release(factory); + release_test_context(&ctx); +} + START_TEST(d2d1) { HMODULE d2d1_dll = GetModuleHandleA("d2d1.dll"); @@ -9739,6 +9780,7 @@ START_TEST(d2d1) queue_d3d10_test(test_colour_space); queue_test(test_geometry_group); queue_test(test_mt_factory); + queue_test(test_effect); run_queued_tests(); } -- 2.20.1

1 0

[PATCH 1/4] include: Add the D2D12DAffineTransform definitions.
by Henri Verbeet 20 Jul '21

20 Jul '21

From: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 209631. include/Makefile.in | 1 + include/d2d1_1.idl | 1 + include/d2d1effects.idl | 46 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 48 insertions(+) create mode 100755 include/d2d1effects.idl diff --git a/include/Makefile.in b/include/Makefile.in index 61a74a210c9..46cb0f53a5e 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -99,6 +99,7 @@ SOURCES = \ d2d1.idl \ d2d1_1.idl \ d2d1_2.idl \ + d2d1effects.idl \ d2dbasetypes.h \ d2derr.h \ d3d.h \ diff --git a/include/d2d1_1.idl b/include/d2d1_1.idl index 257a970968f..fdec8ae5f9c 100644 --- a/include/d2d1_1.idl +++ b/include/d2d1_1.idl @@ -17,6 +17,7 @@ */ import "d2d1.idl"; +import "d2d1effects.idl"; interface ID2D1DeviceContext; interface ID2D1PathGeometry1; diff --git a/include/d2d1effects.idl b/include/d2d1effects.idl new file mode 100755 index 00000000000..ee1dbe94728 --- /dev/null +++ b/include/d2d1effects.idl @@ -0,0 +1,46 @@ +/* + * Copyright 2021 Ziqing Hui for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +cpp_quote("DEFINE_GUID(CLSID_D2D12DAffineTransform, 0x6aa97485,0x6354,0x4cfc,0x90,0x8c,0xe4,0xa7,0x4f,0x62,0xc9,0x6c);") + +typedef enum D2D1_BORDER_MODE +{ + D2D1_BORDER_MODE_SOFT = 0x0, + D2D1_BORDER_MODE_HARD = 0x1, + D2D1_BORDER_MODE_FORCE_DWORD = 0xffffffff +} D2D1_BORDER_MODE; + +typedef enum D2D1_2DAFFINETRANSFORM_PROP +{ + D2D1_2DAFFINETRANSFORM_PROP_INTERPOLATION_MODE = 0x0, + D2D1_2DAFFINETRANSFORM_PROP_BORDER_MODE = 0x1, + D2D1_2DAFFINETRANSFORM_PROP_TRANSFORM_MATRIX = 0x2, + D2D1_2DAFFINETRANSFORM_PROP_SHARPNESS = 0x3, + D2D1_2DAFFINETRANSFORM_PROP_FORCE_DWORD = 0xffffffff +} D2D1_2DAFFINETRANSFORM_PROP; + +typedef enum D2D1_2DAFFINETRANSFORM_INTERPOLATION_MODE +{ + D2D1_2DAFFINETRANSFORM_INTERPOLATION_MODE_NEAREST_NEIGHBOR = 0x0, + D2D1_2DAFFINETRANSFORM_INTERPOLATION_MODE_LINEAR = 0x1, + D2D1_2DAFFINETRANSFORM_INTERPOLATION_MODE_CUBIC = 0x2, + D2D1_2DAFFINETRANSFORM_INTERPOLATION_MODE_MULTI_SAMPLE_LINEAR = 0x3, + D2D1_2DAFFINETRANSFORM_INTERPOLATION_MODE_ANISOTROPIC = 0x4, + D2D1_2DAFFINETRANSFORM_INTERPOLATION_MODE_HIGH_QUALITY_CUBIC = 0x5, + D2D1_2DAFFINETRANSFORM_INTERPOLATION_MODE_FORCE_DWORD = 0xffffffff +} D2D1_2DAFFINETRANSFORM_INTERPOLATION_MODE; -- 2.20.1

1 0

[PATCH v3 5/5] uxtheme: Support scroll bar state tracking in non-client areas.
by Zhiyi Zhang 20 Jul '21

20 Jul '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v3: Supersede 209912. Fix a style inconsistency. dlls/user32/controls.h | 3 +++ dlls/user32/defwnd.c | 11 +++++++++++ dlls/user32/nonclient.c | 33 +++++++++++++++++++++++++++++++++ dlls/user32/scroll.c | 37 ++++++++++++++++++++++++++++++++++--- 4 files changed, 81 insertions(+), 3 deletions(-) diff --git a/dlls/user32/controls.h b/dlls/user32/controls.h index bf32097f95c..2b3d405ae69 100644 --- a/dlls/user32/controls.h +++ b/dlls/user32/controls.h @@ -171,6 +171,8 @@ extern LRESULT NC_HandleNCActivate( HWND hwnd, WPARAM wParam, LPARAM lParam ) DE extern LRESULT NC_HandleNCCalcSize( HWND hwnd, WPARAM wParam, RECT *winRect ) DECLSPEC_HIDDEN; extern LRESULT NC_HandleNCHitTest( HWND hwnd, POINT pt ) DECLSPEC_HIDDEN; extern LRESULT NC_HandleNCLButtonDown( HWND hwnd, WPARAM wParam, LPARAM lParam ) DECLSPEC_HIDDEN; +extern LRESULT NC_HandleNCMouseMove( HWND hwnd, POINT pt ) DECLSPEC_HIDDEN; +extern LRESULT NC_HandleNCMouseLeave( HWND hwnd ) DECLSPEC_HIDDEN; extern LRESULT NC_HandleNCRButtonDown( HWND hwnd, WPARAM wParam, LPARAM lParam ) DECLSPEC_HIDDEN; extern LRESULT NC_HandleNCLButtonDblClk( HWND hwnd, WPARAM wParam, LPARAM lParam) DECLSPEC_HIDDEN; extern LRESULT NC_HandleSysCommand( HWND hwnd, WPARAM wParam, LPARAM lParam ) DECLSPEC_HIDDEN; @@ -184,6 +186,7 @@ extern void SCROLL_DrawNCScrollBar( HWND hwnd, HDC hdc, BOOL draw_horizontal, BO extern void SCROLL_DrawScrollBar( HWND hwnd, HDC hdc, INT nBar, enum SCROLL_HITTEST hit_test, const struct SCROLL_TRACKING_INFO *tracking_info, BOOL arrows, BOOL interior ) DECLSPEC_HIDDEN; +extern void SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt ) DECLSPEC_HIDDEN; extern void SCROLL_TrackScrollBar( HWND hwnd, INT scrollbar, POINT pt ) DECLSPEC_HIDDEN; /* combo box */ diff --git a/dlls/user32/defwnd.c b/dlls/user32/defwnd.c index a3d92e84aef..5eb056ebd9e 100644 --- a/dlls/user32/defwnd.c +++ b/dlls/user32/defwnd.c @@ -245,6 +245,17 @@ static LRESULT DEFWND_DefWinProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa case WM_NCPAINT: return NC_HandleNCPaint( hwnd, (HRGN)wParam ); + case WM_NCMOUSEMOVE: + { + POINT pt; + pt.x = (short)LOWORD(lParam); + pt.y = (short)HIWORD(lParam); + return NC_HandleNCMouseMove( hwnd, pt ); + } + + case WM_NCMOUSELEAVE: + return NC_HandleNCMouseLeave( hwnd ); + case WM_NCHITTEST: { POINT pt; diff --git a/dlls/user32/nonclient.c b/dlls/user32/nonclient.c index 50ecb0c4e2e..02e6ad92320 100644 --- a/dlls/user32/nonclient.c +++ b/dlls/user32/nonclient.c @@ -635,6 +635,39 @@ LRESULT NC_HandleNCHitTest( HWND hwnd, POINT pt ) return HTNOWHERE; } +LRESULT NC_HandleNCMouseMove(HWND hwnd, POINT pt) +{ + LONG hittest; + RECT rect; + + TRACE("hwnd=%p pt=%s\n", hwnd, wine_dbgstr_point(&pt)); + + hittest = NC_HandleNCHitTest(hwnd, pt); + if (hittest != HTHSCROLL && hittest != HTVSCROLL) + return 0; + + WIN_GetRectangles(hwnd, COORDS_CLIENT, &rect, NULL); + ScreenToClient(hwnd, &pt); + pt.x -= rect.left; + pt.y -= rect.top; + SCROLL_HandleScrollEvent(hwnd, hittest == HTHSCROLL ? SB_HORZ : SB_VERT, WM_NCMOUSEMOVE, pt); + return 0; +} + +LRESULT NC_HandleNCMouseLeave(HWND hwnd) +{ + LONG style = GetWindowLongW(hwnd, GWL_STYLE); + POINT pt = {0, 0}; + + TRACE("hwnd=%p\n", hwnd); + + if (style & WS_HSCROLL) + SCROLL_HandleScrollEvent(hwnd, SB_HORZ, WM_NCMOUSELEAVE, pt); + if (style & WS_VSCROLL) + SCROLL_HandleScrollEvent(hwnd, SB_VERT, WM_NCMOUSELEAVE, pt); + + return 0; +} /****************************************************************************** * diff --git a/dlls/user32/scroll.c b/dlls/user32/scroll.c index c4c06476b9c..088e41eee43 100644 --- a/dlls/user32/scroll.c +++ b/dlls/user32/scroll.c @@ -751,7 +751,7 @@ static void SCROLL_HandleKbdEvent(HWND hwnd, WPARAM wParam, LPARAM lParam) * 'pt' is the location of the mouse event in client (for SB_CTL) or * windows coordinates. */ -static void SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt) +void SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt ) { /* Previous mouse position for timer events */ static POINT prevPt; @@ -773,7 +773,8 @@ static void SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt) SCROLLBAR_INFO *infoPtr = SCROLL_GetInternalInfo( hwnd, nBar, FALSE ); if (!infoPtr) return; if ((g_tracking_info.hit_test == SCROLL_NOWHERE) - && (msg != WM_LBUTTONDOWN && msg != WM_MOUSEMOVE && msg != WM_MOUSELEAVE)) + && (msg != WM_LBUTTONDOWN && msg != WM_MOUSEMOVE && msg != WM_MOUSELEAVE + && msg != WM_NCMOUSEMOVE && msg != WM_NCMOUSELEAVE)) return; if (nBar == SB_CTL && (GetWindowLongW( hwnd, GWL_STYLE ) & (SBS_SIZEGRIP | SBS_SIZEBOX))) @@ -841,6 +842,32 @@ static void SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt) break; + case WM_NCMOUSEMOVE: + hittest = SCROLL_HitTest( hwnd, nBar, pt, vertical == g_tracking_info.vertical && GetCapture() == hwnd ); + prevPt = pt; + + if (nBar == SB_CTL) + break; + + tme.cbSize = sizeof(tme); + tme.dwFlags = TME_QUERY; + TrackMouseEvent( &tme ); + if (((tme.dwFlags & (TME_NONCLIENT | TME_LEAVE)) != (TME_NONCLIENT | TME_LEAVE)) || tme.hwndTrack != hwnd) + { + tme.dwFlags = TME_NONCLIENT | TME_LEAVE; + tme.hwndTrack = hwnd; + TrackMouseEvent( &tme ); + } + + break; + + case WM_NCMOUSELEAVE: + if (nBar == SB_CTL) + return; + + hittest = SCROLL_NOWHERE; + break; + case WM_MOUSELEAVE: if (nBar != SB_CTL) return; @@ -870,7 +897,7 @@ static void SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt) switch (g_tracking_info.hit_test) { case SCROLL_NOWHERE: /* No tracking in progress */ - if (msg == WM_MOUSEMOVE || msg == WM_MOUSELEAVE) + if (msg == WM_MOUSEMOVE || msg == WM_MOUSELEAVE || msg == WM_NCMOUSEMOVE || msg == WM_NCMOUSELEAVE) SCROLL_DrawScrollBar( hwnd, hdc, nBar, hittest, &g_tracking_info, TRUE, TRUE ); break; @@ -1049,6 +1076,8 @@ void SCROLL_TrackScrollBar( HWND hwnd, INT scrollbar, POINT pt ) if (msg.message == WM_LBUTTONUP || msg.message == WM_MOUSEMOVE || msg.message == WM_MOUSELEAVE || + msg.message == WM_NCMOUSEMOVE || + msg.message == WM_NCMOUSELEAVE || (msg.message == WM_SYSTIMER && msg.wParam == SCROLL_TIMER)) { pt.x = (short)LOWORD(msg.lParam) - rect.left; @@ -1383,6 +1412,8 @@ LRESULT WINAPI USER_ScrollBarProc( HWND hwnd, UINT message, WPARAM wParam, LPARA } break; case WM_LBUTTONUP: + case WM_NCMOUSEMOVE: + case WM_NCMOUSELEAVE: case WM_MOUSEMOVE: case WM_MOUSELEAVE: case WM_SYSTIMER: -- 2.30.2

1 0

[PATCH v2 5/5] uxtheme: Support scroll bar state tracking in non-client areas.
by Zhiyi Zhang 20 Jul '21

20 Jul '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/controls.h | 3 +++ dlls/user32/defwnd.c | 11 +++++++++++ dlls/user32/nonclient.c | 33 +++++++++++++++++++++++++++++++++ dlls/user32/scroll.c | 37 ++++++++++++++++++++++++++++++++++--- 4 files changed, 81 insertions(+), 3 deletions(-) diff --git a/dlls/user32/controls.h b/dlls/user32/controls.h index bf32097f95c..c25cb1721d5 100644 --- a/dlls/user32/controls.h +++ b/dlls/user32/controls.h @@ -171,6 +171,8 @@ extern LRESULT NC_HandleNCActivate( HWND hwnd, WPARAM wParam, LPARAM lParam ) DE extern LRESULT NC_HandleNCCalcSize( HWND hwnd, WPARAM wParam, RECT *winRect ) DECLSPEC_HIDDEN; extern LRESULT NC_HandleNCHitTest( HWND hwnd, POINT pt ) DECLSPEC_HIDDEN; extern LRESULT NC_HandleNCLButtonDown( HWND hwnd, WPARAM wParam, LPARAM lParam ) DECLSPEC_HIDDEN; +extern LRESULT NC_HandleNCMouseMove( HWND hwnd, POINT pt ) DECLSPEC_HIDDEN; +extern LRESULT NC_HandleNCMouseLeave( HWND hwnd ) DECLSPEC_HIDDEN; extern LRESULT NC_HandleNCRButtonDown( HWND hwnd, WPARAM wParam, LPARAM lParam ) DECLSPEC_HIDDEN; extern LRESULT NC_HandleNCLButtonDblClk( HWND hwnd, WPARAM wParam, LPARAM lParam) DECLSPEC_HIDDEN; extern LRESULT NC_HandleSysCommand( HWND hwnd, WPARAM wParam, LPARAM lParam ) DECLSPEC_HIDDEN; @@ -184,6 +186,7 @@ extern void SCROLL_DrawNCScrollBar( HWND hwnd, HDC hdc, BOOL draw_horizontal, BO extern void SCROLL_DrawScrollBar( HWND hwnd, HDC hdc, INT nBar, enum SCROLL_HITTEST hit_test, const struct SCROLL_TRACKING_INFO *tracking_info, BOOL arrows, BOOL interior ) DECLSPEC_HIDDEN; +void SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt) DECLSPEC_HIDDEN; extern void SCROLL_TrackScrollBar( HWND hwnd, INT scrollbar, POINT pt ) DECLSPEC_HIDDEN; /* combo box */ diff --git a/dlls/user32/defwnd.c b/dlls/user32/defwnd.c index a3d92e84aef..5eb056ebd9e 100644 --- a/dlls/user32/defwnd.c +++ b/dlls/user32/defwnd.c @@ -245,6 +245,17 @@ static LRESULT DEFWND_DefWinProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa case WM_NCPAINT: return NC_HandleNCPaint( hwnd, (HRGN)wParam ); + case WM_NCMOUSEMOVE: + { + POINT pt; + pt.x = (short)LOWORD(lParam); + pt.y = (short)HIWORD(lParam); + return NC_HandleNCMouseMove( hwnd, pt ); + } + + case WM_NCMOUSELEAVE: + return NC_HandleNCMouseLeave( hwnd ); + case WM_NCHITTEST: { POINT pt; diff --git a/dlls/user32/nonclient.c b/dlls/user32/nonclient.c index 50ecb0c4e2e..02e6ad92320 100644 --- a/dlls/user32/nonclient.c +++ b/dlls/user32/nonclient.c @@ -635,6 +635,39 @@ LRESULT NC_HandleNCHitTest( HWND hwnd, POINT pt ) return HTNOWHERE; } +LRESULT NC_HandleNCMouseMove(HWND hwnd, POINT pt) +{ + LONG hittest; + RECT rect; + + TRACE("hwnd=%p pt=%s\n", hwnd, wine_dbgstr_point(&pt)); + + hittest = NC_HandleNCHitTest(hwnd, pt); + if (hittest != HTHSCROLL && hittest != HTVSCROLL) + return 0; + + WIN_GetRectangles(hwnd, COORDS_CLIENT, &rect, NULL); + ScreenToClient(hwnd, &pt); + pt.x -= rect.left; + pt.y -= rect.top; + SCROLL_HandleScrollEvent(hwnd, hittest == HTHSCROLL ? SB_HORZ : SB_VERT, WM_NCMOUSEMOVE, pt); + return 0; +} + +LRESULT NC_HandleNCMouseLeave(HWND hwnd) +{ + LONG style = GetWindowLongW(hwnd, GWL_STYLE); + POINT pt = {0, 0}; + + TRACE("hwnd=%p\n", hwnd); + + if (style & WS_HSCROLL) + SCROLL_HandleScrollEvent(hwnd, SB_HORZ, WM_NCMOUSELEAVE, pt); + if (style & WS_VSCROLL) + SCROLL_HandleScrollEvent(hwnd, SB_VERT, WM_NCMOUSELEAVE, pt); + + return 0; +} /****************************************************************************** * diff --git a/dlls/user32/scroll.c b/dlls/user32/scroll.c index c4c06476b9c..929d70cf08c 100644 --- a/dlls/user32/scroll.c +++ b/dlls/user32/scroll.c @@ -751,7 +751,7 @@ static void SCROLL_HandleKbdEvent(HWND hwnd, WPARAM wParam, LPARAM lParam) * 'pt' is the location of the mouse event in client (for SB_CTL) or * windows coordinates. */ -static void SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt) +void SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt) { /* Previous mouse position for timer events */ static POINT prevPt; @@ -773,7 +773,8 @@ static void SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt) SCROLLBAR_INFO *infoPtr = SCROLL_GetInternalInfo( hwnd, nBar, FALSE ); if (!infoPtr) return; if ((g_tracking_info.hit_test == SCROLL_NOWHERE) - && (msg != WM_LBUTTONDOWN && msg != WM_MOUSEMOVE && msg != WM_MOUSELEAVE)) + && (msg != WM_LBUTTONDOWN && msg != WM_MOUSEMOVE && msg != WM_MOUSELEAVE + && msg != WM_NCMOUSEMOVE && msg != WM_NCMOUSELEAVE)) return; if (nBar == SB_CTL && (GetWindowLongW( hwnd, GWL_STYLE ) & (SBS_SIZEGRIP | SBS_SIZEBOX))) @@ -841,6 +842,32 @@ static void SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt) break; + case WM_NCMOUSEMOVE: + hittest = SCROLL_HitTest( hwnd, nBar, pt, vertical == g_tracking_info.vertical && GetCapture() == hwnd ); + prevPt = pt; + + if (nBar == SB_CTL) + break; + + tme.cbSize = sizeof(tme); + tme.dwFlags = TME_QUERY; + TrackMouseEvent( &tme ); + if (((tme.dwFlags & (TME_NONCLIENT | TME_LEAVE)) != (TME_NONCLIENT | TME_LEAVE)) || tme.hwndTrack != hwnd) + { + tme.dwFlags = TME_NONCLIENT | TME_LEAVE; + tme.hwndTrack = hwnd; + TrackMouseEvent( &tme ); + } + + break; + + case WM_NCMOUSELEAVE: + if (nBar == SB_CTL) + return; + + hittest = SCROLL_NOWHERE; + break; + case WM_MOUSELEAVE: if (nBar != SB_CTL) return; @@ -870,7 +897,7 @@ static void SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt) switch (g_tracking_info.hit_test) { case SCROLL_NOWHERE: /* No tracking in progress */ - if (msg == WM_MOUSEMOVE || msg == WM_MOUSELEAVE) + if (msg == WM_MOUSEMOVE || msg == WM_MOUSELEAVE || msg == WM_NCMOUSEMOVE || msg == WM_NCMOUSELEAVE) SCROLL_DrawScrollBar( hwnd, hdc, nBar, hittest, &g_tracking_info, TRUE, TRUE ); break; @@ -1049,6 +1076,8 @@ void SCROLL_TrackScrollBar( HWND hwnd, INT scrollbar, POINT pt ) if (msg.message == WM_LBUTTONUP || msg.message == WM_MOUSEMOVE || msg.message == WM_MOUSELEAVE || + msg.message == WM_NCMOUSEMOVE || + msg.message == WM_NCMOUSELEAVE || (msg.message == WM_SYSTIMER && msg.wParam == SCROLL_TIMER)) { pt.x = (short)LOWORD(msg.lParam) - rect.left; @@ -1383,6 +1412,8 @@ LRESULT WINAPI USER_ScrollBarProc( HWND hwnd, UINT message, WPARAM wParam, LPARA } break; case WM_LBUTTONUP: + case WM_NCMOUSEMOVE: + case WM_NCMOUSELEAVE: case WM_MOUSEMOVE: case WM_MOUSELEAVE: case WM_SYSTIMER: -- 2.30.2

1 0

[PATCH 1/3] winevulkan: Fix pointer typedef base types.
by Georg Lehmann 20 Jul '21

20 Jul '21

Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> --- dlls/winevulkan/make_vulkan | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index e8534cbd5f5..31164406cab 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -3614,6 +3614,9 @@ class VkRegistry(object): _type = None if not t.find("type") is None: _type = t.find("type").text + tail = t.find("type").tail + if tail is not None: + _type += tail.strip() basetype = VkBaseType(name, _type) base_types.append(basetype) type_info["data"] = basetype -- 2.32.0

1 2

[PATCH v2 4/5] uxtheme: Support pressed state for themed scroll bars.
by Zhiyi Zhang 20 Jul '21

20 Jul '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/scrollbar.c | 67 +++++++++++++++++++++++++++++++--------- 1 file changed, 53 insertions(+), 14 deletions(-) diff --git a/dlls/uxtheme/scrollbar.c b/dlls/uxtheme/scrollbar.c index 40fdbf4b89a..386f0446049 100644 --- a/dlls/uxtheme/scrollbar.c +++ b/dlls/uxtheme/scrollbar.c @@ -75,12 +75,29 @@ void WINAPI UXTHEME_ScrollBarDraw(HWND hwnd, HDC dc, INT bar, enum SCROLL_HITTES lowertrackstate = SCRBS_NORMAL; thumbstate = SCRBS_NORMAL; - if (hit_test == SCROLL_TOP_RECT) - uppertrackstate = SCRBS_HOT; - else if (hit_test == SCROLL_BOTTOM_RECT) - lowertrackstate = SCRBS_HOT; - else if (hit_test == SCROLL_THUMB) - thumbstate = SCRBS_HOT; + if (vertical == tracking_info->vertical && hit_test == tracking_info->hit_test + && GetCapture() == hwnd) + { + if (hit_test == SCROLL_TOP_RECT) + uppertrackstate = SCRBS_PRESSED; + else if (hit_test == SCROLL_BOTTOM_RECT) + lowertrackstate = SCRBS_PRESSED; + else if (hit_test == SCROLL_THUMB) + thumbstate = SCRBS_PRESSED; + } + else + { + if (hit_test == SCROLL_TOP_RECT) + uppertrackstate = SCRBS_HOT; + else if (hit_test == SCROLL_BOTTOM_RECT) + lowertrackstate = SCRBS_HOT; + else if (hit_test == SCROLL_THUMB) + thumbstate = SCRBS_HOT; + } + + /* Thumb is also shown as pressed when tracking */ + if (tracking_info->win == hwnd && tracking_info->bar == bar) + thumbstate = SCRBS_PRESSED; } if (bar == SB_CTL) @@ -96,10 +113,21 @@ void WINAPI UXTHEME_ScrollBarDraw(HWND hwnd, HDC dc, INT bar, enum SCROLL_HITTES uparrowstate = ABS_UPNORMAL; downarrowstate = ABS_DOWNNORMAL; - if (hit_test == SCROLL_TOP_ARROW) - uparrowstate = ABS_UPHOT; - else if (hit_test == SCROLL_BOTTOM_ARROW) - downarrowstate = ABS_DOWNHOT; + if (vertical == tracking_info->vertical && hit_test == tracking_info->hit_test + && GetCapture() == hwnd) + { + if (hit_test == SCROLL_TOP_ARROW) + uparrowstate = ABS_UPPRESSED; + else if (hit_test == SCROLL_BOTTOM_ARROW) + downarrowstate = ABS_DOWNPRESSED; + } + else + { + if (hit_test == SCROLL_TOP_ARROW) + uparrowstate = ABS_UPHOT; + else if (hit_test == SCROLL_BOTTOM_ARROW) + downarrowstate = ABS_DOWNHOT; + } } partrect = *rect; @@ -150,10 +178,21 @@ void WINAPI UXTHEME_ScrollBarDraw(HWND hwnd, HDC dc, INT bar, enum SCROLL_HITTES leftarrowstate = ABS_LEFTNORMAL; rightarrowstate = ABS_RIGHTNORMAL; - if (hit_test == SCROLL_TOP_ARROW) - leftarrowstate = ABS_LEFTHOT; - else if (hit_test == SCROLL_BOTTOM_ARROW) - rightarrowstate = ABS_RIGHTHOT; + if (vertical == tracking_info->vertical && hit_test == tracking_info->hit_test + && GetCapture() == hwnd) + { + if (hit_test == SCROLL_TOP_ARROW) + leftarrowstate = ABS_LEFTPRESSED; + else if (hit_test == SCROLL_BOTTOM_ARROW) + rightarrowstate = ABS_RIGHTPRESSED; + } + else + { + if (hit_test == SCROLL_TOP_ARROW) + leftarrowstate = ABS_LEFTHOT; + else if (hit_test == SCROLL_BOTTOM_ARROW) + rightarrowstate = ABS_RIGHTHOT; + } } partrect = *rect; -- 2.30.2

1 0

[PATCH v2 3/5] uxtheme: Support drawing themed standard scroll bars.
by Zhiyi Zhang 20 Jul '21

20 Jul '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=39821 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/controls.h | 22 -- dlls/user32/hook.c | 1 + dlls/user32/scroll.c | 47 +++- dlls/user32/user_private.h | 3 + dlls/uxtheme/scrollbar.c | 464 +++++-------------------------------- dlls/uxtheme/system.c | 1 + dlls/uxtheme/uxthemedll.h | 4 + include/winuser.h | 26 +++ 8 files changed, 134 insertions(+), 434 deletions(-) diff --git a/dlls/user32/controls.h b/dlls/user32/controls.h index 25ff4fe05ff..bf32097f95c 100644 --- a/dlls/user32/controls.h +++ b/dlls/user32/controls.h @@ -180,28 +180,6 @@ extern void NC_GetSysPopupPos( HWND hwnd, RECT* rect ) DECLSPEC_HIDDEN; /* scrollbar */ -/* Scroll-bar hit testing */ -enum SCROLL_HITTEST -{ - SCROLL_NOWHERE, /* Outside the scroll bar */ - SCROLL_TOP_ARROW, /* Top or left arrow */ - SCROLL_TOP_RECT, /* Rectangle between the top arrow and the thumb */ - SCROLL_THUMB, /* Thumb rectangle */ - SCROLL_BOTTOM_RECT, /* Rectangle between the thumb and the bottom arrow */ - SCROLL_BOTTOM_ARROW /* Bottom or right arrow */ -}; - -/* Scroll bar tracking information */ -struct SCROLL_TRACKING_INFO -{ - HWND win; /* Tracking window */ - INT bar; /* SB_HORZ / SB_VERT / SB_CTL */ - INT thumb_pos; /* Thumb position */ - INT thumb_val; /* Current thumb value from thumb position */ - BOOL vertical; /* Is scroll bar vertical */ - enum SCROLL_HITTEST hit_test; /* Hit Test code of the last button-down event */ -}; - extern void SCROLL_DrawNCScrollBar( HWND hwnd, HDC hdc, BOOL draw_horizontal, BOOL draw_vertical ) DECLSPEC_HIDDEN; extern void SCROLL_DrawScrollBar( HWND hwnd, HDC hdc, INT nBar, enum SCROLL_HITTEST hit_test, const struct SCROLL_TRACKING_INFO *tracking_info, BOOL arrows, diff --git a/dlls/user32/hook.c b/dlls/user32/hook.c index 7921bc3d45a..f5b4c6ab8a1 100644 --- a/dlls/user32/hook.c +++ b/dlls/user32/hook.c @@ -84,6 +84,7 @@ WINE_DECLARE_DEBUG_CHANNEL(relay); static struct user_api_hook original_user_api = { USER_DefDlgProc, + USER_ScrollBarDraw, USER_ScrollBarProc, }; static struct user_api_hook hooked_user_api; diff --git a/dlls/user32/scroll.c b/dlls/user32/scroll.c index 9a22e930332..c4c06476b9c 100644 --- a/dlls/user32/scroll.c +++ b/dlls/user32/scroll.c @@ -567,10 +567,10 @@ static void SCROLL_DrawInterior( HWND hwnd, HDC hdc, INT nBar, SelectObject( hdc, hSaveBrush ); } -static void SCROLL_DoDrawScrollBar( HWND hwnd, HDC hdc, INT nBar, enum SCROLL_HITTEST hit_test, - const struct SCROLL_TRACKING_INFO *tracking_info, BOOL arrows, - BOOL interior, RECT *rect, INT arrowSize, INT thumbPos, - INT thumbSize, BOOL vertical ) +void WINAPI USER_ScrollBarDraw( HWND hwnd, HDC hdc, INT nBar, enum SCROLL_HITTEST hit_test, + const struct SCROLL_TRACKING_INFO *tracking_info, BOOL arrows, + BOOL interior, RECT *rect, INT arrowSize, INT thumbPos, + INT thumbSize, BOOL vertical ) { SCROLLBAR_INFO *infoPtr; @@ -678,8 +678,8 @@ void SCROLL_DrawScrollBar( HWND hwnd, HDC hdc, INT bar, enum SCROLL_HITTEST hit_ tracking_info->thumb_val, tracking_info->vertical, tracking_info->hit_test, draw_arrows, draw_interior, wine_dbgstr_rect(&rect), arrow_size, thumb_pos, thumb_size, vertical, GetCapture()); - SCROLL_DoDrawScrollBar( hwnd, hdc, bar, hit_test, tracking_info, draw_arrows, draw_interior, - &rect, arrow_size, thumb_pos, thumb_size, vertical ); + user_api->pScrollBarDraw( hwnd, hdc, bar, hit_test, tracking_info, draw_arrows, draw_interior, + &rect, arrow_size, thumb_pos, thumb_size, vertical ); } void SCROLL_DrawNCScrollBar( HWND hwnd, HDC hdc, BOOL draw_horizontal, BOOL draw_vertical ) @@ -764,6 +764,7 @@ static void SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt) enum SCROLL_HITTEST hittest; HWND hwndOwner, hwndCtl; + TRACKMOUSEEVENT tme; BOOL vertical; INT arrowSize, thumbSize, thumbPos; RECT rect; @@ -771,7 +772,8 @@ static void SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt) SCROLLBAR_INFO *infoPtr = SCROLL_GetInternalInfo( hwnd, nBar, FALSE ); if (!infoPtr) return; - if ((g_tracking_info.hit_test == SCROLL_NOWHERE) && (msg != WM_LBUTTONDOWN)) + if ((g_tracking_info.hit_test == SCROLL_NOWHERE) + && (msg != WM_LBUTTONDOWN && msg != WM_MOUSEMOVE && msg != WM_MOUSELEAVE)) return; if (nBar == SB_CTL && (GetWindowLongW( hwnd, GWL_STYLE ) & (SBS_SIZEGRIP | SBS_SIZEBOX))) @@ -821,8 +823,29 @@ static void SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt) break; case WM_MOUSEMOVE: - hittest = SCROLL_HitTest( hwnd, nBar, pt, TRUE ); + hittest = SCROLL_HitTest( hwnd, nBar, pt, vertical == g_tracking_info.vertical && GetCapture() == hwnd ); prevPt = pt; + + if (nBar != SB_CTL) + break; + + tme.cbSize = sizeof(tme); + tme.dwFlags = TME_QUERY; + TrackMouseEvent( &tme ); + if (!(tme.dwFlags & TME_LEAVE) || tme.hwndTrack != hwnd) + { + tme.dwFlags = TME_LEAVE; + tme.hwndTrack = hwnd; + TrackMouseEvent( &tme ); + } + + break; + + case WM_MOUSELEAVE: + if (nBar != SB_CTL) + return; + + hittest = SCROLL_NOWHERE; break; case WM_LBUTTONUP: @@ -847,6 +870,8 @@ static void SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt) switch (g_tracking_info.hit_test) { case SCROLL_NOWHERE: /* No tracking in progress */ + if (msg == WM_MOUSEMOVE || msg == WM_MOUSELEAVE) + SCROLL_DrawScrollBar( hwnd, hdc, nBar, hittest, &g_tracking_info, TRUE, TRUE ); break; case SCROLL_TOP_ARROW: @@ -898,7 +923,7 @@ static void SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt) { SCROLL_DrawScrollBar( hwnd, hdc, nBar, SCROLL_NOWHERE, &g_tracking_info, FALSE, TRUE ); } - else /* WM_MOUSEMOVE */ + else if (msg == WM_MOUSEMOVE) { INT pos; @@ -986,6 +1011,8 @@ static void SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt) /* Terminate tracking */ g_tracking_info.win = 0; SCROLL_MovingThumb = FALSE; + hittest = SCROLL_NOWHERE; + SCROLL_DrawScrollBar( hwnd, hdc, nBar, hittest, &g_tracking_info, TRUE, TRUE ); } ReleaseDC( hwnd, hdc ); @@ -1021,6 +1048,7 @@ void SCROLL_TrackScrollBar( HWND hwnd, INT scrollbar, POINT pt ) if (CallMsgFilterW( &msg, MSGF_SCROLLBAR )) continue; if (msg.message == WM_LBUTTONUP || msg.message == WM_MOUSEMOVE || + msg.message == WM_MOUSELEAVE || (msg.message == WM_SYSTIMER && msg.wParam == SCROLL_TIMER)) { pt.x = (short)LOWORD(msg.lParam) - rect.left; @@ -1356,6 +1384,7 @@ LRESULT WINAPI USER_ScrollBarProc( HWND hwnd, UINT message, WPARAM wParam, LPARA break; case WM_LBUTTONUP: case WM_MOUSEMOVE: + case WM_MOUSELEAVE: case WM_SYSTIMER: { POINT pt; diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 8750008a5fb..7c4d9015976 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -389,5 +389,8 @@ struct png_funcs extern struct user_api_hook *user_api DECLSPEC_HIDDEN; LRESULT WINAPI USER_DefDlgProc(HWND, UINT, WPARAM, LPARAM, BOOL) DECLSPEC_HIDDEN; LRESULT WINAPI USER_ScrollBarProc(HWND, UINT, WPARAM, LPARAM, BOOL) DECLSPEC_HIDDEN; +void WINAPI USER_ScrollBarDraw(HWND, HDC, INT, enum SCROLL_HITTEST, + const struct SCROLL_TRACKING_INFO *, BOOL, BOOL, RECT *, INT, INT, + INT, BOOL) DECLSPEC_HIDDEN; #endif /* __WINE_USER_PRIVATE_H */ diff --git a/dlls/uxtheme/scrollbar.c b/dlls/uxtheme/scrollbar.c index 393b45a831d..40fdbf4b89a 100644 --- a/dlls/uxtheme/scrollbar.c +++ b/dlls/uxtheme/scrollbar.c @@ -20,8 +20,6 @@ */ #include <stdarg.h> -#include <string.h> -#include <stdlib.h> #include "windef.h" #include "winbase.h" @@ -32,299 +30,27 @@ #include "vssym32.h" #include "wine/debug.h" -/* Minimum size of the thumb in pixels */ -#define SCROLL_MIN_THUMB 6 - -/* Minimum size of the rectangle between the arrows */ -#define SCROLL_MIN_RECT 4 - -enum SCROLL_HITTEST -{ - SCROLL_NOWHERE, /* Outside the scroll bar */ - SCROLL_TOP_ARROW, /* Top or left arrow */ - SCROLL_TOP_RECT, /* Rectangle between the top arrow and the thumb */ - SCROLL_THUMB, /* Thumb rectangle */ - SCROLL_BOTTOM_RECT, /* Rectangle between the thumb and the bottom arrow */ - SCROLL_BOTTOM_ARROW /* Bottom or right arrow */ -}; - -static HWND tracking_win = 0; -static enum SCROLL_HITTEST tracking_hot_part = SCROLL_NOWHERE; - WINE_DEFAULT_DEBUG_CHANNEL(theme_scroll); -static void calc_thumb_dimensions(unsigned int size, SCROLLINFO *si, unsigned int *thumbpos, unsigned int *thumbsize) +void WINAPI UXTHEME_ScrollBarDraw(HWND hwnd, HDC dc, INT bar, enum SCROLL_HITTEST hit_test, + const struct SCROLL_TRACKING_INFO *tracking_info, + BOOL draw_arrows, BOOL draw_interior, RECT *rect, INT arrowsize, + INT thumbpos, INT thumbsize, BOOL vertical) { - if (size <= SCROLL_MIN_RECT) - *thumbpos = *thumbsize = 0; - else if (si->nPage > si->nMax - si->nMin) - *thumbpos = *thumbsize = 0; - else { - if (si->nPage > 0) { - *thumbsize = MulDiv(size, si->nPage, si->nMax - si->nMin + 1); - if (*thumbsize < SCROLL_MIN_THUMB) *thumbsize = SCROLL_MIN_THUMB; - } - else *thumbsize = GetSystemMetrics(SM_CXVSCROLL); - - if (size < *thumbsize) - *thumbpos = *thumbsize = 0; - else { - int max = si->nMax - max(si->nPage - 1, 0); - size -= *thumbsize; - if (si->nMin >= max) - *thumbpos = 0; - else - *thumbpos = MulDiv(size, si->nTrackPos - si->nMin, max - si->nMin); - } - } -} - -static enum SCROLL_HITTEST hit_test(HWND hwnd, HTHEME theme, POINT pt) -{ - RECT r; - DWORD style = GetWindowLongW(hwnd, GWL_STYLE); - BOOL vertical = style & SBS_VERT; - SIZE sz; - SCROLLINFO si; - unsigned int offset, size, upsize, downsize, thumbpos, thumbsize; - - GetWindowRect(hwnd, &r); - OffsetRect(&r, -r.left, -r.top); - - if (vertical) { - offset = pt.y; - size = r.bottom; - - if (FAILED(GetThemePartSize(theme, NULL, SBP_ARROWBTN, ABS_UPNORMAL, NULL, TS_DRAW, &sz))) { - WARN("Could not get up arrow size.\n"); - upsize = 0; - } else - upsize = sz.cy; - - if (FAILED(GetThemePartSize(theme, NULL, SBP_ARROWBTN, ABS_DOWNNORMAL, NULL, TS_DRAW, &sz))) { - WARN("Could not get down arrow size.\n"); - downsize = 0; - } else - downsize = sz.cy; - } else { - offset = pt.x; - size = r.right; - - if (FAILED(GetThemePartSize(theme, NULL, SBP_ARROWBTN, ABS_LEFTNORMAL, NULL, TS_DRAW, &sz))) { - WARN("Could not get left arrow size.\n"); - upsize = 0; - } else - upsize = sz.cx; - - if (FAILED(GetThemePartSize(theme, NULL, SBP_ARROWBTN, ABS_RIGHTNORMAL, NULL, TS_DRAW, &sz))) { - WARN("Could not get right arrow size.\n"); - downsize = 0; - } else - downsize = sz.cx; - } - - if (pt.x < 0 || pt.x > r.right || pt.y < 0 || pt.y > r.bottom) - return SCROLL_NOWHERE; - - if (size < SCROLL_MIN_RECT + upsize + downsize) - upsize = downsize = (size - SCROLL_MIN_RECT)/2; - - if (offset < upsize) - return SCROLL_TOP_ARROW; - - if (offset > size - downsize) - return SCROLL_BOTTOM_ARROW; - - si.cbSize = sizeof(si); - si.fMask = SIF_ALL; - if (!GetScrollInfo(hwnd, SB_CTL, &si)) { - WARN("GetScrollInfo failed.\n"); - return SCROLL_NOWHERE; - } - - calc_thumb_dimensions(size - upsize - downsize, &si, &thumbpos, &thumbsize); - - if (offset < upsize + thumbpos) - return SCROLL_TOP_RECT; - else if (offset < upsize + thumbpos + thumbsize) - return SCROLL_THUMB; - else - return SCROLL_BOTTOM_RECT; -} - -static void redraw_part(HWND hwnd, HTHEME theme, enum SCROLL_HITTEST part) -{ - DWORD style = GetWindowLongW(hwnd, GWL_STYLE); - BOOL vertical = style & SBS_VERT; - SIZE sz; - RECT r, partrect; - unsigned int size, upsize, downsize; - - if (part == SCROLL_NOWHERE) { /* redraw everything */ - InvalidateRect(hwnd, NULL, TRUE); - return; - } - - GetWindowRect(hwnd, &r); - OffsetRect(&r, -r.left, -r.top); - - if (vertical) { - size = r.bottom; - - if (FAILED(GetThemePartSize(theme, NULL, SBP_ARROWBTN, ABS_UPNORMAL, NULL, TS_DRAW, &sz))) { - WARN("Could not get up arrow size.\n"); - upsize = 0; - } else - upsize = sz.cy; - - if (FAILED(GetThemePartSize(theme, NULL, SBP_ARROWBTN, ABS_DOWNNORMAL, NULL, TS_DRAW, &sz))) { - WARN("Could not get down arrow size.\n"); - downsize = 0; - } else - downsize = sz.cy; - } else { - size = r.right; - - if (FAILED(GetThemePartSize(theme, NULL, SBP_ARROWBTN, ABS_LEFTNORMAL, NULL, TS_DRAW, &sz))) { - WARN("Could not get left arrow size.\n"); - upsize = 0; - } else - upsize = sz.cx; - - if (FAILED(GetThemePartSize(theme, NULL, SBP_ARROWBTN, ABS_RIGHTNORMAL, NULL, TS_DRAW, &sz))) { - WARN("Could not get right arrow size.\n"); - downsize = 0; - } else - downsize = sz.cx; - } - - if (size < SCROLL_MIN_RECT + upsize + downsize) - upsize = downsize = (size - SCROLL_MIN_RECT)/2; - - partrect = r; - - if (part == SCROLL_TOP_ARROW) { - if (vertical) - partrect.bottom = partrect.top + upsize; - else - partrect.right = partrect.left + upsize; - } else if (part == SCROLL_BOTTOM_ARROW) { - if (vertical) - partrect.top = partrect.bottom - downsize; - else - partrect.left = partrect.right - downsize; - } else { - unsigned int thumbpos, thumbsize; - SCROLLINFO si; - - si.cbSize = sizeof(si); - si.fMask = SIF_ALL; - if (!GetScrollInfo(hwnd, SB_CTL, &si)) { - WARN("GetScrollInfo failed.\n"); - return; - } - - calc_thumb_dimensions(size - upsize - downsize, &si, &thumbpos, &thumbsize); - - if (part == SCROLL_TOP_RECT) { - if (vertical) { - partrect.top = r.top + upsize; - partrect.bottom = partrect.top + thumbpos; - } else { - partrect.left = r.left + upsize; - partrect.right = partrect.left + thumbpos; - } - } else if (part == SCROLL_THUMB) { - if (vertical) { - partrect.top = r.top + upsize + thumbpos; - partrect.bottom = partrect.top + thumbsize; - } else { - partrect.left = r.left + upsize + thumbpos; - partrect.right = partrect.left + thumbsize; - } - } else if (part == SCROLL_BOTTOM_RECT) { - if (vertical) { - partrect.top = r.top + upsize + thumbpos + thumbsize; - partrect.bottom = r.bottom - downsize; - } else { - partrect.left = r.left + upsize + thumbpos + thumbsize; - partrect.right = r.right - downsize; - } - } - } - - InvalidateRect(hwnd, &partrect, TRUE); -} - -static void scroll_event(HWND hwnd, HTHEME theme, UINT msg, POINT pt) -{ - enum SCROLL_HITTEST hittest; - TRACKMOUSEEVENT tme; - - if (GetWindowLongW(hwnd, GWL_STYLE) & (SBS_SIZEGRIP | SBS_SIZEBOX)) - return; - - hittest = hit_test(hwnd, theme, pt); - - switch (msg) - { - case WM_MOUSEMOVE: - hittest = hit_test(hwnd, theme, pt); - tracking_win = hwnd; - break; - - case WM_MOUSELEAVE: - if (tracking_win == hwnd) { - hittest = SCROLL_NOWHERE; - } - break; - } - - tme.cbSize = sizeof(tme); - tme.dwFlags = TME_QUERY; - TrackMouseEvent(&tme); - - if (!(tme.dwFlags & TME_LEAVE) || tme.hwndTrack != hwnd) { - tme.dwFlags = TME_LEAVE; - tme.hwndTrack = hwnd; - TrackMouseEvent(&tme); - } - - if (tracking_win != hwnd && msg == WM_MOUSELEAVE) { - redraw_part(hwnd, theme, SCROLL_NOWHERE); - return; - } - - if (tracking_win == hwnd && hittest != tracking_hot_part) { - enum SCROLL_HITTEST oldhotpart = tracking_hot_part; - - tracking_hot_part = hittest; - - if (hittest != SCROLL_NOWHERE) - redraw_part(hwnd, theme, hittest); - else - tracking_win = 0; - - if (oldhotpart != SCROLL_NOWHERE) - redraw_part(hwnd, theme, oldhotpart); - } -} - -static void paint_scrollbar(HWND hwnd, HTHEME theme) -{ - HDC dc; - PAINTSTRUCT ps; - RECT r; - DWORD style = GetWindowLongW(hwnd, GWL_STYLE); - BOOL vertical = style & SBS_VERT; BOOL disabled = !IsWindowEnabled(hwnd); + HTHEME theme; + DWORD style; - GetWindowRect(hwnd, &r); - OffsetRect(&r, -r.left, -r.top); + theme = bar == SB_CTL ? GetWindowTheme(hwnd) : OpenThemeData(NULL, WC_SCROLLBARW); + if (!theme) + { + user_api.pScrollBarDraw(hwnd, dc, bar, hit_test, tracking_info, draw_arrows, draw_interior, + rect, arrowsize, thumbpos, thumbsize, vertical); + return; + } - dc = BeginPaint(hwnd, &ps); - - if (style & SBS_SIZEBOX || style & SBS_SIZEGRIP) { + style = GetWindowLongW(hwnd, GWL_STYLE); + if (bar == SB_CTL && (style & SBS_SIZEBOX || style & SBS_SIZEGRIP)) { int state; if (style & SBS_SIZEBOXTOPLEFTALIGN) @@ -334,20 +60,12 @@ static void paint_scrollbar(HWND hwnd, HTHEME theme) if (IsThemeBackgroundPartiallyTransparent(theme, SBP_SIZEBOX, state)) DrawThemeParentBackground(hwnd, dc, NULL); - DrawThemeBackground(theme, dc, SBP_SIZEBOX, state, &r, NULL); + DrawThemeBackground(theme, dc, SBP_SIZEBOX, state, rect, NULL); } else { - SCROLLINFO si; - unsigned int thumbpos, thumbsize; int uppertrackstate, lowertrackstate, thumbstate; - RECT partrect, trackrect; + RECT partrect; SIZE grippersize; - si.cbSize = sizeof(si); - si.fMask = SIF_ALL; - GetScrollInfo(hwnd, SB_CTL, &si); - - trackrect = r; - if (disabled) { uppertrackstate = SCRBS_DISABLED; lowertrackstate = SCRBS_DISABLED; @@ -357,20 +75,18 @@ static void paint_scrollbar(HWND hwnd, HTHEME theme) lowertrackstate = SCRBS_NORMAL; thumbstate = SCRBS_NORMAL; - if (tracking_win == hwnd) { - if (tracking_hot_part == SCROLL_TOP_RECT) - uppertrackstate = SCRBS_HOT; - else if (tracking_hot_part == SCROLL_BOTTOM_RECT) - lowertrackstate = SCRBS_HOT; - else if (tracking_hot_part == SCROLL_THUMB) - thumbstate = SCRBS_HOT; - } + if (hit_test == SCROLL_TOP_RECT) + uppertrackstate = SCRBS_HOT; + else if (hit_test == SCROLL_BOTTOM_RECT) + lowertrackstate = SCRBS_HOT; + else if (hit_test == SCROLL_THUMB) + thumbstate = SCRBS_HOT; } - DrawThemeParentBackground(hwnd, dc, NULL); + if (bar == SB_CTL) + DrawThemeParentBackground(hwnd, dc, NULL); if (vertical) { - SIZE upsize, downsize; int uparrowstate, downarrowstate; if (disabled) { @@ -380,50 +96,29 @@ static void paint_scrollbar(HWND hwnd, HTHEME theme) uparrowstate = ABS_UPNORMAL; downarrowstate = ABS_DOWNNORMAL; - if (tracking_win == hwnd) { - if (tracking_hot_part == SCROLL_TOP_ARROW) - uparrowstate = ABS_UPHOT; - else if (tracking_hot_part == SCROLL_BOTTOM_ARROW) - downarrowstate = ABS_DOWNHOT; - } + if (hit_test == SCROLL_TOP_ARROW) + uparrowstate = ABS_UPHOT; + else if (hit_test == SCROLL_BOTTOM_ARROW) + downarrowstate = ABS_DOWNHOT; } - if (FAILED(GetThemePartSize(theme, dc, SBP_ARROWBTN, uparrowstate, NULL, TS_DRAW, &upsize))) { - WARN("Could not get up arrow size.\n"); - return; - } - - if (FAILED(GetThemePartSize(theme, dc, SBP_ARROWBTN, downarrowstate, NULL, TS_DRAW, &downsize))) { - WARN("Could not get down arrow size.\n"); - return; - } - - if (r.bottom - r.top - upsize.cy - downsize.cy < SCROLL_MIN_RECT) - upsize.cy = downsize.cy = (r.bottom - r.top - SCROLL_MIN_RECT)/2; - - partrect = r; - partrect.bottom = partrect.top + upsize.cy; + partrect = *rect; + partrect.bottom = partrect.top + arrowsize; DrawThemeBackground(theme, dc, SBP_ARROWBTN, uparrowstate, &partrect, NULL); - trackrect.top = partrect.bottom; - - partrect.bottom = r.bottom; - partrect.top = partrect.bottom - downsize.cy; + partrect.bottom = rect->bottom; + partrect.top = partrect.bottom - arrowsize; DrawThemeBackground(theme, dc, SBP_ARROWBTN, downarrowstate, &partrect, NULL); - trackrect.bottom = partrect.top; - - calc_thumb_dimensions(trackrect.bottom - trackrect.top, &si, &thumbpos, &thumbsize); - if (thumbpos > 0) { - partrect.top = trackrect.top; - partrect.bottom = partrect.top + thumbpos; + partrect.top = rect->top + arrowsize; + partrect.bottom = rect->top + thumbpos; DrawThemeBackground(theme, dc, SBP_UPPERTRACKVERT, uppertrackstate, &partrect, NULL); } if (thumbsize > 0) { - partrect.top = trackrect.top + thumbpos; + partrect.top = rect->top + thumbpos; partrect.bottom = partrect.top + thumbsize; DrawThemeBackground(theme, dc, SBP_THUMBBTNVERT, thumbstate, &partrect, NULL); @@ -438,14 +133,14 @@ static void paint_scrollbar(HWND hwnd, HTHEME theme) } } - if (thumbpos + thumbsize < trackrect.bottom - trackrect.top) { - partrect.bottom = trackrect.bottom; - partrect.top = trackrect.top + thumbsize + thumbpos; - + partrect.bottom = rect->bottom - arrowsize; + if (thumbsize > 0) + partrect.top = rect->top + thumbpos + thumbsize; + else + partrect.top = rect->top + arrowsize; + if (partrect.bottom > partrect.top) DrawThemeBackground(theme, dc, SBP_LOWERTRACKVERT, lowertrackstate, &partrect, NULL); - } } else { - SIZE leftsize, rightsize; int leftarrowstate, rightarrowstate; if (disabled) { @@ -455,50 +150,29 @@ static void paint_scrollbar(HWND hwnd, HTHEME theme) leftarrowstate = ABS_LEFTNORMAL; rightarrowstate = ABS_RIGHTNORMAL; - if (tracking_win == hwnd) { - if (tracking_hot_part == SCROLL_TOP_ARROW) - leftarrowstate = ABS_LEFTHOT; - else if (tracking_hot_part == SCROLL_BOTTOM_ARROW) - rightarrowstate = ABS_RIGHTHOT; - } + if (hit_test == SCROLL_TOP_ARROW) + leftarrowstate = ABS_LEFTHOT; + else if (hit_test == SCROLL_BOTTOM_ARROW) + rightarrowstate = ABS_RIGHTHOT; } - if (FAILED(GetThemePartSize(theme, dc, SBP_ARROWBTN, leftarrowstate, NULL, TS_DRAW, &leftsize))) { - WARN("Could not get left arrow size.\n"); - return; - } - - if (FAILED(GetThemePartSize(theme, dc, SBP_ARROWBTN, rightarrowstate, NULL, TS_DRAW, &rightsize))) { - WARN("Could not get right arrow size.\n"); - return; - } - - if (r.right - r.left - leftsize.cx - rightsize.cx < SCROLL_MIN_RECT) - leftsize.cx = rightsize.cx = (r.right - r.left - SCROLL_MIN_RECT)/2; - - partrect = r; - partrect.right = partrect.left + leftsize.cx; + partrect = *rect; + partrect.right = partrect.left + arrowsize; DrawThemeBackground(theme, dc, SBP_ARROWBTN, leftarrowstate, &partrect, NULL); - trackrect.left = partrect.right; - - partrect.right = r.right; - partrect.left = partrect.right - rightsize.cx; + partrect.right = rect->right; + partrect.left = partrect.right - arrowsize; DrawThemeBackground(theme, dc, SBP_ARROWBTN, rightarrowstate, &partrect, NULL); - trackrect.right = partrect.left; - - calc_thumb_dimensions(trackrect.right - trackrect.left, &si, &thumbpos, &thumbsize); - if (thumbpos > 0) { - partrect.left = trackrect.left; - partrect.right = partrect.left + thumbpos; + partrect.left = rect->left + arrowsize; + partrect.right = rect->left + thumbpos; DrawThemeBackground(theme, dc, SBP_UPPERTRACKHORZ, uppertrackstate, &partrect, NULL); } if (thumbsize > 0) { - partrect.left = trackrect.left + thumbpos; + partrect.left = rect->left + thumbpos; partrect.right = partrect.left + thumbsize; DrawThemeBackground(theme, dc, SBP_THUMBBTNHORZ, thumbstate, &partrect, NULL); @@ -513,16 +187,18 @@ static void paint_scrollbar(HWND hwnd, HTHEME theme) } } - if (thumbpos + thumbsize < trackrect.right - trackrect.left) { - partrect.right = trackrect.right; - partrect.left = trackrect.left + thumbsize + thumbpos; - + partrect.right = rect->right - arrowsize; + if (thumbsize > 0) + partrect.left = rect->left + thumbpos + thumbsize; + else + partrect.left = rect->left + arrowsize; + if (partrect.right > partrect.left) DrawThemeBackground(theme, dc, SBP_LOWERTRACKHORZ, lowertrackstate, &partrect, NULL); - } } } - EndPaint(hwnd, &ps); + if (bar != SB_CTL) + CloseThemeData(theme); } LRESULT WINAPI UXTHEME_ScrollbarWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, @@ -531,7 +207,6 @@ LRESULT WINAPI UXTHEME_ScrollbarWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPAR const WCHAR* themeClass = WC_SCROLLBARW; HTHEME theme; LRESULT result; - POINT pt; TRACE("(%p, 0x%x, %lu, %lu, %d)\n", hwnd, msg, wParam, lParam, unicode); @@ -560,23 +235,6 @@ LRESULT WINAPI UXTHEME_ScrollbarWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPAR * which will do the repaint. */ break; - case WM_PAINT: - theme = GetWindowTheme(hwnd); - if (!theme) return user_api.pScrollBarWndProc(hwnd, msg, wParam, lParam, unicode); - - paint_scrollbar(hwnd, theme); - break; - - case WM_MOUSEMOVE: - case WM_MOUSELEAVE: - theme = GetWindowTheme(hwnd); - if (!theme) return user_api.pScrollBarWndProc(hwnd, msg, wParam, lParam, unicode); - - pt.x = (short)LOWORD(lParam); - pt.y = (short)HIWORD(lParam); - scroll_event(hwnd, theme, msg, pt); - break; - default: return user_api.pScrollBarWndProc(hwnd, msg, wParam, lParam, unicode); } diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c index 83eda58c460..afae1e23f2b 100644 --- a/dlls/uxtheme/system.c +++ b/dlls/uxtheme/system.c @@ -1230,6 +1230,7 @@ BOOL WINAPI ThemeHooksInstall(void) struct user_api_hook hooks; hooks.pDefDlgProc = UXTHEME_DefDlgProc; + hooks.pScrollBarDraw = UXTHEME_ScrollBarDraw; hooks.pScrollBarWndProc = UXTHEME_ScrollbarWndProc; return RegisterUserApiHook(&hooks, &user_api); } diff --git a/dlls/uxtheme/uxthemedll.h b/dlls/uxtheme/uxthemedll.h index 67932f22f88..4b8f95764d6 100644 --- a/dlls/uxtheme/uxthemedll.h +++ b/dlls/uxtheme/uxthemedll.h @@ -103,6 +103,10 @@ extern void UXTHEME_UninitSystem(void) DECLSPEC_HIDDEN; extern struct user_api_hook user_api DECLSPEC_HIDDEN; LRESULT WINAPI UXTHEME_DefDlgProc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, BOOL unicode) DECLSPEC_HIDDEN; +void WINAPI UXTHEME_ScrollBarDraw(HWND hwnd, HDC dc, INT bar, enum SCROLL_HITTEST hit_test, + const struct SCROLL_TRACKING_INFO *tracking_info, + BOOL draw_arrows, BOOL draw_interior, RECT *rect, INT arrowsize, + INT thumbpos, INT thumbsize, BOOL vertical) DECLSPEC_HIDDEN; LRESULT WINAPI UXTHEME_ScrollbarWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, BOOL unicode) DECLSPEC_HIDDEN; diff --git a/include/winuser.h b/include/winuser.h index 7a45198411c..072f435c08e 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -4409,9 +4409,35 @@ WORD WINAPI SYSTEM_KillSystemTimer( WORD ); WINUSERAPI BOOL CDECL __wine_send_input( HWND hwnd, const INPUT *input, const RAWINPUT *rawinput ); /* Uxtheme hook functions and struct */ + +/* Scroll bar hit testing */ +enum SCROLL_HITTEST +{ + SCROLL_NOWHERE, /* Outside the scroll bar */ + SCROLL_TOP_ARROW, /* Top or left arrow */ + SCROLL_TOP_RECT, /* Rectangle between the top arrow and the thumb */ + SCROLL_THUMB, /* Thumb rectangle */ + SCROLL_BOTTOM_RECT, /* Rectangle between the thumb and the bottom arrow */ + SCROLL_BOTTOM_ARROW /* Bottom or right arrow */ +}; + +/* Scroll bar tracking information */ +struct SCROLL_TRACKING_INFO +{ + HWND win; /* Tracking window */ + INT bar; /* SB_HORZ/SB_VERT/SB_CTL */ + INT thumb_pos; /* Thumb position */ + INT thumb_val; /* Current thumb value from thumb position */ + BOOL vertical; /* Is scroll bar vertical */ + enum SCROLL_HITTEST hit_test; /* Hit Test code of the last button-down event */ +}; + struct user_api_hook { LRESULT (WINAPI *pDefDlgProc)(HWND, UINT, WPARAM, LPARAM, BOOL); + void (WINAPI *pScrollBarDraw)(HWND, HDC, INT, enum SCROLL_HITTEST, + const struct SCROLL_TRACKING_INFO *, BOOL, BOOL, RECT *, INT, INT, + INT, BOOL); LRESULT (WINAPI *pScrollBarWndProc)(HWND, UINT, WPARAM, LPARAM, BOOL); }; -- 2.30.2

1 0

[PATCH v2 2/5] uxtheme: Move themed dialog to uxtheme.
by Zhiyi Zhang 20 Jul '21

20 Jul '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51137 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/Makefile.in | 2 - dlls/comctl32/comctl32.h | 4 - dlls/comctl32/commctrl.c | 7 +- dlls/comctl32/theming.c | 157 ------------------ dlls/user32/defdlg.c | 35 +++- dlls/user32/hook.c | 1 + dlls/user32/user_private.h | 1 + dlls/uxtheme/Makefile.in | 1 + .../theme_dialog.c => uxtheme/dialog.c} | 25 ++- dlls/uxtheme/system.c | 1 + dlls/uxtheme/uxthemedll.h | 1 + include/winuser.h | 1 + 12 files changed, 45 insertions(+), 191 deletions(-) delete mode 100644 dlls/comctl32/theming.c rename dlls/{comctl32/theme_dialog.c => uxtheme/dialog.c} (81%) diff --git a/dlls/comctl32/Makefile.in b/dlls/comctl32/Makefile.in index bd99d8f0276..63bfbf0892c 100644 --- a/dlls/comctl32/Makefile.in +++ b/dlls/comctl32/Makefile.in @@ -37,8 +37,6 @@ C_SRCS = \ syslink.c \ tab.c \ taskdialog.c \ - theme_dialog.c \ - theming.c \ toolbar.c \ tooltips.c \ trackbar.c \ diff --git a/dlls/comctl32/comctl32.h b/dlls/comctl32/comctl32.h index 66b341ae5ad..44d3b43ab9b 100644 --- a/dlls/comctl32/comctl32.h +++ b/dlls/comctl32/comctl32.h @@ -280,8 +280,4 @@ int MONTHCAL_MonthLength(int month, int year) DECLSPEC_HIDDEN; int MONTHCAL_CalculateDayOfWeek(SYSTEMTIME *date, BOOL inplace) DECLSPEC_HIDDEN; LONG MONTHCAL_CompareSystemTime(const SYSTEMTIME *first, const SYSTEMTIME *second) DECLSPEC_HIDDEN; -extern void THEMING_Initialize(void) DECLSPEC_HIDDEN; -extern void THEMING_Uninitialize(void) DECLSPEC_HIDDEN; -extern LRESULT THEMING_CallOriginalClass(HWND, UINT, WPARAM, LPARAM) DECLSPEC_HIDDEN; - #endif /* __WINE_COMCTL32_H */ diff --git a/dlls/comctl32/commctrl.c b/dlls/comctl32/commctrl.c index cb9c22a3a88..1c7718e2400 100644 --- a/dlls/comctl32/commctrl.c +++ b/dlls/comctl32/commctrl.c @@ -72,6 +72,7 @@ #define NO_SHLWAPI_STREAM #include "shlwapi.h" #include "comctl32.h" +#include "uxtheme.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(commctrl); @@ -208,14 +209,12 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) TREEVIEW_Register (); UPDOWN_Register (); - /* subclass user32 controls */ - THEMING_Initialize (); + /* Call IsThemeActive() so that delay-loaded uxtheme.dll is loaded for hooking user32 */ + IsThemeActive(); break; case DLL_PROCESS_DETACH: if (lpvReserved) break; - /* clean up subclassing */ - THEMING_Uninitialize(); /* unregister all common control classes */ ANIMATE_Unregister (); diff --git a/dlls/comctl32/theming.c b/dlls/comctl32/theming.c deleted file mode 100644 index c74bcfc36a2..00000000000 --- a/dlls/comctl32/theming.c +++ /dev/null @@ -1,157 +0,0 @@ -/* - * Theming - Initialization - * - * Copyright (c) 2005 by Frank Richter - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - * - */ - -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "comctl32.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(theming); - -typedef LRESULT (CALLBACK* THEMING_SUBCLASSPROC)(HWND, UINT, WPARAM, LPARAM, - ULONG_PTR); - -extern LRESULT CALLBACK THEMING_DialogSubclassProc (HWND, UINT, WPARAM, LPARAM, - ULONG_PTR) DECLSPEC_HIDDEN; - -static const WCHAR dialogClass[] = L"#32770"; - -static const struct ThemingSubclass -{ - const WCHAR* className; - THEMING_SUBCLASSPROC subclassProc; -} subclasses[] = { - /* Note: list must be sorted by class name */ - {dialogClass, THEMING_DialogSubclassProc}, -}; - -#define NUM_SUBCLASSES (ARRAY_SIZE(subclasses)) - -static WNDPROC originalProcs[NUM_SUBCLASSES]; -static ATOM atRefDataProp; -static ATOM atSubclassProp; - -/* Generate a number of subclass window procs. - * With a single proc alone, we can't really reliably find out the superclass, - * so have one for each subclass. The subclass number is also stored in a prop - * since it's needed by THEMING_CallOriginalClass(). Then, the subclass - * proc and ref data are fetched and the proc called. - */ -#define MAKE_SUBCLASS_PROC(N) \ -static LRESULT CALLBACK subclass_proc ## N (HWND wnd, UINT msg, \ - WPARAM wParam, LPARAM lParam) \ -{ \ - LRESULT result; \ - ULONG_PTR refData; \ - SetPropW (wnd, (LPCWSTR)MAKEINTATOM(atSubclassProp), (HANDLE)N); \ - refData = (ULONG_PTR)GetPropW (wnd, (LPCWSTR)MAKEINTATOM(atRefDataProp)); \ - TRACE ("%d; (%p, %x, %lx, %lx, %lx)\n", N, wnd, msg, wParam, lParam, \ - refData); \ - result = subclasses[N].subclassProc (wnd, msg, wParam, lParam, refData);\ - TRACE ("result = %lx\n", result); \ - return result; \ -} - -MAKE_SUBCLASS_PROC(0) - -static const WNDPROC subclassProcs[NUM_SUBCLASSES] = { - subclass_proc0, -}; - -/*********************************************************************** - * THEMING_Initialize - * - * Register classes for standard controls that will shadow the system - * classes. - */ -void THEMING_Initialize (void) -{ - unsigned int i; - - atSubclassProp = GlobalAddAtomW (L"CC32ThemingSubCl"); - atRefDataProp = GlobalAddAtomW (L"CC32ThemingData"); - - for (i = 0; i < NUM_SUBCLASSES; i++) - { - WNDCLASSEXW class; - - class.cbSize = sizeof(class); - if (!GetClassInfoExW (NULL, subclasses[i].className, &class)) - { - ERR("Could not retrieve information for class %s\n", - debugstr_w (subclasses[i].className)); - continue; - } - originalProcs[i] = class.lpfnWndProc; - class.lpfnWndProc = subclassProcs[i]; - - if (!class.lpfnWndProc) - { - ERR("Missing proc for class %s\n", - debugstr_w (subclasses[i].className)); - continue; - } - - if (!RegisterClassExW (&class)) - { - ERR("Could not re-register class %s: %x\n", - debugstr_w (subclasses[i].className), GetLastError ()); - } - else - { - TRACE("Re-registered class %s\n", - debugstr_w (subclasses[i].className)); - } - } -} - -/*********************************************************************** - * THEMING_Uninitialize - * - * Unregister shadow classes for standard controls. - */ -void THEMING_Uninitialize (void) -{ - unsigned int i; - - if (!atSubclassProp) return; /* not initialized */ - - for (i = 0; i < NUM_SUBCLASSES; i++) - { - UnregisterClassW (subclasses[i].className, NULL); - } -} - -/*********************************************************************** - * THEMING_CallOriginalClass - * - * Determines the original window proc and calls it. - */ -LRESULT THEMING_CallOriginalClass (HWND wnd, UINT msg, WPARAM wParam, LPARAM lParam) -{ - INT_PTR subclass = (INT_PTR)GetPropW (wnd, (LPCWSTR)MAKEINTATOM(atSubclassProp)); - WNDPROC oldProc = originalProcs[subclass]; - return CallWindowProcW (oldProc, wnd, msg, wParam, lParam); -} diff --git a/dlls/user32/defdlg.c b/dlls/user32/defdlg.c index 00a73c6b927..4f44a93cd49 100644 --- a/dlls/user32/defdlg.c +++ b/dlls/user32/defdlg.c @@ -354,10 +354,7 @@ out: return dlgInfo; } -/*********************************************************************** - * DefDlgProcA (USER32.@) - */ -LRESULT WINAPI DefDlgProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) +static LRESULT USER_DefDlgProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) { DIALOGINFO *dlgInfo; DLGPROC dlgproc; @@ -411,11 +408,7 @@ LRESULT WINAPI DefDlgProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) return GetWindowLongPtrW( hwnd, DWLP_MSGRESULT ); } - -/*********************************************************************** - * DefDlgProcW (USER32.@) - */ -LRESULT WINAPI DefDlgProcW( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) +static LRESULT USER_DefDlgProcW( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) { DIALOGINFO *dlgInfo; DLGPROC dlgproc; @@ -468,3 +461,27 @@ LRESULT WINAPI DefDlgProcW( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) return GetWindowLongPtrW( hwnd, DWLP_MSGRESULT ); } + +LRESULT WINAPI USER_DefDlgProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, BOOL unicode ) +{ + if (unicode) + return USER_DefDlgProcW( hwnd, msg, wParam, lParam ); + else + return USER_DefDlgProcA( hwnd, msg, wParam, lParam ); +} + +/*********************************************************************** + * DefDlgProcA (USER32.@) + */ +LRESULT WINAPI DefDlgProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) +{ + return user_api->pDefDlgProc( hwnd, msg, wParam, lParam, FALSE ); +} + +/*********************************************************************** + * DefDlgProcW (USER32.@) + */ +LRESULT WINAPI DefDlgProcW( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) +{ + return user_api->pDefDlgProc( hwnd, msg, wParam, lParam, TRUE ); +} diff --git a/dlls/user32/hook.c b/dlls/user32/hook.c index 9a1d010525a..7921bc3d45a 100644 --- a/dlls/user32/hook.c +++ b/dlls/user32/hook.c @@ -83,6 +83,7 @@ WINE_DECLARE_DEBUG_CHANNEL(relay); static struct user_api_hook original_user_api = { + USER_DefDlgProc, USER_ScrollBarProc, }; static struct user_api_hook hooked_user_api; diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 1e3786c2b1e..8750008a5fb 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -387,6 +387,7 @@ struct png_funcs #endif extern struct user_api_hook *user_api DECLSPEC_HIDDEN; +LRESULT WINAPI USER_DefDlgProc(HWND, UINT, WPARAM, LPARAM, BOOL) DECLSPEC_HIDDEN; LRESULT WINAPI USER_ScrollBarProc(HWND, UINT, WPARAM, LPARAM, BOOL) DECLSPEC_HIDDEN; #endif /* __WINE_USER_PRIVATE_H */ diff --git a/dlls/uxtheme/Makefile.in b/dlls/uxtheme/Makefile.in index f252f423a97..d272e049cf9 100644 --- a/dlls/uxtheme/Makefile.in +++ b/dlls/uxtheme/Makefile.in @@ -7,6 +7,7 @@ EXTRADLLFLAGS = -mno-cygwin C_SRCS = \ buffer.c \ + dialog.c \ draw.c \ main.c \ metric.c \ diff --git a/dlls/comctl32/theme_dialog.c b/dlls/uxtheme/dialog.c similarity index 81% rename from dlls/comctl32/theme_dialog.c rename to dlls/uxtheme/dialog.c index 0f7835ae32f..043346b24e2 100644 --- a/dlls/comctl32/theme_dialog.c +++ b/dlls/uxtheme/dialog.c @@ -28,16 +28,11 @@ #include "wingdi.h" #include "winuser.h" #include "uxtheme.h" +#include "uxthemedll.h" #include "vssym32.h" -#include "comctl32.h" #include "wine/debug.h" -/********************************************************************** - * The dialog subclass window proc. - */ -LRESULT CALLBACK THEMING_DialogSubclassProc (HWND hWnd, UINT msg, - WPARAM wParam, LPARAM lParam, - ULONG_PTR dwRefData) +LRESULT WINAPI UXTHEME_DefDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam, BOOL unicode) { HTHEME theme = GetWindowTheme ( hWnd ); static const WCHAR themeClass[] = L"Window"; @@ -48,7 +43,7 @@ LRESULT CALLBACK THEMING_DialogSubclassProc (HWND hWnd, UINT msg, switch (msg) { case WM_CREATE: - result = THEMING_CallOriginalClass (hWnd, msg, wParam, lParam); + result = user_api.pDefDlgProc(hWnd, msg, wParam, lParam, unicode); theme = OpenThemeData( hWnd, themeClass ); return result; @@ -56,7 +51,7 @@ LRESULT CALLBACK THEMING_DialogSubclassProc (HWND hWnd, UINT msg, CloseThemeData ( theme ); SetWindowTheme( hWnd, NULL, NULL ); OpenThemeData( hWnd, NULL ); - return THEMING_CallOriginalClass (hWnd, msg, wParam, lParam); + return user_api.pDefDlgProc(hWnd, msg, wParam, lParam, unicode); case WM_THEMECHANGED: CloseThemeData ( theme ); @@ -65,7 +60,7 @@ LRESULT CALLBACK THEMING_DialogSubclassProc (HWND hWnd, UINT msg, return 0; case WM_ERASEBKGND: - if (!doTheming) return THEMING_CallOriginalClass (hWnd, msg, wParam, lParam); + if (!doTheming) return user_api.pDefDlgProc(hWnd, msg, wParam, lParam, unicode); { RECT rc; WNDPROC dlgp = (WNDPROC)GetWindowLongPtrW (hWnd, DWLP_DLGPROC); @@ -82,7 +77,7 @@ LRESULT CALLBACK THEMING_DialogSubclassProc (HWND hWnd, UINT msg, DrawThemeBackground (theme, (HDC)wParam, WP_DIALOG, 0, &rc, NULL); #endif - return THEMING_CallOriginalClass (hWnd, msg, wParam, lParam); + return user_api.pDefDlgProc(hWnd, msg, wParam, lParam, unicode); else /* We might have gotten a TAB theme class, so check if we can * draw as a tab page. */ @@ -90,13 +85,13 @@ LRESULT CALLBACK THEMING_DialogSubclassProc (HWND hWnd, UINT msg, DrawThemeBackground (theme, (HDC)wParam, TABP_BODY, 0, &rc, NULL); else - return THEMING_CallOriginalClass (hWnd, msg, wParam, lParam); + return user_api.pDefDlgProc(hWnd, msg, wParam, lParam, unicode); } return 1; } case WM_CTLCOLORSTATIC: - if (!doTheming) return THEMING_CallOriginalClass (hWnd, msg, wParam, lParam); + if (!doTheming) return user_api.pDefDlgProc(hWnd, msg, wParam, lParam, unicode); { WNDPROC dlgp = (WNDPROC)GetWindowLongPtrW (hWnd, DWLP_DLGPROC); LRESULT result = CallWindowProcW(dlgp, hWnd, msg, wParam, lParam); @@ -121,7 +116,7 @@ LRESULT CALLBACK THEMING_DialogSubclassProc (HWND hWnd, UINT msg, return (LRESULT)GetStockObject (NULL_BRUSH); } else - return THEMING_CallOriginalClass (hWnd, msg, wParam, lParam); + return user_api.pDefDlgProc(hWnd, msg, wParam, lParam, unicode); } return result; @@ -129,7 +124,7 @@ LRESULT CALLBACK THEMING_DialogSubclassProc (HWND hWnd, UINT msg, default: /* Call old proc */ - return THEMING_CallOriginalClass (hWnd, msg, wParam, lParam); + return user_api.pDefDlgProc(hWnd, msg, wParam, lParam, unicode); } return 0; } diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c index 84b5cbc5fbc..83eda58c460 100644 --- a/dlls/uxtheme/system.c +++ b/dlls/uxtheme/system.c @@ -1229,6 +1229,7 @@ BOOL WINAPI ThemeHooksInstall(void) { struct user_api_hook hooks; + hooks.pDefDlgProc = UXTHEME_DefDlgProc; hooks.pScrollBarWndProc = UXTHEME_ScrollbarWndProc; return RegisterUserApiHook(&hooks, &user_api); } diff --git a/dlls/uxtheme/uxthemedll.h b/dlls/uxtheme/uxthemedll.h index 7a085b8a3f1..67932f22f88 100644 --- a/dlls/uxtheme/uxthemedll.h +++ b/dlls/uxtheme/uxthemedll.h @@ -102,6 +102,7 @@ extern void UXTHEME_InitSystem(HINSTANCE hInst) DECLSPEC_HIDDEN; extern void UXTHEME_UninitSystem(void) DECLSPEC_HIDDEN; extern struct user_api_hook user_api DECLSPEC_HIDDEN; +LRESULT WINAPI UXTHEME_DefDlgProc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, BOOL unicode) DECLSPEC_HIDDEN; LRESULT WINAPI UXTHEME_ScrollbarWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, BOOL unicode) DECLSPEC_HIDDEN; diff --git a/include/winuser.h b/include/winuser.h index 36ca3881e97..7a45198411c 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -4411,6 +4411,7 @@ WINUSERAPI BOOL CDECL __wine_send_input( HWND hwnd, const INPUT *input, const RA /* Uxtheme hook functions and struct */ struct user_api_hook { + LRESULT (WINAPI *pDefDlgProc)(HWND, UINT, WPARAM, LPARAM, BOOL); LRESULT (WINAPI *pScrollBarWndProc)(HWND, UINT, WPARAM, LPARAM, BOOL); }; -- 2.30.2

1 0

[PATCH v2 1/5] uxtheme: Move themed scroll bar to uxtheme.
by Zhiyi Zhang 20 Jul '21

20 Jul '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v2: Supersede 209350~209355. Use undocumented Un/RegisterUserApiHook() instead of adding private wine exports. dlls/comctl32/Makefile.in | 1 - dlls/comctl32/theming.c | 5 ---- dlls/user32/hook.c | 28 +++++++++++++++++++ dlls/user32/scroll.c | 13 +++++---- dlls/user32/user32.spec | 4 +-- dlls/user32/user_private.h | 3 ++ dlls/uxtheme/Makefile.in | 1 + .../theme_scrollbar.c => uxtheme/scrollbar.c} | 21 +++++++------- dlls/uxtheme/system.c | 18 ++++++++++++ dlls/uxtheme/uxtheme.spec | 4 +-- dlls/uxtheme/uxthemedll.h | 8 ++++++ include/winuser.h | 9 ++++++ 12 files changed, 89 insertions(+), 26 deletions(-) rename dlls/{comctl32/theme_scrollbar.c => uxtheme/scrollbar.c} (95%) diff --git a/dlls/comctl32/Makefile.in b/dlls/comctl32/Makefile.in index 4ea068ea731..bd99d8f0276 100644 --- a/dlls/comctl32/Makefile.in +++ b/dlls/comctl32/Makefile.in @@ -38,7 +38,6 @@ C_SRCS = \ tab.c \ taskdialog.c \ theme_dialog.c \ - theme_scrollbar.c \ theming.c \ toolbar.c \ tooltips.c \ diff --git a/dlls/comctl32/theming.c b/dlls/comctl32/theming.c index 8078e661b76..c74bcfc36a2 100644 --- a/dlls/comctl32/theming.c +++ b/dlls/comctl32/theming.c @@ -35,8 +35,6 @@ typedef LRESULT (CALLBACK* THEMING_SUBCLASSPROC)(HWND, UINT, WPARAM, LPARAM, extern LRESULT CALLBACK THEMING_DialogSubclassProc (HWND, UINT, WPARAM, LPARAM, ULONG_PTR) DECLSPEC_HIDDEN; -extern LRESULT CALLBACK THEMING_ScrollbarSubclassProc (HWND, UINT, WPARAM, LPARAM, - ULONG_PTR) DECLSPEC_HIDDEN; static const WCHAR dialogClass[] = L"#32770"; @@ -47,7 +45,6 @@ static const struct ThemingSubclass } subclasses[] = { /* Note: list must be sorted by class name */ {dialogClass, THEMING_DialogSubclassProc}, - {WC_SCROLLBARW, THEMING_ScrollbarSubclassProc} }; #define NUM_SUBCLASSES (ARRAY_SIZE(subclasses)) @@ -78,11 +75,9 @@ static LRESULT CALLBACK subclass_proc ## N (HWND wnd, UINT msg, \ } MAKE_SUBCLASS_PROC(0) -MAKE_SUBCLASS_PROC(1) static const WNDPROC subclassProcs[NUM_SUBCLASSES] = { subclass_proc0, - subclass_proc1, }; /*********************************************************************** diff --git a/dlls/user32/hook.c b/dlls/user32/hook.c index 4c6dbcf7202..9a1d010525a 100644 --- a/dlls/user32/hook.c +++ b/dlls/user32/hook.c @@ -81,6 +81,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(hook); WINE_DECLARE_DEBUG_CHANNEL(relay); +static struct user_api_hook original_user_api = +{ + USER_ScrollBarProc, +}; +static struct user_api_hook hooked_user_api; +struct user_api_hook *user_api = &original_user_api; + struct hook_info { INT id; @@ -961,3 +968,24 @@ BOOL WINAPI IsWinEventHookInstalled(DWORD dwEvent) WARN("(%d)-stub!\n", dwEvent); return TRUE; } + +/* Undocumented RegisterUserApiHook() */ +BOOL WINAPI RegisterUserApiHook(const struct user_api_hook *new, struct user_api_hook *old) +{ + if (!new) + return FALSE; + + USER_Lock(); + hooked_user_api = *new; + user_api = &hooked_user_api; + if (old) + *old = original_user_api; + USER_Unlock(); + return TRUE; +} + +/* Undocumented UnregisterUserApiHook() */ +void WINAPI UnregisterUserApiHook(void) +{ + InterlockedExchangePointer((void **)&user_api, &original_user_api); +} diff --git a/dlls/user32/scroll.c b/dlls/user32/scroll.c index 5561509c50c..9a22e930332 100644 --- a/dlls/user32/scroll.c +++ b/dlls/user32/scroll.c @@ -1317,11 +1317,7 @@ static BOOL SCROLL_SetScrollRange(HWND hwnd, INT nBar, INT minVal, INT maxVal) return TRUE; } - -/*********************************************************************** - * ScrollBarWndProc_common - */ -LRESULT ScrollBarWndProc_common( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam, BOOL unicode ) +LRESULT WINAPI USER_ScrollBarProc( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam, BOOL unicode ) { if (!IsWindow( hwnd )) return 0; @@ -1496,6 +1492,13 @@ LRESULT ScrollBarWndProc_common( HWND hwnd, UINT message, WPARAM wParam, LPARAM return 0; } +/*********************************************************************** + * ScrollBarWndProc_common + */ +LRESULT ScrollBarWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, BOOL unicode ) +{ + return user_api->pScrollBarWndProc( hwnd, msg, wParam, lParam, unicode ); +} /************************************************************************* * SetScrollInfo (USER32.@) diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 391e304a063..8d3ac70210c 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -612,7 +612,7 @@ @ stdcall RegisterTasklist (long) @ stdcall RegisterTouchHitTestingWindow(long long) @ stdcall RegisterTouchWindow(long long) -# @ stub RegisterUserApiHook +@ stdcall RegisterUserApiHook(ptr ptr) @ stdcall RegisterWindowMessageA(str) @ stdcall RegisterWindowMessageW(wstr) @ stdcall ReleaseCapture() @@ -784,7 +784,7 @@ # @ stub UnregisterMessagePumpHook @ stdcall UnregisterPowerSettingNotification(ptr) @ stdcall UnregisterTouchWindow(long) -# @ stub UnregisterUserApiHook +@ stdcall UnregisterUserApiHook() @ stdcall UpdateLayeredWindow(long long ptr ptr long ptr long ptr long) @ stdcall UpdateLayeredWindowIndirect(long ptr) @ stub UpdatePerUserSystemParameters diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 0838ba28b32..1e3786c2b1e 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -386,4 +386,7 @@ struct png_funcs #define assert(expr) ((void)0) #endif +extern struct user_api_hook *user_api DECLSPEC_HIDDEN; +LRESULT WINAPI USER_ScrollBarProc(HWND, UINT, WPARAM, LPARAM, BOOL) DECLSPEC_HIDDEN; + #endif /* __WINE_USER_PRIVATE_H */ diff --git a/dlls/uxtheme/Makefile.in b/dlls/uxtheme/Makefile.in index 61817ee5468..f252f423a97 100644 --- a/dlls/uxtheme/Makefile.in +++ b/dlls/uxtheme/Makefile.in @@ -12,6 +12,7 @@ C_SRCS = \ metric.c \ msstyles.c \ property.c \ + scrollbar.c \ stylemap.c \ system.c \ uxini.c diff --git a/dlls/comctl32/theme_scrollbar.c b/dlls/uxtheme/scrollbar.c similarity index 95% rename from dlls/comctl32/theme_scrollbar.c rename to dlls/uxtheme/scrollbar.c index 7cc59bbd1e5..393b45a831d 100644 --- a/dlls/comctl32/theme_scrollbar.c +++ b/dlls/uxtheme/scrollbar.c @@ -28,8 +28,8 @@ #include "wingdi.h" #include "winuser.h" #include "uxtheme.h" +#include "uxthemedll.h" #include "vssym32.h" -#include "comctl32.h" #include "wine/debug.h" /* Minimum size of the thumb in pixels */ @@ -525,27 +525,26 @@ static void paint_scrollbar(HWND hwnd, HTHEME theme) EndPaint(hwnd, &ps); } -LRESULT CALLBACK THEMING_ScrollbarSubclassProc (HWND hwnd, UINT msg, - WPARAM wParam, LPARAM lParam, - ULONG_PTR dwRefData) +LRESULT WINAPI UXTHEME_ScrollbarWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, + BOOL unicode) { const WCHAR* themeClass = WC_SCROLLBARW; HTHEME theme; LRESULT result; POINT pt; - TRACE("(%p, 0x%x, %lu, %lu, %lu)\n", hwnd, msg, wParam, lParam, dwRefData); + TRACE("(%p, 0x%x, %lu, %lu, %d)\n", hwnd, msg, wParam, lParam, unicode); switch (msg) { case WM_CREATE: - result = THEMING_CallOriginalClass(hwnd, msg, wParam, lParam); + result = user_api.pScrollBarWndProc(hwnd, msg, wParam, lParam, unicode); OpenThemeData(hwnd, themeClass); return result; case WM_DESTROY: theme = GetWindowTheme(hwnd); CloseThemeData(theme); - return THEMING_CallOriginalClass(hwnd, msg, wParam, lParam); + return user_api.pScrollBarWndProc(hwnd, msg, wParam, lParam, unicode); case WM_THEMECHANGED: theme = GetWindowTheme(hwnd); @@ -556,14 +555,14 @@ LRESULT CALLBACK THEMING_ScrollbarSubclassProc (HWND hwnd, UINT msg, case WM_SYSCOLORCHANGE: theme = GetWindowTheme(hwnd); - if (!theme) return THEMING_CallOriginalClass(hwnd, msg, wParam, lParam); + if (!theme) return user_api.pScrollBarWndProc(hwnd, msg, wParam, lParam, unicode); /* Do nothing. When themed, a WM_THEMECHANGED will be received, too, * which will do the repaint. */ break; case WM_PAINT: theme = GetWindowTheme(hwnd); - if (!theme) return THEMING_CallOriginalClass(hwnd, msg, wParam, lParam); + if (!theme) return user_api.pScrollBarWndProc(hwnd, msg, wParam, lParam, unicode); paint_scrollbar(hwnd, theme); break; @@ -571,7 +570,7 @@ LRESULT CALLBACK THEMING_ScrollbarSubclassProc (HWND hwnd, UINT msg, case WM_MOUSEMOVE: case WM_MOUSELEAVE: theme = GetWindowTheme(hwnd); - if (!theme) return THEMING_CallOriginalClass(hwnd, msg, wParam, lParam); + if (!theme) return user_api.pScrollBarWndProc(hwnd, msg, wParam, lParam, unicode); pt.x = (short)LOWORD(lParam); pt.y = (short)HIWORD(lParam); @@ -579,7 +578,7 @@ LRESULT CALLBACK THEMING_ScrollbarSubclassProc (HWND hwnd, UINT msg, break; default: - return THEMING_CallOriginalClass(hwnd, msg, wParam, lParam); + return user_api.pScrollBarWndProc(hwnd, msg, wParam, lParam, unicode); } return 0; diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c index dcd2a660042..84b5cbc5fbc 100644 --- a/dlls/uxtheme/system.c +++ b/dlls/uxtheme/system.c @@ -55,6 +55,8 @@ static WCHAR szCurrentTheme[MAX_PATH]; static WCHAR szCurrentColor[64]; static WCHAR szCurrentSize[64]; +struct user_api_hook user_api = {0}; + /***********************************************************************/ static BOOL CALLBACK UXTHEME_broadcast_msg_enumchild (HWND hWnd, LPARAM msg) @@ -507,10 +509,12 @@ void UXTHEME_InitSystem(HINSTANCE hInst) atDialogThemeEnabled = GlobalAddAtomW(L"ux_dialogtheme"); UXTHEME_LoadTheme(); + ThemeHooksInstall(); } void UXTHEME_UninitSystem(void) { + ThemeHooksRemove(); MSSTYLES_SetActiveTheme(NULL, FALSE); GlobalDeleteAtom(atWindowTheme); @@ -1220,3 +1224,17 @@ HRESULT WINAPI CheckThemeSignature(LPCWSTR pszThemeFileName) MSSTYLES_CloseThemeFile(pt); return S_OK; } + +BOOL WINAPI ThemeHooksInstall(void) +{ + struct user_api_hook hooks; + + hooks.pScrollBarWndProc = UXTHEME_ScrollbarWndProc; + return RegisterUserApiHook(&hooks, &user_api); +} + +BOOL WINAPI ThemeHooksRemove(void) +{ + UnregisterUserApiHook(); + return TRUE; +} diff --git a/dlls/uxtheme/uxtheme.spec b/dlls/uxtheme/uxtheme.spec index 632129b8104..22b1fc4ac3c 100644 --- a/dlls/uxtheme/uxtheme.spec +++ b/dlls/uxtheme/uxtheme.spec @@ -29,8 +29,8 @@ 31 stub -noname InitUserTheme 32 stub -noname InitUserRegistry 33 stub -noname ReestablishServerConnection -34 stub -noname ThemeHooksInstall -35 stub -noname ThemeHooksRemove +34 stdcall -noname ThemeHooksInstall() +35 stdcall -noname ThemeHooksRemove() 36 stub -noname RefreshThemeForTS 43 stub -noname ClassicGetSystemMetrics 44 stub -noname ClassicSystemParametersInfoA diff --git a/dlls/uxtheme/uxthemedll.h b/dlls/uxtheme/uxthemedll.h index fdf529b422a..7a085b8a3f1 100644 --- a/dlls/uxtheme/uxthemedll.h +++ b/dlls/uxtheme/uxthemedll.h @@ -21,6 +21,8 @@ #ifndef __WINE_UXTHEMEDLL_H #define __WINE_UXTHEMEDLL_H +#include <winuser.h> + typedef HANDLE HTHEMEFILE; /********************************************************************** @@ -93,10 +95,16 @@ HRESULT WINAPI EnumThemeSizes(LPWSTR pszThemeFileName, LPWSTR pszColorName, DWORD dwSizeNum, PTHEMENAMES pszColorNames) DECLSPEC_HIDDEN; HRESULT WINAPI ParseThemeIniFile(LPCWSTR pszIniFileName, LPWSTR pszUnknown, ParseThemeIniFileProc callback, LPVOID lpData) DECLSPEC_HIDDEN; +BOOL WINAPI ThemeHooksInstall(void) DECLSPEC_HIDDEN; +BOOL WINAPI ThemeHooksRemove(void) DECLSPEC_HIDDEN; extern void UXTHEME_InitSystem(HINSTANCE hInst) DECLSPEC_HIDDEN; extern void UXTHEME_UninitSystem(void) DECLSPEC_HIDDEN; +extern struct user_api_hook user_api DECLSPEC_HIDDEN; +LRESULT WINAPI UXTHEME_ScrollbarWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, + BOOL unicode) DECLSPEC_HIDDEN; + /* No alpha blending */ #define ALPHABLEND_NONE 0 /* "Cheap" binary alpha blending - but possibly faster */ diff --git a/include/winuser.h b/include/winuser.h index 0b1571c0a95..36ca3881e97 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -4407,6 +4407,15 @@ WORD WINAPI SYSTEM_KillSystemTimer( WORD ); #ifdef __WINESRC__ WINUSERAPI BOOL CDECL __wine_send_input( HWND hwnd, const INPUT *input, const RAWINPUT *rawinput ); + +/* Uxtheme hook functions and struct */ +struct user_api_hook +{ + LRESULT (WINAPI *pScrollBarWndProc)(HWND, UINT, WPARAM, LPARAM, BOOL); +}; + +BOOL WINAPI RegisterUserApiHook(const struct user_api_hook *new, struct user_api_hook *old); +void WINAPI UnregisterUserApiHook(void); #endif #ifdef __cplusplus -- 2.30.2

1 0

[PATCH v2] oleaut32/tests: Report the error when VarParseNumFromStr() fails.
by Francois Gouget 20 Jul '21

20 Jul '21

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- v2: Duplicate the check in ok() and if (). An alternative would be to put an else ok(0, ...) instead. --- dlls/oleaut32/tests/vartest.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index b18e6e3f3a0..136d2ddd521 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -1288,6 +1288,7 @@ static HRESULT convert_str( const char *str, INT dig, ULONG flags, static void expect_NumFromStr( int line, HRESULT hres, NUMPARSE *np, INT a, ULONG b, ULONG c, INT d, INT e, INT f ) { + ok_(__FILE__,line)(hres == (HRESULT)S_OK, "returned %08x\n", hres); if (hres == (HRESULT)S_OK) { ok_(__FILE__,line)(np->cDig == a, "Expected cDig = %d, got %d\n", a, np->cDig); -- 2.20.1

2 1

[PATCH 1/2] oleaut32: Fix VarParseNumFromStr()'s support for two-character currencies.
by Francois Gouget 20 Jul '21

20 Jul '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51452 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This is only a partial fix for bug 51452: two character currencies should now work but longer currencies still fail. --- dlls/oleaut32/tests/vartest.c | 7 +++---- dlls/oleaut32/variant.c | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 136d2ddd521..52a27750f45 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -2154,14 +2154,13 @@ static void test_VarParseNumFromStrMisc(void) /* 2 Polish zloty */ lcid = MAKELCID(MAKELANGID(LANG_POLISH,SUBLANG_POLISH_POLAND),SORT_DEFAULT); WCONVERT(L"z\x142\x32", NUMPRS_CURRENCY|NUMPRS_USE_ALL); - todo_wine EXPECT(1,NUMPRS_CURRENCY|NUMPRS_USE_ALL,NUMPRS_CURRENCY,3,0,0); - todo_wine EXPECT2(2,FAILDIG); + EXPECT(1,NUMPRS_CURRENCY|NUMPRS_USE_ALL,NUMPRS_CURRENCY,3,0,0); + EXPECT2(2,FAILDIG); /* Multi-character currencies can be repeated too "zl2zlzl" */ WCONVERT(L"z\x142\x32z\x142z\x142", NUMPRS_CURRENCY|NUMPRS_USE_ALL); todo_wine EXPECT(1,NUMPRS_CURRENCY|NUMPRS_USE_ALL,NUMPRS_CURRENCY,7,0,0); - todo_wine EXPECTRGB(0,2); - EXPECTRGB(1,FAILDIG); + EXPECT2(2,FAILDIG); lcid = MAKELCID(MAKELANGID(LANG_FRENCH,SUBLANG_FRENCH_SWISS),SORT_DEFAULT); WCONVERT(L"3CHF", NUMPRS_CURRENCY|NUMPRS_USE_ALL); diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index fdc402c7a62..71c3204e0a0 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -1669,8 +1669,8 @@ HRESULT WINAPI VarParseNumFromStr(const OLECHAR *lpszStr, LCID lcid, ULONG dwFla (!chars.cCurrencyLocal2 || lpszStr[1] == chars.cCurrencyLocal2)) { pNumprs->dwOutFlags |= NUMPRS_CURRENCY; - cchUsed++; - lpszStr++; + cchUsed += chars.cCurrencyLocal2 ? 2 : 1; + lpszStr += chars.cCurrencyLocal2 ? 2 : 1; /* Only accept currency characters */ chars.cDecimalPoint = chars.cCurrencyDecimalPoint; chars.cDigitSeparator = chars.cCurrencyDigitSeparator; -- 2.20.1

1 1

[PATCH v2] ntdll: Comment out stubs for Nt and Zw functions.
by Paul Gofman 20 Jul '21

20 Jul '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- v2: - fix port test. Those are supposed to be syscalls and having them as a regular functions is wrong. In the not much likely case the presence of some of these stubs helped some applications those can be added back as -syscall function stubs. dlls/ntdll/ntdll.spec | 188 ++++++++++++++++++++-------------------- dlls/ntdll/tests/port.c | 4 +- 2 files changed, 96 insertions(+), 96 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index ccd825ff58e..aad7bd89d14 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -145,7 +145,7 @@ @ stdcall -syscall NtAllocateVirtualMemoryEx(long ptr ptr long long ptr long) @ stdcall -syscall NtAreMappedFilesTheSame(ptr ptr) @ stdcall -syscall NtAssignProcessToJobObject(long long) -@ stub NtCallbackReturn +# @ stub NtCallbackReturn # @ stub NtCancelDeviceWakeupRequest @ stdcall -syscall NtCancelIoFile(long ptr) @ stdcall -syscall NtCancelIoFileEx(long ptr ptr) @@ -153,7 +153,7 @@ @ stdcall -syscall NtClearEvent(long) @ stdcall -syscall NtClearPowerRequest(long long) @ stdcall -syscall NtClose(long) -@ stub NtCloseObjectAuditAlarm +# @ stub NtCloseObjectAuditAlarm # @ stub NtCompactKeys # @ stub NtCompareTokens @ stdcall -syscall NtCompleteConnectPort(ptr) @@ -163,7 +163,7 @@ @ stdcall -syscall NtCreateDebugObject(ptr long ptr long) @ stdcall -syscall NtCreateDirectoryObject(ptr long ptr) @ stdcall -syscall NtCreateEvent(ptr long ptr long long) -@ stub NtCreateEventPair +# @ stub NtCreateEventPair @ stdcall -syscall NtCreateFile(ptr long ptr ptr ptr long long long long ptr long) @ stdcall -syscall NtCreateIoCompletion(ptr long ptr long) @ stdcall -syscall NtCreateJobObject(ptr long ptr) @@ -178,16 +178,16 @@ @ stdcall -syscall NtCreatePagingFile(ptr ptr ptr ptr) @ stdcall -syscall NtCreatePort(ptr ptr long long ptr) @ stdcall -syscall NtCreatePowerRequest(ptr ptr) -@ stub NtCreateProcess +# @ stub NtCreateProcess # @ stub NtCreateProcessEx -@ stub NtCreateProfile +# @ stub NtCreateProfile @ stdcall -syscall NtCreateSection(ptr long ptr ptr long long long) @ stdcall -syscall NtCreateSemaphore(ptr long ptr long long) @ stdcall -syscall NtCreateSymbolicLinkObject(ptr long ptr ptr) @ stdcall -syscall NtCreateThread(ptr long ptr long ptr ptr ptr long) @ stdcall -syscall NtCreateThreadEx(ptr long ptr long ptr ptr long long long long ptr) @ stdcall -syscall NtCreateTimer(ptr long ptr long) -@ stub NtCreateToken +# @ stub NtCreateToken @ stdcall -syscall NtCreateUserProcess(ptr ptr long long ptr ptr long long ptr ptr ptr) # @ stub NtCreateWaitablePort @ stdcall -arch=i386,arm64 NtCurrentTeb() @@ -205,11 +205,11 @@ @ stdcall -syscall NtDuplicateObject(long long long ptr long long long) @ stdcall -syscall NtDuplicateToken(long long ptr long long ptr) # @ stub NtEnumerateBootEntries -@ stub NtEnumerateBus +# @ stub NtEnumerateBus @ stdcall -syscall NtEnumerateKey(long long long ptr long ptr) # @ stub NtEnumerateSystemEnvironmentValuesEx @ stdcall -syscall NtEnumerateValueKey(long long long ptr long ptr) -@ stub NtExtendSection +# @ stub NtExtendSection @ stdcall -syscall NtFilterToken(long long ptr ptr ptr ptr) @ stdcall -syscall NtFindAtom(ptr long ptr) @ stdcall -syscall NtFlushBuffersFile(long ptr) @@ -217,7 +217,7 @@ @ stdcall -syscall NtFlushKey(long) @ stdcall -syscall NtFlushProcessWriteBuffers() @ stdcall -syscall NtFlushVirtualMemory(long ptr ptr long) -@ stub NtFlushWriteBuffer +# @ stub NtFlushWriteBuffer # @ stub NtFreeUserPhysicalPages @ stdcall -syscall NtFreeVirtualMemory(long ptr ptr long) @ stdcall -syscall NtFsControlFile(long long ptr ptr ptr long ptr long ptr long) @@ -226,13 +226,13 @@ # @ stub NtGetDevicePowerState @ stdcall -syscall NtGetNextThread(ptr ptr long long long ptr) @ stdcall -syscall NtGetNlsSectionPtr(long long long ptr ptr) -@ stub NtGetPlugPlayEvent +# @ stub NtGetPlugPlayEvent @ stdcall NtGetTickCount() @ stdcall -syscall NtGetWriteWatch(long long ptr long ptr ptr ptr) @ stdcall -syscall NtImpersonateAnonymousToken(long) -@ stub NtImpersonateClientOfPort -@ stub NtImpersonateThread -@ stub NtInitializeRegistry +# @ stub NtImpersonateClientOfPort +# @ stub NtImpersonateThread +# @ stub NtInitializeRegistry @ stdcall -syscall NtInitiatePowerAction (long long long long) @ stdcall -syscall NtIsProcessInJob(long long) # @ stub NtIsSystemResumeAutomatic @@ -255,7 +255,7 @@ @ stdcall -syscall NtNotifyChangeMultipleKeys(long long ptr long ptr ptr ptr long long ptr long long) @ stdcall -syscall NtOpenDirectoryObject(ptr long ptr) @ stdcall -syscall NtOpenEvent(ptr long ptr) -@ stub NtOpenEventPair +# @ stub NtOpenEventPair @ stdcall -syscall NtOpenFile(ptr long ptr ptr long long) @ stdcall -syscall NtOpenIoCompletion(ptr long ptr) @ stdcall -syscall NtOpenJobObject(ptr long ptr) @@ -265,7 +265,7 @@ @ stdcall -syscall NtOpenKeyTransactedEx(ptr long ptr long long) @ stdcall -syscall NtOpenKeyedEvent(ptr long ptr) @ stdcall -syscall NtOpenMutant(ptr long ptr) -@ stub NtOpenObjectAuditAlarm +# @ stub NtOpenObjectAuditAlarm @ stdcall -syscall NtOpenProcess(ptr long ptr ptr) @ stdcall -syscall NtOpenProcessToken(long long ptr) @ stdcall -syscall NtOpenProcessTokenEx(long long long ptr) @@ -276,11 +276,11 @@ @ stdcall -syscall NtOpenThreadToken(long long long ptr) @ stdcall -syscall NtOpenThreadTokenEx(long long long long ptr) @ stdcall -syscall NtOpenTimer(ptr long ptr) -@ stub NtPlugPlayControl +# @ stub NtPlugPlayControl @ stdcall -syscall NtPowerInformation(long ptr long ptr long) @ stdcall -syscall NtPrivilegeCheck(ptr ptr ptr) -@ stub NtPrivilegeObjectAuditAlarm -@ stub NtPrivilegedServiceAuditAlarm +# @ stub NtPrivilegeObjectAuditAlarm +# @ stub NtPrivilegedServiceAuditAlarm @ stdcall -syscall NtProtectVirtualMemory(long ptr ptr long ptr) @ stdcall -syscall NtPulseEvent(long ptr) @ stdcall -syscall NtQueryAttributesFile(ptr ptr) @@ -297,19 +297,19 @@ @ stdcall -syscall NtQueryInformationAtom(long long ptr long ptr) @ stdcall -syscall NtQueryInformationFile(long ptr ptr long long) @ stdcall -syscall NtQueryInformationJobObject(long long ptr long ptr) -@ stub NtQueryInformationPort +# @ stub NtQueryInformationPort @ stdcall -syscall NtQueryInformationProcess(long long ptr long ptr) @ stdcall -syscall NtQueryInformationThread(long long ptr long ptr) @ stdcall -syscall NtQueryInformationToken(long long ptr long ptr) @ stdcall -syscall NtQueryInstallUILanguage(ptr) -@ stub NtQueryIntervalProfile +# @ stub NtQueryIntervalProfile @ stdcall -syscall NtQueryIoCompletion(long long ptr long ptr) @ stdcall -syscall NtQueryKey(long long ptr long ptr) @ stdcall -syscall NtQueryLicenseValue(ptr ptr ptr long ptr) @ stdcall -syscall NtQueryMultipleValueKey(long ptr long ptr long ptr) @ stdcall -syscall NtQueryMutant(long long ptr long ptr) @ stdcall -syscall NtQueryObject(long long ptr long ptr) -@ stub NtQueryOpenSubKeys +# @ stub NtQueryOpenSubKeys @ stdcall -syscall NtQueryPerformanceCounter(ptr ptr) # @ stub NtQueryPortInformationProcess # @ stub NtQueryQuotaInformationFile @@ -332,25 +332,25 @@ @ stdcall -syscall NtRaiseHardError(long long ptr ptr long ptr) @ stdcall -syscall NtReadFile(long long ptr ptr ptr ptr long ptr ptr) @ stdcall -syscall NtReadFileScatter(long long ptr ptr ptr ptr long ptr ptr) -@ stub NtReadRequestData +# @ stub NtReadRequestData @ stdcall -syscall NtReadVirtualMemory(long ptr ptr long ptr) -@ stub NtRegisterNewDevice +# @ stub NtRegisterNewDevice @ stdcall -syscall NtRegisterThreadTerminatePort(ptr) @ stdcall -syscall NtReleaseKeyedEvent(long ptr long ptr) @ stdcall -syscall NtReleaseMutant(long ptr) -@ stub NtReleaseProcessMutant +# @ stub NtReleaseProcessMutant @ stdcall -syscall NtReleaseSemaphore(long long ptr) @ stdcall -syscall NtRemoveIoCompletion(ptr ptr ptr ptr ptr) @ stdcall -syscall NtRemoveIoCompletionEx(ptr ptr long ptr ptr long) @ stdcall -syscall NtRemoveProcessDebug(long long) @ stdcall -syscall NtRenameKey(long ptr) @ stdcall -syscall NtReplaceKey(ptr long ptr) -@ stub NtReplyPort +# @ stub NtReplyPort @ stdcall -syscall NtReplyWaitReceivePort(ptr ptr ptr ptr) -@ stub NtReplyWaitReceivePortEx -@ stub NtReplyWaitReplyPort +# @ stub NtReplyWaitReceivePortEx +# @ stub NtReplyWaitReplyPort # @ stub NtRequestDeviceWakeup -@ stub NtRequestPort +# @ stub NtRequestPort @ stdcall -syscall NtRequestWaitReplyPort(ptr ptr ptr) # @ stub NtRequestWakeupLatency @ stdcall -syscall NtResetEvent(long ptr) @@ -365,16 +365,16 @@ # @ stub NtSetBootEntryOrder # @ stub NtSetBootOptions @ stdcall -syscall NtSetContextThread(long ptr) -@ stub NtSetDebugFilterState -@ stub NtSetDefaultHardErrorPort +# @ stub NtSetDebugFilterState +# @ stub NtSetDefaultHardErrorPort @ stdcall -syscall NtSetDefaultLocale(long long) @ stdcall -syscall NtSetDefaultUILanguage(long) @ stdcall -syscall NtSetEaFile(long ptr ptr long) @ stdcall -syscall NtSetEvent(long ptr) # @ stub NtSetEventBoostPriority -@ stub NtSetHighEventPair -@ stub NtSetHighWaitLowEventPair -@ stub NtSetHighWaitLowThread +# @ stub NtSetHighEventPair +# @ stub NtSetHighWaitLowEventPair +# @ stub NtSetHighWaitLowThread @ stdcall -syscall NtSetInformationDebugObject(long long ptr long ptr) @ stdcall -syscall NtSetInformationFile(long ptr ptr long long) @ stdcall -syscall NtSetInformationJobObject(long long ptr long) @@ -386,16 +386,16 @@ @ stdcall -syscall NtSetIntervalProfile(long long) @ stdcall -syscall NtSetIoCompletion(ptr long long long long) @ stdcall -syscall NtSetLdtEntries(long int64 long int64) -@ stub NtSetLowEventPair -@ stub NtSetLowWaitHighEventPair -@ stub NtSetLowWaitHighThread +# @ stub NtSetLowEventPair +# @ stub NtSetLowWaitHighEventPair +# @ stub NtSetLowWaitHighThread @ stdcall -syscall NtSetPowerRequest(long long) # @ stub NtSetQuotaInformationFile @ stdcall -syscall NtSetSecurityObject(long long ptr) -@ stub NtSetSystemEnvironmentValue +# @ stub NtSetSystemEnvironmentValue # @ stub NtSetSystemEnvironmentValueEx @ stdcall -syscall NtSetSystemInformation(long ptr long) -@ stub NtSetSystemPowerState +# @ stub NtSetSystemPowerState @ stdcall -syscall NtSetSystemTime(ptr ptr) @ stdcall -syscall NtSetThreadExecutionState(long ptr) @ stdcall -syscall NtSetTimer(long ptr ptr ptr long long ptr) @@ -405,8 +405,8 @@ @ stdcall -syscall NtSetVolumeInformationFile(long ptr ptr long long) @ stdcall -syscall NtShutdownSystem(long) @ stdcall -syscall NtSignalAndWaitForSingleObject(long long long ptr) -@ stub NtStartProfile -@ stub NtStopProfile +# @ stub NtStartProfile +# @ stub NtStopProfile @ stdcall -syscall NtSuspendProcess(long) @ stdcall -syscall NtSuspendThread(long ptr) @ stdcall -syscall NtSystemDebugControl(long ptr long ptr long ptr) @@ -418,26 +418,26 @@ # @ stub NtTranslateFilePath @ stdcall -syscall NtUnloadDriver(ptr) @ stdcall -syscall NtUnloadKey(ptr) -@ stub NtUnloadKeyEx +# @ stub NtUnloadKeyEx @ stdcall -syscall NtUnlockFile(long ptr ptr ptr ptr) @ stdcall -syscall NtUnlockVirtualMemory(long ptr ptr long) @ stdcall -syscall NtUnmapViewOfSection(long ptr) -@ stub NtVdmControl -@ stub NtW32Call +# @ stub NtVdmControl +# @ stub NtW32Call @ stdcall -syscall NtWaitForDebugEvent(long long ptr ptr) @ stdcall -syscall NtWaitForKeyedEvent(long ptr long ptr) @ stdcall -syscall NtWaitForMultipleObjects(long ptr long long ptr) -@ stub NtWaitForProcessMutant +# @ stub NtWaitForProcessMutant @ stdcall -syscall NtWaitForSingleObject(long long ptr) -@ stub NtWaitHighEventPair -@ stub NtWaitLowEventPair +# @ stub NtWaitHighEventPair +# @ stub NtWaitLowEventPair @ stdcall -syscall -arch=win32 NtWow64AllocateVirtualMemory64(long ptr int64 ptr long long) @ stdcall -syscall -arch=win32 NtWow64GetNativeSystemInformation(long ptr long ptr) @ stdcall -syscall -arch=win32 NtWow64ReadVirtualMemory64(long int64 ptr int64 ptr) @ stdcall -syscall -arch=win32 NtWow64WriteVirtualMemory64(long int64 ptr int64 ptr) @ stdcall -syscall NtWriteFile(long long ptr ptr ptr ptr long ptr ptr) @ stdcall -syscall NtWriteFileGather(long long ptr ptr ptr ptr long ptr ptr) -@ stub NtWriteRequestData +# @ stub NtWriteRequestData @ stdcall -syscall NtWriteVirtualMemory(long ptr ptr long ptr) @ stdcall -syscall NtYieldExecution() @ stub PfxFindPrefix @@ -1168,7 +1168,7 @@ @ stdcall -private -syscall ZwAllocateVirtualMemoryEx(long ptr ptr long long ptr long) NtAllocateVirtualMemoryEx @ stdcall -private -syscall ZwAreMappedFilesTheSame(ptr ptr) NtAreMappedFilesTheSame @ stdcall -private -syscall ZwAssignProcessToJobObject(long long) NtAssignProcessToJobObject -@ stub ZwCallbackReturn +# @ stub ZwCallbackReturn # @ stub ZwCancelDeviceWakeupRequest @ stdcall -private -syscall ZwCancelIoFile(long ptr) NtCancelIoFile @ stdcall -private -syscall ZwCancelIoFileEx(long ptr ptr) NtCancelIoFileEx @@ -1176,7 +1176,7 @@ @ stdcall -private -syscall ZwClearEvent(long) NtClearEvent @ stdcall -private -syscall ZwClearPowerRequest(long long) NtClearPowerRequest @ stdcall -private -syscall ZwClose(long) NtClose -@ stub ZwCloseObjectAuditAlarm +# @ stub ZwCloseObjectAuditAlarm # @ stub ZwCompactKeys # @ stub ZwCompareTokens @ stdcall -private -syscall ZwCompleteConnectPort(ptr) NtCompleteConnectPort @@ -1186,7 +1186,7 @@ # @ stub ZwCreateDebugObject @ stdcall -private -syscall ZwCreateDirectoryObject(ptr long ptr) NtCreateDirectoryObject @ stdcall -private -syscall ZwCreateEvent(ptr long ptr long long) NtCreateEvent -@ stub ZwCreateEventPair +# @ stub ZwCreateEventPair @ stdcall -private -syscall ZwCreateFile(ptr long ptr ptr ptr long long long long ptr long) NtCreateFile @ stdcall -private -syscall ZwCreateIoCompletion(ptr long ptr long) NtCreateIoCompletion @ stdcall -private -syscall ZwCreateJobObject(ptr long ptr) NtCreateJobObject @@ -1201,16 +1201,16 @@ @ stdcall -private -syscall ZwCreatePagingFile(ptr ptr ptr ptr) NtCreatePagingFile @ stdcall -private -syscall ZwCreatePort(ptr ptr long long ptr) NtCreatePort @ stdcall -private -syscall ZwCreatePowerRequest(ptr ptr) NtCreatePowerRequest -@ stub ZwCreateProcess +# @ stub ZwCreateProcess # @ stub ZwCreateProcessEx -@ stub ZwCreateProfile +# @ stub ZwCreateProfile @ stdcall -private -syscall ZwCreateSection(ptr long ptr ptr long long long) NtCreateSection @ stdcall -private -syscall ZwCreateSemaphore(ptr long ptr long long) NtCreateSemaphore @ stdcall -private -syscall ZwCreateSymbolicLinkObject(ptr long ptr ptr) NtCreateSymbolicLinkObject @ stdcall -private -syscall ZwCreateThread(ptr long ptr long ptr ptr ptr long) NtCreateThread @ stdcall -private -syscall ZwCreateThreadEx(ptr long ptr long ptr ptr long long long long ptr) NtCreateThreadEx @ stdcall -private -syscall ZwCreateTimer(ptr long ptr long) NtCreateTimer -@ stub ZwCreateToken +# @ stub ZwCreateToken @ stdcall -private -syscall ZwCreateUserProcess(ptr ptr long long ptr ptr long long ptr ptr ptr) NtCreateUserProcess # @ stub ZwCreateWaitablePort @ stdcall -private -syscall ZwDebugActiveProcess(long long) NtDebugActiveProcess @@ -1227,11 +1227,11 @@ @ stdcall -private -syscall ZwDuplicateObject(long long long ptr long long long) NtDuplicateObject @ stdcall -private -syscall ZwDuplicateToken(long long ptr long long ptr) NtDuplicateToken # @ stub ZwEnumerateBootEntries -@ stub ZwEnumerateBus +# @ stub ZwEnumerateBus @ stdcall -private -syscall ZwEnumerateKey(long long long ptr long ptr) NtEnumerateKey # @ stub ZwEnumerateSystemEnvironmentValuesEx @ stdcall -private -syscall ZwEnumerateValueKey(long long long ptr long ptr) NtEnumerateValueKey -@ stub ZwExtendSection +# @ stub ZwExtendSection @ stdcall -private -syscall ZwFilterToken(long long ptr ptr ptr ptr) NtFilterToken @ stdcall -private -syscall ZwFindAtom(ptr long ptr) NtFindAtom @ stdcall -private -syscall ZwFlushBuffersFile(long ptr) NtFlushBuffersFile @@ -1239,7 +1239,7 @@ @ stdcall -private -syscall ZwFlushKey(long) NtFlushKey @ stdcall -private -syscall ZwFlushProcessWriteBuffers() NtFlushProcessWriteBuffers @ stdcall -private -syscall ZwFlushVirtualMemory(long ptr ptr long) NtFlushVirtualMemory -@ stub ZwFlushWriteBuffer +# @ stub ZwFlushWriteBuffer # @ stub ZwFreeUserPhysicalPages @ stdcall -private -syscall ZwFreeVirtualMemory(long ptr ptr long) NtFreeVirtualMemory @ stdcall -private -syscall ZwFsControlFile(long long ptr ptr ptr long ptr long ptr long) NtFsControlFile @@ -1247,13 +1247,13 @@ @ stdcall -private -syscall ZwGetCurrentProcessorNumber() NtGetCurrentProcessorNumber # @ stub ZwGetDevicePowerState @ stdcall -private -syscall ZwGetNlsSectionPtr(long long long ptr ptr) NtGetNlsSectionPtr -@ stub ZwGetPlugPlayEvent +# @ stub ZwGetPlugPlayEvent @ stdcall -private ZwGetTickCount() NtGetTickCount @ stdcall -private -syscall ZwGetWriteWatch(long long ptr long ptr ptr ptr) NtGetWriteWatch @ stdcall -private -syscall ZwImpersonateAnonymousToken(long) NtImpersonateAnonymousToken -@ stub ZwImpersonateClientOfPort -@ stub ZwImpersonateThread -@ stub ZwInitializeRegistry +# @ stub ZwImpersonateClientOfPort +# @ stub ZwImpersonateThread +# @ stub ZwInitializeRegistry @ stdcall -private -syscall ZwInitiatePowerAction(long long long long) NtInitiatePowerAction @ stdcall -private -syscall ZwIsProcessInJob(long long) NtIsProcessInJob # @ stub ZwIsSystemResumeAutomatic @@ -1276,7 +1276,7 @@ @ stdcall -private -syscall ZwNotifyChangeMultipleKeys(long long ptr long ptr ptr ptr long long ptr long long) NtNotifyChangeMultipleKeys @ stdcall -private -syscall ZwOpenDirectoryObject(ptr long ptr) NtOpenDirectoryObject @ stdcall -private -syscall ZwOpenEvent(ptr long ptr) NtOpenEvent -@ stub ZwOpenEventPair +# @ stub ZwOpenEventPair @ stdcall -private -syscall ZwOpenFile(ptr long ptr ptr long long) NtOpenFile @ stdcall -private -syscall ZwOpenIoCompletion(ptr long ptr) NtOpenIoCompletion @ stdcall -private -syscall ZwOpenJobObject(ptr long ptr) NtOpenJobObject @@ -1286,7 +1286,7 @@ @ stdcall -private -syscall ZwOpenKeyTransactedEx(ptr long ptr long long) NtOpenKeyTransactedEx @ stdcall -private -syscall ZwOpenKeyedEvent(ptr long ptr) NtOpenKeyedEvent @ stdcall -private -syscall ZwOpenMutant(ptr long ptr) NtOpenMutant -@ stub ZwOpenObjectAuditAlarm +# @ stub ZwOpenObjectAuditAlarm @ stdcall -private -syscall ZwOpenProcess(ptr long ptr ptr) NtOpenProcess @ stdcall -private -syscall ZwOpenProcessToken(long long ptr) NtOpenProcessToken @ stdcall -private -syscall ZwOpenProcessTokenEx(long long long ptr) NtOpenProcessTokenEx @@ -1297,11 +1297,11 @@ @ stdcall -private -syscall ZwOpenThreadToken(long long long ptr) NtOpenThreadToken @ stdcall -private -syscall ZwOpenThreadTokenEx(long long long long ptr) NtOpenThreadTokenEx @ stdcall -private -syscall ZwOpenTimer(ptr long ptr) NtOpenTimer -@ stub ZwPlugPlayControl +# @ stub ZwPlugPlayControl @ stdcall -private -syscall ZwPowerInformation(long ptr long ptr long) NtPowerInformation @ stdcall -private -syscall ZwPrivilegeCheck(ptr ptr ptr) NtPrivilegeCheck -@ stub ZwPrivilegeObjectAuditAlarm -@ stub ZwPrivilegedServiceAuditAlarm +# @ stub ZwPrivilegeObjectAuditAlarm +# @ stub ZwPrivilegedServiceAuditAlarm @ stdcall -private -syscall ZwProtectVirtualMemory(long ptr ptr long ptr) NtProtectVirtualMemory @ stdcall -private -syscall ZwPulseEvent(long ptr) NtPulseEvent @ stdcall -private -syscall ZwQueryAttributesFile(ptr ptr) NtQueryAttributesFile @@ -1318,19 +1318,19 @@ @ stdcall -private -syscall ZwQueryInformationAtom(long long ptr long ptr) NtQueryInformationAtom @ stdcall -private -syscall ZwQueryInformationFile(long ptr ptr long long) NtQueryInformationFile @ stdcall -private -syscall ZwQueryInformationJobObject(long long ptr long ptr) NtQueryInformationJobObject -@ stub ZwQueryInformationPort +# @ stub ZwQueryInformationPort @ stdcall -private -syscall ZwQueryInformationProcess(long long ptr long ptr) NtQueryInformationProcess @ stdcall -private -syscall ZwQueryInformationThread(long long ptr long ptr) NtQueryInformationThread @ stdcall -private -syscall ZwQueryInformationToken(long long ptr long ptr) NtQueryInformationToken @ stdcall -private -syscall ZwQueryInstallUILanguage(ptr) NtQueryInstallUILanguage -@ stub ZwQueryIntervalProfile +# @ stub ZwQueryIntervalProfile @ stdcall -private -syscall ZwQueryIoCompletion(long long ptr long ptr) NtQueryIoCompletion @ stdcall -private -syscall ZwQueryKey(long long ptr long ptr) NtQueryKey @ stdcall -private -syscall ZwQueryLicenseValue(ptr ptr ptr long ptr) NtQueryLicenseValue @ stdcall -private -syscall ZwQueryMultipleValueKey(long ptr long ptr long ptr) NtQueryMultipleValueKey @ stdcall -private -syscall ZwQueryMutant(long long ptr long ptr) NtQueryMutant @ stdcall -private -syscall ZwQueryObject(long long ptr long ptr) NtQueryObject -@ stub ZwQueryOpenSubKeys +# @ stub ZwQueryOpenSubKeys @ stdcall -private -syscall ZwQueryPerformanceCounter(ptr ptr) NtQueryPerformanceCounter # @ stub ZwQueryPortInformationProcess # @ stub ZwQueryQuotaInformationFile @@ -1353,25 +1353,25 @@ @ stdcall -private -syscall ZwRaiseHardError(long long ptr ptr long ptr) NtRaiseHardError @ stdcall -private -syscall ZwReadFile(long long ptr ptr ptr ptr long ptr ptr) NtReadFile @ stdcall -private -syscall ZwReadFileScatter(long long ptr ptr ptr ptr long ptr ptr) NtReadFileScatter -@ stub ZwReadRequestData +# @ stub ZwReadRequestData @ stdcall -private -syscall ZwReadVirtualMemory(long ptr ptr long ptr) NtReadVirtualMemory -@ stub ZwRegisterNewDevice +# @ stub ZwRegisterNewDevice @ stdcall -private -syscall ZwRegisterThreadTerminatePort(ptr) NtRegisterThreadTerminatePort @ stdcall -private -syscall ZwReleaseKeyedEvent(long ptr long ptr) NtReleaseKeyedEvent @ stdcall -private -syscall ZwReleaseMutant(long ptr) NtReleaseMutant -@ stub ZwReleaseProcessMutant +# @ stub ZwReleaseProcessMutant @ stdcall -private -syscall ZwReleaseSemaphore(long long ptr) NtReleaseSemaphore @ stdcall -private -syscall ZwRemoveIoCompletion(ptr ptr ptr ptr ptr) NtRemoveIoCompletion @ stdcall -private -syscall ZwRemoveIoCompletionEx(ptr ptr long ptr ptr long) NtRemoveIoCompletionEx @ stdcall -private -syscall ZwRemoveProcessDebug(long long) NtRemoveProcessDebug @ stdcall -private -syscall ZwRenameKey(long ptr) NtRenameKey @ stdcall -private -syscall ZwReplaceKey(ptr long ptr) NtReplaceKey -@ stub ZwReplyPort +# @ stub ZwReplyPort @ stdcall -private -syscall ZwReplyWaitReceivePort(ptr ptr ptr ptr) NtReplyWaitReceivePort -@ stub ZwReplyWaitReceivePortEx -@ stub ZwReplyWaitReplyPort +# @ stub ZwReplyWaitReceivePortEx +# @ stub ZwReplyWaitReplyPort # @ stub ZwRequestDeviceWakeup -@ stub ZwRequestPort +# @ stub ZwRequestPort @ stdcall -private -syscall ZwRequestWaitReplyPort(ptr ptr ptr) NtRequestWaitReplyPort # @ stub ZwRequestWakeupLatency @ stdcall -private -syscall ZwResetEvent(long ptr) NtResetEvent @@ -1386,16 +1386,16 @@ # @ stub ZwSetBootEntryOrder # @ stub ZwSetBootOptions @ stdcall -private -syscall ZwSetContextThread(long ptr) NtSetContextThread -@ stub ZwSetDebugFilterState -@ stub ZwSetDefaultHardErrorPort +# @ stub ZwSetDebugFilterState +# @ stub ZwSetDefaultHardErrorPort @ stdcall -private -syscall ZwSetDefaultLocale(long long) NtSetDefaultLocale @ stdcall -private -syscall ZwSetDefaultUILanguage(long) NtSetDefaultUILanguage @ stdcall -private -syscall ZwSetEaFile(long ptr ptr long) NtSetEaFile @ stdcall -private -syscall ZwSetEvent(long ptr) NtSetEvent # @ stub ZwSetEventBoostPriority -@ stub ZwSetHighEventPair -@ stub ZwSetHighWaitLowEventPair -@ stub ZwSetHighWaitLowThread +# @ stub ZwSetHighEventPair +# @ stub ZwSetHighWaitLowEventPair +# @ stub ZwSetHighWaitLowThread @ stdcall -private -syscall ZwSetInformationDebugObject(long long ptr long ptr) NtSetInformationDebugObject @ stdcall -private -syscall ZwSetInformationFile(long ptr ptr long long) NtSetInformationFile @ stdcall -private -syscall ZwSetInformationJobObject(long long ptr long) NtSetInformationJobObject @@ -1407,16 +1407,16 @@ @ stdcall -private -syscall ZwSetIntervalProfile(long long) NtSetIntervalProfile @ stdcall -private -syscall ZwSetIoCompletion(ptr long long long long) NtSetIoCompletion @ stdcall -private -syscall ZwSetLdtEntries(long int64 long int64) NtSetLdtEntries -@ stub ZwSetLowEventPair -@ stub ZwSetLowWaitHighEventPair -@ stub ZwSetLowWaitHighThread +# @ stub ZwSetLowEventPair +# @ stub ZwSetLowWaitHighEventPair +# @ stub ZwSetLowWaitHighThread @ stdcall -private -syscall ZwSetPowerRequest(long long) NtSetPowerRequest # @ stub ZwSetQuotaInformationFile @ stdcall -private -syscall ZwSetSecurityObject(long long ptr) NtSetSecurityObject -@ stub ZwSetSystemEnvironmentValue +# @ stub ZwSetSystemEnvironmentValue # @ stub ZwSetSystemEnvironmentValueEx @ stdcall -private -syscall ZwSetSystemInformation(long ptr long) NtSetSystemInformation -@ stub ZwSetSystemPowerState +# @ stub ZwSetSystemPowerState @ stdcall -private -syscall ZwSetSystemTime(ptr ptr) NtSetSystemTime @ stdcall -private -syscall ZwSetThreadExecutionState(long ptr) NtSetThreadExecutionState @ stdcall -private -syscall ZwSetTimer(long ptr ptr ptr long long ptr) NtSetTimer @@ -1426,8 +1426,8 @@ @ stdcall -private -syscall ZwSetVolumeInformationFile(long ptr ptr long long) NtSetVolumeInformationFile @ stdcall -private -syscall ZwShutdownSystem(long) NtShutdownSystem @ stdcall -private -syscall ZwSignalAndWaitForSingleObject(long long long ptr) NtSignalAndWaitForSingleObject -@ stub ZwStartProfile -@ stub ZwStopProfile +# @ stub ZwStartProfile +# @ stub ZwStopProfile @ stdcall -private -syscall ZwSuspendProcess(long) NtSuspendProcess @ stdcall -private -syscall ZwSuspendThread(long ptr) NtSuspendThread @ stdcall -private -syscall ZwSystemDebugControl(long ptr long ptr long ptr) NtSystemDebugControl @@ -1439,26 +1439,26 @@ # @ stub ZwTranslateFilePath @ stdcall -private -syscall ZwUnloadDriver(ptr) NtUnloadDriver @ stdcall -private -syscall ZwUnloadKey(ptr) NtUnloadKey -@ stub ZwUnloadKeyEx +# @ stub ZwUnloadKeyEx @ stdcall -private -syscall ZwUnlockFile(long ptr ptr ptr ptr) NtUnlockFile @ stdcall -private -syscall ZwUnlockVirtualMemory(long ptr ptr long) NtUnlockVirtualMemory @ stdcall -private -syscall ZwUnmapViewOfSection(long ptr) NtUnmapViewOfSection -@ stub ZwVdmControl -@ stub ZwW32Call +# @ stub ZwVdmControl +# @ stub ZwW32Call @ stdcall -private -syscall ZwWaitForDebugEvent(long long ptr ptr) NtWaitForDebugEvent @ stdcall -private -syscall ZwWaitForKeyedEvent(long ptr long ptr) NtWaitForKeyedEvent @ stdcall -private -syscall ZwWaitForMultipleObjects(long ptr long long ptr) NtWaitForMultipleObjects -@ stub ZwWaitForProcessMutant +# @ stub ZwWaitForProcessMutant @ stdcall -private -syscall ZwWaitForSingleObject(long long ptr) NtWaitForSingleObject -@ stub ZwWaitHighEventPair -@ stub ZwWaitLowEventPair +# @ stub ZwWaitHighEventPair +# @ stub ZwWaitLowEventPair @ stdcall -syscall -arch=win32 ZwWow64AllocateVirtualMemory64(long ptr int64 ptr long long) NtWow64AllocateVirtualMemory64 @ stdcall -syscall -arch=win32 ZwWow64GetNativeSystemInformation(long ptr long ptr) NtWow64GetNativeSystemInformation @ stdcall -syscall -arch=win32 ZwWow64ReadVirtualMemory64(long int64 ptr int64 ptr) NtWow64ReadVirtualMemory64 @ stdcall -syscall -arch=win32 ZwWow64WriteVirtualMemory64(long int64 ptr int64 ptr) NtWow64WriteVirtualMemory64 @ stdcall -private -syscall ZwWriteFile(long long ptr ptr ptr ptr long ptr ptr) NtWriteFile @ stdcall -private -syscall ZwWriteFileGather(long long ptr ptr ptr ptr long ptr ptr) NtWriteFileGather -@ stub ZwWriteRequestData +# @ stub ZwWriteRequestData @ stdcall -private -syscall ZwWriteVirtualMemory(long ptr ptr long ptr) NtWriteVirtualMemory @ stdcall -private -syscall ZwYieldExecution() NtYieldExecution @ cdecl -private -arch=i386 _CIcos() diff --git a/dlls/ntdll/tests/port.c b/dlls/ntdll/tests/port.c index 9525232ade5..2406a63d8f1 100644 --- a/dlls/ntdll/tests/port.c +++ b/dlls/ntdll/tests/port.c @@ -155,7 +155,7 @@ static BOOL init_function_ptrs(void) !pNtRequestPort || !pNtRegisterThreadTerminatePort || !pNtConnectPort || !pRtlInitUnicodeString) { - win_skip("Needed port functions are not available\n"); + skip("Needed port functions are not available\n"); FreeLibrary(hntdll); return FALSE; } @@ -384,7 +384,7 @@ START_TEST(port) status = pNtCreatePort(&port_handle, &obj, 100, 100, 0); if (status == STATUS_ACCESS_DENIED) skip("Not enough rights\n"); - else todo_wine ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %d\n", status); + else ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %d\n", status); if (status == STATUS_SUCCESS) { -- 2.31.1

2 1

[PATCH] ntdll: Comment out stubs for Nt and Zw functions.
by Paul Gofman 20 Jul '21

20 Jul '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- Those are supposed to be syscalls and having them as a regular functions is wrong. In the not much likely case the presence of some of these stubs helped some applications those can be added back as -syscall function stubs. dlls/ntdll/ntdll.spec | 188 +++++++++++++++++++++--------------------- 1 file changed, 94 insertions(+), 94 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index ccd825ff58e..aad7bd89d14 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -145,7 +145,7 @@ @ stdcall -syscall NtAllocateVirtualMemoryEx(long ptr ptr long long ptr long) @ stdcall -syscall NtAreMappedFilesTheSame(ptr ptr) @ stdcall -syscall NtAssignProcessToJobObject(long long) -@ stub NtCallbackReturn +# @ stub NtCallbackReturn # @ stub NtCancelDeviceWakeupRequest @ stdcall -syscall NtCancelIoFile(long ptr) @ stdcall -syscall NtCancelIoFileEx(long ptr ptr) @@ -153,7 +153,7 @@ @ stdcall -syscall NtClearEvent(long) @ stdcall -syscall NtClearPowerRequest(long long) @ stdcall -syscall NtClose(long) -@ stub NtCloseObjectAuditAlarm +# @ stub NtCloseObjectAuditAlarm # @ stub NtCompactKeys # @ stub NtCompareTokens @ stdcall -syscall NtCompleteConnectPort(ptr) @@ -163,7 +163,7 @@ @ stdcall -syscall NtCreateDebugObject(ptr long ptr long) @ stdcall -syscall NtCreateDirectoryObject(ptr long ptr) @ stdcall -syscall NtCreateEvent(ptr long ptr long long) -@ stub NtCreateEventPair +# @ stub NtCreateEventPair @ stdcall -syscall NtCreateFile(ptr long ptr ptr ptr long long long long ptr long) @ stdcall -syscall NtCreateIoCompletion(ptr long ptr long) @ stdcall -syscall NtCreateJobObject(ptr long ptr) @@ -178,16 +178,16 @@ @ stdcall -syscall NtCreatePagingFile(ptr ptr ptr ptr) @ stdcall -syscall NtCreatePort(ptr ptr long long ptr) @ stdcall -syscall NtCreatePowerRequest(ptr ptr) -@ stub NtCreateProcess +# @ stub NtCreateProcess # @ stub NtCreateProcessEx -@ stub NtCreateProfile +# @ stub NtCreateProfile @ stdcall -syscall NtCreateSection(ptr long ptr ptr long long long) @ stdcall -syscall NtCreateSemaphore(ptr long ptr long long) @ stdcall -syscall NtCreateSymbolicLinkObject(ptr long ptr ptr) @ stdcall -syscall NtCreateThread(ptr long ptr long ptr ptr ptr long) @ stdcall -syscall NtCreateThreadEx(ptr long ptr long ptr ptr long long long long ptr) @ stdcall -syscall NtCreateTimer(ptr long ptr long) -@ stub NtCreateToken +# @ stub NtCreateToken @ stdcall -syscall NtCreateUserProcess(ptr ptr long long ptr ptr long long ptr ptr ptr) # @ stub NtCreateWaitablePort @ stdcall -arch=i386,arm64 NtCurrentTeb() @@ -205,11 +205,11 @@ @ stdcall -syscall NtDuplicateObject(long long long ptr long long long) @ stdcall -syscall NtDuplicateToken(long long ptr long long ptr) # @ stub NtEnumerateBootEntries -@ stub NtEnumerateBus +# @ stub NtEnumerateBus @ stdcall -syscall NtEnumerateKey(long long long ptr long ptr) # @ stub NtEnumerateSystemEnvironmentValuesEx @ stdcall -syscall NtEnumerateValueKey(long long long ptr long ptr) -@ stub NtExtendSection +# @ stub NtExtendSection @ stdcall -syscall NtFilterToken(long long ptr ptr ptr ptr) @ stdcall -syscall NtFindAtom(ptr long ptr) @ stdcall -syscall NtFlushBuffersFile(long ptr) @@ -217,7 +217,7 @@ @ stdcall -syscall NtFlushKey(long) @ stdcall -syscall NtFlushProcessWriteBuffers() @ stdcall -syscall NtFlushVirtualMemory(long ptr ptr long) -@ stub NtFlushWriteBuffer +# @ stub NtFlushWriteBuffer # @ stub NtFreeUserPhysicalPages @ stdcall -syscall NtFreeVirtualMemory(long ptr ptr long) @ stdcall -syscall NtFsControlFile(long long ptr ptr ptr long ptr long ptr long) @@ -226,13 +226,13 @@ # @ stub NtGetDevicePowerState @ stdcall -syscall NtGetNextThread(ptr ptr long long long ptr) @ stdcall -syscall NtGetNlsSectionPtr(long long long ptr ptr) -@ stub NtGetPlugPlayEvent +# @ stub NtGetPlugPlayEvent @ stdcall NtGetTickCount() @ stdcall -syscall NtGetWriteWatch(long long ptr long ptr ptr ptr) @ stdcall -syscall NtImpersonateAnonymousToken(long) -@ stub NtImpersonateClientOfPort -@ stub NtImpersonateThread -@ stub NtInitializeRegistry +# @ stub NtImpersonateClientOfPort +# @ stub NtImpersonateThread +# @ stub NtInitializeRegistry @ stdcall -syscall NtInitiatePowerAction (long long long long) @ stdcall -syscall NtIsProcessInJob(long long) # @ stub NtIsSystemResumeAutomatic @@ -255,7 +255,7 @@ @ stdcall -syscall NtNotifyChangeMultipleKeys(long long ptr long ptr ptr ptr long long ptr long long) @ stdcall -syscall NtOpenDirectoryObject(ptr long ptr) @ stdcall -syscall NtOpenEvent(ptr long ptr) -@ stub NtOpenEventPair +# @ stub NtOpenEventPair @ stdcall -syscall NtOpenFile(ptr long ptr ptr long long) @ stdcall -syscall NtOpenIoCompletion(ptr long ptr) @ stdcall -syscall NtOpenJobObject(ptr long ptr) @@ -265,7 +265,7 @@ @ stdcall -syscall NtOpenKeyTransactedEx(ptr long ptr long long) @ stdcall -syscall NtOpenKeyedEvent(ptr long ptr) @ stdcall -syscall NtOpenMutant(ptr long ptr) -@ stub NtOpenObjectAuditAlarm +# @ stub NtOpenObjectAuditAlarm @ stdcall -syscall NtOpenProcess(ptr long ptr ptr) @ stdcall -syscall NtOpenProcessToken(long long ptr) @ stdcall -syscall NtOpenProcessTokenEx(long long long ptr) @@ -276,11 +276,11 @@ @ stdcall -syscall NtOpenThreadToken(long long long ptr) @ stdcall -syscall NtOpenThreadTokenEx(long long long long ptr) @ stdcall -syscall NtOpenTimer(ptr long ptr) -@ stub NtPlugPlayControl +# @ stub NtPlugPlayControl @ stdcall -syscall NtPowerInformation(long ptr long ptr long) @ stdcall -syscall NtPrivilegeCheck(ptr ptr ptr) -@ stub NtPrivilegeObjectAuditAlarm -@ stub NtPrivilegedServiceAuditAlarm +# @ stub NtPrivilegeObjectAuditAlarm +# @ stub NtPrivilegedServiceAuditAlarm @ stdcall -syscall NtProtectVirtualMemory(long ptr ptr long ptr) @ stdcall -syscall NtPulseEvent(long ptr) @ stdcall -syscall NtQueryAttributesFile(ptr ptr) @@ -297,19 +297,19 @@ @ stdcall -syscall NtQueryInformationAtom(long long ptr long ptr) @ stdcall -syscall NtQueryInformationFile(long ptr ptr long long) @ stdcall -syscall NtQueryInformationJobObject(long long ptr long ptr) -@ stub NtQueryInformationPort +# @ stub NtQueryInformationPort @ stdcall -syscall NtQueryInformationProcess(long long ptr long ptr) @ stdcall -syscall NtQueryInformationThread(long long ptr long ptr) @ stdcall -syscall NtQueryInformationToken(long long ptr long ptr) @ stdcall -syscall NtQueryInstallUILanguage(ptr) -@ stub NtQueryIntervalProfile +# @ stub NtQueryIntervalProfile @ stdcall -syscall NtQueryIoCompletion(long long ptr long ptr) @ stdcall -syscall NtQueryKey(long long ptr long ptr) @ stdcall -syscall NtQueryLicenseValue(ptr ptr ptr long ptr) @ stdcall -syscall NtQueryMultipleValueKey(long ptr long ptr long ptr) @ stdcall -syscall NtQueryMutant(long long ptr long ptr) @ stdcall -syscall NtQueryObject(long long ptr long ptr) -@ stub NtQueryOpenSubKeys +# @ stub NtQueryOpenSubKeys @ stdcall -syscall NtQueryPerformanceCounter(ptr ptr) # @ stub NtQueryPortInformationProcess # @ stub NtQueryQuotaInformationFile @@ -332,25 +332,25 @@ @ stdcall -syscall NtRaiseHardError(long long ptr ptr long ptr) @ stdcall -syscall NtReadFile(long long ptr ptr ptr ptr long ptr ptr) @ stdcall -syscall NtReadFileScatter(long long ptr ptr ptr ptr long ptr ptr) -@ stub NtReadRequestData +# @ stub NtReadRequestData @ stdcall -syscall NtReadVirtualMemory(long ptr ptr long ptr) -@ stub NtRegisterNewDevice +# @ stub NtRegisterNewDevice @ stdcall -syscall NtRegisterThreadTerminatePort(ptr) @ stdcall -syscall NtReleaseKeyedEvent(long ptr long ptr) @ stdcall -syscall NtReleaseMutant(long ptr) -@ stub NtReleaseProcessMutant +# @ stub NtReleaseProcessMutant @ stdcall -syscall NtReleaseSemaphore(long long ptr) @ stdcall -syscall NtRemoveIoCompletion(ptr ptr ptr ptr ptr) @ stdcall -syscall NtRemoveIoCompletionEx(ptr ptr long ptr ptr long) @ stdcall -syscall NtRemoveProcessDebug(long long) @ stdcall -syscall NtRenameKey(long ptr) @ stdcall -syscall NtReplaceKey(ptr long ptr) -@ stub NtReplyPort +# @ stub NtReplyPort @ stdcall -syscall NtReplyWaitReceivePort(ptr ptr ptr ptr) -@ stub NtReplyWaitReceivePortEx -@ stub NtReplyWaitReplyPort +# @ stub NtReplyWaitReceivePortEx +# @ stub NtReplyWaitReplyPort # @ stub NtRequestDeviceWakeup -@ stub NtRequestPort +# @ stub NtRequestPort @ stdcall -syscall NtRequestWaitReplyPort(ptr ptr ptr) # @ stub NtRequestWakeupLatency @ stdcall -syscall NtResetEvent(long ptr) @@ -365,16 +365,16 @@ # @ stub NtSetBootEntryOrder # @ stub NtSetBootOptions @ stdcall -syscall NtSetContextThread(long ptr) -@ stub NtSetDebugFilterState -@ stub NtSetDefaultHardErrorPort +# @ stub NtSetDebugFilterState +# @ stub NtSetDefaultHardErrorPort @ stdcall -syscall NtSetDefaultLocale(long long) @ stdcall -syscall NtSetDefaultUILanguage(long) @ stdcall -syscall NtSetEaFile(long ptr ptr long) @ stdcall -syscall NtSetEvent(long ptr) # @ stub NtSetEventBoostPriority -@ stub NtSetHighEventPair -@ stub NtSetHighWaitLowEventPair -@ stub NtSetHighWaitLowThread +# @ stub NtSetHighEventPair +# @ stub NtSetHighWaitLowEventPair +# @ stub NtSetHighWaitLowThread @ stdcall -syscall NtSetInformationDebugObject(long long ptr long ptr) @ stdcall -syscall NtSetInformationFile(long ptr ptr long long) @ stdcall -syscall NtSetInformationJobObject(long long ptr long) @@ -386,16 +386,16 @@ @ stdcall -syscall NtSetIntervalProfile(long long) @ stdcall -syscall NtSetIoCompletion(ptr long long long long) @ stdcall -syscall NtSetLdtEntries(long int64 long int64) -@ stub NtSetLowEventPair -@ stub NtSetLowWaitHighEventPair -@ stub NtSetLowWaitHighThread +# @ stub NtSetLowEventPair +# @ stub NtSetLowWaitHighEventPair +# @ stub NtSetLowWaitHighThread @ stdcall -syscall NtSetPowerRequest(long long) # @ stub NtSetQuotaInformationFile @ stdcall -syscall NtSetSecurityObject(long long ptr) -@ stub NtSetSystemEnvironmentValue +# @ stub NtSetSystemEnvironmentValue # @ stub NtSetSystemEnvironmentValueEx @ stdcall -syscall NtSetSystemInformation(long ptr long) -@ stub NtSetSystemPowerState +# @ stub NtSetSystemPowerState @ stdcall -syscall NtSetSystemTime(ptr ptr) @ stdcall -syscall NtSetThreadExecutionState(long ptr) @ stdcall -syscall NtSetTimer(long ptr ptr ptr long long ptr) @@ -405,8 +405,8 @@ @ stdcall -syscall NtSetVolumeInformationFile(long ptr ptr long long) @ stdcall -syscall NtShutdownSystem(long) @ stdcall -syscall NtSignalAndWaitForSingleObject(long long long ptr) -@ stub NtStartProfile -@ stub NtStopProfile +# @ stub NtStartProfile +# @ stub NtStopProfile @ stdcall -syscall NtSuspendProcess(long) @ stdcall -syscall NtSuspendThread(long ptr) @ stdcall -syscall NtSystemDebugControl(long ptr long ptr long ptr) @@ -418,26 +418,26 @@ # @ stub NtTranslateFilePath @ stdcall -syscall NtUnloadDriver(ptr) @ stdcall -syscall NtUnloadKey(ptr) -@ stub NtUnloadKeyEx +# @ stub NtUnloadKeyEx @ stdcall -syscall NtUnlockFile(long ptr ptr ptr ptr) @ stdcall -syscall NtUnlockVirtualMemory(long ptr ptr long) @ stdcall -syscall NtUnmapViewOfSection(long ptr) -@ stub NtVdmControl -@ stub NtW32Call +# @ stub NtVdmControl +# @ stub NtW32Call @ stdcall -syscall NtWaitForDebugEvent(long long ptr ptr) @ stdcall -syscall NtWaitForKeyedEvent(long ptr long ptr) @ stdcall -syscall NtWaitForMultipleObjects(long ptr long long ptr) -@ stub NtWaitForProcessMutant +# @ stub NtWaitForProcessMutant @ stdcall -syscall NtWaitForSingleObject(long long ptr) -@ stub NtWaitHighEventPair -@ stub NtWaitLowEventPair +# @ stub NtWaitHighEventPair +# @ stub NtWaitLowEventPair @ stdcall -syscall -arch=win32 NtWow64AllocateVirtualMemory64(long ptr int64 ptr long long) @ stdcall -syscall -arch=win32 NtWow64GetNativeSystemInformation(long ptr long ptr) @ stdcall -syscall -arch=win32 NtWow64ReadVirtualMemory64(long int64 ptr int64 ptr) @ stdcall -syscall -arch=win32 NtWow64WriteVirtualMemory64(long int64 ptr int64 ptr) @ stdcall -syscall NtWriteFile(long long ptr ptr ptr ptr long ptr ptr) @ stdcall -syscall NtWriteFileGather(long long ptr ptr ptr ptr long ptr ptr) -@ stub NtWriteRequestData +# @ stub NtWriteRequestData @ stdcall -syscall NtWriteVirtualMemory(long ptr ptr long ptr) @ stdcall -syscall NtYieldExecution() @ stub PfxFindPrefix @@ -1168,7 +1168,7 @@ @ stdcall -private -syscall ZwAllocateVirtualMemoryEx(long ptr ptr long long ptr long) NtAllocateVirtualMemoryEx @ stdcall -private -syscall ZwAreMappedFilesTheSame(ptr ptr) NtAreMappedFilesTheSame @ stdcall -private -syscall ZwAssignProcessToJobObject(long long) NtAssignProcessToJobObject -@ stub ZwCallbackReturn +# @ stub ZwCallbackReturn # @ stub ZwCancelDeviceWakeupRequest @ stdcall -private -syscall ZwCancelIoFile(long ptr) NtCancelIoFile @ stdcall -private -syscall ZwCancelIoFileEx(long ptr ptr) NtCancelIoFileEx @@ -1176,7 +1176,7 @@ @ stdcall -private -syscall ZwClearEvent(long) NtClearEvent @ stdcall -private -syscall ZwClearPowerRequest(long long) NtClearPowerRequest @ stdcall -private -syscall ZwClose(long) NtClose -@ stub ZwCloseObjectAuditAlarm +# @ stub ZwCloseObjectAuditAlarm # @ stub ZwCompactKeys # @ stub ZwCompareTokens @ stdcall -private -syscall ZwCompleteConnectPort(ptr) NtCompleteConnectPort @@ -1186,7 +1186,7 @@ # @ stub ZwCreateDebugObject @ stdcall -private -syscall ZwCreateDirectoryObject(ptr long ptr) NtCreateDirectoryObject @ stdcall -private -syscall ZwCreateEvent(ptr long ptr long long) NtCreateEvent -@ stub ZwCreateEventPair +# @ stub ZwCreateEventPair @ stdcall -private -syscall ZwCreateFile(ptr long ptr ptr ptr long long long long ptr long) NtCreateFile @ stdcall -private -syscall ZwCreateIoCompletion(ptr long ptr long) NtCreateIoCompletion @ stdcall -private -syscall ZwCreateJobObject(ptr long ptr) NtCreateJobObject @@ -1201,16 +1201,16 @@ @ stdcall -private -syscall ZwCreatePagingFile(ptr ptr ptr ptr) NtCreatePagingFile @ stdcall -private -syscall ZwCreatePort(ptr ptr long long ptr) NtCreatePort @ stdcall -private -syscall ZwCreatePowerRequest(ptr ptr) NtCreatePowerRequest -@ stub ZwCreateProcess +# @ stub ZwCreateProcess # @ stub ZwCreateProcessEx -@ stub ZwCreateProfile +# @ stub ZwCreateProfile @ stdcall -private -syscall ZwCreateSection(ptr long ptr ptr long long long) NtCreateSection @ stdcall -private -syscall ZwCreateSemaphore(ptr long ptr long long) NtCreateSemaphore @ stdcall -private -syscall ZwCreateSymbolicLinkObject(ptr long ptr ptr) NtCreateSymbolicLinkObject @ stdcall -private -syscall ZwCreateThread(ptr long ptr long ptr ptr ptr long) NtCreateThread @ stdcall -private -syscall ZwCreateThreadEx(ptr long ptr long ptr ptr long long long long ptr) NtCreateThreadEx @ stdcall -private -syscall ZwCreateTimer(ptr long ptr long) NtCreateTimer -@ stub ZwCreateToken +# @ stub ZwCreateToken @ stdcall -private -syscall ZwCreateUserProcess(ptr ptr long long ptr ptr long long ptr ptr ptr) NtCreateUserProcess # @ stub ZwCreateWaitablePort @ stdcall -private -syscall ZwDebugActiveProcess(long long) NtDebugActiveProcess @@ -1227,11 +1227,11 @@ @ stdcall -private -syscall ZwDuplicateObject(long long long ptr long long long) NtDuplicateObject @ stdcall -private -syscall ZwDuplicateToken(long long ptr long long ptr) NtDuplicateToken # @ stub ZwEnumerateBootEntries -@ stub ZwEnumerateBus +# @ stub ZwEnumerateBus @ stdcall -private -syscall ZwEnumerateKey(long long long ptr long ptr) NtEnumerateKey # @ stub ZwEnumerateSystemEnvironmentValuesEx @ stdcall -private -syscall ZwEnumerateValueKey(long long long ptr long ptr) NtEnumerateValueKey -@ stub ZwExtendSection +# @ stub ZwExtendSection @ stdcall -private -syscall ZwFilterToken(long long ptr ptr ptr ptr) NtFilterToken @ stdcall -private -syscall ZwFindAtom(ptr long ptr) NtFindAtom @ stdcall -private -syscall ZwFlushBuffersFile(long ptr) NtFlushBuffersFile @@ -1239,7 +1239,7 @@ @ stdcall -private -syscall ZwFlushKey(long) NtFlushKey @ stdcall -private -syscall ZwFlushProcessWriteBuffers() NtFlushProcessWriteBuffers @ stdcall -private -syscall ZwFlushVirtualMemory(long ptr ptr long) NtFlushVirtualMemory -@ stub ZwFlushWriteBuffer +# @ stub ZwFlushWriteBuffer # @ stub ZwFreeUserPhysicalPages @ stdcall -private -syscall ZwFreeVirtualMemory(long ptr ptr long) NtFreeVirtualMemory @ stdcall -private -syscall ZwFsControlFile(long long ptr ptr ptr long ptr long ptr long) NtFsControlFile @@ -1247,13 +1247,13 @@ @ stdcall -private -syscall ZwGetCurrentProcessorNumber() NtGetCurrentProcessorNumber # @ stub ZwGetDevicePowerState @ stdcall -private -syscall ZwGetNlsSectionPtr(long long long ptr ptr) NtGetNlsSectionPtr -@ stub ZwGetPlugPlayEvent +# @ stub ZwGetPlugPlayEvent @ stdcall -private ZwGetTickCount() NtGetTickCount @ stdcall -private -syscall ZwGetWriteWatch(long long ptr long ptr ptr ptr) NtGetWriteWatch @ stdcall -private -syscall ZwImpersonateAnonymousToken(long) NtImpersonateAnonymousToken -@ stub ZwImpersonateClientOfPort -@ stub ZwImpersonateThread -@ stub ZwInitializeRegistry +# @ stub ZwImpersonateClientOfPort +# @ stub ZwImpersonateThread +# @ stub ZwInitializeRegistry @ stdcall -private -syscall ZwInitiatePowerAction(long long long long) NtInitiatePowerAction @ stdcall -private -syscall ZwIsProcessInJob(long long) NtIsProcessInJob # @ stub ZwIsSystemResumeAutomatic @@ -1276,7 +1276,7 @@ @ stdcall -private -syscall ZwNotifyChangeMultipleKeys(long long ptr long ptr ptr ptr long long ptr long long) NtNotifyChangeMultipleKeys @ stdcall -private -syscall ZwOpenDirectoryObject(ptr long ptr) NtOpenDirectoryObject @ stdcall -private -syscall ZwOpenEvent(ptr long ptr) NtOpenEvent -@ stub ZwOpenEventPair +# @ stub ZwOpenEventPair @ stdcall -private -syscall ZwOpenFile(ptr long ptr ptr long long) NtOpenFile @ stdcall -private -syscall ZwOpenIoCompletion(ptr long ptr) NtOpenIoCompletion @ stdcall -private -syscall ZwOpenJobObject(ptr long ptr) NtOpenJobObject @@ -1286,7 +1286,7 @@ @ stdcall -private -syscall ZwOpenKeyTransactedEx(ptr long ptr long long) NtOpenKeyTransactedEx @ stdcall -private -syscall ZwOpenKeyedEvent(ptr long ptr) NtOpenKeyedEvent @ stdcall -private -syscall ZwOpenMutant(ptr long ptr) NtOpenMutant -@ stub ZwOpenObjectAuditAlarm +# @ stub ZwOpenObjectAuditAlarm @ stdcall -private -syscall ZwOpenProcess(ptr long ptr ptr) NtOpenProcess @ stdcall -private -syscall ZwOpenProcessToken(long long ptr) NtOpenProcessToken @ stdcall -private -syscall ZwOpenProcessTokenEx(long long long ptr) NtOpenProcessTokenEx @@ -1297,11 +1297,11 @@ @ stdcall -private -syscall ZwOpenThreadToken(long long long ptr) NtOpenThreadToken @ stdcall -private -syscall ZwOpenThreadTokenEx(long long long long ptr) NtOpenThreadTokenEx @ stdcall -private -syscall ZwOpenTimer(ptr long ptr) NtOpenTimer -@ stub ZwPlugPlayControl +# @ stub ZwPlugPlayControl @ stdcall -private -syscall ZwPowerInformation(long ptr long ptr long) NtPowerInformation @ stdcall -private -syscall ZwPrivilegeCheck(ptr ptr ptr) NtPrivilegeCheck -@ stub ZwPrivilegeObjectAuditAlarm -@ stub ZwPrivilegedServiceAuditAlarm +# @ stub ZwPrivilegeObjectAuditAlarm +# @ stub ZwPrivilegedServiceAuditAlarm @ stdcall -private -syscall ZwProtectVirtualMemory(long ptr ptr long ptr) NtProtectVirtualMemory @ stdcall -private -syscall ZwPulseEvent(long ptr) NtPulseEvent @ stdcall -private -syscall ZwQueryAttributesFile(ptr ptr) NtQueryAttributesFile @@ -1318,19 +1318,19 @@ @ stdcall -private -syscall ZwQueryInformationAtom(long long ptr long ptr) NtQueryInformationAtom @ stdcall -private -syscall ZwQueryInformationFile(long ptr ptr long long) NtQueryInformationFile @ stdcall -private -syscall ZwQueryInformationJobObject(long long ptr long ptr) NtQueryInformationJobObject -@ stub ZwQueryInformationPort +# @ stub ZwQueryInformationPort @ stdcall -private -syscall ZwQueryInformationProcess(long long ptr long ptr) NtQueryInformationProcess @ stdcall -private -syscall ZwQueryInformationThread(long long ptr long ptr) NtQueryInformationThread @ stdcall -private -syscall ZwQueryInformationToken(long long ptr long ptr) NtQueryInformationToken @ stdcall -private -syscall ZwQueryInstallUILanguage(ptr) NtQueryInstallUILanguage -@ stub ZwQueryIntervalProfile +# @ stub ZwQueryIntervalProfile @ stdcall -private -syscall ZwQueryIoCompletion(long long ptr long ptr) NtQueryIoCompletion @ stdcall -private -syscall ZwQueryKey(long long ptr long ptr) NtQueryKey @ stdcall -private -syscall ZwQueryLicenseValue(ptr ptr ptr long ptr) NtQueryLicenseValue @ stdcall -private -syscall ZwQueryMultipleValueKey(long ptr long ptr long ptr) NtQueryMultipleValueKey @ stdcall -private -syscall ZwQueryMutant(long long ptr long ptr) NtQueryMutant @ stdcall -private -syscall ZwQueryObject(long long ptr long ptr) NtQueryObject -@ stub ZwQueryOpenSubKeys +# @ stub ZwQueryOpenSubKeys @ stdcall -private -syscall ZwQueryPerformanceCounter(ptr ptr) NtQueryPerformanceCounter # @ stub ZwQueryPortInformationProcess # @ stub ZwQueryQuotaInformationFile @@ -1353,25 +1353,25 @@ @ stdcall -private -syscall ZwRaiseHardError(long long ptr ptr long ptr) NtRaiseHardError @ stdcall -private -syscall ZwReadFile(long long ptr ptr ptr ptr long ptr ptr) NtReadFile @ stdcall -private -syscall ZwReadFileScatter(long long ptr ptr ptr ptr long ptr ptr) NtReadFileScatter -@ stub ZwReadRequestData +# @ stub ZwReadRequestData @ stdcall -private -syscall ZwReadVirtualMemory(long ptr ptr long ptr) NtReadVirtualMemory -@ stub ZwRegisterNewDevice +# @ stub ZwRegisterNewDevice @ stdcall -private -syscall ZwRegisterThreadTerminatePort(ptr) NtRegisterThreadTerminatePort @ stdcall -private -syscall ZwReleaseKeyedEvent(long ptr long ptr) NtReleaseKeyedEvent @ stdcall -private -syscall ZwReleaseMutant(long ptr) NtReleaseMutant -@ stub ZwReleaseProcessMutant +# @ stub ZwReleaseProcessMutant @ stdcall -private -syscall ZwReleaseSemaphore(long long ptr) NtReleaseSemaphore @ stdcall -private -syscall ZwRemoveIoCompletion(ptr ptr ptr ptr ptr) NtRemoveIoCompletion @ stdcall -private -syscall ZwRemoveIoCompletionEx(ptr ptr long ptr ptr long) NtRemoveIoCompletionEx @ stdcall -private -syscall ZwRemoveProcessDebug(long long) NtRemoveProcessDebug @ stdcall -private -syscall ZwRenameKey(long ptr) NtRenameKey @ stdcall -private -syscall ZwReplaceKey(ptr long ptr) NtReplaceKey -@ stub ZwReplyPort +# @ stub ZwReplyPort @ stdcall -private -syscall ZwReplyWaitReceivePort(ptr ptr ptr ptr) NtReplyWaitReceivePort -@ stub ZwReplyWaitReceivePortEx -@ stub ZwReplyWaitReplyPort +# @ stub ZwReplyWaitReceivePortEx +# @ stub ZwReplyWaitReplyPort # @ stub ZwRequestDeviceWakeup -@ stub ZwRequestPort +# @ stub ZwRequestPort @ stdcall -private -syscall ZwRequestWaitReplyPort(ptr ptr ptr) NtRequestWaitReplyPort # @ stub ZwRequestWakeupLatency @ stdcall -private -syscall ZwResetEvent(long ptr) NtResetEvent @@ -1386,16 +1386,16 @@ # @ stub ZwSetBootEntryOrder # @ stub ZwSetBootOptions @ stdcall -private -syscall ZwSetContextThread(long ptr) NtSetContextThread -@ stub ZwSetDebugFilterState -@ stub ZwSetDefaultHardErrorPort +# @ stub ZwSetDebugFilterState +# @ stub ZwSetDefaultHardErrorPort @ stdcall -private -syscall ZwSetDefaultLocale(long long) NtSetDefaultLocale @ stdcall -private -syscall ZwSetDefaultUILanguage(long) NtSetDefaultUILanguage @ stdcall -private -syscall ZwSetEaFile(long ptr ptr long) NtSetEaFile @ stdcall -private -syscall ZwSetEvent(long ptr) NtSetEvent # @ stub ZwSetEventBoostPriority -@ stub ZwSetHighEventPair -@ stub ZwSetHighWaitLowEventPair -@ stub ZwSetHighWaitLowThread +# @ stub ZwSetHighEventPair +# @ stub ZwSetHighWaitLowEventPair +# @ stub ZwSetHighWaitLowThread @ stdcall -private -syscall ZwSetInformationDebugObject(long long ptr long ptr) NtSetInformationDebugObject @ stdcall -private -syscall ZwSetInformationFile(long ptr ptr long long) NtSetInformationFile @ stdcall -private -syscall ZwSetInformationJobObject(long long ptr long) NtSetInformationJobObject @@ -1407,16 +1407,16 @@ @ stdcall -private -syscall ZwSetIntervalProfile(long long) NtSetIntervalProfile @ stdcall -private -syscall ZwSetIoCompletion(ptr long long long long) NtSetIoCompletion @ stdcall -private -syscall ZwSetLdtEntries(long int64 long int64) NtSetLdtEntries -@ stub ZwSetLowEventPair -@ stub ZwSetLowWaitHighEventPair -@ stub ZwSetLowWaitHighThread +# @ stub ZwSetLowEventPair +# @ stub ZwSetLowWaitHighEventPair +# @ stub ZwSetLowWaitHighThread @ stdcall -private -syscall ZwSetPowerRequest(long long) NtSetPowerRequest # @ stub ZwSetQuotaInformationFile @ stdcall -private -syscall ZwSetSecurityObject(long long ptr) NtSetSecurityObject -@ stub ZwSetSystemEnvironmentValue +# @ stub ZwSetSystemEnvironmentValue # @ stub ZwSetSystemEnvironmentValueEx @ stdcall -private -syscall ZwSetSystemInformation(long ptr long) NtSetSystemInformation -@ stub ZwSetSystemPowerState +# @ stub ZwSetSystemPowerState @ stdcall -private -syscall ZwSetSystemTime(ptr ptr) NtSetSystemTime @ stdcall -private -syscall ZwSetThreadExecutionState(long ptr) NtSetThreadExecutionState @ stdcall -private -syscall ZwSetTimer(long ptr ptr ptr long long ptr) NtSetTimer @@ -1426,8 +1426,8 @@ @ stdcall -private -syscall ZwSetVolumeInformationFile(long ptr ptr long long) NtSetVolumeInformationFile @ stdcall -private -syscall ZwShutdownSystem(long) NtShutdownSystem @ stdcall -private -syscall ZwSignalAndWaitForSingleObject(long long long ptr) NtSignalAndWaitForSingleObject -@ stub ZwStartProfile -@ stub ZwStopProfile +# @ stub ZwStartProfile +# @ stub ZwStopProfile @ stdcall -private -syscall ZwSuspendProcess(long) NtSuspendProcess @ stdcall -private -syscall ZwSuspendThread(long ptr) NtSuspendThread @ stdcall -private -syscall ZwSystemDebugControl(long ptr long ptr long ptr) NtSystemDebugControl @@ -1439,26 +1439,26 @@ # @ stub ZwTranslateFilePath @ stdcall -private -syscall ZwUnloadDriver(ptr) NtUnloadDriver @ stdcall -private -syscall ZwUnloadKey(ptr) NtUnloadKey -@ stub ZwUnloadKeyEx +# @ stub ZwUnloadKeyEx @ stdcall -private -syscall ZwUnlockFile(long ptr ptr ptr ptr) NtUnlockFile @ stdcall -private -syscall ZwUnlockVirtualMemory(long ptr ptr long) NtUnlockVirtualMemory @ stdcall -private -syscall ZwUnmapViewOfSection(long ptr) NtUnmapViewOfSection -@ stub ZwVdmControl -@ stub ZwW32Call +# @ stub ZwVdmControl +# @ stub ZwW32Call @ stdcall -private -syscall ZwWaitForDebugEvent(long long ptr ptr) NtWaitForDebugEvent @ stdcall -private -syscall ZwWaitForKeyedEvent(long ptr long ptr) NtWaitForKeyedEvent @ stdcall -private -syscall ZwWaitForMultipleObjects(long ptr long long ptr) NtWaitForMultipleObjects -@ stub ZwWaitForProcessMutant +# @ stub ZwWaitForProcessMutant @ stdcall -private -syscall ZwWaitForSingleObject(long long ptr) NtWaitForSingleObject -@ stub ZwWaitHighEventPair -@ stub ZwWaitLowEventPair +# @ stub ZwWaitHighEventPair +# @ stub ZwWaitLowEventPair @ stdcall -syscall -arch=win32 ZwWow64AllocateVirtualMemory64(long ptr int64 ptr long long) NtWow64AllocateVirtualMemory64 @ stdcall -syscall -arch=win32 ZwWow64GetNativeSystemInformation(long ptr long ptr) NtWow64GetNativeSystemInformation @ stdcall -syscall -arch=win32 ZwWow64ReadVirtualMemory64(long int64 ptr int64 ptr) NtWow64ReadVirtualMemory64 @ stdcall -syscall -arch=win32 ZwWow64WriteVirtualMemory64(long int64 ptr int64 ptr) NtWow64WriteVirtualMemory64 @ stdcall -private -syscall ZwWriteFile(long long ptr ptr ptr ptr long ptr ptr) NtWriteFile @ stdcall -private -syscall ZwWriteFileGather(long long ptr ptr ptr ptr long ptr ptr) NtWriteFileGather -@ stub ZwWriteRequestData +# @ stub ZwWriteRequestData @ stdcall -private -syscall ZwWriteVirtualMemory(long ptr ptr long ptr) NtWriteVirtualMemory @ stdcall -private -syscall ZwYieldExecution() NtYieldExecution @ cdecl -private -arch=i386 _CIcos() -- 2.31.1

2 1

[PATCH v2] secur32: Set error flag on pull callback.
by Alistair Leslie-Hughes 20 Jul '21

20 Jul '21

Fixes a regression introduced in b8aaf86b2dbb8ecb3f7094cc40a0df89bb2add27 Partial revert the pull_timeout function, which now return -1 and sets the transport error to try again. Wine-bug: https://bugs.winehq.org/show_bug.cgi?id=51440 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/secur32/schannel_gnutls.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index bcf38e3f23f..4d8109721ce 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -292,7 +292,15 @@ static DWORD CDECL schan_get_enabled_protocols(void) static int pull_timeout(gnutls_transport_ptr_t transport, unsigned int timeout) { - return 0; + struct schan_transport *t = (struct schan_transport*)transport; + gnutls_session_t s = (gnutls_session_t)callbacks->get_session_for_transport(t); + SIZE_T count = 0; + + TRACE("\n"); + + if (callbacks->get_buffer(t, &t->in, &count)) return 1; + pgnutls_transport_set_errno(s, EAGAIN); + return -1; } static BOOL CDECL schan_create_session(schan_session *session, schan_credentials *cred) -- 2.30.2

2 1

[PATCH] netapi32: Default to CP_UTF8 when WINEUNIXCP is not set.
by Huw Davies 20 Jul '21

20 Jul '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/netapi32/unixlib.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/dlls/netapi32/unixlib.c b/dlls/netapi32/unixlib.c index 6a8999a6de4..cd04a1116ce 100644 --- a/dlls/netapi32/unixlib.c +++ b/dlls/netapi32/unixlib.c @@ -68,9 +68,9 @@ static NET_API_STATUS (*pNetShareDel)( const char *, const char *, unsigned int static NET_API_STATUS (*pNetWkstaGetInfo)( const char *, unsigned int, unsigned char ** ); static CPTABLEINFO unix_cptable; -static ULONG unix_cp; +static ULONG unix_cp = CP_UTF8; -static BOOL get_unix_codepage(void) +static DWORD WINAPI get_unix_codepage_once( RTL_RUN_ONCE *once, void *param, void **context ) { static const WCHAR wineunixcpW[] = {'W','I','N','E','U','N','I','X','C','P',0}; UNICODE_STRING name, value; @@ -78,19 +78,23 @@ static BOOL get_unix_codepage(void) SIZE_T size; void *ptr; - if (unix_cp) return TRUE; - RtlInitUnicodeString( &name, wineunixcpW ); value.Buffer = value_buffer; value.MaximumLength = sizeof(value_buffer); if (!RtlQueryEnvironmentVariable_U( NULL, &name, &value )) RtlUnicodeStringToInteger( &value, 10, &unix_cp ); - if (NtGetNlsSectionPtr( 11, unix_cp, NULL, &ptr, &size )) - return FALSE; - RtlInitCodePageTable( ptr, &unix_cptable ); + if (unix_cp != CP_UTF8 && !NtGetNlsSectionPtr( 11, unix_cp, NULL, &ptr, &size )) + RtlInitCodePageTable( ptr, &unix_cptable ); return TRUE; } +static BOOL get_unix_codepage( void ) +{ + static RTL_RUN_ONCE once = RTL_RUN_ONCE_INIT; + + return !RtlRunOnceExecuteOnce( &once, get_unix_codepage_once, NULL, NULL ); +} + static DWORD netapi_wcstoumbs( const WCHAR *src, char *dst, DWORD dstlen ) { DWORD srclen = (strlenW( src ) + 1) * sizeof(WCHAR); -- 2.23.0

1 0

[PATCH 5/5] iphlpapi: Implement GetUnicastIpAddressEntry() on top of nsi.
by Huw Davies 20 Jul '21

20 Jul '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/iphlpapi/iphlpapi_main.c | 87 +++++++++++++--------------------- dlls/iphlpapi/tests/iphlpapi.c | 4 +- 2 files changed, 35 insertions(+), 56 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index f4e6ea1a504..93d9b0440dd 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -2696,69 +2696,48 @@ static void unicast_row_fill( MIB_UNICASTIPADDRESS_ROW *row, USHORT fam, void *k DWORD WINAPI GetUnicastIpAddressEntry(MIB_UNICASTIPADDRESS_ROW *row) { - IP_ADAPTER_ADDRESSES *aa, *ptr; - ULONG size = 0; - DWORD ret; + struct nsi_ipv4_unicast_key key4; + struct nsi_ipv6_unicast_key key6; + struct nsi_ip_unicast_rw rw; + struct nsi_ip_unicast_dynamic dyn; + struct nsi_ip_unicast_static stat; + const NPI_MODULEID *mod; + DWORD err, key_size; + void *key; - TRACE("%p\n", row); + TRACE( "%p\n", row ); - if (!row) - return ERROR_INVALID_PARAMETER; + if (!row) return ERROR_INVALID_PARAMETER; + mod = ip_module_id( row->Address.si_family ); + if (!mod) return ERROR_INVALID_PARAMETER; - ret = GetAdaptersAddresses(row->Address.si_family, 0, NULL, NULL, &size); - if (ret != ERROR_BUFFER_OVERFLOW) - return ret; - if (!(ptr = HeapAlloc(GetProcessHeap(), 0, size))) - return ERROR_OUTOFMEMORY; - if ((ret = GetAdaptersAddresses(row->Address.si_family, 0, NULL, ptr, &size))) + if (!row->InterfaceLuid.Value) { - HeapFree(GetProcessHeap(), 0, ptr); - return ret; + err = ConvertInterfaceIndexToLuid( row->InterfaceIndex, &row->InterfaceLuid ); + if (err) return err; } - ret = ERROR_FILE_NOT_FOUND; - for (aa = ptr; aa; aa = aa->Next) + if (row->Address.si_family == WS_AF_INET) { - IP_ADAPTER_UNICAST_ADDRESS *ua; - - if (aa->u.s.IfIndex != row->InterfaceIndex && - memcmp(&aa->Luid, &row->InterfaceLuid, sizeof(row->InterfaceLuid))) - continue; - ret = ERROR_NOT_FOUND; - - ua = aa->FirstUnicastAddress; - while (ua) - { - SOCKADDR_INET *uaaddr = (SOCKADDR_INET *)ua->Address.lpSockaddr; - - if ((row->Address.si_family == WS_AF_INET6 && - !memcmp(&row->Address.Ipv6.sin6_addr, &uaaddr->Ipv6.sin6_addr, sizeof(uaaddr->Ipv6.sin6_addr))) || - (row->Address.si_family == WS_AF_INET && - row->Address.Ipv4.sin_addr.S_un.S_addr == uaaddr->Ipv4.sin_addr.S_un.S_addr)) - { - memcpy(&row->InterfaceLuid, &aa->Luid, sizeof(aa->Luid)); - row->InterfaceIndex = aa->u.s.IfIndex; - row->PrefixOrigin = ua->PrefixOrigin; - row->SuffixOrigin = ua->SuffixOrigin; - row->ValidLifetime = ua->ValidLifetime; - row->PreferredLifetime = ua->PreferredLifetime; - row->OnLinkPrefixLength = ua->OnLinkPrefixLength; - row->SkipAsSource = 0; - row->DadState = ua->DadState; - if (row->Address.si_family == WS_AF_INET6) - row->ScopeId.u.Value = row->Address.Ipv6.sin6_scope_id; - else - row->ScopeId.u.Value = 0; - NtQuerySystemTime(&row->CreationTimeStamp); - HeapFree(GetProcessHeap(), 0, ptr); - return NO_ERROR; - } - ua = ua->Next; - } + key4.luid = row->InterfaceLuid; + key4.addr = row->Address.Ipv4.sin_addr; + key4.pad = 0; + key = &key4; + key_size = sizeof(key4); } - HeapFree(GetProcessHeap(), 0, ptr); + else if (row->Address.si_family == WS_AF_INET6) + { + key6.luid = row->InterfaceLuid; + key6.addr = row->Address.Ipv6.sin6_addr; + key = &key6; + key_size = sizeof(key6); + } + else return ERROR_INVALID_PARAMETER; - return ret; + err = NsiGetAllParameters( 1, mod, NSI_IP_UNICAST_TABLE, key, key_size, &rw, sizeof(rw), + &dyn, sizeof(dyn), &stat, sizeof(stat) ); + if (!err) unicast_row_fill( row, row->Address.si_family, key, &rw, &dyn, &stat ); + return err; } DWORD WINAPI GetUnicastIpAddressTable(ADDRESS_FAMILY family, MIB_UNICASTIPADDRESS_TABLE **table) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 893d6041287..1deac9b64f1 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -1962,7 +1962,7 @@ static void test_GetUnicastIpAddressEntry(void) memset( &row, 0, sizeof(row) ); ret = pGetUnicastIpAddressEntry( &row ); - todo_wine ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); + ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); memset( &row, 0, sizeof(row) ); row.Address.Ipv4.sin_family = AF_INET; @@ -1974,7 +1974,7 @@ static void test_GetUnicastIpAddressEntry(void) memset( &row, 0, sizeof(row) ); row.InterfaceIndex = 123; ret = pGetUnicastIpAddressEntry( &row ); - todo_wine ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); + ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); memset( &row, 0, sizeof(row) ); row.InterfaceIndex = get_interface_index(); -- 2.23.0

1 0

[PATCH 4/5] iphlpapi: Implement GetUnicastIpAddressTable() on top of nsi.
by Huw Davies 20 Jul '21

20 Jul '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/iphlpapi/iphlpapi_main.c | 132 +++++++++++++++++++--------------- dlls/nsi/tests/nsi.c | 1 - 2 files changed, 76 insertions(+), 57 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 4ff9feb57f2..f4e6ea1a504 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -77,6 +77,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(iphlpapi); DWORD WINAPI AllocateAndGetIfTableFromStack( MIB_IFTABLE **table, BOOL sort, HANDLE heap, DWORD flags ); +static const NPI_MODULEID *ip_module_id( USHORT family ) +{ + if (family == WS_AF_INET) return &NPI_MS_IPV4_MODULEID; + if (family == WS_AF_INET6) return &NPI_MS_IPV6_MODULEID; + return NULL; +} + DWORD WINAPI ConvertGuidToStringA( const GUID *guid, char *str, DWORD len ) { if (len < CHARS_IN_GUID) return ERROR_INSUFFICIENT_BUFFER; @@ -2651,6 +2658,42 @@ DWORD WINAPI GetExtendedUdpTable(PVOID pUdpTable, PDWORD pdwSize, BOOL bOrder, return ret; } +static void unicast_row_fill( MIB_UNICASTIPADDRESS_ROW *row, USHORT fam, void *key, struct nsi_ip_unicast_rw *rw, + struct nsi_ip_unicast_dynamic *dyn, struct nsi_ip_unicast_static *stat ) +{ + struct nsi_ipv4_unicast_key *key4 = (struct nsi_ipv4_unicast_key *)key; + struct nsi_ipv6_unicast_key *key6 = (struct nsi_ipv6_unicast_key *)key; + + if (fam == WS_AF_INET) + { + row->Address.Ipv4.sin_family = fam; + row->Address.Ipv4.sin_port = 0; + row->Address.Ipv4.sin_addr = key4->addr; + memset( row->Address.Ipv4.sin_zero, 0, sizeof(row->Address.Ipv4.sin_zero) ); + row->InterfaceLuid.Value = key4->luid.Value; + } + else + { + row->Address.Ipv6.sin6_family = fam; + row->Address.Ipv6.sin6_port = 0; + row->Address.Ipv6.sin6_flowinfo = 0; + row->Address.Ipv6.sin6_addr = key6->addr; + row->Address.Ipv6.sin6_scope_id = dyn->scope_id; + row->InterfaceLuid.Value = key6->luid.Value; + } + + ConvertInterfaceLuidToIndex( &row->InterfaceLuid, &row->InterfaceIndex ); + row->PrefixOrigin = rw->prefix_origin; + row->SuffixOrigin = rw->suffix_origin; + row->ValidLifetime = rw->valid_lifetime; + row->PreferredLifetime = rw->preferred_lifetime; + row->OnLinkPrefixLength = rw->on_link_prefix; + row->SkipAsSource = 0; + row->DadState = dyn->dad_state; + row->ScopeId.u.Value = dyn->scope_id; + row->CreationTimeStamp.QuadPart = stat->creation_time; +} + DWORD WINAPI GetUnicastIpAddressEntry(MIB_UNICASTIPADDRESS_ROW *row) { IP_ADAPTER_ADDRESSES *aa, *ptr; @@ -2720,80 +2763,57 @@ DWORD WINAPI GetUnicastIpAddressEntry(MIB_UNICASTIPADDRESS_ROW *row) DWORD WINAPI GetUnicastIpAddressTable(ADDRESS_FAMILY family, MIB_UNICASTIPADDRESS_TABLE **table) { - IP_ADAPTER_ADDRESSES *aa, *ptr; - MIB_UNICASTIPADDRESS_TABLE *data; - DWORD ret, count = 0; - ULONG size, flags; + void *key[2] = { NULL, NULL }; + struct nsi_ip_unicast_rw *rw[2] = { NULL, NULL }; + struct nsi_ip_unicast_dynamic *dyn[2] = { NULL, NULL }; + struct nsi_ip_unicast_static *stat[2] = { NULL, NULL }; + static const USHORT fam[2] = { WS_AF_INET, WS_AF_INET6 }; + static const DWORD key_size[2] = { sizeof(struct nsi_ipv4_unicast_key), sizeof(struct nsi_ipv6_unicast_key) }; + DWORD err, i, size, count[2] = { 0, 0 }; - TRACE("%u, %p\n", family, table); + TRACE( "%u, %p\n", family, table ); if (!table || (family != WS_AF_INET && family != WS_AF_INET6 && family != WS_AF_UNSPEC)) return ERROR_INVALID_PARAMETER; - flags = GAA_FLAG_SKIP_ANYCAST | - GAA_FLAG_SKIP_MULTICAST | - GAA_FLAG_SKIP_DNS_SERVER | - GAA_FLAG_SKIP_FRIENDLY_NAME; - - ret = GetAdaptersAddresses(family, flags, NULL, NULL, &size); - if (ret != ERROR_BUFFER_OVERFLOW) - return ret; - if (!(ptr = HeapAlloc(GetProcessHeap(), 0, size))) - return ERROR_OUTOFMEMORY; - if ((ret = GetAdaptersAddresses(family, flags, NULL, ptr, &size))) + for (i = 0; i < 2; i++) { - HeapFree(GetProcessHeap(), 0, ptr); - return ret; + if (family != WS_AF_UNSPEC && family != fam[i]) continue; + + err = NsiAllocateAndGetTable( 1, ip_module_id( fam[i] ), NSI_IP_UNICAST_TABLE, key + i, key_size[i], + (void **)rw + i, sizeof(**rw), (void **)dyn + i, sizeof(**dyn), + (void **)stat + i, sizeof(**stat), count + i, 0 ); + if (err) goto err; } - for (aa = ptr; aa; aa = aa->Next) + size = FIELD_OFFSET(MIB_UNICASTIPADDRESS_TABLE, Table[ count[0] + count[1] ]); + *table = heap_alloc( size ); + if (!*table) { - IP_ADAPTER_UNICAST_ADDRESS *ua = aa->FirstUnicastAddress; - while (ua) - { - count++; - ua = ua->Next; - } + err = ERROR_NOT_ENOUGH_MEMORY; + goto err; } - if (!(data = HeapAlloc(GetProcessHeap(), 0, sizeof(*data) + (count - 1) * sizeof(data->Table[0])))) + (*table)->NumEntries = count[0] + count[1]; + for (i = 0; i < count[0]; i++) { - HeapFree(GetProcessHeap(), 0, ptr); - return ERROR_OUTOFMEMORY; + MIB_UNICASTIPADDRESS_ROW *row = (*table)->Table + i; + struct nsi_ipv4_unicast_key *key4 = (struct nsi_ipv4_unicast_key *)key[0]; + + unicast_row_fill( row, fam[0], (void *)(key4 + i), rw[0] + i, dyn[0] + i, stat[0] + i ); } - data->NumEntries = 0; - for (aa = ptr; aa; aa = aa->Next) + for (i = 0; i < count[1]; i++) { - IP_ADAPTER_UNICAST_ADDRESS *ua = aa->FirstUnicastAddress; - while (ua) - { - MIB_UNICASTIPADDRESS_ROW *row = &data->Table[data->NumEntries]; - memcpy(&row->Address, ua->Address.lpSockaddr, ua->Address.iSockaddrLength); - memcpy(&row->InterfaceLuid, &aa->Luid, sizeof(aa->Luid)); - row->InterfaceIndex = aa->u.s.IfIndex; - row->PrefixOrigin = ua->PrefixOrigin; - row->SuffixOrigin = ua->SuffixOrigin; - row->ValidLifetime = ua->ValidLifetime; - row->PreferredLifetime = ua->PreferredLifetime; - row->OnLinkPrefixLength = ua->OnLinkPrefixLength; - row->SkipAsSource = 0; - row->DadState = ua->DadState; - if (row->Address.si_family == WS_AF_INET6) - row->ScopeId.u.Value = row->Address.Ipv6.sin6_scope_id; - else - row->ScopeId.u.Value = 0; - NtQuerySystemTime(&row->CreationTimeStamp); + MIB_UNICASTIPADDRESS_ROW *row = (*table)->Table + count[0] + i; + struct nsi_ipv6_unicast_key *key6 = (struct nsi_ipv6_unicast_key *)key[1]; - data->NumEntries++; - ua = ua->Next; - } + unicast_row_fill( row, fam[1], (void *)(key6 + i), rw[1] + i, dyn[1] + i, stat[1] + i ); } - HeapFree(GetProcessHeap(), 0, ptr); - - *table = data; - return ret; +err: + for (i = 0; i < 2; i++) NsiFreeTable( key[i], rw[i], dyn[i], stat[i] ); + return err; } /****************************************************************** diff --git a/dlls/nsi/tests/nsi.c b/dlls/nsi/tests/nsi.c index c07653c2ede..869fa255bb2 100644 --- a/dlls/nsi/tests/nsi.c +++ b/dlls/nsi/tests/nsi.c @@ -470,7 +470,6 @@ static void test_ip_unicast( int family ) /* SkipAsSource */ ok( row->DadState == dyn->dad_state, "mismatch\n" ); ok( row->ScopeId.Value == dyn->scope_id, "mismatch\n" ); -todo_wine ok( row->CreationTimeStamp.QuadPart == stat->creation_time, "mismatch\n" ); winetest_pop_context(); } -- 2.23.0

1 0

[PATCH 3/5] nsiproxy: Implement IP unicast get_all_parameters.
by Huw Davies 20 Jul '21

20 Jul '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/nsi/tests/nsi.c | 14 +++++++--- dlls/nsiproxy.sys/ip.c | 39 +++++++++++++++++++++++++++ dlls/nsiproxy.sys/main.o | Bin 0 -> 37448 bytes dlls/nsiproxy.sys/ndis.c | 21 +++++++++++++++ dlls/nsiproxy.sys/nsiproxy_private.h | 1 + 5 files changed, 71 insertions(+), 4 deletions(-) create mode 100644 dlls/nsiproxy.sys/main.o diff --git a/dlls/nsi/tests/nsi.c b/dlls/nsi/tests/nsi.c index 3408dfae58f..c07653c2ede 100644 --- a/dlls/nsi/tests/nsi.c +++ b/dlls/nsi/tests/nsi.c @@ -415,11 +415,11 @@ static void test_ip_unicast( int family ) { DWORD rw_sizes[] = { FIELD_OFFSET(struct nsi_ip_unicast_rw, unk[0]), FIELD_OFFSET(struct nsi_ip_unicast_rw, unk[1]), sizeof(struct nsi_ip_unicast_rw) }; - struct nsi_ipv4_unicast_key *key_tbl, *key4; + struct nsi_ipv4_unicast_key *key_tbl, *key4, get_key; struct nsi_ipv6_unicast_key *key6; - struct nsi_ip_unicast_rw *rw_tbl, *rw; - struct nsi_ip_unicast_dynamic *dyn_tbl, *dyn; - struct nsi_ip_unicast_static *stat_tbl, *stat; + struct nsi_ip_unicast_rw *rw_tbl, *rw, get_rw; + struct nsi_ip_unicast_dynamic *dyn_tbl, *dyn, get_dyn; + struct nsi_ip_unicast_static *stat_tbl, *stat, get_stat; MIB_UNICASTIPADDRESS_TABLE *table; const NPI_MODULEID *mod = (family == AF_INET) ? &NPI_MS_IPV4_MODULEID : &NPI_MS_IPV6_MODULEID; DWORD err, count, i, rw_size, key_size = (family == AF_INET) ? sizeof(*key4) : sizeof(*key6); @@ -475,6 +475,12 @@ todo_wine winetest_pop_context(); } + get_key.luid.Value = ~0u; + get_key.addr.s_addr = 0; + err = NsiGetAllParameters( 1, &NPI_MS_IPV4_MODULEID, NSI_IP_UNICAST_TABLE, &get_key, sizeof(get_key), + &get_rw, rw_size, &get_dyn, sizeof(get_dyn), &get_stat, sizeof(get_stat) ); + ok( err == ERROR_NOT_FOUND, "got %d\n", err ); + FreeMibTable( table ); NsiFreeTable( key_tbl, rw_tbl, dyn_tbl, stat_tbl ); winetest_pop_context(); diff --git a/dlls/nsiproxy.sys/ip.c b/dlls/nsiproxy.sys/ip.c index d5fcc689fc4..ab1b6294bea 100644 --- a/dlls/nsiproxy.sys/ip.c +++ b/dlls/nsiproxy.sys/ip.c @@ -180,6 +180,43 @@ static NTSTATUS ip_unicast_enumerate_all( void *key_data, DWORD key_size, void * return status; } +static NTSTATUS ip_unicast_get_all_parameters( const void *key, DWORD key_size, void *rw_data, DWORD rw_size, + void *dynamic_data, DWORD dynamic_size, + void *static_data, DWORD static_size ) +{ + int family = (key_size == sizeof(struct nsi_ipv4_unicast_key)) ? AF_INET : AF_INET6; + NTSTATUS status = STATUS_NOT_FOUND; + const struct nsi_ipv6_unicast_key *key6 = key; + const struct nsi_ipv4_unicast_key *key4 = key; + struct ifaddrs *addrs, *entry; + const char *unix_name; + + TRACE( "%p %d %p %d %p %d %p %d\n", key, key_size, rw_data, rw_size, dynamic_data, dynamic_size, + static_data, static_size ); + + if (!convert_luid_to_unix_name( &key6->luid, &unix_name )) return STATUS_NOT_FOUND; + + if (getifaddrs( &addrs )) return STATUS_NO_MORE_ENTRIES; + + for (entry = addrs; entry; entry = entry->ifa_next) + { + if (!entry->ifa_addr || entry->ifa_addr->sa_family != family) continue; + if (strcmp( entry->ifa_name, unix_name )) continue; + + if (family == AF_INET && + memcmp( &key4->addr, &((struct sockaddr_in *)entry->ifa_addr)->sin_addr, sizeof(key4->addr) )) continue; + if (family == AF_INET6 && + memcmp( &key6->addr, &((struct sockaddr_in6 *)entry->ifa_addr)->sin6_addr, sizeof(key6->addr) )) continue; + + unicast_fill_entry( entry, NULL, rw_data, dynamic_data, static_data ); + status = STATUS_SUCCESS; + break; + } + + freeifaddrs( addrs ); + return status; +} + static struct module_table ipv4_tables[] = { { @@ -189,6 +226,7 @@ static struct module_table ipv4_tables[] = sizeof(struct nsi_ip_unicast_dynamic), sizeof(struct nsi_ip_unicast_static) }, ip_unicast_enumerate_all, + ip_unicast_get_all_parameters, }, { ~0u @@ -210,6 +248,7 @@ static struct module_table ipv6_tables[] = sizeof(struct nsi_ip_unicast_dynamic), sizeof(struct nsi_ip_unicast_static) }, ip_unicast_enumerate_all, + ip_unicast_get_all_parameters, }, { ~0u diff --git a/dlls/nsiproxy.sys/main.o b/dlls/nsiproxy.sys/main.o new file mode 100644 index 0000000000000000000000000000000000000000..6e44033ff5a72e170a1e300ace272de5ba9b0b3f GIT binary patch literal 37448 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 literal 0 HcmV?d00001 diff --git a/dlls/nsiproxy.sys/ndis.c b/dlls/nsiproxy.sys/ndis.c index c40dba7a01a..885915e5b1d 100644 --- a/dlls/nsiproxy.sys/ndis.c +++ b/dlls/nsiproxy.sys/ndis.c @@ -634,6 +634,27 @@ BOOL convert_unix_name_to_luid( const char *unix_name, NET_LUID *luid ) return ret; } +BOOL convert_luid_to_unix_name( const NET_LUID *luid, const char **unix_name ) +{ + struct if_entry *entry; + BOOL ret = FALSE;; + + EnterCriticalSection( &if_list_cs ); + + update_if_table(); + + LIST_FOR_EACH_ENTRY( entry, &if_list, struct if_entry, entry ) + if (entry->if_luid.Value == luid->Value) + { + *unix_name = entry->if_unix_name; + ret = TRUE; + + } + LeaveCriticalSection( &if_list_cs ); + + return ret; +} + static const struct module_table tables[] = { { diff --git a/dlls/nsiproxy.sys/nsiproxy_private.h b/dlls/nsiproxy.sys/nsiproxy_private.h index 1c62a3df038..0f6e7b05c59 100644 --- a/dlls/nsiproxy.sys/nsiproxy_private.h +++ b/dlls/nsiproxy.sys/nsiproxy_private.h @@ -22,6 +22,7 @@ NTSTATUS nsi_enumerate_all_ex( struct nsi_enumerate_all_ex *params ) DECLSPEC_HI NTSTATUS nsi_get_all_parameters_ex( struct nsi_get_all_parameters_ex *params ) DECLSPEC_HIDDEN; NTSTATUS nsi_get_parameter_ex( struct nsi_get_parameter_ex *params ) DECLSPEC_HIDDEN; +BOOL convert_luid_to_unix_name( const NET_LUID *luid, const char **unix_name ) DECLSPEC_HIDDEN; BOOL convert_unix_name_to_luid( const char *unix_name, NET_LUID *luid ) DECLSPEC_HIDDEN; struct module_table -- 2.23.0

1 0

[PATCH 2/5] nsiproxy: Implement IP unicast enumerate_all.
by Huw Davies 20 Jul '21

20 Jul '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/nsi/tests/nsi.c | 72 +++++++++ dlls/nsiproxy.sys/Makefile.in | 1 + dlls/nsiproxy.sys/ip.c | 223 +++++++++++++++++++++++++++ dlls/nsiproxy.sys/ndis.c | 21 +++ dlls/nsiproxy.sys/nsi.c | 2 + dlls/nsiproxy.sys/nsiproxy_private.h | 4 + include/netioapi.h | 1 + include/wine/nsi.h | 39 +++++ 8 files changed, 363 insertions(+) create mode 100644 dlls/nsiproxy.sys/ip.c diff --git a/dlls/nsi/tests/nsi.c b/dlls/nsi/tests/nsi.c index cefd42983d4..3408dfae58f 100644 --- a/dlls/nsi/tests/nsi.c +++ b/dlls/nsi/tests/nsi.c @@ -411,10 +411,82 @@ static void test_ndis_index_luid( void ) ok( err == ERROR_FILE_NOT_FOUND, "got %d\n", err ); } +static void test_ip_unicast( int family ) +{ + DWORD rw_sizes[] = { FIELD_OFFSET(struct nsi_ip_unicast_rw, unk[0]), FIELD_OFFSET(struct nsi_ip_unicast_rw, unk[1]), + sizeof(struct nsi_ip_unicast_rw) }; + struct nsi_ipv4_unicast_key *key_tbl, *key4; + struct nsi_ipv6_unicast_key *key6; + struct nsi_ip_unicast_rw *rw_tbl, *rw; + struct nsi_ip_unicast_dynamic *dyn_tbl, *dyn; + struct nsi_ip_unicast_static *stat_tbl, *stat; + MIB_UNICASTIPADDRESS_TABLE *table; + const NPI_MODULEID *mod = (family == AF_INET) ? &NPI_MS_IPV4_MODULEID : &NPI_MS_IPV6_MODULEID; + DWORD err, count, i, rw_size, key_size = (family == AF_INET) ? sizeof(*key4) : sizeof(*key6); + + winetest_push_context( family == AF_INET ? "AF_INET" : "AF_INET6" ); + + for (i = 0; i < ARRAY_SIZE(rw_sizes); i++) + { + err = NsiAllocateAndGetTable( 1, mod, NSI_IP_UNICAST_TABLE, (void **)&key_tbl, key_size, + (void **)&rw_tbl, rw_sizes[i], (void **)&dyn_tbl, sizeof(*dyn_tbl), + (void **)&stat_tbl, sizeof(*stat_tbl), &count, 0 ); + if (!err) break; + } + ok( !err, "got %d\n", err ); + rw_size = rw_sizes[i]; + + err = GetUnicastIpAddressTable( family, &table ); + ok( !err, "got %d\n", err ); + ok( table->NumEntries == count, "table entries %d count %d\n", table->NumEntries, count ); + + for (i = 0; i < count; i++) + { + MIB_UNICASTIPADDRESS_ROW *row = table->Table + i; + rw = (struct nsi_ip_unicast_rw *)((BYTE *)rw_tbl + i * rw_size); + dyn = dyn_tbl + i; + stat = stat_tbl + i; + winetest_push_context( "%d", i ); + + ok( row->Address.si_family == family, "mismatch\n" ); + + if (family == AF_INET) + { + key4 = key_tbl + i; + ok( !memcmp( &row->Address.Ipv4.sin_addr, &key4->addr, sizeof(struct in_addr) ), "mismatch\n" ); + ok( row->InterfaceLuid.Value == key4->luid.Value, "mismatch\n" ); + } + else + { + key6 = (struct nsi_ipv6_unicast_key *)key_tbl + i; + ok( !memcmp( &row->Address.Ipv6.sin6_addr, &key6->addr, sizeof(struct in6_addr) ), "mismatch\n" ); + ok( row->InterfaceLuid.Value == key6->luid.Value, "mismatch\n" ); + } + ok( row->PrefixOrigin == rw->prefix_origin, "mismatch\n" ); + ok( row->SuffixOrigin == rw->suffix_origin, "mismatch\n" ); + ok( row->ValidLifetime == rw->valid_lifetime, "mismatch\n" ); + ok( row->PreferredLifetime == rw->preferred_lifetime, "mismatch\n" ); + ok( row->OnLinkPrefixLength == rw->on_link_prefix, "mismatch\n" ); + /* SkipAsSource */ + ok( row->DadState == dyn->dad_state, "mismatch\n" ); + ok( row->ScopeId.Value == dyn->scope_id, "mismatch\n" ); +todo_wine + ok( row->CreationTimeStamp.QuadPart == stat->creation_time, "mismatch\n" ); + winetest_pop_context(); + } + + FreeMibTable( table ); + NsiFreeTable( key_tbl, rw_tbl, dyn_tbl, stat_tbl ); + winetest_pop_context(); +} + START_TEST( nsi ) { test_nsi_api(); test_ndis_ifinfo(); test_ndis_index_luid(); + + test_ip_unicast( AF_INET ); + test_ip_unicast( AF_INET6 ); } diff --git a/dlls/nsiproxy.sys/Makefile.in b/dlls/nsiproxy.sys/Makefile.in index e44aacf5b54..07c2738e55b 100644 --- a/dlls/nsiproxy.sys/Makefile.in +++ b/dlls/nsiproxy.sys/Makefile.in @@ -4,5 +4,6 @@ EXTRADLLFLAGS = -Wl,--subsystem,native C_SRCS = \ device.c \ + ip.c \ ndis.c \ nsi.c diff --git a/dlls/nsiproxy.sys/ip.c b/dlls/nsiproxy.sys/ip.c new file mode 100644 index 00000000000..d5fcc689fc4 --- /dev/null +++ b/dlls/nsiproxy.sys/ip.c @@ -0,0 +1,223 @@ +/* + * nsiproxy.sys ipv4 and ipv6 modules + * + * Copyright 2003, 2006, 2011 Juan Lang + * Copyright 2021 Huw Davies + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#include "config.h" +#include <stdarg.h> + +#ifdef HAVE_NETINET_IN_H +#include <netinet/in.h> +#endif + +#ifdef HAVE_IFADDRS_H +#include <ifaddrs.h> +#endif + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winbase.h" +#include "winternl.h" +#include "winioctl.h" +#define USE_WS_PREFIX +#include "winsock2.h" +#include "ws2ipdef.h" +#include "nldef.h" +#include "ifdef.h" +#include "netiodef.h" +#include "wine/nsi.h" +#include "wine/debug.h" + +#include "nsiproxy_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(nsi); + +static inline DWORD nsi_popcount( DWORD m ) +{ +#ifdef HAVE___BUILTIN_POPCOUNT + return __builtin_popcount( m ); +#else + m -= m >> 1 & 0x55555555; + m = (m & 0x33333333) + (m >> 2 & 0x33333333); + return ((m + (m >> 4)) & 0x0f0f0f0f) * 0x01010101 >> 24; +#endif +} + +static DWORD mask_v4_to_prefix( struct in_addr *addr ) +{ + return nsi_popcount( addr->s_addr ); +} + +static DWORD mask_v6_to_prefix( struct in6_addr *addr ) +{ + DWORD ret; + + ret = nsi_popcount( *(DWORD *)addr->s6_addr ); + ret += nsi_popcount( *(DWORD *)(addr->s6_addr + 4) ); + ret += nsi_popcount( *(DWORD *)(addr->s6_addr + 8) ); + ret += nsi_popcount( *(DWORD *)(addr->s6_addr + 12) ); + return ret; +} + +static ULONG64 get_boot_time( void ) +{ + SYSTEM_TIMEOFDAY_INFORMATION ti; + + NtQuerySystemInformation( SystemTimeOfDayInformation, &ti, sizeof(ti), NULL ); + return ti.BootTime.QuadPart; +} + +static void unicast_fill_entry( struct ifaddrs *entry, void *key, struct nsi_ip_unicast_rw *rw, + struct nsi_ip_unicast_dynamic *dyn, struct nsi_ip_unicast_static *stat ) +{ + struct nsi_ipv6_unicast_key placeholder, *key6 = key; + struct nsi_ipv4_unicast_key *key4 = key; + DWORD scope_id = 0; + + if (!key) + { + key6 = &placeholder; + key4 = (struct nsi_ipv4_unicast_key *)&placeholder; + } + + convert_unix_name_to_luid( entry->ifa_name, &key6->luid ); + + if (entry->ifa_addr->sa_family == AF_INET) + { + memcpy( &key4->addr, &((struct sockaddr_in *)entry->ifa_addr)->sin_addr, sizeof(key4->addr) ); + key4->pad = 0; + } + else if (entry->ifa_addr->sa_family == AF_INET6) + { + memcpy( &key6->addr, &((struct sockaddr_in6 *)entry->ifa_addr)->sin6_addr, sizeof(key6->addr) ); + scope_id = ((struct sockaddr_in6 *)entry->ifa_addr)->sin6_scope_id; + } + + if (rw) + { + rw->preferred_lifetime = 60000; + rw->valid_lifetime = 60000; + + if (key6->luid.Info.IfType != IF_TYPE_SOFTWARE_LOOPBACK) + { + rw->prefix_origin = IpPrefixOriginDhcp; + rw->suffix_origin = IpSuffixOriginDhcp; + } + else + { + rw->prefix_origin = IpPrefixOriginManual; + rw->suffix_origin = IpSuffixOriginManual; + } + if (entry->ifa_netmask && entry->ifa_netmask->sa_family == AF_INET) + rw->on_link_prefix = mask_v4_to_prefix( &((struct sockaddr_in *)entry->ifa_netmask)->sin_addr ); + else if (entry->ifa_netmask && entry->ifa_netmask->sa_family == AF_INET6) + rw->on_link_prefix = mask_v6_to_prefix( &((struct sockaddr_in6 *)entry->ifa_netmask)->sin6_addr ); + else rw->on_link_prefix = 0; + rw->unk[0] = 0; + rw->unk[1] = 0; + } + + if (dyn) + { + dyn->scope_id = scope_id; + dyn->dad_state = IpDadStatePreferred; + } + + if (stat) stat->creation_time = get_boot_time(); +} + +static NTSTATUS ip_unicast_enumerate_all( void *key_data, DWORD key_size, void *rw_data, DWORD rw_size, + void *dynamic_data, DWORD dynamic_size, + void *static_data, DWORD static_size, DWORD_PTR *count ) +{ + DWORD num = 0; + NTSTATUS status = STATUS_SUCCESS; + BOOL want_data = key_size || rw_size || dynamic_size || static_size; + struct ifaddrs *addrs, *entry; + int family = (key_size == sizeof(struct nsi_ipv4_unicast_key)) ? AF_INET : AF_INET6; + + TRACE( "%p %d %p %d %p %d %p %d %p\n", key_data, key_size, rw_data, rw_size, + dynamic_data, dynamic_size, static_data, static_size, count ); + + if (getifaddrs( &addrs )) return STATUS_NO_MORE_ENTRIES; + + for (entry = addrs; entry; entry = entry->ifa_next) + { + if (!entry->ifa_addr || entry->ifa_addr->sa_family != family) continue; + + if (num < *count) + { + unicast_fill_entry( entry, key_data, rw_data, dynamic_data, static_data ); + key_data = (BYTE *)key_data + key_size; + rw_data = (BYTE *)rw_data + rw_size; + dynamic_data = (BYTE *)dynamic_data + dynamic_size; + static_data = (BYTE *)static_data + static_size; + } + num++; + } + + freeifaddrs( addrs ); + + if (!want_data || num <= *count) *count = num; + else status = STATUS_MORE_ENTRIES; + + return status; +} + +static struct module_table ipv4_tables[] = +{ + { + NSI_IP_UNICAST_TABLE, + { + sizeof(struct nsi_ipv4_unicast_key), sizeof(struct nsi_ip_unicast_rw), + sizeof(struct nsi_ip_unicast_dynamic), sizeof(struct nsi_ip_unicast_static) + }, + ip_unicast_enumerate_all, + }, + { + ~0u + } +}; + +const struct module ipv4_module = +{ + &NPI_MS_IPV4_MODULEID, + ipv4_tables +}; + +static struct module_table ipv6_tables[] = +{ + { + NSI_IP_UNICAST_TABLE, + { + sizeof(struct nsi_ipv6_unicast_key), sizeof(struct nsi_ip_unicast_rw), + sizeof(struct nsi_ip_unicast_dynamic), sizeof(struct nsi_ip_unicast_static) + }, + ip_unicast_enumerate_all, + }, + { + ~0u + } +}; + +const struct module ipv6_module = +{ + &NPI_MS_IPV6_MODULEID, + ipv6_tables +}; diff --git a/dlls/nsiproxy.sys/ndis.c b/dlls/nsiproxy.sys/ndis.c index 332df7159b9..c40dba7a01a 100644 --- a/dlls/nsiproxy.sys/ndis.c +++ b/dlls/nsiproxy.sys/ndis.c @@ -613,6 +613,27 @@ static NTSTATUS index_luid_get_parameter( const void *key, DWORD key_size, DWORD return status; } +BOOL convert_unix_name_to_luid( const char *unix_name, NET_LUID *luid ) +{ + struct if_entry *entry; + BOOL ret = FALSE;; + + EnterCriticalSection( &if_list_cs ); + + update_if_table(); + + LIST_FOR_EACH_ENTRY( entry, &if_list, struct if_entry, entry ) + if (!strcmp( entry->if_unix_name, unix_name )) + { + *luid = entry->if_luid; + ret = TRUE; + break; + } + LeaveCriticalSection( &if_list_cs ); + + return ret; +} + static const struct module_table tables[] = { { diff --git a/dlls/nsiproxy.sys/nsi.c b/dlls/nsiproxy.sys/nsi.c index e4286b5fc93..8e084a076fd 100644 --- a/dlls/nsiproxy.sys/nsi.c +++ b/dlls/nsiproxy.sys/nsi.c @@ -38,6 +38,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(nsi); static const struct module *modules[] = { &ndis_module, + &ipv4_module, + &ipv6_module, }; static const struct module_table *get_module_table( const NPI_MODULEID *id, DWORD table ) diff --git a/dlls/nsiproxy.sys/nsiproxy_private.h b/dlls/nsiproxy.sys/nsiproxy_private.h index 0cd2a79d59f..1c62a3df038 100644 --- a/dlls/nsiproxy.sys/nsiproxy_private.h +++ b/dlls/nsiproxy.sys/nsiproxy_private.h @@ -22,6 +22,8 @@ NTSTATUS nsi_enumerate_all_ex( struct nsi_enumerate_all_ex *params ) DECLSPEC_HI NTSTATUS nsi_get_all_parameters_ex( struct nsi_get_all_parameters_ex *params ) DECLSPEC_HIDDEN; NTSTATUS nsi_get_parameter_ex( struct nsi_get_parameter_ex *params ) DECLSPEC_HIDDEN; +BOOL convert_unix_name_to_luid( const char *unix_name, NET_LUID *luid ) DECLSPEC_HIDDEN; + struct module_table { DWORD table; @@ -43,3 +45,5 @@ struct module }; extern const struct module ndis_module DECLSPEC_HIDDEN; +extern const struct module ipv4_module DECLSPEC_HIDDEN; +extern const struct module ipv6_module DECLSPEC_HIDDEN; diff --git a/include/netioapi.h b/include/netioapi.h index bbd203fc9b3..4735620dedb 100644 --- a/include/netioapi.h +++ b/include/netioapi.h @@ -256,6 +256,7 @@ DWORD WINAPI GetIfTable2(MIB_IF_TABLE2**); DWORD WINAPI GetIfTable2Ex(MIB_IF_TABLE_LEVEL,MIB_IF_TABLE2**); DWORD WINAPI GetIpInterfaceTable(ADDRESS_FAMILY,MIB_IPINTERFACE_TABLE**); DWORD WINAPI GetUnicastIpAddressEntry(MIB_UNICASTIPADDRESS_ROW*); +DWORD WINAPI GetUnicastIpAddressTable(ADDRESS_FAMILY,MIB_UNICASTIPADDRESS_TABLE**); PCHAR WINAPI if_indextoname(NET_IFINDEX,PCHAR); NET_IFINDEX WINAPI if_nametoindex(PCSTR); diff --git a/include/wine/nsi.h b/include/wine/nsi.h index 3327b1f7403..bba5be11e50 100644 --- a/include/wine/nsi.h +++ b/include/wine/nsi.h @@ -19,6 +19,8 @@ #ifndef __WINE_NSI_H #define __WINE_NSI_H +#include "inaddr.h" +#include "in6addr.h" #include "winioctl.h" /* Undocumented NSI NDIS tables */ @@ -94,6 +96,43 @@ struct nsi_ndis_ifinfo_static DWORD phys_medium_type; }; +/* Undocumented NSI IP tables */ +#define NSI_IP_UNICAST_TABLE 10 + +struct nsi_ipv4_unicast_key +{ + NET_LUID luid; + IN_ADDR addr; + DWORD pad; +}; + +struct nsi_ipv6_unicast_key +{ + NET_LUID luid; + IN6_ADDR addr; +}; + +struct nsi_ip_unicast_rw +{ + DWORD preferred_lifetime; + DWORD valid_lifetime; + DWORD prefix_origin; + DWORD suffix_origin; + DWORD on_link_prefix; + DWORD unk[2]; +}; + +struct nsi_ip_unicast_dynamic +{ + DWORD scope_id; + DWORD dad_state; +}; + +struct nsi_ip_unicast_static +{ + ULONG64 creation_time; +}; + /* Wine specific ioctl interface */ #define IOCTL_NSIPROXY_WINE_ENUMERATE_ALL CTL_CODE(FILE_DEVICE_NETWORK, 0x400, METHOD_BUFFERED, 0) -- 2.23.0

1 0

[PATCH 1/5] iphlpapi: Remove unused function getInterfaceStatsByName().
by Huw Davies 20 Jul '21

20 Jul '21

This should have been part of commit 0b5a6c704c06. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/iphlpapi/ipstats.c | 130 ---------------------------------------- dlls/iphlpapi/ipstats.h | 5 -- 2 files changed, 135 deletions(-) diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index 3cf0e811437..43c481c749f 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -199,16 +199,6 @@ static DWORD kstat_get_ui32( kstat_t *ksp, const char *name ) if (!strcmp( data[i].name, name )) return data[i].value.ui32; return 0; } - -static ULONGLONG kstat_get_ui64( kstat_t *ksp, const char *name ) -{ - unsigned int i; - kstat_named_t *data = ksp->ks_data; - - for (i = 0; i < ksp->ks_ndata; i++) - if (!strcmp( data[i].name, name )) return data[i].value.ui64; - return 0; -} #endif #if defined(HAVE_SYS_TIHDR_H) && defined(T_OPTMGMT_ACK) @@ -286,126 +276,6 @@ static void *read_mib_entry( int fd, int level, int name, int *len ) } #endif /* HAVE_SYS_TIHDR_H && T_OPTMGMT_ACK */ -DWORD getInterfaceStatsByName(const char *name, PMIB_IFROW entry) -{ - DWORD ret = ERROR_NOT_SUPPORTED; - - if (!name || !entry) return ERROR_INVALID_PARAMETER; - -#ifdef __linux__ - { - FILE *fp; - - if ((fp = fopen("/proc/net/dev", "r"))) - { - DWORD skip; - char buf[512], *ptr; - int nameLen = strlen(name); - - while ((ptr = fgets(buf, sizeof(buf), fp))) - { - while (*ptr && isspace(*ptr)) ptr++; - if (_strnicmp(ptr, name, nameLen) == 0 && *(ptr + nameLen) == ':') - { - ptr += nameLen + 1; - sscanf( ptr, "%u %u %u %u %u %u %u %u %u %u %u %u", - &entry->dwInOctets, &entry->dwInUcastPkts, - &entry->dwInErrors, &entry->dwInDiscards, - &skip, &skip, &skip, - &entry->dwInNUcastPkts, &entry->dwOutOctets, - &entry->dwOutUcastPkts, &entry->dwOutErrors, - &entry->dwOutDiscards ); - break; - } - } - fclose(fp); - ret = NO_ERROR; - } - } -#elif defined(HAVE_LIBKSTAT) - { - kstat_ctl_t *kc; - kstat_t *ksp; - - if ((kc = kstat_open()) && - (ksp = kstat_lookup( kc, NULL, -1, (char *)name )) && - kstat_read( kc, ksp, NULL ) != -1 && - ksp->ks_type == KSTAT_TYPE_NAMED) - { - entry->dwMtu = 1500; /* FIXME */ - entry->dwSpeed = min( kstat_get_ui64( ksp, "ifspeed" ), ~0u ); - entry->dwInOctets = kstat_get_ui32( ksp, "rbytes" ); - entry->dwInNUcastPkts = kstat_get_ui32( ksp, "multircv" ); - entry->dwInNUcastPkts += kstat_get_ui32( ksp, "brdcstrcv" ); - entry->dwInUcastPkts = kstat_get_ui32( ksp, "ipackets" ) - entry->dwInNUcastPkts; - entry->dwInDiscards = kstat_get_ui32( ksp, "norcvbuf" ); - entry->dwInErrors = kstat_get_ui32( ksp, "ierrors" ); - entry->dwInUnknownProtos = kstat_get_ui32( ksp, "unknowns" ); - entry->dwOutOctets = kstat_get_ui32( ksp, "obytes" ); - entry->dwOutNUcastPkts = kstat_get_ui32( ksp, "multixmt" ); - entry->dwOutNUcastPkts += kstat_get_ui32( ksp, "brdcstxmt" ); - entry->dwOutUcastPkts = kstat_get_ui32( ksp, "opackets" ) - entry->dwOutNUcastPkts; - entry->dwOutDiscards = 0; /* FIXME */ - entry->dwOutErrors = kstat_get_ui32( ksp, "oerrors" ); - entry->dwOutQLen = kstat_get_ui32( ksp, "noxmtbuf" ); - ret = NO_ERROR; - } - if (kc) kstat_close( kc ); - } -#elif defined(HAVE_SYS_SYSCTL_H) && defined(NET_RT_IFLIST) - { - int mib[] = {CTL_NET, PF_ROUTE, 0, AF_INET, NET_RT_IFLIST, if_nametoindex(name)}; - size_t needed; - char *buf = NULL, *end; - struct if_msghdr *ifm; - struct if_data ifdata; - - if(sysctl(mib, ARRAY_SIZE(mib), NULL, &needed, NULL, 0) == -1) - { - ERR ("failed to get size of iflist\n"); - goto done; - } - buf = HeapAlloc (GetProcessHeap (), 0, needed); - if (!buf) - { - ret = ERROR_OUTOFMEMORY; - goto done; - } - if(sysctl(mib, ARRAY_SIZE(mib), buf, &needed, NULL, 0) == -1) - { - ERR ("failed to get iflist\n"); - goto done; - } - for ( end = buf + needed; buf < end; buf += ifm->ifm_msglen) - { - ifm = (struct if_msghdr *) buf; - if(ifm->ifm_type == RTM_IFINFO) - { - ifdata = ifm->ifm_data; - entry->dwMtu = ifdata.ifi_mtu; - entry->dwSpeed = ifdata.ifi_baudrate; - entry->dwInOctets = ifdata.ifi_ibytes; - entry->dwInErrors = ifdata.ifi_ierrors; - entry->dwInDiscards = ifdata.ifi_iqdrops; - entry->dwInUcastPkts = ifdata.ifi_ipackets; - entry->dwInNUcastPkts = ifdata.ifi_imcasts; - entry->dwOutOctets = ifdata.ifi_obytes; - entry->dwOutUcastPkts = ifdata.ifi_opackets; - entry->dwOutErrors = ifdata.ifi_oerrors; - ret = NO_ERROR; - break; - } - } - done: - HeapFree (GetProcessHeap (), 0, buf); - } -#else - FIXME( "unimplemented\n" ); -#endif - return ret; -} - - /****************************************************************** * GetIcmpStatistics (IPHLPAPI.@) * diff --git a/dlls/iphlpapi/ipstats.h b/dlls/iphlpapi/ipstats.h index 68bcb9c9ad8..bb0c77758f7 100644 --- a/dlls/iphlpapi/ipstats.h +++ b/dlls/iphlpapi/ipstats.h @@ -27,11 +27,6 @@ #include "winbase.h" #include "iprtrmib.h" -/* Fills in entry's interface stats, using name to find them. - * Returns ERROR_INVALID_PARAMETER if name or entry is NULL, NO_ERROR otherwise. - */ -DWORD getInterfaceStatsByName(const char *name, PMIB_IFROW entry) DECLSPEC_HIDDEN; - DWORD build_tcp_table(TCP_TABLE_CLASS, void **, BOOL, HANDLE, DWORD, DWORD *) DECLSPEC_HIDDEN; DWORD build_tcp6_table(TCP_TABLE_CLASS, void **, BOOL, HANDLE, DWORD, DWORD *) DECLSPEC_HIDDEN; DWORD build_udp_table(UDP_TABLE_CLASS, void **, BOOL, HANDLE, DWORD, DWORD *) DECLSPEC_HIDDEN; -- 2.23.0

1 0

[PATCH 02/10] gdi32: Use DC_ATTR for GetCurrentPositionEx implementation.
by Jacek Caban 20 Jul '21

20 Jul '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/dc.c | 13 ------------- dlls/gdi32/gdidc.c | 11 +++++++++++ dlls/gdi32/tests/metafile.c | 3 +++ 3 files changed, 14 insertions(+), 13 deletions(-)

3 3

[PATCH v2 1/2] ndis.sys: Add network adapter information to the registry.
by Haoyang Chen 20 Jul '21

20 Jul '21

Signed-off-by: Haoyang Chen <chenhaoyang(a)uniontech.com> --- dlls/ndis.sys/main.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/dlls/ndis.sys/main.c b/dlls/ndis.sys/main.c index 94c19ffca53..25faf9f7dad 100644 --- a/dlls/ndis.sys/main.c +++ b/dlls/ndis.sys/main.c @@ -123,6 +123,7 @@ static void add_key(const WCHAR *guidstrW, const MIB_IF_ROW2 *netdev) { HKEY card_key; WCHAR keynameW[100]; + HKEY sub_key; swprintf( keynameW, ARRAY_SIZE(keynameW), L"Software\\Microsoft\\Windows NT\\CurrentVersion\\NetworkCards\\%d", netdev->InterfaceIndex ); if (RegCreateKeyExW( HKEY_LOCAL_MACHINE, keynameW, 0, NULL, @@ -132,6 +133,22 @@ static void add_key(const WCHAR *guidstrW, const MIB_IF_ROW2 *netdev) RegSetValueExW( card_key, L"ServiceName", 0, REG_SZ, (BYTE *)guidstrW, (lstrlenW(guidstrW) + 1) * sizeof(WCHAR) ); RegCloseKey( card_key ); } + + swprintf( keynameW, ARRAY_SIZE(keynameW), L"System\\CurrentControlSet\\Control\\Network\\{4D36E972-E325-11CE-BFC1-08002BE10318}"); + if (RegCreateKeyExW( HKEY_LOCAL_MACHINE, keynameW, 0, NULL, + REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &card_key, NULL ) == ERROR_SUCCESS) + { + swprintf( keynameW, ARRAY_SIZE(keynameW), L"%s\\Connection", guidstrW); + if (RegCreateKeyExW( card_key, keynameW, 0, NULL, + REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &sub_key, NULL ) == ERROR_SUCCESS) + { + RegSetValueExW( sub_key, L"Name", 0, REG_SZ, (BYTE *)netdev->Description, (lstrlenW(netdev->Description) + 1) * sizeof(WCHAR) ); + RegSetValueExW( sub_key, L"PnpInstanceID", 0, REG_SZ, (BYTE *)L"PCI\\VEN_8086&DEV_100E&SUBSYS_001E8086&REV_02\\3&267A616A&0&18", + (lstrlenW(L"PCI\\VEN_8086&DEV_100E&SUBSYS_001E8086&REV_02\\3&267A616A&0&18") + 1) * sizeof(WCHAR) ); + RegCloseKey( sub_key ); + } + RegCloseKey( card_key ); + } } static int add_device(DRIVER_OBJECT *driver, const WCHAR *guidstrW, MIB_IF_ROW2 *netdev) -- 2.20.1

1 1

[PATCH 10/10] gdi32: Use NtGdiAngleArc for AngleArc implementation.
by Jacek Caban 19 Jul '21

19 Jul '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/enhmfdrv/dc.c | 14 +------------- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 1 - dlls/gdi32/enhmfdrv/graphics.c | 6 +++--- dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/gdi_private.h | 2 ++ dlls/gdi32/gdidc.c | 15 +++++++++++++++ dlls/gdi32/painting.c | 6 ++---- 7 files changed, 24 insertions(+), 22 deletions(-)

2 1

[PATCH 09/10] gdi32: Use NtGdiRectangle for Rectangle implementation.
by Jacek Caban 19 Jul '21

19 Jul '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/enhmfdrv/dc.c | 14 +------- dlls/gdi32/enhmfdrv/graphics.c | 59 +++++++++++++++++++++------------- dlls/gdi32/gdi_private.h | 3 ++ dlls/gdi32/gdidc.c | 15 +++++++++ dlls/gdi32/mfdrv/graphics.c | 6 ++-- dlls/gdi32/mfdrv/init.c | 2 +- dlls/gdi32/mfdrv/metafiledrv.h | 1 - dlls/gdi32/painting.c | 7 ++-- 8 files changed, 62 insertions(+), 45 deletions(-)

2 1

[PATCH 08/10] gdi32: Use NtGdiRoundRect for RoundRect implementation.
by Jacek Caban 19 Jul '21

19 Jul '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/enhmfdrv/dc.c | 15 +------- dlls/gdi32/enhmfdrv/graphics.c | 62 ++++++++++++++++++++++------------ dlls/gdi32/gdi_private.h | 4 +++ dlls/gdi32/gdidc.c | 22 ++++++++++++ dlls/gdi32/mfdrv/graphics.c | 10 +++--- dlls/gdi32/mfdrv/init.c | 13 ++++++- dlls/gdi32/mfdrv/metafiledrv.h | 4 +-- dlls/gdi32/painting.c | 8 ++--- 8 files changed, 89 insertions(+), 49 deletions(-)

2 1

[PATCH 07/10] gdi32: Use NtGdiEllipse for Ellipse implementation.
by Jacek Caban 19 Jul '21

19 Jul '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/enhmfdrv/dc.c | 14 +------- dlls/gdi32/enhmfdrv/graphics.c | 59 +++++++++++++++++++++------------- dlls/gdi32/gdi_private.h | 3 ++ dlls/gdi32/gdidc.c | 15 +++++++++ dlls/gdi32/mfdrv/graphics.c | 6 ++-- dlls/gdi32/mfdrv/init.c | 11 ++++++- dlls/gdi32/mfdrv/metafiledrv.h | 3 +- dlls/gdi32/painting.c | 7 ++-- 8 files changed, 73 insertions(+), 45 deletions(-)

2 1

[PATCH 06/10] gdi32: Handle EMFs directly in arc functions.
by Jacek Caban 19 Jul '21

19 Jul '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/enhmfdrv/dc.c | 60 +++---------------------------- dlls/gdi32/enhmfdrv/graphics.c | 66 ++++++++++++++++++++++++---------- dlls/gdi32/gdi_private.h | 3 ++ dlls/gdi32/gdidc.c | 28 +++++++++++++++ 4 files changed, 83 insertions(+), 74 deletions(-)

2 1

[PATCH 05/10] gdi32: Store graphics mode in DC_ATTR.
by Jacek Caban 19 Jul '21

19 Jul '21

2 1

[PATCH 04/10] gdi32: Handle EMFs directly in MoveToEx.
by Jacek Caban 19 Jul '21

19 Jul '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/enhmfdrv/dc.c | 13 +------------ dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 1 - dlls/gdi32/enhmfdrv/graphics.c | 7 ++++--- dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/gdi_private.h | 1 + dlls/gdi32/gdidc.c | 4 ++++ 6 files changed, 11 insertions(+), 17 deletions(-)

2 1

[PATCH 03/10] gdi32: Handle EMFs recording directly in LineTo implementation.
by Jacek Caban 19 Jul '21

19 Jul '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- Those are similar to old-style makefiles in a sense that recording is done in user space, rather than kernel space. However, they have an actual special king DC associated and some parts of the implementation (like bounding rect handling) uses driver interface. dlls/gdi32/enhmfdrv/dc.c | 13 +------------ dlls/gdi32/enhmfdrv/graphics.c | 28 +++++++++++++++------------- dlls/gdi32/enhmfdrv/init.c | 1 + dlls/gdi32/gdi_private.h | 12 ++++++++++-- dlls/gdi32/gdidc.c | 16 ++++++++++++++++ dlls/gdi32/objects.c | 2 +- include/ntgdi.h | 1 + 7 files changed, 45 insertions(+), 28 deletions(-)

2 1

[PATCH 01/10] gdi32/tests: Silence noisy traces.
by Jacek Caban 19 Jul '21

19 Jul '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/tests/metafile.c | 112 +++++++++++++++++++++--------------- 1 file changed, 65 insertions(+), 47 deletions(-)

1 0

[PATCH v2 1/4] mshtml: Add stub for HTMLElement classList property.
by Paul Gofman 19 Jul '21

19 Jul '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/mshtml/htmlelem.c | 88 ++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 2 + dlls/mshtml/mshtml_private_iface.idl | 13 ++++ dlls/mshtml/tests/documentmode.js | 1 + 4 files changed, 104 insertions(+) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index b9677ec867a..961e4e79e08 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -6065,6 +6065,8 @@ HRESULT HTMLElement_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) *ppv = &This->IProvideMultipleClassInfo_iface; }else if(IsEqualGUID(&IID_IProvideMultipleClassInfo, riid)) { *ppv = &This->IProvideMultipleClassInfo_iface; + }else if(IsEqualGUID(&IID_IWineHTMLElementPrivate, riid)) { + *ppv = &This->IWineHTMLElementPrivate_iface; }else { return HTMLDOMNode_QI(&This->node, riid, ppv); } @@ -6366,7 +6368,10 @@ void HTMLElement_init_dispex_info(dispex_data_t *info, compat_mode_t mode) } if(mode >= COMPAT_MODE_IE10) + { dispex_info_add_interface(info, IHTMLElement7_tid, NULL); + dispex_info_add_interface(info, IWineHTMLElementPrivate_tid, NULL); + } } static const tid_t HTMLElement_iface_tids[] = { @@ -6390,6 +6395,88 @@ static event_target_vtbl_t HTMLElement_event_target_vtbl = { HTMLElement_set_current_event }; +static inline HTMLElement *impl_from_IWineHTMLElementPrivateVtbl(IWineHTMLElementPrivate *iface) +{ + return CONTAINING_RECORD(iface, HTMLElement, IWineHTMLElementPrivate_iface); +} + +static HRESULT WINAPI htmlelement_private_QueryInterface(IWineHTMLElementPrivate *iface, + REFIID riid, void **ppv) +{ + HTMLElement *This = impl_from_IWineHTMLElementPrivateVtbl(iface); + + return IHTMLElement_QueryInterface(&This->IHTMLElement_iface, riid, ppv); +} + +static ULONG WINAPI htmlelement_private_AddRef(IWineHTMLElementPrivate *iface) +{ + HTMLElement *This = impl_from_IWineHTMLElementPrivateVtbl(iface); + + return IHTMLElement_AddRef(&This->IHTMLElement_iface); +} + +static ULONG WINAPI htmlelement_private_Release(IWineHTMLElementPrivate *iface) +{ + HTMLElement *This = impl_from_IWineHTMLElementPrivateVtbl(iface); + + return IHTMLElement_Release(&This->IHTMLElement_iface); +} + +static HRESULT WINAPI htmlelement_private_GetTypeInfoCount(IWineHTMLElementPrivate *iface, UINT *pctinfo) +{ + HTMLElement *This = impl_from_IWineHTMLElementPrivateVtbl(iface); + + return HTMLElement_GetTypeInfoCount(&This->IHTMLElement_iface, pctinfo); +} + +static HRESULT WINAPI htmlelement_private_GetTypeInfo(IWineHTMLElementPrivate *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + HTMLElement *This = impl_from_IWineHTMLElementPrivateVtbl(iface); + + return HTMLElement_GetTypeInfo(&This->IHTMLElement_iface, iTInfo, lcid, ppTInfo); +} + +static HRESULT WINAPI htmlelement_private_GetIDsOfNames(IWineHTMLElementPrivate *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, + LCID lcid, DISPID *rgDispId) +{ + HTMLElement *This = impl_from_IWineHTMLElementPrivateVtbl(iface); + + return HTMLElement_GetIDsOfNames(&This->IHTMLElement_iface, riid, rgszNames, cNames, lcid, + rgDispId); +} + +static HRESULT WINAPI htmlelement_private_Invoke(IWineHTMLElementPrivate *iface, DISPID dispIdMember, + REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, + VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + HTMLElement *This = impl_from_IWineHTMLElementPrivateVtbl(iface); + + return HTMLElement_Invoke(&This->IHTMLElement_iface, dispIdMember, riid, lcid, wFlags, + pDispParams, pVarResult, pExcepInfo, puArgErr); +} + +static HRESULT WINAPI htmlelement_private_get_classList(IWineHTMLElementPrivate *iface, IDispatch **class_list) +{ + FIXME("iface %p, class_list %p stub.\n", iface, class_list); + + *class_list = NULL; + + return S_OK; +} + +static const IWineHTMLElementPrivateVtbl WineHTMLElementPrivateVtbl = { + htmlelement_private_QueryInterface, + htmlelement_private_AddRef, + htmlelement_private_Release, + htmlelement_private_GetTypeInfoCount, + htmlelement_private_GetTypeInfo, + htmlelement_private_GetIDsOfNames, + htmlelement_private_Invoke, + htmlelement_private_get_classList, +}; + static dispex_static_data_t HTMLElement_dispex = { &HTMLElement_event_target_vtbl.dispex_vtbl, DispHTMLUnknownElement_tid, @@ -6409,6 +6496,7 @@ void HTMLElement_Init(HTMLElement *This, HTMLDocumentNode *doc, nsIDOMElement *n This->IElementSelector_iface.lpVtbl = &ElementSelectorVtbl; This->IElementTraversal_iface.lpVtbl = &ElementTraversalVtbl; This->IProvideMultipleClassInfo_iface.lpVtbl = &ProvideMultipleClassInfoVtbl; + This->IWineHTMLElementPrivate_iface.lpVtbl = &WineHTMLElementPrivateVtbl; if(dispex_data && !dispex_data->vtbl) dispex_data->vtbl = &HTMLElement_event_target_vtbl.dispex_vtbl; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index e2c1f221372..56bef40b4d0 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -273,6 +273,7 @@ typedef struct EventTarget EventTarget; XIID(ISVGTextContentElement) #define PRIVATE_TID_LIST \ + XIID(IWineHTMLElementPrivate) \ XIID(IWineHTMLWindowPrivate) \ XIID(IWineMSHTMLConsole) @@ -828,6 +829,7 @@ typedef struct { IElementSelector IElementSelector_iface; IElementTraversal IElementTraversal_iface; IProvideMultipleClassInfo IProvideMultipleClassInfo_iface; + IWineHTMLElementPrivate IWineHTMLElementPrivate_iface; nsIDOMElement *dom_element; /* NULL for legacy comments represented as HTML elements */ nsIDOMHTMLElement *html_element; /* NULL for non-HTML elements (like SVG elements) */ diff --git a/dlls/mshtml/mshtml_private_iface.idl b/dlls/mshtml/mshtml_private_iface.idl index 6c5c5db991f..9ca7e0d7421 100644 --- a/dlls/mshtml/mshtml_private_iface.idl +++ b/dlls/mshtml/mshtml_private_iface.idl @@ -89,4 +89,17 @@ interface IWineHTMLWindowPrivate : IDispatch HRESULT console([retval, out] IDispatch **console); } +[ + odl, + oleautomation, + dual, + hidden, + uuid(465908fd-f394-489f-b7a3-4c00fbbe9eec) +] +interface IWineHTMLElementPrivate : IDispatch +{ + [propget, id(1)] + HRESULT classList([retval, out] IDispatch **class_list); +} + } /* library MSHTML_private */ diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 859e1fe53db..c20f6ee18df 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -57,6 +57,7 @@ sync_test("elem_props", function() { test_exposed("sheet", v >= 9); test_exposed("readyState", v < 11); test_exposed("styleSheet", v < 11); + test_exposed("classList", v >= 10); }); sync_test("doc_props", function() { -- 2.31.1

3 11

[PATCH 1/4] mshtml: Add stub for HTMLElement classList property.
by Paul Gofman 19 Jul '21

19 Jul '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/mshtml/htmlelem.c | 88 ++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 2 + dlls/mshtml/mshtml_private_iface.idl | 13 ++++ dlls/mshtml/tests/documentmode.js | 1 + 4 files changed, 104 insertions(+) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index b9677ec867a..961e4e79e08 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -6065,6 +6065,8 @@ HRESULT HTMLElement_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) *ppv = &This->IProvideMultipleClassInfo_iface; }else if(IsEqualGUID(&IID_IProvideMultipleClassInfo, riid)) { *ppv = &This->IProvideMultipleClassInfo_iface; + }else if(IsEqualGUID(&IID_IWineHTMLElementPrivate, riid)) { + *ppv = &This->IWineHTMLElementPrivate_iface; }else { return HTMLDOMNode_QI(&This->node, riid, ppv); } @@ -6366,7 +6368,10 @@ void HTMLElement_init_dispex_info(dispex_data_t *info, compat_mode_t mode) } if(mode >= COMPAT_MODE_IE10) + { dispex_info_add_interface(info, IHTMLElement7_tid, NULL); + dispex_info_add_interface(info, IWineHTMLElementPrivate_tid, NULL); + } } static const tid_t HTMLElement_iface_tids[] = { @@ -6390,6 +6395,88 @@ static event_target_vtbl_t HTMLElement_event_target_vtbl = { HTMLElement_set_current_event }; +static inline HTMLElement *impl_from_IWineHTMLElementPrivateVtbl(IWineHTMLElementPrivate *iface) +{ + return CONTAINING_RECORD(iface, HTMLElement, IWineHTMLElementPrivate_iface); +} + +static HRESULT WINAPI htmlelement_private_QueryInterface(IWineHTMLElementPrivate *iface, + REFIID riid, void **ppv) +{ + HTMLElement *This = impl_from_IWineHTMLElementPrivateVtbl(iface); + + return IHTMLElement_QueryInterface(&This->IHTMLElement_iface, riid, ppv); +} + +static ULONG WINAPI htmlelement_private_AddRef(IWineHTMLElementPrivate *iface) +{ + HTMLElement *This = impl_from_IWineHTMLElementPrivateVtbl(iface); + + return IHTMLElement_AddRef(&This->IHTMLElement_iface); +} + +static ULONG WINAPI htmlelement_private_Release(IWineHTMLElementPrivate *iface) +{ + HTMLElement *This = impl_from_IWineHTMLElementPrivateVtbl(iface); + + return IHTMLElement_Release(&This->IHTMLElement_iface); +} + +static HRESULT WINAPI htmlelement_private_GetTypeInfoCount(IWineHTMLElementPrivate *iface, UINT *pctinfo) +{ + HTMLElement *This = impl_from_IWineHTMLElementPrivateVtbl(iface); + + return HTMLElement_GetTypeInfoCount(&This->IHTMLElement_iface, pctinfo); +} + +static HRESULT WINAPI htmlelement_private_GetTypeInfo(IWineHTMLElementPrivate *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + HTMLElement *This = impl_from_IWineHTMLElementPrivateVtbl(iface); + + return HTMLElement_GetTypeInfo(&This->IHTMLElement_iface, iTInfo, lcid, ppTInfo); +} + +static HRESULT WINAPI htmlelement_private_GetIDsOfNames(IWineHTMLElementPrivate *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, + LCID lcid, DISPID *rgDispId) +{ + HTMLElement *This = impl_from_IWineHTMLElementPrivateVtbl(iface); + + return HTMLElement_GetIDsOfNames(&This->IHTMLElement_iface, riid, rgszNames, cNames, lcid, + rgDispId); +} + +static HRESULT WINAPI htmlelement_private_Invoke(IWineHTMLElementPrivate *iface, DISPID dispIdMember, + REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, + VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + HTMLElement *This = impl_from_IWineHTMLElementPrivateVtbl(iface); + + return HTMLElement_Invoke(&This->IHTMLElement_iface, dispIdMember, riid, lcid, wFlags, + pDispParams, pVarResult, pExcepInfo, puArgErr); +} + +static HRESULT WINAPI htmlelement_private_get_classList(IWineHTMLElementPrivate *iface, IDispatch **class_list) +{ + FIXME("iface %p, class_list %p stub.\n", iface, class_list); + + *class_list = NULL; + + return S_OK; +} + +static const IWineHTMLElementPrivateVtbl WineHTMLElementPrivateVtbl = { + htmlelement_private_QueryInterface, + htmlelement_private_AddRef, + htmlelement_private_Release, + htmlelement_private_GetTypeInfoCount, + htmlelement_private_GetTypeInfo, + htmlelement_private_GetIDsOfNames, + htmlelement_private_Invoke, + htmlelement_private_get_classList, +}; + static dispex_static_data_t HTMLElement_dispex = { &HTMLElement_event_target_vtbl.dispex_vtbl, DispHTMLUnknownElement_tid, @@ -6409,6 +6496,7 @@ void HTMLElement_Init(HTMLElement *This, HTMLDocumentNode *doc, nsIDOMElement *n This->IElementSelector_iface.lpVtbl = &ElementSelectorVtbl; This->IElementTraversal_iface.lpVtbl = &ElementTraversalVtbl; This->IProvideMultipleClassInfo_iface.lpVtbl = &ProvideMultipleClassInfoVtbl; + This->IWineHTMLElementPrivate_iface.lpVtbl = &WineHTMLElementPrivateVtbl; if(dispex_data && !dispex_data->vtbl) dispex_data->vtbl = &HTMLElement_event_target_vtbl.dispex_vtbl; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index e2c1f221372..56bef40b4d0 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -273,6 +273,7 @@ typedef struct EventTarget EventTarget; XIID(ISVGTextContentElement) #define PRIVATE_TID_LIST \ + XIID(IWineHTMLElementPrivate) \ XIID(IWineHTMLWindowPrivate) \ XIID(IWineMSHTMLConsole) @@ -828,6 +829,7 @@ typedef struct { IElementSelector IElementSelector_iface; IElementTraversal IElementTraversal_iface; IProvideMultipleClassInfo IProvideMultipleClassInfo_iface; + IWineHTMLElementPrivate IWineHTMLElementPrivate_iface; nsIDOMElement *dom_element; /* NULL for legacy comments represented as HTML elements */ nsIDOMHTMLElement *html_element; /* NULL for non-HTML elements (like SVG elements) */ diff --git a/dlls/mshtml/mshtml_private_iface.idl b/dlls/mshtml/mshtml_private_iface.idl index 6c5c5db991f..9ca7e0d7421 100644 --- a/dlls/mshtml/mshtml_private_iface.idl +++ b/dlls/mshtml/mshtml_private_iface.idl @@ -89,4 +89,17 @@ interface IWineHTMLWindowPrivate : IDispatch HRESULT console([retval, out] IDispatch **console); } +[ + odl, + oleautomation, + dual, + hidden, + uuid(465908fd-f394-489f-b7a3-4c00fbbe9eec) +] +interface IWineHTMLElementPrivate : IDispatch +{ + [propget, id(1)] + HRESULT classList([retval, out] IDispatch **class_list); +} + } /* library MSHTML_private */ diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 859e1fe53db..c20f6ee18df 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -57,6 +57,7 @@ sync_test("elem_props", function() { test_exposed("sheet", v >= 9); test_exposed("readyState", v < 11); test_exposed("styleSheet", v < 11); + test_exposed("classList", v >= 10); }); sync_test("doc_props", function() { -- 2.31.1

3 7

[PATCH v2] kernel32/tests: Allow failure when loading the 268 bytes minimal PE image.
by Francois Gouget 19 Jul '21

19 Jul '21

Windows 10 1809+ rejects this minimal image so allow ERROR_BAD_EXE_FORMAT as a valid result. Also adjust the comment to reflect the range of Windows versions that usually accept this image and note that there are some exceptions which means there are other unidentified factors at play. Wine-Bug: https://bugs.winehq.org//show_bug.cgi?id=51185 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- v2: Fixed v1's comment to match the platforms this test accutally succeeds on. w7u (32-bit Windows 7) rejects this image but not w7pro64. cw-rx460 (64-bit Windows 8.1) also rejects this image but not cw-gtx560, w8 and w864. So this image is sometimes rejected by Windows versions that are expected to accept it without the reason being known. https://test.winehq.org/data/patterns.html#kernel32:loader --- dlls/kernel32/tests/loader.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 1db68a191a3..4ec77670f8c 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -860,7 +860,10 @@ static void test_Loader(void) 0, { ERROR_SUCCESS, ERROR_BAD_EXE_FORMAT } /* vista is more strict */ }, - /* Minimal PE image that Windows7 is able to load: 268 bytes */ + /* Minimal PE image initially created for Windows 7 and accepted from + * Vista up to Windows 10 1709 with some unexplained exceptions: + * 268 bytes + */ { 0x04, 0, 0xf0, /* optional header size just forces 0xf0 bytes to be written, 0 or another number don't change the behaviour, what really @@ -868,7 +871,7 @@ static void test_Loader(void) 0x04 /* also serves as e_lfanew in the truncated MZ header */, 0x04, 0x40, /* minimal image size that Windows7 accepts */ 0, - { ERROR_SUCCESS } + { ERROR_SUCCESS, ERROR_BAD_EXE_FORMAT } /* rejected by win10 1809+ */ }, /* the following data mimics the PE image which 8k demos have */ { 0x04, -- 2.20.1

2 2

RFC: Bugzilla keyword definitions
by Francois Gouget 19 Jul '21

19 Jul '21

I have some issues with the definitions of some Bugzilla keywords. Then they also have a lot of formatting inconsistencies and once we've come to a consensus I have no idea who can make changes (the definitions seem to be stored in some sort of database). Well. Here goes anyway: * testcase | Bugs that have a testcase attached, in source form but not | necessarily integrated into the Wine test suite. The definition does not say what a testcase is. Also, while I totally expect the source for most test cases to be available, I think the keyword should be usable even if the source code is not published. Specifying that the source is available should be the exclusive role of the 'source' keyword. So I would use a definition like: | Bugs where a minimal program dedicated to reproducing the bug, aka | a testcase, has been attached. The testcase need not be integrated | into the Wine test suite. If the source is available (which is | strongly recommended) add the source keyword too. * patch | Bugs in this keyword contain a patch that are waiting for approval. What is a 'patch that is waiting for approval'? Is it a patch which is referenced in https://source.winehq.org/patches/ ? What happens if the patch is rejected? (or drops off the list) Should the patch keyword be removed? What if the patch is in wine-staging? To me the patch keyword should make it possible to identify bugs where someone proposed a potential fix, even if it needs to be refined to be acceptable, may break other applications, etc. Essentially anything that's not a blatant hack that checks the executable filename or replaces a properly implemented function with a stub. So I would use the following definition: | Bugs with this keyword contain a proposed fix. The fix may be | incomplete, break other applications or be otherwise unacceptable as | long as it does fix the symptoms described in the bug and is not a | pure workaround (such as altering Wine's behavior based on the | executable filename, replacing an implemented function with a stub, | etc.). * regression | bugs relating to programs that were working at one time but stoped | working for some reason Except for the obvious typo, capitalization and missing full stop I'm fine with this definition. I take 'programs' to mean applications that users would actually want to use with Wine, not Wine's tests. So maybe the definition could be a bit more explicit: | Bugs relating to applications (excluding Wine's tests) that were | working at one time but stopped working for some reason. * Then there is the related 'Regression SHA1' property. I think it should be ok to use that property to identify the commit causing a bug, whether that bug is a regression or not. First note that only bugs that have the regression *keyword* appear on the regressions page: https://source.winehq.org/regressions So if a commit adds Wine tests that fail the 'regression' keyword is not applicable but I think it would still be valuable to set the "Regression SHA1" field: - The commit message may provide valuable insight into what was on the mind of the developer who wrote the tests. - Such commits can sometimes be a pain to track down when the test has seen a lot of churn. - The commit's author is likely to have insight into the bug. - Setting the 'Regression SHA1' field allows identifying the bugs for which the above information is available. - It also lets the patterns page put links to that commit and reference it as being the source of the test failures. Maybe a better name for 'Regression SHA1' would be something like 'Bad SHA1' or 'Introduced by SHA1'. I'm not sure renaming the field is worth it but the description could be changed from | SHA1 of the git commit that caused the regression. to | SHA1 of the git commit that causes the bug. * hardware | Issues communicating with HW such as serial/parallel/cdrom/usb s/HW/hardware/ + trailing full stop * obfuscation It looks like there is an extra space in "management techniques". * Integration | Bugs related to Wine integration into OS (menu, MIME-types, look) s/integration into OS/integration with the OS/ And I'd even argue that the integration is with the desktop environment (GNOME, KDE, etc) rather than the operating system. * dotnet | Bugs that appear in applications using dotNet and that are related | to this dotNet usage instead of being independent bugs. s/dotNet/.NET/g * The definitions for the following keywords also have formatting issues. Either the capitalization is wrong, or the trailing full stop is missing, or both: Abandoned? hardware integration localization performance source valgrind -- Francois Gouget <fgouget(a)free.fr> http://fgouget.free.fr/ Theory is where you know everything but nothing works. Practice is where everything works but nobody knows why. Sometimes they go hand in hand: nothing works and nobody knows why.

9 19

[PATCH] winetest: Create the -d directory if it does not exist already.
by Francois Gouget 19 Jul '21

19 Jul '21

'winetest.exe' automatically creates '%TEMP%\wct' (or an alternative new directory). 'winetext.exe -x DIR' automatically creates DIR. 'winetest.exe -d DIR' now automatically creates DIR too. In all cases newly created directories are removed after the tests. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- programs/winetest/main.c | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 81c7de2a020..fa773e28d4f 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -1024,6 +1024,7 @@ run_tests (char *logname, char *outdir) DWORD strsize; SECURITY_ATTRIBUTES sa; char tmppath[MAX_PATH], tempdir[MAX_PATH+4]; + BOOL newdir; DWORD needed; HMODULE kernel32; @@ -1064,22 +1065,23 @@ run_tests (char *logname, char *outdir) if (logfile == INVALID_HANDLE_VALUE) report (R_FATAL, "Could not open logfile: %u", GetLastError()); - /* try stable path for ZoneAlarm */ - if (!outdir) { + if (outdir) + strcpy( tempdir, outdir); + else + { strcpy( tempdir, tmppath ); - strcat( tempdir, "wct" ); - - if (!CreateDirectoryA( tempdir, NULL )) - { - if (!GetTempFileNameA( tmppath, "wct", 0, tempdir )) - report (R_FATAL, "Can't name temporary dir (check %%TEMP%%)."); - DeleteFileA( tempdir ); - if (!CreateDirectoryA( tempdir, NULL )) - report (R_FATAL, "Could not create directory: %s", tempdir); - } + strcat( tempdir, "wct" ); /* try stable path for ZoneAlarm */ } - else - strcpy( tempdir, outdir); + newdir = CreateDirectoryA( tempdir, NULL ); + if (!newdir && !outdir) + { + if (!GetTempFileNameA( tmppath, "wct", 0, tempdir )) + report (R_FATAL, "Can't name temporary dir (check %%TEMP%%)."); + DeleteFileA( tempdir ); + newdir = CreateDirectoryA( tempdir, NULL ); + } + if (!newdir && (!outdir || GetLastError() != ERROR_ALREADY_EXISTS)) + report (R_FATAL, "Could not create directory %s (%d)", tempdir, GetLastError()); report (R_DIR, tempdir); @@ -1172,7 +1174,7 @@ run_tests (char *logname, char *outdir) report (R_STATUS, "Cleaning up - %u failures", failures); CloseHandle( logfile ); logfile = 0; - if (!outdir) + if (newdir) remove_dir (tempdir); heap_free(wine_tests); heap_free(curpath); -- 2.20.1

1 0

[PATCH] secur32: Set error flag on pull callback.
by Alistair Leslie-Hughes 19 Jul '21

19 Jul '21

Fixes a regression introduced in b8aaf86b2dbb8ecb3f7094cc40a0df89bb2add27 The poll function currently always returns 0 which signals to gnutls that no data is available. We should return -1 and set the the transport error to try again. Wine-bug: https://bugs.winehq.org/show_bug.cgi?id=51440 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/secur32/schannel_gnutls.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index bcf38e3f23f..3ed0fbea16e 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -292,7 +292,12 @@ static DWORD CDECL schan_get_enabled_protocols(void) static int pull_timeout(gnutls_transport_ptr_t transport, unsigned int timeout) { - return 0; + struct schan_transport *t = (struct schan_transport*)transport; + gnutls_session_t s = (gnutls_session_t)callbacks->get_session_for_transport(t); + + TRACE("\n"); + pgnutls_transport_set_errno(s, EAGAIN); + return -1; } static BOOL CDECL schan_create_session(schan_session *session, schan_credentials *cred) -- 2.30.2

2 1

[PATCH] kernel32/tests: Test whether console color attributes are copied to new screen buffers
by Hugh McMaster 19 Jul '21

19 Jul '21

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- dlls/kernel32/tests/console.c | 81 +++++++++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 918ecac8ac4..b1d2465c5ea 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -973,6 +973,86 @@ static void testScreenBuffer(HANDLE hConOut) SetConsoleOutputCP(oldcp); } +static void test_new_screen_buffer_color_attributes(HANDLE hConOut) +{ + CONSOLE_SCREEN_BUFFER_INFOEX csbi, csbi2; + BOOL ret; + HANDLE hConOut2; + WORD orig_attr, orig_popup, attr; + + csbi.cbSize = csbi2.cbSize = sizeof(CONSOLE_SCREEN_BUFFER_INFOEX); + + ret = GetConsoleScreenBufferInfoEx(hConOut, &csbi); + ok(ret, "GetConsoleScreenBufferInfoEx failed: error %u\n", GetLastError()); + orig_attr = csbi.wAttributes; + orig_popup = csbi.wPopupAttributes; + trace("Character Attributes: %#x, Popup Attributes: %#x\n", orig_attr, orig_popup); + hConOut2 = CreateConsoleScreenBuffer(GENERIC_READ|GENERIC_WRITE, 0, NULL, + CONSOLE_TEXTMODE_BUFFER, NULL); + ok(hConOut2 != INVALID_HANDLE_VALUE, "CreateConsoleScreenBuffer failed: error %u\n", GetLastError()); + + ret = GetConsoleScreenBufferInfoEx(hConOut2, &csbi2); + ok(ret, "GetConsoleScreenBufferInfoEx failed: error %u\n", GetLastError()); + + todo_wine ok(csbi2.wAttributes == orig_attr, "Character Attributes should have been copied: " + "got %#x, expected %#x\n", csbi2.wAttributes, orig_attr); + todo_wine ok(csbi2.wPopupAttributes != orig_popup, "Popup Attributes should not match original value\n"); + todo_wine ok(csbi2.wPopupAttributes == orig_attr, "Popup Attributes should match Character Attributes\n"); + + CloseHandle(hConOut2); + + /* Test different Character Attributes */ + attr = FOREGROUND_BLUE|BACKGROUND_GREEN; + ret = SetConsoleTextAttribute(hConOut, attr); + ok(ret, "SetConsoleTextAttribute failed: error %u\n", GetLastError()); + + hConOut2 = CreateConsoleScreenBuffer(GENERIC_READ|GENERIC_WRITE, 0, NULL, + CONSOLE_TEXTMODE_BUFFER, NULL); + ok(hConOut2 != INVALID_HANDLE_VALUE, "CreateConsoleScreenBuffer failed: error %u\n", GetLastError()); + + memset(&csbi2, 0, sizeof(CONSOLE_SCREEN_BUFFER_INFOEX)); + csbi2.cbSize = sizeof(CONSOLE_SCREEN_BUFFER_INFOEX); + + ret = GetConsoleScreenBufferInfoEx(hConOut2, &csbi2); + ok(ret, "GetConsoleScreenBufferInfoEx failed: error %u\n", GetLastError()); + + todo_wine ok(csbi2.wAttributes == attr, "Character Attributes should have been copied: " + "got %#x, expected %#x\n", csbi2.wAttributes, attr); + todo_wine ok(csbi2.wPopupAttributes != orig_popup, "Popup Attributes should not match original value\n"); + todo_wine ok(csbi2.wPopupAttributes == attr, "Popup Attributes should match Character Attributes\n"); + + CloseHandle(hConOut2); + + ret = SetConsoleTextAttribute(hConOut, orig_attr); + ok(ret, "SetConsoleTextAttribute failed: error %u\n", GetLastError()); + + /* Test inheritance of different Popup Attributes */ + csbi.wPopupAttributes = attr; + ret = SetConsoleScreenBufferInfoEx(hConOut, &csbi); + ok(ret, "SetConsoleScreenBufferInfoEx failed: error %u\n", GetLastError()); + + hConOut2 = CreateConsoleScreenBuffer(GENERIC_READ|GENERIC_WRITE, 0, NULL, + CONSOLE_TEXTMODE_BUFFER, NULL); + ok(hConOut2 != INVALID_HANDLE_VALUE, "CreateConsoleScreenBuffer failed: error %u\n", GetLastError()); + + memset(&csbi2, 0, sizeof(CONSOLE_SCREEN_BUFFER_INFOEX)); + csbi2.cbSize = sizeof(CONSOLE_SCREEN_BUFFER_INFOEX); + + ret = GetConsoleScreenBufferInfoEx(hConOut2, &csbi2); + ok(ret, "GetConsoleScreenBufferInfoEx failed: error %u\n", GetLastError()); + + todo_wine ok(csbi2.wAttributes == orig_attr, "Character Attributes should have been copied: " + "got %#x, expected %#x\n", csbi2.wAttributes, orig_attr); + todo_wine ok(csbi2.wPopupAttributes != orig_popup, "Popup Attributes should not match original value\n"); + todo_wine ok(csbi2.wPopupAttributes == orig_attr, "Popup Attributes should match Character Attributes\n"); + + CloseHandle(hConOut2); + + csbi.wPopupAttributes = orig_popup; + ret = SetConsoleScreenBufferInfoEx(hConOut, &csbi); + ok(ret, "SetConsoleScreenBufferInfoEx failed: error %u\n", GetLastError()); +} + static void CALLBACK signaled_function(void *p, BOOLEAN timeout) { HANDLE event = p; @@ -4506,6 +4586,7 @@ START_TEST(console) testScroll(hConOut, sbi.dwSize); /* will test sb creation / modification / codepage handling */ if (!test_current) testScreenBuffer(hConOut); + test_new_screen_buffer_color_attributes(hConOut); /* Test waiting for a console handle */ testWaitForConsoleInput(hConIn); test_wait(hConIn, hConOut); -- 2.32.0

2 2

[PATCH] ntdll: Add stub for ProcessInstrumentationCallback info class in NtSetInformationProcess().
by Paul Gofman 19 Jul '21

19 Jul '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ntdll/tests/info.c | 27 +++++++++++++++++++++++++++ dlls/ntdll/unix/process.c | 11 +++++++++++ include/winternl.h | 7 +++++++ 3 files changed, 45 insertions(+) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index c873a224a7c..40e01917d9a 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -3232,6 +3232,32 @@ static void test_debug_object(void) ok( event.u.LoadDll.fUnicode == TRUE, "event not updated %x\n", event.u.LoadDll.fUnicode ); } +static void test_process_instrumentation_callback(void) +{ + PROCESS_INSTRUMENTATION_CALLBACK_INFORMATION info; + NTSTATUS status; + + status = NtSetInformationProcess( GetCurrentProcess(), ProcessInstrumentationCallback, NULL, 0 ); + ok( status == STATUS_INFO_LENGTH_MISMATCH /* Win10 */ || status == STATUS_INVALID_INFO_CLASS + || status == STATUS_NOT_SUPPORTED, "Got unexpected status %#x.\n", status ); + if (status != STATUS_INFO_LENGTH_MISMATCH) + { + win_skip( "ProcessInstrumentationCallback is not supported.\n" ); + return; + } + + memset(&info, 0, sizeof(info)); + status = NtSetInformationProcess( GetCurrentProcess(), ProcessInstrumentationCallback, &info, sizeof(info) ); + ok( status == STATUS_SUCCESS /* Win 10 */ || broken( status == STATUS_PRIVILEGE_NOT_HELD ) + || broken( status == STATUS_INFO_LENGTH_MISMATCH ), "Got unexpected status %#x.\n", status ); + + memset(&info, 0, sizeof(info)); + status = NtSetInformationProcess( GetCurrentProcess(), ProcessInstrumentationCallback, &info, 2 * sizeof(info) ); + ok( status == STATUS_SUCCESS || status == STATUS_INFO_LENGTH_MISMATCH + || broken( status == STATUS_PRIVILEGE_NOT_HELD ) /* some versions and machines before Win10 */, + "Got unexpected status %#x.\n", status ); +} + START_TEST(info) { char **argv; @@ -3298,4 +3324,5 @@ START_TEST(info) test_NtGetCurrentProcessorNumber(); test_ThreadEnableAlignmentFaultFixup(); + test_process_instrumentation_callback(); } diff --git a/dlls/ntdll/unix/process.c b/dlls/ntdll/unix/process.c index 77fb81fe404..141720565dc 100644 --- a/dlls/ntdll/unix/process.c +++ b/dlls/ntdll/unix/process.c @@ -1507,6 +1507,17 @@ NTSTATUS WINAPI NtSetInformationProcess( HANDLE handle, PROCESSINFOCLASS class, break; } + case ProcessInstrumentationCallback: + { + PROCESS_INSTRUMENTATION_CALLBACK_INFORMATION *instr = info; + + FIXME( "ProcessInstrumentationCallback stub.\n" ); + + if (size < sizeof(*instr)) return STATUS_INFO_LENGTH_MISMATCH; + ret = STATUS_SUCCESS; + break; + } + case ProcessWineMakeProcessSystem: if (size != sizeof(HANDLE *)) return STATUS_INFO_LENGTH_MISMATCH; SERVER_START_REQ( make_process_system ) diff --git a/include/winternl.h b/include/winternl.h index f832729f985..a97cfdf0231 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1472,6 +1472,13 @@ typedef struct _FILE_IO_COMPLETION_NOTIFICATION_INFORMATION { #define FILE_SKIP_SET_EVENT_ON_HANDLE 0x2 #define FILE_SKIP_SET_USER_EVENT_ON_FAST_IO 0x4 +typedef struct _PROCESS_INSTRUMENTATION_CALLBACK_INFORMATION +{ + ULONG Version; + ULONG Reserved; + VOID *Callback; +} PROCESS_INSTRUMENTATION_CALLBACK_INFORMATION, *PPROCESS_INSTRUMENTATION_CALLBACK_INFORMATION; + typedef enum _FSINFOCLASS { FileFsVolumeInformation = 1, FileFsLabelInformation, -- 2.31.1

1 0

[PATCH] ntdll: Add SystemKernelDebuggerInformationEx info class to NtQuerySystemInformation().
by Paul Gofman 19 Jul '21

19 Jul '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ntdll/tests/info.c | 24 ++++++++++++++++++++++++ dlls/ntdll/unix/system.c | 18 ++++++++++++++++++ include/winternl.h | 6 ++++++ 3 files changed, 48 insertions(+) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index c873a224a7c..85e27e92663 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -979,6 +979,7 @@ static void test_query_kerndebug(void) { NTSTATUS status; ULONG ReturnLength; + SYSTEM_KERNEL_DEBUGGER_INFORMATION_EX skdi_ex; SYSTEM_KERNEL_DEBUGGER_INFORMATION skdi; status = pNtQuerySystemInformation(SystemKernelDebuggerInformation, &skdi, 0, &ReturnLength); @@ -991,6 +992,29 @@ static void test_query_kerndebug(void) status = pNtQuerySystemInformation(SystemKernelDebuggerInformation, &skdi, sizeof(skdi) + 2, &ReturnLength); ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); ok( sizeof(skdi) == ReturnLength, "Inconsistent length %d\n", ReturnLength); + + status = pNtQuerySystemInformation(SystemKernelDebuggerInformationEx, &skdi_ex, 0, &ReturnLength); + ok( status == STATUS_INFO_LENGTH_MISMATCH + || status == STATUS_NOT_IMPLEMENTED /* before win7 */ + || status == STATUS_INVALID_INFO_CLASS /* wow64 on Win10 */, + "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status); + + if (status != STATUS_INFO_LENGTH_MISMATCH) + { + win_skip( "NtQuerySystemInformation(SystemKernelDebuggerInformationEx) is not implemented.\n" ); + } + else + { + status = pNtQuerySystemInformation(SystemKernelDebuggerInformationEx, &skdi_ex, + sizeof(skdi_ex), &ReturnLength); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); + ok( sizeof(skdi_ex) == ReturnLength, "Inconsistent length %d\n", ReturnLength); + + status = pNtQuerySystemInformation(SystemKernelDebuggerInformationEx, &skdi_ex, + sizeof(skdi_ex) + 2, &ReturnLength); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); + ok( sizeof(skdi_ex) == ReturnLength, "Inconsistent length %d\n", ReturnLength); + } } static void test_query_regquota(void) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index 596eea251b6..5efb99aaf17 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -2595,6 +2595,24 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, break; } + case SystemKernelDebuggerInformationEx: + { + SYSTEM_KERNEL_DEBUGGER_INFORMATION_EX skdi; + + skdi.DebuggerAllowed = FALSE; + skdi.DebuggerEnabled = FALSE; + skdi.DebuggerPresent = FALSE; + + len = sizeof(skdi); + if (size >= len) + { + if (!info) ret = STATUS_ACCESS_VIOLATION; + else memcpy( info, &skdi, len ); + } + else ret = STATUS_INFO_LENGTH_MISMATCH; + break; + } + case SystemRegistryQuotaInformation: /* 37 */ { /* Something to do with the size of the registry * diff --git a/include/winternl.h b/include/winternl.h index f832729f985..c632328b322 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2485,6 +2485,12 @@ typedef struct _SYSTEM_KERNEL_DEBUGGER_INFORMATION { BOOLEAN DebuggerNotPresent; } SYSTEM_KERNEL_DEBUGGER_INFORMATION, *PSYSTEM_KERNEL_DEBUGGER_INFORMATION; +typedef struct _SYSTEM_KERNEL_DEBUGGER_INFORMATION_EX { + BOOLEAN DebuggerAllowed; + BOOLEAN DebuggerEnabled; + BOOLEAN DebuggerPresent; +} SYSTEM_KERNEL_DEBUGGER_INFORMATION_EX, *PSYSTEM_KERNEL_DEBUGGER_INFORMATION_EX; + typedef struct _VM_COUNTERS { SIZE_T PeakVirtualSize; -- 2.31.1

1 0

[PATCH] mouse.c: Ensure mouse does not get stuck after grab release.
by Mark Redmann 19 Jul '21

19 Jul '21

1 0

Re: [PATCH] wineboot: Add network adapter information to the registry.
by Huw Davies 19 Jul '21

19 Jul '21

On Mon, Jul 19, 2021 at 03:39:16PM +0800, Haoyang Chen wrote: > 在 2021/7/19 下午3:16, Huw Davies 写道: > > We're already adding some network card keys in ndis.sys, so probably > > this should go there instead of wineboot. > > > > Also, which is these does the app you're looking at actually need? I > > don't see DefaultNameIndex and DefaultNameResourceId in my Windows 10 > > VM and don't see PnpInstanceID on many of the adaptors in my Windows 7 > > VM. > > > > Huw. > > > Hi, > > There is an application which needs to query the "real" MAC address. > > It first enumerates all the MAC addresses through the GetAdaptersInfo() > > function, and then goes to the registry to look up the PnpInstanceID > > value of the corresponding network card. Ok, so we don't need the DefaultName* values. > It does not query the ndis.sys key. I'm not sure why you mention this. I was simply suggesting moving the creation of these keys to ndis.sys, so that all of this stuff is in the same place. Since we need the PnpInstanceID value, that should set in ndis.sys and then wbemprox should be changed to read it from the registry. Huw.

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel