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

Zhiyi Zhang : light.msstyles: Add Vista+ button parts.
by Alexandre Julliard 27 Jun '22

27 Jun '22

Module: wine Branch: master Commit: 957b004c63aff47cf1aa11384c5e3b8be1e3ddf6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=957b004c63aff47cf1aa1138… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Jun 7 22:17:20 2022 +0800 light.msstyles: Add Vista+ button parts. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/light.msstyles/Makefile.in | 10 +-- dlls/light.msstyles/blue_checkbox_13px.bmp | Bin 8250 -> 10538 bytes dlls/light.msstyles/blue_checkbox_13px.svg | 26 ++++++- dlls/light.msstyles/blue_checkbox_16px.bmp | Bin 12426 -> 15498 bytes dlls/light.msstyles/blue_checkbox_16px.svg | 24 +++++- dlls/light.msstyles/blue_checkbox_19px.bmp | Bin 17466 -> 0 bytes dlls/light.msstyles/blue_checkbox_19px.svg | 48 ------------ dlls/light.msstyles/blue_checkbox_20px.bmp | Bin 0 -> 24138 bytes dlls/light.msstyles/blue_checkbox_20px.svg | 72 ++++++++++++++++++ dlls/light.msstyles/blue_checkbox_22px.bmp | Bin 23370 -> 0 bytes dlls/light.msstyles/blue_checkbox_22px.svg | 50 ------------- dlls/light.msstyles/blue_checkbox_25px.bmp | Bin 30138 -> 0 bytes dlls/light.msstyles/blue_checkbox_25px.svg | 36 --------- dlls/light.msstyles/blue_checkbox_26px.bmp | Bin 0 -> 41738 bytes dlls/light.msstyles/blue_checkbox_26px.svg | 52 +++++++++++++ dlls/light.msstyles/blue_checkbox_28px.bmp | Bin 37770 -> 0 bytes dlls/light.msstyles/blue_checkbox_28px.svg | 40 ---------- dlls/light.msstyles/blue_checkbox_31px.bmp | Bin 46266 -> 0 bytes dlls/light.msstyles/blue_checkbox_31px.svg | 40 ---------- dlls/light.msstyles/blue_checkbox_32px.bmp | Bin 0 -> 61578 bytes dlls/light.msstyles/blue_checkbox_32px.svg | 56 ++++++++++++++ dlls/light.msstyles/blue_checkbox_40px.bmp | Bin 0 -> 96138 bytes dlls/light.msstyles/blue_checkbox_40px.svg | 74 +++++++++++++++++++ dlls/light.msstyles/blue_checkbox_52px.bmp | Bin 0 -> 162378 bytes dlls/light.msstyles/blue_checkbox_52px.svg | 114 +++++++++++++++++++++++++++++ dlls/light.msstyles/light.rc | 83 ++++++++++++++++----- 26 files changed, 482 insertions(+), 243 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=957b004c63aff47cf1aa…

1 0

Zhiyi Zhang : light.msstyles: Add Vista+ combobox parts.
by Alexandre Julliard 27 Jun '22

27 Jun '22

Module: wine Branch: master Commit: ed0b12b6b527d561161f503d9ae18e32a14ddc8a URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed0b12b6b527d561161f503d… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Jun 3 17:03:19 2022 +0800 light.msstyles: Add Vista+ combobox parts. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53066 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/light.msstyles/Makefile.in | 28 ++- dlls/light.msstyles/blue_combobox_border.bmp | Bin 0 -> 458 bytes dlls/light.msstyles/blue_combobox_border.svg | 17 ++ .../blue_combobox_dropdownbutton.bmp | Bin 0 -> 2154 bytes .../blue_combobox_dropdownbutton.svg | 18 ++ .../blue_combobox_dropdownbutton_glyph_10px.bmp | Bin 0 -> 3178 bytes .../blue_combobox_dropdownbutton_glyph_10px.svg | 27 +++ .../blue_combobox_dropdownbutton_glyph_11px.bmp | Bin 0 -> 1194 bytes .../blue_combobox_dropdownbutton_glyph_11px.svg | 27 +++ .../blue_combobox_dropdownbutton_glyph_14px.bmp | Bin 0 -> 2378 bytes .../blue_combobox_dropdownbutton_glyph_14px.svg | 27 +++ .../blue_combobox_dropdownbutton_glyph_17px.bmp | Bin 0 -> 3674 bytes .../blue_combobox_dropdownbutton_glyph_17px.svg | 27 +++ .../blue_combobox_dropdownbutton_glyph_21px.bmp | Bin 0 -> 5178 bytes .../blue_combobox_dropdownbutton_glyph_21px.svg | 27 +++ .../blue_combobox_dropdownbutton_glyph_27px.bmp | Bin 0 -> 8778 bytes .../blue_combobox_dropdownbutton_glyph_27px.svg | 29 +++ .../blue_combobox_dropdownbutton_glyph_9px.bmp | Bin 0 -> 858 bytes .../blue_combobox_dropdownbutton_glyph_9px.svg | 25 +++ .../blue_combobox_dropdownbutton_left.bmp | Bin 0 -> 2346 bytes .../blue_combobox_dropdownbutton_left.svg | 15 ++ ...lue_combobox_dropdownbutton_left_glyph_10px.bmp | Bin 0 -> 3178 bytes ...lue_combobox_dropdownbutton_left_glyph_10px.svg | 27 +++ ...lue_combobox_dropdownbutton_left_glyph_11px.bmp | Bin 0 -> 1194 bytes ...lue_combobox_dropdownbutton_left_glyph_11px.svg | 27 +++ ...lue_combobox_dropdownbutton_left_glyph_14px.bmp | Bin 0 -> 2378 bytes ...lue_combobox_dropdownbutton_left_glyph_14px.svg | 27 +++ ...lue_combobox_dropdownbutton_left_glyph_17px.bmp | Bin 0 -> 3674 bytes ...lue_combobox_dropdownbutton_left_glyph_17px.svg | 27 +++ ...lue_combobox_dropdownbutton_left_glyph_21px.bmp | Bin 0 -> 5178 bytes ...lue_combobox_dropdownbutton_left_glyph_21px.svg | 27 +++ ...lue_combobox_dropdownbutton_left_glyph_27px.bmp | Bin 0 -> 8778 bytes ...lue_combobox_dropdownbutton_left_glyph_27px.svg | 29 +++ ...blue_combobox_dropdownbutton_left_glyph_9px.bmp | Bin 0 -> 858 bytes ...blue_combobox_dropdownbutton_left_glyph_9px.svg | 25 +++ .../blue_combobox_dropdownbutton_right.bmp | Bin 0 -> 1978 bytes .../blue_combobox_dropdownbutton_right.svg | 15 ++ ...ue_combobox_dropdownbutton_right_glyph_10px.bmp | Bin 0 -> 3178 bytes ...ue_combobox_dropdownbutton_right_glyph_10px.svg | 27 +++ ...ue_combobox_dropdownbutton_right_glyph_11px.bmp | Bin 0 -> 1194 bytes ...ue_combobox_dropdownbutton_right_glyph_11px.svg | 27 +++ ...ue_combobox_dropdownbutton_right_glyph_14px.bmp | Bin 0 -> 2378 bytes ...ue_combobox_dropdownbutton_right_glyph_14px.svg | 27 +++ ...ue_combobox_dropdownbutton_right_glyph_17px.bmp | Bin 0 -> 3674 bytes ...ue_combobox_dropdownbutton_right_glyph_17px.svg | 27 +++ ...ue_combobox_dropdownbutton_right_glyph_21px.bmp | Bin 0 -> 5178 bytes ...ue_combobox_dropdownbutton_right_glyph_21px.svg | 27 +++ ...ue_combobox_dropdownbutton_right_glyph_27px.bmp | Bin 0 -> 8778 bytes ...ue_combobox_dropdownbutton_right_glyph_27px.svg | 29 +++ ...lue_combobox_dropdownbutton_right_glyph_9px.bmp | Bin 0 -> 858 bytes ...lue_combobox_dropdownbutton_right_glyph_9px.svg | 25 +++ dlls/light.msstyles/blue_combobox_readonly.bmp | Bin 0 -> 2154 bytes dlls/light.msstyles/blue_combobox_readonly.svg | 18 ++ dlls/light.msstyles/blue_combobutton.bmp | Bin 5178 -> 0 bytes dlls/light.msstyles/blue_combobutton.svg | 18 -- dlls/light.msstyles/blue_combobutton_glyph.bmp | Bin 1258 -> 0 bytes dlls/light.msstyles/blue_combobutton_glyph.svg | 25 --- dlls/light.msstyles/light.rc | 194 +++++++++++++++++++-- 58 files changed, 858 insertions(+), 57 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ed0b12b6b527d561161f…

1 0

Zhiyi Zhang : light.msstyles: Add Vista+ edit parts.
by Alexandre Julliard 27 Jun '22

27 Jun '22

Module: wine Branch: master Commit: 24aa157516ad161773f2f774d37b822a1860d2be URL: https://source.winehq.org/git/wine.git/?a=commit;h=24aa157516ad161773f2f774… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Jun 8 15:27:26 2022 +0800 light.msstyles: Add Vista+ edit parts. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/light.msstyles/Makefile.in | 9 ++ .../light.msstyles/blue_edit_background_1x12px.bmp | Bin 0 -> 186 bytes .../light.msstyles/blue_edit_background_1x12px.svg | 13 +++ .../light.msstyles/blue_edit_background_1x15px.bmp | Bin 0 -> 198 bytes .../light.msstyles/blue_edit_background_1x15px.svg | 13 +++ .../light.msstyles/blue_edit_background_1x18px.bmp | Bin 0 -> 210 bytes .../light.msstyles/blue_edit_background_1x18px.svg | 13 +++ .../light.msstyles/blue_edit_background_1x24px.bmp | Bin 0 -> 234 bytes .../light.msstyles/blue_edit_background_1x24px.svg | 13 +++ dlls/light.msstyles/blue_edit_background_1x6px.bmp | Bin 0 -> 162 bytes dlls/light.msstyles/blue_edit_background_1x6px.svg | 13 +++ dlls/light.msstyles/blue_edit_border_hscroll.bmp | Bin 0 -> 458 bytes dlls/light.msstyles/blue_edit_border_hscroll.svg | 17 +++ dlls/light.msstyles/blue_edit_border_hvscroll.bmp | Bin 0 -> 458 bytes dlls/light.msstyles/blue_edit_border_hvscroll.svg | 17 +++ dlls/light.msstyles/blue_edit_border_noscroll.bmp | Bin 0 -> 458 bytes dlls/light.msstyles/blue_edit_border_noscroll.svg | 17 +++ dlls/light.msstyles/blue_edit_border_vscroll.bmp | Bin 0 -> 458 bytes dlls/light.msstyles/blue_edit_border_vscroll.svg | 17 +++ dlls/light.msstyles/light.rc | 120 +++++++++++++++++++++ 20 files changed, 262 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=24aa157516ad161773f2…

1 0

Zhiyi Zhang : light.msstyles: Add Explorer::TreeView subclass.
by Alexandre Julliard 27 Jun '22

27 Jun '22

Module: wine Branch: master Commit: d29ffcc402cc397ff578c4f73c08fa34ad7c1748 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d29ffcc402cc397ff578c4f7… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue May 31 22:21:29 2022 +0800 light.msstyles: Add Explorer::TreeView subclass. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53066 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/light.msstyles/Makefile.in | 18 +++ .../blue_explorer_treeview_glyph_16px.bmp | Bin 0 -> 2186 bytes .../blue_explorer_treeview_glyph_16px.svg | 7 + .../blue_explorer_treeview_glyph_20px.bmp | Bin 0 -> 3338 bytes .../blue_explorer_treeview_glyph_20px.svg | 9 ++ .../blue_explorer_treeview_glyph_24px.bmp | Bin 0 -> 4746 bytes .../blue_explorer_treeview_glyph_24px.svg | 9 ++ .../blue_explorer_treeview_glyph_32px.bmp | Bin 0 -> 8330 bytes .../blue_explorer_treeview_glyph_32px.svg | 7 + .../blue_explorer_treeview_glyph_40px.bmp | Bin 0 -> 12938 bytes .../blue_explorer_treeview_glyph_40px.svg | 7 + .../blue_explorer_treeview_glyph_48px.bmp | Bin 0 -> 18570 bytes .../blue_explorer_treeview_glyph_48px.svg | 9 ++ .../blue_explorer_treeview_glyph_64px.bmp | Bin 0 -> 32906 bytes .../blue_explorer_treeview_glyph_64px.svg | 9 ++ .../blue_explorer_treeview_hot_glyph_16px.bmp | Bin 0 -> 2186 bytes .../blue_explorer_treeview_hot_glyph_16px.svg | 9 ++ .../blue_explorer_treeview_hot_glyph_20px.bmp | Bin 0 -> 3338 bytes .../blue_explorer_treeview_hot_glyph_20px.svg | 9 ++ .../blue_explorer_treeview_hot_glyph_24px.bmp | Bin 0 -> 4746 bytes .../blue_explorer_treeview_hot_glyph_24px.svg | 9 ++ .../blue_explorer_treeview_hot_glyph_32px.bmp | Bin 0 -> 8330 bytes .../blue_explorer_treeview_hot_glyph_32px.svg | 9 ++ .../blue_explorer_treeview_hot_glyph_40px.bmp | Bin 0 -> 12938 bytes .../blue_explorer_treeview_hot_glyph_40px.svg | 9 ++ .../blue_explorer_treeview_hot_glyph_48px.bmp | Bin 0 -> 18570 bytes .../blue_explorer_treeview_hot_glyph_48px.svg | 9 ++ .../blue_explorer_treeview_hot_glyph_64px.bmp | Bin 0 -> 32906 bytes .../blue_explorer_treeview_hot_glyph_64px.svg | 9 ++ .../blue_explorer_treeview_item_hot.bmp | Bin 0 -> 334 bytes .../blue_explorer_treeview_item_hot.svg | 4 + .../blue_explorer_treeview_item_hot_selected.bmp | Bin 0 -> 334 bytes .../blue_explorer_treeview_item_hot_selected.svg | 4 + .../blue_explorer_treeview_item_selected.bmp | Bin 0 -> 334 bytes .../blue_explorer_treeview_item_selected.svg | 4 + ...e_explorer_treeview_item_selected_not_focus.bmp | Bin 0 -> 334 bytes ...e_explorer_treeview_item_selected_not_focus.svg | 4 + dlls/light.msstyles/light.rc | 146 +++++++++++++++++++++ 38 files changed, 300 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d29ffcc402cc397ff578…

1 0

Zhiyi Zhang : light.msstyles: Add Vista+ header parts.
by Alexandre Julliard 27 Jun '22

27 Jun '22

Module: wine Branch: master Commit: ab82ff093aa716e8927ca782585d44d399b7fe77 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab82ff093aa716e8927ca782… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Jun 2 17:16:11 2022 +0800 light.msstyles: Add Vista+ header parts. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/light.msstyles/Makefile.in | 29 +++ dlls/light.msstyles/blue_header.bmp | Bin 618 -> 714 bytes dlls/light.msstyles/blue_header.svg | 13 +- dlls/light.msstyles/blue_header_dropdown.bmp | Bin 0 -> 1002 bytes dlls/light.msstyles/blue_header_dropdown.svg | 4 + .../light.msstyles/blue_header_dropdown_filter.bmp | Bin 0 -> 1002 bytes .../light.msstyles/blue_header_dropdown_filter.svg | 10 + .../blue_header_dropdown_filter_glyph_10px.bmp | Bin 0 -> 1218 bytes .../blue_header_dropdown_filter_glyph_10px.svg | 8 + .../blue_header_dropdown_filter_glyph_12px.bmp | Bin 0 -> 1578 bytes .../blue_header_dropdown_filter_glyph_12px.svg | 8 + .../blue_header_dropdown_filter_glyph_15px.bmp | Bin 0 -> 2658 bytes .../blue_header_dropdown_filter_glyph_15px.svg | 8 + .../blue_header_dropdown_filter_glyph_19px.bmp | Bin 0 -> 4242 bytes .../blue_header_dropdown_filter_glyph_19px.svg | 8 + .../blue_header_dropdown_filter_glyph_23px.bmp | Bin 0 -> 6210 bytes .../blue_header_dropdown_filter_glyph_23px.svg | 8 + .../blue_header_dropdown_glyph_10px.bmp | Bin 0 -> 858 bytes .../blue_header_dropdown_glyph_10px.svg | 9 + .../blue_header_dropdown_glyph_13px.bmp | Bin 0 -> 1334 bytes .../blue_header_dropdown_glyph_13px.svg | 9 + .../blue_header_dropdown_glyph_17px.bmp | Bin 0 -> 1974 bytes .../blue_header_dropdown_glyph_17px.svg | 9 + .../blue_header_dropdown_glyph_21px.bmp | Bin 0 -> 3162 bytes .../blue_header_dropdown_glyph_21px.svg | 9 + .../blue_header_dropdown_glyph_29px.bmp | Bin 0 -> 5706 bytes .../blue_header_dropdown_glyph_29px.svg | 9 + .../blue_header_dropdown_glyph_7px.bmp | Bin 0 -> 474 bytes .../blue_header_dropdown_glyph_7px.svg | 9 + .../blue_header_dropdown_glyph_9px.bmp | Bin 0 -> 678 bytes .../blue_header_dropdown_glyph_9px.svg | 9 + dlls/light.msstyles/blue_header_item.bmp | Bin 2538 -> 5898 bytes dlls/light.msstyles/blue_header_item.svg | 70 ++++--- dlls/light.msstyles/blue_header_overflow.bmp | Bin 0 -> 1482 bytes dlls/light.msstyles/blue_header_overflow.svg | 5 + .../blue_header_overflow_glyph_10px.bmp | Bin 0 -> 858 bytes .../blue_header_overflow_glyph_10px.svg | 13 ++ .../blue_header_overflow_glyph_12px.bmp | Bin 0 -> 1194 bytes .../blue_header_overflow_glyph_12px.svg | 13 ++ .../blue_header_overflow_glyph_16px.bmp | Bin 0 -> 1930 bytes .../blue_header_overflow_glyph_16px.svg | 13 ++ .../blue_header_overflow_glyph_20px.bmp | Bin 0 -> 3338 bytes .../blue_header_overflow_glyph_20px.svg | 11 ++ .../blue_header_overflow_glyph_24px.bmp | Bin 0 -> 4170 bytes .../blue_header_overflow_glyph_24px.svg | 13 ++ .../blue_header_overflow_glyph_32px.bmp | Bin 0 -> 7306 bytes .../blue_header_overflow_glyph_32px.svg | 13 ++ .../blue_header_overflow_glyph_8px.bmp | Bin 0 -> 586 bytes .../blue_header_overflow_glyph_8px.svg | 13 ++ .../light.msstyles/blue_header_sort_arrow_13px.bmp | Bin 0 -> 658 bytes .../light.msstyles/blue_header_sort_arrow_13px.svg | 9 + .../light.msstyles/blue_header_sort_arrow_16px.bmp | Bin 0 -> 970 bytes .../light.msstyles/blue_header_sort_arrow_16px.svg | 9 + .../light.msstyles/blue_header_sort_arrow_17px.bmp | Bin 0 -> 2314 bytes .../light.msstyles/blue_header_sort_arrow_17px.svg | 9 + .../light.msstyles/blue_header_sort_arrow_20px.bmp | Bin 0 -> 1338 bytes .../light.msstyles/blue_header_sort_arrow_20px.svg | 9 + .../light.msstyles/blue_header_sort_arrow_26px.bmp | Bin 0 -> 2010 bytes .../light.msstyles/blue_header_sort_arrow_26px.svg | 9 + .../light.msstyles/blue_header_sort_arrow_39px.bmp | Bin 0 -> 4818 bytes .../light.msstyles/blue_header_sort_arrow_39px.svg | 9 + .../light.msstyles/blue_header_sort_arrow_52px.bmp | Bin 0 -> 8458 bytes .../light.msstyles/blue_header_sort_arrow_52px.svg | 9 + dlls/light.msstyles/light.rc | 203 ++++++++++++++++++++- 64 files changed, 544 insertions(+), 45 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ab82ff093aa716e8927c…

1 0

Brendan Shanks : wbemprox: Use return length from NtQuerySystemInformationEx().
by Alexandre Julliard 27 Jun '22

27 Jun '22

Module: wine Branch: master Commit: 9c3201ad68e02b9917e6aa7360fb71da9f94b61d URL: https://source.winehq.org/git/wine.git/?a=commit;h=9c3201ad68e02b9917e6aa73… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Wed Jun 22 21:06:43 2022 -0700 wbemprox: Use return length from NtQuerySystemInformationEx(). --- dlls/wbemprox/builtin.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 725f3816ad9..4ac52918f6f 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -1533,7 +1533,7 @@ static UINT get_logical_processor_count( UINT *num_physical, UINT *num_packages if (status != STATUS_INFO_LENGTH_MISMATCH) return get_processor_count(); if (!(buf = malloc( len ))) return get_processor_count(); - status = NtQuerySystemInformationEx( SystemLogicalProcessorInformationEx, &all, sizeof(all), buf, len, NULL ); + status = NtQuerySystemInformationEx( SystemLogicalProcessorInformationEx, &all, sizeof(all), buf, len, &len ); if (status != STATUS_SUCCESS) { free( buf );

1 0

Nikolay Sivov : d2d1/effect: Reserve a buffer for property values.
by Alexandre Julliard 27 Jun '22

27 Jun '22

Module: wine Branch: master Commit: 727878630b23ec046a91e4ce20d3686975c85a76 URL: https://source.winehq.org/git/wine.git/?a=commit;h=727878630b23ec046a91e4ce… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jun 26 13:20:23 2022 +0300 d2d1/effect: Reserve a buffer for property values. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/factory.c | 130 ++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 100 insertions(+), 30 deletions(-) diff --git a/dlls/d2d1/factory.c b/dlls/d2d1/factory.c index 5c79d1791ff..0cb4b5df7d6 100644 --- a/dlls/d2d1/factory.c +++ b/dlls/d2d1/factory.c @@ -34,11 +34,30 @@ struct d2d_effect_property { WCHAR *name; D2D1_PROPERTY_TYPE type; - BYTE *value; + union + { + size_t offset; + void *ptr; + } data; + UINT32 size; PD2D1_PROPERTY_SET_FUNCTION set_function; PD2D1_PROPERTY_GET_FUNCTION get_function; }; +struct d2d_effect_properties +{ + struct d2d_effect_property *properties; + size_t offset; + size_t size; + size_t count; + struct + { + BYTE *ptr; + size_t size; + size_t count; + } data; +}; + struct d2d_effect_registration { struct list entry; @@ -47,22 +66,28 @@ struct d2d_effect_registration CLSID id; UINT32 input_count; - - struct d2d_effect_property *properties; - size_t property_size; - size_t property_count; + struct d2d_effect_properties properties; }; -static void d2d_effect_registration_cleanup(struct d2d_effect_registration *reg) +static void d2d_effect_properties_cleanup(struct d2d_effect_properties *props) { + struct d2d_effect_property *p; size_t i; - for (i = 0; i < reg->property_count; ++i) + for (i = 0; i < props->count; ++i) { - free(reg->properties[i].name); - free(reg->properties[i].value); + p = &props->properties[i]; + free(p->name); + if (p->type == D2D1_PROPERTY_TYPE_STRING) + free(p->data.ptr); } - free(reg->properties); + free(props->properties); + free(props->data.ptr); +} + +static void d2d_effect_registration_cleanup(struct d2d_effect_registration *reg) +{ + d2d_effect_properties_cleanup(&reg->properties); free(reg); } @@ -731,32 +756,80 @@ static struct d2d_effect_property * parse_effect_get_property(const struct d2d_e { unsigned int i; - for (i = 0; i < effect->property_count; ++i) + for (i = 0; i < effect->properties.count; ++i) { - if (!wcscmp(name, effect->properties[i].name)) - return &effect->properties[i]; + if (!wcscmp(name, effect->properties.properties[i].name)) + return &effect->properties.properties[i]; } return NULL; } -static HRESULT parse_effect_add_property(struct d2d_effect_registration *effect, WCHAR *name, - D2D1_PROPERTY_TYPE type, BYTE *value) +static HRESULT parse_effect_add_property(struct d2d_effect_properties *props, const WCHAR *name, + D2D1_PROPERTY_TYPE type, const WCHAR *value) { - struct d2d_effect_property *property; + static const UINT32 sizes[] = + { + 0, /* D2D1_PROPERTY_TYPE_UNKNOWN */ + 0, /* D2D1_PROPERTY_TYPE_STRING */ + sizeof(BOOL), /* D2D1_PROPERTY_TYPE_BOOL */ + sizeof(UINT32), /* D2D1_PROPERTY_TYPE_UINT32 */ + sizeof(INT32), /* D2D1_PROPERTY_TYPE_IN32 */ + sizeof(float), /* D2D1_PROPERTY_TYPE_FLOAT */ + 2 * sizeof(float), /* D2D1_PROPERTY_TYPE_VECTOR2 */ + 3 * sizeof(float), /* D2D1_PROPERTY_TYPE_VECTOR3 */ + 4 * sizeof(float), /* D2D1_PROPERTY_TYPE_VECTOR4 */ + 0, /* FIXME: D2D1_PROPERTY_TYPE_BLOB */ + sizeof(void *), /* D2D1_PROPERTY_TYPE_IUNKNOWN */ + sizeof(UINT32), /* D2D1_PROPERTY_TYPE_ENUM */ + 0, /* FIXME: D2D1_PROPERTY_TYPE_ARRAY */ + sizeof(CLSID), /* D2D1_PROPERTY_TYPE_CLSID */ + 6 * sizeof(float), /* D2D1_PROPERTY_TYPE_MATRIX_3X2 */ + 12 * sizeof(float), /* D2D1_PROPERTY_TYPE_MATRIX_4X3 */ + 16 * sizeof(float), /* D2D1_PROPERTY_TYPE_MATRIX_4X4 */ + 20 * sizeof(float), /* D2D1_PROPERTY_TYPE_MATRIX_5X4 */ + sizeof(void *), /* D2D1_PROPERTY_TYPE_COLOR_CONTEXT */ + }; + struct d2d_effect_property *p; + + assert(type >= D2D1_PROPERTY_TYPE_STRING && type <= D2D1_PROPERTY_TYPE_COLOR_CONTEXT); + + if (type == D2D1_PROPERTY_TYPE_BLOB || type == D2D1_PROPERTY_TYPE_ARRAY) + { + FIXME("Ignoring property %s of type %u.\n", wine_dbgstr_w(name), type); + return S_OK; + } - if (!d2d_array_reserve((void **)&effect->properties, &effect->property_size, - effect->property_count + 1, sizeof(*effect->properties))) + if (!d2d_array_reserve((void **)&props->properties, &props->size, props->count + 1, + sizeof(*props->properties))) { return E_OUTOFMEMORY; } - property = &effect->properties[effect->property_count++]; - property->name = name; - property->type = type; - property->value = value; - property->set_function = NULL; - property->get_function = NULL; + /* TODO: we could save some space for properties that have both getter and setter. */ + if (!d2d_array_reserve((void **)&props->data.ptr, &props->data.size, + props->data.size + sizes[type], sizeof(*props->data.ptr))) + { + return E_OUTOFMEMORY; + } + + p = &props->properties[props->count++]; + p->name = wcsdup(name); + p->type = type; + if (p->type == D2D1_PROPERTY_TYPE_STRING) + { + p->data.ptr = value ? wcsdup(value) : NULL; + p->size = value ? (wcslen(value) + 1) * sizeof(WCHAR) : 0; + } + else + { + p->data.offset = props->offset; + p->size = sizes[type]; + props->offset += p->size; + /* FIXME: convert and write initial value */ + } + p->set_function = NULL; + p->get_function = NULL; return S_OK; } @@ -792,13 +865,10 @@ static HRESULT parse_effect_property(IXmlReader *reader, struct d2d_effect_regis } if (SUCCEEDED(hr)) - hr = parse_effect_add_property(effect, name, type, (BYTE *)value); + hr = parse_effect_add_property(&effect->properties, name, type, value); - if (FAILED(hr)) - { - free(value); - free(name); - } + free(value); + free(name); return hr; }

1 0

Nikolay Sivov : d2d1/effect: Set property index.
by Alexandre Julliard 27 Jun '22

27 Jun '22

Module: wine Branch: master Commit: 8eff207c231a34294e28062778c6b5508d72332e URL: https://source.winehq.org/git/wine.git/?a=commit;h=8eff207c231a34294e280627… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jun 26 13:28:05 2022 +0300 d2d1/effect: Set property index. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/factory.c | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/factory.c b/dlls/d2d1/factory.c index 0cb4b5df7d6..16e12d818bc 100644 --- a/dlls/d2d1/factory.c +++ b/dlls/d2d1/factory.c @@ -34,6 +34,7 @@ struct d2d_effect_property { WCHAR *name; D2D1_PROPERTY_TYPE type; + UINT32 index; union { size_t offset; @@ -50,6 +51,7 @@ struct d2d_effect_properties size_t offset; size_t size; size_t count; + size_t custom_count; struct { BYTE *ptr; @@ -766,7 +768,7 @@ static struct d2d_effect_property * parse_effect_get_property(const struct d2d_e } static HRESULT parse_effect_add_property(struct d2d_effect_properties *props, const WCHAR *name, - D2D1_PROPERTY_TYPE type, const WCHAR *value) + UINT32 index, D2D1_PROPERTY_TYPE type, const WCHAR *value) { static const UINT32 sizes[] = { @@ -814,6 +816,8 @@ static HRESULT parse_effect_add_property(struct d2d_effect_properties *props, co } p = &props->properties[props->count++]; + p->index = index; + if (p->index < 0x80000000) props->custom_count++; p->name = wcsdup(name); p->type = type; if (p->type == D2D1_PROPERTY_TYPE_STRING) @@ -834,11 +838,22 @@ static HRESULT parse_effect_add_property(struct d2d_effect_properties *props, co return S_OK; } +static UINT32 parse_effect_get_property_index(struct d2d_effect_properties *props, + const WCHAR *name) +{ + if (!wcscmp(name, L"DisplayName")) return D2D1_PROPERTY_DISPLAYNAME; + if (!wcscmp(name, L"Author")) return D2D1_PROPERTY_AUTHOR; + if (!wcscmp(name, L"Category")) return D2D1_PROPERTY_CATEGORY; + if (!wcscmp(name, L"Description")) return D2D1_PROPERTY_DESCRIPTION; + return props->custom_count; +} + static HRESULT parse_effect_property(IXmlReader *reader, struct d2d_effect_registration *effect) { WCHAR *name = NULL, *value = NULL; D2D1_PROPERTY_TYPE type; unsigned int depth; + UINT32 index; HRESULT hr; if (FAILED(hr = parse_effect_get_attribute(reader, L"name", &name))) @@ -865,7 +880,10 @@ static HRESULT parse_effect_property(IXmlReader *reader, struct d2d_effect_regis } if (SUCCEEDED(hr)) - hr = parse_effect_add_property(&effect->properties, name, type, value); + { + index = parse_effect_get_property_index(&effect->properties, name); + hr = parse_effect_add_property(&effect->properties, name, index, type, value); + } free(value); free(name);

1 0

Nikolay Sivov : d2d1: Move effect object creation to effect.c.
by Alexandre Julliard 27 Jun '22

27 Jun '22

Module: wine Branch: master Commit: c172b89588abef7c2fc4b26a5af843e817acbf0e URL: https://source.winehq.org/git/wine.git/?a=commit;h=c172b89588abef7c2fc4b26a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jun 26 14:13:02 2022 +0300 d2d1: Move effect object creation to effect.c. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/d2d1_private.h | 4 ++-- dlls/d2d1/device.c | 28 +--------------------------- dlls/d2d1/effect.c | 43 ++++++++++++++++++++++++++++++++----------- 3 files changed, 35 insertions(+), 40 deletions(-) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 9be553c72d8..82c0b91e06d 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -624,8 +624,8 @@ struct d2d_effect size_t input_count; }; -HRESULT d2d_effect_init(struct d2d_effect *effect, - struct d2d_effect_context *effect_context, const CLSID *effect_id) DECLSPEC_HIDDEN; +HRESULT d2d_effect_create(struct d2d_device_context *context, const CLSID *effect_id, + ID2D1Effect **effect) DECLSPEC_HIDDEN; static inline BOOL d2d_array_reserve(void **elements, size_t *capacity, size_t count, size_t size) { diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index 04a31992ba2..dc29f3b7cb6 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -1946,36 +1946,10 @@ static HRESULT STDMETHODCALLTYPE d2d_device_context_CreateEffect(ID2D1DeviceCont REFCLSID effect_id, ID2D1Effect **effect) { struct d2d_device_context *context = impl_from_ID2D1DeviceContext(iface); - struct d2d_effect_context *effect_context; - struct d2d_effect *object; - HRESULT hr; TRACE("iface %p, effect_id %s, effect %p.\n", iface, debugstr_guid(effect_id), effect); - if (!(effect_context = calloc(1, sizeof(*effect_context)))) - return E_OUTOFMEMORY; - d2d_effect_context_init(effect_context, context); - - if (!(object = calloc(1, sizeof(*object)))) - { - ID2D1EffectContext_Release(&effect_context->ID2D1EffectContext_iface); - return E_OUTOFMEMORY; - } - - hr = d2d_effect_init(object, effect_context, effect_id); - ID2D1EffectContext_Release(&effect_context->ID2D1EffectContext_iface); - if (FAILED(hr)) - { - WARN("Failed to initialise effect, hr %#lx.\n", hr); - free(object); - return hr; - } - - *effect = &object->ID2D1Effect_iface; - - TRACE("Created effect %p.\n", *effect); - - return S_OK; + return d2d_effect_create(context, effect_id, effect); } static HRESULT STDMETHODCALLTYPE d2d_device_context_ID2D1DeviceContext_CreateGradientStopCollection( diff --git a/dlls/d2d1/effect.c b/dlls/d2d1/effect.c index f1b877821c8..688f1055791 100644 --- a/dlls/d2d1/effect.c +++ b/dlls/d2d1/effect.c @@ -753,26 +753,47 @@ static const ID2D1ImageVtbl d2d_effect_image_vtbl = d2d_effect_image_GetFactory, }; -HRESULT d2d_effect_init(struct d2d_effect *effect, struct d2d_effect_context *effect_context, const CLSID *effect_id) +HRESULT d2d_effect_create(struct d2d_device_context *context, const CLSID *effect_id, + ID2D1Effect **effect) { + struct d2d_effect_context *effect_context; + struct d2d_effect *object; unsigned int i; - effect->ID2D1Effect_iface.lpVtbl = &d2d_effect_vtbl; - effect->ID2D1Image_iface.lpVtbl = &d2d_effect_image_vtbl; - effect->refcount = 1; + if (!(effect_context = calloc(1, sizeof(*effect_context)))) + return E_OUTOFMEMORY; + d2d_effect_context_init(effect_context, context); + + if (!(object = calloc(1, sizeof(*object)))) + { + ID2D1EffectContext_Release(&effect_context->ID2D1EffectContext_iface); + return E_OUTOFMEMORY; + } + + object->ID2D1Effect_iface.lpVtbl = &d2d_effect_vtbl; + object->ID2D1Image_iface.lpVtbl = &d2d_effect_image_vtbl; + object->refcount = 1; + object->effect_context = effect_context; for (i = 0; i < ARRAY_SIZE(builtin_effects); ++i) { if (IsEqualGUID(effect_id, builtin_effects[i].clsid)) { - effect->info = &builtin_effects[i]; - d2d_effect_SetInputCount(&effect->ID2D1Effect_iface, effect->info->default_input_count); - effect->effect_context = effect_context; - ID2D1EffectContext_AddRef(&effect_context->ID2D1EffectContext_iface); - return S_OK; + object->info = &builtin_effects[i]; + d2d_effect_SetInputCount(&object->ID2D1Effect_iface, object->info->default_input_count); + break; } } - WARN("Unsupported effect clsid %s.\n", debugstr_guid(effect_id)); - return E_FAIL; + if (i == ARRAY_SIZE(builtin_effects)) + { + ID2D1Effect_Release(&object->ID2D1Effect_iface); + return E_FAIL; + } + + *effect = &object->ID2D1Effect_iface; + + TRACE("Created effect %p.\n", *effect); + + return S_OK; }

1 0

Nikolay Sivov : d2d1/effect: Set initial value for uint32 properties.
by Alexandre Julliard 27 Jun '22

27 Jun '22

Module: wine Branch: master Commit: 4a05b93d023ef8260c75e500efe53be421397a03 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4a05b93d023ef8260c75e500… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jun 26 14:22:05 2022 +0300 d2d1/effect: Set initial value for uint32 properties. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/factory.c | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/factory.c b/dlls/d2d1/factory.c index 16e12d818bc..52e09033e6d 100644 --- a/dlls/d2d1/factory.c +++ b/dlls/d2d1/factory.c @@ -827,10 +827,32 @@ static HRESULT parse_effect_add_property(struct d2d_effect_properties *props, co } else { + void *src = NULL; + UINT32 _uint32; + p->data.offset = props->offset; p->size = sizes[type]; props->offset += p->size; - /* FIXME: convert and write initial value */ + + if (value) + { + switch (p->type) + { + case D2D1_PROPERTY_TYPE_UINT32: + _uint32 = wcstoul(value, NULL, 10); + src = &_uint32; + break; + case D2D1_PROPERTY_TYPE_IUNKNOWN: + case D2D1_PROPERTY_TYPE_COLOR_CONTEXT: + break; + default: + FIXME("Initial value for property type %u is not handled.\n", p->type); + } + + if (src && p->size) memcpy(props->data.ptr + p->data.offset, src, p->size); + } + else if (p->size) + memset(props->data.ptr + p->data.offset, 0, p->size); } p->set_function = NULL; p->get_function = NULL;

1 0