wine-commits February 2022

wine-commits@winehq.org

2 participants
1495 discussions

Jan Sikorski : wined3d: Use a separate heap for deferred resource upload buffers.
by Alexandre Julliard 11 Feb '22

11 Feb '22

Module: wine Branch: master Commit: b33a5b34b7a815c85f946efeb840aff1d15ffa62 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b33a5b34b7a815c85f946efe… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Fri Feb 11 13:43:27 2022 +0100 wined3d: Use a separate heap for deferred resource upload buffers. Significantly reduces global heap lock contention in some games. 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/cs.c | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 90686e8d170..ffa0689e5a4 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -49,6 +49,7 @@ struct wined3d_command_list SIZE_T data_size; void *data; + HANDLE upload_heap; SIZE_T resource_count; struct wined3d_resource **resources; @@ -3979,6 +3980,7 @@ static void wined3d_cs_packet_incref_objects(struct wined3d_cs_packet *packet) struct wined3d_deferred_context { struct wined3d_device_context c; + HANDLE upload_heap; SIZE_T data_size, data_capacity; void *data; @@ -4108,7 +4110,15 @@ static bool wined3d_deferred_context_map_upload_bo(struct wined3d_device_context deferred->upload_count + 1, sizeof(*deferred->uploads))) return false; - if (!(sysmem = heap_alloc(size + RESOURCE_ALIGNMENT - 1))) + if (!deferred->upload_heap) + deferred->upload_heap = HeapCreate(HEAP_NO_SERIALIZE, 0, 0); + if (!deferred->upload_heap) + { + ERR("Failed to create upload heap.\n"); + return false; + } + + if (!(sysmem = HeapAlloc(deferred->upload_heap, 0, size + RESOURCE_ALIGNMENT - 1))) return false; upload = &deferred->uploads[deferred->upload_count++]; @@ -4253,10 +4263,9 @@ void CDECL wined3d_deferred_context_destroy(struct wined3d_device_context *conte heap_free(deferred->resources); for (i = 0; i < deferred->upload_count; ++i) - { wined3d_resource_decref(deferred->uploads[i].resource); - heap_free(deferred->uploads[i].sysmem); - } + if (deferred->upload_heap) + HeapDestroy(deferred->upload_heap); heap_free(deferred->uploads); for (i = 0; i < deferred->command_list_count; ++i) @@ -4341,6 +4350,9 @@ HRESULT CDECL wined3d_deferred_context_record_command_list(struct wined3d_device deferred->command_list_count = 0; deferred->query_count = 0; + object->upload_heap = deferred->upload_heap; + deferred->upload_heap = 0; + /* This is in fact recorded into a subsequent command list. */ if (restore) wined3d_device_context_set_state(&deferred->c, deferred->c.state); @@ -4357,13 +4369,11 @@ HRESULT CDECL wined3d_deferred_context_record_command_list(struct wined3d_device static void wined3d_command_list_destroy_object(void *object) { struct wined3d_command_list *list = object; - SIZE_T i; TRACE("list %p.\n", list); - for (i = 0; i < list->upload_count; ++i) - heap_free(list->uploads[i].sysmem); - + if (list->upload_heap) + HeapDestroy(list->upload_heap); heap_free(list); }

1 0

Paul Gofman : wined3d: Use StretchBlt() in swapchain_blit_gdi().
by Alexandre Julliard 11 Feb '22

11 Feb '22

Module: wine Branch: master Commit: 2435f116c3ae527a4b6b52b78a44449a277fd8db URL: https://source.winehq.org/git/wine.git/?a=commit;h=2435f116c3ae527a4b6b52b7… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Feb 11 15:19:58 2022 +0300 wined3d: Use StretchBlt() in swapchain_blit_gdi(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/swapchain.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 49a40f3e1d6..5fcbfc58779 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -459,8 +459,9 @@ static void swapchain_blit_gdi(struct wined3d_swapchain *swapchain, if (!(dst_dc = GetDCEx(swapchain->win_handle, 0, DCX_USESTYLE | DCX_CACHE))) ERR("Failed to get destination DC.\n"); - if (!BitBlt(dst_dc, dst_rect->left, dst_rect->top, dst_rect->right - dst_rect->left, - dst_rect->bottom - dst_rect->top, src_dc, src_rect->left, src_rect->top, SRCCOPY)) + if (!StretchBlt(dst_dc, dst_rect->left, dst_rect->top, dst_rect->right - dst_rect->left, + dst_rect->bottom - dst_rect->top, src_dc, src_rect->left, src_rect->top, + src_rect->right - src_rect->left, src_rect->bottom - src_rect->top, SRCCOPY)) ERR("Failed to blit.\n"); ReleaseDC(swapchain->win_handle, dst_dc);

1 0

Zhiyi Zhang : light.msstyles: Do not use transparent treeview parts.
by Alexandre Julliard 11 Feb '22

11 Feb '22

Module: wine Branch: master Commit: 6255d92a60fc635755108a6dbc8a936ac3d5275f URL: https://source.winehq.org/git/wine.git/?a=commit;h=6255d92a60fc635755108a6d… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Feb 11 15:15:35 2022 +0800 light.msstyles: Do not use transparent treeview parts. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52434 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../blue_treeview_expand_collapse_11px.bmp | Bin 1106 -> 930 bytes .../blue_treeview_expand_collapse_11px.svg | 14 ++++++++++---- .../blue_treeview_expand_collapse_13px.bmp | Bin 1490 -> 1178 bytes .../blue_treeview_expand_collapse_13px.svg | 14 ++++++++++---- .../blue_treeview_expand_collapse_16px.bmp | Bin 2186 -> 1674 bytes .../blue_treeview_expand_collapse_16px.svg | 14 ++++++++++---- .../blue_treeview_expand_collapse_18px.bmp | Bin 2730 -> 2154 bytes .../blue_treeview_expand_collapse_18px.svg | 14 +++++++++----- .../blue_treeview_expand_collapse_20px.bmp | Bin 3338 -> 2538 bytes .../blue_treeview_expand_collapse_20px.svg | 14 +++++++++----- .../blue_treeview_expand_collapse_23px.bmp | Bin 4370 -> 3450 bytes .../blue_treeview_expand_collapse_23px.svg | 14 +++++++++----- .../blue_treeview_expand_collapse_9px.bmp | Bin 786 -> 642 bytes .../blue_treeview_expand_collapse_9px.svg | 15 ++++++++++----- 14 files changed, 67 insertions(+), 32 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6255d92a60fc63575510…

1 0

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

11 Feb '22

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

Zhiyi Zhang : light.msstyles: Do not use transparent tab pane edges.
by Alexandre Julliard 11 Feb '22

11 Feb '22

Module: wine Branch: master Commit: 080c934a4b696d12511ddcfd0834ffc763d50cde URL: https://source.winehq.org/git/wine.git/?a=commit;h=080c934a4b696d12511ddcfd… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Feb 11 15:15:18 2022 +0800 light.msstyles: Do not use transparent tab pane edges. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/light.msstyles/blue_tab_pane_edge.bmp | Bin 9354 -> 7050 bytes dlls/light.msstyles/blue_tab_pane_edge.svg | 7 +++---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/light.msstyles/blue_tab_pane_edge.bmp b/dlls/light.msstyles/blue_tab_pane_edge.bmp index 0ee90aca9c5..0fe3e1cd2eb 100644 Binary files a/dlls/light.msstyles/blue_tab_pane_edge.bmp and b/dlls/light.msstyles/blue_tab_pane_edge.bmp differ diff --git a/dlls/light.msstyles/blue_tab_pane_edge.svg b/dlls/light.msstyles/blue_tab_pane_edge.svg index 73f3fc2d2c7..2a950c9087d 100644 --- a/dlls/light.msstyles/blue_tab_pane_edge.svg +++ b/dlls/light.msstyles/blue_tab_pane_edge.svg @@ -1,16 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> -<svg id="bitmap:48-32" width="48" height="48" version="1.1" viewBox="0 0 12.7 12.7" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> +<svg id="bitmap:48-24" width="48" height="48" version="1.1" viewBox="0 0 12.7 12.7" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> <metadata> <rdf:RDF> <cc:Work rdf:about=""> <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> - <dc:title/> </cc:Work> </rdf:RDF> </metadata> <g fill="#fff"> - <rect x=".13229" y=".13229" width="12.435" height="12.171" rx=".52917" ry=".52917" stroke="#aeaeae" stroke-width=".26458"/> - <rect transform="matrix(1 0 .99934 .036434 0 0)" x="-341.09" y="341.31" width="5.4429" height="7.262"/> + <rect y="-2.2204e-16" width="12.7" height="12.7" rx=".52919" ry=".54067" stroke-linejoin="round" stroke-width=".26458"/> + <rect x=".13229" y=".13229" width="12.435" height="12.435" rx=".52919" ry=".54067" stroke="#aeaeae" stroke-width=".26458"/> </g> </svg>

1 0

Zhiyi Zhang : light.msstyles: Fill combo box background with white pixels.
by Alexandre Julliard 11 Feb '22

11 Feb '22

Module: wine Branch: master Commit: c4ffeff7cd11822adb7289e43415a5103e5fa5c2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c4ffeff7cd11822adb7289e4… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Feb 11 15:15:04 2022 +0800 light.msstyles: Fill combo box background with white pixels. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/light.msstyles/blue_combobutton.bmp | Bin 6858 -> 5178 bytes dlls/light.msstyles/blue_combobutton.svg | 6 +++--- dlls/light.msstyles/light.rc | 1 - 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/light.msstyles/blue_combobutton.bmp b/dlls/light.msstyles/blue_combobutton.bmp index a2b12ba3e1f..77ddc24e296 100644 Binary files a/dlls/light.msstyles/blue_combobutton.bmp and b/dlls/light.msstyles/blue_combobutton.bmp differ diff --git a/dlls/light.msstyles/blue_combobutton.svg b/dlls/light.msstyles/blue_combobutton.svg index aab7ff06812..07293de0ba8 100644 --- a/dlls/light.msstyles/blue_combobutton.svg +++ b/dlls/light.msstyles/blue_combobutton.svg @@ -1,15 +1,15 @@ <?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#"> +<svg id="bitmap:20-24" 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 y="-7e-5" width="5.2917" height="22.225" fill="#fff" stroke-width=".26458"/> + <g transform="translate(5.0184e-6 -6.4982e-5)" 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"/> diff --git a/dlls/light.msstyles/light.rc b/dlls/light.msstyles/light.rc index a8e35f9c5d7..4b196716171 100644 --- a/dlls/light.msstyles/light.rc +++ b/dlls/light.msstyles/light.rc @@ -398,7 +398,6 @@ BLUE_INI TEXTFILE "GlyphType = ImageGlyph\r\n" "GlyphImageFile = blue_combobutton_glyph.bmp\r\n" "GlyphTransparent = True\r\n" -"Transparent = True\r\n" "TransitionDurations = 4, " "0, 100, 100, 100, " "100, 0, 100, 100, "

1 0

Zhiyi Zhang : light.msstyles: Fill radio button background with white pixels.
by Alexandre Julliard 11 Feb '22

11 Feb '22

Module: wine Branch: master Commit: aafad831a9e886e76d32154c1b83b66e0cb8dcc8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aafad831a9e886e76d32154c… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Feb 11 15:14:54 2022 +0800 light.msstyles: Fill radio button background with white pixels. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/light.msstyles/blue_radiobutton_13px.bmp | Bin 5546 -> 5546 bytes dlls/light.msstyles/blue_radiobutton_13px.svg | 27 +++++++++++++------------- dlls/light.msstyles/blue_radiobutton_16px.bmp | Bin 8330 -> 8330 bytes dlls/light.msstyles/blue_radiobutton_16px.svg | 27 +++++++++++++------------- dlls/light.msstyles/blue_radiobutton_19px.bmp | Bin 11690 -> 11690 bytes dlls/light.msstyles/blue_radiobutton_19px.svg | 19 ++++++++++-------- dlls/light.msstyles/blue_radiobutton_22px.bmp | Bin 15626 -> 15626 bytes dlls/light.msstyles/blue_radiobutton_22px.svg | 17 +++++++++------- dlls/light.msstyles/blue_radiobutton_25px.bmp | Bin 20138 -> 20138 bytes dlls/light.msstyles/blue_radiobutton_25px.svg | 25 ++++++++++++------------ dlls/light.msstyles/blue_radiobutton_28px.bmp | Bin 25226 -> 25226 bytes dlls/light.msstyles/blue_radiobutton_28px.svg | 17 +++++++++------- dlls/light.msstyles/blue_radiobutton_31px.bmp | Bin 30890 -> 30890 bytes dlls/light.msstyles/blue_radiobutton_31px.svg | 17 +++++++++------- 14 files changed, 82 insertions(+), 67 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=aafad831a9e886e76d32…

1 0

Zhiyi Zhang : light.msstyles: Fill checkbox background with white pixels.
by Alexandre Julliard 11 Feb '22

11 Feb '22

Module: wine Branch: master Commit: 03e7ad417d0eb16fd77ea91cbff8ad786ef9c2e0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=03e7ad417d0eb16fd77ea91c… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Feb 11 15:14:43 2022 +0800 light.msstyles: Fill checkbox background with white pixels. Some window procedures don't actually erase background when WM_ERASEBKGND is received. So when drawing transparent buttons on such windows, there may be left over content from buttons of different states. This commit adds a white background to all the button parts that shouldn't be transparent. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52433 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/light.msstyles/blue_checkbox_13px.bmp | Bin 8250 -> 8250 bytes dlls/light.msstyles/blue_checkbox_13px.svg | 18 +++++++----------- dlls/light.msstyles/blue_checkbox_16px.bmp | Bin 12426 -> 12426 bytes dlls/light.msstyles/blue_checkbox_16px.svg | 12 +++++------- dlls/light.msstyles/blue_checkbox_19px.bmp | Bin 17466 -> 17466 bytes dlls/light.msstyles/blue_checkbox_19px.svg | 2 +- dlls/light.msstyles/blue_checkbox_22px.bmp | Bin 23370 -> 23370 bytes dlls/light.msstyles/blue_checkbox_22px.svg | 2 +- dlls/light.msstyles/blue_checkbox_25px.bmp | Bin 30138 -> 30138 bytes dlls/light.msstyles/blue_checkbox_25px.svg | 18 +++++++----------- dlls/light.msstyles/blue_checkbox_28px.bmp | Bin 37770 -> 37770 bytes dlls/light.msstyles/blue_checkbox_28px.svg | 10 +++++----- dlls/light.msstyles/blue_checkbox_31px.bmp | Bin 46266 -> 46266 bytes dlls/light.msstyles/blue_checkbox_31px.svg | 26 ++++++++++---------------- 14 files changed, 36 insertions(+), 52 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=03e7ad417d0eb16fd77e…

1 0

Zhiyi Zhang : light.msstyles: Adjust scroll bar arrow width and height to 17 pixels.
by Alexandre Julliard 11 Feb '22

11 Feb '22

Module: wine Branch: master Commit: cbc0d24f665fec3f44a4c08c0699d1356b754479 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cbc0d24f665fec3f44a4c08c… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Feb 11 15:14:30 2022 +0800 light.msstyles: Adjust scroll bar arrow width and height to 17 pixels. Themed scroll bar width and height are 17 pixels on XP. Fix that Light theme scroll bar arrow glyphs look off by 1 pixel. The combo button glyphs also have to be moved by 1 pixel because it was designed against the old scroll bar arrow button width and height. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/light.msstyles/blue_combobutton_glyph.bmp | Bin 1258 -> 1258 bytes dlls/light.msstyles/blue_combobutton_glyph.svg | 27 +++++++++++-------------- dlls/light.msstyles/light.rc | 4 ++-- 3 files changed, 14 insertions(+), 17 deletions(-) diff --git a/dlls/light.msstyles/blue_combobutton_glyph.bmp b/dlls/light.msstyles/blue_combobutton_glyph.bmp index 2c0bd8a357f..251f3772bb8 100644 Binary files a/dlls/light.msstyles/blue_combobutton_glyph.bmp and b/dlls/light.msstyles/blue_combobutton_glyph.bmp differ diff --git a/dlls/light.msstyles/blue_combobutton_glyph.svg b/dlls/light.msstyles/blue_combobutton_glyph.svg index 0caf1c4b696..b501a5496bd 100644 --- a/dlls/light.msstyles/blue_combobutton_glyph.svg +++ b/dlls/light.msstyles/blue_combobutton_glyph.svg @@ -5,24 +5,21 @@ <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"/> + <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.52915 0.66961 0.92136 0.91789 0.13162-0.13113-0.92136-0.91789z" stroke-width=".26458"/> + <path d="m2.2496 0.52917-0.92136 0.91789 0.13162 0.13113 0.92136-0.91789z" stroke-width=".26458"/> + <g transform="translate(.13227)"> + <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> </svg> diff --git a/dlls/light.msstyles/light.rc b/dlls/light.msstyles/light.rc index bfb04faf9e8..a8e35f9c5d7 100644 --- a/dlls/light.msstyles/light.rc +++ b/dlls/light.msstyles/light.rc @@ -144,8 +144,8 @@ BLUE_INI TEXTFILE "EdgeFillColor = 255 255 255\r\n" "\r\n[SysMetrics]\r\n" -"ScrollbarWidth = 16\r\n" -"ScrollbarHeight = 16\r\n" +"ScrollbarWidth = 17\r\n" +"ScrollbarHeight = 17\r\n" "\r\n; System colors\r\n" "Scrollbar = 255 255 255\r\n"

1 0

Zhiyi Zhang : light.msstyles: Use stretch sizing type for scroll bar arrow button background.
by Alexandre Julliard 11 Feb '22

11 Feb '22

Module: wine Branch: master Commit: 3acf12b8676c15be52ac4c4145112f0c0c646559 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3acf12b8676c15be52ac4c41… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Feb 11 15:14:16 2022 +0800 light.msstyles: Use stretch sizing type for scroll bar arrow button background. Scroll bar arrow button background within its sizing margins is all white, using stretch instead of tile has no visual difference and is more efficient. On Windows, stretch sizing type is also used for this part. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/light.msstyles/light.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/light.msstyles/light.rc b/dlls/light.msstyles/light.rc index ba27c9461bc..bfb04faf9e8 100644 --- a/dlls/light.msstyles/light.rc +++ b/dlls/light.msstyles/light.rc @@ -607,7 +607,7 @@ BLUE_INI TEXTFILE "BgType = ImageFile\r\n" "SizingMargins = 5, 5, 5, 5\r\n" "ContentMargins = 0, 0, 3, 3\r\n" -"SizingType = Tile\r\n" +"SizingType = Stretch\r\n" "ImageFile = blue_scrollbar_arrows.bmp\r\n" "ImageCount = 16\r\n" "ImageLayout = Vertical\r\n"

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2022