- wine-devel - winehq.org

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

25 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..4ea0efeb 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, 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 6

[PATCH] oleaut32: ICreateTypeInfo2::AddVarDesc() should handle failure of allocation and initialization of a variant description.
by Dmitry Timoshkov 25 Jun '21

25 Jun '21

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/oleaut32/typelib.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 4669b03d5fc..0526af0abdb 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -11019,6 +11019,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddVarDesc(ICreateTypeInfo2 *iface, { ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface); TLBVarDesc *var_desc; + HRESULT hr; TRACE("%p %u %p\n", This, index, varDesc); @@ -11044,7 +11045,9 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddVarDesc(ICreateTypeInfo2 *iface, var_desc = This->vardescs = heap_alloc_zero(sizeof(TLBVarDesc)); TLBVarDesc_Constructor(var_desc); - TLB_AllocAndInitVarDesc(varDesc, &var_desc->vardesc_create); + hr = TLB_AllocAndInitVarDesc(varDesc, &var_desc->vardesc_create); + if (FAILED(hr)) + return hr; var_desc->vardesc = *var_desc->vardesc_create; ++This->typeattr.cVars; -- 2.31.1

1 0

[PATCH] ntdll: Fix null pointer dereference in RtlDosPathNameToNtPathName_U_WithStatus.
by Akihiro Sagawa 25 Jun '21

25 Jun '21

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/ntdll/path.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[PATCH v3 5/5] nsi/tests: Add tests for the NDIS ifinfo table.
by Huw Davies 25 Jun '21

25 Jun '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/nsi/tests/Makefile.in | 5 ++ dlls/nsi/tests/nsi.c | 149 +++++++++++++++++++++++++++++++++++++ include/wine/nsi.h | 73 ++++++++++++++++++ 3 files changed, 227 insertions(+) create mode 100644 dlls/nsi/tests/Makefile.in create mode 100644 dlls/nsi/tests/nsi.c diff --git a/dlls/nsi/tests/Makefile.in b/dlls/nsi/tests/Makefile.in new file mode 100644 index 00000000000..98129935198 --- /dev/null +++ b/dlls/nsi/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = nsi.dll +IMPORTS = nsi uuid iphlpapi + +C_SRCS = \ + nsi.c diff --git a/dlls/nsi/tests/nsi.c b/dlls/nsi/tests/nsi.c new file mode 100644 index 00000000000..0cdb1993f1c --- /dev/null +++ b/dlls/nsi/tests/nsi.c @@ -0,0 +1,149 @@ +/* + * Network Store Interface tests + * + * Copyright 2021 Huw Davies + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "winsock2.h" +#include "winternl.h" +#include "ws2ipdef.h" +#include "iphlpapi.h" +#include "netioapi.h" +#include "iptypes.h" +#include "netiodef.h" +#include "wine/nsi.h" +#include "wine/test.h" + +static int bounded( ULONG64 val, ULONG64 lo, ULONG64 hi ) +{ + return lo <= val && val <= hi; +} + +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), + sizeof(struct nsi_ndis_ifinfo_rw) }; + struct nsi_ndis_ifinfo_rw *rw_tbl; + struct nsi_ndis_ifinfo_dynamic *dyn_tbl, *dyn_tbl_2; + struct nsi_ndis_ifinfo_static *stat_tbl; + DWORD err, count, i, rw_size; + NET_LUID *luid_tbl, *luid_tbl_2; + MIB_IF_TABLE2 *table; + + /* Contents of GetIfTable2() keyed by luids */ + + 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]; + + err = GetIfTable2( &table ); + ok( !err, "got %d\n", err ); + ok( table->NumEntries == count, "table entries %d count %d\n", table->NumEntries, count ); + + /* Grab the dyn table again to provide an upper bound for the stats returned from GetIfTable2(). + (The luids must be retrieved again otherwise NsiAllocateAndGetTable() fails). */ + err = NsiAllocateAndGetTable( 1, &NPI_MS_NDIS_MODULEID, NSI_NDIS_IFINFO_TABLE, (void **)&luid_tbl_2, sizeof(*luid_tbl_2), + NULL, 0, (void **)&dyn_tbl_2, sizeof(*dyn_tbl_2), + NULL, 0, &count, 0 ); + ok( !err, "got %d\n", err ); + ok( table->NumEntries == count, "table entries %d count %d\n", table->NumEntries, count ); + + for (i = 0; i < count; i++) + { + MIB_IF_ROW2 *row = table->Table + i; + NET_LUID *luid = luid_tbl + i; + struct nsi_ndis_ifinfo_rw *rw = (struct nsi_ndis_ifinfo_rw *)((BYTE *)rw_tbl + i * rw_size); + struct nsi_ndis_ifinfo_dynamic *dyn = dyn_tbl + i, *dyn_2 = dyn_tbl_2 + i; + struct nsi_ndis_ifinfo_static *stat = stat_tbl + i; + + winetest_push_context( "%d", i ); + ok( row->InterfaceLuid.Value == luid->Value, "mismatch\n" ); + ok( row->InterfaceIndex == stat->if_index, "mismatch\n" ); + ok( IsEqualGUID( &row->InterfaceGuid, &stat->if_guid ), "mismatch\n" ); + ok( !memcmp( row->Alias, rw->alias.String, rw->alias.Length ), "mismatch\n" ); + ok( lstrlenW( row->Alias ) * 2 == rw->alias.Length, "mismatch\n" ); + ok( !memcmp( row->Description, stat->descr.String, sizeof(row->Description) ), "mismatch\n" ); + ok( lstrlenW( row->Description ) * 2 == stat->descr.Length, "mismatch\n" ); + ok( row->PhysicalAddressLength == rw->phys_addr.Length, "mismatch\n" ); + ok( !memcmp( row->PhysicalAddress, rw->phys_addr.Address, IF_MAX_PHYS_ADDRESS_LENGTH ), "mismatch\n" ); + ok( row->PhysicalAddressLength == stat->perm_phys_addr.Length, "mismatch\n" ); + ok( !memcmp( row->PermanentPhysicalAddress, stat->perm_phys_addr.Address, IF_MAX_PHYS_ADDRESS_LENGTH ), + "mismatch\n" ); + ok( row->Mtu == dyn->mtu, "mismatch\n" ); + ok( row->Type == stat->type, "mismatch\n" ); + /* TunnelType */ + ok( row->MediaType == stat->media_type, "mismatch\n" ); + ok( row->PhysicalMediumType == stat->phys_medium_type, "mismatch\n" ); + ok( row->AccessType == stat->access_type, "mismatch\n" ); + /* DirectionType */ + ok( row->InterfaceAndOperStatusFlags.HardwareInterface == stat->flags.hw, "mismatch\n" ); + ok( row->InterfaceAndOperStatusFlags.FilterInterface == stat->flags.filter, "mismatch\n" ); + ok( row->InterfaceAndOperStatusFlags.ConnectorPresent == stat->conn_present, "mismatch\n" ); + /* NotAuthenticated */ + ok( row->InterfaceAndOperStatusFlags.NotMediaConnected == dyn->flags.not_media_conn, "mismatch\n" ); + /* Paused */ + /* LowPower */ + /* EndPointInterface */ + ok( row->OperStatus == dyn->oper_status, "mismatch\n" ); + ok( row->AdminStatus == rw->admin_status, "mismatch\n" ); + ok( row->MediaConnectState == dyn->media_conn_state, "mismatch\n" ); + ok( IsEqualGUID( &row->NetworkGuid, &rw->network_guid ), "mismatch\n" ); + ok( row->ConnectionType == stat->conn_type, "mismatch\n" ); + if (dyn->xmit_speed == ~0ULL) dyn->xmit_speed = 0; + ok( row->TransmitLinkSpeed == dyn->xmit_speed, "mismatch\n" ); + if (dyn->rcv_speed == ~0ULL) dyn->rcv_speed = 0; + ok( row->ReceiveLinkSpeed == dyn->rcv_speed, "mismatch\n" ); + ok( bounded( row->InOctets, dyn->in_octets, dyn_2->in_octets ), "mismatch\n" ); + ok( bounded( row->InUcastPkts, dyn->in_ucast_pkts, dyn_2->in_ucast_pkts ), "mismatch\n" ); + ok( bounded( row->InNUcastPkts, dyn->in_mcast_pkts + dyn->in_bcast_pkts, + dyn_2->in_mcast_pkts + dyn_2->in_bcast_pkts ), "mismatch\n" ); + ok( bounded( row->InDiscards, dyn->in_discards, dyn_2->in_discards ), "mismatch\n" ); + ok( bounded( row->InErrors, dyn->in_errors, dyn_2->in_errors ), "mismatch\n" ); + /* InUnknownProtos */ + ok( bounded( row->InUcastOctets, dyn->in_ucast_octs, dyn_2->in_ucast_octs ), "mismatch\n" ); + ok( bounded( row->InMulticastOctets, dyn->in_mcast_octs, dyn_2->in_mcast_octs ), "mismatch\n" ); + ok( bounded( row->InBroadcastOctets, dyn->in_bcast_octs, dyn_2->in_bcast_octs ), "mismatch\n" ); + ok( bounded( row->OutOctets, dyn->out_octets, dyn_2->out_octets ), "mismatch\n" ); + ok( bounded( row->OutUcastPkts, dyn->out_ucast_pkts, dyn_2->out_ucast_pkts ), "mismatch\n" ); + ok( bounded( row->OutNUcastPkts, dyn->out_mcast_pkts + dyn->out_bcast_pkts, + dyn_2->out_mcast_pkts + dyn_2->out_bcast_pkts ), "mismatch\n" ); + ok( bounded( row->OutDiscards, dyn->out_discards, dyn_2->out_discards ), "mismatch\n" ); + ok( bounded( row->OutErrors, dyn->out_errors, dyn_2->out_errors ), "mismatch\n" ); + ok( bounded( row->OutUcastOctets, dyn->out_ucast_octs, dyn_2->out_ucast_octs ), "mismatch\n" ); + ok( bounded( row->OutMulticastOctets, dyn->out_mcast_octs, dyn_2->out_mcast_octs ), "mismatch\n" ); + ok( bounded( row->OutBroadcastOctets, dyn->out_bcast_octs, dyn_2->out_bcast_octs ), "mismatch\n" ); + /* OutQLen */ + winetest_pop_context(); + } + + FreeMibTable( table ); + NsiFreeTable( luid_tbl_2, NULL, dyn_tbl_2, NULL ); + NsiFreeTable( luid_tbl, rw_tbl, dyn_tbl, stat_tbl ); +} + +START_TEST( nsi ) +{ + test_ndis_ifinfo(); +} diff --git a/include/wine/nsi.h b/include/wine/nsi.h index 594d6f9ea5d..362eaed0c4e 100644 --- a/include/wine/nsi.h +++ b/include/wine/nsi.h @@ -19,6 +19,79 @@ #ifndef __WINE_NSI_H #define __WINE_NSI_H +/* Undocumented NSI NDIS tables */ +#define NSI_NDIS_IFINFO_TABLE 0 +#define NSI_NDIS_INDEX_LUID_TABLE 2 + +struct nsi_ndis_ifinfo_rw +{ + GUID network_guid; + DWORD admin_status; + IF_COUNTED_STRING alias; /* .Length in bytes not including '\0' */ + IF_PHYSICAL_ADDRESS phys_addr; + USHORT pad; + IF_COUNTED_STRING name2; + DWORD unk; +}; + +struct nsi_ndis_ifinfo_dynamic +{ + DWORD oper_status; + struct + { + DWORD unk : 1; + DWORD not_media_conn : 1; + DWORD unk2 : 30; + } flags; + DWORD media_conn_state; + DWORD unk; + DWORD mtu; + ULONG64 xmit_speed; + ULONG64 rcv_speed; + ULONG64 in_errors; + ULONG64 in_discards; + ULONG64 out_errors; + ULONG64 out_discards; + ULONG64 unk2; + ULONG64 in_octets; + ULONG64 in_ucast_pkts; + ULONG64 in_mcast_pkts; + ULONG64 in_bcast_pkts; + ULONG64 out_octets; + ULONG64 out_ucast_pkts; + ULONG64 out_mcast_pkts; + ULONG64 out_bcast_pkts; + ULONG64 unk3[2]; + ULONG64 in_ucast_octs; + ULONG64 in_mcast_octs; + ULONG64 in_bcast_octs; + ULONG64 out_ucast_octs; + ULONG64 out_mcast_octs; + ULONG64 out_bcast_octs; + ULONG64 unk4; +}; + +struct nsi_ndis_ifinfo_static +{ + DWORD if_index; + IF_COUNTED_STRING descr; + DWORD type; + DWORD access_type; + DWORD unk; + DWORD conn_type; + GUID if_guid; + USHORT conn_present; + IF_PHYSICAL_ADDRESS perm_phys_addr; + struct + { + DWORD hw : 1; + DWORD filter : 1; + DWORD unk : 30; + } flags; + DWORD media_type; + DWORD phys_medium_type; +}; + /* Undocumented Nsi api */ 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, -- 2.23.0

1 0

[PATCH v3 4/5] nsi: Add stub implementations of NsiAllocateAndGetTable() and NsiFreeTable().
by Huw Davies 25 Jun '21

25 Jun '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/nsi/Makefile.in | 3 +++ dlls/nsi/nsi.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ dlls/nsi/nsi.spec | 4 ++-- include/wine/nsi.h | 28 ++++++++++++++++++++++++++++ 4 files changed, 77 insertions(+), 2 deletions(-) create mode 100644 dlls/nsi/nsi.c create mode 100644 include/wine/nsi.h diff --git a/dlls/nsi/Makefile.in b/dlls/nsi/Makefile.in index 634c4011ed9..68126cab6c6 100644 --- a/dlls/nsi/Makefile.in +++ b/dlls/nsi/Makefile.in @@ -2,3 +2,6 @@ MODULE = nsi.dll IMPORTLIB = nsi EXTRADLLFLAGS = -mno-cygwin + +C_SRCS = \ + nsi.c diff --git a/dlls/nsi/nsi.c b/dlls/nsi/nsi.c new file mode 100644 index 00000000000..d55445a3dd7 --- /dev/null +++ b/dlls/nsi/nsi.c @@ -0,0 +1,44 @@ +/* + * Network Store Interface + * + * Copyright 2021 Huw Davies + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#include "winsock2.h" +#include "winternl.h" +#include "ws2ipdef.h" +#include "iphlpapi.h" +#include "netioapi.h" +#include "iptypes.h" +#include "netiodef.h" +#include "wine/nsi.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(nsi); + +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 ) +{ + FIXME( "%d %p %d %p %d %p %d %p %d %p %d %p %d: stub\n", unk, module, table, key_data, key_size, + rw_data, rw_size, dynamic_data, dynamic_size, static_data, static_size, count, unk2 ); + 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 2d500d30e94..fc2db9e35c1 100644 --- a/dlls/nsi/nsi.spec +++ b/dlls/nsi/nsi.spec @@ -1,5 +1,5 @@ @ stub NsiAllocateAndGetPersistentDataWithMaskTable -@ stub NsiAllocateAndGetTable +@ stdcall NsiAllocateAndGetTable(long ptr long ptr long ptr long ptr long ptr long ptr long) @ stub NsiCancelChangeNotification @ stub NsiDeregisterChangeNotification @ stub NsiDeregisterChangeNotificationEx @@ -7,7 +7,7 @@ @ stub NsiEnumerateObjectsAllParametersEx @ stub NsiEnumerateObjectsAllPersistentParametersWithMask @ stub NsiFreePersistentDataWithMaskTable -@ stub NsiFreeTable +@ stdcall NsiFreeTable(ptr ptr ptr ptr) @ stub NsiGetAllParameters @ stub NsiGetAllParametersEx @ stub NsiGetAllPersistentParametersWithMask diff --git a/include/wine/nsi.h b/include/wine/nsi.h new file mode 100644 index 00000000000..594d6f9ea5d --- /dev/null +++ b/include/wine/nsi.h @@ -0,0 +1,28 @@ +/* + * 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_NSI_H +#define __WINE_NSI_H + +/* Undocumented Nsi api */ +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 ); +void WINAPI NsiFreeTable( void *key_data, void *rw_data, void *dynamic_data, void *static_data ); + +#endif /* __WINE_NSI_H */ -- 2.23.0

1 0

[PATCH v3 3/5] nsi: Add a stub dll.
by Huw Davies 25 Jun '21

25 Jun '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/nsi/Makefile.in | 4 ++++ dlls/nsi/nsi.spec | 26 ++++++++++++++++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 dlls/nsi/Makefile.in create mode 100644 dlls/nsi/nsi.spec diff --git a/dlls/nsi/Makefile.in b/dlls/nsi/Makefile.in new file mode 100644 index 00000000000..634c4011ed9 --- /dev/null +++ b/dlls/nsi/Makefile.in @@ -0,0 +1,4 @@ +MODULE = nsi.dll +IMPORTLIB = nsi + +EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/nsi/nsi.spec b/dlls/nsi/nsi.spec new file mode 100644 index 00000000000..2d500d30e94 --- /dev/null +++ b/dlls/nsi/nsi.spec @@ -0,0 +1,26 @@ +@ stub NsiAllocateAndGetPersistentDataWithMaskTable +@ stub NsiAllocateAndGetTable +@ stub NsiCancelChangeNotification +@ stub NsiDeregisterChangeNotification +@ stub NsiDeregisterChangeNotificationEx +@ stub NsiEnumerateObjectsAllParameters +@ stub NsiEnumerateObjectsAllParametersEx +@ stub NsiEnumerateObjectsAllPersistentParametersWithMask +@ stub NsiFreePersistentDataWithMaskTable +@ stub NsiFreeTable +@ stub NsiGetAllParameters +@ stub NsiGetAllParametersEx +@ stub NsiGetAllPersistentParametersWithMask +@ stub NsiObjectSecurity +@ stub NsiGetParameter +@ stub NsiGetParameterEx +@ stub NsiRegisterChangeNotification +@ stub NsiRegisterChangeNotificationEx +@ stub NsiRequestChangeNotification +@ stub NsiRequestChangeNotificationEx +@ stub NsiSetAllParameters +@ stub NsiSetAllParametersEx +@ stub NsiSetAllPersistentParametersWithMask +@ stub NsiSetObjectSecurity +@ stub NsiSetParameter +@ stub NsiSetParameterEx -- 2.23.0

1 0

[PATCH v3 2/5] uuid: Add a few NPI module ids.
by Huw Davies 25 Jun '21

25 Jun '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/uuid/uuid.c | 3 +++ include/netiodef.h | 29 +++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/dlls/uuid/uuid.c b/dlls/uuid/uuid.c index eacb83301d1..aa7ad3dd678 100644 --- a/dlls/uuid/uuid.c +++ b/dlls/uuid/uuid.c @@ -92,6 +92,9 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); #include "comsvcs.h" #include "directmanipulation.h" +#define __WINE_INIT_NPI_MODULEID +#include "netiodef.h" + /* FIXME: cguids declares GUIDs but does not define their values */ /* GUIDs not declared in an exported header file */ diff --git a/include/netiodef.h b/include/netiodef.h index 611359c49f8..658dd235db0 100644 --- a/include/netiodef.h +++ b/include/netiodef.h @@ -57,4 +57,33 @@ static inline BOOLEAN NmrIsEqualNpiModuleId( const NPI_MODULEID *mod1, const NPI return FALSE; } +#ifdef __WINE_INIT_NPI_MODULEID +#ifdef __cplusplus +#define DEFINE_NPI_GUID_MODULEID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \ + EXTERN_C const NPI_MODULEID name DECLSPEC_HIDDEN; \ + EXTERN_C const NPI_MODULEID name = \ + { sizeof(NPI_MODULEID), MIT_GUID, { { l, w1, w2, { b1, b2, b3, b4, b5, b6, b7, b8 } } } } +#else +#define DEFINE_NPI_GUID_MODULEID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \ + const NPI_MODULEID name DECLSPEC_HIDDEN; \ + const NPI_MODULEID name = \ + { sizeof(NPI_MODULEID), MIT_GUID, { { l, w1, w2, { b1, b2, b3, b4, b5, b6, b7, b8 } } } } +#endif +#else /* __WINE_INIT_MODULEID */ +#define DEFINE_NPI_GUID_MODULEID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \ + EXTERN_C const NPI_MODULEID name DECLSPEC_HIDDEN +#endif /* __WINE_INIT_MODULEID */ + +#define DEFINE_NPI_MS_MODULEID(name, n) DEFINE_NPI_GUID_MODULEID(name, 0xeb004a00 + (n), 0x9b1a, 0x11d4, \ + 0x91, 0x23, 0x00, 0x50, 0x04, 0x77, 0x59, 0xbc) + +DEFINE_NPI_MS_MODULEID( NPI_MS_IPV4_MODULEID, 0x00 ); +DEFINE_NPI_MS_MODULEID( NPI_MS_IPV6_MODULEID, 0x01 ); +DEFINE_NPI_MS_MODULEID( NPI_MS_UDP_MODULEID, 0x02 ); +DEFINE_NPI_MS_MODULEID( NPI_MS_TCP_MODULEID, 0x03 ); +DEFINE_NPI_MS_MODULEID( NPI_MS_NDIS_MODULEID, 0x11 ); + +#undef DEFINE_NPI_MS_MODULEID +#undef DEFINE_NPI_GUID_MODULEID + #endif /* __WINE_NETIODEF_H */ -- 2.23.0

1 0

[PATCH v3 1/5] include: Add netiodef.h.
by Huw Davies 25 Jun '21

25 Jun '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- include/Makefile.in | 1 + include/netiodef.h | 60 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+) create mode 100644 include/netiodef.h 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 */ -- 2.23.0

1 0

[PATCH 1/5] hid: Introduce new copy_bits helper for HidP_SetUsageValueArray.
by Rémi Bernon 25 Jun '21

25 Jun '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/hid/hidp.c | 70 ++++++++++++++++++++++++++++-- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 6 +-- 2 files changed, 68 insertions(+), 8 deletions(-) diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c index 8d893f6327d..827de20c634 100644 --- a/dlls/hid/hidp.c +++ b/dlls/hid/hidp.c @@ -70,6 +70,7 @@ struct caps_filter { BOOLEAN buttons; BOOLEAN values; + BOOLEAN array; USAGE usage_page; USHORT collection; USAGE usage; @@ -102,6 +103,7 @@ static NTSTATUS enum_value_caps( WINE_HIDP_PREPARSED_DATA *preparsed, HIDP_REPOR { if (!match_value_caps( caps, filter )) continue; if (filter->report_id && caps->report_id != filter->report_id) continue; + 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 ); } @@ -114,6 +116,44 @@ static NTSTATUS enum_value_caps( WINE_HIDP_PREPARSED_DATA *preparsed, HIDP_REPOR return HIDP_STATUS_SUCCESS; } +/* copy count bits from src, starting at (-shift) bit if < 0, to dst starting at (shift) bit if > 0 */ +static void copy_bits( unsigned char *dst, const unsigned char *src, int count, int shift ) +{ + unsigned char bits, mask; + size_t src_shift = shift < 0 ? (-shift & 7) : 0; + size_t dst_shift = shift > 0 ? (shift & 7) : 0; + if (shift < 0) src += -shift / 8; + if (shift > 0) dst += shift / 8; + + if (src_shift == 0 && dst_shift == 0) + { + memcpy( dst, src, count / 8 ); + dst += count / 8; + src += count / 8; + count &= 7; + } + + if (!count) return; + + bits = *dst << (8 - dst_shift); + count += dst_shift; + + while (count > 8) + { + *dst = bits >> (8 - dst_shift); + bits = *(unsigned short *)src++ >> src_shift; + *dst++ |= bits << dst_shift; + count -= 8; + } + + bits >>= (8 - dst_shift); + if (count <= 8 - src_shift) bits |= (*src >> src_shift) << dst_shift; + else bits |= (*(unsigned short *)src >> src_shift) << dst_shift; + + mask = (1 << count) - 1; + *dst = (bits & mask) | (*dst & ~mask); +} + static NTSTATUS get_report_data(BYTE *report, INT reportLength, INT startBit, INT valueSize, PULONG value) { @@ -323,6 +363,13 @@ static NTSTATUS find_usage(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT return HIDP_STATUS_USAGE_NOT_FOUND; } +struct usage_value_params +{ + void *value_buf; + USHORT value_len; + void *report_buf; +}; + static LONG sign_extend(ULONG value, const WINE_HID_ELEMENT *element) { UINT bit_count = element->bitCount; @@ -514,6 +561,15 @@ ULONG WINAPI HidP_MaxUsageListLength( HIDP_REPORT_TYPE report_type, USAGE usage_ return count; } +static NTSTATUS set_usage_value( const struct hid_value_caps *caps, void *user ) +{ + struct usage_value_params *params = user; + ULONG bit_count = caps->bit_size * caps->report_count; + if ((bit_count + 7) / 8 > params->value_len) return HIDP_STATUS_BUFFER_TOO_SMALL; + copy_bits( params->report_buf, params->value_buf, bit_count, caps->start_bit ); + return HIDP_STATUS_NULL; +} + NTSTATUS WINAPI HidP_SetUsageValue(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection, USAGE Usage, ULONG UsageValue, PHIDP_PREPARSED_DATA PreparsedData, CHAR *Report, ULONG ReportLength) @@ -539,11 +595,19 @@ NTSTATUS WINAPI HidP_SetUsageValueArray( HIDP_REPORT_TYPE report_type, USAGE usa USAGE usage, char *value_buf, USHORT value_len, PHIDP_PREPARSED_DATA preparsed_data, char *report_buf, ULONG report_len ) { - FIXME( "report_type %d, usage_page %x, collection %d, usage %x, value_buf %p, value_len %u, " - "preparsed_data %p, report_buf %p, report_len %u stub!\n", + struct usage_value_params params = {.value_buf = value_buf, .value_len = value_len, .report_buf = report_buf}; + WINE_HIDP_PREPARSED_DATA *preparsed = (WINE_HIDP_PREPARSED_DATA *)preparsed_data; + struct caps_filter filter = {.values = TRUE, .array = TRUE, .usage_page = usage_page, .collection = collection, .usage = usage}; + USHORT count = 1; + + TRACE( "report_type %d, usage_page %x, collection %d, usage %x, value_buf %p, value_len %u, " + "preparsed_data %p, report_buf %p, report_len %u.\n", report_type, usage_page, collection, usage, value_buf, value_len, preparsed_data, report_buf, report_len ); - return HIDP_STATUS_NOT_IMPLEMENTED; + if (!report_len) return HIDP_STATUS_INVALID_REPORT_LENGTH; + + filter.report_id = report_buf[0]; + return enum_value_caps( preparsed, report_type, report_len, &filter, set_usage_value, &params, &count ); } struct set_usage_params diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index ca030599299..3185b0f7893 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -2021,15 +2021,14 @@ static void test_hidp(HANDLE file, int report_id) status = HidP_SetUsageValueArray(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_X, buffer, sizeof(buffer), preparsed_data, report, caps.InputReportByteLength); - todo_wine ok(status == HIDP_STATUS_NOT_VALUE_ARRAY, "HidP_SetUsageValueArray returned %#x\n", status); memset(buffer, 0xcd, sizeof(buffer)); status = HidP_SetUsageValueArray(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_HATSWITCH, buffer, 0, preparsed_data, report, caps.InputReportByteLength); - todo_wine ok(status == HIDP_STATUS_BUFFER_TOO_SMALL, "HidP_SetUsageValueArray returned %#x\n", status); status = HidP_SetUsageValueArray(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_HATSWITCH, buffer, 8, preparsed_data, report, caps.InputReportByteLength); + todo_wine ok(status == HIDP_STATUS_NOT_IMPLEMENTED, "HidP_SetUsageValueArray returned %#x\n", status); status = HidP_GetUsageValueArray(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_X, buffer, @@ -2365,13 +2364,10 @@ static void test_hidp(HANDLE file, int report_id) memset(buffer, 0xff, sizeof(buffer)); status = HidP_SetUsageValueArray(HidP_Feature, HID_USAGE_PAGE_HAPTICS, 0, HID_USAGE_HAPTICS_WAVEFORM_CUTOFF_TIME, buffer, 0, preparsed_data, report, caps.FeatureReportByteLength); - todo_wine ok(status == HIDP_STATUS_BUFFER_TOO_SMALL, "HidP_SetUsageValueArray returned %#x\n", status); status = HidP_SetUsageValueArray(HidP_Feature, HID_USAGE_PAGE_HAPTICS, 0, HID_USAGE_HAPTICS_WAVEFORM_CUTOFF_TIME, buffer, 64, preparsed_data, report, caps.FeatureReportByteLength); - todo_wine ok(status == HIDP_STATUS_SUCCESS, "HidP_SetUsageValueArray returned %#x\n", status); - todo_wine ok(!memcmp(report + 9, buffer, 8), "unexpected report data\n"); memset(buffer, 0, sizeof(buffer)); -- 2.32.0

2 6

[PATCH v2 5/5] nsi/tests: Add tests for the NDIS ifinfo table.
by Huw Davies 25 Jun '21

25 Jun '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/nsi/tests/Makefile.in | 5 ++ dlls/nsi/tests/nsi.c | 146 +++++++++++++++++++++++++++++++++++++ include/wine/nsi.h | 73 +++++++++++++++++++ 3 files changed, 224 insertions(+) create mode 100644 dlls/nsi/tests/Makefile.in create mode 100644 dlls/nsi/tests/nsi.c diff --git a/dlls/nsi/tests/Makefile.in b/dlls/nsi/tests/Makefile.in new file mode 100644 index 00000000000..98129935198 --- /dev/null +++ b/dlls/nsi/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = nsi.dll +IMPORTS = nsi uuid iphlpapi + +C_SRCS = \ + nsi.c diff --git a/dlls/nsi/tests/nsi.c b/dlls/nsi/tests/nsi.c new file mode 100644 index 00000000000..2fc1876c833 --- /dev/null +++ b/dlls/nsi/tests/nsi.c @@ -0,0 +1,146 @@ +/* + * Network Store Interface tests + * + * Copyright 2021 Huw Davies + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "winsock2.h" +#include "winternl.h" +#include "ws2ipdef.h" +#include "iphlpapi.h" +#include "netioapi.h" +#include "iptypes.h" +#include "netiodef.h" +#include "wine/nsi.h" +#include "wine/test.h" + +static int bounded( ULONG64 val, ULONG64 lo, ULONG64 hi ) +{ + return lo <= val && val <= hi; +} + +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), + sizeof(struct nsi_ndis_ifinfo_rw) }; + struct nsi_ndis_ifinfo_rw *rw_tbl; + struct nsi_ndis_ifinfo_dynamic *dyn_tbl, *dyn_tbl_2; + struct nsi_ndis_ifinfo_static *stat_tbl; + DWORD err, count, i, rw_size; + NET_LUID *luid_tbl, *luid_tbl_2; + MIB_IF_TABLE2 *table; + + /* Contents of GetIfTable2() keyed by luids */ + + 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]; + + err = GetIfTable2( &table ); + ok( !err, "got %d\n", err ); + ok( table->NumEntries == count, "table entries %d count %d\n", table->NumEntries, count ); + + /* Grab the dyn table again to provide an upper bound for the stats returned from GetIfTable2(). + (The luids must be retrieved again otherwise NsiAllocateAndGetTable() fails). */ + err = NsiAllocateAndGetTable( 1, &NPI_MS_NDIS_MODULEID, NSI_NDIS_IFINFO_TABLE, (void **)&luid_tbl_2, sizeof(*luid_tbl_2), + NULL, 0, (void **)&dyn_tbl_2, sizeof(*dyn_tbl_2), + NULL, 0, &count, 0 ); + ok( !err, "got %d\n", err ); + ok( table->NumEntries == count, "table entries %d count %d\n", table->NumEntries, count ); + + for (i = 0; i < count; i++) + { + MIB_IF_ROW2 *row = table->Table + i; + NET_LUID *luid = luid_tbl + i; + struct nsi_ndis_ifinfo_rw *rw = (struct nsi_ndis_ifinfo_rw *)((BYTE *)rw_tbl + i * rw_size); + struct nsi_ndis_ifinfo_dynamic *dyn = dyn_tbl + i, *dyn_2 = dyn_tbl_2 + i; + struct nsi_ndis_ifinfo_static *stat = stat_tbl + i; + + ok( row->InterfaceLuid.Value == luid->Value, "%d: mismatch\n", i ); + ok( row->InterfaceIndex == stat->if_index, "%d: mismatch\n", i ); + ok( IsEqualGUID( &row->InterfaceGuid, &stat->if_guid ), "%d: mismatch\n", i ); + ok( !memcmp( row->Alias, rw->alias.String, rw->alias.Length ), "%d: mismatch\n", i ); + ok( lstrlenW( row->Alias ) * 2 == rw->alias.Length, "%d: mismatch\n", i ); + ok( !memcmp( row->Description, stat->descr.String, sizeof(row->Description) ), "%d: mismatch\n", i ); + ok( lstrlenW( row->Description ) * 2 == stat->descr.Length, "%d: mismatch\n", i ); + ok( row->PhysicalAddressLength == rw->phys_addr.Length, "%d: mismatch\n", i ); + ok( !memcmp( row->PhysicalAddress, rw->phys_addr.Address, IF_MAX_PHYS_ADDRESS_LENGTH ), "%d: mismatch\n", i ); + ok( row->PhysicalAddressLength == stat->perm_phys_addr.Length, "%d: mismatch\n", i ); + ok( !memcmp( row->PermanentPhysicalAddress, stat->perm_phys_addr.Address, IF_MAX_PHYS_ADDRESS_LENGTH ), "%d: mismatch\n", i ); + ok( row->Mtu == dyn->mtu, "%d: mismatch\n", i ); + ok( row->Type == stat->type, "%d: mismatch\n", i ); + /* TunnelType */ + ok( row->MediaType == stat->media_type, "%d: mismatch\n", i ); + ok( row->PhysicalMediumType == stat->phys_medium_type, "%d: mismatch\n", i ); + ok( row->AccessType == stat->access_type, "%d: mismatch\n", i ); + /* DirectionType */ + ok( row->InterfaceAndOperStatusFlags.HardwareInterface == stat->flags.hw, "%d: mismatch\n", i ); + ok( row->InterfaceAndOperStatusFlags.FilterInterface == stat->flags.filter, "%d: mismatch\n", i ); + ok( row->InterfaceAndOperStatusFlags.ConnectorPresent == stat->conn_present, "%d: mismatch\n", i ); + /* NotAuthenticated */ + ok( row->InterfaceAndOperStatusFlags.NotMediaConnected == dyn->flags.not_media_conn, "%d: mismatch\n", i ); + /* Paused */ + /* LowPower */ + /* EndPointInterface */ + ok( row->OperStatus == dyn->oper_status, "%d: mismatch\n", i ); + ok( row->AdminStatus == rw->admin_status, "%d: mismatch\n", i ); + ok( row->MediaConnectState == dyn->media_conn_state, "%d: status mismatch\n", i ); + ok( IsEqualGUID( &row->NetworkGuid, &rw->network_guid ), "%d: mismatch\n", i ); + ok( row->ConnectionType == stat->conn_type, "%d: mismatch\n", i ); + if (dyn->xmit_speed == ~0ULL) dyn->xmit_speed = 0; + ok( row->TransmitLinkSpeed == dyn->xmit_speed, "%d: mismatch\n", i ); + if (dyn->rcv_speed == ~0ULL) dyn->rcv_speed = 0; + ok( row->ReceiveLinkSpeed == dyn->rcv_speed, "%d: mismatch\n", i ); + ok( bounded( row->InOctets, dyn->in_octets, dyn_2->in_octets ), "%d: mismatch\n", i ); + ok( bounded( row->InUcastPkts, dyn->in_ucast_pkts, dyn_2->in_ucast_pkts ), "%d: mismatch\n", i ); + ok( bounded( row->InNUcastPkts, dyn->in_mcast_pkts + dyn->in_bcast_pkts, + dyn_2->in_mcast_pkts + dyn_2->in_bcast_pkts ), "%d: mismatch\n", i ); + ok( bounded( row->InDiscards, dyn->in_discards, dyn_2->in_discards ), "%d: mismatch\n", i ); + ok( bounded( row->InErrors, dyn->in_errors, dyn_2->in_errors ), "%d: mismatch\n", i ); + /* InUnknownProtos */ + ok( bounded( row->InUcastOctets, dyn->in_ucast_octs, dyn_2->in_ucast_octs ), "%d: mismatch\n", i ); + ok( bounded( row->InMulticastOctets, dyn->in_mcast_octs, dyn_2->in_mcast_octs ), "%d: mismatch\n", i ); + ok( bounded( row->InBroadcastOctets, dyn->in_bcast_octs, dyn_2->in_bcast_octs ), "%d: mismatch\n", i ); + ok( bounded( row->OutOctets, dyn->out_octets, dyn_2->out_octets ), "%d: mismatch\n", i ); + ok( bounded( row->OutUcastPkts, dyn->out_ucast_pkts, dyn_2->out_ucast_pkts ), "%d: mismatch\n", i ); + ok( bounded( row->OutNUcastPkts, dyn->out_mcast_pkts + dyn->out_bcast_pkts, + dyn_2->out_mcast_pkts + dyn_2->out_bcast_pkts ), "%d: mismatch\n", i ); + ok( bounded( row->OutDiscards, dyn->out_discards, dyn_2->out_discards ), "%d: mismatch\n", i ); + ok( bounded( row->OutErrors, dyn->out_errors, dyn_2->out_errors ), "%d: mismatch\n", i ); + ok( bounded( row->OutUcastOctets, dyn->out_ucast_octs, dyn_2->out_ucast_octs ), "%d: mismatch\n", i ); + ok( bounded( row->OutMulticastOctets, dyn->out_mcast_octs, dyn_2->out_mcast_octs ), "%d: mismatch\n", i ); + ok( bounded( row->OutBroadcastOctets, dyn->out_bcast_octs, dyn_2->out_bcast_octs ), "%d: mismatch\n", i ); + /* OutQLen */ + } + + FreeMibTable( table ); + NsiFreeTable( luid_tbl_2, NULL, dyn_tbl_2, NULL ); + NsiFreeTable( luid_tbl, rw_tbl, dyn_tbl, stat_tbl ); +} + +START_TEST( nsi ) +{ + test_ndis_ifinfo(); +} diff --git a/include/wine/nsi.h b/include/wine/nsi.h index 594d6f9ea5d..362eaed0c4e 100644 --- a/include/wine/nsi.h +++ b/include/wine/nsi.h @@ -19,6 +19,79 @@ #ifndef __WINE_NSI_H #define __WINE_NSI_H +/* Undocumented NSI NDIS tables */ +#define NSI_NDIS_IFINFO_TABLE 0 +#define NSI_NDIS_INDEX_LUID_TABLE 2 + +struct nsi_ndis_ifinfo_rw +{ + GUID network_guid; + DWORD admin_status; + IF_COUNTED_STRING alias; /* .Length in bytes not including '\0' */ + IF_PHYSICAL_ADDRESS phys_addr; + USHORT pad; + IF_COUNTED_STRING name2; + DWORD unk; +}; + +struct nsi_ndis_ifinfo_dynamic +{ + DWORD oper_status; + struct + { + DWORD unk : 1; + DWORD not_media_conn : 1; + DWORD unk2 : 30; + } flags; + DWORD media_conn_state; + DWORD unk; + DWORD mtu; + ULONG64 xmit_speed; + ULONG64 rcv_speed; + ULONG64 in_errors; + ULONG64 in_discards; + ULONG64 out_errors; + ULONG64 out_discards; + ULONG64 unk2; + ULONG64 in_octets; + ULONG64 in_ucast_pkts; + ULONG64 in_mcast_pkts; + ULONG64 in_bcast_pkts; + ULONG64 out_octets; + ULONG64 out_ucast_pkts; + ULONG64 out_mcast_pkts; + ULONG64 out_bcast_pkts; + ULONG64 unk3[2]; + ULONG64 in_ucast_octs; + ULONG64 in_mcast_octs; + ULONG64 in_bcast_octs; + ULONG64 out_ucast_octs; + ULONG64 out_mcast_octs; + ULONG64 out_bcast_octs; + ULONG64 unk4; +}; + +struct nsi_ndis_ifinfo_static +{ + DWORD if_index; + IF_COUNTED_STRING descr; + DWORD type; + DWORD access_type; + DWORD unk; + DWORD conn_type; + GUID if_guid; + USHORT conn_present; + IF_PHYSICAL_ADDRESS perm_phys_addr; + struct + { + DWORD hw : 1; + DWORD filter : 1; + DWORD unk : 30; + } flags; + DWORD media_type; + DWORD phys_medium_type; +}; + /* Undocumented Nsi api */ 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, -- 2.23.0

2 2

[PATCH v2 4/5] nsi: Add stub implementations of NsiAllocateAndGetTable() and NsiFreeTable().
by Huw Davies 25 Jun '21

25 Jun '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/nsi/Makefile.in | 3 +++ dlls/nsi/nsi.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ dlls/nsi/nsi.spec | 4 ++-- include/wine/nsi.h | 28 ++++++++++++++++++++++++++++ 4 files changed, 77 insertions(+), 2 deletions(-) create mode 100644 dlls/nsi/nsi.c create mode 100644 include/wine/nsi.h diff --git a/dlls/nsi/Makefile.in b/dlls/nsi/Makefile.in index 634c4011ed9..68126cab6c6 100644 --- a/dlls/nsi/Makefile.in +++ b/dlls/nsi/Makefile.in @@ -2,3 +2,6 @@ MODULE = nsi.dll IMPORTLIB = nsi EXTRADLLFLAGS = -mno-cygwin + +C_SRCS = \ + nsi.c diff --git a/dlls/nsi/nsi.c b/dlls/nsi/nsi.c new file mode 100644 index 00000000000..d55445a3dd7 --- /dev/null +++ b/dlls/nsi/nsi.c @@ -0,0 +1,44 @@ +/* + * Network Store Interface + * + * Copyright 2021 Huw Davies + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#include "winsock2.h" +#include "winternl.h" +#include "ws2ipdef.h" +#include "iphlpapi.h" +#include "netioapi.h" +#include "iptypes.h" +#include "netiodef.h" +#include "wine/nsi.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(nsi); + +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 ) +{ + FIXME( "%d %p %d %p %d %p %d %p %d %p %d %p %d: stub\n", unk, module, table, key_data, key_size, + rw_data, rw_size, dynamic_data, dynamic_size, static_data, static_size, count, unk2 ); + 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 2d500d30e94..fc2db9e35c1 100644 --- a/dlls/nsi/nsi.spec +++ b/dlls/nsi/nsi.spec @@ -1,5 +1,5 @@ @ stub NsiAllocateAndGetPersistentDataWithMaskTable -@ stub NsiAllocateAndGetTable +@ stdcall NsiAllocateAndGetTable(long ptr long ptr long ptr long ptr long ptr long ptr long) @ stub NsiCancelChangeNotification @ stub NsiDeregisterChangeNotification @ stub NsiDeregisterChangeNotificationEx @@ -7,7 +7,7 @@ @ stub NsiEnumerateObjectsAllParametersEx @ stub NsiEnumerateObjectsAllPersistentParametersWithMask @ stub NsiFreePersistentDataWithMaskTable -@ stub NsiFreeTable +@ stdcall NsiFreeTable(ptr ptr ptr ptr) @ stub NsiGetAllParameters @ stub NsiGetAllParametersEx @ stub NsiGetAllPersistentParametersWithMask diff --git a/include/wine/nsi.h b/include/wine/nsi.h new file mode 100644 index 00000000000..594d6f9ea5d --- /dev/null +++ b/include/wine/nsi.h @@ -0,0 +1,28 @@ +/* + * 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_NSI_H +#define __WINE_NSI_H + +/* Undocumented Nsi api */ +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 ); +void WINAPI NsiFreeTable( void *key_data, void *rw_data, void *dynamic_data, void *static_data ); + +#endif /* __WINE_NSI_H */ -- 2.23.0

1 0

[PATCH v2 3/5] nsi: Add a stub dll.
by Huw Davies 25 Jun '21

25 Jun '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/nsi/Makefile.in | 4 ++++ dlls/nsi/nsi.spec | 26 ++++++++++++++++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 dlls/nsi/Makefile.in create mode 100644 dlls/nsi/nsi.spec diff --git a/dlls/nsi/Makefile.in b/dlls/nsi/Makefile.in new file mode 100644 index 00000000000..634c4011ed9 --- /dev/null +++ b/dlls/nsi/Makefile.in @@ -0,0 +1,4 @@ +MODULE = nsi.dll +IMPORTLIB = nsi + +EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/nsi/nsi.spec b/dlls/nsi/nsi.spec new file mode 100644 index 00000000000..2d500d30e94 --- /dev/null +++ b/dlls/nsi/nsi.spec @@ -0,0 +1,26 @@ +@ stub NsiAllocateAndGetPersistentDataWithMaskTable +@ stub NsiAllocateAndGetTable +@ stub NsiCancelChangeNotification +@ stub NsiDeregisterChangeNotification +@ stub NsiDeregisterChangeNotificationEx +@ stub NsiEnumerateObjectsAllParameters +@ stub NsiEnumerateObjectsAllParametersEx +@ stub NsiEnumerateObjectsAllPersistentParametersWithMask +@ stub NsiFreePersistentDataWithMaskTable +@ stub NsiFreeTable +@ stub NsiGetAllParameters +@ stub NsiGetAllParametersEx +@ stub NsiGetAllPersistentParametersWithMask +@ stub NsiObjectSecurity +@ stub NsiGetParameter +@ stub NsiGetParameterEx +@ stub NsiRegisterChangeNotification +@ stub NsiRegisterChangeNotificationEx +@ stub NsiRequestChangeNotification +@ stub NsiRequestChangeNotificationEx +@ stub NsiSetAllParameters +@ stub NsiSetAllParametersEx +@ stub NsiSetAllPersistentParametersWithMask +@ stub NsiSetObjectSecurity +@ stub NsiSetParameter +@ stub NsiSetParameterEx -- 2.23.0

1 0

[PATCH v2 2/5] uuid: Add a few NPI module ids.
by Huw Davies 25 Jun '21

25 Jun '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/uuid/uuid.c | 3 +++ include/netiodef.h | 29 +++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/dlls/uuid/uuid.c b/dlls/uuid/uuid.c index eacb83301d1..aa7ad3dd678 100644 --- a/dlls/uuid/uuid.c +++ b/dlls/uuid/uuid.c @@ -92,6 +92,9 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); #include "comsvcs.h" #include "directmanipulation.h" +#define __WINE_INIT_NPI_MODULEID +#include "netiodef.h" + /* FIXME: cguids declares GUIDs but does not define their values */ /* GUIDs not declared in an exported header file */ diff --git a/include/netiodef.h b/include/netiodef.h index 611359c49f8..658dd235db0 100644 --- a/include/netiodef.h +++ b/include/netiodef.h @@ -57,4 +57,33 @@ static inline BOOLEAN NmrIsEqualNpiModuleId( const NPI_MODULEID *mod1, const NPI return FALSE; } +#ifdef __WINE_INIT_NPI_MODULEID +#ifdef __cplusplus +#define DEFINE_NPI_GUID_MODULEID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \ + EXTERN_C const NPI_MODULEID name DECLSPEC_HIDDEN; \ + EXTERN_C const NPI_MODULEID name = \ + { sizeof(NPI_MODULEID), MIT_GUID, { { l, w1, w2, { b1, b2, b3, b4, b5, b6, b7, b8 } } } } +#else +#define DEFINE_NPI_GUID_MODULEID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \ + const NPI_MODULEID name DECLSPEC_HIDDEN; \ + const NPI_MODULEID name = \ + { sizeof(NPI_MODULEID), MIT_GUID, { { l, w1, w2, { b1, b2, b3, b4, b5, b6, b7, b8 } } } } +#endif +#else /* __WINE_INIT_MODULEID */ +#define DEFINE_NPI_GUID_MODULEID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \ + EXTERN_C const NPI_MODULEID name DECLSPEC_HIDDEN +#endif /* __WINE_INIT_MODULEID */ + +#define DEFINE_NPI_MS_MODULEID(name, n) DEFINE_NPI_GUID_MODULEID(name, 0xeb004a00 + (n), 0x9b1a, 0x11d4, \ + 0x91, 0x23, 0x00, 0x50, 0x04, 0x77, 0x59, 0xbc) + +DEFINE_NPI_MS_MODULEID( NPI_MS_IPV4_MODULEID, 0x00 ); +DEFINE_NPI_MS_MODULEID( NPI_MS_IPV6_MODULEID, 0x01 ); +DEFINE_NPI_MS_MODULEID( NPI_MS_UDP_MODULEID, 0x02 ); +DEFINE_NPI_MS_MODULEID( NPI_MS_TCP_MODULEID, 0x03 ); +DEFINE_NPI_MS_MODULEID( NPI_MS_NDIS_MODULEID, 0x11 ); + +#undef DEFINE_NPI_MS_MODULEID +#undef DEFINE_NPI_GUID_MODULEID + #endif /* __WINE_NETIODEF_H */ -- 2.23.0

1 0

[PATCH v2 1/5] include: Add netiodef.h.
by Huw Davies 25 Jun '21

25 Jun '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- include/Makefile.in | 1 + include/netiodef.h | 60 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+) create mode 100644 include/netiodef.h 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 */ -- 2.23.0

1 0

[PATCH v4 1/2] mf/sar: Query for current padding before requesting sample buffer.
by Giovanni Mascellani 25 Jun '21

25 Jun '21

According to both MSDN and our impementation, GetBufferSize returns the size of the buffer, but it doesn't guarantee that all of it is available. In order to know how much of it is available, the caller must also call GetCurrentPadding and subtract that number to the buffer size. Failing to do so might result in GetBuffer returning an error. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- This patch is unchanged. It is being resent because otherwise the second patch fails to apply. dlls/mf/sar.c | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/dlls/mf/sar.c b/dlls/mf/sar.c index 77cbfcb21da..eba822ae0fe 100644 --- a/dlls/mf/sar.c +++ b/dlls/mf/sar.c @@ -1751,7 +1751,7 @@ static HRESULT WINAPI audio_renderer_render_callback_GetParameters(IMFAsyncCallb static void audio_renderer_render(struct audio_renderer *renderer, IMFAsyncResult *result) { - unsigned int src_frames, dst_frames, max_frames, src_len; + unsigned int src_frames, dst_frames, max_frames, pad_frames, src_len; struct queued_object *obj, *obj2; BOOL keep_sample = FALSE; IMFMediaBuffer *buffer; @@ -1775,20 +1775,24 @@ static void audio_renderer_render(struct audio_renderer *renderer, IMFAsyncResul { if (SUCCEEDED(IAudioClient_GetBufferSize(renderer->audio_client, &max_frames))) { - src_frames -= obj->u.sample.frame_offset; - dst_frames = min(src_frames, max_frames); - - if (SUCCEEDED(hr = IAudioRenderClient_GetBuffer(renderer->audio_render_client, dst_frames, &dst))) + if (SUCCEEDED(IAudioClient_GetCurrentPadding(renderer->audio_client, &pad_frames))) { - memcpy(dst, src + obj->u.sample.frame_offset * renderer->frame_size, - dst_frames * renderer->frame_size); + max_frames -= pad_frames; + src_frames -= obj->u.sample.frame_offset; + dst_frames = min(src_frames, max_frames); - IAudioRenderClient_ReleaseBuffer(renderer->audio_render_client, dst_frames, 0); + if (SUCCEEDED(hr = IAudioRenderClient_GetBuffer(renderer->audio_render_client, dst_frames, &dst))) + { + memcpy(dst, src + obj->u.sample.frame_offset * renderer->frame_size, + dst_frames * renderer->frame_size); - obj->u.sample.frame_offset += dst_frames; - } + IAudioRenderClient_ReleaseBuffer(renderer->audio_render_client, dst_frames, 0); - keep_sample = FAILED(hr) || src_frames > max_frames; + obj->u.sample.frame_offset += dst_frames; + } + + keep_sample = FAILED(hr) || src_frames > max_frames; + } } } IMFMediaBuffer_Unlock(buffer); -- 2.32.0

2 9

[PATCH 1/5] ntdll/tests: Test deleting files with an open mapping.
by Zebediah Figura 25 Jun '21

25 Jun '21

From: Qian Hong <qhong(a)codeweavers.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntdll/tests/file.c | 93 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 91 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index b7b46365911..5d234114fd5 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -2960,12 +2960,13 @@ static void test_file_disposition_information(void) { char tmp_path[MAX_PATH], buffer[MAX_PATH + 16]; DWORD dirpos; - HANDLE handle, handle2, handle3; + HANDLE handle, handle2, handle3, mapping; NTSTATUS res; IO_STATUS_BLOCK io; FILE_DISPOSITION_INFORMATION fdi; BOOL fileDeleted; - DWORD fdi2; + DWORD fdi2, size; + void *view; GetTempPathA( MAX_PATH, tmp_path ); @@ -3312,6 +3313,94 @@ todo_wine ok( !fileDeleted, "Directory shouldn't have been deleted\n" ); fileDeleted = RemoveDirectoryA( buffer ); ok( fileDeleted, "Directory should have been deleted\n" ); + + /* a file with an open mapping handle cannot be deleted */ + + GetTempFileNameA( tmp_path, "dis", 0, buffer ); + handle = CreateFileA( buffer, GENERIC_READ | GENERIC_WRITE | DELETE, 0, NULL, CREATE_ALWAYS, 0, 0 ); + ok( handle != INVALID_HANDLE_VALUE, "failed to create file, error %u\n", GetLastError() ); + WriteFile(handle, "data", 4, &size, NULL); + mapping = CreateFileMappingA( handle, NULL, PAGE_READONLY, 0, 4, NULL ); + ok( !!mapping, "failed to create mapping, error %u\n", GetLastError() ); + + fdi.DoDeleteFile = FALSE; + res = pNtSetInformationFile( handle, &io, &fdi, sizeof(fdi), FileDispositionInformation ); + ok( !res, "got %#x\n", res ); + + fdi.DoDeleteFile = TRUE; + res = pNtSetInformationFile( handle, &io, &fdi, sizeof(fdi), FileDispositionInformation ); + todo_wine ok( res == STATUS_CANNOT_DELETE, "got %#x\n", res ); + res = GetFileAttributesA( buffer ); + ok( res != INVALID_FILE_ATTRIBUTES, "expected file to exist\n" ); + + CloseHandle( mapping ); + CloseHandle( handle ); + res = DeleteFileA( buffer ); + todo_wine ok( res, "got error %u\n", GetLastError() ); + + GetTempFileNameA( tmp_path, "dis", 0, buffer ); + handle = CreateFileA( buffer, GENERIC_READ | GENERIC_WRITE | DELETE, 0, NULL, CREATE_ALWAYS, 0, 0 ); + ok( handle != INVALID_HANDLE_VALUE, "failed to create file, error %u\n", GetLastError() ); + WriteFile(handle, "data", 4, &size, NULL); + mapping = CreateFileMappingA( handle, NULL, PAGE_READONLY, 0, 4, NULL ); + ok( !!mapping, "failed to create mapping, error %u\n", GetLastError() ); + CloseHandle( mapping ); + + fdi.DoDeleteFile = TRUE; + res = pNtSetInformationFile( handle, &io, &fdi, sizeof(fdi), FileDispositionInformation ); + ok( !res, "got %#x\n", res ); + + CloseHandle( handle ); + res = DeleteFileA( buffer ); + ok( !res, "expected failure\n" ); + ok( GetLastError() == ERROR_FILE_NOT_FOUND, "got error %u\n", GetLastError() ); + + /* a file with an open view cannot be deleted */ + + GetTempFileNameA( tmp_path, "dis", 0, buffer ); + handle = CreateFileA( buffer, GENERIC_READ | GENERIC_WRITE | DELETE, 0, NULL, CREATE_ALWAYS, 0, 0 ); + ok( handle != INVALID_HANDLE_VALUE, "failed to create file, error %u\n", GetLastError() ); + WriteFile(handle, "data", 4, &size, NULL); + mapping = CreateFileMappingA( handle, NULL, PAGE_READONLY, 0, 4, NULL ); + ok( !!mapping, "failed to create mapping, error %u\n", GetLastError() ); + view = MapViewOfFile( mapping, FILE_MAP_READ, 0, 0, 4 ); + ok( !!view, "failed to map view, error %u\n", GetLastError() ); + CloseHandle( mapping ); + + fdi.DoDeleteFile = FALSE; + res = pNtSetInformationFile( handle, &io, &fdi, sizeof(fdi), FileDispositionInformation ); + ok( !res, "got %#x\n", res ); + + fdi.DoDeleteFile = TRUE; + res = pNtSetInformationFile( handle, &io, &fdi, sizeof(fdi), FileDispositionInformation ); + todo_wine ok( res == STATUS_CANNOT_DELETE, "got %#x\n", res ); + res = GetFileAttributesA( buffer ); + ok( res != INVALID_FILE_ATTRIBUTES, "expected file to exist\n" ); + + UnmapViewOfFile( view ); + CloseHandle( handle ); + res = DeleteFileA( buffer ); + todo_wine ok( res, "got error %u\n", GetLastError() ); + + GetTempFileNameA( tmp_path, "dis", 0, buffer ); + handle = CreateFileA( buffer, GENERIC_READ | GENERIC_WRITE | DELETE, 0, NULL, CREATE_ALWAYS, 0, 0 ); + ok( handle != INVALID_HANDLE_VALUE, "failed to create file, error %u\n", GetLastError() ); + WriteFile(handle, "data", 4, &size, NULL); + mapping = CreateFileMappingA( handle, NULL, PAGE_READONLY, 0, 4, NULL ); + ok( !!mapping, "failed to create mapping, error %u\n", GetLastError() ); + view = MapViewOfFile( mapping, FILE_MAP_READ, 0, 0, 4 ); + ok( !!view, "failed to map view, error %u\n", GetLastError() ); + CloseHandle( mapping ); + UnmapViewOfFile( view ); + + fdi.DoDeleteFile = TRUE; + res = pNtSetInformationFile( handle, &io, &fdi, sizeof(fdi), FileDispositionInformation ); + ok( !res, "got %#x\n", res ); + + CloseHandle( handle ); + res = DeleteFileA( buffer ); + ok( !res, "expected failure\n" ); + ok( GetLastError() == ERROR_FILE_NOT_FOUND, "got error %u\n", GetLastError() ); } static void test_file_name_information(void) -- 2.30.2

1 4

[PATCH 1/6] ws2_32: Move the getsockopt(SO_LINGER) implementation to ntdll.
by Zebediah Figura 25 Jun '21

25 Jun '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntdll/unix/socket.c | 22 ++++++++++++++++++++++ dlls/ws2_32/socket.c | 23 +++++------------------ include/wine/afd.h | 1 + 3 files changed, 28 insertions(+), 18 deletions(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index 7b62c5aef68..89926411a40 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -1613,6 +1613,28 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc case IOCTL_AFD_WINE_SET_SO_KEEPALIVE: return do_setsockopt( handle, io, SOL_SOCKET, SO_KEEPALIVE, in_buffer, in_size ); + case IOCTL_AFD_WINE_GET_SO_LINGER: + { + struct WS_linger *ws_linger = out_buffer; + struct linger unix_linger; + socklen_t len = sizeof(unix_linger); + int ret; + + if ((status = server_get_unix_fd( handle, 0, &fd, &needs_close, NULL, NULL ))) + return status; + + ret = getsockopt( fd, SOL_SOCKET, SO_LINGER, &unix_linger, &len ); + if (needs_close) close( fd ); + if (!ret) + { + ws_linger->l_onoff = unix_linger.l_onoff; + ws_linger->l_linger = unix_linger.l_linger; + io->Information = sizeof(*ws_linger); + } + + return ret ? sock_errno_to_status( errno ) : STATUS_SUCCESS; + } + default: { if ((code >> 16) == FILE_DEVICE_NETWORK) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index c35972c1d27..de83563bd29 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2229,9 +2229,6 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, case WS_SO_LINGER: { - struct linger lingval; - socklen_t len = sizeof(struct linger); - /* struct linger and LINGER have different sizes */ if (!optlen || *optlen < sizeof(LINGER) || !optval) { @@ -2243,23 +2240,13 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, if (_get_fd_type(fd) == SOCK_DGRAM) { - SetLastError(WSAENOPROTOOPT); - ret = SOCKET_ERROR; + release_sock_fd( s, fd ); + SetLastError( WSAENOPROTOOPT ); + return -1; } - else if (getsockopt(fd, SOL_SOCKET, SO_LINGER, &lingval, &len) != 0) - { - SetLastError(wsaErrno()); - ret = SOCKET_ERROR; - } - else - { - ((LINGER *)optval)->l_onoff = lingval.l_onoff; - ((LINGER *)optval)->l_linger = lingval.l_linger; - *optlen = sizeof(struct linger); - } - release_sock_fd( s, fd ); - return ret; + + return server_getsockopt( s, IOCTL_AFD_WINE_GET_SO_LINGER, optval, optlen ); } case WS_SO_MAX_MSG_SIZE: diff --git a/include/wine/afd.h b/include/wine/afd.h index 616ba27b679..f1dd392ed32 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -165,6 +165,7 @@ struct afd_get_events_params #define IOCTL_AFD_WINE_GET_SO_ERROR CTL_CODE(FILE_DEVICE_NETWORK, 222, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_AFD_WINE_GET_SO_KEEPALIVE CTL_CODE(FILE_DEVICE_NETWORK, 223, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_AFD_WINE_SET_SO_KEEPALIVE CTL_CODE(FILE_DEVICE_NETWORK, 224, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_AFD_WINE_GET_SO_LINGER CTL_CODE(FILE_DEVICE_NETWORK, 225, METHOD_BUFFERED, FILE_ANY_ACCESS) struct afd_create_params { -- 2.30.2

2 8

[PATCH v2 1/5] ntdll/tests: Fix AVX tests on processors that don't support XSAVEOPT.
by Zebediah Figura 25 Jun '21

25 Jun '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- v2: fix test failures dlls/ntdll/tests/exception.c | 58 +++++++++++++++++++++++++----------- 1 file changed, 40 insertions(+), 18 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 7e849fba1aa..1a63a717d21 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -7562,7 +7562,7 @@ static const unsigned test_extended_context_spoil_data1[8] = {0x10, 0x20, 0x30, static const unsigned test_extended_context_spoil_data2[8] = {0x15, 0x25, 0x35, 0x45, 0x55, 0x65, 0x75, 0x85}; static BOOL test_extended_context_modified_state; -static BOOL compaction_enabled; +static BOOL xsaveopt_enabled, compaction_enabled; static DWORD test_extended_context_handler(EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD *frame, CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **dispatcher) @@ -7603,9 +7603,11 @@ static DWORD test_extended_context_handler(EXCEPTION_RECORD *rec, EXCEPTION_REGI context_ymm_data = (unsigned int *)&xs->YmmContext; ok(!((ULONG_PTR)xs % 64), "Got unexpected xs %p.\n", xs); - ok((compaction_enabled && (xs->CompactionMask & (expected_compaction_mask | 3)) == expected_compaction_mask) - || (!compaction_enabled && !xs->CompactionMask), "Got unexpected CompactionMask %s, compaction %#x.\n", - wine_dbgstr_longlong(xs->CompactionMask), compaction_enabled); + if (compaction_enabled) + ok((xs->CompactionMask & (expected_compaction_mask | 3)) == expected_compaction_mask, + "Got compaction mask %#I64x.\n", xs->CompactionMask); + else + ok(!xs->CompactionMask, "Got compaction mask %#I64x.\n", xs->CompactionMask); if (test_extended_context_modified_state) { @@ -7615,9 +7617,13 @@ static DWORD test_extended_context_handler(EXCEPTION_RECORD *rec, EXCEPTION_REGI } else { - ok(!xs->Mask, "Got unexpected Mask %s.\n", wine_dbgstr_longlong(xs->Mask)); - /* The save area has garbage in this case, the state should be restored to INIT_STATE - * without using these data. */ + ok(xs->Mask == (xsaveopt_enabled ? 0 : 4), "Got unexpected Mask %#I64x.\n", xs->Mask); + /* The save area has garbage if xsaveopt is available, so we can't test + * its contents. */ + + /* Clear the mask; the state should be restored to INIT_STATE without + * using this data. */ + xs->Mask = 0; memcpy(context_ymm_data, test_extended_context_spoil_data1 + 4, sizeof(M128A)); } @@ -7897,6 +7903,7 @@ static void test_extended_context(void) int regs[4]; __cpuidex(regs, 0xd, 1); + xsaveopt_enabled = regs[0] & 1; compaction_enabled = regs[0] & 2; } @@ -8547,7 +8554,7 @@ static void test_extended_context(void) "Got unexpected bret %#x, GetLastError() %u.\n", bret, GetLastError()); ok(context->ContextFlags == expected_flags, "Got unexpected ContextFlags %#x.\n", context->ContextFlags); - ok(xs->Mask == (compaction_enabled ? 0 : 4), "Got unexpected Mask %s.\n", wine_dbgstr_longlong(xs->Mask)); + ok(xs->Mask == (compaction_enabled ? 0 : 4), "Got unexpected Mask %#I64x.\n", xs->Mask); ok(xs->CompactionMask == 4, "Got unexpected CompactionMask %s.\n", wine_dbgstr_longlong(xs->CompactionMask)); for (i = 0; i < 4; ++i) @@ -8618,7 +8625,7 @@ static void test_extended_context(void) expected_compaction = compaction_enabled ? ((ULONG64)1 << 63) | 4 : 0; xs = (XSTATE *)((BYTE *)context_ex + context_ex->XState.Offset); - ok(!xs->Mask, "Got unexpected Mask %s.\n", wine_dbgstr_longlong(xs->Mask)); + ok(xs->Mask == (xsaveopt_enabled ? 0 : 4), "Got unexpected Mask %#I64x.\n", xs->Mask); ok(xs->CompactionMask == expected_compaction, "Got unexpected CompactionMask %s.\n", wine_dbgstr_longlong(xs->CompactionMask)); @@ -8626,12 +8633,13 @@ static void test_extended_context(void) ok(!data[i], "Got unexpected data %#x, i %u.\n", data[i], i); for (i = 0; i < 4; ++i) - ok(((ULONG *)&xs->YmmContext)[i] == 0xcccccccc + ok(((ULONG *)&xs->YmmContext)[i] == ((xs->Mask & 4) ? 0 : 0xcccccccc) || broken(((ULONG *)&xs->YmmContext)[i] == test_extended_context_data[i + 4]), "Got unexpected data %#x, i %u.\n", ((ULONG *)&xs->YmmContext)[i], i); /* Test fault exception context. */ memset(data, 0xff, sizeof(data)); + xs->Mask = 0; test_extended_context_modified_state = FALSE; run_exception_test(test_extended_context_handler, NULL, except_code_reset_ymm_state, ARRAY_SIZE(except_code_reset_ymm_state), PAGE_EXECUTE_READ); @@ -8664,12 +8672,13 @@ static void test_extended_context(void) bret = GetThreadContext(thread, context); ok(bret, "Got unexpected bret %#x, GetLastError() %u.\n", bret, GetLastError()); - ok(!xs->Mask, "Got unexpected Mask %s.\n", wine_dbgstr_longlong(xs->Mask)); + todo_wine_if (!xsaveopt_enabled) + ok(xs->Mask == (xsaveopt_enabled ? 0 : 4), "Got unexpected Mask %#I64x.\n", xs->Mask); ok(xs->CompactionMask == expected_compaction, "Got unexpected CompactionMask %s.\n", wine_dbgstr_longlong(xs->CompactionMask)); for (i = 0; i < 16 * 4; ++i) - ok(((ULONG *)&xs->YmmContext)[i] == 0xcccccccc, "Got unexpected value %#x, i %u.\n", - ((ULONG *)&xs->YmmContext)[i], i); + ok(((ULONG *)&xs->YmmContext)[i] == ((xs->Mask & 4) ? 0 : 0xcccccccc), + "Got unexpected value %#x, i %u.\n", ((ULONG *)&xs->YmmContext)[i], i); pSetXStateFeaturesMask(context, 4); memset(&xs->YmmContext, 0, sizeof(xs->YmmContext)); @@ -8725,11 +8734,24 @@ static void test_extended_context(void) memset(&xs->YmmContext, 0xcc, sizeof(xs->YmmContext)); bret = GetThreadContext(thread, context); ok(bret, "Got unexpected bret %#x, GetLastError() %u.\n", bret, GetLastError()); - ok(!xs->Mask || (sizeof(void *) == 4 && xs->Mask == 4), - "Got unexpected Mask %s.\n", wine_dbgstr_longlong(xs->Mask)); - for (i = 0; i < 16 * 4; ++i) - ok(((ULONG *)&xs->YmmContext)[i] == (xs->Mask ? (i < 8 * 4 ? 0 : 0x48484848) : 0xcccccccc), - "Got unexpected value %#x, i %u.\n", ((ULONG *)&xs->YmmContext)[i], i); + todo_wine_if (!xsaveopt_enabled && sizeof(void *) != 4) + ok(xs->Mask == (xsaveopt_enabled ? 0 : 4) || (sizeof(void *) == 4 && xs->Mask == 4), + "Got unexpected Mask %#I64x.\n", xs->Mask); + if (xs->Mask == 4) + { + for (i = 0; i < 8 * sizeof(void *); ++i) + ok(((ULONG *)&xs->YmmContext)[i] == 0, + "Got unexpected value %#x, i %u.\n", ((ULONG *)&xs->YmmContext)[i], i); + for (; i < 16 * 4; ++i) + ok(((ULONG *)&xs->YmmContext)[i] == 0x48484848, + "Got unexpected value %#x, i %u.\n", ((ULONG *)&xs->YmmContext)[i], i); + } + else + { + for (i = 0; i < 16 * 4; ++i) + ok(((ULONG *)&xs->YmmContext)[i] == 0xcccccccc, + "Got unexpected value %#x, i %u.\n", ((ULONG *)&xs->YmmContext)[i], i); + } bret = ResumeThread(thread); ok(bret, "Got unexpected bret %#x, GetLastError() %u.\n", bret, GetLastError()); -- 2.30.2

4 7

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

25 Jun '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/light.msstyles/light.rc | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/light.msstyles/light.rc b/dlls/light.msstyles/light.rc index f0a462035a7..b7a8f538536 100644 --- a/dlls/light.msstyles/light.rc +++ b/dlls/light.msstyles/light.rc @@ -341,6 +341,13 @@ BLUE_INI TEXTFILE "FillColor = 255 255 255\r\n" "BorderColor = 174 174 174\r\n" +"\r\n; ListView\r\n" +"[ListView]\r\n" +"BgType = BorderFill\r\n" +"BorderSize = 1\r\n" +"FillColor = 255 255 255\r\n" +"BorderColor = 174 174 174\r\n" + "\r\n; Rebar\r\n" "[Rebar]\r\n" "BgType = ImageFile\r\n" -- 2.30.2

1 0

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

25 Jun '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/light.msstyles/Makefile.in | 2 + .../light.msstyles/blue_status_background.bmp | Bin 0 -> 186 bytes .../light.msstyles/blue_status_background.svg | 14 +++++++ dlls/light.msstyles/blue_status_pane.bmp | Bin 0 -> 318 bytes dlls/light.msstyles/blue_status_pane.svg | 13 +++++++ dlls/light.msstyles/light.rc | 36 ++++++++++++++++++ 6 files changed, 65 insertions(+) create mode 100644 dlls/light.msstyles/blue_status_background.bmp create mode 100644 dlls/light.msstyles/blue_status_background.svg create mode 100644 dlls/light.msstyles/blue_status_pane.bmp create mode 100644 dlls/light.msstyles/blue_status_pane.svg diff --git a/dlls/light.msstyles/Makefile.in b/dlls/light.msstyles/Makefile.in index aef2c2f66e1..c446a1c3b56 100644 --- a/dlls/light.msstyles/Makefile.in +++ b/dlls/light.msstyles/Makefile.in @@ -37,6 +37,8 @@ SVG_SRCS = \ blue_spin_glyph_left.svg \ blue_spin_glyph_right.svg \ blue_spin_glyph_up.svg \ + blue_status_background.svg \ + blue_status_pane.svg \ blue_toolbar_buttons_split_dropdown_glyph.svg \ blue_toolbar_buttons_split_dropdown.svg \ blue_toolbar_buttons_split.svg \ diff --git a/dlls/light.msstyles/blue_status_background.bmp b/dlls/light.msstyles/blue_status_background.bmp new file mode 100644 index 0000000000000000000000000000000000000000..b56048f2f66628f7c08dbbd6e566c502a9b4b878 GIT binary patch literal 186 zcmZ?r-NgU_T|lY^h?#+y1&A3LB!DCXg8`UCC;l@qKoCgczmt1VF}eyue2^W;;42IO P1!2suXzX<`02BuR!v-hg literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_status_background.svg b/dlls/light.msstyles/blue_status_background.svg new file mode 100644 index 00000000000..4fc5d4fdce0 --- /dev/null +++ b/dlls/light.msstyles/blue_status_background.svg @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:3-24" width="3" height="4" version="1.1" viewBox="0 0 .79375 1.0583" 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=".13229" width=".79375" height="3.4173e-7" fill="#aeaeae" stroke="#aeaeae" stroke-width=".26458"/> + <rect x="-1.1102e-16" y=".26457" width=".79375" height=".79375" fill="#f5f5f5"/> +</svg> diff --git a/dlls/light.msstyles/blue_status_pane.bmp b/dlls/light.msstyles/blue_status_pane.bmp new file mode 100644 index 0000000000000000000000000000000000000000..befc4807cbdd86bb652179774b0d646f8120bd73 GIT binary patch literal 318 zcmZ?rwPR!egDxOh1H{Zg%n!tj3<_ZO79blF{AXZ*Adu95C-<OYOf~pLSnx|TtXsDZ KXafWcRyF{Fgffc& literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_status_pane.svg b/dlls/light.msstyles/blue_status_pane.svg new file mode 100644 index 00000000000..9c1b197b6c6 --- /dev/null +++ b/dlls/light.msstyles/blue_status_pane.svg @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:3-32" width="3" height="15" version="1.1" viewBox="0 0 .79375 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 x=".26458" width=".26458" height="3.7042" fill="#aeaeae" stroke-width="0"/> +</svg> diff --git a/dlls/light.msstyles/light.rc b/dlls/light.msstyles/light.rc index c96b4dcf30f..f0a462035a7 100644 --- a/dlls/light.msstyles/light.rc +++ b/dlls/light.msstyles/light.rc @@ -532,6 +532,35 @@ BLUE_INI TEXTFILE "GlyphImageFile = blue_spin_glyph_left.bmp\r\n" "GlyphTransparent = True\r\n" +"\r\n; Status\r\n" +"[Status]\r\n" +"SizingMargins = 1, 1, 2, 1\r\n" +"ImageFile = blue_status_background.bmp\r\n" +"BgType = ImageFile\r\n" +"ImageCount = 1\r\n" +"SizingType = Stretch\r\n" + +"[Status.Pane]\r\n" +"SizingMargins = 0, 2, 2, 2\r\n" +"ImageFile = blue_status_pane.bmp\r\n" +"BgType = ImageFile\r\n" +"ImageCount = 1\r\n" +"SizingType = Tile\r\n" +"Transparent = True\r\n" + +"[Status.GripperPane]\r\n" +"BgType = None\r\n" + +"[Status.Gripper]\r\n" +"ContentMargins = 0, 0, 0, 0\r\n" +"; Same as scrollbar resize box gripper \r\n" +"ImageFile = blue_scrollbar_resizebox_grip.bmp\r\n" +"BgType = ImageFile\r\n" +"ImageCount = 2\r\n" +"SizingType = TrueSize\r\n" +"Transparent = True\r\n" +"VAlign = Bottom\r\n" + "\r\n; Toolbar\r\n" "[Toolbar]\r\n" "BgType = BorderFill\r\n" @@ -707,6 +736,13 @@ BLUE_SPIN_GLYPH_RIGHT_BMP BITMAP "blue_spin_glyph_right.bmp" /* @makedep: blue_spin_glyph_up.bmp */ BLUE_SPIN_GLYPH_UP_BMP BITMAP "blue_spin_glyph_up.bmp" +/* Status */ +/* @makedep: blue_status_background.bmp */ +BLUE_STATUS_BACKGROUND_BMP BITMAP "blue_status_background.bmp" + +/* @makedep: blue_status_pane.bmp */ +BLUE_STATUS_PANE_BMP BITMAP "blue_status_pane.bmp" + /* ToolBar */ /* @makedep: blue_toolbar_buttons.bmp */ BLUE_TOOLBAR_BUTTONS_BMP BITMAP "blue_toolbar_buttons.bmp" -- 2.30.2

1 0

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

25 Jun '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- 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 ++++ .../blue_rebar_gripper_vertical.bmp | Bin 0 -> 378 bytes .../blue_rebar_gripper_vertical.svg | 14 ++++ dlls/light.msstyles/light.rc | 72 ++++++++++++++++++ 10 files changed, 147 insertions(+) create mode 100644 dlls/light.msstyles/blue_rebar_background.bmp create mode 100644 dlls/light.msstyles/blue_rebar_background.svg create mode 100644 dlls/light.msstyles/blue_rebar_chevron.bmp create mode 100644 dlls/light.msstyles/blue_rebar_chevron.svg create mode 100644 dlls/light.msstyles/blue_rebar_gripper_horizontal.bmp create mode 100644 dlls/light.msstyles/blue_rebar_gripper_horizontal.svg create mode 100644 dlls/light.msstyles/blue_rebar_gripper_vertical.bmp create mode 100644 dlls/light.msstyles/blue_rebar_gripper_vertical.svg diff --git a/dlls/light.msstyles/Makefile.in b/dlls/light.msstyles/Makefile.in index 524c2607b18..aef2c2f66e1 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 0000000000000000000000000000000000000000..18a85f93f1915e3482438217a59fd1860aee8b88 GIT binary patch literal 438 zcmZ?r-NwiO23<h128fw~SQ3aC86<!t1A`7!9?XFg{}~t{2qf~~$vvnTE=44R1x?+5 Q7yuav1EXw6NT7uS09Zok8~^|S literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..4b581c5ed1da2f8ef954635ef2784c73010c6971 GIT binary patch literal 2298 zcmZ?r{l&om23<h128g+U*bImn859_pfph^>9>_!j{}~t{2qgC3$vvnTNs=fg3jtMY z*RGup#PS4`F|1m(N^ae{b^AAM+N4NLwLrTqfaYGqXC}~Y380!?8#iuL!KIEEH6Xn} zb7tc+2bcMjiVuZw28N3`Fnsm_u_iA65~BvBcc8)<Xzzm2^o%R^=qvueQgb&Neol-F zfO<9$W_854jaq7cO*2^VeTpH$^7;ErV>zJO{og0+5iFlcQTuJ0o(0fcyyf%%siqRY lrW)+}G1UlX`Am!&P?!PjnvKsKYK1GhIiuwUdWcYm4*=2{@T&j- literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..3dca037e702f49f747318e0930e52ecd41c54a41 GIT binary patch literal 378 zcmZ?rtzu*VgDxOh1H^1V%mu`Z3<?a)K>7m^V}kz-3=jm8`tRf(RE((xzX%I{X`*G< Sty}jW1kg1MlsLLOaPa}q{4${c literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..4b1e85479a16a21e908bfb3cf6779a11f916c765 GIT binary patch literal 378 zcmZ?rtzu*VgDxOh1H@cF%m&1a3<?a)K>7m^V}kz-3=jm8`tRf(RE((xzX%I{X_92u Yty}jWgz;(8)z$qE!o;e>XBIW&0IM7qwg3PC literal 0 HcmV?d00001 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" -- 2.30.2

1 0

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

25 Jun '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- 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 ++++ .../blue_toolbar_buttons_split.bmp | Bin 0 -> 3306 bytes .../blue_toolbar_buttons_split.svg | 18 ++++ .../blue_toolbar_buttons_split_dropdown.bmp | Bin 0 -> 2778 bytes .../blue_toolbar_buttons_split_dropdown.svg | 18 ++++ ...e_toolbar_buttons_split_dropdown_glyph.bmp | Bin 0 -> 2298 bytes ...e_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(-) create mode 100644 dlls/light.msstyles/blue_toolbar_buttons.bmp create mode 100644 dlls/light.msstyles/blue_toolbar_buttons.svg create mode 100644 dlls/light.msstyles/blue_toolbar_buttons_split.bmp create mode 100644 dlls/light.msstyles/blue_toolbar_buttons_split.svg create mode 100644 dlls/light.msstyles/blue_toolbar_buttons_split_dropdown.bmp create mode 100644 dlls/light.msstyles/blue_toolbar_buttons_split_dropdown.svg create mode 100644 dlls/light.msstyles/blue_toolbar_buttons_split_dropdown_glyph.bmp create mode 100644 dlls/light.msstyles/blue_toolbar_buttons_split_dropdown_glyph.svg create mode 100644 dlls/light.msstyles/blue_toolbar_separator_horizontal.bmp create mode 100644 dlls/light.msstyles/blue_toolbar_separator_horizontal.svg create mode 100644 dlls/light.msstyles/blue_toolbar_separator_vertical.bmp create mode 100644 dlls/light.msstyles/blue_toolbar_separator_vertical.svg diff --git a/dlls/light.msstyles/Makefile.in b/dlls/light.msstyles/Makefile.in index ad21f8683bf..524c2607b18 100644 --- a/dlls/light.msstyles/Makefile.in +++ b/dlls/light.msstyles/Makefile.in @@ -32,4 +32,10 @@ SVG_SRCS = \ blue_spin_glyph_down.svg \ blue_spin_glyph_left.svg \ blue_spin_glyph_right.svg \ - blue_spin_glyph_up.svg + blue_spin_glyph_up.svg \ + blue_toolbar_buttons_split_dropdown_glyph.svg \ + blue_toolbar_buttons_split_dropdown.svg \ + blue_toolbar_buttons_split.svg \ + blue_toolbar_buttons.svg \ + blue_toolbar_separator_horizontal.svg \ + blue_toolbar_separator_vertical.svg diff --git a/dlls/light.msstyles/blue_toolbar_buttons.bmp b/dlls/light.msstyles/blue_toolbar_buttons.bmp new file mode 100644 index 0000000000000000000000000000000000000000..820a119f1aaeb51aaeb7536b2f93b56c4002809c GIT binary patch literal 4890 zcmeHKJx{|h5DkKb6*h)8BNZKrD$yw&x-hZuR~Yyx3y6t{0ks60p8{fP)AI3mqB?eu zJEMz2>?UhfeCp+NzGp{yeTmP#lf7L}+dW>d(YMj>&^J8a+r;>=gBQcV^L~F+f!^`y znE|O7*ecYa->Ab)X98DE36~AXobubw7|suB7-M*Qk{|{AG0I;DGMitlGdP_C^qZ+( zo5yUC?{BN|n8Pp=_PEackS5DCrZsysgZEGwIGRTqCM{p=`>5IJ63xf-P9%?qbusEr z#IP;Jpaq#z9(Bh_*sh5vh}Gwd1XXx1FjpU;<oQOO|2a7aTtB6?%Z%^sFm?w1JwK?) z3XP#=gQ@x&DFdgq`mD98HIF#E=7X3tU)Vle>KJegAOo(CvVWWP=sNc#^lW9eiqF2H zebfT?q6Ko9d7+Oo>Wt0xQQ2Is<s$b94wK{9@uT&owSj$9g~q7&pULk?8934^o(1Sk YkPKTs^;=8(C_G!ZP17;p7%&<50c@fXasU7T literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_toolbar_buttons.svg b/dlls/light.msstyles/blue_toolbar_buttons.svg new file mode 100644 index 00000000000..7eb3130ec1c --- /dev/null +++ b/dlls/light.msstyles/blue_toolbar_buttons.svg @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:9-32" width="9" height="132" version="1.1" viewBox="0 0 2.3812 34.925" 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-linejoin="bevel" stroke-width=".26458"> + <rect x=".13229" y="5.9531" width="2.1167" height="5.5563" rx=".52917" ry=".52917" fill="#fffffe" stroke="#3096fa"/> + <g fill="#fff"> + <rect x=".13229" y="11.774" width="2.1167" height="5.5563" rx=".52917" ry=".52917" stroke="#2979ff"/> + <rect x=".13229" y="29.236" width="2.1167" height="5.5563" rx=".52917" ry=".52917" stroke="#2979ff"/> + <rect x=".13229" y="23.416" width="2.1167" height="5.5563" rx=".52917" ry=".52917" stroke="#3096fa"/> + </g> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_toolbar_buttons_split.bmp b/dlls/light.msstyles/blue_toolbar_buttons_split.bmp new file mode 100644 index 0000000000000000000000000000000000000000..61a440b6640887429ff42ca41846bad4ced6a1f5 GIT binary patch literal 3306 zcmZ?reZ|8723<h128h{!xCMwA859_pfph{?9>_!j{}~t{2qgC3$vvnTNs=fg3!19` z)td7E8_kdZuhRJg#!cqO{+DaZ{ckcq@qgcpKmY&y`VYo?r~QGe1Bt=F@1OtwSL^)# zU#STbLC_$vQE^BZ&^jDI@rNESAh9O1Q~wXl{0omqP@IC|wn9Sz7@sGR;{60DEqtG1 zDF17Y-SJ=3jsJl0T)Si6XBx}>nrnOF@0r<u{{IEWJrMsrJ@XGt9asz&>wkX!2kQI% zYnlN}1Wtp*M#cYw!+_@D0E|B@@$v^4k0<}0o%0tFkF&t>2#$B493tLrPk`bbt+*KF zj_?o|tuKJZ*>I@WM(Ydul*2=%9>iH+*q!=&ZZ4v}0JZ@@ZGrF84HQ6i2}*qdY&(qb L;&IgbXdwUq!W$Kv literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_toolbar_buttons_split.svg b/dlls/light.msstyles/blue_toolbar_buttons_split.svg new file mode 100644 index 00000000000..d5fec105607 --- /dev/null +++ b/dlls/light.msstyles/blue_toolbar_buttons_split.svg @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:6-32" width="6" height="132" version="1.1" viewBox="0 0 1.5875 34.925" 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" stroke-linejoin="bevel" stroke-width=".26458"> + <rect x=".13229" y="5.9531" width="1.3229" height="5.5563" rx=".52917" ry=".52917" stroke="#3096fa"/> + <rect x=".13229" y="11.774" width="1.3229" height="5.5563" rx=".52917" ry=".52917" stroke="#2979ff"/> + <rect x=".13229" y="29.236" width="1.3229" height="5.5563" rx=".52917" ry=".52917" stroke="#2979ff"/> + <rect x=".13229" y="23.416" width="1.3229" height="5.5563" rx=".52917" ry=".52917" stroke="#3096fa"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_toolbar_buttons_split_dropdown.bmp b/dlls/light.msstyles/blue_toolbar_buttons_split_dropdown.bmp new file mode 100644 index 0000000000000000000000000000000000000000..fb5be321f129856612422afe671867e36c0aaad0 GIT binary patch literal 2778 zcmeHIyH3ME5HtcBJ|b~RL?Q(_A{8#uP$40Hg#w7v5K*N@aSZXNfT;4~@d5lt9(TUe zu(wX4$WVj|S-REj?ai(WYeqNMIR83uI6AbqDEBGvDR&&#*`<21oYQe5;5g|rJv7cP zuQrBT9rrR{At)7bS05s%EYPkGaD7yuI>Jj&K}><?uHt#Kte_+~5&;C|1h=IWuXclN zZ+i~1oEqFdncy|j5Hqj_MvI$6moyloRS~QWX*Pd2F3P??l)c(Q#{OU)c?B7tj`aJJ zf}BFXMT+O4r=XX*DFGRJiR@Naig7jA_Wr=ZPfitaKh__84LKw3ADMgBi25?B38RhC zD0BTR%n1Y5C;!pgtxx9DpMUj9f1*F*)F<h!VqXlauJO;cPtx0#6I-yqnPK1?>BPYd literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_toolbar_buttons_split_dropdown.svg b/dlls/light.msstyles/blue_toolbar_buttons_split_dropdown.svg new file mode 100644 index 00000000000..aa5d05aef6e --- /dev/null +++ b/dlls/light.msstyles/blue_toolbar_buttons_split_dropdown.svg @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:5-32" width="5" height="132" version="1.1" viewBox="0 0 1.3229 34.925" 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" stroke-linejoin="bevel" stroke-width=".26458"> + <rect x=".13229" y="5.9531" width="1.0583" height="5.5563" rx=".52917" ry=".52917" stroke="#3096fa"/> + <rect x=".13229" y="11.774" width="1.0583" height="5.5563" rx=".52917" ry=".52917" stroke="#2979ff"/> + <rect x=".13229" y="29.236" width="1.0583" height="5.5563" rx=".52917" ry=".52917" stroke="#2979ff"/> + <rect x=".13229" y="23.416" width="1.0583" height="5.5563" rx=".52917" ry=".52917" stroke="#3096fa"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_toolbar_buttons_split_dropdown_glyph.bmp b/dlls/light.msstyles/blue_toolbar_buttons_split_dropdown_glyph.bmp new file mode 100644 index 0000000000000000000000000000000000000000..2ada751dd6b4de8e519bf382b4a2c33446231e91 GIT binary patch literal 2298 zcmeH|y-UMT6vbl|B7#d+7l)#z1(RkFT|30dMJPIF7X(52;qYchF^Pj+0tS50Higi^ zZ03Iwk`C9CYC>zO?c!kY(O>U-_nsHR<@U6G60ZxBb&KyCumKLhim)xLB3^#hv7K5Z z2p^v$NA=^=tEu8r+qI=sKZ}S7C2GnXc+{A@ZtenIltpUEF10I+niT_DpRRW|r-j6- z5;Os7XK9|AdpdHj)Y;j}axK}Rj(nJ&(@1Su!`*IrE?P|b9GS}V*j7E_jbtoxi|)!| zY^hI?sj}EsjL1@b>VE0-V^xYx^(C@v=jj8+rlR9s_+~3vpJPjL#t*flRFlT|eqW2t zT4DRl7%TPreGWX%`P@E_Mk5h*x7X`2L<9K4;c#Z2aaS4)1_3nLJmaiG8={u=894`< z+&m+vL0i~9C-aQo>+ktSTMqwy1Ah#OZ&)f{=o_}`F7ypc4d6l9Jb&jKv8Cnax#+$D ue=GqGJTTWckQadq7%+ejW_$x@2?QYPGxj<NLFOCSJ0RC*<TUUneB&LK{N%#` literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_toolbar_buttons_split_dropdown_glyph.svg b/dlls/light.msstyles/blue_toolbar_buttons_split_dropdown_glyph.svg new file mode 100644 index 00000000000..dd0200a5c2e --- /dev/null +++ b/dlls/light.msstyles/blue_toolbar_buttons_split_dropdown_glyph.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="m2.3813 1.1987-1.0503 0.91793-0.15004-0.13113 1.0503-0.91794z"/> + <path d="m0.41463 1.0583 1.0503 0.91794-0.15004 0.13113-1.0503-0.91794z"/> + <g> + <path d="m2.3813 3.58-1.0503 0.91794-0.15004-0.13113 1.0503-0.91793z" fill="#3096fa"/> + <path d="m0.41463 3.4396 1.0503 0.91794-0.15004 0.13113-1.0503-0.91793z" fill="#3096fa"/> + <path d="m2.3813 5.9612-1.0503 0.91793-0.15004-0.13113 1.0503-0.91793z" fill="#2979ff"/> + <path d="m0.41463 5.8208 1.0503 0.91793-0.15004 0.13113-1.0503-0.91793z" fill="#2979ff"/> + <path d="m2.3812 8.3425-1.0503 0.91794-0.15004-0.13113 1.0503-0.91794z" fill="#aeaeae"/> + <path d="m0.41463 8.2021 1.0503 0.91794-0.15004 0.13113-1.0503-0.91793z" fill="#aeaeae"/> + <path d="m2.3813 10.724-1.0503 0.91794-0.15004-0.13113 1.0503-0.91794z" fill="#3096fa"/> + <path d="m0.41463 10.583 1.0503 0.91794-0.15004 0.13113-1.0503-0.91793z" fill="#3096fa"/> + <path d="m2.3813 13.105-1.0503 0.91794-0.15004-0.13113 1.0503-0.91794z" fill="#2979ff"/> + <path d="m0.41463 12.965 1.0503 0.91794-0.15004 0.13113-1.0503-0.91794z" fill="#2979ff"/> + </g> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_toolbar_separator_horizontal.bmp b/dlls/light.msstyles/blue_toolbar_separator_horizontal.bmp new file mode 100644 index 0000000000000000000000000000000000000000..7d05303b554e947a099d3bbe1380c1175a1e3282 GIT binary patch literal 298 zcmZ?r)na4-gDxOh1H>Fa%nHPe3<?a)KzacXV}kz-3=jm8`tRf(RE((xzX%I{X}q%Q R)~y5DjvEk?$E_2$3;+bg4e|g0 literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_toolbar_separator_horizontal.svg b/dlls/light.msstyles/blue_toolbar_separator_horizontal.svg new file mode 100644 index 00000000000..43ad7bea4d6 --- /dev/null +++ b/dlls/light.msstyles/blue_toolbar_separator_horizontal.svg @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:8-32" width="8" height="5" version="1.1" viewBox="0 0 2.1167 1.3229" 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)" x=".52917" y="-1.0583" width=".52917" height=".26458" fill="#aeaeae" stroke-width="0"/> +</svg> diff --git a/dlls/light.msstyles/blue_toolbar_separator_vertical.bmp b/dlls/light.msstyles/blue_toolbar_separator_vertical.bmp new file mode 100644 index 0000000000000000000000000000000000000000..45abed769996520d59ead98337759e02ebf8bbe9 GIT binary patch literal 298 zcmZ?r)na4-gDxOh1H`OA%mKuV3<?a)KzacXV}kz-3=jm8`tRf(RE((xzX%I{X{yPt MTet2%2vcex08Wh!@&Et; literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_toolbar_separator_vertical.svg b/dlls/light.msstyles/blue_toolbar_separator_vertical.svg new file mode 100644 index 00000000000..60b3e07b92f --- /dev/null +++ b/dlls/light.msstyles/blue_toolbar_separator_vertical.svg @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:5-32" width="5" height="8" version="1.1" viewBox="0 0 1.3229 2.1167" 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=".52917" y=".79375" width=".52917" height=".26458" fill="#aeaeae" stroke-width="0"/> +</svg> diff --git a/dlls/light.msstyles/light.rc b/dlls/light.msstyles/light.rc index 0f9fe2847fe..c24df6ca17f 100644 --- a/dlls/light.msstyles/light.rc +++ b/dlls/light.msstyles/light.rc @@ -472,6 +472,73 @@ BLUE_INI TEXTFILE "GlyphType = ImageGlyph\r\n" "GlyphImageFile = blue_spin_glyph_left.bmp\r\n" "GlyphTransparent = True\r\n" + +"\r\n; Toolbar\r\n" +"[Toolbar]\r\n" +"BgType = BorderFill\r\n" +"BorderSize = 0\r\n" +"FillColor = 244 244 244\r\n" +"TextColor = 0 0 0\r\n" + +"[Toolbar(Pressed)]\r\n" +"TextColor = 0 0 0\r\n" + +"[Toolbar.Button]\r\n" +"SizingMargins = 3, 3, 3, 3\r\n" +"ContentMargins = 0, 0, 0, 0\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" + +"[Toolbar.Separator]\r\n" +"SizingMargins = 5, 2, 2, 1\r\n" +"ImageFile = blue_toolbar_separator_horizontal.bmp\r\n" +"BgType = ImageFile\r\n" +"ImageCount = 1\r\n" +"SizingType = Tile\r\n" +"Transparent = True\r\n" + +"[Toolbar.SeparatorVert]\r\n" +"SizingMargins = 2, 1, 5, 1\r\n" +"ImageFile = blue_toolbar_separator_vertical.bmp\r\n" +"BgType = ImageFile\r\n" +"ImageCount = 1\r\n" +"SizingType = Tile\r\n" +"Transparent = True\r\n" + +"[Toolbar.DropdownButton]\r\n" +"SizingMargins = 4, 4, 4, 4\r\n" +"ContentMargins = 0, 0, 0, 0\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" + +"[Toolbar.SplitButton]\r\n" +"SizingMargins = 3, 2, 3, 3\r\n" +"ImageFile = blue_toolbar_buttons_split.bmp\r\n" +"BgType = ImageFile\r\n" +"ImageLayout = Vertical\r\n" +"ImageCount = 6\r\n" +"SizingType = Stretch\r\n" +"Transparent = True\r\n" + +"[Toolbar.SplitButtonDropdown]\r\n" +"SizingMargins = 1, 3, 3, 3\r\n" +"ImageFile = blue_toolbar_buttons_split_dropdown.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_toolbar_buttons_split_dropdown_glyph.bmp\r\n" +"GlyphTransparent = True\r\n" } /* Button */ @@ -568,6 +635,25 @@ BLUE_SPIN_GLYPH_RIGHT_BMP BITMAP "blue_spin_glyph_right.bmp" /* @makedep: blue_spin_glyph_up.bmp */ BLUE_SPIN_GLYPH_UP_BMP BITMAP "blue_spin_glyph_up.bmp" +/* ToolBar */ +/* @makedep: blue_toolbar_buttons.bmp */ +BLUE_TOOLBAR_BUTTONS_BMP BITMAP "blue_toolbar_buttons.bmp" + +/* @makedep: blue_toolbar_buttons_split.bmp */ +BLUE_TOOLBAR_BUTTONS_SPLIT_BMP BITMAP "blue_toolbar_buttons_split.bmp" + +/* @makedep: blue_toolbar_separator_horizontal.bmp */ +BLUE_TOOLBAR_SEPARATOR_HORIZONTAL_BMP BITMAP "blue_toolbar_separator_horizontal.bmp" + +/* @makedep: blue_toolbar_separator_vertical.bmp */ +BLUE_TOOLBAR_SEPARATOR_VERTICAL_BMP BITMAP "blue_toolbar_separator_vertical.bmp" + +/* @makedep: blue_toolbar_buttons_split_dropdown.bmp */ +BLUE_TOOLBAR_BUTTONS_SPLIT_DROPDOWN_BMP BITMAP "blue_toolbar_buttons_split_dropdown.bmp" + +/* @makedep: blue_toolbar_buttons_split_dropdown_glyph.bmp */ +BLUE_TOOLBAR_BUTTONS_SPLIT_DROPDOWN_GLYPH_BMP BITMAP "blue_toolbar_buttons_split_dropdown_glyph.bmp" + /* File version */ #define WINE_FILEDESCRIPTION_STR "Light Theme" #define WINE_FILENAME_STR "light.msstyles" -- 2.30.2

1 0

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

25 Jun '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- 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 ++++ .../blue_spin_background_down.bmp | Bin 0 -> 1674 bytes .../blue_spin_background_down.svg | 19 ++++ .../blue_spin_background_left.bmp | Bin 0 -> 1674 bytes .../blue_spin_background_left.svg | 19 ++++ .../blue_spin_background_right.bmp | Bin 0 -> 1674 bytes .../blue_spin_background_right.svg | 19 ++++ .../blue_spin_background_up.bmp | Bin 0 -> 1674 bytes .../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(-) create mode 100644 dlls/light.msstyles/blue_spin_background.bmp create mode 100644 dlls/light.msstyles/blue_spin_background.svg create mode 100644 dlls/light.msstyles/blue_spin_background_down.bmp create mode 100644 dlls/light.msstyles/blue_spin_background_down.svg create mode 100644 dlls/light.msstyles/blue_spin_background_left.bmp create mode 100644 dlls/light.msstyles/blue_spin_background_left.svg create mode 100644 dlls/light.msstyles/blue_spin_background_right.bmp create mode 100644 dlls/light.msstyles/blue_spin_background_right.svg create mode 100644 dlls/light.msstyles/blue_spin_background_up.bmp create mode 100644 dlls/light.msstyles/blue_spin_background_up.svg create mode 100644 dlls/light.msstyles/blue_spin_glyph_down.bmp create mode 100644 dlls/light.msstyles/blue_spin_glyph_down.svg create mode 100644 dlls/light.msstyles/blue_spin_glyph_left.bmp create mode 100644 dlls/light.msstyles/blue_spin_glyph_left.svg create mode 100644 dlls/light.msstyles/blue_spin_glyph_right.bmp create mode 100644 dlls/light.msstyles/blue_spin_glyph_right.svg create mode 100644 dlls/light.msstyles/blue_spin_glyph_up.bmp create mode 100644 dlls/light.msstyles/blue_spin_glyph_up.svg diff --git a/dlls/light.msstyles/Makefile.in b/dlls/light.msstyles/Makefile.in index bcfb38b319c..ad21f8683bf 100644 --- a/dlls/light.msstyles/Makefile.in +++ b/dlls/light.msstyles/Makefile.in @@ -23,4 +23,13 @@ SVG_SRCS = \ blue_scrollbar_shaft_horizontal.svg \ blue_scrollbar_shaft_vertical.svg \ blue_scrollbar_thumb_horizontal.svg \ - blue_scrollbar_thumb_vertical.svg + blue_scrollbar_thumb_vertical.svg \ + blue_spin_background_down.svg \ + blue_spin_background_left.svg \ + blue_spin_background_right.svg \ + blue_spin_background.svg \ + blue_spin_background_up.svg \ + blue_spin_glyph_down.svg \ + blue_spin_glyph_left.svg \ + blue_spin_glyph_right.svg \ + blue_spin_glyph_up.svg diff --git a/dlls/light.msstyles/blue_spin_background.bmp b/dlls/light.msstyles/blue_spin_background.bmp new file mode 100644 index 0000000000000000000000000000000000000000..083b3062dda511d970de85f6fc4d7c56071737e2 GIT binary patch literal 446 zcmZ?r-N(oP23<h128j89m>q~286<!t1A_@v9?XFg{}~t{2qf~~$vvnTE=44R1x?*L jY~TSlz`y`h`X3blMSx0C#r^|DhNN1|kiZrUK)(S1!w?N` literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_spin_background.svg b/dlls/light.msstyles/blue_spin_background.svg new file mode 100644 index 00000000000..a817341f6ed --- /dev/null +++ b/dlls/light.msstyles/blue_spin_background.svg @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:14-24" width="14" height="7" version="1.1" viewBox="0 0 3.7042 1.8521" 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" stroke-width=".26458"> + <rect x=".13229" y=".13229" width="1.5875" height="1.5875" stroke="#aeaeae"/> + <rect x="1.9844" y=".13229" width="1.5875" height="1.5875" stroke="#e0e0e0"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_spin_background_down.bmp b/dlls/light.msstyles/blue_spin_background_down.bmp new file mode 100644 index 0000000000000000000000000000000000000000..762755aacaa123204fbab2e403c288db395882c1 GIT binary patch literal 1674 zcmeHHJ5Iwu6f_cwI09E7xS)X=rJ<ssAaDUbH5G;vq{jqEu3$yx2zCj*-ILG}DaZvj z_G5P6voRZ4qM)(F=<V*jd9%e%vAz94$I=*Jzs6d_+QnM2*0BRJ=ce4rvbdB$y}g5r za`M}A)i6>sk|YVkaH0W%mc2m`L{XG$fMCQrjL?{apk?lP9uuQ&yWaF(<P*p7ay|$U zBOT|Yo@YIrAACL~_lO)@)$K9OXEMDxq^nK3+)xDq4+Az9Wn_z97n$>*?Yi+^v<&3q zbR`O>me1P@spxD~ZvQ(^xn>^4VwU-5>2MpBJ)Rfuuk6VDll*x^d5X%P?%`n_HYGAX zKhnD$(cLW(^^ulsMGRYObmP5fHFQ4XGM|SkpJFk^Nb>Ygt33JE^8Ww-a3)Rv<e&UM EUon&;oB#j- literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_spin_background_down.svg b/dlls/light.msstyles/blue_spin_background_down.svg new file mode 100644 index 00000000000..6742bd1c57f --- /dev/null +++ b/dlls/light.msstyles/blue_spin_background_down.svg @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:8-24" width="8" height="64" version="1.1" viewBox="0 0 2.1167 16.933" 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="-3e-4" width="2.1167" height="16.934" fill="#fff" stroke-width=".26459"/> + <g stroke-width=".265"> + <rect x=".39708" y=".1325" width="1.3229" height="3.7042" rx=".52917" ry=".52917" fill="#fff" stroke="#aeaeae"/> + <rect x=".39708" y="4.3658" width="1.3229" height="3.7042" rx=".52917" ry=".52917" fill="#fff" stroke="#3096fa"/> + <rect x=".39708" y="8.5992" width="1.3229" height="3.7042" rx=".52917" ry=".52917" fill="#2979ff" stroke="#2979ff"/> + <rect x=".39708" y="12.832" width="1.3229" height="3.7042" rx=".52917" ry=".52917" fill="#fff" stroke="#aeaeae"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_spin_background_left.bmp b/dlls/light.msstyles/blue_spin_background_left.bmp new file mode 100644 index 0000000000000000000000000000000000000000..673c554e9fcd84b8f8d6b51174d290cce69ac626 GIT binary patch literal 1674 zcmeH{J5Iwu5QdF};0jy;aFHg|C=C@25+q!JM@@y{1nIMc*A=YD9KkN3w|f#gA_cj? zjy?RlGmch{BGJ%TjAq9(-;8X{Z)rP+{SC)hAMqAv6K5Z1&DlbPNuP@<lH;&zK%Il5 ztE%(c=X!0Bh|)BTqG)6c2}=EPqA(2OI4+DKL5n#C!7u<rf|9xK`wTgvYzAMoFZ4;0 zWLX~wh?bFaWb0{*!#V3i(=n+Yd9L=mQ<_eM4^HT2m#(+9BT+r!7-J|cSGWyL-Vk2f z*Q@p&9Fw<W>C=^cKi^49=W177$SZv52QV*ZlRUV{hHZHMa#?<TFwcXt;_Zow3|_oG zV1_xyG-R89XZL%;Rm=WDrdkc*wS9+eOP}XTpT~th<!lV;M9<)Sp{Fel=lq`k`-gQ{ Kb$|Zp{qqCe-DFAt literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_spin_background_left.svg b/dlls/light.msstyles/blue_spin_background_left.svg new file mode 100644 index 00000000000..84d342d124d --- /dev/null +++ b/dlls/light.msstyles/blue_spin_background_left.svg @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:7-24" width="7" height="64" version="1.1" viewBox="0 0 1.8521 16.933" 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="1.7764e-15" y="-.00024286" width="1.8521" height="16.933" fill="#fff" stroke-width=".26459"/> + <g stroke-width=".265"> + <rect x=".39708" y=".39708" width="1.3229" height="3.7042" rx=".52917" ry=".52917" fill="#fff" stroke="#aeaeae"/> + <rect x=".39708" y="4.6305" width="1.3229" height="3.7042" rx=".52917" ry=".52917" fill="#fff" stroke="#3096fa"/> + <rect x=".39708" y="8.8636" width="1.3229" height="3.7042" rx=".52917" ry=".52917" fill="#2979ff" stroke="#2979ff"/> + <rect x=".39708" y="13.097" width="1.3229" height="3.7042" rx=".52917" ry=".52917" fill="#fff" stroke="#aeaeae"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_spin_background_right.bmp b/dlls/light.msstyles/blue_spin_background_right.bmp new file mode 100644 index 0000000000000000000000000000000000000000..56a6281810884e67d023d98c6269e5e68ea71e61 GIT binary patch literal 1674 zcmeH{Jx;?w5QP^B!4<dy;DQEfl!l512?7`3r=}vw3DRT!uV6*y2zCj*-ILG}DaZvj z_V9LRysR8WqM-<4G`l<V=E>H6#kO|)OUgtadk<?FYa44ptzbvUoSS+lr8u=ft)0E| zdh*kAv0==zERN%W2^46F@Cy}1QIaI32^1Ky4kI+w2oz{hz#jyG(PZQH59qV*3qEO@ zPV)gkj110!%hQEpYw)4*ko-gHcsj3+XgtDH>z4=AU8jpxohaa89X1wa<caQzT(f`P z^~QbC3ZH%ItT}wzqQAWubRKm*^4l6O`*BPKI9HQV5uWDPo5<qvta^Wi3wjYAm(TZ9 z=E(Bt79Q4N(;~;`M}D&<y1yZ!IdaqDJ6zb&{OOJRqW$LcQ1iL7e5%P1=!9o@VtHBu SZUH|3?+^2w^?v^L`||}t8)QlV literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_spin_background_right.svg b/dlls/light.msstyles/blue_spin_background_right.svg new file mode 100644 index 00000000000..c8ac6d2146b --- /dev/null +++ b/dlls/light.msstyles/blue_spin_background_right.svg @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:7-24" width="7" height="64" version="1.1" viewBox="0 0 1.8521 16.933" 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="-.00024286" width="1.8521" height="16.933" fill="#fff" stroke-width=".26459"/> + <g stroke-width=".265"> + <rect x=".1325" y=".39708" width="1.3229" height="3.7042" rx=".52917" ry=".52917" fill="#fff" stroke="#aeaeae"/> + <rect x=".1325" y="4.6305" width="1.3229" height="3.7042" rx=".52917" ry=".52917" fill="#fff" stroke="#3096fa"/> + <rect x=".1325" y="8.8636" width="1.3229" height="3.7042" rx=".52917" ry=".52917" fill="#2979ff" stroke="#2979ff"/> + <rect x=".1325" y="13.097" width="1.3229" height="3.7042" rx=".52917" ry=".52917" fill="#fff" stroke="#aeaeae"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_spin_background_up.bmp b/dlls/light.msstyles/blue_spin_background_up.bmp new file mode 100644 index 0000000000000000000000000000000000000000..5c53878b300f632667e5a7d5a94891620ca37a87 GIT binary patch literal 1674 zcmeHHJ5Iwu6m%qnas;jbxS)X=rJ<ssfN%jIH5G;vq{sZPU`6H#cA4~cpM;J`K`yYd zAG7<OjoBy?4TYtQ-tNwud0Xrh+d1s7TN-`rH&|_~eXN$XfgKQ^n{p@1;!*;24vsEM z=db6QF-Sy7l7wM6&;UUT5eR}HilSTt1QzQUgvJ~MEpyNFm>6x-^=0oxK5-l`=7RuX z={N`VJnP~7;<E|4U2<$ycc(O)ihFxZ*V}ZpsR{%$42-cTmMwZ+WX?v@b>qEg8OX=k zk|>;7KJQ~v(b=lplb<~0nt2rSY35&~_q(X<wO4$+@kHjI<)dfHQ&c{D#0={gQzGN* zGkw?--Q5vUA8FZE#29OgZoC(*hR)}u%;%}fr<hM*NuK_Bl_%d?+*kh(XR_>{{MY~I E8&hc`oB#j- literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_spin_background_up.svg b/dlls/light.msstyles/blue_spin_background_up.svg new file mode 100644 index 00000000000..1ec9953a6c1 --- /dev/null +++ b/dlls/light.msstyles/blue_spin_background_up.svg @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:8-24" width="8" height="64" version="1.1" viewBox="0 0 2.1167 16.933" 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="-3e-4" width="2.1167" height="16.934" fill="#fff" stroke-width=".26459"/> + <g stroke-width=".265"> + <rect x=".39708" y=".39708" width="1.3229" height="3.7042" rx=".52917" ry=".52917" fill="#fff" stroke="#aeaeae"/> + <rect x=".39708" y="4.6304" width="1.3229" height="3.7042" rx=".52917" ry=".52917" fill="#fff" stroke="#3096fa"/> + <rect x=".39708" y="8.8637" width="1.3229" height="3.7042" rx=".52917" ry=".52917" fill="#2979ff" stroke="#2979ff"/> + <rect x=".39708" y="13.097" width="1.3229" height="3.7042" rx=".52917" ry=".52917" fill="#fff" stroke="#aeaeae"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_spin_glyph_down.bmp b/dlls/light.msstyles/blue_spin_glyph_down.bmp new file mode 100644 index 0000000000000000000000000000000000000000..d729401a67ff5df11be9af50b00bf4635237a77f GIT binary patch literal 810 zcmbu7!D_-l6h)`D&|e4yl2W=7v}r}Mchi-d{z|ugfol`7n{*wLK(^WBFY+l>vKh}r z9%NJ$bjX=E@7~Gd5;B_)A62)O><f4X2OiXmGS=UK?PO`C4v%s4?CbmI<jNJ{>56~O z&hy+ailQmY@~!WuY3iZZS(b&=N_^3I@73I=cf?0a%)FyHF8*&{yXCC4_MrhQC%p$X zgit}}Q$_D`(mUc)6R>j9yKr~T?drpCqoCPEpH|N8X5zJRP`9gbh+l~>`Ys+Faz;}} x{B|8AW?uh${jc9$^t*F1)68wa%1Q4*4Ixw@zUW;}bn{D#pK!Kv(z|dm=N^N6n~wkh literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_spin_glyph_down.svg b/dlls/light.msstyles/blue_spin_glyph_down.svg new file mode 100644 index 00000000000..6f0fef139fc --- /dev/null +++ b/dlls/light.msstyles/blue_spin_glyph_down.svg @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:7-32" width="7" height="24" version="1.1" viewBox="0 0 1.8521 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=".26458"> + <path d="m1.8521 0.40498-0.91902 0.91793-0.13129-0.13113 0.91902-0.91794z"/> + <path d="m0.13129 0.26458 0.91902 0.91793-0.13129 0.13113-0.91902-0.91794z"/> + <g> + <path d="m1.8521 1.9925-0.91902 0.91794-0.13129-0.13113 0.91902-0.91793z" fill="#3096fa"/> + <path d="m0.13129 1.8521 0.91902 0.91794-0.13129 0.13113-0.91902-0.91793z" fill="#3096fa"/> + <path d="m1.8521 3.58-0.91902 0.91793-0.13129-0.13113 0.91902-0.91793z" fill="#fff"/> + <path d="m0.13129 3.4396 0.91902 0.91793-0.13129 0.13113-0.91902-0.91793z" fill="#fff"/> + <path d="m1.8521 5.1675-0.91902 0.91794-0.13129-0.13113 0.91902-0.91794z" fill="#aeaeae"/> + <path d="m0.13129 5.0271 0.91902 0.91794-0.13129 0.13113-0.91902-0.91793z" fill="#aeaeae"/> + </g> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_spin_glyph_left.bmp b/dlls/light.msstyles/blue_spin_glyph_left.bmp new file mode 100644 index 0000000000000000000000000000000000000000..a895c886808d8a97f543e7da2193fc157688c44a GIT binary patch literal 810 zcmaiwyH12a7)J3DUqZQPsEqESHrCr%+4w59KEbvM#Mn@ia4l)(F?f?@-3HIBvjq4P zo$SXj=bN25VfB1{V(rJ8=NmaA7v#wDEL|nXJjCcN>-VRde)aV7Dz^LsPXFkus`B$Z z{~B+}vdo1wX_}rNxM8X&3h%)53~%eYejGFXUY4cJ8H)aD-f^y@JN|b$@60{PocDe2 zlZhv5mo#MXG)ysj<1<*dM0mn%qKNQ>Ii?eyaF+<rZFukRqG00LecZXbFlaXMa`4=< zC{SG-Ogz8iWxI<O!gCYe*qp1j(XH_8J|7(2b?*z|Y3>o8d>fxkJXyP>A%mx3irFLM Y(XtSpFq`Q8!V~70PI$ug-3hUN0A)s-yZ`_I literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_spin_glyph_left.svg b/dlls/light.msstyles/blue_spin_glyph_left.svg new file mode 100644 index 00000000000..334ee0b87cf --- /dev/null +++ b/dlls/light.msstyles/blue_spin_glyph_left.svg @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:6-32" width="6" height="28" version="1.1" viewBox="0 0 1.5875 7.4083" 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.3229 0.13141-0.9179 0.91988-0.13113-0.13141 0.9179-0.91988z"/> + <path d="m0.39572 0.80081 0.9179 0.91988-0.13113 0.13141-0.9179-0.91988z"/> + <g> + <path d="m1.3229 1.9835-0.9179 0.91988-0.13113-0.13141 0.9179-0.91988z" fill="#3096fa"/> + <path d="m0.39572 2.6529 0.9179 0.91988-0.13113 0.13141-0.9179-0.91988z" fill="#3096fa"/> + <path d="m1.3229 3.8356-0.9179 0.91988-0.13113-0.13141 0.9179-0.91988z" fill="#fff"/> + <path d="m0.39572 4.505 0.9179 0.91988-0.13113 0.13141-0.9179-0.91988z" fill="#fff"/> + <path d="m1.3229 5.6877-0.9179 0.91988-0.13113-0.13141 0.9179-0.91988z" fill="#aeaeae"/> + <path d="m0.39572 6.3571 0.9179 0.91988-0.13113 0.13141-0.9179-0.91988z" fill="#aeaeae"/> + </g> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_spin_glyph_right.bmp b/dlls/light.msstyles/blue_spin_glyph_right.bmp new file mode 100644 index 0000000000000000000000000000000000000000..1e5804c5bc54b956471f35a9351258b2613d56c5 GIT binary patch literal 810 zcmb7;K~94}7)Hm|cm-HAsEM1J##)RVfQ>6RUd62^=u(S`nS^vr0t5~K$LLLpbu+%v zP=&vdIN=R5-#0UP;r-=UeT^ma6P&;Vj?|g5)q2DvhEeMKvyBPw9v;P!f#CQ+pJiE` zrs-+FN|MB*tIM)H|4*0adBDBR?>j|NIAj$}+no2^er7u|&H0P=T>Cf1#2`G$Jg7l< z4s-#1$CJGS73@7(yZy{Mk!cW~AFtPOvswtx=IzF#tDBcA;rUm$eVzxqXwmi5Gl#dT wUF83GMz?N1vz}!7J@SPoRSd$D%!3+)=Rg<GcRblUP{H1lwR<2VQW`p*pDJXV`v3p{ literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_spin_glyph_right.svg b/dlls/light.msstyles/blue_spin_glyph_right.svg new file mode 100644 index 00000000000..56b68ce195a --- /dev/null +++ b/dlls/light.msstyles/blue_spin_glyph_right.svg @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:6-32" width="6" height="28" version="1.1" viewBox="0 0 1.5875 7.4083" 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.1938 1.049-0.91988-0.9179 0.13141-0.13113 0.91988 0.9179z"/> + <path d="m1.3159 0.93194-0.91988 0.9179-0.13141-0.13113 0.91988-0.9179z"/> + <g> + <path d="m1.1938 2.9011-0.91988-0.9179 0.13141-0.13113 0.91988 0.9179z" fill="#3096fa"/> + <path d="m1.3159 2.784-0.91988 0.9179-0.13141-0.13113 0.91988-0.9179z" fill="#3096fa"/> + <path d="m1.1938 4.7532-0.91988-0.9179 0.13141-0.13113 0.91988 0.9179z" fill="#fff"/> + <path d="m1.3159 4.6361-0.91988 0.9179-0.13141-0.13113 0.91988-0.9179z" fill="#fff"/> + <path d="m1.1938 6.6053-0.91988-0.9179 0.13141-0.13113 0.91988 0.9179z" fill="#aeaeae"/> + <path d="m1.3159 6.4882-0.91988 0.9179-0.13141-0.13113 0.91988-0.9179z" fill="#aeaeae"/> + </g> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_spin_glyph_up.bmp b/dlls/light.msstyles/blue_spin_glyph_up.bmp new file mode 100644 index 0000000000000000000000000000000000000000..62c560a676d0074669f15ea439a8cc3b35390768 GIT binary patch literal 810 zcmbu5Jx;?w5QPmv;tEJe_JTVk5=SZAr=g<ZDzuz{mLyi(nA-A><kF3g;hW&#X8C5p z$V&=KVdZaU=e^z0lh==TGsmn~_7}K>D>!qMBi8#l+tJdF^ZkjV*AGw6M^`3<iwS>h z7ex`LX?i`@@;vt-Da%sf*Mm=W=^MOTxj*<>mW85MRdq9-gYR><m3d?Rl(W`41}i7M z2MH*s!T3}c8ZbGjgCG9rR!%e@TKIR)J__QGXkq2-HcJmZ>7qdO+n^r&ZohK-UC<nM z_a^7BznO=kcW-km=V8C{Kcht}^G^APf8NCOR!(}En}C8E2H)k}fXPW!Abtp<TRG`{ JXhG&pt}n}On{faD literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_spin_glyph_up.svg b/dlls/light.msstyles/blue_spin_glyph_up.svg new file mode 100644 index 00000000000..6641d33cb20 --- /dev/null +++ b/dlls/light.msstyles/blue_spin_glyph_up.svg @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:7-32" width="7" height="24" version="1.1" viewBox="0 0 1.8521 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=".26458"> + <path d="m0.93222 0.27387 0.91986 0.91792-0.13141 0.13113-0.91986-0.91792z"/> + <path d="m0 1.1825 0.91986-0.91792 0.13141 0.13113-0.91986 0.91792z"/> + <g> + <path d="m0.93222 1.8614 0.91986 0.91792-0.13141 0.13113-0.91986-0.91792z" fill="#3096fa"/> + <path d="m0 2.77 0.91986-0.91792 0.13141 0.13113-0.91986 0.91792z" fill="#3096fa"/> + <path d="m0.93222 3.4489 0.91986 0.91792-0.13141 0.13113-0.91986-0.91792z" fill="#fff"/> + <path d="m0 4.3575 0.91986-0.91792 0.13141 0.13113-0.91986 0.91792z" fill="#fff"/> + <path d="m0.93222 5.0364 0.91986 0.91792-0.13141 0.13113-0.91986-0.91792z" fill="#aeaeae"/> + <path d="m0 5.945 0.91986-0.91792 0.13141 0.13113-0.91986 0.91792z" fill="#aeaeae"/> + </g> + </g> +</svg> diff --git a/dlls/light.msstyles/light.rc b/dlls/light.msstyles/light.rc index c197a35960a..0f9fe2847fe 100644 --- a/dlls/light.msstyles/light.rc +++ b/dlls/light.msstyles/light.rc @@ -416,6 +416,62 @@ BLUE_INI TEXTFILE "SizingType = TrueSize\r\n" "Transparent = True\r\n" "VAlign = Bottom\r\n" + +"\r\n; Spin\r\n" +"[Spin]\r\n" +"BgType = ImageFile\r\n" +"SizingType = Tile\r\n" +"ImageFile = blue_spin_background.bmp\r\n" +"SizingMargins = 2, 2, 2, 2\r\n" +"ImageCount = 1\r\n" + +"[Spin.Up]\r\n" +"BgType = ImageFile\r\n" +"SizingType = Stretch\r\n" +"ImageFile = blue_spin_background_up.bmp\r\n" +"SizingMargins = 4, 3, 4, 2\r\n" +"ContentMargins = 0, 0, 0, 0\r\n" +"ImageCount = 4\r\n" +"ImageLayout = Vertical\r\n" +"GlyphType = ImageGlyph\r\n" +"GlyphImageFile = blue_spin_glyph_up.bmp\r\n" +"GlyphTransparent = True\r\n" + +"[Spin.Down]\r\n" +"BgType = ImageFile\r\n" +"SizingType = Tile\r\n" +"ImageFile = blue_spin_background_down.bmp\r\n" +"SizingMargins = 4, 3, 3, 3\r\n" +"ContentMargins = 0, 0, 0, 0\r\n" +"ImageCount = 4\r\n" +"ImageLayout = Vertical\r\n" +"GlyphType = ImageGlyph\r\n" +"GlyphImageFile = blue_spin_glyph_down.bmp\r\n" +"GlyphTransparent = True\r\n" + +"[Spin.Uphorz]\r\n" +"BgType = ImageFile\r\n" +"SizingType = Stretch\r\n" +"ImageFile = blue_spin_background_right.bmp\r\n" +"SizingMargins = 3, 3, 4, 2\r\n" +"ContentMargins = 0, 0, 0, 0\r\n" +"ImageCount = 4\r\n" +"ImageLayout = Vertical\r\n" +"GlyphType = ImageGlyph\r\n" +"GlyphImageFile = blue_spin_glyph_right.bmp\r\n" +"GlyphTransparent = True\r\n" + +"[Spin.Downhorz]\r\n" +"BgType = ImageFile\r\n" +"SizingType = Stretch\r\n" +"ImageFile = blue_spin_background_left.bmp\r\n" +"SizingMargins = 4, 2, 4, 2\r\n" +"ContentMargins = 0, 0, 0, 0\r\n" +"ImageCount = 4\r\n" +"ImageLayout = Vertical\r\n" +"GlyphType = ImageGlyph\r\n" +"GlyphImageFile = blue_spin_glyph_left.bmp\r\n" +"GlyphTransparent = True\r\n" } /* Button */ @@ -484,6 +540,34 @@ BLUE_SCROLLBAR_THUMB_HORIZONTAL_BMP BITMAP "blue_scrollbar_thumb_horizontal.bmp" /* @makedep: blue_scrollbar_thumb_vertical.bmp */ BLUE_SCROLLBAR_THUMB_VERTICAL_BMP BITMAP "blue_scrollbar_thumb_vertical.bmp" +/* Spin */ +/* @makedep: blue_spin_background.bmp */ +BLUE_SPIN_BACKGROUND_BMP BITMAP "blue_spin_background.bmp" + +/* @makedep: blue_spin_background_down.bmp */ +BLUE_SPIN_BACKGROUND_DOWN_BMP BITMAP "blue_spin_background_down.bmp" + +/* @makedep: blue_spin_background_right.bmp */ +BLUE_SPIN_BACKGROUND_RIGHT_BMP BITMAP "blue_spin_background_right.bmp" + +/* @makedep: blue_spin_background_left.bmp */ +BLUE_SPIN_BACKGROUND_LEFT_BMP BITMAP "blue_spin_background_left.bmp" + +/* @makedep: blue_spin_background_up.bmp */ +BLUE_SPIN_BACKGROUND_UP_BMP BITMAP "blue_spin_background_up.bmp" + +/* @makedep: blue_spin_glyph_down.bmp */ +BLUE_SPIN_GLYPH_DOWN_BMP BITMAP "blue_spin_glyph_down.bmp" + +/* @makedep: blue_spin_glyph_left.bmp */ +BLUE_SPIN_GLYPH_LEFT_BMP BITMAP "blue_spin_glyph_left.bmp" + +/* @makedep: blue_spin_glyph_right.bmp */ +BLUE_SPIN_GLYPH_RIGHT_BMP BITMAP "blue_spin_glyph_right.bmp" + +/* @makedep: blue_spin_glyph_up.bmp */ +BLUE_SPIN_GLYPH_UP_BMP BITMAP "blue_spin_glyph_up.bmp" + /* File version */ #define WINE_FILEDESCRIPTION_STR "Light Theme" #define WINE_FILENAME_STR "light.msstyles" -- 2.30.2

1 0

[PATCH 1/6] light.msstyles: Add Scroll Bar parts.
by Zhiyi Zhang 25 Jun '21

25 Jun '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- 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(-) create mode 100644 dlls/light.msstyles/blue_scrollbar_arrow_glyphs_7px.bmp create mode 100644 dlls/light.msstyles/blue_scrollbar_arrow_glyphs_7px.svg create mode 100644 dlls/light.msstyles/blue_scrollbar_arrow_glyphs_9px.bmp create mode 100644 dlls/light.msstyles/blue_scrollbar_arrow_glyphs_9px.svg create mode 100644 dlls/light.msstyles/blue_scrollbar_arrows.bmp create mode 100644 dlls/light.msstyles/blue_scrollbar_arrows.svg create mode 100644 dlls/light.msstyles/blue_scrollbar_resizebox_grip.bmp create mode 100644 dlls/light.msstyles/blue_scrollbar_resizebox_grip.svg create mode 100644 dlls/light.msstyles/blue_scrollbar_shaft_horizontal.bmp create mode 100644 dlls/light.msstyles/blue_scrollbar_shaft_horizontal.svg create mode 100644 dlls/light.msstyles/blue_scrollbar_shaft_vertical.bmp create mode 100644 dlls/light.msstyles/blue_scrollbar_shaft_vertical.svg create mode 100644 dlls/light.msstyles/blue_scrollbar_thumb_horizontal.bmp create mode 100644 dlls/light.msstyles/blue_scrollbar_thumb_horizontal.svg create mode 100644 dlls/light.msstyles/blue_scrollbar_thumb_vertical.bmp create mode 100644 dlls/light.msstyles/blue_scrollbar_thumb_vertical.svg diff --git a/dlls/light.msstyles/Makefile.in b/dlls/light.msstyles/Makefile.in index 201ed57d055..bcfb38b319c 100644 --- a/dlls/light.msstyles/Makefile.in +++ b/dlls/light.msstyles/Makefile.in @@ -15,4 +15,12 @@ SVG_SRCS = \ blue_groupbox.svg \ blue_radiobutton_13px.svg \ blue_radiobutton_16px.svg \ - blue_radiobutton_25px.svg + blue_radiobutton_25px.svg \ + blue_scrollbar_arrow_glyphs_7px.svg \ + blue_scrollbar_arrow_glyphs_9px.svg \ + blue_scrollbar_arrows.svg \ + blue_scrollbar_resizebox_grip.svg \ + blue_scrollbar_shaft_horizontal.svg \ + blue_scrollbar_shaft_vertical.svg \ + blue_scrollbar_thumb_horizontal.svg \ + blue_scrollbar_thumb_vertical.svg diff --git a/dlls/light.msstyles/blue_scrollbar_arrow_glyphs_7px.bmp b/dlls/light.msstyles/blue_scrollbar_arrow_glyphs_7px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..e8de9a21fd637883a13d7773f777d35ca74a727e GIT binary patch literal 3274 zcmcJRyKWjm7=<@Vq%^4kDO@%oO^CzARv=~MCRLg|Nu;!Sf|QPd7$l&!d@r$J`@8^e z0)}Suo%N2hmq8#ajC?#Z=gjQxVgLW1J^b?Lg%h-&{Qm)-gKyx8<2q02KZQEONb?=% z{!g5L`1$Mih`818*_u@s7Z-!`^YfBTK0Q4xqI)+tH?JO}UtV4|**{C}y}rKA!cW25 zsK)(rHePGs`|NuYU2n#|?+<|01AGy9!0KTOy~&!C2e>Slf|v*9IUBEMh3^BahgGLO zSR6O39u_ADMRafRt7`SINuM9pn#*=0?V-Py<+{^ldq3`>{UK-L<pI8b*WR~!Kpp_A z2lyiJfYrkmdXqIN4{%v91u+lIb8C2Lrw`V7a1>{XH!X}d<q7<lIDKj1J>uPs@*1;e zM*e(E@|s^=T@|>V$C}qReN+C0&oi>^Rh%i_k{VnIj6uvp$b0mzWzP)W>H)q0JYe+z zzbXGptQjTmsk!1z@s`vU-MR~ZJMY$F9+W@up7i9NWw$n4b*fem^Y&gr`|djLtsXYz zS9sr1@}A*bahCD`r#u;hn1_&8p12^{6#rHa@CBfKRuAx-@=wn*0$VrYFR%C}hGV%W zUU5x)x9BHlXJ_wp(XhUcO&v$eNM~JzK2_ht^@FV+=n)Hvy*yBS$2^3*N3Z%n0f7g4 z)pzAjP(SE1KzarAKsovt%(Z@}9_B~Y{EGOt*70_IygIJ7R-MLVd0e~qp!yDP>bT#n zW&-_pqoRB>yz$}Rp9eejz`gQ7@f~{)%yU3_(gG6@c%V1DspFYYuh1*s49_rVTEA-# z;jR94#C6YhUXUY0ofqg2=ZUHJXh9Aeo%~TArM|<^%gR5X+}&9V<2qKS;7VW!T<~z7 zFgEo*@DR~kj6D!L|CyJ8@^7aeR^58fdR}zv!{9t2AB=A5y*Upa^dOJY-(hzr2W6cv u>%QOq<BREWt=M~DuHS74To64^ip)J=&I6+>kHp8`19R0a<)5y%vHb-+w^!)^ literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_scrollbar_arrow_glyphs_7px.svg b/dlls/light.msstyles/blue_scrollbar_arrow_glyphs_7px.svg new file mode 100644 index 00000000000..c5eed6d9d3b --- /dev/null +++ b/dlls/light.msstyles/blue_scrollbar_arrow_glyphs_7px.svg @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:7-32" width="7" height="112" version="1.1" viewBox="0 0 1.8521 29.633" 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.93222 0.27387 0.91986 0.91792-0.13141 0.13113-0.91986-0.91792z"/> + <path d="m0 1.1825 0.91986-0.91792 0.13141 0.13113-0.91986 0.91792z"/> + <g> + <path d="m0.93222 2.126 0.91986 0.91792-0.13141 0.13113-0.91986-0.91792z" fill="#3096fa"/> + <path d="m0 3.0346 0.91986-0.91792 0.13141 0.13113-0.91986 0.91792z" fill="#3096fa"/> + <path d="m0.93222 3.978 0.91986 0.91792-0.13141 0.13113-0.91986-0.91792z" fill="#fff"/> + <path d="m0 4.8867 0.91986-0.91792 0.13141 0.13113-0.91986 0.91792z" fill="#fff"/> + <path d="m0.93222 5.8301 0.91986 0.91792-0.13141 0.13113-0.91986-0.91792z" fill="#aeaeae"/> + <path d="m0 6.7388 0.91986-0.91792 0.13141 0.13113-0.91986 0.91792z" fill="#aeaeae"/> + </g> + <path d="m1.8591 8.0782-0.91792 0.91986-0.13113-0.13141 0.91792-0.91986z"/> + <path d="m0.14042 7.9375 0.91792 0.91986-0.13113 0.13141-0.91792-0.91986z"/> + <g> + <path d="m1.8591 9.9303-0.91792 0.91986-0.13113-0.13141 0.91792-0.91986z" fill="#3096fa"/> + <path d="m0.14042 9.7896 0.91792 0.91986-0.13113 0.13141-0.91792-0.91986z" fill="#3096fa"/> + <path d="m1.8591 11.782-0.91792 0.91986-0.13113-0.13141 0.91792-0.91986z" fill="#fff"/> + <path d="m0.14042 11.642 0.91792 0.91986-0.13113 0.13141-0.91792-0.91986z" fill="#fff"/> + <path d="m1.8591 13.634-0.91792 0.91986-0.13113-0.13141 0.91792-0.91986z" fill="#aeaeae"/> + <path d="m0.14042 13.494 0.91792 0.91986-0.13113 0.13141-0.91792-0.91986z" fill="#aeaeae"/> + </g> + <path d="m1.3229 14.948-0.9179 0.91988-0.13113-0.13141 0.9179-0.91988z"/> + <path d="m0.39572 15.617 0.9179 0.91988-0.13113 0.13141-0.9179-0.91988z"/> + <g> + <path d="m1.3229 16.8-0.9179 0.91988-0.13113-0.13141 0.9179-0.91988z" fill="#3096fa"/> + <path d="m0.39572 17.47 0.9179 0.91988-0.13113 0.13141-0.9179-0.91988z" fill="#3096fa"/> + <path d="m1.3229 18.652-0.9179 0.91988-0.13113-0.13141 0.9179-0.91988z" fill="#fff"/> + <path d="m0.39572 19.322 0.9179 0.91988-0.13113 0.13141-0.9179-0.91988z" fill="#fff"/> + <path d="m1.3229 20.504-0.9179 0.91988-0.13113-0.13141 0.9179-0.91988z" fill="#aeaeae"/> + <path d="m0.39571 21.174 0.9179 0.91988-0.13113 0.13141-0.9179-0.91988z" fill="#aeaeae"/> + </g> + <path d="m1.4583 23.274-0.91988-0.9179 0.13141-0.13113 0.91988 0.9179z"/> + <path d="m1.5805 23.157-0.91988 0.9179-0.13141-0.13113 0.91988-0.9179z"/> + <g> + <path d="m1.4583 25.126-0.91988-0.9179 0.13141-0.13113 0.91988 0.9179z" fill="#3096fa"/> + <path d="m1.5805 25.009-0.91988 0.9179-0.13141-0.13113 0.91988-0.9179z" fill="#3096fa"/> + <path d="m1.4583 26.978-0.91988-0.9179 0.13141-0.13113 0.91988 0.9179z" fill="#fff"/> + <path d="m1.5805 26.861-0.91988 0.9179-0.13141-0.13113 0.91988-0.9179z" fill="#fff"/> + <path d="m1.4583 28.83-0.91988-0.9179 0.13141-0.13113 0.91988 0.9179z" fill="#aeaeae"/> + <path d="m1.5805 28.713-0.91988 0.9179-0.13141-0.13113 0.91988-0.9179z" fill="#aeaeae"/> + </g> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_scrollbar_arrow_glyphs_9px.bmp b/dlls/light.msstyles/blue_scrollbar_arrow_glyphs_9px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..da6e0a47f02d02fbaef5158f534588dd411b787e GIT binary patch literal 5322 zcmds(zit{q7{o71n)H!C3YbfrCX$1(tw74iO{z3`m9%++RFPwh3=+B8^8b>8>-_?} z3D`8`H{|wociLT_CFIDgJigtXx!q;74B!6On^(cI{p9}-@Dlt2&w?;`&hvA^)6KL+ z5d8bo++zRBx9=IURQE+Gm0NUvem*=oIoWV4f<QdF`1<<#%_?*k7Z+{To4D4xy1J^s zkHLGJhVxW?yxxHyu+BT%`>UQ?EEYr1@U08K0b=0w@Bz9uTBnC_6)*-?51Fs}czqW5 z0eBP-=SQvK>~P2H;p}*C16@4(-Sm1`RyRG^Zr^ox+#U|LD(pAD>+ae;?0&5JczFmv zxb5yfiid1B1YQr}^<9sF*TV<s+Gw2~!d1W+SUqIEdJhjB48UV~7$`TCAKKW~&d$yn z@FQ~QwTF+%xzNUIjx{Fa=_ePj`OC}8I{U<E-}-cA^Eo+p<XdZ1oN`0?;aU%_0Y<>; zVZz5eL(du$c&~@>br1uuhwx?dxq&uvooSWx$_?d*Yfa_lyxSU0d)rnIm%Q?_*9u*0 z-1W96^P{HM!)bS`&N<@SqYqvW%jRx!uE=$!70)X-oF2j{FO`QOu(kVmy`%i|dI(<! z+Q;i5eA#@~xgzl2n{tkvnz-sMlTS(AH!A83Z|X~Os;1mSziB=k<4E~s#(GKzj<a)5 zwNIvmKzU~UonzkQlj=U@W=@ykm%r<bYaj-xhx8+m^N_K0YvG}CZcd)L>MfH`bLu|j zW>IH&Q(sOGnzd!_9q*+cGLDLMYNA^U5BdItKzWwCUyMyN`J}pU1d2MtoBFbbM!A=I zNIwF(d&pS2b@7moVsGSFzgRaa*T5h1Mv|v#eQEL$P42hD=uS^hJIYIwpJpBNRF3lQ zMEjVzr~D+Z`XE>HFm8a<L;A|ow7#To@-ydQM%SSq19NY47BRmGl+SD7;k?)C7wg7l zUDj)*9xn4VQ(u~VEY^Xk?y%WWUYh*O8OY$4996wp%+I3k361-lHFpmg>wcsj(hq@h c(&$V+=I&ue*P$N+>pf&%IjVftJ}Ym30bpQQ0ssI2 literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_scrollbar_arrow_glyphs_9px.svg b/dlls/light.msstyles/blue_scrollbar_arrow_glyphs_9px.svg new file mode 100644 index 00000000000..7f5bde5dcc8 --- /dev/null +++ b/dlls/light.msstyles/blue_scrollbar_arrow_glyphs_9px.svg @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:9-32" width="9" height="144" version="1.1" viewBox="0 0 2.3812 38.1" 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.1968 0.53845 0.91986 0.91792-0.13141 0.13113-0.91986-0.91792z"/> + <path d="m0.26458 1.4471 0.91986-0.91792 0.13141 0.13113-0.91986 0.91792z"/> + <g> + <path d="m1.1968 2.9197 0.91986 0.91792-0.13141 0.13113-0.91986-0.91792z" fill="#3096fa"/> + <path d="m0.26458 3.8283 0.91986-0.91792 0.13141 0.13113-0.91986 0.91792z" fill="#3096fa"/> + <path d="m1.1968 5.301 0.91986 0.91792-0.13141 0.13113-0.91986-0.91792z" fill="#fff"/> + <path d="m0.26458 6.2096 0.91986-0.91792 0.13141 0.13113-0.91986 0.91792z" fill="#fff"/> + <path d="m1.1968 7.6822 0.91986 0.91792-0.13141 0.13113-0.91986-0.91792z" fill="#aeaeae"/> + <path d="m0.26458 8.5908 0.91986-0.91792 0.13141 0.13113-0.91986 0.91792z" fill="#aeaeae"/> + </g> + <path d="m2.1144 10.459-0.91792 0.91986-0.13113-0.13141 0.91792-0.91986z"/> + <path d="m0.39571 10.319 0.91792 0.91986-0.13113 0.13141-0.91792-0.91986z"/> + <g> + <path d="m2.1144 12.841-0.91792 0.91986-0.13113-0.13141 0.91792-0.91986z" fill="#3096fa"/> + <path d="m0.39571 12.7 0.91792 0.91986-0.13113 0.13141-0.91792-0.91986z" fill="#3096fa"/> + <path d="m2.1144 15.222-0.91792 0.91986-0.13113-0.13141 0.91792-0.91986z" fill="#fff"/> + <path d="m0.39571 15.081 0.91792 0.91986-0.13113 0.13141-0.91792-0.91986z" fill="#fff"/> + <path d="m2.1144 17.603-0.91792 0.91986-0.13113-0.13141 0.91792-0.91986z" fill="#aeaeae"/> + <path d="m0.39571 17.462 0.91792 0.91986-0.13113 0.13141-0.91792-0.91986z" fill="#aeaeae"/> + </g> + <path d="m1.5875 19.446-0.9179 0.91988-0.13113-0.13141 0.9179-0.91988z"/> + <path d="m0.6603 20.115 0.9179 0.91988-0.13113 0.13141-0.9179-0.91988z"/> + <g> + <path d="m1.5875 21.827-0.9179 0.91988-0.13113-0.13141 0.9179-0.91988z" fill="#3096fa"/> + <path d="m0.6603 22.497 0.9179 0.91988-0.13113 0.13141-0.9179-0.91988z" fill="#3096fa"/> + <path d="m1.5875 24.208-0.9179 0.91988-0.13113-0.13141 0.9179-0.91988z" fill="#fff"/> + <path d="m0.6603 24.878 0.9179 0.91988-0.13113 0.13141-0.9179-0.91988z" fill="#fff"/> + <path d="m1.5875 26.59-0.9179 0.91988-0.13113-0.13141 0.9179-0.91988z" fill="#aeaeae"/> + <path d="m0.6603 27.259 0.9179 0.91988-0.13113 0.13141-0.9179-0.91988z" fill="#aeaeae"/> + </g> + <path d="m1.7229 29.889-0.91988-0.9179 0.13141-0.13113 0.91988 0.9179z"/> + <path d="m1.845 29.772-0.91988 0.9179-0.13141-0.13113 0.91988-0.9179z"/> + <g> + <path d="m1.7229 32.27-0.91988-0.9179 0.13141-0.13113 0.91988 0.9179z" fill="#3096fa"/> + <path d="m1.845 32.153-0.91988 0.9179-0.13141-0.13113 0.91988-0.9179z" fill="#3096fa"/> + <path d="m1.7229 34.651-0.91988-0.9179 0.13141-0.13113 0.91988 0.9179z" fill="#fff"/> + <path d="m1.845 34.534-0.91988 0.9179-0.13141-0.13113 0.91988-0.9179z" fill="#fff"/> + <path d="m1.7229 37.032-0.91988-0.9179 0.13141-0.13113 0.91988 0.9179z" fill="#aeaeae"/> + <path d="m1.845 36.915-0.91988 0.9179-0.13141-0.13113 0.91988-0.9179z" fill="#aeaeae"/> + </g> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_scrollbar_arrows.bmp b/dlls/light.msstyles/blue_scrollbar_arrows.bmp new file mode 100644 index 0000000000000000000000000000000000000000..8e6ae4fe96acdcd67e7d576f6315d3680e39bcc4 GIT binary patch literal 14282 zcmeI2&2HL26oqf3JV3kaE2Pb$8`5o*O;_1e%HInl>AI_sK0)^(q>1tf5hafRt0>79 z*cY-Z6%|O>3^!*CB0r*<u@}||9m_WM_*~l>?uGMtys>%nNs{RY*59$b#qwrJWJ%s7 z?d#Ly$<A!0B9qy+=*H(S-)4tAH<n-N`u%>rUawRtSFQ;fD4`d8G@DIhjJhUhpoCr! z?GrFLA(YSy?#Ok47ssJz4EsQB9%RY4TCLV<wS3a_DX&ov2*cG}<#Pqiw0^YP*3zyP zSM_McF++2@r`?WdX-AJgIMlP#L0Q@ruPe-AuyMR9zE^k_#+aiO_JQpKpNxK%IM9op zY-#bmZ`Rqo-Vy!tTTix;t?n>rP&nPTjQ>5v)x+p)Eh>F<%x7!y^;hU6t{#}%a~%y| z{L9SU84b<tPlQQSE~ts-YUVVKhPWfa{meP`|0d`e!#>a?57OpaxghbceRF^5m8K># zcNeGw8TZ<8bsyR7C>~T-xqyIiuOn%_<zO&K=PetJ2EC;weurK;Kkpx;w}cC|Y{r_) zFArFA`So?kH3vSkJm=|0!E=8f5}qr1^Bk0?d+Gf(dCu}R*(_@x<jHeeUXM2bfFM81 zbG?q`IZr?O#B+BSzP=YcS3M-pk+UY8l^3Hg5YJgZ%CUm{JQDqAw!RM1TTaIc(()W@ zj?Y8vlVkiA1U(iSa?Npkj?A=>+?XfNr5&Fm&v8s|5m}Qwm+4&`vP{_iE#&VfWN%5H zV_t{OW?5=G<eDSTk>|*Bc=0mN_bthD<T>)(5F^yVzHiB~g7BY{XYpc-78A0!d<0o% B3bFtI literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_scrollbar_arrows.svg b/dlls/light.msstyles/blue_scrollbar_arrows.svg new file mode 100644 index 00000000000..352db059a9d --- /dev/null +++ b/dlls/light.msstyles/blue_scrollbar_arrows.svg @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:17-24" width="17" height="272" version="1.1" viewBox="0 0 4.4979 71.967" 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="-1.875e-5" width="4.4979" height="71.967" fill="#fff"/> + <g stroke-width=".26458"> + <rect x=".13229" y=".13229" width="4.2333" height="4.2333" rx=".52917" ry=".52917" fill="#fff" stroke="#aeaeae"/> + <rect x=".13229" y="4.6302" width="4.2333" height="4.2333" rx=".52917" ry=".52917" fill="#fff" stroke="#3096fa"/> + <rect x=".13229" y="9.1281" width="4.2333" height="4.2333" rx=".52917" ry=".52917" fill="#2979ff" stroke="#2979ff"/> + <g fill="#fff"> + <rect x=".13229" y="13.626" width="4.2333" height="4.2333" rx=".52917" ry=".52917" stroke="#aeaeae"/> + <rect x=".13229" y="18.124" width="4.2333" height="4.2333" rx=".52917" ry=".52917" stroke="#aeaeae"/> + <rect x=".13229" y="22.622" width="4.2333" height="4.2333" rx=".52917" ry=".52917" stroke="#3096fa"/> + </g> + <rect x=".13229" y="27.12" width="4.2333" height="4.2333" rx=".52917" ry=".52917" fill="#2979ff" stroke="#2979ff"/> + <g fill="#fff"> + <rect x=".13229" y="31.618" width="4.2333" height="4.2333" rx=".52917" ry=".52917" stroke="#aeaeae"/> + <rect x=".13229" y="36.116" width="4.2333" height="4.2333" rx=".52917" ry=".52917" stroke="#aeaeae"/> + <rect x=".13229" y="40.614" width="4.2333" height="4.2333" rx=".52917" ry=".52917" stroke="#3096fa"/> + </g> + <rect x=".13229" y="45.111" width="4.2333" height="4.2333" rx=".52917" ry=".52917" fill="#2979ff" stroke="#2979ff"/> + <g fill="#fff"> + <rect x=".13229" y="49.609" width="4.2333" height="4.2333" rx=".52917" ry=".52917" stroke="#aeaeae"/> + <rect x=".13229" y="54.107" width="4.2333" height="4.2333" rx=".52917" ry=".52917" stroke="#aeaeae"/> + <rect x=".13229" y="58.605" width="4.2333" height="4.2333" rx=".52917" ry=".52917" stroke="#3096fa"/> + </g> + <rect x=".13229" y="63.103" width="4.2333" height="4.2333" rx=".52917" ry=".52917" fill="#2979ff" stroke="#2979ff"/> + <rect x=".13229" y="67.601" width="4.2333" height="4.2333" rx=".52917" ry=".52917" fill="#fff" stroke="#aeaeae"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_scrollbar_resizebox_grip.bmp b/dlls/light.msstyles/blue_scrollbar_resizebox_grip.bmp new file mode 100644 index 0000000000000000000000000000000000000000..6bc433536ddf5adfba071bea14e246fb9e41b33a GIT binary patch literal 2314 zcmZ?r<>F)jgDxOh1H=kIEC|GmKo&EQZr}hC7~nqx0|bF&{yVt`6=NtNAizREelSVz z-MjZc2!q^&i;YhXSr0k>Le`IqO-uX9aWk#-kmG-9x@Dm4r>0*hH48Z`KxU!yDK(#v XesufL`GoY3%8!P?Xb6mk04M|ikd>kI literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_scrollbar_resizebox_grip.svg b/dlls/light.msstyles/blue_scrollbar_resizebox_grip.svg new file mode 100644 index 00000000000..5c31233d422 --- /dev/null +++ b/dlls/light.msstyles/blue_scrollbar_resizebox_grip.svg @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:32-32" width="32" height="17" version="1.1" viewBox="0 0 8.4667 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> + <g fill="#bdbdbd" stroke-width="0"> + <rect x="3.4396" y="3.7042" width=".52917" height=".52917"/> + <rect x="2.6458" y="3.7042" width=".52917" height=".52917"/> + <rect x="1.8521" y="3.7042" width=".52917" height=".52917"/> + <rect x="2.6458" y="2.9104" width=".52917" height=".52917"/> + <rect x="3.4396" y="2.9104" width=".52917" height=".52917"/> + <rect x="3.4396" y="2.1167" width=".52917" height=".52917"/> + <rect x="4.4979" y="2.1167" width=".52917" height=".52917"/> + <rect x="5.2917" y="3.7042" width=".52917" height=".52917"/> + <rect x="4.4979" y="3.7042" width=".52917" height=".52917"/> + <rect x="4.4979" y="2.9104" width=".52917" height=".52917"/> + <rect x="5.2917" y="2.9104" width=".52917" height=".52917"/> + <rect x="6.0854" y="3.7042" width=".52917" height=".52917"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_scrollbar_shaft_horizontal.bmp b/dlls/light.msstyles/blue_scrollbar_shaft_horizontal.bmp new file mode 100644 index 0000000000000000000000000000000000000000..36ba313b639d525267e9de26bbbd503fdf0a8a3c GIT binary patch literal 394 zcmZ?r?P6pAgDxOh1H?=~tN_G}3=%*R%z)4+<bMVR2m*=zcXAIZMv*3h!-A&fD;O{^ Hj8qx`Ui`mn literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_scrollbar_shaft_horizontal.svg b/dlls/light.msstyles/blue_scrollbar_shaft_horizontal.svg new file mode 100644 index 00000000000..9a2fd73b407 --- /dev/null +++ b/dlls/light.msstyles/blue_scrollbar_shaft_horizontal.svg @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:2-24" width="2" height="32" version="1.1" viewBox="0 0 .52917 8.4667" 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=".52917" height="8.4667" fill="#f5f5f5" stroke="#0091ea" stroke-dasharray="0, 2.91041999999999978" stroke-width=".26458"/> +</svg> diff --git a/dlls/light.msstyles/blue_scrollbar_shaft_vertical.bmp b/dlls/light.msstyles/blue_scrollbar_shaft_vertical.bmp new file mode 100644 index 0000000000000000000000000000000000000000..17cca423462277fc3594d93e4843c794bbcecf7a GIT binary patch literal 490 zcmZ?reZ|NC23<h128j89m;;Cz86<!t149B-9?XFg{}~t{2qf~~$vvnTE=44R1x?*o Sq5%T~(MrFLs)d9V0|Nk*?n(Xt literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_scrollbar_shaft_vertical.svg b/dlls/light.msstyles/blue_scrollbar_shaft_vertical.svg new file mode 100644 index 00000000000..b9408619f1b --- /dev/null +++ b/dlls/light.msstyles/blue_scrollbar_shaft_vertical.svg @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:14-24" width="14" height="8" version="1.1" viewBox="0 0 3.7042 2.1167" 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="3.7042" height="2.1167" fill="#f5f5f5" stroke="#0091ea" stroke-dasharray="0, 2.91042999999999985" stroke-width=".26458"/> +</svg> diff --git a/dlls/light.msstyles/blue_scrollbar_thumb_horizontal.bmp b/dlls/light.msstyles/blue_scrollbar_thumb_horizontal.bmp new file mode 100644 index 0000000000000000000000000000000000000000..1107be09217240ede1d7eb5d97879ba360c66fe6 GIT binary patch literal 4762 zcmeHKK~4fO6#XV1z_>78feo_30}vBeZajga0bRQy886@g5XcNiFypva6IhCC*bDBQ zL^BIIl<$MlNpVGsiwSAdmUd>|Yx~;wLrX`kZJMVW)DFrH$^ps-?V={y`guR^q!kk- zdG>@$hsRgxt0fzof4+;NsN3!OzJI5g009tiBK-FIeJLetCO`lLoCtIV1j%>+0#1Y# zXii|^bHFW!qKMT)5d+Ok>G2<a>2x}S!N9<Fif<7BK!e#p9jye&Z~WkJ$le({d9LO3 zG9c}94o3)vUYVboJQ0g~wnPt*$6JgK4$v78BxA&5zTN`|mas~y<t&G)pVdQEgK@kv zbUs$`3ykLEu@?7)pIauj0|5;0mBI1x#_p+M{6O3YheXrQQ5;-|Mp4uYdbv@IA1<d~ z??iD>l|7fGehiXAzO*nt5oTaQkQ|c9STy&+Q7<eW8oeIimP3)u>Y<2%X14TL#V=C8 zZt(4WMZUI8YzN==T-bgVKZbEoF^nHU72$`--o?^`hQE^bE|#j1vAYL0N12*-bM5wa Ho$g}aUx`De literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_scrollbar_thumb_horizontal.svg b/dlls/light.msstyles/blue_scrollbar_thumb_horizontal.svg new file mode 100644 index 00000000000..a94689a93ab --- /dev/null +++ b/dlls/light.msstyles/blue_scrollbar_thumb_horizontal.svg @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:22-24" width="22" height="68" version="1.1" viewBox="0 0 5.8208 17.992" 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" stroke-width=".26458"> + <rect x="-7.0588e-5" width="5.8209" height="17.992" fill="#fff" stroke-width=".070005"/> + <rect x=".13229" y=".13229" width="5.5563" height="4.2333" rx=".52917" ry=".52918" stroke="#aeaeae"/> + <rect x=".13229" y="4.6302" width="5.5563" height="4.2333" rx=".52917" ry=".52918" stroke="#3096fa"/> + <rect x=".13229" y="9.1281" width="5.5563" height="4.2333" rx=".52917" ry=".52918" stroke="#2979ff"/> + <rect x=".13229" y="13.626" width="5.5563" height="4.2333" rx=".52917" ry=".52918" stroke="#aeaeae"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_scrollbar_thumb_vertical.bmp b/dlls/light.msstyles/blue_scrollbar_thumb_vertical.bmp new file mode 100644 index 0000000000000000000000000000000000000000..49c5ceb41d9425b7b6a40aad7d4f205ad7d9bc1c GIT binary patch literal 4714 zcmeHKF;2rk5L_fa02N<I6KKo>(ooS*Q9?io&{9P*AK(GtM0TDK8PfxjT@q@$qrjoV z5|NA8xh&%t356itnJUGt?#{Ar_V%>e8EYH+7n?M<Ypf>b2Ie8=8f{@EdM!RI855PG z*x|<B!Q~P}@?rhgewwC15V)>8kQp#Q0#A5^VJL)PnE?YN@C0uahw?xmfhXKZ7GPl? zc<rNez`722o`e5z&iDN&id3lj!)<5++z?GBAp>B(HH4Fxof9_e+^I<hF#S_bM#N5& zAG<uw7Fhr13osA22tY*y6^HVae8N}TRNSYMb!ys2=YUZ+x(<pQROOsmC$^9Hsi#C$ z&>1S=G>Jdn*gjU(5Qs+-)9iDUduN$tWH&pKVHx@T`E2}7xz`p$n}vezh)g{95P%Rt z$)VJl=_Kp!67Ew;c7WGDItQ%lfXf_I<(y?ue%BH&eI=@b+d~^#01b(AucfLXUK^T2 Zy3f+RneI!<z65!w^q*VxysdJd^#!G8L{I<# literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_scrollbar_thumb_vertical.svg b/dlls/light.msstyles/blue_scrollbar_thumb_vertical.svg new file mode 100644 index 00000000000..bd0cd89ff2c --- /dev/null +++ b/dlls/light.msstyles/blue_scrollbar_thumb_vertical.svg @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:17-24" width="17" height="88" version="1.1" viewBox="0 0 4.4979 23.283" 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="-.00012353" width="4.4979" height="23.283" fill="#fff" stroke-width=".26458"/> + <g fill="#fff" stroke-width=".26458"> + <rect transform="rotate(90)" x=".13229" y="-4.3656" width="5.5563" height="4.2333" rx=".52917" ry=".52916" stroke="#aeaeae"/> + <rect transform="rotate(90)" x="5.9531" y="-4.3656" width="5.5563" height="4.2333" rx=".52917" ry=".52916" stroke="#3096fa"/> + <rect transform="rotate(90)" x="11.774" y="-4.3656" width="5.5563" height="4.2333" rx=".52917" ry=".52916" stroke="#2979ff"/> + <rect transform="rotate(90)" x="17.595" y="-4.3656" width="5.5563" height="4.2333" rx=".52917" ry=".52916" stroke="#aeaeae"/> + </g> +</svg> diff --git a/dlls/light.msstyles/light.rc b/dlls/light.msstyles/light.rc index cb51b8a5246..c197a35960a 100644 --- a/dlls/light.msstyles/light.rc +++ b/dlls/light.msstyles/light.rc @@ -340,6 +340,82 @@ BLUE_INI TEXTFILE "BorderSize = 1\r\n" "FillColor = 255 255 255\r\n" "BorderColor = 174 174 174\r\n" + +"\r\n; Scroll Bar\r\n" +"[ScrollBar.ArrowBtn]\r\n" +"BgType = ImageFile\r\n" +"SizingMargins = 5, 5, 5, 5\r\n" +"ContentMargins = 0, 0, 3, 3\r\n" +"SizingType = Tile\r\n" +"ImageFile = blue_scrollbar_arrows.bmp\r\n" +"ImageCount = 16\r\n" +"ImageLayout = Vertical\r\n" +"GlyphType = ImageGlyph\r\n" +"GlyphTransparent = True\r\n" +"ImageSelectType = Size\r\n" +"UniformSizing = True\r\n" +"ImageFile1 = blue_scrollbar_arrow_glyphs_7px.bmp\r\n" +"ImageFile2 = blue_scrollbar_arrow_glyphs_9px.bmp\r\n" +"MinSize1 = 7, 7\r\n" +"MinSize2 = 9, 9\r\n" + +"[ScrollBar.ThumbBtnHorz]\r\n" +"BgType = ImageFile\r\n" +"SizingMargins = 5, 5, 5, 5\r\n" +"ContentMargins = 4, 4, 0, 0\r\n" +"ImageFile = blue_scrollbar_thumb_horizontal.bmp\r\n" +"ImageCount = 4\r\n" +"ImageLayout = Vertical\r\n" + +"[ScrollBar.ThumbBtnVert]\r\n" +"BgType = ImageFile\r\n" +"SizingMargins = 5, 5, 5, 5\r\n" +"ContentMargins = 0, 0, 4, 4\r\n" +"ImageFile = blue_scrollbar_thumb_vertical.bmp\r\n" +"ImageCount = 4\r\n" +"ImageLayout = Vertical\r\n" + +"[ScrollBar.GripperHorz]\r\n" +"BgType = None\r\n" + +"[ScrollBar.GripperVert]\r\n" +"BgType = None\r\n" + +"[ScrollBar.LowerTrackHorz]\r\n" +"BgType = ImageFile\r\n" +"ImageFile = blue_scrollbar_shaft_horizontal.bmp\r\n" +"SizingMargins = 0, 0, 1, 1\r\n" +"ImageCount = 4\r\n" +"ImageLayout = Vertical\r\n" + +"[ScrollBar.LowerTrackVert]\r\n" +"BgType = ImageFile\r\n" +"ImageFile = blue_scrollbar_shaft_vertical.bmp\r\n" +"SizingMargins = 1, 1, 0, 0\r\n" +"ImageCount = 4\r\n" +"ImageLayout = Vertical\r\n" + +"[ScrollBar.UpperTrackHorz]\r\n" +"BgType = ImageFile\r\n" +"ImageFile = blue_scrollbar_shaft_horizontal.bmp\r\n" +"SizingMargins = 0, 0, 1, 1\r\n" +"ImageCount = 4\r\n" +"ImageLayout = Vertical\r\n" + +"[ScrollBar.UpperTrackVert]\r\n" +"BgType = ImageFile\r\n" +"ImageFile = blue_scrollbar_shaft_vertical.bmp\r\n" +"SizingMargins = 1, 1, 0, 0\r\n" +"ImageCount = 4\r\n" +"ImageLayout = Vertical\r\n" + +"[ScrollBar.SizeBox]\r\n" +"ImageFile = blue_scrollbar_resizebox_grip.bmp\r\n" +"BgType = ImageFile\r\n" +"ImageCount = 2\r\n" +"SizingType = TrueSize\r\n" +"Transparent = True\r\n" +"VAlign = Bottom\r\n" } /* Button */ @@ -383,6 +459,31 @@ BLUE_COMBOBUTTON_BMP BITMAP "blue_combobutton.bmp" /* @makedep: blue_combobutton_glyph.bmp */ BLUE_COMBOBUTTON_GLYPH_BMP BITMAP "blue_combobutton_glyph.bmp" +/* Scroll Bar */ +/* @makedep: blue_scrollbar_arrows.bmp */ +BLUE_SCROLLBAR_ARROWS_BMP BITMAP "blue_scrollbar_arrows.bmp" + +/* @makedep: blue_scrollbar_arrow_glyphs_7px.bmp */ +BLUE_SCROLLBAR_ARROW_GLYPHS_7PX_BMP BITMAP "blue_scrollbar_arrow_glyphs_7px.bmp" + +/* @makedep: blue_scrollbar_arrow_glyphs_9px.bmp */ +BLUE_SCROLLBAR_ARROW_GLYPHS_9PX_BMP BITMAP "blue_scrollbar_arrow_glyphs_9px.bmp" + +/* @makedep: blue_scrollbar_resizebox_grip.bmp */ +BLUE_SCROLLBAR_RESIZEBOX_GRIP_BMP BITMAP "blue_scrollbar_resizebox_grip.bmp" + +/* @makedep: blue_scrollbar_shaft_horizontal.bmp */ +BLUE_SCROLLBAR_SHAFT_HORIZONTAL_BMP BITMAP "blue_scrollbar_shaft_horizontal.bmp" + +/* @makedep: blue_scrollbar_shaft_vertical.bmp */ +BLUE_SCROLLBAR_SHAFT_VERTICAL_BMP BITMAP "blue_scrollbar_shaft_vertical.bmp" + +/* @makedep: blue_scrollbar_thumb_horizontal.bmp */ +BLUE_SCROLLBAR_THUMB_HORIZONTAL_BMP BITMAP "blue_scrollbar_thumb_horizontal.bmp" + +/* @makedep: blue_scrollbar_thumb_vertical.bmp */ +BLUE_SCROLLBAR_THUMB_VERTICAL_BMP BITMAP "blue_scrollbar_thumb_vertical.bmp" + /* File version */ #define WINE_FILEDESCRIPTION_STR "Light Theme" #define WINE_FILENAME_STR "light.msstyles" -- 2.30.2

1 0

[WineHQ] news: Fix some spelling issues.
by Francois Gouget 25 Jun '21

25 Jun '21

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- news/en/2004012201.xml | 2 +- news/en/2017052601.xml | 2 +- news/en/2018070901.xml | 2 +- news/ko/2017052601.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)

1 0

[WineHQ] Fix the WineConf case.
by Francois Gouget 25 Jun '21

25 Jun '21

1 0

[PATCH 1/2] ntdll: Implement RtlDefaultNpAcl
by Patrick Hibbs 24 Jun '21

24 Jun '21

Signed-off-by: Patrick Hibbs <hibbsncc1701(a)gmail.com> --- dlls/ntdll/sec.c | 171 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 169 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/sec.c b/dlls/ntdll/sec.c index eccfc82ce8c..448b0b7def6 100644 --- a/dlls/ntdll/sec.c +++ b/dlls/ntdll/sec.c @@ -1721,11 +1721,178 @@ NTSTATUS WINAPI RtlConvertToAutoInheritSecurityObject( /****************************************************************************** * RtlDefaultNpAcl (NTDLL.@) + * + * Constructs a default ACL with the following entries: + * Local System: Full Control + * Administrators: Full Control + * World: Read Only + * Anonymous: Read Only + * Owner: Full Control + * + * 'Owner' is determined by the current effective + * thread token's default owner. (Or process token if + * the thread token cannot be retrieved.) + * + * Returns STATUS_SUCCESS if successful. + * Generates EXCEPTION_ACCESS_VIOLATION if pAcl is NULL. */ NTSTATUS WINAPI RtlDefaultNpAcl(PACL *pAcl) { - FIXME("%p - stub\n", pAcl); + PACL new_acl = NULL; + PSID new_sid = NULL; + DWORD acl_length = 0; + ULONG owner_sid_length = 0; + PTOKEN_OWNER owner = NULL; + HANDLE token = NULL; + SID_IDENTIFIER_AUTHORITY local_auth = {SECURITY_NT_AUTHORITY}; + SID_IDENTIFIER_AUTHORITY world_auth = {SECURITY_WORLD_SID_AUTHORITY}; + NTSTATUS ret; + + TRACE("pAcl=%p\n", pAcl); *pAcl = NULL; - return STATUS_SUCCESS; + + new_sid = RtlAllocateHeap(GetProcessHeap(), 0, SECURITY_MAX_SID_SIZE); + if (new_sid) + { + ret = NtOpenThreadToken(GetCurrentThread(), + TOKEN_QUERY, + TRUE, + &token); + if (ret == STATUS_NO_TOKEN) + { + ret = NtOpenProcessToken(GetCurrentProcess(), + TOKEN_QUERY, + &token); + if (!NT_SUCCESS(ret)) + { + RtlFreeHeap(GetProcessHeap(), 0, new_sid); + return ret; + } + } + + /* Get the length of the owner's SID. */ + ret = NtQueryInformationToken(token, + TokenOwner, + NULL, + 0, + &owner_sid_length); + if (ret == STATUS_BUFFER_TOO_SMALL) + { + owner = RtlAllocateHeap(GetProcessHeap(), 0, owner_sid_length); + if (owner) + { + /* Actually get the owner's SID. */ + ret = NtQueryInformationToken(token, + TokenOwner, + owner, + owner_sid_length, + &owner_sid_length); + if (NT_SUCCESS(ret)) + { + acl_length = sizeof(ACL) + + (5 * sizeof(ACCESS_ALLOWED_ACE)) + + RtlLengthRequiredSid(1) + /* Local System */ + RtlLengthRequiredSid(2) + /* Administrators */ + RtlLengthRequiredSid(1) + /* World */ + RtlLengthRequiredSid(1) + /* Anonymous */ + RtlLengthSid(owner->Owner); /* Owner */ + + new_acl = RtlAllocateHeap(GetProcessHeap(), 0, acl_length); + if (new_acl) + { + ret = RtlCreateAcl(new_acl, acl_length, MIN_ACL_REVISION); + if (NT_SUCCESS(ret)) + { + ret = RtlInitializeSid(new_sid, + &local_auth, + 1); + if (NT_SUCCESS(ret)) + { + *RtlSubAuthoritySid(new_sid, 0) = SECURITY_LOCAL_SYSTEM_RID; + ret = RtlAddAccessAllowedAce(new_acl, + MIN_ACL_REVISION, + GENERIC_ALL, + new_sid); + if (NT_SUCCESS(ret)) + { + ret = RtlInitializeSid(new_sid, + &local_auth, + 2); + if (NT_SUCCESS(ret)) + { + *RtlSubAuthoritySid(new_sid, 0) = SECURITY_BUILTIN_DOMAIN_RID; + *RtlSubAuthoritySid(new_sid, 1) = DOMAIN_ALIAS_RID_ADMINS; + ret = RtlAddAccessAllowedAce(new_acl, + MIN_ACL_REVISION, + GENERIC_ALL, + new_sid); + if (NT_SUCCESS(ret)) + { + ret = RtlInitializeSid(new_sid, + &world_auth, + 1); + if (NT_SUCCESS(ret)) + { + *RtlSubAuthoritySid(new_sid, 0) = SECURITY_WORLD_RID; + ret = RtlAddAccessAllowedAce(new_acl, + MIN_ACL_REVISION, + GENERIC_READ, + new_sid); + if (NT_SUCCESS(ret)) + { + ret = RtlInitializeSid(new_sid, + &local_auth, + 1); + if (NT_SUCCESS(ret)) + { + *RtlSubAuthoritySid(new_sid, 0) = SECURITY_ANONYMOUS_LOGON_RID; + ret = RtlAddAccessAllowedAce(new_acl, + MIN_ACL_REVISION, + GENERIC_READ, + new_sid); + if (NT_SUCCESS(ret)) + { + ret = RtlAddAccessAllowedAce(new_acl, + MIN_ACL_REVISION, + GENERIC_ALL, + owner->Owner); + if (NT_SUCCESS(ret)) + { + *pAcl = new_acl; + } + } + } + } + } + } + } + } + } + } + } + else + ret = STATUS_NO_MEMORY; + } + } + else + ret = STATUS_NO_MEMORY; + } + } + else + ret = STATUS_NO_MEMORY; + + if (new_sid) + RtlFreeHeap(GetProcessHeap(), 0, new_sid); + + if (owner) + RtlFreeHeap(GetProcessHeap(), 0, owner); + + if ((!NT_SUCCESS(ret)) && (new_acl)) + RtlFreeHeap(GetProcessHeap(), 0, new_acl); + + if (token) + NtClose(token); + + return ret; } -- 2.32.0

1 1

[PATCH 2/5] uuid: Add a few NPI module ids.
by Huw Davies 24 Jun '21

24 Jun '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/uuid/uuid.c | 3 +++ include/netiodef.h | 31 +++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+) diff --git a/dlls/uuid/uuid.c b/dlls/uuid/uuid.c index eacb83301d1..aa7ad3dd678 100644 --- a/dlls/uuid/uuid.c +++ b/dlls/uuid/uuid.c @@ -92,6 +92,9 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); #include "comsvcs.h" #include "directmanipulation.h" +#define __WINE_INIT_NPI_MODULEID +#include "netiodef.h" + /* FIXME: cguids declares GUIDs but does not define their values */ /* GUIDs not declared in an exported header file */ diff --git a/include/netiodef.h b/include/netiodef.h index 4d8d469b138..3089685bef1 100644 --- a/include/netiodef.h +++ b/include/netiodef.h @@ -40,8 +40,10 @@ typedef const NPI_MODULEID *PNPI_MODULEID; #ifdef NONAMELESSUNION #define _U(x) (x).u +#define __U .u #else #define _U(x) (x) +#define __U #endif static inline BOOLEAN NmrIsEqualNpiModuleId( const NPI_MODULEID *mod1, const NPI_MODULEID *mod2 ) @@ -63,6 +65,35 @@ static inline BOOLEAN NmrIsEqualNpiModuleId( const NPI_MODULEID *mod1, const NPI return FALSE; } +#ifdef __WINE_INIT_NPI_MODULEID +#ifdef __cplusplus +#define DEFINE_NPI_GUID_MODULEID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \ + EXTERN_C const NPI_MODULEID name DECLSPEC_HIDDEN; \ + EXTERN_C const NPI_MODULEID name = \ + { .Length = sizeof(NPI_MODULEID), .Type = MIT_GUID, __U.Guid = { l, w1, w2, { b1, b2, b3, b4, b5, b6, b7, b8 } } } +#else +#define DEFINE_NPI_GUID_MODULEID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \ + const NPI_MODULEID name DECLSPEC_HIDDEN; \ + const NPI_MODULEID name = \ + { .Length = sizeof(NPI_MODULEID), .Type = MIT_GUID, __U.Guid = { l, w1, w2, { b1, b2, b3, b4, b5, b6, b7, b8 } } } +#endif +#else /* __WINE_INIT_MODULEID */ +#define DEFINE_NPI_GUID_MODULEID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \ + EXTERN_C const NPI_MODULEID name DECLSPEC_HIDDEN +#endif /* __WINE_INIT_MODULEID */ + +#define DEFINE_NPI_MS_MODULEID(name, l) DEFINE_NPI_GUID_MODULEID(name, 0xeb004a00 + l, 0x9b1a, 0x11d4, 0x91, 0x23, 0x00, 0x50, 0x04, 0x77, 0x59, 0xbc) + +DEFINE_NPI_MS_MODULEID( NPI_MS_IPV4_MODULEID, 0x00 ); +DEFINE_NPI_MS_MODULEID( NPI_MS_IPV6_MODULEID, 0x01 ); +DEFINE_NPI_MS_MODULEID( NPI_MS_UDP_MODULEID, 0x02 ); +DEFINE_NPI_MS_MODULEID( NPI_MS_TCP_MODULEID, 0x03 ); +DEFINE_NPI_MS_MODULEID( NPI_MS_NDIS_MODULEID, 0x11 ); + +#undef DEFINE_NPI_MS_MODULEID +#undef DEFINE_NPI_GUID_MODULEID + #undef _U +#undef __U #endif /* __WINE_NETIODEF_H */ -- 2.23.0

2 1

[PATCH] po: Update Lithuanian translation
by Aurimas Fišeras 24 Jun '21

24 Jun '21

1 0

[PATCH 1/5] wined3d: Store the map pitch in the wined3d_texture_sub_resource structure.
by Zebediah Figura 24 Jun '21

24 Jun '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/wined3d/texture.c | 34 +++++++++++++++++++++++----------- dlls/wined3d/wined3d_private.h | 2 ++ 2 files changed, 25 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 165d83eb035..ad34e44b406 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1711,6 +1711,20 @@ void CDECL wined3d_texture_get_pitch(const struct wined3d_texture *texture, width, height, row_pitch, slice_pitch); } +static void wined3d_texture_get_map_pitch(const struct wined3d_texture *texture, + unsigned int level, unsigned int *row_pitch, unsigned int *slice_pitch) +{ + if (texture->resource.format_flags & WINED3DFMT_FLAG_BROKEN_PITCH) + { + *row_pitch = wined3d_texture_get_level_width(texture, level) * texture->resource.format->byte_count; + *slice_pitch = wined3d_texture_get_level_height(texture, level) * (*row_pitch); + } + else + { + wined3d_texture_get_pitch(texture, level, row_pitch, slice_pitch); + } +} + DWORD CDECL wined3d_texture_set_lod(struct wined3d_texture *texture, DWORD lod) { struct wined3d_resource *resource; @@ -1992,6 +2006,8 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, unsig sub_resource->size = texture->slice_pitch; sub_resource->locations = WINED3D_LOCATION_DISCARDED; + wined3d_texture_get_map_pitch(texture, level, &sub_resource->map_row_pitch, &sub_resource->map_slice_pitch); + if (texture->texture_ops == &texture_gl_ops) { if (multisample_type && gl_info->supported[ARB_TEXTURE_MULTISAMPLE]) @@ -3587,15 +3603,8 @@ static HRESULT texture_resource_sub_resource_map(struct wined3d_resource *resour context_release(context); - if (fmt_flags & WINED3DFMT_FLAG_BROKEN_PITCH) - { - map_desc->row_pitch = wined3d_texture_get_level_width(texture, texture_level) * format->byte_count; - map_desc->slice_pitch = wined3d_texture_get_level_height(texture, texture_level) * map_desc->row_pitch; - } - else - { - wined3d_texture_get_pitch(texture, texture_level, &map_desc->row_pitch, &map_desc->slice_pitch); - } + map_desc->row_pitch = sub_resource->map_row_pitch; + map_desc->slice_pitch = sub_resource->map_slice_pitch; if (!box) { @@ -3950,6 +3959,8 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc for (i = 0; i < sub_count; ++i) { struct wined3d_texture_sub_resource *sub_resource; + unsigned int level = i % texture->level_count; + unsigned int layer = i / texture->level_count; sub_resource = &texture->sub_resources[i]; sub_resource->locations = WINED3D_LOCATION_DISCARDED; @@ -3959,6 +3970,8 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc wined3d_texture_invalidate_location(texture, i, ~WINED3D_LOCATION_SYSMEM); } + wined3d_texture_get_map_pitch(texture, level, &sub_resource->map_row_pitch, &sub_resource->map_slice_pitch); + if (FAILED(hr = device_parent->ops->texture_sub_resource_created(device_parent, desc->resource_type, texture, i, &sub_resource->parent, &sub_resource->parent_ops))) { @@ -3970,8 +3983,7 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc TRACE("parent %p, parent_ops %p.\n", sub_resource->parent, sub_resource->parent_ops); - TRACE("Created sub-resource %u (level %u, layer %u).\n", - i, i % texture->level_count, i / texture->level_count); + TRACE("Created sub-resource %u (level %u, layer %u).\n", i, level, layer); if (desc->usage & WINED3DUSAGE_OWNDC) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index da1cf638606..1e6a315e72c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4259,6 +4259,8 @@ struct wined3d_texture DWORD locations; struct wined3d_bo_gl bo; + unsigned int map_row_pitch, map_slice_pitch; + void *user_memory; } *sub_resources; }; -- 2.30.2

3 11

[PATCH 1/5] ntdll/tests: Fix AVX tests on processors that don't support XSAVEOPT.
by Zebediah Figura 24 Jun '21

24 Jun '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntdll/tests/exception.c | 57 ++++++++++++++++++++++++------------ 1 file changed, 39 insertions(+), 18 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 7e849fba1aa..cf2f6b1e7fb 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -7562,7 +7562,7 @@ static const unsigned test_extended_context_spoil_data1[8] = {0x10, 0x20, 0x30, static const unsigned test_extended_context_spoil_data2[8] = {0x15, 0x25, 0x35, 0x45, 0x55, 0x65, 0x75, 0x85}; static BOOL test_extended_context_modified_state; -static BOOL compaction_enabled; +static BOOL xsaveopt_enabled, compaction_enabled; static DWORD test_extended_context_handler(EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD *frame, CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **dispatcher) @@ -7603,9 +7603,11 @@ static DWORD test_extended_context_handler(EXCEPTION_RECORD *rec, EXCEPTION_REGI context_ymm_data = (unsigned int *)&xs->YmmContext; ok(!((ULONG_PTR)xs % 64), "Got unexpected xs %p.\n", xs); - ok((compaction_enabled && (xs->CompactionMask & (expected_compaction_mask | 3)) == expected_compaction_mask) - || (!compaction_enabled && !xs->CompactionMask), "Got unexpected CompactionMask %s, compaction %#x.\n", - wine_dbgstr_longlong(xs->CompactionMask), compaction_enabled); + if (compaction_enabled) + ok((xs->CompactionMask & (expected_compaction_mask | 3)) == expected_compaction_mask, + "Got compaction mask %#I64x.\n", xs->CompactionMask); + else + ok(!xs->CompactionMask, "Got compaction mask %#I64x.\n", xs->CompactionMask); if (test_extended_context_modified_state) { @@ -7615,9 +7617,12 @@ static DWORD test_extended_context_handler(EXCEPTION_RECORD *rec, EXCEPTION_REGI } else { - ok(!xs->Mask, "Got unexpected Mask %s.\n", wine_dbgstr_longlong(xs->Mask)); - /* The save area has garbage in this case, the state should be restored to INIT_STATE - * without using these data. */ + ok(xs->Mask == (xsaveopt_enabled ? 0 : 4), "Got unexpected Mask %#I64x.\n", xs->Mask); + /* The save area has garbage if xsaveopt is available. + * + * Clear the mask; the state should be restored to INIT_STATE without + * using this data. */ + xs->Mask = 0; memcpy(context_ymm_data, test_extended_context_spoil_data1 + 4, sizeof(M128A)); } @@ -7897,6 +7902,7 @@ static void test_extended_context(void) int regs[4]; __cpuidex(regs, 0xd, 1); + xsaveopt_enabled = regs[0] & 1; compaction_enabled = regs[0] & 2; } @@ -8547,7 +8553,7 @@ static void test_extended_context(void) "Got unexpected bret %#x, GetLastError() %u.\n", bret, GetLastError()); ok(context->ContextFlags == expected_flags, "Got unexpected ContextFlags %#x.\n", context->ContextFlags); - ok(xs->Mask == (compaction_enabled ? 0 : 4), "Got unexpected Mask %s.\n", wine_dbgstr_longlong(xs->Mask)); + ok(xs->Mask == (compaction_enabled ? 0 : 4), "Got unexpected Mask %#I64x.\n", xs->Mask); ok(xs->CompactionMask == 4, "Got unexpected CompactionMask %s.\n", wine_dbgstr_longlong(xs->CompactionMask)); for (i = 0; i < 4; ++i) @@ -8618,7 +8624,7 @@ static void test_extended_context(void) expected_compaction = compaction_enabled ? ((ULONG64)1 << 63) | 4 : 0; xs = (XSTATE *)((BYTE *)context_ex + context_ex->XState.Offset); - ok(!xs->Mask, "Got unexpected Mask %s.\n", wine_dbgstr_longlong(xs->Mask)); + ok(xs->Mask == (xsaveopt_enabled ? 0 : 4), "Got unexpected Mask %#I64x.\n", xs->Mask); ok(xs->CompactionMask == expected_compaction, "Got unexpected CompactionMask %s.\n", wine_dbgstr_longlong(xs->CompactionMask)); @@ -8626,12 +8632,13 @@ static void test_extended_context(void) ok(!data[i], "Got unexpected data %#x, i %u.\n", data[i], i); for (i = 0; i < 4; ++i) - ok(((ULONG *)&xs->YmmContext)[i] == 0xcccccccc + ok(((ULONG *)&xs->YmmContext)[i] == ((xs->Mask & 4) ? 0 : 0xcccccccc) || broken(((ULONG *)&xs->YmmContext)[i] == test_extended_context_data[i + 4]), "Got unexpected data %#x, i %u.\n", ((ULONG *)&xs->YmmContext)[i], i); /* Test fault exception context. */ memset(data, 0xff, sizeof(data)); + xs->Mask = 0; test_extended_context_modified_state = FALSE; run_exception_test(test_extended_context_handler, NULL, except_code_reset_ymm_state, ARRAY_SIZE(except_code_reset_ymm_state), PAGE_EXECUTE_READ); @@ -8664,12 +8671,13 @@ static void test_extended_context(void) bret = GetThreadContext(thread, context); ok(bret, "Got unexpected bret %#x, GetLastError() %u.\n", bret, GetLastError()); - ok(!xs->Mask, "Got unexpected Mask %s.\n", wine_dbgstr_longlong(xs->Mask)); + todo_wine_if (!xsaveopt_enabled) + ok(xs->Mask == (xsaveopt_enabled ? 0 : 4), "Got unexpected Mask %#I64x.\n", xs->Mask); ok(xs->CompactionMask == expected_compaction, "Got unexpected CompactionMask %s.\n", wine_dbgstr_longlong(xs->CompactionMask)); for (i = 0; i < 16 * 4; ++i) - ok(((ULONG *)&xs->YmmContext)[i] == 0xcccccccc, "Got unexpected value %#x, i %u.\n", - ((ULONG *)&xs->YmmContext)[i], i); + ok(((ULONG *)&xs->YmmContext)[i] == ((xs->Mask & 4) ? 0 : 0xcccccccc), + "Got unexpected value %#x, i %u.\n", ((ULONG *)&xs->YmmContext)[i], i); pSetXStateFeaturesMask(context, 4); memset(&xs->YmmContext, 0, sizeof(xs->YmmContext)); @@ -8725,11 +8733,24 @@ static void test_extended_context(void) memset(&xs->YmmContext, 0xcc, sizeof(xs->YmmContext)); bret = GetThreadContext(thread, context); ok(bret, "Got unexpected bret %#x, GetLastError() %u.\n", bret, GetLastError()); - ok(!xs->Mask || (sizeof(void *) == 4 && xs->Mask == 4), - "Got unexpected Mask %s.\n", wine_dbgstr_longlong(xs->Mask)); - for (i = 0; i < 16 * 4; ++i) - ok(((ULONG *)&xs->YmmContext)[i] == (xs->Mask ? (i < 8 * 4 ? 0 : 0x48484848) : 0xcccccccc), - "Got unexpected value %#x, i %u.\n", ((ULONG *)&xs->YmmContext)[i], i); + if (sizeof(void *) == 4) + { + ok(xs->Mask == 4, "Got unexpected Mask %#I64x.\n", xs->Mask); + for (i = 0; i < 8 * 4; ++i) + ok(((ULONG *)&xs->YmmContext)[i] == 0, + "Got unexpected value %#x, i %u.\n", ((ULONG *)&xs->YmmContext)[i], i); + for (; i < 16 * 4; ++i) + ok(((ULONG *)&xs->YmmContext)[i] == 0x48484848, + "Got unexpected value %#x, i %u.\n", ((ULONG *)&xs->YmmContext)[i], i); + } + else + { + todo_wine_if (!xsaveopt_enabled) + ok(xs->Mask == (xsaveopt_enabled ? 0 : 4), "Got unexpected Mask %#I64x.\n", xs->Mask); + for (i = 0; i < 16 * 4; ++i) + ok(((ULONG *)&xs->YmmContext)[i] == ((xs->Mask & 4) ? 0 : 0xcccccccc), + "Got unexpected value %#x, i %u.\n", ((ULONG *)&xs->YmmContext)[i], i); + } bret = ResumeThread(thread); ok(bret, "Got unexpected bret %#x, GetLastError() %u.\n", bret, GetLastError()); -- 2.30.2

4 11

[PATCH 1/6] d2d1: Use D3D11 interfaces in d2d_bitmap_create_shared.
by Rémi Bernon 24 Jun '21

24 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/bitmap.c | 39 ++++++++++++++++++++++++--------------- 1 file changed, 24 insertions(+), 15 deletions(-) diff --git a/dlls/d2d1/bitmap.c b/dlls/d2d1/bitmap.c index 0b5f3e6dc5a..03982924efa 100644 --- a/dlls/d2d1/bitmap.c +++ b/dlls/d2d1/bitmap.c @@ -414,7 +414,7 @@ HRESULT d2d_bitmap_create_shared(struct d2d_device_context *context, REFIID iid, if (IsEqualGUID(iid, &IID_ID2D1Bitmap)) { struct d2d_bitmap *src_impl = unsafe_impl_from_ID2D1Bitmap(data); - ID3D10Device *device; + ID3D11Device *device; HRESULT hr = S_OK; if (src_impl->factory != context->factory) @@ -423,9 +423,9 @@ HRESULT d2d_bitmap_create_shared(struct d2d_device_context *context, REFIID iid, goto failed; } - ID3D10Resource_GetDevice(src_impl->resource, &device); - ID3D10Device_Release(device); - if (device != context->d3d_device) + ID3D11Resource_GetDevice(src_impl->d3d11_resource, &device); + ID3D11Device_Release(device); + if (device != (ID3D11Device *)context->d3d11_device) { hr = D2DERR_UNSUPPORTED_OPERATION; goto failed; @@ -466,28 +466,37 @@ HRESULT d2d_bitmap_create_shared(struct d2d_device_context *context, REFIID iid, { DXGI_SURFACE_DESC surface_desc; IDXGISurface *surface = data; - ID3D10Resource *resource; + ID3D11Resource *resource; + ID3D10Resource *d3d10_resource; D2D1_SIZE_U pixel_size; - ID3D10Device *device; + ID3D11Device *device; HRESULT hr; - if (FAILED(IDXGISurface_QueryInterface(surface, &IID_ID3D10Resource, (void **)&resource))) + if (FAILED(IDXGISurface_QueryInterface(surface, &IID_ID3D11Resource, (void **)&resource))) { WARN("Failed to get d3d resource from dxgi surface.\n"); return E_FAIL; } - ID3D10Resource_GetDevice(resource, &device); - ID3D10Device_Release(device); - if (device != context->d3d_device) + if (FAILED(hr = ID3D11Resource_QueryInterface(resource, &IID_ID3D10Resource, (void **)&d3d10_resource))) { - ID3D10Resource_Release(resource); + ERR("Failed to query ID3D10Resource interface, hr %#x.\n", hr); + ID3D11Resource_Release(resource); + return hr; + } + + ID3D11Resource_GetDevice(resource, &device); + ID3D11Resource_Release(resource); + ID3D11Device_Release(device); + if (device != (ID3D11Device *)context->d3d11_device) + { + ID3D10Resource_Release(d3d10_resource); return D2DERR_UNSUPPORTED_OPERATION; } if (!(*bitmap = heap_alloc_zero(sizeof(**bitmap)))) { - ID3D10Resource_Release(resource); + ID3D10Resource_Release(d3d10_resource); return E_OUTOFMEMORY; } @@ -495,7 +504,7 @@ HRESULT d2d_bitmap_create_shared(struct d2d_device_context *context, REFIID iid, if (FAILED(hr = IDXGISurface_GetDesc(surface, &surface_desc))) { WARN("Failed to get surface desc, hr %#x.\n", hr); - ID3D10Resource_Release(resource); + ID3D10Resource_Release(d3d10_resource); return hr; } @@ -522,8 +531,8 @@ HRESULT d2d_bitmap_create_shared(struct d2d_device_context *context, REFIID iid, pixel_size.width = surface_desc.Width; pixel_size.height = surface_desc.Height; - d2d_bitmap_init(*bitmap, context, resource, pixel_size, &d); - ID3D10Resource_Release(resource); + d2d_bitmap_init(*bitmap, context, d3d10_resource, pixel_size, &d); + ID3D10Resource_Release(d3d10_resource); TRACE("Created bitmap %p.\n", *bitmap); return S_OK; -- 2.32.0

3 11

[PATCH v3 4/4] light.msstyles: Add List Box parts.
by Zhiyi Zhang 24 Jun '21

24 Jun '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/light.msstyles/light.rc | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/light.msstyles/light.rc b/dlls/light.msstyles/light.rc index bebee8788c4..cb51b8a5246 100644 --- a/dlls/light.msstyles/light.rc +++ b/dlls/light.msstyles/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\n" +"FillColor = 255 255 255\r\n" +"BorderColor = 174 174 174\r\n" } /* Button */ -- 2.30.2

1 0

[PATCH v3 3/4] light.msstyles: Add Edit parts.
by Zhiyi Zhang 24 Jun '21

24 Jun '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/light.msstyles/light.rc | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/dlls/light.msstyles/light.rc b/dlls/light.msstyles/light.rc index 2451ffcd4f0..bebee8788c4 100644 --- a/dlls/light.msstyles/light.rc +++ b/dlls/light.msstyles/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\r\n" +"BorderSize = 1\r\n" +"FillColor = 255 255 255\r\n" +"BorderColor = 174 174 174\r\n" + +"[Edit.Edittext(Disabled)]\r\n" +"FillColor = 245 245 245\r\n" +"TextColor = 166 166 166\r\n" + +"[Edit.Edittext(ReadOnly)]\r\n" +"FillColor = 245 245 245\r\n" +"TextColor = 0 0 0\r\n" } /* Button */ -- 2.30.2

1 0

[PATCH v3 2/4] light.msstyles: Add ComboBox parts.
by Zhiyi Zhang 24 Jun '21

24 Jun '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/light.msstyles/Makefile.in | 2 ++ dlls/light.msstyles/blue_combobutton.bmp | Bin 0 -> 6858 bytes dlls/light.msstyles/blue_combobutton.svg | 18 ++++++++++ .../light.msstyles/blue_combobutton_glyph.bmp | Bin 0 -> 1258 bytes .../light.msstyles/blue_combobutton_glyph.svg | 28 ++++++++++++++++ dlls/light.msstyles/light.rc | 31 ++++++++++++++++++ 6 files changed, 79 insertions(+) create mode 100644 dlls/light.msstyles/blue_combobutton.bmp create mode 100644 dlls/light.msstyles/blue_combobutton.svg create mode 100644 dlls/light.msstyles/blue_combobutton_glyph.bmp create mode 100644 dlls/light.msstyles/blue_combobutton_glyph.svg diff --git a/dlls/light.msstyles/Makefile.in b/dlls/light.msstyles/Makefile.in index 599609def60..8f4ffdb9a22 100644 --- a/dlls/light.msstyles/Makefile.in +++ b/dlls/light.msstyles/Makefile.in @@ -7,6 +7,8 @@ SVG_SRCS = \ blue_checkbox_13px.svg \ blue_checkbox_16px.svg \ blue_checkbox_25px.svg \ + blue_combobutton_glyph.svg \ + blue_combobutton.svg \ blue_commandlink_glyph_30px.svg \ blue_commandlink_glyph_45px.svg \ blue_commandlink.svg \ diff --git a/dlls/light.msstyles/blue_combobutton.bmp b/dlls/light.msstyles/blue_combobutton.bmp new file mode 100644 index 0000000000000000000000000000000000000000..a2b12ba3e1f3c3506f30c0dd75e567612a6e526c GIT binary patch literal 6858 zcmeI1&raJw5XN1B$_sGf(B#lVLJm0M1rV2>dO>}Y9_svgf*vdCh*yY|<Q9n}TxrS+ zrA|Q03}&29-pkA;m2$AfFrRn7`DMMa2H9MHeL9QYj-T|qPjO1|jp9R8kB%r`z0Z?` z!$nd4!(;CH%guL~RLNtNYd6zqG^&lq;~7Op;f%pG_ru}vldNJgnaqjVrLm7Prp;VK z^?hQ_q=s}B!jk&wbb3OJe{xQmzLnh$WS|bEA_H~B)9nE68ERd%??MJ@->Dlx25Mck z??MJ@->Dlx25Mck??MJ@->Dlx25Mck??MLYee{=1K81J->S3Lbp2am(-=iq{-+O;v z@H#2X{h9kQaf|*e>pax#dd-?kntxo<cy^tpGeutW=zg?{>!tc7g`Kti>}Ot&>{rmb zwygYmy62mMSDp(zuXx6LrL@o0{#E;D={5iDehKM&rF)rs)OLN1C)a7bSgx()<=(k0 zcuAv9=YNCxV18{&?(xDq^t`%l*Vez|**c9g3TKQgOXK_1-DUCji0bE?H14`#%lv%A zHJkLJ&+CzW<8_6wq~87dd_s)k`G~Ji=0Y<vP**(N4&a`l)>Zp1WT5t)x)Efc)>Zp1 zWT5t)x)Efc)>Zp1WT5t)x)Efc)>Zp1WT5t)x)EfM-ba5ao{!dP`(ZO^Cm}s6?|*TZ z)-;zZSq<X)dT_Deb@IB6!8LR4@xnXwT)nTee?$D-ELEsw%$kvb+R70>GEmFBH6sJH zl_P#+pq6=SMh0ptNBqb@E%Vll4AfSR_>qBH=B*hSsI46FBLlU}TQf3HTRGxK2I+mj guX`Y768gT5|JT9q*krAw>%`mXeI56B;q5cO0viV@SpWb4 literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_combobutton.svg b/dlls/light.msstyles/blue_combobutton.svg new file mode 100644 index 00000000000..aab7ff06812 --- /dev/null +++ b/dlls/light.msstyles/blue_combobutton.svg @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:20-32" width="20" height="84" version="1.1" viewBox="0 0 5.2917 22.225" 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=".39687" y=".39687" width="4.4979" height="4.7625" rx=".52917" ry=".52917" fill="none" stroke="#aeaeae"/> + <rect x=".39687" y="5.9531" width="4.4979" height="4.7625" rx=".52917" ry=".52917" fill="none" stroke="#3096fa"/> + <rect x=".39687" y="11.509" width="4.4979" height="4.7625" rx=".52917" ry=".52917" fill="#2979ff" stroke="#2979ff"/> + <rect x=".39687" y="17.066" width="4.4979" height="4.7625" rx=".52917" ry=".52917" fill="none" stroke="#aeaeae"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_combobutton_glyph.bmp b/dlls/light.msstyles/blue_combobutton_glyph.bmp new file mode 100644 index 0000000000000000000000000000000000000000..2c0bd8a357fbffce7007fb3606beba2cf9a7b606 GIT binary patch literal 1258 zcmd6jO>ToQ5QQBztDK>W-XP8iKy13|CMU=pDrJQd3wGTDQg<AHpL68~luGV52}HOc z#G+DT@!2zPo{{{5x64{x*9UtD8+eA5dQnfDhi*<eSXQaqCz=gj_wR$@qH^-Li*CB6 zvMlquu0LJX?W(GZAS{Z);6J(3TgNOGPd^hc{kiYu<gSNy9BNXF5B%TyfA-ee9A<N2 z9zh5OCUZfL#nZo~^E$bpc`(Wa?F<i<%U7!N?@Z6;(j?ocO}Al_Xw#;<$y}Or7mKIQ z<?79}lM8pfHqoP8T72+Ox$ur0W^-X4fxOwkWG?72+;gEe;N(K@!6=u`=X3t~`T;?t Bf*t?> literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_combobutton_glyph.svg b/dlls/light.msstyles/blue_combobutton_glyph.svg new file mode 100644 index 00000000000..0caf1c4b696 --- /dev/null +++ b/dlls/light.msstyles/blue_combobutton_glyph.svg @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:10-32" width="10" height="28" version="1.1" viewBox="0 0 2.6458 7.4083" 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-1.8521h6.35v6.35h-6.35z" fill="none" stroke-width=".26458"/> + <path d="m0 3.7042h6.35v6.35h-6.35z" fill="none" stroke-width=".26458"/> + <path d="m0.39688 0.66961 0.92136 0.91789 0.13162-0.13113-0.92136-0.91789z" stroke-width=".26458"/> + <path d="m2.1173 0.52917-0.92136 0.91789 0.13162 0.13113 0.92136-0.91789z" stroke-width=".26458"/> + <g> + <g stroke-width=".26458"> + <path d="m0.39688 2.5217 0.92136 0.91789 0.13162-0.13113-0.92136-0.91789z" fill="#3096fa"/> + <path d="m2.1173 2.3812-0.92136 0.91789 0.13162 0.13113 0.92136-0.91789z" fill="#3096fa"/> + <path d="m0.39688 4.3738 0.92136 0.91789 0.13162-0.13113-0.92136-0.91789z" fill="#fff"/> + <path d="m2.1173 4.2333-0.92136 0.91789 0.13162 0.13113 0.92136-0.91789z" fill="#fff"/> + </g> + <path d="m0.39688 6.2259 0.92136 0.91789 0.13162-0.13113-0.92136-0.91789z" fill="#aeaeae"/> + <path d="m2.1173 6.0854-0.92136 0.91789 0.13162 0.13113 0.92136-0.91789z" fill="#aeaeae"/> + </g> + </g> +</svg> diff --git a/dlls/light.msstyles/light.rc b/dlls/light.msstyles/light.rc index cc5b371da8c..2451ffcd4f0 100644 --- a/dlls/light.msstyles/light.rc +++ b/dlls/light.msstyles/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" } /* Button */ @@ -330,6 +354,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

1 0

[PATCH v3 1/4] light.msstyles: Add Button parts.
by Zhiyi Zhang 24 Jun '21

24 Jun '21

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. v3: Supersede 208185~208189. Use buildimage to generate bitmaps. dlls/light.msstyles/Makefile.in | 13 ++ dlls/light.msstyles/blue_button.bmp | Bin 0 -> 12282 bytes dlls/light.msstyles/blue_button.svg | 24 +++ dlls/light.msstyles/blue_checkbox_13px.bmp | Bin 0 -> 8250 bytes dlls/light.msstyles/blue_checkbox_13px.svg | 44 ++++++ dlls/light.msstyles/blue_checkbox_16px.bmp | Bin 0 -> 12426 bytes dlls/light.msstyles/blue_checkbox_16px.svg | 36 +++++ dlls/light.msstyles/blue_checkbox_25px.bmp | Bin 0 -> 30138 bytes dlls/light.msstyles/blue_checkbox_25px.svg | 40 +++++ dlls/light.msstyles/blue_commandlink.bmp | Bin 0 -> 13074 bytes dlls/light.msstyles/blue_commandlink.svg | 18 +++ .../blue_commandlink_glyph_30px.bmp | Bin 0 -> 18138 bytes .../blue_commandlink_glyph_30px.svg | 19 +++ .../blue_commandlink_glyph_45px.bmp | Bin 0 -> 40638 bytes .../blue_commandlink_glyph_45px.svg | 19 +++ dlls/light.msstyles/blue_groupbox.bmp | Bin 0 -> 1898 bytes dlls/light.msstyles/blue_groupbox.svg | 15 ++ dlls/light.msstyles/blue_radiobutton_13px.bmp | Bin 0 -> 5546 bytes dlls/light.msstyles/blue_radiobutton_13px.svg | 28 ++++ dlls/light.msstyles/blue_radiobutton_16px.bmp | Bin 0 -> 8330 bytes dlls/light.msstyles/blue_radiobutton_16px.svg | 28 ++++ dlls/light.msstyles/blue_radiobutton_25px.bmp | Bin 0 -> 20138 bytes dlls/light.msstyles/blue_radiobutton_25px.svg | 28 ++++ dlls/light.msstyles/light.rc | 149 ++++++++++++++++++ 24 files changed, 461 insertions(+) create mode 100644 dlls/light.msstyles/blue_button.bmp create mode 100644 dlls/light.msstyles/blue_button.svg create mode 100644 dlls/light.msstyles/blue_checkbox_13px.bmp create mode 100644 dlls/light.msstyles/blue_checkbox_13px.svg create mode 100644 dlls/light.msstyles/blue_checkbox_16px.bmp create mode 100644 dlls/light.msstyles/blue_checkbox_16px.svg create mode 100644 dlls/light.msstyles/blue_checkbox_25px.bmp create mode 100644 dlls/light.msstyles/blue_checkbox_25px.svg create mode 100644 dlls/light.msstyles/blue_commandlink.bmp create mode 100644 dlls/light.msstyles/blue_commandlink.svg create mode 100644 dlls/light.msstyles/blue_commandlink_glyph_30px.bmp create mode 100644 dlls/light.msstyles/blue_commandlink_glyph_30px.svg create mode 100644 dlls/light.msstyles/blue_commandlink_glyph_45px.bmp create mode 100644 dlls/light.msstyles/blue_commandlink_glyph_45px.svg create mode 100644 dlls/light.msstyles/blue_groupbox.bmp create mode 100644 dlls/light.msstyles/blue_groupbox.svg create mode 100644 dlls/light.msstyles/blue_radiobutton_13px.bmp create mode 100644 dlls/light.msstyles/blue_radiobutton_13px.svg create mode 100644 dlls/light.msstyles/blue_radiobutton_16px.bmp create mode 100644 dlls/light.msstyles/blue_radiobutton_16px.svg create mode 100644 dlls/light.msstyles/blue_radiobutton_25px.bmp create mode 100644 dlls/light.msstyles/blue_radiobutton_25px.svg diff --git a/dlls/light.msstyles/Makefile.in b/dlls/light.msstyles/Makefile.in index d6b7a53d7f8..599609def60 100644 --- a/dlls/light.msstyles/Makefile.in +++ b/dlls/light.msstyles/Makefile.in @@ -1,3 +1,16 @@ MODULE = light.msstyles RC_SRCS = light.rc + +SVG_SRCS = \ + blue_button.svg \ + blue_checkbox_13px.svg \ + blue_checkbox_16px.svg \ + blue_checkbox_25px.svg \ + blue_commandlink_glyph_30px.svg \ + blue_commandlink_glyph_45px.svg \ + blue_commandlink.svg \ + blue_groupbox.svg \ + blue_radiobutton_13px.svg \ + blue_radiobutton_16px.svg \ + blue_radiobutton_25px.svg diff --git a/dlls/light.msstyles/blue_button.bmp b/dlls/light.msstyles/blue_button.bmp new file mode 100644 index 0000000000000000000000000000000000000000..6dd20ad167d73dd2a5e607df51b73197295a177e GIT binary patch literal 12282 zcmeI1&rZTX5XNit89YLdpa=hOmID`0UVIW04}$sxo{a>B7a#!+@C;D!&l#SC*mg6{ zblH?}GIUBp@@-hUQ1WH>V<x}uZ0#mI^OE+$@6X(ixy$&#^Swj9-mUKQaIKN&*_V7r zwd>pawVVGM9&P+;`Fc?dJ6A#2yo|%QbIR03qg|aWTa^N9PR)1QkclXBGa;GJ_e48v zR$}7MYAyaH(Uf&-H|HgEZCt?z_#iQWys()7A9mnFKD>xhzA3P1jc+NBEt6b~Y;_f` zt$3X1^4PI%D?RsoAiACEc*Xg^e0}IJIq{*DC+8zsw{~-0LKl3K7(hJOOn?vY!8))5 zAM)Y6aBgOPI=qin;yklb_S?(mxi8NUdOT)L-pluTz2a~<oD2qoxZm$nmM$8sHSTu1 zh0$mf%;)pi7_<JDZZ#GS(Q@<D&~y_KEuMEI>(*}0OX%9Tf)DUPVgPwzGXXy2?}IQY z2VMw^ri;abrFHqX;_+0A$HHOZF+G)wR4-4cUW%zvrcB*xjOpRDz&Zi<?3(GEVzqgu zns&X9CsC$#Z|dQ5wm5=+@DDM77|@6T4X$m@Bhf6)s8KSC+z?g<%weCeQ$-#J!g$o} zlk<7h?fKCf^;EmRfDiD&IshN`-Urm}QMczHM%_NmWYiI@7w`c-q*;M;2Is{-=0%Qm W`<Zs#UTW+-Uti7yH0$<q7Vro8$&m8^ literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_button.svg b/dlls/light.msstyles/blue_button.svg new file mode 100644 index 00000000000..99041a80209 --- /dev/null +++ b/dlls/light.msstyles/blue_button.svg @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:22-32" width="22" height="138" version="1.1" viewBox="0 0 5.8208 36.512" 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(-40.717 -1.1913)" stroke-width=".26458"> + <g fill="#fff"> + <rect x="40.849" y="1.3236" width="5.5563" height="5.8208" rx=".52917" ry=".52917" stroke="#aeaeae"/> + <rect x="40.849" y="19.58" width="5.5563" height="5.8208" rx=".52917" ry=".52917" stroke="#aeaeae"/> + <g stroke="#3096fa"> + <rect x="40.849" y="25.665" width="5.5563" height="5.8208" rx=".52917" ry=".52917"/> + <rect x="40.849" y="31.751" width="5.5563" height="5.8208" rx=".52917" ry=".52917"/> + <rect x="40.849" y="7.409" width="5.5563" height="5.8208" rx=".52917" ry=".52917"/> + </g> + </g> + <rect x="40.849" y="13.494" width="5.5563" height="5.8208" rx=".52917" ry=".52917" fill="#2979ff" stroke="#2979ff"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_checkbox_13px.bmp b/dlls/light.msstyles/blue_checkbox_13px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..a6b1903b236fae8ccbbcd272d143f36a01eca005 GIT binary patch literal 8250 zcmeHM&2HL27&K|soGR282&k&mK-9)=I6yB*x%5y)mD)=s`U*Yu5QlK!++#^h5PgB7 z{BVdOB_t1kco9I{gQ3!PKF8~>4S4M$Sw*syVb}Z3?5@2N_S3Sv_cpCq*LQqYfTzGu zAfcp{M=0AVe9T--Q6By%!gk+%{5C_8G(7gi&(6+L=jZ1)fC(@kQ2e^pYHeIxTy&r- zqyEIxo$Hq3;8vis`j_#!`0DCv9hx!Cg|`JMi66CwkLg#^+<836b8t??8Z+ejkRR>< zU8bWr`GtG~q@lS5q<*t~mSTsQ6g$Y=04BhEK=Es~zqNs~!w#}#R^9UTD8<3801y33 z_<U{H*B9&1jDb)dC4STzKBiwu&&A{X8H1D&YfRaC@;Te<13zru0lG~0-~;%De4}rs zQQiVU{MI3V-XCeH$+3DfF;o*^J}^x~y}obkY=G058fuxfBpyY4YHU|{|1!Sw4t~5? z#~5Rp3vUZj^0^1$a?Y|EuJ<cxEFS0M1}P)fm?75(e$noxbxoJ)C{BLC^K|a(YI;)N zzC~T?H;WH{#(VwJ`2qbO$q?`LOYHTl;?Zigx`rI4i5%t2qVFKYoqUurmcX+$!0(~G z4}6}d6E)!1aNkA#lsr8>)leTm|H-QpHK>;^FE5{Q4s<!R4S^55jY?4?w(~m1&Vw^* zx7&NXO{O6pI0e!{|K7fL-U07tUI|SR_$6rKe3bH!CGt^LRn}NJ(`4oBLXV318@|{Q z;5N|K1NzX;^{7j8kgegq%l4lqnV!{<YYmV;&3M$M(X%C{zj8dv4qxUFAF}<d%cG)Z zo@bDE<-r-T!%fGdG7a^EITkEkIb(S=h{o0x!L>YUYr?KioR50)QSvDAlcs5GFZ3wl zRz7X50aFsVZy*=$0e!Qs&Go3LnH+01+;>@HCyAU%Lwx|<j7LR{SyxNU`0LThiIzir zXdbC9kBS<apZA&=Z}Q-b#>cN6kIFRE$Mi%iknXpkS{@Cev2=!3#Cx$kYHQ+r6lV>x zGYY<L3(lU_5N`qtJ&L_c+~*SDHh><`2j+Uzqp5+{1(JXU41gJrdNd_)obOT8bHEUA zdDNppc;?EZWdt}L4WOY;3broPUJp$Xusmvy6Lx(fJ9|PNlfoS1^HD5V&?}&KT-~jJ z=D+o5d_EfenX1dYJ~u&gOR<Y3G;uzP^Dx;t8h_Vph0aI$oMmOuJW=c?VolifiO)w@ S<hM}KQ-1Y$umAVoLjM5TYj8mT literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_checkbox_13px.svg b/dlls/light.msstyles/blue_checkbox_13px.svg new file mode 100644 index 00000000000..fbbca0ae2f6 --- /dev/null +++ b/dlls/light.msstyles/blue_checkbox_13px.svg @@ -0,0 +1,44 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:13-32" width="13" height="156" fill="#000000" version="1.1" viewBox="0 0 13 156" 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="none"> + <path d="m0 0h24v24h-24z"/> + <rect x=".5" y=".5" width="12" height="12" rx="2" ry="2" stroke="#aeaeae"/> + <rect x=".5" y="13.5" width="12" height="12" rx="2" ry="2" stroke="#3096fa"/> + <path d="m0.5 25.5h24v24h-24z"/> + <rect x=".5" y="26.5" width="12" height="12" rx="2" ry="2" stroke="#2979ff"/> + <rect x=".5" y="39.5" width="12" height="12" rx="2" ry="2" stroke="#aeaeae"/> + <path d="m4.1723e-7 52h24v24h-24z"/> + <rect x=".5" y="52.5" width="12" height="12" rx="2" ry="2" stroke="#aeaeae"/> + <rect x=".5" y="65.5" width="12" height="12" rx="2" ry="2" stroke="#3096fa"/> + <path d="m0.5 77.5h24v24h-24z"/> + <rect x=".5" y="78.5" width="12" height="12" rx="2" ry="2" stroke="#2979ff"/> + <rect x=".5" y="91.5" width="12" height="12" rx="2" ry="2" stroke="#aeaeae"/> + <path d="m-1.9073e-6 104h24v24h-24z"/> + <rect x=".5" y="104.5" width="12" height="12" rx="2" ry="2" stroke="#aeaeae"/> + <rect x=".5" y="117.5" width="12" height="12" rx="2" ry="2" stroke="#3096fa"/> + <path d="m0.5 129.5h24v24h-24z"/> + <rect x=".5" y="130.5" width="12" height="12" rx="2" ry="2" stroke="#2979ff"/> + <rect x=".5" y="143.5" width="12" height="12" rx="2" ry="2" stroke="#aeaeae"/> + </g> + <path d="m4.8636 60.537-2.1477-2.194-0.71591 0.73134 2.8636 2.9254 6.1364-6.2687-0.71591-0.73134z"/> + <g> + <path d="m4.8636 73.537-2.1477-2.194-0.71591 0.73134 2.8636 2.9254 6.1364-6.2687-0.71591-0.73134z" fill="#3096fa"/> + <path d="m4.8636 99.537-2.1477-2.194-0.71591 0.73134 2.8636 2.9254 6.1364-6.2687-0.71591-0.73134z" fill="#aeaeae"/> + <path d="m4.8636 86.537-2.1477-2.194-0.71591 0.73135 2.8636 2.9254 6.1364-6.2687-0.71591-0.73134z" fill="#2979ff"/> + </g> + <path d="m2 110h9v1h-9z"/> + <g> + <path d="m2 123h9v1h-9z" fill="#3096fa"/> + <path d="m2 136h9v1h-9z" fill="#2979ff"/> + <path d="m2 149h9v1h-9z" fill="#aeaeae"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_checkbox_16px.bmp b/dlls/light.msstyles/blue_checkbox_16px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..3504ce48ff7b2a97db094252fc1bd13f6ab5fa00 GIT binary patch literal 12426 zcmeHNJx|+E6m`_9VW>oxPDmuGP#|HjBN#grmP(bnRLaH=VCmE$A7seX0Wl$xPzlsM zQo@D=AyNk>CPp?U79<vi5GRG#a~)seI0^Q1IwY2#INay!d)}Ad5x&o?f8Ev;qio}M z9(V`*0YXYtc?GMO_o><|LQ%Ru<Pz(jzy0Xlb60z93#(SEky@>G3h01v35q?bR4VgF zM@MzEkwg8Bt?7}M6boJ+Z5aK^aJkXr<Kr;+EgCQTWG!)h#HV$TfnuA#4A)q58((($ z?fp+HUms)tl8zccMy3slCC!ocfGGH9fRuhs-A2S#JR-93Q$PoVOHk~INH5RB)<rgv z6NP2h`lnd%@<6v=2`+CE@qHl-ehV=6BKu`5as9&Qxwy5oP8@5kv(L#|IaK#jxDPK} z;!Fr%m)ZL~S9AYDM@tPLBhyA#KhPX$FS8VdJp*L*TPN*5>?I@ZqITLYX*wWWLf1>$ z$-}RedBoQ{B`qf^68cAMr=;e&Um5Q6`t2@+(RYi+%RX7lbCu<B{3P*tEN(5$fn%+8 z_BmNAhw5Gm_u++0oC)FUW9(mOF4^dmlNp&dD3&yb`PU!HTC`nO&rp}rufc`(gZF>m z<PYP%zmLn8mNDL0{g8i6_4~gM^&i4UJOsWtZO9S(ZwEZmLKFD-QX50~X_K3UJqPZ9 zWngHr@i!3k1pG9EXJIda8z2e{6dS*afCGT$&t(pkYv2la&rY^B{tW!a(G%Y{Z4CAn zxB%XoKEv4f)?4=aDjfGf0|@g?2|iKQfEG{#jB!fxK~qw|Bd|vo9{5Dt1PW9!`BSZb zzvcfBZb)R}hscK<^^cf={9j}eJEp&h^NknvZ|9@mwBgGvWpO5Qj{2QQCr0Yu$``rB z2CkoA4gHJshgsx>m+;+Cjz{~=Ui$dicoo+NG=Gj0Td_I#t}(7FkzE+je;>aPoe`-) z{bLL<#NEPPAn)wczm?B@4zprwaTT%mXrn=SFUPp$Q@qG6t|7i9a`76EQ-*J}kx8V$ zc?1mo%ks@OHt~!KM!ma#g8YAi@_!+eP`j8s{JXC?>VH`N*e<F&roY)KsxRu_&c~TX zntaI3vasjCoxZ1z)W4Olm(&ehKjB=ZtN&jsv$(!QTQ`*B(SEZRE5B1pR@)`@facF} z&9XX&m}}rl>?Q~FZ{>^MpJqfQHSqVpwWr1qcMDvIV!!^aeC~6YZSN;n5qnR$uE4ns z$GGKFJf6iG;#-}fR^xHX@Tm=~Z3>)6z|g-epW472Hua)b=+=$%vLOGTtnYuc|AY5` z+MtROy#IICfqw_@|J^eeoxlJ2F#qRg?Pxvbf6wg(d|#a3(OHkD66F8E_kYSEJ#8M4 zyyTzOz5@Q>`Hgjboa+B+{et{|g7SZ-XKuakCI1Wfy%h-7FUbGRJR<o2-<~X7*Mj`P L7x}|ffB*Xjzuufm literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_checkbox_16px.svg b/dlls/light.msstyles/blue_checkbox_16px.svg new file mode 100644 index 00000000000..4646a259e62 --- /dev/null +++ b/dlls/light.msstyles/blue_checkbox_16px.svg @@ -0,0 +1,36 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:16-32" width="16" height="192" fill="#000000" version="1.1" viewBox="0 0 16 192" 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="none"> + <rect x=".5" y=".5" width="15" height="15" rx="2" ry="2" stroke="#aeaeae"/> + <rect x=".5" y="16.5" width="15" height="15" rx="2" ry="2" stroke="#3096fa"/> + <rect x=".5" y="32.5" width="15" height="15" rx="2" ry="2" stroke="#2979ff"/> + <rect x=".5" y="48.5" width="15" height="15" rx="2" ry="2" stroke="#aeaeae"/> + <rect x=".5" y="64.5" width="15" height="15" rx="2" ry="2" stroke="#aeaeae"/> + <rect x=".5" y="80.5" width="15" height="15" rx="2" ry="2" stroke="#3096fa"/> + <rect x=".5" y="96.5" width="15" height="15" rx="2" ry="2" stroke="#2979ff"/> + <rect x=".5" y="112.5" width="15" height="15" rx="2" ry="2" stroke="#aeaeae"/> + <rect x=".5" y="128.5" width="15" height="15" rx="2" ry="2" stroke="#aeaeae"/> + <rect x=".5" y="144.5" width="15" height="15" rx="2" ry="2" stroke="#3096fa"/> + <rect x=".5" y="160.5" width="15" height="15" rx="2" ry="2" stroke="#2979ff"/> + <rect x=".5" y="176.5" width="15" height="15" rx="2" ry="2" stroke="#aeaeae"/> + </g> + <path d="m5.8182 74.91-2.8636-3.1343-0.95455 1.0448 3.8182 4.1791 8.1818-8.9552-0.95455-1.0448z"/> + <path d="m5.8182 90.91-2.8636-3.1343-0.95455 1.0448 3.8182 4.1791 8.1818-8.9552-0.95455-1.0448z" fill="#3096fa"/> + <path d="m5.8182 106.91-2.8636-3.1343-0.95455 1.0448 3.8182 4.1791 8.1818-8.9552-0.95455-1.0448z" fill="#2979ff"/> + <path d="m5.8182 122.91-2.8636-3.1343-0.95454 1.0448 3.8182 4.1791 8.1818-8.9552-0.95455-1.0448z"/> + <g> + <path d="m2 135h12v2h-12z"/> + <path d="m2 151h12v2h-12z" fill="#3096fa"/> + <path d="m2 167h12v2h-12z" fill="#2979ff"/> + <path d="m2 183h12v2h-12z"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_checkbox_25px.bmp b/dlls/light.msstyles/blue_checkbox_25px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..8720209c6081e0c7f097a0822be7c621895e56d4 GIT binary patch literal 30138 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 I)$m#BzuylKPXGV_ literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_checkbox_25px.svg b/dlls/light.msstyles/blue_checkbox_25px.svg new file mode 100644 index 00000000000..0815af16e31 --- /dev/null +++ b/dlls/light.msstyles/blue_checkbox_25px.svg @@ -0,0 +1,40 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:25-32" width="25" height="300" fill="#000000" version="1.1" viewBox="0 0 25 300" 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="1" y="1" width="23" height="23" rx="2" ry="2" fill="none" stroke="#aeaeae" stroke-width="2"/> + <path d="m9.4091 116.87-4.0568-4.7015-1.3523 1.5672 5.4091 6.2687 11.591-13.433-1.3523-1.5672z"/> + <path d="m4 211h17v3h-17z"/> + <g fill="none" stroke-width="2"> + <rect x="1" y="26" width="23" height="23" rx="2" ry="2" stroke="#3096fa"/> + <rect x="1" y="51" width="23" height="23" rx="2" ry="2" stroke="#2979ff"/> + <rect x="1" y="76" width="23" height="23" rx="2" ry="2" stroke="#aeaeae"/> + <rect x="1" y="101" width="23" height="23" rx="2" ry="2" stroke="#aeaeae"/> + <rect x="1" y="126" width="23" height="23" rx="2" ry="2" stroke="#3096fa"/> + <rect x="1" y="151" width="23" height="23" rx="2" ry="2" stroke="#2979ff"/> + <rect x="1" y="176" width="23" height="23" rx="2" ry="2" stroke="#aeaeae"/> + </g> + <g> + <path d="m9.4091 141.87-4.0568-4.7015-1.3523 1.5672 5.4091 6.2687 11.591-13.433-1.3523-1.5672z" fill="#3096fa"/> + <path d="m9.4091 166.87-4.0568-4.7015-1.3523 1.5672 5.4091 6.2687 11.591-13.433-1.3523-1.5672z" fill="#2979ff"/> + <path d="m9.4091 191.87-4.0568-4.7015-1.3523 1.5672 5.4091 6.2687 11.591-13.433-1.3523-1.5672z" fill="#aeaeae"/> + </g> + <g fill="none" stroke-width="2"> + <rect x="1" y="201" width="23" height="23" rx="2" ry="2" stroke="#aeaeae"/> + <rect x="1" y="226" width="23" height="23" rx="2" ry="2" stroke="#3096fa"/> + <rect x="1" y="251" width="23" height="23" rx="2" ry="2" stroke="#2979ff"/> + <rect x="1" y="276" width="23" height="23" rx="2" ry="2" stroke="#aeaeae"/> + </g> + <g> + <path d="m4 236h17v3h-17z" fill="#3096fa"/> + <path d="m4 261h17v3h-17z" fill="#2979ff"/> + <path d="m4 286h17v3h-17z" fill="#aeaeae"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_commandlink.bmp b/dlls/light.msstyles/blue_commandlink.bmp new file mode 100644 index 0000000000000000000000000000000000000000..73f06fe6040b47966522ef122e007712a0d6d9b4 GIT binary patch literal 13074 zcmeI1y;8zJ6ote1SJ>Hu6pllL8G^h4jg^fLVP|ClAuwa<SUQpnuizW-_gX@d;(9jA z&cu)q3mf%h*zD%+ne6iAX77dV-JW%=<aoh(gmQ{<S+T5&Rkse%e!j+O=Mc-%AJrqh zo4dyyNr~Yw)4!f}Yth7+N4~Q`k({y#eP{MDX;sm;h$oIGuNNno+a#CD9tWMV(nA}{ zd-FI?XKYFjT{5n*?W@h)_GwHXwVDJukb`+AR84=NKhPi21pbXbl*ePlYpf4p<abuF z-|ow_d$dami3jYl?+l?`tOKX6^k_$BZOPP86ttJ?x6ZjL+gt-<<mMWo${muNMCBS7 zqbP?^cFb{P?pLHU^JlJMNH7K%62=G3^}d=~O@|!FA^o1vALtJ`{!pH4=->W2*9ba; zqWG=jd@9#KE&-n_%pcIVP<cjrPHd9^36KB@kN^pgz)us9ezPX7JxAG~NKR4qnRu-# z>V*t!PaX>PP+&*@IMKUyC{HDOC`!K__dDMU+GKvzl7sRA`h$KG$blR*0dgRRG=VSv zP#%vFud$Yd;x<-@<9)d=*h7I`+^Zq9$OjtrMDN;>S%)&UvM<H6xrc(s!T%h!Pm%*U lXaeLw4rv1Phct~}x=wNrCH)ZDCIJ#40TLhq68LijJ^`<tISl{+ literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_commandlink.svg b/dlls/light.msstyles/blue_commandlink.svg new file mode 100644 index 00000000000..77f23aca6e1 --- /dev/null +++ b/dlls/light.msstyles/blue_commandlink.svg @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:11-32" width="11" height="294" version="1.1" viewBox="0 0 2.9104 77.788" 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="none" stroke-linecap="round" stroke-width=".26458"> + <rect x=".13229" y="13.097" width="2.6456" height="12.7" rx=".52917" ry=".52917" stroke="#3096fa"/> + <rect x=".13229" y="26.061" width="2.6456" height="12.7" rx=".52917" ry=".52917" stroke="#2979ff"/> + <rect x=".13229" y="51.991" width="2.6456" height="12.7" rx=".52917" ry=".52917" stroke="#3096fa"/> + <rect x=".13229" y="64.955" width="2.6456" height="12.7" rx=".52917" ry=".52917" stroke="#3096fa"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_commandlink_glyph_30px.bmp b/dlls/light.msstyles/blue_commandlink_glyph_30px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..e52b192007ce04e5d3180ed01e8b810873ce12bf GIT binary patch literal 18138 zcmeI2T~32Q5XUik4&$SIMCld!pid@7;UqrTHYVlK_-yGV__&WZp_q)bv>;8Jv|E-T z(Ld<`U3TXWzZsTHvg3!ZJFD70c>l(B$riJnSy$FMA0Ic@`Lwl>WvzdzjmGy+FRhD5 zon9Q(3!Oj!1pW(wV&O;1B%ilf-gv9nFWE?3JNCm`yIlHn(dULX=`vS2V#;*1O=&7W zMLc?!$g^TG3RrLbUP03+@<G^s-nvaZrRQk%T@cD4qk)1m5C8!X009sH0c`?#p3jwO z59}}?%QBDcn~et04q3N^c836J4rSISGgomkWjeWLN^|2!q#jJuG+@0dxB2+jHCK{s zId`5}PgFBW61R>g$2QV@?K*W=dQv&m=|(Xa1V8`;KmY_lpfdrQIgzr?jx-$5%=Tz% zmuw`iJ#oTDdvYyW2NSf3G?`a9qVmLqX=oeKtM7Sci_~T`b%Q3ip{X$=9qu{^+gHc^ zji>Y+t-cE~d3%^XdVl~3fB*=900{I+0P98jq`U3Az<N=v7u`+?qyGk3(}*>yMq}7^ zR$#qo8wbuo00ck)1V8`;dLn>&uqUv4+@c=zQ4j9P3sX&~2ThUO^)m=t)PuW$Knn<f IKraM-0R9zDg8%>k literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_commandlink_glyph_30px.svg b/dlls/light.msstyles/blue_commandlink_glyph_30px.svg new file mode 100644 index 00000000000..cb367b792a2 --- /dev/null +++ b/dlls/light.msstyles/blue_commandlink_glyph_30px.svg @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:30-32" width="30" height="150" version="1.1" viewBox="0 0 7.9375 39.688" 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.7625 2.1167-0.37306 0.37306 1.2118 1.2144h-4.2783v0.52917h4.2783l-1.2144 1.2144 0.37571 0.37306 1.8521-1.8521z" fill="#3096fa"/> + <path d="m4.7625 10.054-0.37306 0.37306 1.2118 1.2144h-4.2783v0.52917h4.2783l-1.2144 1.2144 0.37571 0.37306 1.8521-1.8521z" fill="#3096fa"/> + <path d="m4.7625 17.992-0.37306 0.37306 1.2118 1.2144h-4.2783v0.52917h4.2783l-1.2144 1.2144 0.37571 0.37306 1.8521-1.8521z" fill="#2979ff"/> + <path d="m4.7625 25.929-0.37306 0.37306 1.2118 1.2144h-4.2783v0.52917h4.2783l-1.2144 1.2144 0.37571 0.37306 1.8521-1.8521z" fill="#aeaeae"/> + <path d="m4.7625 33.867-0.37306 0.37306 1.2118 1.2144h-4.2783v0.52917h4.2783l-1.2144 1.2144 0.37571 0.37306 1.8521-1.8521z" fill="#3096fa"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_commandlink_glyph_45px.bmp b/dlls/light.msstyles/blue_commandlink_glyph_45px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..a450715cf8a86a62713750564169cb2102860e36 GIT binary patch literal 40638 zcmeI5&rj1}7{@n%L=SpVFKSFQF|y4cYoqZ@xOnp75l@;RCr=Pyz+s7=ObFs^mnGr| zaw6f^X1M7Rju4K7a3S%J5W@&OK5bXlcEga;SDq$c;%iIC-hKG+?AcqM^`Yze&#wvl z;{*Rc%HtuAUp$hD+ljNhebTs{cRe4JNI3tjW7PHRMW5%!W9^<h)>q++U;qYS00v+H z24En52I^+^Ro&FSQNA-4OP+c$+snNBJZR6<EA;8^1<BTl5=nMEZSlHe*VL+1?z||T zyQmp1b7Na0<NhV_+(vf7&#kY}WXEOk+@?O}=hjx~%l#{oxh=L`L(BWPi~2f!etK0p z_nw&@^l_Wo29+LP7td{I{XT9ZyZO7I-#7`kZ$3}1Qha=C$9QlnEVp8|!+hQPIQoy6 zF>n7VJh~H>S@r$)ih3VAJ~;Hu@w`*a-c<d#Vdsxq-e}>q@^k6&wXom6>ig}Q`n$te zuyT>1tx0_ybk=v;xR2MAyWX&Q4ZYy!)kLrBn03m_8;A8X$7~NX+vh1ZukiB}_c_h1 z-ON72`Qf~K3|kn00T_S*7=Qs7fB_hQ0T_S*7=Qs7fC04z=I7^M^O&jCYO$!%&&|#C zGVeYQ;!#~*UKU=Xr{u!I!gPbzVz$Qja=9$LMsIT)0q)xD?5yw_JtdiWBEY?}w6r9= zMsIVEdAT`m*4VfB8a+QJ^ImS=U$0iHVrxKdMrF>y0QUxeFXC(T%-kQ~-sCtrQB5;2 zpPQ$YZrSyArBVr9J3bBO#$$%A(Vr6Y*5cw~==Van&lgo&j)Ok-a^P{Z$@%(3?>SM$ zYR$`>vC125c-Q%u*!NIzJiPP7f|Y|-rM?al+3Te70I%5fhQ-T%3jtoy>pEtg3h-8? zub-K>hlhQh!oDlg&r{rd$*kSXJyR-`P@{LHU<(5<00S@p126ysFaQHE00S@p126ys ziVe_E<~8L~GjX|&o^qL9%BA;t5RWRo6@DE(w|rvG=?1UGOf;1KPWjuiYxEZPaN6*3 z=h8LG3%`!u;vPzW3~;Z|fbi?+?KsJd1-RGPxA+=84QKKJ?se+BC%#6{aWWX--r$%Q zU!&(7*w5StP4>(tjodp?jlMaTomZVa<>XkE``a|y5xPcyO3dsd6}m=$O3Yg{624!7 z;w4C;5zn4D<9HtE5L=^<Ti$4!pK~d(HG0m$@BPn{)T-3iL2lP+t?$PDylJuP4Tm>V z2=Izt*D>pqk9R0j5x?%wrFxjzIZufJubbm(IMr>R55B>5^sW<ZVE_hT00v+H24DaN zU;qYS00v+H24Fz70ra|8Yq-%1^;_I}by7ZYrf%qyUT)qO-4oUNNjkk;(d%AqRQqQ~ zuY11_)t~L5*S)PckemL|o4)yXMxwb7dfi7E<LGrCrOnp4(Cfa{NmNJB>pm)zN6%9) zYGrTUjzzC~Q+vbA@#}S8)Lx?3{n4?ATVMbNU;qYS00v+H24DaNU;qYS00v+{g#py) zRakA#>HH2Ce~-RtMC~4G^lJUKn;kX!c2?9KLyg{X>#f`T-+k2Rql|9U=%cjRIu~m6 qtxlpkf*O5PCXb#6HTt97M19LHYV=Vn#e6UT126ysFaQGz4g3W~>mIoP literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_commandlink_glyph_45px.svg b/dlls/light.msstyles/blue_commandlink_glyph_45px.svg new file mode 100644 index 00000000000..b724ef6bd96 --- /dev/null +++ b/dlls/light.msstyles/blue_commandlink_glyph_45px.svg @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:45-32" width="45" height="225" version="1.1" viewBox="0 0 11.906 59.531" 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="m7.1834 3.175-0.57825 0.55959 1.8783 1.8217h-6.6314v0.79375h6.6314l-1.8824 1.8217 0.58235 0.55959 2.8707-2.7781z" fill="#3096fa"/> + <path d="m7.1834 15.081-0.57825 0.5596 1.8783 1.8217h-6.6314v0.79375h6.6314l-1.8824 1.8217 0.58235 0.55959 2.8707-2.7781z" fill="#3096fa"/> + <path d="m7.1834 26.988-0.57825 0.5596 1.8783 1.8217h-6.6314v0.79375h6.6314l-1.8824 1.8217 0.58235 0.55959 2.8707-2.7781z" fill="#2979ff"/> + <path d="m7.1834 50.8-0.57825 0.5596 1.8783 1.8217h-6.6314v0.79375h6.6314l-1.8824 1.8217 0.58235 0.55959 2.8707-2.7781z" fill="#3096fa"/> + <path d="m7.1834 38.894-0.57825 0.5596 1.8783 1.8217h-6.6314v0.79375h6.6314l-1.8824 1.8217 0.58235 0.55959 2.8707-2.7781z" fill="#aeaeae"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_groupbox.bmp b/dlls/light.msstyles/blue_groupbox.bmp new file mode 100644 index 0000000000000000000000000000000000000000..9ef6c2136a694370f4339982703425ade854f185 GIT binary patch literal 1898 zcmZ?r&0=Q&gDxOh1H@uLECR%g3<?a)K>7h2kiY={85kf4B=g_NJ*XH%2>}5XH2Jk_ z*UGP3w{8~@{{-Uy6k?DWJ6Ek*CAWV4`rSaYtAK2*K0$K^UM|QCpm{Ywv%&79hM6!6 zw{6?T4m9@%$lowAYSADwN6lqm7!3zViW&`v(QrU6TWFjfe$t?v1eNc5fw+PiW`oQC X)e)e&0*DoW=I#Mvs?<Z!`bQoBr@jye literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_groupbox.svg b/dlls/light.msstyles/blue_groupbox.svg new file mode 100644 index 00000000000..4354fac3d32 --- /dev/null +++ b/dlls/light.msstyles/blue_groupbox.svg @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:22-32" width="22" height="20" version="1.1" viewBox="0 0 5.8208 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 transform="translate(0,-1)"> + <rect x=".13229" y="1.1323" width="5.5563" height="5.0271" rx=".52917" ry=".52917" fill="none" stroke="#aeaeae" stroke-width=".26458"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_radiobutton_13px.bmp b/dlls/light.msstyles/blue_radiobutton_13px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..636992294934772b6821a1bdebbc8c625c46c738 GIT binary patch literal 5546 zcmeHLyG~m{5OowDO;V;KkOB#8B76}gMv7=6#YBqo5jIV#NCbxz)F}~M$3<FWSv(tr zD{9O)a9v>Y0f2a1kT&P+Biz?Qq@;j|D<-ouduDfb_K2M@^}hZhCBN_Z_Z#FnWCrpi z^(yrg`jwu?Fz|^~O8w9$rrv)19GLv0Vb?9F_4V}}WChZOTtW^Z)wQ*?iD=mF?rs<S zF6LX%#d^Ko59y(XZ-#!z5^*M0;~QIBTRd*;qaQI1#&HrlhZxV`G0wxc2RWf$U0r=g zoQ`826B`>FHAsPejTgX%#KghRJgbnS&CSi1j6v*v6tC?)z2*RHSs$L4KG?^Wm}Aaw zZ*TWv{sPiLPJQ&<wU4f2J9r+%PbcjI%m=QCwTqaq;w+QU2Uz17{W`9R`BRLk^YpWB z7<=&LXk+YRtsN6bU+^>cL!9v&9&jDR7FfqhrP2+%k2d|p2YFy(nI|wc?B9X-)Y_K$ z7+g?`FC#foO0PiLkV{b-K7_7{(ol?}V&P2}=3Gcilrlxc_KSs)9;xRtGs>S{BF^lg z@eMIMl*m!~foVV_M|D1)!HciyJm&TwCt6F6>Nw;vGy#82%neJ9YP^6iDk@IpiSwn8 z#QbZ?QH=K!@Qjxn74zu<j8%PbUY-s1u_Z=wRD2rj#ry@NBW4FBM=`#AAJ$Xtb90{3 z@HBkUv(T0tmG>a;D>I4l0q#R`6!(a@;U;jWQlpMCZ&h!Pb=K#=eP(t{9DTtra6i8} z8sLG)y0ea=Fy75`O1qTyu&*2BfmsuKAy3>F>rzVlTGvcI1{c&<%h{aoW>>CUr|rAW z<yF}^^vg~aI+3HmxR91#&KA!r<NcyO(nIaLV>8n4Iw6h{f9X06@zcUl_&E=p<fzKW z@eKajb@G_ogPc%b|8Nx75C^-(Jh68TW64pC7qCNO;$)sUAND*tTUH$Pm!176UfYtR z=SyP)ran9`>xcPcON`>^;$Sc4FA&!`TO5@fy>lPbQSB2rPdPiCv=8!^9OXU8`*KGo zfjbb(ilf&mt_j~Mq{+H4Z`KvI$2#kC;C{w-OdNf|k9d7QA&z1V^1y=>SVvJA@8&sa zYkwj~uVkKMHP!_<UuoDnpWxnR%-{Ktd;8WSPu7-PInnyow_fAX9kD|SiHyTpV{bih z`w^^(wZ8ShlZyry)YiBDu6>f;dc;gy_PO<~*KtkgQwX)>=tF$#9{@*D-uP$hN8`w_ z$HLJtC}N?viuI!rNX$&?M`NIf!@|)BDr_RR#C|l4y0IQ2M|J;qZ~M`k>V`+Qel(1V zTOy$!jibVzq<%Dvh+9ehXdD&x;4WhQXc!T<Z2f2)sXV%FkNs%i|4isP{;D6f*4omK z+VIAo)Q_4un@;LSZCK+M3H_*<vuXDA(SFp1HGW$^YUZQ*u^;{Se|w77*w~M6y{g3j H`quvf$~kDv literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_radiobutton_13px.svg b/dlls/light.msstyles/blue_radiobutton_13px.svg new file mode 100644 index 00000000000..41f2b6e976a --- /dev/null +++ b/dlls/light.msstyles/blue_radiobutton_13px.svg @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:13-32" width="13" height="104" version="1.1" viewBox="0 0 13 104" 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="m10 58.5a3.5 3.5 0 0 1-3.5 3.5 3.5 3.5 0 0 1-3.5-3.5 3.5 3.5 0 0 1 3.5-3.5 3.5 3.5 0 0 1 3.5 3.5z"/> + <g fill="none"> + <ellipse cx="6.5" cy="6.5" rx="6" ry="6" stroke="#aeaeae"/> + <ellipse cx="6.5" cy="19.5" rx="6" ry="6" stroke="#3096fa"/> + <ellipse cx="6.5" cy="32.5" rx="6" ry="6" stroke="#2979ff"/> + <ellipse cx="6.5" cy="45.5" rx="6" ry="6" stroke="#aeaeae"/> + <ellipse cx="6.5" cy="58.5" rx="6" ry="6" stroke="#aeaeae"/> + <ellipse cx="6.5" cy="71.5" rx="6" ry="6" stroke="#3096fa"/> + <ellipse cx="6.5" cy="84.5" rx="6" ry="6" stroke="#2979ff"/> + <ellipse cx="6.5" cy="97.5" rx="6" ry="6" stroke="#aeaeae"/> + </g> + <g> + <path d="m10 71.5a3.5 3.5 0 0 1-3.5 3.5 3.5 3.5 0 0 1-3.5-3.5 3.5 3.5 0 0 1 3.5-3.5 3.5 3.5 0 0 1 3.5 3.5z" fill="#3096fa"/> + <path d="m10 84.5a3.5 3.5 0 0 1-3.5 3.5 3.5 3.5 0 0 1-3.5-3.5 3.5 3.5 0 0 1 3.5-3.5 3.5 3.5 0 0 1 3.5 3.5z" fill="#2979ff"/> + <path d="m10 97.5a3.5 3.5 0 0 1-3.5 3.5 3.5 3.5 0 0 1-3.5-3.5 3.5 3.5 0 0 1 3.5-3.5 3.5 3.5 0 0 1 3.5 3.5z" fill="#aeaeae"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_radiobutton_16px.bmp b/dlls/light.msstyles/blue_radiobutton_16px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..9b8ffe570b308de67845223ad0c3d1d409f430ac GIT binary patch literal 8330 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 literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_radiobutton_16px.svg b/dlls/light.msstyles/blue_radiobutton_16px.svg new file mode 100644 index 00000000000..158279ee557 --- /dev/null +++ b/dlls/light.msstyles/blue_radiobutton_16px.svg @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:16-32" width="16" height="128" version="1.1" viewBox="0 0 16 128" 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="m13 72a5 5 0 0 1-5 5 5 5 0 0 1-5-5 5 5 0 0 1 5-5 5 5 0 0 1 5 5z"/> + <g fill="none"> + <circle cx="8" cy="8" r="7.5" stroke="#aeaeae"/> + <circle cx="8" cy="24" r="7.5" stroke="#3096fa"/> + <circle cx="8" cy="40" r="7.5" stroke="#2979ff"/> + <circle cx="8" cy="56" r="7.5" stroke="#aeaeae"/> + <circle cx="8" cy="72" r="7.5" stroke="#aeaeae"/> + <circle cx="8" cy="88" r="7.5" stroke="#3096fa"/> + <circle cx="8" cy="104" r="7.5" stroke="#2979ff"/> + <circle cx="8" cy="120" r="7.5" stroke="#aeaeae"/> + </g> + <g> + <path d="m13 88a5 5 0 0 1-5 5 5 5 0 0 1-5-5 5 5 0 0 1 5-5 5 5 0 0 1 5 5z" fill="#3096fa" stroke="#3096fa"/> + <path d="m13 104a5 5 0 0 1-5 5 5 5 0 0 1-5-5 5 5 0 0 1 5-5 5 5 0 0 1 5 5z" fill="#2979ff"/> + <path d="m13 120a5 5 0 0 1-5 5 5 5 0 0 1-5-5 5 5 0 0 1 5-5 5 5 0 0 1 5 5z" fill="#aeaeae"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_radiobutton_25px.bmp b/dlls/light.msstyles/blue_radiobutton_25px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..cab87f62316ed9d409412a5b32a1c30b394a6e1b GIT binary patch literal 20138 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 literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_radiobutton_25px.svg b/dlls/light.msstyles/blue_radiobutton_25px.svg new file mode 100644 index 00000000000..f105f57095c --- /dev/null +++ b/dlls/light.msstyles/blue_radiobutton_25px.svg @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:25-32" width="25" height="200" version="1.1" viewBox="0 0 25 200" 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="none" stroke-width="2"> + <ellipse cx="12.5" cy="12.5" rx="11.5" ry="11.5" stroke="#aeaeae"/> + <ellipse cx="12.5" cy="37.5" rx="11.5" ry="11.5" stroke="#3096fa"/> + <ellipse cx="12.5" cy="62.5" rx="11.5" ry="11.5" stroke="#2979ff"/> + <ellipse cx="12.5" cy="87.5" rx="11.5" ry="11.5" stroke="#aeaeae"/> + <ellipse cx="12.5" cy="112.5" rx="11.5" ry="11.5" stroke="#aeaeae"/> + <ellipse cx="12.5" cy="137.5" rx="11.5" ry="11.5" stroke="#3096fa"/> + <ellipse cx="12.5" cy="162.5" rx="11.5" ry="11.5" stroke="#2979ff"/> + <ellipse cx="12.5" cy="187.5" rx="11.5" ry="11.5" stroke="#aeaeae"/> + </g> + <path d="m20 112.5a7.5 7.5 0 0 1-7.5 7.5 7.5 7.5 0 0 1-7.5-7.5 7.5 7.5 0 0 1 7.5-7.5 7.5 7.5 0 0 1 7.5 7.5z"/> + <g> + <path d="m20 137.5a7.5 7.5 0 0 1-7.5 7.5 7.5 7.5 0 0 1-7.5-7.5 7.5 7.5 0 0 1 7.5-7.5 7.5 7.5 0 0 1 7.5 7.5z" fill="#3096fa"/> + <path d="m20 162.5a7.5 7.5 0 0 1-7.5 7.5 7.5 7.5 0 0 1-7.5-7.5 7.5 7.5 0 0 1 7.5-7.5 7.5 7.5 0 0 1 7.5 7.5z" fill="#2979ff"/> + <path d="m20 187.5a7.5 7.5 0 0 1-7.5 7.5 7.5 7.5 0 0 1-7.5-7.5 7.5 7.5 0 0 1 7.5-7.5 7.5 7.5 0 0 1 7.5 7.5z" fill="#aeaeae"/> + </g> +</svg> diff --git a/dlls/light.msstyles/light.rc b/dlls/light.msstyles/light.rc index dccda341b7c..cc5b371da8c 100644 --- a/dlls/light.msstyles/light.rc +++ b/dlls/light.msstyles/light.rc @@ -179,8 +179,157 @@ BLUE_INI TEXTFILE "\r\n; Flat menus\r\n" "FlatMenus = true\r\n" + +"\r\n; Button\r\n" +"[Button.Pushbutton]\r\n" +"BgType = ImageFile\r\n" +"SizingMargins = 8, 8, 8, 8\r\n" +"SizingType = Stretch\r\n" +"ContentMargins = 3, 3, 3, 3\r\n" +"ImageFile = blue_button.bmp\r\n" +"ImageCount = 6\r\n" +"ImageLayout = Vertical\r\n" +"TextColor = 0 0 0\r\n" +"MinSize = 10, 5\r\n" + +"[Button.Pushbutton(Pressed)]\r\n" +"TextColor = 255 255 255\r\n" + +"[Button.Pushbutton(Disabled)]\r\n" +"TextColor = 166 166 166\r\n" + +"[Button.Checkbox]\r\n" +"BgType = ImageFile\r\n" +"ImageLayout = Vertical\r\n" +"SizingType = TrueSize\r\n" +"SizingMargins = 0, 0, 0, 0\r\n" +"ContentMargins = 0, 0, 0, 0\r\n" +"ImageCount = 12\r\n" +"MirrorImage = False\r\n" +"ImageSelectType = Dpi\r\n" +"UniformSizing = True\r\n" +"Transparent = True\r\n" +"ImageFile1 = blue_checkbox_13px.bmp\r\n" +"ImageFile2 = blue_checkbox_16px.bmp\r\n" +"ImageFile3 = blue_checkbox_25px.bmp\r\n" +"MinDpi1 = 96\r\n" +"MinDpi2 = 118\r\n" +"MinDpi3 = 185\r\n" + +"[Button.Checkbox(Checkeddisabled)]\r\n" +"TextColor = 189 189 189\r\n" + +"[Button.Checkbox(Uncheckeddisabled)]\r\n" +"TextColor = 189 189 189\r\n" + +"[Button.Checkbox(Mixeddisabled)]\r\n" +"TextColor = 189 189 189\r\n" + +"[Button.Radiobutton]\r\n" +"BgType = ImageFile\r\n" +"ImageLayout = Vertical\r\n" +"Transparent = True\r\n" +"SizingType = TrueSize\r\n" +"SizingMargins = 0, 0, 0, 0\r\n" +"ContentMargins = 0, 0, 0, 0\r\n" +"ImageCount = 8\r\n" +"ImageSelectType = Dpi\r\n" +"UniformSizing = True\r\n" +"ImageFile1 = blue_radiobutton_13px.bmp\r\n" +"ImageFile2 = blue_radiobutton_16px.bmp\r\n" +"ImageFile3 = blue_radiobutton_25px.bmp\r\n" +"MinDpi1 = 96\r\n" +"MinDpi2 = 118\r\n" +"MinDpi3 = 185\r\n" + +"[Button.Radiobutton(Checkeddisabled)]\r\n" +"TextColor = 189 189 189\r\n" + +"[Button.Radiobutton(Uncheckeddisabled)]\r\n" +"TextColor = 189 189 189\r\n" + +"[Button.Groupbox]\r\n" +"TextColor = 0 0 0\r\n" +"BgType = ImageFile\r\n" +"SizingMargins = 5, 5, 5, 5\r\n" +"SizingType = Tile\r\n" +"ImageFile = blue_groupbox.bmp\r\n" +"BorderOnly = True\r\n" +"Transparent = True\r\n" + +"[Button.Commandlink]\r\n" +"BgType = ImageFile\r\n" +"BorderSize = 0\r\n" +"ContentMargins = 7, 7, 10, 10\r\n" +"Font = Tahoma, 10\r\n" +"BodyFont = Tahoma, 8\r\n" +"ImageFile = blue_commandlink.bmp\r\n" +"ImageCount = 6\r\n" +"ImageLayout = Vertical\r\n" +"SizingType = Stretch\r\n" +"SizingMargins = 5, 5, 24, 24\r\n" +"Transparent = True\r\n" +"TextColor = 0 0 0\r\n" +"MinSize = 10, 5\r\n" + +"[Button.Commandlink(Hot)]\r\n" +"TextColor = 48 150 250\r\n" + +"[Button.Commandlink(Pressed)]\r\n" +"TextColor = 41 121 255\r\n" + +"[Button.Commandlink(Disabled)]\r\n" +"TextColor = 174 174 174\r\n" + +"[Button.CommandlinkGlyph]\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" +"Transparent = True\r\n" +"UniformSizing = True\r\n" +"ImageFile1 = blue_commandlink_glyph_30px.bmp\r\n" +"ImageFile2 = blue_commandlink_glyph_45px.bmp\r\n" +"MinDpi1 = 96\r\n" +"MinDpi2 = 144\r\n" } +/* Button */ +/* @makedep: blue_button.bmp */ +BLUE_BUTTON_BMP BITMAP "blue_button.bmp" + +/* @makedep: blue_checkbox_13px.bmp */ +BLUE_CHECKBOX_13PX_BMP BITMAP "blue_checkbox_13px.bmp" + +/* @makedep: blue_checkbox_16px.bmp */ +BLUE_CHECKBOX_16PX_BMP BITMAP "blue_checkbox_16px.bmp" + +/* @makedep: blue_checkbox_25px.bmp */ +BLUE_CHECKBOX_25PX_BMP BITMAP "blue_checkbox_25px.bmp" + +/* @makedep: blue_radiobutton_13px.bmp */ +BLUE_RADIOBUTTON_13PX_BMP BITMAP "blue_radiobutton_13px.bmp" + +/* @makedep: blue_radiobutton_16px.bmp */ +BLUE_RADIOBUTTON_16PX_BMP BITMAP "blue_radiobutton_16px.bmp" + +/* @makedep: blue_radiobutton_25px.bmp */ +BLUE_RADIOBUTTON_25PX_BMP BITMAP "blue_radiobutton_25px.bmp" + +/* @makedep: blue_groupbox.bmp */ +BLUE_GROUPBOX_BMP BITMAP "blue_groupbox.bmp" + +/* @makedep: blue_commandlink.bmp */ +BLUE_COMMANDLINK_BMP BITMAP "blue_commandlink.bmp" + +/* @makedep: blue_commandlink_glyph_30px.bmp */ +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" + /* File version */ #define WINE_FILEDESCRIPTION_STR "Light Theme" #define WINE_FILENAME_STR "light.msstyles" -- 2.30.2

1 0

[PATCH 5/5] nsi/tests: Add tests for the NDIS ifinfo table.
by Huw Davies 24 Jun '21

24 Jun '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/nsi/tests/Makefile.in | 5 ++ dlls/nsi/tests/nsi.c | 146 +++++++++++++++++++++++++++++++++++++ include/ifmib.h | 72 ++++++++++++++++++ 3 files changed, 223 insertions(+) create mode 100644 dlls/nsi/tests/Makefile.in create mode 100644 dlls/nsi/tests/nsi.c diff --git a/dlls/nsi/tests/Makefile.in b/dlls/nsi/tests/Makefile.in new file mode 100644 index 00000000000..98129935198 --- /dev/null +++ b/dlls/nsi/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = nsi.dll +IMPORTS = nsi uuid iphlpapi + +C_SRCS = \ + nsi.c diff --git a/dlls/nsi/tests/nsi.c b/dlls/nsi/tests/nsi.c new file mode 100644 index 00000000000..96806e444de --- /dev/null +++ b/dlls/nsi/tests/nsi.c @@ -0,0 +1,146 @@ +/* + * Network Store Interface tests + * + * Copyright 2021 Huw Davies + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "winsock2.h" +#include "winternl.h" +#include "ws2ipdef.h" +#include "iphlpapi.h" +#include "netioapi.h" +#include "iptypes.h" +#include "netiodef.h" + +#include "wine/test.h" + +static int bounded( ULONG64 val, ULONG64 lo, ULONG64 hi ) +{ + return lo <= val && val <= hi; +} + +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), + sizeof(struct nsi_ndis_ifinfo_rw) }; + struct nsi_ndis_ifinfo_rw *rw_tbl; + struct nsi_ndis_ifinfo_dynamic *dyn_tbl, *dyn_tbl_2; + struct nsi_ndis_ifinfo_static *stat_tbl; + DWORD err, count, i, rw_size; + NET_LUID *luid_tbl, *luid_tbl_2; + MIB_IF_TABLE2 *table; + + /* Contents of GetIfTable2() keyed by luids */ + + 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]; + + err = GetIfTable2( &table ); + ok( !err, "got %d\n", err ); + ok( table->NumEntries == count, "table entries %d count %d\n", table->NumEntries, count ); + + /* Grab the dyn table again to provide an upper bound for the stats returned from GetIfTable2(). + (The luids must be retrieved again otherwise NsiAllocateAndGetTable() fails). */ + err = NsiAllocateAndGetTable( 1, &NPI_MS_NDIS_MODULEID, NSI_NDIS_IFINFO_TABLE, (void **)&luid_tbl_2, sizeof(*luid_tbl_2), + NULL, 0, (void **)&dyn_tbl_2, sizeof(*dyn_tbl_2), + NULL, 0, &count, 0 ); + ok( !err, "got %d\n", err ); + ok( table->NumEntries == count, "table entries %d count %d\n", table->NumEntries, count ); + + for (i = 0; i < count; i++) + { + MIB_IF_ROW2 *row = table->Table + i; + NET_LUID *luid = luid_tbl + i; + struct nsi_ndis_ifinfo_rw *rw = (struct nsi_ndis_ifinfo_rw *)((BYTE *)rw_tbl + i * rw_size); + struct nsi_ndis_ifinfo_dynamic *dyn = dyn_tbl + i, *dyn_2 = dyn_tbl_2 + i; + struct nsi_ndis_ifinfo_static *stat = stat_tbl + i; + + ok( row->InterfaceLuid.Value == luid->Value, "%d: mismatch\n", i ); + ok( row->InterfaceIndex == stat->if_index, "%d: mismatch\n", i ); + ok( IsEqualGUID( &row->InterfaceGuid, &stat->if_guid ), "%d: mismatch\n", i ); + ok( !memcmp( row->Alias, rw->alias.String, rw->alias.Length ), "%d: mismatch\n", i ); + ok( lstrlenW( row->Alias ) * 2 == rw->alias.Length, "%d: mismatch\n", i ); + ok( !memcmp( row->Description, stat->descr.String, sizeof(row->Description) ), "%d: mismatch\n", i ); + ok( lstrlenW( row->Description ) * 2 == stat->descr.Length, "%d: mismatch\n", i ); + ok( row->PhysicalAddressLength == rw->phys_addr.Length, "%d: mismatch\n", i ); + ok( !memcmp( row->PhysicalAddress, rw->phys_addr.Address, IF_MAX_PHYS_ADDRESS_LENGTH ), "%d: mismatch\n", i ); + ok( row->PhysicalAddressLength == stat->perm_phys_addr.Length, "%d: mismatch\n", i ); + ok( !memcmp( row->PermanentPhysicalAddress, stat->perm_phys_addr.Address, IF_MAX_PHYS_ADDRESS_LENGTH ), "%d: mismatch\n", i ); + ok( row->Mtu == dyn->mtu, "%d: mismatch\n", i ); + ok( row->Type == stat->type, "%d: mismatch\n", i ); + /* TunnelType */ + ok( row->MediaType == stat->media_type, "%d: mismatch\n", i ); + ok( row->PhysicalMediumType == stat->phys_medium_type, "%d: mismatch\n", i ); + ok( row->AccessType == stat->access_type, "%d: mismatch\n", i ); + /* DirectionType */ + ok( row->InterfaceAndOperStatusFlags.HardwareInterface == stat->flags.hw, "%d: mismatch\n", i ); + ok( row->InterfaceAndOperStatusFlags.FilterInterface == stat->flags.filter, "%d: mismatch\n", i ); + ok( row->InterfaceAndOperStatusFlags.ConnectorPresent == stat->conn_present, "%d: mismatch\n", i ); + /* NotAuthenticated */ + ok( row->InterfaceAndOperStatusFlags.NotMediaConnected == dyn->flags.not_media_conn, "%d: mismatch\n", i ); + /* Paused */ + /* LowPower */ + /* EndPointInterface */ + ok( row->OperStatus == dyn->oper_status, "%d: mismatch\n", i ); + ok( row->AdminStatus == rw->admin_status, "%d: mismatch\n", i ); + ok( row->MediaConnectState == dyn->media_conn_state, "%d: status mismatch\n", i ); + ok( IsEqualGUID( &row->NetworkGuid, &rw->network_guid ), "%d: mismatch\n", i ); + ok( row->ConnectionType == stat->conn_type, "%d: mismatch\n", i ); + if (dyn->xmit_speed == ~0ULL) dyn->xmit_speed = 0; + ok( row->TransmitLinkSpeed == dyn->xmit_speed, "%d: mismatch\n", i ); + if (dyn->rcv_speed == ~0ULL) dyn->rcv_speed = 0; + ok( row->ReceiveLinkSpeed == dyn->rcv_speed, "%d: mismatch\n", i ); + ok( bounded( row->InOctets, dyn->in_octets, dyn_2->in_octets ), "%d: mismatch\n", i ); + ok( bounded( row->InUcastPkts, dyn->in_ucast_pkts, dyn_2->in_ucast_pkts ), "%d: mismatch\n", i ); + ok( bounded( row->InNUcastPkts, dyn->in_mcast_pkts + dyn->in_bcast_pkts, + dyn_2->in_mcast_pkts + dyn_2->in_bcast_pkts ), "%d: mismatch\n", i ); + ok( bounded( row->InDiscards, dyn->in_discards, dyn_2->in_discards ), "%d: mismatch\n", i ); + ok( bounded( row->InErrors, dyn->in_errors, dyn_2->in_errors ), "%d: mismatch\n", i ); + /* InUnknownProtos */ + ok( bounded( row->InUcastOctets, dyn->in_ucast_octs, dyn_2->in_ucast_octs ), "%d: mismatch\n", i ); + ok( bounded( row->InMulticastOctets, dyn->in_mcast_octs, dyn_2->in_mcast_octs ), "%d: mismatch\n", i ); + ok( bounded( row->InBroadcastOctets, dyn->in_bcast_octs, dyn_2->in_bcast_octs ), "%d: mismatch\n", i ); + ok( bounded( row->OutOctets, dyn->out_octets, dyn_2->out_octets ), "%d: mismatch\n", i ); + ok( bounded( row->OutUcastPkts, dyn->out_ucast_pkts, dyn_2->out_ucast_pkts ), "%d: mismatch\n", i ); + ok( bounded( row->OutNUcastPkts, dyn->out_mcast_pkts + dyn->out_bcast_pkts, + dyn_2->out_mcast_pkts + dyn_2->out_bcast_pkts ), "%d: mismatch\n", i ); + ok( bounded( row->OutDiscards, dyn->out_discards, dyn_2->out_discards ), "%d: mismatch\n", i ); + ok( bounded( row->OutErrors, dyn->out_errors, dyn_2->out_errors ), "%d: mismatch\n", i ); + ok( bounded( row->OutUcastOctets, dyn->out_ucast_octs, dyn_2->out_ucast_octs ), "%d: mismatch\n", i ); + ok( bounded( row->OutMulticastOctets, dyn->out_mcast_octs, dyn_2->out_mcast_octs ), "%d: mismatch\n", i ); + ok( bounded( row->OutBroadcastOctets, dyn->out_bcast_octs, dyn_2->out_bcast_octs ), "%d: mismatch\n", i ); + /* OutQLen */ + } + + FreeMibTable( table ); + NsiFreeTable( luid_tbl_2, NULL, dyn_tbl_2, NULL ); + NsiFreeTable( luid_tbl, rw_tbl, dyn_tbl, stat_tbl ); +} + +START_TEST( nsi ) +{ + test_ndis_ifinfo(); +} diff --git a/include/ifmib.h b/include/ifmib.h index 440ed144037..83f2c090945 100644 --- a/include/ifmib.h +++ b/include/ifmib.h @@ -66,5 +66,77 @@ typedef struct _MIB_IFTABLE MIB_IFROW table[1]; } MIB_IFTABLE, *PMIB_IFTABLE; +/* Undocumented NSI NDIS tables */ +#define NSI_NDIS_IFINFO_TABLE 0 +#define NSI_NDIS_INDEX_LUID_TABLE 2 + +struct nsi_ndis_ifinfo_rw +{ + GUID network_guid; + DWORD admin_status; + IF_COUNTED_STRING alias; /* .Length in bytes not including '\0' */ + IF_PHYSICAL_ADDRESS phys_addr; + USHORT pad; + IF_COUNTED_STRING name2; + DWORD unk; +}; + +struct nsi_ndis_ifinfo_dynamic +{ + DWORD oper_status; + struct + { + DWORD unk : 1; + DWORD not_media_conn : 1; + DWORD unk2 : 30; + } flags; + DWORD media_conn_state; + DWORD unk; + DWORD mtu; + ULONG64 xmit_speed; + ULONG64 rcv_speed; + ULONG64 in_errors; + ULONG64 in_discards; + ULONG64 out_errors; + ULONG64 out_discards; + ULONG64 unk2; + ULONG64 in_octets; + ULONG64 in_ucast_pkts; + ULONG64 in_mcast_pkts; + ULONG64 in_bcast_pkts; + ULONG64 out_octets; + ULONG64 out_ucast_pkts; + ULONG64 out_mcast_pkts; + ULONG64 out_bcast_pkts; + ULONG64 unk3[2]; + ULONG64 in_ucast_octs; + ULONG64 in_mcast_octs; + ULONG64 in_bcast_octs; + ULONG64 out_ucast_octs; + ULONG64 out_mcast_octs; + ULONG64 out_bcast_octs; + ULONG64 unk4; +}; + +struct nsi_ndis_ifinfo_static +{ + DWORD if_index; + IF_COUNTED_STRING descr; + DWORD type; + DWORD access_type; + DWORD unk; + DWORD conn_type; + GUID if_guid; + USHORT conn_present; + IF_PHYSICAL_ADDRESS perm_phys_addr; + struct + { + DWORD hw : 1; + DWORD filter : 1; + DWORD unk : 30; + } flags; + DWORD media_type; + DWORD phys_medium_type; +}; #endif /* __WINE_IFMIB_H */ -- 2.23.0

1 0

[PATCH 4/5] nsi: Add stub implementations of NsiAllocateAndGetTable() and NsiFreeTable().
by Huw Davies 24 Jun '21

24 Jun '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/nsi/Makefile.in | 3 +++ dlls/nsi/nsi.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ dlls/nsi/nsi.spec | 4 ++-- include/netiodef.h | 6 ++++++ 4 files changed, 55 insertions(+), 2 deletions(-) create mode 100644 dlls/nsi/nsi.c diff --git a/dlls/nsi/Makefile.in b/dlls/nsi/Makefile.in index 634c4011ed9..68126cab6c6 100644 --- a/dlls/nsi/Makefile.in +++ b/dlls/nsi/Makefile.in @@ -2,3 +2,6 @@ MODULE = nsi.dll IMPORTLIB = nsi EXTRADLLFLAGS = -mno-cygwin + +C_SRCS = \ + nsi.c diff --git a/dlls/nsi/nsi.c b/dlls/nsi/nsi.c new file mode 100644 index 00000000000..3d6429a9113 --- /dev/null +++ b/dlls/nsi/nsi.c @@ -0,0 +1,44 @@ +/* + * Network Store Interface + * + * Copyright 2021 Huw Davies + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#include "winsock2.h" +#include "winternl.h" +#include "ws2ipdef.h" +#include "iphlpapi.h" +#include "netioapi.h" +#include "iptypes.h" +#include "netiodef.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(nsi); + +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 ) +{ + FIXME( "%d %p %d %p %d %p %d %p %d %p %d %p %d: stub\n", unk, module, table, key_data, key_size, + rw_data, rw_size, dynamic_data, dynamic_size, static_data, static_size, count, unk2 ); + 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 2d500d30e94..fc2db9e35c1 100644 --- a/dlls/nsi/nsi.spec +++ b/dlls/nsi/nsi.spec @@ -1,5 +1,5 @@ @ stub NsiAllocateAndGetPersistentDataWithMaskTable -@ stub NsiAllocateAndGetTable +@ stdcall NsiAllocateAndGetTable(long ptr long ptr long ptr long ptr long ptr long ptr long) @ stub NsiCancelChangeNotification @ stub NsiDeregisterChangeNotification @ stub NsiDeregisterChangeNotificationEx @@ -7,7 +7,7 @@ @ stub NsiEnumerateObjectsAllParametersEx @ stub NsiEnumerateObjectsAllPersistentParametersWithMask @ stub NsiFreePersistentDataWithMaskTable -@ stub NsiFreeTable +@ stdcall NsiFreeTable(ptr ptr ptr ptr) @ stub NsiGetAllParameters @ stub NsiGetAllParametersEx @ stub NsiGetAllPersistentParametersWithMask diff --git a/include/netiodef.h b/include/netiodef.h index 3089685bef1..2bc05399b63 100644 --- a/include/netiodef.h +++ b/include/netiodef.h @@ -96,4 +96,10 @@ DEFINE_NPI_MS_MODULEID( NPI_MS_NDIS_MODULEID, 0x11 ); #undef _U #undef __U +/* Undocumented Nsi api */ +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 ); +void WINAPI NsiFreeTable( void *key_data, void *rw_data, void *dynamic_data, void *static_data ); + #endif /* __WINE_NETIODEF_H */ -- 2.23.0

1 0

[PATCH 3/5] nsi: Add a stub dll.
by Huw Davies 24 Jun '21

24 Jun '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/nsi/Makefile.in | 4 ++++ dlls/nsi/nsi.spec | 26 ++++++++++++++++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 dlls/nsi/Makefile.in create mode 100644 dlls/nsi/nsi.spec diff --git a/dlls/nsi/Makefile.in b/dlls/nsi/Makefile.in new file mode 100644 index 00000000000..634c4011ed9 --- /dev/null +++ b/dlls/nsi/Makefile.in @@ -0,0 +1,4 @@ +MODULE = nsi.dll +IMPORTLIB = nsi + +EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/nsi/nsi.spec b/dlls/nsi/nsi.spec new file mode 100644 index 00000000000..2d500d30e94 --- /dev/null +++ b/dlls/nsi/nsi.spec @@ -0,0 +1,26 @@ +@ stub NsiAllocateAndGetPersistentDataWithMaskTable +@ stub NsiAllocateAndGetTable +@ stub NsiCancelChangeNotification +@ stub NsiDeregisterChangeNotification +@ stub NsiDeregisterChangeNotificationEx +@ stub NsiEnumerateObjectsAllParameters +@ stub NsiEnumerateObjectsAllParametersEx +@ stub NsiEnumerateObjectsAllPersistentParametersWithMask +@ stub NsiFreePersistentDataWithMaskTable +@ stub NsiFreeTable +@ stub NsiGetAllParameters +@ stub NsiGetAllParametersEx +@ stub NsiGetAllPersistentParametersWithMask +@ stub NsiObjectSecurity +@ stub NsiGetParameter +@ stub NsiGetParameterEx +@ stub NsiRegisterChangeNotification +@ stub NsiRegisterChangeNotificationEx +@ stub NsiRequestChangeNotification +@ stub NsiRequestChangeNotificationEx +@ stub NsiSetAllParameters +@ stub NsiSetAllParametersEx +@ stub NsiSetAllPersistentParametersWithMask +@ stub NsiSetObjectSecurity +@ stub NsiSetParameter +@ stub NsiSetParameterEx -- 2.23.0

1 0

[PATCH 1/5] include: Add netiodef.h.
by Huw Davies 24 Jun '21

24 Jun '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- include/Makefile.in | 1 + include/netiodef.h | 68 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 69 insertions(+) create mode 100644 include/netiodef.h 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..4d8d469b138 --- /dev/null +++ b/include/netiodef.h @@ -0,0 +1,68 @@ +/* + * 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; + } DUMMYUNIONNAME; +} NPI_MODULEID; + +typedef const NPI_MODULEID *PNPI_MODULEID; + +#ifdef NONAMELESSUNION +#define _U(x) (x).u +#else +#define _U(x) (x) +#endif + +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( _U(*mod1).Guid, _U(*mod2).Guid ); +#else + return IsEqualGUID( &_U(*mod1).Guid, &_U(*mod2).Guid ); +#endif + } + else if (mod1->Type == MIT_IF_LUID) + return _U(*mod1).IfLuid.HighPart == _U(*mod2).IfLuid.HighPart && + _U(*mod1).IfLuid.LowPart == _U(*mod2).IfLuid.LowPart; + } + return FALSE; +} + +#undef _U + +#endif /* __WINE_NETIODEF_H */ -- 2.23.0

1 0

[PATCH vkd3d v2] tests: Add offset tests to test_uav_counters().
by Conor McCarthy 24 Jun '21

24 Jun '21

Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- tests/d3d12.c | 226 +++++++++++++++++++++++++++----------------------- 1 file changed, 123 insertions(+), 103 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index f289a10d..ce6d6b36 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -21671,6 +21671,8 @@ static void test_uav_counters(void) 0x00000001, 0x0010000a, 0x00000000, 0x00004001, 0x00000000, 0x0010001a, 0x00000000, 0x0100003e, }; + static const unsigned int counter_offsets[] = {0, 1, 255}; + if (!init_compute_test_context(&context)) return; device = context.device; @@ -21694,9 +21696,6 @@ static void test_uav_counters(void) hr = create_root_signature(device, &root_signature_desc, &context.root_signature); ok(SUCCEEDED(hr), "Failed to create root signature, hr %#x.\n", hr); - context.pipeline_state = create_compute_pipeline_state(device, context.root_signature, - shader_bytecode(cs_producer_code, sizeof(cs_producer_code))); - descriptor_heap = create_gpu_descriptor_heap(device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 3); buffer = create_default_buffer(device, 1024, @@ -21706,120 +21705,141 @@ static void test_uav_counters(void) counter_buffer = create_default_buffer(device, 1024, D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_DEST); - memset(&uav_desc, 0, sizeof(uav_desc)); - uav_desc.Format = DXGI_FORMAT_UNKNOWN; - uav_desc.ViewDimension = D3D12_UAV_DIMENSION_BUFFER; - uav_desc.Buffer.NumElements = 256; - uav_desc.Buffer.StructureByteStride = sizeof(uint32_t); - uav_desc.Buffer.Flags = D3D12_BUFFER_UAV_FLAG_NONE; - ID3D12Device_CreateUnorderedAccessView(device, buffer, counter_buffer, &uav_desc, - get_cpu_descriptor_handle(&context, descriptor_heap, 0)); - ID3D12Device_CreateUnorderedAccessView(device, out_buffer, NULL, &uav_desc, - get_cpu_descriptor_handle(&context, descriptor_heap, 1)); + for (i = 0; i < ARRAY_SIZE(counter_offsets); ++i) + { + unsigned int j; - counter = 0; - upload_buffer_data(counter_buffer, 0, sizeof(counter), &counter, queue, command_list); - reset_command_list(command_list, context.allocator); - transition_sub_resource_state(command_list, counter_buffer, 0, - D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_UNORDERED_ACCESS); + vkd3d_test_set_context("Offset %u", counter_offsets[i]); - /* produce */ - ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); - ID3D12GraphicsCommandList_SetComputeRootSignature(command_list, context.root_signature); - ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, 1, &descriptor_heap); - ID3D12GraphicsCommandList_SetComputeRootDescriptorTable(command_list, 0, - ID3D12DescriptorHeap_GetGPUDescriptorHandleForHeapStart(descriptor_heap)); - ID3D12GraphicsCommandList_Dispatch(command_list, 16, 1, 1); + context.pipeline_state = create_compute_pipeline_state(device, context.root_signature, + shader_bytecode(cs_producer_code, sizeof(cs_producer_code))); - counter = read_uav_counter(&context, counter_buffer, 0); - ok(counter == 64, "Got unexpected value %u.\n", counter); - transition_sub_resource_state(command_list, buffer, 0, - D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE); - get_buffer_readback_with_command_list(buffer, DXGI_FORMAT_R32_UINT, &rb, queue, command_list); - memcpy(id, rb.data, 64 * sizeof(*id)); - release_resource_readback(&rb); - qsort(id, 64, sizeof(*id), compare_id); - for (i = 0; i < 64; ++i) - { - if (id[i] != i) - break; - } - ok(i == 64, "Got unexpected id %u at %u.\n", id[i], i); + memset(&uav_desc, 0, sizeof(uav_desc)); + uav_desc.Format = DXGI_FORMAT_UNKNOWN; + uav_desc.ViewDimension = D3D12_UAV_DIMENSION_BUFFER; + uav_desc.Buffer.NumElements = 256; + uav_desc.Buffer.StructureByteStride = sizeof(uint32_t); + uav_desc.Buffer.Flags = D3D12_BUFFER_UAV_FLAG_NONE; + uav_desc.Buffer.CounterOffsetInBytes = counter_offsets[i] * sizeof(uint32_t); + ID3D12Device_CreateUnorderedAccessView(device, buffer, counter_buffer, &uav_desc, + get_cpu_descriptor_handle(&context, descriptor_heap, 0)); + ID3D12Device_CreateUnorderedAccessView(device, out_buffer, NULL, &uav_desc, + get_cpu_descriptor_handle(&context, descriptor_heap, 1)); + + counter = 0; + upload_buffer_data(counter_buffer, counter_offsets[i] * sizeof(uint32_t), + sizeof(counter), &counter, queue, command_list); + reset_command_list(command_list, context.allocator); + transition_sub_resource_state(command_list, counter_buffer, 0, + D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_UNORDERED_ACCESS); - reset_command_list(command_list, context.allocator); - transition_sub_resource_state(command_list, buffer, 0, - D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_UNORDERED_ACCESS); + /* produce */ + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); + ID3D12GraphicsCommandList_SetComputeRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, 1, &descriptor_heap); + ID3D12GraphicsCommandList_SetComputeRootDescriptorTable(command_list, 0, + ID3D12DescriptorHeap_GetGPUDescriptorHandleForHeapStart(descriptor_heap)); + ID3D12GraphicsCommandList_Dispatch(command_list, 16, 1, 1); - ID3D12PipelineState_Release(context.pipeline_state); - context.pipeline_state = create_compute_pipeline_state(device, context.root_signature, - shader_bytecode(cs_consumer_code, sizeof(cs_consumer_code))); + counter = read_uav_counter(&context, counter_buffer, uav_desc.Buffer.CounterOffsetInBytes); + ok(counter == 64, "Got unexpected value %u.\n", counter); + transition_sub_resource_state(command_list, buffer, 0, + D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE); + get_buffer_readback_with_command_list(buffer, DXGI_FORMAT_R32_UINT, &rb, queue, command_list); + memcpy(id, rb.data, 64 * sizeof(*id)); + release_resource_readback(&rb); + qsort(id, 64, sizeof(*id), compare_id); + for (j = 0; j < 64; ++j) + { + if (id[j] != j) + break; + } + ok(j == 64, "Got unexpected id %u at %u.\n", id[j], j); - /* consume */ - ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); - ID3D12GraphicsCommandList_SetComputeRootSignature(command_list, context.root_signature); - ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, 1, &descriptor_heap); - ID3D12GraphicsCommandList_SetComputeRootDescriptorTable(command_list, 0, - ID3D12DescriptorHeap_GetGPUDescriptorHandleForHeapStart(descriptor_heap)); - ID3D12GraphicsCommandList_Dispatch(command_list, 16, 1, 1); + reset_command_list(command_list, context.allocator); + transition_sub_resource_state(command_list, buffer, 0, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_UNORDERED_ACCESS); - transition_sub_resource_state(command_list, out_buffer, 0, - D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE); - counter = read_uav_counter(&context, counter_buffer, 0); - ok(!counter, "Got unexpected value %u.\n", counter); - get_buffer_readback_with_command_list(out_buffer, DXGI_FORMAT_R32_UINT, &rb, queue, command_list); - memcpy(id, rb.data, 64 * sizeof(*id)); - release_resource_readback(&rb); - qsort(id, 64, sizeof(*id), compare_id); - for (i = 0; i < 64; ++i) - { - if (id[i] != i) - break; - } - ok(i == 64, "Got unexpected id %u at %u.\n", id[i], i); + ID3D12PipelineState_Release(context.pipeline_state); + context.pipeline_state = create_compute_pipeline_state(device, context.root_signature, + shader_bytecode(cs_consumer_code, sizeof(cs_consumer_code))); - reset_command_list(command_list, context.allocator); - transition_sub_resource_state(command_list, counter_buffer, 0, - D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_DEST); - transition_sub_resource_state(command_list, buffer, 0, - D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_DEST); - transition_sub_resource_state(command_list, out_buffer, 0, - D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_UNORDERED_ACCESS); + /* consume */ + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); + ID3D12GraphicsCommandList_SetComputeRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, 1, &descriptor_heap); + ID3D12GraphicsCommandList_SetComputeRootDescriptorTable(command_list, 0, + ID3D12DescriptorHeap_GetGPUDescriptorHandleForHeapStart(descriptor_heap)); + ID3D12GraphicsCommandList_Dispatch(command_list, 16, 1, 1); - /* produce on CPU */ - counter = 8; - for (i = 0; i < counter; ++i) - id[i] = 0xdeadbeef; - upload_buffer_data(buffer, 0, counter * sizeof(*id), id, queue, command_list); - reset_command_list(command_list, context.allocator); - upload_buffer_data(counter_buffer, 0, sizeof(counter), &counter, queue, command_list); - reset_command_list(command_list, context.allocator); + transition_sub_resource_state(command_list, out_buffer, 0, + D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE); + counter = read_uav_counter(&context, counter_buffer, uav_desc.Buffer.CounterOffsetInBytes); + ok(!counter, "Got unexpected value %u.\n", counter); + get_buffer_readback_with_command_list(out_buffer, DXGI_FORMAT_R32_UINT, &rb, queue, command_list); + memcpy(id, rb.data, 64 * sizeof(*id)); + release_resource_readback(&rb); + qsort(id, 64, sizeof(*id), compare_id); + for (j = 0; j < 64; ++j) + { + if (id[j] != j) + break; + } + ok(j == 64, "Got unexpected id %u at %u.\n", id[j], j); - transition_sub_resource_state(command_list, counter_buffer, 0, - D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_UNORDERED_ACCESS); - transition_sub_resource_state(command_list, buffer, 0, - D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_UNORDERED_ACCESS); + reset_command_list(command_list, context.allocator); + transition_sub_resource_state(command_list, counter_buffer, 0, + D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_DEST); + transition_sub_resource_state(command_list, buffer, 0, + D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_DEST); + transition_sub_resource_state(command_list, out_buffer, 0, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_UNORDERED_ACCESS); - /* consume */ - ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); - ID3D12GraphicsCommandList_SetComputeRootSignature(command_list, context.root_signature); - ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, 1, &descriptor_heap); - ID3D12GraphicsCommandList_SetComputeRootDescriptorTable(command_list, 0, - ID3D12DescriptorHeap_GetGPUDescriptorHandleForHeapStart(descriptor_heap)); - ID3D12GraphicsCommandList_Dispatch(command_list, 1, 1, 1); - ID3D12GraphicsCommandList_Dispatch(command_list, 1, 1, 1); + /* produce on CPU */ + counter = 8; + for (j = 0; j < counter; ++j) + id[j] = 0xdeadbeef; + upload_buffer_data(buffer, 0, counter * sizeof(*id), id, queue, command_list); + reset_command_list(command_list, context.allocator); + upload_buffer_data(counter_buffer, counter_offsets[i] * sizeof(uint32_t), + sizeof(counter), &counter, queue, command_list); + reset_command_list(command_list, context.allocator); - transition_sub_resource_state(command_list, out_buffer, 0, - D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE); - counter = read_uav_counter(&context, counter_buffer, 0); - ok(!counter, "Got unexpected value %u.\n", counter); + transition_sub_resource_state(command_list, counter_buffer, 0, + D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_UNORDERED_ACCESS); + transition_sub_resource_state(command_list, buffer, 0, + D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_UNORDERED_ACCESS); - get_buffer_readback_with_command_list(out_buffer, DXGI_FORMAT_R32_UINT, &rb, queue, command_list); - for (i = 0; i < 8; ++i) - { - data = get_readback_uint(&rb, i, 0, 0); - ok(data == 0xdeadbeef, "Got data %u at %u.\n", data, i); + /* consume */ + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); + ID3D12GraphicsCommandList_SetComputeRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, 1, &descriptor_heap); + ID3D12GraphicsCommandList_SetComputeRootDescriptorTable(command_list, 0, + ID3D12DescriptorHeap_GetGPUDescriptorHandleForHeapStart(descriptor_heap)); + ID3D12GraphicsCommandList_Dispatch(command_list, 1, 1, 1); + ID3D12GraphicsCommandList_Dispatch(command_list, 1, 1, 1); + + transition_sub_resource_state(command_list, out_buffer, 0, + D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE); + counter = read_uav_counter(&context, counter_buffer, uav_desc.Buffer.CounterOffsetInBytes); + ok(!counter, "Got unexpected value %u.\n", counter); + + get_buffer_readback_with_command_list(out_buffer, DXGI_FORMAT_R32_UINT, &rb, queue, command_list); + for (j = 0; j < 8; ++j) + { + data = get_readback_uint(&rb, j, 0, 0); + ok(data == 0xdeadbeef, "Got data %u at %u.\n", data, j); + } + release_resource_readback(&rb); + + reset_command_list(command_list, context.allocator); + transition_sub_resource_state(command_list, out_buffer, 0, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_UNORDERED_ACCESS); + transition_sub_resource_state(command_list, counter_buffer, 0, + D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_DEST); + ID3D12PipelineState_Release(context.pipeline_state); + context.pipeline_state = NULL; } - release_resource_readback(&rb); ID3D12Resource_Release(buffer); ID3D12Resource_Release(out_buffer); -- 2.31.1

2 1

[PATCH vkd3d v4 1/5] vkd3d-shader: Introduce struct vkd3d_shader_register_range.
by Conor McCarthy 24 Jun '21

24 Jun '21

Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- libs/vkd3d-shader/dxbc.c | 25 ++++++++++++++---------- libs/vkd3d-shader/spirv.c | 8 ++++---- libs/vkd3d-shader/trace.c | 10 +++++----- libs/vkd3d-shader/vkd3d_shader_main.c | 4 ++-- libs/vkd3d-shader/vkd3d_shader_private.h | 9 +++++++-- 5 files changed, 33 insertions(+), 23 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index d2cf87e3..61acf77b 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -654,7 +654,8 @@ static void shader_sm4_read_dcl_resource(struct vkd3d_shader_instruction *ins, } reg_data_type = opcode == VKD3D_SM4_OP_DCL_RESOURCE ? VKD3D_DATA_RESOURCE : VKD3D_DATA_UAV; shader_sm4_read_dst_param(priv, &tokens, end, reg_data_type, &semantic->resource.reg); - semantic->resource.register_index = shader_sm4_map_resource_idx(&semantic->resource.reg.reg, priv); + semantic->resource.range.first = shader_sm4_map_resource_idx(&semantic->resource.reg.reg, priv); + semantic->resource.range.last = semantic->resource.range.first; components = *tokens++; for (i = 0; i < VKD3D_VEC4_SIZE; i++) @@ -675,7 +676,7 @@ static void shader_sm4_read_dcl_resource(struct vkd3d_shader_instruction *ins, if (reg_data_type == VKD3D_DATA_UAV) ins->flags = (opcode_token & VKD3D_SM5_UAV_FLAGS_MASK) >> VKD3D_SM5_UAV_FLAGS_SHIFT; - shader_sm4_read_register_space(priv, &tokens, end, &semantic->resource.register_space); + shader_sm4_read_register_space(priv, &tokens, end, &semantic->resource.range.space); } static void shader_sm4_read_dcl_constant_buffer(struct vkd3d_shader_instruction *ins, @@ -916,9 +917,10 @@ static void shader_sm5_read_dcl_uav_raw(struct vkd3d_shader_instruction *ins, const DWORD *end = &tokens[token_count]; shader_sm4_read_dst_param(priv, &tokens, end, VKD3D_DATA_UAV, &resource->resource.reg); - resource->resource.register_index = shader_sm4_map_resource_idx(&resource->resource.reg.reg, priv); + resource->resource.range.first = shader_sm4_map_resource_idx(&resource->resource.reg.reg, priv); + resource->resource.range.last = resource->resource.range.first; ins->flags = (opcode_token & VKD3D_SM5_UAV_FLAGS_MASK) >> VKD3D_SM5_UAV_FLAGS_SHIFT; - shader_sm4_read_register_space(priv, &tokens, end, &resource->resource.register_space); + shader_sm4_read_register_space(priv, &tokens, end, &resource->resource.range.space); } static void shader_sm5_read_dcl_uav_structured(struct vkd3d_shader_instruction *ins, @@ -929,12 +931,13 @@ static void shader_sm5_read_dcl_uav_structured(struct vkd3d_shader_instruction * const DWORD *end = &tokens[token_count]; shader_sm4_read_dst_param(priv, &tokens, end, VKD3D_DATA_UAV, &resource->resource.reg); - resource->resource.register_index = shader_sm4_map_resource_idx(&resource->resource.reg.reg, priv); + resource->resource.range.first = shader_sm4_map_resource_idx(&resource->resource.reg.reg, priv); + resource->resource.range.last = resource->resource.range.first; ins->flags = (opcode_token & VKD3D_SM5_UAV_FLAGS_MASK) >> VKD3D_SM5_UAV_FLAGS_SHIFT; resource->byte_stride = *tokens++; if (resource->byte_stride % 4) FIXME("Byte stride %u is not multiple of 4.\n", resource->byte_stride); - shader_sm4_read_register_space(priv, &tokens, end, &resource->resource.register_space); + shader_sm4_read_register_space(priv, &tokens, end, &resource->resource.range.space); } static void shader_sm5_read_dcl_tgsm_raw(struct vkd3d_shader_instruction *ins, @@ -967,11 +970,12 @@ static void shader_sm5_read_dcl_resource_structured(struct vkd3d_shader_instruct const DWORD *end = &tokens[token_count]; shader_sm4_read_dst_param(priv, &tokens, end, VKD3D_DATA_RESOURCE, &resource->resource.reg); - resource->resource.register_index = shader_sm4_map_resource_idx(&resource->resource.reg.reg, priv); + resource->resource.range.first = shader_sm4_map_resource_idx(&resource->resource.reg.reg, priv); + resource->resource.range.last = resource->resource.range.first; resource->byte_stride = *tokens++; if (resource->byte_stride % 4) FIXME("Byte stride %u is not multiple of 4.\n", resource->byte_stride); - shader_sm4_read_register_space(priv, &tokens, end, &resource->resource.register_space); + shader_sm4_read_register_space(priv, &tokens, end, &resource->resource.range.space); } static void shader_sm5_read_dcl_resource_raw(struct vkd3d_shader_instruction *ins, @@ -982,8 +986,9 @@ static void shader_sm5_read_dcl_resource_raw(struct vkd3d_shader_instruction *in const DWORD *end = &tokens[token_count]; shader_sm4_read_dst_param(priv, &tokens, end, VKD3D_DATA_RESOURCE, &resource->resource.reg); - resource->resource.register_index = shader_sm4_map_resource_idx(&resource->resource.reg.reg, priv); - shader_sm4_read_register_space(priv, &tokens, end, &resource->resource.register_space); + resource->resource.range.first = shader_sm4_map_resource_idx(&resource->resource.reg.reg, priv); + resource->resource.range.last = resource->resource.range.first; + shader_sm4_read_register_space(priv, &tokens, end, &resource->resource.range.space); } static void shader_sm5_read_sync(struct vkd3d_shader_instruction *ins, diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 0e75b0ae..7a23d315 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2441,8 +2441,8 @@ static bool vkd3d_dxbc_compiler_has_combined_sampler(const struct vkd3d_dxbc_com if (!vkd3d_dxbc_compiler_check_shader_visibility(compiler, combined_sampler->shader_visibility)) continue; - if ((!resource || (combined_sampler->resource_space == resource->register_space - && combined_sampler->resource_index == resource->register_index)) + if ((!resource || (combined_sampler->resource_space == resource->range.space + && combined_sampler->resource_index == resource->range.first)) && (!sampler || (combined_sampler->sampler_space == sampler->register_space && combined_sampler->sampler_index == sampler->register_index))) return true; @@ -5554,8 +5554,8 @@ static void vkd3d_dxbc_compiler_emit_resource_declaration(struct vkd3d_dxbc_comp SpvStorageClass storage_class = SpvStorageClassUniformConstant; const struct vkd3d_shader_register *reg = &resource->reg.reg; const struct vkd3d_spirv_resource_type *resource_type_info; - unsigned int register_space = resource->register_space; - unsigned int register_index = resource->register_index; + unsigned int register_space = resource->range.space; + unsigned int register_index = resource->range.first; enum vkd3d_shader_component_type sampled_type; struct vkd3d_symbol resource_symbol; bool is_uav; diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index 4e355118..c35179a8 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -1428,7 +1428,7 @@ static void shader_dump_instruction(struct vkd3d_d3d_asm_compiler *compiler, shader_dump_ins_modifiers(compiler, &ins->declaration.semantic.resource.reg); vkd3d_string_buffer_printf(buffer, "%s ", compiler->colours.reset); shader_dump_register(compiler, &ins->declaration.semantic.resource.reg.reg); - shader_dump_register_space(compiler, ins->declaration.semantic.resource.register_space); + shader_dump_register_space(compiler, ins->declaration.semantic.resource.range.space); break; case VKD3DSIH_DCL_CONSTANT_BUFFER: @@ -1531,14 +1531,14 @@ static void shader_dump_instruction(struct vkd3d_d3d_asm_compiler *compiler, case VKD3DSIH_DCL_RESOURCE_RAW: vkd3d_string_buffer_printf(buffer, " "); shader_dump_dst_param(compiler, &ins->declaration.raw_resource.resource.reg); - shader_dump_register_space(compiler, ins->declaration.raw_resource.resource.register_space); + shader_dump_register_space(compiler, ins->declaration.raw_resource.resource.range.space); break; case VKD3DSIH_DCL_RESOURCE_STRUCTURED: vkd3d_string_buffer_printf(buffer, " "); shader_dump_dst_param(compiler, &ins->declaration.structured_resource.resource.reg); shader_print_uint_literal(compiler, ", ", ins->declaration.structured_resource.byte_stride, ""); - shader_dump_register_space(compiler, ins->declaration.structured_resource.resource.register_space); + shader_dump_register_space(compiler, ins->declaration.structured_resource.resource.range.space); break; case VKD3DSIH_DCL_SAMPLER: @@ -1597,7 +1597,7 @@ static void shader_dump_instruction(struct vkd3d_d3d_asm_compiler *compiler, shader_dump_uav_flags(compiler, ins->flags); shader_addline(buffer, " "); shader_dump_dst_param(compiler, &ins->declaration.raw_resource.resource.reg); - shader_dump_register_space(compiler, ins->declaration.raw_resource.resource.register_space); + shader_dump_register_space(compiler, ins->declaration.raw_resource.resource.range.space); break; case VKD3DSIH_DCL_UAV_STRUCTURED: @@ -1605,7 +1605,7 @@ static void shader_dump_instruction(struct vkd3d_d3d_asm_compiler *compiler, shader_addline(buffer, " "); shader_dump_dst_param(compiler, &ins->declaration.structured_resource.resource.reg); shader_print_uint_literal(compiler, ", ", ins->declaration.structured_resource.byte_stride, ""); - shader_dump_register_space(compiler, ins->declaration.structured_resource.resource.register_space); + shader_dump_register_space(compiler, ins->declaration.structured_resource.resource.range.space); break; case VKD3DSIH_DEF: diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 2308b894..df811d37 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -666,8 +666,8 @@ static void vkd3d_shader_scan_resource_declaration(struct vkd3d_shader_scan_cont type = VKD3D_SHADER_DESCRIPTOR_TYPE_UAV; else type = VKD3D_SHADER_DESCRIPTOR_TYPE_SRV; - vkd3d_shader_scan_add_descriptor(context, type, resource->register_space, - resource->register_index, resource_type, resource_data_type, 0); + vkd3d_shader_scan_add_descriptor(context, type, resource->range.space, + resource->range.first, resource_type, resource_data_type, 0); if (type == VKD3D_SHADER_DESCRIPTOR_TYPE_UAV) vkd3d_shader_scan_add_uav_range(context, resource->reg.reg.idx[0].offset, context->scan_descriptor_info->descriptor_count - 1); diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 6d756e40..cddb3d27 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -636,11 +636,16 @@ struct vkd3d_shader_index_range unsigned int register_count; }; +struct vkd3d_shader_register_range +{ + unsigned int space; + unsigned int first, last; +}; + struct vkd3d_shader_resource { struct vkd3d_shader_dst_param reg; - unsigned int register_space; - unsigned int register_index; + struct vkd3d_shader_register_range range; }; enum vkd3d_decl_usage -- 2.31.1

2 9

[PATCH 1/5] hid: Rewrite HidP_GetSpecificValueCaps using enum_value_caps.
by Rémi Bernon 24 Jun '21

24 Jun '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/hid/hidp.c | 110 +++++++++++++++-------------- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 91 +----------------------- 2 files changed, 59 insertions(+), 142 deletions(-) diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c index 301c367d37a..c11a5d66985 100644 --- a/dlls/hid/hidp.c +++ b/dlls/hid/hidp.c @@ -69,6 +69,7 @@ static NTSTATUS get_value_caps_range( WINE_HIDP_PREPARSED_DATA *preparsed, HIDP_ struct caps_filter { BOOLEAN buttons; + BOOLEAN values; USAGE usage_page; USHORT collection; USAGE usage; @@ -78,6 +79,7 @@ static BOOL match_value_caps( const struct hid_value_caps *caps, const struct ca { if (!caps->usage_min && !caps->usage_max) return FALSE; if (filter->buttons && !HID_VALUE_CAPS_IS_BUTTON( caps )) return FALSE; + if (filter->values && HID_VALUE_CAPS_IS_BUTTON( caps )) return FALSE; if (filter->usage_page && filter->usage_page != caps->usage_page) return FALSE; if (filter->collection && filter->collection != caps->link_collection) return FALSE; if (!filter->usage) return TRUE; @@ -247,6 +249,9 @@ NTSTATUS WINAPI HidP_GetCaps( PHIDP_PREPARSED_DATA preparsed_data, HIDP_CAPS *ca caps->NumberInputButtonCaps = preparsed->new_caps.NumberInputButtonCaps; caps->NumberOutputButtonCaps = preparsed->new_caps.NumberOutputButtonCaps; caps->NumberFeatureButtonCaps = preparsed->new_caps.NumberFeatureButtonCaps; + caps->NumberInputValueCaps = preparsed->new_caps.NumberInputValueCaps; + caps->NumberOutputValueCaps = preparsed->new_caps.NumberOutputValueCaps; + caps->NumberFeatureValueCaps = preparsed->new_caps.NumberFeatureValueCaps; return HIDP_STATUS_SUCCESS; } @@ -701,68 +706,67 @@ NTSTATUS WINAPI HidP_GetSpecificButtonCaps( HIDP_REPORT_TYPE report_type, USAGE return enum_value_caps( preparsed, report_type, &filter, get_button_caps, &caps, caps_count ); } -NTSTATUS WINAPI HidP_GetSpecificValueCaps(HIDP_REPORT_TYPE ReportType, - USAGE UsagePage, USHORT LinkCollection, USAGE Usage, - HIDP_VALUE_CAPS *ValueCaps, USHORT *ValueCapsLength, PHIDP_PREPARSED_DATA PreparsedData) +static NTSTATUS get_value_caps( const struct hid_value_caps *caps, void *user ) { - WINE_HIDP_PREPARSED_DATA *data = (PWINE_HIDP_PREPARSED_DATA)PreparsedData; - WINE_HID_ELEMENT *elems = HID_ELEMS(data); - WINE_HID_REPORT *report = NULL; - USHORT v_count = 0, r_count = 0; - int i,j,u; - - TRACE("(%i, 0x%x, %i, 0x%x, %p %p %p)\n", ReportType, UsagePage, LinkCollection, - Usage, ValueCaps, ValueCapsLength, PreparsedData); - - if (data->magic != HID_MAGIC) - return HIDP_STATUS_INVALID_PREPARSED_DATA; - - switch(ReportType) + HIDP_VALUE_CAPS **iter = user, *dst = *iter; + dst->UsagePage = caps->usage_page; + dst->ReportID = caps->report_id; + dst->LinkCollection = caps->link_collection; + dst->LinkUsagePage = caps->link_usage_page; + dst->LinkUsage = caps->link_usage; + dst->BitField = caps->bit_field; + dst->IsAlias = FALSE; + dst->IsAbsolute = HID_VALUE_CAPS_IS_ABSOLUTE( caps ); + dst->HasNull = HID_VALUE_CAPS_HAS_NULL( caps ); + dst->BitSize = caps->bit_size; + dst->ReportCount = caps->is_range ? 1 : caps->report_count; + dst->UnitsExp = caps->units_exp; + dst->Units = caps->units; + dst->LogicalMin = caps->logical_min; + dst->LogicalMax = caps->logical_max; + dst->PhysicalMin = caps->physical_min; + dst->PhysicalMax = caps->physical_max; + if (!(dst->IsRange = caps->is_range)) { - case HidP_Input: - v_count = data->caps.NumberInputValueCaps; - report = HID_INPUT_REPORTS(data); - break; - case HidP_Output: - v_count = data->caps.NumberOutputValueCaps; - report = HID_OUTPUT_REPORTS(data); - break; - case HidP_Feature: - v_count = data->caps.NumberFeatureValueCaps; - report = HID_FEATURE_REPORTS(data); - break; - default: - return HIDP_STATUS_INVALID_REPORT_TYPE; + dst->NotRange.Usage = caps->usage_min; + dst->NotRange.DataIndex = caps->data_index_min; } - r_count = data->reportCount[ReportType]; - - if (!r_count || !v_count) + else { - *ValueCapsLength = 0; - return HIDP_STATUS_SUCCESS; + dst->Range.UsageMin = caps->usage_min; + dst->Range.UsageMax = caps->usage_max; + dst->Range.DataIndexMin = caps->data_index_min; + dst->Range.DataIndexMax = caps->data_index_max; } - - v_count = min(v_count, *ValueCapsLength); - - u = 0; - for (j = 0; j < r_count && u < v_count; j++) + if (!(dst->IsStringRange = caps->is_string_range)) + dst->NotRange.StringIndex = caps->string_min; + else { - for (i = 0; i < report[j].elementCount && u < v_count; i++) - { - if (elems[report[j].elementIdx + i].caps.BitSize != 1 && - (UsagePage == 0 || UsagePage == elems[report[j].elementIdx + i].caps.UsagePage) && - (LinkCollection == 0 || LinkCollection == elems[report[j].elementIdx + i].caps.LinkCollection) && - (Usage == 0 || Usage == elems[report[j].elementIdx + i].caps.NotRange.Usage)) - { - ValueCaps[u++] = elems[report[j].elementIdx + i].caps; - } - } + dst->Range.StringMin = caps->string_min; + dst->Range.StringMax = caps->string_max; } - TRACE("Matched %i usages\n", u); + if ((dst->IsDesignatorRange = caps->is_designator_range)) + dst->NotRange.DesignatorIndex = caps->designator_min; + else + { + dst->Range.DesignatorMin = caps->designator_min; + dst->Range.DesignatorMax = caps->designator_max; + } + *iter += 1; + return HIDP_STATUS_SUCCESS; +} + +NTSTATUS WINAPI HidP_GetSpecificValueCaps( HIDP_REPORT_TYPE report_type, USAGE usage_page, USHORT collection, + USAGE usage, HIDP_VALUE_CAPS *caps, USHORT *caps_count, + PHIDP_PREPARSED_DATA preparsed_data ) +{ + WINE_HIDP_PREPARSED_DATA *preparsed = (WINE_HIDP_PREPARSED_DATA *)preparsed_data; + const struct caps_filter filter = {.values = TRUE, .usage_page = usage_page, .collection = collection, .usage = usage}; - *ValueCapsLength = u; + TRACE( "report_type %d, usage_page %x, collection %d, usage %x, caps %p, caps_count %p, preparsed_data %p.\n", + report_type, usage_page, collection, usage, caps, caps_count, preparsed_data ); - return HIDP_STATUS_SUCCESS; + return enum_value_caps( preparsed, report_type, &filter, get_value_caps, &caps, caps_count ); } NTSTATUS WINAPI HidP_GetUsagesEx(HIDP_REPORT_TYPE ReportType, USHORT LinkCollection, USAGE_AND_PAGE *ButtonList, diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 11779daf684..3ce750728ec 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -1834,7 +1834,6 @@ static void test_hidp(HANDLE file, int report_id) check_member(caps, expect_hidp_caps[report_id], "%d", FeatureReportByteLength); check_member(caps, expect_hidp_caps[report_id], "%d", NumberLinkCollectionNodes); check_member(caps, expect_hidp_caps[report_id], "%d", NumberInputButtonCaps); - todo_wine check_member(caps, expect_hidp_caps[report_id], "%d", NumberInputValueCaps); todo_wine check_member(caps, expect_hidp_caps[report_id], "%d", NumberInputDataIndices); @@ -1934,15 +1933,12 @@ static void test_hidp(HANDLE file, int report_id) count = ARRAY_SIZE(value_caps); status = HidP_GetValueCaps(HidP_Output, value_caps, &count, preparsed_data); - todo_wine ok(status == HIDP_STATUS_USAGE_NOT_FOUND, "HidP_GetValueCaps returned %#x\n", status); status = HidP_GetValueCaps(HidP_Feature + 1, value_caps, &count, preparsed_data); ok(status == HIDP_STATUS_INVALID_REPORT_TYPE, "HidP_GetValueCaps returned %#x\n", status); count = 0; status = HidP_GetValueCaps(HidP_Input, value_caps, &count, preparsed_data); - todo_wine ok(status == HIDP_STATUS_BUFFER_TOO_SMALL, "HidP_GetValueCaps returned %#x\n", status); - todo_wine ok(count == caps.NumberInputValueCaps, "HidP_GetValueCaps returned count %d, expected %d\n", count, caps.NumberInputValueCaps); count = ARRAY_SIZE(value_caps); @@ -1956,61 +1952,18 @@ static void test_hidp(HANDLE file, int report_id) for (i = 0; i < ARRAY_SIZE(expect_value_caps); ++i) { winetest_push_context("value_caps[%d]", i); - todo_wine_if(i == 3) - check_member(value_caps[i], expect_value_caps[i], "%04x", UsagePage); - check_member(value_caps[i], expect_value_caps[i], "%d", ReportID); - check_member(value_caps[i], expect_value_caps[i], "%d", IsAlias); - todo_wine_if(i == 2) - check_member(value_caps[i], expect_value_caps[i], "%d", BitField); - check_member(value_caps[i], expect_value_caps[i], "%d", LinkCollection); - check_member(value_caps[i], expect_value_caps[i], "%04x", LinkUsage); - check_member(value_caps[i], expect_value_caps[i], "%04x", LinkUsagePage); - todo_wine_if(i == 3) - check_member(value_caps[i], expect_value_caps[i], "%d", IsRange); - check_member(value_caps[i], expect_value_caps[i], "%d", IsStringRange); - check_member(value_caps[i], expect_value_caps[i], "%d", IsDesignatorRange); - todo_wine_if(i == 2) - check_member(value_caps[i], expect_value_caps[i], "%d", IsAbsolute); - todo_wine_if(i == 2) - check_member(value_caps[i], expect_value_caps[i], "%d", HasNull); - todo_wine_if(i >= 2) - check_member(value_caps[i], expect_value_caps[i], "%d", BitSize); - todo_wine_if(i == 2) - check_member(value_caps[i], expect_value_caps[i], "%d", ReportCount); - check_member(value_caps[i], expect_value_caps[i], "%d", UnitsExp); - check_member(value_caps[i], expect_value_caps[i], "%d", Units); - todo_wine_if(i >= 3) - check_member(value_caps[i], expect_value_caps[i], "%d", LogicalMin); - todo_wine_if(i >= 2) - check_member(value_caps[i], expect_value_caps[i], "%d", LogicalMax); - check_member(value_caps[i], expect_value_caps[i], "%d", PhysicalMin); - check_member(value_caps[i], expect_value_caps[i], "%d", PhysicalMax); - todo_wine - check_member(value_caps[i], expect_value_caps[i], "%04x", Range.UsageMin); - todo_wine - check_member(value_caps[i], expect_value_caps[i], "%04x", Range.UsageMax); - check_member(value_caps[i], expect_value_caps[i], "%d", Range.StringMin); - check_member(value_caps[i], expect_value_caps[i], "%d", Range.StringMax); - check_member(value_caps[i], expect_value_caps[i], "%d", Range.DesignatorMin); - check_member(value_caps[i], expect_value_caps[i], "%d", Range.DesignatorMax); - todo_wine_if(i >= 2) - check_member(value_caps[i], expect_value_caps[i], "%d", Range.DataIndexMin); - todo_wine_if(i >= 2) - check_member(value_caps[i], expect_value_caps[i], "%d", Range.DataIndexMax); + check_hidp_value_caps(&value_caps[i], &expect_value_caps[i]); winetest_pop_context(); } count = ARRAY_SIZE(value_caps) - 4; status = HidP_GetSpecificValueCaps(HidP_Output, 0, 0, 0, value_caps, &count, preparsed_data); - todo_wine ok(status == HIDP_STATUS_USAGE_NOT_FOUND, "HidP_GetSpecificValueCaps returned %#x\n", status); status = HidP_GetSpecificValueCaps(HidP_Feature + 1, 0, 0, 0, value_caps, &count, preparsed_data); ok(status == HIDP_STATUS_INVALID_REPORT_TYPE, "HidP_GetSpecificValueCaps returned %#x\n", status); count = 0; status = HidP_GetSpecificValueCaps(HidP_Input, 0, 0, 0, value_caps, &count, preparsed_data); - todo_wine ok(status == HIDP_STATUS_BUFFER_TOO_SMALL, "HidP_GetSpecificValueCaps returned %#x\n", status); - todo_wine ok(count == caps.NumberInputValueCaps, "HidP_GetSpecificValueCaps returned count %d, expected %d\n", count, caps.NumberInputValueCaps); count = ARRAY_SIZE(value_caps) - 4; @@ -2031,58 +1984,18 @@ static void test_hidp(HANDLE file, int report_id) value_caps + 4, &count, preparsed_data); ok(status == HIDP_STATUS_SUCCESS, "HidP_GetSpecificValueCaps returned %#x\n", status); ok(count == 1, "HidP_GetSpecificValueCaps returned count %d, expected %d\n", count, 1); - - todo_wine - check_member(value_caps[4], value_caps[3], "%04x", UsagePage); - check_member(value_caps[4], value_caps[3], "%d", ReportID); - check_member(value_caps[4], value_caps[3], "%d", IsAlias); - check_member(value_caps[4], value_caps[3], "%d", BitField); - check_member(value_caps[4], value_caps[3], "%d", LinkCollection); - check_member(value_caps[4], value_caps[3], "%04x", LinkUsage); - check_member(value_caps[4], value_caps[3], "%04x", LinkUsagePage); - todo_wine - check_member(value_caps[4], value_caps[3], "%d", IsRange); - check_member(value_caps[4], value_caps[3], "%d", IsStringRange); - check_member(value_caps[4], value_caps[3], "%d", IsDesignatorRange); - check_member(value_caps[4], value_caps[3], "%d", IsAbsolute); - check_member(value_caps[4], value_caps[3], "%d", HasNull); - todo_wine - check_member(value_caps[4], value_caps[3], "%d", BitSize); - check_member(value_caps[4], value_caps[3], "%d", ReportCount); - check_member(value_caps[4], value_caps[3], "%d", UnitsExp); - check_member(value_caps[4], value_caps[3], "%d", Units); - todo_wine - check_member(value_caps[4], value_caps[3], "%d", LogicalMin); - todo_wine - check_member(value_caps[4], value_caps[3], "%d", LogicalMax); - check_member(value_caps[4], value_caps[3], "%d", PhysicalMin); - check_member(value_caps[4], value_caps[3], "%d", PhysicalMax); - todo_wine - check_member(value_caps[4], value_caps[3], "%04x", Range.UsageMin); - todo_wine - check_member(value_caps[4], value_caps[3], "%04x", Range.UsageMax); - check_member(value_caps[4], value_caps[3], "%d", Range.StringMin); - check_member(value_caps[4], value_caps[3], "%d", Range.StringMax); - check_member(value_caps[4], value_caps[3], "%d", Range.DesignatorMin); - check_member(value_caps[4], value_caps[3], "%d", Range.DesignatorMax); - todo_wine - check_member(value_caps[4], value_caps[3], "%d", Range.DataIndexMin); - todo_wine - check_member(value_caps[4], value_caps[3], "%d", Range.DataIndexMax); + check_hidp_value_caps(&value_caps[4], &value_caps[3]); count = 0xdead; status = HidP_GetSpecificValueCaps(HidP_Input, 0xfffe, 0, 0, value_caps, &count, preparsed_data); - todo_wine ok(status == HIDP_STATUS_USAGE_NOT_FOUND, "HidP_GetSpecificValueCaps returned %#x\n", status); ok(count == 0, "HidP_GetSpecificValueCaps returned count %d, expected %d\n", count, 0); count = 0xdead; status = HidP_GetSpecificValueCaps(HidP_Input, 0, 0xfffe, 0, value_caps, &count, preparsed_data); - todo_wine ok(status == HIDP_STATUS_USAGE_NOT_FOUND, "HidP_GetSpecificValueCaps returned %#x\n", status); ok(count == 0, "HidP_GetSpecificValueCaps returned count %d, expected %d\n", count, 0); count = 0xdead; status = HidP_GetSpecificValueCaps(HidP_Input, 0, 0, 0xfffe, value_caps, &count, preparsed_data); - todo_wine ok(status == HIDP_STATUS_USAGE_NOT_FOUND, "HidP_GetSpecificValueCaps returned %#x\n", status); ok(count == 0, "HidP_GetSpecificValueCaps returned count %d, expected %d\n", count, 0); -- 2.32.0

2 6

[PATCH v5] mf/sar: Allow requesting more than a sample per period.
by Giovanni Mascellani 24 Jun '21

24 Jun '21

The IAudioClient implementation from both Windows and winepulse.drv never sets the event more than once per period, which is usually around 10 ms long. Some codecs produce audio samples shorter than 10 ms, so it is critical that the SAR is able to process more than a sample per period. This is not currently the case: a new sample is requested only in audio_renderer_render, which is executed (at most) once per period. This results in the SAR not being able to keep up with the audio client, and eventually underrunning. With this patch the SAR keeps a count of how many frames are currently queued, and a new sample is immediately requested if the internal queue has less than two periods of frames. This patch fixes audio stuttering problems in the logo videos of Borderlands 3, Deep Rock Galactic and Mutant Year Zero. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- v2: Remove some changes that didn't really help the solution and update the description accordingly. v3: Reimplement from scratches, using a different strategy and avoiding manually setting the event. v4: Resent with no changes, because it fails to apply without the first patch. v5: * Zero the count when flushing the queue. * Only request more sample when running. dlls/mf/sar.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/dlls/mf/sar.c b/dlls/mf/sar.c index eba822ae0fe..7b7d4918e17 100644 --- a/dlls/mf/sar.c +++ b/dlls/mf/sar.c @@ -101,6 +101,8 @@ struct audio_renderer HANDLE buffer_ready_event; MFWORKITEM_KEY buffer_ready_key; unsigned int frame_size; + unsigned int queued_frames; + unsigned int target_queued_frames; struct list queue; enum stream_state state; unsigned int flags; @@ -234,6 +236,7 @@ static void audio_renderer_release_audio_client(struct audio_renderer *renderer) { release_pending_object(obj); } + renderer->queued_frames = 0; renderer->buffer_ready_key = 0; if (renderer->audio_client) { @@ -1330,6 +1333,13 @@ static HRESULT WINAPI audio_renderer_stream_GetMediaTypeHandler(IMFStreamSink *i static HRESULT stream_queue_sample(struct audio_renderer *renderer, IMFSample *sample) { struct queued_object *object; + DWORD sample_len, sample_frames; + HRESULT hr; + + if (FAILED(hr = IMFSample_GetTotalLength(sample, &sample_len))) + return hr; + + sample_frames = sample_len / renderer->frame_size; if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; @@ -1339,6 +1349,7 @@ static HRESULT stream_queue_sample(struct audio_renderer *renderer, IMFSample *s IMFSample_AddRef(object->u.sample.sample); list_add_tail(&renderer->queue, &object->entry); + renderer->queued_frames += sample_frames; return S_OK; } @@ -1357,9 +1368,17 @@ static HRESULT WINAPI audio_renderer_stream_ProcessSample(IMFStreamSink *iface, return MF_E_STREAMSINK_REMOVED; EnterCriticalSection(&renderer->cs); + if (renderer->state == STREAM_STATE_RUNNING) hr = stream_queue_sample(renderer, sample); renderer->flags &= ~SAR_SAMPLE_REQUESTED; + + if (renderer->queued_frames < renderer->target_queued_frames && renderer->state == STREAM_STATE_RUNNING) + { + IMFMediaEventQueue_QueueEventParamVar(renderer->stream_event_queue, MEStreamSinkRequestSample, &GUID_NULL, S_OK, NULL); + renderer->flags |= SAR_SAMPLE_REQUESTED; + } + LeaveCriticalSection(&renderer->cs); return hr; @@ -1428,6 +1447,7 @@ static HRESULT WINAPI audio_renderer_stream_Flush(IMFStreamSink *iface) release_pending_object(obj); } } + renderer->queued_frames = 0; LeaveCriticalSection(&renderer->cs); return hr; @@ -1516,6 +1536,8 @@ static HRESULT audio_renderer_create_audio_client(struct audio_renderer *rendere unsigned int flags; WAVEFORMATEX *wfx; HRESULT hr; + REFERENCE_TIME period; + DWORD samples_per_second; audio_renderer_release_audio_client(renderer); @@ -1543,6 +1565,7 @@ static HRESULT audio_renderer_create_audio_client(struct audio_renderer *rendere flags |= AUDCLNT_STREAMFLAGS_NOPERSIST; hr = IAudioClient_Initialize(renderer->audio_client, AUDCLNT_SHAREMODE_SHARED, flags, 1000000, 0, wfx, &renderer->stream_config.session_id); + samples_per_second = wfx->nSamplesPerSec; CoTaskMemFree(wfx); if (FAILED(hr)) { @@ -1576,6 +1599,13 @@ static HRESULT audio_renderer_create_audio_client(struct audio_renderer *rendere return hr; } + if (FAILED(hr = IAudioClient_GetDevicePeriod(renderer->audio_client, &period, NULL))) + { + WARN("Failed to retrieve device period, hr %#x.\n", hr); + return hr; + } + renderer->target_queued_frames = 2 * period * samples_per_second / 10000000; + if (SUCCEEDED(hr = MFCreateAsyncResult(NULL, &renderer->render_callback, NULL, &result))) { if (FAILED(hr = MFPutWaitingWorkItem(renderer->buffer_ready_event, 0, result, &renderer->buffer_ready_key))) @@ -1789,6 +1819,7 @@ static void audio_renderer_render(struct audio_renderer *renderer, IMFAsyncResul IAudioRenderClient_ReleaseBuffer(renderer->audio_render_client, dst_frames, 0); obj->u.sample.frame_offset += dst_frames; + renderer->queued_frames -= dst_frames; } keep_sample = FAILED(hr) || src_frames > max_frames; -- 2.32.0

1 0

[PATCH 1/6] server: Introduce IOCTL_AFD_WINE_GET_SO_ERROR.
by Zebediah Figura 24 Jun '21

24 Jun '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- include/wine/afd.h | 1 + server/sock.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+) diff --git a/include/wine/afd.h b/include/wine/afd.h index 6370e00539f..0ccd248e614 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -162,6 +162,7 @@ struct afd_get_events_params #define IOCTL_AFD_WINE_GET_SO_ACCEPTCONN CTL_CODE(FILE_DEVICE_NETWORK, 219, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_AFD_WINE_GET_SO_BROADCAST CTL_CODE(FILE_DEVICE_NETWORK, 220, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_AFD_WINE_SET_SO_BROADCAST CTL_CODE(FILE_DEVICE_NETWORK, 221, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_AFD_WINE_GET_SO_ERROR CTL_CODE(FILE_DEVICE_NETWORK, 222, METHOD_BUFFERED, FILE_ANY_ACCESS) struct afd_create_params { diff --git a/server/sock.c b/server/sock.c index 71f22845827..f614bf5feaa 100644 --- a/server/sock.c +++ b/server/sock.c @@ -2546,6 +2546,40 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) return 1; } + case IOCTL_AFD_WINE_GET_SO_ERROR: + { + int error; + socklen_t len = sizeof(error); + unsigned int i; + + if (get_reply_max_size() < sizeof(error)) + { + set_error( STATUS_BUFFER_TOO_SMALL ); + return 0; + } + + if (getsockopt( unix_fd, SOL_SOCKET, SO_ERROR, (char *)&error, &len ) < 0) + { + set_error( sock_get_ntstatus( errno ) ); + return 0; + } + + if (!error) + { + for (i = 0; i < ARRAY_SIZE( sock->errors ); ++i) + { + if (sock->errors[i]) + { + error = sock->errors[i]; + break; + } + } + } + + set_reply_data( &error, sizeof(error) ); + return 1; + } + default: set_error( STATUS_NOT_SUPPORTED ); return 0; -- 2.30.2

2 7

cypt32:chain started crashing on Jun 17
by Francois Gouget 24 Jun '21

24 Jun '21

The June 16 build crashed on some machines but since June 17 all builds crash on all Windows machines (and time out in Wine): https://test.winehq.org/data/patterns.html#crypt32:chain The best explanation is that some certificate expired on the 17th: * The few June 16 cypt32:chain tests that were run after midnight (i.e. on the 17th) crashed. * And all cypt32:chain tests run since the 17th crash. Does anyone know what to do? -- Francois Gouget <fgouget(a)codeweavers.com>

1 1

An introduction of a potential student contributor
by Weiwen Chen 24 Jun '21

24 Jun '21

Hi everyone, My name is Weiwen Chen, an undergraduate at Fudan University, Department of Physics. I'm interested in open source projects and I have three years' programming experience, mainly in python, c and golang. I have some experience of operating system utilities through the labs of MIT 6.828. I'm a linux user and wine is something good in my daily life. Maybe I'm not as experienced as you, but I'll try my best to do something useful. I applied to the 'Implement robocopy.exe' summer project <https://wiki.winehq.org/Summer_Of_Code#Implement_robocopy.exe>, and have exchanged several emails with Ms. Figura and Mr. Li. (Though I'm not sure whether my application will be accepted! ;)) --- Besides, I want to know how to add a new executable into the `programs/` directory correctly. I'm trying to set up a skeleton program which can be compiled. I created `robocopy/` dir under `programs/`, copied things from `reg/` and modified the `MODULE` variable in `Makefile.in`, added lines below in `configure.ac` and rerun `autoconf` command. WINE_CONFIG_MAKEFILE(programs/robocopy) WINE_CONFIG_MAKEFILE(programs/robocopy/tests) I hope it will generate an executable called `robocopy.exe` which acts like `reg.exe`, but I don't find it under `.wine/drive_c/windows/system32/` or `.wine/drive_c/windows/syswow64/`. Have I missed anything? I wonder how to add a skeleton executable into `programs/` which can be correctly compiled and placed. I staged my code mentioned above under my github fork <https://github.com/ofey404/wine/tree/robocopy>, Wish you all the best Weiwen Chen

3 2

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

23 Jun '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/light.msstyles/blue_button.bmp | Bin 0 -> 12198 bytes dlls/light.msstyles/blue_button.svg | 24 +++ dlls/light.msstyles/blue_checkbox_13px.bmp | Bin 0 -> 8166 bytes dlls/light.msstyles/blue_checkbox_13px.svg | 44 +++++ dlls/light.msstyles/blue_checkbox_16px.bmp | Bin 0 -> 12342 bytes dlls/light.msstyles/blue_checkbox_16px.svg | 36 +++++ dlls/light.msstyles/blue_checkbox_25px.bmp | Bin 0 -> 30054 bytes dlls/light.msstyles/blue_checkbox_25px.svg | 40 +++++ dlls/light.msstyles/blue_commandlink.bmp | Bin 0 -> 12990 bytes dlls/light.msstyles/blue_commandlink.svg | 18 +++ .../blue_commandlink_glyph_30px.bmp | Bin 0 -> 18054 bytes .../blue_commandlink_glyph_30px.svg | 19 +++ .../blue_commandlink_glyph_45px.bmp | Bin 0 -> 40554 bytes .../blue_commandlink_glyph_45px.svg | 19 +++ dlls/light.msstyles/blue_groupbox.bmp | Bin 0 -> 1814 bytes dlls/light.msstyles/blue_groupbox.svg | 15 ++ dlls/light.msstyles/blue_radiobutton_13px.bmp | Bin 0 -> 5462 bytes dlls/light.msstyles/blue_radiobutton_13px.svg | 28 ++++ dlls/light.msstyles/blue_radiobutton_16px.bmp | Bin 0 -> 8246 bytes dlls/light.msstyles/blue_radiobutton_16px.svg | 28 ++++ dlls/light.msstyles/blue_radiobutton_25px.bmp | Bin 0 -> 20054 bytes dlls/light.msstyles/blue_radiobutton_25px.svg | 28 ++++ dlls/light.msstyles/light.rc | 151 ++++++++++++++++++ 23 files changed, 450 insertions(+) create mode 100644 dlls/light.msstyles/blue_button.bmp create mode 100644 dlls/light.msstyles/blue_button.svg create mode 100644 dlls/light.msstyles/blue_checkbox_13px.bmp create mode 100644 dlls/light.msstyles/blue_checkbox_13px.svg create mode 100644 dlls/light.msstyles/blue_checkbox_16px.bmp create mode 100644 dlls/light.msstyles/blue_checkbox_16px.svg create mode 100644 dlls/light.msstyles/blue_checkbox_25px.bmp create mode 100644 dlls/light.msstyles/blue_checkbox_25px.svg create mode 100644 dlls/light.msstyles/blue_commandlink.bmp create mode 100644 dlls/light.msstyles/blue_commandlink.svg create mode 100644 dlls/light.msstyles/blue_commandlink_glyph_30px.bmp create mode 100644 dlls/light.msstyles/blue_commandlink_glyph_30px.svg create mode 100644 dlls/light.msstyles/blue_commandlink_glyph_45px.bmp create mode 100644 dlls/light.msstyles/blue_commandlink_glyph_45px.svg create mode 100644 dlls/light.msstyles/blue_groupbox.bmp create mode 100644 dlls/light.msstyles/blue_groupbox.svg create mode 100644 dlls/light.msstyles/blue_radiobutton_13px.bmp create mode 100644 dlls/light.msstyles/blue_radiobutton_13px.svg create mode 100644 dlls/light.msstyles/blue_radiobutton_16px.bmp create mode 100644 dlls/light.msstyles/blue_radiobutton_16px.svg create mode 100644 dlls/light.msstyles/blue_radiobutton_25px.bmp create mode 100644 dlls/light.msstyles/blue_radiobutton_25px.svg diff --git a/dlls/light.msstyles/blue_button.bmp b/dlls/light.msstyles/blue_button.bmp new file mode 100644 index 0000000000000000000000000000000000000000..172bfdd932f96a27bddfc1893995239f5447b0bb GIT binary patch literal 12198 zcmeI0F;2rk5Jk-eC~57|t_VV+BSm`dLYasgP$MD%Y3ZC4@eL?!2SIJ0B*OA)nek>s z5<2e~3F%wf9cLrG?0)^#k7jc7dLDGo70oe?GaC0aPJ)Q$Ah@OP-%j1=7HHZ&T!hWy zx@hK?ZSy#?UV|Ag<9x>~&BwE`rm@}+G0gi@$L4*iFlAHimzA^2l2#QhwRpk-*C_!V zpo82AuJ8l=@XHTF<;7yWF`o;)e50)79Nx}H5!F&MNj%-Favn32G9EdPoR_;HUXssR z6<ntzbbt=~cM5*^13w_=yPQwcG|aNBSgls=a=ElVgBk1fI%g);vZ^XW&%U*Ly)%PY z9h-kcgDD$fmYiMIw5n*S#S;#=P6_A$9pp}Mg&*LDV?PX)7nE<Cx~?fc)bh>jaya7b zluQy&_o>WaCg-ueOF}zK3OkKks@7{TW18eUW=SmL#XH=OV{7d5kZV=We$2#YKQBQ) z=m!tL1HK*@EHC1XoyD5@#w^a^h-#^lN$%_g=P~;B=-bPGVDu5463_uU$erK{Km21q ppl^@9J=qt1dv}L<mfq0Miq0FjPDkhf9rkY&{4l&9(6@Je`)>k^jEVpN literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_button.svg b/dlls/light.msstyles/blue_button.svg new file mode 100644 index 00000000000..d1c6bd80e64 --- /dev/null +++ b/dlls/light.msstyles/blue_button.svg @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg width="22" height="138" version="1.1" viewBox="0 0 5.8208 36.512" 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(-40.717 -1.1913)" stroke-width=".26458"> + <g fill="#fff"> + <rect x="40.849" y="1.3236" width="5.5563" height="5.8208" rx=".52917" ry=".52917" stroke="#aeaeae"/> + <rect x="40.849" y="19.58" width="5.5563" height="5.8208" rx=".52917" ry=".52917" stroke="#aeaeae"/> + <g stroke="#3096fa"> + <rect x="40.849" y="25.665" width="5.5563" height="5.8208" rx=".52917" ry=".52917"/> + <rect x="40.849" y="31.751" width="5.5563" height="5.8208" rx=".52917" ry=".52917"/> + <rect x="40.849" y="7.409" width="5.5563" height="5.8208" rx=".52917" ry=".52917"/> + </g> + </g> + <rect x="40.849" y="13.494" width="5.5563" height="5.8208" rx=".52917" ry=".52917" fill="#2979ff" stroke="#2979ff"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_checkbox_13px.bmp b/dlls/light.msstyles/blue_checkbox_13px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..7f55d7571e2894d89d4622d3a05c8f893361e795 GIT binary patch literal 8166 zcmeHL%Wm306oo9BRZIT>R7ENfDX}T4#0sg~D$1gpO7s`H4v!6gP^kn6qCZds39Bpu zS#<>;QUPM08Y<nM>oD#ZjAt54D5-4e_>SkEGh;I+o*TbA`5BMc$6K6}z;oam5RD{o zjzs#%|9Ei^y91|QuNS|%x*A+wURnV8fb%!ZM;s!SJDtumF^*T{Jh&Cs0hWp{#<;$| z-e*2QqE9C>f7co@r(fiI7kQoM5S$%r9<n~SxW}SuT{+KwVV?mBXoi5&Z_H=EQ6&|p zQfdHL0QrFPH!J>-O6f9H4}Cq#c`BwVwvNYF@WtBD=YxG{?E4XYI#Jxa4p(r3YJ}b| z@?0V>=GBQi);wT+lDAY!7FFwN`+)tzJ}V{@i13e=-v;cryK^(XXcz;)0>}r}qHf&S z{O0j+*)Yn~QFs*jW!<Q-j>lK=#k$eggMD#7qE9D^d)MI#PEd`|`$e8h<i)%?amShm ztdDuSY??*Yx^kZVg6A3BHI2jq{y|&qH|E2i{4Ndm`am@W*CQ%~dwqbt{;7DhTCMJ( zhH2yP>C?7%5b{nvN<>jSTMK<-U;=#f(#aa|Yq%bveu`lp1MMl|hjpE-LAwCXOTp=O zyIJ(jfK$=OQP#-)qK&yT;7t4d{)y;QX_yC24wys#es%5q24Wnq2u&XNE@{GgG+;eS z)yN)|Q*A1zw|Z2r-|%9Kg4;s9G)DgfT2GI<G^KP6*CRT66{GT@0qqp^(}qV~nqs;@ zRm1TpRbFS2pV3*`<xyGV<r&;x#-6W|bUdok@Ho)qz?(yFdsIiW(&fRmJ-X6_^=QC) zls$?XrfoHjw|Z2r--senT(^KR>fwpiG(9~kYZi60hU*cv-o&6W(4IoK;Za#*HH`v& z`Rmceg_%WuW}O=@kIEV^k1o!SGCbd}`jO*Nm4?SzUYI%X=D!<;?NJ?#t!tQhJfrQ= zl_so5gMWM4!*AOLwt5tMm%PtK!EFI!U;=o0bWKwOZv?~u1DFCE9$nKEz;WKAXlH>L z;PU922I-9>gC3sG@u-G|2gw0*;Ggz-@biG}(bYVUcCSYr6aLTi1ir(<Pg;kjuU%t3 zc8`YNNAJH0yB1Axp<DCG!#n{^SdRv*N9Fb2*4C}XWPPY{zTJlPXz+Seww7l*z&^*{ OH?@!dbe>0BkNyE918kxI literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_checkbox_13px.svg b/dlls/light.msstyles/blue_checkbox_13px.svg new file mode 100644 index 00000000000..d7cafa54296 --- /dev/null +++ b/dlls/light.msstyles/blue_checkbox_13px.svg @@ -0,0 +1,44 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg width="13" height="156" fill="#000000" version="1.1" viewBox="0 0 13 156" 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="none"> + <path d="m0 0h24v24h-24z"/> + <rect x=".5" y=".5" width="12" height="12" rx="2" ry="2" stroke="#aeaeae"/> + <rect x=".5" y="13.5" width="12" height="12" rx="2" ry="2" stroke="#3096fa"/> + <path d="m0.5 25.5h24v24h-24z"/> + <rect x=".5" y="26.5" width="12" height="12" rx="2" ry="2" stroke="#2979ff"/> + <rect x=".5" y="39.5" width="12" height="12" rx="2" ry="2" stroke="#aeaeae"/> + <path d="m4.1723e-7 52h24v24h-24z"/> + <rect x=".5" y="52.5" width="12" height="12" rx="2" ry="2" stroke="#aeaeae"/> + <rect x=".5" y="65.5" width="12" height="12" rx="2" ry="2" stroke="#3096fa"/> + <path d="m0.5 77.5h24v24h-24z"/> + <rect x=".5" y="78.5" width="12" height="12" rx="2" ry="2" stroke="#2979ff"/> + <rect x=".5" y="91.5" width="12" height="12" rx="2" ry="2" stroke="#aeaeae"/> + <path d="m-1.9073e-6 104h24v24h-24z"/> + <rect x=".5" y="104.5" width="12" height="12" rx="2" ry="2" stroke="#aeaeae"/> + <rect x=".5" y="117.5" width="12" height="12" rx="2" ry="2" stroke="#3096fa"/> + <path d="m0.5 129.5h24v24h-24z"/> + <rect x=".5" y="130.5" width="12" height="12" rx="2" ry="2" stroke="#2979ff"/> + <rect x=".5" y="143.5" width="12" height="12" rx="2" ry="2" stroke="#aeaeae"/> + </g> + <path d="m4.8636 60.537-2.1477-2.194-0.71591 0.73134 2.8636 2.9254 6.1364-6.2687-0.71591-0.73134z"/> + <g> + <path d="m4.8636 73.537-2.1477-2.194-0.71591 0.73134 2.8636 2.9254 6.1364-6.2687-0.71591-0.73134z" fill="#3096fa"/> + <path d="m4.8636 99.537-2.1477-2.194-0.71591 0.73134 2.8636 2.9254 6.1364-6.2687-0.71591-0.73134z" fill="#aeaeae"/> + <path d="m4.8636 86.537-2.1477-2.194-0.71591 0.73135 2.8636 2.9254 6.1364-6.2687-0.71591-0.73134z" fill="#2979ff"/> + </g> + <path d="m2 110h9v1h-9z"/> + <g> + <path d="m2 123h9v1h-9z" fill="#3096fa"/> + <path d="m2 136h9v1h-9z" fill="#2979ff"/> + <path d="m2 149h9v1h-9z" fill="#aeaeae"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_checkbox_16px.bmp b/dlls/light.msstyles/blue_checkbox_16px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..6451eb3aa70932ea32451b5d4a63a29e8c3363cc GIT binary patch literal 12342 zcmeHNzi-+=6b4l)8LFmBrwl<=M1Tx7YLux%)3H)Vw)_EEI)h<h>Xa$sM=B-ijs)2< z1du8<Q>KjBGG&RBB?G~x$@O~&FEIvUpXp$bPx^T0<9+x06Zg)1`L?A;WZJ@K5_kvv z2BMKTK9TVKpSJ@H3L=q4qp^B?eB5d_n<gMUf_zVj3)_Y*)a&)vT&J5QU+{`l2Vkmj zx$cvblNfOU!DXtJxC_Lmc~C*bF@6=UoO1_Xb^4v{&nth{{oBDj=2bL6zN9(QEf5F4 z4JhfCxTIfEOsxtd)dEaFcm(;L4!Lb%qzj_7;aUIWEApwLtb^KB;PNIB-`8T`%RY0N zs^zh&^4LE}eC~@^OJiVPd!EbOter!7KZ)D$!zE5Y_%rU`WJeguyov^-en@kq+k7$( z3k@pkw?+EBFK1S*s@?)jKzM{{RrFKIt!eFkRWFFTg8t##ujoapgW6T$@?H`9YccLK zm#JDFt16HEgT&{)c(pVJ_O<7^%+1<4l=qXk4L@As1cX21{>^mywM<?`1LRAZ!}weG zH9c-YgUGAtm$=YAodLr0zrP(Au=DS%=l5Cp%99wd`SaWVxjz3dp#Gy+$RpsZ+k#Hn ze|zAO7P`Qvm+F|n&keZ->=|$iYycCJgTDi(N8rcMc^UQsxCY|DSaR?ia5w~L{G3*h zxdJYM_gu)<!Cyl8EB?-A6Ug5H=fE3Vxk~)L3Emyh0b*Q-qkS%(X1DQ04`>3ipNf2{ zHw!!fWqR<zC)zGhqRfy#*ZN<y_#eWJ;%?yx@sO+j;Un)mXe~L3e0pzK-W9ox7xnMt zqurb=%O?%oiJT#SD{|?n`nU5%A-#j=M_8$Uk^8WWxbOmH*A(M%|Lk^zZ=@P{KBV!p zk0>TqP<DlWT?%7uO#dVNQhZ5d$MugsB;a=gdycqsME`a^w>im*;`%0h?@&jF?rqq| zE1&#DVSO9^JyA$Cxt}V0Sw}vd1?K^f`d8%->)6E_m1KUff5P}bK=Hp2k*HP49Q{4e zUG+aHezYpu-mtveuV^po-^uS+wH%cpHZx$)fLpVyP1V1hZ&tM(JU^OMeW3rJAD8ib zfx50K#-sh_Om=?1nrT>7?U2ULe%+e30-r13QtW5O^l#^jU!RvmJv;XM-z#eg_}u{K zqB5#~JD=N}WUYhDCVcO#YNkW?Htge-PySeoZTR<aZ`9;|s_>}}%xxB&2SDmyl}~kG z47+AUFAehYzATLYgZ2K8_J4T(rwtm3gy;XkJn(0D{vW*aHu?SE0>=Nm)~?oP{P$FE z$X}@cPdu%w*Gw4y%l{69@Bh7S7>A#q_|slR$REGIvCofN{y)uM82<+-{&!n*`}cn0 hzmWet1L6FI@juQ$;s1Z1C83lH<A;TaALjb~-#-V*m*fBd literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_checkbox_16px.svg b/dlls/light.msstyles/blue_checkbox_16px.svg new file mode 100644 index 00000000000..946a90bd983 --- /dev/null +++ b/dlls/light.msstyles/blue_checkbox_16px.svg @@ -0,0 +1,36 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg width="16" height="192" fill="#000000" version="1.1" viewBox="0 0 16 192" 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="none"> + <rect x=".5" y=".5" width="15" height="15" rx="2" ry="2" stroke="#aeaeae"/> + <rect x=".5" y="16.5" width="15" height="15" rx="2" ry="2" stroke="#3096fa"/> + <rect x=".5" y="32.5" width="15" height="15" rx="2" ry="2" stroke="#2979ff"/> + <rect x=".5" y="48.5" width="15" height="15" rx="2" ry="2" stroke="#aeaeae"/> + <rect x=".5" y="64.5" width="15" height="15" rx="2" ry="2" stroke="#aeaeae"/> + <rect x=".5" y="80.5" width="15" height="15" rx="2" ry="2" stroke="#3096fa"/> + <rect x=".5" y="96.5" width="15" height="15" rx="2" ry="2" stroke="#2979ff"/> + <rect x=".5" y="112.5" width="15" height="15" rx="2" ry="2" stroke="#aeaeae"/> + <rect x=".5" y="128.5" width="15" height="15" rx="2" ry="2" stroke="#aeaeae"/> + <rect x=".5" y="144.5" width="15" height="15" rx="2" ry="2" stroke="#3096fa"/> + <rect x=".5" y="160.5" width="15" height="15" rx="2" ry="2" stroke="#2979ff"/> + <rect x=".5" y="176.5" width="15" height="15" rx="2" ry="2" stroke="#aeaeae"/> + </g> + <path d="m5.8182 74.91-2.8636-3.1343-0.95455 1.0448 3.8182 4.1791 8.1818-8.9552-0.95455-1.0448z"/> + <path d="m5.8182 90.91-2.8636-3.1343-0.95455 1.0448 3.8182 4.1791 8.1818-8.9552-0.95455-1.0448z" fill="#3096fa"/> + <path d="m5.8182 106.91-2.8636-3.1343-0.95455 1.0448 3.8182 4.1791 8.1818-8.9552-0.95455-1.0448z" fill="#2979ff"/> + <path d="m5.8182 122.91-2.8636-3.1343-0.95454 1.0448 3.8182 4.1791 8.1818-8.9552-0.95455-1.0448z"/> + <g> + <path d="m2 135h12v2h-12z"/> + <path d="m2 151h12v2h-12z" fill="#3096fa"/> + <path d="m2 167h12v2h-12z" fill="#2979ff"/> + <path d="m2 183h12v2h-12z"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_checkbox_25px.bmp b/dlls/light.msstyles/blue_checkbox_25px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..c9bae2042b0136e5d8b73170799b2e48e5743a62 GIT binary patch literal 30054 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 NBv<ZPs^PQLe*xSO3%>vW literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_checkbox_25px.svg b/dlls/light.msstyles/blue_checkbox_25px.svg new file mode 100644 index 00000000000..8a32f232c81 --- /dev/null +++ b/dlls/light.msstyles/blue_checkbox_25px.svg @@ -0,0 +1,40 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg width="25" height="300" fill="#000000" version="1.1" viewBox="0 0 25 300" 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="1" y="1" width="23" height="23" rx="2" ry="2" fill="none" stroke="#aeaeae" stroke-width="2"/> + <path d="m9.4091 116.87-4.0568-4.7015-1.3523 1.5672 5.4091 6.2687 11.591-13.433-1.3523-1.5672z"/> + <path d="m4 211h17v3h-17z"/> + <g fill="none" stroke-width="2"> + <rect x="1" y="26" width="23" height="23" rx="2" ry="2" stroke="#3096fa"/> + <rect x="1" y="51" width="23" height="23" rx="2" ry="2" stroke="#2979ff"/> + <rect x="1" y="76" width="23" height="23" rx="2" ry="2" stroke="#aeaeae"/> + <rect x="1" y="101" width="23" height="23" rx="2" ry="2" stroke="#aeaeae"/> + <rect x="1" y="126" width="23" height="23" rx="2" ry="2" stroke="#3096fa"/> + <rect x="1" y="151" width="23" height="23" rx="2" ry="2" stroke="#2979ff"/> + <rect x="1" y="176" width="23" height="23" rx="2" ry="2" stroke="#aeaeae"/> + </g> + <g> + <path d="m9.4091 141.87-4.0568-4.7015-1.3523 1.5672 5.4091 6.2687 11.591-13.433-1.3523-1.5672z" fill="#3096fa"/> + <path d="m9.4091 166.87-4.0568-4.7015-1.3523 1.5672 5.4091 6.2687 11.591-13.433-1.3523-1.5672z" fill="#2979ff"/> + <path d="m9.4091 191.87-4.0568-4.7015-1.3523 1.5672 5.4091 6.2687 11.591-13.433-1.3523-1.5672z" fill="#aeaeae"/> + </g> + <g fill="none" stroke-width="2"> + <rect x="1" y="201" width="23" height="23" rx="2" ry="2" stroke="#aeaeae"/> + <rect x="1" y="226" width="23" height="23" rx="2" ry="2" stroke="#3096fa"/> + <rect x="1" y="251" width="23" height="23" rx="2" ry="2" stroke="#2979ff"/> + <rect x="1" y="276" width="23" height="23" rx="2" ry="2" stroke="#aeaeae"/> + </g> + <g> + <path d="m4 236h17v3h-17z" fill="#3096fa"/> + <path d="m4 261h17v3h-17z" fill="#2979ff"/> + <path d="m4 286h17v3h-17z" fill="#aeaeae"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_commandlink.bmp b/dlls/light.msstyles/blue_commandlink.bmp new file mode 100644 index 0000000000000000000000000000000000000000..929a08af852478eb382bd466fd9497ad07cbe6e3 GIT binary patch literal 12990 zcmeI1F;2rU6o%b}4oDoK%}}9~4oyJf0PGxvnKX1@?2I50SKtP1S{4qKIvLFGq)!S` z9c4g5C4Z%tXW7qg^Yyp=65ri_UaRVJi>nVihg}Yo8YmAXrB-PFx~Q$Hz$JeT$HiN) zDUv|L%n{Q%3D)`h%?NE-nFO)<n4L-grnmKFGGEGgt~lvqUM53~xwqdbb!}dLTU(5@ zF}5Z_4&)$n!g}g~dY~Sf1bU+f-Elug9uV%zG>lyF^*$fOSWB`z4ZI?qZ&7yU4^<rU z4CWeKe`V%zAL`Az!`%MxTqW9X^PCr)7fpSfs2=`2*Jv_inFL6H1W14cNPq->n}B(m zj?H4afoYgIVzz#59%m!?%q*^A^Xxc7K|NxYuzEa4oZN$Xm<$oShjn_+vT=-6iX3VM zkpnr%T4Fu*Ks`_oO#(mkpk4d6^f>It*zf%vEON!$`YI2w`9S1*n0H%PTmF#QJcDN_ wJVOz!o#?y4PI)Ttt^SwEfgEJMTTeaoMh`qgX$qfZ5+DH*AOR8}fqzHf8^!81*Z=?k literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_commandlink.svg b/dlls/light.msstyles/blue_commandlink.svg new file mode 100644 index 00000000000..97f72bfd651 --- /dev/null +++ b/dlls/light.msstyles/blue_commandlink.svg @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg width="11" height="294" version="1.1" viewBox="0 0 2.9104 77.788" 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="none" stroke-linecap="round" stroke-width=".26458"> + <rect x=".13229" y="13.097" width="2.6456" height="12.7" rx=".52917" ry=".52917" stroke="#3096fa"/> + <rect x=".13229" y="26.061" width="2.6456" height="12.7" rx=".52917" ry=".52917" stroke="#2979ff"/> + <rect x=".13229" y="51.991" width="2.6456" height="12.7" rx=".52917" ry=".52917" stroke="#3096fa"/> + <rect x=".13229" y="64.955" width="2.6456" height="12.7" rx=".52917" ry=".52917" stroke="#3096fa"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_commandlink_glyph_30px.bmp b/dlls/light.msstyles/blue_commandlink_glyph_30px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..76789b095575b8d12fdf51ac96b6486d69fe2c27 GIT binary patch literal 18054 zcmeI2O-{m45P<6iJc4lvZ5qnP1GsQ!;sVaX&qml7_e#A)Dcr$R)h@<qv6!#`U;8p$ z_>oKrwDUgr-t;w-y!*$OhoFAl>2aWOqmgP{1-E((f+s!yd3}ib3l12-z`r+8q@#7Q zNmiC3inloaN|RDU%-Lx&ZP?{U@@)FQVT-Htsz!W;3)>g78mCCduNHMyY{nDi9qucb zUX}Oa_I(r`=hJ$PR-RSedYvc+!vF>_fB_6(z}Y~a=j-iuyK+wKkg(tHW960_V$D|O zv|;adJJWs;b}p{Ys~YhYE^J@SpK(n3LA{qI%B$}yeTUg$jXF*3!)=yjQ8S;`>tw~V zs-aWYe8vC<Fn|FJV8GUZEW))c!<8jfW`kH3!%{=c+4FFEWX}ht{h+`WadckSNL433 z!h!9D*Zk(?(4;q$MKn3qHcYQeS}$&AVe~tn#%r`b6U3;7yiOE@VE_XdzyJm?;B0{X zqRz@%Clu@#Wxr_a>bacQ%brH|s9v6!mRA()7j0>dGz?$>0~o*n23!o#54zaub}jv2 gLO<B8gwAHu51!T2>0~c%=?6Q_8Oa#Hz~2pg1CC}%!~g&Q literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_commandlink_glyph_30px.svg b/dlls/light.msstyles/blue_commandlink_glyph_30px.svg new file mode 100644 index 00000000000..9d0e199b42c --- /dev/null +++ b/dlls/light.msstyles/blue_commandlink_glyph_30px.svg @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg width="30" height="150" version="1.1" viewBox="0 0 7.9375 39.688" 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.7625 2.1167-0.37306 0.37306 1.2118 1.2144h-4.2783v0.52917h4.2783l-1.2144 1.2144 0.37571 0.37306 1.8521-1.8521z" fill="#3096fa"/> + <path d="m4.7625 10.054-0.37306 0.37306 1.2118 1.2144h-4.2783v0.52917h4.2783l-1.2144 1.2144 0.37571 0.37306 1.8521-1.8521z" fill="#3096fa"/> + <path d="m4.7625 17.992-0.37306 0.37306 1.2118 1.2144h-4.2783v0.52917h4.2783l-1.2144 1.2144 0.37571 0.37306 1.8521-1.8521z" fill="#2979ff"/> + <path d="m4.7625 25.929-0.37306 0.37306 1.2118 1.2144h-4.2783v0.52917h4.2783l-1.2144 1.2144 0.37571 0.37306 1.8521-1.8521z" fill="#aeaeae"/> + <path d="m4.7625 33.867-0.37306 0.37306 1.2118 1.2144h-4.2783v0.52917h4.2783l-1.2144 1.2144 0.37571 0.37306 1.8521-1.8521z" fill="#3096fa"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_commandlink_glyph_45px.bmp b/dlls/light.msstyles/blue_commandlink_glyph_45px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..a05919387b97f7c43080ff215cc78208d1c58cdd GIT binary patch literal 40554 zcmeI5PiqrF7>5&3^q?Npi;7S|+9Xx8OQq-H-A~X{FDVF~Qf$+D2=rV^jk_VB2HKtq z{g;K_Bv5ZHIhN2%!4F|23GM5<8#mpZ^pI?_=8gOclij4dlP3?8*%^N9<jvc6-y+W6 zBtOQuyyWteOEfaVkCDi0{{N4A&EmX(2N-|>7=Qs7fB_izj||k!<V@YvHYhuFV;DYG zJ)fLq-U}|&F!d6BdVWhXH&G<Yj@NBox719{qT<wT@!WaMaGC#Z%Vdn-5zlQT*Zkc2 zA$=XYE1uibSNz=C5q%lIFPYnBs~K9>$DP+J^m+1ubnb?kocD2?+6fgV9*O5Rv^gKQ zk*xm8>5qHi_SNU<t3rPL^xSyyG$?n-Y_0yf{eATBL&kjeJNN2YQ0B1DYvlDbJHBjr z=JtG^Pd*9zeS_9NZ2d+XuiZZvCLRX;{9&J0Gxg<GTd?~gLpzpw9c+&8v{fIkDR;c# z@EUr~&#Q?Z*VXe{(aSpw<7ehgadGA;4zKWeiu;|e<+W-4zHM^<aMOJaTNr==7=Qs7 zfB_hQ0T_S*7=Qs7fB_hQfp87%?Ci{N*(jIGLy^&MZ*R{s?*$j){nEj~f$)r;qPx4h z>o%{aSjA#dct-DV8y;qxzr3}zB|M|2D08kU+=u)7`@%DNhkHfgK4RbEGkX3WW)<!V zKNp|TGvmC%eZrqbd`8dAa|(Br+jmbHy;7gIuL^VjbZ>7ja7I5MX4^;LjD8Tz+@{Y; zrIOf;p83-3<<jG(%Ke_$jGj4%s^7SVw_;hA*o>ar!?LF>5RadZrCtY#oN>~smzVd& zjyG&x_M209MUU&4x2W)nA3t-OO);}GPvNa4eV*dZGMROn%VwcaKt}IM!4?K!00v+H z24DaNU;qYS00v+H24DaNLN-8|#0)LOhvq(d=AETX{DKS7LZU?Ph2KZd%QG?Sy2EQT zH;YBt5!o5N&Ak{m6z(!*h2KZ-_>Qe9+=ui*_<i&acVflQ9Xn#*;xl?$Ol1As@d{;P z;xl^g_vRJu6K?b3GkWd==ltA>D!1>RGJ1b~t$xbwufp1%(o*pI=m*5iE@FW*`T;SY z(Z?~d89gn=((L8($_=;YrBSgN{jl{L*YH*-Jt{V%=XS7s)fSw-=veA?kecJWRfSjV zc%#Xi$SJ&{$8|i;FDkt9$IlC~6f-yHDVew>eV*b@GuibtU*9$<h5P7TC)mOO48Q;k zzyJ)u01UtY48Q;kzyJ)uK-dPb)_u5!vDSUKe%0EWYq?^rd(}&r&#~5hn0DLiZeXo@ zM~Zj-<A1x4weH(nW$;(9)_rhyot%la?mMv*>=>+dAIw`fXJM`TZfx~-EY`a3%^%K& z0T_S*7=Qs7fB_hQ0T_S*7=Qs7fPo+ekkJRR*7-Te=sS1Sk0X)M_rqd$bs(ef&R4HT zBcpE`{I|J0|1P%u+t^M)M&D~2_MVT7-fN@(`^f0~@6@dk8NF*Fye%^N@Z733BcoT1 S;5iJy01UtY48VY71AhQDzZ!`E literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_commandlink_glyph_45px.svg b/dlls/light.msstyles/blue_commandlink_glyph_45px.svg new file mode 100644 index 00000000000..04825c4669b --- /dev/null +++ b/dlls/light.msstyles/blue_commandlink_glyph_45px.svg @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg width="45" height="225" version="1.1" viewBox="0 0 11.906 59.531" 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="m7.1834 3.175-0.57825 0.55959 1.8783 1.8217h-6.6314v0.79375h6.6314l-1.8824 1.8217 0.58235 0.55959 2.8707-2.7781z" fill="#3096fa"/> + <path d="m7.1834 15.081-0.57825 0.5596 1.8783 1.8217h-6.6314v0.79375h6.6314l-1.8824 1.8217 0.58235 0.55959 2.8707-2.7781z" fill="#3096fa"/> + <path d="m7.1834 26.988-0.57825 0.5596 1.8783 1.8217h-6.6314v0.79375h6.6314l-1.8824 1.8217 0.58235 0.55959 2.8707-2.7781z" fill="#2979ff"/> + <path d="m7.1834 50.8-0.57825 0.5596 1.8783 1.8217h-6.6314v0.79375h6.6314l-1.8824 1.8217 0.58235 0.55959 2.8707-2.7781z" fill="#3096fa"/> + <path d="m7.1834 38.894-0.57825 0.5596 1.8783 1.8217h-6.6314v0.79375h6.6314l-1.8824 1.8217 0.58235 0.55959 2.8707-2.7781z" fill="#aeaeae"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_groupbox.bmp b/dlls/light.msstyles/blue_groupbox.bmp new file mode 100644 index 0000000000000000000000000000000000000000..5b8f94cebb6a75f6afa42507d17b114379b759ec GIT binary patch literal 1814 zcmZ?r6=P=r12Z700mNcJECR%g3<^M!f#Crg1H)lH2nGuPiM4Cj%CBF)e)qa{>wW_9 ze+n_kj9nlzf%G0AUA1b}Dxj^D0gxF$^Qu8+1MyF4m<e;ywr$(kL1qH+f0!7xXpots z<}xshh65x;jfTT$I3SlTG)@n+Dkt{>-CaSAG8kkAsEz>DKR~PiG<OdWQ>7jPnF*?g E03>V+W&i*H literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_groupbox.svg b/dlls/light.msstyles/blue_groupbox.svg new file mode 100644 index 00000000000..803e8cb7f34 --- /dev/null +++ b/dlls/light.msstyles/blue_groupbox.svg @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg width="5.8208mm" height="5.2917mm" version="1.1" viewBox="0 0 5.8208 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 transform="translate(0,-1)"> + <rect x=".13229" y="1.1323" width="5.5563" height="5.0271" rx=".52917" ry=".52917" fill="none" stroke="#aeaeae" stroke-width=".26458"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_radiobutton_13px.bmp b/dlls/light.msstyles/blue_radiobutton_13px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..73d8a2e6c89819d23a1ea6b72d591250b0233bb0 GIT binary patch literal 5462 zcmeHLyG|QX5OpLTO_DAhffPvCCc=x5(qN=0W$Z|)@(IRGT7pBvHy~KzBCW9y&j#U& zB9-lLU@5?SfI&RgNH^!)N7&beA}JtZrSaUEIkR`}+#`0951+ogO3CLPe$$W_kTT?1 z>J5HVsW*uKdZ|P@B0pPOTY1PD<OFgJIfm3WH#esv(A2@fK_C1s;z!W4>+9>okO6A= z%Jf5)i8Hwx-`L&VWofa8e&jTm#~^ebIiA5|U4X9%Iiud#*!W1C&SM?Z+uPf9NQr)p z7r=(Z<iXE6Ymn2Oot@XrL2f&W*LG9Ca|E{R56?><?5-uJ%lO{j-XP*vkPd1ZqVK+a zbRSQG=RtlkX&+!d^PPD2EaEksWd`~X?|4qX&TAoljx}|Ge)bJ(557EYtX;fo-{jF3 ze9Zk2XZ(f-d=GL<>|?cB?T0-?n||VhJTSSe6PP;o??8NNZOeKLE~v$~@w}*H)*vU4 zYf(ubL)S!QEXGl>_`VM@7jh&j*;(Wci^cH)spqq0<<Be=XZFzehL{^m<S6~XG$4|r zx*pHq#rI4Bu_ok9YspcahdRcl;jfGNwB)G93;3d<@>HETU*=RSyp<fqx}AV$zT~J_ z$c$jE`h)ZGY_PkQ9LZ7fb#xH%D@aGojY^JUefK`>r`qTCJe712zUWzKOODEWkoT3H z!TJ#QAvubBL|(cD+_}`~qpVx?+hd>gIdGrZeUnFD@Cn?{AC3li;IZ%QqbN=F^PJMI zWIXKa26<rKiM>!K?u&h?WPGjbrXGU}>fTB&@4LCRp6i_Wu5;a6b&ma2rv{zKQD9ui zk-wUoy{t|Ri}mpVYTunKOTX)cI7<Ar>omkq3rFE+95~5QRgdEt{Eh1r5NkrtsBeBa zifhP&eZ)GkcO7fVQH>X{Lt^q|oj4!%JiS;^9Q9Y6b`-B|$<fQ@$q~~Zo|pYYylcr( z99<e6MEnYQor|Rj$<cfFK_AsVf%B~9ib?yRe#ueZgS;<yVg|TFv7$J7qw-qtokLpe z3+rZIVSDVeJ_qh+a^K|97kr4<_Y>kM-a#ICkP`bSs#E<uCvELd<Y-UUIaz04fb*4x zt?LQyZPxso4|%ZPdeq6@k}GFg-}$ZAcmW+1nTNB+zV*Pi6Y$Kpe(Mn<7o&U7wtnjo zyK|qUZ#{B~mVNI0*6X|$^f`oDa`Z8N>mLC}(cbuDn@8iwu*bsDFeqYSwu;T85lGBT znnz=xh{M9s2r6u%w#0cfjJmZRBS-c8_h9GI+wO)}ws|y+id!OK9*v{Io}_s+jEGxF z^Jp9u_TVmJ^Jo|mw`}uh9H~6IZ%^}R;NMJ`IsR%Mwf5RFkJ|9YpEQq}m`x|mqc*JZ si-dX9#B7>#eRLkRVU6E5kD7Q?Kh2~6{{Nn$JvR2!w_bJPfBn|~27<_BApigX literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_radiobutton_13px.svg b/dlls/light.msstyles/blue_radiobutton_13px.svg new file mode 100644 index 00000000000..b46c8b97b1a --- /dev/null +++ b/dlls/light.msstyles/blue_radiobutton_13px.svg @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg width="13" height="104" version="1.1" viewBox="0 0 13 104" 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="m10 58.5a3.5 3.5 0 0 1-3.5 3.5 3.5 3.5 0 0 1-3.5-3.5 3.5 3.5 0 0 1 3.5-3.5 3.5 3.5 0 0 1 3.5 3.5z"/> + <g fill="none"> + <ellipse cx="6.5" cy="6.5" rx="6" ry="6" stroke="#aeaeae"/> + <ellipse cx="6.5" cy="19.5" rx="6" ry="6" stroke="#3096fa"/> + <ellipse cx="6.5" cy="32.5" rx="6" ry="6" stroke="#2979ff"/> + <ellipse cx="6.5" cy="45.5" rx="6" ry="6" stroke="#aeaeae"/> + <ellipse cx="6.5" cy="58.5" rx="6" ry="6" stroke="#aeaeae"/> + <ellipse cx="6.5" cy="71.5" rx="6" ry="6" stroke="#3096fa"/> + <ellipse cx="6.5" cy="84.5" rx="6" ry="6" stroke="#2979ff"/> + <ellipse cx="6.5" cy="97.5" rx="6" ry="6" stroke="#aeaeae"/> + </g> + <g> + <path d="m10 71.5a3.5 3.5 0 0 1-3.5 3.5 3.5 3.5 0 0 1-3.5-3.5 3.5 3.5 0 0 1 3.5-3.5 3.5 3.5 0 0 1 3.5 3.5z" fill="#3096fa"/> + <path d="m10 84.5a3.5 3.5 0 0 1-3.5 3.5 3.5 3.5 0 0 1-3.5-3.5 3.5 3.5 0 0 1 3.5-3.5 3.5 3.5 0 0 1 3.5 3.5z" fill="#2979ff"/> + <path d="m10 97.5a3.5 3.5 0 0 1-3.5 3.5 3.5 3.5 0 0 1-3.5-3.5 3.5 3.5 0 0 1 3.5-3.5 3.5 3.5 0 0 1 3.5 3.5z" fill="#aeaeae"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_radiobutton_16px.bmp b/dlls/light.msstyles/blue_radiobutton_16px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..f7e3d4ca3bd09d235201e7e6a3135beb8239566b GIT binary patch literal 8246 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 Y``LNC|JNe_|CgeE@UOME<Ntqu01qSLIsgCw literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_radiobutton_16px.svg b/dlls/light.msstyles/blue_radiobutton_16px.svg new file mode 100644 index 00000000000..d9c53d1d2d7 --- /dev/null +++ b/dlls/light.msstyles/blue_radiobutton_16px.svg @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg width="16" height="128" version="1.1" viewBox="0 0 16 128" 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="m13 72a5 5 0 0 1-5 5 5 5 0 0 1-5-5 5 5 0 0 1 5-5 5 5 0 0 1 5 5z"/> + <g fill="none"> + <circle cx="8" cy="8" r="7.5" stroke="#aeaeae"/> + <circle cx="8" cy="24" r="7.5" stroke="#3096fa"/> + <circle cx="8" cy="40" r="7.5" stroke="#2979ff"/> + <circle cx="8" cy="56" r="7.5" stroke="#aeaeae"/> + <circle cx="8" cy="72" r="7.5" stroke="#aeaeae"/> + <circle cx="8" cy="88" r="7.5" stroke="#3096fa"/> + <circle cx="8" cy="104" r="7.5" stroke="#2979ff"/> + <circle cx="8" cy="120" r="7.5" stroke="#aeaeae"/> + </g> + <g> + <path d="m13 88a5 5 0 0 1-5 5 5 5 0 0 1-5-5 5 5 0 0 1 5-5 5 5 0 0 1 5 5z" fill="#3096fa" stroke="#3096fa"/> + <path d="m13 104a5 5 0 0 1-5 5 5 5 0 0 1-5-5 5 5 0 0 1 5-5 5 5 0 0 1 5 5z" fill="#2979ff"/> + <path d="m13 120a5 5 0 0 1-5 5 5 5 0 0 1-5-5 5 5 0 0 1 5-5 5 5 0 0 1 5 5z" fill="#aeaeae"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_radiobutton_25px.bmp b/dlls/light.msstyles/blue_radiobutton_25px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..8cc7b112e961b3d2ae9a45c0fa49597eb53f41d4 GIT binary patch literal 20054 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 literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_radiobutton_25px.svg b/dlls/light.msstyles/blue_radiobutton_25px.svg new file mode 100644 index 00000000000..b9934537557 --- /dev/null +++ b/dlls/light.msstyles/blue_radiobutton_25px.svg @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg width="25" height="200" version="1.1" viewBox="0 0 25 200" 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="none" stroke-width="2"> + <ellipse cx="12.5" cy="12.5" rx="11.5" ry="11.5" stroke="#aeaeae"/> + <ellipse cx="12.5" cy="37.5" rx="11.5" ry="11.5" stroke="#3096fa"/> + <ellipse cx="12.5" cy="62.5" rx="11.5" ry="11.5" stroke="#2979ff"/> + <ellipse cx="12.5" cy="87.5" rx="11.5" ry="11.5" stroke="#aeaeae"/> + <ellipse cx="12.5" cy="112.5" rx="11.5" ry="11.5" stroke="#aeaeae"/> + <ellipse cx="12.5" cy="137.5" rx="11.5" ry="11.5" stroke="#3096fa"/> + <ellipse cx="12.5" cy="162.5" rx="11.5" ry="11.5" stroke="#2979ff"/> + <ellipse cx="12.5" cy="187.5" rx="11.5" ry="11.5" stroke="#aeaeae"/> + </g> + <path d="m20 112.5a7.5 7.5 0 0 1-7.5 7.5 7.5 7.5 0 0 1-7.5-7.5 7.5 7.5 0 0 1 7.5-7.5 7.5 7.5 0 0 1 7.5 7.5z"/> + <g> + <path d="m20 137.5a7.5 7.5 0 0 1-7.5 7.5 7.5 7.5 0 0 1-7.5-7.5 7.5 7.5 0 0 1 7.5-7.5 7.5 7.5 0 0 1 7.5 7.5z" fill="#3096fa"/> + <path d="m20 162.5a7.5 7.5 0 0 1-7.5 7.5 7.5 7.5 0 0 1-7.5-7.5 7.5 7.5 0 0 1 7.5-7.5 7.5 7.5 0 0 1 7.5 7.5z" fill="#2979ff"/> + <path d="m20 187.5a7.5 7.5 0 0 1-7.5 7.5 7.5 7.5 0 0 1-7.5-7.5 7.5 7.5 0 0 1 7.5-7.5 7.5 7.5 0 0 1 7.5 7.5z" fill="#aeaeae"/> + </g> +</svg> diff --git a/dlls/light.msstyles/light.rc b/dlls/light.msstyles/light.rc index dccda341b7c..ea138423e8e 100644 --- a/dlls/light.msstyles/light.rc +++ b/dlls/light.msstyles/light.rc @@ -179,8 +179,159 @@ BLUE_INI TEXTFILE "\r\n; Flat menus\r\n" "FlatMenus = true\r\n" + +"\r\n; Button\r\n" +"[Button.Pushbutton]\r\n" +"BgType = ImageFile\r\n" +"SizingMargins = 8, 8, 8, 8\r\n" +"SizingType = Stretch\r\n" +"ContentMargins = 3, 3, 3, 3\r\n" +"ImageFile = blue_button.bmp\r\n" +"ImageCount = 6\r\n" +"ImageLayout = Vertical\r\n" +"TextColor = 0 0 0\r\n" +"MinSize = 10, 5\r\n" + +"[Button.Pushbutton(Pressed)]\r\n" +"TextColor = 255 255 255\r\n" + +"[Button.Pushbutton(Disabled)]\r\n" +"TextColor = 166 166 166\r\n" + +"[Button.Checkbox]\r\n" +"BgType = ImageFile\r\n" +"ImageLayout = Vertical\r\n" +"SizingType = TrueSize\r\n" +"SizingMargins = 0, 0, 0, 0\r\n" +"ContentMargins = 0, 0, 0, 0\r\n" +"ImageCount = 12\r\n" +"MirrorImage = False\r\n" +"ImageSelectType = Dpi\r\n" +"UniformSizing = True\r\n" +"Transparent = True\r\n" +"ImageFile1 = blue_checkbox_13px.bmp\r\n" +"ImageFile2 = blue_checkbox_16px.bmp\r\n" +"ImageFile3 = blue_checkbox_25px.bmp\r\n" +"MinDpi1 = 96\r\n" +"MinDpi2 = 118\r\n" +"MinDpi3 = 185\r\n" + +"[Button.Checkbox(Checkeddisabled)]\r\n" +"TextColor = 189 189 189\r\n" + +"[Button.Checkbox(Uncheckeddisabled)]\r\n" +"TextColor = 189 189 189\r\n" + +"[Button.Checkbox(Mixeddisabled)]\r\n" +"TextColor = 189 189 189\r\n" + +"[Button.Radiobutton]\r\n" +"BgType = ImageFile\r\n" +"ImageLayout = Vertical\r\n" +"Transparent = True\r\n" +"SizingType = TrueSize\r\n" +"SizingMargins = 0, 0, 0, 0\r\n" +"ContentMargins = 0, 0, 0, 0\r\n" +"ImageCount = 8\r\n" +"ImageSelectType = Dpi\r\n" +"UniformSizing = True\r\n" +"ImageFile1 = blue_radiobutton_13px.bmp\r\n" +"ImageFile2 = blue_radiobutton_16px.bmp\r\n" +"ImageFile3 = blue_radiobutton_25px.bmp\r\n" +"MinDpi1 = 96\r\n" +"MinDpi2 = 118\r\n" +"MinDpi3 = 185\r\n" + +"[Button.Radiobutton(Checkeddisabled)]\r\n" +"TextColor = 189 189 189\r\n" + +"[Button.Radiobutton(Uncheckeddisabled)]\r\n" +"TextColor = 189 189 189\r\n" + +"[Button.Groupbox]\r\n" +"TextColor = 0 0 0\r\n" +"BgType = ImageFile\r\n" +"SizingMargins = 5, 5, 5, 5\r\n" +"SizingType = Tile\r\n" +"ImageFile = blue_groupbox.bmp\r\n" +"BorderOnly = True\r\n" +"Transparent = True\r\n" + +"[Button.Commandlink]\r\n" +"BgType = ImageFile\r\n" +"BorderSize = 0\r\n" +"ContentMargins = 7, 7, 10, 10\r\n" +"Font = Tahoma, 10\r\n" +"BodyFont = Tahoma, 8\r\n" +"ImageFile = blue_commandlink.bmp\r\n" +"ImageCount = 6\r\n" +"ImageLayout = Vertical\r\n" +"SizingType = Stretch\r\n" +"SizingMargins = 5, 5, 24, 24\r\n" +"Transparent = True\r\n" +"TextColor = 0 0 0\r\n" +"MinSize = 10, 5\r\n" + +"[Button.Commandlink(Hot)]\r\n" +"TextColor = 48 150 250\r\n" + +"[Button.Commandlink(Pressed)]\r\n" +"TextColor = 41 121 255\r\n" + +"[Button.Commandlink(Disabled)]\r\n" +"TextColor = 174 174 174\r\n" + +"[Button.CommandlinkGlyph]\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" +"Transparent = True\r\n" +"UniformSizing = True\r\n" +"ImageFile1 = blue_commandlink_glyph_30px.bmp\r\n" +"ImageFile2 = blue_commandlink_glyph_45px.bmp\r\n" +"MinDpi1 = 96\r\n" +"MinDpi2 = 144\r\n" } +/* All following bitmaps are of 32-bit ARGB format */ + +/* Button */ +/* @makedep: blue_button.bmp */ +BLUE_BUTTON_BMP BITMAP "blue_button.bmp" + +/* @makedep: blue_checkbox_13px.bmp */ +BLUE_CHECKBOX_13PX_BMP BITMAP "blue_checkbox_13px.bmp" + +/* @makedep: blue_checkbox_16px.bmp */ +BLUE_CHECKBOX_16PX_BMP BITMAP "blue_checkbox_16px.bmp" + +/* @makedep: blue_checkbox_25px.bmp */ +BLUE_CHECKBOX_25PX_BMP BITMAP "blue_checkbox_25px.bmp" + +/* @makedep: blue_radiobutton_13px.bmp */ +BLUE_RADIOBUTTON_13PX_BMP BITMAP "blue_radiobutton_13px.bmp" + +/* @makedep: blue_radiobutton_16px.bmp */ +BLUE_RADIOBUTTON_16PX_BMP BITMAP "blue_radiobutton_16px.bmp" + +/* @makedep: blue_radiobutton_25px.bmp */ +BLUE_RADIOBUTTON_25PX_BMP BITMAP "blue_radiobutton_25px.bmp" + +/* @makedep: blue_groupbox.bmp */ +BLUE_GROUPBOX_BMP BITMAP "blue_groupbox.bmp" + +/* @makedep: blue_commandlink.bmp */ +BLUE_COMMANDLINK_BMP BITMAP "blue_commandlink.bmp" + +/* @makedep: blue_commandlink_glyph_30px.bmp */ +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" + /* File version */ #define WINE_FILEDESCRIPTION_STR "Light Theme" #define WINE_FILENAME_STR "light.msstyles" -- 2.30.2

2 1

[PATCH 1/6] server: Introduce IOCTL_AFD_WINE_GET_SO_ACCEPTCONN.
by Zebediah Figura 23 Jun '21

23 Jun '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- include/wine/afd.h | 1 + server/sock.c | 14 ++++++++++++++ 2 files changed, 15 insertions(+) diff --git a/include/wine/afd.h b/include/wine/afd.h index e497eece0be..4c501872dde 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -159,6 +159,7 @@ struct afd_get_events_params #define IOCTL_AFD_WINE_GETPEERNAME CTL_CODE(FILE_DEVICE_NETWORK, 216, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_AFD_WINE_DEFER CTL_CODE(FILE_DEVICE_NETWORK, 217, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_AFD_WINE_GET_INFO CTL_CODE(FILE_DEVICE_NETWORK, 218, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_AFD_WINE_GET_SO_ACCEPTCONN CTL_CODE(FILE_DEVICE_NETWORK, 219, METHOD_BUFFERED, FILE_ANY_ACCESS) struct afd_create_params { diff --git a/server/sock.c b/server/sock.c index b73fbb98388..71f22845827 100644 --- a/server/sock.c +++ b/server/sock.c @@ -2532,6 +2532,20 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) return 0; } + case IOCTL_AFD_WINE_GET_SO_ACCEPTCONN: + { + int listening = (sock->state == SOCK_LISTENING); + + if (get_reply_max_size() < sizeof(listening)) + { + set_error( STATUS_BUFFER_TOO_SMALL ); + return 0; + } + + set_reply_data( &listening, sizeof(listening) ); + return 1; + } + default: set_error( STATUS_NOT_SUPPORTED ); return 0; -- 2.30.2

2 8

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

23 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.31.1

2 4

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