[PATCH v16 0/1] MR672: comdlg32: Common item dialog fixes

List overview All Threads

newer

older

[PATCH 0/2] MR1295: Enable...

Re: [PATCH v3 0/4] MR1311:...

Ben Cottrell (＠bgc)

8 Oct 2022 8 Oct '22

4:02 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.

-- v16: comdlg32: Add missing controls and their functionality to IFileDialog, or the common item dialog.

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

Show replies by date

Ben Cottrell

8 Oct 8 Oct

4:02 a.m.

New subject: [PATCH v16 1/1] 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

comdlg32: Add missing controls to the common item dialog, only affecting the implementation --- dlls/comctl32/idb_hist_large.bmp | Bin 11642 -> 13894 bytes dlls/comctl32/idb_hist_large.svg | 97 +++++---- dlls/comctl32/idb_hist_small.bmp | Bin 5242 -> 6214 bytes dlls/comctl32/idb_hist_small.svg | 326 +++++++++++-------------------- dlls/comctl32/toolbar.c | 4 +- dlls/comdlg32/itemdlg.c | 137 ++++++++++++- 6 files changed, 307 insertions(+), 257 deletions(-)

diff --git a/dlls/comctl32/idb_hist_large.bmp b/dlls/comctl32/idb_hist_large.bmp index b7818fbafb22c45a5b4a6ccbec91fad9304fe51f..13e927bda04e5dff2c13d43850ba35d08d3efb1d 100644 GIT binary patch literal 13894 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 QJ9cRZuuoKW|E{<H1AJYrX#fBK

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..4f09a643dfb 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 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 id="stop2" offset="0"/> + <stop id="stop4" 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 id="stop7" stop-color="#FFF" offset="0"/> + <stop id="stop9" 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 id="stop12" stop-color="#73d216" offset="0"/> + <stop id="stop14" 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 id="stop17" stop-color="#FFF" offset="0"/> + <stop id="stop19" 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 id="stop22" stop-color="#73d216" offset="0"/> + <stop id="stop24" 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 id="stop27" stop-color="#d3d7cf" offset="0"/> + <stop id="stop29" 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 id="stop32" stop-color="#729fcf" offset="0"/> + <stop id="stop34" stop-color="#3465a4" offset="1"/> </linearGradient> + <radialGradient id="radialGradient251" cx="27.547" cy="15.843" r="16.956" gradientTransform="matrix(.41072 .0074091 .0052128 -.28896 122.38 19.752)" gradientUnits="userSpaceOnUse" xlink:href="#radialGradient3266"/> + <radialGradient id="radialGradient253" cx="15.987" cy="1.535" r="17.171" gradientTransform="matrix(.99732 0 0 .78343 110.59 1.6235)" gradientUnits="userSpaceOnUse" xlink:href="#radialGradient3263"/> + <radialGradient id="radialGradient367" cx="24.837" cy="36.421" r="15.645" gradientTransform="matrix(.60722 0 0 .30361 115.42 7.1543)" 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"/> + <path id="path359" d="m140 18.212a9.5 4.75 0 1 1-18.999 0 9.5 4.75 0 1 1 18.999 0z" color="#000000" fill="url(#radialGradient367)" fill-rule="evenodd" opacity=".32157" stroke-width=".67862"/> + <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> - <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 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> - <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 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 id="g260" transform="rotate(-90 131.52 13.531)"> + <g id="g348" transform="translate(1.0224 .0092846)"> + <path id="path241" d="m124.53 16.5v-9h5.9878v-4l10.011 8.5554-10.011 8.445v-4h-5.9878z" color="#000000" fill="url(#radialGradient251)" fill-rule="evenodd" stroke="#3a7304" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10"/> + <path id="path243" d="m131.02 4.5v3.5h-5.988l0.0317 4.5c5.9878-3 8.9817 2 14.471-0.5l-8.515-7.5z" color="#000000" fill="url(#radialGradient253)" fill-rule="evenodd" opacity=".50802"/> + <path id="path247" d="m125.53 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..e8820fe1a7cc41b09864d781279985a9705d029e 100644 GIT binary patch delta 1237 zcmbW1YfMvT7{||PyA}(!&@)mt!&a~}Ak3*SYD)#Nix;Gzs~4sVFfL&_3Kl8_qO-sz z)nV!3CBWuoY9UJ$jai+S20{y!+Zf)Kv1R)-KWr|$#JEJQ@jQFqL+e=Lr@hJVyyyI% z=lMU+Imvs1Nn^`X*BaNwQT$qmud6U6m}m@5sVE`dDIA|&NMKW6W-V&=<WFn*D$*Xf z%hTZhKx$db>#Y41)~-Oa^j+cU(v@gPpiRd+kcRV@XrI;^*|6rJyvYEvrnL~&n8UN6 zA^RbTv6dvH5dO-1Ua}l+%-(^S?{0@d-w2Y^i9X+t+>2^;2dlnvLHD<pz%g?c%7<Cl zGtvd7a~}eU;g>}DqTiVlMQ`w)(|2w{2;P(E&-1Lg%)<MA1iA}#ApR^LUhONM=NXUM zUU(op_U<xtK&(y2`*S_^UP17|NH?rJXP)!uF9Fj)c&<1!B7Vetx-*rZYy8I75Q5D0 z7SYLE0;}FGtkt;*BCBqu_G;JD>d{_UF;E5Klbb<xwhXpjv_B=WaGszpvzgSogA$tQ zDNNxTT%VqV5PSoolcb3H)h*htipQ?W0qC4M&-Kp^an*rd&|j*Di2m)c*s~jKGiSI8 zKjKP<J3#F$d?endZzZ)J-2$3c>`3Mtj82V12xOElHDH<KP>mUk>d+S7{^1i(T(>TQ zInV>eekW`kY60o_ogniRgVI|GhKY|M|4MT(wl&vBnODS;QcshVren4x@&3Mv0L+2f zBU21mB`N%>(Y=}0`QFcMlV5Ok<Huo_|0rx8ISjHdi$U%!gXA$An8w>VHT%w8%Bt6d z%RJslnx;)?Fe=kvTJo=*SuK$^WR(`UZTIX`eOytX1M)`OAns}<Eb>)>ak`z;y3O|@ z>a)ryocqi!7=^#ame=@c2S<Gn0xgs+)nGZCH#f3I8Q)sqtn{?s-#dAn+vxuY61~-s zJ=Vf)@*KFYXx`wYYBWmL@)BAv`#YvU&AVRn55XKLPo9#7)&H212didT@+XDYYJEMy zUDsV)w%^WeA9MuckG$<AF>)T9@;_)J+8>=MG$sOTVd4d%I_>)O&XOM*Cr)t{fi7-| zv+zfJA~#?^0Xdboqkp3lkUu6vlB)v8rUYCStK60%mfBYD&N*iOGo!owFG;<A4}~@U ze;`6i#V>+0Wt~ihs4X|)34RYbjzu(N^+;@4z0dOGsEGMK@*se~k(cOl<f>54i>v4k H-h=rE=7tdi

delta 568 zcmX?R@JmC-$+t>`0Su~uWDXDq0I>iNGcqVJFav1@pu7+_2v5|JQe^~*Kmktn<cW;N z6SMBvFG?}~PXV6%kx_2)W5&nK3z7^cpJcKG(;pcnC&w|r5T2J{@c;bv%m2?_y$HjT zZ!&2z1I2;*L?_>3c_Tb0P9Lo1^yTyap%|ow1th-Mjg66cR*ddsPj*WdApL*wF?L4b z8Bsc59mmg|{tv}q9U$?=Zk&w5(;~FM3XYsP@gIu83P9qUk8v?F3WaHc6&yNs>^~Gw zzR9h{3>4n%#>2=c7@`iAKXClWe+Zr&!K=*-6y1D`mywY%Xz~d@Yvv#|plW`gX#uKW z)w>Vv{}08JBL%dWfx?@Q2>?y=QwGcLJh1ma1W&#psLkZ33=V@Rp|^}alRbp3nS7Lh z0+N&O3BQ_rLBx3SeGv{OZv}ApCW}62UYue)IZ#ZOXGyBb|3%5h|2w=C{s7}pW%4Vr Y8{7^5|1)*?D0Q}b%TGQlZo$|A0HiGYLjV8(

diff --git a/dlls/comctl32/idb_hist_small.svg b/dlls/comctl32/idb_hist_small.svg index 3fceec0da6e..a1fc2bca087 100644 --- a/dlls/comctl32/idb_hist_small.svg +++ b/dlls/comctl32/idb_hist_small.svg @@ -2,253 +2,159 @@

#include "commdlg.h" #include "cdlg.h" @@ -40,6 +41,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,7 +123,9 @@ typedef struct FileDialogImpl { IShellItem *psi_folder;

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

LPWSTR set_filename; @@ -1414,6 +1418,71 @@ 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 = 0; + IKnownFolder *known_folder = NULL; + HRESULT hr; + TRACE("%p\n", This); + SendMessageW(This->address_edit_hwnd, WM_GETTEXT, MAX_PATH, (LPARAM)address_text); + hr = IKnownFolderManager_GetFolderByName(This->kfmgr, address_text, &known_folder); + if (SUCCEEDED(hr)) + { + hr = IKnownFolder_GetIDList(known_folder, KF_FLAG_DEFAULT, &pidl); + if (FAILED(hr)) + { + TRACE("IKnownFolder_GetIDList failed\n"); + } + } + else + { + hr = SHParseDisplayName(address_text, 0, &pidl, SFGAO_FOLDER, 0); + if (FAILED(hr)) + { + TRACE("SHParseDisplayName failed\n"); + } + } + if (pidl != 0) + { + IExplorerBrowser_BrowseToIDList(This->peb, pidl, SBSP_ABSOLUTE); + CoTaskMemFree(pidl); + } + else + { + ERR("on_browse_address_accept failed to get pidl for path\n"); + } + 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 +1705,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 +1844,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; @@ -1854,6 +1930,14 @@ static HRESULT init_explorerbrowser(FileDialogImpl *This) return hr; }

+ hr = CoCreateInstance(&CLSID_KnownFolderManager, NULL, CLSCTX_INPROC_SERVER, + &IID_IKnownFolderManager, (LPVOID*)&This->kfmgr); + if (FAILED(hr)) + { + ERR("Failed to instantiate KnownFolderManager"); + return hr; + } + IExplorerBrowser_SetOptions(This->peb, EBO_SHOWFRAMES | EBO_NOBORDER);

hr = IExplorerBrowser_Initialize(This->peb, This->dlg_hwnd, &rc, NULL); @@ -1895,7 +1979,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 +2007,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_VIEWTREE+1; + 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 +2271,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 +2336,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 +3473,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 +3487,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;

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

Marvin

4:05 a.m.

New subject: [PATCH v16 1/1] 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=124803

Your paranoid android.

=== debian11 (build log) ===

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

=== debian11 (build log) ===

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

Esme Povirk (＠madewokherd)

15 Nov 15 Nov

8:39 p.m.

Resource 131 (IDB_HIST_LARGE) in comctl32.dll exists on Windows in the layout Wine has. Applications can and most likely do rely on it. Same with resource 130 (IDB_HIST_SMALL).

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

Esme Povirk (＠madewokherd)

8:47 p.m.

The address bar and up buttons need to be split into separate patches IMO, as well as the changes to comctl32 if they're even valid (I'm dubious of those, my suspicion is that any change you need to make there probably breaks applications).

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

813

Age (days ago)

851

Last active (days ago)

wine-gitlab@winehq.org

4 comments

4 participants

tags (0)

participants (4)

Ben Cottrell
Ben Cottrell (＠bgc)
Esme Povirk (＠madewokherd)
Marvin