February 2022 - Wine-Commits

Jan Sikorski : wined3d: Reinitialize query pool's free list entry when it runs out.
by Alexandre Julliard Feb. 11, 2022

Feb. 11, 2022

Module: wine Branch: master Commit: 8981c32fa28b179c80f1d869473db1f7089fb159 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8981c32fa28b179c80f1d869… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Thu Feb 10 15:21:55 2022 +0100 wined3d: Reinitialize query pool's free list entry when it runs out. We check if it's empty to put it back in. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_vk.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index f3ec5c03c85..ac8a5770cd8 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -1446,6 +1446,7 @@ bool wined3d_context_vk_allocate_query(struct wined3d_context_vk *context_vk, if (wined3d_query_pool_vk_allocate_query(pool_vk, &idx)) goto done; list_remove(&pool_vk->entry); + list_init(&pool_vk->entry); } if (!(pool_vk = heap_alloc_zero(sizeof(*pool_vk))))

1 0

Piotr Caban : msvcp60: Remove basic_ios<wchar> code.
by Alexandre Julliard Feb. 11, 2022

Feb. 11, 2022

Module: wine Branch: master Commit: 2f7ae6fe3bb5a352501f9758d741525c0f9d8ddc URL: https://source.winehq.org/git/wine.git/?a=commit;h=2f7ae6fe3bb5a352501f9758… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Feb 11 14:17:56 2022 +0100 msvcp60: Remove basic_ios<wchar> code. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp60/ios.c | 498 ++++++++++++++++++++-------------------------- dlls/msvcp60/msvcp60.spec | 56 +++--- 2 files changed, 246 insertions(+), 308 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2f7ae6fe3bb5a352501f…

1 0

Piotr Caban : msvcp60: Remove unused functions from ios.c file.
by Alexandre Julliard Feb. 11, 2022

Feb. 11, 2022

Module: wine Branch: master Commit: 43cae812e54ad89d51895b61b32888df9d5d2fc8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=43cae812e54ad89d51895b61… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Feb 11 14:19:53 2022 +0100 msvcp60: Remove unused functions from ios.c file. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp60/ios.c | 1474 +++++++++------------------------------------------- 1 file changed, 254 insertions(+), 1220 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=43cae812e54ad89d5189…

1 0

Alexandre Julliard : Release 7.2.
by Alexandre Julliard Feb. 11, 2022

Feb. 11, 2022

Module: wine Branch: master Commit: d318f43559dbb0093e22bab1aa0eb9dc01170cc2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d318f43559dbb0093e22bab1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 11 21:32:05 2022 +0100 Release 7.2. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 1284 +++++++++++++++++++++++++++++++++++-------------------------- AUTHORS | 1 + VERSION | 2 +- configure | 18 +- 4 files changed, 753 insertions(+), 552 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d318f43559dbb0093e22…

1 0

Bernhard Kölbl : include/windows.foundation.idl: Add more declares.
by Alexandre Julliard Feb. 11, 2022

Feb. 11, 2022

Module: wine Branch: master Commit: 8d5791a928f4cbada2345beb80951eb8e6fd05dc URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d5791a928f4cbada2345beb… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Mon Jan 31 13:51:47 2022 +0100 include/windows.foundation.idl: Add more declares. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/windows.foundation.idl | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/include/windows.foundation.idl b/include/windows.foundation.idl index a4ee7303ddb..8abb3275fa7 100644 --- a/include/windows.foundation.idl +++ b/include/windows.foundation.idl @@ -158,9 +158,13 @@ namespace Windows { namespace Windows { namespace Foundation { declare { + interface Windows.Foundation.Collections.IIterable<HSTRING>; + interface Windows.Foundation.Collections.IIterator<HSTRING>; + interface Windows.Foundation.Collections.IVectorView<HSTRING>; + interface Windows.Foundation.Collections.IVector<HSTRING>; + interface Windows.Foundation.Collections.IMapView<HSTRING, Windows.Foundation.Collections.IVectorView<HSTRING>*>; interface Windows.Foundation.AsyncOperationCompletedHandler<boolean>; interface Windows.Foundation.IAsyncOperation<boolean>; - interface Windows.Foundation.Collections.IVectorView<HSTRING>; } } }

1 0

Bernhard Kölbl : include/windows.globalization.idl: Add Language class and interfaces.
by Alexandre Julliard Feb. 11, 2022

Feb. 11, 2022

Module: wine Branch: master Commit: 09caab16c98852aed4f7becbb9a6b1391db5f587 URL: https://source.winehq.org/git/wine.git/?a=commit;h=09caab16c98852aed4f7becb… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Mon Jan 31 13:51:48 2022 +0100 include/windows.globalization.idl: Add Language class and interfaces. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/windows.globalization.idl | 132 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 132 insertions(+) diff --git a/include/windows.globalization.idl b/include/windows.globalization.idl index c08f7bd27d9..03c44703b7e 100644 --- a/include/windows.globalization.idl +++ b/include/windows.globalization.idl @@ -29,9 +29,31 @@ import "windows.foundation.idl"; namespace Windows { namespace Globalization { typedef enum DayOfWeek DayOfWeek; + typedef enum LanguageLayoutDirection LanguageLayoutDirection; + interface ILanguage; + interface ILanguage2; + interface ILanguage3; + interface ILanguageExtensionSubtags; + interface ILanguageFactory; + interface ILanguageStatics; + interface ILanguageStatics2; + interface ILanguageStatics3; + runtimeclass Language; } } +namespace Windows { + namespace Globalization { + declare{ + interface Windows.Foundation.Collections.IIterable<Windows.Globalization.Language*>; + interface Windows.Foundation.Collections.IIterator<Windows.Globalization.Language*>; + interface Windows.Foundation.Collections.IVectorView<Windows.Globalization.Language*>; + interface Windows.Foundation.Collections.IVector<Windows.Globalization.Language*>; + } + } +} + + namespace Windows { namespace Globalization { [contract(Windows.Foundation.UniversalApiContract, 1.0)] @@ -45,5 +67,115 @@ namespace Windows { Friday = 5, Saturday = 6 }; + + [contract(Windows.Foundation.UniversalApiContract, 6.0)] + enum LanguageLayoutDirection + { + Ltr = 0, + Rtl = 1, + TtbLtr = 2, + TtbRtl = 3, + }; + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Globalization.Language), + uuid(ea79a752-f7c2-4265-b1bd-c4dec4e4f080) + ] + interface ILanguage : IInspectable + { + [propget] HRESULT LanguageTag([out, retval] HSTRING *value); + [propget] HRESULT DisplayName([out, retval] HSTRING *value); + [propget] HRESULT NativeName([out, retval] HSTRING *value); + [propget] HRESULT Script([out, retval] HSTRING *value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 6.0), + exclusiveto(Windows.Globalization.Language), + uuid(6a47e5b5-d94d-4886-a404-a5a5b9d5b494) + ] + interface ILanguage2 : IInspectable + { + [propget] HRESULT LayoutDirection([out, retval] Windows.Globalization.LanguageLayoutDirection *value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 10.0), + exclusiveto(Windows.Globalization.Language), + uuid(c6af3d10-641a-5ba4-bb43-5e12aed75954) + ] + interface ILanguage3 : IInspectable + { + [propget] HRESULT AbbreviatedName([out, retval] HSTRING *value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Globalization.Language), + uuid(7d7daf45-368d-4364-852b-dec927037b85) + ] + interface ILanguageExtensionSubtags : IInspectable + { + HRESULT GetExtensionSubtags([in] HSTRING tag, [out, retval] Windows.Foundation.Collections.IVectorView<HSTRING> **value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Globalization.Language), + uuid(9b0252ac-0c27-44f8-b792-9793fb66c63e) + ] + interface ILanguageFactory : IInspectable + { + HRESULT CreateLanguage([in] HSTRING tag, [out, retval] Windows.Globalization.Language **value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Globalization.Language), + uuid(b23cd557-0865-46d4-89b8-d59be8990f0d) + ] + interface ILanguageStatics : IInspectable + { + HRESULT IsWellFormed([in] HSTRING tag, [out, retval] BOOLEAN *result); + [propget] HRESULT CurrentInputMethodLanguageTag([out, retval] HSTRING *value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Globalization.Language), + uuid(30199f6e-914b-4b2a-9d6e-e3b0e27dbe4f) + ] + interface ILanguageStatics2 : IInspectable + { + HRESULT TrySetInputMethodLanguageTag([in] HSTRING tag, [out, retval] BOOLEAN *result); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 10.0), + exclusiveto(Windows.Globalization.Language), + uuid(d15ecb5a-71de-5752-9542-fac5b4f27261) + ] + interface ILanguageStatics3 : IInspectable + { + HRESULT GetMuiCompatibleLanguageListFromLanguageTags([in] Windows.Foundation.Collections.IIterable<HSTRING> *tags, [out, retval] Windows.Foundation.Collections.IVector<HSTRING> **result); + } + + [ + activatable(Windows.Globalization.ILanguageFactory, Windows.Foundation.UniversalApiContract, 1.0), + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(agile), + static(Windows.Globalization.ILanguageStatics, Windows.Foundation.UniversalApiContract, 1.0), + static(Windows.Globalization.ILanguageStatics2, Windows.Foundation.UniversalApiContract, 1.0), + static(Windows.Globalization.ILanguageStatics3, Windows.Foundation.UniversalApiContract, 10.0), + threading(both) + ] + runtimeclass Language + { + [contract(Windows.Foundation.UniversalApiContract, 1.0), default] interface Windows.Globalization.ILanguage; + [contract(Windows.Foundation.UniversalApiContract, 1.0)] interface Windows.Globalization.ILanguageExtensionSubtags; + [contract(Windows.Foundation.UniversalApiContract, 6.0)] interface Windows.Globalization.ILanguage2; + [contract(Windows.Foundation.UniversalApiContract, 10.0)] interface Windows.Globalization.ILanguage3; + } } }

1 0

Jan Sikorski : wined3d: Avoid waiting for a command buffer to finish executing to read off its queries.
by Alexandre Julliard Feb. 11, 2022

Feb. 11, 2022

Module: wine Branch: master Commit: 9a799898a1ff2d124b98e959637121628f92e64a URL: https://source.winehq.org/git/wine.git/?a=commit;h=9a799898a1ff2d124b98e959… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Thu Feb 10 15:21:56 2022 +0100 wined3d: Avoid waiting for a command buffer to finish executing to read off its queries. Some games wait for query results on the frame executing the query, expecting that enough time have passed for it to be available. By requiring that the entire command buffer is done, we risk stalling the whole frame if it wasn't flushed along the way. This patch drops this requirement. Mainly, we need to ensure that we don't call vkGetQueryPoolResults() before the reset command is executed, and accidentally retrieve result from previous usage. Using host query reset doesn't quite solve the problem, as it might get called too early, if the application decides to reuse a query without waiting for results. Besides, we want to support devices where host query reset is not available. To make it work, when a Vulkan query is no longer needed, we queue it for resetting at command buffer submission time, and only mark it free for reuse after this command buffer is finished executing. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_vk.c | 89 ++++++++++++++++++++++++++++++++++++------ dlls/wined3d/query.c | 84 ++++++++++++++++++--------------------- dlls/wined3d/wined3d_private.h | 13 +++++- 3 files changed, 124 insertions(+), 62 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9a799898a1ff2d124b98…

1 0

Bernhard Kölbl : include: Add windows.media.speechrecognition.idl.
by Alexandre Julliard Feb. 11, 2022

Feb. 11, 2022

Module: wine Branch: master Commit: 4dde99bdbef4d959b3f60ae7198340d137c3f50c URL: https://source.winehq.org/git/wine.git/?a=commit;h=4dde99bdbef4d959b3f60ae7… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Mon Jan 31 13:51:49 2022 +0100 include: Add windows.media.speechrecognition.idl. Add ISpeechRecognitionConstraint together with its dependencies. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/windows.media.speechrecognition.idl | 88 +++++++++++++++++++++++++++++ 2 files changed, 89 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 2f1e4767848..04537ea72ef 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -784,6 +784,7 @@ SOURCES = \ windows.h \ windows.media.devices.idl \ windows.media.idl \ + windows.media.speechrecognition.idl \ windows.media.speechsynthesis.idl \ windows.storage.streams.idl \ windows.system.idl \ diff --git a/include/windows.media.speechrecognition.idl b/include/windows.media.speechrecognition.idl new file mode 100644 index 00000000000..65c9d5ef8da --- /dev/null +++ b/include/windows.media.speechrecognition.idl @@ -0,0 +1,88 @@ +/* + * Copyright 2022 Bernhard Kölbl + * + * 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 + */ + +#ifdef __WIDL__ +#pragma winrt ns_prefix +#endif + +import "inspectable.idl"; +import "asyncinfo.idl"; +import "eventtoken.idl"; +import "windowscontracts.idl"; +import "windows.foundation.idl"; +import "windows.globalization.idl"; +/*import "windows.phone.idl";*/ +/*import "windows.storage.idl";*/ + +namespace Windows { + namespace Media { + namespace SpeechRecognition { + typedef enum SpeechRecognitionConstraintProbability SpeechRecognitionConstraintProbability; + typedef enum SpeechRecognitionConstraintType SpeechRecognitionConstraintType; + interface ISpeechRecognitionConstraint; + } + } +} + +namespace Windows { + namespace Media { + namespace SpeechRecognition { + declare { + } + } + } +} + +namespace Windows { + namespace Media { + namespace SpeechRecognition { + + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + enum SpeechRecognitionConstraintProbability + { + Default = 0, + Min = 1, + Max = 2, + }; + + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + enum SpeechRecognitionConstraintType + { + Topic = 0, + List = 1, + Grammar = 2, + VoiceCommandDefinition = 3, + }; + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + uuid(79ac1628-4d68-43c4-8911-40dc4101b55b) + ] + interface ISpeechRecognitionConstraint : IInspectable + { + [propget] HRESULT IsEnabled([out, retval] boolean *value); + [propput] HRESULT IsEnabled([in] boolean value); + [propget] HRESULT Tag([out, retval] HSTRING *value); + [propput] HRESULT Tag([in] HSTRING value); + [propget] HRESULT Type([out, retval] Windows.Media.SpeechRecognition.SpeechRecognitionConstraintType *value); + [propget] HRESULT Probability([out, retval] Windows.Media.SpeechRecognition.SpeechRecognitionConstraintProbability *value); + [propput] HRESULT Probability([in] Windows.Media.SpeechRecognition.SpeechRecognitionConstraintProbability value); + } + } + } +}

1 0

Zebediah Figura : wined3d: Introduce wined3d_lock_init() and wined3d_lock_cleanup() helpers.
by Alexandre Julliard Feb. 11, 2022

Feb. 11, 2022

Module: wine Branch: master Commit: f30d3ac214f3916041a47ecf0a7711449d36bba4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f30d3ac214f3916041a47ecf… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Feb 10 19:02:34 2022 -0600 wined3d: Introduce wined3d_lock_init() and wined3d_lock_cleanup() helpers. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_vk.c | 8 ++------ dlls/wined3d/wined3d_private.h | 15 +++++++++++++++ 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 343abac1004..8e149de028f 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -518,9 +518,7 @@ static HRESULT adapter_vk_create_device(struct wined3d *wined3d, const struct wi goto fail; } - InitializeCriticalSection(&device_vk->allocator_cs); - if (device_vk->allocator_cs.DebugInfo != (RTL_CRITICAL_SECTION_DEBUG *)-1) - device_vk->allocator_cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": wined3d_device_vk.allocator_cs"); + wined3d_lock_init(&device_vk->allocator_cs, "wined3d_device_vk.allocator_cs"); *device = &device_vk->d; @@ -540,9 +538,7 @@ static void adapter_vk_destroy_device(struct wined3d_device *device) wined3d_device_cleanup(&device_vk->d); wined3d_allocator_cleanup(&device_vk->allocator); - if (device_vk->allocator_cs.DebugInfo != (RTL_CRITICAL_SECTION_DEBUG *)-1) - device_vk->allocator_cs.DebugInfo->Spare[0] = 0; - DeleteCriticalSection(&device_vk->allocator_cs); + wined3d_lock_cleanup(&device_vk->allocator_cs); VK_CALL(vkDestroyDevice(device_vk->vk_device, NULL)); heap_free(device_vk); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ef1062ec9b4..88c2f5ba285 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -5650,6 +5650,21 @@ struct wined3d_shader_limits unsigned int packed_input; }; +#define wined3d_lock_init(lock, name) wined3d_lock_init_(lock, __FILE__ ": " name) +static inline void wined3d_lock_init_(CRITICAL_SECTION *lock, const char *name) +{ + InitializeCriticalSection(lock); + if (lock->DebugInfo != (RTL_CRITICAL_SECTION_DEBUG *)-1) + lock->DebugInfo->Spare[0] = (DWORD_PTR)name; +} + +static inline void wined3d_lock_cleanup(CRITICAL_SECTION *lock) +{ + if (lock->DebugInfo != (RTL_CRITICAL_SECTION_DEBUG *)-1) + lock->DebugInfo->Spare[0] = 0; + DeleteCriticalSection(lock); +} + #ifdef __GNUC__ #define PRINTF_ATTR(fmt,args) __attribute__((format (printf,fmt,args))) #else

1 0

Zhiyi Zhang : light.msstyles: Do not use transparent edges for trackbar horizontal and vertical thumb.
by Alexandre Julliard Feb. 11, 2022

Feb. 11, 2022

Module: wine Branch: master Commit: b96ec3bf4152999154be5f7e27859cfe2656e05f URL: https://source.winehq.org/git/wine.git/?a=commit;h=b96ec3bf4152999154be5f7e… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Feb 11 15:15:26 2022 +0800 light.msstyles: Do not use transparent edges for trackbar horizontal and vertical thumb. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../light.msstyles/blue_trackbar_thumb_horizontal.bmp | Bin 2418 -> 3918 bytes .../light.msstyles/blue_trackbar_thumb_horizontal.svg | 14 +++++++------- dlls/light.msstyles/blue_trackbar_thumb_vertical.bmp | Bin 4758 -> 3658 bytes dlls/light.msstyles/blue_trackbar_thumb_vertical.svg | 14 +++++++------- dlls/light.msstyles/light.rc | 4 ++-- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/light.msstyles/blue_trackbar_thumb_horizontal.bmp b/dlls/light.msstyles/blue_trackbar_thumb_horizontal.bmp index f3c8f55a9b2..5a548024b18 100644 Binary files a/dlls/light.msstyles/blue_trackbar_thumb_horizontal.bmp and b/dlls/light.msstyles/blue_trackbar_thumb_horizontal.bmp differ diff --git a/dlls/light.msstyles/blue_trackbar_thumb_horizontal.svg b/dlls/light.msstyles/blue_trackbar_thumb_horizontal.svg index d1063507dd0..4aa6c26b068 100644 --- a/dlls/light.msstyles/blue_trackbar_thumb_horizontal.svg +++ b/dlls/light.msstyles/blue_trackbar_thumb_horizontal.svg @@ -1,19 +1,19 @@ <?xml version="1.0" encoding="UTF-8"?> -<svg id="bitmap:6-32" width="6" height="95" version="1.1" viewBox="0 0 1.5875 25.135" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> +<svg id="bitmap:11-24" width="11" height="105" version="1.1" viewBox="0 0 2.9104 27.781" 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="-.00023066" width="2.9104" height="27.781" fill="#fdffff" stroke-linejoin="round" stroke-width=".070004"/> <g stroke-width=".26458"> - <rect x=".39688" y=".13229" width=".79375" height="4.7625" rx=".52917" ry=".52917" fill="#fff" stroke="#aeaeae"/> - <rect x=".39688" y="5.1594" width=".79375" height="4.7625" rx=".52917" ry=".52917" fill="#fff" stroke="#3096fa"/> - <rect x=".39688" y="10.186" width=".79375" height="4.7625" rx=".52917" ry=".52917" fill="#2979ff" stroke="#2979ff"/> - <rect x=".39688" y="15.214" width=".79375" height="4.7625" rx=".52917" ry=".52917" fill="#fff" stroke="#aeaeae"/> - <rect x=".39688" y="20.241" width=".79375" height="4.7625" rx=".52917" ry=".52917" fill="#fff" stroke="#aeaeae"/> + <rect x=".13229" y=".13206" width="2.6458" height="5.2917" rx=".52917" ry=".52917" fill="#fff" stroke="#aeaeae"/> + <rect x=".13229" y="5.6883" width="2.6458" height="5.2917" rx=".52917" ry=".52917" fill="#fff" stroke="#3096fa"/> + <rect x=".13229" y="11.245" width="2.6458" height="5.2917" rx=".52917" ry=".52917" fill="#2979ff" stroke="#2979ff"/> + <rect x=".13229" y="16.801" width="2.6458" height="5.2917" rx=".52917" ry=".52917" fill="#fff" stroke="#aeaeae"/> + <rect x=".13229" y="22.357" width="2.6458" height="5.2917" rx=".52917" ry=".52917" fill="#fff" stroke="#aeaeae"/> </g> </svg> diff --git a/dlls/light.msstyles/blue_trackbar_thumb_vertical.bmp b/dlls/light.msstyles/blue_trackbar_thumb_vertical.bmp index b5c9d0f78a5..32315aa00da 100644 Binary files a/dlls/light.msstyles/blue_trackbar_thumb_vertical.bmp and b/dlls/light.msstyles/blue_trackbar_thumb_vertical.bmp differ diff --git a/dlls/light.msstyles/blue_trackbar_thumb_vertical.svg b/dlls/light.msstyles/blue_trackbar_thumb_vertical.svg index 0ea443d89ef..f15c9fd1baa 100644 --- a/dlls/light.msstyles/blue_trackbar_thumb_vertical.svg +++ b/dlls/light.msstyles/blue_trackbar_thumb_vertical.svg @@ -1,19 +1,19 @@ <?xml version="1.0" encoding="UTF-8"?> -<svg id="bitmap:21-32" width="21" height="55" version="1.1" viewBox="0 0 5.5562 14.552" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> +<svg id="bitmap:21-24" width="21" height="55" version="1.1" viewBox="0 0 5.5562 14.552" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> <metadata> <rdf:RDF> <cc:Work rdf:about=""> <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> - <dc:title/> </cc:Work> </rdf:RDF> </metadata> + <rect x="-9.0909e-6" y="2.2204e-16" width="5.5562" height="14.552" fill="#fdffff" stroke-linejoin="round" stroke-width=".070003"/> <g stroke-width=".26458"> - <rect x=".13229" y=".39688" width="5.2917" height="2.1167" rx=".52917" ry=".52917" fill="#fff" stroke="#aeaeae"/> - <rect x=".13229" y="3.3073" width="5.2917" height="2.1167" rx=".52917" ry=".52917" fill="#fff" stroke="#3096fa"/> - <rect x=".13229" y="6.2177" width="5.2917" height="2.1167" rx=".52917" ry=".52917" fill="#2979ff" stroke="#2979ff"/> - <rect x=".13229" y="9.1281" width="5.2917" height="2.1167" rx=".52917" ry=".52917" fill="#fff" stroke="#aeaeae"/> - <rect x=".13229" y="12.039" width="5.2917" height="2.1167" rx=".52917" ry=".52917" fill="#fff" stroke="#aeaeae"/> + <rect x=".13229" y=".13229" width="5.2916" height="2.6458" rx=".52916" ry=".52916" fill="#fff" stroke="#aeaeae"/> + <rect x=".13229" y="3.0427" width="5.2917" height="2.6458" rx=".52917" ry=".52916" fill="#fff" stroke="#3096fa"/> + <rect x=".13229" y="5.9531" width="5.2917" height="2.6458" rx=".52917" ry=".52916" fill="#2979ff" stroke="#2979ff"/> + <rect x=".13229" y="8.8635" width="5.2917" height="2.6458" rx=".52917" ry=".52916" fill="#fff" stroke="#aeaeae"/> + <rect x=".13229" y="11.774" width="5.2917" height="2.6458" rx=".52917" ry=".52916" fill="#fff" stroke="#aeaeae"/> </g> </svg> diff --git a/dlls/light.msstyles/light.rc b/dlls/light.msstyles/light.rc index 4b196716171..4596f0f0458 100644 --- a/dlls/light.msstyles/light.rc +++ b/dlls/light.msstyles/light.rc @@ -1091,13 +1091,13 @@ BLUE_INI TEXTFILE "ImageFile = blue_trackbar_thumb_horizontal.bmp\r\n" "ImageCount = 5\r\n" "ImageLayout = Vertical\r\n" -"SizingMargins = 2, 3, 2, 3\r\n" +"SizingMargins = 1, 1, 1, 1\r\n" "SizingType = Tile\r\n" "[TrackBar.ThumbVert]\r\n" "BgType = ImageFile\r\n" "ImageFile = blue_trackbar_thumb_vertical.bmp\r\n" -"SizingMargins = 2, 3, 2, 3\r\n" +"SizingMargins = 1, 1, 1, 1\r\n" "SizingType = Stretch\r\n" "ImageCount = 5\r\n" "ImageLayout = Vertical\r\n"

1 0