wine-commits June 2021

wine-commits@winehq.org

1 participants
811 discussions

Zhiyi Zhang : light.msstyles: Add Rebar parts.
by Alexandre Julliard 25 Jun '21

25 Jun '21

Module: wine Branch: master Commit: 37e85d3a238b9a38e5409f241bc711b1d056c988 URL: https://source.winehq.org/git/wine.git/?a=commit;h=37e85d3a238b9a38e5409f24… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Jun 25 09:58:30 2021 +0800 light.msstyles: Add Rebar 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 ++ dlls/light.msstyles/blue_rebar_background.bmp | Bin 0 -> 438 bytes dlls/light.msstyles/blue_rebar_background.svg | 13 ++++ dlls/light.msstyles/blue_rebar_chevron.bmp | Bin 0 -> 2298 bytes dlls/light.msstyles/blue_rebar_chevron.svg | 28 ++++++++ .../blue_rebar_gripper_horizontal.bmp | Bin 0 -> 378 bytes .../blue_rebar_gripper_horizontal.svg | 16 +++++ .../light.msstyles/blue_rebar_gripper_vertical.bmp | Bin 0 -> 378 bytes .../light.msstyles/blue_rebar_gripper_vertical.svg | 14 ++++ dlls/light.msstyles/light.rc | 72 +++++++++++++++++++++ 10 files changed, 147 insertions(+) diff --git a/dlls/light.msstyles/Makefile.in b/dlls/light.msstyles/Makefile.in index 39690b35995..9ed4d4094e4 100644 --- a/dlls/light.msstyles/Makefile.in +++ b/dlls/light.msstyles/Makefile.in @@ -16,6 +16,10 @@ SVG_SRCS = \ blue_radiobutton_13px.svg \ blue_radiobutton_16px.svg \ blue_radiobutton_25px.svg \ + blue_rebar_background.svg \ + blue_rebar_chevron.svg \ + blue_rebar_gripper_horizontal.svg \ + blue_rebar_gripper_vertical.svg \ blue_scrollbar_arrow_glyphs_7px.svg \ blue_scrollbar_arrow_glyphs_9px.svg \ blue_scrollbar_arrows.svg \ diff --git a/dlls/light.msstyles/blue_rebar_background.bmp b/dlls/light.msstyles/blue_rebar_background.bmp new file mode 100644 index 00000000000..18a85f93f19 Binary files /dev/null and b/dlls/light.msstyles/blue_rebar_background.bmp differ diff --git a/dlls/light.msstyles/blue_rebar_background.svg b/dlls/light.msstyles/blue_rebar_background.svg new file mode 100644 index 00000000000..aca531e8bb4 --- /dev/null +++ b/dlls/light.msstyles/blue_rebar_background.svg @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:3-24" width="3" height="25" version="1.1" viewBox="0 0 .79375 6.6146" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <rect x="-1e-6" y="-5.5511e-17" width=".79375" height="6.6146" fill="#fff" stroke-width=".26458"/> +</svg> diff --git a/dlls/light.msstyles/blue_rebar_chevron.bmp b/dlls/light.msstyles/blue_rebar_chevron.bmp new file mode 100644 index 00000000000..4b581c5ed1d Binary files /dev/null and b/dlls/light.msstyles/blue_rebar_chevron.bmp differ diff --git a/dlls/light.msstyles/blue_rebar_chevron.svg b/dlls/light.msstyles/blue_rebar_chevron.svg new file mode 100644 index 00000000000..a6e1b707c47 --- /dev/null +++ b/dlls/light.msstyles/blue_rebar_chevron.svg @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:10-32" width="10" height="54" version="1.1" viewBox="0 0 2.6458 14.288" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <g stroke-width=".26458"> + <path d="m1.9855 1.5795-0.91792-0.91901 0.13113-0.13129 0.91792 0.91901z" fill="#aeaeae"/> + <path d="m2.1074 1.4622-0.91792 0.91901-0.13113-0.13129 0.91792-0.91901z" fill="#aeaeae"/> + <path d="m1.9855 3.9607-0.91792-0.91901 0.13113-0.13129 0.91792 0.91901z" fill="#3096fa"/> + <path d="m2.1074 3.8435-0.91792 0.91901-0.13113-0.13129 0.91792-0.91901z" fill="#3096fa"/> + <path d="m1.9294 6.8751 7.757e-4 -1.3187 0.18651-1.14e-4 -7.75e-4 1.3187z" fill="#2979ff"/> + <path d="m2.0993 6.8784-1.3055 7.821e-4 1.1418e-4 -0.18839 1.3055-7.827e-4z" fill="#2979ff"/> + <g fill="#aeaeae"> + <path d="m1.9855 8.7232-0.91792-0.91901 0.13113-0.13129 0.91792 0.91901z"/> + <path d="m2.1074 8.606-0.91792 0.91901-0.13113-0.13129 0.91792-0.91901z"/> + <path d="m1.9855 11.104-0.91792-0.91901 0.13113-0.13129 0.91792 0.91901z"/> + <path d="m2.1074 10.987-0.91792 0.91901-0.13113-0.13129 0.91792-0.91901z"/> + <path d="m1.9855 13.486-0.91792-0.91901 0.13113-0.13129 0.91792 0.91901z"/> + <path d="m2.1074 13.368-0.91792 0.91901-0.13113-0.13129 0.91792-0.91901z"/> + </g> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_rebar_gripper_horizontal.bmp b/dlls/light.msstyles/blue_rebar_gripper_horizontal.bmp new file mode 100644 index 00000000000..3dca037e702 Binary files /dev/null and b/dlls/light.msstyles/blue_rebar_gripper_horizontal.bmp differ diff --git a/dlls/light.msstyles/blue_rebar_gripper_horizontal.svg b/dlls/light.msstyles/blue_rebar_gripper_horizontal.svg new file mode 100644 index 00000000000..faaa3d41ba4 --- /dev/null +++ b/dlls/light.msstyles/blue_rebar_gripper_horizontal.svg @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:6-32" width="6" height="10" version="1.1" viewBox="0 0 1.5875 2.6458" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <g stroke-width=".26458"> + <path d="m0.52917 0.52917h0.26458v1.5875h-0.26458z" fill="#aeaeae"/> + <path d="m0.79375 0.52917h0.26458v1.5875h-0.26458z" fill="#fff"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_rebar_gripper_vertical.bmp b/dlls/light.msstyles/blue_rebar_gripper_vertical.bmp new file mode 100644 index 00000000000..4b1e85479a1 Binary files /dev/null and b/dlls/light.msstyles/blue_rebar_gripper_vertical.bmp differ diff --git a/dlls/light.msstyles/blue_rebar_gripper_vertical.svg b/dlls/light.msstyles/blue_rebar_gripper_vertical.svg new file mode 100644 index 00000000000..0a1249e8883 --- /dev/null +++ b/dlls/light.msstyles/blue_rebar_gripper_vertical.svg @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:10-32" width="10" height="6" version="1.1" viewBox="0 0 2.6458 1.5875" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <path d="m1.3229 0.79375h0.52917v0.52917h-0.52917z" fill="#aeaeae" stroke-width=".26458"/> + <path d="m1.0583 0.52917h0.52917v0.52917h-0.52917z" fill="#2d2d2d" stroke-width=".26458"/> +</svg> diff --git a/dlls/light.msstyles/light.rc b/dlls/light.msstyles/light.rc index c24df6ca17f..c96b4dcf30f 100644 --- a/dlls/light.msstyles/light.rc +++ b/dlls/light.msstyles/light.rc @@ -341,6 +341,65 @@ BLUE_INI TEXTFILE "FillColor = 255 255 255\r\n" "BorderColor = 174 174 174\r\n" +"\r\n; Rebar\r\n" +"[Rebar]\r\n" +"BgType = ImageFile\r\n" +"SizingType = Stretch\r\n" +"ImageFile = blue_rebar_background.bmp\r\n" +"SizingMargins = 1, 1, 9, 2\r\n" +"Font = Tahoma, 8\r\n" +"TextColor = 0 0 0\r\n" + +"[Rebar.Band]\r\n" +"BgType = None\r\n" +"ContentMargins = 2, 0, 0, 0\r\n" + +"[Rebar.Gripper]\r\n" +"Bgtype = imagefile\r\n" +"SizingMargins = 2, 1, 4, 2\r\n" +"ContentMargins = 2, 1, 0, 0\r\n" +"ImageFile = blue_rebar_gripper_horizontal.bmp\r\n" +"SizingType = Tile\r\n" +"Transparent = True\r\n" + +"[Rebar.GripperVert]\r\n" +"Bgtype = ImageFile\r\n" +"SizingMargins = 3, 3, 2, 1\r\n" +"ContentMargins = 1, 2, 0, 0\r\n" +"ImageFile = blue_rebar_gripper_vertical.bmp\r\n" +"SizingType = Tile\r\n" +"Transparent = True\r\n" + +"[Rebar.Chevron]\r\n" +"SizingMargins = 4, 4, 4, 4\r\n" +"ContentMargins = 0, 0, 0, 0\r\n" +"; Same as toolbar buttons \r\n" +"ImageFile = blue_toolbar_buttons.bmp\r\n" +"Bgtype = ImageFile\r\n" +"Imagelayout = Vertical\r\n" +"ImageCount = 6\r\n" +"SizingType = Stretch\r\n" +"Transparent = True\r\n" +"GlyphType = ImageGlyph\r\n" +"GlyphImageFile = blue_rebar_chevron.bmp\r\n" +"GlyphTransparent = True\r\n" +"VAlign = Top\r\n" + +"[Rebar.ChevronVert]\r\n" +"SizingMargins = 4, 4, 4, 4\r\n" +"ContentMargins = 0, 0, 0, 0\r\n" +"; Same as toolbar buttons \r\n" +"ImageFile = blue_toolbar_buttons.bmp\r\n" +"Bgtype = ImageFile\r\n" +"Imagelayout = Vertical\r\n" +"ImageCount = 6\r\n" +"SizingType = Stretch\r\n" +"Transparent = True\r\n" +"GlyphType = ImageGlyph\r\n" +"GlyphImageFile = blue_rebar_chevron.bmp\r\n" +"GlyphTransparent = True\r\n" +"VAlign = Top\r\n" + "\r\n; Scroll Bar\r\n" "[ScrollBar.ArrowBtn]\r\n" "BgType = ImageFile\r\n" @@ -582,6 +641,19 @@ BLUE_COMBOBUTTON_BMP BITMAP "blue_combobutton.bmp" /* @makedep: blue_combobutton_glyph.bmp */ BLUE_COMBOBUTTON_GLYPH_BMP BITMAP "blue_combobutton_glyph.bmp" +/* Rebar */ +/* @makedep: blue_rebar_background.bmp */ +BLUE_REBAR_BACKGROUND_BMP BITMAP "blue_rebar_background.bmp" + +/* @makedep: blue_rebar_gripper_horizontal.bmp */ +BLUE_REBAR_GRIPPER_HORIZONTAL_BMP BITMAP "blue_rebar_gripper_horizontal.bmp" + +/* @makedep: blue_rebar_gripper_vertical.bmp */ +BLUE_REBAR_GRIPPER_VERTICAL_BMP BITMAP "blue_rebar_gripper_vertical.bmp" + +/* @makedep: blue_rebar_chevron.bmp */ +BLUE_REBAR_CHEVRON_BMP BITMAP "blue_rebar_chevron.bmp" + /* Scroll Bar */ /* @makedep: blue_scrollbar_arrows.bmp */ BLUE_SCROLLBAR_ARROWS_BMP BITMAP "blue_scrollbar_arrows.bmp"

1 0

Zhiyi Zhang : light.msstyles: Add Toolbar parts.
by Alexandre Julliard 25 Jun '21

25 Jun '21

Module: wine Branch: master Commit: 28a08e90cbc28a6c169b7975b1b369f5ecedc6b9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=28a08e90cbc28a6c169b7975… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Jun 25 09:58:15 2021 +0800 light.msstyles: Add Toolbar parts. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/light.msstyles/Makefile.in | 8 +- dlls/light.msstyles/blue_toolbar_buttons.bmp | Bin 0 -> 4890 bytes dlls/light.msstyles/blue_toolbar_buttons.svg | 20 +++++ dlls/light.msstyles/blue_toolbar_buttons_split.bmp | Bin 0 -> 3306 bytes dlls/light.msstyles/blue_toolbar_buttons_split.svg | 18 +++++ .../blue_toolbar_buttons_split_dropdown.bmp | Bin 0 -> 2778 bytes .../blue_toolbar_buttons_split_dropdown.svg | 18 +++++ .../blue_toolbar_buttons_split_dropdown_glyph.bmp | Bin 0 -> 2298 bytes .../blue_toolbar_buttons_split_dropdown_glyph.svg | 28 +++++++ .../blue_toolbar_separator_horizontal.bmp | Bin 0 -> 298 bytes .../blue_toolbar_separator_horizontal.svg | 13 ++++ .../blue_toolbar_separator_vertical.bmp | Bin 0 -> 298 bytes .../blue_toolbar_separator_vertical.svg | 13 ++++ dlls/light.msstyles/light.rc | 86 +++++++++++++++++++++ 14 files changed, 203 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=28a08e90cbc28a6c169b…

1 0

Zhiyi Zhang : light.msstyles: Add Spin parts.
by Alexandre Julliard 25 Jun '21

25 Jun '21

Module: wine Branch: master Commit: 4801f7b29f932d86acdbc4867f4fc8460882ac8b URL: https://source.winehq.org/git/wine.git/?a=commit;h=4801f7b29f932d86acdbc486… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Jun 25 09:57:59 2021 +0800 light.msstyles: Add Spin parts. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/light.msstyles/Makefile.in | 11 ++- dlls/light.msstyles/blue_spin_background.bmp | Bin 0 -> 446 bytes dlls/light.msstyles/blue_spin_background.svg | 16 ++++ dlls/light.msstyles/blue_spin_background_down.bmp | Bin 0 -> 1674 bytes dlls/light.msstyles/blue_spin_background_down.svg | 19 +++++ dlls/light.msstyles/blue_spin_background_left.bmp | Bin 0 -> 1674 bytes dlls/light.msstyles/blue_spin_background_left.svg | 19 +++++ dlls/light.msstyles/blue_spin_background_right.bmp | Bin 0 -> 1674 bytes dlls/light.msstyles/blue_spin_background_right.svg | 19 +++++ dlls/light.msstyles/blue_spin_background_up.bmp | Bin 0 -> 1674 bytes dlls/light.msstyles/blue_spin_background_up.svg | 19 +++++ dlls/light.msstyles/blue_spin_glyph_down.bmp | Bin 0 -> 810 bytes dlls/light.msstyles/blue_spin_glyph_down.svg | 24 ++++++ dlls/light.msstyles/blue_spin_glyph_left.bmp | Bin 0 -> 810 bytes dlls/light.msstyles/blue_spin_glyph_left.svg | 24 ++++++ dlls/light.msstyles/blue_spin_glyph_right.bmp | Bin 0 -> 810 bytes dlls/light.msstyles/blue_spin_glyph_right.svg | 24 ++++++ dlls/light.msstyles/blue_spin_glyph_up.bmp | Bin 0 -> 810 bytes dlls/light.msstyles/blue_spin_glyph_up.svg | 24 ++++++ dlls/light.msstyles/light.rc | 84 +++++++++++++++++++++ 20 files changed, 282 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4801f7b29f932d86acdb…

1 0

Zhiyi Zhang : light.msstyles: Add Scroll Bar parts.
by Alexandre Julliard 25 Jun '21

25 Jun '21

Module: wine Branch: master Commit: 2bb0680b6897e37688ecb536f1870f6db9ed64ee URL: https://source.winehq.org/git/wine.git/?a=commit;h=2bb0680b6897e37688ecb536… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Jun 25 09:57:45 2021 +0800 light.msstyles: Add Scroll Bar parts. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/light.msstyles/Makefile.in | 10 +- .../blue_scrollbar_arrow_glyphs_7px.bmp | Bin 0 -> 3274 bytes .../blue_scrollbar_arrow_glyphs_7px.svg | 54 +++++++++++ .../blue_scrollbar_arrow_glyphs_9px.bmp | Bin 0 -> 5322 bytes .../blue_scrollbar_arrow_glyphs_9px.svg | 54 +++++++++++ dlls/light.msstyles/blue_scrollbar_arrows.bmp | Bin 0 -> 14282 bytes dlls/light.msstyles/blue_scrollbar_arrows.svg | 37 ++++++++ .../blue_scrollbar_resizebox_grip.bmp | Bin 0 -> 2314 bytes .../blue_scrollbar_resizebox_grip.svg | 26 ++++++ .../blue_scrollbar_shaft_horizontal.bmp | Bin 0 -> 394 bytes .../blue_scrollbar_shaft_horizontal.svg | 13 +++ .../blue_scrollbar_shaft_vertical.bmp | Bin 0 -> 490 bytes .../blue_scrollbar_shaft_vertical.svg | 13 +++ .../blue_scrollbar_thumb_horizontal.bmp | Bin 0 -> 4762 bytes .../blue_scrollbar_thumb_horizontal.svg | 19 ++++ .../blue_scrollbar_thumb_vertical.bmp | Bin 0 -> 4714 bytes .../blue_scrollbar_thumb_vertical.svg | 19 ++++ dlls/light.msstyles/light.rc | 101 +++++++++++++++++++++ 18 files changed, 345 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2bb0680b6897e37688ec…

1 0

Francois Gouget : winehq: Fix the WineConf case.
by Alexandre Julliard 25 Jun '21

25 Jun '21

Module: website Branch: master Commit: 8fa5d74c470a7f0e4e395f4a191e7c80d8533cff URL: https://source.winehq.org/git/website.git/?a=commit;h=8fa5d74c470a7f0e4e395… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Jun 25 03:26:20 2021 +0200 winehq: Fix the WineConf case. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/de/2009060301.xml | 2 +- news/en/2008071301.xml | 2 +- news/en/2009060301.xml | 2 +- news/en/2009092101.xml | 2 +- wwn/en/interviews/interview_11.xml | 2 +- wwn/en/interviews/interview_2.xml | 4 ++-- wwn/en/interviews/interview_6.xml | 4 ++-- wwn/en/wn20020308_117.xml | 4 ++-- wwn/en/wn20020325_118.xml | 10 +++++----- wwn/en/wn20020331_119.xml | 8 ++++---- wwn/en/wn20030207_156.xml | 12 ++++++------ wwn/en/wn20030815_183.xml | 4 ++-- wwn/en/wn20031003_190.xml | 8 ++++---- wwn/en/wn20031108_195.xml | 4 ++-- wwn/en/wn20031205_199.xml | 10 +++++----- wwn/en/wn20040109_204.xml | 4 ++-- wwn/en/wn20040116_205.xml | 4 ++-- wwn/en/wn20040130_207.xml | 2 +- wwn/en/wn20040203_208.xml | 2 +- wwn/en/wn20040206_209.xml | 10 +++++----- wwn/en/wn20040625_228.xml | 6 +++--- wwn/en/wn20040910_239.xml | 2 +- wwn/en/wn20041015_244.xml | 16 ++++++++-------- wwn/en/wn20041022_245.xml | 2 +- wwn/en/wn20041210_252.xml | 2 +- wwn/en/wn20041224_254.xml | 2 +- wwn/en/wn20050128_259.xml | 4 ++-- wwn/en/wn20050506_273.xml | 8 ++++---- wwn/en/wn20060305_307.xml | 10 +++++----- wwn/en/wn20060402_310.xml | 4 ++-- wwn/en/wn20060428_312.xml | 6 +++--- wwn/en/wn20060810_319.xml | 2 +- wwn/en/wn20070226_323.xml | 2 +- wwn/en/wn20070430_330.xml | 2 +- wwn/en/wn20080106_338.xml | 6 +++--- wwn/en/wn20080224_341.xml | 2 +- wwn/en/wn20080714_349.xml | 14 +++++++------- wwn/en/wn20090527_357.xml | 2 +- wwn/en/wn20090603_358.xml | 2 +- wwn/en/wn20090921_360.xml | 10 +++++----- 40 files changed, 102 insertions(+), 102 deletions(-) Diff: https://source.winehq.org/git/website.git/?a=commitdiff;h=8fa5d74c470a7f0e4…

1 0

Francois Gouget : winehq: News: Fix some spelling issues.
by Alexandre Julliard 25 Jun '21

25 Jun '21

Module: website Branch: master Commit: e67ca36ab66a3e4f86fd434647353905a42a95b3 URL: https://source.winehq.org/git/website.git/?a=commit;h=e67ca36ab66a3e4f86fd4… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Jun 25 03:26:25 2021 +0200 winehq: News: Fix some spelling issues. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2004012201.xml | 2 +- news/en/2017052601.xml | 2 +- news/en/2018070901.xml | 2 +- news/ko/2017052601.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/news/en/2004012201.xml b/news/en/2004012201.xml index 5a012d18..f9f70956 100644 --- a/news/en/2004012201.xml +++ b/news/en/2004012201.xml @@ -5,6 +5,6 @@ TransGaming released <a href="http://downloads.transgaming.com/files/point2play-1.2_releasenotes.txt">Point2Play 1.2</a> yesterday. The new version brings support for multiuser - WineX installations and translations to German and Portugese. + WineX installations and translations to German and Portuguese. </body> </news> diff --git a/news/en/2017052601.xml b/news/en/2017052601.xml index 9374dca3..0dfeca53 100644 --- a/news/en/2017052601.xml +++ b/news/en/2017052601.xml @@ -5,7 +5,7 @@ <p> The Wine development release 2.9 is now available.</p> <p> <a href="{$root}/announce/2.9">What's new</a> in this release: <ul> - <li>Support for tesselation shaders in Direct3D.</li> + <li>Support for tessellation shaders in Direct3D.</li> <li>Binary mode support in WebServices.</li> <li>Clipboard changes detected through Xfixes.</li> <li>User interface improvements in RegEdit.</li> diff --git a/news/en/2018070901.xml b/news/en/2018070901.xml index 28582b31..6e082d16 100644 --- a/news/en/2018070901.xml +++ b/news/en/2018070901.xml @@ -7,7 +7,7 @@ <ul> <li>Unicode data updated to Unicode 11.0.0.</li> <li>Proxy configuration dialog in the Internet control panel.</li> - <li>Syntax fixes in the Cmd.exe command intepreter.</li> + <li>Syntax fixes in the Cmd.exe command interpreter.</li> <li>Some more glyphs in the Wingdings font.</li> <li>Various bug fixes.</li> </ul> diff --git a/news/ko/2017052601.xml b/news/ko/2017052601.xml index 57aa2ccb..2fcdb89b 100644 --- a/news/ko/2017052601.xml +++ b/news/ko/2017052601.xml @@ -5,7 +5,7 @@ <p> 와인 개발자판 2.9(을)를 내려받을 수 있습니다.</p> <p> <a href="{$root}/announce/2.9">이 판</a>의 변경 및 개선점: <ul> - <li>Support for tesselation shaders in Direct3D.</li> + <li>Support for tessellation shaders in Direct3D.</li> <li>Binary mode support in WebServices.</li> <li>Clipboard changes detected through Xfixes.</li> <li>User interface improvements in RegEdit.</li>

1 0

Rémi Bernon : hid: Rewrite HidP_GetUsagesEx using enum_value_caps.
by Alexandre Julliard 24 Jun '21

24 Jun '21

Module: wine Branch: master Commit: f8e696503683a99970e7d27e3796e1c5d045328c URL: https://source.winehq.org/git/wine.git/?a=commit;h=f8e696503683a99970e7d27e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jun 24 10:05:59 2021 +0200 hid: Rewrite HidP_GetUsagesEx using enum_value_caps. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/hidp.c | 101 ++++++++++++++----------------------- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 2 - 2 files changed, 37 insertions(+), 66 deletions(-) diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c index 4889a1e4014..8d893f6327d 100644 --- a/dlls/hid/hidp.c +++ b/dlls/hid/hidp.c @@ -716,81 +716,54 @@ NTSTATUS WINAPI HidP_GetSpecificValueCaps( HIDP_REPORT_TYPE report_type, USAGE u return enum_value_caps( preparsed, report_type, 0, &filter, get_value_caps, &caps, caps_count ); } -NTSTATUS WINAPI HidP_GetUsagesEx(HIDP_REPORT_TYPE ReportType, USHORT LinkCollection, USAGE_AND_PAGE *ButtonList, - ULONG *UsageLength, PHIDP_PREPARSED_DATA PreparsedData, CHAR *Report, ULONG ReportLength) +struct get_usage_and_page_params { - WINE_HIDP_PREPARSED_DATA *data = (WINE_HIDP_PREPARSED_DATA*)PreparsedData; - WINE_HID_ELEMENT *elems = HID_ELEMS(data); - WINE_HID_REPORT *report = NULL; - USHORT b_count = 0, r_count = 0; - int i,uCount = 0; - NTSTATUS rc; - - TRACE("(%i, %i, %p, %p(%i), %p, %p, %i)\n", ReportType, LinkCollection, ButtonList, - UsageLength, *UsageLength, PreparsedData, Report, ReportLength); - - if (data->magic != HID_MAGIC) - return HIDP_STATUS_INVALID_PREPARSED_DATA; - - switch(ReportType) - { - case HidP_Input: - b_count = data->caps.NumberInputButtonCaps; - break; - case HidP_Output: - b_count = data->caps.NumberOutputButtonCaps; - break; - case HidP_Feature: - b_count = data->caps.NumberFeatureButtonCaps; - break; - default: - return HIDP_STATUS_INVALID_REPORT_TYPE; - } - r_count = data->reportCount[ReportType]; - report = &data->reports[data->reportIdx[ReportType][(BYTE)Report[0]]]; - - if (!r_count || !b_count) - return HIDP_STATUS_USAGE_NOT_FOUND; + USAGE_AND_PAGE *usages; + USAGE_AND_PAGE *usages_end; + char *report_buf; +}; - if (report->reportID && report->reportID != Report[0]) - return HIDP_STATUS_REPORT_DOES_NOT_EXIST; +static NTSTATUS get_usage_and_page( const struct hid_value_caps *caps, void *user ) +{ + struct get_usage_and_page_params *params = user; + ULONG bit, last; - for (i = 0; i < report->elementCount; i++) + for (bit = caps->start_bit, last = bit + caps->usage_max - caps->usage_min; bit <= last; bit++) { - if (elems[report->elementIdx + i].caps.BitSize == 1) + if (!(params->report_buf[bit / 8] & (1 << (bit % 8)))) continue; + if (params->usages < params->usages_end) { - int k; - WINE_HID_ELEMENT *element = &elems[report->elementIdx + i]; - for (k=0; k < element->bitCount; k++) - { - UINT v = 0; - NTSTATUS rc = get_report_data((BYTE*)Report, ReportLength, - element->valueStartBit + k, 1, &v); - if (rc != HIDP_STATUS_SUCCESS) - return rc; - if (v) - { - if (uCount < *UsageLength) - { - ButtonList[uCount].Usage = element->caps.Range.UsageMin + k; - ButtonList[uCount].UsagePage = element->caps.UsagePage; - } - uCount++; - } - } + params->usages->UsagePage = caps->usage_page; + params->usages->Usage = caps->usage_min + bit - caps->start_bit; } + params->usages++; } - TRACE("Returning %i usages\n", uCount); + return HIDP_STATUS_SUCCESS; +} - if (*UsageLength < uCount) - rc = HIDP_STATUS_BUFFER_TOO_SMALL; - else - rc = HIDP_STATUS_SUCCESS; +NTSTATUS WINAPI HidP_GetUsagesEx( HIDP_REPORT_TYPE report_type, USHORT collection, USAGE_AND_PAGE *usages, + ULONG *usages_len, PHIDP_PREPARSED_DATA preparsed_data, char *report_buf, ULONG report_len ) +{ + struct get_usage_and_page_params params = {.usages = usages, .usages_end = usages + *usages_len, .report_buf = report_buf}; + WINE_HIDP_PREPARSED_DATA *preparsed = (WINE_HIDP_PREPARSED_DATA *)preparsed_data; + struct caps_filter filter = {.buttons = TRUE, .collection = collection}; + NTSTATUS status; + USHORT limit = -1; - *UsageLength = uCount; + TRACE( "report_type %d, collection %d, usages %p, usages_len %p, preparsed_data %p, report_buf %p, report_len %u.\n", + report_type, collection, usages, usages_len, preparsed_data, report_buf, report_len ); - return rc; + if (!report_len) return HIDP_STATUS_INVALID_REPORT_LENGTH; + + filter.report_id = report_buf[0]; + status = enum_value_caps( preparsed, report_type, report_len, &filter, get_usage_and_page, &params, &limit ); + *usages_len = params.usages - usages; + if (status != HIDP_STATUS_SUCCESS) return status; + + if (*usages_len == 0) return HIDP_STATUS_USAGE_NOT_FOUND; + if (params.usages > params.usages_end) return HIDP_STATUS_BUFFER_TOO_SMALL; + return status; } ULONG WINAPI HidP_MaxDataListLength(HIDP_REPORT_TYPE ReportType, PHIDP_PREPARSED_DATA PreparsedData) diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index b455fe650f1..ca030599299 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -2227,10 +2227,8 @@ static void test_hidp(HANDLE file, int report_id) usage_and_pages[0].Usage, 4); ok(usage_and_pages[1].Usage == 6, "got usage_and_pages[1] Usage %x, expected %x\n", usage_and_pages[1].Usage, 6); - todo_wine ok(usage_and_pages[2].Usage == 6, "got usage_and_pages[2] Usage %x, expected %x\n", usage_and_pages[2].Usage, 6); - todo_wine ok(usage_and_pages[3].Usage == 4, "got usage_and_pages[3] Usage %x, expected %x\n", usage_and_pages[3].Usage, 4);

1 0

Rémi Bernon : hid: Rewrite HidP_GetUsages using enum_value_caps.
by Alexandre Julliard 24 Jun '21

24 Jun '21

Module: wine Branch: master Commit: 1184afb6404b8d817c0bb5974ffc4094d4fa102c URL: https://source.winehq.org/git/wine.git/?a=commit;h=1184afb6404b8d817c0bb597… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jun 24 10:05:58 2021 +0200 hid: Rewrite HidP_GetUsages using enum_value_caps. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/hidp.c | 98 +++++++++++++------------------------- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 3 -- 2 files changed, 33 insertions(+), 68 deletions(-) diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c index 6197e30c4da..4889a1e4014 100644 --- a/dlls/hid/hidp.c +++ b/dlls/hid/hidp.c @@ -420,82 +420,50 @@ NTSTATUS WINAPI HidP_GetUsageValueArray(HIDP_REPORT_TYPE ReportType, USAGE Usage } -NTSTATUS WINAPI HidP_GetUsages(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection, - PUSAGE UsageList, PULONG UsageLength, PHIDP_PREPARSED_DATA PreparsedData, - PCHAR Report, ULONG ReportLength) +struct get_usage_params { - PWINE_HIDP_PREPARSED_DATA data = (PWINE_HIDP_PREPARSED_DATA)PreparsedData; - WINE_HID_ELEMENT *elems = HID_ELEMS(data); - WINE_HID_REPORT *report = NULL; - BOOL found = FALSE; - USHORT b_count = 0, r_count = 0; - int i,uCount; + USAGE *usages; + USAGE *usages_end; + char *report_buf; +}; - TRACE("(%i, %x, %i, %p, %p, %p, %p, %i)\n", ReportType, UsagePage, LinkCollection, UsageList, - UsageLength, PreparsedData, Report, ReportLength); +static NTSTATUS get_usage( const struct hid_value_caps *caps, void *user ) +{ + struct get_usage_params *params = user; + ULONG bit, last; - if (data->magic != HID_MAGIC) + for (bit = caps->start_bit, last = bit + caps->usage_max - caps->usage_min; bit <= last; ++bit) { - *UsageLength = 0; - return HIDP_STATUS_INVALID_PREPARSED_DATA; + if (!(params->report_buf[bit / 8] & (1 << (bit % 8)))) continue; + if (params->usages < params->usages_end) *params->usages = caps->usage_min + bit - caps->start_bit; + params->usages++; } - switch(ReportType) - { - case HidP_Input: - b_count = data->caps.NumberInputButtonCaps; - break; - case HidP_Output: - b_count = data->caps.NumberOutputButtonCaps; - break; - case HidP_Feature: - b_count = data->caps.NumberFeatureButtonCaps; - break; - default: - return HIDP_STATUS_INVALID_REPORT_TYPE; - } - r_count = data->reportCount[ReportType]; - report = &data->reports[data->reportIdx[ReportType][(BYTE)Report[0]]]; - - if (!r_count || !b_count) - return HIDP_STATUS_USAGE_NOT_FOUND; + return HIDP_STATUS_SUCCESS; +} - if (report->reportID && report->reportID != Report[0]) - return HIDP_STATUS_REPORT_DOES_NOT_EXIST; +NTSTATUS WINAPI HidP_GetUsages( HIDP_REPORT_TYPE report_type, USAGE usage_page, USHORT collection, USAGE *usages, + ULONG *usages_len, PHIDP_PREPARSED_DATA preparsed_data, char *report_buf, ULONG report_len ) +{ + WINE_HIDP_PREPARSED_DATA *preparsed = (WINE_HIDP_PREPARSED_DATA *)preparsed_data; + struct get_usage_params params = {.usages = usages, .usages_end = usages + *usages_len, .report_buf = report_buf}; + struct caps_filter filter = {.buttons = TRUE, .usage_page = usage_page, .collection = collection}; + NTSTATUS status; + USHORT limit = -1; - uCount = 0; - for (i = 0; i < report->elementCount && uCount < *UsageLength; i++) - { - if (elems[report->elementIdx + i].caps.BitSize == 1 && - elems[report->elementIdx + i].caps.UsagePage == UsagePage) - { - int k; - WINE_HID_ELEMENT *element = &elems[report->elementIdx + i]; - for (k=0; k < element->bitCount; k++) - { - UINT v = 0; - NTSTATUS rc = get_report_data((BYTE*)Report, ReportLength, - element->valueStartBit + k, 1, &v); - if (rc != HIDP_STATUS_SUCCESS) - return rc; - found = TRUE; - if (v) - { - if (uCount == *UsageLength) - return HIDP_STATUS_BUFFER_TOO_SMALL; - UsageList[uCount] = element->caps.Range.UsageMin + k; - uCount++; - } - } - } - } + TRACE( "report_type %d, collection %d, usages %p, usages_len %p, preparsed_data %p, report_buf %p, report_len %u.\n", + report_type, collection, usages, usages_len, preparsed_data, report_buf, report_len ); - *UsageLength = uCount; + if (!report_len) return HIDP_STATUS_INVALID_REPORT_LENGTH; - if (!found) - return HIDP_STATUS_USAGE_NOT_FOUND; + filter.report_id = report_buf[0]; + status = enum_value_caps( preparsed, report_type, report_len, &filter, get_usage, &params, &limit ); + *usages_len = params.usages - usages; + if (status != HIDP_STATUS_SUCCESS) return status; - return HIDP_STATUS_SUCCESS; + if (*usages_len == 0) return HIDP_STATUS_USAGE_NOT_FOUND; + if (params.usages > params.usages_end) return HIDP_STATUS_BUFFER_TOO_SMALL; + return status; } NTSTATUS WINAPI HidP_GetValueCaps( HIDP_REPORT_TYPE report_type, HIDP_VALUE_CAPS *caps, USHORT *caps_count, diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 8777880fd9d..b455fe650f1 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -2190,7 +2190,6 @@ static void test_hidp(HANDLE file, int report_id) status = HidP_GetUsages(HidP_Input, HID_USAGE_PAGE_BUTTON, 0, usages, &value, preparsed_data, report, caps.InputReportByteLength); ok(status == HIDP_STATUS_BUFFER_TOO_SMALL, "HidP_GetUsages returned %#x\n", status); - todo_wine ok(value == 2, "got usage count %d, expected %d\n", value, 2); value = ARRAY_SIZE(usages); memset(usages, 0xcd, sizeof(usages)); @@ -2207,9 +2206,7 @@ static void test_hidp(HANDLE file, int report_id) report, caps.InputReportByteLength); ok(status == HIDP_STATUS_SUCCESS, "HidP_GetUsages returned %#x\n", status); ok(value == 2, "got usage count %d, expected %d\n", value, 2); - todo_wine ok(usages[0] == 6, "got usages[0] %x, expected %x\n", usages[0], 6); - todo_wine ok(usages[1] == 4, "got usages[1] %x, expected %x\n", usages[1], 4); value = ARRAY_SIZE(usage_and_pages);

1 0

Rémi Bernon : hid: Rewrite HidP_SetUsages using enum_value_caps.
by Alexandre Julliard 24 Jun '21

24 Jun '21

Module: wine Branch: master Commit: 8f5b49c0c4ddb63b156ae3c77f47b5a68ab1a4c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8f5b49c0c4ddb63b156ae3c7… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jun 24 10:05:57 2021 +0200 hid: Rewrite HidP_SetUsages using enum_value_caps. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/hidp.c | 71 +++++++++++++++++++++++++----------------- dlls/hidclass.sys/descriptor.c | 2 ++ include/wine/hid.h | 1 + 3 files changed, 45 insertions(+), 29 deletions(-) diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c index 76b9ff5ee2c..6197e30c4da 100644 --- a/dlls/hid/hidp.c +++ b/dlls/hid/hidp.c @@ -73,6 +73,7 @@ struct caps_filter USAGE usage_page; USHORT collection; USAGE usage; + UCHAR report_id; }; static BOOL match_value_caps( const struct hid_value_caps *caps, const struct caps_filter *filter ) @@ -89,20 +90,22 @@ static BOOL match_value_caps( const struct hid_value_caps *caps, const struct ca typedef NTSTATUS (*enum_value_caps_callback)( const struct hid_value_caps *caps, void *user ); static NTSTATUS enum_value_caps( WINE_HIDP_PREPARSED_DATA *preparsed, HIDP_REPORT_TYPE report_type, - const struct caps_filter *filter, enum_value_caps_callback callback, - void *user, USHORT *count ) + ULONG report_len, const struct caps_filter *filter, + enum_value_caps_callback callback, void *user, USHORT *count ) { const struct hid_value_caps *caps, *caps_end; NTSTATUS status; LONG remaining = *count; - for (status = get_value_caps_range( preparsed, report_type, 0, &caps, &caps_end ); + for (status = get_value_caps_range( preparsed, report_type, report_len, &caps, &caps_end ); status == HIDP_STATUS_SUCCESS && caps != caps_end; caps++) { if (!match_value_caps( caps, filter )) continue; - if (remaining-- > 0) status = callback( caps, user ); + if (filter->report_id && caps->report_id != filter->report_id) continue; + else if (remaining-- > 0) status = callback( caps, user ); } + if (status == HIDP_STATUS_NULL) status = HIDP_STATUS_SUCCESS; if (status != HIDP_STATUS_SUCCESS) return status; *count -= remaining; @@ -539,7 +542,7 @@ ULONG WINAPI HidP_MaxUsageListLength( HIDP_REPORT_TYPE report_type, USAGE usage_ TRACE( "report_type %d, usage_page %x, preparsed_data %p.\n", report_type, usage_page, preparsed_data ); - enum_value_caps( preparsed, report_type, &filter, get_usage_list_length, &count, &limit ); + enum_value_caps( preparsed, report_type, 0, &filter, get_usage_list_length, &count, &limit ); return count; } @@ -575,32 +578,42 @@ NTSTATUS WINAPI HidP_SetUsageValueArray( HIDP_REPORT_TYPE report_type, USAGE usa return HIDP_STATUS_NOT_IMPLEMENTED; } -NTSTATUS WINAPI HidP_SetUsages(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection, - PUSAGE UsageList, PULONG UsageLength, PHIDP_PREPARSED_DATA PreparsedData, - PCHAR Report, ULONG ReportLength) +struct set_usage_params { - WINE_HID_ELEMENT element; - NTSTATUS rc; - ULONG i; + USAGE usage; + char *report_buf; +}; - TRACE("(%i, %x, %i, %p, %p, %p, %p, %i)\n", ReportType, UsagePage, LinkCollection, UsageList, - UsageLength, PreparsedData, Report, ReportLength); +static NTSTATUS set_usage( const struct hid_value_caps *caps, void *user ) +{ + struct set_usage_params *params = user; + ULONG bit = caps->start_bit + params->usage - caps->usage_min; + params->report_buf[bit / 8] |= (1 << (bit % 8)); + return HIDP_STATUS_NULL; +} - for (i = 0; i < *UsageLength; i++) - { - rc = find_usage(ReportType, UsagePage, LinkCollection, - UsageList[i], PreparsedData, Report, 1, &element); - if (rc == HIDP_STATUS_SUCCESS) - { - rc = set_report_data((BYTE*)Report, ReportLength, - element.valueStartBit, element.bitCount, -1); - } +NTSTATUS WINAPI HidP_SetUsages( HIDP_REPORT_TYPE report_type, USAGE usage_page, USHORT collection, USAGE *usages, + ULONG *usage_count, PHIDP_PREPARSED_DATA preparsed_data, char *report_buf, ULONG report_len ) +{ + WINE_HIDP_PREPARSED_DATA *preparsed = (WINE_HIDP_PREPARSED_DATA *)preparsed_data; + struct set_usage_params params = {.report_buf = report_buf}; + struct caps_filter filter = {.buttons = TRUE, .usage_page = usage_page, .collection = collection}; + NTSTATUS status; + USHORT limit = 1; + ULONG i, count = *usage_count; - if (rc != HIDP_STATUS_SUCCESS) - { - *UsageLength = i; - return rc; - } + TRACE( "report_type %d, usage_page %x, collection %d, usages %p, usage_count %p, preparsed_data %p, " + "report_buf %p, report_len %u.\n", + report_type, usage_page, collection, usages, usage_count, preparsed_data, report_buf, report_len ); + + if (!report_len) return HIDP_STATUS_INVALID_REPORT_LENGTH; + + filter.report_id = report_buf[0]; + for (i = 0; i < count; ++i) + { + params.usage = filter.usage = usages[i]; + status = enum_value_caps( preparsed, report_type, report_len, &filter, set_usage, &params, &limit ); + if (status != HIDP_STATUS_SUCCESS) return status; } return HIDP_STATUS_SUCCESS; @@ -669,7 +682,7 @@ NTSTATUS WINAPI HidP_GetSpecificButtonCaps( HIDP_REPORT_TYPE report_type, USAGE TRACE( "report_type %d, usage_page %x, collection %d, usage %x, caps %p, caps_count %p, preparsed_data %p.\n", report_type, usage_page, collection, usage, caps, caps_count, preparsed_data ); - return enum_value_caps( preparsed, report_type, &filter, get_button_caps, &caps, caps_count ); + return enum_value_caps( preparsed, report_type, 0, &filter, get_button_caps, &caps, caps_count ); } static NTSTATUS get_value_caps( const struct hid_value_caps *caps, void *user ) @@ -732,7 +745,7 @@ NTSTATUS WINAPI HidP_GetSpecificValueCaps( HIDP_REPORT_TYPE report_type, USAGE u TRACE( "report_type %d, usage_page %x, collection %d, usage %x, caps %p, caps_count %p, preparsed_data %p.\n", report_type, usage_page, collection, usage, caps, caps_count, preparsed_data ); - return enum_value_caps( preparsed, report_type, &filter, get_value_caps, &caps, caps_count ); + return enum_value_caps( preparsed, report_type, 0, &filter, get_value_caps, &caps, caps_count ); } NTSTATUS WINAPI HidP_GetUsagesEx(HIDP_REPORT_TYPE ReportType, USHORT LinkCollection, USAGE_AND_PAGE *ButtonList, diff --git a/dlls/hidclass.sys/descriptor.c b/dlls/hidclass.sys/descriptor.c index e319519ca90..3b4455a0b88 100644 --- a/dlls/hidclass.sys/descriptor.c +++ b/dlls/hidclass.sys/descriptor.c @@ -481,6 +481,7 @@ static BOOL parse_new_value_caps( struct hid_parser_state *state, HIDP_REPORT_TY if (!*bit_size) *bit_size = 8; *bit_size += state->items.bit_size * state->items.report_count; *byte_size = max( *byte_size, (*bit_size + 7) / 8 ); + state->items.start_bit = *bit_size; if (!state->items.report_count) { @@ -498,6 +499,7 @@ static BOOL parse_new_value_caps( struct hid_parser_state *state, HIDP_REPORT_TY state->items.report_count -= usages_size - 1; while (usages_size--) { + state->items.start_bit -= state->items.report_count * state->items.bit_size; state->items.usage_page = state->usages_page[usages_size]; state->items.usage_min = state->usages_min[usages_size]; state->items.usage_max = state->usages_max[usages_size]; diff --git a/include/wine/hid.h b/include/wine/hid.h index ceb07069b52..8d1d6d4d104 100644 --- a/include/wine/hid.h +++ b/include/wine/hid.h @@ -59,6 +59,7 @@ struct hid_value_caps USHORT bit_field; USHORT bit_size; USHORT report_count; + ULONG start_bit; LONG logical_min; LONG logical_max; LONG physical_min;

1 0

Rémi Bernon : hid: Rewrite HidP_MaxUsageListLength using enum_value_caps.
by Alexandre Julliard 24 Jun '21

24 Jun '21

Module: wine Branch: master Commit: 14caae214fa6bcbef260b4498cf33267318a1ef2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=14caae214fa6bcbef260b449… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jun 24 10:05:56 2021 +0200 hid: Rewrite HidP_MaxUsageListLength using enum_value_caps. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/hidp.c | 58 ++++++++------------------------------ dlls/ntoskrnl.exe/tests/ntoskrnl.c | 4 --- 2 files changed, 12 insertions(+), 50 deletions(-) diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c index c11a5d66985..76b9ff5ee2c 100644 --- a/dlls/hid/hidp.c +++ b/dlls/hid/hidp.c @@ -524,56 +524,22 @@ NTSTATUS WINAPI HidP_InitializeReportForID( HIDP_REPORT_TYPE report_type, UCHAR return HIDP_STATUS_SUCCESS; } -ULONG WINAPI HidP_MaxUsageListLength(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, PHIDP_PREPARSED_DATA PreparsedData) +static NTSTATUS get_usage_list_length( const struct hid_value_caps *caps, void *data ) { - PWINE_HIDP_PREPARSED_DATA data = (PWINE_HIDP_PREPARSED_DATA)PreparsedData; - WINE_HID_ELEMENT *elems = HID_ELEMS(data); - WINE_HID_REPORT *report = NULL; - int r_count; - int i; - int count = 0; - - TRACE("(%i, %x, %p)\n", ReportType, UsagePage, PreparsedData); - - if (data->magic != HID_MAGIC) - return 0; - - switch(ReportType) - { - case HidP_Input: - report = HID_INPUT_REPORTS(data); - break; - case HidP_Output: - report = HID_OUTPUT_REPORTS(data); - break; - case HidP_Feature: - report = HID_FEATURE_REPORTS(data); - break; - default: - return HIDP_STATUS_INVALID_REPORT_TYPE; - } - r_count = data->reportCount[ReportType]; + *(ULONG *)data += caps->report_count; + return HIDP_STATUS_SUCCESS; +} +ULONG WINAPI HidP_MaxUsageListLength( HIDP_REPORT_TYPE report_type, USAGE usage_page, PHIDP_PREPARSED_DATA preparsed_data ) +{ + WINE_HIDP_PREPARSED_DATA *preparsed = (WINE_HIDP_PREPARSED_DATA *)preparsed_data; + struct caps_filter filter = {.buttons = TRUE, .usage_page = usage_page}; + USHORT limit = -1; + ULONG count = 0; - if (!r_count) - return 0; + TRACE( "report_type %d, usage_page %x, preparsed_data %p.\n", report_type, usage_page, preparsed_data ); - for (i = 0; i < r_count; i++) - { - int j; - for (j = 0; j < report[i].elementCount; j++) - { - if (elems[report[i].elementIdx + j].caps.BitSize == 1 && - (UsagePage == 0 || elems[report[i].elementIdx + j].caps.UsagePage == UsagePage)) - { - if (elems[report[i].elementIdx + j].caps.IsRange) - count += (elems[report[i].elementIdx + j].caps.Range.UsageMax - - elems[report[i].elementIdx + j].caps.Range.UsageMin) + 1; - else - count++; - } - } - } + enum_value_caps( preparsed, report_type, &filter, get_usage_list_length, &count, &limit ); return count; } diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 3ce750728ec..8777880fd9d 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -2140,18 +2140,14 @@ static void test_hidp(HANDLE file, int report_id) ok(value == 0, "got value %x, expected %#x\n", value, 0); value = HidP_MaxUsageListLength(HidP_Feature + 1, 0, preparsed_data); - todo_wine ok(value == 0, "HidP_MaxUsageListLength(HidP_Feature + 1, 0) returned %d, expected %d\n", value, 0); value = HidP_MaxUsageListLength(HidP_Input, 0, preparsed_data); - todo_wine ok(value == 42, "HidP_MaxUsageListLength(HidP_Input, 0) returned %d, expected %d\n", value, 42); value = HidP_MaxUsageListLength(HidP_Input, HID_USAGE_PAGE_BUTTON, preparsed_data); - todo_wine ok(value == 32, "HidP_MaxUsageListLength(HidP_Input, HID_USAGE_PAGE_BUTTON) returned %d, expected %d\n", value, 32); value = HidP_MaxUsageListLength(HidP_Input, HID_USAGE_PAGE_LED, preparsed_data); ok(value == 8, "HidP_MaxUsageListLength(HidP_Input, HID_USAGE_PAGE_LED) returned %d, expected %d\n", value, 8); value = HidP_MaxUsageListLength(HidP_Feature, HID_USAGE_PAGE_BUTTON, preparsed_data); - todo_wine ok(value == 8, "HidP_MaxUsageListLength(HidP_Feature, HID_USAGE_PAGE_BUTTON) returned %d, expected %d\n", value, 8); value = HidP_MaxUsageListLength(HidP_Feature, HID_USAGE_PAGE_LED, preparsed_data); ok(value == 0, "HidP_MaxUsageListLength(HidP_Feature, HID_USAGE_PAGE_LED) returned %d, expected %d\n", value, 0);

1 0

← Newer
1
...
13
14
15
16
17
18
19
...
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