wine-commits June 2021

wine-commits@winehq.org

1 participants
811 discussions

Zhiyi Zhang : light.msstyles: Add Progress parts.
by Alexandre Julliard 28 Jun '21

28 Jun '21

Module: wine Branch: master Commit: 3dab0775c7ed3ef65034ca1904eb2ac7f6a204ae URL: https://source.winehq.org/git/wine.git/?a=commit;h=3dab0775c7ed3ef65034ca19… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jun 28 10:29:58 2021 +0800 light.msstyles: Add Progress parts. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/light.msstyles/Makefile.in | 4 ++ .../blue_progress_chunk_horizontal.bmp | Bin 0 -> 2358 bytes .../blue_progress_chunk_horizontal.svg | 13 ++++++ .../blue_progress_chunk_vertical.bmp | Bin 0 -> 2490 bytes .../blue_progress_chunk_vertical.svg | 13 ++++++ .../blue_progress_track_horizontal.bmp | Bin 0 -> 2698 bytes .../blue_progress_track_horizontal.svg | 13 ++++++ .../blue_progress_track_vertical.bmp | Bin 0 -> 886 bytes .../blue_progress_track_vertical.svg | 13 ++++++ dlls/light.msstyles/light.rc | 48 +++++++++++++++++++++ 10 files changed, 104 insertions(+) diff --git a/dlls/light.msstyles/Makefile.in b/dlls/light.msstyles/Makefile.in index f5bbb77df04..c3c5643236a 100644 --- a/dlls/light.msstyles/Makefile.in +++ b/dlls/light.msstyles/Makefile.in @@ -15,6 +15,10 @@ SVG_SRCS = \ blue_groupbox.svg \ blue_header.svg \ blue_header_item.svg \ + blue_progress_chunk_horizontal.svg \ + blue_progress_chunk_vertical.svg \ + blue_progress_track_horizontal.svg \ + blue_progress_track_vertical.svg \ blue_radiobutton_13px.svg \ blue_radiobutton_16px.svg \ blue_radiobutton_25px.svg \ diff --git a/dlls/light.msstyles/blue_progress_chunk_horizontal.bmp b/dlls/light.msstyles/blue_progress_chunk_horizontal.bmp new file mode 100644 index 00000000000..60debfe4049 Binary files /dev/null and b/dlls/light.msstyles/blue_progress_chunk_horizontal.bmp differ diff --git a/dlls/light.msstyles/blue_progress_chunk_horizontal.svg b/dlls/light.msstyles/blue_progress_chunk_horizontal.svg new file mode 100644 index 00000000000..629b667f585 --- /dev/null +++ b/dlls/light.msstyles/blue_progress_chunk_horizontal.svg @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:49-24" width="49" height="15" version="1.1" viewBox="0 0 12.965 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 width="12.965" height="3.9688" fill="#3096fa" style="paint-order:normal"/> +</svg> diff --git a/dlls/light.msstyles/blue_progress_chunk_vertical.bmp b/dlls/light.msstyles/blue_progress_chunk_vertical.bmp new file mode 100644 index 00000000000..f9816b09dcf Binary files /dev/null and b/dlls/light.msstyles/blue_progress_chunk_vertical.bmp differ diff --git a/dlls/light.msstyles/blue_progress_chunk_vertical.svg b/dlls/light.msstyles/blue_progress_chunk_vertical.svg new file mode 100644 index 00000000000..4f43374dce5 --- /dev/null +++ b/dlls/light.msstyles/blue_progress_chunk_vertical.svg @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:15-24" width="15" height="49" version="1.1" viewBox="0 0 3.9687 12.965" 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)" y="-3.9688" width="12.965" height="3.9688" fill="#3096fa" style="paint-order:normal"/> +</svg> diff --git a/dlls/light.msstyles/blue_progress_track_horizontal.bmp b/dlls/light.msstyles/blue_progress_track_horizontal.bmp new file mode 100644 index 00000000000..43d5eaa441a Binary files /dev/null and b/dlls/light.msstyles/blue_progress_track_horizontal.bmp differ diff --git a/dlls/light.msstyles/blue_progress_track_horizontal.svg b/dlls/light.msstyles/blue_progress_track_horizontal.svg new file mode 100644 index 00000000000..af25bbbcd51 --- /dev/null +++ b/dlls/light.msstyles/blue_progress_track_horizontal.svg @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:53-24" width="53" height="16" version="1.1" viewBox="0 0 14.023 4.2333" 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=".13229" y=".13229" width="13.758" height="3.9688" fill="#fff" stroke="#aeaeae" stroke-width=".26458"/> +</svg> diff --git a/dlls/light.msstyles/blue_progress_track_vertical.bmp b/dlls/light.msstyles/blue_progress_track_vertical.bmp new file mode 100644 index 00000000000..5dddee9c32e Binary files /dev/null and b/dlls/light.msstyles/blue_progress_track_vertical.bmp differ diff --git a/dlls/light.msstyles/blue_progress_track_vertical.svg b/dlls/light.msstyles/blue_progress_track_vertical.svg new file mode 100644 index 00000000000..2f0f638bd8a --- /dev/null +++ b/dlls/light.msstyles/blue_progress_track_vertical.svg @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:14-24" width="14" height="17" version="1.1" viewBox="0 0 3.7042 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> + <rect x=".13229" y=".13229" width="3.4396" height="4.2333" fill="#fff" stroke="#aeaeae" stroke-width=".26458"/> +</svg> diff --git a/dlls/light.msstyles/light.rc b/dlls/light.msstyles/light.rc index 19e3192201f..199ddcbfa77 100644 --- a/dlls/light.msstyles/light.rc +++ b/dlls/light.msstyles/light.rc @@ -365,6 +365,41 @@ BLUE_INI TEXTFILE "FillColor = 255 255 255\r\n" "BorderColor = 174 174 174\r\n" +"\r\n; Progress\r\n" +"[Progress]\r\n" +"ProgressChunkSize = 1\r\n" +"ProgressSpaceSize = 0\r\n" +"BgType = BorderFill\r\n" +"FillType = Solid\r\n" +"FillColor = 255 255 255\r\n" +"BorderSize = 1\r\n" +"BorderColor = 174 174 174\r\n" + +"[Progress.Bar]\r\n" +"BgType = ImageFile\r\n" +"ImageFile = blue_progress_track_horizontal.bmp\r\n" +"MinSize = 10, 10\r\n" +"SizingMargins = 1, 1, 1, 1\r\n" +"SizingType = Stretch\r\n" + +"[Progress.BarVert]\r\n" +"BgType = ImageFile\r\n" +"ImageFile = blue_progress_track_vertical.bmp\r\n" +"SizingMargins = 1, 1, 1, 1\r\n" +"SizingType = Stretch\r\n" + +"[Progress.Chunk]\r\n" +"BgType = ImageFile\r\n" +"ImageFile = blue_progress_chunk_horizontal.bmp\r\n" +"SizingMargins = 1, 1, 1, 1\r\n" +"SizingType = Stretch\r\n" + +"[Progress.ChunkVert]\r\n" +"BgType = ImageFile\r\n" +"ImageFile = blue_progress_chunk_vertical.bmp\r\n" +"SizingMargins = 1, 1, 1, 1\r\n" +"SizingType = Stretch\r\n" + "\r\n; Rebar\r\n" "[Rebar]\r\n" "BgType = ImageFile\r\n" @@ -722,6 +757,19 @@ BLUE_HEADER_BMP BITMAP "blue_header.bmp" /* @makedep: blue_header_item.bmp */ BLUE_HEADER_ITEM_BMP BITMAP "blue_header_item.bmp" +/* Progress */ +/* @makedep: blue_progress_chunk_horizontal.bmp */ +BLUE_PROGRESS_CHUNK_HORIZONTAL_BMP BITMAP "blue_progress_chunk_horizontal.bmp" + +/* @makedep: blue_progress_chunk_vertical.bmp */ +BLUE_PROGRESS_CHUNK_VERTICAL_BMP BITMAP "blue_progress_chunk_vertical.bmp" + +/* @makedep: blue_progress_track_horizontal.bmp */ +BLUE_PROGRESS_TRACK_HORIZONTAL_BMP BITMAP "blue_progress_track_horizontal.bmp" + +/* @makedep: blue_progress_track_vertical.bmp */ +BLUE_PROGRESS_TRACK_VERTICAL_BMP BITMAP "blue_progress_track_vertical.bmp" + /* Rebar */ /* @makedep: blue_rebar_background.bmp */ BLUE_REBAR_BACKGROUND_BMP BITMAP "blue_rebar_background.bmp"

1 0

Zhiyi Zhang : light.msstyles: Add Header parts.
by Alexandre Julliard 28 Jun '21

28 Jun '21

Module: wine Branch: master Commit: a0debf126f2faecb5b108f588316ef2845a7ebf6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a0debf126f2faecb5b108f58… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jun 28 10:29:52 2021 +0800 light.msstyles: Add Header parts. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/light.msstyles/Makefile.in | 2 ++ dlls/light.msstyles/blue_header.bmp | Bin 0 -> 618 bytes dlls/light.msstyles/blue_header.svg | 21 +++++++++++++++++ dlls/light.msstyles/blue_header_item.bmp | Bin 0 -> 2538 bytes dlls/light.msstyles/blue_header_item.svg | 39 +++++++++++++++++++++++++++++++ dlls/light.msstyles/light.rc | 24 +++++++++++++++++++ 6 files changed, 86 insertions(+) diff --git a/dlls/light.msstyles/Makefile.in b/dlls/light.msstyles/Makefile.in index c0b55dd966d..f5bbb77df04 100644 --- a/dlls/light.msstyles/Makefile.in +++ b/dlls/light.msstyles/Makefile.in @@ -13,6 +13,8 @@ SVG_SRCS = \ blue_commandlink_glyph_30px.svg \ blue_commandlink_glyph_45px.svg \ blue_groupbox.svg \ + blue_header.svg \ + blue_header_item.svg \ blue_radiobutton_13px.svg \ blue_radiobutton_16px.svg \ blue_radiobutton_25px.svg \ diff --git a/dlls/light.msstyles/blue_header.bmp b/dlls/light.msstyles/blue_header.bmp new file mode 100644 index 00000000000..fb81a657aa9 Binary files /dev/null and b/dlls/light.msstyles/blue_header.bmp differ diff --git a/dlls/light.msstyles/blue_header.svg b/dlls/light.msstyles/blue_header.svg new file mode 100644 index 00000000000..46046e1e454 --- /dev/null +++ b/dlls/light.msstyles/blue_header.svg @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:6-24" width="6" height="24" version="1.1" viewBox="0 0 1.5875 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="0"> + <rect width="1.5875" height="6.35" fill="#fff"/> + <g fill="#aeaeae"> + <rect x="1.3229" y="3.1988e-7" width=".26458" height="6.0854"/> + <rect transform="rotate(90)" x="5.8208" y="-1.3229" width=".26458" height="1.3229"/> + <rect x="-1.5895e-8" width=".26458" height="6.0854"/> + <rect transform="rotate(90)" x="2.2252e-7" y="-1.3229" width=".26458" height="1.3229"/> + </g> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_header_item.bmp b/dlls/light.msstyles/blue_header_item.bmp new file mode 100644 index 00000000000..3a381109f57 Binary files /dev/null and b/dlls/light.msstyles/blue_header_item.bmp differ diff --git a/dlls/light.msstyles/blue_header_item.svg b/dlls/light.msstyles/blue_header_item.svg new file mode 100644 index 00000000000..642db57b60f --- /dev/null +++ b/dlls/light.msstyles/blue_header_item.svg @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:6-24" width="6" height="120" version="1.1" viewBox="0 0 1.5875 31.75" 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(-159.47 -110.22)" stroke-width="0"> + <rect x="159.47" y="110.22" width="1.5875" height="6.35" fill="#fff"/> + <rect x="160.79" y="110.22" width=".26458" height="6.0854" fill="#aeaeae"/> + <rect transform="rotate(90)" x="116.04" y="-160.79" width=".26458" height="1.3229" fill="#aeaeae"/> + <rect x="159.47" y="116.57" width="1.5875" height="6.35" fill="#fff"/> + <g fill="#3096fa"> + <rect x="160.79" y="116.57" width=".26458" height="6.0854"/> + <rect transform="rotate(90)" x="122.39" y="-160.79" width=".26458" height="1.0583"/> + <rect x="159.47" y="116.57" width=".26458" height="6.0854"/> + </g> + <rect x="159.47" y="122.92" width="1.5875" height="6.35" fill="#fff"/> + <g fill="#2979ff"> + <rect x="160.79" y="122.92" width=".26458" height="6.0854"/> + <rect transform="rotate(90)" x="122.92" y="-160.79" width=".26458" height="1.0583"/> + <rect x="159.47" y="122.92" width=".26458" height="6.0854"/> + </g> + <rect x="159.47" y="129.27" width="1.5875" height="6.35" fill="#fff"/> + <rect transform="rotate(90)" x="135.09" y="-161.06" width=".26458" height="1.5875" fill="#aeaeae"/> + <rect x="159.47" y="135.62" width="1.5875" height="6.35" fill="#fff"/> + <g fill="#aeaeae"> + <rect transform="rotate(90)" x="141.44" y="-161.06" width=".26458" height="1.5875"/> + <rect x="159.47" y="110.22" width=".26458" height="6.0854"/> + <rect transform="rotate(90)" x="110.22" y="-160.79" width=".26458" height="1.3229"/> + </g> + <rect transform="rotate(90)" x="116.57" y="-160.79" width=".26458" height="1.0583" fill="#3096fa"/> + <rect transform="rotate(90)" x="128.74" y="-160.79" width=".26458" height="1.0583" fill="#2979ff"/> + </g> +</svg> diff --git a/dlls/light.msstyles/light.rc b/dlls/light.msstyles/light.rc index 5aea6c02610..19e3192201f 100644 --- a/dlls/light.msstyles/light.rc +++ b/dlls/light.msstyles/light.rc @@ -334,6 +334,23 @@ BLUE_INI TEXTFILE "FillColor = 245 245 245\r\n" "TextColor = 0 0 0\r\n" +"\r\n; Header\r\n" +"[Header]\r\n" +"BgType = ImageFile\r\n" +"SizingMargins = 2, 2, 2, 4\r\n" +"ImageFile = blue_header.bmp\r\n" +"SizingType = Tile\r\n" + +"[Header.HeaderItem]\r\n" +"BgType = ImageFile\r\n" +"SizingMargins = 2, 2, 2, 4\r\n" +"ContentMargins = 3, 0, 0, 0\r\n" +"ImageFile = blue_header_item.bmp\r\n" +"ImageCount = 5\r\n" +"ImageLayout = Vertical\r\n" +"SizingType = Tile\r\n" +"Transparent = True\r\n" + "\r\n; ListBox\r\n" "[ListBox]\r\n" "BgType = BorderFill\r\n" @@ -698,6 +715,13 @@ BLUE_COMBOBUTTON_BMP BITMAP "blue_combobutton.bmp" /* @makedep: blue_combobutton_glyph.bmp */ BLUE_COMBOBUTTON_GLYPH_BMP BITMAP "blue_combobutton_glyph.bmp" +/* Header */ +/* @makedep: blue_header.bmp */ +BLUE_HEADER_BMP BITMAP "blue_header.bmp" + +/* @makedep: blue_header_item.bmp */ +BLUE_HEADER_ITEM_BMP BITMAP "blue_header_item.bmp" + /* Rebar */ /* @makedep: blue_rebar_background.bmp */ BLUE_REBAR_BACKGROUND_BMP BITMAP "blue_rebar_background.bmp"

1 0

Zhiyi Zhang : light.msstyles: Add TreeView parts.
by Alexandre Julliard 28 Jun '21

28 Jun '21

Module: wine Branch: master Commit: 5daeb032c7aa4ed51adac969d2ed087acfd69577 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5daeb032c7aa4ed51adac969… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jun 28 10:29:44 2021 +0800 light.msstyles: Add TreeView parts. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/light.msstyles/Makefile.in | 5 +++- .../blue_treeview_expand_collapse_10px.bmp | Bin 0 -> 938 bytes .../blue_treeview_expand_collapse_10px.svg | 16 +++++++++++ .../blue_treeview_expand_collapse_15px.bmp | Bin 0 -> 1938 bytes .../blue_treeview_expand_collapse_15px.svg | 16 +++++++++++ .../blue_treeview_expand_collapse_9px.bmp | Bin 0 -> 786 bytes .../blue_treeview_expand_collapse_9px.svg | 16 +++++++++++ dlls/light.msstyles/light.rc | 31 +++++++++++++++++++++ 8 files changed, 83 insertions(+), 1 deletion(-) diff --git a/dlls/light.msstyles/Makefile.in b/dlls/light.msstyles/Makefile.in index ec23c395b3a..c0b55dd966d 100644 --- a/dlls/light.msstyles/Makefile.in +++ b/dlls/light.msstyles/Makefile.in @@ -44,4 +44,7 @@ SVG_SRCS = \ blue_toolbar_buttons_split_dropdown.svg \ blue_toolbar_buttons_split_dropdown_glyph.svg \ blue_toolbar_separator_horizontal.svg \ - blue_toolbar_separator_vertical.svg + blue_toolbar_separator_vertical.svg \ + blue_treeview_expand_collapse_10px.svg \ + blue_treeview_expand_collapse_15px.svg \ + blue_treeview_expand_collapse_9px.svg diff --git a/dlls/light.msstyles/blue_treeview_expand_collapse_10px.bmp b/dlls/light.msstyles/blue_treeview_expand_collapse_10px.bmp new file mode 100644 index 00000000000..31860c071b5 Binary files /dev/null and b/dlls/light.msstyles/blue_treeview_expand_collapse_10px.bmp differ diff --git a/dlls/light.msstyles/blue_treeview_expand_collapse_10px.svg b/dlls/light.msstyles/blue_treeview_expand_collapse_10px.svg new file mode 100644 index 00000000000..370531f67bc --- /dev/null +++ b/dlls/light.msstyles/blue_treeview_expand_collapse_10px.svg @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:10-32" width="10" height="20" version="1.1" viewBox="0 0 2.6458 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> + <path d="m0.92604 2.3616 1.2446-1.0424-1.2446-1.0424z" fill="none" stroke="#aeaeae" stroke-width=".26458"/> + <path d="m0.26458 4.7625h1.8521v-1.8521z" fill="#3096fa" stroke-width=".19844"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_treeview_expand_collapse_15px.bmp b/dlls/light.msstyles/blue_treeview_expand_collapse_15px.bmp new file mode 100644 index 00000000000..8f55669d86d Binary files /dev/null and b/dlls/light.msstyles/blue_treeview_expand_collapse_15px.bmp differ diff --git a/dlls/light.msstyles/blue_treeview_expand_collapse_15px.svg b/dlls/light.msstyles/blue_treeview_expand_collapse_15px.svg new file mode 100644 index 00000000000..d219da9b6f4 --- /dev/null +++ b/dlls/light.msstyles/blue_treeview_expand_collapse_15px.svg @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:15-32" width="15" height="30" version="1.1" viewBox="0 0 3.9687 7.9375" 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.92604 3.7042 2.5586-1.7198-2.5586-1.7198z" fill="none" stroke="#aeaeae" stroke-width=".26458"/> + <path d="m0.26458 7.4083h3.175v-3.175z" fill="#3096fa" stroke-width=".19844"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_treeview_expand_collapse_9px.bmp b/dlls/light.msstyles/blue_treeview_expand_collapse_9px.bmp new file mode 100644 index 00000000000..239cf2d779f Binary files /dev/null and b/dlls/light.msstyles/blue_treeview_expand_collapse_9px.bmp differ diff --git a/dlls/light.msstyles/blue_treeview_expand_collapse_9px.svg b/dlls/light.msstyles/blue_treeview_expand_collapse_9px.svg new file mode 100644 index 00000000000..15ba25f8094 --- /dev/null +++ b/dlls/light.msstyles/blue_treeview_expand_collapse_9px.svg @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:9-32" width="9" height="18" version="1.1" viewBox="0 0 2.3812 4.7625" 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.66146 2.0842 0.99269-0.89372-0.99269-0.89372z" fill="none" stroke="#aeaeae" stroke-width=".26458"/> + <path d="m0.26458 4.4979h1.5875v-1.5875z" fill="#3096fa" stroke-width=".19844"/> + </g> +</svg> diff --git a/dlls/light.msstyles/light.rc b/dlls/light.msstyles/light.rc index b7a8f538536..5aea6c02610 100644 --- a/dlls/light.msstyles/light.rc +++ b/dlls/light.msstyles/light.rc @@ -634,6 +634,27 @@ BLUE_INI TEXTFILE "GlyphType = ImageGlyph\r\n" "GlyphImageFile = blue_toolbar_buttons_split_dropdown_glyph.bmp\r\n" "GlyphTransparent = True\r\n" + +"\r\n; TreeView\r\n" +"[TreeView]\r\n" +"BgType = BorderFill\r\n" +"BorderSize = 1\r\n" +"FillColor = 255 255 255\r\n" +"BorderColor = 174 174 174\r\n" + +"[TreeView.Glyph]\r\n" +"BgType = ImageFile\r\n" +"SizingType = TrueSize\r\n" +"ImageCount = 2\r\n" +"ImageLayout = vertical\r\n" +"ImageSelectType = Dpi\r\n" +"UniformSizing = True\r\n" +"ImageFile1 = blue_treeview_expand_collapse_9px.bmp\r\n" +"ImageFile2 = blue_treeview_expand_collapse_10px.bmp\r\n" +"ImageFile3 = blue_treeview_expand_collapse_15px.bmp\r\n" +"MinDpi1 = 96\r\n" +"MinDpi2 = 133\r\n" +"MinDpi3 = 150\r\n" } /* Button */ @@ -769,6 +790,16 @@ BLUE_TOOLBAR_BUTTONS_SPLIT_DROPDOWN_BMP BITMAP "blue_toolbar_buttons_split_dropd /* @makedep: blue_toolbar_buttons_split_dropdown_glyph.bmp */ BLUE_TOOLBAR_BUTTONS_SPLIT_DROPDOWN_GLYPH_BMP BITMAP "blue_toolbar_buttons_split_dropdown_glyph.bmp" +/* TreeView */ +/* @makedep: blue_treeview_expand_collapse_9px.bmp */ +BLUE_TREEVIEW_EXPAND_COLLAPSE_9PX_BMP BITMAP "blue_treeview_expand_collapse_9px.bmp" + +/* @makedep: blue_treeview_expand_collapse_10px.bmp */ +BLUE_TREEVIEW_EXPAND_COLLAPSE_10PX_BMP BITMAP "blue_treeview_expand_collapse_10px.bmp" + +/* @makedep: blue_treeview_expand_collapse_15px.bmp */ +BLUE_TREEVIEW_EXPAND_COLLAPSE_15PX_BMP BITMAP "blue_treeview_expand_collapse_15px.bmp" + /* File version */ #define WINE_FILEDESCRIPTION_STR "Light Theme" #define WINE_FILENAME_STR "light.msstyles"

1 0

Qian Hong : server: Forbid deleting files with an open mapping.
by Alexandre Julliard 28 Jun '21

28 Jun '21

Module: wine Branch: master Commit: 73d0bb77409b1a27fd25169516759cf0bd9d3d9a URL: https://source.winehq.org/git/wine.git/?a=commit;h=73d0bb77409b1a27fd251695… Author: Qian Hong <qhong(a)codeweavers.com> Date: Fri Jun 25 00:28:49 2021 -0500 server: Forbid deleting files with an open mapping. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/file.c | 8 ++++---- server/fd.c | 11 +++++++++++ 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 5d234114fd5..19ae5f2ac21 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -3329,14 +3329,14 @@ todo_wine fdi.DoDeleteFile = TRUE; res = pNtSetInformationFile( handle, &io, &fdi, sizeof(fdi), FileDispositionInformation ); - todo_wine ok( res == STATUS_CANNOT_DELETE, "got %#x\n", res ); + 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() ); + 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 ); @@ -3373,14 +3373,14 @@ todo_wine fdi.DoDeleteFile = TRUE; res = pNtSetInformationFile( handle, &io, &fdi, sizeof(fdi), FileDispositionInformation ); - todo_wine ok( res == STATUS_CANNOT_DELETE, "got %#x\n", res ); + 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() ); + 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 ); diff --git a/server/fd.c b/server/fd.c index bfa2805d82b..e326354d127 100644 --- a/server/fd.c +++ b/server/fd.c @@ -2452,6 +2452,17 @@ static void set_fd_disposition( struct fd *fd, int unlink ) if (unlink) { + struct fd *fd_ptr; + + LIST_FOR_EACH_ENTRY( fd_ptr, &fd->inode->open, struct fd, inode_entry ) + { + if (fd_ptr->access & FILE_MAPPING_ACCESS) + { + set_error( STATUS_CANNOT_DELETE ); + return; + } + } + if (fstat( fd->unix_fd, &st ) == -1) { file_set_error();

1 0

Qian Hong : ntdll/tests: Test deleting files with an open mapping.
by Alexandre Julliard 28 Jun '21

28 Jun '21

Module: wine Branch: master Commit: 7316122011305885736debf18227788fb57a8a2e URL: https://source.winehq.org/git/wine.git/?a=commit;h=7316122011305885736debf1… Author: Qian Hong <qhong(a)codeweavers.com> Date: Fri Jun 25 00:28:48 2021 -0500 ntdll/tests: Test deleting files with an open mapping. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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)

1 0

Floris Renaud : po: Update Dutch translation.
by Alexandre Julliard 28 Jun '21

28 Jun '21

Module: wine Branch: master Commit: e5f42e9c0cddfc48d1f0247f6b309167fb7f36a6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e5f42e9c0cddfc48d1f0247f… Author: Floris Renaud <jkfloris(a)dds.nl> Date: Sun Jun 27 14:06:45 2021 +0200 po: Update Dutch translation. Signed-off-by: Floris Renaud <jkfloris(a)dds.nl> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/nl.po | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/po/nl.po b/po/nl.po index f57e73cc0a8..46076ff7ae2 100644 --- a/po/nl.po +++ b/po/nl.po @@ -6984,10 +6984,8 @@ msgid "Resource is not currently available.\n" msgstr "Bron is tijdelijk niet beschikbaar.\n" #: dlls/light.msstyles/light.rc:30 dlls/light.msstyles/light.rc:37 -#, fuzzy -#| msgid "Class Name:" msgid "Classic Blue" -msgstr "Klassenaam:" +msgstr "Klassiek Blauw" #: dlls/light.msstyles/light.rc:43 dlls/light.msstyles/light.rc:49 #: programs/winhlp32/winhlp32.rc:53 programs/winhlp32/winhlp32.rc:73

1 0

Alexandre Julliard : ntdll: Avoid crash on shutting down partially initialized thread.
by Alexandre Julliard 28 Jun '21

28 Jun '21

Module: wine Branch: master Commit: 364099f528f83f0056f00178d9be6fe332692dc7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=364099f528f83f0056f00178… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Jun 27 19:32:48 2021 +0200 ntdll: Avoid crash on shutting down partially initialized thread. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 54806b0ab22..14cc105b64d 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -3411,7 +3411,7 @@ void WINAPI LdrShutdownThread(void) if (wm->ldr.TlsIndex != -1) call_tls_callbacks( wm->ldr.DllBase, DLL_THREAD_DETACH ); RtlAcquirePebLock(); - RemoveEntryList( &NtCurrentTeb()->TlsLinks ); + if (NtCurrentTeb()->TlsLinks.Flink) RemoveEntryList( &NtCurrentTeb()->TlsLinks ); if ((pointers = NtCurrentTeb()->ThreadLocalStoragePointer)) { for (i = 0; i < tls_module_count; i++) RtlFreeHeap( GetProcessHeap(), 0, pointers[i] );

1 0

Alexandre Julliard : ntdll: Only update the data that was requested in the destination context.
by Alexandre Julliard 28 Jun '21

28 Jun '21

Module: wine Branch: master Commit: ee65ea88ee7144e63cc10b0a5525bdfda688c93b URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee65ea88ee7144e63cc10b0a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jun 26 11:13:24 2021 +0200 ntdll: Only update the data that was requested in the destination context. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/thread.c | 100 ++++++++++++++++++++++++----------------------- 1 file changed, 51 insertions(+), 49 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ee65ea88ee7144e63cc1…

1 0

Alexandre Julliard : server: Support both native and wow64 register contexts.
by Alexandre Julliard 28 Jun '21

28 Jun '21

Module: wine Branch: master Commit: 8ac411ed6dc7a9390178a01e6f07a963a593d406 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8ac411ed6dc7a9390178a01e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jun 26 11:13:05 2021 +0200 server: Support both native and wow64 register contexts. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/exception.c | 2 - dlls/ntdll/unix/server.c | 5 +- dlls/ntdll/unix/signal_arm.c | 18 ++++ dlls/ntdll/unix/signal_arm64.c | 18 ++++ dlls/ntdll/unix/signal_i386.c | 18 ++++ dlls/ntdll/unix/signal_x86_64.c | 18 ++++ dlls/ntdll/unix/thread.c | 84 ++++++++++++--- dlls/ntdll/unix/unix_private.h | 2 + include/wine/server_protocol.h | 12 ++- server/protocol.def | 9 +- server/request.h | 3 +- server/thread.c | 225 +++++++++++++++++++++++++--------------- server/trace.c | 24 ++++- 13 files changed, 323 insertions(+), 115 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8ac411ed6dc7a9390178…

1 0

Alexandre Julliard : ntdll: Support converting server contexts from one machine to another.
by Alexandre Julliard 28 Jun '21

28 Jun '21

Module: wine Branch: master Commit: f64d86eb0aa9e53b872f2c611d5889cd91f70ddc URL: https://source.winehq.org/git/wine.git/?a=commit;h=f64d86eb0aa9e53b872f2c61… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jun 26 11:11:01 2021 +0200 ntdll: Support converting server contexts from one machine to another. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_i386.c | 72 ------- dlls/ntdll/unix/thread.c | 459 ++++++++++++++++++++++++++++++++++------- dlls/ntdll/unix/unix_private.h | 2 + 3 files changed, 383 insertions(+), 150 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f64d86eb0aa9e53b872f…

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
82
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2021