wine-devel June 2021

wine-devel@winehq.org

82 participants
607 discussions

[PATCH v2 1/6] light.msstyles: Add Classic Blue visual style.
by Zhiyi Zhang 23 Jun '21

23 Jun '21

Classic Blue is a visual style that uses blue as the main color and doesn't have bitmaps for UI controls. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v2: Supersede 208166~208171. Move from themes/light to dlls/light.msstyles. Save SVGs in optimized SVG instead of Inkscape SVG to save space. configure.ac | 1 + dlls/light.msstyles/Makefile.in | 3 + dlls/light.msstyles/light.msstyles.spec | 1 + dlls/light.msstyles/light.rc … [View More] | 140 ++++++++++++++++++++++++ dlls/light.msstyles/resources.h | 24 ++++ loader/wine.inf.in | 2 + 6 files changed, 171 insertions(+) create mode 100644 dlls/light.msstyles/Makefile.in create mode 100644 dlls/light.msstyles/light.msstyles.spec create mode 100644 dlls/light.msstyles/light.rc create mode 100644 dlls/light.msstyles/resources.h diff --git a/configure.ac b/configure.ac index f76dd047825..796cd015d17 100644 --- a/configure.ac +++ b/configure.ac @@ -3326,6 +3326,7 @@ WINE_CONFIG_MAKEFILE(dlls/ksproxy.ax) WINE_CONFIG_MAKEFILE(dlls/ksuser) WINE_CONFIG_MAKEFILE(dlls/ktmw32) WINE_CONFIG_MAKEFILE(dlls/l3codeca.acm) +WINE_CONFIG_MAKEFILE(dlls/light.msstyles) WINE_CONFIG_MAKEFILE(dlls/loadperf) WINE_CONFIG_MAKEFILE(dlls/localspl) WINE_CONFIG_MAKEFILE(dlls/localspl/tests) diff --git a/dlls/light.msstyles/Makefile.in b/dlls/light.msstyles/Makefile.in new file mode 100644 index 00000000000..d6b7a53d7f8 --- /dev/null +++ b/dlls/light.msstyles/Makefile.in @@ -0,0 +1,3 @@ +MODULE = light.msstyles + +RC_SRCS = light.rc diff --git a/dlls/light.msstyles/light.msstyles.spec b/dlls/light.msstyles/light.msstyles.spec new file mode 100644 index 00000000000..b427b2913c6 --- /dev/null +++ b/dlls/light.msstyles/light.msstyles.spec @@ -0,0 +1 @@ +# no exported entry points diff --git a/dlls/light.msstyles/light.rc b/dlls/light.msstyles/light.rc new file mode 100644 index 00000000000..e0ace9cb52e --- /dev/null +++ b/dlls/light.msstyles/light.rc @@ -0,0 +1,140 @@ +/* + * Copyright 2021 Zhiyi Zhang for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "resources.h" + +#pragma makedep po + +LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT + +/* Theme color display names */ +STRINGTABLE +{ + IDS_COLOR_DISPLAY_NAME_CLASSIC_BLUE "Classic Blue" +} + +/* Theme color tooltips */ +STRINGTABLE +{ + IDS_COLOR_TOOLTIP_CLASSIC_BLUE "Classic Blue" +} + +/* Theme size display names */ +STRINGTABLE +{ + IDS_SIZE_DISPLAY_NAME_NORMAL "Normal" +} + +/* Theme size tooltips */ +STRINGTABLE +{ + IDS_SIZE_TOOLTIP_NORMAL "Normal" +} + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +/* Theme version */ +1 PACKTHEM_VERSION {0x3} + +/* Theme color names */ +1 COLORNAMES +{ +"Classic Blue\0" +"\0" +} + +/* Theme size names */ +1 SIZENAMES +{ +"NormalSize\0" +"\0" +} + +/* Theme ini files */ +1 FILERESNAMES +{ +"CLASSIC_BLUE_INI\0" +"\0" +} + +/* Theme definition */ +THEMES_INI TEXTFILE +{ +"[documentation]\r\n" +"DisplayName = Light\r\n" +"ToolTip = Light Visual Style\r\n" +} + +/* Light theme definition */ +/* Classic blue theme, no bitmaps */ +CLASSIC_BLUE_INI TEXTFILE +{ +"[Globals]\r\n" +"EdgeLightColor = 255 255 255\r\n" +"EdgeHighLightColor = 255 255 255\r\n" +"EdgeShadowColor = 189 189 189\r\n" +"EdgeDkShadowColor = 158 158 158\r\n" +"EdgeFillColor = 255 255 255\r\n" + +"\r\n[SysMetrics]\r\n" +"; System colors\r\n" +"Scrollbar = 255 255 255\r\n" +"Background = 37 111 149\r\n" +"ActiveCaption = 50 150 250\r\n" +"InactiveCaption = 245 245 245\r\n" +"Menu = 255 255 255\r\n" +"Window = 255 255 255\r\n" +"WindowFrame = 158 158 158\r\n" +"MenuText = 0 0 0\r\n" +"WindowText = 0 0 0\r\n" +"CaptionText = 0 0 0\r\n" +"ActiveBorder = 255 255 255\r\n" +"InactiveBorder = 255 255 255\r\n" +"AppWorkSpace = 128 128 128\r\n" +"Highlight = 48 150 250\r\n" +"HighlightText = 255 255 255\r\n" +"BtnFace = 245 245 245\r\n" +"BtnShadow = 166 166 166\r\n" +"GrayText = 166 166 166\r\n" +"BtnText = 0 0 0\r\n" +"InactiveCaptionText = 100 100 100\r\n" +"BtnHighlight = 255 255 255\r\n" +"DkShadow3d = 106 106 106\r\n" +"Light3d = 227 227 227\r\n" +"InfoText = 0 0 0\r\n" +"InfoBk = 255 255 255\r\n" +"ButtonAlternateFace = 255 255 255\r\n" +"HotTracking = 224 224 224\r\n" +"GradientActiveCaption = 50 150 250\r\n" +"GradientInactiveCaption = 245 245 245\r\n" +"MenuHilight = 48 150 250\r\n" +"MenuBar = 255 255 255\r\n" + +"\r\n; Flat menus\r\n" +"FlatMenus = true\r\n" +} + +/* File version */ +#define WINE_FILEDESCRIPTION_STR "Light Theme" +#define WINE_FILENAME_STR "light.msstyles" +#define WINE_FILEVERSION 1,0,0,1 +#define WINE_FILEVERSION_STR "1.0.0.1" +#define WINE_PRODUCTVERSION 1,0,0,1 +#define WINE_PRODUCTVERSION_STR "1.0.0.1" + +#include "wine/wine_common_ver.rc" diff --git a/dlls/light.msstyles/resources.h b/dlls/light.msstyles/resources.h new file mode 100644 index 00000000000..b0a7e7008ce --- /dev/null +++ b/dlls/light.msstyles/resources.h @@ -0,0 +1,24 @@ +/* + * Copyright 2021 Zhiyi Zhang for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <winnt.h> + +#define IDS_COLOR_DISPLAY_NAME_CLASSIC_BLUE 1000 +#define IDS_COLOR_TOOLTIP_CLASSIC_BLUE 2000 +#define IDS_SIZE_DISPLAY_NAME_NORMAL 3000 +#define IDS_SIZE_TOOLTIP_NORMAL 4000 diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 24da6f3af6b..0eaa75191bd 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2658,6 +2658,8 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,iexplore.exe 11,,notepad.exe 11,,winetest.exe,- +; Themes +10,Resources\Themes\light,light.msstyles ; skip .NET fake dlls in Wine Mono package 11,,aspnet_regiis.exe,- 11,,ngen.exe,- -- 2.30.2 [View Less]

1 0

[PATCH vkd3d v3 6/6] vkd3d-shader: Track register size in components.
by Zebediah Figura 23 Jun '21

23 Jun '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- v3: Fix write_sm1_uniforms(). libs/vkd3d-shader/hlsl.c | 8 ++++---- libs/vkd3d-shader/hlsl.y | 10 ++++----- libs/vkd3d-shader/hlsl_codegen.c | 35 ++++++++++++++++---------------- 3 files changed, 26 insertions(+), 27 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index c36fe602..721458eb 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -111,9 +111,9 @@… [View More] struct hlsl_type *hlsl_new_type(struct hlsl_ctx *ctx, const char *name, enum hls type->dimx = dimx; type->dimy = dimy; if (type_class == HLSL_CLASS_MATRIX) - type->reg_size = hlsl_type_is_row_major(type) ? dimy : dimx; + type->reg_size = (hlsl_type_is_row_major(type) ? dimy : dimx) * 4; else - type->reg_size = 1; + type->reg_size = 4; list_add_tail(&ctx->types, &type->entry); @@ -352,11 +352,11 @@ struct hlsl_type *hlsl_type_clone(struct hlsl_ctx *ctx, struct hlsl_type *old, u } case HLSL_CLASS_MATRIX: - type->reg_size = hlsl_type_is_row_major(type) ? type->dimy : type->dimx; + type->reg_size = (hlsl_type_is_row_major(type) ? type->dimy : type->dimx) * 4; break; default: - type->reg_size = 1; + type->reg_size = 4; break; } diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 4355b9a2..828b19a4 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -567,7 +567,7 @@ static struct hlsl_ir_load *add_record_load(struct hlsl_ctx *ctx, struct list *i { struct hlsl_ir_constant *c; - if (!(c = hlsl_new_uint_constant(ctx, field->reg_offset * 4, loc))) + if (!(c = hlsl_new_uint_constant(ctx, field->reg_offset, loc))) return NULL; list_add_tail(instrs, &c->node.entry); @@ -601,7 +601,7 @@ static struct hlsl_ir_load *add_array_load(struct hlsl_ctx *ctx, struct list *in return NULL; } - if (!(c = hlsl_new_uint_constant(ctx, data_type->reg_size * 4, loc))) + if (!(c = hlsl_new_uint_constant(ctx, data_type->reg_size, loc))) return NULL; list_add_tail(instrs, &c->node.entry); if (!(mul = hlsl_new_binary_expr(ctx, HLSL_IR_BINOP_MUL, index, &c->node))) @@ -663,7 +663,7 @@ static struct hlsl_type *apply_type_modifiers(struct hlsl_ctx *ctx, struct hlsl_ *modifiers &= ~HLSL_TYPE_MODIFIERS_MASK; if (new_type->type == HLSL_CLASS_MATRIX) - new_type->reg_size = hlsl_type_is_row_major(new_type) ? new_type->dimy : new_type->dimx; + new_type->reg_size = (hlsl_type_is_row_major(new_type) ? new_type->dimy : new_type->dimx) * 4; return new_type; } @@ -738,7 +738,7 @@ static bool add_typedef(struct hlsl_ctx *ctx, DWORD modifiers, struct hlsl_type if (type->type != HLSL_CLASS_MATRIX) check_invalid_matrix_modifiers(ctx, type->modifiers, v->loc); else - type->reg_size = hlsl_type_is_row_major(type) ? type->dimy : type->dimx; + type->reg_size = (hlsl_type_is_row_major(type) ? type->dimy : type->dimx) * 4; if ((type->modifiers & HLSL_MODIFIER_COLUMN_MAJOR) && (type->modifiers & HLSL_MODIFIER_ROW_MAJOR)) @@ -1328,7 +1328,7 @@ static void struct_var_initializer(struct hlsl_ctx *ctx, struct list *list, stru if (hlsl_type_component_count(field->type) == hlsl_type_component_count(node->data_type)) { - if (!(c = hlsl_new_uint_constant(ctx, field->reg_offset * 4, node->loc))) + if (!(c = hlsl_new_uint_constant(ctx, field->reg_offset, node->loc))) break; list_add_tail(list, &c->node.entry); diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 068fb167..79cae35e 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -93,7 +93,7 @@ static void prepend_input_copy(struct hlsl_ctx *ctx, struct list *instrs, struct return; list_add_head(instrs, &load->node.entry); - if (!(offset = hlsl_new_uint_constant(ctx, field_offset * 4, var->loc))) + if (!(offset = hlsl_new_uint_constant(ctx, field_offset, var->loc))) return; list_add_after(&load->node.entry, &offset->node.entry); @@ -160,7 +160,7 @@ static void append_output_copy(struct hlsl_ctx *ctx, struct list *instrs, struct list_add_before(&var->scope_entry, &output->scope_entry); list_add_tail(&ctx->extern_vars, &output->extern_entry); - if (!(offset = hlsl_new_uint_constant(ctx, field_offset * 4, var->loc))) + if (!(offset = hlsl_new_uint_constant(ctx, field_offset, var->loc))) return; list_add_tail(instrs, &offset->node.entry); @@ -291,7 +291,7 @@ static bool split_struct_copies(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr struct hlsl_ir_load *field_load; struct hlsl_ir_constant *c; - if (!(c = hlsl_new_uint_constant(ctx, field->reg_offset * 4, instr->loc))) + if (!(c = hlsl_new_uint_constant(ctx, field->reg_offset, instr->loc))) return false; list_add_before(&instr->entry, &c->node.entry); @@ -714,9 +714,8 @@ static bool is_range_available(struct liveness *liveness, unsigned int first_wri } static struct hlsl_reg allocate_range(struct hlsl_ctx *ctx, struct liveness *liveness, - unsigned int first_write, unsigned int last_read, unsigned int reg_count) + unsigned int first_write, unsigned int last_read, unsigned int component_count) { - const unsigned int component_count = reg_count * 4; unsigned int i, component_idx; struct hlsl_reg ret = {0}; @@ -738,9 +737,9 @@ static struct hlsl_reg allocate_range(struct hlsl_ctx *ctx, struct liveness *liv static const char *debug_register(char class, struct hlsl_reg reg, const struct hlsl_type *type) { - if (type->reg_size > 1) + if (type->reg_size > 4) return vkd3d_dbg_sprintf("%c%u-%c%u", class, reg.id, class, - reg.id + type->reg_size - 1); + reg.id + (type->reg_size / 4) - 1); return vkd3d_dbg_sprintf("%c%u%s", class, reg.id, debug_hlsl_writemask(reg.writemask)); } @@ -751,7 +750,7 @@ static void allocate_variable_temp_register(struct hlsl_ctx *ctx, struct hlsl_ir if (!var->reg.allocated && var->last_read) { - if (var->data_type->reg_size > 1) + if (var->data_type->reg_size > 4) var->reg = allocate_range(ctx, liveness, var->first_write, var->last_read, var->data_type->reg_size); else @@ -770,7 +769,7 @@ static void allocate_temp_registers_recurse(struct hlsl_ctx *ctx, struct list *i { if (!instr->reg.allocated && instr->last_read) { - if (instr->data_type->reg_size > 1) + if (instr->data_type->reg_size > 4) instr->reg = allocate_range(ctx, liveness, instr->index, instr->last_read, instr->data_type->reg_size); else @@ -832,23 +831,23 @@ static void allocate_const_registers_recurse(struct hlsl_ctx *ctx, struct list * { struct hlsl_ir_constant *constant = hlsl_ir_constant(instr); const struct hlsl_type *type = instr->data_type; + unsigned int x, y, i, writemask, end_reg; unsigned int reg_size = type->reg_size; - unsigned int x, y, i, writemask; - if (reg_size > 1) + if (reg_size > 4) constant->reg = allocate_range(ctx, liveness, 1, UINT_MAX, reg_size); else constant->reg = allocate_register(ctx, liveness, 1, UINT_MAX, type->dimx); TRACE("Allocated constant @%u to %s.\n", instr->index, debug_register('c', constant->reg, type)); if (!hlsl_array_reserve(ctx, (void **)&defs->values, &defs->size, - constant->reg.id + reg_size, sizeof(*defs->values))) + constant->reg.id + reg_size / 4, sizeof(*defs->values))) return; - if (constant->reg.id + reg_size > defs->count) + end_reg = constant->reg.id + reg_size / 4; + if (end_reg > defs->count) { - memset(&defs->values[defs->count], 0, - sizeof(*defs->values) * (constant->reg.id + reg_size - defs->count)); - defs->count = constant->reg.id + reg_size; + memset(&defs->values[defs->count], 0, sizeof(*defs->values) * (end_reg - defs->count)); + defs->count = end_reg; } assert(type->type <= HLSL_CLASS_LAST_NUMERIC); @@ -931,7 +930,7 @@ static void allocate_const_registers(struct hlsl_ctx *ctx, struct hlsl_ir_functi { if (var->is_uniform && var->last_read) { - if (var->data_type->reg_size > 1) + if (var->data_type->reg_size > 4) var->reg = allocate_range(ctx, &liveness, 1, UINT_MAX, var->data_type->reg_size); else { @@ -1520,7 +1519,7 @@ static void write_sm1_uniforms(struct hlsl_ctx *ctx, struct bytecode_buffer *buf { put_dword(buffer, 0); /* name */ put_dword(buffer, D3DXRS_FLOAT4 | (var->reg.id << 16)); - put_dword(buffer, var->data_type->reg_size); + put_dword(buffer, var->data_type->reg_size / 4); put_dword(buffer, 0); /* type */ put_dword(buffer, 0); /* FIXME: default value */ } -- 2.32.0 [View Less]

3 2

[PATCH vkd3d 1/6] vkd3d-shader: Zero-initialize constant definitions.
by Zebediah Figura 23 Jun '21

23 Jun '21

From: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- Resent without changes, as this clashes with a later patch in this series. libs/vkd3d-shader/hlsl_codegen.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 366b8bda..54c91bf8 100644 --- a/libs/vkd3d-shader/… [View More]

3 14

[PATCH 1/6] themes/light: Add Classic Blue visual style.
by Zhiyi Zhang 23 Jun '21

23 Jun '21

Classic Blue is a visual style that uses blue as the main color and doesn't have bitmaps for UI controls. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- configure.ac | 1 + dlls/setupapi/fakedll.c | 51 +++++++------- loader/wine.inf.in | 2 + themes/light/Makefile.in | 3 + themes/light/light.rc | 140 +++++++++++++++++++++++++++++++++++++++ themes/light/resources.h | 25 +++++++ tools/make_makefiles | 8 +-- tools/makedep.c | 14 … [View More]++-- 8 files changed, 209 insertions(+), 35 deletions(-) create mode 100644 themes/light/Makefile.in create mode 100644 themes/light/light.rc create mode 100644 themes/light/resources.h diff --git a/configure.ac b/configure.ac index f76dd047825..4888b70ae20 100644 --- a/configure.ac +++ b/configure.ac @@ -4002,6 +4002,7 @@ WINE_CONFIG_MAKEFILE(programs/wusa) WINE_CONFIG_MAKEFILE(programs/xcopy) WINE_CONFIG_MAKEFILE(programs/xcopy/tests) WINE_CONFIG_MAKEFILE(server) +WINE_CONFIG_MAKEFILE(themes/light) WINE_CONFIG_MAKEFILE(tools,,[test "x$enable_tools" = xno]) WINE_CONFIG_MAKEFILE(tools/sfnt2fon,,[test "x$enable_tools" = xno]) WINE_CONFIG_MAKEFILE(tools/widl,,[test "x$enable_tools" = xno]) diff --git a/dlls/setupapi/fakedll.c b/dlls/setupapi/fakedll.c index 203d7c393ce..416db544303 100644 --- a/dlls/setupapi/fakedll.c +++ b/dlls/setupapi/fakedll.c @@ -417,11 +417,22 @@ static const WCHAR *enum_load_path( unsigned int idx ) /* try to load a pre-compiled fake dll */ static void *load_fake_dll( const WCHAR *name, SIZE_T *size ) { + static const struct + { + const WCHAR *suffix; + const WCHAR *dir; + } + search_dirs[] = + { + {L".dll", L"\\dlls"}, + {L".exe", L"\\programs"}, + {L".msstyles", L"\\themes"}, + }; const WCHAR *build_dir = _wgetenv( L"WINEBUILDDIR" ); const WCHAR *path; WCHAR *file, *ptr; void *data = NULL; - unsigned int i, pos, len, namelen, maxlen = 0; + unsigned int i, pos, len, namelen, suffixlen, maxlen = 0; WCHAR *p; int res = 0; @@ -441,29 +452,21 @@ static void *load_fake_dll( const WCHAR *name, SIZE_T *size ) if (build_dir) { - /* try as a dll */ - ptr = file + pos; - namelen = len + 1; - file[pos + len + 1] = 0; - if (namelen > 4 && !wcsncmp( ptr + namelen - 4, L".dll", 4 )) namelen -= 4; - ptr = prepend( ptr, ptr, namelen ); - ptr = prepend( ptr, L"\\dlls", 5 ); - ptr = prepend( ptr, build_dir, lstrlenW(build_dir) ); - if ((res = read_file( ptr, &data, size ))) goto done; - lstrcpyW( file + pos + len + 1, L".fake" ); - if ((res = read_file( ptr, &data, size ))) goto done; - - /* now as a program */ - ptr = file + pos; - namelen = len + 1; - file[pos + len + 1] = 0; - if (namelen > 4 && !wcsncmp( ptr + namelen - 4, L".exe", 4 )) namelen -= 4; - ptr = prepend( ptr, ptr, namelen ); - ptr = prepend( ptr, L"\\programs", 9 ); - ptr = prepend( ptr, build_dir, lstrlenW(build_dir) ); - if ((res = read_file( ptr, &data, size ))) goto done; - lstrcpyW( file + pos + len + 1, L".fake" ); - if ((res = read_file( ptr, &data, size ))) goto done; + for (i = 0; i < ARRAY_SIZE(search_dirs); ++i) + { + ptr = file + pos; + namelen = len + 1; + file[pos + len + 1] = 0; + suffixlen = lstrlenW( search_dirs[i].suffix ); + if (namelen > suffixlen && !wcsncmp( ptr + namelen - suffixlen, search_dirs[i].suffix, suffixlen )) + namelen -= suffixlen; + ptr = prepend( ptr, ptr, namelen ); + ptr = prepend( ptr, search_dirs[i].dir, lstrlenW( search_dirs[i].dir )); + ptr = prepend( ptr, build_dir, lstrlenW( build_dir ) ); + if ((res = read_file( ptr, &data, size ))) goto done; + lstrcpyW( file + pos + len + 1, L".fake" ); + if ((res = read_file( ptr, &data, size ))) goto done; + } } file[pos + len + 1] = 0; diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 24da6f3af6b..0eaa75191bd 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2658,6 +2658,8 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,iexplore.exe 11,,notepad.exe 11,,winetest.exe,- +; Themes +10,Resources\Themes\light,light.msstyles ; skip .NET fake dlls in Wine Mono package 11,,aspnet_regiis.exe,- 11,,ngen.exe,- diff --git a/themes/light/Makefile.in b/themes/light/Makefile.in new file mode 100644 index 00000000000..d6b7a53d7f8 --- /dev/null +++ b/themes/light/Makefile.in @@ -0,0 +1,3 @@ +MODULE = light.msstyles + +RC_SRCS = light.rc diff --git a/themes/light/light.rc b/themes/light/light.rc new file mode 100644 index 00000000000..e0ace9cb52e --- /dev/null +++ b/themes/light/light.rc @@ -0,0 +1,140 @@ +/* + * Copyright 2021 Zhiyi Zhang for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "resources.h" + +#pragma makedep po + +LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT + +/* Theme color display names */ +STRINGTABLE +{ + IDS_COLOR_DISPLAY_NAME_CLASSIC_BLUE "Classic Blue" +} + +/* Theme color tooltips */ +STRINGTABLE +{ + IDS_COLOR_TOOLTIP_CLASSIC_BLUE "Classic Blue" +} + +/* Theme size display names */ +STRINGTABLE +{ + IDS_SIZE_DISPLAY_NAME_NORMAL "Normal" +} + +/* Theme size tooltips */ +STRINGTABLE +{ + IDS_SIZE_TOOLTIP_NORMAL "Normal" +} + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +/* Theme version */ +1 PACKTHEM_VERSION {0x3} + +/* Theme color names */ +1 COLORNAMES +{ +"Classic Blue\0" +"\0" +} + +/* Theme size names */ +1 SIZENAMES +{ +"NormalSize\0" +"\0" +} + +/* Theme ini files */ +1 FILERESNAMES +{ +"CLASSIC_BLUE_INI\0" +"\0" +} + +/* Theme definition */ +THEMES_INI TEXTFILE +{ +"[documentation]\r\n" +"DisplayName = Light\r\n" +"ToolTip = Light Visual Style\r\n" +} + +/* Light theme definition */ +/* Classic blue theme, no bitmaps */ +CLASSIC_BLUE_INI TEXTFILE +{ +"[Globals]\r\n" +"EdgeLightColor = 255 255 255\r\n" +"EdgeHighLightColor = 255 255 255\r\n" +"EdgeShadowColor = 189 189 189\r\n" +"EdgeDkShadowColor = 158 158 158\r\n" +"EdgeFillColor = 255 255 255\r\n" + +"\r\n[SysMetrics]\r\n" +"; System colors\r\n" +"Scrollbar = 255 255 255\r\n" +"Background = 37 111 149\r\n" +"ActiveCaption = 50 150 250\r\n" +"InactiveCaption = 245 245 245\r\n" +"Menu = 255 255 255\r\n" +"Window = 255 255 255\r\n" +"WindowFrame = 158 158 158\r\n" +"MenuText = 0 0 0\r\n" +"WindowText = 0 0 0\r\n" +"CaptionText = 0 0 0\r\n" +"ActiveBorder = 255 255 255\r\n" +"InactiveBorder = 255 255 255\r\n" +"AppWorkSpace = 128 128 128\r\n" +"Highlight = 48 150 250\r\n" +"HighlightText = 255 255 255\r\n" +"BtnFace = 245 245 245\r\n" +"BtnShadow = 166 166 166\r\n" +"GrayText = 166 166 166\r\n" +"BtnText = 0 0 0\r\n" +"InactiveCaptionText = 100 100 100\r\n" +"BtnHighlight = 255 255 255\r\n" +"DkShadow3d = 106 106 106\r\n" +"Light3d = 227 227 227\r\n" +"InfoText = 0 0 0\r\n" +"InfoBk = 255 255 255\r\n" +"ButtonAlternateFace = 255 255 255\r\n" +"HotTracking = 224 224 224\r\n" +"GradientActiveCaption = 50 150 250\r\n" +"GradientInactiveCaption = 245 245 245\r\n" +"MenuHilight = 48 150 250\r\n" +"MenuBar = 255 255 255\r\n" + +"\r\n; Flat menus\r\n" +"FlatMenus = true\r\n" +} + +/* File version */ +#define WINE_FILEDESCRIPTION_STR "Light Theme" +#define WINE_FILENAME_STR "light.msstyles" +#define WINE_FILEVERSION 1,0,0,1 +#define WINE_FILEVERSION_STR "1.0.0.1" +#define WINE_PRODUCTVERSION 1,0,0,1 +#define WINE_PRODUCTVERSION_STR "1.0.0.1" + +#include "wine/wine_common_ver.rc" diff --git a/themes/light/resources.h b/themes/light/resources.h new file mode 100644 index 00000000000..ef75da9f628 --- /dev/null +++ b/themes/light/resources.h @@ -0,0 +1,25 @@ +/* + * Copyright 2021 Zhiyi Zhang for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <winnt.h> + +#define IDS_COLOR_DISPLAY_NAME_CLASSIC_BLUE 1000 +#define IDS_COLOR_TOOLTIP_CLASSIC_BLUE 2000 +#define IDS_SIZE_DISPLAY_NAME_NORMAL 3000 +#define IDS_SIZE_TOOLTIP_NORMAL 4000 + diff --git a/tools/make_makefiles b/tools/make_makefiles index 3abba2da840..fe337c52196 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -439,12 +439,12 @@ sub update_makefiles(@) die "APPMODE should not be defined in $file" if defined $make{"APPMODE"}; die "STATICLIB should not be defined in $file" if defined $make{"STATICLIB"}; } - elsif (defined($make{"MODULE"})) # dll or program + elsif (defined($make{"MODULE"})) # dll or program or theme { - (my $name = $file) =~ s/^(dlls|programs)\/(.*)\/Makefile/$2/; + (my $name = $file) =~ s/^(dlls|programs|themes)\/(.*)\/Makefile/$2/; my $dllflags = $make{"EXTRADLLFLAGS"} || ""; if (defined $make{"APPMODE"}) { $dllflags .= " " . $make{"APPMODE"}; } - die "MODULE should not be defined in $file" unless $file =~ /^(dlls|programs)\//; + die "MODULE should not be defined in $file" unless $file =~ /^(dlls|programs|themes)\//; die "STATICLIB should not be defined in $file" if defined $make{"STATICLIB"}; if ($file =~ /^programs\//) { @@ -456,7 +456,7 @@ sub update_makefiles(@) { die "APPMODE should not be defined in $file" if defined $make{"APPMODE"} ; die "EXTRADLLFLAGS should not contain -mconsole or -mwindows in $file" if $dllflags =~ /-m(console|windows)/; - die "Invalid MODULE in $file" unless ($name =~ /\./ && $make{"MODULE"} eq $name) || $make{"MODULE"} eq "$name.dll"; + die "Invalid MODULE in $file" unless ($name =~ /\./ && $make{"MODULE"} eq $name) || $make{"MODULE"} eq "$name.dll" || $make{"MODULE"} eq "$name.msstyles"; } if (defined $make{"IMPORTLIB"}) { diff --git a/tools/makedep.c b/tools/makedep.c index db076d0c057..0d1cb5166bb 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -208,6 +208,7 @@ struct makefile int is_cross; int is_win16; int is_exe; + int is_msstyles; /* values generated at output time */ struct strarray in_files; @@ -3286,7 +3287,8 @@ static void output_module( struct makefile *make ) char *spec_file = NULL; unsigned int i; - if (!make->is_exe) spec_file = src_dir_path( make, replace_extension( make->module, ".dll", ".spec" )); + if (!make->is_exe && !make->is_msstyles) + spec_file = src_dir_path( make, replace_extension( make->module, ".dll", ".spec" )); strarray_addall( &all_libs, add_import_libs( make, &dep_libs, make->delayimports, 1, 0 )); strarray_addall( &all_libs, add_import_libs( make, &dep_libs, make->imports, 0, 0 )); add_import_libs( make, &dep_libs, get_default_imports( make ), 0, 0 ); /* dependencies only */ @@ -3319,7 +3321,7 @@ static void output_module( struct makefile *make ) strmake( "d%s/%s", pe_dir, make->module )); output( "%s%s %s.fake:", module_path, dll_ext, module_path ); } - else + else if (!make->is_msstyles) { strarray_addall( &all_libs, add_unix_libraries( make, &dep_libs )); strarray_add( &make->all_targets, make->module ); @@ -3338,11 +3340,8 @@ static void output_module( struct makefile *make ) output( "\n" ); output_winegcc_command( make, make->is_cross ); if (make->is_cross) output_filename( "-Wl,--wine-builtin" ); - if (spec_file) - { - output_filename( "-shared" ); - output_filename( spec_file ); - } + if (make->is_msstyles || spec_file) output_filename( "-shared" ); + if (spec_file) output_filename( spec_file ); output_filenames( make->extradllflags ); output_filenames_obj_dir( make, make->is_cross ? make->crossobj_files : make->object_files ); output_filenames_obj_dir( make, make->res_files ); @@ -4229,6 +4228,7 @@ static void load_sources( struct makefile *make ) make->use_msvcrt = strarray_exists( &make->extradllflags, "-mno-cygwin" ); make->is_exe = strarray_exists( &make->extradllflags, "-mconsole" ) || strarray_exists( &make->extradllflags, "-mwindows" ); + make->is_msstyles = make->module && strendswith( make->module, ".msstyles" ); if (make->module && !make->install_lib.count && !make->install_dev.count) { -- 2.30.2 [View Less]

2 1

[PATCH] kernel32: Implement GetProcessGroupAffinity stub.
by Roman Pišl 23 Jun '21

23 Jun '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51322 Signed-off-by: Roman Pišl <rpisl(a)seznam.cz> --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/process.c | 11 +++++++++++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index ec094c98508..0f474504bfe 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -782,7 +782,7 @@ @ … [View More]

1 0

[PATCH 6/6] themes/light: Add List Box parts.
by Zhiyi Zhang 23 Jun '21

23 Jun '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- themes/light/light.rc | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/themes/light/light.rc b/themes/light/light.rc index 8a6f4651e3e..be27a0c71ca 100644 --- a/themes/light/light.rc +++ b/themes/light/light.rc @@ -333,6 +333,13 @@ BLUE_INI TEXTFILE "[Edit.Edittext(ReadOnly)]\r\n" "FillColor = 245 245 245\r\n" "TextColor = 0 0 0\r\n" + +"\r\n; ListBox\r\n" +"[ListBox]\r\n" +"BgType = BorderFill\r\n" +"BorderSize = 1\r\… [View More]

1 0

[PATCH 5/6] themes/light: Add Edit parts.
by Zhiyi Zhang 23 Jun '21

23 Jun '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- themes/light/light.rc | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/themes/light/light.rc b/themes/light/light.rc index 186aab3b066..8a6f4651e3e 100644 --- a/themes/light/light.rc +++ b/themes/light/light.rc @@ -318,6 +318,21 @@ BLUE_INI TEXTFILE "GlyphImageFile = blue_combobutton_glyph.bmp\r\n" "GlyphTransparent = True\r\n" "Transparent = True\r\n" + +"\r\n; Edit\r\n" +"[Edit]\r\n" +"BgType = BorderFill\… [View More]

1 0

[PATCH 4/6] themes/light: Add ComboBox parts.
by Zhiyi Zhang 23 Jun '21

23 Jun '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- themes/light/blue_combobutton.bmp | Bin 0 -> 6774 bytes themes/light/blue_combobutton.svg | 101 ++++++++++++++++++++++ themes/light/blue_combobutton_glyph.bmp | Bin 0 -> 1174 bytes themes/light/blue_combobutton_glyph.svg | 106 ++++++++++++++++++++++++ themes/light/light.rc | 31 +++++++ 5 files changed, 238 insertions(+) create mode 100644 themes/light/blue_combobutton.bmp create mode … [View More]100644 themes/light/blue_combobutton.svg create mode 100644 themes/light/blue_combobutton_glyph.bmp create mode 100644 themes/light/blue_combobutton_glyph.svg diff --git a/themes/light/blue_combobutton.bmp b/themes/light/blue_combobutton.bmp new file mode 100644 index 0000000000000000000000000000000000000000..549aece42a6dad47f94aa39230d8c6c5122a5b52 GIT binary patch literal 6774 zcmeI0v2Gec5Qa$;cdk;Ufg;7B6gisImiu&m7VB)@B8tsBAORhP!Bq;|c_9l(w3#8A z(`Ropv&M>xLz<g^cmMg=U7?YV({JY=d;8B<c~%l1B+ew>^#=0n^-g5{=kdSTPrTA& zHk<Vqi^Xa_pKl~mFtp}I8MZwcuVs8Wolf7|oHuKY)Q^>EHKI2qEURBGmq*I5vFK#F zG?PKy@q9PHJEQhh=Poj+bEj{H3~FC>?jnOaclu_?p!QYgE;6Wdr*DP~YF~BkB7-`2 z`ew)wedzvjE6k>(XK9W0PVL8b643+Ut#zLg;r^^F_Gjb1)ttt|e!3Xmr>6QXIfX)N zn&F)??0i!HAn_-}dHTJ3X3Hzt*Hd27v$eeEYlY*E7yPX}yXWryy8Dath*$f)9K63& zztTnZlK!W)_w9L`Y9Ql>;{L3?9sSw3Z#6&u81=W;^-5wRk%F<=Ue!0su=8yvU)H<p z`Z7&Fhu@F1W_MMOmD%!SUnMN7Pv1Ws>Dg?o=QCZJ$)N6dz8m13QTwWM7a7#K(>Fr~ zwXZsNkwKk1eKTZG`>Jyn8PvJcH$w)suR3>;L7h8&Gh~Q9aDN%y?k1zAq-X8>pY%@I zQ~Q4OIH?EPQ+1!Z?_g-niv8JlL;ugE?{eM$b+P-`_hzf0wz+5~gF4DFKN-}v9?fJ> zM>*yvgWA@knGEVE$NXea+j=yUK^^6opA2eSk7hEcqa5>-L2c{NOa^t7V}3G3cmLPf H#RT(TZA>K7 literal 0 HcmV?d00001 diff --git a/themes/light/blue_combobutton.svg b/themes/light/blue_combobutton.svg new file mode 100644 index 00000000000..83cbad42cd8 --- /dev/null +++ b/themes/light/blue_combobutton.svg @@ -0,0 +1,101 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="20" + height="84" + viewBox="0 0 5.2916666 22.225" + version="1.1" + id="svg8" + inkscape:version="1.0.2 (e86c870879, 2021-01-15)" + sodipodi:docname="blue_combobutton.svg" + inkscape:export-filename="/home/eric/src/wine/themes/light/blue_combobutton.png" + inkscape:export-xdpi="96" + inkscape:export-ydpi="96"> + <defs + id="defs2" /> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="11.2" + inkscape:cx="-55.876149" + inkscape:cy="19.823541" + inkscape:document-units="mm" + inkscape:current-layer="layer1" + inkscape:document-rotation="0" + showgrid="true" + units="px" + inkscape:window-width="3840" + inkscape:window-height="2058" + inkscape:window-x="0" + inkscape:window-y="0" + inkscape:window-maximized="1"> + <inkscape:grid + type="xygrid" + id="grid10" + originx="-6.5565108e-07" + originy="-4.9173833e-07" /> + </sodipodi:namedview> + <metadata + id="metadata5"> + <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 + inkscape:label="Layer 1" + inkscape:groupmode="layer" + id="layer1"> + <rect + style="fill:none;stroke:#aeaeae;stroke-width:0.264582;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="rect12" + width="4.4979162" + height="4.7625008" + x="0.39687434" + y="0.39687434" + rx="0.52916664" + ry="0.52916664" /> + <rect + style="fill:none;stroke:#3096fa;stroke-width:0.264582;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="rect12-3" + width="4.4979162" + height="4.7625012" + x="0.39687434" + y="5.9531245" + rx="0.52916664" + ry="0.52916664" /> + <rect + style="fill:#2979ff;stroke:#2979ff;stroke-width:0.264582;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;fill-opacity:1" + id="rect12-3-6" + width="4.4979162" + height="4.7625017" + x="0.39687434" + y="11.509375" + rx="0.52916664" + ry="0.52916664" /> + <rect + style="fill:none;stroke:#aeaeae;stroke-width:0.264582;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="rect12-36" + width="4.4979162" + height="4.7625008" + x="0.39687434" + y="17.065624" + rx="0.52916664" + ry="0.52916664" /> + </g> +</svg> diff --git a/themes/light/blue_combobutton_glyph.bmp b/themes/light/blue_combobutton_glyph.bmp new file mode 100644 index 0000000000000000000000000000000000000000..c427c0dc605dcaa171372af78978a9ce1074d4f7 GIT binary patch literal 1174 zcmd6jKMsO06o)Z!a_|HWj&79272@t4JcSdHhMs|vxN!jf+`&^JCioS>h!7S{l;mss z-usoL-)^txR`YFHH?V*e%&ax5WgVDbmJgc72TPV^Nl_H%sbA!I9)h2ysU&|I%Q90Y z)6GnlI_PS%bJwMJeC?UD$$|IY|7Bg*bpn%Kn1|qlgi$Z_mC1B(X|p{q^jsKtp%=hk zdAVwl++s25rHt&b(zahlLRQ)t^-^j_nM~)U$;P7Rg}ZJQiGi1j9Q>6R-jTqh7v>?D bH%l1xLSMnt3ug&EFVrp!ytFxw{p;TyDj9uq literal 0 HcmV?d00001 diff --git a/themes/light/blue_combobutton_glyph.svg b/themes/light/blue_combobutton_glyph.svg new file mode 100644 index 00000000000..f27cb4d0dbf --- /dev/null +++ b/themes/light/blue_combobutton_glyph.svg @@ -0,0 +1,106 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="10" + height="28" + viewBox="0 0 2.6458333 7.408334" + version="1.1" + id="svg8" + inkscape:version="1.0.2 (e86c870879, 2021-01-15)" + sodipodi:docname="blue_combobutton_glyph.svg" + inkscape:export-filename="/home/eric/src/wine/themes/light/blue_combobutton_glyph.png" + inkscape:export-xdpi="96" + inkscape:export-ydpi="96"> + <defs + id="defs2" /> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="31.678384" + inkscape:cx="-5.501522" + inkscape:cy="11.482504" + inkscape:document-units="mm" + inkscape:current-layer="layer1" + inkscape:document-rotation="0" + showgrid="true" + units="px" + inkscape:window-width="3840" + inkscape:window-height="2059" + inkscape:window-x="0" + inkscape:window-y="0" + inkscape:window-maximized="1"> + <inkscape:grid + type="xygrid" + id="grid10" /> + </sodipodi:namedview> + <metadata + id="metadata5"> + <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></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <g + inkscape:label="Layer 1" + inkscape:groupmode="layer" + id="layer1" + style="display:inline"> + <path + d="m 0,-1.8520833 h 6.35 v 6.35 H 0 Z" + fill="none" + id="path2" + style="stroke-width:0.264583" /> + <path + d="M 0,3.7041667 H 6.35 V 10.054167 H 0 Z" + fill="none" + id="path2-3" + style="stroke-width:0.264583" /> + <path + d="M 0.396875,0.66961251 1.3182396,1.5875 1.4498631,1.4563732 0.52849851,0.53848571 Z" + id="path4-79-8" + style="stroke-width:0.264582" /> + <path + d="M 2.1173348,0.52916667 1.1959703,1.4470542 1.3275939,1.5781809 2.2489584,0.66029351 Z" + id="path4-79-8-5" + style="display:inline;stroke-width:0.264582" /> + <path + d="M 0.396875,2.5216958 1.3182396,3.4395833 1.4498631,3.3084566 0.52849854,2.390569 Z" + id="path4-79-8-2" + style="display:inline;fill:#3096fa;fill-opacity:1;stroke-width:0.264582" /> + <path + d="M 2.1173348,2.38125 1.1959703,3.2991375 1.3275939,3.4302643 2.2489584,2.5123768 Z" + id="path4-79-8-5-9" + style="display:inline;fill:#3096fa;fill-opacity:1;stroke-width:0.264582" /> + <path + d="M 0.396875,4.3737791 1.3182396,5.2916667 1.4498631,5.1605399 0.52849854,4.2426524 Z" + id="path4-79-8-2-1" + style="display:inline;fill:#ffffff;fill-opacity:1;stroke-width:0.264582" /> + <path + d="M 2.1173348,4.2333333 1.1959703,5.1512209 1.3275939,5.2823476 2.2489584,4.3644602 Z" + id="path4-79-8-5-9-2" + style="display:inline;fill:#ffffff;fill-opacity:1;stroke-width:0.264582" /> + <path + d="M 0.396875,6.2258625 1.3182396,7.14375 1.4498631,7.0126233 0.52849854,6.0947357 Z" + id="path4-79-8-2-1-7" + style="display:inline;fill:#aeaeae;fill-opacity:1;stroke:none;stroke-width:0.264582;stroke-opacity:1" /> + <path + d="M 2.1173348,6.0854167 1.1959703,7.0033042 1.3275939,7.134431 2.2489584,6.2165435 Z" + id="path4-79-8-5-9-2-0" + style="display:inline;fill:#aeaeae;fill-opacity:1;stroke:none;stroke-width:0.264582;stroke-opacity:1" /> + </g> +</svg> diff --git a/themes/light/light.rc b/themes/light/light.rc index ea138423e8e..186aab3b066 100644 --- a/themes/light/light.rc +++ b/themes/light/light.rc @@ -294,6 +294,30 @@ BLUE_INI TEXTFILE "ImageFile2 = blue_commandlink_glyph_45px.bmp\r\n" "MinDpi1 = 96\r\n" "MinDpi2 = 144\r\n" + +"\r\n; ComboBox\r\n" +"[ComboBox]\r\n" +"BgType = BorderFill\r\n" +"BorderSize = 1\r\n" +"FillColor = 255 255 255\r\n" +"BorderColor = 174 174 174\r\n" + +"[ComboBox(Disabled)]\r\n" +"BorderColor = 228 228 228\r\n" +"FillColor = 231 231 231\r\n" + +"[ComboBox.DropDownButton]\r\n" +"BgType = ImageFile\r\n" +"ImageLayout = Vertical\r\n" +"SizingType = Stretch\r\n" +"ImageFile = blue_combobutton.bmp\r\n" +"SizingMargins = 3, 3, 3, 3\r\n" +"ContentMargins = 0, 0, 0, 0\r\n" +"ImageCount = 4\r\n" +"GlyphType = ImageGlyph\r\n" +"GlyphImageFile = blue_combobutton_glyph.bmp\r\n" +"GlyphTransparent = True\r\n" +"Transparent = True\r\n" } /* All following bitmaps are of 32-bit ARGB format */ @@ -332,6 +356,13 @@ BLUE_COMMANDLINK_GLYPH_30PX_BMP BITMAP "blue_commandlink_glyph_30px.bmp" /* @makedep: blue_commandlink_glyph_45px.bmp */ BLUE_COMMANDLINK_GLYPH_45PX_BMP BITMAP "blue_commandlink_glyph_45px.bmp" +/* ComboBox */ +/* @makedep: blue_combobutton.bmp */ +BLUE_COMBOBUTTON_BMP BITMAP "blue_combobutton.bmp" + +/* @makedep: blue_combobutton_glyph.bmp */ +BLUE_COMBOBUTTON_GLYPH_BMP BITMAP "blue_combobutton_glyph.bmp" + /* File version */ #define WINE_FILEDESCRIPTION_STR "Light Theme" #define WINE_FILENAME_STR "light.msstyles" -- 2.30.2 [View Less]

1 0

[PATCH 3/6] themes/light: Add Button parts.
by Zhiyi Zhang 23 Jun '21

23 Jun '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- themes/light/blue_button.bmp | Bin 0 -> 12198 bytes themes/light/blue_button.svg | 126 ++++++++++ themes/light/blue_checkbox_13px.bmp | Bin 0 -> 8166 bytes themes/light/blue_checkbox_13px.svg | 236 +++++++++++++++++++ themes/light/blue_checkbox_16px.bmp | Bin 0 -> 12342 bytes themes/light/blue_checkbox_16px.svg | 200 ++++++++++++++++ themes/light/… [View More]

1 0

[PATCH 2/6] themes/light: Add Blue stub visual style.
by Zhiyi Zhang 23 Jun '21

23 Jun '21

Blue is a visual style that uses blue as the main color and contains bitmaps for UI controls. Its system color is the same as Classic Blue. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- themes/light/light.rc | 52 ++++++++++++++++++++++++++++++++++++++++ themes/light/resources.h | 7 +++--- 2 files changed, 56 insertions(+), 3 deletions(-) diff --git a/themes/light/light.rc b/themes/light/light.rc index e0ace9cb52e..dccda341b7c 100644 --- a/themes/light/light.rc +++ b/… [View More]themes/light/light.rc @@ -25,12 +25,14 @@ LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT /* Theme color display names */ STRINGTABLE { + IDS_COLOR_DISPLAY_NAME_BLUE "Blue" IDS_COLOR_DISPLAY_NAME_CLASSIC_BLUE "Classic Blue" } /* Theme color tooltips */ STRINGTABLE { + IDS_COLOR_TOOLTIP_BLUE "Blue" IDS_COLOR_TOOLTIP_CLASSIC_BLUE "Classic Blue" } @@ -54,6 +56,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL /* Theme color names */ 1 COLORNAMES { +"Blue\0" "Classic Blue\0" "\0" } @@ -68,6 +71,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL /* Theme ini files */ 1 FILERESNAMES { +"BLUE_INI\0" "CLASSIC_BLUE_INI\0" "\0" } @@ -129,6 +133,54 @@ CLASSIC_BLUE_INI TEXTFILE "FlatMenus = true\r\n" } +/* Blue theme */ +BLUE_INI TEXTFILE +{ +"[Globals]\r\n" +"EdgeLightColor = 255 255 255\r\n" +"EdgeHighLightColor = 255 255 255\r\n" +"EdgeShadowColor = 189 189 189\r\n" +"EdgeDkShadowColor = 158 158 158\r\n" +"EdgeFillColor = 255 255 255\r\n" + +"\r\n[SysMetrics]\r\n" +"; System colors\r\n" +"Scrollbar = 255 255 255\r\n" +"Background = 37 111 149\r\n" +"ActiveCaption = 50 150 250\r\n" +"InactiveCaption = 245 245 245\r\n" +"Menu = 255 255 255\r\n" +"Window = 255 255 255\r\n" +"WindowFrame = 158 158 158\r\n" +"MenuText = 0 0 0\r\n" +"WindowText = 0 0 0\r\n" +"CaptionText = 0 0 0\r\n" +"ActiveBorder = 255 255 255\r\n" +"InactiveBorder = 255 255 255\r\n" +"AppWorkSpace = 128 128 128\r\n" +"Highlight = 48 150 250\r\n" +"HighlightText = 255 255 255\r\n" +"BtnFace = 245 245 245\r\n" +"BtnShadow = 166 166 166\r\n" +"GrayText = 166 166 166\r\n" +"BtnText = 0 0 0\r\n" +"InactiveCaptionText = 100 100 100\r\n" +"BtnHighlight = 255 255 255\r\n" +"DkShadow3d = 106 106 106\r\n" +"Light3d = 227 227 227\r\n" +"InfoText = 0 0 0\r\n" +"InfoBk = 255 255 255\r\n" +"ButtonAlternateFace = 255 255 255\r\n" +"HotTracking = 224 224 224\r\n" +"GradientActiveCaption = 50 150 250\r\n" +"GradientInactiveCaption = 245 245 245\r\n" +"MenuHilight = 48 150 250\r\n" +"MenuBar = 255 255 255\r\n" + +"\r\n; Flat menus\r\n" +"FlatMenus = true\r\n" +} + /* File version */ #define WINE_FILEDESCRIPTION_STR "Light Theme" #define WINE_FILENAME_STR "light.msstyles" diff --git a/themes/light/resources.h b/themes/light/resources.h index ef75da9f628..c37ef2140f1 100644 --- a/themes/light/resources.h +++ b/themes/light/resources.h @@ -18,8 +18,9 @@ #include <winnt.h> -#define IDS_COLOR_DISPLAY_NAME_CLASSIC_BLUE 1000 -#define IDS_COLOR_TOOLTIP_CLASSIC_BLUE 2000 +#define IDS_COLOR_DISPLAY_NAME_BLUE 1000 +#define IDS_COLOR_DISPLAY_NAME_CLASSIC_BLUE 1001 +#define IDS_COLOR_TOOLTIP_BLUE 2000 +#define IDS_COLOR_TOOLTIP_CLASSIC_BLUE 2001 #define IDS_SIZE_DISPLAY_NAME_NORMAL 3000 #define IDS_SIZE_TOOLTIP_NORMAL 4000 - -- 2.30.2 [View Less]

1 0

← Newer
1
...
18
19
20
21
22
23
24
...
61
Older →

Jump to page:

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 June 2021