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

Zebediah Figura : ws2_32: Use IOCTL_AFD_WINE_GET_SO_RCVBUF.
by Alexandre Julliard 28 Jun '21

28 Jun '21

Module: wine Branch: master Commit: 8312539efe18533f6e2b35882d12e9d1bcbefa0d URL: https://source.winehq.org/git/wine.git/?a=commit;h=8312539efe18533f6e2b3588… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jun 25 20:21:08 2021 -0500 ws2_32: Use IOCTL_AFD_WINE_GET_SO_RCVBUF. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 5 ++++- dlls/ws2_32/tests/sock.c | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 4982b08934b..7ed48124a5a 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2090,7 +2090,6 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, /* Handle common cases. The special cases are below, sorted * alphabetically */ - case WS_SO_RCVBUF: case WS_SO_REUSEADDR: case WS_SO_SNDBUF: if ( (fd = get_sock_fd( s, 0, NULL )) == -1) @@ -2285,6 +2284,10 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, } return ret ? 0 : SOCKET_ERROR; } + + case WS_SO_RCVBUF: + return server_getsockopt( s, IOCTL_AFD_WINE_GET_SO_RCVBUF, optval, optlen ); + case WS_SO_RCVTIMEO: case WS_SO_SNDTIMEO: { diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 9f461376853..ccaa04e4ef5 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1224,7 +1224,7 @@ static void test_set_getsockopt(void) value = 0xdeadbeef; err = getsockopt(s, SOL_SOCKET, SO_RCVBUF, (char *)&value, &size); ok( !err, "getsockopt(SO_RCVBUF) failed error: %u\n", WSAGetLastError() ); - todo_wine ok( value == 4096, "expected 4096, got %u\n", value ); + ok( value == 4096, "expected 4096, got %u\n", value ); /* SO_LINGER */ for( i = 0; i < ARRAY_SIZE(linger_testvals);i++) {

1 0

Paul Gofman : mshtml: Handle NULL nsstyle in HTMLWindow7_getComputedStyle().
by Alexandre Julliard 28 Jun '21

28 Jun '21

Module: wine Branch: master Commit: 362eed3ae30e17da64888407140334925499071c URL: https://source.winehq.org/git/wine.git/?a=commit;h=362eed3ae30e17da64888407… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Jun 28 22:29:46 2021 +0300 mshtml: Handle NULL nsstyle in HTMLWindow7_getComputedStyle(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlwindow.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 4c57d457e41..0ca4cd6397e 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -2364,6 +2364,13 @@ static HRESULT WINAPI HTMLWindow7_getComputedStyle(IHTMLWindow7 *iface, IHTMLDOM return E_FAIL; } + if (!nsstyle) + { + FIXME("nsIDOMWindow_GetComputedStyle returned NULL nsstyle.\n"); + *p = NULL; + return S_OK; + } + hres = create_computed_style(nsstyle, dispex_compat_mode(&This->inner_window->event_target.dispex), p); nsIDOMCSSStyleDeclaration_Release(nsstyle); return hres;

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 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 Tab parts.
by Alexandre Julliard 28 Jun '21

28 Jun '21

Module: wine Branch: master Commit: ace01c30f87399c30dcbe27bb6a46533d57f8176 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ace01c30f87399c30dcbe27b… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jun 28 10:30:06 2021 +0800 light.msstyles: Add Tab 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 ++ dlls/light.msstyles/blue_tab_background.bmp | Bin 0 -> 19338 bytes dlls/light.msstyles/blue_tab_background.svg | 13 ++++ dlls/light.msstyles/blue_tab_item.bmp | Bin 0 -> 1658 bytes dlls/light.msstyles/blue_tab_item.svg | 108 +++++++++++++++++++++++++++ dlls/light.msstyles/blue_tab_item_left.bmp | Bin 0 -> 1658 bytes dlls/light.msstyles/blue_tab_item_left.svg | 111 ++++++++++++++++++++++++++++ dlls/light.msstyles/blue_tab_item_right.bmp | Bin 0 -> 1658 bytes dlls/light.msstyles/blue_tab_item_right.svg | 109 +++++++++++++++++++++++++++ dlls/light.msstyles/blue_tab_pane_edge.bmp | Bin 0 -> 9354 bytes dlls/light.msstyles/blue_tab_pane_edge.svg | 16 ++++ dlls/light.msstyles/light.rc | 104 ++++++++++++++++++++++++++ 12 files changed, 466 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ace01c30f87399c30dcb…

1 0

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

28 Jun '21

Module: wine Branch: master Commit: 3e4c5afeb23c724d9efa3d8a746be02312eb5f3a URL: https://source.winehq.org/git/wine.git/?a=commit;h=3e4c5afeb23c724d9efa3d8a… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jun 28 10:30:20 2021 +0800 light.msstyles: Add TrackBar parts. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/light.msstyles/Makefile.in | 15 +++ dlls/light.msstyles/blue_trackbar_slider_track.bmp | Bin 0 -> 378 bytes dlls/light.msstyles/blue_trackbar_slider_track.svg | 13 ++ .../blue_trackbar_thumb_down_11px.bmp | Bin 0 -> 4318 bytes .../blue_trackbar_thumb_down_11px.svg | 21 +++ .../blue_trackbar_thumb_down_15px.bmp | Bin 0 -> 7638 bytes .../blue_trackbar_thumb_down_15px.svg | 21 +++ .../blue_trackbar_thumb_down_21px.bmp | Bin 0 -> 18618 bytes .../blue_trackbar_thumb_down_21px.svg | 21 +++ .../blue_trackbar_thumb_horizontal.bmp | Bin 0 -> 2418 bytes .../blue_trackbar_thumb_horizontal.svg | 19 +++ .../blue_trackbar_thumb_left_19px.bmp | Bin 0 -> 4318 bytes .../blue_trackbar_thumb_left_19px.svg | 21 +++ .../blue_trackbar_thumb_left_25px.bmp | Bin 0 -> 7638 bytes .../blue_trackbar_thumb_left_25px.svg | 21 +++ .../blue_trackbar_thumb_left_44px.bmp | Bin 0 -> 17738 bytes .../blue_trackbar_thumb_left_44px.svg | 21 +++ .../blue_trackbar_thumb_right_19px.bmp | Bin 0 -> 4318 bytes .../blue_trackbar_thumb_right_19px.svg | 21 +++ .../blue_trackbar_thumb_right_25px.bmp | Bin 0 -> 7638 bytes .../blue_trackbar_thumb_right_25px.svg | 21 +++ .../blue_trackbar_thumb_right_44px.bmp | Bin 0 -> 17738 bytes .../blue_trackbar_thumb_right_44px.svg | 21 +++ .../light.msstyles/blue_trackbar_thumb_up_11px.bmp | Bin 0 -> 4318 bytes .../light.msstyles/blue_trackbar_thumb_up_11px.svg | 21 +++ .../light.msstyles/blue_trackbar_thumb_up_15px.bmp | Bin 0 -> 7638 bytes .../light.msstyles/blue_trackbar_thumb_up_15px.svg | 21 +++ .../light.msstyles/blue_trackbar_thumb_up_21px.bmp | Bin 0 -> 18618 bytes .../light.msstyles/blue_trackbar_thumb_up_21px.svg | 21 +++ .../blue_trackbar_thumb_vertical.bmp | Bin 0 -> 4758 bytes .../blue_trackbar_thumb_vertical.svg | 19 +++ dlls/light.msstyles/light.rc | 150 +++++++++++++++++++++ 32 files changed, 468 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3e4c5afeb23c724d9efa…

1 0

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

28 Jun '21

Module: wine Branch: master Commit: 0d915de46d7d4bdcc172d62ebb95dcb29c5cab10 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d915de46d7d4bdcc172d62e… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jun 28 10:30:29 2021 +0800 light.msstyles: Add Tooltip parts. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/light.msstyles/Makefile.in | 1 + dlls/light.msstyles/blue_tooltip_close.bmp | Bin 0 -> 3402 bytes dlls/light.msstyles/blue_tooltip_close.svg | 17 +++++++++++++++++ dlls/light.msstyles/light.rc | 12 ++++++++++++ 4 files changed, 30 insertions(+) diff --git a/dlls/light.msstyles/Makefile.in b/dlls/light.msstyles/Makefile.in index 8f9143d62f9..3205d1b28f9 100644 --- a/dlls/light.msstyles/Makefile.in +++ b/dlls/light.msstyles/Makefile.in @@ -56,6 +56,7 @@ SVG_SRCS = \ blue_toolbar_buttons_split_dropdown_glyph.svg \ blue_toolbar_separator_horizontal.svg \ blue_toolbar_separator_vertical.svg \ + blue_tooltip_close.svg \ blue_trackbar_slider_track.svg \ blue_trackbar_thumb_down_11px.svg \ blue_trackbar_thumb_down_15px.svg \ diff --git a/dlls/light.msstyles/blue_tooltip_close.bmp b/dlls/light.msstyles/blue_tooltip_close.bmp new file mode 100644 index 00000000000..82adf7e5cc1 Binary files /dev/null and b/dlls/light.msstyles/blue_tooltip_close.bmp differ diff --git a/dlls/light.msstyles/blue_tooltip_close.svg b/dlls/light.msstyles/blue_tooltip_close.svg new file mode 100644 index 00000000000..4a0e66448bc --- /dev/null +++ b/dlls/light.msstyles/blue_tooltip_close.svg @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:17-32" width="17" height="48" version="1.1" viewBox="0 0 4.4979 12.7" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <g stroke-width=".26458"> + <path d="m4.4979 0.42636-0.453-0.42636-1.796 1.6903-1.796-1.6903-0.453 0.42636 1.796 1.6903-1.796 1.6903 0.453 0.42636 1.796-1.6903 1.796 1.6903 0.453-0.42636-1.796-1.6903z" fill="#aeaeae"/> + <path d="m4.4979 4.6597-0.453-0.42636-1.796 1.6903-1.796-1.6903-0.453 0.42636 1.796 1.6903-1.796 1.6903 0.453 0.42636 1.796-1.6903 1.796 1.6903 0.453-0.42636-1.796-1.6903z" fill="#ff1744"/> + <path d="m4.4979 8.893-0.453-0.42636-1.796 1.6903-1.796-1.6903-0.453 0.42636 1.796 1.6903-1.796 1.6903 0.453 0.42636 1.796-1.6903 1.796 1.6903 0.453-0.42636-1.796-1.6903z" fill="#d50000"/> + </g> +</svg> diff --git a/dlls/light.msstyles/light.rc b/dlls/light.msstyles/light.rc index c8c3f22ddb1..bddf183132c 100644 --- a/dlls/light.msstyles/light.rc +++ b/dlls/light.msstyles/light.rc @@ -879,6 +879,14 @@ BLUE_INI TEXTFILE "[TrackBar.TicsVert]\r\n" "Color = 174 174 174\r\n" +"\r\n; Tooltip\r\n" +"[Tooltip.Close]\r\n" +"BgType = ImageFile\r\n" +"ImageFile = blue_tooltip_close.bmp\r\n" +"ImageCount = 3\r\n" +"SizingType = TrueSize\r\n" +"ImageLayout = Vertical\r\n" + "\r\n; TreeView\r\n" "[TreeView]\r\n" "BgType = BorderFill\r\n" @@ -1070,6 +1078,10 @@ 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" +/* Tooltip */ +/* @makedep: blue_tooltip_close.bmp */ +BLUE_TOOLTIP_CLOSE_BMP BITMAP "blue_tooltip_close.bmp" + /* TrackBar */ /* @makedep: blue_trackbar_thumb_horizontal.bmp */ BLUE_TRACKBAR_THUMB_HORIZONTAL_BMP BITMAP "blue_trackbar_thumb_horizontal.bmp"

1 0

Rémi Bernon : hid: Return HIDP_STATUS_INCOMPATIBLE_REPORT_ID when id mismatches.
by Alexandre Julliard 28 Jun '21

28 Jun '21

Module: wine Branch: master Commit: 28bbaf670749fe058a6770982a4d0a3100032fa9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=28bbaf670749fe058a677098… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jun 28 09:21:57 2021 +0200 hid: Return HIDP_STATUS_INCOMPATIBLE_REPORT_ID when id mismatches. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/hidp.c | 5 +++-- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 4 ---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c index 59f18276b38..6261c3c2f68 100644 --- a/dlls/hid/hidp.c +++ b/dlls/hid/hidp.c @@ -96,13 +96,14 @@ static NTSTATUS enum_value_caps( WINE_HIDP_PREPARSED_DATA *preparsed, HIDP_REPOR { const struct hid_value_caps *caps, *caps_end; NTSTATUS status; + BOOL incompatible = FALSE; LONG remaining = *count; 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 (filter->report_id && caps->report_id != filter->report_id) continue; + if (filter->report_id && caps->report_id != filter->report_id) incompatible = TRUE; else if (filter->array && (caps->is_range || caps->report_count <= 1)) return HIDP_STATUS_NOT_VALUE_ARRAY; else if (remaining-- > 0) status = callback( caps, user ); } @@ -111,7 +112,7 @@ static NTSTATUS enum_value_caps( WINE_HIDP_PREPARSED_DATA *preparsed, HIDP_REPOR if (status != HIDP_STATUS_SUCCESS) return status; *count -= remaining; - if (*count == 0) return HIDP_STATUS_USAGE_NOT_FOUND; + if (*count == 0) return incompatible ? HIDP_STATUS_INCOMPATIBLE_REPORT_ID : HIDP_STATUS_USAGE_NOT_FOUND; if (remaining < 0) return HIDP_STATUS_BUFFER_TOO_SMALL; return HIDP_STATUS_SUCCESS; } diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 432bc168259..753957a8ac6 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -2292,14 +2292,12 @@ static void test_hidp(HANDLE file, int report_id) status = HidP_SetUsageValue(HidP_Feature, HID_USAGE_PAGE_ORDINAL, waveform_list, 3, HID_USAGE_HAPTICS_WAVEFORM_RUMBLE, preparsed_data, report, caps.FeatureReportByteLength); - todo_wine_if(!report_id) ok(status == (report_id ? HIDP_STATUS_SUCCESS : HIDP_STATUS_INCOMPATIBLE_REPORT_ID), "HidP_SetUsageValue returned %#x\n", status); report[0] = 2; status = HidP_SetUsageValue(HidP_Feature, HID_USAGE_PAGE_ORDINAL, waveform_list, 3, HID_USAGE_HAPTICS_WAVEFORM_RUMBLE, preparsed_data, report, caps.FeatureReportByteLength); - todo_wine ok(status == HIDP_STATUS_INCOMPATIBLE_REPORT_ID, "HidP_SetUsageValue returned %#x\n", status); report[0] = report_id; status = HidP_SetUsageValue(HidP_Feature, HID_USAGE_PAGE_ORDINAL, 0xdead, 3, HID_USAGE_HAPTICS_WAVEFORM_RUMBLE, @@ -2330,13 +2328,11 @@ static void test_hidp(HANDLE file, int report_id) report[0] = 1 - report_id; status = HidP_GetUsageValue(HidP_Feature, HID_USAGE_PAGE_ORDINAL, waveform_list, 3, &value, preparsed_data, report, caps.FeatureReportByteLength); - todo_wine_if(!report_id) ok(status == (report_id ? HIDP_STATUS_SUCCESS : HIDP_STATUS_INCOMPATIBLE_REPORT_ID), "HidP_GetUsageValue returned %#x\n", status); report[0] = 2; status = HidP_GetUsageValue(HidP_Feature, HID_USAGE_PAGE_ORDINAL, waveform_list, 3, &value, preparsed_data, report, caps.FeatureReportByteLength); - todo_wine ok(status == HIDP_STATUS_INCOMPATIBLE_REPORT_ID, "HidP_GetUsageValue returned %#x\n", status); report[0] = report_id; status = HidP_GetUsageValue(HidP_Feature, HID_USAGE_PAGE_ORDINAL, 0xdead, 3, &value,

1 0

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

28 Jun '21

Module: wine Branch: master Commit: 1c4e7a00a309641ec1c8d6efce751f488b224c67 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1c4e7a00a309641ec1c8d6ef… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jun 28 09:21:58 2021 +0200 hid: Rewrite HidP_MaxDataListLength 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 | 32 ++++++++++++++++---------------- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 1 - 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c index 6261c3c2f68..afd69281f0d 100644 --- a/dlls/hid/hidp.c +++ b/dlls/hid/hidp.c @@ -679,24 +679,24 @@ NTSTATUS WINAPI HidP_GetUsagesEx( HIDP_REPORT_TYPE report_type, USHORT collectio return status; } -ULONG WINAPI HidP_MaxDataListLength(HIDP_REPORT_TYPE ReportType, PHIDP_PREPARSED_DATA PreparsedData) +static NTSTATUS count_data( const struct hid_value_caps *caps, void *user ) { - WINE_HIDP_PREPARSED_DATA *data = (WINE_HIDP_PREPARSED_DATA *)PreparsedData; - TRACE("(%i, %p)\n", ReportType, PreparsedData); - if (data->magic != HID_MAGIC) - return 0; + if (caps->is_range || HID_VALUE_CAPS_IS_BUTTON( caps )) *(ULONG *)user += caps->report_count; + else *(ULONG *)user += 1; + return HIDP_STATUS_SUCCESS; +} - switch(ReportType) - { - case HidP_Input: - return data->caps.NumberInputDataIndices; - case HidP_Output: - return data->caps.NumberOutputDataIndices; - case HidP_Feature: - return data->caps.NumberFeatureDataIndices; - default: - return 0; - } +ULONG WINAPI HidP_MaxDataListLength( HIDP_REPORT_TYPE report_type, PHIDP_PREPARSED_DATA preparsed_data ) +{ + WINE_HIDP_PREPARSED_DATA *preparsed = (WINE_HIDP_PREPARSED_DATA *)preparsed_data; + struct caps_filter filter = {}; + USHORT limit = -1; + ULONG count = 0; + + TRACE( "report_type %d, preparsed_data %p.\n", report_type, preparsed_data ); + + enum_value_caps( preparsed, report_type, 0, &filter, count_data, &count, &limit ); + return count; } NTSTATUS WINAPI HidP_GetData(HIDP_REPORT_TYPE ReportType, HIDP_DATA *DataList, ULONG *DataLength, diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 753957a8ac6..101366bf50b 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -2229,7 +2229,6 @@ static void test_hidp(HANDLE file, int report_id) value = HidP_MaxDataListLength(HidP_Feature + 1, preparsed_data); ok(value == 0, "HidP_MaxDataListLength(HidP_Feature + 1) returned %d, expected %d\n", value, 0); value = HidP_MaxDataListLength(HidP_Input, preparsed_data); - todo_wine ok(value == 50, "HidP_MaxDataListLength(HidP_Input) returned %d, expected %d\n", value, 50); value = HidP_MaxDataListLength(HidP_Output, preparsed_data); ok(value == 0, "HidP_MaxDataListLength(HidP_Output) returned %d, expected %d\n", value, 0);

1 0

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

28 Jun '21

Module: wine Branch: master Commit: b860281d3228daf0d2291804c1664e78206c7b57 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b860281d3228daf0d2291804… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jun 28 09:21:59 2021 +0200 hid: Rewrite HidP_GetData 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 | 157 ++++++++++++------------------------- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 41 +++++----- 2 files changed, 73 insertions(+), 125 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b860281d3228daf0d229…

1 0