[PATCH v8 0/2] MR672: comdlg32: Common item dialog fixes

List overview All Threads

newer

older

Re: [PATCH v9 0/2] MR672:...

Ben Cottrell (＠bgc)

23 Aug 2022 23 Aug '22

12:05 a.m.

Made changes to comdlg32/itemdlg.c to add missing controls, which are the address bar and the up button. Updated bitmaps in comctl32 and SVG files for history icons. My changes help to resolve this bug: https://bugs.winehq.org/show_bug.cgi?id=50338.

-- v8: comdlg32: Add missing controls to the common item dialog, only affecting the implementation

https://gitlab.winehq.org/wine/wine/-/merge_requests/672

Show replies by date

Ben Cottrell

23 Aug 23 Aug

12:05 a.m.

New subject: [PATCH v8 1/2] comdlg32: Add missing controls and their functionality to IFileDialog, or the common item dialog.

From: Ben Cottrell bencot@windowslive.com

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50338 --- dlls/comctl32/idb_hist_large.bmp | Bin 11642 -> 13962 bytes dlls/comctl32/idb_hist_large.svg | 97 ++++++----- dlls/comctl32/idb_hist_small.bmp | Bin 5242 -> 6214 bytes dlls/comctl32/idb_hist_small.svg | 281 ++++--------------------------- dlls/comctl32/toolbar.c | 4 +- dlls/comdlg32/itemdlg.c | 105 +++++++++++- include/commctrl.h | 7 +- 7 files changed, 193 insertions(+), 301 deletions(-)

diff --git a/dlls/comctl32/idb_hist_large.bmp b/dlls/comctl32/idb_hist_large.bmp index b7818fbafb22c45a5b4a6ccbec91fad9304fe51f..d6cedaf012801804c9628f29becc7aa62836ca9b 100644 GIT binary patch literal 13962 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

literal 11642 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 HI|Ba(0sWkd

diff --git a/dlls/comctl32/idb_hist_large.svg b/dlls/comctl32/idb_hist_large.svg index a811fbcaa5d..7dd8283f7a2 100644 --- a/dlls/comctl32/idb_hist_large.svg +++ b/dlls/comctl32/idb_hist_large.svg @@ -1,55 +1,68 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<?xml version="1.0" encoding="UTF-8"?>  -<svg id="bitmap:120-32" xmlns="http://www.w3.org/2000/svg" height="24" width="120" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink"> - <defs id="defs2916"> - <radialGradient id="radialGradient1361" gradientUnits="userSpaceOnUse" cy="36.421" cx="24.837" gradientTransform="matrix(1,0,0,0.536723,0,16.87306)" r="15.645"> - <stop id="stop8664" stop-color="#000" offset="0"/> - <stop id="stop8666" stop-color="#000" stop-opacity="0" offset="1"/> +<svg id="bitmap:144-32" width="144" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> + <defs> + <radialGradient id="radialGradient1361" cx="24.837" cy="36.421" r="15.645" gradientTransform="matrix(1 0 0 .53672 0 16.873)" gradientUnits="userSpaceOnUse"> + <stop offset="0"/> + <stop stop-opacity="0" offset="1"/> </radialGradient> - <radialGradient id="radialGradient3241" gradientUnits="userSpaceOnUse" cx="15.987" cy="1.535" r="17.171" gradientTransform="matrix(-0.99935,0,0,0.783428,33.4962,1.6234577)"> - <stop id="stop8652-1" stop-color="#FFF" offset="0"/> - <stop id="stop8654-1" stop-color="#FFF" stop-opacity="0" offset="1"/> + <radialGradient id="radialGradient3241" cx="15.987" cy="1.535" r="17.171" gradientTransform="matrix(-.99935 0 0 .78343 33.496 1.6235)" gradientUnits="userSpaceOnUse"> + <stop stop-color="#FFF" offset="0"/> + <stop stop-color="#FFF" stop-opacity="0" offset="1"/> </radialGradient> - <radialGradient id="radialGradient3244" gradientUnits="userSpaceOnUse" cx="17.481" cy="16.118" r="16.956" gradientTransform="matrix(-0.411558,0.00716573,-0.00521275,-0.299389,21.69622,19.724318)"> - <stop id="stop2593-6" stop-color="#73d216" offset="0"/> - <stop id="stop2595-2" stop-color="#4e9a06" offset="1"/> + <radialGradient id="radialGradient3244" cx="17.481" cy="16.118" r="16.956" gradientTransform="matrix(-.41156 .0071657 -.0052128 -.29939 21.696 19.724)" gradientUnits="userSpaceOnUse"> + <stop stop-color="#73d216" offset="0"/> + <stop stop-color="#4e9a06" offset="1"/> </radialGradient> - <radialGradient id="radialGradient3263" gradientUnits="userSpaceOnUse" cx="15.987" cy="1.535" r="17.171" gradientTransform="matrix(0.99731932,0,0,0.783428,14.565151,1.62346)"> - <stop id="stop8652" stop-color="#FFF" offset="0"/> - <stop id="stop8654" stop-color="#FFF" stop-opacity="0" offset="1"/> + <radialGradient id="radialGradient3263" cx="15.987" cy="1.535" r="17.171" gradientTransform="matrix(.99732 0 0 .78343 14.565 1.6235)" gradientUnits="userSpaceOnUse"> + <stop stop-color="#FFF" offset="0"/> + <stop stop-color="#FFF" stop-opacity="0" offset="1"/> </radialGradient> - <radialGradient id="radialGradient3266" gradientUnits="userSpaceOnUse" cx="27.547" cy="15.843" r="16.956" gradientTransform="matrix(0.41071672,0.0074091,0.00521275,-0.288964,26.347891,19.75179)"> - <stop id="stop2593" stop-color="#73d216" offset="0"/> - <stop id="stop2595" stop-color="#4e9a06" offset="1"/> + <radialGradient id="radialGradient3266" cx="27.547" cy="15.843" r="16.956" gradientTransform="matrix(.41072 .0074091 .0052128 -.28896 26.348 19.752)" gradientUnits="userSpaceOnUse"> + <stop stop-color="#73d216" offset="0"/> + <stop stop-color="#4e9a06" offset="1"/> </radialGradient> - <linearGradient id="linearGradient3278" y2="4" gradientUnits="userSpaceOnUse" y1="15" gradientTransform="translate(96,-1)" x2="4" x1="4"> - <stop id="stop10718" stop-color="#d3d7cf" offset="0"/> - <stop id="stop10720" stop-color="#babdb6" offset="1"/> + <linearGradient id="linearGradient3278" x1="4" x2="4" y1="15" y2="4" gradientTransform="translate(96,-1)" gradientUnits="userSpaceOnUse"> + <stop stop-color="#d3d7cf" offset="0"/> + <stop stop-color="#babdb6" offset="1"/> </linearGradient> - <linearGradient id="linearGradient3281" y2="5" gradientUnits="userSpaceOnUse" y1="2" gradientTransform="translate(96,0)" x2="4" x1="4"> - <stop id="stop10746" stop-color="#729fcf" offset="0"/> - <stop id="stop10748" stop-color="#3465a4" offset="1"/> + <linearGradient id="linearGradient3281" x1="4" x2="4" y1="2" y2="5" gradientTransform="translate(96)" gradientUnits="userSpaceOnUse"> + <stop stop-color="#729fcf" offset="0"/> + <stop stop-color="#3465a4" offset="1"/> </linearGradient> + <radialGradient id="radialGradient59" cx="27.547" cy="15.843" r="16.956" gradientTransform="matrix(.41072 .0074091 .0052128 -.28896 49.916 19.752)" gradientUnits="userSpaceOnUse" xlink:href="#radialGradient3266"/> + <radialGradient id="radialGradient61" cx="15.987" cy="1.535" r="17.171" gradientTransform="matrix(.99732 0 0 .78343 38.133 1.6235)" gradientUnits="userSpaceOnUse" xlink:href="#radialGradient3263"/> + <radialGradient id="radialGradient376" cx="24.837" cy="36.421" r="15.645" gradientTransform="matrix(.7031 0 0 .35156 42.639 6.5347)" gradientUnits="userSpaceOnUse" xlink:href="#radialGradient1361"/> </defs> - <g id="g3268"> - <path id="path8660" opacity="0.32156863" style="color:#000000;" d="m40.482,36.421a15.645,8.3969,0,1,1,-31.289,0,15.645,8.3969,0,1,1,31.289,0z" fill-rule="evenodd" transform="matrix(0.703097,0,0,0.655005,18.537026,-6.3560112)" fill="url(#radialGradient1361)"/> - <path id="path8643" stroke-linejoin="round" style="color:#000000;stroke-dasharray:none;" d="m28.501,16.5,0-9,5.9878,0,0-4,10.011,8.5554l-10.011,8.445v-4h-5.9878z" fill-rule="evenodd" stroke-dashoffset="0" stroke="#3a7304" stroke-linecap="round" stroke-miterlimit="10" stroke-width="0.99999964" fill="url(#radialGradient3266)"/> - <path id="path8645" opacity="0.5080214" style="color:#000000;" d="m34.988,4.5,0,3.5h-5.988l0.03167,4.5c5.9878-3,8.9817,2,14.471-0.5l-8.515-7.5z" fill-rule="evenodd" fill="url(#radialGradient3263)"/> - <path id="path8658" opacity="0.48128339" stroke-linejoin="miter" style="color:#000000;stroke-dasharray:none;" d="m29.499,15.5,0-7,5.9878,0,0-3,7.4848,6.5-7.4848,6.5,0-3-5.9878,0z" stroke-dashoffset="0" stroke="#FFF" stroke-linecap="butt" stroke-miterlimit="10" stroke-width="0.99999976" fill="none"/> + <g fill-rule="evenodd"> + <path transform="matrix(.7031 0 0 .655 18.537 -6.356)" d="m40.482 36.421a15.645 8.3969 0 1 1-31.289 0 15.645 8.3969 0 1 1 31.289 0z" color="#000000" fill="url(#radialGradient1361)" opacity=".32157"/> + <path d="m28.501 16.5v-9h5.9878v-4l10.011 8.5554-10.011 8.445v-4h-5.9878z" color="#000000" fill="url(#radialGradient3266)" stroke="#3a7304" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10"/> + <path d="m34.988 4.5v3.5h-5.988l0.03167 4.5c5.9878-3 8.9817 2 14.471-0.5l-8.515-7.5z" color="#000000" fill="url(#radialGradient3263)" opacity=".50802"/> </g> - <g id="g3246"> - <path id="path8660-4" opacity="0.32156863" style="color:#000000;" d="m40.482,36.421a15.645,8.3969,0,1,1,-31.289,0,15.645,8.3969,0,1,1,31.289,0z" fill-rule="evenodd" transform="matrix(0.703097,0,0,0.655005,-5.4629086,-6.3560133)" fill="url(#radialGradient1361)"/> - <path id="path8643-2" stroke-linejoin="round" style="color:#000000;stroke-dasharray:none;" d="m19.532,16.5,0-9-6,0,0-4-10.032,8.5554,10.032,8.4446,0-4,6,0z" fill-rule="evenodd" stroke-dashoffset="0" stroke="#3a7304" stroke-linecap="round" stroke-miterlimit="10" stroke-width="0.99999988" fill="url(#radialGradient3244)"/> - <path id="path8645-4" opacity="0.5080214" style="color:#000000;" d="m13.032,4.5,0,3.5,6,0-0.03173,4.5c-6-3-9,2-14.5-0.5l8.5317-7.5z" fill-rule="evenodd" fill="url(#radialGradient3241)"/> - <path id="path8658-0" opacity="0.48128339" stroke-linejoin="miter" style="color:#000000;stroke-dasharray:none;" d="m18.532,15.5,0-7-6,0,0-3-7.5,6.5,7.5,6.5,0-3,6,0z" stroke-dashoffset="0" stroke="#FFF" stroke-linecap="butt" stroke-miterlimit="10" stroke-width="1" fill="none"/> + <path d="m29.499 15.5v-7h5.9878v-3l7.4848 6.5-7.4848 6.5v-3z" color="#000000" fill="none" opacity=".48128" stroke="#fff" stroke-miterlimit="10"/> + <g fill-rule="evenodd"> + <path transform="matrix(.7031 0 0 .655 -5.4629 -6.356)" d="m40.482 36.421a15.645 8.3969 0 1 1-31.289 0 15.645 8.3969 0 1 1 31.289 0z" color="#000000" fill="url(#radialGradient1361)" opacity=".32157"/> + <path d="m19.532 16.5v-9h-6v-4l-10.032 8.5554 10.032 8.4446v-4z" color="#000000" fill="url(#radialGradient3244)" stroke="#3a7304" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10"/> + <path d="m13.032 4.5v3.5h6l-0.03173 4.5c-6-3-9 2-14.5-0.5l8.5317-7.5z" color="#000000" fill="url(#radialGradient3241)" opacity=".50802"/> </g> - <image id="image3101" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABYAAAAWCAYAAADEtGw7AAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A /wD/oL2nkwAAAAlwSFlzAAAN1wAADdcBQiibeAAAAAd0SU1FB9kHCwovJyZFtIYAAAKZSURBVDjL vZTLT1QxGMVPe3vbKXONgRASAwkwK5c+4k5NJHHQnUYTFq50JRGDEHVjTPARlsYQdDAYNxoT/wAB WfkfqFGDiuIjwMgwYww6L2amn4t7uc6VuTgstKu2aX89PedrgX/U2Fqnf6DvdDL5NUFEqNjtmE/L 0E22IOzs/LFuPhbr7B0cuDAGAGLtgOXldOLQ4W60tbVi9449eDwxjcSj17h08QSIvEWejKvD97Fv 7350dR2AZVkAAGMMhq4MJQAEwFQqlTA5MQXOOZ7teo6ZN7OolFvw4t0CFpZXfFWtLVsBAE+mJ/Hx 8wcAQEd7B+IHuwPqRfXAcRwoFcHZM/2YmprGy9tPkfn2HUtLGV9uRBiUV/M4euQY4vE4iAg3R26s syUAZowjk0mDyIAxoLSax2oxj2Ih6wdSKmiUSwVUKhWUyyUIYdfMQYSmygDOJWzbhi2V6xcBlrDB reptVA/49yLOOYTUECoKpYtegAQ7oiFs7QdGtbnhil24BcY5LGH7ACEkuCVAZDywqb03DKqUdPMK kSSl9OC0OcWRSATMq4QtDQpRrbDysxAAG2Pq9bhaccQLjLA49wWpZBot25rR3Ljdv5FrBdVhBVUr VuCc4e2r90gl07h1vQepZBqzM3Pus7YljKHQ8PhGVhhDSCXTGBvuQVOjg9FrxzH/aRGcM0hph9qw oRVSKjwYOQmtNbTWAAiO4+Dh6Cnkcvm//m4i6AT59RmNNniqWCB9x3GgtUahUKwf7B9ABkqpQK26 YBduWRai0YbNg40x XjBu6m5Zba6FgKlKLdUF+vPwoMeG0NTY5D0MDsviYIx5Pybz+szru3NrwLv3 xhGLdfbWAo9mc9m+bC6LO+Njm7q2lOry4Lnz1/E/2i8h2hqY4UCQ2AAAAABJRU5ErkJggg== " height="22" width="22" y="1" x="49"/> - <image id="image3115" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABYAAAAWCAYAAADEtGw7AAAABmJLR0QA/wD/AP+gvaeTAAAACXBI WXMAAA3XAAAN1wFCKJt4AAAAB3RJTUUH1QoRFQYvy1T0IwAAAzhJREFUOMutk91rW2Ucxz/Pc56T k7Osprqa6Iq9KLS1JqUJrXUT9LZeKYhziHjltZfiEMuk1KrzUiYI3vkXFBUvZJdSNzPQWhbm0rXd 8rK0aR1NmreTnMeLJIeQprOiXzg8nHOe5/N8f2+CHs29culj4DLHSAiRv/7jp08BNPKvmcBzoObA 3QV3FdhV4RVXdA58duWTRWAB4FYyxe18mIVL76B1B9haF5e/JTqcY3xinDPBCi/NPmT4mfNIa4S9 7LX1s0/88QY0UqrLzMIH738IwHff/8DyVz/z+58ZMrsH3obhUBCANy+8xfz8PLp2A12/gwi8CsLP 0FkjSvXW69D4WvWGurm5SaGwh1Mvs7f/kHx+z7PrVy6NeoVCoUA2m8UUFR6zHcxmGWFI6pU0PikO 0DRVnxxiSInjlKnXKtSqh63vgFO1aThVtra2WFtbQ4oGc/EnQV/DNG0y91eZGHFuAsW+YCkFUlqY ponpswDQGgxlIg3F6OgosVgMgKrbxKnlGTrVILFuMTHS/E2FV9z+jg2J8tkoK4Bl19oF1Jh+G2Xa bGxsMDg4CEA8HkfLYfCd4UHhJ1R4pQrQF9xybSCkxFCm1xlK+ZCGYmxsjNnZ2Z5zCq29JkP2gn+9 eQPLslr16hB7tL29TSKRIJFIYJomUh7BHHX8wvPnyGQyCFq3D5yyCNgWB6WqtycWizEzM4Nod0tn fSRYCEGpVAIBWmuyd++xkysQenqIocefBSCTyWDbNgBTU1N9Hct+YL/fjxSC2+spdnIFri5dZCdX 4E7yLgCRSIRoNMr0 9DRSyr6OZb8c+v1+XK3ZyRX4cvECg8EBri5dJL2VRUpBIBBAKdVV6BPk+Jfr q4yPTfDNlbdJp9OUD4tUyiVc1+Xyey9Tq9VIpVLs7+977dZPR8Dnz71IMBikWCwSCoVaYUnphdxs NnEch0AgAIBhGLiue/LiSSlJJpP8k+Lx+MlS0a3JyUlM0zxmgGR7Sk/ouLsvH+X4X/dxtyKRiOeu 47B31Vqj+0zoEXA4HOb/kAd2XXfp8y+WP/ovsPv30u966TzmstPAQPs5DQTaw2QAGnCACvAXcAAc tt+b7f/8DTlPJBp8S28uAAAAAElFTkSuQmCC " height="22" width="22" y="1" x="73"/> - <g id="g3306"> - <path id="rect9935" stroke-linejoin="round" d="m98.5,1.5,19,0c0.554,0,1,0.446,1,1v20h-21v-20c0-0.554,0.446-1,1-1z" stroke="#204a87" stroke-linecap="round" stroke-miterlimit="4" stroke-width="1" fill="url(#linearGradient3281)"/> - <rect id="rect9941" stroke-linejoin="miter" style="stroke-dasharray:none;" height="15" width="5" stroke="#d3d7cf" stroke-linecap="round" stroke-miterlimit="4" y="5.5" x="99.5" stroke-width="1" fill="url(#linearGradient3278)"/> - <path id="path9939" stroke-linejoin="miter" d="M105.5,21" fill-rule="evenodd" stroke="#888a85" stroke-linecap="butt" stroke-width="1px" fill="#204a87"/> - <rect id="rect10713" stroke-linejoin="miter" style="stroke-dasharray:none;" height="15" width="10" stroke="#eeeeec" stroke-linecap="round" stroke-miterlimit="4" y="5.5" x="106.5" stroke-width="1" fill="#eeeeec"/> - <path id="path10754" stroke-linejoin="miter" d="m105.5,21,0-16" stroke="#888a85" stroke-linecap="butt" stroke-width="1px" fill="none"/> + <path d="m18.532 15.5v-7h-6v-3l-7.5 6.5 7.5 6.5v-3z" color="#000000" fill="none" opacity=".48128" stroke="#fff" stroke-miterlimit="10"/> + <image x="73.218" y=".9398" width="22" height="22" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABYAAAAWCAYAAADEtGw7AAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A /wD/oL2nkwAAAAlwSFlzAAAN1wAADdcBQiibeAAAAAd0SU1FB9kHCwovJyZFtIYAAAKZSURBVDjL vZTLT1QxGMVPe3vbKXONgRASAwkwK5c+4k5NJHHQnUYTFq50JRGDEHVjTPARlsYQdDAYNxoT/wAB WfkfqFGDiuIjwMgwYww6L2amn4t7uc6VuTgstKu2aX89PedrgX/U2Fqnf6DvdDL5NUFEqNjtmE/L 0E22IOzs/LFuPhbr7B0cuDAGAGLtgOXldOLQ4W60tbVi9449eDwxjcSj17h08QSIvEWejKvD97Fv 7350dR2AZVkAAGMMhq4MJQAEwFQqlTA5MQXOOZ7teo6ZN7OolFvw4t0CFpZXfFWtLVsBAE+mJ/Hx 8wcAQEd7B+IHuwPqRfXAcRwoFcHZM/2YmprGy9tPkfn2HUtLGV9uRBiUV/M4euQY4vE4iAg3R26s syUAZowjk0mDyIAxoLSax2oxj2Ih6wdSKmiUSwVUKhWUyyUIYdfMQYSmygDOJWzbhi2V6xcBlrDB reptVA/49yLOOYTUECoKpYtegAQ7oiFs7QdGtbnhil24BcY5LGH7ACEkuCVAZDywqb03DKqUdPMK kSSl9OC0OcWRSATMq4QtDQpRrbDysxAAG2Pq9bhaccQLjLA49wWpZBot25rR3Ljdv5FrBdVhBVUr VuCc4e2r90gl07h1vQepZBqzM3Pus7YljKHQ8PhGVhhDSCXTGBvuQVOjg9FrxzH/aRGcM0hph9qw oRVSKjwYOQmtNbTWAAiO4+Dh6Cnkcvm//m4i6AT59RmNNniqWCB9x3GgtUahUKwf 7B9ABkqpQK26 YBduWRai0YbNg40xXjBu6m5Zba6FgKlKLdUF+vPwoMeG0NTY5D0MDsviYIx5Pybz+szru3NrwLv3 xhGLdfbWAo9mc9m+bC6LO+Njm7q2lOry4Lnz1/E/2i8h2hqY4UCQ2AAAAABJRU5ErkJggg== "/> + <image x="97.218" y=".9398" width="22" height="22" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABYAAAAWCAYAAADEtGw7AAAABmJLR0QA/wD/AP+gvaeTAAAACXBI WXMAAA3XAAAN1wFCKJt4AAAAB3RJTUUH1QoRFQYvy1T0IwAAAzhJREFUOMutk91rW2Ucxz/Pc56T k7Osprqa6Iq9KLS1JqUJrXUT9LZeKYhziHjltZfiEMuk1KrzUiYI3vkXFBUvZJdSNzPQWhbm0rXd 8rK0aR1NmreTnMeLJIeQprOiXzg8nHOe5/N8f2+CHs29culj4DLHSAiRv/7jp08BNPKvmcBzoObA 3QV3FdhV4RVXdA58duWTRWAB4FYyxe18mIVL76B1B9haF5e/JTqcY3xinDPBCi/NPmT4mfNIa4S9 7LX1s0/88QY0UqrLzMIH738IwHff/8DyVz/z+58ZMrsH3obhUBCANy+8xfz8PLp2A12/gwi8CsLP 0FkjSvXW69D4WvWGurm5SaGwh1Mvs7f/kHx+z7PrVy6NeoVCoUA2m8UUFR6zHcxmGWFI6pU0PikO 0DRVnxxiSInjlKnXKtSqh63vgFO1aThVtra2WFtbQ4oGc/EnQV/DNG0y91eZGHFuAsW+YCkFUlqY ponpswDQGgxlIg3F6OgosVgMgKrbxKnlGTrVILFuMTHS/E2FV9z+jg2J8tkoK4Bl19oF1Jh+G2Xa bGxsMDg4CEA8HkfLYfCd4UHhJ1R4pQrQF9xybSCkxFCm1xlK+ZCGYmxsjNnZ2Z5zCq29JkP2gn+9 eQPLslr16hB7tL29TSKRIJFIYJomUh7BHHX8wvPnyGQyCFq3D5yyCNgWB6WqtycWizEzM4Nod0tn fSRYCEGpVAIBWmuyd++xkysQenqIocefBSCTyWDbNgBTU1N9Hct+YL/fjxSC2+sp dnIFri5dZCdX 4E7yLgCRSIRoNMr09DRSyr6OZb8c+v1+XK3ZyRX4cvECg8EBri5dJL2VRUpBIBBAKdVV6BPk+Jfr q4yPTfDNlbdJp9OUD4tUyiVc1+Xyey9Tq9VIpVLs7+977dZPR8Dnz71IMBikWCwSCoVaYUnphdxs NnEch0AgAIBhGLiue/LiSSlJJpP8k+Lx+MlS0a3JyUlM0zxmgGR7Sk/ouLsvH+X4X/dxtyKRiOeu 47B31Vqj+0zoEXA4HOb/kAd2XXfp8y+WP/ovsPv30u966TzmstPAQPs5DQTaw2QAGnCACvAXcAAc tt+b7f/8DTlPJBp8S28uAAAAAElFTkSuQmCC "/> + <g transform="translate(24.218 -.060204)"> + <path d="m98.5 1.5h19c0.554 0 1 0.446 1 1v20h-21v-20c0-0.554 0.446-1 1-1z" fill="url(#linearGradient3281)" stroke="#204a87" stroke-linecap="round" stroke-linejoin="round"/> + <g> + <rect x="99.5" y="5.5" width="5" height="15" fill="url(#linearGradient3278)" stroke="#d3d7cf" stroke-linecap="round"/> + <path d="m105.5 21" fill="#204a87" fill-rule="evenodd" stroke="#888a85" stroke-width="1px"/> + <rect x="106.5" y="5.5" width="10" height="15" fill="#eeeeec" stroke="#eeeeec" stroke-linecap="round"/> + <path d="m105.5 21v-16" fill="none" stroke="#888a85" stroke-width="1px"/> + </g> + </g> + <g transform="translate(-.0033286 -1.3077)"> + <path d="m71.102 19.339a11 5.5 0 1 1-21.999 0 11 5.5 0 1 1 21.999 0z" color="#000000" fill="url(#radialGradient376)" fill-rule="evenodd" opacity=".32157" stroke-width=".67862"/> + <g transform="rotate(-90 60.068 12)"> + <path d="m52.069 16.5v-9h5.9878v-4l10.011 8.5554-10.011 8.445v-4h-5.9878z" color="#000000" fill="url(#radialGradient59)" fill-rule="evenodd" stroke="#3a7304" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10"/> + <path d="m58.556 4.5v3.5h-5.988l0.03167 4.5c5.9878-3 8.9817 2 14.471-0.5l-8.515-7.5z" color="#000000" fill="url(#radialGradient61)" fill-rule="evenodd" opacity=".50802"/> + <path d="m53.067 15.5v-7h5.9878v-3l7.4848 6.5-7.4848 6.5v-3z" color="#000000" fill="none" opacity=".48128" stroke="#fff" stroke-miterlimit="10"/> + </g> </g> </svg> diff --git a/dlls/comctl32/idb_hist_small.bmp b/dlls/comctl32/idb_hist_small.bmp index c735f54377f2ca6dfd890857db294ff983ff8d6e..eed1a9f62d42c7240eefbc2f61c6c713ec113a09 100644 GIT binary patch delta 1235 zcmbW1YfPI}7{_Vf7Yg)3OId~ru544;iW`a{&{o80NQUd?E(kJYH@2CHn+=y?EznM2 zFpBu@d@#7;hTu?I#Y-|QmyS{{8z58I)=cLj@r&P0VZ)?<&->DvEc(fl{LV?vd7l6C zoF~sYE2)#|Y1@o>i4nrcqjMJJAVo<LMQ9=zx<=4*znq6ldz3S6B&F&joHa(nR_Xp= zD|Glz=ox29;DVOio}(Fmc9&(~|G@ilrexw59p|jF$M{ISzl@^$&IlZSH|nOl!;lo_ z5t1XeFkOeAB_rZ&magDTi6ovW54-l=9m76%BlP{1i28V^0F@A2>llmr;=y#>@GoHQ z_Iw!fgLo6m@6*eWo$NbdsV{$>K+#Y$GF&JBCFNl)>dw-wg4FE7j|jm_i8{&Y$g^RQ z{(F<yKimrK7jLeLICi0KwnxY(7-?ZHlx!ijQQ5-kj<V&lm4=Cjie0T={`%e&N=90- z)%6x6m-ZmKXCLZ+>IGY4SboTs`VyVQs_rOG6Ed5+F@q37W*uZ%@_ue)rS7QK{`%6u z;tYm<pTm{kW*~&{*zx?88pQM#Lh34p?N%Rbx1F&0op^8IG7=k%0p6FGqpj+XinKzA ziP`H2!G~bzKFN-0G_aLAXR-6l1Ls{IPK|e<%*&y~+lK9)Gmw6@AM)=?p%^#>)nFOQ zZ(TxW*NOXVwZX~vA{mUa#TRZ8^nKG)2tkaon?;4BCbr2CaUxenQ(0`7><M!7-{6q9 z9mQj9c-7Ye#kU8ba36;9>M`tDIFBN4YcR6fu*mxe>MOA}RY9ttK6-5&s}Q?XD=tVS zZfRpWZxv<Aep+dMDd4y{fQoCKC>T2j<9IXHet!&c!)17GrXCgk&k+0W3jwl4l0@=l zCedCpEYs8ZzO0FyWTH3l)q1A=z|zG#Ln!juv3;xo>juk_bhR8cKYxzLTlbPKb`9|; zWaOOO6u<ikA**5EC_)gqVzX#B$x<}YhSIQ=dRMX2wqn28kC#1GJUMs@$LAf$xompC zp4Pkg2KFdwRl7C{I&SX>Rv|m$v<%(l4L*pY9WGxNs-W5D2);di0R@w7cw>mKlwPP5 zZyAiM6&Z;|sb`Gqg?Bcur0-0bz}F_hk{4*1>qGVRPoOYw3y@MKiR7s2L@C6p%9P}5 z(ELgYbxI~{<LOV5DCKLB-d?)&RLg7h&dJ0a-yr_<$a!@pdp1AiuYbOrHPK9!u9Jr| aZ6IECm9!oZH}6>gVROEQyqJ(BYX2KoWn6y%

delta 614 zcmbu6&nt9M9LDF|%gnel!<~B##)8R@Fh)#cK^E#|#nAL7z3ELdM4H8HY;>;(W8AX1 zJ*6Q@UjKllB+?A>vo}e-3mbod?VCEz9M{syw?5zR={e7HI-PUg_P;UoV_>e-#%qrC z1S7_f8N?Q_iEP@~zT(PbhAQhxUa{)SHNxd#b9x*S(Yp60BJ>;Jl~mz{Ou-N|ad$k7 zBC(UtSK`O0n1EEEsXJqB^#19A-ah{Q1b(qeWID_H@UI{Vqfk?~M_ak?`r)2h<b7lt zJ@!>d4o%$p-GVhoC!aaTB2vXNHk?T{GZNy-i@R%T!IK&E6fMCnEvOs6g4~h4xuh2S z4opW*T7luxmEk6CIlDTi7Vx`+WEj2f6eN%C9cti)(~B(q02xoSFw}sYhn-NYlb>*w zbg|xB!UD3c#OitA=<I}AU{el~7_xE-hFA9v)^fw)=`sBP6-u)(Sj*pKL`gzYbrMBd z?GmCjO!VVfO~5FfhwO`>+UFGd1N;x-zBue<%i^Dj2+Xn;_x@x%-HS(Px-al%9@LpL Yajcimx)vxE($Si=)&6RDDmqB|9mxp*?f?J)

diff --git a/dlls/comctl32/idb_hist_small.svg b/dlls/comctl32/idb_hist_small.svg index 3fceec0da6e..9170e106e70 100644 --- a/dlls/comctl32/idb_hist_small.svg +++ b/dlls/comctl32/idb_hist_small.svg @@ -1,254 +1,33 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<?xml version="1.0" encoding="UTF-8"?>  - -<svg - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - id="bitmap:80-32" - version="1.1" - inkscape:version="0.47 r22583" - width="80" - height="16" - sodipodi:docname="idb_hist_small.svg"> - <sodipodi:namedview - pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="1" - objecttolerance="10" - gridtolerance="10" - guidetolerance="10" - inkscape:pageopacity="0" - inkscape:pageshadow="2" - inkscape:window-width="1680" - inkscape:window-height="975" - id="namedview2903" - showgrid="true" - inkscape:snap-bbox="true" - inkscape:bbox-paths="true" - inkscape:snap-nodes="false" - inkscape:zoom="9.6032528" - inkscape:cx="53.152097" - inkscape:cy="-2.0974936" - inkscape:window-x="1280" - inkscape:window-y="25" - inkscape:window-maximized="1" - inkscape:current-layer="bitmap:80-32"> - <inkscape:grid - id="grid2913" - type="xygrid" /> - <sodipodi:guide - id="guide2915" - orientation="0,80" - position="0,0" /> - <sodipodi:guide - id="guide2917" - orientation="-16,0" - position="80,0" /> - <sodipodi:guide - id="guide2919" - orientation="0,-80" - position="80,16" /> - <sodipodi:guide - id="guide2921" - orientation="16,0" - position="0,16" /> - </sodipodi:namedview> - <defs - id="defs2905"> - <linearGradient - inkscape:collect="always" - id="linearGradient10716"> - <stop - style="stop-color:#d3d7cf;stop-opacity:1" - offset="0" - id="stop10718" /> - <stop - style="stop-color:#babdb6;stop-opacity:1" - offset="1" - id="stop10720" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - id="linearGradient9791"> - <stop - style="stop-color:#3465a4;stop-opacity:1" - offset="0" - id="stop9793" /> - <stop - style="stop-color:#204a87;stop-opacity:1" - offset="1" - id="stop9795" /> - </linearGradient> - <linearGradient - y2="4" - x2="4" - y1="15" - x1="4" - gradientTransform="translate(64,-1)" - gradientUnits="userSpaceOnUse" - id="linearGradient3019" - xlink:href="#linearGradient10716" - inkscape:collect="always" /> - <linearGradient - gradientTransform="translate(64,0)" - y2="2" - x2="1" - y1="16" - x1="1" - gradientUnits="userSpaceOnUse" - id="linearGradient3023" - xlink:href="#linearGradient9791" - inkscape:collect="always" /> - <inkscape:perspective - sodipodi:type="inkscape:persp3d" - inkscape:vp_x="0 : 0.5 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_z="1 : 0.5 : 1" - inkscape:persp3d-origin="0.5 : 0.33333333 : 1" - id="perspective3042" /> - <inkscape:perspective - sodipodi:type="inkscape:persp3d" - inkscape:vp_x="0 : 0.5 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_z="1 : 0.5 : 1" - inkscape:persp3d-origin="0.5 : 0.33333333 : 1" - id="perspective3056" /> - <inkscape:perspective - sodipodi:type="inkscape:persp3d" - inkscape:vp_x="0 : 0.5 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_z="1 : 0.5 : 1" - inkscape:persp3d-origin="0.5 : 0.33333333 : 1" - id="perspective3070" /> - <inkscape:perspective - sodipodi:type="inkscape:persp3d" - inkscape:vp_x="0 : 0.5 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_z="1 : 0.5 : 1" - inkscape:persp3d-origin="0.5 : 0.33333333 : 1" - id="perspective3084" /> - </defs> - <g - id="g3027"> - <path - style="fill:#3465a4;fill-opacity:1;stroke:url(#linearGradient3023);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1" - d="m 65.5,0.5 13,0 c 0.554,0 1,0.446 1,1 l 0,14 -15,0 0,-14 c 0,-0.554 0.446,-1 1,-1 z" - id="rect9935" - sodipodi:nodetypes="ccccccc" /> - <path - style="fill:#204a87;fill-rule:evenodd;stroke:#888a85;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="m 70.5,15 0,-12" - id="path9939" - sodipodi:nodetypes="cc" /> - <rect - style="fill:url(#linearGradient3019);fill-opacity:1;stroke:#d3d7cf;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" - id="rect9941" - width="4" - height="11" - x="65.5" - y="3.5" /> - <rect - y="3.5" - x="71.5" - height="11" - width="7" - id="rect10713" - style="fill:#eeeeec;fill-opacity:1;stroke:#eeeeec;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> - <path - style="fill:none;stroke:#204a88;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="m 65,2.5 14,0" - id="path9799" /> +<svg id="bitmap:96-32" width="96" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:xlink="http://www.w3.org/1999/xlink"> + <defs id="defs12"> + <linearGradient id="linearGradient3019" x1="4" x2="4" y1="15" y2="4" gradientTransform="translate(64,-1)" gradientUnits="userSpaceOnUse"> + <stop id="stop2" stop-color="#d3d7cf" offset="0"/> + <stop id="stop4" stop-color="#babdb6" offset="1"/> + </linearGradient> + <linearGradient id="linearGradient3023" x1="1" x2="1" y1="16" y2="2" gradientTransform="translate(64)" gradientUnits="userSpaceOnUse"> + <stop id="stop7" stop-color="#3465a4" offset="0"/> + <stop id="stop9" stop-color="#204a87" offset="1"/> + </linearGradient> + </defs> + <g id="g26" transform="translate(16)"> + <path id="path14" d="m65.5 0.5h13c0.554 0 1 0.446 1 1v14h-15v-14c0-0.554 0.446-1 1-1z" fill="#3465a4" stroke="url(#linearGradient3023)" stroke-linecap="round" stroke-linejoin="round"/> + <g id="g24"> + <path id="path16" d="m70.5 15v-12" fill="#204a87" fill-rule="evenodd" stroke="#888a85" stroke-width="1px"/> + <rect id="rect18" x="65.5" y="3.5" width="4" height="11" fill="url(#linearGradient3019)" stroke="#d3d7cf" stroke-linecap="round"/> + <rect id="rect20" x="71.5" y="3.5" width="7" height="11" fill="#eeeeec" stroke="#eeeeec" stroke-linecap="round"/> + <path id="path22" d="m65 2.5h14" fill="none" stroke="#204a88" stroke-width="1px"/> </g> - <image - xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAABl0RVh0 -U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAI2SURBVDiNlZJLSFRhHMV/3+POw0bDFFLE -XkQgaBQEhdNGaNEiggRbRoFCuMlyjDZCKzeNkIsochMUvaRFYj5wES1m0CmkFDfRIiwznbGBHuN4 -79z7tQhfMxPUgbP5/ofD+Z//hzGGfIa7dKyxU7cVm+VTUgTGo3F39YG+cJc1EI5YoWKaNRQ1ALjS -0hs8efTsaQSz4YjV8N8GSmqaDp/xtTdfrw36QxPhiNVWTCcaI/orhp1bHhXZm+2DganPY1SV7cMn -t/F4/NbKh/mZYWM4H4s6PzcMOrXpuXgfKRRKKISQCAQAiU9DeLiU+Xewq7ye+PS4MzY5sIAxp2JR -ZwZAA7hejtjHZyipUUKBEAgBQgHCY9meI700z8G6I1ZN1Z7ap2N3J8IRqyMWdfo1QM5bJZ1ZwHaz -2G4WpTSlJWWUBEL4LT9GuNhejndLo9SE6kRrc1fJ0KtHfcevWsc0wNKPOd4nX693oH2ClCPRWYnW -Cr8viE8GUPgpzZWjTJCsnTHrK2wpUILUAmXJP/SBp7KgLBoqmkgvZsyDl3dWsquZjRUAWg5dWzdQ -lkBpychcL9onqQ7tp277CSbfxO3E2/hX47KpRMHi7Sc9W84oLbKXznUHlFLUVzZRofcy8PxhZjH5 -ZcS4eWc0xhR8jnDEMpdbu/nlJUmmUubF6OCK7dgdsRtOf762oIM1ODmbxFRidXp2atHbFLmgs78l -qCivzHz7nho2Lhc2R/6nBEISX06n7sWihZHz8RtB3gm0bnbltgAAAABJRU5ErkJggg== -" - width="16" - height="16" - id="image3044" - x="16" - y="0" /> - <image - xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAABl0RVh0 -U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAIhSURBVDiNhZNPSBRxFMe/b2Z+szu7UmJs -rRu1QggRCYKVbluH3CJW00xEIogOJXSyoi26eokQAzvEHiTw0CUKgrBuHSRXio4VHiJL91C5bJK7 -7czuzO/36zCZrozug3d6f/i873sPUkrU8qM3tSvxW1rGK6ZhC4unWB0RJqPh5q6FH58Nrxxli+IW -ED6dPNzfc23gnmcxAG+CeIoNGb668YvJYWPPzmZSaHPQqsgq8r7Iga7BU1cNk6/g4/dpHIn2gFRY -8RSTVdWEnySlXIdMU4lDfY0dBzvZ118fULDy0FSGWFMfiBQQAAlASgEhBe6kL7gE8RQbChrbH/Sf -uOSvr2+g94uvwKUDpugQkmNm/hmICASChKt+e7TXHeHYbfaoqXH/+e7jg0autIB3396AMR90TQdX -BCxRgGkWULRWULZLUEiFnwXRujuxpgHnNiz7D0znN0oyD3ABh5uoCBNcckguwR0Jxxbgjjtyrph1 -1zgzal/OLn25/vhl2oTtk617E5B6GUIvgQUAf0CFHlDBDAXMr0DVqFrH9SKSgqm2lli4vS2mzxVe -I1+Zh5DA6cgNiH8U3HYdANJP7q41+L9GFZO7dkSS584MBIpsEXPL0+gMDeP+xIjFK/BvusaNh8R0 -fby3+6wRDocoqIQw+nAEmTGbNuZ6nnJmzJ6wK5WO5y+eZmdn35bL5YpXWrUGXrY6UsO2UDK/nAt4 -EdR85Vrv/Bdt8zR07MrLCQAAAABJRU5ErkJggg== -" - width="16" - height="16" - id="image3058" - x="0" - y="0" /> - <image - xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A -/wD/oL2nkwAAAAlwSFlzAAAN1wAADdcBQiibeAAAAAd0SU1FB9kHCwonI+nx+pcAAAH5SURBVDjL -jZI/aFNBGMB/d+/eexeJCXnBUHFzcJG6iIjgJpFoUYt/6CC4C6KLoOIgQqkVJIriUqSDOLi4aS3a -qktLdSk4OtVB8U9CiPr6XprmziExaRob/eDguPu+3/e7jxMA586fFaVS2VSWN1OJt/C38D3YPwhC -dM7GRseFunTlYmJp6eNyoXCQga0D/KxGFCcXuXr5dDNLABZGxx8xuHMX+fwBhBAU7xQBUDdv3IpO -jZxgamoagFQqRcPkeP/hM59KPwDYlksDgpczL/he/kIURWSzQRPwRyeZTKK1ZujQEIu3ZylXKnz9 -VgFAK0NjNebokWEKhTzGGO7dv9sNEEJQKpVoNAyNesxKLaIW/UIA9TjB6kpEvb5CHMf4vt+eg+od -l0U4Lkp5uJ6PteAoFyEVYLHWYi0bA6y1KDeBqzfh6RpgcXUC5SbWAGw/AEjpIKWDo1wAHMdFOqp1 -b7ryewCe57b3uSCJMZ1uvu/3GMj1AK1122R+ZoGFV2/bBVrrruINDDwA3kzPsWN7DteVvH4+1zZY -H2rt8JpdmklnTu5j5NheAJ48e8fk4/m2XV+DIAh4+vACovXprbUcP7yH4cJuqtXqvwHpdLpnUABS -SjKZTP8nZIMsUkpAIAQtC4EQnQUCY0wP4HoYhtfCMGTiwQT/E57nzQL8BtWmvaof7hjzAAAAAElF -TkSuQmCC -" - width="16" - height="16" - id="image3072" - x="32" - y="0" /> - <image - xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBI -WXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH1QoRFQY0QTE9zwAAAjtJREFUOMuV0kFIk2Ecx/Hv/32e -9927uXJbI2usFS0RLC+BQkX3wqgggg5Bh6J70KGidrBDp6KrdK2D4CUoiigr0KZBIXhxUwnRydRE -WrLXbe/2dpioKxP8XZ7n8Pw//P/P8whr6Tpz5xbwGPDYiAcgIvP3rueS3ad/tYHugtoi1NLAogbo -7e3tz+fzlyYmp8guxuTB3av1cqkTDx89jw2mXac1EefAoRMY1kFWlj4M7gmO3VAAnZ2dfalUil3B -IAPpH4RbonzP5Jic+YlTqjAxPs3tm8foOHoEq/kCpn0IQ/sT2v06pze1S6FQwK0UWVpeZn5hGQBb -13ArRQq/Xdyai646iDIoF2fwKSkYm4FqtUq1skq55FByVig7K1RWHdyyw9h4iZmcUC0O4BXfMTud -Bq/yrQEAEGWhtYVp+VCmD6VNxDDZH0sQ2XcWp9aBmDFGRk2gOtoAiAja9GPaASw7iM/fhGn70aaf -3GyOTHYKT2JgHWduoQnd8nJV/92BYSgMQ6G0CYBSJobSxONx2traQAQRjecJAA2AZVnr+72RILXa -xpew/Yqt0jBCIBCo/x4PvrwfZnhgBM+rI02BZkRke8Dn8wHw6e0QidhuDidCfHwzhOd55PN5MpnM -P0DDCLZtA3Dt8imuXDyJYRj0vxrm2YvPtLe3k0wmtwei0ShP7p9DKUU2m0VE6GgN8zR1nnA4vP5S -/wVCoRChUAgRWT+4ed3qDhqASCTCTqPXWn/d09PTvZPCaDTaB/AHRla4xjKX5L8AAAAASUVORK5C -YII= -" - width="16" - height="16" - id="image3086" - x="48" - y="0" /> - <metadata - id="metadata3175"> - rdf:RDF - <cc:Work - rdf:about=""> - dc:title</dc:title> - </cc:Work> - </rdf:RDF> - </metadata> + </g> + <image id="image28" x="16" width="16" height="16" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAABl0RVh0 U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAI2SURBVDiNlZJLSFRhHMV/3+POw0bDFFLE XkQgaBQEhdNGaNEiggRbRoFCuMlyjDZCKzeNkIsochMUvaRFYj5wES1m0CmkFDfRIiwznbGBHuN4 79z7tQhfMxPUgbP5/ofD+Z//hzGGfIa7dKyxU7cVm+VTUgTGo3F39YG+cJc1EI5YoWKaNRQ1ALjS 0hs8efTsaQSz4YjV8N8GSmqaDp/xtTdfrw36QxPhiNVWTCcaI/orhp1bHhXZm+2DganPY1SV7cMn t/F4/NbKh/mZYWM4H4s6PzcMOrXpuXgfKRRKKISQCAQAiU9DeLiU+Xewq7ye+PS4MzY5sIAxp2JR ZwZAA7hejtjHZyipUUKBEAgBQgHCY9meI700z8G6I1ZN1Z7ap2N3J8IRqyMWdfo1QM5bJZ1ZwHaz 2G4WpTSlJWWUBEL4LT9GuNhejndLo9SE6kRrc1fJ0KtHfcevWsc0wNKPOd4nX693oH2ClCPRWYnW Cr8viE8GUPgpzZWjTJCsnTHrK2wpUILUAmXJP/SBp7KgLBoqmkgvZsyDl3dWsquZjRUAWg5dWzdQ lkBpychcL9onqQ7tp277CSbfxO3E2/hX47KpRMHi7Sc9W84oLbKXznUHlFLUVzZRofcy8PxhZjH5 ZcS4eWc0xhR8jnDEMpdbu/nlJUmmUubF6OCK7dgdsRtOf762oIM1ODmbxFRidXp2atHbFLmgs78l qCivzHz7nho2Lhc2R/6nBEISX06n7sWihZHz8RtB3gm0bnbltgAAAABJRU5ErkJgg g== "/> + <image id="image30" width="16" height="16" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAABl0RVh0 U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAIhSURBVDiNhZNPSBRxFMe/b2Z+szu7UmJs rRu1QggRCYKVbluH3CJW00xEIogOJXSyoi26eokQAzvEHiTw0CUKgrBuHSRXio4VHiJL91C5bJK7 7czuzO/36zCZrozug3d6f/i873sPUkrU8qM3tSvxW1rGK6ZhC4unWB0RJqPh5q6FH58Nrxxli+IW ED6dPNzfc23gnmcxAG+CeIoNGb668YvJYWPPzmZSaHPQqsgq8r7Iga7BU1cNk6/g4/dpHIn2gFRY 8RSTVdWEnySlXIdMU4lDfY0dBzvZ118fULDy0FSGWFMfiBQQAAlASgEhBe6kL7gE8RQbChrbH/Sf uOSvr2+g94uvwKUDpugQkmNm/hmICASChKt+e7TXHeHYbfaoqXH/+e7jg0autIB3396AMR90TQdX BCxRgGkWULRWULZLUEiFnwXRujuxpgHnNiz7D0znN0oyD3ABh5uoCBNcckguwR0Jxxbgjjtyrph1 1zgzal/OLn25/vhl2oTtk617E5B6GUIvgQUAf0CFHlDBDAXMr0DVqFrH9SKSgqm2lli4vS2mzxVe I1+Zh5DA6cgNiH8U3HYdANJP7q41+L9GFZO7dkSS584MBIpsEXPL0+gMDeP+xIjFK/BvusaNh8R0 fby3+6wRDocoqIQw+nAEmTGbNuZ6nnJmzJ6wK5WO5y+eZmdn35bL5YpXWrUGXrY6UsO2UDK/nAt4 EdR85Vrv/Bdt8zR07MrLCQAAAABJRU5ErkJggg== "/> + <image id="image32" x="48" width="16" height="16" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A /wD/oL2nkwAAAAlwSFlzAAAN1wAADdcBQiibeAAAAAd0SU1FB9kHCwonI+nx+pcAAAH5SURBVDjL jZI/aFNBGMB/d+/eexeJCXnBUHFzcJG6iIjgJpFoUYt/6CC4C6KLoOIgQqkVJIriUqSDOLi4aS3a qktLdSk4OtVB8U9CiPr6XprmziExaRob/eDguPu+3/e7jxMA586fFaVS2VSWN1OJt/C38D3YPwhC dM7GRseFunTlYmJp6eNyoXCQga0D/KxGFCcXuXr5dDNLABZGxx8xuHMX+fwBhBAU7xQBUDdv3IpO jZxgamoagFQqRcPkeP/hM59KPwDYlksDgpczL/he/kIURWSzQRPwRyeZTKK1ZujQEIu3ZylXKnz9 VgFAK0NjNebokWEKhTzGGO7dv9sNEEJQKpVoNAyNesxKLaIW/UIA9TjB6kpEvb5CHMf4vt+eg+od l0U4Lkp5uJ6PteAoFyEVYLHWYi0bA6y1KDeBqzfh6RpgcXUC5SbWAGw/AEjpIKWDo1wAHMdFOqp1 b7ryewCe57b3uSCJMZ1uvu/3GMj1AK1122R+ZoGFV2/bBVrrruINDDwA3kzPsWN7DteVvH4+1zZY H2rt8JpdmklnTu5j5NheAJ48e8fk4/m2XV+DIAh4+vACovXprbUcP7yH4cJuqtXqvwHpdLpnUABS SjKZTP8nZIMsUkpAIAQtC4EQnQUCY0wP4HoYhtfCMGTiwQT/E57nzQL8BtWmvaof7hjzAAAAAElF TkSuQmCC "/> + <image id="image34" x="64" width="16" height="16" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBI WXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH1QoRFQY0QTE9zwAAAjtJREFUOMuV0kFIk2Ecx/Hv/32e 9927uXJbI2usFS0RLC+BQkX3wqgggg5Bh6J70KGidrBDp6KrdK2D4CUoiigr0KZBIXhxUwnRydRE WrLXbe/2dpioKxP8XZ7n8Pw//P/P8whr6Tpz5xbwGPDYiAcgIvP3rueS3ad/tYHugtoi1NLAogbo 7e3tz+fzlyYmp8guxuTB3av1cqkTDx89jw2mXac1EefAoRMY1kFWlj4M7gmO3VAAnZ2dfalUil3B IAPpH4RbonzP5Jic+YlTqjAxPs3tm8foOHoEq/kCpn0IQ/sT2v06pze1S6FQwK0UWVpeZn5hGQBb 13ArRQq/Xdyai646iDIoF2fwKSkYm4FqtUq1skq55FByVig7K1RWHdyyw9h4iZmcUC0O4BXfMTud Bq/yrQEAEGWhtYVp+VCmD6VNxDDZH0sQ2XcWp9aBmDFGRk2gOtoAiAja9GPaASw7iM/fhGn70aaf 3GyOTHYKT2JgHWduoQnd8nJV/92BYSgMQ6G0CYBSJobSxONx2traQAQRjecJAA2AZVnr+72RILXa xpew/Yqt0jBCIBCo/x4PvrwfZnhgBM+rI02BZkRke8Dn8wHw6e0QidhuDidCfHwzhOd55PN5MpnM P0DDCLZtA3Dt8imuXDyJYRj0vxrm2YvPtLe3k0wmtwei0ShP7p9DKUU2m0VE6GgN8zR1nnA4vP5S /wVCoRChUAgRWT+4ed3qDhqASCTCTqPXWn/d09PTvZPCaDTaB/AHRla4xjKX5L8AA AAASUVORK5C YII= "/> + <metadata id="metadata36"> + rdf:RDF + <cc:Work rdf:about=""/> + </rdf:RDF> + </metadata> + <image id="image43" transform="rotate(-90)" x="-16" y="32" width="16" height="16" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAABl0RVh0 U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAI2SURBVDiNlZJLSFRhHMV/3+POw0bDFFLE XkQgaBQEhdNGaNEiggRbRoFCuMlyjDZCKzeNkIsochMUvaRFYj5wES1m0CmkFDfRIiwznbGBHuN4 79z7tQhfMxPUgbP5/ofD+Z//hzGGfIa7dKyxU7cVm+VTUgTGo3F39YG+cJc1EI5YoWKaNRQ1ALjS 0hs8efTsaQSz4YjV8N8GSmqaDp/xtTdfrw36QxPhiNVWTCcaI/orhp1bHhXZm+2DganPY1SV7cMn t/F4/NbKh/mZYWM4H4s6PzcMOrXpuXgfKRRKKISQCAQAiU9DeLiU+Xewq7ye+PS4MzY5sIAxp2JR ZwZAA7hejtjHZyipUUKBEAgBQgHCY9meI700z8G6I1ZN1Z7ap2N3J8IRqyMWdfo1QM5bJZ1ZwHaz 2G4WpTSlJWWUBEL4LT9GuNhejndLo9SE6kRrc1fJ0KtHfcevWsc0wNKPOd4nX693oH2ClCPRWYnW Cr8viE8GUPgpzZWjTJCsnTHrK2wpUILUAmXJP/SBp7KgLBoqmkgvZsyDl3dWsquZjRUAWg5dWzdQ lkBpychcL9onqQ7tp277CSbfxO3E2/hX47KpRMHi7Sc9W84oLbKXznUHlFLUVzZRofcy8PxhZjH5 ZcS4eWc0xhR8jnDEMpdbu/nlJUmmUubF6OCK7dgdsRtOf762oIM1ODmbxFRidXp2atHbFLmgs78l qCivzHz7nho2Lhc2R/6nBEISX06n7sWih ZHz8RtB3gm0bnbltgAAAABJRU5ErkJggg== "/> </svg> diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 02538eeb649..dc2074c0fb5 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -2852,11 +2852,11 @@ TOOLBAR_AddBitmap (TOOLBAR_INFO *infoPtr, INT count, const TBADDBITMAP *lpAddBmp info.nID = IDB_VIEW_LARGE; break; case IDB_HIST_SMALL_COLOR: - info.nButtons = 5; + info.nButtons = 6; info.nID = IDB_HIST_SMALL; break; case IDB_HIST_LARGE_COLOR: - info.nButtons = 5; + info.nButtons = 6; info.nID = IDB_HIST_LARGE; break; default: diff --git a/dlls/comdlg32/itemdlg.c b/dlls/comdlg32/itemdlg.c index 95778c2f358..bad25d61792 100644 --- a/dlls/comdlg32/itemdlg.c +++ b/dlls/comdlg32/itemdlg.c @@ -40,6 +40,7 @@ #define IDC_NAV_TOOLBAR 200 #define IDC_NAVBACK 201 #define IDC_NAVFORWARD 202 +#define IDC_NAVUP 203

#include <initguid.h> /* This seems to be another version of IID_IFileDialogCustomize. If @@ -121,6 +122,7 @@ typedef struct FileDialogImpl { IShellItem *psi_folder;

HWND dlg_hwnd; + HWND address_edit_hwnd; IExplorerBrowser *peb; DWORD ebevents_cookie;

@@ -1414,6 +1416,49 @@ static LRESULT CALLBACK ctrl_container_wndproc(HWND hwnd, UINT umessage, WPARAM return FALSE; }

+static LRESULT on_browse_address_accept(FileDialogImpl *This, WPARAM wparam, LPARAM lparam) +{ + wchar_t address_text[MAX_PATH]; + PIDLIST_ABSOLUTE pidl; + HRESULT hr; + TRACE("%p\n", This); + SendMessageW(This->address_edit_hwnd, WM_GETTEXT, MAX_PATH, (LPARAM)address_text); + hr = SHParseDisplayName(address_text, 0, &pidl, SFGAO_FOLDER, 0); + if (SUCCEEDED(hr)) + { + IExplorerBrowser_BrowseToIDList(This->peb, NULL, SBSP_ABSOLUTE); + } + return FALSE; +} + +static LRESULT CALLBACK address_edit_wndproc(HWND hwnd, UINT umessage, WPARAM wparam, LPARAM lparam, + UINT_PTR id_subclass, DWORD_PTR ref_data) +{ + FileDialogImpl *This = (FileDialogImpl*)GetWindowLongPtrW(hwnd, GWLP_USERDATA); + switch(umessage) + { + case WM_COMMAND: + if (wparam == IDOK) + { + if (GetFocus() == This->address_edit_hwnd) + { + return on_browse_address_accept(This, wparam, lparam); + } + else + { + return DefSubclassProc(hwnd, umessage, wparam, lparam); + } + } + else + { + return DefSubclassProc(hwnd, umessage, wparam, lparam); + } + default: + return DefSubclassProc(hwnd, umessage, wparam, lparam); + } + return FALSE; +} + static void radiobuttonlist_set_selected_item(FileDialogImpl *This, customctrl *ctrl, cctrl_item *item) { cctrl_item *cursor; @@ -1636,13 +1681,16 @@ static void update_layout(FileDialogImpl *This) HDWP hdwp; HWND hwnd; RECT dialog_rc; + RECT wnd_rc; RECT cancel_rc, dropdown_rc, open_rc; RECT filetype_rc, filename_rc, filenamelabel_rc; RECT toolbar_rc, ebrowser_rc, customctrls_rc; + RECT address_edit_rc = {0,0,264,14}; static const UINT vspacing = 4, hspacing = 4; static const UINT min_width = 320, min_height = 200; BOOL show_dropdown;

+ MapDialogRect(This->dlg_hwnd, &address_edit_rc); if (!GetClientRect(This->dlg_hwnd, &dialog_rc)) { TRACE("Invalid dialog window, not updating layout\n"); @@ -1772,6 +1820,10 @@ static void update_layout(FileDialogImpl *This) MapWindowPoints(NULL, This->dlg_hwnd, (POINT*)&toolbar_rc, 2); }

+ hwnd = GetParent(This->dlg_hwnd); + GetWindowRect(hwnd, &wnd_rc); + GetWindowRect(This->address_edit_hwnd, &address_edit_rc); + /* The custom controls */ customctrls_rc.left = dialog_rc.left + hspacing; customctrls_rc.right = dialog_rc.right - hspacing; @@ -1895,7 +1947,11 @@ static void init_toolbar(FileDialogImpl *This, HWND hwnd) { HWND htoolbar; TBADDBITMAP tbab; - TBBUTTON button[2]; + TBBUTTON button[4]; + const int button_size = 24; + RECT rc_edit = {0,0,264,14}; + int border_w = GetSystemMetrics(SM_CXBORDER); + MapDialogRect(hwnd, &rc_edit);

htoolbar = CreateWindowExW(0, TOOLBARCLASSNAMEW, NULL, TBSTYLE_FLAT | WS_CHILD | WS_VISIBLE, 0, 0, 0, 0, @@ -1919,9 +1975,32 @@ static void init_toolbar(FileDialogImpl *This, HWND hwnd) button[1].dwData = 0; button[1].iString = 0;

- SendMessageW(htoolbar, TB_ADDBUTTONSW, 2, (LPARAM)button); - SendMessageW(htoolbar, TB_SETBUTTONSIZE, 0, MAKELPARAM(24,24)); + button[2].iBitmap = HIST_UP; + button[2].idCommand = IDC_NAVUP; + button[2].fsState = TBSTATE_ENABLED; + button[2].fsStyle = BTNS_BUTTON; + button[2].dwData = 0; + button[2].iString = 0; + + button[3].iBitmap = rc_edit.right; + button[3].idCommand = 0; + button[3].fsState = TBSTATE_ENABLED; + button[3].fsStyle = BTNS_SEP; + button[3].dwData = 0; + button[3].iString = 0; + + SendMessageW(htoolbar, TB_ADDBUTTONSW, 3, (LPARAM)button); + SendMessageW(htoolbar, TB_SETBUTTONSIZE, 0, MAKELPARAM(button_size,button_size)); SendMessageW(htoolbar, TB_AUTOSIZE, 0, 0); + + This->address_edit_hwnd = CreateWindowExW(WS_EX_CLIENTEDGE, L"Edit", L"", + WS_CHILD | WS_BORDER | WS_VISIBLE | ES_LEFT | ES_AUTOHSCROLL, + button_size*3+button_size, border_w+2, rc_edit.right, rc_edit.bottom, + htoolbar, (HMENU) IDC_NAV_TOOLBAR, COMDLG32_hInstance, This ); + SetWindowSubclass(This->address_edit_hwnd, address_edit_wndproc, 1, (DWORD_PTR)This->address_edit_hwnd); + SetWindowSubclass(htoolbar, address_edit_wndproc, 1, (DWORD_PTR)0); + SetWindowSubclass(hwnd, address_edit_wndproc, 1, (DWORD_PTR)0); + SetWindowLongPtrW(This->address_edit_hwnd, GWLP_ID, 0xFFFF); }

static void update_control_text(FileDialogImpl *This) @@ -2160,6 +2239,13 @@ static LRESULT on_browse_forward(FileDialogImpl *This) return FALSE; }

+static LRESULT on_browse_up(FileDialogImpl *This) +{ + TRACE("%p\n", This); + IExplorerBrowser_BrowseToIDList(This->peb, NULL, SBSP_PARENT); + return FALSE; +} + static LRESULT on_command_filetype(FileDialogImpl *This, WPARAM wparam, LPARAM lparam) { if(HIWORD(wparam) == CBN_SELCHANGE) @@ -2218,6 +2304,7 @@ static LRESULT on_wm_command(FileDialogImpl *This, WPARAM wparam, LPARAM lparam) case psh1: return on_command_opendropdown(This, wparam, lparam); case IDC_NAVBACK: return on_browse_back(This); case IDC_NAVFORWARD: return on_browse_forward(This); + case IDC_NAVUP: return on_browse_up(This); case IDC_FILETYPE: return on_command_filetype(This, wparam, lparam); default: TRACE("Unknown command.\n"); } @@ -3354,6 +3441,8 @@ static HRESULT WINAPI IExplorerBrowserEvents_fnOnNavigationComplete(IExplorerBro { FileDialogImpl *This = impl_from_IExplorerBrowserEvents(iface); HRESULT hr; + PWSTR disp_name = 0; + SFGAOF shellitem_attr; TRACE("%p (%p)\n", This, pidlFolder);

if(This->psi_folder) @@ -3366,6 +3455,16 @@ static HRESULT WINAPI IExplorerBrowserEvents_fnOnNavigationComplete(IExplorerBro This->psi_folder = NULL; }

+ hr = IShellItem_GetAttributes(This->psi_folder, SFGAO_FILESYSTEM, &shellitem_attr); + if (hr == S_OK) + { + IShellItem_GetDisplayName(This->psi_folder, SIGDN_FILESYSPATH,&disp_name); + } + else + { + IShellItem_GetDisplayName(This->psi_folder, SIGDN_NORMALDISPLAY,&disp_name); + } + SendMessageW(This->address_edit_hwnd, WM_SETTEXT, 0, (LPARAM)disp_name); events_OnFolderChange(This);

return S_OK; diff --git a/include/commctrl.h b/include/commctrl.h index 725ef64764f..606511579a9 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -1468,9 +1468,10 @@ typedef struct tagTBADDBITMAP {

#define HIST_BACK 0 #define HIST_FORWARD 1 -#define HIST_FAVORITES 2 -#define HIST_ADDTOFAVORITES 3 -#define HIST_VIEWTREE 4 +#define HIST_UP 2 +#define HIST_FAVORITES 3 +#define HIST_ADDTOFAVORITES 4 +#define HIST_VIEWTREE 5

typedef struct tagTBSAVEPARAMSA { HKEY hkr;

-- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/672

Marvin

12:09 a.m.

New subject: [PATCH v8 1/2] comdlg32: Add missing controls and their functionality to IFileDialog, or the common item dialog.

Hi,

It looks like your patch introduced the new failures shown below. Please investigate and fix them before resubmitting your patch. If they are not new, fixing them anyway would help a lot. Otherwise please ask for the known failures list to be updated.

The full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=121740

Your paranoid android.

=== debian11 (build log) ===

error: corrupt patch at line 294 Task: Patch failed to apply

=== debian11 (build log) ===

error: corrupt patch at line 294 Task: Patch failed to apply

Ben Cottrell

12:05 a.m.

New subject: [PATCH v8 2/2] comdlg32: Add missing controls to the common item dialog, only affecting the implementation

From: Ben Cottrell bencot@windowslive.com

--- dlls/comctl32/idb_hist_large.bmp | Bin 13962 -> 13894 bytes dlls/comctl32/idb_hist_large.svg | 80 +++++++++++++++---------------- dlls/comctl32/idb_hist_small.bmp | Bin 6214 -> 6214 bytes dlls/comctl32/idb_hist_small.svg | 8 ++-- dlls/comdlg32/itemdlg.c | 2 +- include/commctrl.h | 7 ++- 6 files changed, 48 insertions(+), 49 deletions(-)

diff --git a/dlls/comctl32/idb_hist_large.bmp b/dlls/comctl32/idb_hist_large.bmp index d6cedaf012801804c9628f29becc7aa62836ca9b..01e614fb4cc303fe0c0d0e1b697b5164e6fc5d24 100644 GIT binary patch literal 13894 zcmeI2d0b8T|Hm))mVKWuvrCvVzTYtnU)nIXu_o#&MJT0|Qr%lqsI<wFr9sBnLWz<# zOEFn1N|7yuj5S#rsciB3z28T-UsSq{Jm!z@d>&rT>738!ea`)Sp6C63e?I378Z+#_ zBB2bU|ND`alRhOi5UGj8v=!0$oEC4yf4(UYiQfF<KWXou@=p(Z)E;O^)>TNVq(<f9 zeLlwLKD2yn`yYCL)wP$<!Iq@YNL@%hNPS6KB<*tbq3wT2Uz6IAnv#Uanzj|idqkI( zfulQJCFR$%4pdx3xt#`7jmLt;`yW!64gS5{M{P)-kp4w#UoPI~V|<S5a9wVrY^itq zQmM50_z6b-hQ>xYCT6BN{)-mWK?^gMtXMYreK#+Y$(s2t@OM|(^$QHR<g>s(cYc81 zRd0WvJTKq*f3Q4#=igB5^KqX5zbn3h{+GGFZ(u<B3_H7#m9MjKM3*m#o6=1dJyBoU zFr^0qN2xuke4TgpnGYU=CM1ebqE@8VBpy!|@AJ4eCp9MV^P)`Qddvd1XGT6J@$=J( z#Lrn*@r3SH5@+rEqLz*LZ$8I$xGuNhw(q-E_4XTyI<w7&rvJ93_FYMAo3E*~{gG1X zr$)xo!bwxj;ovkISMshQ_u3or{*~)_xJtTq{W|jg_ygBjH*N^Jc==M9|DwQrQhHEO zkUm|vO7Zvi@34Gj@WcBL9^kL)=B=A$#L}tC#+jdmqdOHxI1Wa7#t~#>ro5%Y2V$_) z&keWpF5}LPtF`Lt*>r?j^s0#;_ASf<Gt-vTfyCqY6{#ahtz5kSC5injk1aFBEOFea zsW6XRhkY%#V;ek{-;&rr_mWKRvEoagG0#+Gy01m;nsD~T=eQ2n<u=@wZLqC(OU?FG zRC=n&bkNav>~rzdUaP2KFA`r<Y5U{HkN?cbWCA8nn*uAF8My!G5ejIm^Y7os-GTx^ z`LyM~E9)NBxs!hvLBY#$`plU!dq>B&##iwp{FnKEwqn&vyn6Kt_sPa1vd=0kEX1FG z{)wWZA`}-Fqokw+rKP2K`t&KDKYuRh*|TS06+J0}|H8oA3Y)xD@Uz`{D6-CG;#AJr zx0I501Pd4Vpx|CU9?<n_)7{%QYT}2V-DV_afw^I3)JYno?xgQX+~+KgyWIERkoY<N zg2WuPBC*e64l5V_yD5ona|+Hpa9g(1Thv&hC${dLps~c{nMdYkG?wd?iCQ-vD4cs! zhwE}1Zp${<R^@BF-@ZhmOZ>d{$l8K$mzh2j+w?ggYAzW-HhPoz9%{2Ms?3jt^>jR- zalQZWA()TK3@KPrY?-M$`T1D3GFb3UGwto)8eh7$P!#->m6ai%>N7)k@7~4n<HrS^ zIB^1%m6etC7E8=iZTw`OIr$bl%#wnid-->2Wrx|SfgkRF9(Rrr%uYv<s;Xu~qi<(5 z9N*2g;aE+NhWZ+F8;<$LQxNYPXu3Bv>?Riv?INZ6ok`3a=Pw-BI1jE|6l}8pV1LHU zbtCl@ecfuPWLDpE{npNSE<Y8D`8koqPyaGet42fVJWu<2me=Jr+?H)H=WJ6^YPQcd zB$6MQAD@d+ke?5O_C~uGDzmk6MQUw_lL2MySK;T;<HvZ&3{juH>xUHV@b<6rQ$TH5 zw{PDTcw(j$x_9rMz?Z@wF*|=VKMLQ^IV<}Tb@4zogVu9~J|D8)p=7{X`x2cswxwFD zXO#9@Ijy8e@Dx_DMvzH~*jf7))z>7ckvPUE?H|P2UyKsFXx$qUE_>;8dLz{K+rv9I z3QatId?|6!Mit4lpNc+h&VH^&|09uU6<29Twp3mFm-$?YhFYo<oUepKKf(K@id?rq zto!vCvR5bnV`*)LLgI(nQ26@-_C@8f><*3Z%{zC5Jm^FCQTU(Ae&^kN_CrseJP~5r z-{^n%`Bmg5{EVxM2df!$TVz_Y;bIcJGs56;ViR0ae}nP<KukzlfXTlvfo*ay#4g%* zs6NLyHIgE}R2Rb(j0*XW*ih53v8!H@alG$qs}rlye)n{=O0tCawP^U?jEDd21YzrU zEe5{1(eM%c62-M2K4-?+*1JWp&+K?+Y!T#@6$bA!5tx4=626zC;Y+sK9k<7q*>cRx z+lom?mc4HBbN>>tw7V%8dvAWFh+pQ@rowWD75=1r<XRr(%%s~CXE>HIL(I+<%B#;^ zxPbFHIe*#zFca)=Zr;2pi2V@r#Nz!Ml$*1E;yA}S5$kW{rvddJ=gpkIa18oN{FC}9 z=4a)(cnpd6fX*%#bPl(K>RNq4Uu>EDh98;sZK}_)h5Z(fZ3~hrsk*|PHdV3d<Iuum zQ0dfti(!0d5n4q~LW?+afuA-<Y|!q+EPQg(Q5fqshi0Hvq6Iw9ZwK-AQY7upoYzz& z3V!%L8*LnirrRc<`L0Q5xn~+$|89l0$7Tw4+o#Qf*}2uQNe@ArxkE}NcK>xFqwLrC z9;=k<_&Iel1A$Y=Va2SeIDh`Uz|x7-qr$PEnUj%q`gEQ7;W(7IKM9vEUBbC@=WyuI zA*7|H2{}+|YAOyMJcz`^L?k683HeZFW~ShOIF|j5{BVCM7~=fp6N$k$gS#y@E&k<P zTm?U$Z=NKu!{hSR4hzgYyb=b4#zL{JM359#}1tqHITUK1hn@aSz=^B}VS?LX(Y# zG{(kg9&Lt}yQiYn{^?+5+8nk)n}fs-`J|Q!Q!wvr#2bFR1~TV0mdgC7t{aOcTa3_b z$3!%bnJh5G_F5mXB9Xt_XMy1<{&31zk57Hal!#?IYeZ6Ml{GlN*t`62{7OA~7<0zx zVBwTeSUPhO(o>FL!IZIBVlf8Z(xEt!kx^%UUcP*Z+}vEG9yyEvvbD(C1eqD>$RS^r zawr)-rlYXX$^_Zj*%khW=Vt7$l;J1q!WmRnJ>}1p$AjZQQ;GS1v^1AYd=h*%4uj*} zp|#5y|Jr1N#+$~YN%#bGjJ1YcY6v8*x;LplbHn3WZQs*zp-AL9iJcZ1l{lxYMc-&A zv{-M5)*Gd08)k|&JIF^wzwtxN5&H|?vR`Vxa}s>cl=~kg`0>k(K%=!|->|;kKwzk8 zgfW`!G)2qU$@nCG8rsKOqJ8W%w2d-{)*e^5q^*PcVrhv)roB&bzm>NY{8+q+Uyo=` zeds_EJPq`)&DTy~D8O7FL6-X1;XeyrMniCn{Dm-or@3)m=3g9}k`wo0&geI62H6su z$KGa>^B$hxKPHY9Qih+C=T1YR%=4$~YyKq?c@30ME^8om){?R$PFiy2XZe{J42*RX z#=FB-Gl89EJI$cJ&mQ*aYax;A-WNOdo1kc?;-tmvHq{oftM-OYfkwshlyw*o>xvGc zrr<cJ7B&svM9o0=7<+V!w@24_JE+IoqH~-rG-<zAyfc0|ACD$({a@03*6M#&QOx~5 z(jHyHr{n9bQ}7k3({@W}MBAc!tUWYh?a+DG4167FiBH4L(Lc@=d{62N4NJsw-SySo z{JZ?{+$(W+0zAj{N6b<g!o8;>!p8>NyetvD*cqONgOPmrurNQnOF2<p`1ym@9{0w@ z)X3)CaX%s=B0`919KR~oh-z8?$;>{9^z5t(Wt_<(ehv%kKOZ=M7m1v-+S0T4=XXJq zo{tEX75x<IQe?by{)=U2c0n&jj@~;R@x}J3XclRT78Fmq9Gnf=xh?3q&Z?y68mq_O zhgdvr?J=ZGMXnuDUH>bNQG9Xf;61X`<;brv`+YGwhtarhv&O%-+v58ud-RE!jec=5 z=p?v8H{K0;@vhK|m1E8M-AePb_QGD_p839YV`R{#+>QMm{|4rYuf^9?53_(#QUKhJ zt;1(Nqf6=c`zh}8-EDRJ#70L6V;r;81z~e1Bb+tQyqupwl*jDHL-JGk1$F1=VA4La zT@#yRn{psUPOVsHtj+(NB!1FPWmM?+>67)x4|SMC-cN_tf1j>ByBi@iUcQ;zAfq`K z_kYjGSx}F*raWR2<+GOPnBoNU3%_FWnGkqh*a5TM3tp+X>Ewyre&8JZy+th78QE&i z;G$W{t6n=CTSK<(@k5jY`q3Ekc(cFbn8|tj(1baH*5xEB&CkY*`zzY94YtKL**0H; zuf-hM9bJvt2UiREGx?o~@4M-D`QdqcR75!Djnzdg@w3&#R1kB-{%79!K}guMN0{gH zyk1%V!})W<p52Jr7FHvh9%Bb!)v8rUPEN+rqem;&s+Hj<CG!LnO3g~A7+X*Nr@ZsT z^8Ut}i%m*bpG|<2o=tv+`_OayU6dU(<LuBfZi+CEX_sb?PtqMQ@-)rk(?ZbHeZV7; zn=ZdkQmUvp>-K2k+W)>)!jdwtjI9_H_p>m@zg^geO_vTJ^wRIxayePh*79vrw*gAU zFK(x3!~2`b7Ta8(lO$Z@$2d3eHEs4SFC&`|Ra~_D)OOR=@w0=*c+MDY>{{ZCjcz8` z=xU5j?xxrt=l~Ccf!Iy_Jf^&s-)AYy59iN3@7l6qU5#vV{Mx>KJ2=iM=J5~c8p`l< zG(8OprJOuo@BDB-N@Tiz+9B3YmuK(7;5c`|_k6p<7F{VHX_H`q)(5Qxc64(Bg&5Y> zb6AOrvktEn*R44B|B7;=T*K{iUo6XxfnlOQ*mpGZ`0+W<qpC=zUCMdd`z}Ilo>XZk ztRL#V2qlKbC;DM2{Vua8-xn&bx>uBCUct|l^8A_oPej-jxD4-$umA_FbR16_ht*C- z2=$%`m(h9xKTl{~hS!Gb!Vk~CLf5UWkxkdpx>&k&so;N(962Ja2^El!E2Mdt@1mOD zf1S+Ez~SR56*`)p`ce3y@o7K|MUD)WJ@ca&#{Rx*gcUmNvPL`Rht^SgWX^@hl}LOU zU{ES{)iHbDn7;Si%z@1%a_s}dHaI<9b8a`nE+0g*pKJFs@3r~vNt%<Z%5`3c<sJlI zV|b{`Gs<;Rl!>(pQ&spOCbn(a4Ev$Iv2ngFf^0?$T4rZ}-{#JM!w4Ph-n$pf&x1Ph zbD7qDHvAe=Bb!bmbr2pNjyzhs%%k`HH)u^U``&$|6&AyN-TK?z&!b}ft@8U*<|jGz zNQDj^KlZWs5s9pSP?5N5pP0DQ=Y=e7y|8xpMWhAV#!iKLvIE>NZ-+*(S&6D#+gH)Y ze|byeOAIaV6Kqks=|a*+<0mxd0JP~Hj98|<nSWnh?ze&;%V}_yyWk=FpDm$q8QBlv z0kg2mfqW17pEb@>Z1$N6+35b*M>+0OdM{qr_;u;xMXU>1RU?~rL;F_vpZ!OVA@LsN zVh>9Z_2?O#j%5}Y-hJL(1n_#^Tkqdb(b`YO>GTRQPsdUY3iB_%$9s2gzhCqn!JV6V zHNAhY+MPTnlk42F+_U(#`R_q!A8v*Y(bRw0q3E;0_L-`iZX7id?z3v+x*t)I={jgE zm{3CR-(S}@Pp^}8!T;z&bCJnYiCjxor?%ylnIA)ADWnsPVNNmZ7aCuOnbw#)mg3ZE zFGToS3)<mti`W$&kdM;AY!?@-{_R(UP%PROxkIV<@0|beTH(4?zrbZg^=vwi)J0fW z7%pGEhW*!XA)@dp@}8C9#`7|4xcQ*aB)`mbGQjVc|DT^(dWfDgwu+*D)<>B0aKw5V zDyKOH2(!@weUtV`nSN|ETUWiA+rUEm<X<pquNQ2NhhXpy*D_i+%&yllF25PEv(8A$ zU-E0qbCkLFiaK7RhHR7KtbWC@I_~J3n0!8ozWoU%ZldCL3GcT;RxE|jgdsS+KMGlU zw;^jEDKP?RF`F=l^5@N4x8l;3T;YA#AGdA^?>B1ue&hA)*TT0xkzt!LkLK^yu{oFK zcKc~<pyb6194&r{$f7b7mAyhS=|Ex0V`;%F`yp2$%!4_8EgGX<yw}SB^`$s>S_4;- zAMR%IL3(ZH4lQ-2HJfqq^IucWn=f+g%inqY&lC#_ix$&utd~ro_+@2d1wTh?cp43b zJH@X6vk?d|Ef?+kO&ku_u>&D<bHzMwFL=)P7Bp|Zcae{upL2Dc<`x*(YQd7lo7Rx8 zV&CRC(+cyYgR5oJmDZ)5WaQh{uR}o8E_j^3j`)YgNPS%La#8M`6XWi^=rIrw<{AD! zb^L6RewUKe;OVF@B`-7s*?dsl@2KgR*hObbd(YudRbBO-s5<HJ_hkQTrGcfTWn20V zT7%^{NngWtc<-8}ucKk>X#19CI5>0-4i4t`i&cu3msdmY#oq0`J><RIjYn*dQT(fp zP5+6*U;RA1Uyg;Xg@)IX08QuU=pN>|1x60}&*!+`e_=K2T49e7xv2R53Y1?g*6(^c z$UvhwXuM{<Xz|!CrAx+k4XN@YYB`|dqUA{QmO-^t`{(or^ne$AS1B8&-QIoJ51KVe zHtfIry~CSAdGgdeG?qR>D``PNb16{e9pnzFNW5UUn%aU<U#r)LI3_AC|FO6K2a;R9 AW&i*H

literal 13962 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

diff --git a/dlls/comctl32/idb_hist_large.svg b/dlls/comctl32/idb_hist_large.svg index 7dd8283f7a2..492b9263dae 100644 --- a/dlls/comctl32/idb_hist_large.svg +++ b/dlls/comctl32/idb_hist_large.svg @@ -1,68 +1,68 @@ <?xml version="1.0" encoding="UTF-8"?>  <svg id="bitmap:144-32" width="144" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> - <defs> + <defs id="defs40"> <radialGradient id="radialGradient1361" cx="24.837" cy="36.421" r="15.645" gradientTransform="matrix(1 0 0 .53672 0 16.873)" gradientUnits="userSpaceOnUse"> - <stop offset="0"/> - <stop stop-opacity="0" offset="1"/> + <stop id="stop2" offset="0"/> + <stop id="stop4" stop-opacity="0" offset="1"/> </radialGradient> <radialGradient id="radialGradient3241" cx="15.987" cy="1.535" r="17.171" gradientTransform="matrix(-.99935 0 0 .78343 33.496 1.6235)" gradientUnits="userSpaceOnUse"> - <stop stop-color="#FFF" offset="0"/> - <stop stop-color="#FFF" stop-opacity="0" offset="1"/> + <stop id="stop7" stop-color="#FFF" offset="0"/> + <stop id="stop9" stop-color="#FFF" stop-opacity="0" offset="1"/> </radialGradient> <radialGradient id="radialGradient3244" cx="17.481" cy="16.118" r="16.956" gradientTransform="matrix(-.41156 .0071657 -.0052128 -.29939 21.696 19.724)" gradientUnits="userSpaceOnUse"> - <stop stop-color="#73d216" offset="0"/> - <stop stop-color="#4e9a06" offset="1"/> + <stop id="stop12" stop-color="#73d216" offset="0"/> + <stop id="stop14" stop-color="#4e9a06" offset="1"/> </radialGradient> <radialGradient id="radialGradient3263" cx="15.987" cy="1.535" r="17.171" gradientTransform="matrix(.99732 0 0 .78343 14.565 1.6235)" gradientUnits="userSpaceOnUse"> - <stop stop-color="#FFF" offset="0"/> - <stop stop-color="#FFF" stop-opacity="0" offset="1"/> + <stop id="stop17" stop-color="#FFF" offset="0"/> + <stop id="stop19" stop-color="#FFF" stop-opacity="0" offset="1"/> </radialGradient> <radialGradient id="radialGradient3266" cx="27.547" cy="15.843" r="16.956" gradientTransform="matrix(.41072 .0074091 .0052128 -.28896 26.348 19.752)" gradientUnits="userSpaceOnUse"> - <stop stop-color="#73d216" offset="0"/> - <stop stop-color="#4e9a06" offset="1"/> + <stop id="stop22" stop-color="#73d216" offset="0"/> + <stop id="stop24" stop-color="#4e9a06" offset="1"/> </radialGradient> <linearGradient id="linearGradient3278" x1="4" x2="4" y1="15" y2="4" gradientTransform="translate(96,-1)" gradientUnits="userSpaceOnUse"> - <stop stop-color="#d3d7cf" offset="0"/> - <stop stop-color="#babdb6" offset="1"/> + <stop id="stop27" stop-color="#d3d7cf" offset="0"/> + <stop id="stop29" stop-color="#babdb6" offset="1"/> </linearGradient> <linearGradient id="linearGradient3281" x1="4" x2="4" y1="2" y2="5" gradientTransform="translate(96)" gradientUnits="userSpaceOnUse"> - <stop stop-color="#729fcf" offset="0"/> - <stop stop-color="#3465a4" offset="1"/> + <stop id="stop32" stop-color="#729fcf" offset="0"/> + <stop id="stop34" stop-color="#3465a4" offset="1"/> </linearGradient> <radialGradient id="radialGradient59" cx="27.547" cy="15.843" r="16.956" gradientTransform="matrix(.41072 .0074091 .0052128 -.28896 49.916 19.752)" gradientUnits="userSpaceOnUse" xlink:href="#radialGradient3266"/> <radialGradient id="radialGradient61" cx="15.987" cy="1.535" r="17.171" gradientTransform="matrix(.99732 0 0 .78343 38.133 1.6235)" gradientUnits="userSpaceOnUse" xlink:href="#radialGradient3263"/> <radialGradient id="radialGradient376" cx="24.837" cy="36.421" r="15.645" gradientTransform="matrix(.7031 0 0 .35156 42.639 6.5347)" gradientUnits="userSpaceOnUse" xlink:href="#radialGradient1361"/> </defs> - <g fill-rule="evenodd"> - <path transform="matrix(.7031 0 0 .655 18.537 -6.356)" d="m40.482 36.421a15.645 8.3969 0 1 1-31.289 0 15.645 8.3969 0 1 1 31.289 0z" color="#000000" fill="url(#radialGradient1361)" opacity=".32157"/> - <path d="m28.501 16.5v-9h5.9878v-4l10.011 8.5554-10.011 8.445v-4h-5.9878z" color="#000000" fill="url(#radialGradient3266)" stroke="#3a7304" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10"/> - <path d="m34.988 4.5v3.5h-5.988l0.03167 4.5c5.9878-3 8.9817 2 14.471-0.5l-8.515-7.5z" color="#000000" fill="url(#radialGradient3263)" opacity=".50802"/> + <g id="g48" fill-rule="evenodd"> + <path id="path42" transform="matrix(.7031 0 0 .655 18.537 -6.356)" d="m40.482 36.421a15.645 8.3969 0 1 1-31.289 0 15.645 8.3969 0 1 1 31.289 0z" color="#000000" fill="url(#radialGradient1361)" opacity=".32157"/> + <path id="path44" d="m28.501 16.5v-9h5.9878v-4l10.011 8.5554-10.011 8.445v-4h-5.9878z" color="#000000" fill="url(#radialGradient3266)" stroke="#3a7304" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10"/> + <path id="path46" d="m34.988 4.5v3.5h-5.988l0.03167 4.5c5.9878-3 8.9817 2 14.471-0.5l-8.515-7.5z" color="#000000" fill="url(#radialGradient3263)" opacity=".50802"/> </g> - <path d="m29.499 15.5v-7h5.9878v-3l7.4848 6.5-7.4848 6.5v-3z" color="#000000" fill="none" opacity=".48128" stroke="#fff" stroke-miterlimit="10"/> - <g fill-rule="evenodd"> - <path transform="matrix(.7031 0 0 .655 -5.4629 -6.356)" d="m40.482 36.421a15.645 8.3969 0 1 1-31.289 0 15.645 8.3969 0 1 1 31.289 0z" color="#000000" fill="url(#radialGradient1361)" opacity=".32157"/> - <path d="m19.532 16.5v-9h-6v-4l-10.032 8.5554 10.032 8.4446v-4z" color="#000000" fill="url(#radialGradient3244)" stroke="#3a7304" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10"/> - <path d="m13.032 4.5v3.5h6l-0.03173 4.5c-6-3-9 2-14.5-0.5l8.5317-7.5z" color="#000000" fill="url(#radialGradient3241)" opacity=".50802"/> + <path id="path50" d="m29.499 15.5v-7h5.9878v-3l7.4848 6.5-7.4848 6.5v-3z" color="#000000" fill="none" opacity=".48128" stroke="#fff" stroke-miterlimit="10"/> + <g id="g58" fill-rule="evenodd"> + <path id="path52" transform="matrix(.7031 0 0 .655 -5.4629 -6.356)" d="m40.482 36.421a15.645 8.3969 0 1 1-31.289 0 15.645 8.3969 0 1 1 31.289 0z" color="#000000" fill="url(#radialGradient1361)" opacity=".32157"/> + <path id="path54" d="m19.532 16.5v-9h-6v-4l-10.032 8.5554 10.032 8.4446v-4z" color="#000000" fill="url(#radialGradient3244)" stroke="#3a7304" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10"/> + <path id="path56" d="m13.032 4.5v3.5h6l-0.03173 4.5c-6-3-9 2-14.5-0.5l8.5317-7.5z" color="#000000" fill="url(#radialGradient3241)" opacity=".50802"/> </g> - <path d="m18.532 15.5v-7h-6v-3l-7.5 6.5 7.5 6.5v-3z" color="#000000" fill="none" opacity=".48128" stroke="#fff" stroke-miterlimit="10"/> - <image x="73.218" y=".9398" width="22" height="22" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABYAAAAWCAYAAADEtGw7AAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A /wD/oL2nkwAAAAlwSFlzAAAN1wAADdcBQiibeAAAAAd0SU1FB9kHCwovJyZFtIYAAAKZSURBVDjL vZTLT1QxGMVPe3vbKXONgRASAwkwK5c+4k5NJHHQnUYTFq50JRGDEHVjTPARlsYQdDAYNxoT/wAB WfkfqFGDiuIjwMgwYww6L2amn4t7uc6VuTgstKu2aX89PedrgX/U2Fqnf6DvdDL5NUFEqNjtmE/L 0E22IOzs/LFuPhbr7B0cuDAGAGLtgOXldOLQ4W60tbVi9449eDwxjcSj17h08QSIvEWejKvD97Fv 7350dR2AZVkAAGMMhq4MJQAEwFQqlTA5MQXOOZ7teo6ZN7OolFvw4t0CFpZXfFWtLVsBAE+mJ/Hx 8wcAQEd7B+IHuwPqRfXAcRwoFcHZM/2YmprGy9tPkfn2HUtLGV9uRBiUV/M4euQY4vE4iAg3R26s syUAZowjk0mDyIAxoLSax2oxj2Ih6wdSKmiUSwVUKhWUyyUIYdfMQYSmygDOJWzbhi2V6xcBlrDB reptVA/49yLOOYTUECoKpYtegAQ7oiFs7QdGtbnhil24BcY5LGH7ACEkuCVAZDywqb03DKqUdPMK kSSl9OC0OcWRSATMq4QtDQpRrbDysxAAG2Pq9bhaccQLjLA49wWpZBot25rR3Ljdv5FrBdVhBVUr VuCc4e2r90gl07h1vQepZBqzM3Pus7YljKHQ8PhGVhhDSCXTGBvuQVOjg9FrxzH/aRGcM0hph9qw oRVSKjwYOQmtNbTWAAiO4+Dh6Cnkcvm//m4i6AT59RmNNniqWCB9x3GgtUahUKwf 7B9ABkqpQK26 YBduWRai0YbNg40xXjBu6m5Zba6FgKlKLdUF+vPwoMeG0NTY5D0MDsviYIx5Pybz+szru3NrwLv3 xhGLdfbWAo9mc9m+bC6LO+Njm7q2lOry4Lnz1/E/2i8h2hqY4UCQ2AAAAABJRU5ErkJggg== "/> - <image x="97.218" y=".9398" width="22" height="22" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABYAAAAWCAYAAADEtGw7AAAABmJLR0QA/wD/AP+gvaeTAAAACXBI WXMAAA3XAAAN1wFCKJt4AAAAB3RJTUUH1QoRFQYvy1T0IwAAAzhJREFUOMutk91rW2Ucxz/Pc56T k7Osprqa6Iq9KLS1JqUJrXUT9LZeKYhziHjltZfiEMuk1KrzUiYI3vkXFBUvZJdSNzPQWhbm0rXd 8rK0aR1NmreTnMeLJIeQprOiXzg8nHOe5/N8f2+CHs29culj4DLHSAiRv/7jp08BNPKvmcBzoObA 3QV3FdhV4RVXdA58duWTRWAB4FYyxe18mIVL76B1B9haF5e/JTqcY3xinDPBCi/NPmT4mfNIa4S9 7LX1s0/88QY0UqrLzMIH738IwHff/8DyVz/z+58ZMrsH3obhUBCANy+8xfz8PLp2A12/gwi8CsLP 0FkjSvXW69D4WvWGurm5SaGwh1Mvs7f/kHx+z7PrVy6NeoVCoUA2m8UUFR6zHcxmGWFI6pU0PikO 0DRVnxxiSInjlKnXKtSqh63vgFO1aThVtra2WFtbQ4oGc/EnQV/DNG0y91eZGHFuAsW+YCkFUlqY ponpswDQGgxlIg3F6OgosVgMgKrbxKnlGTrVILFuMTHS/E2FV9z+jg2J8tkoK4Bl19oF1Jh+G2Xa bGxsMDg4CEA8HkfLYfCd4UHhJ1R4pQrQF9xybSCkxFCm1xlK+ZCGYmxsjNnZ2Z5zCq29JkP2gn+9 eQPLslr16hB7tL29TSKRIJFIYJomUh7BHHX8wvPnyGQyCFq3D5yyCNgWB6WqtycWizEzM4Nod0tn fSRYCEGpVAIBWmuyd++xkysQenqIocefBSCTyWDbNgBTU1N9Hct+YL/fjxSC2+sp dnIFri5dZCdX 4E7yLgCRSIRoNMr09DRSyr6OZb8c+v1+XK3ZyRX4cvECg8EBri5dJL2VRUpBIBBAKdVV6BPk+Jfr q4yPTfDNlbdJp9OUD4tUyiVc1+Xyey9Tq9VIpVLs7+977dZPR8Dnz71IMBikWCwSCoVaYUnphdxs NnEch0AgAIBhGLiue/LiSSlJJpP8k+Lx+MlS0a3JyUlM0zxmgGR7Sk/ouLsvH+X4X/dxtyKRiOeu 47B31Vqj+0zoEXA4HOb/kAd2XXfp8y+WP/ovsPv30u966TzmstPAQPs5DQTaw2QAGnCACvAXcAAc tt+b7f/8DTlPJBp8S28uAAAAAElFTkSuQmCC "/> - <g transform="translate(24.218 -.060204)"> - <path d="m98.5 1.5h19c0.554 0 1 0.446 1 1v20h-21v-20c0-0.554 0.446-1 1-1z" fill="url(#linearGradient3281)" stroke="#204a87" stroke-linecap="round" stroke-linejoin="round"/> - <g> - <rect x="99.5" y="5.5" width="5" height="15" fill="url(#linearGradient3278)" stroke="#d3d7cf" stroke-linecap="round"/> - <path d="m105.5 21" fill="#204a87" fill-rule="evenodd" stroke="#888a85" stroke-width="1px"/> - <rect x="106.5" y="5.5" width="10" height="15" fill="#eeeeec" stroke="#eeeeec" stroke-linecap="round"/> - <path d="m105.5 21v-16" fill="none" stroke="#888a85" stroke-width="1px"/> + <path id="path60" d="m18.532 15.5v-7h-6v-3l-7.5 6.5 7.5 6.5v-3z" color="#000000" fill="none" opacity=".48128" stroke="#fff" stroke-miterlimit="10"/> + <image id="image62" x="48.892" y=".8428" width="22" height="22" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABYAAAAWCAYAAADEtGw7AAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A /wD/oL2nkwAAAAlwSFlzAAAN1wAADdcBQiibeAAAAAd0SU1FB9kHCwovJyZFtIYAAAKZSURBVDjL vZTLT1QxGMVPe3vbKXONgRASAwkwK5c+4k5NJHHQnUYTFq50JRGDEHVjTPARlsYQdDAYNxoT/wAB WfkfqFGDiuIjwMgwYww6L2amn4t7uc6VuTgstKu2aX89PedrgX/U2Fqnf6DvdDL5NUFEqNjtmE/L 0E22IOzs/LFuPhbr7B0cuDAGAGLtgOXldOLQ4W60tbVi9449eDwxjcSj17h08QSIvEWejKvD97Fv 7350dR2AZVkAAGMMhq4MJQAEwFQqlTA5MQXOOZ7teo6ZN7OolFvw4t0CFpZXfFWtLVsBAE+mJ/Hx 8wcAQEd7B+IHuwPqRfXAcRwoFcHZM/2YmprGy9tPkfn2HUtLGV9uRBiUV/M4euQY4vE4iAg3R26s syUAZowjk0mDyIAxoLSax2oxj2Ih6wdSKmiUSwVUKhWUyyUIYdfMQYSmygDOJWzbhi2V6xcBlrDB reptVA/49yLOOYTUECoKpYtegAQ7oiFs7QdGtbnhil24BcY5LGH7ACEkuCVAZDywqb03DKqUdPMK kSSl9OC0OcWRSATMq4QtDQpRrbDysxAAG2Pq9bhaccQLjLA49wWpZBot25rR3Ljdv5FrBdVhBVUr VuCc4e2r90gl07h1vQepZBqzM3Pus7YljKHQ8PhGVhhDSCXTGBvuQVOjg9FrxzH/aRGcM0hph9qw oRVSKjwYOQmtNbTWAAiO4+Dh6Cnkcvm//m4i6AT59RmNNniqWCB 9x3GgtUahUKwf7B9ABkqpQK26 YBduWRai0YbNg40xXjBu6m5Zba6FgKlKLdUF+vPwoMeG0NTY5D0MDsviYIx5Pybz+szru3NrwLv3 xhGLdfbWAo9mc9m+bC6LO+Njm7q2lOry4Lnz1/E/2i8h2hqY4UCQ2AAAAABJRU5ErkJggg== "/> + <image id="image64" x="72.892" y=".8428" width="22" height="22" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABYAAAAWCAYAAADEtGw7AAAABmJLR0QA/wD/AP+gvaeTAAAACXBI WXMAAA3XAAAN1wFCKJt4AAAAB3RJTUUH1QoRFQYvy1T0IwAAAzhJREFUOMutk91rW2Ucxz/Pc56T k7Osprqa6Iq9KLS1JqUJrXUT9LZeKYhziHjltZfiEMuk1KrzUiYI3vkXFBUvZJdSNzPQWhbm0rXd 8rK0aR1NmreTnMeLJIeQprOiXzg8nHOe5/N8f2+CHs29culj4DLHSAiRv/7jp08BNPKvmcBzoObA 3QV3FdhV4RVXdA58duWTRWAB4FYyxe18mIVL76B1B9haF5e/JTqcY3xinDPBCi/NPmT4mfNIa4S9 7LX1s0/88QY0UqrLzMIH738IwHff/8DyVz/z+58ZMrsH3obhUBCANy+8xfz8PLp2A12/gwi8CsLP 0FkjSvXW69D4WvWGurm5SaGwh1Mvs7f/kHx+z7PrVy6NeoVCoUA2m8UUFR6zHcxmGWFI6pU0PikO 0DRVnxxiSInjlKnXKtSqh63vgFO1aThVtra2WFtbQ4oGc/EnQV/DNG0y91eZGHFuAsW+YCkFUlqY ponpswDQGgxlIg3F6OgosVgMgKrbxKnlGTrVILFuMTHS/E2FV9z+jg2J8tkoK4Bl19oF1Jh+G2Xa bGxsMDg4CEA8HkfLYfCd4UHhJ1R4pQrQF9xybSCkxFCm1xlK+ZCGYmxsjNnZ2Z5zCq29JkP2gn+9 eQPLslr16hB7tL29TSKRIJFIYJomUh7BHHX8wvPnyGQyCFq3D5yyCNgWB6WqtycWizEzM4Nod0tn fSRYCEGpVAIBWmuyd++xkysQenqIocefBSCTyWDbNgBTU1N9Hct +YL/fjxSC2+spdnIFri5dZCdX 4E7yLgCRSIRoNMr09DRSyr6OZb8c+v1+XK3ZyRX4cvECg8EBri5dJL2VRUpBIBBAKdVV6BPk+Jfr q4yPTfDNlbdJp9OUD4tUyiVc1+Xyey9Tq9VIpVLs7+977dZPR8Dnz71IMBikWCwSCoVaYUnphdxs NnEch0AgAIBhGLiue/LiSSlJJpP8k+Lx+MlS0a3JyUlM0zxmgGR7Sk/ouLsvH+X4X/dxtyKRiOeu 47B31Vqj+0zoEXA4HOb/kAd2XXfp8y+WP/ovsPv30u966TzmstPAQPs5DQTaw2QAGnCACvAXcAAc tt+b7f/8DTlPJBp8S28uAAAAAElFTkSuQmCC "/> + <g id="g78" transform="translate(-.10787 -.15721)"> + <path id="path66" d="m98.5 1.5h19c0.554 0 1 0.446 1 1v20h-21v-20c0-0.554 0.446-1 1-1z" fill="url(#linearGradient3281)" stroke="#204a87" stroke-linecap="round" stroke-linejoin="round"/> + <g id="g76"> + <rect id="rect68" x="99.5" y="5.5" width="5" height="15" fill="url(#linearGradient3278)" stroke="#d3d7cf" stroke-linecap="round"/> + <path id="path70" d="m105.5 21" fill="#204a87" fill-rule="evenodd" stroke="#888a85" stroke-width="1px"/> + <rect id="rect72" x="106.5" y="5.5" width="10" height="15" fill="#eeeeec" stroke="#eeeeec" stroke-linecap="round"/> + <path id="path74" d="m105.5 21v-16" fill="none" stroke="#888a85" stroke-width="1px"/> </g> </g> - <g transform="translate(-.0033286 -1.3077)"> - <path d="m71.102 19.339a11 5.5 0 1 1-21.999 0 11 5.5 0 1 1 21.999 0z" color="#000000" fill="url(#radialGradient376)" fill-rule="evenodd" opacity=".32157" stroke-width=".67862"/> - <g transform="rotate(-90 60.068 12)"> - <path d="m52.069 16.5v-9h5.9878v-4l10.011 8.5554-10.011 8.445v-4h-5.9878z" color="#000000" fill="url(#radialGradient59)" fill-rule="evenodd" stroke="#3a7304" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10"/> - <path d="m58.556 4.5v3.5h-5.988l0.03167 4.5c5.9878-3 8.9817 2 14.471-0.5l-8.515-7.5z" color="#000000" fill="url(#radialGradient61)" fill-rule="evenodd" opacity=".50802"/> - <path d="m53.067 15.5v-7h5.9878v-3l7.4848 6.5-7.4848 6.5v-3z" color="#000000" fill="none" opacity=".48128" stroke="#fff" stroke-miterlimit="10"/> + <g id="g90" transform="translate(71.754 -2.1883)"> + <path id="path80" d="m71.102 19.339a11 5.5 0 1 1-21.999 0 11 5.5 0 1 1 21.999 0z" color="#000000" fill="url(#radialGradient376)" fill-rule="evenodd" opacity=".32157" stroke-width=".67862"/> + <g id="g88" transform="rotate(-90,60.068,12)"> + <path id="path82" d="m52.069 16.5v-9h5.9878v-4l10.011 8.5554-10.011 8.445v-4h-5.9878z" color="#000000" fill="url(#radialGradient59)" fill-rule="evenodd" stroke="#3a7304" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10"/> + <path id="path84" d="m58.556 4.5v3.5h-5.988l0.03167 4.5c5.9878-3 8.9817 2 14.471-0.5l-8.515-7.5z" color="#000000" fill="url(#radialGradient61)" fill-rule="evenodd" opacity=".50802"/> + <path id="path86" d="m53.067 15.5v-7h5.9878v-3l7.4848 6.5-7.4848 6.5v-3z" color="#000000" fill="none" opacity=".48128" stroke="#fff" stroke-miterlimit="10"/> </g> </g> </svg> diff --git a/dlls/comctl32/idb_hist_small.bmp b/dlls/comctl32/idb_hist_small.bmp index eed1a9f62d42c7240eefbc2f61c6c713ec113a09..83e56187f5ac44d12bd24e68d6034ca6211e80c8 100644 GIT binary patch delta 236 zcmW;GF-rnr0DxiC^YlK?^YqS+peY&}4-#^4xFK$6OmJ`rNumY^hrou025I;p=;H-{ zM~#8Q4RP3UNfcN(xb#O-$9H<4*pL0E1d&PAqCw#9@|U?nW>Y%ZhKgLya|48yvdFE| zW~mL4`FGm+W7RWg>mx+rjk(@ZJ&k$cmIupbQhX*Xo^Wd1p^J#v2#CcPS(*}-0zz|) zC`Tk_KvKR(S~Je9CQHYpQ@KIdGrlU#&EeY~A**Xnb^Gtuh6v|_pW4wzw{iwZ_mi&c dZ}I(lAARSSRsE2_+gI0@JbJI{WseK*;2(S8T;Biy

delta 267 zcmXAjuS>*m9EO>j`{m|#J2wxb7>olK400^U!oZ?nFv#G7#b9&s!eKBuAJFFiAzWCH zp<hlpOk%Lu{44x!Yad>o_wznY+{AZ+rQ-0QB$Zgm)8$vW=%PqX$X6CsVREis_LP<& zR2gY}Ygav`OKSCv6aBhJ42kG3d>AFVbx3Z`$*d_ic1mN_H1-VJIUrlB$($LtZi;Yf zggeFdQpr1<uFpC4O2(ndy}ys}UitLPelL)FgHGWrXcb%@hkJ<Ny($cThOMa2Rv43S hEUUs|5>BY25l_)BP59M4`HR{tWP7yJwvINR{{g8BX6^t0

diff --git a/dlls/comctl32/idb_hist_small.svg b/dlls/comctl32/idb_hist_small.svg index 9170e106e70..d19932d8531 100644 --- a/dlls/comctl32/idb_hist_small.svg +++ b/dlls/comctl32/idb_hist_small.svg @@ -11,7 +11,7 @@ <stop id="stop9" stop-color="#204a87" offset="1"/> </linearGradient> </defs> - <g id="g26" transform="translate(16)"> + <g id="g26"> <path id="path14" d="m65.5 0.5h13c0.554 0 1 0.446 1 1v14h-15v-14c0-0.554 0.446-1 1-1z" fill="#3465a4" stroke="url(#linearGradient3023)" stroke-linecap="round" stroke-linejoin="round"/> <g id="g24"> <path id="path16" d="m70.5 15v-12" fill="#204a87" fill-rule="evenodd" stroke="#888a85" stroke-width="1px"/> @@ -22,12 +22,12 @@ </g> <image id="image28" x="16" width="16" height="16" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAABl0RVh0 U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAI2SURBVDiNlZJLSFRhHMV/3+POw0bDFFLE XkQgaBQEhdNGaNEiggRbRoFCuMlyjDZCKzeNkIsochMUvaRFYj5wES1m0CmkFDfRIiwznbGBHuN4 79z7tQhfMxPUgbP5/ofD+Z//hzGGfIa7dKyxU7cVm+VTUgTGo3F39YG+cJc1EI5YoWKaNRQ1ALjS 0hs8efTsaQSz4YjV8N8GSmqaDp/xtTdfrw36QxPhiNVWTCcaI/orhp1bHhXZm+2DganPY1SV7cMn t/F4/NbKh/mZYWM4H4s6PzcMOrXpuXgfKRRKKISQCAQAiU9DeLiU+Xewq7ye+PS4MzY5sIAxp2JR ZwZAA7hejtjHZyipUUKBEAgBQgHCY9meI700z8G6I1ZN1Z7ap2N3J8IRqyMWdfo1QM5bJZ1ZwHaz 2G4WpTSlJWWUBEL4LT9GuNhejndLo9SE6kRrc1fJ0KtHfcevWsc0wNKPOd4nX693oH2ClCPRWYnW Cr8viE8GUPgpzZWjTJCsnTHrK2wpUILUAmXJP/SBp7KgLBoqmkgvZsyDl3dWsquZjRUAWg5dWzdQ lkBpychcL9onqQ7tp277CSbfxO3E2/hX47KpRMHi7Sc9W84oLbKXznUHlFLUVzZRofcy8PxhZjH5 ZcS4eWc0xhR8jnDEMpdbu/nlJUmmUubF6OCK7dgdsRtOf762oIM1ODmbxFRidXp2atHbFLmgs78l qCivzHz7nho2Lhc2R/6nBEISX06n7sWihZHz8RtB3gm0bnbltgAAAABJRU5ErkJgg g== "/> <image id="image30" width="16" height="16" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAABl0RVh0 U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAIhSURBVDiNhZNPSBRxFMe/b2Z+szu7UmJs rRu1QggRCYKVbluH3CJW00xEIogOJXSyoi26eokQAzvEHiTw0CUKgrBuHSRXio4VHiJL91C5bJK7 7czuzO/36zCZrozug3d6f/i873sPUkrU8qM3tSvxW1rGK6ZhC4unWB0RJqPh5q6FH58Nrxxli+IW ED6dPNzfc23gnmcxAG+CeIoNGb668YvJYWPPzmZSaHPQqsgq8r7Iga7BU1cNk6/g4/dpHIn2gFRY 8RSTVdWEnySlXIdMU4lDfY0dBzvZ118fULDy0FSGWFMfiBQQAAlASgEhBe6kL7gE8RQbChrbH/Sf uOSvr2+g94uvwKUDpugQkmNm/hmICASChKt+e7TXHeHYbfaoqXH/+e7jg0autIB3396AMR90TQdX BCxRgGkWULRWULZLUEiFnwXRujuxpgHnNiz7D0znN0oyD3ABh5uoCBNcckguwR0Jxxbgjjtyrph1 1zgzal/OLn25/vhl2oTtk617E5B6GUIvgQUAf0CFHlDBDAXMr0DVqFrH9SKSgqm2lli4vS2mzxVe I1+Zh5DA6cgNiH8U3HYdANJP7q41+L9GFZO7dkSS584MBIpsEXPL0+gMDeP+xIjFK/BvusaNh8R0 fby3+6wRDocoqIQw+nAEmTGbNuZ6nnJmzJ6wK5WO5y+eZmdn35bL5YpXWrUGXrY6UsO2UDK/nAt4 EdR85Vrv/Bdt8zR07MrLCQAAAABJRU5ErkJggg== "/> - <image id="image32" x="48" width="16" height="16" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A /wD/oL2nkwAAAAlwSFlzAAAN1wAADdcBQiibeAAAAAd0SU1FB9kHCwonI+nx+pcAAAH5SURBVDjL jZI/aFNBGMB/d+/eexeJCXnBUHFzcJG6iIjgJpFoUYt/6CC4C6KLoOIgQqkVJIriUqSDOLi4aS3a qktLdSk4OtVB8U9CiPr6XprmziExaRob/eDguPu+3/e7jxMA586fFaVS2VSWN1OJt/C38D3YPwhC dM7GRseFunTlYmJp6eNyoXCQga0D/KxGFCcXuXr5dDNLABZGxx8xuHMX+fwBhBAU7xQBUDdv3IpO jZxgamoagFQqRcPkeP/hM59KPwDYlksDgpczL/he/kIURWSzQRPwRyeZTKK1ZujQEIu3ZylXKnz9 VgFAK0NjNebokWEKhTzGGO7dv9sNEEJQKpVoNAyNesxKLaIW/UIA9TjB6kpEvb5CHMf4vt+eg+od l0U4Lkp5uJ6PteAoFyEVYLHWYi0bA6y1KDeBqzfh6RpgcXUC5SbWAGw/AEjpIKWDo1wAHMdFOqp1 b7ryewCe57b3uSCJMZ1uvu/3GMj1AK1122R+ZoGFV2/bBVrrruINDDwA3kzPsWN7DteVvH4+1zZY H2rt8JpdmklnTu5j5NheAJ48e8fk4/m2XV+DIAh4+vACovXprbUcP7yH4cJuqtXqvwHpdLpnUABS SjKZTP8nZIMsUkpAIAQtC4EQnQUCY0wP4HoYhtfCMGTiwQT/E57nzQL8BtWmvaof7hjzAAAAAElF TkSuQmCC "/> - <image id="image34" x="64" width="16" height="16" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBI WXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH1QoRFQY0QTE9zwAAAjtJREFUOMuV0kFIk2Ecx/Hv/32e 9927uXJbI2usFS0RLC+BQkX3wqgggg5Bh6J70KGidrBDp6KrdK2D4CUoiigr0KZBIXhxUwnRydRE WrLXbe/2dpioKxP8XZ7n8Pw//P/P8whr6Tpz5xbwGPDYiAcgIvP3rueS3ad/tYHugtoi1NLAogbo 7e3tz+fzlyYmp8guxuTB3av1cqkTDx89jw2mXac1EefAoRMY1kFWlj4M7gmO3VAAnZ2dfalUil3B IAPpH4RbonzP5Jic+YlTqjAxPs3tm8foOHoEq/kCpn0IQ/sT2v06pze1S6FQwK0UWVpeZn5hGQBb 13ArRQq/Xdyai646iDIoF2fwKSkYm4FqtUq1skq55FByVig7K1RWHdyyw9h4iZmcUC0O4BXfMTud Bq/yrQEAEGWhtYVp+VCmD6VNxDDZH0sQ2XcWp9aBmDFGRk2gOtoAiAja9GPaASw7iM/fhGn70aaf 3GyOTHYKT2JgHWduoQnd8nJV/92BYSgMQ6G0CYBSJobSxONx2traQAQRjecJAA2AZVnr+72RILXa xpew/Yqt0jBCIBCo/x4PvrwfZnhgBM+rI02BZkRke8Dn8wHw6e0QidhuDidCfHwzhOd55PN5MpnM P0DDCLZtA3Dt8imuXDyJYRj0vxrm2YvPtLe3k0wmtwei0ShP7p9DKUU2m0VE6GgN8zR1nnA4vP5S /wVCoRChUAgRWT+4ed3qDhqASCTCTqPXWn/d09PTvZPCaDTaB/AHRla4xjKX5L8AA AAASUVORK5C YII= "/> + <image id="image32" x="32" width="16" height="16" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A /wD/oL2nkwAAAAlwSFlzAAAN1wAADdcBQiibeAAAAAd0SU1FB9kHCwonI+nx+pcAAAH5SURBVDjL jZI/aFNBGMB/d+/eexeJCXnBUHFzcJG6iIjgJpFoUYt/6CC4C6KLoOIgQqkVJIriUqSDOLi4aS3a qktLdSk4OtVB8U9CiPr6XprmziExaRob/eDguPu+3/e7jxMA586fFaVS2VSWN1OJt/C38D3YPwhC dM7GRseFunTlYmJp6eNyoXCQga0D/KxGFCcXuXr5dDNLABZGxx8xuHMX+fwBhBAU7xQBUDdv3IpO jZxgamoagFQqRcPkeP/hM59KPwDYlksDgpczL/he/kIURWSzQRPwRyeZTKK1ZujQEIu3ZylXKnz9 VgFAK0NjNebokWEKhTzGGO7dv9sNEEJQKpVoNAyNesxKLaIW/UIA9TjB6kpEvb5CHMf4vt+eg+od l0U4Lkp5uJ6PteAoFyEVYLHWYi0bA6y1KDeBqzfh6RpgcXUC5SbWAGw/AEjpIKWDo1wAHMdFOqp1 b7ryewCe57b3uSCJMZ1uvu/3GMj1AK1122R+ZoGFV2/bBVrrruINDDwA3kzPsWN7DteVvH4+1zZY H2rt8JpdmklnTu5j5NheAJ48e8fk4/m2XV+DIAh4+vACovXprbUcP7yH4cJuqtXqvwHpdLpnUABS SjKZTP8nZIMsUkpAIAQtC4EQnQUCY0wP4HoYhtfCMGTiwQT/E57nzQL8BtWmvaof7hjzAAAAAElF TkSuQmCC "/> + <image id="image34" x="48" width="16" height="16" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBI WXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH1QoRFQY0QTE9zwAAAjtJREFUOMuV0kFIk2Ecx/Hv/32e 9927uXJbI2usFS0RLC+BQkX3wqgggg5Bh6J70KGidrBDp6KrdK2D4CUoiigr0KZBIXhxUwnRydRE WrLXbe/2dpioKxP8XZ7n8Pw//P/P8whr6Tpz5xbwGPDYiAcgIvP3rueS3ad/tYHugtoi1NLAogbo 7e3tz+fzlyYmp8guxuTB3av1cqkTDx89jw2mXac1EefAoRMY1kFWlj4M7gmO3VAAnZ2dfalUil3B IAPpH4RbonzP5Jic+YlTqjAxPs3tm8foOHoEq/kCpn0IQ/sT2v06pze1S6FQwK0UWVpeZn5hGQBb 13ArRQq/Xdyai646iDIoF2fwKSkYm4FqtUq1skq55FByVig7K1RWHdyyw9h4iZmcUC0O4BXfMTud Bq/yrQEAEGWhtYVp+VCmD6VNxDDZH0sQ2XcWp9aBmDFGRk2gOtoAiAja9GPaASw7iM/fhGn70aaf 3GyOTHYKT2JgHWduoQnd8nJV/92BYSgMQ6G0CYBSJobSxONx2traQAQRjecJAA2AZVnr+72RILXa xpew/Yqt0jBCIBCo/x4PvrwfZnhgBM+rI02BZkRke8Dn8wHw6e0QidhuDidCfHwzhOd55PN5MpnM P0DDCLZtA3Dt8imuXDyJYRj0vxrm2YvPtLe3k0wmtwei0ShP7p9DKUU2m0VE6GgN8zR1nnA4vP5S /wVCoRChUAgRWT+4ed3qDhqASCTCTqPXWn/d09PTvZPCaDTaB/AHRla4xjKX5L8AA AAASUVORK5C YII= "/> <metadata id="metadata36"> rdf:RDF <cc:Work rdf:about=""/> </rdf:RDF> </metadata> - <image id="image43" transform="rotate(-90)" x="-16" y="32" width="16" height="16" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAABl0RVh0 U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAI2SURBVDiNlZJLSFRhHMV/3+POw0bDFFLE XkQgaBQEhdNGaNEiggRbRoFCuMlyjDZCKzeNkIsochMUvaRFYj5wES1m0CmkFDfRIiwznbGBHuN4 79z7tQhfMxPUgbP5/ofD+Z//hzGGfIa7dKyxU7cVm+VTUgTGo3F39YG+cJc1EI5YoWKaNRQ1ALjS 0hs8efTsaQSz4YjV8N8GSmqaDp/xtTdfrw36QxPhiNVWTCcaI/orhp1bHhXZm+2DganPY1SV7cMn t/F4/NbKh/mZYWM4H4s6PzcMOrXpuXgfKRRKKISQCAQAiU9DeLiU+Xewq7ye+PS4MzY5sIAxp2JR ZwZAA7hejtjHZyipUUKBEAgBQgHCY9meI700z8G6I1ZN1Z7ap2N3J8IRqyMWdfo1QM5bJZ1ZwHaz 2G4WpTSlJWWUBEL4LT9GuNhejndLo9SE6kRrc1fJ0KtHfcevWsc0wNKPOd4nX693oH2ClCPRWYnW Cr8viE8GUPgpzZWjTJCsnTHrK2wpUILUAmXJP/SBp7KgLBoqmkgvZsyDl3dWsquZjRUAWg5dWzdQ lkBpychcL9onqQ7tp277CSbfxO3E2/hX47KpRMHi7Sc9W84oLbKXznUHlFLUVzZRofcy8PxhZjH5 ZcS4eWc0xhR8jnDEMpdbu/nlJUmmUubF6OCK7dgdsRtOf762oIM1ODmbxFRidXp2atHbFLmgs78l qCivzHz7nho2Lhc2R/6nBEISX06n7sWih ZHz8RtB3gm0bnbltgAAAABJRU5ErkJggg== "/> + <image id="image43" transform="rotate(-90)" x="-16" y="80" width="16" height="16" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAABl0RVh0 U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAI2SURBVDiNlZJLSFRhHMV/3+POw0bDFFLE XkQgaBQEhdNGaNEiggRbRoFCuMlyjDZCKzeNkIsochMUvaRFYj5wES1m0CmkFDfRIiwznbGBHuN4 79z7tQhfMxPUgbP5/ofD+Z//hzGGfIa7dKyxU7cVm+VTUgTGo3F39YG+cJc1EI5YoWKaNRQ1ALjS 0hs8efTsaQSz4YjV8N8GSmqaDp/xtTdfrw36QxPhiNVWTCcaI/orhp1bHhXZm+2DganPY1SV7cMn t/F4/NbKh/mZYWM4H4s6PzcMOrXpuXgfKRRKKISQCAQAiU9DeLiU+Xewq7ye+PS4MzY5sIAxp2JR ZwZAA7hejtjHZyipUUKBEAgBQgHCY9meI700z8G6I1ZN1Z7ap2N3J8IRqyMWdfo1QM5bJZ1ZwHaz 2G4WpTSlJWWUBEL4LT9GuNhejndLo9SE6kRrc1fJ0KtHfcevWsc0wNKPOd4nX693oH2ClCPRWYnW Cr8viE8GUPgpzZWjTJCsnTHrK2wpUILUAmXJP/SBp7KgLBoqmkgvZsyDl3dWsquZjRUAWg5dWzdQ lkBpychcL9onqQ7tp277CSbfxO3E2/hX47KpRMHi7Sc9W84oLbKXznUHlFLUVzZRofcy8PxhZjH5 ZcS4eWc0xhR8jnDEMpdbu/nlJUmmUubF6OCK7dgdsRtOf762oIM1ODmbxFRidXp2atHbFLmgs78l qCivzHz7nho2Lhc2R/6nBEISX06n7sWih ZHz8RtB3gm0bnbltgAAAABJRU5ErkJggg== "/> </svg> diff --git a/dlls/comdlg32/itemdlg.c b/dlls/comdlg32/itemdlg.c index bad25d61792..2a38387312f 100644 --- a/dlls/comdlg32/itemdlg.c +++ b/dlls/comdlg32/itemdlg.c @@ -1975,7 +1975,7 @@ static void init_toolbar(FileDialogImpl *This, HWND hwnd) button[1].dwData = 0; button[1].iString = 0;

- button[2].iBitmap = HIST_UP; + button[2].iBitmap = HIST_VIEWTREE+1; button[2].idCommand = IDC_NAVUP; button[2].fsState = TBSTATE_ENABLED; button[2].fsStyle = BTNS_BUTTON; diff --git a/include/commctrl.h b/include/commctrl.h index 606511579a9..725ef64764f 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -1468,10 +1468,9 @@ typedef struct tagTBADDBITMAP {

#define HIST_BACK 0 #define HIST_FORWARD 1 -#define HIST_UP 2 -#define HIST_FAVORITES 3 -#define HIST_ADDTOFAVORITES 4 -#define HIST_VIEWTREE 5 +#define HIST_FAVORITES 2 +#define HIST_ADDTOFAVORITES 3 +#define HIST_VIEWTREE 4

typedef struct tagTBSAVEPARAMSA { HKEY hkr;

-- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/672

Marvin

12:09 a.m.

New subject: [PATCH v8 2/2] comdlg32: Add missing controls to the common item dialog, only affecting the implementation

Hi,

The full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=121741

Your paranoid android.

=== debian11 (build log) ===

error: corrupt patch at line 294 Task: Patch failed to apply

=== debian11 (build log) ===

error: corrupt patch at line 294 Task: Patch failed to apply

899

Age (days ago)

899

Last active (days ago)

wine-gitlab@winehq.org

4 comments

3 participants

tags (0)

participants (3)

Ben Cottrell
Ben Cottrell (＠bgc)
Marvin