- wine-devel - winehq.org

[PATCH 1/5] d2d1: Use D3D11 interfaces to create rasterizer state.
by Rémi Bernon 28 Jun '21

28 Jun '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49395 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/d2d1/d2d1_private.h | 2 +- dlls/d2d1/device.c | 22 +++++++++++++++------- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 73259835786..0915bc55cfd 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -172,7 +172,7 @@ struct d2d_device_context ID3D11Buffer *ib; unsigned int vb_stride; ID3D11Buffer *vb; - ID3D10RasterizerState *rs; + ID3D11RasterizerState *rs; ID3D10BlendState *bs; ID3D10SamplerState *sampler_states [D2D_SAMPLER_INTERPOLATION_MODE_COUNT] diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index efeeaf6aa18..0a0e9f5bbe6 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -125,6 +125,7 @@ static void d2d_device_context_draw(struct d2d_device_context *render_target, en ID3D10Device *device = render_target->d3d_device; ID3D10Buffer *d3d10_ib = NULL, *d3d10_vb = NULL, *d3d10_vs_cb = NULL, *d3d10_ps_cb = NULL; ID3D11Buffer *vs_cb = render_target->vs_cb, *ps_cb = render_target->ps_cb; + ID3D10RasterizerState *d3d10_rs = NULL; ID3D10VertexShader *d3d10_vs = NULL; ID3D10PixelShader *d3d10_ps = NULL; ID3D10InputLayout *d3d10_il = NULL; @@ -182,6 +183,12 @@ static void d2d_device_context_draw(struct d2d_device_context *render_target, en goto error; } + if (render_target->rs && FAILED(hr = ID3D11RasterizerState_QueryInterface(render_target->rs, &IID_ID3D10RasterizerState, (void **)&d3d10_rs))) + { + ERR("Failed to query D3D10 rasterizer state, hr %#x.\n", hr); + goto error; + } + if (FAILED(hr = render_target->stateblock->lpVtbl->Capture(render_target->stateblock))) { WARN("Failed to capture stateblock, hr %#x.\n", hr); @@ -218,7 +225,7 @@ static void d2d_device_context_draw(struct d2d_device_context *render_target, en scissor_rect.bottom = render_target->pixel_size.height; } ID3D10Device_RSSetScissorRects(device, 1, &scissor_rect); - ID3D10Device_RSSetState(device, render_target->rs); + ID3D10Device_RSSetState(device, d3d10_rs); ID3D10Device_OMSetRenderTargets(device, 1, &render_target->target->rtv, NULL); if (brush) { @@ -237,6 +244,7 @@ static void d2d_device_context_draw(struct d2d_device_context *render_target, en WARN("Failed to apply stateblock, hr %#x.\n", hr); error: + if (d3d10_rs) ID3D10RasterizerState_Release(d3d10_rs); if (d3d10_ps) ID3D10PixelShader_Release(d3d10_ps); if (d3d10_vs) ID3D10VertexShader_Release(d3d10_vs); if (d3d10_il) ID3D10InputLayout_Release(d3d10_il); @@ -318,7 +326,7 @@ static ULONG STDMETHODCALLTYPE d2d_device_context_inner_Release(IUnknown *iface) IDWriteRenderingParams_Release(context->text_rendering_params); if (context->bs) ID3D10BlendState_Release(context->bs); - ID3D10RasterizerState_Release(context->rs); + ID3D11RasterizerState_Release(context->rs); ID3D11Buffer_Release(context->vb); ID3D11Buffer_Release(context->ib); ID3D11Buffer_Release(context->ps_cb); @@ -2859,7 +2867,7 @@ static HRESULT d2d_device_context_init(struct d2d_device_context *render_target, D3D10_STATE_BLOCK_MASK state_mask; struct d2d_device *device_impl; IDWriteFactory *dwrite_factory; - D3D10_RASTERIZER_DESC rs_desc; + D3D11_RASTERIZER_DESC rs_desc; D3D11_BUFFER_DESC buffer_desc; unsigned int i; HRESULT hr; @@ -4033,8 +4041,8 @@ static HRESULT d2d_device_context_init(struct d2d_device_context *render_target, goto err; } - rs_desc.FillMode = D3D10_FILL_SOLID; - rs_desc.CullMode = D3D10_CULL_NONE; + rs_desc.FillMode = D3D11_FILL_SOLID; + rs_desc.CullMode = D3D11_CULL_NONE; rs_desc.FrontCounterClockwise = FALSE; rs_desc.DepthBias = 0; rs_desc.DepthBiasClamp = 0.0f; @@ -4043,7 +4051,7 @@ static HRESULT d2d_device_context_init(struct d2d_device_context *render_target, rs_desc.ScissorEnable = TRUE; rs_desc.MultisampleEnable = FALSE; rs_desc.AntialiasedLineEnable = FALSE; - if (FAILED(hr = ID3D10Device_CreateRasterizerState(render_target->d3d_device, &rs_desc, &render_target->rs))) + if (FAILED(hr = ID3D11Device1_CreateRasterizerState(render_target->d3d11_device, &rs_desc, &render_target->rs))) { WARN("Failed to create clear rasterizer state, hr %#x.\n", hr); goto err; @@ -4082,7 +4090,7 @@ err: if (render_target->default_text_rendering_params) IDWriteRenderingParams_Release(render_target->default_text_rendering_params); if (render_target->rs) - ID3D10RasterizerState_Release(render_target->rs); + ID3D11RasterizerState_Release(render_target->rs); if (render_target->vb) ID3D11Buffer_Release(render_target->vb); if (render_target->ib) -- 2.32.0

4 11

[PATCH] wined3d: Avoid ending the renderpass when issuing a query.
by Jan Sikorski 28 Jun '21

28 Jun '21

Allocate a fresh query index that does not need to be reset. Reset query pools at creation and when the render pass is ended. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> --- dlls/wined3d/context_vk.c | 19 +++++++++++--- dlls/wined3d/query.c | 47 ++++++++++++++++++++++++++-------- dlls/wined3d/wined3d_private.h | 6 ++++- 3 files changed, 57 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 43b806a19b5..8b20fd3f779 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -1282,12 +1282,11 @@ VkRenderPass wined3d_context_vk_get_render_pass(struct wined3d_context_vk *conte void wined3d_context_vk_end_current_render_pass(struct wined3d_context_vk *context_vk) { + VkCommandBuffer vk_command_buffer = context_vk->current_command_buffer.vk_command_buffer; const struct wined3d_vk_info *vk_info = context_vk->vk_info; - VkCommandBuffer vk_command_buffer; if (context_vk->vk_render_pass) { - vk_command_buffer = context_vk->current_command_buffer.vk_command_buffer; VK_CALL(vkCmdEndRenderPass(vk_command_buffer)); context_vk->vk_render_pass = VK_NULL_HANDLE; VK_CALL(vkCmdPipelineBarrier(vk_command_buffer, VK_PIPELINE_STAGE_ALL_GRAPHICS_BIT, @@ -1300,6 +1299,15 @@ void wined3d_context_vk_end_current_render_pass(struct wined3d_context_vk *conte context_vk->vk_framebuffer, context_vk->current_command_buffer.id); context_vk->vk_framebuffer = VK_NULL_HANDLE; } + + while (!list_empty(&context_vk->dirty_query_pools)) + { + struct wined3d_query_pool_vk *pool_vk = LIST_ENTRY(list_head(&context_vk->dirty_query_pools), + struct wined3d_query_pool_vk, dirty_entry); + list_remove(&pool_vk->dirty_entry); + list_init(&pool_vk->dirty_entry); + wined3d_query_pool_vk_reset(pool_vk, context_vk, vk_command_buffer); + } } static void wined3d_context_vk_destroy_render_pass(struct wine_rb_entry *entry, void *ctx) @@ -1330,6 +1338,7 @@ static void wined3d_context_vk_destroy_query_pools(struct wined3d_context_vk *co bool wined3d_context_vk_allocate_query(struct wined3d_context_vk *context_vk, enum wined3d_query_type type, struct wined3d_query_pool_idx_vk *pool_idx) { + const struct wined3d_vk_info *vk_info = context_vk->vk_info; struct wined3d_query_pool_vk *pool_vk, *entry; struct list *free_pools; size_t idx; @@ -1376,6 +1385,10 @@ bool wined3d_context_vk_allocate_query(struct wined3d_context_vk *context_vk, return false; } + wined3d_context_vk_end_current_render_pass(context_vk); + VK_CALL(vkCmdResetQueryPool(wined3d_context_vk_get_command_buffer(context_vk), + pool_vk->vk_query_pool, 0, WINED3D_QUERY_POOL_SIZE)); + if (!wined3d_query_pool_vk_allocate_query(pool_vk, &idx)) { wined3d_query_pool_vk_cleanup(pool_vk, context_vk); @@ -1449,7 +1462,6 @@ void wined3d_context_vk_remove_pending_queries(struct wined3d_context_vk *contex { if (p->query_vk != query_vk && !wined3d_query_vk_accumulate_data(p->query_vk, context_vk, &p->pool_idx)) continue; - wined3d_query_pool_vk_free_query(p->pool_idx.pool_vk, p->pool_idx.idx); --p->query_vk->pending_count; } @@ -3390,6 +3402,7 @@ HRESULT wined3d_context_vk_init(struct wined3d_context_vk *context_vk, struct wi wined3d_context_vk_init_graphics_pipeline_key(context_vk); list_init(&context_vk->active_queries); + list_init(&context_vk->dirty_query_pools); list_init(&context_vk->free_occlusion_query_pools); list_init(&context_vk->free_timestamp_query_pools); list_init(&context_vk->free_pipeline_statistics_query_pools); diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 81f5ba7d0d7..8c135f09c0a 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -1348,12 +1348,12 @@ HRESULT wined3d_query_gl_create(struct wined3d_device *device, enum wined3d_quer } } -void wined3d_query_pool_vk_free_query(struct wined3d_query_pool_vk *pool_vk, size_t idx) +static void wined3d_query_pool_vk_mark_complete(struct wined3d_query_pool_vk *pool_vk, size_t idx, + struct wined3d_context_vk *context_vk) { - wined3d_bitmap_clear(pool_vk->allocated, idx); - - if (list_empty(&pool_vk->entry)) - list_add_tail(pool_vk->free_list, &pool_vk->entry); + wined3d_bitmap_set(pool_vk->completed, idx); + if (list_empty(&pool_vk->dirty_entry)) + list_add_tail(&context_vk->dirty_query_pools, &pool_vk->dirty_entry); } bool wined3d_query_pool_vk_allocate_query(struct wined3d_query_pool_vk *pool_vk, size_t *idx) @@ -1372,6 +1372,29 @@ void wined3d_query_pool_vk_cleanup(struct wined3d_query_pool_vk *pool_vk, struct VK_CALL(vkDestroyQueryPool(device_vk->vk_device, pool_vk->vk_query_pool, NULL)); list_remove(&pool_vk->entry); + list_remove(&pool_vk->dirty_entry); +} + +void wined3d_query_pool_vk_reset(struct wined3d_query_pool_vk *pool_vk, struct wined3d_context_vk *context_vk, + VkCommandBuffer vk_command_buffer) +{ + const struct wined3d_vk_info *vk_info = context_vk->vk_info; + unsigned int start = 0, idx; + struct wined3d_range range; + + for (;;) + { + if (!wined3d_bitmap_get_range(pool_vk->completed, WINED3D_QUERY_POOL_SIZE, start, &range)) + break; + + VK_CALL(vkCmdResetQueryPool(vk_command_buffer, pool_vk->vk_query_pool, range.offset, range.size)); + start = range.offset + range.size; + for (idx = range.offset; idx < start; ++idx) + wined3d_bitmap_clear(pool_vk->allocated, idx); + } + memset(pool_vk->completed, 0, sizeof(pool_vk->completed)); + if (list_empty(&pool_vk->entry)) + list_add_tail(pool_vk->free_list, &pool_vk->entry); } bool wined3d_query_pool_vk_init(struct wined3d_query_pool_vk *pool_vk, @@ -1383,6 +1406,7 @@ bool wined3d_query_pool_vk_init(struct wined3d_query_pool_vk *pool_vk, VkResult vr; list_init(&pool_vk->entry); + list_init(&pool_vk->dirty_entry); pool_vk->free_list = free_pools; pool_info.sType = VK_STRUCTURE_TYPE_QUERY_POOL_CREATE_INFO; @@ -1468,6 +1492,8 @@ bool wined3d_query_vk_accumulate_data(struct wined3d_query_vk *query_vk, if (vr == VK_NOT_READY) return false; + wined3d_query_pool_vk_mark_complete(pool_idx->pool_vk, pool_idx->idx, context_vk); + result = (void *)query_vk->q.data; switch (query_vk->q.type) { @@ -1519,8 +1545,7 @@ static void wined3d_query_vk_begin(struct wined3d_query_vk *query_vk, struct wined3d_query_pool_vk *pool_vk; size_t idx; - if (!query_vk->pool_idx.pool_vk - && !wined3d_context_vk_allocate_query(context_vk, query_vk->q.type, &query_vk->pool_idx)) + if (!wined3d_context_vk_allocate_query(context_vk, query_vk->q.type, &query_vk->pool_idx)) { ERR("Failed to allocate new query.\n"); return; @@ -1528,7 +1553,6 @@ static void wined3d_query_vk_begin(struct wined3d_query_vk *query_vk, pool_vk = query_vk->pool_idx.pool_vk; idx = query_vk->pool_idx.idx; - VK_CALL(vkCmdResetQueryPool(vk_command_buffer, pool_vk->vk_query_pool, idx, 1)); if (query_vk->q.type >= WINED3D_QUERY_TYPE_SO_STATISTICS_STREAM1 && query_vk->q.type <= WINED3D_QUERY_TYPE_SO_STATISTICS_STREAM3) VK_CALL(vkCmdBeginQueryIndexedEXT(vk_command_buffer, pool_vk->vk_query_pool, idx, @@ -1599,6 +1623,7 @@ static BOOL wined3d_query_vk_poll(struct wined3d_query *query, uint32_t flags) if (query_vk->pool_idx.pool_vk && !wined3d_query_vk_accumulate_data(query_vk, context_vk, &query_vk->pool_idx)) goto unavailable; + query_vk->pool_idx.pool_vk = NULL; context_release(&context_vk->c); return TRUE; @@ -1622,7 +1647,6 @@ static BOOL wined3d_query_vk_issue(struct wined3d_query *query, uint32_t flags) { context_vk = wined3d_context_vk(context_acquire(&device_vk->d, NULL, 0)); - wined3d_context_vk_end_current_render_pass(context_vk); list_remove(&query_vk->entry); if (query_vk->pending_count) wined3d_context_vk_remove_pending_queries(context_vk, query_vk); @@ -1633,6 +1657,9 @@ static BOOL wined3d_query_vk_issue(struct wined3d_query *query, uint32_t flags) wined3d_query_vk_end(query_vk, context_vk, vk_command_buffer); list_remove(&query_vk->entry); } + if (query_vk->pool_idx.pool_vk) + wined3d_query_pool_vk_mark_complete(query_vk->pool_idx.pool_vk, + query_vk->pool_idx.idx, context_vk); wined3d_query_vk_begin(query_vk, context_vk, vk_command_buffer); list_add_head(&context_vk->active_queries, &query_vk->entry); query_vk->started = true; @@ -1669,8 +1696,6 @@ static void wined3d_query_vk_destroy(struct wined3d_query *query) wined3d_context_vk_remove_pending_queries(context_vk, query_vk); context_release(&context_vk->c); } - if (query_vk->pool_idx.pool_vk) - wined3d_query_pool_vk_free_query(query_vk->pool_idx.pool_vk, query_vk->pool_idx.idx); heap_free(query_vk); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 84dad38f0c9..70691df7246 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2023,16 +2023,19 @@ struct wined3d_pipeline_statistics_query struct wined3d_query_pool_vk { struct list entry; + struct list dirty_entry; struct list *free_list; VkQueryPool vk_query_pool; uint32_t allocated[WINED3D_BITMAP_SIZE(WINED3D_QUERY_POOL_SIZE)]; + uint32_t completed[WINED3D_BITMAP_SIZE(WINED3D_QUERY_POOL_SIZE)]; }; bool wined3d_query_pool_vk_allocate_query(struct wined3d_query_pool_vk *pool_vk, size_t *idx) DECLSPEC_HIDDEN; void wined3d_query_pool_vk_cleanup(struct wined3d_query_pool_vk *pool_vk, struct wined3d_context_vk *context_vk) DECLSPEC_HIDDEN; -void wined3d_query_pool_vk_free_query(struct wined3d_query_pool_vk *pool_vk, size_t idx) DECLSPEC_HIDDEN; +void wined3d_query_pool_vk_reset(struct wined3d_query_pool_vk *pool_vk, struct wined3d_context_vk *context_vk, + VkCommandBuffer vk_command_buffer) DECLSPEC_HIDDEN; bool wined3d_query_pool_vk_init(struct wined3d_query_pool_vk *pool_vk, struct wined3d_context_vk *context_vk, enum wined3d_query_type type, struct list *free_pools) DECLSPEC_HIDDEN; @@ -2574,6 +2577,7 @@ struct wined3d_context_vk struct list active_queries; struct wined3d_pending_queries_vk pending_queries; + struct list dirty_query_pools; struct list free_occlusion_query_pools; struct list free_timestamp_query_pools; struct list free_pipeline_statistics_query_pools; -- 2.30.2

2 1

[PATCH] include: Add proofofpossessioncookieinfo.idl file.
by Jacek Caban 28 Jun '21

28 Jun '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/proofofpossessioncookieinfo.idl | 70 +++++++++++++++++++++++++ 1 file changed, 70 insertions(+) create mode 100644 include/proofofpossessioncookieinfo.idl

1 0

[PATCH 1/3] reg: Support use of registry views when deleting registry values
by Hugh McMaster 28 Jun '21

28 Jun '21

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/reg/delete.c | 22 ++++++++++++++++++---- programs/reg/tests/delete.c | 28 ++++++++++++++-------------- 2 files changed, 32 insertions(+), 18 deletions(-) diff --git a/programs/reg/delete.c b/programs/reg/delete.c index 8804e16e52f..f6965493faa 100644 --- a/programs/reg/delete.c +++ b/programs/reg/delete.c @@ -35,7 +35,7 @@ static void output_error(LONG rc) } } -static int run_delete(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name, +static int run_delete(HKEY root, WCHAR *path, REGSAM sam, WCHAR *key_name, WCHAR *value_name, BOOL value_empty, BOOL value_all, BOOL force) { LONG rc; @@ -72,7 +72,7 @@ static int run_delete(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name return 0; } - if ((rc = RegOpenKeyExW(root, path, 0, KEY_READ|KEY_SET_VALUE, &hkey))) + if ((rc = RegOpenKeyExW(root, path, 0, KEY_READ|KEY_SET_VALUE|sam, &hkey))) { output_error(rc); return 1; @@ -132,6 +132,7 @@ int reg_delete(int argc, WCHAR *argvW[]) HKEY root; WCHAR *path, *key_name, *value_name = NULL; BOOL value_all = FALSE, value_empty = FALSE, force = FALSE; + REGSAM sam = 0; int i; if (!parse_registry_key(argvW[2], &root, &path)) @@ -158,8 +159,18 @@ int reg_delete(int argc, WCHAR *argvW[]) value_empty = TRUE; continue; } - else if (!lstrcmpiW(str, L"reg:32") || !lstrcmpiW(str, L"reg:64")) + else if (!lstrcmpiW(str, L"reg:32")) + { + if (sam & KEY_WOW64_32KEY) goto invalid; + sam |= KEY_WOW64_32KEY; + continue; + } + else if (!lstrcmpiW(str, L"reg:64")) + { + if (sam & KEY_WOW64_64KEY) goto invalid; + sam |= KEY_WOW64_64KEY; continue; + } else if (!str[0] || str[1]) goto invalid; @@ -181,9 +192,12 @@ int reg_delete(int argc, WCHAR *argvW[]) if ((value_name && value_empty) || (value_name && value_all) || (value_empty && value_all)) goto invalid; + if (sam == (KEY_WOW64_32KEY|KEY_WOW64_64KEY)) + goto invalid; + key_name = get_long_key(root, path); - return run_delete(root, path, key_name, value_name, value_empty, value_all, force); + return run_delete(root, path, sam, key_name, value_name, value_empty, value_all, force); invalid: output_message(STRING_INVALID_SYNTAX); diff --git a/programs/reg/tests/delete.c b/programs/reg/tests/delete.c index d6a3b7e1d04..102fc0d788a 100644 --- a/programs/reg/tests/delete.c +++ b/programs/reg/tests/delete.c @@ -270,17 +270,17 @@ static void test_registry_view_win64(void) open_key(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY, &hkey); run_reg_exe("reg delete HKLM\\" KEY_BASE " /v DWORD /f /reg:32", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg_nonexist(hkey, "DWORD"); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "DWORD"); run_reg_exe("reg delete HKLM\\" KEY_BASE " /ve /f /reg:32", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg_nonexist(hkey, NULL); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, NULL); run_reg_exe("reg delete HKLM\\" KEY_BASE " /va /f /reg:32", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg_nonexist(hkey, "String"); - todo_wine verify_reg_nonexist(hkey, "Multiple Strings"); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "String"); + verify_reg_nonexist(hkey, "Multiple Strings"); verify_key(hkey, "Subkey", KEY_WOW64_32KEY); run_reg_exe("reg delete HKLM\\" KEY_BASE "\\Subkey /f /reg:32", &r); @@ -380,17 +380,17 @@ static void test_registry_view_wow64(void) open_key(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY, &hkey); run_reg_exe("reg delete HKLM\\" KEY_BASE " /v DWORD /f /reg:64", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg_nonexist(hkey, "DWORD"); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "DWORD"); run_reg_exe("reg delete HKLM\\" KEY_BASE " /ve /f /reg:64", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg_nonexist(hkey, NULL); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, NULL); run_reg_exe("reg delete HKLM\\" KEY_BASE " /va /f /reg:64", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg_nonexist(hkey, "String"); - todo_wine verify_reg_nonexist(hkey, "Multiple Strings"); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "String"); + verify_reg_nonexist(hkey, "Multiple Strings"); verify_key(hkey, "Subkey", KEY_WOW64_64KEY); run_reg_exe("reg delete HKLM\\" KEY_BASE "\\Subkey /f /reg:64", &r); -- 2.32.0

1 2

[RFC] Wayland driver development - June 2021 update
by Alexandros Frantzis 28 Jun '21

28 Jun '21

Hi all, For the past few months I have been working on improving the experimental Wayland driver (original announcement here [1], first update here [2]). The result of this work is an update which adds several major features: * Vulkan support * Multimonitor support * HiDPI handling * Cursor clipping/relative movement * Wayland keymap handling To get, build and use the Wayland driver do (note that building with Wayland requires wayland-client, wayland-egl and xkbcommon development files to be present on the system): $ git clone -b wayland https://gitlab.collabora.com/alf/wine/ $ cd wine $ ./configure --with-wayland [--with-vulkan --with-vkd3d] $ make [-jN] $ DISPLAY= WAYLAND_DISPLAY=wayland-0 ./wine ... I have uploaded a video showcasing the new features here: https://youtu.be/AyzOnMv7rTc Vulkan support comes with window management handling (resizing, fullscreen etc), and can be used either directly or to implement Direct3D through either WineD3D or DXVK. The Wayland driver now exposes multiple monitors to Wine and supports dynamic addition and removal of monitors. It also supports changing the application-perceived resolution of each monitor (through compositor scaling, see previous update [2]) to implement per-monitor mode changes. For HiDPI handling the Wayland driver exposes a high resolution (i.e., the native monitor resolution) by default, and leaves it to the application/Wine to perform any scaling (e.g., setting LogPixels). Note that although Wayland supports per-monitor scale factors (but not mixed-scaling for the same Wayland surface) the Wine core support for this is not yet in place. At the moment, when windows are presented on multiple monitors with different (Wayland) scale factors, the part of the window in its "main" monitor is presented in high/native resolution while other parts are scaled by the compositor. The "main" monitor for a window changes only when that window moves fully to another monitor. It's sometimes useful to let the Wayland compositor automatically perform a (naive) scaling based on the monitor scale factor. This is supported by setting the driver option HKCU\Software\Wine\Wayland Driver\HiDPIScaling (or corresponding per app option) to "Compositor" (the default being "Application"). To implement cursor clipping and provide relative mouse movement (important for first person perspective games) the driver utilizes heuristics to best map application requests to the corresponding Wayland functionality (pointer-constraints and relative-pointer protocols). Finally, the new Wayland keymap handling allows users to transparently use the current keymap of their Wayland session in Wine applications (although it doesn't allow changing it from the Wine side). --- I think the driver has reached a point where it has enough features to be useful for many use cases and also provide enough confidence that it is a viable option going forward. My plan now is to mainly focus on fixes/improvements and to start preparing for staging by creating a more upstream/review friendly patchset series. I am looking forward to any feedback or questions. Thanks, Alexandros [1] https://www.winehq.org/pipermail/wine-devel/2020-December/178575.html [2] https://www.winehq.org/pipermail/wine-devel/2021-February/181325.html

2 1

[PATCH vkd3d v5 1/6] vkd3d-shader: Pass a struct vkd3d_shader_register_range to vkd3d_dxbc_compiler_emit_combined_sampler_declarations().
by Conor McCarthy 28 Jun '21

28 Jun '21

Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index aed15b94..c70c431e 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -5464,7 +5464,7 @@ static uint32_t vkd3d_dxbc_compiler_get_image_type_id(struct vkd3d_dxbc_compiler } static void vkd3d_dxbc_compiler_emit_combined_sampler_declarations(struct vkd3d_dxbc_compiler *compiler, - const struct vkd3d_shader_register *resource, unsigned int resource_space, unsigned int resource_index, + const struct vkd3d_shader_register *resource, const struct vkd3d_shader_register_range *resource_range, enum vkd3d_shader_resource_type resource_type, enum vkd3d_shader_component_type sampled_type, unsigned int structure_stride, bool raw, const struct vkd3d_spirv_resource_type *resource_type_info) { @@ -5486,7 +5486,7 @@ static void vkd3d_dxbc_compiler_emit_combined_sampler_declarations(struct vkd3d_ { current = &shader_interface->combined_samplers[i]; - if (current->resource_space != resource_space || current->resource_index != resource_index) + if (current->resource_space != resource_range->space || current->resource_index != resource_range->first) continue; if (!(current->flags & resource_type_flag)) @@ -5501,7 +5501,7 @@ static void vkd3d_dxbc_compiler_emit_combined_sampler_declarations(struct vkd3d_ vkd3d_dxbc_compiler_error(compiler, VKD3D_SHADER_ERROR_SPV_INVALID_DESCRIPTOR_BINDING, "Combined descriptor binding for resource %u, space %u, " "and sampler %u, space %u has unsupported ‘count’ %u.", - resource_index, resource_space, current->sampler_index, + resource_range->first, resource_range->space, current->sampler_index, current->sampler_space, current->binding.count); } @@ -5510,8 +5510,8 @@ static void vkd3d_dxbc_compiler_emit_combined_sampler_declarations(struct vkd3d_ depth = current->sampler_index != VKD3D_SHADER_DUMMY_SAMPLER_INDEX && (d->flags & VKD3D_SHADER_DESCRIPTOR_INFO_FLAG_SAMPLER_COMPARISON_MODE); - image_type_id = vkd3d_dxbc_compiler_get_image_type_id(compiler, resource, resource_space, - resource_index, resource_type_info, sampled_type, structure_stride || raw, depth); + image_type_id = vkd3d_dxbc_compiler_get_image_type_id(compiler, resource, resource_range->space, + resource_range->first, resource_type_info, sampled_type, structure_stride || raw, depth); type_id = vkd3d_spirv_get_op_type_sampled_image(builder, image_type_id); ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, storage_class, type_id); @@ -5521,17 +5521,17 @@ static void vkd3d_dxbc_compiler_emit_combined_sampler_declarations(struct vkd3d_ vkd3d_dxbc_compiler_emit_descriptor_binding(compiler, var_id, &current->binding); if (current->sampler_index == VKD3D_SHADER_DUMMY_SAMPLER_INDEX) - vkd3d_spirv_build_op_name(builder, var_id, "t%u_%u_dummy_sampler", resource_space, resource_index); + vkd3d_spirv_build_op_name(builder, var_id, "t%u_%u_dummy_sampler", resource_range->space, + resource_range->first); else - vkd3d_spirv_build_op_name(builder, var_id, "t%u_%u_s%u_%u", resource_space, resource_index, + vkd3d_spirv_build_op_name(builder, var_id, "t%u_%u_s%u_%u", resource_range->space, resource_range->first, current->sampler_space, current->sampler_index); vkd3d_symbol_make_combined_sampler(&symbol, resource, current->sampler_index == VKD3D_SHADER_DUMMY_SAMPLER_INDEX ? 0 : current->sampler_space, current->sampler_index); symbol.id = var_id; - symbol.info.resource.range.space = resource_space; - symbol.info.resource.range.first = resource_index; + symbol.info.resource.range = *resource_range; symbol.info.resource.sampled_type = sampled_type; symbol.info.resource.type_id = image_type_id; symbol.info.resource.resource_type_info = resource_type_info; @@ -5569,8 +5569,8 @@ static void vkd3d_dxbc_compiler_emit_resource_declaration(struct vkd3d_dxbc_comp if (vkd3d_dxbc_compiler_has_combined_sampler(compiler, resource, NULL)) { - vkd3d_dxbc_compiler_emit_combined_sampler_declarations(compiler, reg, register_space, - register_index, resource_type, sampled_type, structure_stride, raw, resource_type_info); + vkd3d_dxbc_compiler_emit_combined_sampler_declarations(compiler, reg, &resource->range, + resource_type, sampled_type, structure_stride, raw, resource_type_info); return; } -- 2.31.1

2 11

[PATCH] ntdll: Return SessionId 1 in NtQueryInformationToken(TokenSessionId).
by Gijs Vermeulen 28 Jun '21

28 Jun '21

From: Alexander Gabello <alexandergabello(a)mail.weber.edu> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46595 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/ntdll/unix/security.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/security.c b/dlls/ntdll/unix/security.c index 6a088e84e4d..8c40ea03d8e 100644 --- a/dlls/ntdll/unix/security.c +++ b/dlls/ntdll/unix/security.c @@ -419,7 +419,7 @@ NTSTATUS WINAPI NtQueryInformationToken( HANDLE token, TOKEN_INFORMATION_CLASS c case TokenSessionId: { - *(DWORD *)info = 0; + *(DWORD *)info = 1; FIXME("QueryInformationToken( ..., TokenSessionId, ...) semi-stub\n"); } break; -- 2.32.0

1 0

[PATCH v2] Allow 16-bit executables to be loaded from build directory.
by Bernhard Übelacker 28 Jun '21

28 Jun '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51214 Signed-off-by: Bernhard Übelacker <bernhardu(a)mailbox.org> --- v2: Supersede 208473 Correction to subject and Wine-Bug line, added signed-off-by This patch is kind of related to commits: bb065801a69 and a0425b9610a. These are the events that seem to lead to the failure: - Loading of module rundll.exe16 fails - Therefore hPrevInstance is zero, which is put into context.Esi - Somehow this seem to lead to the segfault. Unfortunately the last instructions are not shown properly. 2918 WARN("Failed to load module %s; status=%x\n", debugstr_w(libname), nts); 1: x/i $pc => 0x7bc30b49 <load_dll+217>: test $0x4,%al (rr) bt #0 load_dll (load_path=<optimized out>, libname=<optimized out>, default_ext=<optimized out>, flags=<error reading variable: Could not find the frame base for "load_dll".>, pwm=<optimized out>) at .../wine-git/dlls/ntdll/loader.c:2918 #1 0x7bc328c3 in LdrLoadDll@16 (path_name=<error reading variable: Could not find the frame base for "LdrLoadDll@16".>, flags=<optimized out>, libname=<optimized out>, hModule=<optimized out>) at .../wine-git/dlls/ntdll/loader.c:2966 #2 0x7b026d63 in load_library (libname=0x21fa78, flags=0) at .../wine-git/dlls/kernelbase/loader.c:168 #3 0x7b027bd9 in LoadLibraryExW@12 (name=0x7ffc2c00, file=0x0, flags=0) at .../wine-git/dlls/kernelbase/loader.c:517 #4 0x7b027d35 in LoadLibraryA@4 (name=0x21fb54 "rundll.exe16") at .../wine-git/dlls/kernelbase/loader.c:499 #5 0x664275ca in MODULE_LoadModule16 (libname=0x2a267b "C:\\windows\\rundll.exe", implicit=0, lib_only=0) at .../wine-git/dlls/krnl386.exe16/ne_module.c:959 #6 0x664282fe in LoadModule16@8 (name=0x2a267b "C:\\windows\\rundll.exe", paramBlock=0x21fe92) at .../wine-git/dlls/krnl386.exe16/ne_module.c:1130 #7 0x7eba1c1c in main (argc=4, argv=0x2a2590) at .../wine-git/programs/winevdm/winevdm.c:556 ... (rr) step 1176 hPrevInstance = NE_GetInstance( pModule ); ... 0x66429023 in NE_StartTask () at /home/bernhard/data/entwicklung/2021/wine/wine-git/wine-git/dlls/krnl386.exe16/ne_module.c:1233 1233 context.Esi = pTask->hPrevInstance; ... (rr) bt #0 0x6640395f in wine_call_to_16_regs@12 () #1 0x6643f0e5 in K32WOWCallback16Ex@20 (vpfn16=0, dwFlags=2, cbArgs=4, pArgs=0x0, pdwRetCode=0x13cfc14) at .../wine-git/dlls/krnl386.exe16/wowthunk.c:439 #2 0x66429060 in NE_StartTask () at .../wine-git/dlls/krnl386.exe16/ne_module.c:1240 #3 0x66432e53 in task_start (p=0x26fc58) at .../wine-git/dlls/krnl386.exe16/task.c:475 #4 0x7b62e250 in WriteTapemark@16 () #5 0x7bc555a7 in call_thread_func_wrapper () #6 0x7bc55c60 in call_thread_func (entry=0x66432df0 <task_start>, arg=0x26fc58) at .../wine-git/dlls/ntdll/thread.c:225 ... (rr) stepi 0x6640398e in wine_call_to_16_regs@12 () 1: x/i $pc => 0x6640398e <wine_call_to_16_regs@12+178>: mov 0xa0(%edx),%esi (rr) x/1xw $edx + 0xa0 0x13cfcb4: 0x00000000 (rr) stepi 0x66403994 in wine_call_to_16_regs@12 () 1: x/i $pc => 0x66403994 <wine_call_to_16_regs@12+184>: mov 0x9c(%edx),%edi (rr) 0x6640399a in wine_call_to_16_regs@12 () 1: x/i $pc => 0x6640399a <wine_call_to_16_regs@12+190>: mov 0xb0(%edx),%eax (rr) 0x664039a0 in wine_call_to_16_regs@12 () 1: x/i $pc => 0x664039a0 <wine_call_to_16_regs@12+196>: mov 0xa4(%edx),%ebx (rr) 0x664039a6 in wine_call_to_16_regs@12 () 1: x/i $pc => 0x664039a6 <wine_call_to_16_regs@12+202>: mov 0xac(%edx),%ecx (rr) 0x664039ac in wine_call_to_16_regs@12 () 1: x/i $pc => 0x664039ac <wine_call_to_16_regs@12+208>: mov 0xa8(%edx),%edx (rr) 0x664039b2 in wine_call_to_16_regs@12 () 1: x/i $pc => 0x664039b2 <wine_call_to_16_regs@12+214>: popw %ds (rr) 0x664039b4 in wine_call_to_16_regs@12 () 1: x/i $pc => 0x664039b4 <wine_call_to_16_regs@12+216>: lretw (rr) 0x00000020 in ?? () 1: x/i $pc => 0x20: <error: Cannot access memory at address 0x20> (rr) 0x00000022 in ?? () 1: x/i $pc => 0x22: <error: Cannot access memory at address 0x22> (rr) 0x00000027 in ?? () 1: x/i $pc => 0x27: <error: Cannot access memory at address 0x27> (rr) 0x00000000 in ?? () 1: x/i $pc => 0x0: <error: Cannot access memory at address 0x0> (rr) 0x00000005 in ?? () 1: x/i $pc => 0x5: <error: Cannot access memory at address 0x5> (rr) Thread 8 received signal SIGSEGV, Segmentation fault. 0x00000005 in ?? () 1: x/i $pc => 0x5: <error: Cannot access memory at address 0x5> --- dlls/ntdll/loader.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 54806b0ab22..da539258eb3 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2675,6 +2675,7 @@ static NTSTATUS find_builtin_without_file( const WCHAR *name, UNICODE_STRING *ne if (!get_env_var( L"WINEBUILDDIR", 20 + 2 * wcslen(name), new_name )) { + len = new_name->Length; RtlAppendUnicodeToString( new_name, L"\\dlls\\" ); RtlAppendUnicodeToString( new_name, name ); if ((ext = wcsrchr( name, '.' )) && !wcscmp( ext, L".dll" )) new_name->Length -= 4 * sizeof(WCHAR); @@ -2685,6 +2686,17 @@ static NTSTATUS find_builtin_without_file( const WCHAR *name, UNICODE_STRING *ne RtlAppendUnicodeToString( new_name, L".fake" ); status = open_dll_file( new_name, pwm, mapping, image_info, id ); if (status != STATUS_DLL_NOT_FOUND) goto done; + + new_name->Length = len; + RtlAppendUnicodeToString( new_name, L"\\programs\\" ); + RtlAppendUnicodeToString( new_name, name ); + RtlAppendUnicodeToString( new_name, L"\\" ); + RtlAppendUnicodeToString( new_name, name ); + status = open_dll_file( new_name, pwm, mapping, image_info, id ); + if (status != STATUS_DLL_NOT_FOUND) goto done; + RtlAppendUnicodeToString( new_name, L".fake" ); + status = open_dll_file( new_name, pwm, mapping, image_info, id ); + if (status != STATUS_DLL_NOT_FOUND) goto done; RtlFreeUnicodeString( new_name ); } -- 2.30.2

1 0

[PATCH 1/5] hid: Return HIDP_STATUS_INCOMPATIBLE_REPORT_ID when id mismatches.
by Rémi Bernon 28 Jun '21

28 Jun '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/hid/hidp.c | 5 +++-- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 4 ---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c index 59f18276b38..6261c3c2f68 100644 --- a/dlls/hid/hidp.c +++ b/dlls/hid/hidp.c @@ -96,13 +96,14 @@ static NTSTATUS enum_value_caps( WINE_HIDP_PREPARSED_DATA *preparsed, HIDP_REPOR { const struct hid_value_caps *caps, *caps_end; NTSTATUS status; + BOOL incompatible = FALSE; LONG remaining = *count; for (status = get_value_caps_range( preparsed, report_type, report_len, &caps, &caps_end ); status == HIDP_STATUS_SUCCESS && caps != caps_end; caps++) { if (!match_value_caps( caps, filter )) continue; - if (filter->report_id && caps->report_id != filter->report_id) continue; + if (filter->report_id && caps->report_id != filter->report_id) incompatible = TRUE; else if (filter->array && (caps->is_range || caps->report_count <= 1)) return HIDP_STATUS_NOT_VALUE_ARRAY; else if (remaining-- > 0) status = callback( caps, user ); } @@ -111,7 +112,7 @@ static NTSTATUS enum_value_caps( WINE_HIDP_PREPARSED_DATA *preparsed, HIDP_REPOR if (status != HIDP_STATUS_SUCCESS) return status; *count -= remaining; - if (*count == 0) return HIDP_STATUS_USAGE_NOT_FOUND; + if (*count == 0) return incompatible ? HIDP_STATUS_INCOMPATIBLE_REPORT_ID : HIDP_STATUS_USAGE_NOT_FOUND; if (remaining < 0) return HIDP_STATUS_BUFFER_TOO_SMALL; return HIDP_STATUS_SUCCESS; } diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 432bc168259..753957a8ac6 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -2292,14 +2292,12 @@ static void test_hidp(HANDLE file, int report_id) status = HidP_SetUsageValue(HidP_Feature, HID_USAGE_PAGE_ORDINAL, waveform_list, 3, HID_USAGE_HAPTICS_WAVEFORM_RUMBLE, preparsed_data, report, caps.FeatureReportByteLength); - todo_wine_if(!report_id) ok(status == (report_id ? HIDP_STATUS_SUCCESS : HIDP_STATUS_INCOMPATIBLE_REPORT_ID), "HidP_SetUsageValue returned %#x\n", status); report[0] = 2; status = HidP_SetUsageValue(HidP_Feature, HID_USAGE_PAGE_ORDINAL, waveform_list, 3, HID_USAGE_HAPTICS_WAVEFORM_RUMBLE, preparsed_data, report, caps.FeatureReportByteLength); - todo_wine ok(status == HIDP_STATUS_INCOMPATIBLE_REPORT_ID, "HidP_SetUsageValue returned %#x\n", status); report[0] = report_id; status = HidP_SetUsageValue(HidP_Feature, HID_USAGE_PAGE_ORDINAL, 0xdead, 3, HID_USAGE_HAPTICS_WAVEFORM_RUMBLE, @@ -2330,13 +2328,11 @@ static void test_hidp(HANDLE file, int report_id) report[0] = 1 - report_id; status = HidP_GetUsageValue(HidP_Feature, HID_USAGE_PAGE_ORDINAL, waveform_list, 3, &value, preparsed_data, report, caps.FeatureReportByteLength); - todo_wine_if(!report_id) ok(status == (report_id ? HIDP_STATUS_SUCCESS : HIDP_STATUS_INCOMPATIBLE_REPORT_ID), "HidP_GetUsageValue returned %#x\n", status); report[0] = 2; status = HidP_GetUsageValue(HidP_Feature, HID_USAGE_PAGE_ORDINAL, waveform_list, 3, &value, preparsed_data, report, caps.FeatureReportByteLength); - todo_wine ok(status == HIDP_STATUS_INCOMPATIBLE_REPORT_ID, "HidP_GetUsageValue returned %#x\n", status); report[0] = report_id; status = HidP_GetUsageValue(HidP_Feature, HID_USAGE_PAGE_ORDINAL, 0xdead, 3, &value, -- 2.32.0

2 6

[PATCH 2/5] nsi: Add a stub implementation of NsiGetParameter().
by Huw Davies 28 Jun '21

28 Jun '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/nsi/nsi.c | 8 ++++++++ dlls/nsi/nsi.spec | 2 +- dlls/nsi/tests/nsi.c | 23 +++++++++++++++++++++++ include/wine/nsi.h | 2 ++ 4 files changed, 34 insertions(+), 1 deletion(-) diff --git a/dlls/nsi/nsi.c b/dlls/nsi/nsi.c index 3691dd5ad2b..bf52fe248c8 100644 --- a/dlls/nsi/nsi.c +++ b/dlls/nsi/nsi.c @@ -51,3 +51,11 @@ DWORD WINAPI NsiGetAllParameters( DWORD unk, const NPI_MODULEID *module, DWORD t rw_data, rw_size, dynamic_data, dynamic_size, static_data, static_size ); return ERROR_CALL_NOT_IMPLEMENTED; } + +DWORD WINAPI NsiGetParameter( DWORD unk, const NPI_MODULEID *module, DWORD table, const void *key, DWORD key_size, + DWORD param_type, void *data, DWORD data_size, DWORD data_offset ) +{ + FIXME( "%d %p %d %p %d %d %p %d %d: stub\n", unk, module, table, key, key_size, + param_type, data, data_size, data_offset ); + return ERROR_CALL_NOT_IMPLEMENTED; +} diff --git a/dlls/nsi/nsi.spec b/dlls/nsi/nsi.spec index 7db46c83e94..46757988146 100644 --- a/dlls/nsi/nsi.spec +++ b/dlls/nsi/nsi.spec @@ -12,7 +12,7 @@ @ stub NsiGetAllParametersEx @ stub NsiGetAllPersistentParametersWithMask @ stub NsiObjectSecurity -@ stub NsiGetParameter +@ stdcall NsiGetParameter(long ptr long ptr long long ptr long long) @ stub NsiGetParameterEx @ stub NsiRegisterChangeNotification @ stub NsiRegisterChangeNotificationEx diff --git a/dlls/nsi/tests/nsi.c b/dlls/nsi/tests/nsi.c index e0c0fcf168b..72c9dcdccbd 100644 --- a/dlls/nsi/tests/nsi.c +++ b/dlls/nsi/tests/nsi.c @@ -75,6 +75,29 @@ todo_wine ok( get_dyn.oper_status == dyn->oper_status, "mismatch\n" ); ok( get_stat.if_index == stat->if_index, "mismatch\n" ); ok( IsEqualGUID( &get_stat.if_guid, &stat->if_guid ), "mismatch\n" ); + + memset( &get_rw, 0xcc, sizeof(get_rw) ); + memset( &get_dyn, 0xcc, sizeof(get_dyn) ); + memset( &get_stat, 0xcc, sizeof(get_stat) ); + + err = NsiGetParameter( 1, &NPI_MS_NDIS_MODULEID, NSI_NDIS_IFINFO_TABLE, luid_tbl + i, sizeof(*luid_tbl), + NSI_PARAM_TYPE_RW, &get_rw.alias, sizeof(get_rw.alias), + FIELD_OFFSET(struct nsi_ndis_ifinfo_rw, alias) ); + ok( !err, "got %d\n", err ); + ok( get_rw.alias.Length == rw->alias.Length, "mismatch\n" ); + ok( !memcmp( get_rw.alias.String, rw->alias.String, rw->alias.Length ), "mismatch\n" ); + + err = NsiGetParameter( 1, &NPI_MS_NDIS_MODULEID, NSI_NDIS_IFINFO_TABLE, luid_tbl + i, sizeof(*luid_tbl), + NSI_PARAM_TYPE_STATIC, &get_stat.if_index, sizeof(get_stat.if_index), + FIELD_OFFSET(struct nsi_ndis_ifinfo_static, if_index) ); + ok( !err, "got %d\n", err ); + ok( get_stat.if_index == stat->if_index, "mismatch\n" ); + + err = NsiGetParameter( 1, &NPI_MS_NDIS_MODULEID, NSI_NDIS_IFINFO_TABLE, luid_tbl + i, sizeof(*luid_tbl), + NSI_PARAM_TYPE_STATIC, &get_stat.if_guid, sizeof(get_stat.if_guid), + FIELD_OFFSET(struct nsi_ndis_ifinfo_static, if_guid) ); + ok( !err, "got %d\n", err ); + ok( IsEqualGUID( &get_stat.if_guid, &stat->if_guid ), "mismatch\n" ); winetest_pop_context(); } diff --git a/include/wine/nsi.h b/include/wine/nsi.h index 547ed91ce41..8b276e76b82 100644 --- a/include/wine/nsi.h +++ b/include/wine/nsi.h @@ -100,5 +100,7 @@ void WINAPI NsiFreeTable( void *key_data, void *rw_data, void *dynamic_data, voi DWORD WINAPI NsiGetAllParameters( DWORD unk, const NPI_MODULEID *module, DWORD table, const void *key, DWORD key_size, void *rw_data, DWORD rw_size, void *dynamic_data, DWORD dynamic_size, void *static_data, DWORD static_size ); +DWORD WINAPI NsiGetParameter( DWORD unk, const NPI_MODULEID *module, DWORD table, const void *key, DWORD key_size, + DWORD param_type, void *data, DWORD data_size, DWORD data_offset ); #endif /* __WINE_NSI_H */ -- 2.23.0

2 2

[PATCH v2 5/5] nsi: Add a stub implementation of NsiGetAllParametersEx().
by Huw Davies 28 Jun '21

28 Jun '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/nsi/nsi.c | 23 +++++++++++++++++++++++ dlls/nsi/nsi.spec | 2 +- dlls/nsi/tests/nsi.c | 30 ++++++++++++++++++++++++++++++ include/wine/nsi.h | 18 ++++++++++++++++++ 4 files changed, 72 insertions(+), 1 deletion(-) diff --git a/dlls/nsi/nsi.c b/dlls/nsi/nsi.c index 1ed0cfad916..4e55721475b 100644 --- a/dlls/nsi/nsi.c +++ b/dlls/nsi/nsi.c @@ -84,8 +84,31 @@ DWORD WINAPI NsiGetAllParameters( DWORD unk, const NPI_MODULEID *module, DWORD t void *rw_data, DWORD rw_size, void *dynamic_data, DWORD dynamic_size, void *static_data, DWORD static_size ) { + struct nsi_get_all_parameters_ex params; + FIXME( "%d %p %d %p %d %p %d %p %d %p %d: stub\n", unk, module, table, key, key_size, rw_data, rw_size, dynamic_data, dynamic_size, static_data, static_size ); + + params.unknown[0] = 0; + params.unknown[1] = 0; + params.module = module; + params.table = table; + params.first_arg = unk; + params.unknown2 = 0; + params.key = key; + params.key_size = key_size; + params.rw_data = rw_data; + params.rw_size = rw_size; + params.dynamic_data = dynamic_data; + params.dynamic_size = dynamic_size; + params.static_data = static_data; + params.static_size = static_size; + + return NsiGetAllParametersEx( &params ); +} + +DWORD WINAPI NsiGetAllParametersEx( struct nsi_get_all_parameters_ex *params ) +{ return ERROR_CALL_NOT_IMPLEMENTED; } diff --git a/dlls/nsi/nsi.spec b/dlls/nsi/nsi.spec index 912a5e8d052..376d25438aa 100644 --- a/dlls/nsi/nsi.spec +++ b/dlls/nsi/nsi.spec @@ -9,7 +9,7 @@ @ stub NsiFreePersistentDataWithMaskTable @ stdcall NsiFreeTable(ptr ptr ptr ptr) @ stdcall NsiGetAllParameters(long ptr long ptr long ptr long ptr long ptr long) -@ stub NsiGetAllParametersEx +@ stdcall NsiGetAllParametersEx(ptr) @ stub NsiGetAllPersistentParametersWithMask @ stub NsiObjectSecurity @ stdcall NsiGetParameter(long ptr long ptr long long ptr long long) diff --git a/dlls/nsi/tests/nsi.c b/dlls/nsi/tests/nsi.c index 5e2ea71646c..7c2c57b9548 100644 --- a/dlls/nsi/tests/nsi.c +++ b/dlls/nsi/tests/nsi.c @@ -40,6 +40,7 @@ static void test_nsi_api( void ) struct nsi_ndis_ifinfo_rw *rw_tbl, *rw, get_rw, *enum_rw_tbl, *enum_rw; struct nsi_ndis_ifinfo_dynamic *dyn_tbl, *dyn, get_dyn, *enum_dyn_tbl, *enum_dyn; struct nsi_ndis_ifinfo_static *stat_tbl, *stat, get_stat, *enum_stat_tbl, *enum_stat; + struct nsi_get_all_parameters_ex get_all_params; struct nsi_enumerate_all_ex enum_params; DWORD err, count, i, rw_size, enum_count; NET_LUID *luid_tbl, *enum_luid_tbl; @@ -81,6 +82,35 @@ todo_wine memset( &get_dyn, 0xcc, sizeof(get_dyn) ); memset( &get_stat, 0xcc, sizeof(get_stat) ); + memset( &get_all_params, 0, sizeof(get_all_params) ); + get_all_params.first_arg = 1; + get_all_params.module = &NPI_MS_NDIS_MODULEID; + get_all_params.table = NSI_NDIS_IFINFO_TABLE; + get_all_params.key = luid_tbl + i; + get_all_params.key_size = sizeof(*luid_tbl); + get_all_params.rw_data = &get_rw; + get_all_params.rw_size = rw_size; + get_all_params.dynamic_data = &get_dyn; + get_all_params.dynamic_size = sizeof(get_dyn); + get_all_params.static_data = &get_stat; + get_all_params.static_size = sizeof(get_stat); + + err = NsiGetAllParametersEx( &get_all_params ); + ok( !err, "got %d\n", err ); + /* test a selection of members */ + ok( IsEqualGUID( &get_rw.network_guid, &rw->network_guid ), "mismatch\n" ); + ok( get_rw.alias.Length == rw->alias.Length, "mismatch\n" ); + ok( !memcmp( get_rw.alias.String, rw->alias.String, rw->alias.Length ), "mismatch\n" ); + ok( get_rw.phys_addr.Length == rw->phys_addr.Length, "mismatch\n" ); + ok( !memcmp( get_rw.phys_addr.Address, rw->phys_addr.Address, IF_MAX_PHYS_ADDRESS_LENGTH ), "mismatch\n" ); + ok( get_dyn.oper_status == dyn->oper_status, "mismatch\n" ); + ok( get_stat.if_index == stat->if_index, "mismatch\n" ); + ok( IsEqualGUID( &get_stat.if_guid, &stat->if_guid ), "mismatch\n" ); + + memset( &get_rw, 0xcc, sizeof(get_rw) ); + memset( &get_dyn, 0xcc, sizeof(get_dyn) ); + memset( &get_stat, 0xcc, sizeof(get_stat) ); + err = NsiGetParameter( 1, &NPI_MS_NDIS_MODULEID, NSI_NDIS_IFINFO_TABLE, luid_tbl + i, sizeof(*luid_tbl), NSI_PARAM_TYPE_RW, &get_rw.alias, sizeof(get_rw.alias), FIELD_OFFSET(struct nsi_ndis_ifinfo_rw, alias) ); diff --git a/include/wine/nsi.h b/include/wine/nsi.h index 999b8a57810..81d221324e9 100644 --- a/include/wine/nsi.h +++ b/include/wine/nsi.h @@ -116,6 +116,23 @@ struct nsi_enumerate_all_ex DWORD_PTR count; }; +struct nsi_get_all_parameters_ex +{ + void *unknown[2]; + const NPI_MODULEID *module; + DWORD_PTR table; + DWORD first_arg; + DWORD unknown2; + const void *key; + DWORD key_size; + void *rw_data; + DWORD rw_size; + void *dynamic_data; + DWORD dynamic_size; + void *static_data; + DWORD static_size; +}; + DWORD WINAPI NsiAllocateAndGetTable( DWORD unk, const NPI_MODULEID *module, DWORD table, 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 *count, DWORD unk2 ); @@ -128,6 +145,7 @@ void WINAPI NsiFreeTable( void *key_data, void *rw_data, void *dynamic_data, voi DWORD WINAPI NsiGetAllParameters( DWORD unk, const NPI_MODULEID *module, DWORD table, const void *key, DWORD key_size, void *rw_data, DWORD rw_size, void *dynamic_data, DWORD dynamic_size, void *static_data, DWORD static_size ); +DWORD WINAPI NsiGetAllParametersEx( struct nsi_get_all_parameters_ex *params ); DWORD WINAPI NsiGetParameter( DWORD unk, const NPI_MODULEID *module, DWORD table, const void *key, DWORD key_size, DWORD param_type, void *data, DWORD data_size, DWORD data_offset ); -- 2.23.0

1 0

[PATCH v2 4/5] nsi: Add a stub implementation of NsiEnumerateObjectsAllParametersEx().
by Huw Davies 28 Jun '21

28 Jun '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/nsi/nsi.c | 27 +++++++++++++++++++++++++++ dlls/nsi/nsi.spec | 2 +- dlls/nsi/tests/nsi.c | 20 ++++++++++++++++++++ include/wine/nsi.h | 19 +++++++++++++++++++ 4 files changed, 67 insertions(+), 1 deletion(-) diff --git a/dlls/nsi/nsi.c b/dlls/nsi/nsi.c index 66054ffacd6..1ed0cfad916 100644 --- a/dlls/nsi/nsi.c +++ b/dlls/nsi/nsi.c @@ -43,8 +43,35 @@ DWORD WINAPI NsiEnumerateObjectsAllParameters( DWORD unk, DWORD unk2, const NPI_ void *dynamic_data, DWORD dynamic_size, void *static_data, DWORD static_size, DWORD *count ) { + struct nsi_enumerate_all_ex params; + DWORD err; + FIXME( "%d %d %p %d %p %d %p %d %p %d %p %d %p: stub\n", unk, unk2, module, table, key_data, key_size, rw_data, rw_size, dynamic_data, dynamic_size, static_data, static_size, count ); + + params.unknown[0] = 0; + params.unknown[1] = 0; + params.module = module; + params.table = table; + params.first_arg = unk; + params.second_arg = unk2; + params.key_data = key_data; + params.key_size = key_size; + params.rw_data = rw_data; + params.rw_size = rw_size; + params.dynamic_data = dynamic_data; + params.dynamic_size = dynamic_size; + params.static_data = static_data; + params.static_size = static_size; + params.count = *count; + + err = NsiEnumerateObjectsAllParametersEx( &params ); + *count = params.count; + return err; +} + +DWORD WINAPI NsiEnumerateObjectsAllParametersEx( struct nsi_enumerate_all_ex *params ) +{ return ERROR_CALL_NOT_IMPLEMENTED; } diff --git a/dlls/nsi/nsi.spec b/dlls/nsi/nsi.spec index d4a29c38fe6..912a5e8d052 100644 --- a/dlls/nsi/nsi.spec +++ b/dlls/nsi/nsi.spec @@ -4,7 +4,7 @@ @ stub NsiDeregisterChangeNotification @ stub NsiDeregisterChangeNotificationEx @ stdcall NsiEnumerateObjectsAllParameters(long long ptr long ptr long ptr long ptr long ptr long ptr) -@ stub NsiEnumerateObjectsAllParametersEx +@ stdcall NsiEnumerateObjectsAllParametersEx(ptr) @ stub NsiEnumerateObjectsAllPersistentParametersWithMask @ stub NsiFreePersistentDataWithMaskTable @ stdcall NsiFreeTable(ptr ptr ptr ptr) diff --git a/dlls/nsi/tests/nsi.c b/dlls/nsi/tests/nsi.c index b1befd548cd..5e2ea71646c 100644 --- a/dlls/nsi/tests/nsi.c +++ b/dlls/nsi/tests/nsi.c @@ -40,6 +40,7 @@ static void test_nsi_api( void ) struct nsi_ndis_ifinfo_rw *rw_tbl, *rw, get_rw, *enum_rw_tbl, *enum_rw; struct nsi_ndis_ifinfo_dynamic *dyn_tbl, *dyn, get_dyn, *enum_dyn_tbl, *enum_dyn; struct nsi_ndis_ifinfo_static *stat_tbl, *stat, get_stat, *enum_stat_tbl, *enum_stat; + struct nsi_enumerate_all_ex enum_params; DWORD err, count, i, rw_size, enum_count; NET_LUID *luid_tbl, *enum_luid_tbl; @@ -159,6 +160,25 @@ todo_wine ok( enum_luid_tbl[i].Value == luid_tbl[i].Value, "%d: mismatch\n", i ); } + memset( &enum_params, 0, sizeof(enum_params) ); + enum_params.first_arg = 1; + enum_params.second_arg = 1; + enum_params.module = &NPI_MS_NDIS_MODULEID; + enum_params.table = NSI_NDIS_IFINFO_TABLE; + enum_params.key_data = enum_luid_tbl; + enum_params.key_size = sizeof(*enum_luid_tbl); + enum_params.rw_data = enum_rw_tbl; + enum_params.rw_size = rw_size; + enum_params.dynamic_data = enum_dyn_tbl; + enum_params.dynamic_size = sizeof(*enum_dyn_tbl); + enum_params.static_data = enum_stat_tbl; + enum_params.static_size = sizeof(*enum_stat_tbl); + enum_params.count = count; + + err = NsiEnumerateObjectsAllParametersEx( &enum_params ); + ok( !err, "got %d\n", err ); + ok( enum_params.count == count, "mismatch\n" ); + free( enum_luid_tbl ); free( enum_rw_tbl ); free( enum_dyn_tbl ); diff --git a/include/wine/nsi.h b/include/wine/nsi.h index 648adac9931..999b8a57810 100644 --- a/include/wine/nsi.h +++ b/include/wine/nsi.h @@ -98,6 +98,24 @@ struct nsi_ndis_ifinfo_static #define NSI_PARAM_TYPE_DYNAMIC 1 #define NSI_PARAM_TYPE_STATIC 2 +struct nsi_enumerate_all_ex +{ + void *unknown[2]; + const NPI_MODULEID *module; + DWORD_PTR table; + DWORD first_arg; + DWORD second_arg; + 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 WINAPI NsiAllocateAndGetTable( DWORD unk, const NPI_MODULEID *module, DWORD table, 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 *count, DWORD unk2 ); @@ -105,6 +123,7 @@ DWORD WINAPI NsiEnumerateObjectsAllParameters( DWORD unk, DWORD unk2, const NPI_ 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 *count ); +DWORD WINAPI NsiEnumerateObjectsAllParametersEx( struct nsi_enumerate_all_ex *params ); void WINAPI NsiFreeTable( void *key_data, void *rw_data, void *dynamic_data, void *static_data ); DWORD WINAPI NsiGetAllParameters( DWORD unk, const NPI_MODULEID *module, DWORD table, const void *key, DWORD key_size, void *rw_data, DWORD rw_size, void *dynamic_data, DWORD dynamic_size, -- 2.23.0

1 0

[PATCH v2 3/5] nsi: Add a stub implementation of NsiEnumerateObjectsAllParameters().
by Huw Davies 28 Jun '21

28 Jun '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/nsi/nsi.c | 10 ++++++ dlls/nsi/nsi.spec | 2 +- dlls/nsi/tests/nsi.c | 72 +++++++++++++++++++++++++++++++++++++++++--- include/wine/nsi.h | 4 +++ 4 files changed, 82 insertions(+), 6 deletions(-) diff --git a/dlls/nsi/nsi.c b/dlls/nsi/nsi.c index bf52fe248c8..66054ffacd6 100644 --- a/dlls/nsi/nsi.c +++ b/dlls/nsi/nsi.c @@ -38,6 +38,16 @@ DWORD WINAPI NsiAllocateAndGetTable( DWORD unk, const NPI_MODULEID *module, DWOR return ERROR_CALL_NOT_IMPLEMENTED; } +DWORD WINAPI NsiEnumerateObjectsAllParameters( DWORD unk, DWORD unk2, const NPI_MODULEID *module, DWORD table, + 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 *count ) +{ + FIXME( "%d %d %p %d %p %d %p %d %p %d %p %d %p: stub\n", unk, unk2, module, table, key_data, key_size, + rw_data, rw_size, dynamic_data, dynamic_size, static_data, static_size, count ); + return ERROR_CALL_NOT_IMPLEMENTED; +} + void WINAPI NsiFreeTable( void *key_data, void *rw_data, void *dynamic_data, void *static_data ) { FIXME( "%p %p %p %p: stub\n", key_data, rw_data, dynamic_data, static_data ); diff --git a/dlls/nsi/nsi.spec b/dlls/nsi/nsi.spec index 46757988146..d4a29c38fe6 100644 --- a/dlls/nsi/nsi.spec +++ b/dlls/nsi/nsi.spec @@ -3,7 +3,7 @@ @ stub NsiCancelChangeNotification @ stub NsiDeregisterChangeNotification @ stub NsiDeregisterChangeNotificationEx -@ stub NsiEnumerateObjectsAllParameters +@ stdcall NsiEnumerateObjectsAllParameters(long long ptr long ptr long ptr long ptr long ptr long ptr) @ stub NsiEnumerateObjectsAllParametersEx @ stub NsiEnumerateObjectsAllPersistentParametersWithMask @ stub NsiFreePersistentDataWithMaskTable diff --git a/dlls/nsi/tests/nsi.c b/dlls/nsi/tests/nsi.c index 72c9dcdccbd..b1befd548cd 100644 --- a/dlls/nsi/tests/nsi.c +++ b/dlls/nsi/tests/nsi.c @@ -37,11 +37,11 @@ static void test_nsi_api( void ) { DWORD rw_sizes[] = { FIELD_OFFSET(struct nsi_ndis_ifinfo_rw, name2), FIELD_OFFSET(struct nsi_ndis_ifinfo_rw, unk), sizeof(struct nsi_ndis_ifinfo_rw) }; - struct nsi_ndis_ifinfo_rw *rw_tbl, *rw, get_rw; - struct nsi_ndis_ifinfo_dynamic *dyn_tbl, *dyn, get_dyn; - struct nsi_ndis_ifinfo_static *stat_tbl, *stat, get_stat; - DWORD err, count, i, rw_size; - NET_LUID *luid_tbl; + struct nsi_ndis_ifinfo_rw *rw_tbl, *rw, get_rw, *enum_rw_tbl, *enum_rw; + struct nsi_ndis_ifinfo_dynamic *dyn_tbl, *dyn, get_dyn, *enum_dyn_tbl, *enum_dyn; + struct nsi_ndis_ifinfo_static *stat_tbl, *stat, get_stat, *enum_stat_tbl, *enum_stat; + DWORD err, count, i, rw_size, enum_count; + NET_LUID *luid_tbl, *enum_luid_tbl; /* Use the NDIS ifinfo table to test various api */ for (i = 0; i < ARRAY_SIZE(rw_sizes); i++) @@ -101,6 +101,68 @@ todo_wine winetest_pop_context(); } + enum_count = 0; + err = NsiEnumerateObjectsAllParameters( 1, 1, &NPI_MS_NDIS_MODULEID, NSI_NDIS_IFINFO_TABLE, + NULL, 0, NULL, 0, + NULL, 0, NULL, 0, &enum_count ); + ok( !err, "got %d\n", err ); + ok( enum_count == count, "mismatch\n" ); + + enum_luid_tbl = malloc( count * sizeof(*enum_luid_tbl) ); + enum_rw_tbl = malloc( count * rw_size ); + enum_dyn_tbl = malloc( count * sizeof(*enum_dyn_tbl) ); + enum_stat_tbl = malloc( count * sizeof(*enum_stat_tbl) ); + + err = NsiEnumerateObjectsAllParameters( 1, 1, &NPI_MS_NDIS_MODULEID, NSI_NDIS_IFINFO_TABLE, + enum_luid_tbl, sizeof(*enum_luid_tbl), enum_rw_tbl, rw_size, + enum_dyn_tbl, sizeof(*enum_dyn_tbl), enum_stat_tbl, sizeof(*enum_stat_tbl), + &enum_count ); + ok( !err, "got %d\n", err ); + ok( enum_count == count, "mismatch\n" ); + + for (i = 0; i < count; i++) + { + winetest_push_context( "%d", i ); + rw = (struct nsi_ndis_ifinfo_rw *)((BYTE *)rw_tbl + i * rw_size); + enum_rw = (struct nsi_ndis_ifinfo_rw *)((BYTE *)enum_rw_tbl + i * rw_size); + dyn = dyn_tbl + i; + enum_dyn = enum_dyn_tbl + i; + stat = stat_tbl + i; + enum_stat = enum_stat_tbl + i; + + /* test a selection of members */ + ok( enum_luid_tbl[i].Value == luid_tbl[i].Value, "mismatch\n" ); + ok( IsEqualGUID( &enum_rw->network_guid, &rw->network_guid ), "mismatch\n" ); + ok( enum_rw->alias.Length == rw->alias.Length, "mismatch\n" ); + ok( !memcmp( enum_rw->alias.String, rw->alias.String, rw->alias.Length ), "mismatch\n" ); + ok( enum_rw->phys_addr.Length == rw->phys_addr.Length, "mismatch\n" ); + ok( !memcmp( enum_rw->phys_addr.Address, rw->phys_addr.Address, IF_MAX_PHYS_ADDRESS_LENGTH ), "mismatch\n" ); + ok( enum_dyn->oper_status == dyn->oper_status, "mismatch\n" ); + ok( enum_stat->if_index == stat->if_index, "mismatch\n" ); + ok( IsEqualGUID( &enum_stat->if_guid, &stat->if_guid ), "mismatch\n" ); + winetest_pop_context(); + } + + if (count > 0) + { + enum_count--; + memset( enum_luid_tbl, 0xcc, count * sizeof(*enum_luid_tbl) ); + + err = NsiEnumerateObjectsAllParameters( 1, 1, &NPI_MS_NDIS_MODULEID, NSI_NDIS_IFINFO_TABLE, + enum_luid_tbl, sizeof(*enum_luid_tbl), enum_rw_tbl, rw_size, + enum_dyn_tbl, sizeof(*enum_dyn_tbl), enum_stat_tbl, sizeof(*enum_stat_tbl), + &enum_count ); + ok( err == ERROR_MORE_DATA, "got %d\n", err ); + ok( enum_count == count - 1, "mismatch\n" ); + + for (i = 0; i < enum_count; i++) /* for simplicity just check the luids */ + ok( enum_luid_tbl[i].Value == luid_tbl[i].Value, "%d: mismatch\n", i ); + } + + free( enum_luid_tbl ); + free( enum_rw_tbl ); + free( enum_dyn_tbl ); + free( enum_stat_tbl ); NsiFreeTable( luid_tbl, rw_tbl, dyn_tbl, stat_tbl ); } diff --git a/include/wine/nsi.h b/include/wine/nsi.h index e0370b00d41..648adac9931 100644 --- a/include/wine/nsi.h +++ b/include/wine/nsi.h @@ -101,6 +101,10 @@ struct nsi_ndis_ifinfo_static DWORD WINAPI NsiAllocateAndGetTable( DWORD unk, const NPI_MODULEID *module, DWORD table, 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 *count, DWORD unk2 ); +DWORD WINAPI NsiEnumerateObjectsAllParameters( DWORD unk, DWORD unk2, const NPI_MODULEID *module, DWORD table, + 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 *count ); void WINAPI NsiFreeTable( void *key_data, void *rw_data, void *dynamic_data, void *static_data ); DWORD WINAPI NsiGetAllParameters( DWORD unk, const NPI_MODULEID *module, DWORD table, const void *key, DWORD key_size, void *rw_data, DWORD rw_size, void *dynamic_data, DWORD dynamic_size, -- 2.23.0

1 0

[PATCH v2 2/5] nsi: Add a stub implementation of NsiGetParameter().
by Huw Davies 28 Jun '21

28 Jun '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/nsi/nsi.c | 8 ++++++++ dlls/nsi/nsi.spec | 2 +- dlls/nsi/tests/nsi.c | 23 +++++++++++++++++++++++ include/wine/nsi.h | 7 +++++++ 4 files changed, 39 insertions(+), 1 deletion(-) diff --git a/dlls/nsi/nsi.c b/dlls/nsi/nsi.c index 3691dd5ad2b..bf52fe248c8 100644 --- a/dlls/nsi/nsi.c +++ b/dlls/nsi/nsi.c @@ -51,3 +51,11 @@ DWORD WINAPI NsiGetAllParameters( DWORD unk, const NPI_MODULEID *module, DWORD t rw_data, rw_size, dynamic_data, dynamic_size, static_data, static_size ); return ERROR_CALL_NOT_IMPLEMENTED; } + +DWORD WINAPI NsiGetParameter( DWORD unk, const NPI_MODULEID *module, DWORD table, const void *key, DWORD key_size, + DWORD param_type, void *data, DWORD data_size, DWORD data_offset ) +{ + FIXME( "%d %p %d %p %d %d %p %d %d: stub\n", unk, module, table, key, key_size, + param_type, data, data_size, data_offset ); + return ERROR_CALL_NOT_IMPLEMENTED; +} diff --git a/dlls/nsi/nsi.spec b/dlls/nsi/nsi.spec index 7db46c83e94..46757988146 100644 --- a/dlls/nsi/nsi.spec +++ b/dlls/nsi/nsi.spec @@ -12,7 +12,7 @@ @ stub NsiGetAllParametersEx @ stub NsiGetAllPersistentParametersWithMask @ stub NsiObjectSecurity -@ stub NsiGetParameter +@ stdcall NsiGetParameter(long ptr long ptr long long ptr long long) @ stub NsiGetParameterEx @ stub NsiRegisterChangeNotification @ stub NsiRegisterChangeNotificationEx diff --git a/dlls/nsi/tests/nsi.c b/dlls/nsi/tests/nsi.c index e0c0fcf168b..72c9dcdccbd 100644 --- a/dlls/nsi/tests/nsi.c +++ b/dlls/nsi/tests/nsi.c @@ -75,6 +75,29 @@ todo_wine ok( get_dyn.oper_status == dyn->oper_status, "mismatch\n" ); ok( get_stat.if_index == stat->if_index, "mismatch\n" ); ok( IsEqualGUID( &get_stat.if_guid, &stat->if_guid ), "mismatch\n" ); + + memset( &get_rw, 0xcc, sizeof(get_rw) ); + memset( &get_dyn, 0xcc, sizeof(get_dyn) ); + memset( &get_stat, 0xcc, sizeof(get_stat) ); + + err = NsiGetParameter( 1, &NPI_MS_NDIS_MODULEID, NSI_NDIS_IFINFO_TABLE, luid_tbl + i, sizeof(*luid_tbl), + NSI_PARAM_TYPE_RW, &get_rw.alias, sizeof(get_rw.alias), + FIELD_OFFSET(struct nsi_ndis_ifinfo_rw, alias) ); + ok( !err, "got %d\n", err ); + ok( get_rw.alias.Length == rw->alias.Length, "mismatch\n" ); + ok( !memcmp( get_rw.alias.String, rw->alias.String, rw->alias.Length ), "mismatch\n" ); + + err = NsiGetParameter( 1, &NPI_MS_NDIS_MODULEID, NSI_NDIS_IFINFO_TABLE, luid_tbl + i, sizeof(*luid_tbl), + NSI_PARAM_TYPE_STATIC, &get_stat.if_index, sizeof(get_stat.if_index), + FIELD_OFFSET(struct nsi_ndis_ifinfo_static, if_index) ); + ok( !err, "got %d\n", err ); + ok( get_stat.if_index == stat->if_index, "mismatch\n" ); + + err = NsiGetParameter( 1, &NPI_MS_NDIS_MODULEID, NSI_NDIS_IFINFO_TABLE, luid_tbl + i, sizeof(*luid_tbl), + NSI_PARAM_TYPE_STATIC, &get_stat.if_guid, sizeof(get_stat.if_guid), + FIELD_OFFSET(struct nsi_ndis_ifinfo_static, if_guid) ); + ok( !err, "got %d\n", err ); + ok( IsEqualGUID( &get_stat.if_guid, &stat->if_guid ), "mismatch\n" ); winetest_pop_context(); } diff --git a/include/wine/nsi.h b/include/wine/nsi.h index 547ed91ce41..e0370b00d41 100644 --- a/include/wine/nsi.h +++ b/include/wine/nsi.h @@ -93,6 +93,11 @@ struct nsi_ndis_ifinfo_static }; /* Undocumented Nsi api */ + +#define NSI_PARAM_TYPE_RW 0 +#define NSI_PARAM_TYPE_DYNAMIC 1 +#define NSI_PARAM_TYPE_STATIC 2 + DWORD WINAPI NsiAllocateAndGetTable( DWORD unk, const NPI_MODULEID *module, DWORD table, 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 *count, DWORD unk2 ); @@ -100,5 +105,7 @@ void WINAPI NsiFreeTable( void *key_data, void *rw_data, void *dynamic_data, voi DWORD WINAPI NsiGetAllParameters( DWORD unk, const NPI_MODULEID *module, DWORD table, const void *key, DWORD key_size, void *rw_data, DWORD rw_size, void *dynamic_data, DWORD dynamic_size, void *static_data, DWORD static_size ); +DWORD WINAPI NsiGetParameter( DWORD unk, const NPI_MODULEID *module, DWORD table, const void *key, DWORD key_size, + DWORD param_type, void *data, DWORD data_size, DWORD data_offset ); #endif /* __WINE_NSI_H */ -- 2.23.0

1 0

[PATCH v2 1/5] nsi: Add a stub implementation of NsiGetAllParameters().
by Huw Davies 28 Jun '21

28 Jun '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/nsi/nsi.c | 9 ++++++++ dlls/nsi/nsi.spec | 2 +- dlls/nsi/tests/nsi.c | 50 ++++++++++++++++++++++++++++++++++++++++++++ include/wine/nsi.h | 3 +++ 4 files changed, 63 insertions(+), 1 deletion(-) diff --git a/dlls/nsi/nsi.c b/dlls/nsi/nsi.c index d55445a3dd7..3691dd5ad2b 100644 --- a/dlls/nsi/nsi.c +++ b/dlls/nsi/nsi.c @@ -42,3 +42,12 @@ void WINAPI NsiFreeTable( void *key_data, void *rw_data, void *dynamic_data, voi { FIXME( "%p %p %p %p: stub\n", key_data, rw_data, dynamic_data, static_data ); } + +DWORD WINAPI NsiGetAllParameters( DWORD unk, const NPI_MODULEID *module, DWORD table, const void *key, DWORD key_size, + void *rw_data, DWORD rw_size, void *dynamic_data, DWORD dynamic_size, + void *static_data, DWORD static_size ) +{ + FIXME( "%d %p %d %p %d %p %d %p %d %p %d: stub\n", unk, module, table, key, key_size, + rw_data, rw_size, dynamic_data, dynamic_size, static_data, static_size ); + return ERROR_CALL_NOT_IMPLEMENTED; +} diff --git a/dlls/nsi/nsi.spec b/dlls/nsi/nsi.spec index fc2db9e35c1..7db46c83e94 100644 --- a/dlls/nsi/nsi.spec +++ b/dlls/nsi/nsi.spec @@ -8,7 +8,7 @@ @ stub NsiEnumerateObjectsAllPersistentParametersWithMask @ stub NsiFreePersistentDataWithMaskTable @ stdcall NsiFreeTable(ptr ptr ptr ptr) -@ stub NsiGetAllParameters +@ stdcall NsiGetAllParameters(long ptr long ptr long ptr long ptr long ptr long) @ stub NsiGetAllParametersEx @ stub NsiGetAllPersistentParametersWithMask @ stub NsiObjectSecurity diff --git a/dlls/nsi/tests/nsi.c b/dlls/nsi/tests/nsi.c index 0cdb1993f1c..e0c0fcf168b 100644 --- a/dlls/nsi/tests/nsi.c +++ b/dlls/nsi/tests/nsi.c @@ -33,6 +33,54 @@ static int bounded( ULONG64 val, ULONG64 lo, ULONG64 hi ) return lo <= val && val <= hi; } +static void test_nsi_api( void ) +{ + DWORD rw_sizes[] = { FIELD_OFFSET(struct nsi_ndis_ifinfo_rw, name2), FIELD_OFFSET(struct nsi_ndis_ifinfo_rw, unk), + sizeof(struct nsi_ndis_ifinfo_rw) }; + struct nsi_ndis_ifinfo_rw *rw_tbl, *rw, get_rw; + struct nsi_ndis_ifinfo_dynamic *dyn_tbl, *dyn, get_dyn; + struct nsi_ndis_ifinfo_static *stat_tbl, *stat, get_stat; + DWORD err, count, i, rw_size; + NET_LUID *luid_tbl; + + /* Use the NDIS ifinfo table to test various api */ + for (i = 0; i < ARRAY_SIZE(rw_sizes); i++) + { + err = NsiAllocateAndGetTable( 1, &NPI_MS_NDIS_MODULEID, NSI_NDIS_IFINFO_TABLE, (void **)&luid_tbl, sizeof(*luid_tbl), + (void **)&rw_tbl, rw_sizes[i], (void **)&dyn_tbl, sizeof(*dyn_tbl), + (void **)&stat_tbl, sizeof(*stat_tbl), &count, 0 ); + if (!err) break; + } +todo_wine + ok( !err, "got %d\n", err ); + if (err) return; + rw_size = rw_sizes[i]; + + for (i = 0; i < count; i++) + { + winetest_push_context( "%d", i ); + rw = (struct nsi_ndis_ifinfo_rw *)((BYTE *)rw_tbl + i * rw_size); + dyn = dyn_tbl + i; + stat = stat_tbl + i; + + err = NsiGetAllParameters( 1, &NPI_MS_NDIS_MODULEID, NSI_NDIS_IFINFO_TABLE, luid_tbl + i, sizeof(*luid_tbl), + &get_rw, rw_size, &get_dyn, sizeof(get_dyn), &get_stat, sizeof(get_stat) ); + ok( !err, "got %d\n", err ); + /* test a selection of members */ + ok( IsEqualGUID( &get_rw.network_guid, &rw->network_guid ), "mismatch\n" ); + ok( get_rw.alias.Length == rw->alias.Length, "mismatch\n" ); + ok( !memcmp( get_rw.alias.String, rw->alias.String, rw->alias.Length ), "mismatch\n" ); + ok( get_rw.phys_addr.Length == rw->phys_addr.Length, "mismatch\n" ); + ok( !memcmp( get_rw.phys_addr.Address, rw->phys_addr.Address, IF_MAX_PHYS_ADDRESS_LENGTH ), "mismatch\n" ); + ok( get_dyn.oper_status == dyn->oper_status, "mismatch\n" ); + ok( get_stat.if_index == stat->if_index, "mismatch\n" ); + ok( IsEqualGUID( &get_stat.if_guid, &stat->if_guid ), "mismatch\n" ); + winetest_pop_context(); + } + + NsiFreeTable( luid_tbl, rw_tbl, dyn_tbl, stat_tbl ); +} + static void test_ndis_ifinfo( void ) { DWORD rw_sizes[] = { FIELD_OFFSET(struct nsi_ndis_ifinfo_rw, name2), FIELD_OFFSET(struct nsi_ndis_ifinfo_rw, unk), @@ -145,5 +193,7 @@ todo_wine START_TEST( nsi ) { + test_nsi_api(); + test_ndis_ifinfo(); } diff --git a/include/wine/nsi.h b/include/wine/nsi.h index 362eaed0c4e..547ed91ce41 100644 --- a/include/wine/nsi.h +++ b/include/wine/nsi.h @@ -97,5 +97,8 @@ DWORD WINAPI NsiAllocateAndGetTable( DWORD unk, const NPI_MODULEID *module, DWOR void **rw_data, DWORD rw_size, void **dynamic_data, DWORD dynamic_size, void **static_data, DWORD static_size, DWORD *count, DWORD unk2 ); void WINAPI NsiFreeTable( void *key_data, void *rw_data, void *dynamic_data, void *static_data ); +DWORD WINAPI NsiGetAllParameters( DWORD unk, const NPI_MODULEID *module, DWORD table, const void *key, DWORD key_size, + void *rw_data, DWORD rw_size, void *dynamic_data, DWORD dynamic_size, + void *static_data, DWORD static_size ); #endif /* __WINE_NSI_H */ -- 2.23.0

1 0

[PATCH 3/5] nsi: Add a stub implementation of NsiEnumerateObjectsAllParameters().
by Huw Davies 28 Jun '21

28 Jun '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/nsi/nsi.c | 10 ++++++ dlls/nsi/nsi.spec | 2 +- dlls/nsi/tests/nsi.c | 72 +++++++++++++++++++++++++++++++++++++++++--- include/wine/nsi.h | 4 +++ 4 files changed, 82 insertions(+), 6 deletions(-) diff --git a/dlls/nsi/nsi.c b/dlls/nsi/nsi.c index bf52fe248c8..66054ffacd6 100644 --- a/dlls/nsi/nsi.c +++ b/dlls/nsi/nsi.c @@ -38,6 +38,16 @@ DWORD WINAPI NsiAllocateAndGetTable( DWORD unk, const NPI_MODULEID *module, DWOR return ERROR_CALL_NOT_IMPLEMENTED; } +DWORD WINAPI NsiEnumerateObjectsAllParameters( DWORD unk, DWORD unk2, const NPI_MODULEID *module, DWORD table, + 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 *count ) +{ + FIXME( "%d %d %p %d %p %d %p %d %p %d %p %d %p: stub\n", unk, unk2, module, table, key_data, key_size, + rw_data, rw_size, dynamic_data, dynamic_size, static_data, static_size, count ); + return ERROR_CALL_NOT_IMPLEMENTED; +} + void WINAPI NsiFreeTable( void *key_data, void *rw_data, void *dynamic_data, void *static_data ) { FIXME( "%p %p %p %p: stub\n", key_data, rw_data, dynamic_data, static_data ); diff --git a/dlls/nsi/nsi.spec b/dlls/nsi/nsi.spec index 46757988146..d4a29c38fe6 100644 --- a/dlls/nsi/nsi.spec +++ b/dlls/nsi/nsi.spec @@ -3,7 +3,7 @@ @ stub NsiCancelChangeNotification @ stub NsiDeregisterChangeNotification @ stub NsiDeregisterChangeNotificationEx -@ stub NsiEnumerateObjectsAllParameters +@ stdcall NsiEnumerateObjectsAllParameters(long long ptr long ptr long ptr long ptr long ptr long ptr) @ stub NsiEnumerateObjectsAllParametersEx @ stub NsiEnumerateObjectsAllPersistentParametersWithMask @ stub NsiFreePersistentDataWithMaskTable diff --git a/dlls/nsi/tests/nsi.c b/dlls/nsi/tests/nsi.c index 72c9dcdccbd..b1befd548cd 100644 --- a/dlls/nsi/tests/nsi.c +++ b/dlls/nsi/tests/nsi.c @@ -37,11 +37,11 @@ static void test_nsi_api( void ) { DWORD rw_sizes[] = { FIELD_OFFSET(struct nsi_ndis_ifinfo_rw, name2), FIELD_OFFSET(struct nsi_ndis_ifinfo_rw, unk), sizeof(struct nsi_ndis_ifinfo_rw) }; - struct nsi_ndis_ifinfo_rw *rw_tbl, *rw, get_rw; - struct nsi_ndis_ifinfo_dynamic *dyn_tbl, *dyn, get_dyn; - struct nsi_ndis_ifinfo_static *stat_tbl, *stat, get_stat; - DWORD err, count, i, rw_size; - NET_LUID *luid_tbl; + struct nsi_ndis_ifinfo_rw *rw_tbl, *rw, get_rw, *enum_rw_tbl, *enum_rw; + struct nsi_ndis_ifinfo_dynamic *dyn_tbl, *dyn, get_dyn, *enum_dyn_tbl, *enum_dyn; + struct nsi_ndis_ifinfo_static *stat_tbl, *stat, get_stat, *enum_stat_tbl, *enum_stat; + DWORD err, count, i, rw_size, enum_count; + NET_LUID *luid_tbl, *enum_luid_tbl; /* Use the NDIS ifinfo table to test various api */ for (i = 0; i < ARRAY_SIZE(rw_sizes); i++) @@ -101,6 +101,68 @@ todo_wine winetest_pop_context(); } + enum_count = 0; + err = NsiEnumerateObjectsAllParameters( 1, 1, &NPI_MS_NDIS_MODULEID, NSI_NDIS_IFINFO_TABLE, + NULL, 0, NULL, 0, + NULL, 0, NULL, 0, &enum_count ); + ok( !err, "got %d\n", err ); + ok( enum_count == count, "mismatch\n" ); + + enum_luid_tbl = malloc( count * sizeof(*enum_luid_tbl) ); + enum_rw_tbl = malloc( count * rw_size ); + enum_dyn_tbl = malloc( count * sizeof(*enum_dyn_tbl) ); + enum_stat_tbl = malloc( count * sizeof(*enum_stat_tbl) ); + + err = NsiEnumerateObjectsAllParameters( 1, 1, &NPI_MS_NDIS_MODULEID, NSI_NDIS_IFINFO_TABLE, + enum_luid_tbl, sizeof(*enum_luid_tbl), enum_rw_tbl, rw_size, + enum_dyn_tbl, sizeof(*enum_dyn_tbl), enum_stat_tbl, sizeof(*enum_stat_tbl), + &enum_count ); + ok( !err, "got %d\n", err ); + ok( enum_count == count, "mismatch\n" ); + + for (i = 0; i < count; i++) + { + winetest_push_context( "%d", i ); + rw = (struct nsi_ndis_ifinfo_rw *)((BYTE *)rw_tbl + i * rw_size); + enum_rw = (struct nsi_ndis_ifinfo_rw *)((BYTE *)enum_rw_tbl + i * rw_size); + dyn = dyn_tbl + i; + enum_dyn = enum_dyn_tbl + i; + stat = stat_tbl + i; + enum_stat = enum_stat_tbl + i; + + /* test a selection of members */ + ok( enum_luid_tbl[i].Value == luid_tbl[i].Value, "mismatch\n" ); + ok( IsEqualGUID( &enum_rw->network_guid, &rw->network_guid ), "mismatch\n" ); + ok( enum_rw->alias.Length == rw->alias.Length, "mismatch\n" ); + ok( !memcmp( enum_rw->alias.String, rw->alias.String, rw->alias.Length ), "mismatch\n" ); + ok( enum_rw->phys_addr.Length == rw->phys_addr.Length, "mismatch\n" ); + ok( !memcmp( enum_rw->phys_addr.Address, rw->phys_addr.Address, IF_MAX_PHYS_ADDRESS_LENGTH ), "mismatch\n" ); + ok( enum_dyn->oper_status == dyn->oper_status, "mismatch\n" ); + ok( enum_stat->if_index == stat->if_index, "mismatch\n" ); + ok( IsEqualGUID( &enum_stat->if_guid, &stat->if_guid ), "mismatch\n" ); + winetest_pop_context(); + } + + if (count > 0) + { + enum_count--; + memset( enum_luid_tbl, 0xcc, count * sizeof(*enum_luid_tbl) ); + + err = NsiEnumerateObjectsAllParameters( 1, 1, &NPI_MS_NDIS_MODULEID, NSI_NDIS_IFINFO_TABLE, + enum_luid_tbl, sizeof(*enum_luid_tbl), enum_rw_tbl, rw_size, + enum_dyn_tbl, sizeof(*enum_dyn_tbl), enum_stat_tbl, sizeof(*enum_stat_tbl), + &enum_count ); + ok( err == ERROR_MORE_DATA, "got %d\n", err ); + ok( enum_count == count - 1, "mismatch\n" ); + + for (i = 0; i < enum_count; i++) /* for simplicity just check the luids */ + ok( enum_luid_tbl[i].Value == luid_tbl[i].Value, "%d: mismatch\n", i ); + } + + free( enum_luid_tbl ); + free( enum_rw_tbl ); + free( enum_dyn_tbl ); + free( enum_stat_tbl ); NsiFreeTable( luid_tbl, rw_tbl, dyn_tbl, stat_tbl ); } diff --git a/include/wine/nsi.h b/include/wine/nsi.h index 8b276e76b82..8fd16dd9d97 100644 --- a/include/wine/nsi.h +++ b/include/wine/nsi.h @@ -96,6 +96,10 @@ struct nsi_ndis_ifinfo_static DWORD WINAPI NsiAllocateAndGetTable( DWORD unk, const NPI_MODULEID *module, DWORD table, 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 *count, DWORD unk2 ); +DWORD WINAPI NsiEnumerateObjectsAllParameters( DWORD unk, DWORD unk2, const NPI_MODULEID *module, DWORD table, + 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 *count ); void WINAPI NsiFreeTable( void *key_data, void *rw_data, void *dynamic_data, void *static_data ); DWORD WINAPI NsiGetAllParameters( DWORD unk, const NPI_MODULEID *module, DWORD table, const void *key, DWORD key_size, void *rw_data, DWORD rw_size, void *dynamic_data, DWORD dynamic_size, -- 2.23.0

2 1

[PATCH 5/5] nsi: Add a stub implementation of NsiGetAllParametersEx().
by Huw Davies 28 Jun '21

28 Jun '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/nsi/nsi.c | 23 +++++++++++++++++++++++ dlls/nsi/nsi.spec | 2 +- dlls/nsi/tests/nsi.c | 30 ++++++++++++++++++++++++++++++ include/wine/nsi.h | 18 ++++++++++++++++++ 4 files changed, 72 insertions(+), 1 deletion(-) diff --git a/dlls/nsi/nsi.c b/dlls/nsi/nsi.c index 1ed0cfad916..4e55721475b 100644 --- a/dlls/nsi/nsi.c +++ b/dlls/nsi/nsi.c @@ -84,8 +84,31 @@ DWORD WINAPI NsiGetAllParameters( DWORD unk, const NPI_MODULEID *module, DWORD t void *rw_data, DWORD rw_size, void *dynamic_data, DWORD dynamic_size, void *static_data, DWORD static_size ) { + struct nsi_get_all_parameters_ex params; + FIXME( "%d %p %d %p %d %p %d %p %d %p %d: stub\n", unk, module, table, key, key_size, rw_data, rw_size, dynamic_data, dynamic_size, static_data, static_size ); + + params.unknown[0] = 0; + params.unknown[1] = 0; + params.module = module; + params.table = table; + params.first_arg = unk; + params.unknown2 = 0; + params.key = key; + params.key_size = key_size; + params.rw_data = rw_data; + params.rw_size = rw_size; + params.dynamic_data = dynamic_data; + params.dynamic_size = dynamic_size; + params.static_data = static_data; + params.static_size = static_size; + + return NsiGetAllParametersEx( &params ); +} + +DWORD WINAPI NsiGetAllParametersEx( struct nsi_get_all_parameters_ex *params ) +{ return ERROR_CALL_NOT_IMPLEMENTED; } diff --git a/dlls/nsi/nsi.spec b/dlls/nsi/nsi.spec index 912a5e8d052..376d25438aa 100644 --- a/dlls/nsi/nsi.spec +++ b/dlls/nsi/nsi.spec @@ -9,7 +9,7 @@ @ stub NsiFreePersistentDataWithMaskTable @ stdcall NsiFreeTable(ptr ptr ptr ptr) @ stdcall NsiGetAllParameters(long ptr long ptr long ptr long ptr long ptr long) -@ stub NsiGetAllParametersEx +@ stdcall NsiGetAllParametersEx(ptr) @ stub NsiGetAllPersistentParametersWithMask @ stub NsiObjectSecurity @ stdcall NsiGetParameter(long ptr long ptr long long ptr long long) diff --git a/dlls/nsi/tests/nsi.c b/dlls/nsi/tests/nsi.c index 5e2ea71646c..7c2c57b9548 100644 --- a/dlls/nsi/tests/nsi.c +++ b/dlls/nsi/tests/nsi.c @@ -40,6 +40,7 @@ static void test_nsi_api( void ) struct nsi_ndis_ifinfo_rw *rw_tbl, *rw, get_rw, *enum_rw_tbl, *enum_rw; struct nsi_ndis_ifinfo_dynamic *dyn_tbl, *dyn, get_dyn, *enum_dyn_tbl, *enum_dyn; struct nsi_ndis_ifinfo_static *stat_tbl, *stat, get_stat, *enum_stat_tbl, *enum_stat; + struct nsi_get_all_parameters_ex get_all_params; struct nsi_enumerate_all_ex enum_params; DWORD err, count, i, rw_size, enum_count; NET_LUID *luid_tbl, *enum_luid_tbl; @@ -81,6 +82,35 @@ todo_wine memset( &get_dyn, 0xcc, sizeof(get_dyn) ); memset( &get_stat, 0xcc, sizeof(get_stat) ); + memset( &get_all_params, 0, sizeof(get_all_params) ); + get_all_params.first_arg = 1; + get_all_params.module = &NPI_MS_NDIS_MODULEID; + get_all_params.table = NSI_NDIS_IFINFO_TABLE; + get_all_params.key = luid_tbl + i; + get_all_params.key_size = sizeof(*luid_tbl); + get_all_params.rw_data = &get_rw; + get_all_params.rw_size = rw_size; + get_all_params.dynamic_data = &get_dyn; + get_all_params.dynamic_size = sizeof(get_dyn); + get_all_params.static_data = &get_stat; + get_all_params.static_size = sizeof(get_stat); + + err = NsiGetAllParametersEx( &get_all_params ); + ok( !err, "got %d\n", err ); + /* test a selection of members */ + ok( IsEqualGUID( &get_rw.network_guid, &rw->network_guid ), "mismatch\n" ); + ok( get_rw.alias.Length == rw->alias.Length, "mismatch\n" ); + ok( !memcmp( get_rw.alias.String, rw->alias.String, rw->alias.Length ), "mismatch\n" ); + ok( get_rw.phys_addr.Length == rw->phys_addr.Length, "mismatch\n" ); + ok( !memcmp( get_rw.phys_addr.Address, rw->phys_addr.Address, IF_MAX_PHYS_ADDRESS_LENGTH ), "mismatch\n" ); + ok( get_dyn.oper_status == dyn->oper_status, "mismatch\n" ); + ok( get_stat.if_index == stat->if_index, "mismatch\n" ); + ok( IsEqualGUID( &get_stat.if_guid, &stat->if_guid ), "mismatch\n" ); + + memset( &get_rw, 0xcc, sizeof(get_rw) ); + memset( &get_dyn, 0xcc, sizeof(get_dyn) ); + memset( &get_stat, 0xcc, sizeof(get_stat) ); + err = NsiGetParameter( 1, &NPI_MS_NDIS_MODULEID, NSI_NDIS_IFINFO_TABLE, luid_tbl + i, sizeof(*luid_tbl), NSI_PARAM_TYPE_RW, &get_rw.alias, sizeof(get_rw.alias), FIELD_OFFSET(struct nsi_ndis_ifinfo_rw, alias) ); diff --git a/include/wine/nsi.h b/include/wine/nsi.h index 999b8a57810..81d221324e9 100644 --- a/include/wine/nsi.h +++ b/include/wine/nsi.h @@ -116,6 +116,23 @@ struct nsi_enumerate_all_ex DWORD_PTR count; }; +struct nsi_get_all_parameters_ex +{ + void *unknown[2]; + const NPI_MODULEID *module; + DWORD_PTR table; + DWORD first_arg; + DWORD unknown2; + const void *key; + DWORD key_size; + void *rw_data; + DWORD rw_size; + void *dynamic_data; + DWORD dynamic_size; + void *static_data; + DWORD static_size; +}; + DWORD WINAPI NsiAllocateAndGetTable( DWORD unk, const NPI_MODULEID *module, DWORD table, 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 *count, DWORD unk2 ); @@ -128,6 +145,7 @@ void WINAPI NsiFreeTable( void *key_data, void *rw_data, void *dynamic_data, voi DWORD WINAPI NsiGetAllParameters( DWORD unk, const NPI_MODULEID *module, DWORD table, const void *key, DWORD key_size, void *rw_data, DWORD rw_size, void *dynamic_data, DWORD dynamic_size, void *static_data, DWORD static_size ); +DWORD WINAPI NsiGetAllParametersEx( struct nsi_get_all_parameters_ex *params ); DWORD WINAPI NsiGetParameter( DWORD unk, const NPI_MODULEID *module, DWORD table, const void *key, DWORD key_size, DWORD param_type, void *data, DWORD data_size, DWORD data_offset ); -- 2.23.0

1 0

[PATCH 4/5] nsi: Add a stub implementation of NsiEnumerateObjectsAllParametersEx().
by Huw Davies 28 Jun '21

28 Jun '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/nsi/nsi.c | 27 +++++++++++++++++++++++++++ dlls/nsi/nsi.spec | 2 +- dlls/nsi/tests/nsi.c | 20 ++++++++++++++++++++ include/wine/nsi.h | 24 ++++++++++++++++++++++++ 4 files changed, 72 insertions(+), 1 deletion(-) diff --git a/dlls/nsi/nsi.c b/dlls/nsi/nsi.c index 66054ffacd6..1ed0cfad916 100644 --- a/dlls/nsi/nsi.c +++ b/dlls/nsi/nsi.c @@ -43,8 +43,35 @@ DWORD WINAPI NsiEnumerateObjectsAllParameters( DWORD unk, DWORD unk2, const NPI_ void *dynamic_data, DWORD dynamic_size, void *static_data, DWORD static_size, DWORD *count ) { + struct nsi_enumerate_all_ex params; + DWORD err; + FIXME( "%d %d %p %d %p %d %p %d %p %d %p %d %p: stub\n", unk, unk2, module, table, key_data, key_size, rw_data, rw_size, dynamic_data, dynamic_size, static_data, static_size, count ); + + params.unknown[0] = 0; + params.unknown[1] = 0; + params.module = module; + params.table = table; + params.first_arg = unk; + params.second_arg = unk2; + params.key_data = key_data; + params.key_size = key_size; + params.rw_data = rw_data; + params.rw_size = rw_size; + params.dynamic_data = dynamic_data; + params.dynamic_size = dynamic_size; + params.static_data = static_data; + params.static_size = static_size; + params.count = *count; + + err = NsiEnumerateObjectsAllParametersEx( &params ); + *count = params.count; + return err; +} + +DWORD WINAPI NsiEnumerateObjectsAllParametersEx( struct nsi_enumerate_all_ex *params ) +{ return ERROR_CALL_NOT_IMPLEMENTED; } diff --git a/dlls/nsi/nsi.spec b/dlls/nsi/nsi.spec index d4a29c38fe6..912a5e8d052 100644 --- a/dlls/nsi/nsi.spec +++ b/dlls/nsi/nsi.spec @@ -4,7 +4,7 @@ @ stub NsiDeregisterChangeNotification @ stub NsiDeregisterChangeNotificationEx @ stdcall NsiEnumerateObjectsAllParameters(long long ptr long ptr long ptr long ptr long ptr long ptr) -@ stub NsiEnumerateObjectsAllParametersEx +@ stdcall NsiEnumerateObjectsAllParametersEx(ptr) @ stub NsiEnumerateObjectsAllPersistentParametersWithMask @ stub NsiFreePersistentDataWithMaskTable @ stdcall NsiFreeTable(ptr ptr ptr ptr) diff --git a/dlls/nsi/tests/nsi.c b/dlls/nsi/tests/nsi.c index b1befd548cd..5e2ea71646c 100644 --- a/dlls/nsi/tests/nsi.c +++ b/dlls/nsi/tests/nsi.c @@ -40,6 +40,7 @@ static void test_nsi_api( void ) struct nsi_ndis_ifinfo_rw *rw_tbl, *rw, get_rw, *enum_rw_tbl, *enum_rw; struct nsi_ndis_ifinfo_dynamic *dyn_tbl, *dyn, get_dyn, *enum_dyn_tbl, *enum_dyn; struct nsi_ndis_ifinfo_static *stat_tbl, *stat, get_stat, *enum_stat_tbl, *enum_stat; + struct nsi_enumerate_all_ex enum_params; DWORD err, count, i, rw_size, enum_count; NET_LUID *luid_tbl, *enum_luid_tbl; @@ -159,6 +160,25 @@ todo_wine ok( enum_luid_tbl[i].Value == luid_tbl[i].Value, "%d: mismatch\n", i ); } + memset( &enum_params, 0, sizeof(enum_params) ); + enum_params.first_arg = 1; + enum_params.second_arg = 1; + enum_params.module = &NPI_MS_NDIS_MODULEID; + enum_params.table = NSI_NDIS_IFINFO_TABLE; + enum_params.key_data = enum_luid_tbl; + enum_params.key_size = sizeof(*enum_luid_tbl); + enum_params.rw_data = enum_rw_tbl; + enum_params.rw_size = rw_size; + enum_params.dynamic_data = enum_dyn_tbl; + enum_params.dynamic_size = sizeof(*enum_dyn_tbl); + enum_params.static_data = enum_stat_tbl; + enum_params.static_size = sizeof(*enum_stat_tbl); + enum_params.count = count; + + err = NsiEnumerateObjectsAllParametersEx( &enum_params ); + ok( !err, "got %d\n", err ); + ok( enum_params.count == count, "mismatch\n" ); + free( enum_luid_tbl ); free( enum_rw_tbl ); free( enum_dyn_tbl ); diff --git a/include/wine/nsi.h b/include/wine/nsi.h index 8fd16dd9d97..999b8a57810 100644 --- a/include/wine/nsi.h +++ b/include/wine/nsi.h @@ -93,6 +93,29 @@ struct nsi_ndis_ifinfo_static }; /* Undocumented Nsi api */ + +#define NSI_PARAM_TYPE_RW 0 +#define NSI_PARAM_TYPE_DYNAMIC 1 +#define NSI_PARAM_TYPE_STATIC 2 + +struct nsi_enumerate_all_ex +{ + void *unknown[2]; + const NPI_MODULEID *module; + DWORD_PTR table; + DWORD first_arg; + DWORD second_arg; + 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 WINAPI NsiAllocateAndGetTable( DWORD unk, const NPI_MODULEID *module, DWORD table, 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 *count, DWORD unk2 ); @@ -100,6 +123,7 @@ DWORD WINAPI NsiEnumerateObjectsAllParameters( DWORD unk, DWORD unk2, const NPI_ 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 *count ); +DWORD WINAPI NsiEnumerateObjectsAllParametersEx( struct nsi_enumerate_all_ex *params ); void WINAPI NsiFreeTable( void *key_data, void *rw_data, void *dynamic_data, void *static_data ); DWORD WINAPI NsiGetAllParameters( DWORD unk, const NPI_MODULEID *module, DWORD table, const void *key, DWORD key_size, void *rw_data, DWORD rw_size, void *dynamic_data, DWORD dynamic_size, -- 2.23.0

1 0

[PATCH 1/5] nsi: Add a stub implementation of NsiGetAllParameters().
by Huw Davies 28 Jun '21

28 Jun '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/nsi/nsi.c | 9 ++++++++ dlls/nsi/nsi.spec | 2 +- dlls/nsi/tests/nsi.c | 50 ++++++++++++++++++++++++++++++++++++++++++++ include/wine/nsi.h | 3 +++ 4 files changed, 63 insertions(+), 1 deletion(-) diff --git a/dlls/nsi/nsi.c b/dlls/nsi/nsi.c index d55445a3dd7..3691dd5ad2b 100644 --- a/dlls/nsi/nsi.c +++ b/dlls/nsi/nsi.c @@ -42,3 +42,12 @@ void WINAPI NsiFreeTable( void *key_data, void *rw_data, void *dynamic_data, voi { FIXME( "%p %p %p %p: stub\n", key_data, rw_data, dynamic_data, static_data ); } + +DWORD WINAPI NsiGetAllParameters( DWORD unk, const NPI_MODULEID *module, DWORD table, const void *key, DWORD key_size, + void *rw_data, DWORD rw_size, void *dynamic_data, DWORD dynamic_size, + void *static_data, DWORD static_size ) +{ + FIXME( "%d %p %d %p %d %p %d %p %d %p %d: stub\n", unk, module, table, key, key_size, + rw_data, rw_size, dynamic_data, dynamic_size, static_data, static_size ); + return ERROR_CALL_NOT_IMPLEMENTED; +} diff --git a/dlls/nsi/nsi.spec b/dlls/nsi/nsi.spec index fc2db9e35c1..7db46c83e94 100644 --- a/dlls/nsi/nsi.spec +++ b/dlls/nsi/nsi.spec @@ -8,7 +8,7 @@ @ stub NsiEnumerateObjectsAllPersistentParametersWithMask @ stub NsiFreePersistentDataWithMaskTable @ stdcall NsiFreeTable(ptr ptr ptr ptr) -@ stub NsiGetAllParameters +@ stdcall NsiGetAllParameters(long ptr long ptr long ptr long ptr long ptr long) @ stub NsiGetAllParametersEx @ stub NsiGetAllPersistentParametersWithMask @ stub NsiObjectSecurity diff --git a/dlls/nsi/tests/nsi.c b/dlls/nsi/tests/nsi.c index 0cdb1993f1c..e0c0fcf168b 100644 --- a/dlls/nsi/tests/nsi.c +++ b/dlls/nsi/tests/nsi.c @@ -33,6 +33,54 @@ static int bounded( ULONG64 val, ULONG64 lo, ULONG64 hi ) return lo <= val && val <= hi; } +static void test_nsi_api( void ) +{ + DWORD rw_sizes[] = { FIELD_OFFSET(struct nsi_ndis_ifinfo_rw, name2), FIELD_OFFSET(struct nsi_ndis_ifinfo_rw, unk), + sizeof(struct nsi_ndis_ifinfo_rw) }; + struct nsi_ndis_ifinfo_rw *rw_tbl, *rw, get_rw; + struct nsi_ndis_ifinfo_dynamic *dyn_tbl, *dyn, get_dyn; + struct nsi_ndis_ifinfo_static *stat_tbl, *stat, get_stat; + DWORD err, count, i, rw_size; + NET_LUID *luid_tbl; + + /* Use the NDIS ifinfo table to test various api */ + for (i = 0; i < ARRAY_SIZE(rw_sizes); i++) + { + err = NsiAllocateAndGetTable( 1, &NPI_MS_NDIS_MODULEID, NSI_NDIS_IFINFO_TABLE, (void **)&luid_tbl, sizeof(*luid_tbl), + (void **)&rw_tbl, rw_sizes[i], (void **)&dyn_tbl, sizeof(*dyn_tbl), + (void **)&stat_tbl, sizeof(*stat_tbl), &count, 0 ); + if (!err) break; + } +todo_wine + ok( !err, "got %d\n", err ); + if (err) return; + rw_size = rw_sizes[i]; + + for (i = 0; i < count; i++) + { + winetest_push_context( "%d", i ); + rw = (struct nsi_ndis_ifinfo_rw *)((BYTE *)rw_tbl + i * rw_size); + dyn = dyn_tbl + i; + stat = stat_tbl + i; + + err = NsiGetAllParameters( 1, &NPI_MS_NDIS_MODULEID, NSI_NDIS_IFINFO_TABLE, luid_tbl + i, sizeof(*luid_tbl), + &get_rw, rw_size, &get_dyn, sizeof(get_dyn), &get_stat, sizeof(get_stat) ); + ok( !err, "got %d\n", err ); + /* test a selection of members */ + ok( IsEqualGUID( &get_rw.network_guid, &rw->network_guid ), "mismatch\n" ); + ok( get_rw.alias.Length == rw->alias.Length, "mismatch\n" ); + ok( !memcmp( get_rw.alias.String, rw->alias.String, rw->alias.Length ), "mismatch\n" ); + ok( get_rw.phys_addr.Length == rw->phys_addr.Length, "mismatch\n" ); + ok( !memcmp( get_rw.phys_addr.Address, rw->phys_addr.Address, IF_MAX_PHYS_ADDRESS_LENGTH ), "mismatch\n" ); + ok( get_dyn.oper_status == dyn->oper_status, "mismatch\n" ); + ok( get_stat.if_index == stat->if_index, "mismatch\n" ); + ok( IsEqualGUID( &get_stat.if_guid, &stat->if_guid ), "mismatch\n" ); + winetest_pop_context(); + } + + NsiFreeTable( luid_tbl, rw_tbl, dyn_tbl, stat_tbl ); +} + static void test_ndis_ifinfo( void ) { DWORD rw_sizes[] = { FIELD_OFFSET(struct nsi_ndis_ifinfo_rw, name2), FIELD_OFFSET(struct nsi_ndis_ifinfo_rw, unk), @@ -145,5 +193,7 @@ todo_wine START_TEST( nsi ) { + test_nsi_api(); + test_ndis_ifinfo(); } diff --git a/include/wine/nsi.h b/include/wine/nsi.h index 362eaed0c4e..547ed91ce41 100644 --- a/include/wine/nsi.h +++ b/include/wine/nsi.h @@ -97,5 +97,8 @@ DWORD WINAPI NsiAllocateAndGetTable( DWORD unk, const NPI_MODULEID *module, DWOR void **rw_data, DWORD rw_size, void **dynamic_data, DWORD dynamic_size, void **static_data, DWORD static_size, DWORD *count, DWORD unk2 ); void WINAPI NsiFreeTable( void *key_data, void *rw_data, void *dynamic_data, void *static_data ); +DWORD WINAPI NsiGetAllParameters( DWORD unk, const NPI_MODULEID *module, DWORD table, const void *key, DWORD key_size, + void *rw_data, DWORD rw_size, void *dynamic_data, DWORD dynamic_size, + void *static_data, DWORD static_size ); #endif /* __WINE_NSI_H */ -- 2.23.0

1 0

Frama-C Framework in Wine.
by Игорь Чебаненко 28 Jun '21

28 Jun '21

I don't know if you use it in your project,but if not,try. Wikipedia: https://en.wikipedia.org/wiki/Frama-C Website: https://frama-c.com/

1 0

[PATCH] qcap/vfwcapture: Set the correct allocator properties when connecting.
by Zebediah Figura 28 Jun '21

28 Jun '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/qcap/vfwcapture.c | 29 ++++++++++------------------- 1 file changed, 10 insertions(+), 19 deletions(-) diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index ae073b845e0..b048fff6b4a 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -193,14 +193,6 @@ static HRESULT vfw_capture_init_stream(struct strmbase_filter *iface) ALLOCATOR_PROPERTIES req_props, ret_props; HRESULT hr; - req_props.cBuffers = 3; - req_props.cbBuffer = get_image_size(filter); - req_props.cbAlign = 1; - req_props.cbPrefix = 0; - if (FAILED(hr = IMemAllocator_SetProperties(filter->source.pAllocator, &req_props, &ret_props)) - && hr != VFW_E_ALREADY_COMMITTED) - ERR("Failed to set allocator properties (buffer size %u), hr %#x.\n", req_props.cbBuffer, hr); - if (FAILED(hr = IMemAllocator_Commit(filter->source.pAllocator))) ERR("Failed to commit allocator, hr %#x.\n", hr); @@ -688,20 +680,19 @@ static HRESULT source_query_interface(struct strmbase_pin *iface, REFIID iid, vo } static HRESULT WINAPI VfwPin_DecideBufferSize(struct strmbase_source *iface, - IMemAllocator *pAlloc, ALLOCATOR_PROPERTIES *ppropInputRequest) + IMemAllocator *allocator, ALLOCATOR_PROPERTIES *req_props) { - ALLOCATOR_PROPERTIES actual; + struct vfw_capture *filter = impl_from_strmbase_pin(&iface->pin); + ALLOCATOR_PROPERTIES ret_props; - /* What we put here doesn't matter, the - driver function should override it then commit */ - if (!ppropInputRequest->cBuffers) - ppropInputRequest->cBuffers = 3; - if (!ppropInputRequest->cbBuffer) - ppropInputRequest->cbBuffer = 230400; - if (!ppropInputRequest->cbAlign) - ppropInputRequest->cbAlign = 1; + if (!req_props->cBuffers) + req_props->cBuffers = 3; + if (!req_props->cbBuffer) + req_props->cbBuffer = get_image_size(filter); + if (!req_props->cbAlign) + req_props->cbAlign = 1; - return IMemAllocator_SetProperties(pAlloc, ppropInputRequest, &actual); + return IMemAllocator_SetProperties(allocator, req_props, &ret_props); } static const struct strmbase_source_ops source_ops = -- 2.30.2

1 0

[PATCH 6/6] light.msstyles: Add Tooltip parts.
by Zhiyi Zhang 28 Jun '21

28 Jun '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/light.msstyles/Makefile.in | 1 + dlls/light.msstyles/blue_tooltip_close.bmp | Bin 0 -> 3402 bytes dlls/light.msstyles/blue_tooltip_close.svg | 17 +++++++++++++++++ dlls/light.msstyles/light.rc | 12 ++++++++++++ 4 files changed, 30 insertions(+) create mode 100644 dlls/light.msstyles/blue_tooltip_close.bmp create mode 100644 dlls/light.msstyles/blue_tooltip_close.svg diff --git a/dlls/light.msstyles/Makefile.in b/dlls/light.msstyles/Makefile.in index 8f9143d62f9..3205d1b28f9 100644 --- a/dlls/light.msstyles/Makefile.in +++ b/dlls/light.msstyles/Makefile.in @@ -56,6 +56,7 @@ SVG_SRCS = \ blue_toolbar_buttons_split_dropdown_glyph.svg \ blue_toolbar_separator_horizontal.svg \ blue_toolbar_separator_vertical.svg \ + blue_tooltip_close.svg \ blue_trackbar_slider_track.svg \ blue_trackbar_thumb_down_11px.svg \ blue_trackbar_thumb_down_15px.svg \ diff --git a/dlls/light.msstyles/blue_tooltip_close.bmp b/dlls/light.msstyles/blue_tooltip_close.bmp new file mode 100644 index 0000000000000000000000000000000000000000..82adf7e5cc1d7e306225f7c7954ef38a29b4c141 GIT binary patch literal 3402 zcmb_czmF0@6dq3#VuBD<4m^!mTtQ=EYj;_=J5OU{Ea~i|(}Ko=(n!gFLHHS9L%AId z4VT+Bh8PM8{szLq^LxvHvtfga!-luB^WOJ8X5P&EjQ4LJ2>1Dc_cvG!_6l}KybyOW zT4B7l9ui{p;|Lj-AHHru{^7W{75^O-!tTM|Y=w3@7|*;7A1kwGu#Y=wn;_#{JoAv} zI*oAx<N2)+&ZiC3_ruNsH<$RS5I<k8U``6Yk@PPye(|LX=QCmpi5p`)_2TR#)-aTD ztjYQAjo%dh#%xE3Ur)X9_3Ro)Yxfmw8Ao@7c}ejNz<<1E_>ZFq@Rq{Cf4a5edcn`} zAkQcSd_&<fzbnM#eh~Hwqnkr_FS<3=J=>sn>?V)e`rNTY+;z8S`Rp`$&W6f3ZRFUu z_YH7N?)_|xqS++%GI81~2jiKy=4TT`uvsQaf%JoMjCXm+b8$lH^JALGJhzzy?bHuo zbHL6eeu~l6590}?@I8|LW#*WC_2WEAd0-Zd!+(u0<K)qgvp6LY8_GPqH;;aRUr=I> z@rZo&<K1(L0oPZs<s$S0wJRyU!PyDz)Q_u&6an5+IF9mdaXd)>U!772yoSQ%y>(wd zqrm#1n?rXmx;523TirW$h`a9go@URX4q=>qd*9x_NRWa4Gr9LGl}fbHX!Pp!`d<3M zc;+d5f^Sx<)dJ}U;}{Pk&Qq;c)A*k79Ci!ePW?bU2i#oZr_E;5)eq!N!A8=*#OSLZ z@aJI*i5s_CEsuU+UrEG<GR|xA=m+KnCFTI{s~??CCk9-9jm6r^#bWUY^U~UfanNqJ zcj|{}ni1eEh2tpS7RQ6=2XG;*p`mcO{#~p;uzu*~(A|q}O?A&!_l_Onu5-`GGyLzK SLmk4%(T45Y`vy2B_|ZStLw0Ha literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_tooltip_close.svg b/dlls/light.msstyles/blue_tooltip_close.svg new file mode 100644 index 00000000000..4a0e66448bc --- /dev/null +++ b/dlls/light.msstyles/blue_tooltip_close.svg @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:17-32" width="17" height="48" version="1.1" viewBox="0 0 4.4979 12.7" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <g stroke-width=".26458"> + <path d="m4.4979 0.42636-0.453-0.42636-1.796 1.6903-1.796-1.6903-0.453 0.42636 1.796 1.6903-1.796 1.6903 0.453 0.42636 1.796-1.6903 1.796 1.6903 0.453-0.42636-1.796-1.6903z" fill="#aeaeae"/> + <path d="m4.4979 4.6597-0.453-0.42636-1.796 1.6903-1.796-1.6903-0.453 0.42636 1.796 1.6903-1.796 1.6903 0.453 0.42636 1.796-1.6903 1.796 1.6903 0.453-0.42636-1.796-1.6903z" fill="#ff1744"/> + <path d="m4.4979 8.893-0.453-0.42636-1.796 1.6903-1.796-1.6903-0.453 0.42636 1.796 1.6903-1.796 1.6903 0.453 0.42636 1.796-1.6903 1.796 1.6903 0.453-0.42636-1.796-1.6903z" fill="#d50000"/> + </g> +</svg> diff --git a/dlls/light.msstyles/light.rc b/dlls/light.msstyles/light.rc index c8c3f22ddb1..bddf183132c 100644 --- a/dlls/light.msstyles/light.rc +++ b/dlls/light.msstyles/light.rc @@ -879,6 +879,14 @@ BLUE_INI TEXTFILE "[TrackBar.TicsVert]\r\n" "Color = 174 174 174\r\n" +"\r\n; Tooltip\r\n" +"[Tooltip.Close]\r\n" +"BgType = ImageFile\r\n" +"ImageFile = blue_tooltip_close.bmp\r\n" +"ImageCount = 3\r\n" +"SizingType = TrueSize\r\n" +"ImageLayout = Vertical\r\n" + "\r\n; TreeView\r\n" "[TreeView]\r\n" "BgType = BorderFill\r\n" @@ -1070,6 +1078,10 @@ BLUE_TOOLBAR_BUTTONS_SPLIT_DROPDOWN_BMP BITMAP "blue_toolbar_buttons_split_dropd /* @makedep: blue_toolbar_buttons_split_dropdown_glyph.bmp */ BLUE_TOOLBAR_BUTTONS_SPLIT_DROPDOWN_GLYPH_BMP BITMAP "blue_toolbar_buttons_split_dropdown_glyph.bmp" +/* Tooltip */ +/* @makedep: blue_tooltip_close.bmp */ +BLUE_TOOLTIP_CLOSE_BMP BITMAP "blue_tooltip_close.bmp" + /* TrackBar */ /* @makedep: blue_trackbar_thumb_horizontal.bmp */ BLUE_TRACKBAR_THUMB_HORIZONTAL_BMP BITMAP "blue_trackbar_thumb_horizontal.bmp" -- 2.30.2

1 0

[PATCH 5/6] light.msstyles: Add TrackBar parts.
by Zhiyi Zhang 28 Jun '21

28 Jun '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/light.msstyles/Makefile.in | 15 ++ .../blue_trackbar_slider_track.bmp | Bin 0 -> 378 bytes .../blue_trackbar_slider_track.svg | 13 ++ .../blue_trackbar_thumb_down_11px.bmp | Bin 0 -> 4318 bytes .../blue_trackbar_thumb_down_11px.svg | 21 +++ .../blue_trackbar_thumb_down_15px.bmp | Bin 0 -> 7638 bytes .../blue_trackbar_thumb_down_15px.svg | 21 +++ .../blue_trackbar_thumb_down_21px.bmp | Bin 0 -> 18618 bytes .../blue_trackbar_thumb_down_21px.svg | 21 +++ .../blue_trackbar_thumb_horizontal.bmp | Bin 0 -> 2418 bytes .../blue_trackbar_thumb_horizontal.svg | 19 +++ .../blue_trackbar_thumb_left_19px.bmp | Bin 0 -> 4318 bytes .../blue_trackbar_thumb_left_19px.svg | 21 +++ .../blue_trackbar_thumb_left_25px.bmp | Bin 0 -> 7638 bytes .../blue_trackbar_thumb_left_25px.svg | 21 +++ .../blue_trackbar_thumb_left_44px.bmp | Bin 0 -> 17738 bytes .../blue_trackbar_thumb_left_44px.svg | 21 +++ .../blue_trackbar_thumb_right_19px.bmp | Bin 0 -> 4318 bytes .../blue_trackbar_thumb_right_19px.svg | 21 +++ .../blue_trackbar_thumb_right_25px.bmp | Bin 0 -> 7638 bytes .../blue_trackbar_thumb_right_25px.svg | 21 +++ .../blue_trackbar_thumb_right_44px.bmp | Bin 0 -> 17738 bytes .../blue_trackbar_thumb_right_44px.svg | 21 +++ .../blue_trackbar_thumb_up_11px.bmp | Bin 0 -> 4318 bytes .../blue_trackbar_thumb_up_11px.svg | 21 +++ .../blue_trackbar_thumb_up_15px.bmp | Bin 0 -> 7638 bytes .../blue_trackbar_thumb_up_15px.svg | 21 +++ .../blue_trackbar_thumb_up_21px.bmp | Bin 0 -> 18618 bytes .../blue_trackbar_thumb_up_21px.svg | 21 +++ .../blue_trackbar_thumb_vertical.bmp | Bin 0 -> 4758 bytes .../blue_trackbar_thumb_vertical.svg | 19 +++ dlls/light.msstyles/light.rc | 150 ++++++++++++++++++ 32 files changed, 468 insertions(+) create mode 100644 dlls/light.msstyles/blue_trackbar_slider_track.bmp create mode 100644 dlls/light.msstyles/blue_trackbar_slider_track.svg create mode 100644 dlls/light.msstyles/blue_trackbar_thumb_down_11px.bmp create mode 100644 dlls/light.msstyles/blue_trackbar_thumb_down_11px.svg create mode 100644 dlls/light.msstyles/blue_trackbar_thumb_down_15px.bmp create mode 100644 dlls/light.msstyles/blue_trackbar_thumb_down_15px.svg create mode 100644 dlls/light.msstyles/blue_trackbar_thumb_down_21px.bmp create mode 100644 dlls/light.msstyles/blue_trackbar_thumb_down_21px.svg create mode 100644 dlls/light.msstyles/blue_trackbar_thumb_horizontal.bmp create mode 100644 dlls/light.msstyles/blue_trackbar_thumb_horizontal.svg create mode 100644 dlls/light.msstyles/blue_trackbar_thumb_left_19px.bmp create mode 100644 dlls/light.msstyles/blue_trackbar_thumb_left_19px.svg create mode 100644 dlls/light.msstyles/blue_trackbar_thumb_left_25px.bmp create mode 100644 dlls/light.msstyles/blue_trackbar_thumb_left_25px.svg create mode 100644 dlls/light.msstyles/blue_trackbar_thumb_left_44px.bmp create mode 100644 dlls/light.msstyles/blue_trackbar_thumb_left_44px.svg create mode 100644 dlls/light.msstyles/blue_trackbar_thumb_right_19px.bmp create mode 100644 dlls/light.msstyles/blue_trackbar_thumb_right_19px.svg create mode 100644 dlls/light.msstyles/blue_trackbar_thumb_right_25px.bmp create mode 100644 dlls/light.msstyles/blue_trackbar_thumb_right_25px.svg create mode 100644 dlls/light.msstyles/blue_trackbar_thumb_right_44px.bmp create mode 100644 dlls/light.msstyles/blue_trackbar_thumb_right_44px.svg create mode 100644 dlls/light.msstyles/blue_trackbar_thumb_up_11px.bmp create mode 100644 dlls/light.msstyles/blue_trackbar_thumb_up_11px.svg create mode 100644 dlls/light.msstyles/blue_trackbar_thumb_up_15px.bmp create mode 100644 dlls/light.msstyles/blue_trackbar_thumb_up_15px.svg create mode 100644 dlls/light.msstyles/blue_trackbar_thumb_up_21px.bmp create mode 100644 dlls/light.msstyles/blue_trackbar_thumb_up_21px.svg create mode 100644 dlls/light.msstyles/blue_trackbar_thumb_vertical.bmp create mode 100644 dlls/light.msstyles/blue_trackbar_thumb_vertical.svg diff --git a/dlls/light.msstyles/Makefile.in b/dlls/light.msstyles/Makefile.in index 7be6fa532a6..8f9143d62f9 100644 --- a/dlls/light.msstyles/Makefile.in +++ b/dlls/light.msstyles/Makefile.in @@ -56,6 +56,21 @@ SVG_SRCS = \ blue_toolbar_buttons_split_dropdown_glyph.svg \ blue_toolbar_separator_horizontal.svg \ blue_toolbar_separator_vertical.svg \ + blue_trackbar_slider_track.svg \ + blue_trackbar_thumb_down_11px.svg \ + blue_trackbar_thumb_down_15px.svg \ + blue_trackbar_thumb_down_21px.svg \ + blue_trackbar_thumb_horizontal.svg \ + blue_trackbar_thumb_left_19px.svg \ + blue_trackbar_thumb_left_25px.svg \ + blue_trackbar_thumb_left_44px.svg \ + blue_trackbar_thumb_right_19px.svg \ + blue_trackbar_thumb_right_25px.svg \ + blue_trackbar_thumb_right_44px.svg \ + blue_trackbar_thumb_up_11px.svg \ + blue_trackbar_thumb_up_15px.svg \ + blue_trackbar_thumb_up_21px.svg \ + blue_trackbar_thumb_vertical.svg \ blue_treeview_expand_collapse_10px.svg \ blue_treeview_expand_collapse_15px.svg \ blue_treeview_expand_collapse_9px.svg diff --git a/dlls/light.msstyles/blue_trackbar_slider_track.bmp b/dlls/light.msstyles/blue_trackbar_slider_track.bmp new file mode 100644 index 0000000000000000000000000000000000000000..dca5590613cda7f630e5c99ce5a9f38a5c29936b GIT binary patch literal 378 zcmZ?rtzu*VgDxOh1H|k=%mu`Z3=%++f#Cy~L?`|;FhCGU;=hx7P%*j+LVOl91?#W@ Upc<g?e^dYz8Cv3)J_EWR03b8HEdT%j literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_trackbar_slider_track.svg b/dlls/light.msstyles/blue_trackbar_slider_track.svg new file mode 100644 index 00000000000..b2a6dfc9ef6 --- /dev/null +++ b/dlls/light.msstyles/blue_trackbar_slider_track.svg @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:7-24" width="7" height="10" version="1.1" viewBox="0 0 1.8521 2.6458" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <rect x=".13229" y=".13229" width="1.5875" height="2.3813" fill="#fff" stroke="#aeaeae" stroke-width=".26458"/> +</svg> diff --git a/dlls/light.msstyles/blue_trackbar_thumb_down_11px.bmp b/dlls/light.msstyles/blue_trackbar_thumb_down_11px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..eae1b3872084acad56cc0db830d2f7f5e0e2724c GIT binary patch literal 4318 zcmeH~PfG$(5WqL;)<p;*gUF~z%YzaL+09F*F44VDP?s)Aeu54Km67SCj)H%o&S4-F zK?l)YgfhzN6BM+%JI$=VWjD6fAj86k<Lu1*-k*KX=P>@oI}4|@E&L9m^rNhx^l)~r z7xi)@j*prK99RF45Bv*D>zZIok9{pstwE_&YB-%vUywHIfy_`Qld0r#xhm=>vW@sy zEM~>{y&wo8U@MhM#8=QisO6K%qy_y#u~>X3j<rIeAfo>^kw^?M9&J9K&+9nGlb_;@ z#eOVgs44ypR_?L@xM!WV4>FyjiKy#k=hsgC7IF=XVebWLvw2?kJVVu^xk~M9ty+!v zp2#-hVb^07Bffj-I-=Ym>E?v^3WR2LcL;Xe7BM<6NLL5CyHUFgiRizDeXn|la6G=2 z+tzXHf{>r$Y%St}n}rND#am-#Kvq2q^KrXueY1aUA7nZY6H(8Nopn1k1Sdx!;5;X7 zHV<q%N07Ti0h9*_y2gxn*l^e}UT$#2*7=R;aV-x)=L7^CkDoZkzd&Gmit)%if59>S zS;I2lS6bcQCSy|nzs$-_-cQo(*}rAkJGN6RdFaraZI*{1JY!Sx(CMm@hsZWsmy(B~ zzOr<E)W}1}-8`hrh`;t<t(#SE{P{I>R34%_2qoLB9*W1~Hmp0;dWdYJJJhI$$~@0^ Y>mmIQSG78@zEIa@^w5Fp{qcI}12_~nEdT%j literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_trackbar_thumb_down_11px.svg b/dlls/light.msstyles/blue_trackbar_thumb_down_11px.svg new file mode 100644 index 00000000000..5f568dcdba0 --- /dev/null +++ b/dlls/light.msstyles/blue_trackbar_thumb_down_11px.svg @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:11-32" width="11" height="95" version="1.1" viewBox="0 0 2.9104 25.135" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <g stroke-width=".26458"> + <path d="m2.5135 3.4803-0.001511-3.0834h-2.1136l-0.0015146 3.0834 1.0583 1.0923z" fill="#fff" stroke="#aeaeae"/> + <path d="m2.6458 13.64-0.0017-3.3214h-2.3778l-0.001705 3.3214 1.1906 1.1766z" fill="#2979ff"/> + <g fill="#fff"> + <path d="m2.5135 23.589-0.00151-3.0834h-2.1136l-0.00151 3.0834 1.0583 1.0923z" stroke="#aeaeae"/> + <path d="m2.5135 8.5074-0.0015-3.0834h-2.1136l-0.00151 3.0834 1.0583 1.0923z" stroke="#3096fa"/> + <path d="m2.5135 18.562-0.0015-3.0834h-2.1136l-0.00151 3.0834 1.0583 1.0923z" stroke="#3096fa"/> + </g> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_trackbar_thumb_down_15px.bmp b/dlls/light.msstyles/blue_trackbar_thumb_down_15px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..e034b99ce2156aaad0cb0b6c4e0b401607409bd1 GIT binary patch literal 7638 zcmeI1&2JJx6u@cp?q6VH?4c}bTrjPLCN^oJCJi2Jym|HJ(WtD}f51B*g@1wab<l$z zG${uq9@WIeC{hFo5K4iR{h0B+(jmLBth=&liSDG+`FQWQZ}#oX<n?v!)~B<s!}1({ zZ$do-^%>MT*E!cIXoE*`=&A~JxduNtN7rs{JWvTubx)hpnocR5PS0mDnLM^uo&=01 zm&-K@g@TMNj?M7NWYU|>W?RK#QKnEzr4oU08|*I`@!Q+mi^!GBWr7?ll}d$x{Wi!~ z^!QXNwF=yRwOVC}rmfX#6!;G4U03rk4g%LhxlyUt>&W*&e}nPxE^@QkG{S~5)I)v7 z!gGc)Gab+;4r|6!l+K8+H2c?R<%AI28|v@tuoE0+v#%69hZd^B&fqMy2a!wX#rV}7 zY^|)TANFxl!e5tP39^(3G;nN&7o(TGV6UZo&M5eqlrJw7F}~b}dBeM14D*Yi*HXT| z*6eTP+Z!S#{B0@B2lVVq5$~!P5A2g4dEH$>cHdJmvC@%Zyyk9~WBfYU>yq7fx*VG% zKR*EP@Ajj<+swWg^~t36k*OHAsE7JPHo_a~YlVc05q@~~p|2GijvUs|JsP2{zJmR$ z*}@u2ngLN@Z+O+;*I_jdQVs0&m4au<LY>LGoo+5HP{Ff9A6+zcH?up4KH+>+aQ~tL zN1-<8Q*N2bj9U7by9WBLBMw=t9U5}qFysVx5cGN@9OL^`xNt|0ry<W>V8jU=<7FD+ z?x}frzx%)_f8ZETK>s1*fgvV2##8tcZw`42HXT;r<SG1otgLEpShhO@tYp>Csx|*t zEPL-+Xb-lo%!^w~d2Fq$ryuirAZ~9A;&y)n$7cBPxcw!u5V!A*#_i<$Ti~6z9ewY_ z?W#C#tZQrRJ@)j;6JvIr*n5(*?2Wyr@$)|sw?jVfr1I^DIT<VYcF1e*>E+uoUk~|y z-JA^M%>F9h4*wTehv#-p=G(hqf0&bT^6irj?_hpL^4`Xa9Ff|%W|IjS$lN&j_LK6} IvFF==16bE8YybcN literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_trackbar_thumb_down_15px.svg b/dlls/light.msstyles/blue_trackbar_thumb_down_15px.svg new file mode 100644 index 00000000000..19a37abd8ee --- /dev/null +++ b/dlls/light.msstyles/blue_trackbar_thumb_down_15px.svg @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:15-32" width="15" height="125" version="1.1" viewBox="0 0 3.9687 33.073" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <g stroke-width=".26458"> + <path d="m3.5718 4.6544-0.0022678-4.2576h-3.1704l-0.0022714 4.2576 1.5875 1.5082z" fill="#fff" stroke="#aeaeae"/> + <path d="m3.7066 17.987-0.00246-4.4936h-3.4347l-0.002463 4.4936 1.7198 1.5918z" fill="#2979ff"/> + <g fill="#fff"> + <path d="m3.5718 11.269-0.0022707-4.2576h-3.1704l-0.002273 4.2576 1.5875 1.5082z" stroke="#3096fa"/> + <path d="m3.5718 31.113-0.0023-4.2576h-3.1704l-0.00227 4.2576 1.5875 1.5082z" stroke="#aeaeae"/> + <path d="m3.5718 24.498-0.00227-4.2576h-3.1704l-0.002273 4.2576 1.5875 1.5082z" stroke="#3096fa"/> + </g> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_trackbar_thumb_down_21px.bmp b/dlls/light.msstyles/blue_trackbar_thumb_down_21px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..d194ae3a8037ddf7601d52b3b15bec5248781a57 GIT binary patch literal 18618 zcmeI3UuYvm9LKln3DpNFA{6cf5g#s%UR!b&n~I!=sGQs(f^a^F_~45^sa)GsAM)T+ z1wqj^x#T>RyO&y;{z)4eq<tu*q4!qB9O8jc%1I$s+TFA}lii=cNjlr4P4*_)ZRvV5 zWHY<7GoPLO<~y@H`R$y)n0{R;hC%%P9JeQM`xCb&<tgPsj5~JE<8E01MJat)8k~Ra ztxwBN3hh25l<V*_C6mdP@$qqtk}YmrEgFrUn4FwkN~hCgYHBLOj-7ImcYR@DK{E^k z78e&aJih6KnMfphXJ=<sLI|)xDFv*rIx#WP+Xxr!cLD9EVJPzW*Y@@{uynlMoAq!< zM@Riwm#thb$59pW#>NJ)^J8OU?IPTfk&#xk+4}10s#yWrcd)j$W@5e^=09o2#q-VB zwkz3eR^NxHdWiW5a<gdjN2_tMP!pa{WHOn2RX~lz<>lo(mYWHO!w>A|qJ0ME=H^tU znR)`tKR-Xuw7`Z0E1<0}Pft&4J3Bk|;H<p5u0tx7Qjzl>hoUa%=H{lAr;#02o^d!6 z`Hf%>ltGRunTjIqc|aO<CwNp#wqvD;5lqu$eY3nDNv4S5YUGjj^q!WO{#m;@39LMh zAqKx6Nv5=Cqk1|DEitXK=LQ!xOY>a&UXNkuxfU8ZJI!J@ehWkcCrGSkiQc?KNc_bN zJ9f$?@!)kj@qq>gfkN^_4f&4dn>5nZM{m5Lg1%LfEztn$tJ144^fgk~LgefPdhI36 z+`3!Q4NP?%==U#c`cR;*`KJDDyPsSQZkd0tRPgwLx&Aw_^CZ$KG~a~po^PeG?semj zl<h!e-1)`Ce7XELXHMDK0lw;PCh?wMja$*ugq>HcMr_=QP|SZDzC2T7zNs|PcrZ~& zeS-5%+bWh_!GuD(H&5d|GZ0n|%s2H|_aGg4M}>mWlz5Me8l$7{s(P%aV!o*lcV4DH zyrMzA`hNg>fEs(-{{sE-Rh2}$tobGx4p8%-J2eW3CA0F3!`q7tb%+(T&1C{|tmkCO zv^AE%Noh|H>JtYd(Xpt81WW__W@mXnlFS;W5=xf#^q!Vb|A6i0D6n=P>ad=@S)Y<j z2Nsp~JX|fIR@pO?3!7C>e*g4(458DHL%(kZLeDVQuHyh<|HBY!n}d)Kki87yz#~qe z=tgcr)=woKV-~qTSDRyqUIzwzUsUpTx&6M1IfgJV)b@T=Ua_vo9`Jo6%3}GT|MWTJ z>9)*}uK*$cB@r&>YeUw?J$Spe^=-m{zr&6TSNyHW`b&_<xohy*vrksz!pEnYQG-i$ z@;LW5=zIFHaxT*b+I*}*9@kh3!so2l5KzlsJL7Tf`r^E<$fGVX0p2dYj-g1VWoNFB z#^U?gp1c3wxT+=ZF^Ow^bMLoHCch^-iP`IC7_fcZv!`SpmObzF93wtH@3qmfW|rOG zU8|>L7W?~sYfs+(UXM%u%|Oys|7INhn>Q{Ja_yM<H=|v>RsEZo-bj1?@BEv??I-Q* zQ1oxcf-C6X6mlM-f0K|{Ff09=(!a@dC4Ht2{+})ul|Iu$){^u^I+3XKMS9N{iSM+y z?$ejPNGH7rn?w3`t#RHfT9W=v-ed=2wr*3d-<0b&*`O%bZvx2mo2A<$u061xm)JT4 zH-coAhF@t<=W03vEjfId79SPm`pxn&MB3AV?7gZbxz^H|?2lr-p=={}+X(MX$A10h Ee>lY|(f|Me literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_trackbar_thumb_down_21px.svg b/dlls/light.msstyles/blue_trackbar_thumb_down_21px.svg new file mode 100644 index 00000000000..c3433edd231 --- /dev/null +++ b/dlls/light.msstyles/blue_trackbar_thumb_down_21px.svg @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:21-32" width="21" height="220" version="1.1" viewBox="0 0 5.5562 58.208" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <g stroke-width=".26458"> + <path d="m5.1594 8.3507-0.0034-7.9539h-4.7557l-0.0034071 7.9539 2.3812 2.8176z" fill="#fff" stroke="#aeaeae"/> + <path d="m5.2953 31.754-0.0036-8.2057h-5.0199l-0.0036 8.2057 2.5135 2.9068z" fill="#2979ff"/> + <g fill="#fff"> + <path d="m5.1594 19.992-0.00341-7.9539h-4.7556l-0.00341 7.9539 2.3812 2.8176z" stroke="#3096fa"/> + <path d="m5.1593 54.917-0.0034-7.9539h-4.7556l-0.0034 7.9539 2.3812 2.8176z" stroke="#aeaeae"/> + <path d="m5.1594 43.276-0.0034-7.9539h-4.7556l-0.00341 7.9539 2.3812 2.8176z" stroke="#3096fa"/> + </g> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_trackbar_thumb_horizontal.bmp b/dlls/light.msstyles/blue_trackbar_thumb_horizontal.bmp new file mode 100644 index 0000000000000000000000000000000000000000..f3c8f55a9b2041f5d6b551124fb5d518218cb718 GIT binary patch literal 2418 zcmeHJOHPD95XESW-ol*_H=}`tMqSLtl^ZYM9drX3PvG89GR_Sc2(VEPq9nTG=NW)b zSp`!)lNmcRCMIs^@S2y`1tjl5HU0CeZLJx%INu;P5toQHZAV+j^Vb$m3j;K*J!l2` zXBXECB};^jAJ)g?u@wYCPH<h<<dP_g;xtVmNfJQ*&bsgWwGaXb#98+|4|ovobbwWS zQ2D9ypYsaCFq_Sb^)AQ%c@O_8M;PpyU>jKj<oq3ht;gUP(7-m{r0(do)R9m1N$upC zPH+8K?t{Wl+nD<A=&~Pzy=P%o1!j;F=lhqB`(`yf$_T`zK01lT=L?9BXDCOfGRN}a zpaxL^fw-){?{Qm&5_zY?YCfp^d^$$|Ux6|}|7DKlUC*k9hXv-96K9{P$5OAI@3(XP kS>~wf1Ks}EI{I55RDQDm^p7(8e?t2pW>wHWNSvPf4R_|o;s5{u literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_trackbar_thumb_horizontal.svg b/dlls/light.msstyles/blue_trackbar_thumb_horizontal.svg new file mode 100644 index 00000000000..d1063507dd0 --- /dev/null +++ b/dlls/light.msstyles/blue_trackbar_thumb_horizontal.svg @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:6-32" width="6" height="95" version="1.1" viewBox="0 0 1.5875 25.135" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <g stroke-width=".26458"> + <rect x=".39688" y=".13229" width=".79375" height="4.7625" rx=".52917" ry=".52917" fill="#fff" stroke="#aeaeae"/> + <rect x=".39688" y="5.1594" width=".79375" height="4.7625" rx=".52917" ry=".52917" fill="#fff" stroke="#3096fa"/> + <rect x=".39688" y="10.186" width=".79375" height="4.7625" rx=".52917" ry=".52917" fill="#2979ff" stroke="#2979ff"/> + <rect x=".39688" y="15.214" width=".79375" height="4.7625" rx=".52917" ry=".52917" fill="#fff" stroke="#aeaeae"/> + <rect x=".39688" y="20.241" width=".79375" height="4.7625" rx=".52917" ry=".52917" fill="#fff" stroke="#aeaeae"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_trackbar_thumb_left_19px.bmp b/dlls/light.msstyles/blue_trackbar_thumb_left_19px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..6c504227cd6eefb7ac61491911dfe98e39c4d69b GIT binary patch literal 4318 zcmZ?ry(ho`23<h128e}$*c^x%859_pfpiE|9>_!j{}~t{2qgC3$vvnTNs=fg3sI`5 zqiEHtRYIFKZMwQ{-Masz;Qjmeqc{_2jwsNa+m|j~`uU#(0JQTjvRNB9ZWITabNBM) z%OsftvJ%;>wQJW(0?m1N?b@|pBsd4I6xpl|8#Wv|cI?=1xFm@TG_z!Z?s`HEcY#s> zG`#Ln8eXu}1azwyHR2Iw9<|aJ%)G%!|DU5R^lO&o)nC&L{*!|LH#nf=q5qQ%MSsn< zy8Y*94@qhN*L1_b$Y%YYtt0+xj`iI?$NESz2b8Rl&H6vnSn}6w>xX|&O(!c4A)EDU zhS{M%TXV_IL&#=*o2n!GdzR%BYPbuOp1|QX+xi}*;RQ>Z|EKGTQ6nDV=20nq!OR<s z^#2-7)&G^6Pl5P9DHz=^|0}drfcl@1Vg^htvRVJDHRXZg_hE9R(lE3Bmut%b_1+^@ zKeBqbS(Taxkj2Si!_A_iyFg}AE4<+Dqf$J=&7)HKf|)lM>Ct)!d&3O5?ij6yu!j+{ lC~|lqr*mqhFJv<Z8=G3~)zSVCa*9G_kM@Ts?{8C@ZveHxerx~$ literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_trackbar_thumb_left_19px.svg b/dlls/light.msstyles/blue_trackbar_thumb_left_19px.svg new file mode 100644 index 00000000000..f737f711968 --- /dev/null +++ b/dlls/light.msstyles/blue_trackbar_thumb_left_19px.svg @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:19-32" width="19" height="55" version="1.1" viewBox="0 0 5.0271 14.552" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <g stroke-width=".26458"> + <path d="m1.5481 2.5135 3.0863-0.00151v-2.1136l-3.0863-0.0015157-1.0933 1.0583z" fill="#fff" stroke="#aeaeae"/> + <path d="m1.4411 8.4667 3.3214-0.001731v-2.3778l-3.3214-0.0017307-1.1766 1.1906z" fill="#2979ff"/> + <g fill="#fff"> + <path d="m1.5481 5.4239 3.0863-0.00151v-2.1136l-3.0863-0.0015111-1.0933 1.0583z" stroke="#3096fa"/> + <path d="m1.5481 14.155 3.0863-0.0015v-2.1136l-3.0863-0.0015-1.0933 1.0583z" stroke="#aeaeae"/> + <path d="m1.5481 11.245 3.0863-0.0015v-2.1136l-3.0863-0.00151-1.0933 1.0583z" stroke="#3096fa"/> + </g> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_trackbar_thumb_left_25px.bmp b/dlls/light.msstyles/blue_trackbar_thumb_left_25px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..0524d79ac9a8db631ad00a07a1881946cb2a7d42 GIT binary patch literal 7638 zcmeI1&r1S96vww8|3rtNLs3?g+99@6MbM!iMCbYs>eQi>0?*yk(7(Z-mrg;4Is|sC zLzf5%CCNgRa@C#QRL{n3f^g?8BrcA#JG=Y+%)EK;IgIlwH~rejaR}f0Q2L-OLFv*4 zv>vFJzwX1Sa4=2#{O~q5zqr05-2BsN@1LG>=An2zz6PZhi^Z6o5(oskWj&5YqYJ52 zs$3`(n4JUqXv!GSXC3rQ`F!4v{Kva82DG`8$z(B?%h}fF0#*j}e;o8*ve~Su1Ylu+ z_8{2jDU-=4)3=Tzkw{#o)9IS3{-cg)D<{Um{g-+^Fh;2T3OUsAfgI{MM-JGHG+!a7 z9qLMOYRw3FYevw`>=YKzq`AEs^eh;WnX>tKjUn4oZG=3gj8Q%I=te{@nGaVj>54DO z7{-y?ZG`ord4C~3+VZ)TQ3*|q8{z4f`rVnb+$%EPj=Y1_i2hW+JyE952QM<9|ChDX z1Le70WH>Pn9?#VCfjNWPuaH9>9}Nz1oFj)iUm>R*YPL7B#e6PixBO-c<{#Yv?Ydok z{=SUCd}FI{uc|^{#sK@wLi?*KeJg|Qj!i<_vr2uD!S-E4aGg`F-^B2Zo>S;IF&r2N z_b=-CKp$rQ;W-!|nO`+H#PRXXac#nQOcj2Bnz9=5$u>1Z#{G|N)W3tBb$jy?UtEiF zf1zF{I<emEtlOLC*m`B1b3X5#b-UF{pVu;5aeLuGov)D74mI`u74<$G^?oAtz9{wn nt`qyzo&9!sp2Ak}p&$PhQTr9<ChGV=4t1O(hdN&&M^*g}tQ~Rv literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_trackbar_thumb_left_25px.svg b/dlls/light.msstyles/blue_trackbar_thumb_left_25px.svg new file mode 100644 index 00000000000..d5b482d0cad --- /dev/null +++ b/dlls/light.msstyles/blue_trackbar_thumb_left_25px.svg @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:25-32" width="25" height="75" version="1.1" viewBox="0 0 6.6146 19.844" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <g stroke-width=".26458"> + <path d="m1.9572 3.5718 4.2628-0.00227v-3.1704l-4.2628-0.0022736-1.5101 1.5875z" fill="#fff" stroke="#aeaeae"/> + <path d="m1.8564 11.642 4.4936-0.0025v-3.4347l-4.4936-0.0025-1.5918 1.7198z" fill="#2979ff"/> + <g fill="#fff"> + <path d="m1.9572 7.5406 4.2628-0.00227v-3.1704l-4.2628-0.0022666-1.5101 1.5875z" stroke="#3096fa"/> + <path d="m1.9572 19.447 4.2628-0.0023v-3.1704l-4.2628-0.0023-1.5101 1.5875z" stroke="#aeaeae"/> + <path d="m1.9572 15.478 4.2628-0.0023v-3.1704l-4.2628-0.0023-1.5101 1.5875z" stroke="#3096fa"/> + </g> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_trackbar_thumb_left_44px.bmp b/dlls/light.msstyles/blue_trackbar_thumb_left_44px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..3b94c674cfaaddea5cd5cd85804230df3d3ddfa0 GIT binary patch literal 17738 zcmeI4O-vI(6vs>K(VKEK@g@i%(i#u78bc%+6E8-uaF9qndw{A3&Rzs!_(<X6u}NDf z2TocOiHYE?SH*asL<lBDHj%09_+H^{hO*6WA!X*7-7xzmyR(^J-~M;rYiEa^`}cZ7 z)$JARUqb1GG61C|bTM=W?1$U1JF>}8X#Wq-$eue7o*il8aUkq*{(m~1%jF(J5!q~3 z>L}@S8gHfNRwxw03kwUQi;Ig^xm=byHt>_}hZi`{L;1Y4v}6e(bf8xI^uwFUWFq-| zexq0{3fs1|v0}$wymNDNeZXq1t*z+=J@8UJ-UF?Up;ouIx3&6I?c9wQ^xO(sUDmBt zm6PhVye4Ut7*(tCf>sAntLy9QY7?XCDlgQZ0`CqNUJMxE;}|e+nJ{*_-B{JX6yWfA z1LhSD&l@pw8qbIsE#x!(_zadxCAZsi>c`ylpz>nfq%qD9FEX1FL;Uh0vzkxpiqVbm zA~S9<<_*Ag#^>w%w86gF9uU*f0Wld7V&aO_QDpj&ukUYi<W^YB#78S{?^^cO*Ha&R zu|qN0ZTsPs<K3-d_QrB0KWNE6`to-_yy8t)q>_ql{QdM=NPAC<U#U|sUNLpGPo!ej z-s(FezQ5Jut!j1l=2%s$zrNAO({9~(t6H6juT=60OYZ*G&Zq*^@`{N_6tuc&f>u>d zs;j(WDw+_f>pS+3k968N%b6GBA}2ji9Ov}BIm{S)o$+kd7#*wnC05mn>1+KQ;>96m zM)8=qIpsSJvzkw8iqT&BC05mP$=6lppxzu0V4f+HZR0Z8E_D^ZpA0z9$>intx;Uv{ zKfLn!r7mdyovzVoy?AA^<00_v=wwv;uEz^g>Me4(eF)m_sqJ;w-FW3l$64UY=w@^4 zzm`|N=)3^!zPPnD;h4%RhdSag4*WEMs~!XK%Hg&r&}O$@J5!Ex<wb5zdT{*A=y`LP z8I5NSGoyGx%xJm9<3r4h@*U#llutU$jPiA24s3Hhz~%dVF#p#0&z^pM-wEd58uu$* zQP01@{2O`bWVY77oaS4C`L~nZd$+4O>w%(pF#qOuXODNRRuAN3vcde@@%&0xdHI+8 z9L&Fw#~QPK{Y!pE%Ozh|nS*-sJiz6BTJ?Qp)7QUodLNwA`}UyKVEtQTA>vSLxA*Ni zt;YfWD6D7M<gngpettdytZdekapT2^$Vm?r!8tu|#LRvDo9XMN$<Jsx#be^;l<yET Ur+ku_(ZZO=;{R2s%)0CU0KLue+W-In literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_trackbar_thumb_left_44px.svg b/dlls/light.msstyles/blue_trackbar_thumb_left_44px.svg new file mode 100644 index 00000000000..e666a7ff164 --- /dev/null +++ b/dlls/light.msstyles/blue_trackbar_thumb_left_44px.svg @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:44-32" width="44" height="100" version="1.1" viewBox="0 0 11.642 26.458" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <g stroke-width=".26458"> + <path d="m3.2942 4.8948 7.9539-0.00321v-4.4914l-7.9539-0.003221-2.8176 2.2489z" fill="#fff" stroke="#aeaeae"/> + <path d="m3.1714 15.61 8.2057-0.0034v-4.7557l-8.2057-0.0034-2.9068 2.3812z" fill="#2979ff"/> + <g fill="#fff"> + <path d="m3.2942 10.186 7.9539-0.0032v-4.4915l-7.9539-0.00321-2.8176 2.2489z" stroke="#3096fa"/> + <path d="m3.2942 26.061 7.9539-0.0032v-4.4914l-7.9539-0.0032-2.8176 2.2489z" stroke="#aeaeae"/> + <path d="m3.2942 20.77 7.9539-0.0032v-4.4915l-7.9539-0.0032-2.8176 2.2489z" stroke="#3096fa"/> + </g> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_trackbar_thumb_right_19px.bmp b/dlls/light.msstyles/blue_trackbar_thumb_right_19px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..71cc35f825cd4f9d2d0d9da15b1a21d61accd69e GIT binary patch literal 4318 zcmZ?ry(ho`23<h128e}$*c^x%859_pfpiE|9>_!j{}~t{2qgC3$vvnTNs=fg3sI`b zSF~>3y8oo$O`A5|*t~hO2sRr*=8yueUcLGYXx_t(8#hX!n@6fyAbW4zxbX{U*5g&H zR!Jk9M~+z_^KRa}`5S27i?wUlD#6Sn*DR2E$B!TXy<x+KW0ab8>(;G5KzF^Q)LpRf z0-7TOa}$Ur)sKYY5o8{*7+?BAcH>}T|C(m-pCmln>c;<>##r+Z$Q)9@pOaI6{hDp{ z@atqlj66iDSs;7=o}KgS_iU@j-=^!M<RNm*0-JYk!SCO*EnobYrVGzQ<eCLC@6Yza z-@j&>!t)ThX8k?4;Lq<_mM<xF7d*Ts>7nEyQr$%;9zo_2jq#+f!IW>1-SWRu^EVLx zCmw6O{9mc9g=_|lO}bfNdtYEPk4&>b{&?}fOh*&uCJ;@5SwQnN9{;b=QHGgEnOPwJ zY8|1DSyXcuwZe-^@rXNp!NP5@(L|RIu(AYCIYI663siQK0^sH9Xgx$!u))J?v>u`; nTN2w&g{i~WUInQk1rTaSlVTP~Ev$V%+8-h=<Y3`7()vRH{+c-< literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_trackbar_thumb_right_19px.svg b/dlls/light.msstyles/blue_trackbar_thumb_right_19px.svg new file mode 100644 index 00000000000..104f71ae479 --- /dev/null +++ b/dlls/light.msstyles/blue_trackbar_thumb_right_19px.svg @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:19-32" width="19" height="55" version="1.1" viewBox="0 0 5.0271 14.552" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <g stroke-width=".26458"> + <path d="m3.4832 2.5135-3.0863-0.0015v-2.1136l3.0863-0.0015 1.0933 1.0583z" fill="#fff" stroke="#aeaeae"/> + <path d="m3.5902 8.4666-3.3214-0.0017v-2.3778l3.3214-0.0017 1.1766 1.1906z" fill="#2979ff"/> + <g fill="#fff"> + <path d="m3.4832 5.4239-3.0863-0.0015v-2.1136l3.0863-0.0015 1.0933 1.0583z" stroke="#3096fa"/> + <path d="m3.4832 14.155-3.0863-0.0015v-2.1136l3.0863-0.0015 1.0933 1.0583z" stroke="#aeaeae"/> + <path d="m3.4832 11.245-3.0863-0.0015v-2.1136l3.0863-0.0015 1.0933 1.0583z" stroke="#3096fa"/> + </g> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_trackbar_thumb_right_25px.bmp b/dlls/light.msstyles/blue_trackbar_thumb_right_25px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..f1a133198fec5f418e8843eb13c385b958447164 GIT binary patch literal 7638 zcmeI0y-or_5XaBxOIVm#dRT}S#E*v1P^b-wZ{Qmk6F>`VdqwdT`0ll&(1gOm!otEx zB525kkAjoCaR(f7;t3mfryy~|++OaE`|aM&{C6^u-G>FE-%iExSlGO<ZDBLUqA@G_ zov-`i)YHH)20y$8k!b9|b5rVcPU<QB59M+>P&7yUKQ?Y;_<ogUSr(K^rA{`R#ij6V zstg=oqtQT4JD<;o{UACR$f?)sP%IW(f)g6$=wcwJR;wYWnaN~Uy&Rnk<W#FwS8y!x zUXwVw8OW(rDo&wLxZ`4Q&x3nCxc!PdK4jw@eM`Y6>J|CdwD<OT5R@#n>U1yG#%eph zU!}S4k6>SIb$aK)U$tG8f#Y*u?*(V0{gDcW{nk|nqtAJ{1v|abvQsNRv|SgY&v`B* zrztq!v|T3yInL9yYp2((?%CQ<+jTRL)4Mrw?90$l+jTRz=ixH1hs*3&-0>kB=eX{F zHVM7*i~VW51_{#<21=GR568`23nO8=5I6UK<7i^wcj!Spu;<6o$UsgPl1tH1j%EgO zI&ieK>E$pm0Fve#B$fljVPOpXw9L$SXPyW5dT{#{cYN^2`2@Wp|C;vx&-)+kof7+? zYJMfVpJQ&P(zx>y8XI?hHRLeoiNxW~cZu_#x6_yK@45YoJ3eINTuHMe^lI8QoyM<F zx1yTY#QK$L?Nzo8=kM|ISGntnG!pK*C~>&!yTswHQxoUE-cDb_zvuQV?)Z?6b4AUX Ks8^(oT>U3vs3r#h literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_trackbar_thumb_right_25px.svg b/dlls/light.msstyles/blue_trackbar_thumb_right_25px.svg new file mode 100644 index 00000000000..2a63c9de7c1 --- /dev/null +++ b/dlls/light.msstyles/blue_trackbar_thumb_right_25px.svg @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:25-32" width="25" height="75" version="1.1" viewBox="0 0 6.6146 19.844" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <g stroke-width=".26458"> + <path d="m4.6597 3.5719-4.2628-0.0023v-3.1704l4.2628-0.0023 1.5101 1.5875z" fill="#fff" stroke="#aeaeae"/> + <path d="m4.7605 11.642-4.4936-0.0025v-3.4347l4.4936-0.0025 1.5918 1.7198z" fill="#2979ff"/> + <g fill="#fff"> + <path d="m4.6597 7.5406-4.2628-0.0023v-3.1704l4.2628-0.0023 1.5101 1.5875z" stroke="#3096fa"/> + <path d="m4.6597 19.447-4.2628-0.0023v-3.1704l4.2628-0.0023 1.5101 1.5875z" stroke="#aeaeae"/> + <path d="m4.6597 15.478-4.2628-0.0023v-3.1704l4.2628-0.0023 1.5101 1.5875z" stroke="#3096fa"/> + </g> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_trackbar_thumb_right_44px.bmp b/dlls/light.msstyles/blue_trackbar_thumb_right_44px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..8e7a1a2178aa2ec9aeb08c2999a3b502607103b7 GIT binary patch literal 17738 zcmeI4O-vI(6vyjFjGnye#Skxuc))-`kOQK|#OTGdM>T#$6OBQU14rV)qgcy{aB4!! zM=<HlgV2+Soahzffs3Su(k46D@x5K1OiJ6`F0}JrvJ+-!`~B<d|IK@|GsDoGTQ_2E zc@M`?s28B#hk7X17CQp%*XwZDQ*<om{ox~e=;qy5d!FKR$5EfhB|Mx;rL>KjPN&t} z+}wjkZG@~g%I4;#&SWx$`T6;&WHNayD7P(Mw2@LuFE1|_7Zw(N%*@Q34#I4cmwwk= zE~miG8^C<okC_86a<8wiYhW&drXST~=E952g+jqs)0}vb88w~FW{Y6!m1>&i#*55Y zP}87|JoI~mrarjxA~R`vc6Rm&F-zbDJ3r&jyQ7Ccpy8{;iY+($8vd4pxOc{6<;F|> z8N@q4O`fP^<;07=1)L@Dt&wV+bRP#j)atv4(QIw<8d|Ly8%$0*x5Z0Z4U<nIbE_-n z>rfw(-J+I<1)Psv+De`1R!;m<!+Jng8>O6I(`x$mmNPjprIVe3$8WZHT^l)DdVBGC z5tvtWygShN%_^@8UDkiUPb!t@-%y_}_W5~<eO^zE<+X3xNemQ0(~s*hbKynma{ec3 zx}Xw$N&TU(YQDpX*R?ci`pb)=ljvV9#k=?9lk9k1XiwA5=ia=U=o&Qj!IRg8*5$RO z9ZmN>CFY3Nv(5gFg7hHB-z4>CZoHVhQd04ry5l$d{w63M3(9v$t6}m<)I`f`$b6mR zM$|UP0{U&oHdJk=o}1QVZO0q=W_EeOPH#Gv^y|)3L7A=ddcW;2{jR+y2s0C2)MH7H zoWJMC%!n76%X*|^T#v;L*WzZzOMbtohtHm@#>|u#{V=CT+uJLd+46dR_!~5R&17cI zi~3Mt>tSM!cn>sI%F%-?f0NRmNs1Se;<223M^rx9c)m_?BWjytftHWs>Doca@w~0; zQPKR{{;oI&f3=|Nea4rH=HCosH1kx@e88?51kJbXLPzs&hAj^ERFED7`5Vn?NLWu0 z&A%P2N4f77&A&BoUM^(5-kecO^sZ!qR<EO_&kMVr7GH0p?CgKr3bS6>1}}al?SHGa zSBNxVwzlkR+KBeQ0gLbYNe;ZoPJ4x5?@itHlU#U_nbzP-*e`;-Sd2XmtK9eFc*NeZ z)*cd0dN6tMoHPx4bpEfOjCd=p6z;YZJxKC5N&Ol57Q~B}X8f%@=iqNr;<2QBXFvHQ VYNFK@^L5Z_!~d_MQqP=k{{yDOX$SxS literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_trackbar_thumb_right_44px.svg b/dlls/light.msstyles/blue_trackbar_thumb_right_44px.svg new file mode 100644 index 00000000000..3f372770d21 --- /dev/null +++ b/dlls/light.msstyles/blue_trackbar_thumb_right_44px.svg @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:44-32" width="44" height="100" version="1.1" viewBox="0 0 11.642 26.458" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <g stroke-width=".26458"> + <path d="m8.3507 4.8947-7.9539-0.0032v-4.4914l7.9539-0.0032 2.8176 2.2489z" fill="#fff" stroke="#aeaeae"/> + <path d="m8.4736 15.61-8.2057-0.0034v-4.7557l8.2057-0.0034 2.9068 2.3812z" fill="#2979ff"/> + <g fill="#fff"> + <path d="m8.3507 10.186-7.9539-0.0032v-4.4915l7.9539-0.0032 2.8176 2.2489z" stroke="#3096fa"/> + <path d="m8.3507 26.061-7.9539-0.0032v-4.4914l7.9539-0.0032 2.8176 2.2489z" stroke="#aeaeae"/> + <path d="m8.3507 20.77-7.9539-0.0032v-4.4915l7.9539-0.0032 2.8176 2.2489z" stroke="#3096fa"/> + </g> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_trackbar_thumb_up_11px.bmp b/dlls/light.msstyles/blue_trackbar_thumb_up_11px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..62a89d8f36266d42b8fd223fedb9294148896d61 GIT binary patch literal 4318 zcmeH~%}WAN5WqL;)<p;*50X%XrUxSutXr2(U7~w`L8mTC{skQhLZh@pXTeYC9zuc; zbPzuf+#o;t52AM0on}^_t+BfqVX(D><GeTX+qXLV#_?_K@HS47V|<UG&Z6$4PH`@7 z8tvX7jzg6I$Ms+2gRSk|Lsf9B;mlZ+K9o+UWmGUwnO#kck<eNe3zSQ<<pFnLU-J2U zwOlU0YCUK2Q=GAxOvZ-udZki%Q}Z|%(BH&7%rTa1GMTiapRd(w3g2ingj_DyLjSy) zW8+jR<v_k&EEYwy9h$S4md$3fPSgTft@xyT!nt2Y1p^)K2V(R^rZp@U%$5gGo;}-N zLLyj|?oKpoi2M|1ES&mn!qsM7Dn&<XNGiny^fw_I7^xvRTeai$eD6N4@V$p?K}-Z& z5L?%*A-G&~i1A=sx;YTV#72ka?A}`TCFXMq7l8s<t@xyT5cbHZV4yvA??28O<$z+t z-v@(Su{F%hcE9+3-H-j?UPiX9!#_jVyTVwq5OTYaeH`W8EeLs+)Epbbk!Jx}e!xHJ zai92Gi1-$n?>8*<4uc+K^%kY^nyt5d=kr>9=%;l?|J_lo^U(i3>sjX^RUy3tkbgGh literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_trackbar_thumb_up_11px.svg b/dlls/light.msstyles/blue_trackbar_thumb_up_11px.svg new file mode 100644 index 00000000000..26ca8028227 --- /dev/null +++ b/dlls/light.msstyles/blue_trackbar_thumb_up_11px.svg @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:11-32" width="11" height="95" version="1.1" viewBox="0 0 2.9104 25.135" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <g stroke-width=".26458"> + <path d="m2.5135 21.655-0.00151 3.0834h-2.1136l-0.00151-3.0834 1.0583-1.0923z" fill="#fff" stroke="#aeaeae"/> + <path d="m2.6458 11.495-0.0017 3.3214h-2.3778l-0.00171-3.3214 1.1906-1.1766z" fill="#2979ff"/> + <g fill="#fff"> + <path d="m2.5135 1.547-0.00151 3.0834h-2.1136l-0.00151-3.0834 1.0583-1.0923z" stroke="#aeaeae"/> + <path d="m2.5135 16.628-0.0015 3.0834h-2.1136l-0.00151-3.0834 1.0583-1.0923z" stroke="#3096fa"/> + <path d="m2.5135 6.5741-0.0015 3.0834h-2.1136l-0.00151-3.0834 1.0583-1.0923z" stroke="#3096fa"/> + </g> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_trackbar_thumb_up_15px.bmp b/dlls/light.msstyles/blue_trackbar_thumb_up_15px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..6c6b7e0c16ce24d64d705669ba2f6306c100aa66 GIT binary patch literal 7638 zcmeHLy>AmS6i)>^e*qFpA+$7Y2tsK~C7PuSkO3h!Rz?<<rhJH*6_K=Q|Ac&pg#i`@ zM3sR7fshbVM4~7}xhTp-G`^f4&mniZyE@JtIuVKbROi|6{eFJuXZzLX*safJ1Ec3T z{yxTX2FnvHbAfY#Qz&na?O3%u5D5JFV>*a!-F|2>x~iUbg>nzd<#IX}@KAK4cjQoT z`A|wBpU+dtogOfsV>R8O1;OUjGDjB6^s3}ekCB1!F;;q~(=oagN`^zf=Kd`fi}7-~ zthU>2Ax}{hKwQ62DBLmD29w!rb`$&PHJeQ?ztw6%sZ>%knaq}zXVkI34Q8*`>$W`7 zXfy!(?c=+~3@lG#K8YZ%Tdh_{{93I>+56yoMR|Cq4*S1^{*_9lGGvmqofuIY$2E^* z_`swHH!B-SuIO06LowF|axkX0Y2nWCNJ(`dsj!(hBzJPCz~5L2963#ttpn>EIRS#U z<O+i0F!>m(R9L62FOL5CO@_lgXzt&mWH?R^)>Yd0$R~`owD}3h!L|Ni_lhmIYcH2K zNqVhEf4t}NX}tnue_hp5%iP?qB|{rzKdS2A-`bK0t-b@2j`p=wNSND6@^XaiMZ5af zS0ldu?KLIo)gJ0y<@Ujgr6n!Bstn&e9Wu$<Uh?qK?#evbyL!l^7v8_ZLgJ!^1-umF z-A*8P=p{}JYl+o~;NpPi*qCwbp2ut9>R#h4xgPegIY$c*FwWFvtSRg)JTunwc#iKO zcUt}!!glb!m1oo;u^31GuL=GK=<lw9<w@-KI&!-Xz6#rmH+Xob4*3z}{v7iacobZ7 zVnl67oDV`GcnCWeLL%I(Y<NzS=XUO?1C{=spJ(-rGih`jy^rTf{1$ZoNWXs_D|v30 z=k^KzJn)W5-nUQKSU%r-+rB#|xE!f{_A7FA%!cd1ypzHDF}p}1xuWRUZ9c|I-naj! H_wBy{<4r6B literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_trackbar_thumb_up_15px.svg b/dlls/light.msstyles/blue_trackbar_thumb_up_15px.svg new file mode 100644 index 00000000000..ae9115e84be --- /dev/null +++ b/dlls/light.msstyles/blue_trackbar_thumb_up_15px.svg @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:15-32" width="15" height="125" version="1.1" viewBox="0 0 3.9687 33.073" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <g stroke-width=".26458"> + <path d="m3.5719 28.414-0.0023 4.2576h-3.1704l-0.0023-4.2576 1.5875-1.5082z" fill="#fff" stroke="#aeaeae"/> + <path d="m3.7067 15.081-0.0025 4.4936h-3.4347l-0.0025-4.4936 1.7198-1.5918z" fill="#2979ff"/> + <g fill="#fff"> + <path d="m3.5719 21.799-0.0023 4.2576h-3.1704l-0.0023-4.2576 1.5875-1.5082z" stroke="#3096fa"/> + <path d="m3.5719 1.9553-0.0023 4.2576h-3.1704l-0.0023-4.2576 1.5875-1.5082z" stroke="#aeaeae"/> + <path d="m3.5719 8.5698-0.0023 4.2576h-3.1704l-0.0023-4.2576 1.5875-1.5082z" stroke="#3096fa"/> + </g> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_trackbar_thumb_up_21px.bmp b/dlls/light.msstyles/blue_trackbar_thumb_up_21px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..b8df1c175900401e51c54e10ee09ff804502bf87 GIT binary patch literal 18618 zcmeHOTWB0r7@k-wsTZVFr3gat#iXlkE;XbHNG(DyQV=1eKKUR%=v&dINvgPyv4SY1 z*=!QC;tgG6?&&5bS%X0mG(m`vOBE~$5@}h|xHCz1ZpZKJX40ANb#~5bSI;3QGjlHA zp8e1FpELjd=Rbbt+mk{xUBdsjkRL|=4Y@!#And}mWV;@>rbGlG_D9Re@e?n;VXDmN z_U?>YId9b6-7O;%7TFk0Pfw4kX&P~w=$JUBAaHqdE;-R9=#h^81yq+9a*1Pdd9qsP zcen(uYPwDzoh7<=AVoRP3KP1cyWQ@)s2*`l=X1p6nL92)wvqMqbw^4R4u=VF6od1< zy}h+VLqpQm)>c-ykw}CD0s#@2uTdQ`5^$Tw$H&8V-x+E9iHQlZudnX|1IxHl-5(ej z=$@LI+ORX&nVFeQ^b7j^e)@VJmwY~7A?oMm=jS7t;4UsMDrmnnGBR>s9GIy9pSQoi zzyJF3@^VVWT3ub$(Jlm;J!a~j^tP+3%LVy_L!nT@;jXQ%5!6eVlZvDu2`bS3)ZpNt zC`pn9cXM--P>x`IJe#0f+9HhQ{P6IwD9dsbS5;LqHa14*n3`W%C&;XGa&l6ld&~6n zw20@gvIg7k==FMc17~V<bX3M1&tMMkaf(U%L#}%<zX8Z_9}B!Y2}Aaj$#P2xVUdmR zC40(MqQ&@PA*0O)Iwp=O2wa}|z@;*9Ua`sW_~us5GsDClhM&lgpzo~4$uYS+bHJri zjc97TV%RK^TT0Qx;5;KtPpMAaLe$=rJsi{Kl*BcM47og`Ye){b)LI_VL%+t!+)jbM zc8%cOLoqlXX)UW&K7LLj8;Na~wAfoWiSo$_QTCQw?9E79Ws~Bs4HGpZ6Ykc>V82zq zd0CV@suI|nLV?mz)uUcH2YWN633m$*cWThRDR)!{iN7YHy-D6bx<_uWn$v!2&1kUN zY=<JZS1*zG4yCj=$>pc_EA2<GYgezN9ISrrdmZgU8<(HV$li=JA9l%YRbl<lIm`Dn z9`qXvL~g5;WY1w+_NLlWdP@1|8A%VX8c?yTbb~0J&q|TjBQMeS4ZBJ4R@5n<Jui|- zIEJTe5#`Go5#RZ3yIAJ-;D}G@dsU))iyAm5Von^}o5Wkb8(f)EzIZ{#b%yv|Ozch4 z^3-0)FF=|r{&V&wX(-l^34^Q}^UE>0JRR~WAGxGE{LY3BY9>A6n9kQGE>92&+{_m) z8G7LKs+;u4DVEWnW5&2-$iwNC%QL^^+00~*Yb<Wx(ajoR7ilQ!bB0?KAns$9BY~vu zi3foBbC$TjkPDALXpGT(1@5E3T(*h(2f3KqJ|q_ox`25zL)^beqpQR`u4MP5-gOd~ zN*Y|1Tr4`13?orF@LoxYSzr8mqJHVhfcb7h+{WUjbbXW6!)aAO8V-JL#Vz{U_#Gu# zzjWoqeV~xk7yl5$E&7qT%kNFsCzE>U!#<36n7n!Dkxbg>QycEz%m?2Y_ZM4#M6>^7 z^&93wp3MA)CZ9etOzw-sqRf4}O#JUT<`N@c5BG0!KkWb62hGI4`Fno*H`}Yb?fW<1 zN$ubC9V_JiO+nc9Z;DC%o1W6F&eJO1Bj=S*PsjT=+bSKMr^TFga{uPPZ<*qZFpuA~ zZ@yT1K!!Uu0?xIwifQ7QP!BFoCb6sZj1G_AWT%^4o@{k<N1j+qdHkkjcd`F~HIv7g zf}gCol#lYnn3>0KLY`-H5x<Gpyi37gP|P-d6ESoj-u@;{_dAsLAXd*BV3<aoW@l$< z{N{Jb;x|#ghsJL%EG%Sno_1+zNx?X-qTl_ukJ0>$`e^*-%E}5|3zMchC4Lj}g{Ki` ri11CTc#Zf?@Gq<LwCGodSl2}Hn~u)YVh()y7QYFeJ!Iy{KY9N*hU~EO literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_trackbar_thumb_up_21px.svg b/dlls/light.msstyles/blue_trackbar_thumb_up_21px.svg new file mode 100644 index 00000000000..5b73b2fec54 --- /dev/null +++ b/dlls/light.msstyles/blue_trackbar_thumb_up_21px.svg @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:21-32" width="21" height="220" version="1.1" viewBox="0 0 5.5562 58.208" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <g stroke-width=".26458"> + <path d="m0.4005 49.854 0.0034 7.9539h4.7556l0.0034-7.9539-2.3812-2.8176z" fill="#fff" stroke="#aeaeae"/> + <path d="m0.26458 26.451 0.0036 8.2057h5.0199l0.0036-8.2057-2.5135-2.9068z" fill="#2979ff"/> + <g fill="#fff"> + <path d="m0.4005 38.212 0.0034 7.9539h4.7556l0.0034-7.9539-2.3812-2.8176z" stroke="#3096fa"/> + <path d="m0.40051 3.2871 0.0034 7.9539h4.7556l0.0034-7.9539-2.3812-2.8176z" stroke="#aeaeae"/> + <path d="m0.4005 14.929 0.0034 7.9539h4.7556l0.0034-7.9539-2.3812-2.8176z" stroke="#3096fa"/> + </g> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_trackbar_thumb_vertical.bmp b/dlls/light.msstyles/blue_trackbar_thumb_vertical.bmp new file mode 100644 index 0000000000000000000000000000000000000000..b5c9d0f78a528afc15f2073d17e0a8fce6e1884a GIT binary patch literal 4758 zcmeHJKTpC?5U<hE$;7qo*y@5|aFT(=$;GeYAgG_f*+7W)3y>6s_A~UK#u+{dv3)P+ zUEu}7guT}$L@pdx+TO44?tVY|x_5&!qqJB2enCG+zeYbYY~vW?>FPQjZWtKG@<ZpK zdwc(|adD@^lb!D3-Q@ee6^3CloleDMGJ&d2`9ToG<MG(Un9k>Oi3S{_{Ml?);u1a= zPpyS;RK4n)j;MO41507lg;_&Ci#q0B2S0g=X)c>;Crv4?DlYsrQa<8Dq)pN~X^N|* znzdO_jXF*BY#%Ud&?e14)A^sgdS}?Ac^&*DJmPzE>f${Ko?Q!iZVWv~K;MPRzRZu{ z@zO+$1f7SsUW?GOzBS&m#;1#-a;@7~`}mtX@9mmPJST&`BQ^Dv_>&+nZH%cVekR0s zo?@EIUc6md`9~+thi#D$T2R?3-|Iw+QQOSDn?!!S3y?YQ6@vNlb0pOI*m!C+;s>za zf@;-is&{*ViSyFjPnv%wzdgyurMV-2h)0WI%f^`M;V0rD-<wkx?@5O}tv)3k_O$<Z GPx}k^i?<a3 literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_trackbar_thumb_vertical.svg b/dlls/light.msstyles/blue_trackbar_thumb_vertical.svg new file mode 100644 index 00000000000..0ea443d89ef --- /dev/null +++ b/dlls/light.msstyles/blue_trackbar_thumb_vertical.svg @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:21-32" width="21" height="55" version="1.1" viewBox="0 0 5.5562 14.552" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <g stroke-width=".26458"> + <rect x=".13229" y=".39688" width="5.2917" height="2.1167" rx=".52917" ry=".52917" fill="#fff" stroke="#aeaeae"/> + <rect x=".13229" y="3.3073" width="5.2917" height="2.1167" rx=".52917" ry=".52917" fill="#fff" stroke="#3096fa"/> + <rect x=".13229" y="6.2177" width="5.2917" height="2.1167" rx=".52917" ry=".52917" fill="#2979ff" stroke="#2979ff"/> + <rect x=".13229" y="9.1281" width="5.2917" height="2.1167" rx=".52917" ry=".52917" fill="#fff" stroke="#aeaeae"/> + <rect x=".13229" y="12.039" width="5.2917" height="2.1167" rx=".52917" ry=".52917" fill="#fff" stroke="#aeaeae"/> + </g> +</svg> diff --git a/dlls/light.msstyles/light.rc b/dlls/light.msstyles/light.rc index f5fc7eae6f4..c8c3f22ddb1 100644 --- a/dlls/light.msstyles/light.rc +++ b/dlls/light.msstyles/light.rc @@ -775,6 +775,110 @@ BLUE_INI TEXTFILE "GlyphImageFile = blue_toolbar_buttons_split_dropdown_glyph.bmp\r\n" "GlyphTransparent = True\r\n" +"\r\n; TrackBar\r\n" +"[TrackBar]\r\n" +"BgType = BorderFill\r\n" +"FillType = Solid\r\n" +"FillColor = 245 245 245\r\n" +"BorderSize = 1\r\n" +"BorderColor = 174 174 174\r\n" + +"[TrackBar.Thumb]\r\n" +"BgType = ImageFile\r\n" +"ImageFile = blue_trackbar_thumb_horizontal.bmp\r\n" +"ImageCount = 5\r\n" +"ImageLayout = Vertical\r\n" +"SizingMargins = 2, 3, 2, 3\r\n" +"SizingType = Tile\r\n" + +"[TrackBar.ThumbVert]\r\n" +"BgType = ImageFile\r\n" +"ImageFile = blue_trackbar_thumb_vertical.bmp\r\n" +"SizingMargins = 2, 3, 2, 3\r\n" +"SizingType = Stretch\r\n" +"ImageCount = 5\r\n" +"ImageLayout = Vertical\r\n" + +"[TrackBar.ThumbTop]\r\n" +"BgType = ImageFile\r\n" +"ImageCount = 5\r\n" +"ImageLayout = Vertical\r\n" +"Transparent = True\r\n" +"SizingType = TrueSize\r\n" +"ImageSelectType = Dpi\r\n" +"UniformSizing = true\r\n" +"ImageFile1 = blue_trackbar_thumb_up_11px.bmp\r\n" +"ImageFile2 = blue_trackbar_thumb_up_15px.bmp\r\n" +"ImageFile3 = blue_trackbar_thumb_up_21px.bmp\r\n" +"MinDpi1 = 96\r\n" +"MinDpi2 = 118\r\n" +"MinDpi3 = 185\r\n" + +"[TrackBar.ThumbBottom]\r\n" +"BgType = ImageFile\r\n" +"ImageCount = 5\r\n" +"Transparent = True\r\n" +"SizingType = TrueSize\r\n" +"ImageLayout = Vertical\r\n" +"ImageSelectType = Dpi\r\n" +"UniformSizing = True\r\n" +"ImageFile1 = blue_trackbar_thumb_down_11px.bmp\r\n" +"ImageFile2 = blue_trackbar_thumb_down_15px.bmp\r\n" +"ImageFile3 = blue_trackbar_thumb_down_21px.bmp\r\n" +"MinDpi1 = 96\r\n" +"MinDpi2 = 118\r\n" +"MinDpi3 = 185\r\n" + +"[TrackBar.ThumbLeft]\r\n" +"BgType = ImageFile\r\n" +"SizingType = TrueSize\r\n" +"ImageCount = 5\r\n" +"Transparent = True\r\n" +"ImageLayout = Vertical\r\n" +"ImageSelectType = Dpi\r\n" +"UniformSizing = True\r\n" +"ImageFile1 = blue_trackbar_thumb_left_19px.bmp\r\n" +"ImageFile2 = blue_trackbar_thumb_left_25px.bmp\r\n" +"ImageFile3 = blue_trackbar_thumb_left_44px.bmp\r\n" +"MinDpi1 = 96\r\n" +"MinDpi2 = 118\r\n" +"MinDpi3 = 185\r\n" + +"[TrackBar.ThumbRight]\r\n" +"BgType = ImageFile\r\n" +"SizingType = TrueSize\r\n" +"ImageCount = 5\r\n" +"Transparent = True\r\n" +"ImageLayout = Vertical\r\n" +"ImageSelectType = Dpi\r\n" +"UniformSizing = True\r\n" +"ImageFile1 = blue_trackbar_thumb_right_19px.bmp\r\n" +"ImageFile2 = blue_trackbar_thumb_right_25px.bmp\r\n" +"ImageFile3 = blue_trackbar_thumb_right_44px.bmp\r\n" +"MinDpi1 = 96\r\n" +"MinDpi2 = 118\r\n" +"MinDpi3 = 185\r\n" + +"[TrackBar.Track]\r\n" +"BgType = ImageFile\r\n" +"ImageFile = blue_trackbar_slider_track.bmp\r\n" +"ImageCount = 1\r\n" +"SizingType = Stretch\r\n" +"SizingMargins = 2, 2, 2, 2\r\n" + +"[TrackBar.TrackVert]\r\n" +"BgType = ImageFile\r\n" +"ImageFile = blue_trackbar_slider_track.bmp\r\n" +"ImageCount = 1\r\n" +"SizingType = Stretch\r\n" +"SizingMargins = 2, 2, 2, 2\r\n" + +"[TrackBar.Tics]\r\n" +"Color = 174 174 174\r\n" + +"[TrackBar.TicsVert]\r\n" +"Color = 174 174 174\r\n" + "\r\n; TreeView\r\n" "[TreeView]\r\n" "BgType = BorderFill\r\n" @@ -966,6 +1070,52 @@ BLUE_TOOLBAR_BUTTONS_SPLIT_DROPDOWN_BMP BITMAP "blue_toolbar_buttons_split_dropd /* @makedep: blue_toolbar_buttons_split_dropdown_glyph.bmp */ BLUE_TOOLBAR_BUTTONS_SPLIT_DROPDOWN_GLYPH_BMP BITMAP "blue_toolbar_buttons_split_dropdown_glyph.bmp" +/* TrackBar */ +/* @makedep: blue_trackbar_thumb_horizontal.bmp */ +BLUE_TRACKBAR_THUMB_HORIZONTAL_BMP BITMAP "blue_trackbar_thumb_horizontal.bmp" + +/* @makedep: blue_trackbar_thumb_vertical.bmp */ +BLUE_TRACKBAR_THUMB_VERTICAL_BMP BITMAP "blue_trackbar_thumb_vertical.bmp" + +/* @makedep: blue_trackbar_slider_track.bmp */ +BLUE_TRACKBAR_SLIDER_TRACK_BMP BITMAP "blue_trackbar_slider_track.bmp" + +/* @makedep: blue_trackbar_thumb_down_11px.bmp */ +BLUE_TRACKBAR_THUMB_DOWN_11PX_BMP BITMAP "blue_trackbar_thumb_down_11px.bmp" + +/* @makedep: blue_trackbar_thumb_down_15px.bmp */ +BLUE_TRACKBAR_THUMB_DOWN_15PX_BMP BITMAP "blue_trackbar_thumb_down_15px.bmp" + +/* @makedep: blue_trackbar_thumb_down_21px.bmp */ +BLUE_TRACKBAR_THUMB_DOWN_21PX_BMP BITMAP "blue_trackbar_thumb_down_21px.bmp" + +/* @makedep: blue_trackbar_thumb_left_19px.bmp */ +BLUE_TRACKBAR_THUMB_LEFT_19PX_BMP BITMAP "blue_trackbar_thumb_left_19px.bmp" + +/* @makedep: blue_trackbar_thumb_left_25px.bmp */ +BLUE_TRACKBAR_THUMB_LEFT_25PX_BMP BITMAP "blue_trackbar_thumb_left_25px.bmp" + +/* @makedep: blue_trackbar_thumb_left_44px.bmp */ +BLUE_TRACKBAR_THUMB_LEFT_44PX_BMP BITMAP "blue_trackbar_thumb_left_44px.bmp" + +/* @makedep: blue_trackbar_thumb_right_19px.bmp */ +BLUE_TRACKBAR_THUMB_RIGHT_19PX_BMP BITMAP "blue_trackbar_thumb_right_19px.bmp" + +/* @makedep: blue_trackbar_thumb_right_25px.bmp */ +BLUE_TRACKBAR_THUMB_RIGHT_25PX_BMP BITMAP "blue_trackbar_thumb_right_25px.bmp" + +/* @makedep: blue_trackbar_thumb_right_44px.bmp */ +BLUE_TRACKBAR_THUMB_RIGHT_44PX_BMP BITMAP "blue_trackbar_thumb_right_44px.bmp" + +/* @makedep: blue_trackbar_thumb_up_11px.bmp */ +BLUE_TRACKBAR_THUMB_UP_11PX_BMP BITMAP "blue_trackbar_thumb_up_11px.bmp" + +/* @makedep: blue_trackbar_thumb_up_15px.bmp */ +BLUE_TRACKBAR_THUMB_UP_15PX_BMP BITMAP "blue_trackbar_thumb_up_15px.bmp" + +/* @makedep: blue_trackbar_thumb_up_21px.bmp */ +BLUE_TRACKBAR_THUMB_UP_21PX_BMP BITMAP "blue_trackbar_thumb_up_21px.bmp" + /* TreeView */ /* @makedep: blue_treeview_expand_collapse_9px.bmp */ BLUE_TREEVIEW_EXPAND_COLLAPSE_9PX_BMP BITMAP "blue_treeview_expand_collapse_9px.bmp" -- 2.30.2

1 0

[PATCH 4/6] light.msstyles: Add Tab parts.
by Zhiyi Zhang 28 Jun '21

28 Jun '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/light.msstyles/Makefile.in | 5 + dlls/light.msstyles/blue_tab_background.bmp | Bin 0 -> 19338 bytes dlls/light.msstyles/blue_tab_background.svg | 13 +++ dlls/light.msstyles/blue_tab_item.bmp | Bin 0 -> 1658 bytes dlls/light.msstyles/blue_tab_item.svg | 108 +++++++++++++++++++ dlls/light.msstyles/blue_tab_item_left.bmp | Bin 0 -> 1658 bytes dlls/light.msstyles/blue_tab_item_left.svg | 111 ++++++++++++++++++++ dlls/light.msstyles/blue_tab_item_right.bmp | Bin 0 -> 1658 bytes dlls/light.msstyles/blue_tab_item_right.svg | 109 +++++++++++++++++++ dlls/light.msstyles/blue_tab_pane_edge.bmp | Bin 0 -> 9354 bytes dlls/light.msstyles/blue_tab_pane_edge.svg | 16 +++ dlls/light.msstyles/light.rc | 104 ++++++++++++++++++ 12 files changed, 466 insertions(+) create mode 100644 dlls/light.msstyles/blue_tab_background.bmp create mode 100644 dlls/light.msstyles/blue_tab_background.svg create mode 100644 dlls/light.msstyles/blue_tab_item.bmp create mode 100644 dlls/light.msstyles/blue_tab_item.svg create mode 100644 dlls/light.msstyles/blue_tab_item_left.bmp create mode 100644 dlls/light.msstyles/blue_tab_item_left.svg create mode 100644 dlls/light.msstyles/blue_tab_item_right.bmp create mode 100644 dlls/light.msstyles/blue_tab_item_right.svg create mode 100644 dlls/light.msstyles/blue_tab_pane_edge.bmp create mode 100644 dlls/light.msstyles/blue_tab_pane_edge.svg diff --git a/dlls/light.msstyles/Makefile.in b/dlls/light.msstyles/Makefile.in index c3c5643236a..7be6fa532a6 100644 --- a/dlls/light.msstyles/Makefile.in +++ b/dlls/light.msstyles/Makefile.in @@ -45,6 +45,11 @@ SVG_SRCS = \ blue_spin_glyph_up.svg \ blue_status_background.svg \ blue_status_pane.svg \ + blue_tab_background.svg \ + blue_tab_item.svg \ + blue_tab_item_left.svg \ + blue_tab_item_right.svg \ + blue_tab_pane_edge.svg \ blue_toolbar_buttons.svg \ blue_toolbar_buttons_split.svg \ blue_toolbar_buttons_split_dropdown.svg \ diff --git a/dlls/light.msstyles/blue_tab_background.bmp b/dlls/light.msstyles/blue_tab_background.bmp new file mode 100644 index 0000000000000000000000000000000000000000..f98d95e3fa16bc27694891006c98a7e167846f4b GIT binary patch literal 19338 zcmeIxJr2Qe0Egi}F*$+rSPWt@xrfyWT)J8xi{Xvk(`ZF2k-UD-{&YW%=W(B}xB1-8 z=Vd*{YV4l($NTx~!{<7U@p>&crv2f3{XF^gee?CjDUbO_^6)(KEdNy=o@XBY>?a4p zPv+r=pBxB3nTH>Kav=O<9)9@Af$)=g_~9o9!cXSmho2k>KbeOgesUoEWFCI_$${{b zdHCTc2f|P0;fJ3b2tS#JAAWKm{A3<}_{o9rlX>{zCkMh$=HZ8*90)&|haY}&ApB$= ze)!3O@RND?;U@>ePv+r=pBxB3nTH>Kav=O<9)9@Af$)=g_~9o9!cXSmho2k>Kbhwb G{5$|xt`<uG literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_tab_background.svg b/dlls/light.msstyles/blue_tab_background.svg new file mode 100644 index 00000000000..55f868b3f4a --- /dev/null +++ b/dlls/light.msstyles/blue_tab_background.svg @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:10-24" width="10" height="600" version="1.1" viewBox="0 0 2.6458 158.75" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <rect x="1e-7" y="5e-7" width="2.6458" height="158.75" fill="#fff" stroke-width="0"/> +</svg> diff --git a/dlls/light.msstyles/blue_tab_item.bmp b/dlls/light.msstyles/blue_tab_item.bmp new file mode 100644 index 0000000000000000000000000000000000000000..4ebf519c2e7d5bd1868dc89813db582002cde966 GIT binary patch literal 1658 zcmeHGOG?8~6upAF2DeZI6{G{Foj7vh21JFr07oqq=Pp1Zwk{!`w*ZACQ=KG(WC3+r zlMo@F*Xwz08o?Ag73(GU<eqzy!8^RuIq7fHtnPpV^cMOIy+J!bq7Sub6cf!KrEur? z^t$oMipAy+oqH{=tJk8n;{9FX!5){na-higW}kR?&Myy~rTnb%=#qFc=FtV;9)j@X zopfDK7lpaO4Z~Q-=`wxQ|G!-~O*2Un91)0_Y}@vIKZ+vH^Bl(^D0m4WfS9SiTk}Er zRj(?4{xpY2Qc4^VsQiL0VHlQW83cjrx|Ls+Wq~Na^816@56tVwwKmIH9?LA(+EiFw o`S!&5r+gh2;)<s6xDeg^@d#uZ|L1Xe9^*Lv&Lbj<`&H%f3kb2a(f|Me literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_tab_item.svg b/dlls/light.msstyles/blue_tab_item.svg new file mode 100644 index 00000000000..ec462d22cd7 --- /dev/null +++ b/dlls/light.msstyles/blue_tab_item.svg @@ -0,0 +1,108 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:5-24" width="5" height="95" version="1.1" viewBox="0 0 1.3229 25.135" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <rect y="-5e-5" width="1.3229" height="25.135" fill="#fff" stroke-width=".26458"/> + <rect transform="rotate(90)" x="19.315" y="-.26458" width=".26458" height=".26458" fill="#aeaeae" stroke-width="0"/> + <rect x=".13229" y="15.214" width="1.0583" height="4.7625" rx=".52917" ry=".52916" fill="#f5f5f5" stroke="#aeaeae" stroke-width=".26458"/> + <g stroke-width="0"> + <g fill="#aeaeae"> + <rect transform="rotate(90)" x="19.579" y="-.26458" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="19.579" y="-1.3229" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="19.844" y="-.26458" width=".26458" height=".26458"/> + </g> + <rect transform="rotate(90)" x="19.315" y="-1.0583" width=".79375" height=".79375" fill="#f5f5f5"/> + <rect transform="rotate(90)" x="19.844" y="-1.3229" width=".26458" height=".26458" fill="#fff"/> + <g fill="#aeaeae"> + <rect transform="rotate(90)" x="19.844" y="-1.3229" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="19.315" y="-1.3229" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="4.2333" y="-.26458" width=".26458" height=".26458"/> + </g> + </g> + <g fill="#fff"> + <rect x=".13229" y="5.1594" width="1.0583" height="4.7625" rx=".52917" ry=".52916" stroke="#3096fa" stroke-width=".26458"/> + <rect transform="rotate(90)" x="9.7896" y="-1.0583" width=".26458" height=".79375" stroke-width="0"/> + <rect transform="rotate(90)" x="9.525" y="-.52917" width=".26458" height=".26458" stroke-width="0"/> + </g> + <g stroke-width="0"> + <rect transform="rotate(90)" x="9.525" y="-1.0583" width=".26458" height=".26458" fill="#aeaeae"/> + <g fill="#fff"> + <rect transform="rotate(90)" x="9.2604" y="-.52917" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="9.525" y="-.79375" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="9.525" y="-1.0583" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="9.2604" y="-1.0583" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="9.7896" y="-1.3229" width=".26458" height=".26458"/> + </g> + <g fill="#3096fa"> + <rect transform="rotate(90)" x="9.7896" y="-1.3229" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="9.525" y="-.26458" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="9.525" y="-1.3229" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="9.7896" y="-1.3229" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="9.7896" y="-.26458" width=".26458" height=".26458"/> + </g> + </g> + <rect x=".13229" y="10.186" width="1.0583" height="4.7625" rx=".52917" ry=".52916" fill="#fff" stroke="#aeaeae" stroke-width=".26458"/> + <g stroke-width="0"> + <rect transform="rotate(90)" x="14.817" y="-1.3229" width=".26458" height="1.3229" fill="#fff"/> + <rect transform="rotate(90)" x="14.552" y="-.26458" width=".26458" height=".26458" fill="#aeaeae"/> + <rect transform="rotate(90)" x="14.552" y="-1.3229" width=".26458" height=".26458" fill="#aeaeae"/> + <rect transform="rotate(90)" x="14.552" y="-.52917" width=".26458" height=".26458" fill="#fff"/> + <rect transform="rotate(90)" x="14.552" y="-1.0583" width=".26458" height=".26458" fill="#aeaeae"/> + </g> + <g fill="#fff"> + <g stroke-width="0"> + <rect transform="rotate(90)" x="14.288" y="-.52917" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="14.552" y="-.79375" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="14.552" y="-1.0583" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="14.288" y="-1.0583" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="14.817" y="-.79375" width=".26458" height=".26458"/> + </g> + <rect x=".13229" y="20.241" width="1.0583" height="4.7625" rx=".52917" ry=".52916" stroke="#2979ff" stroke-width=".26458"/> + <rect transform="rotate(90)" x="24.871" y="-1.0583" width=".26458" height=".79375" stroke-width="0"/> + <rect transform="rotate(90)" x="24.606" y="-.52917" width=".26458" height=".26458" stroke-width="0"/> + </g> + <g stroke-width="0"> + <rect transform="rotate(90)" x="24.606" y="-1.0583" width=".26458" height=".26458" fill="#aeaeae"/> + <g fill="#fff"> + <rect transform="rotate(90)" x="24.342" y="-.52917" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="24.606" y="-.79375" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="24.606" y="-1.0583" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="24.342" y="-1.0583" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="24.871" y="-1.3229" width=".26458" height=".26458"/> + </g> + <rect transform="rotate(90)" x="24.871" y="-1.3229" width=".26458" height=".26458" fill="#3096fa"/> + <g fill="#2979ff"> + <rect transform="rotate(90)" x="24.606" y="-1.3229" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="24.871" y="-1.3229" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="24.871" y="-.26458" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="24.606" y="-.26458" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="24.342" y="-1.3229" width=".26458" height=".26458"/> + </g> + <rect transform="rotate(90)" x="9.2604" y="-1.3229" width=".26458" height=".26458" fill="#3096fa"/> + <rect transform="rotate(90)" x="9.2604" y="-.26458" width=".26458" height=".26458" fill="#3096fa"/> + <rect transform="rotate(90)" x="14.287" y="-.26458" width=".26458" height=".26458" fill="#aeaeae"/> + <rect transform="rotate(90)" x="14.288" y="-1.3229" width=".26458" height=".26458" fill="#aeaeae"/> + <rect transform="rotate(90)" x="24.606" y="-.26458" width=".26458" height=".26458" fill="#2979ff"/> + <rect transform="rotate(90)" x="24.342" y="-.26458" width=".26458" height=".26458" fill="#2979ff"/> + </g> + <rect x=".13229" y=".13229" width="1.0583" height="4.7625" rx=".52917" ry=".52916" fill="#f5f5f5" stroke="#aeaeae" stroke-width=".26458"/> + <g fill="#aeaeae" stroke-width="0"> + <rect transform="rotate(90)" x="4.4979" y="-.26458" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="4.4979" y="-1.3229" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="4.7625" y="-.26458" width=".26458" height=".26458"/> + </g> + <g stroke-width="0"> + <rect transform="rotate(90)" x="4.2333" y="-1.0583" width=".79375" height=".79375" fill="#f5f5f5"/> + <rect transform="rotate(90)" x="4.7625" y="-1.3229" width=".26458" height=".26458" fill="#fff"/> + <rect transform="rotate(90)" x="4.7625" y="-1.3229" width=".26458" height=".26458" fill="#aeaeae"/> + <rect transform="rotate(90)" x="4.2333" y="-1.3229" width=".26458" height=".26458" fill="#aeaeae"/> + </g> + <rect x="1.2723" y="20.898" width=".016691" height=".060252" rx=".52917" ry=".060252" fill="#fff" stroke-width=".26458"/> +</svg> diff --git a/dlls/light.msstyles/blue_tab_item_left.bmp b/dlls/light.msstyles/blue_tab_item_left.bmp new file mode 100644 index 0000000000000000000000000000000000000000..e395328565e388d743e8dd088b3e15706781804e GIT binary patch literal 1658 zcmeHGJ5Iwu6nsd)8Ms24KtT%HG*mRX079T}0IHxMdJce$NH~H&djODZx6s&yeSpvg z+cJ_ro5yT$jKGo7BEpm3?3<l+v7?>t(d9PH>jpSPZ=sLT8?*x?dQ%&XVxrGaDcn8m zT{MoY*x3A`^Pt6b4O+BzeAwnPR}K^zU+of)PWb7Lvy>k-9-k6VCs_D;pT}oBeI;Gj z(?wx!aKkVba=J`k_5W|zP18)01Xl!NCfl}s-;bim^E}6K2nrS<1Q4_Gr+!`-zVXVR zTK|h29!V*2MWFHvwuE6=mSqqGuIpBQS(XK&{K{|lYCkZqAJ;l8=Xor%T<cI__2tV0 l=kM})RETq$#gjtx^ZNskS^S^J<#~+b_$!ZyDBf3<#}B7Dv)=#! literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_tab_item_left.svg b/dlls/light.msstyles/blue_tab_item_left.svg new file mode 100644 index 00000000000..26bd9353a2b --- /dev/null +++ b/dlls/light.msstyles/blue_tab_item_left.svg @@ -0,0 +1,111 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:5-24" width="5" height="95" version="1.1" viewBox="0 0 1.3229 25.135" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <rect y="-5e-5" width="1.3229" height="25.135" fill="#fff" stroke-width=".26458"/> + <g fill="#fff"> + <rect x=".13229" y="5.1594" width="1.0583" height="4.7625" rx=".52917" ry=".52916" stroke="#3096fa" stroke-width=".26458"/> + <rect transform="rotate(90)" x="9.7896" y="-1.0583" width=".26458" height=".79375" stroke-width="0"/> + <rect transform="rotate(90)" x="9.525" y="-.52917" width=".26458" height=".26458" stroke-width="0"/> + </g> + <g stroke-width="0"> + <rect transform="rotate(90)" x="9.525" y="-1.0583" width=".26458" height=".26458" fill="#aeaeae"/> + <g fill="#fff"> + <rect transform="rotate(90)" x="9.2604" y="-.52917" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="9.525" y="-.79375" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="9.525" y="-1.0583" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="9.2604" y="-1.0583" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="9.7896" y="-1.3229" width=".26458" height=".26458"/> + </g> + <g fill="#3096fa"> + <rect transform="rotate(90)" x="9.7896" y="-1.3229" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="9.525" y="-.26458" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="9.525" y="-1.3229" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="9.7896" y="-1.3229" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="9.7896" y="-.26458" width=".26458" height=".26458"/> + </g> + </g> + <rect x=".13229" y="10.186" width="1.0583" height="4.7625" rx=".52917" ry=".52916" fill="#fff" stroke="#aeaeae" stroke-width=".26458"/> + <g stroke-width="0"> + <rect transform="rotate(90)" x="14.817" y="-1.3229" width=".26458" height="1.3229" fill="#fff"/> + <rect transform="rotate(90)" x="14.552" y="-.26459" width=".26458" height=".26458" fill="#aeaeae"/> + <rect transform="rotate(90)" x="14.552" y="-1.3229" width=".26458" height=".26458" fill="#aeaeae"/> + <rect transform="rotate(90)" x="14.552" y="-.52917" width=".26458" height=".26458" fill="#fff"/> + <rect transform="rotate(90)" x="14.552" y="-1.0583" width=".26458" height=".26458" fill="#aeaeae"/> + </g> + <g fill="#fff"> + <g stroke-width="0"> + <rect transform="rotate(90)" x="14.288" y="-.52917" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="14.552" y="-.79375" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="14.552" y="-1.0583" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="14.288" y="-1.0583" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="14.817" y="-.79375" width=".26458" height=".26458"/> + </g> + <rect x=".13229" y="20.241" width="1.0583" height="4.7625" rx=".52917" ry=".52916" stroke="#2979ff" stroke-width=".26458"/> + <rect transform="rotate(90)" x="24.871" y="-1.0583" width=".26458" height=".79375" stroke-width="0"/> + <rect transform="rotate(90)" x="24.606" y="-.52917" width=".26458" height=".26458" stroke-width="0"/> + </g> + <g stroke-width="0"> + <rect transform="rotate(90)" x="24.606" y="-1.0583" width=".26458" height=".26458" fill="#aeaeae"/> + <g fill="#fff"> + <rect transform="rotate(90)" x="24.342" y="-.52917" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="24.606" y="-.79375" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="24.606" y="-1.0583" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="24.342" y="-1.0583" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="24.871" y="-1.3229" width=".26458" height=".26458"/> + </g> + <rect transform="rotate(90)" x="24.871" y="-1.3229" width=".26458" height=".26458" fill="#3096fa"/> + <g fill="#2979ff"> + <rect transform="rotate(90)" x="24.606" y="-1.3229" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="24.871" y="-1.3229" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="24.871" y="-.26459" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="24.606" y="-.26458" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="24.342" y="-1.3229" width=".26458" height=".26458"/> + </g> + <rect transform="rotate(90)" x="9.2604" y="-1.3229" width=".26458" height=".26458" fill="#3096fa"/> + <rect transform="rotate(90)" x="9.2604" y="-.26458" width=".26458" height=".26458" fill="#3096fa"/> + <rect transform="rotate(90)" x="14.288" y="-.26458" width=".26458" height=".26458" fill="#aeaeae"/> + <rect transform="rotate(90)" x="14.288" y="-1.3229" width=".26458" height=".26458" fill="#aeaeae"/> + <rect transform="rotate(90)" x="24.606" y="-.26458" width=".26458" height=".26458" fill="#2979ff"/> + <rect transform="rotate(90)" x="24.342" y="-.26458" width=".26458" height=".26458" fill="#2979ff"/> + <g fill="#aeaeae"> + <rect transform="rotate(90)" x="14.552" y="-.26459" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="14.817" y="-.26458" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="19.315" y="-.26458" width=".26458" height=".26458"/> + </g> + </g> + <rect x=".13229" y="15.214" width="1.0583" height="4.7625" rx=".52917" ry=".52916" fill="#f5f5f5" stroke="#aeaeae" stroke-width=".26458"/> + <g stroke-width="0"> + <g fill="#aeaeae"> + <rect transform="rotate(90)" x="19.579" y="-.26458" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="19.579" y="-1.3229" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="19.844" y="-.26458" width=".26458" height=".26458"/> + </g> + <rect transform="rotate(90)" x="19.315" y="-1.0583" width=".79375" height=".79375" fill="#f5f5f5"/> + <rect transform="rotate(90)" x="19.844" y="-1.3229" width=".26458" height=".26458" fill="#fff"/> + <g fill="#aeaeae"> + <rect transform="rotate(90)" x="19.844" y="-1.3229" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="19.315" y="-1.3229" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="4.2333" y="-.26458" width=".26458" height=".26458"/> + </g> + </g> + <rect x=".13229" y=".13229" width="1.0583" height="4.7625" rx=".52917" ry=".52916" fill="#f5f5f5" stroke="#aeaeae" stroke-width=".26458"/> + <g fill="#aeaeae" stroke-width="0"> + <rect transform="rotate(90)" x="4.4979" y="-.26458" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="4.4979" y="-1.3229" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="4.7625" y="-.26458" width=".26458" height=".26458"/> + </g> + <g stroke-width="0"> + <rect transform="rotate(90)" x="4.2333" y="-1.0583" width=".79375" height=".79375" fill="#f5f5f5"/> + <rect transform="rotate(90)" x="4.7625" y="-1.3229" width=".26458" height=".26458" fill="#fff"/> + <rect transform="rotate(90)" x="4.7625" y="-1.3229" width=".26458" height=".26458" fill="#aeaeae"/> + <rect transform="rotate(90)" x="4.2333" y="-1.3229" width=".26458" height=".26458" fill="#aeaeae"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_tab_item_right.bmp b/dlls/light.msstyles/blue_tab_item_right.bmp new file mode 100644 index 0000000000000000000000000000000000000000..1ba39c28378c8fa676d9c9fcb6b266849ed16e97 GIT binary patch literal 1658 zcmeHGJ5Iw;5L_hS3|t{iKtd^K(@@dm0tk@80jPq4=s5r~BH;-ByaRw_yM@Ls>;r^0 z*p`uOzn5hk93$aKX_3szJKou`i#K}HKe^teW!(YC=pFPadW-geL?7j%QB3sxlnVEc z2Um?xHY~P(={)LiU84@Qj*q)6^U{GL<C}fr$r-;qaF+73#?uSp`HZLMe0vDO^LNs9 zJzW*%1~&|2C8z83P5=LO-89W4NpM6UX0mPD_x&h}JkN6+hoImkgaBfu`fg#U{HRxL z;P6N(g(Cw?zhFxkhEmEP2wc~#{IV<yr1UGlKdAk|+&-@LSS|A?vs~*@VGY&W6X&1m ibyA2+TEw$L4D-h$kVX8T$Mt!P<M=0!h$!w?mB%lnMYG%h literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_tab_item_right.svg b/dlls/light.msstyles/blue_tab_item_right.svg new file mode 100644 index 00000000000..5043e6e2bf7 --- /dev/null +++ b/dlls/light.msstyles/blue_tab_item_right.svg @@ -0,0 +1,109 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:5-24" width="5" height="95" version="1.1" viewBox="0 0 1.3229 25.135" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <rect y="-5e-5" width="1.3229" height="25.135" fill="#fff" stroke-width=".26458"/> + <rect transform="rotate(90)" x="19.315" y="-.26458" width=".26458" height=".26458" fill="#aeaeae" stroke-width="0"/> + <rect x=".13229" y="15.214" width="1.0583" height="4.7625" rx=".52917" ry=".52916" fill="#f5f5f5" stroke="#aeaeae" stroke-width=".26458"/> + <g stroke-width="0"> + <g fill="#aeaeae"> + <rect transform="rotate(90)" x="19.579" y="-.26458" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="19.579" y="-1.3229" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="19.844" y="-.26458" width=".26458" height=".26458"/> + </g> + <rect transform="rotate(90)" x="19.315" y="-1.0583" width=".79375" height=".79375" fill="#f5f5f5"/> + <rect transform="rotate(90)" x="19.844" y="-1.3229" width=".26458" height=".26458" fill="#fff"/> + <g fill="#aeaeae"> + <rect transform="rotate(90)" x="19.844" y="-1.3229" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="19.315" y="-1.3229" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="4.2333" y="-.26458" width=".26458" height=".26458"/> + </g> + </g> + <rect x=".13229" y=".13229" width="1.0583" height="4.7625" rx=".52917" ry=".52916" fill="#f5f5f5" stroke="#aeaeae" stroke-width=".26458"/> + <g fill="#aeaeae" stroke-width="0"> + <rect transform="rotate(90)" x="4.4979" y="-.26458" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="4.4979" y="-1.3229" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="4.7625" y="-.26458" width=".26458" height=".26458"/> + </g> + <g stroke-width="0"> + <rect transform="rotate(90)" x="4.2333" y="-1.0583" width=".79375" height=".79375" fill="#f5f5f5"/> + <rect transform="rotate(90)" x="4.7625" y="-1.3229" width=".26458" height=".26458" fill="#fff"/> + <rect transform="rotate(90)" x="4.7625" y="-1.3229" width=".26458" height=".26458" fill="#aeaeae"/> + <rect transform="rotate(90)" x="4.2333" y="-1.3229" width=".26458" height=".26458" fill="#aeaeae"/> + </g> + <g fill="#fff"> + <rect x=".13229" y="5.1594" width="1.0583" height="4.7625" rx=".52917" ry=".52916" stroke="#3096fa" stroke-width=".26458"/> + <rect transform="rotate(90)" x="9.7896" y="-1.0583" width=".26458" height=".79375" stroke-width="0"/> + <rect transform="rotate(90)" x="9.525" y="-.52917" width=".26458" height=".26458" stroke-width="0"/> + </g> + <g stroke-width="0"> + <rect transform="rotate(90)" x="9.525" y="-1.0583" width=".26458" height=".26458" fill="#aeaeae"/> + <g fill="#fff"> + <rect transform="rotate(90)" x="9.2604" y="-.52917" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="9.525" y="-.79375" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="9.525" y="-1.0583" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="9.2604" y="-1.0583" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="9.7896" y="-1.3229" width=".26458" height=".26458"/> + </g> + <g fill="#3096fa"> + <rect transform="rotate(90)" x="9.7896" y="-1.3229" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="9.525" y="-.26458" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="9.525" y="-1.3229" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="9.7896" y="-1.3229" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="9.7896" y="-.26458" width=".26458" height=".26458"/> + </g> + </g> + <rect x=".13229" y="10.186" width="1.0583" height="4.7625" rx=".52917" ry=".52916" fill="#fff" stroke="#aeaeae" stroke-width=".26458"/> + <g stroke-width="0"> + <rect transform="rotate(90)" x="14.817" y="-1.3229" width=".26458" height="1.3229" fill="#fff"/> + <rect transform="rotate(90)" x="14.552" y="-.26458" width=".26458" height=".26458" fill="#aeaeae"/> + <rect transform="rotate(90)" x="14.552" y="-1.3229" width=".26458" height=".26458" fill="#aeaeae"/> + <rect transform="rotate(90)" x="14.552" y="-.52917" width=".26458" height=".26458" fill="#fff"/> + <rect transform="rotate(90)" x="14.552" y="-1.0583" width=".26458" height=".26458" fill="#aeaeae"/> + </g> + <g fill="#fff"> + <g stroke-width="0"> + <rect transform="rotate(90)" x="14.288" y="-.52917" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="14.552" y="-.79375" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="14.552" y="-1.0583" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="14.288" y="-1.0583" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="14.817" y="-.79375" width=".26458" height=".26458"/> + </g> + <rect x=".13229" y="20.241" width="1.0583" height="4.7625" rx=".52917" ry=".52916" stroke="#2979ff" stroke-width=".26458"/> + <rect transform="rotate(90)" x="24.871" y="-1.0583" width=".26458" height=".79375" stroke-width="0"/> + <rect transform="rotate(90)" x="24.606" y="-.52917" width=".26458" height=".26458" stroke-width="0"/> + </g> + <g stroke-width="0"> + <rect transform="rotate(90)" x="24.606" y="-1.0583" width=".26458" height=".26458" fill="#aeaeae"/> + <g fill="#fff"> + <rect transform="rotate(90)" x="24.342" y="-.52917" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="24.606" y="-.79375" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="24.606" y="-1.0583" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="24.342" y="-1.0583" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="24.871" y="-1.3229" width=".26458" height=".26458"/> + </g> + <rect transform="rotate(90)" x="24.871" y="-1.3229" width=".26458" height=".26458" fill="#3096fa"/> + <g fill="#2979ff"> + <rect transform="rotate(90)" x="24.606" y="-1.3229" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="24.871" y="-1.3229" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="24.871" y="-.26458" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="24.606" y="-.26458" width=".26458" height=".26458"/> + <rect transform="rotate(90)" x="24.342" y="-1.3229" width=".26458" height=".26458"/> + </g> + <rect transform="rotate(90)" x="9.2604" y="-1.3229" width=".26458" height=".26458" fill="#3096fa"/> + <rect transform="rotate(90)" x="9.2604" y="-.26458" width=".26458" height=".26458" fill="#3096fa"/> + <rect transform="rotate(90)" x="14.288" y="-.26458" width=".26458" height=".26458" fill="#aeaeae"/> + <rect transform="rotate(90)" x="14.288" y="-1.3229" width=".26458" height=".26458" fill="#aeaeae"/> + <rect transform="rotate(90)" x="24.606" y="-.26458" width=".26458" height=".26458" fill="#2979ff"/> + <rect transform="rotate(90)" x="24.342" y="-.26458" width=".26458" height=".26458" fill="#2979ff"/> + <rect transform="rotate(90)" x="14.552" y="-.26458" width=".26458" height=".26458" fill="#aeaeae"/> + <rect transform="rotate(90)" x="14.817" y="-1.3229" width=".26458" height=".26458" fill="#aeaeae"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_tab_pane_edge.bmp b/dlls/light.msstyles/blue_tab_pane_edge.bmp new file mode 100644 index 0000000000000000000000000000000000000000..0ee90aca9c540376d512f607da8aefd74ec87961 GIT binary patch literal 9354 zcmeI2El<Nx6oxMW0TMd_3&CMXu&8Cp)C>t0iA5kV2qc+9Vv$YSiq_2_2w%UT{VlAy zdtd0AnUUZQH#s+ZcA9?N^Y&?{c1P3MVfY?1eBXlOo{caJn>^AV=jLj}5Pm+~6-Se^ z>(#NpZEdYNEylP5cEJD~fFp1MPQe&V!3DSkSKtQRfqU=(9>EjHKm}fY;Tikq{W(0B z*YH}-!MQjm=VlM~I|uB|49vnz%*Kq&x}E3wepOX(WmztYqKGNLtjPSDW!YX`*Y8c! zEV{14?W8f7m6_!|rR*}y%y<r8d|y%>de=R_jRE&><6T|dzf9Ov_iy7}UERM-*i`p# z<6T|dzf9Ov_iy7}UERM-*i`p#<6T|dzf9Ov_iy7}UERM-*i`p#<6T|dzf9Ov_iy7} zUERM-*i`p#<6T|dzf9Ov_iy7}UFn}|2@?MQoofg_+qT6mq__ToYd7G3h<o_pbI|YM MzgK2ucCMXS0_lekzyJUM literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_tab_pane_edge.svg b/dlls/light.msstyles/blue_tab_pane_edge.svg new file mode 100644 index 00000000000..73f3fc2d2c7 --- /dev/null +++ b/dlls/light.msstyles/blue_tab_pane_edge.svg @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:48-32" width="48" height="48" version="1.1" viewBox="0 0 12.7 12.7" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <g fill="#fff"> + <rect x=".13229" y=".13229" width="12.435" height="12.171" rx=".52917" ry=".52917" stroke="#aeaeae" stroke-width=".26458"/> + <rect transform="matrix(1 0 .99934 .036434 0 0)" x="-341.09" y="341.31" width="5.4429" height="7.262"/> + </g> +</svg> diff --git a/dlls/light.msstyles/light.rc b/dlls/light.msstyles/light.rc index 199ddcbfa77..f5fc7eae6f4 100644 --- a/dlls/light.msstyles/light.rc +++ b/dlls/light.msstyles/light.rc @@ -620,6 +620,94 @@ BLUE_INI TEXTFILE "Transparent = True\r\n" "VAlign = Bottom\r\n" +"\r\n; Tab\r\n" +"[Tab]\r\n" +"BgType = BorderFill\r\n" +"FillType = Solid\r\n" +"FillColor = 255 255 255\r\n" +"BorderSize = 0\r\n" + +"[Tab.Pane]\r\n" +"BgType = ImageFile\r\n" +"ImageFile = blue_tab_pane_edge.bmp\r\n" +"SizingMargins = 2, 4, 2, 4\r\n" +"SizingType = Stretch\r\n" +"ImageCount = 1\r\n" + +"[Tab.TabItem]\r\n" +"SizingMargins = 2, 2, 6, 6\r\n" +"ContentMargins = 0, 0, 0, 0\r\n" +"BgType = ImageFile\r\n" +"ImageFile = blue_tab_item.bmp\r\n" +"ImageCount = 5\r\n" +"ImageLayout = Vertical\r\n" + +"[Tab.TabItemLeftEdge]\r\n" +"SizingMargins = 2, 2, 6, 6\r\n" +"ContentMargins = 0, 0, 0, 0\r\n" +"BgType = ImageFile\r\n" +"ImageFile = blue_tab_item_left.bmp\r\n" +"ImageCount = 5\r\n" +"ImageLayout = Vertical\r\n" +"Transparent = True\r\n" + +"[Tab.TabItemRightEdge]\r\n" +"SizingMargins = 2, 2, 6, 6\r\n" +"ContentMargins = 0, 0, 0, 0\r\n" +"BgType = ImageFile\r\n" +"ImageFile = blue_tab_item_right.bmp\r\n" +"ImageCount = 5\r\n" +"ImageLayout = Vertical\r\n" +"Transparent = True\r\n" + +"[Tab.TabItemBothEdge]\r\n" +"SizingMargins = 2, 2, 6, 6\r\n" +"ContentMargins = 0, 0, 0, 0\r\n" +"BgType = ImageFile\r\n" +"ImageFile = blue_tab_item.bmp\r\n" +"ImageCount = 5\r\n" +"ImageLayout = Vertical\r\n" + +"[Tab.TopTabItem]\r\n" +"SizingMargins = 2, 2, 6, 6\r\n" +"ContentMargins = 0, 0, 0, 0\r\n" +"BgType = ImageFile\r\n" +"ImageFile = blue_tab_item.bmp\r\n" +"ImageCount = 5\r\n" +"ImageLayout = Vertical\r\n" +"Transparent = True\r\n" + +"[Tab.TopTabItemLeftEdge]\r\n" +"SizingMargins = 2, 2, 6, 6\r\n" +"ContentMargins = 0, 0, 0, 0\r\n" +"BgType = ImageFile\r\n" +"ImageFile = blue_tab_item_left.bmp\r\n" +"ImageCount = 5\r\n" +"ImageLayout = Vertical\r\n" +"Transparent = True\r\n" + +"[Tab.TopTabItemRightEdge]\r\n" +"SizingMargins = 2, 2, 6, 6\r\n" +"ContentMargins = 0, 0, 0, 0\r\n" +"BgType = ImageFile\r\n" +"ImageFile = blue_tab_item_right.bmp\r\n" +"ImageCount = 5\r\n" +"ImageLayout = Vertical\r\n" +"Transparent = True\r\n" + +"[Tab.TopTabItemBothEdge]\r\n" +"SizingMargins = 2, 2, 6, 6\r\n" +"ContentMargins = 0, 0, 0, 0\r\n" +"BgType = ImageFile\r\n" +"ImageFile = blue_tab_item.bmp\r\n" +"ImageCount = 5\r\n" +"ImageLayout = Vertical\r\n" +"Transparent = True\r\n" + +"[Tab.Body]\r\n" +"BgType = ImageFile\r\n" +"ImageFile = blue_tab_background.bmp\r\n" + "\r\n; Toolbar\r\n" "[Toolbar]\r\n" "BgType = BorderFill\r\n" @@ -843,6 +931,22 @@ BLUE_STATUS_BACKGROUND_BMP BITMAP "blue_status_background.bmp" /* @makedep: blue_status_pane.bmp */ BLUE_STATUS_PANE_BMP BITMAP "blue_status_pane.bmp" +/* Tab */ +/* @makedep: blue_tab_background.bmp */ +BLUE_TAB_BACKGROUND_BMP BITMAP "blue_tab_background.bmp" + +/* @makedep: blue_tab_item.bmp */ +BLUE_TAB_ITEM_BMP BITMAP "blue_tab_item.bmp" + +/* @makedep: blue_tab_item_left.bmp */ +BLUE_TAB_ITEM_LEFT_BMP BITMAP "blue_tab_item_left.bmp" + +/* @makedep: blue_tab_item_right.bmp */ +BLUE_TAB_ITEM_RIGHT_BMP BITMAP "blue_tab_item_right.bmp" + +/* @makedep: blue_tab_pane_edge.bmp */ +BLUE_TAB_PANE_EDGE_BMP BITMAP "blue_tab_pane_edge.bmp" + /* ToolBar */ /* @makedep: blue_toolbar_buttons.bmp */ BLUE_TOOLBAR_BUTTONS_BMP BITMAP "blue_toolbar_buttons.bmp" -- 2.30.2

1 0

[PATCH 3/6] light.msstyles: Add Progress parts.
by Zhiyi Zhang 28 Jun '21

28 Jun '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/light.msstyles/Makefile.in | 4 ++ .../blue_progress_chunk_horizontal.bmp | Bin 0 -> 2358 bytes .../blue_progress_chunk_horizontal.svg | 13 +++++ .../blue_progress_chunk_vertical.bmp | Bin 0 -> 2490 bytes .../blue_progress_chunk_vertical.svg | 13 +++++ .../blue_progress_track_horizontal.bmp | Bin 0 -> 2698 bytes .../blue_progress_track_horizontal.svg | 13 +++++ .../blue_progress_track_vertical.bmp | Bin 0 -> 886 bytes .../blue_progress_track_vertical.svg | 13 +++++ dlls/light.msstyles/light.rc | 48 ++++++++++++++++++ 10 files changed, 104 insertions(+) create mode 100644 dlls/light.msstyles/blue_progress_chunk_horizontal.bmp create mode 100644 dlls/light.msstyles/blue_progress_chunk_horizontal.svg create mode 100644 dlls/light.msstyles/blue_progress_chunk_vertical.bmp create mode 100644 dlls/light.msstyles/blue_progress_chunk_vertical.svg create mode 100644 dlls/light.msstyles/blue_progress_track_horizontal.bmp create mode 100644 dlls/light.msstyles/blue_progress_track_horizontal.svg create mode 100644 dlls/light.msstyles/blue_progress_track_vertical.bmp create mode 100644 dlls/light.msstyles/blue_progress_track_vertical.svg diff --git a/dlls/light.msstyles/Makefile.in b/dlls/light.msstyles/Makefile.in index f5bbb77df04..c3c5643236a 100644 --- a/dlls/light.msstyles/Makefile.in +++ b/dlls/light.msstyles/Makefile.in @@ -15,6 +15,10 @@ SVG_SRCS = \ blue_groupbox.svg \ blue_header.svg \ blue_header_item.svg \ + blue_progress_chunk_horizontal.svg \ + blue_progress_chunk_vertical.svg \ + blue_progress_track_horizontal.svg \ + blue_progress_track_vertical.svg \ blue_radiobutton_13px.svg \ blue_radiobutton_16px.svg \ blue_radiobutton_25px.svg \ diff --git a/dlls/light.msstyles/blue_progress_chunk_horizontal.bmp b/dlls/light.msstyles/blue_progress_chunk_horizontal.bmp new file mode 100644 index 0000000000000000000000000000000000000000..60debfe40494d2a82bf975ee4bb42e9ddd896acd GIT binary patch literal 2358 zcmZ?rHREIegDxOh1H^_v%n!tj3=%++fnf~?m_j4|GcZ69Nc_K(dr&c&0)ku?G!?(5 q84NbWFxVUfbkC@ph)XA<;WQdf)GSa&)6-~r8ck31uMh`iz5@W5dk(t* literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_progress_chunk_horizontal.svg b/dlls/light.msstyles/blue_progress_chunk_horizontal.svg new file mode 100644 index 00000000000..629b667f585 --- /dev/null +++ b/dlls/light.msstyles/blue_progress_chunk_horizontal.svg @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:49-24" width="49" height="15" version="1.1" viewBox="0 0 12.965 3.9688" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <rect width="12.965" height="3.9688" fill="#3096fa" style="paint-order:normal"/> +</svg> diff --git a/dlls/light.msstyles/blue_progress_chunk_vertical.bmp b/dlls/light.msstyles/blue_progress_chunk_vertical.bmp new file mode 100644 index 0000000000000000000000000000000000000000..f9816b09dcff388dc141bf9ade59f65d1c81d2cc GIT binary patch literal 2490 zcmZ?r-NnfO23<h128j8A*bs;r86<!t1A_rn9?XFg{}~t{2qf~~$vvnTE=44R1x?+r zX$Hh2pkCq?167Wy#~)my;WHXO$RRMA9*{!=lRX+fm|=n}G8#U}p@GRB4Ij)fK^7Se MALP)$WCOzo0PaN&!~g&Q literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_progress_chunk_vertical.svg b/dlls/light.msstyles/blue_progress_chunk_vertical.svg new file mode 100644 index 00000000000..4f43374dce5 --- /dev/null +++ b/dlls/light.msstyles/blue_progress_chunk_vertical.svg @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:15-24" width="15" height="49" version="1.1" viewBox="0 0 3.9687 12.965" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <rect transform="rotate(90)" y="-3.9688" width="12.965" height="3.9688" fill="#3096fa" style="paint-order:normal"/> +</svg> diff --git a/dlls/light.msstyles/blue_progress_track_horizontal.bmp b/dlls/light.msstyles/blue_progress_track_horizontal.bmp new file mode 100644 index 0000000000000000000000000000000000000000..43d5eaa441a33b300008495fe4e215d0a10018c1 GIT binary patch literal 2698 zcmZ?r?c!npgDxOh1H`64EC9re3=%*R2%z#14vhTIzyLuYf&WhKLB%i`VrdpMh3f`4 zU;sMr|6m0`w~e}wg2)*SKMDd5sC6{_M#GP?5TH!=X!;usKgvRYGTlQY{Q;dhXaNHN D7T0e@ literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_progress_track_horizontal.svg b/dlls/light.msstyles/blue_progress_track_horizontal.svg new file mode 100644 index 00000000000..af25bbbcd51 --- /dev/null +++ b/dlls/light.msstyles/blue_progress_track_horizontal.svg @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:53-24" width="53" height="16" version="1.1" viewBox="0 0 14.023 4.2333" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <rect x=".13229" y=".13229" width="13.758" height="3.9688" fill="#fff" stroke="#aeaeae" stroke-width=".26458"/> +</svg> diff --git a/dlls/light.msstyles/blue_progress_track_vertical.bmp b/dlls/light.msstyles/blue_progress_track_vertical.bmp new file mode 100644 index 0000000000000000000000000000000000000000..5dddee9c32ee9eeac628d82e4f4fead8576230cc GIT binary patch literal 886 zcmZ?rEn{W?gDxOh1H^nlEC|Gm3=%++f#D4km_j4|GcZ69Nc_K(dr&c&0)ku?G!^TJ h1`G^9rT>WlKxLz9f#Eb74v@q`>u>;?PYhsS005g#n8^SD literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_progress_track_vertical.svg b/dlls/light.msstyles/blue_progress_track_vertical.svg new file mode 100644 index 00000000000..2f0f638bd8a --- /dev/null +++ b/dlls/light.msstyles/blue_progress_track_vertical.svg @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:14-24" width="14" height="17" version="1.1" viewBox="0 0 3.7042 4.4979" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <rect x=".13229" y=".13229" width="3.4396" height="4.2333" fill="#fff" stroke="#aeaeae" stroke-width=".26458"/> +</svg> diff --git a/dlls/light.msstyles/light.rc b/dlls/light.msstyles/light.rc index 19e3192201f..199ddcbfa77 100644 --- a/dlls/light.msstyles/light.rc +++ b/dlls/light.msstyles/light.rc @@ -365,6 +365,41 @@ BLUE_INI TEXTFILE "FillColor = 255 255 255\r\n" "BorderColor = 174 174 174\r\n" +"\r\n; Progress\r\n" +"[Progress]\r\n" +"ProgressChunkSize = 1\r\n" +"ProgressSpaceSize = 0\r\n" +"BgType = BorderFill\r\n" +"FillType = Solid\r\n" +"FillColor = 255 255 255\r\n" +"BorderSize = 1\r\n" +"BorderColor = 174 174 174\r\n" + +"[Progress.Bar]\r\n" +"BgType = ImageFile\r\n" +"ImageFile = blue_progress_track_horizontal.bmp\r\n" +"MinSize = 10, 10\r\n" +"SizingMargins = 1, 1, 1, 1\r\n" +"SizingType = Stretch\r\n" + +"[Progress.BarVert]\r\n" +"BgType = ImageFile\r\n" +"ImageFile = blue_progress_track_vertical.bmp\r\n" +"SizingMargins = 1, 1, 1, 1\r\n" +"SizingType = Stretch\r\n" + +"[Progress.Chunk]\r\n" +"BgType = ImageFile\r\n" +"ImageFile = blue_progress_chunk_horizontal.bmp\r\n" +"SizingMargins = 1, 1, 1, 1\r\n" +"SizingType = Stretch\r\n" + +"[Progress.ChunkVert]\r\n" +"BgType = ImageFile\r\n" +"ImageFile = blue_progress_chunk_vertical.bmp\r\n" +"SizingMargins = 1, 1, 1, 1\r\n" +"SizingType = Stretch\r\n" + "\r\n; Rebar\r\n" "[Rebar]\r\n" "BgType = ImageFile\r\n" @@ -722,6 +757,19 @@ BLUE_HEADER_BMP BITMAP "blue_header.bmp" /* @makedep: blue_header_item.bmp */ BLUE_HEADER_ITEM_BMP BITMAP "blue_header_item.bmp" +/* Progress */ +/* @makedep: blue_progress_chunk_horizontal.bmp */ +BLUE_PROGRESS_CHUNK_HORIZONTAL_BMP BITMAP "blue_progress_chunk_horizontal.bmp" + +/* @makedep: blue_progress_chunk_vertical.bmp */ +BLUE_PROGRESS_CHUNK_VERTICAL_BMP BITMAP "blue_progress_chunk_vertical.bmp" + +/* @makedep: blue_progress_track_horizontal.bmp */ +BLUE_PROGRESS_TRACK_HORIZONTAL_BMP BITMAP "blue_progress_track_horizontal.bmp" + +/* @makedep: blue_progress_track_vertical.bmp */ +BLUE_PROGRESS_TRACK_VERTICAL_BMP BITMAP "blue_progress_track_vertical.bmp" + /* Rebar */ /* @makedep: blue_rebar_background.bmp */ BLUE_REBAR_BACKGROUND_BMP BITMAP "blue_rebar_background.bmp" -- 2.30.2

1 0

[PATCH 2/6] light.msstyles: Add Header parts.
by Zhiyi Zhang 28 Jun '21

28 Jun '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/light.msstyles/Makefile.in | 2 ++ dlls/light.msstyles/blue_header.bmp | Bin 0 -> 618 bytes dlls/light.msstyles/blue_header.svg | 21 ++++++++++++ dlls/light.msstyles/blue_header_item.bmp | Bin 0 -> 2538 bytes dlls/light.msstyles/blue_header_item.svg | 39 +++++++++++++++++++++++ dlls/light.msstyles/light.rc | 24 ++++++++++++++ 6 files changed, 86 insertions(+) create mode 100644 dlls/light.msstyles/blue_header.bmp create mode 100644 dlls/light.msstyles/blue_header.svg create mode 100644 dlls/light.msstyles/blue_header_item.bmp create mode 100644 dlls/light.msstyles/blue_header_item.svg diff --git a/dlls/light.msstyles/Makefile.in b/dlls/light.msstyles/Makefile.in index c0b55dd966d..f5bbb77df04 100644 --- a/dlls/light.msstyles/Makefile.in +++ b/dlls/light.msstyles/Makefile.in @@ -13,6 +13,8 @@ SVG_SRCS = \ blue_commandlink_glyph_30px.svg \ blue_commandlink_glyph_45px.svg \ blue_groupbox.svg \ + blue_header.svg \ + blue_header_item.svg \ blue_radiobutton_13px.svg \ blue_radiobutton_16px.svg \ blue_radiobutton_25px.svg \ diff --git a/dlls/light.msstyles/blue_header.bmp b/dlls/light.msstyles/blue_header.bmp new file mode 100644 index 0000000000000000000000000000000000000000..fb81a657aa950214103575d3e2572d6199dfe4ea GIT binary patch literal 618 zcmZ?r&0=BzgDxOh1H^1VECIxfV3L910V9xu0sb>EKoCggzmt1VF@_QX0xW3q|1kgq X!#WHA7DHAER52<x2*Us^<`@_Na*2b5 literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_header.svg b/dlls/light.msstyles/blue_header.svg new file mode 100644 index 00000000000..46046e1e454 --- /dev/null +++ b/dlls/light.msstyles/blue_header.svg @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:6-24" width="6" height="24" version="1.1" viewBox="0 0 1.5875 6.35" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <g stroke-width="0"> + <rect width="1.5875" height="6.35" fill="#fff"/> + <g fill="#aeaeae"> + <rect x="1.3229" y="3.1988e-7" width=".26458" height="6.0854"/> + <rect transform="rotate(90)" x="5.8208" y="-1.3229" width=".26458" height="1.3229"/> + <rect x="-1.5895e-8" width=".26458" height="6.0854"/> + <rect transform="rotate(90)" x="2.2252e-7" y="-1.3229" width=".26458" height="1.3229"/> + </g> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_header_item.bmp b/dlls/light.msstyles/blue_header_item.bmp new file mode 100644 index 0000000000000000000000000000000000000000..3a381109f575918b9b46977ffe71f58354168a91 GIT binary patch literal 2538 zcmZ?reZ|QD23<h128h{!xB`e786<!t149B-9?XFg{}~t{2qf~~$vvnTE=44R1x?+5 z48Xv!e*OA&r~qgg1{f9l4~h#6F!;qr<9G1K5k|5iC9PFz{)eM#o&QzZK>q>-{{4fZ zzklFjaC=6@{{J5YVE~V}Ds4y{!6OL9U|{$)%>aR>8~vJY1Qz@M{~r|n`->2RX&V&- s2F`$o3r4)bq6a}UFd)~xz_J<$z+!ME|Ni|O6&svk0FOFwv;pG{0Js*V-2eap literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_header_item.svg b/dlls/light.msstyles/blue_header_item.svg new file mode 100644 index 00000000000..642db57b60f --- /dev/null +++ b/dlls/light.msstyles/blue_header_item.svg @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:6-24" width="6" height="120" version="1.1" viewBox="0 0 1.5875 31.75" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <g transform="translate(-159.47 -110.22)" stroke-width="0"> + <rect x="159.47" y="110.22" width="1.5875" height="6.35" fill="#fff"/> + <rect x="160.79" y="110.22" width=".26458" height="6.0854" fill="#aeaeae"/> + <rect transform="rotate(90)" x="116.04" y="-160.79" width=".26458" height="1.3229" fill="#aeaeae"/> + <rect x="159.47" y="116.57" width="1.5875" height="6.35" fill="#fff"/> + <g fill="#3096fa"> + <rect x="160.79" y="116.57" width=".26458" height="6.0854"/> + <rect transform="rotate(90)" x="122.39" y="-160.79" width=".26458" height="1.0583"/> + <rect x="159.47" y="116.57" width=".26458" height="6.0854"/> + </g> + <rect x="159.47" y="122.92" width="1.5875" height="6.35" fill="#fff"/> + <g fill="#2979ff"> + <rect x="160.79" y="122.92" width=".26458" height="6.0854"/> + <rect transform="rotate(90)" x="122.92" y="-160.79" width=".26458" height="1.0583"/> + <rect x="159.47" y="122.92" width=".26458" height="6.0854"/> + </g> + <rect x="159.47" y="129.27" width="1.5875" height="6.35" fill="#fff"/> + <rect transform="rotate(90)" x="135.09" y="-161.06" width=".26458" height="1.5875" fill="#aeaeae"/> + <rect x="159.47" y="135.62" width="1.5875" height="6.35" fill="#fff"/> + <g fill="#aeaeae"> + <rect transform="rotate(90)" x="141.44" y="-161.06" width=".26458" height="1.5875"/> + <rect x="159.47" y="110.22" width=".26458" height="6.0854"/> + <rect transform="rotate(90)" x="110.22" y="-160.79" width=".26458" height="1.3229"/> + </g> + <rect transform="rotate(90)" x="116.57" y="-160.79" width=".26458" height="1.0583" fill="#3096fa"/> + <rect transform="rotate(90)" x="128.74" y="-160.79" width=".26458" height="1.0583" fill="#2979ff"/> + </g> +</svg> diff --git a/dlls/light.msstyles/light.rc b/dlls/light.msstyles/light.rc index 5aea6c02610..19e3192201f 100644 --- a/dlls/light.msstyles/light.rc +++ b/dlls/light.msstyles/light.rc @@ -334,6 +334,23 @@ BLUE_INI TEXTFILE "FillColor = 245 245 245\r\n" "TextColor = 0 0 0\r\n" +"\r\n; Header\r\n" +"[Header]\r\n" +"BgType = ImageFile\r\n" +"SizingMargins = 2, 2, 2, 4\r\n" +"ImageFile = blue_header.bmp\r\n" +"SizingType = Tile\r\n" + +"[Header.HeaderItem]\r\n" +"BgType = ImageFile\r\n" +"SizingMargins = 2, 2, 2, 4\r\n" +"ContentMargins = 3, 0, 0, 0\r\n" +"ImageFile = blue_header_item.bmp\r\n" +"ImageCount = 5\r\n" +"ImageLayout = Vertical\r\n" +"SizingType = Tile\r\n" +"Transparent = True\r\n" + "\r\n; ListBox\r\n" "[ListBox]\r\n" "BgType = BorderFill\r\n" @@ -698,6 +715,13 @@ BLUE_COMBOBUTTON_BMP BITMAP "blue_combobutton.bmp" /* @makedep: blue_combobutton_glyph.bmp */ BLUE_COMBOBUTTON_GLYPH_BMP BITMAP "blue_combobutton_glyph.bmp" +/* Header */ +/* @makedep: blue_header.bmp */ +BLUE_HEADER_BMP BITMAP "blue_header.bmp" + +/* @makedep: blue_header_item.bmp */ +BLUE_HEADER_ITEM_BMP BITMAP "blue_header_item.bmp" + /* Rebar */ /* @makedep: blue_rebar_background.bmp */ BLUE_REBAR_BACKGROUND_BMP BITMAP "blue_rebar_background.bmp" -- 2.30.2

1 0

[PATCH 1/6] light.msstyles: Add TreeView parts.
by Zhiyi Zhang 28 Jun '21

28 Jun '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/light.msstyles/Makefile.in | 5 ++- .../blue_treeview_expand_collapse_10px.bmp | Bin 0 -> 938 bytes .../blue_treeview_expand_collapse_10px.svg | 16 +++++++++ .../blue_treeview_expand_collapse_15px.bmp | Bin 0 -> 1938 bytes .../blue_treeview_expand_collapse_15px.svg | 16 +++++++++ .../blue_treeview_expand_collapse_9px.bmp | Bin 0 -> 786 bytes .../blue_treeview_expand_collapse_9px.svg | 16 +++++++++ dlls/light.msstyles/light.rc | 31 ++++++++++++++++++ 8 files changed, 83 insertions(+), 1 deletion(-) create mode 100644 dlls/light.msstyles/blue_treeview_expand_collapse_10px.bmp create mode 100644 dlls/light.msstyles/blue_treeview_expand_collapse_10px.svg create mode 100644 dlls/light.msstyles/blue_treeview_expand_collapse_15px.bmp create mode 100644 dlls/light.msstyles/blue_treeview_expand_collapse_15px.svg create mode 100644 dlls/light.msstyles/blue_treeview_expand_collapse_9px.bmp create mode 100644 dlls/light.msstyles/blue_treeview_expand_collapse_9px.svg diff --git a/dlls/light.msstyles/Makefile.in b/dlls/light.msstyles/Makefile.in index ec23c395b3a..c0b55dd966d 100644 --- a/dlls/light.msstyles/Makefile.in +++ b/dlls/light.msstyles/Makefile.in @@ -44,4 +44,7 @@ SVG_SRCS = \ blue_toolbar_buttons_split_dropdown.svg \ blue_toolbar_buttons_split_dropdown_glyph.svg \ blue_toolbar_separator_horizontal.svg \ - blue_toolbar_separator_vertical.svg + blue_toolbar_separator_vertical.svg \ + blue_treeview_expand_collapse_10px.svg \ + blue_treeview_expand_collapse_15px.svg \ + blue_treeview_expand_collapse_9px.svg diff --git a/dlls/light.msstyles/blue_treeview_expand_collapse_10px.bmp b/dlls/light.msstyles/blue_treeview_expand_collapse_10px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..31860c071b5e1f8a4e151da24c9b3063e286b3f2 GIT binary patch literal 938 zcmZ?rUB%1*23<h128g+USOka}859^mQVLLcAQK7vXJCLJkl24G_n=}VNuro6M5&@o z(a)&{4Zo%t{KtmTO~$1bT^)#zO)WNc*wo@uhprZ%I%Ktk)WOseqYjsvwQJW--oJl8 z!6;j|Zry(%-noALdI4N!fyANeCIIPcK()%a)PmH3<bd|40NF2qv?DgPFm)g~AlnI~ z7HDoVx>_`KHbDL}pqW{?)B)uqfcPa)jW@a)5Fcb75O)Catu<@bXkb%=q;B7;RjY(> QsR4-t?U@5q!-h=_0DaY}!T<mO literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_treeview_expand_collapse_10px.svg b/dlls/light.msstyles/blue_treeview_expand_collapse_10px.svg new file mode 100644 index 00000000000..370531f67bc --- /dev/null +++ b/dlls/light.msstyles/blue_treeview_expand_collapse_10px.svg @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:10-32" width="10" height="20" version="1.1" viewBox="0 0 2.6458 5.2917" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <g> + <path d="m0.92604 2.3616 1.2446-1.0424-1.2446-1.0424z" fill="none" stroke="#aeaeae" stroke-width=".26458"/> + <path d="m0.26458 4.7625h1.8521v-1.8521z" fill="#3096fa" stroke-width=".19844"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_treeview_expand_collapse_15px.bmp b/dlls/light.msstyles/blue_treeview_expand_collapse_15px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..8f55669d86dd1d01a1188c6a2cb5beee25381c34 GIT binary patch literal 1938 zcmchVJ8r`;42EU2KnnEX8x&o#=Lo5TG|14USLxazbH)M<kSiE|#EStRCa)f$Tf3+~ zlL!z5Nue}E@Ndc_KZ&%Iy?*w@Va)OVfKuoYO2m`6g1tG#G1Z0?;`oqHW|OyfEy$W) zv$8Ie^!qiK{VfKPE3>K)-el>U%iCBk?_xQ;k3GkqV|_e_b@5!*#)q&bAIj={46FE9 z*2R@&xon!|-WB)xtE!UFwyx`uFV7Yu7TgQ$j%vvB{LYqV^ASt_wrwAXg*MQ$E!XrZ zR{4vfn4pe5rv{UyHBfg-EMjY{GgRxE*2bzFa8ty;X`Qa?Zk1nIA4@stp^uy&XeFgg q6i3#_#_Sv0Z_Izz&li1UdS9+N^$U%m!@UZ*+b1^aKGWHS?DY=`0D<fP literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_treeview_expand_collapse_15px.svg b/dlls/light.msstyles/blue_treeview_expand_collapse_15px.svg new file mode 100644 index 00000000000..d219da9b6f4 --- /dev/null +++ b/dlls/light.msstyles/blue_treeview_expand_collapse_15px.svg @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:15-32" width="15" height="30" version="1.1" viewBox="0 0 3.9687 7.9375" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <g> + <path d="m0.92604 3.7042 2.5586-1.7198-2.5586-1.7198z" fill="none" stroke="#aeaeae" stroke-width=".26458"/> + <path d="m0.26458 7.4083h3.175v-3.175z" fill="#3096fa" stroke-width=".19844"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_treeview_expand_collapse_9px.bmp b/dlls/light.msstyles/blue_treeview_expand_collapse_9px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..239cf2d779f9e59e69198996b7eef8da472a4123 GIT binary patch literal 786 zcmZ?r6=G%pgDxOh1H_y_ECj@i3<?Y&sSYL}fdT$AFhCGU=D(ABP%(xQ0s<@q<Z(&= zoNCbUYns7-bd0VZn>utgAU?V}Y--Te;ZlRF4xbvBIznp5m0!1RUGM+@{~7V=2deqM ze*OBTt5&UI!=(<S28cmm*T#(-d9kSj%KZnL!Mt|u+G#-cC7?Pfbafy#Ffkze2oUdt b@nJMb4Kd~b)qwzB_YmQ)i46@6SW`9tD$0)A literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_treeview_expand_collapse_9px.svg b/dlls/light.msstyles/blue_treeview_expand_collapse_9px.svg new file mode 100644 index 00000000000..15ba25f8094 --- /dev/null +++ b/dlls/light.msstyles/blue_treeview_expand_collapse_9px.svg @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:9-32" width="9" height="18" version="1.1" viewBox="0 0 2.3812 4.7625" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <g> + <path d="m0.66146 2.0842 0.99269-0.89372-0.99269-0.89372z" fill="none" stroke="#aeaeae" stroke-width=".26458"/> + <path d="m0.26458 4.4979h1.5875v-1.5875z" fill="#3096fa" stroke-width=".19844"/> + </g> +</svg> diff --git a/dlls/light.msstyles/light.rc b/dlls/light.msstyles/light.rc index b7a8f538536..5aea6c02610 100644 --- a/dlls/light.msstyles/light.rc +++ b/dlls/light.msstyles/light.rc @@ -634,6 +634,27 @@ BLUE_INI TEXTFILE "GlyphType = ImageGlyph\r\n" "GlyphImageFile = blue_toolbar_buttons_split_dropdown_glyph.bmp\r\n" "GlyphTransparent = True\r\n" + +"\r\n; TreeView\r\n" +"[TreeView]\r\n" +"BgType = BorderFill\r\n" +"BorderSize = 1\r\n" +"FillColor = 255 255 255\r\n" +"BorderColor = 174 174 174\r\n" + +"[TreeView.Glyph]\r\n" +"BgType = ImageFile\r\n" +"SizingType = TrueSize\r\n" +"ImageCount = 2\r\n" +"ImageLayout = vertical\r\n" +"ImageSelectType = Dpi\r\n" +"UniformSizing = True\r\n" +"ImageFile1 = blue_treeview_expand_collapse_9px.bmp\r\n" +"ImageFile2 = blue_treeview_expand_collapse_10px.bmp\r\n" +"ImageFile3 = blue_treeview_expand_collapse_15px.bmp\r\n" +"MinDpi1 = 96\r\n" +"MinDpi2 = 133\r\n" +"MinDpi3 = 150\r\n" } /* Button */ @@ -769,6 +790,16 @@ BLUE_TOOLBAR_BUTTONS_SPLIT_DROPDOWN_BMP BITMAP "blue_toolbar_buttons_split_dropd /* @makedep: blue_toolbar_buttons_split_dropdown_glyph.bmp */ BLUE_TOOLBAR_BUTTONS_SPLIT_DROPDOWN_GLYPH_BMP BITMAP "blue_toolbar_buttons_split_dropdown_glyph.bmp" +/* TreeView */ +/* @makedep: blue_treeview_expand_collapse_9px.bmp */ +BLUE_TREEVIEW_EXPAND_COLLAPSE_9PX_BMP BITMAP "blue_treeview_expand_collapse_9px.bmp" + +/* @makedep: blue_treeview_expand_collapse_10px.bmp */ +BLUE_TREEVIEW_EXPAND_COLLAPSE_10PX_BMP BITMAP "blue_treeview_expand_collapse_10px.bmp" + +/* @makedep: blue_treeview_expand_collapse_15px.bmp */ +BLUE_TREEVIEW_EXPAND_COLLAPSE_15PX_BMP BITMAP "blue_treeview_expand_collapse_15px.bmp" + /* File version */ #define WINE_FILEDESCRIPTION_STR "Light Theme" #define WINE_FILENAME_STR "light.msstyles" -- 2.30.2

1 0

[PATCH v2 1/2] imm32 : Make an interface to disable input method in ImmAssociateContext
by Dongwan Kim 28 Jun '21

28 Jun '21

When ImmAssociateContext(hwnd, 0) is called, imm should be disabled. On Debian using uim or fcitx for korean, a program cannot receive KeyPress(VK_HANGUL) because the input method consumes the key. We should change input context to disable it in ImmAssociateContext. Signed-off-by: Dongwan Kim <kdw6485(a)gmail.com> --- dlls/imm32/imm.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 9d2a09f22be..bf243832168 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -111,6 +111,7 @@ static CRITICAL_SECTION_DEBUG critsect_debug = }; static CRITICAL_SECTION threaddata_cs = { &critsect_debug, -1, 0, 0, 0, 0 }; static BOOL disable_ime; +static HIMC ( *wine_associate_input_context)(HWND, HIMC); static inline BOOL is_himc_ime_unicode(const InputContextData *data) { @@ -598,6 +599,13 @@ HIMC WINAPI ImmAssociateContext(HWND hWnd, HIMC hIMC) } } + if(!wine_associate_input_context){ + HMODULE h = load_graphics_driver(); + wine_associate_input_context = (LPVOID)GetProcAddress(h, "wine_associate_input_context"); + FreeLibrary(h); + } + if(wine_associate_input_context) + wine_associate_input_context(hWnd, hIMC); if (!hIMC) return old; -- 2.30.2

1 1

[PATCH] po: Update Dutch translation
by Floris Renaud 27 Jun '21

27 Jun '21

Signed-off-by: Floris Renaud <jkfloris(a)dds.nl> --- po/nl.po | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/po/nl.po b/po/nl.po index f57e73cc0a8..46076ff7ae2 100644 --- a/po/nl.po +++ b/po/nl.po @@ -6984,10 +6984,8 @@ msgid "Resource is not currently available.\n" msgstr "Bron is tijdelijk niet beschikbaar.\n" #: dlls/light.msstyles/light.rc:30 dlls/light.msstyles/light.rc:37 -#, fuzzy -#| msgid "Class Name:" msgid "Classic Blue" -msgstr "Klassenaam:" +msgstr "Klassiek Blauw" #: dlls/light.msstyles/light.rc:43 dlls/light.msstyles/light.rc:49 #: programs/winhlp32/winhlp32.rc:53 programs/winhlp32/winhlp32.rc:73 -- 2.32.0

1 0

[PATCH 1/2] imm32 : Make an interface to disable input method in ImmAssociateContext
by Dongwan Kim 27 Jun '21

27 Jun '21

When ImmAssociateContext(hwnd, 0) is called, imm should be disabled. On Debian using uim or fcitx for korean, a program cannot receive KeyPress(VK_HANGUL) because the input method consumes the key. We should change input context to disable it in ImmAssociateContext. Signed-off-by: Dongwan Kim <kdw6485(a)gmail.com> --- dlls/imm32/imm.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 9d2a09f22be..9f9f898db9e 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -111,6 +111,7 @@ static CRITICAL_SECTION_DEBUG critsect_debug = }; static CRITICAL_SECTION threaddata_cs = { &critsect_debug, -1, 0, 0, 0, 0 }; static BOOL disable_ime; +static HIMC ( *wine_associate_input_context)(HWND, HIMC); static inline BOOL is_himc_ime_unicode(const InputContextData *data) { @@ -598,6 +599,13 @@ HIMC WINAPI ImmAssociateContext(HWND hWnd, HIMC hIMC) } } + if(!wine_associate_input_context) + { + HMODULE h = load_graphics_driver(); + wine_associate_input_context = (LPVOID)GetProcAddress(h, "wine_associate_input_context"); + FreeLibrary(h); + } + wine_associate_input_context(hWnd, hIMC); if (!hIMC) return old; -- 2.30.2

2 2

[PATCH 1/2] imm32 : Make an interface to disable input method in ImmAssociateContext
by Dongwan Kim 27 Jun '21

27 Jun '21

When ImmAssociateContext(hwnd, 0) is called, imm should be disabled. On Debian using uim or fcitx for korean, a program cannot receive KeyPress(VK_HANGUL) because the input method consumes the key. We should change input context to disable it in ImmAssociateContext. Signed-off-by: Dongwan Kim <kdw6485(a)gmail.com> --- dlls/imm32/imm.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 9d2a09f22be..9f9f898db9e 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -111,6 +111,7 @@ static CRITICAL_SECTION_DEBUG critsect_debug = }; static CRITICAL_SECTION threaddata_cs = { &critsect_debug, -1, 0, 0, 0, 0 }; static BOOL disable_ime; +static HIMC ( *wine_associate_input_context)(HWND, HIMC); static inline BOOL is_himc_ime_unicode(const InputContextData *data) { @@ -598,6 +599,13 @@ HIMC WINAPI ImmAssociateContext(HWND hWnd, HIMC hIMC) } } + if(!wine_associate_input_context) + { + HMODULE h = load_graphics_driver(); + wine_associate_input_context = (LPVOID)GetProcAddress(h, "wine_associate_input_context"); + FreeLibrary(h); + } + wine_associate_input_context(hWnd, hIMC); if (!hIMC) return old; -- 2.30.2

2 2

[PATCH 1/2] imm32 : Make an interface to disable input method in ImmAssociateContext
by Dongwan Kim 27 Jun '21

27 Jun '21

When ImmAssociateContext(hwnd, 0) is called, imm should be disabled. On Debian using uim or fcitx for korean, a program cannot receive KeyPress(VK_HANGUL) because the input method consumes the key. We should change input context to disable it in ImmAssociateContext. Signed-off-by: Dongwan Kim <kdw6485(a)gmail.com> --- dlls/imm32/imm.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 9d2a09f22be..9f9f898db9e 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -111,6 +111,7 @@ static CRITICAL_SECTION_DEBUG critsect_debug = }; static CRITICAL_SECTION threaddata_cs = { &critsect_debug, -1, 0, 0, 0, 0 }; static BOOL disable_ime; +static HIMC ( *wine_associate_input_context)(HWND, HIMC); static inline BOOL is_himc_ime_unicode(const InputContextData *data) { @@ -598,6 +599,13 @@ HIMC WINAPI ImmAssociateContext(HWND hWnd, HIMC hIMC) } } + if(!wine_associate_input_context) + { + HMODULE h = load_graphics_driver(); + wine_associate_input_context = (LPVOID)GetProcAddress(h, "wine_associate_input_context"); + FreeLibrary(h); + } + wine_associate_input_context(hWnd, hIMC); if (!hIMC) return old; -- 2.30.2

2 2

[PATCH 2/3] d3dx10: Handle format converting for D3DX10CreateTextureFromMemory.
by Ziqing Hui 27 Jun '21

27 Jun '21

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/d3dx10_43/tests/d3dx10.c | 3 +- dlls/d3dx10_43/texture.c | 89 ++++++++++++++++++++++++++++++++--- 2 files changed, 83 insertions(+), 9 deletions(-)

2 3

[PATCH 1/3] d3dx10: Implement D3DX10CreateTextureFromMemory initially.
by Ziqing Hui 27 Jun '21

27 Jun '21

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/d3dx10_43/d3dx10_43_main.c | 11 -- dlls/d3dx10_43/tests/d3dx10.c | 7 +- dlls/d3dx10_43/texture.c | 233 ++++++++++++++++++++++++++++++++ 3 files changed, 236 insertions(+), 15 deletions(-)

2 3

[programs/robocopy.exe] How to do unit test correctly?
by Weiwen Chen 26 Jun '21

26 Jun '21

Hi everyone: I'm Weiwen Chen from Fudan University and I'm working on adding `robocopy.exe` into wine. I stage my work on my github fork <https://github.com/ofey404/wine/tree/robocopy>. This program accepts complex command line arguments, so I'm trying to implement my own `getopt` function which accepts dos-style flags(beginning with slash, like `/x`). The dummy code is under programs/robocopy <https://github.com/ofey404/wine/tree/robocopy/programs/robocopy> directory. And I want to add some unittest of `getopt_long()`, in robocopy/tests/getopt.c <https://github.com/ofey404/wine/blob/fe4a71850b023eefadab5ce357ce4671c1fffc…>. I try to import my source code of `getopt.c` relatively into unit test file, but I failed with error message like this: ../wine-git/programs/robocopy/tests/getopt.c:20: error: #include directive with relative path not allowed How can I include my source file correctly into the test? Maybe I should configure something in the `configure` script, but I don't know how to do it. I've read some of the builtin programs, but they seldom have a separate `test/` directory, and I don't find examples of unit tests. Wish you all the best Weiwen Chen

3 4

[PATCH] Allow 16-bit executables loaded from build directory.
by Bernhard Übelacker 26 Jun '21

26 Jun '21

https://bugs.winehq.org/show_bug.cgi?id=51214 ---- And kind of related to commits: bb065801a69 and a0425b9610a. These are the events that seem to lead to the failure: - Loading of module rundll.exe16 fails - Therefore hPrevInstance is zero, which is put into context.Esi - Somehow this seem to lead to the segfault. Unfortunately the last instructions are not shown properly. 2918 WARN("Failed to load module %s; status=%x\n", debugstr_w(libname), nts); 1: x/i $pc => 0x7bc30b49 <load_dll+217>: test $0x4,%al (rr) bt #0 load_dll (load_path=<optimized out>, libname=<optimized out>, default_ext=<optimized out>, flags=<error reading variable: Could not find the frame base for "load_dll".>, pwm=<optimized out>) at .../wine-git/dlls/ntdll/loader.c:2918 #1 0x7bc328c3 in LdrLoadDll@16 (path_name=<error reading variable: Could not find the frame base for "LdrLoadDll@16".>, flags=<optimized out>, libname=<optimized out>, hModule=<optimized out>) at .../wine-git/dlls/ntdll/loader.c:2966 #2 0x7b026d63 in load_library (libname=0x21fa78, flags=0) at .../wine-git/dlls/kernelbase/loader.c:168 #3 0x7b027bd9 in LoadLibraryExW@12 (name=0x7ffc2c00, file=0x0, flags=0) at .../wine-git/dlls/kernelbase/loader.c:517 #4 0x7b027d35 in LoadLibraryA@4 (name=0x21fb54 "rundll.exe16") at .../wine-git/dlls/kernelbase/loader.c:499 #5 0x664275ca in MODULE_LoadModule16 (libname=0x2a267b "C:\\windows\\rundll.exe", implicit=0, lib_only=0) at .../wine-git/dlls/krnl386.exe16/ne_module.c:959 #6 0x664282fe in LoadModule16@8 (name=0x2a267b "C:\\windows\\rundll.exe", paramBlock=0x21fe92) at .../wine-git/dlls/krnl386.exe16/ne_module.c:1130 #7 0x7eba1c1c in main (argc=4, argv=0x2a2590) at .../wine-git/programs/winevdm/winevdm.c:556 ... (rr) step 1176 hPrevInstance = NE_GetInstance( pModule ); ... 0x66429023 in NE_StartTask () at .../wine-git/dlls/krnl386.exe16/ne_module.c:1233 1233 context.Esi = pTask->hPrevInstance; ... (rr) bt #0 0x6640395f in wine_call_to_16_regs@12 () #1 0x6643f0e5 in K32WOWCallback16Ex@20 (vpfn16=0, dwFlags=2, cbArgs=4, pArgs=0x0, pdwRetCode=0x13cfc14) at .../wine-git/dlls/krnl386.exe16/wowthunk.c:439 #2 0x66429060 in NE_StartTask () at .../wine-git/dlls/krnl386.exe16/ne_module.c:1240 #3 0x66432e53 in task_start (p=0x26fc58) at .../wine-git/dlls/krnl386.exe16/task.c:475 #4 0x7b62e250 in WriteTapemark@16 () #5 0x7bc555a7 in call_thread_func_wrapper () #6 0x7bc55c60 in call_thread_func (entry=0x66432df0 <task_start>, arg=0x26fc58) at .../wine-git/dlls/ntdll/thread.c:225 ... (rr) stepi 0x6640398e in wine_call_to_16_regs@12 () 1: x/i $pc => 0x6640398e <wine_call_to_16_regs@12+178>: mov 0xa0(%edx),%esi (rr) x/1xw $edx + 0xa0 0x13cfcb4: 0x00000000 (rr) stepi 0x66403994 in wine_call_to_16_regs@12 () 1: x/i $pc => 0x66403994 <wine_call_to_16_regs@12+184>: mov 0x9c(%edx),%edi (rr) 0x6640399a in wine_call_to_16_regs@12 () 1: x/i $pc => 0x6640399a <wine_call_to_16_regs@12+190>: mov 0xb0(%edx),%eax (rr) 0x664039a0 in wine_call_to_16_regs@12 () 1: x/i $pc => 0x664039a0 <wine_call_to_16_regs@12+196>: mov 0xa4(%edx),%ebx (rr) 0x664039a6 in wine_call_to_16_regs@12 () 1: x/i $pc => 0x664039a6 <wine_call_to_16_regs@12+202>: mov 0xac(%edx),%ecx (rr) 0x664039ac in wine_call_to_16_regs@12 () 1: x/i $pc => 0x664039ac <wine_call_to_16_regs@12+208>: mov 0xa8(%edx),%edx (rr) 0x664039b2 in wine_call_to_16_regs@12 () 1: x/i $pc => 0x664039b2 <wine_call_to_16_regs@12+214>: popw %ds (rr) 0x664039b4 in wine_call_to_16_regs@12 () 1: x/i $pc => 0x664039b4 <wine_call_to_16_regs@12+216>: lretw (rr) 0x00000020 in ?? () 1: x/i $pc => 0x20: <error: Cannot access memory at address 0x20> (rr) 0x00000022 in ?? () 1: x/i $pc => 0x22: <error: Cannot access memory at address 0x22> (rr) 0x00000027 in ?? () 1: x/i $pc => 0x27: <error: Cannot access memory at address 0x27> (rr) 0x00000000 in ?? () 1: x/i $pc => 0x0: <error: Cannot access memory at address 0x0> (rr) 0x00000005 in ?? () 1: x/i $pc => 0x5: <error: Cannot access memory at address 0x5> (rr) Thread 8 received signal SIGSEGV, Segmentation fault. 0x00000005 in ?? () 1: x/i $pc => 0x5: <error: Cannot access memory at address 0x5> --- dlls/ntdll/loader.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 54806b0ab22..da539258eb3 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2675,6 +2675,7 @@ static NTSTATUS find_builtin_without_file( const WCHAR *name, UNICODE_STRING *ne if (!get_env_var( L"WINEBUILDDIR", 20 + 2 * wcslen(name), new_name )) { + len = new_name->Length; RtlAppendUnicodeToString( new_name, L"\\dlls\\" ); RtlAppendUnicodeToString( new_name, name ); if ((ext = wcsrchr( name, '.' )) && !wcscmp( ext, L".dll" )) new_name->Length -= 4 * sizeof(WCHAR); @@ -2685,6 +2686,17 @@ static NTSTATUS find_builtin_without_file( const WCHAR *name, UNICODE_STRING *ne RtlAppendUnicodeToString( new_name, L".fake" ); status = open_dll_file( new_name, pwm, mapping, image_info, id ); if (status != STATUS_DLL_NOT_FOUND) goto done; + + new_name->Length = len; + RtlAppendUnicodeToString( new_name, L"\\programs\\" ); + RtlAppendUnicodeToString( new_name, name ); + RtlAppendUnicodeToString( new_name, L"\\" ); + RtlAppendUnicodeToString( new_name, name ); + status = open_dll_file( new_name, pwm, mapping, image_info, id ); + if (status != STATUS_DLL_NOT_FOUND) goto done; + RtlAppendUnicodeToString( new_name, L".fake" ); + status = open_dll_file( new_name, pwm, mapping, image_info, id ); + if (status != STATUS_DLL_NOT_FOUND) goto done; RtlFreeUnicodeString( new_name ); } -- 2.30.2

1 1

[PATCH v2] Distinguish the two functions of family_matches and face_matches.
by Jiangyi Chen 26 Jun '21

26 Jun '21

2 1

[PATCH v10 1/4] winevulkan: Support use of extensions which mustn't be exposed.
by Derek Lesho 25 Jun '21

25 Jun '21

Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> --- dlls/winevulkan/make_vulkan | 35 ++++++++++++++++++++++++----------- 1 file changed, 24 insertions(+), 11 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 9ef863837d1..d226057c69e 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -120,6 +120,11 @@ UNSUPPORTED_EXTENSIONS = [ "VK_NV_external_memory_win32", ] +# Either internal extensions which aren't present on the win32 platform which +# winevulkan may nonetheless use, or extensions we want to generate headers for +# but not expose to applications (useful for test commits) +UNEXPOSED_EXTENSIONS = {} + # The Vulkan loader provides entry-points for core functionality and important # extensions. Based on vulkan-1.def this amounts to WSI extensions on 1.0.51. CORE_EXTENSIONS = [ @@ -521,8 +526,8 @@ class VkEnumValue(object): class VkFunction(object): - def __init__(self, _type=None, name=None, params=[], extensions=[], alias=None): - self.extensions = [] + def __init__(self, _type=None, name=None, params=[], alias=None): + self.extensions = set() self.name = name self.type = _type self.params = params @@ -665,6 +670,10 @@ class VkFunction(object): def needs_private_thunk(self): return self.thunk_type == ThunkType.PRIVATE + def needs_exposing(self): + # The function needs exposed if at-least one extension isn't both UNSUPPORTED and UNEXPOSED + return self.is_required() and (not self.extensions or not self.extensions.issubset(UNEXPOSED_EXTENSIONS)) + def pfn(self, prefix="p", call_conv=None, conv=False): """ Create function pointer. """ @@ -2651,7 +2660,7 @@ class VkGenerator(object): # Create thunks for instance and device functions. # Global functions don't go through the thunks. for vk_func in self.registry.funcs.values(): - if not vk_func.is_required(): + if not vk_func.needs_exposing(): continue if vk_func.is_global_func(): @@ -2671,6 +2680,8 @@ class VkGenerator(object): for ext in self.registry.extensions: if ext["type"] != "device": continue + if ext["name"] in UNEXPOSED_EXTENSIONS: + continue f.write(" \"{0}\",\n".format(ext["name"])) f.write("};\n\n") @@ -2680,6 +2691,8 @@ class VkGenerator(object): for ext in self.registry.extensions: if ext["type"] != "instance": continue + if ext["name"] in UNEXPOSED_EXTENSIONS: + continue f.write(" \"{0}\",\n".format(ext["name"])) f.write("};\n\n") @@ -2739,7 +2752,7 @@ class VkGenerator(object): f.write("const struct unix_funcs loader_funcs =\n") f.write("{\n") for vk_func in self.registry.funcs.values(): - if not vk_func.is_required(): + if not vk_func.needs_exposing(): continue if vk_func.loader_thunk_type == ThunkType.NONE: continue @@ -2758,7 +2771,7 @@ class VkGenerator(object): # Generate prototypes for device and instance functions requiring a custom implementation. f.write("/* Functions for which we have custom implementations outside of the thunks. */\n") for vk_func in self.registry.funcs.values(): - if not vk_func.is_required(): + if not vk_func.needs_exposing(): continue if vk_func.needs_thunk() and not vk_func.needs_private_thunk(): continue @@ -2857,7 +2870,7 @@ class VkGenerator(object): f.write("WINE_DEFAULT_DEBUG_CHANNEL(vulkan);\n\n") for vk_func in self.registry.funcs.values(): - if not vk_func.is_required(): + if not vk_func.needs_exposing(): continue if vk_func.loader_thunk_type != ThunkType.PUBLIC: continue @@ -2866,7 +2879,7 @@ class VkGenerator(object): f.write("static const struct vulkan_func vk_device_dispatch_table[] =\n{\n") for vk_func in self.registry.device_funcs: - if not vk_func.is_required(): + if not vk_func.needs_exposing(): continue f.write(" {{\"{0}\", &{0}}},\n".format(vk_func.name)) @@ -2874,7 +2887,7 @@ class VkGenerator(object): f.write("static const struct vulkan_func vk_phys_dev_dispatch_table[] =\n{\n") for vk_func in self.registry.phys_dev_funcs: - if not vk_func.is_required(): + if not vk_func.needs_exposing(): continue f.write(" {{\"{0}\", &{0}}},\n".format(vk_func.name)) @@ -2882,7 +2895,7 @@ class VkGenerator(object): f.write("static const struct vulkan_func vk_instance_dispatch_table[] =\n{\n") for vk_func in self.registry.instance_funcs: - if not vk_func.is_required(): + if not vk_func.needs_exposing(): continue f.write(" {{\"{0}\", &{0}}},\n".format(vk_func.name)) @@ -2939,7 +2952,7 @@ class VkGenerator(object): f.write("struct unix_funcs\n") f.write("{\n") for vk_func in self.registry.funcs.values(): - if not vk_func.is_required(): + if not vk_func.needs_exposing(): continue if vk_func.loader_thunk_type == ThunkType.NONE: continue @@ -3433,7 +3446,7 @@ class VkRegistry(object): # the XML file to handle this, but because of the manner in which we parse the XML # file we pre-populate from <commands> before we check if a command is enabled. if cmd_name in self.funcs: - self.funcs[cmd_name].extensions.append(ext_name) + self.funcs[cmd_name].extensions.add(ext_name) # Some extensions are not ready or have numbers reserved as a place holder. if ext.attrib["supported"] == "disabled": -- 2.32.0

2 5

[PATCH] ole32: Request the needed memory blocks at once.
by Haoyang Chen 25 Jun '21

25 Jun '21

When requesting a large block of memory, newNumBlocks can be very large and time-consuming. Signed-off-by: Haoyang Chen <chenhaoyang(a)uniontech.com> --- dlls/ole32/storage32.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 980b6c8d9f6..1bc8455cc6b 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -4144,7 +4144,7 @@ static void StorageImpl_SetNextBlockInChain( * */ static ULONG StorageImpl_GetNextFreeBigBlock( - StorageImpl* This) + StorageImpl* This, ULONG neededAddNumBlocks) { ULONG depotBlockIndexPos; BYTE depotBuffer[MAX_BIG_BLOCK_SIZE]; @@ -4269,7 +4269,7 @@ static ULONG StorageImpl_GetNextFreeBigBlock( /* * make sure that the block physically exists before using it */ - neededSize.QuadPart = StorageImpl_GetBigBlockOffset(This, freeBlock)+This->bigBlockSize; + neededSize.QuadPart = StorageImpl_GetBigBlockOffset(This, freeBlock)+This->bigBlockSize * neededAddNumBlocks; ILockBytes_Stat(This->lockBytes, &statstg, STATFLAG_NONAME); @@ -7403,7 +7403,7 @@ static BOOL BlockChainStream_Enlarge(BlockChainStream* This, */ if (blockIndex == BLOCK_END_OF_CHAIN) { - blockIndex = StorageImpl_GetNextFreeBigBlock(This->parentStorage); + blockIndex = StorageImpl_GetNextFreeBigBlock(This->parentStorage, 1); StorageImpl_SetNextBlockInChain(This->parentStorage, blockIndex, BLOCK_END_OF_CHAIN); @@ -7472,7 +7472,7 @@ static BOOL BlockChainStream_Enlarge(BlockChainStream* This, { while (oldNumBlocks < newNumBlocks) { - blockIndex = StorageImpl_GetNextFreeBigBlock(This->parentStorage); + blockIndex = StorageImpl_GetNextFreeBigBlock(This->parentStorage, newNumBlocks - oldNumBlocks); StorageImpl_SetNextBlockInChain( This->parentStorage, -- 2.20.1

2 1

[PATCH v2] winedbg: Try to load debug symbols for executable in gdb mode.
by Bernhard Übelacker 25 Jun '21

25 Jun '21

Signed-off-by: Bernhard Übelacker <bernhardu(a)mailbox.org> ---- This loads the debug information similar to LOAD_DLL_DEBUG_EVENT for dll's a few lines below, or CREATE_PROCESS_DEBUG_EVENT for exe's in winedbg/tgt_active.c. It should be an improvement just for real PE executables. For .exe.so files the debug information gets loaded via the ELF enumeration, with this patch 'info share' shows a line for the fake exe additional to the .exe.so line. First submission: https://www.winehq.org/pipermail/wine-devel/2021-May/186536.html Resend: https://www.winehq.org/pipermail/wine-devel/2021-June/189401.html v2: - Removed fetch_module_name and logging. --- programs/winedbg/gdbproxy.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index 478e0d16fe0..19fa86d44da 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -437,6 +437,9 @@ static BOOL handle_debug_event(struct gdb_context* gdbctx) fprintf(stderr, "%04x:%04x: create thread I @%p\n", de->dwProcessId, de->dwThreadId, de->u.CreateProcessInfo.lpStartAddress); + dbg_load_module(gdbctx->process->handle, de->u.CreateProcessInfo.hFile, u.buffer, + (DWORD_PTR)de->u.CreateProcessInfo.lpBaseOfImage, 0); + dbg_add_thread(gdbctx->process, de->dwThreadId, de->u.CreateProcessInfo.hThread, de->u.CreateProcessInfo.lpThreadLocalBase); -- 2.30.2

1 0

[PATCH resend] winedbg: Try to load debug symbols for executable in gdb mode.
by Bernhard Übelacker 25 Jun '21

25 Jun '21

Signed-off-by: Bernhard Übelacker <bernhardu(a)mailbox.org> ---- This loads the debug information similar to LOAD_DLL_DEBUG_EVENT for dll's a few lines below, or CREATE_PROCESS_DEBUG_EVENT for exe's in winedbg/tgt_active.c. It should be an improvement just for real PE executables. For .exe.so files the debug information gets loaded via the ELF enumeration, with this patch 'info share' shows a line for the fake exe additional to the .exe.so line. First submission: https://www.winehq.org/pipermail/wine-devel/2021-May/186536.html --- programs/winedbg/gdbproxy.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index 478e0d16fe0..d768a8a585c 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -437,6 +437,17 @@ static BOOL handle_debug_event(struct gdb_context* gdbctx) fprintf(stderr, "%04x:%04x: create thread I @%p\n", de->dwProcessId, de->dwThreadId, de->u.CreateProcessInfo.lpStartAddress); + fetch_module_name( de->u.CreateProcessInfo.lpImageName, de->u.CreateProcessInfo.lpBaseOfImage, + u.buffer, ARRAY_SIZE(u.buffer) ); + fprintf(stderr, "%04x:%04x: loads EXE %s @%p (%u<%u>)\n", + de->dwProcessId, de->dwThreadId, + dbg_W2A(u.buffer, -1), + de->u.CreateProcessInfo.lpBaseOfImage, + de->u.CreateProcessInfo.dwDebugInfoFileOffset, + de->u.CreateProcessInfo.nDebugInfoSize); + dbg_load_module(gdbctx->process->handle, de->u.CreateProcessInfo.hFile, u.buffer, + (DWORD_PTR)de->u.CreateProcessInfo.lpBaseOfImage, 0); + dbg_add_thread(gdbctx->process, de->dwThreadId, de->u.CreateProcessInfo.hThread, de->u.CreateProcessInfo.lpThreadLocalBase); -- 2.30.2

2 2

[PATCH 1/4] d2d1: Use D3D11 interfaces to create buffers.
by Rémi Bernon 25 Jun '21

25 Jun '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49395 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/d2d1/d2d1_private.h | 8 +- dlls/d2d1/device.c | 211 +++++++++++++++++++++++++-------------- 2 files changed, 138 insertions(+), 81 deletions(-) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index e2510568e3c..e85c93ec277 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -166,12 +166,12 @@ struct d2d_device_context struct d2d_bitmap *target; ID3D10StateBlock *stateblock; struct d2d_shape_resources shape_resources[D2D_SHAPE_TYPE_COUNT]; - ID3D10Buffer *vs_cb; + ID3D11Buffer *vs_cb; ID3D10PixelShader *ps; - ID3D10Buffer *ps_cb; - ID3D10Buffer *ib; + ID3D11Buffer *ps_cb; + ID3D11Buffer *ib; unsigned int vb_stride; - ID3D10Buffer *vb; + ID3D11Buffer *vb; ID3D10RasterizerState *rs; ID3D10BlendState *bs; ID3D10SamplerState *sampler_states diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index 6390037bce3..5242342c454 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -118,11 +118,13 @@ static void d2d_clip_stack_pop(struct d2d_clip_stack *stack) } static void d2d_device_context_draw(struct d2d_device_context *render_target, enum d2d_shape_type shape_type, - ID3D10Buffer *ib, unsigned int index_count, ID3D10Buffer *vb, unsigned int vb_stride, + ID3D11Buffer *ib, unsigned int index_count, ID3D11Buffer *vb, unsigned int vb_stride, struct d2d_brush *brush, struct d2d_brush *opacity_brush) { struct d2d_shape_resources *shape_resources = &render_target->shape_resources[shape_type]; ID3D10Device *device = render_target->d3d_device; + ID3D10Buffer *d3d10_ib = NULL, *d3d10_vb = NULL, *d3d10_vs_cb = NULL, *d3d10_ps_cb = NULL; + ID3D11Buffer *vs_cb = render_target->vs_cb, *ps_cb = render_target->ps_cb; D3D10_RECT scissor_rect; unsigned int offset; D3D10_VIEWPORT vp; @@ -135,22 +137,46 @@ static void d2d_device_context_draw(struct d2d_device_context *render_target, en vp.MinDepth = 0.0f; vp.MaxDepth = 1.0f; + if (ib && FAILED(hr = ID3D11Buffer_QueryInterface(ib, &IID_ID3D10Buffer, (void **)&d3d10_ib))) + { + ERR("Failed to query D3D10 index buffer, hr %#x.\n", hr); + goto error; + } + + if (vb && FAILED(hr = ID3D11Buffer_QueryInterface(vb, &IID_ID3D10Buffer, (void **)&d3d10_vb))) + { + ERR("Failed to query D3D10 vertex buffer, hr %#x.\n", hr); + goto error; + } + + if (vs_cb && FAILED(hr = ID3D11Buffer_QueryInterface(vs_cb, &IID_ID3D10Buffer, (void **)&d3d10_vs_cb))) + { + ERR("Failed to query D3D10 VS constant buffer, hr %#x.\n", hr); + goto error; + } + + if (ps_cb && FAILED(hr = ID3D11Buffer_QueryInterface(ps_cb, &IID_ID3D10Buffer, (void **)&d3d10_ps_cb))) + { + ERR("Failed to query D3D10 PS constant buffer, hr %#x.\n", hr); + goto error; + } + if (FAILED(hr = render_target->stateblock->lpVtbl->Capture(render_target->stateblock))) { WARN("Failed to capture stateblock, hr %#x.\n", hr); - return; + goto error; } ID3D10Device_ClearState(device); ID3D10Device_IASetInputLayout(device, shape_resources->il); ID3D10Device_IASetPrimitiveTopology(device, D3D10_PRIMITIVE_TOPOLOGY_TRIANGLELIST); - ID3D10Device_IASetIndexBuffer(device, ib, DXGI_FORMAT_R16_UINT, 0); + ID3D10Device_IASetIndexBuffer(device, d3d10_ib, DXGI_FORMAT_R16_UINT, 0); offset = 0; - ID3D10Device_IASetVertexBuffers(device, 0, 1, &vb, &vb_stride, &offset); - ID3D10Device_VSSetConstantBuffers(device, 0, 1, &render_target->vs_cb); + ID3D10Device_IASetVertexBuffers(device, 0, 1, &d3d10_vb, &vb_stride, &offset); + ID3D10Device_VSSetConstantBuffers(device, 0, 1, &d3d10_vs_cb); ID3D10Device_VSSetShader(device, shape_resources->vs); - ID3D10Device_PSSetConstantBuffers(device, 0, 1, &render_target->ps_cb); + ID3D10Device_PSSetConstantBuffers(device, 0, 1, &d3d10_ps_cb); ID3D10Device_PSSetShader(device, render_target->ps); ID3D10Device_RSSetViewports(device, 1, &vp); if (render_target->clip_stack.count) @@ -188,6 +214,12 @@ static void d2d_device_context_draw(struct d2d_device_context *render_target, en if (FAILED(hr = render_target->stateblock->lpVtbl->Apply(render_target->stateblock))) WARN("Failed to apply stateblock, hr %#x.\n", hr); + +error: + if (d3d10_ib) ID3D10Buffer_Release(d3d10_ib); + if (d3d10_vb) ID3D10Buffer_Release(d3d10_vb); + if (d3d10_vs_cb) ID3D10Buffer_Release(d3d10_vs_cb); + if (d3d10_ps_cb) ID3D10Buffer_Release(d3d10_ps_cb); } static void d2d_device_context_set_error(struct d2d_device_context *context, HRESULT code) @@ -263,11 +295,11 @@ static ULONG STDMETHODCALLTYPE d2d_device_context_inner_Release(IUnknown *iface) if (context->bs) ID3D10BlendState_Release(context->bs); ID3D10RasterizerState_Release(context->rs); - ID3D10Buffer_Release(context->vb); - ID3D10Buffer_Release(context->ib); - ID3D10Buffer_Release(context->ps_cb); + ID3D11Buffer_Release(context->vb); + ID3D11Buffer_Release(context->ib); + ID3D11Buffer_Release(context->ps_cb); ID3D10PixelShader_Release(context->ps); - ID3D10Buffer_Release(context->vs_cb); + ID3D11Buffer_Release(context->vs_cb); for (i = 0; i < D2D_SHAPE_TYPE_COUNT; ++i) { ID3D10VertexShader_Release(context->shape_resources[i].vs); @@ -712,15 +744,22 @@ static void STDMETHODCALLTYPE d2d_device_context_FillEllipse(ID2D1DeviceContext static HRESULT d2d_device_context_update_ps_cb(struct d2d_device_context *context, struct d2d_brush *brush, struct d2d_brush *opacity_brush, BOOL outline, BOOL is_arc) { + D3D11_MAPPED_SUBRESOURCE map_desc; + ID3D11DeviceContext *d3d_context; struct d2d_ps_cb *cb_data; HRESULT hr; - if (FAILED(hr = ID3D10Buffer_Map(context->ps_cb, D3D10_MAP_WRITE_DISCARD, 0, (void **)&cb_data))) + ID3D11Device1_GetImmediateContext(context->d3d11_device, &d3d_context); + + if (FAILED(hr = ID3D11DeviceContext_Map(d3d_context, (ID3D11Resource *)context->ps_cb, + 0, D3D11_MAP_WRITE_DISCARD, 0, &map_desc))) { WARN("Failed to map constant buffer, hr %#x.\n", hr); + ID3D11DeviceContext_Release(d3d_context); return hr; } + cb_data = map_desc.pData; cb_data->outline = outline; cb_data->is_arc = is_arc; cb_data->pad[0] = 0; @@ -730,7 +769,8 @@ static HRESULT d2d_device_context_update_ps_cb(struct d2d_device_context *contex if (!d2d_brush_fill_cb(opacity_brush, &cb_data->opacity_brush)) WARN("Failed to initialize opacity brush buffer.\n"); - ID3D10Buffer_Unmap(context->ps_cb); + ID3D11DeviceContext_Unmap(d3d_context, (ID3D11Resource *)context->ps_cb, 0); + ID3D11DeviceContext_Release(d3d_context); return hr; } @@ -738,17 +778,24 @@ static HRESULT d2d_device_context_update_ps_cb(struct d2d_device_context *contex static HRESULT d2d_device_context_update_vs_cb(struct d2d_device_context *context, const D2D_MATRIX_3X2_F *geometry_transform, float stroke_width) { + D3D11_MAPPED_SUBRESOURCE map_desc; + ID3D11DeviceContext *d3d_context; const D2D1_MATRIX_3X2_F *w; struct d2d_vs_cb *cb_data; float tmp_x, tmp_y; HRESULT hr; - if (FAILED(hr = ID3D10Buffer_Map(context->vs_cb, D3D10_MAP_WRITE_DISCARD, 0, (void **)&cb_data))) + ID3D11Device1_GetImmediateContext(context->d3d11_device, &d3d_context); + + if (FAILED(hr = ID3D11DeviceContext_Map(d3d_context, (ID3D11Resource *)context->vs_cb, + 0, D3D11_MAP_WRITE_DISCARD, 0, &map_desc))) { WARN("Failed to map constant buffer, hr %#x.\n", hr); + ID3D11DeviceContext_Release(d3d_context); return hr; } + cb_data = map_desc.pData; cb_data->transform_geometry._11 = geometry_transform->_11; cb_data->transform_geometry._21 = geometry_transform->_21; cb_data->transform_geometry._31 = geometry_transform->_31; @@ -772,7 +819,8 @@ static HRESULT d2d_device_context_update_vs_cb(struct d2d_device_context *contex cb_data->transform_rty.z = w->_32 * tmp_y; cb_data->transform_rty.w = -2.0f / context->pixel_size.height; - ID3D10Buffer_Unmap(context->vs_cb); + ID3D11DeviceContext_Unmap(d3d_context, (ID3D11Resource *)context->vs_cb, 0); + ID3D11DeviceContext_Release(d3d_context); return S_OK; } @@ -780,9 +828,9 @@ static HRESULT d2d_device_context_update_vs_cb(struct d2d_device_context *contex static void d2d_device_context_draw_geometry(struct d2d_device_context *render_target, const struct d2d_geometry *geometry, struct d2d_brush *brush, float stroke_width) { - D3D10_SUBRESOURCE_DATA buffer_data; - D3D10_BUFFER_DESC buffer_desc; - ID3D10Buffer *ib, *vb; + D3D11_SUBRESOURCE_DATA buffer_data; + D3D11_BUFFER_DESC buffer_desc; + ID3D11Buffer *ib, *vb; HRESULT hr; if (FAILED(hr = d2d_device_context_update_vs_cb(render_target, &geometry->transform, stroke_width))) @@ -797,7 +845,7 @@ static void d2d_device_context_draw_geometry(struct d2d_device_context *render_t return; } - buffer_desc.Usage = D3D10_USAGE_DEFAULT; + buffer_desc.Usage = D3D11_USAGE_DEFAULT; buffer_desc.CPUAccessFlags = 0; buffer_desc.MiscFlags = 0; @@ -807,53 +855,53 @@ static void d2d_device_context_draw_geometry(struct d2d_device_context *render_t if (geometry->outline.face_count) { buffer_desc.ByteWidth = geometry->outline.face_count * sizeof(*geometry->outline.faces); - buffer_desc.BindFlags = D3D10_BIND_INDEX_BUFFER; + buffer_desc.BindFlags = D3D11_BIND_INDEX_BUFFER; buffer_data.pSysMem = geometry->outline.faces; - if (FAILED(hr = ID3D10Device_CreateBuffer(render_target->d3d_device, &buffer_desc, &buffer_data, &ib))) + if (FAILED(hr = ID3D11Device1_CreateBuffer(render_target->d3d11_device, &buffer_desc, &buffer_data, &ib))) { WARN("Failed to create index buffer, hr %#x.\n", hr); return; } buffer_desc.ByteWidth = geometry->outline.vertex_count * sizeof(*geometry->outline.vertices); - buffer_desc.BindFlags = D3D10_BIND_VERTEX_BUFFER; + buffer_desc.BindFlags = D3D11_BIND_VERTEX_BUFFER; buffer_data.pSysMem = geometry->outline.vertices; - if (FAILED(hr = ID3D10Device_CreateBuffer(render_target->d3d_device, &buffer_desc, &buffer_data, &vb))) + if (FAILED(hr = ID3D11Device1_CreateBuffer(render_target->d3d11_device, &buffer_desc, &buffer_data, &vb))) { ERR("Failed to create vertex buffer, hr %#x.\n", hr); - ID3D10Buffer_Release(ib); + ID3D11Buffer_Release(ib); return; } d2d_device_context_draw(render_target, D2D_SHAPE_TYPE_OUTLINE, ib, 3 * geometry->outline.face_count, vb, sizeof(*geometry->outline.vertices), brush, NULL); - ID3D10Buffer_Release(vb); - ID3D10Buffer_Release(ib); + ID3D11Buffer_Release(vb); + ID3D11Buffer_Release(ib); } if (geometry->outline.bezier_face_count) { buffer_desc.ByteWidth = geometry->outline.bezier_face_count * sizeof(*geometry->outline.bezier_faces); - buffer_desc.BindFlags = D3D10_BIND_INDEX_BUFFER; + buffer_desc.BindFlags = D3D11_BIND_INDEX_BUFFER; buffer_data.pSysMem = geometry->outline.bezier_faces; - if (FAILED(hr = ID3D10Device_CreateBuffer(render_target->d3d_device, &buffer_desc, &buffer_data, &ib))) + if (FAILED(hr = ID3D11Device1_CreateBuffer(render_target->d3d11_device, &buffer_desc, &buffer_data, &ib))) { WARN("Failed to create beziers index buffer, hr %#x.\n", hr); return; } buffer_desc.ByteWidth = geometry->outline.bezier_count * sizeof(*geometry->outline.beziers); - buffer_desc.BindFlags = D3D10_BIND_VERTEX_BUFFER; + buffer_desc.BindFlags = D3D11_BIND_VERTEX_BUFFER; buffer_data.pSysMem = geometry->outline.beziers; - if (FAILED(hr = ID3D10Device_CreateBuffer(render_target->d3d_device, &buffer_desc, &buffer_data, &vb))) + if (FAILED(hr = ID3D11Device1_CreateBuffer(render_target->d3d11_device, &buffer_desc, &buffer_data, &vb))) { ERR("Failed to create beziers vertex buffer, hr %#x.\n", hr); - ID3D10Buffer_Release(ib); + ID3D11Buffer_Release(ib); return; } @@ -861,30 +909,30 @@ static void d2d_device_context_draw_geometry(struct d2d_device_context *render_t 3 * geometry->outline.bezier_face_count, vb, sizeof(*geometry->outline.beziers), brush, NULL); - ID3D10Buffer_Release(vb); - ID3D10Buffer_Release(ib); + ID3D11Buffer_Release(vb); + ID3D11Buffer_Release(ib); } if (geometry->outline.arc_face_count) { buffer_desc.ByteWidth = geometry->outline.arc_face_count * sizeof(*geometry->outline.arc_faces); - buffer_desc.BindFlags = D3D10_BIND_INDEX_BUFFER; + buffer_desc.BindFlags = D3D11_BIND_INDEX_BUFFER; buffer_data.pSysMem = geometry->outline.arc_faces; - if (FAILED(hr = ID3D10Device_CreateBuffer(render_target->d3d_device, &buffer_desc, &buffer_data, &ib))) + if (FAILED(hr = ID3D11Device1_CreateBuffer(render_target->d3d11_device, &buffer_desc, &buffer_data, &ib))) { WARN("Failed to create arcs index buffer, hr %#x.\n", hr); return; } buffer_desc.ByteWidth = geometry->outline.arc_count * sizeof(*geometry->outline.arcs); - buffer_desc.BindFlags = D3D10_BIND_VERTEX_BUFFER; + buffer_desc.BindFlags = D3D11_BIND_VERTEX_BUFFER; buffer_data.pSysMem = geometry->outline.arcs; - if (FAILED(hr = ID3D10Device_CreateBuffer(render_target->d3d_device, &buffer_desc, &buffer_data, &vb))) + if (FAILED(hr = ID3D11Device1_CreateBuffer(render_target->d3d11_device, &buffer_desc, &buffer_data, &vb))) { ERR("Failed to create arcs vertex buffer, hr %#x.\n", hr); - ID3D10Buffer_Release(ib); + ID3D11Buffer_Release(ib); return; } @@ -893,8 +941,8 @@ static void d2d_device_context_draw_geometry(struct d2d_device_context *render_t 3 * geometry->outline.arc_face_count, vb, sizeof(*geometry->outline.arcs), brush, NULL); - ID3D10Buffer_Release(vb); - ID3D10Buffer_Release(ib); + ID3D11Buffer_Release(vb); + ID3D11Buffer_Release(ib); } } @@ -917,12 +965,12 @@ static void STDMETHODCALLTYPE d2d_device_context_DrawGeometry(ID2D1DeviceContext static void d2d_device_context_fill_geometry(struct d2d_device_context *render_target, const struct d2d_geometry *geometry, struct d2d_brush *brush, struct d2d_brush *opacity_brush) { - D3D10_SUBRESOURCE_DATA buffer_data; - D3D10_BUFFER_DESC buffer_desc; - ID3D10Buffer *ib, *vb; + D3D11_SUBRESOURCE_DATA buffer_data; + D3D11_BUFFER_DESC buffer_desc; + ID3D11Buffer *ib, *vb; HRESULT hr; - buffer_desc.Usage = D3D10_USAGE_DEFAULT; + buffer_desc.Usage = D3D11_USAGE_DEFAULT; buffer_desc.CPUAccessFlags = 0; buffer_desc.MiscFlags = 0; @@ -944,40 +992,40 @@ static void d2d_device_context_fill_geometry(struct d2d_device_context *render_t if (geometry->fill.face_count) { buffer_desc.ByteWidth = geometry->fill.face_count * sizeof(*geometry->fill.faces); - buffer_desc.BindFlags = D3D10_BIND_INDEX_BUFFER; + buffer_desc.BindFlags = D3D11_BIND_INDEX_BUFFER; buffer_data.pSysMem = geometry->fill.faces; - if (FAILED(hr = ID3D10Device_CreateBuffer(render_target->d3d_device, &buffer_desc, &buffer_data, &ib))) + if (FAILED(hr = ID3D11Device1_CreateBuffer(render_target->d3d11_device, &buffer_desc, &buffer_data, &ib))) { WARN("Failed to create index buffer, hr %#x.\n", hr); return; } buffer_desc.ByteWidth = geometry->fill.vertex_count * sizeof(*geometry->fill.vertices); - buffer_desc.BindFlags = D3D10_BIND_VERTEX_BUFFER; + buffer_desc.BindFlags = D3D11_BIND_VERTEX_BUFFER; buffer_data.pSysMem = geometry->fill.vertices; - if (FAILED(hr = ID3D10Device_CreateBuffer(render_target->d3d_device, &buffer_desc, &buffer_data, &vb))) + if (FAILED(hr = ID3D11Device1_CreateBuffer(render_target->d3d11_device, &buffer_desc, &buffer_data, &vb))) { ERR("Failed to create vertex buffer, hr %#x.\n", hr); - ID3D10Buffer_Release(ib); + ID3D11Buffer_Release(ib); return; } d2d_device_context_draw(render_target, D2D_SHAPE_TYPE_TRIANGLE, ib, 3 * geometry->fill.face_count, vb, sizeof(*geometry->fill.vertices), brush, opacity_brush); - ID3D10Buffer_Release(vb); - ID3D10Buffer_Release(ib); + ID3D11Buffer_Release(vb); + ID3D11Buffer_Release(ib); } if (geometry->fill.bezier_vertex_count) { buffer_desc.ByteWidth = geometry->fill.bezier_vertex_count * sizeof(*geometry->fill.bezier_vertices); - buffer_desc.BindFlags = D3D10_BIND_VERTEX_BUFFER; + buffer_desc.BindFlags = D3D11_BIND_VERTEX_BUFFER; buffer_data.pSysMem = geometry->fill.bezier_vertices; - if (FAILED(hr = ID3D10Device_CreateBuffer(render_target->d3d_device, &buffer_desc, &buffer_data, &vb))) + if (FAILED(hr = ID3D11Device1_CreateBuffer(render_target->d3d11_device, &buffer_desc, &buffer_data, &vb))) { ERR("Failed to create beziers vertex buffer, hr %#x.\n", hr); return; @@ -986,16 +1034,16 @@ static void d2d_device_context_fill_geometry(struct d2d_device_context *render_t d2d_device_context_draw(render_target, D2D_SHAPE_TYPE_CURVE, NULL, geometry->fill.bezier_vertex_count, vb, sizeof(*geometry->fill.bezier_vertices), brush, opacity_brush); - ID3D10Buffer_Release(vb); + ID3D11Buffer_Release(vb); } if (geometry->fill.arc_vertex_count) { buffer_desc.ByteWidth = geometry->fill.arc_vertex_count * sizeof(*geometry->fill.arc_vertices); - buffer_desc.BindFlags = D3D10_BIND_VERTEX_BUFFER; + buffer_desc.BindFlags = D3D11_BIND_VERTEX_BUFFER; buffer_data.pSysMem = geometry->fill.arc_vertices; - if (FAILED(hr = ID3D10Device_CreateBuffer(render_target->d3d_device, &buffer_desc, &buffer_data, &vb))) + if (FAILED(hr = ID3D11Device1_CreateBuffer(render_target->d3d11_device, &buffer_desc, &buffer_data, &vb))) { ERR("Failed to create arc vertex buffer, hr %#x.\n", hr); return; @@ -1005,7 +1053,7 @@ static void d2d_device_context_fill_geometry(struct d2d_device_context *render_t d2d_device_context_draw(render_target, D2D_SHAPE_TYPE_CURVE, NULL, geometry->fill.arc_vertex_count, vb, sizeof(*geometry->fill.arc_vertices), brush, opacity_brush); - ID3D10Buffer_Release(vb); + ID3D11Buffer_Release(vb); } } @@ -1602,6 +1650,8 @@ static void STDMETHODCALLTYPE d2d_device_context_PopAxisAlignedClip(ID2D1DeviceC static void STDMETHODCALLTYPE d2d_device_context_Clear(ID2D1DeviceContext *iface, const D2D1_COLOR_F *colour) { struct d2d_device_context *render_target = impl_from_ID2D1DeviceContext(iface); + D3D11_MAPPED_SUBRESOURCE map_desc; + ID3D11DeviceContext *d3d_context; struct d2d_ps_cb *ps_cb_data; struct d2d_vs_cb *vs_cb_data; D2D1_COLOR_F *c; @@ -1609,13 +1659,17 @@ static void STDMETHODCALLTYPE d2d_device_context_Clear(ID2D1DeviceContext *iface TRACE("iface %p, colour %p.\n", iface, colour); - if (FAILED(hr = ID3D10Buffer_Map(render_target->vs_cb, D3D10_MAP_WRITE_DISCARD, - 0, (void **)&vs_cb_data))) + ID3D11Device1_GetImmediateContext(render_target->d3d11_device, &d3d_context); + + if (FAILED(hr = ID3D11DeviceContext_Map(d3d_context, (ID3D11Resource *)render_target->vs_cb, + 0, D3D11_MAP_WRITE_DISCARD, 0, &map_desc))) { WARN("Failed to map vs constant buffer, hr %#x.\n", hr); + ID3D11DeviceContext_Release(d3d_context); return; } + vs_cb_data = map_desc.pData; vs_cb_data->transform_geometry._11 = 1.0f; vs_cb_data->transform_geometry._21 = 0.0f; vs_cb_data->transform_geometry._31 = 0.0f; @@ -1633,15 +1687,17 @@ static void STDMETHODCALLTYPE d2d_device_context_Clear(ID2D1DeviceContext *iface vs_cb_data->transform_rty.z = 1.0f; vs_cb_data->transform_rty.w = -1.0f; - ID3D10Buffer_Unmap(render_target->vs_cb); + ID3D11DeviceContext_Unmap(d3d_context, (ID3D11Resource *)render_target->vs_cb, 0); - if (FAILED(hr = ID3D10Buffer_Map(render_target->ps_cb, D3D10_MAP_WRITE_DISCARD, - 0, (void **)&ps_cb_data))) + if (FAILED(hr = ID3D11DeviceContext_Map(d3d_context, (ID3D11Resource *)render_target->ps_cb, + 0, D3D11_MAP_WRITE_DISCARD, 0, &map_desc))) { WARN("Failed to map ps constant buffer, hr %#x.\n", hr); + ID3D11DeviceContext_Release(d3d_context); return; } + ps_cb_data = map_desc.pData; memset(ps_cb_data, 0, sizeof(*ps_cb_data)); ps_cb_data->colour_brush.type = D2D_BRUSH_TYPE_SOLID; ps_cb_data->colour_brush.opacity = 1.0f; @@ -1655,7 +1711,8 @@ static void STDMETHODCALLTYPE d2d_device_context_Clear(ID2D1DeviceContext *iface c->g *= c->a; c->b *= c->a; - ID3D10Buffer_Unmap(render_target->ps_cb); + ID3D11DeviceContext_Unmap(d3d_context, (ID3D11Resource *)render_target->ps_cb, 0); + ID3D11DeviceContext_Release(d3d_context); d2d_device_context_draw(render_target, D2D_SHAPE_TYPE_TRIANGLE, render_target->ib, 6, render_target->vb, render_target->vb_stride, NULL, NULL); @@ -2774,12 +2831,12 @@ static const struct ID2D1GdiInteropRenderTargetVtbl d2d_gdi_interop_render_targe static HRESULT d2d_device_context_init(struct d2d_device_context *render_target, ID2D1Device *device, IUnknown *outer_unknown, const struct d2d_device_context_ops *ops) { - D3D10_SUBRESOURCE_DATA buffer_data; + D3D11_SUBRESOURCE_DATA buffer_data; D3D10_STATE_BLOCK_MASK state_mask; struct d2d_device *device_impl; IDWriteFactory *dwrite_factory; D3D10_RASTERIZER_DESC rs_desc; - D3D10_BUFFER_DESC buffer_desc; + D3D11_BUFFER_DESC buffer_desc; unsigned int i; HRESULT hr; @@ -3891,12 +3948,12 @@ static HRESULT d2d_device_context_init(struct d2d_device_context *render_target, } buffer_desc.ByteWidth = sizeof(struct d2d_vs_cb); - buffer_desc.Usage = D3D10_USAGE_DYNAMIC; + buffer_desc.Usage = D3D11_USAGE_DYNAMIC; buffer_desc.BindFlags = D3D10_BIND_CONSTANT_BUFFER; buffer_desc.CPUAccessFlags = D3D10_CPU_ACCESS_WRITE; buffer_desc.MiscFlags = 0; - if (FAILED(hr = ID3D10Device_CreateBuffer(render_target->d3d_device, &buffer_desc, NULL, + if (FAILED(hr = ID3D11Device1_CreateBuffer(render_target->d3d11_device, &buffer_desc, NULL, &render_target->vs_cb))) { WARN("Failed to create constant buffer, hr %#x.\n", hr); @@ -3911,12 +3968,12 @@ static HRESULT d2d_device_context_init(struct d2d_device_context *render_target, } buffer_desc.ByteWidth = sizeof(struct d2d_ps_cb); - buffer_desc.Usage = D3D10_USAGE_DYNAMIC; + buffer_desc.Usage = D3D11_USAGE_DYNAMIC; buffer_desc.BindFlags = D3D10_BIND_CONSTANT_BUFFER; buffer_desc.CPUAccessFlags = D3D10_CPU_ACCESS_WRITE; buffer_desc.MiscFlags = 0; - if (FAILED(hr = ID3D10Device_CreateBuffer(render_target->d3d_device, &buffer_desc, NULL, + if (FAILED(hr = ID3D11Device1_CreateBuffer(render_target->d3d11_device, &buffer_desc, NULL, &render_target->ps_cb))) { WARN("Failed to create constant buffer, hr %#x.\n", hr); @@ -3924,8 +3981,8 @@ static HRESULT d2d_device_context_init(struct d2d_device_context *render_target, } buffer_desc.ByteWidth = sizeof(indices); - buffer_desc.Usage = D3D10_USAGE_DEFAULT; - buffer_desc.BindFlags = D3D10_BIND_INDEX_BUFFER; + buffer_desc.Usage = D3D11_USAGE_DEFAULT; + buffer_desc.BindFlags = D3D11_BIND_INDEX_BUFFER; buffer_desc.CPUAccessFlags = 0; buffer_desc.MiscFlags = 0; @@ -3933,7 +3990,7 @@ static HRESULT d2d_device_context_init(struct d2d_device_context *render_target, buffer_data.SysMemPitch = 0; buffer_data.SysMemSlicePitch = 0; - if (FAILED(hr = ID3D10Device_CreateBuffer(render_target->d3d_device, + if (FAILED(hr = ID3D11Device1_CreateBuffer(render_target->d3d11_device, &buffer_desc, &buffer_data, &render_target->ib))) { WARN("Failed to create clear index buffer, hr %#x.\n", hr); @@ -3941,11 +3998,11 @@ static HRESULT d2d_device_context_init(struct d2d_device_context *render_target, } buffer_desc.ByteWidth = sizeof(quad); - buffer_desc.BindFlags = D3D10_BIND_VERTEX_BUFFER; + buffer_desc.BindFlags = D3D11_BIND_VERTEX_BUFFER; buffer_data.pSysMem = quad; render_target->vb_stride = sizeof(*quad); - if (FAILED(hr = ID3D10Device_CreateBuffer(render_target->d3d_device, + if (FAILED(hr = ID3D11Device1_CreateBuffer(render_target->d3d11_device, &buffer_desc, &buffer_data, &render_target->vb))) { WARN("Failed to create clear vertex buffer, hr %#x.\n", hr); @@ -4003,15 +4060,15 @@ err: if (render_target->rs) ID3D10RasterizerState_Release(render_target->rs); if (render_target->vb) - ID3D10Buffer_Release(render_target->vb); + ID3D11Buffer_Release(render_target->vb); if (render_target->ib) - ID3D10Buffer_Release(render_target->ib); + ID3D11Buffer_Release(render_target->ib); if (render_target->ps_cb) - ID3D10Buffer_Release(render_target->ps_cb); + ID3D11Buffer_Release(render_target->ps_cb); if (render_target->ps) ID3D10PixelShader_Release(render_target->ps); if (render_target->vs_cb) - ID3D10Buffer_Release(render_target->vs_cb); + ID3D11Buffer_Release(render_target->vs_cb); for (i = 0; i < D2D_SHAPE_TYPE_COUNT; ++i) { if (render_target->shape_resources[i].vs) -- 2.32.0

2 7

[PATCH v2 1/3] wined3d: Use a wined3d_resource operation to retrieve the resource dimensions in wined3d_device_context_update_sub_resource().
by Zebediah Figura 25 Jun '21

25 Jun '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- Potentially we could obviate even this, by storing the level and layer count inside the wined3d_resource structure. However, it's not immediately clear to me what's worth taking up memory for. dlls/wined3d/buffer.c | 23 +++++++++++++++++++ dlls/wined3d/device.c | 40 ++++++---------------------------- dlls/wined3d/texture.c | 9 ++++++++ dlls/wined3d/wined3d_private.h | 8 +++++++ 4 files changed, 47 insertions(+), 33 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 7b8c8904961..142cce0299f 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -840,6 +840,28 @@ struct wined3d_resource * CDECL wined3d_buffer_get_resource(struct wined3d_buffe return &buffer->resource; } +static HRESULT buffer_resource_sub_resource_get_desc(struct wined3d_resource *resource, + unsigned int sub_resource_idx, struct wined3d_sub_resource_desc *desc) +{ + if (sub_resource_idx) + { + WARN("Invalid sub_resource_idx %u.\n", sub_resource_idx); + return E_INVALIDARG; + } + + desc->format = WINED3DFMT_UNKNOWN; + desc->multisample_type = WINED3D_MULTISAMPLE_NONE; + desc->multisample_quality = 0; + desc->usage = resource->usage; + desc->bind_flags = resource->bind_flags; + desc->access = resource->access; + desc->width = resource->size; + desc->height = 1; + desc->depth = 1; + desc->size = resource->size; + return S_OK; +} + static HRESULT buffer_resource_sub_resource_map(struct wined3d_resource *resource, unsigned int sub_resource_idx, struct wined3d_map_desc *map_desc, const struct wined3d_box *box, uint32_t flags) { @@ -1105,6 +1127,7 @@ static const struct wined3d_resource_ops buffer_resource_ops = buffer_resource_decref, buffer_resource_preload, buffer_resource_unload, + buffer_resource_sub_resource_get_desc, buffer_resource_sub_resource_map, buffer_resource_sub_resource_unmap, }; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index a11f137729f..6d749269c18 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4649,7 +4649,7 @@ void CDECL wined3d_device_context_update_sub_resource(struct wined3d_device_cont struct wined3d_resource *resource, unsigned int sub_resource_idx, const struct wined3d_box *box, const void *data, unsigned int row_pitch, unsigned int depth_pitch, unsigned int flags) { - unsigned int width, height, depth; + struct wined3d_sub_resource_desc desc; struct wined3d_box b; TRACE("context %p, resource %p, sub_resource_idx %u, box %s, data %p, row_pitch %u, depth_pitch %u, flags %#x.\n", @@ -4664,43 +4664,17 @@ void CDECL wined3d_device_context_update_sub_resource(struct wined3d_device_cont return; } - if (resource->type == WINED3D_RTYPE_BUFFER) - { - if (sub_resource_idx > 0) - { - WARN("Invalid sub_resource_idx %u.\n", sub_resource_idx); - return; - } - - width = resource->size; - height = 1; - depth = 1; - } - else - { - struct wined3d_texture *texture = texture_from_resource(resource); - unsigned int level; - - if (sub_resource_idx >= texture->level_count * texture->layer_count) - { - WARN("Invalid sub_resource_idx %u.\n", sub_resource_idx); - return; - } - - level = sub_resource_idx % texture->level_count; - width = wined3d_texture_get_level_width(texture, level); - height = wined3d_texture_get_level_height(texture, level); - depth = wined3d_texture_get_level_depth(texture, level); - } + if (FAILED(wined3d_resource_get_sub_resource_desc(resource, sub_resource_idx, &desc))) + return; if (!box) { - wined3d_box_set(&b, 0, 0, width, height, 0, depth); + wined3d_box_set(&b, 0, 0, desc.width, desc.height, 0, desc.depth); box = &b; } - else if (box->left >= box->right || box->right > width - || box->top >= box->bottom || box->bottom > height - || box->front >= box->back || box->back > depth) + else if (box->left >= box->right || box->right > desc.width + || box->top >= box->bottom || box->bottom > desc.height + || box->front >= box->back || box->back > desc.depth) { WARN("Invalid box %s specified.\n", debug_box(box)); return; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 165d83eb035..5f02bcfed8f 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -3506,6 +3506,14 @@ static void texture_resource_unload(struct wined3d_resource *resource) resource_unload(&texture->resource); } +static HRESULT texture_resource_sub_resource_get_desc(struct wined3d_resource *resource, + unsigned int sub_resource_idx, struct wined3d_sub_resource_desc *desc) +{ + const struct wined3d_texture *texture = texture_from_resource(resource); + + return wined3d_texture_get_sub_resource_desc(texture, sub_resource_idx, desc); +} + static HRESULT texture_resource_sub_resource_map(struct wined3d_resource *resource, unsigned int sub_resource_idx, struct wined3d_map_desc *map_desc, const struct wined3d_box *box, DWORD flags) { @@ -3692,6 +3700,7 @@ static const struct wined3d_resource_ops texture_resource_ops = texture_resource_decref, texture_resource_preload, texture_resource_unload, + texture_resource_sub_resource_get_desc, texture_resource_sub_resource_map, texture_resource_sub_resource_unmap, }; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index da1cf638606..15b028a00f0 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4050,6 +4050,8 @@ struct wined3d_resource_ops ULONG (*resource_decref)(struct wined3d_resource *resource); void (*resource_preload)(struct wined3d_resource *resource); void (*resource_unload)(struct wined3d_resource *resource); + HRESULT (*resource_sub_resource_get_desc)(struct wined3d_resource *resource, + unsigned int sub_resource_idx, struct wined3d_sub_resource_desc *desc); HRESULT (*resource_sub_resource_map)(struct wined3d_resource *resource, unsigned int sub_resource_idx, struct wined3d_map_desc *map_desc, const struct wined3d_box *box, DWORD flags); HRESULT (*resource_sub_resource_unmap)(struct wined3d_resource *resource, unsigned int sub_resource_idx); @@ -4110,6 +4112,12 @@ static inline void wined3d_resource_release(struct wined3d_resource *resource) InterlockedDecrement(&resource->access_count); } +static inline HRESULT wined3d_resource_get_sub_resource_desc(struct wined3d_resource *resource, + unsigned int sub_resource_idx, struct wined3d_sub_resource_desc *desc) +{ + return resource->resource_ops->resource_sub_resource_get_desc(resource, sub_resource_idx, desc); +} + void resource_cleanup(struct wined3d_resource *resource) DECLSPEC_HIDDEN; HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device *device, enum wined3d_resource_type type, const struct wined3d_format *format, -- 2.30.2

2 5

[PATCH 5/5] wined3d: Use wined3d_mask_from_size() in find_draw_buffers_mask().
by Henri Verbeet 25 Jun '21

25 Jun '21

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context_gl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 742dc5f3042..474003d7553 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -3310,7 +3310,7 @@ static uint32_t find_draw_buffers_mask(const struct wined3d_context_gl *context_ return context_generate_rt_mask_from_resource(rts[0]->resource); rt_mask = ps ? ps->reg_maps.rt_mask : 1; - rt_mask &= (1u << gl_info->limits.buffers) - 1; + rt_mask &= wined3d_mask_from_size(gl_info->limits.buffers); if (state->blend_state && state->blend_state->dual_source) rt_mask = 1; -- 2.20.1

1 0

[PATCH 4/5] wined3d: Use wined3d_mask_from_size() in wined3d_context_gl_enable_clip_distances().
by Henri Verbeet 25 Jun '21

25 Jun '21

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context_gl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 43c086ac758..742dc5f3042 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -2396,8 +2396,8 @@ void wined3d_context_gl_enable_clip_distances(struct wined3d_context_gl *context clip_distance_count = gl_info->limits.user_clip_distances; disable_mask = ~enable_mask; - enable_mask &= (1u << clip_distance_count) - 1; - disable_mask &= (1u << clip_distance_count) - 1; + enable_mask &= wined3d_mask_from_size(clip_distance_count); + disable_mask &= wined3d_mask_from_size(clip_distance_count); current_mask = context_gl->c.clip_distance_mask; context_gl->c.clip_distance_mask = enable_mask; -- 2.20.1

1 0

[PATCH 3/5] wined3d: Use wined3d_mask_from_size() in glsl_blitter_blit().
by Henri Verbeet 25 Jun '21

25 Jun '21

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index ccfd5f3f28e..5d0e7b13bd4 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -13215,7 +13215,7 @@ static DWORD glsl_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bli const struct wined3d_format *f = src_texture->resource.format; alpha_test_key.color_space_low_value = 0; - alpha_test_key.color_space_high_value = ~(((1u << f->alpha_size) - 1) << f->alpha_offset); + alpha_test_key.color_space_high_value = ~(wined3d_mask_from_size(f->alpha_size) << f->alpha_offset); colour_key = &alpha_test_key; } else if (op != WINED3D_BLIT_OP_COLOR_BLIT_CKEY) -- 2.20.1

1 0

[PATCH 2/5] wined3d: Use wined3d_mask_from_size() in arbfp_blitter_blit().
by Henri Verbeet 25 Jun '21

25 Jun '21

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/arb_program_shader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index e297c724412..1b533107f64 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7922,7 +7922,7 @@ static DWORD arbfp_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bl { const struct wined3d_format *fmt = src_texture->resource.format; alpha_test_key.color_space_low_value = 0; - alpha_test_key.color_space_high_value = ~(((1u << fmt->alpha_size) - 1) << fmt->alpha_offset); + alpha_test_key.color_space_high_value = ~(wined3d_mask_from_size(fmt->alpha_size) << fmt->alpha_offset); color_key = &alpha_test_key; } -- 2.20.1

1 0

[PATCH 1/5] wined3d: Only invalidate valid state IDs in wined3d_cs_exec_reset_state().
by Henri Verbeet 25 Jun '21

25 Jun '21

Not every state ID between 0 and STATE_HIGHEST is valid; for example, there are holes in the renderstate IDs. While invalidating these works fine, attempting to subsequently apply them in e.g. context_apply_draw_state() ends up calling state_undefined() and printing an ERR. This is especially visible when running the d2d1 tests. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/cs.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 544b76534d0..492644e1f30 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -2214,15 +2214,21 @@ static void wined3d_cs_mt_push_constants(struct wined3d_device_context *context, static void wined3d_cs_exec_reset_state(struct wined3d_cs *cs, const void *data) { + const struct wined3d_device *device = cs->c.device; const struct wined3d_cs_reset_state *op = data; + const struct wined3d_state_entry *state_table; unsigned int state; state_cleanup(&cs->state); - wined3d_state_reset(&cs->state, &cs->c.device->adapter->d3d_info); + wined3d_state_reset(&cs->state, &device->adapter->d3d_info); if (op->invalidate) { + state_table = device->state_table; for (state = 0; state <= STATE_HIGHEST; ++state) - device_invalidate_state(cs->c.device, state); + { + if (state_table[state].representative) + device_invalidate_state(device, state); + } } } -- 2.20.1

1 0

[PATCH 1/3] reg/tests: Modify delete_tree() to support the use of registry views
by Hugh McMaster 25 Jun '21

25 Jun '21

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/reg/tests/add.c | 17 ++++++++++------- programs/reg/tests/copy.c | 36 +++++++++++++++++------------------ programs/reg/tests/delete.c | 4 ++-- programs/reg/tests/export.c | 8 ++++---- programs/reg/tests/import.c | 12 ++++++------ programs/reg/tests/query.c | 6 +++--- programs/reg/tests/reg_test.h | 2 +- 7 files changed, 44 insertions(+), 41 deletions(-) diff --git a/programs/reg/tests/add.c b/programs/reg/tests/add.c index 3b4a895d0c5..bb72c4a3737 100644 --- a/programs/reg/tests/add.c +++ b/programs/reg/tests/add.c @@ -154,7 +154,7 @@ void delete_key_(const char *file, unsigned line, HKEY root, const char *path, R } } -LONG delete_tree(const HKEY key, const char *subkey) +LONG delete_tree(HKEY root, const char *path, REGSAM sam) { HKEY hkey; LONG ret; @@ -162,7 +162,7 @@ LONG delete_tree(const HKEY key, const char *subkey) DWORD max_subkey_len, subkey_len; static const char empty[1]; - ret = RegOpenKeyExA(key, subkey, 0, KEY_READ, &hkey); + ret = RegOpenKeyExA(root, path, 0, KEY_READ|sam, &hkey); if (ret) return ret; ret = RegQueryInfoKeyA(hkey, NULL, NULL, NULL, NULL, &max_subkey_len, @@ -184,11 +184,14 @@ LONG delete_tree(const HKEY key, const char *subkey) ret = RegEnumKeyExA(hkey, 0, subkey_name, &subkey_len, NULL, NULL, NULL, NULL); if (ret == ERROR_NO_MORE_ITEMS) break; if (ret) goto cleanup; - ret = delete_tree(hkey, subkey_name); + ret = delete_tree(hkey, subkey_name, sam); if (ret) goto cleanup; } - ret = RegDeleteKeyA(hkey, empty); + if (!sam) + ret = RegDeleteKeyA(hkey, empty); + else + ret = RegDeleteKeyExA(hkey, empty, sam, 0); cleanup: HeapFree(GetProcessHeap(), 0, subkey_name); @@ -219,7 +222,7 @@ static void test_command_syntax(void) { DWORD r; - delete_tree(HKEY_CURRENT_USER, KEY_BASE); + delete_tree(HKEY_CURRENT_USER, KEY_BASE, 0); verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE, 0); run_reg_exe("reg add", &r); @@ -322,7 +325,7 @@ static void test_key_formats(void) verify_key(hkey, "https://winehq.org", 0); close_key(hkey); - delete_tree(HKEY_CURRENT_USER, KEY_BASE); + delete_tree(HKEY_CURRENT_USER, KEY_BASE, 0); /* Test validity of trailing backslash after system key */ run_reg_exe("reg add HKCU\\ /v Value1 /t REG_SZ /d foo /f", &r); @@ -409,7 +412,7 @@ static void test_add(void) verify_reg(hkey, NULL, REG_NONE, "T\0e\0s\0t\0\0", 10, 0); close_key(hkey); - delete_tree(HKEY_CURRENT_USER, KEY_BASE); + delete_tree(HKEY_CURRENT_USER, KEY_BASE, 0); } static void test_reg_none(void) diff --git a/programs/reg/tests/copy.c b/programs/reg/tests/copy.c index 2b461c17f5e..c6a83e57276 100644 --- a/programs/reg/tests/copy.c +++ b/programs/reg/tests/copy.c @@ -126,10 +126,10 @@ static void test_copy_empty_key(void) { DWORD r; - delete_tree(HKEY_CURRENT_USER, COPY_SRC); + delete_tree(HKEY_CURRENT_USER, COPY_SRC, 0); verify_key_nonexist(HKEY_CURRENT_USER, COPY_SRC, 0); - delete_tree(HKEY_CURRENT_USER, KEY_BASE); + delete_tree(HKEY_CURRENT_USER, KEY_BASE, 0); verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE, 0); add_key(HKEY_CURRENT_USER, COPY_SRC, 0, NULL); @@ -191,10 +191,10 @@ static void test_copy_simple_data(void) HKEY hkey; DWORD r, dword; - delete_tree(HKEY_CURRENT_USER, COPY_SRC); + delete_tree(HKEY_CURRENT_USER, COPY_SRC, 0); verify_key_nonexist(HKEY_CURRENT_USER, COPY_SRC, 0); - delete_tree(HKEY_CURRENT_USER, KEY_BASE); + delete_tree(HKEY_CURRENT_USER, KEY_BASE, 0); verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE, 0); add_key(HKEY_CURRENT_USER, COPY_SRC, 0, &hkey); @@ -261,10 +261,10 @@ static void test_copy_complex_data(void) HKEY hkey, subkey; DWORD r, dword; - delete_tree(HKEY_CURRENT_USER, COPY_SRC); + delete_tree(HKEY_CURRENT_USER, COPY_SRC, 0); verify_key_nonexist(HKEY_CURRENT_USER, COPY_SRC, 0); - delete_tree(HKEY_CURRENT_USER, KEY_BASE); + delete_tree(HKEY_CURRENT_USER, KEY_BASE, 0); verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE, 0); add_key(HKEY_CURRENT_USER, COPY_SRC, 0, &hkey); @@ -330,10 +330,10 @@ static void test_copy_key_order(void) HKEY hkey; DWORD r; - delete_tree(HKEY_CURRENT_USER, COPY_SRC); + delete_tree(HKEY_CURRENT_USER, COPY_SRC, 0); verify_key_nonexist(HKEY_CURRENT_USER, COPY_SRC, 0); - delete_tree(HKEY_CURRENT_USER, KEY_BASE); + delete_tree(HKEY_CURRENT_USER, KEY_BASE, 0); verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE, 0); add_key(HKEY_CURRENT_USER, COPY_SRC, 0, &hkey); @@ -355,10 +355,10 @@ static void test_copy_value_order(void) HKEY hkey; DWORD r; - delete_tree(HKEY_CURRENT_USER, COPY_SRC); + delete_tree(HKEY_CURRENT_USER, COPY_SRC, 0); verify_key_nonexist(HKEY_CURRENT_USER, COPY_SRC, 0); - delete_tree(HKEY_CURRENT_USER, KEY_BASE); + delete_tree(HKEY_CURRENT_USER, KEY_BASE, 0); verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE, 0); add_key(HKEY_CURRENT_USER, COPY_SRC, 0, &hkey); @@ -380,10 +380,10 @@ static void test_copy_hex_data(void) HKEY hkey; DWORD r; - delete_tree(HKEY_CURRENT_USER, COPY_SRC); + delete_tree(HKEY_CURRENT_USER, COPY_SRC, 0); verify_key_nonexist(HKEY_CURRENT_USER, COPY_SRC, 0); - delete_tree(HKEY_CURRENT_USER, KEY_BASE); + delete_tree(HKEY_CURRENT_USER, KEY_BASE, 0); verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE, 0); /* Try copying empty hex values */ @@ -449,10 +449,10 @@ static void test_copy_embedded_null_values(void) { DWORD r; - delete_tree(HKEY_CURRENT_USER, COPY_SRC); + delete_tree(HKEY_CURRENT_USER, COPY_SRC, 0); verify_key_nonexist(HKEY_CURRENT_USER, COPY_SRC, 0); - delete_tree(HKEY_CURRENT_USER, KEY_BASE); + delete_tree(HKEY_CURRENT_USER, KEY_BASE, 0); verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE, 0); test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" @@ -482,10 +482,10 @@ static void test_copy_slashes(void) HKEY hkey; DWORD r; - delete_tree(HKEY_CURRENT_USER, COPY_SRC); + delete_tree(HKEY_CURRENT_USER, COPY_SRC, 0); verify_key_nonexist(HKEY_CURRENT_USER, COPY_SRC, 0); - delete_tree(HKEY_CURRENT_USER, KEY_BASE); + delete_tree(HKEY_CURRENT_USER, KEY_BASE, 0); verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE, 0); add_key(HKEY_CURRENT_USER, COPY_SRC, 0, &hkey); @@ -508,10 +508,10 @@ static void test_copy_escaped_null_values(void) HKEY hkey; DWORD r; - delete_tree(HKEY_CURRENT_USER, COPY_SRC); + delete_tree(HKEY_CURRENT_USER, COPY_SRC, 0); verify_key_nonexist(HKEY_CURRENT_USER, COPY_SRC, 0); - delete_tree(HKEY_CURRENT_USER, KEY_BASE); + delete_tree(HKEY_CURRENT_USER, KEY_BASE, 0); verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE, 0); add_key(HKEY_CURRENT_USER, COPY_SRC, 0, &hkey); diff --git a/programs/reg/tests/delete.c b/programs/reg/tests/delete.c index 251a15f3371..e40c0256925 100644 --- a/programs/reg/tests/delete.c +++ b/programs/reg/tests/delete.c @@ -23,7 +23,7 @@ static void test_command_syntax(void) { DWORD r; - delete_tree(HKEY_CURRENT_USER, KEY_BASE); + delete_tree(HKEY_CURRENT_USER, KEY_BASE, 0); verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE, 0); run_reg_exe("reg delete", &r); @@ -74,7 +74,7 @@ static void test_delete(void) DWORD r; const DWORD deadbeef = 0xdeadbeef; - delete_tree(HKEY_CURRENT_USER, KEY_BASE); + delete_tree(HKEY_CURRENT_USER, KEY_BASE, 0); verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE, 0); /* Create a test key */ diff --git a/programs/reg/tests/export.c b/programs/reg/tests/export.c index df44baddb30..0f48443384e 100644 --- a/programs/reg/tests/export.c +++ b/programs/reg/tests/export.c @@ -176,7 +176,7 @@ static void test_export(void) HKEY hkey, subkey; BYTE hex[4], buffer[8]; - delete_tree(HKEY_CURRENT_USER, KEY_BASE); + delete_tree(HKEY_CURRENT_USER, KEY_BASE, 0); verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE, 0); run_reg_exe("reg export", &r); @@ -287,7 +287,7 @@ static void test_export(void) run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg /y", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); ok(compare_export("file.reg", complex_data_test, 0), "compare_export() failed\n"); - delete_tree(HKEY_CURRENT_USER, KEY_BASE); + delete_tree(HKEY_CURRENT_USER, KEY_BASE, 0); /* Test the export order of registry keys */ add_key(HKEY_CURRENT_USER, KEY_BASE, 0, &hkey); @@ -413,7 +413,7 @@ static void test_export(void) run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg /y", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); ok(compare_export("file.reg", slashes_test, TODO_REG_COMPARE), "compare_export() failed\n"); - delete_tree(HKEY_CURRENT_USER, KEY_BASE); + delete_tree(HKEY_CURRENT_USER, KEY_BASE, 0); /* Test escaped null characters */ add_key(HKEY_CURRENT_USER, KEY_BASE, 0, &hkey); @@ -428,7 +428,7 @@ static void test_export(void) run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg /y", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); ok(compare_export("file.reg", escaped_null_test, 0), "compare_export() failed\n"); - delete_tree(HKEY_CURRENT_USER, KEY_BASE); + delete_tree(HKEY_CURRENT_USER, KEY_BASE, 0); } START_TEST(export) diff --git a/programs/reg/tests/import.c b/programs/reg/tests/import.c index 2d8ece8990b..2531ba336e8 100644 --- a/programs/reg/tests/import.c +++ b/programs/reg/tests/import.c @@ -101,7 +101,7 @@ static void test_import(void) LONG err; BYTE hex[8]; - delete_tree(HKEY_CURRENT_USER, KEY_BASE); + delete_tree(HKEY_CURRENT_USER, KEY_BASE, 0); verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE, 0); run_reg_exe("reg import", &r); @@ -1643,7 +1643,7 @@ static void test_import(void) close_key(hkey); - delete_tree(HKEY_CURRENT_USER, KEY_BASE); + delete_tree(HKEY_CURRENT_USER, KEY_BASE, 0); } static void test_unicode_import(void) @@ -1654,7 +1654,7 @@ static void test_unicode_import(void) char buffer[24]; BYTE hex[8]; - delete_tree(HKEY_CURRENT_USER, KEY_BASE); + delete_tree(HKEY_CURRENT_USER, KEY_BASE, 0); verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE, 0); test_import_wstr("REGEDIT\n", &r); @@ -3192,7 +3192,7 @@ static void test_unicode_import(void) close_key(hkey); - delete_tree(HKEY_CURRENT_USER, KEY_BASE); + delete_tree(HKEY_CURRENT_USER, KEY_BASE, 0); } static void test_import_with_whitespace(void) @@ -3200,7 +3200,7 @@ static void test_import_with_whitespace(void) HKEY hkey; DWORD r, dword; - delete_tree(HKEY_CURRENT_USER, KEY_BASE); + delete_tree(HKEY_CURRENT_USER, KEY_BASE, 0); verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE, 0); test_import_str(" REGEDIT4\n\n" @@ -3346,7 +3346,7 @@ static void test_unicode_import_with_whitespace(void) HKEY hkey; DWORD r, dword; - delete_tree(HKEY_CURRENT_USER, KEY_BASE); + delete_tree(HKEY_CURRENT_USER, KEY_BASE, 0); verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE, 0); test_import_wstr("\xef\xbb\xbf Windows Registry Editor Version 5.00\n\n" diff --git a/programs/reg/tests/query.c b/programs/reg/tests/query.c index 3e8b134363b..270f0aad75d 100644 --- a/programs/reg/tests/query.c +++ b/programs/reg/tests/query.c @@ -164,7 +164,7 @@ static void test_query(void) HKEY hkey, subkey; BYTE buf[512]; - delete_tree(HKEY_CURRENT_USER, KEY_BASE); + delete_tree(HKEY_CURRENT_USER, KEY_BASE, 0); verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE, 0); run_reg_exe("reg query", &r); @@ -270,7 +270,7 @@ static void test_query(void) ok(r == REG_EXIT_SUCCESS || r == REG_EXIT_FAILURE /* WinXP */, "got exit code %d, expected 0\n", r); - delete_tree(HKEY_CURRENT_USER, KEY_BASE); + delete_tree(HKEY_CURRENT_USER, KEY_BASE, 0); /* Subkeys only */ add_key(HKEY_CURRENT_USER, KEY_BASE, 0, &hkey); @@ -288,7 +288,7 @@ static void test_query(void) ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); compare_query(buf, test8b, FALSE, 0); - delete_tree(HKEY_CURRENT_USER, KEY_BASE); + delete_tree(HKEY_CURRENT_USER, KEY_BASE, 0); } START_TEST(query) diff --git a/programs/reg/tests/reg_test.h b/programs/reg/tests/reg_test.h index fdc747af1e9..a5d7169beb4 100644 --- a/programs/reg/tests/reg_test.h +++ b/programs/reg/tests/reg_test.h @@ -64,7 +64,7 @@ void add_key_(const char *file, unsigned line, const HKEY root, const char *path #define delete_key(r,p,s) delete_key_(__FILE__,__LINE__,r,p,s) void delete_key_(const char *file, unsigned line, HKEY root, const char *path, REGSAM sam); -LONG delete_tree(const HKEY key, const char *subkey); +LONG delete_tree(HKEY root, const char *path, REGSAM sam); #define add_value(k,n,t,d,s) add_value_(__FILE__,__LINE__,k,n,t,d,s) void add_value_(const char *file, unsigned line, HKEY hkey, const char *name, -- 2.32.0

1 2

[PATCH] kernelbase: Don't pass on StdHandles if they are never to be inherited
by Brendan McGrath 25 Jun '21

25 Jun '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51262 Signed-off-by: Brendan McGrath <brendan(a)redmandi.com> --- dlls/kernelbase/process.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/kernelbase/process.c b/dlls/kernelbase/process.c index e3bd5feb296c..2833e76138bf 100644 --- a/dlls/kernelbase/process.c +++ b/dlls/kernelbase/process.c @@ -141,8 +141,8 @@ static WCHAR *get_file_name( WCHAR *cmdline, WCHAR *buffer, DWORD buflen ) * create_process_params */ static RTL_USER_PROCESS_PARAMETERS *create_process_params( const WCHAR *filename, const WCHAR *cmdline, - const WCHAR *cur_dir, void *env, DWORD flags, - const STARTUPINFOW *startup ) + const WCHAR *cur_dir, void *env, BOOL inherit, + DWORD flags, const STARTUPINFOW *startup ) { RTL_USER_PROCESS_PARAMETERS *params; UNICODE_STRING imageW, curdirW, cmdlineW, titleW, desktopW, runtimeW, newdirW; @@ -199,7 +199,7 @@ static RTL_USER_PROCESS_PARAMETERS *create_process_params( const WCHAR *filename params->hStdOutput = startup->hStdOutput; params->hStdError = startup->hStdError; } - else if (flags & DETACHED_PROCESS) + else if (flags & DETACHED_PROCESS || ((flags & CREATE_NEW_CONSOLE) && !inherit) ) { params->hStdInput = INVALID_HANDLE_VALUE; params->hStdOutput = INVALID_HANDLE_VALUE; @@ -545,7 +545,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH CreateProcessInternalW( HANDLE token, const WCHAR info->hThread = info->hProcess = 0; info->dwProcessId = info->dwThreadId = 0; - if (!(params = create_process_params( app_name, tidy_cmdline, cur_dir, env, flags, startup_info ))) + if (!(params = create_process_params( app_name, tidy_cmdline, cur_dir, env, inherit, flags, startup_info ))) { status = STATUS_NO_MEMORY; goto done; -- 2.25.1

2 8

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