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

Henri Verbeet : wined3d: Only invalidate valid state IDs in wined3d_cs_exec_reset_state().
by Alexandre Julliard 25 Jun '21

25 Jun '21

Module: wine Branch: master Commit: 0170bb0e548d33e4fa014b73cd2c75ce7ea0dc82 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0170bb0e548d33e4fa014b73… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 25 15:01:28 2021 +0200 wined3d: Only invalidate valid state IDs in wined3d_cs_exec_reset_state(). 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> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 ad393c203c4..4adfa18f5f7 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); + } } }

1 0

Henri Verbeet : wined3d: Use wined3d_mask_from_size() in arbfp_blitter_blit().
by Alexandre Julliard 25 Jun '21

25 Jun '21

Module: wine Branch: master Commit: 260b11a193b3f7b69722369ca26d2f7268c1f2c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=260b11a193b3f7b69722369c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 25 15:01:29 2021 +0200 wined3d: Use wined3d_mask_from_size() in arbfp_blitter_blit(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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; }

1 0

Henri Verbeet : wined3d: Use wined3d_mask_from_size() in glsl_blitter_blit().
by Alexandre Julliard 25 Jun '21

25 Jun '21

Module: wine Branch: master Commit: d5fa539749213fbc43f596ef483617c9084c854f URL: https://source.winehq.org/git/wine.git/?a=commit;h=d5fa539749213fbc43f596ef… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 25 15:01:30 2021 +0200 wined3d: Use wined3d_mask_from_size() in glsl_blitter_blit(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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)

1 0

Henri Verbeet : wined3d: Use wined3d_mask_from_size() in wined3d_context_gl_enable_clip_distances().
by Alexandre Julliard 25 Jun '21

25 Jun '21

Module: wine Branch: master Commit: 0fd45ba2be3e971db16d7201a9ae1bb62ab7cee8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0fd45ba2be3e971db16d7201… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 25 15:01:31 2021 +0200 wined3d: Use wined3d_mask_from_size() in wined3d_context_gl_enable_clip_distances(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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;

1 0

Henri Verbeet : wined3d: Use wined3d_mask_from_size() in find_draw_buffers_mask().
by Alexandre Julliard 25 Jun '21

25 Jun '21

Module: wine Branch: master Commit: 64ab905758e74f4214d27b85437fa1032472b7aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=64ab905758e74f4214d27b85… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 25 15:01:32 2021 +0200 wined3d: Use wined3d_mask_from_size() in find_draw_buffers_mask(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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;

1 0

Huw Davies : include: Add netiodef.h.
by Alexandre Julliard 25 Jun '21

25 Jun '21

Module: wine Branch: master Commit: bfdf115cd6d17059fc1102ca5dce6ca9e8942910 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bfdf115cd6d17059fc1102ca… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jun 25 10:22:41 2021 +0100 include: Add netiodef.h. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/netiodef.h | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 5b84d7858ff..4a8c261bb8f 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -524,6 +524,7 @@ SOURCES = \ netcon.idl \ netfw.idl \ netioapi.h \ + netiodef.h \ netlistmgr.idl \ newdev.h \ nldef.h \ diff --git a/include/netiodef.h b/include/netiodef.h new file mode 100644 index 00000000000..611359c49f8 --- /dev/null +++ b/include/netiodef.h @@ -0,0 +1,60 @@ +/* + * Copyright 2021 Huw Davies + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_NETIODEF_H +#define __WINE_NETIODEF_H + +typedef enum _NPI_MODULEID_TYPE +{ + MIT_GUID = 1, + MIT_IF_LUID +} NPI_MODULEID_TYPE; + +typedef struct _NPI_MODULEID +{ + USHORT Length; + NPI_MODULEID_TYPE Type; + union + { + GUID Guid; + LUID IfLuid; + }; +} NPI_MODULEID; + +typedef const NPI_MODULEID *PNPI_MODULEID; + +static inline BOOLEAN NmrIsEqualNpiModuleId( const NPI_MODULEID *mod1, const NPI_MODULEID *mod2 ) +{ + if (mod1->Type == mod2->Type) + { + if (mod1->Type == MIT_GUID) + { +#ifdef __cplusplus + return IsEqualGUID( mod1->Guid, mod2->Guid ); +#else + return IsEqualGUID( &mod1->Guid, &mod2->Guid ); +#endif + } + else if (mod1->Type == MIT_IF_LUID) + return mod1->IfLuid.HighPart == mod2->IfLuid.HighPart && + mod1->IfLuid.LowPart == mod2->IfLuid.LowPart; + } + return FALSE; +} + +#endif /* __WINE_NETIODEF_H */

1 0

Zhiyi Zhang : light.msstyles: Add Scroll Bar parts.
by Alexandre Julliard 25 Jun '21

25 Jun '21

Module: wine Branch: master Commit: 2bb0680b6897e37688ecb536f1870f6db9ed64ee URL: https://source.winehq.org/git/wine.git/?a=commit;h=2bb0680b6897e37688ecb536… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Jun 25 09:57:45 2021 +0800 light.msstyles: Add Scroll Bar parts. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/light.msstyles/Makefile.in | 10 +- .../blue_scrollbar_arrow_glyphs_7px.bmp | Bin 0 -> 3274 bytes .../blue_scrollbar_arrow_glyphs_7px.svg | 54 +++++++++++ .../blue_scrollbar_arrow_glyphs_9px.bmp | Bin 0 -> 5322 bytes .../blue_scrollbar_arrow_glyphs_9px.svg | 54 +++++++++++ dlls/light.msstyles/blue_scrollbar_arrows.bmp | Bin 0 -> 14282 bytes dlls/light.msstyles/blue_scrollbar_arrows.svg | 37 ++++++++ .../blue_scrollbar_resizebox_grip.bmp | Bin 0 -> 2314 bytes .../blue_scrollbar_resizebox_grip.svg | 26 ++++++ .../blue_scrollbar_shaft_horizontal.bmp | Bin 0 -> 394 bytes .../blue_scrollbar_shaft_horizontal.svg | 13 +++ .../blue_scrollbar_shaft_vertical.bmp | Bin 0 -> 490 bytes .../blue_scrollbar_shaft_vertical.svg | 13 +++ .../blue_scrollbar_thumb_horizontal.bmp | Bin 0 -> 4762 bytes .../blue_scrollbar_thumb_horizontal.svg | 19 ++++ .../blue_scrollbar_thumb_vertical.bmp | Bin 0 -> 4714 bytes .../blue_scrollbar_thumb_vertical.svg | 19 ++++ dlls/light.msstyles/light.rc | 101 +++++++++++++++++++++ 18 files changed, 345 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2bb0680b6897e37688ec…

1 0

Zhiyi Zhang : light.msstyles: Add Spin parts.
by Alexandre Julliard 25 Jun '21

25 Jun '21

Module: wine Branch: master Commit: 4801f7b29f932d86acdbc4867f4fc8460882ac8b URL: https://source.winehq.org/git/wine.git/?a=commit;h=4801f7b29f932d86acdbc486… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Jun 25 09:57:59 2021 +0800 light.msstyles: Add Spin parts. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/light.msstyles/Makefile.in | 11 ++- dlls/light.msstyles/blue_spin_background.bmp | Bin 0 -> 446 bytes dlls/light.msstyles/blue_spin_background.svg | 16 ++++ dlls/light.msstyles/blue_spin_background_down.bmp | Bin 0 -> 1674 bytes dlls/light.msstyles/blue_spin_background_down.svg | 19 +++++ dlls/light.msstyles/blue_spin_background_left.bmp | Bin 0 -> 1674 bytes dlls/light.msstyles/blue_spin_background_left.svg | 19 +++++ dlls/light.msstyles/blue_spin_background_right.bmp | Bin 0 -> 1674 bytes dlls/light.msstyles/blue_spin_background_right.svg | 19 +++++ dlls/light.msstyles/blue_spin_background_up.bmp | Bin 0 -> 1674 bytes dlls/light.msstyles/blue_spin_background_up.svg | 19 +++++ dlls/light.msstyles/blue_spin_glyph_down.bmp | Bin 0 -> 810 bytes dlls/light.msstyles/blue_spin_glyph_down.svg | 24 ++++++ dlls/light.msstyles/blue_spin_glyph_left.bmp | Bin 0 -> 810 bytes dlls/light.msstyles/blue_spin_glyph_left.svg | 24 ++++++ dlls/light.msstyles/blue_spin_glyph_right.bmp | Bin 0 -> 810 bytes dlls/light.msstyles/blue_spin_glyph_right.svg | 24 ++++++ dlls/light.msstyles/blue_spin_glyph_up.bmp | Bin 0 -> 810 bytes dlls/light.msstyles/blue_spin_glyph_up.svg | 24 ++++++ dlls/light.msstyles/light.rc | 84 +++++++++++++++++++++ 20 files changed, 282 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4801f7b29f932d86acdb…

1 0

Zhiyi Zhang : light.msstyles: Add Toolbar parts.
by Alexandre Julliard 25 Jun '21

25 Jun '21

Module: wine Branch: master Commit: 28a08e90cbc28a6c169b7975b1b369f5ecedc6b9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=28a08e90cbc28a6c169b7975… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Jun 25 09:58:15 2021 +0800 light.msstyles: Add Toolbar parts. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/light.msstyles/Makefile.in | 8 +- dlls/light.msstyles/blue_toolbar_buttons.bmp | Bin 0 -> 4890 bytes dlls/light.msstyles/blue_toolbar_buttons.svg | 20 +++++ dlls/light.msstyles/blue_toolbar_buttons_split.bmp | Bin 0 -> 3306 bytes dlls/light.msstyles/blue_toolbar_buttons_split.svg | 18 +++++ .../blue_toolbar_buttons_split_dropdown.bmp | Bin 0 -> 2778 bytes .../blue_toolbar_buttons_split_dropdown.svg | 18 +++++ .../blue_toolbar_buttons_split_dropdown_glyph.bmp | Bin 0 -> 2298 bytes .../blue_toolbar_buttons_split_dropdown_glyph.svg | 28 +++++++ .../blue_toolbar_separator_horizontal.bmp | Bin 0 -> 298 bytes .../blue_toolbar_separator_horizontal.svg | 13 ++++ .../blue_toolbar_separator_vertical.bmp | Bin 0 -> 298 bytes .../blue_toolbar_separator_vertical.svg | 13 ++++ dlls/light.msstyles/light.rc | 86 +++++++++++++++++++++ 14 files changed, 203 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=28a08e90cbc28a6c169b…

1 0

Zhiyi Zhang : light.msstyles: Add Rebar parts.
by Alexandre Julliard 25 Jun '21

25 Jun '21

Module: wine Branch: master Commit: 37e85d3a238b9a38e5409f241bc711b1d056c988 URL: https://source.winehq.org/git/wine.git/?a=commit;h=37e85d3a238b9a38e5409f24… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Jun 25 09:58:30 2021 +0800 light.msstyles: Add Rebar parts. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/light.msstyles/Makefile.in | 4 ++ dlls/light.msstyles/blue_rebar_background.bmp | Bin 0 -> 438 bytes dlls/light.msstyles/blue_rebar_background.svg | 13 ++++ dlls/light.msstyles/blue_rebar_chevron.bmp | Bin 0 -> 2298 bytes dlls/light.msstyles/blue_rebar_chevron.svg | 28 ++++++++ .../blue_rebar_gripper_horizontal.bmp | Bin 0 -> 378 bytes .../blue_rebar_gripper_horizontal.svg | 16 +++++ .../light.msstyles/blue_rebar_gripper_vertical.bmp | Bin 0 -> 378 bytes .../light.msstyles/blue_rebar_gripper_vertical.svg | 14 ++++ dlls/light.msstyles/light.rc | 72 +++++++++++++++++++++ 10 files changed, 147 insertions(+) diff --git a/dlls/light.msstyles/Makefile.in b/dlls/light.msstyles/Makefile.in index 39690b35995..9ed4d4094e4 100644 --- a/dlls/light.msstyles/Makefile.in +++ b/dlls/light.msstyles/Makefile.in @@ -16,6 +16,10 @@ SVG_SRCS = \ blue_radiobutton_13px.svg \ blue_radiobutton_16px.svg \ blue_radiobutton_25px.svg \ + blue_rebar_background.svg \ + blue_rebar_chevron.svg \ + blue_rebar_gripper_horizontal.svg \ + blue_rebar_gripper_vertical.svg \ blue_scrollbar_arrow_glyphs_7px.svg \ blue_scrollbar_arrow_glyphs_9px.svg \ blue_scrollbar_arrows.svg \ diff --git a/dlls/light.msstyles/blue_rebar_background.bmp b/dlls/light.msstyles/blue_rebar_background.bmp new file mode 100644 index 00000000000..18a85f93f19 Binary files /dev/null and b/dlls/light.msstyles/blue_rebar_background.bmp differ diff --git a/dlls/light.msstyles/blue_rebar_background.svg b/dlls/light.msstyles/blue_rebar_background.svg new file mode 100644 index 00000000000..aca531e8bb4 --- /dev/null +++ b/dlls/light.msstyles/blue_rebar_background.svg @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:3-24" width="3" height="25" version="1.1" viewBox="0 0 .79375 6.6146" 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-6" y="-5.5511e-17" width=".79375" height="6.6146" fill="#fff" stroke-width=".26458"/> +</svg> diff --git a/dlls/light.msstyles/blue_rebar_chevron.bmp b/dlls/light.msstyles/blue_rebar_chevron.bmp new file mode 100644 index 00000000000..4b581c5ed1d Binary files /dev/null and b/dlls/light.msstyles/blue_rebar_chevron.bmp differ diff --git a/dlls/light.msstyles/blue_rebar_chevron.svg b/dlls/light.msstyles/blue_rebar_chevron.svg new file mode 100644 index 00000000000..a6e1b707c47 --- /dev/null +++ b/dlls/light.msstyles/blue_rebar_chevron.svg @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:10-32" width="10" height="54" version="1.1" viewBox="0 0 2.6458 14.288" 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.9855 1.5795-0.91792-0.91901 0.13113-0.13129 0.91792 0.91901z" fill="#aeaeae"/> + <path d="m2.1074 1.4622-0.91792 0.91901-0.13113-0.13129 0.91792-0.91901z" fill="#aeaeae"/> + <path d="m1.9855 3.9607-0.91792-0.91901 0.13113-0.13129 0.91792 0.91901z" fill="#3096fa"/> + <path d="m2.1074 3.8435-0.91792 0.91901-0.13113-0.13129 0.91792-0.91901z" fill="#3096fa"/> + <path d="m1.9294 6.8751 7.757e-4 -1.3187 0.18651-1.14e-4 -7.75e-4 1.3187z" fill="#2979ff"/> + <path d="m2.0993 6.8784-1.3055 7.821e-4 1.1418e-4 -0.18839 1.3055-7.827e-4z" fill="#2979ff"/> + <g fill="#aeaeae"> + <path d="m1.9855 8.7232-0.91792-0.91901 0.13113-0.13129 0.91792 0.91901z"/> + <path d="m2.1074 8.606-0.91792 0.91901-0.13113-0.13129 0.91792-0.91901z"/> + <path d="m1.9855 11.104-0.91792-0.91901 0.13113-0.13129 0.91792 0.91901z"/> + <path d="m2.1074 10.987-0.91792 0.91901-0.13113-0.13129 0.91792-0.91901z"/> + <path d="m1.9855 13.486-0.91792-0.91901 0.13113-0.13129 0.91792 0.91901z"/> + <path d="m2.1074 13.368-0.91792 0.91901-0.13113-0.13129 0.91792-0.91901z"/> + </g> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_rebar_gripper_horizontal.bmp b/dlls/light.msstyles/blue_rebar_gripper_horizontal.bmp new file mode 100644 index 00000000000..3dca037e702 Binary files /dev/null and b/dlls/light.msstyles/blue_rebar_gripper_horizontal.bmp differ diff --git a/dlls/light.msstyles/blue_rebar_gripper_horizontal.svg b/dlls/light.msstyles/blue_rebar_gripper_horizontal.svg new file mode 100644 index 00000000000..faaa3d41ba4 --- /dev/null +++ b/dlls/light.msstyles/blue_rebar_gripper_horizontal.svg @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:6-32" width="6" height="10" version="1.1" viewBox="0 0 1.5875 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> + <g stroke-width=".26458"> + <path d="m0.52917 0.52917h0.26458v1.5875h-0.26458z" fill="#aeaeae"/> + <path d="m0.79375 0.52917h0.26458v1.5875h-0.26458z" fill="#fff"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_rebar_gripper_vertical.bmp b/dlls/light.msstyles/blue_rebar_gripper_vertical.bmp new file mode 100644 index 00000000000..4b1e85479a1 Binary files /dev/null and b/dlls/light.msstyles/blue_rebar_gripper_vertical.bmp differ diff --git a/dlls/light.msstyles/blue_rebar_gripper_vertical.svg b/dlls/light.msstyles/blue_rebar_gripper_vertical.svg new file mode 100644 index 00000000000..0a1249e8883 --- /dev/null +++ b/dlls/light.msstyles/blue_rebar_gripper_vertical.svg @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:10-32" width="10" height="6" version="1.1" viewBox="0 0 2.6458 1.5875" 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> + <path d="m1.3229 0.79375h0.52917v0.52917h-0.52917z" fill="#aeaeae" stroke-width=".26458"/> + <path d="m1.0583 0.52917h0.52917v0.52917h-0.52917z" fill="#2d2d2d" stroke-width=".26458"/> +</svg> diff --git a/dlls/light.msstyles/light.rc b/dlls/light.msstyles/light.rc index c24df6ca17f..c96b4dcf30f 100644 --- a/dlls/light.msstyles/light.rc +++ b/dlls/light.msstyles/light.rc @@ -341,6 +341,65 @@ BLUE_INI TEXTFILE "FillColor = 255 255 255\r\n" "BorderColor = 174 174 174\r\n" +"\r\n; Rebar\r\n" +"[Rebar]\r\n" +"BgType = ImageFile\r\n" +"SizingType = Stretch\r\n" +"ImageFile = blue_rebar_background.bmp\r\n" +"SizingMargins = 1, 1, 9, 2\r\n" +"Font = Tahoma, 8\r\n" +"TextColor = 0 0 0\r\n" + +"[Rebar.Band]\r\n" +"BgType = None\r\n" +"ContentMargins = 2, 0, 0, 0\r\n" + +"[Rebar.Gripper]\r\n" +"Bgtype = imagefile\r\n" +"SizingMargins = 2, 1, 4, 2\r\n" +"ContentMargins = 2, 1, 0, 0\r\n" +"ImageFile = blue_rebar_gripper_horizontal.bmp\r\n" +"SizingType = Tile\r\n" +"Transparent = True\r\n" + +"[Rebar.GripperVert]\r\n" +"Bgtype = ImageFile\r\n" +"SizingMargins = 3, 3, 2, 1\r\n" +"ContentMargins = 1, 2, 0, 0\r\n" +"ImageFile = blue_rebar_gripper_vertical.bmp\r\n" +"SizingType = Tile\r\n" +"Transparent = True\r\n" + +"[Rebar.Chevron]\r\n" +"SizingMargins = 4, 4, 4, 4\r\n" +"ContentMargins = 0, 0, 0, 0\r\n" +"; Same as toolbar buttons \r\n" +"ImageFile = blue_toolbar_buttons.bmp\r\n" +"Bgtype = ImageFile\r\n" +"Imagelayout = Vertical\r\n" +"ImageCount = 6\r\n" +"SizingType = Stretch\r\n" +"Transparent = True\r\n" +"GlyphType = ImageGlyph\r\n" +"GlyphImageFile = blue_rebar_chevron.bmp\r\n" +"GlyphTransparent = True\r\n" +"VAlign = Top\r\n" + +"[Rebar.ChevronVert]\r\n" +"SizingMargins = 4, 4, 4, 4\r\n" +"ContentMargins = 0, 0, 0, 0\r\n" +"; Same as toolbar buttons \r\n" +"ImageFile = blue_toolbar_buttons.bmp\r\n" +"Bgtype = ImageFile\r\n" +"Imagelayout = Vertical\r\n" +"ImageCount = 6\r\n" +"SizingType = Stretch\r\n" +"Transparent = True\r\n" +"GlyphType = ImageGlyph\r\n" +"GlyphImageFile = blue_rebar_chevron.bmp\r\n" +"GlyphTransparent = True\r\n" +"VAlign = Top\r\n" + "\r\n; Scroll Bar\r\n" "[ScrollBar.ArrowBtn]\r\n" "BgType = ImageFile\r\n" @@ -582,6 +641,19 @@ BLUE_COMBOBUTTON_BMP BITMAP "blue_combobutton.bmp" /* @makedep: blue_combobutton_glyph.bmp */ BLUE_COMBOBUTTON_GLYPH_BMP BITMAP "blue_combobutton_glyph.bmp" +/* Rebar */ +/* @makedep: blue_rebar_background.bmp */ +BLUE_REBAR_BACKGROUND_BMP BITMAP "blue_rebar_background.bmp" + +/* @makedep: blue_rebar_gripper_horizontal.bmp */ +BLUE_REBAR_GRIPPER_HORIZONTAL_BMP BITMAP "blue_rebar_gripper_horizontal.bmp" + +/* @makedep: blue_rebar_gripper_vertical.bmp */ +BLUE_REBAR_GRIPPER_VERTICAL_BMP BITMAP "blue_rebar_gripper_vertical.bmp" + +/* @makedep: blue_rebar_chevron.bmp */ +BLUE_REBAR_CHEVRON_BMP BITMAP "blue_rebar_chevron.bmp" + /* Scroll Bar */ /* @makedep: blue_scrollbar_arrows.bmp */ BLUE_SCROLLBAR_ARROWS_BMP BITMAP "blue_scrollbar_arrows.bmp"

1 0