[PATCH v4 0/2] MR10950: shell32: Add an Info icon.
Hi Alex, I ran into an application that needed SIID_INFO. I noticed you added a lot of icons to shell32, so maybe you can help me with two issues: 1) On my WinXP and Win11, the (i) Icon has index 221, not 215. The power off icon however has index 215. Can you double check if you used the correct value for IDI_SHELL_POWER_OFF back in 9954c08dc8dc? 2) It seems the other shell icon SVGs have a rasterized image embedded, which tools/buildimage needs. For this .svg it writes "no render directive found in dlls/shell32/resources/info.svg". How did you generate those for the icons you added? Other Wikimedia Commons Tango icons don't seem to have them, so I guess they were added by one of us. -- v4: shell32: Use IDI_SHELL_INFO icon for SIID_INFO. shell32: Add an Info icon. https://gitlab.winehq.org/wine/wine/-/merge_requests/10950
From: Stefan Dösinger <stefan@codeweavers.com> The icon file is taken from dlls/user32/resources/oic_note.svg but renamed info.svg to match "SIID_INFO". --- dlls/shell32/Makefile.in | 1 + dlls/shell32/resources/info.svg | 383 ++++++++++++++++++++++++++++++++ dlls/shell32/shell32.rc | 3 + dlls/shell32/shresdef.h | 2 + 4 files changed, 389 insertions(+) create mode 100644 dlls/shell32/resources/info.svg diff --git a/dlls/shell32/Makefile.in b/dlls/shell32/Makefile.in index 54059b73dc3..84615e29e3e 100644 --- a/dlls/shell32/Makefile.in +++ b/dlls/shell32/Makefile.in @@ -45,6 +45,7 @@ SOURCES = \ resources/folder_open.svg \ resources/help.svg \ resources/image.svg \ + resources/info.svg \ resources/internet.svg \ resources/log_off.svg \ resources/menu.svg \ diff --git a/dlls/shell32/resources/info.svg b/dlls/shell32/resources/info.svg new file mode 100644 index 00000000000..f2b489322d0 --- /dev/null +++ b/dlls/shell32/resources/info.svg @@ -0,0 +1,383 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<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="svg2" + height="272" + width="632" + version="1.1" + sodipodi:docname="oic_note.svg" + inkscape:version="0.92.3 (2405546, 2018-03-11)"> + <metadata + id="metadata47"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + </cc:Work> + </rdf:RDF> + </metadata> + <sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="1244" + inkscape:window-height="856" + id="namedview45" + showgrid="false" + inkscape:zoom="1" + inkscape:cx="184" + inkscape:cy="32" + inkscape:window-x="466" + inkscape:window-y="262" + inkscape:window-maximized="0" + inkscape:current-layer="svg2" /> + <defs + id="defs4"> + <radialGradient + id="radialGradient3293" + cx="23.857" + gradientUnits="userSpaceOnUse" + cy="40" + r="17.143" + gradientTransform="matrix(1,0,0,0.5,0,20)"> + <stop + id="stop4128" + stop-color="#000" + offset="0" /> + <stop + id="stop4130" + stop-color="#000" + stop-opacity="0" + offset="1" /> + </radialGradient> + <linearGradient + id="linearGradient3297" + x1="15.027" + gradientUnits="userSpaceOnUse" + y1="14.936" + gradientTransform="matrix(1.002994,0,0,1.002994,-0.071859,0.01968356)" + x2="19.015" + y2="31.885"> + <stop + id="stop3692" + stop-color="#fffeff" + stop-opacity="0.1" + offset="0" /> + <stop + id="stop3694" + stop-color="#fffeff" + stop-opacity="0.1" + offset="1" /> + </linearGradient> + <linearGradient + id="linearGradient3306" + x1="36.918" + gradientUnits="userSpaceOnUse" + y1="66.288" + gradientTransform="matrix(0.920488,0,0,0.920488,10.36853,8.9735945)" + x2="19.071" + y2="5.541"> + <stop + id="stop2893" + stop-color="#204a87" + offset="0" /> + <stop + id="stop2895" + stop-color="#3465a4" + offset="1" /> + </linearGradient> + <linearGradient + id="linearGradient3421" + x1="21.994" + gradientUnits="userSpaceOnUse" + y1="33.955" + gradientTransform="matrix(0.68106924,0,0,0.68120249,-0.84509344,0.08898907)" + x2="20.917" + y2="15.815"> + <stop + id="stop2911" + stop-color="#fffeff" + stop-opacity="0.2" + offset="0" /> + <stop + id="stop2913" + stop-color="#fffeff" + stop-opacity="0.1" + offset="1" /> + </linearGradient> + <radialGradient + id="radialGradient3431" + cx="23.857" + gradientUnits="userSpaceOnUse" + cy="40" + r="17.143" + gradientTransform="matrix(0.713704,0,0,0.175,174.40483,45.999405)"> + <stop + id="stop4128-8" + stop-color="#000" + offset="0" /> + <stop + id="stop4130-7" + stop-color="#000" + stop-opacity="0" + offset="1" /> + </radialGradient> + <radialGradient + inkscape:collect="always" + xlink:href="#radialGradient3293" + id="radialGradient872" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1,0,0,0.5,0,20)" + cx="23.857" + cy="40" + r="17.143" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3306" + id="linearGradient874" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.920488,0,0,0.920488,10.36853,8.9735945)" + x1="36.918" + y1="66.288" + x2="19.071" + y2="5.541" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3297" + id="linearGradient876" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.002994,0,0,1.002994,-0.071859,0.01968356)" + x1="15.027" + y1="14.936" + x2="19.015" + y2="31.885" /> + </defs> + <image + id="icon:16-4" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQBAMAAADt3eJSAAAAAXNSR0IArs4c6QAAAC1QTFRFAH8A AAAAf38AAAB/fwB/AH9/wMDAf39//wAAAP8A//8AAAD//wD/AP//////McQmvgAAAAF0Uk5TAEDm 2GYAAAABYktHRACIBR1IAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH2QsXFCUQrZByXwAA AEtJREFUCNdjYGBgFBQUYAACRvHy8kIQS7zY2Ni8ECgApIEsATAjGcQQNwYxjAvBDGMowwwmYmaM zrADM4Da7ZJh5oANhFuBsBTqDAC5Vxf8tA357AAAAABJRU5ErkJggg== " + height="16" + width="16" + y="252" + x="608" /> + <image + id="icon:16-8" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAAAXNSR0IArs4c6QAAAS9QTFRFmqi8 IUuII06KJ1CNJ1GNJlKPJlKQJlOPJ1OQKVSSK1WRLVeRLFeULleSLViSLFiVLViTLViULVmVLVqV L1uXNV2UNV2VNl6VNGWkNWakNmalQ2iaRGibRWibP2qjP2qkRWqbRmqcRWykQm2lRW2kQG6pQW6p SW2eSm2eRG6mQW+qQm+pQm+qQnCqQ3CqRXCnRXCoRHGrRXKqRXKrSHKqR3OqR3OsSnWsTHatT3es UHmvUnmuUXqvUnquVH2yV3+zWIC0WYG0W4O1XIO2XYS2XoW2XoW3X4a3YIa3YYe4Y4m5ZIm5Zom3 ZYq6Zou6Z4u6Z4y7ao68bZC9bpG+b5K+cJK/cZO/cpS/gp/Cmqm8nKq9nau9nrPNpbjPrL3StMPV vMnZzMzM1dvj5efo7u7smZSEXwAAAAF0Uk5TAEDm2GYAAAABYktHRACIBR1IAAAACXBIWXMAAAsT AAALEwEAmpwYAAAAB3RJTUUH2QsVCgQgu2cR4QAAAMFJREFUGNNjYAABRRZGJmYNBhhQF7D2Dw3x thSUgfDFlcLNpCQkpIwD9cXB8iq+QC4ISLkayAIF+MJAfO0kkIifCAODgq0ZSFYtHkTqWUgzcPlB NYA1OXEzcASDWDYJMWARTw4GziAwKy4CTHmwMvB6gbUk+YC1OHAxyFgZAlm6KRYgAS0ToNuEA4BK jJJjQQpceIDukNV0gjnMTk4B5FRRZS8doJCkqrO8GMQzskLmju5u9qb8snD/ynCzsXND/AoAF9cd /1BwUZ0AAAAASUVORK5CYII= " + height="16" + width="16" + y="252" + x="584" /> + <image + id="icon:16-32" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAAZiS0dEADQA ZQCkMkXLAwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB9kLDxEDKjsklVIAAAJcSURBVDjL fVNLTxNhFD3fR+dRWqhFSgMzrRRTHgopLro2cWs0StggWxONq7JxiRBduFLCRllqojshJv4KNlKD xrRCKdCHjIVK6XRm2s511xSm8e7uzbnnnNwHw4WYnF+7YxnGcqNuXaNmU2KcE8AsQZKSgiQ93/7w 6Es7nrUnY7Orm6KLxaMRBYE+L9ySAAKhWqtDO65gN1uEaTW+pdYTMQdB9P7r3LASGJoaV/A9U8JJ xYRNBADgjMHnFRFV/Ujva9jLFvPpjQWlRTA2u7oZHuyLD4cGkPyltRovBmcM41f8KGinyO4Xk6n1 xDSfml+7LboQnxxVHM293QLePb3Zym0i/MyeIKL0we2WYtfn3sxw06i9iI6o+LFXcigTAZni6bma TYSdXBkhZQB101jidtOO9vu9OKmYDsuVWh1L778663odvh4ZRBThnHO3LLoc6qGABy8fxvHk7oSD wCaC6OoCY7ybM8aIOgztQKuifGbi8E+140CJCEQEbtu2rpsNcMYcoImwH4dH1Y7bMKwmiKjGGWOZ UllHr0c8B+r1iBi87Ea+pDsIPG4B5VMdnPMdLsrys51sHleVS+dcdHGgZjYwd2vEoa4GvDjMHUGU 5UUGAKMzK1thdSAWDPiQPij/95DCwR5opb8o/C5tpT4lbrSd8qt8SA0ORtR+ZPJ/cVart4gYAzyy ADXQg4PCMfIFrZDeWBhyPNPozMqWJAmxkBqEzytDFLpABJhWA+WzGnI5DZZVT6bWE9MdvxEAJh+8 vWcZxjKRPcIY9xLIBpHOGN8VZXlx++Pjz+ 34fwepDdkjUQmrAAAAAElFTkSuQmCC " + height="16" + width="16" + y="252" + x="560" /> + <image + id="icon:32-4" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgBAMAAACBVGfHAAAAAXNSR0IArs4c6QAAAC1QTFRFAH8A AAAAf38AAAB/fwB/AH9/wMDAf39//wAAAP8A//8AAAD//wD/AP//////McQmvgAAAAF0Uk5TAEDm 2GYAAAABYktHRACIBR1IAAAACXBIWXMAAA3XAAAN1wFCKJt4AAAAB3RJTUUH2QsXFCUTNJkj5QAA AJZJREFUKM+VkUEKwzAMBJMfRBd/ZCG+5S+moN56CUQPDuToN7SW1ThESaF722El7FXXXYuIhoPt iZkTNR9YRBbeSXiKim2q/3gAUSRZQGaoZBksUByXTKpAA7lEUp2AJRB1xgBuga0YH7AlFUz5BPBy AH+DbQf2ju30sNGBtQFdUhPf75dIbn24xnynrnV/F3c5f9ufegP03F+97qymfQAAAABJRU5ErkJg gg== " + height="32" + width="32" + y="236" + x="520" /> + <image + id="icon:32-8" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAMAAABEpIrGAAAAAXNSR0IArs4c6QAAAq9QTFRFaYKl IkyJJU6JJk+JJ1CKKlGMKVKLKlKLKlKMK1OMK1ONLVOOLVSOL1aOMFeOMViPMliPM1mPMlqQOl6S Ol+TP2KWPWOaNGWkPWSaPmSbNWalNmelQmWWN2elQ2WWP2aaRGWXQGabQGacOGimRWeWOWmmOmmn PGunPGuoQ2qeRWqePWyoPmyoRmufPm2oPm2pRWyfP26pQG6pSG2hQW+qQXCqQ3CqQ3CrSW+kSnCl S3ClRXKsTHGlTnGjRnOsTHKlTHKnR3OsUHKkTHOnR3StSHStVXKdSXWtSXWuSnWsVnOdVnOeV3Od V3OfSnauV3SeS3auV3SfWXSfS3euTHeuTHevUXeoTXivU3eqTniwTnmwT3mvW3egT3mwVHmsUHqw UHqxXXifV3mrVHqsVXqsVnqrUXuxUnyxUnyyU3yxU3yyU32yU32zWXysVH2yVH2zVX6zV3+yV3+0 W3+tV4C0WIC0XYCwWoG0WoK1W4K1XoKxXIO1XYO2XYS2XoS0aoKlYoWzbISmYIa2YIa4Y4a2ZIe2 ZYe0Zoi1Yom5ZIm6ZYq6Zoq4Zou6Z4u4aIu4aYy4aIy8aY28bo67a4+9bY+8bZC+bZG+cJK9cJK+ cJK/cZK+cZPAc5O+c5TAdZS+c5XAdJW/dJXAdJXBdJbBdpfBeJfAeZjBeprDeprEe5rEepvEfZvD fZzEf5zCf5zEfp3Efp3Ff53Ff57GgJ7Gg57CgJ/GgZ/Ggp/FgaDGgqDGj560gqHHhaHDkqC1h6PF hqPIiKPFiaTFiaTGjKXGjqfHkarIm7HNoLXOobbPprnQtbvDtrvDt7zDub3Err/Tr7/Tr8DUvsHG tMPVv8LHwMPHw8XIusjYvMnZyMnKysrLzM zMxdDcztfg0tnh193j3OHl5ejp7Ozr7O3r7e3r7u7s spFDYwAAAAF0Uk5TAEDm2GYAAAABYktHRACIBR1IAAAACXBIWXMAAA3XAAAN1wFCKJt4AAAAB3RJ TUUH2QsVCTIAC1MeBQAAAfBJREFUOMtjYCABePuKCnALifp4Y5cO5HNqn7d65+p5bba8QVh08xdv WzGhPDsyu2LCyq253OimyBhvXJjhDgPZC9fpyqHIC6TuKHdHBuU7UgWR9UdsSHNHBembklQQ9itt g8sX3j4JYWTsNoC7g205wvy1Tx5lQljVa7hgBoQtRBgdfWIfjLkkJQaigHlzhjs2kLOZBWKA1gqo iAcU+EHBBk2wK9yqJkL4AQEBId0HjgcEhELB5DJ/kALhOTUQfnh40/0nT+6Ew0BU8yQRkAL29SUQ PggcenLBUFlVwzUWCOIrlvGAFDDuz48F80Hg2JMt4iCg5piQlla0ngmkgHN7ZRoMBF96UicOAcrW abULwCYIL+3IAIKsrKwMc/F7j9XFYUAqoQXsBq+G2XlAUJBlpypu9uSuOAKUxoF94a24qqCgINZE CijU9+QckoJp8pDYYJ5rqioNETry5CBC3mg+CzQu7DthYuef9CIUdNnEwGJzliNU7PqTo5792hC2 +3Q2eHqQWKQHEdzz8MG1wxB/6C8WQ6RLGcuZOlB7ZaFm6c+0UkFOk5bzHcWRgftiCwGUVKsgMaPL CC5t0jNLUgU9X3A4z59a4mKoZuRSMm2uAyuW3BXDopTcOmXhlNZkJeZEHHnTW5idkVPY35uBqgAA lFfQgymcmM8AAAAASUVORK5CYII= " + height="32" + width="32" + y="236" + x="480" /> + <rect + id="icon:32-32" + y="236" + x="440" + width="32" + height="32" + style="fill:none" /> + <image + id="icon:48-4" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwBAMAAAClLOS0AAAAAXNSR0IArs4c6QAAAC1QTFRFAH8A AAAAf38AAAB/fwB/AH9/wMDAf39//wAAAP8A//8AAAD//wD/AP//////McQmvgAAAAF0Uk5TAEDm 2GYAAAABYktHRACIBR1IAAAACXBIWXMAAA3XAAAN1wFCKJt4AAAAB3RJTUUH2QsXFCUV3fqG0AAA AOJJREFUOMullEEOhCAMRfUGsuEiTZyddyEmzM6NiRx4EpecYYpIKWDHmPkbk770f8HWrrtVr1BD W1faooxq6vbtUJtVdd2dKklPdSQ8R4cKoMLTsAb0X+HQC3MG3nDWD2JYA9UDoRYd/QHGOeaYumHZ ixYEwAEkQE6nFXlpHh29TPtOLCRHkG5AzgabwBFC2db7Ip2B/RrA9Bgsn6fAi2CugKtBPCBdyeiF u7oAMWTy1Tik9Op8OZ1A+rQpJIM8JWvM8OX4JK/RlkPyY0TFoZbXQFwcedXE5ZTXWf4ByL+M//UF bizd0VWSQrQAAAAASUVORK5CYII= " + height="48" + width="48" + y="220" + x="384" /> + <image + id="icon:48-8" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAMAAABg3Am1AAAAAXNSR0IArs4c6QAAAnlQTFRFMliO Jk2IJ06JIlSPJFSVI1WQLlKPJVWWL1OQLlWKJ1aXMFSRHFqaKFeYMVWSJ1iTHlubMlaTMVeNK1ia IFycKlqVLFmbM1mPIV2dK1uWLVqcLFuXNVqQI16eL1udLlyYJF+fL12ZMF6aMV+bM2CcOl+WNGGd O2CXNWKePGGYNmOfNWSaPGOTPmKZOGSgPWSUP2OaRmKUOWWhQGSbOmaiP2aXO2ejQGeYPGikQWiZ RGefPWmlPGqgRWigP2qnPmyiQGuoR2qiP22jSGujQW6kSmykQm+lS22lQ3CmTG6mRHGnUG+cRXKo RnOqTXKkR3SrSHWsVHOgT3SmSnatUHWnS3euVnWiUXaoTHivU3epWHekTnmxVHiqWnilVXmsW3mm VHunUHuzVnqtXHqnV3uuXXuoWHyvXnypWX2wXX6lZHylX32qWH+rWn6xYH6rW3+yYX+sWoGtXICz Z3+oYoCtW4KuXYG0Y4GuXoK1ZIKwXYSxY4SrZYOxXoWyZIWsX4azWoi5Z4WzYIe0ZoeuYYi1Z4iv aYe1Yom2b4ewaYqxZYu4aouyc4qna4y0Z426bI21aI67c4y1bY62aY+8bo+3b5C4dJCycJG5dZGz cZK6dpK0cpO7d5O1eJS2dJW9fJSxeZW4gZSsepa5dpe/e5e6d5jAfJi7fZm8fpq9f5u+gJy/gZ3A gp7Bg5/ChKDDhqHEh6LGi6LAiKPHjKPBiaXIkKfFkajGm6/HnrLKobTNorXOo7bPpbjRprnSq7rN scDUssHVtcXYvsrYwMzayszJws7cxNDextLgzNXdztff0tri09vk2+Dj4ufq4+jr5+nm6uzp6+7q 7e/r1KigVQAAAAF0Uk5TAEDm2GYAAAABYk tHRACIBR1IAAAACXBIWXMAAA3XAAAN1wFCKJt4AAAA B3RJTUUH2QsVCToTRzTV0wAAA2NJREFUSMfFlulPE1EQwKUUymELbhEaQJAi27RGK0pACJZ0A+kG GgMWiNUoKmC4FIhVjAareCCm9QBJuGo2QSuipFDjfWs8IAg6f5Gv+3q83Rbkg4m/T/3wm+nM7Nt5 u27dP8BRo6ckEkpf41iL3Rq3rXvQ7Xn+zDM52KGNa/2LXqzp9XjHL3YetViOdl4c93p6NcWr6FWZ /d6hFkuI6uND3quZVSv5cd3eobqQjLHcnu2Ki+ynjU4eFNlmH/vvjaZF0Nu2Tt+MYPPceKRvCwvY OnM2oszTOa0Pq2fqzEo2H/GQEvU73C+S6zzeOiKibzheMM+uIXHqtwAfAr8rEYMd5HQzpy3iQn4A LAZthHmKGFWx/VJY1bO/fj8LyJUsoudc6JlrHkXos+lESOZxa4LnzWYX22RqHyaTie0+GTiJMQ/3 r2abfDaikovxB2gfrJ7aR0VFBcP5a3I0XgmzzdeevmsJpEZyuY+eQ/iNqrncQtg+49W3ZYDf1QIb se9CDR+gv3tYVMj770sACyxjMBjKCdhb+ERR981hPdoBPuo2IdS63fgfGIbZw+EDJXnChvU4AzCH 9KwslUqlLmQw9JQEBzw2Ccbnq/oNgJ23Var09BQ+xGhU+wMoziy0yxndV4BSv82TW2I0ltIuXJJ+ sE44vkL15mVYRDK2U1OTETl0aokzH4/10jFyfEZapaoF+IRT83JysnI9gj2Px+poOG0IDrtMl4MK GQV4HkjttxHtB/yrUMNt8Y+ukMZVvwBwCm0lYjRwXGO4giy6YKeOzgn0+AWAJVIreWhXbOB4tzfx Awn2mLIEPzOUpKxUyuXW5uCi1bjV6WSPewE+i2y5PIPThF7RnqYUssc+gNdBW45JstqKiK10P5fs cQIdPVq5vTtkJyRkc+S+rGq2kz2yAP BrEeaxncBzrkGwxOPvWMke5xbmX94qwal9KBS1zmjh6qNc jLDHYOoEhUwmKx2jxMtVz5UJeiRs5Lu04eteO2EV2ViWJSbuG9O2Rbghkpy92cJCeFua0XOdinwF RR/hrBsJWZYolUo3WF2Hole8FNNsLqs2mBqRWzvRnla1yj1apGmcGGlmdmUrFNk7yhpHxhryiv52 scfm1dsGRtzukYFT9XmxrWv7dMinoqKo/LV9Ovx//gDtqJRBNXNLfgAAAABJRU5ErkJggg== " + height="48" + width="48" + y="220" + x="328" /> + <rect + id="icon:48-32" + y="220" + x="272" + width="48" + height="48" + style="fill:none" /> + <rect + id="icon:256-32" + y="8" + x="8" + width="256" + height="256" + style="fill:none" /> + <g + id="g3310" + transform="translate(264,212)"> + <g + id="layer2" + transform="translate(7.9999996,7.9995145)"> + <path + id="path6548" + style="color:#000000;display:block;opacity:0.6;fill:url(#radialGradient3293);fill-rule:nonzero" + d="M 41,40 A 17.143,8.5714 0 1 1 6.714,40 17.143,8.5714 0 1 1 41,40 Z" + transform="matrix(1.070555,0,0,0.525,-0.892755,22.5)" + display="block" + inkscape:connector-curvature="0" /> + </g> + <path + id="path1314" + style="fill:url(#linearGradient3306);fill-rule:nonzero;stroke:#204a87;stroke-width:0.99999976;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none" + d="m 53.5,31 a 21.5,21.5 0 0 1 -43,0 21.5,21.5 0 1 1 43,0 z" + stroke-miterlimit="4" + inkscape:connector-curvature="0" /> + <path + id="path3560" + style="opacity:0.45;fill-opacity:0;stroke:#eeeeec;stroke-width:0.99999887;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none" + d="m 52.539,31 a 20.539,20.539 0 0 1 -41.077,0 20.539,20.539 0 1 1 41.077,0 z" + stroke-miterlimit="4" + inkscape:connector-curvature="0" /> + <g + id="layer4" + transform="translate(7.9999996,7.9995145)"> + <path + id="path3955" + d="m 43.429,21.8 c 0,10.863 -10.385,-6.2851 -18.731,0.38754 -8.1507,6.517 -20.659,12.227 -20.659,1.364 0,-11.117 8.7214,-21.431 19.584,-21.431 10.8626,0 19.805,8.8164 19.805,19.679 z" + style="fill:url(#linearGradient3297);fill-rule:nonzero" + inkscape:connector-curvature="0" /> + </g> + <g + id="text3046" + font-size="40px" + transform="translate(7.9999996,7.9995145)" + font-style="normal" + font-weight="normal" + style="font-style:normal;font-weight:normal;font-size:40px;font-family:'Bitstream Vera Sans';fill:#eeeeec"> + <path + id="path28492" + style="text-align:center;fill:#eeeeec" + d="m 26.05,10.202 c -1.08,0 -1.944,0.864 -1.944,1.944 0,1.116 0.864,1.944 1.944,1.944 1.044,0 1.944,-0.864 1.944,-1.944 0,-1.044 -0.9,-1.944 -1.944,-1.944 m -0.72,7.992 -5.328,1.152 v 0.936 l 2.916,0.54 -2.124,10.728 c -0.144,0.792 -0.216,1.44 -0.216,1.872 0,1.584 0.756,2.376 2.304,2.376 1.368,0 3.096,-0.432 5.076,-1.26 v -1.116 c -1.116,0.36 -1.98,0.54 -2.664,0.54 -1.116,0 -1.728,-0.468 -1.728,-1.404 0,-0.216 0.036,-0.504 0.108,-0.9 L 26.266,18.194 H 25.33" + inkscape:connector-curvature="0" /> + </g> + </g> + <g + id="g3436" + transform="translate(264,212)"> + <path + id="path6548-4" + style="color:#000000;display:block;opacity:0.6;fill:url(#radialGradient3431);fill-rule:nonzero" + d="m 203.67,52.999 a 12.235,3 0 1 1 -24.47,0 12.235,3 0 1 1 24.47,0 z" + display="block" + inkscape:connector-curvature="0" /> + <g + id="g2915" + transform="translate(176,23.999395)"> + <path + id="path1949" + style="fill:#3465a4;stroke:#204a87;stroke-width:1.00000072;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none" + d="m 29.486,15.496 a 13.993,13.996 0 0 1 -27.986,0 13.993,13.996 0 1 1 27.986,0 z" + stroke-miterlimit="4" + inkscape:connector-curvature="0" /> + <path + id="path3560-8" + style="opacity:0.34659089;fill-opacity:0;stroke:#ffffff;stroke-width:0.99999946;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none" + d="m 28.422,15.496 a 12.929,12.931 0 0 1 -25.858,0 12.929,12.931 0 1 1 25.858,0 z" + stroke-miterlimit="4" + inkscape:connector-curvature="0" /> + <path + id="path3955-0" + d="m 28.693,14.882 c 0,7.3778 -7.052,-4.2686 -12.719,0.26321 -5.5346,4.4261 -14.028,8.3042 -14.028,0.92639 0,-7.5505 5.9222,-14.555 13.299,-14.555 7.3764,0 13.448,5.9878 13.448,13.366 z" + style="fill:url(#linearGradient3421);fill-rule:nonzero" + inkscape:connector-curvature="0" /> + </g> + <g + id="text3046-4" + font-size="40px" + transform="translate(176,23.999395)" + font-style="normal" + font-weight="normal" + style="font-style:normal;font-weight:normal;font-size:40px;font-family:'Bitstream Vera Sans';fill:#eeeeec"> + <path + id="path28468" + style="text-align:center;fill:#eeeeec" + d="m 16.861,6.9638 c -0.72,0 -1.296,0.576 -1.296,1.296 0,0.744 0.576,1.296 1.296,1.296 0.696,0 1.296,-0.576 1.296,-1.296 0,-0.696 -0.6,-1.296 -1.296,-1.296 m -0.48,5.328 -3.552,0.768 v 0.624 l 1.944,0.36 -1.416,7.152 c -0.096,0.528 -0.144,0.96 -0.144,1.248 0,1.056 0.504,1.584 1.536,1.584 0.912,0 2.064,-0.288 3.384,-0.84 v -0.744 c -0.744,0.24 -1.32,0.36 -1.776,0.36 -0.744,0 -1.152,-0.312 -1.152,-0.936 0,-0.144 0.024,-0.336 0.072,-0.6 l 1.728,-8.976 h -0.624" + inkscape:connector-curvature="0" /> + </g> + </g> + <g + transform="matrix(5.33,0,0,5.33,-34.300001,-34.477332)" + id="g870"> + <g + transform="translate(7.9999996,7.9995145)" + id="g856"> + <path + inkscape:connector-curvature="0" + display="block" + transform="matrix(1.070555,0,0,0.525,-0.892755,22.5)" + d="M 41,40 A 17.143,8.5714 0 1 1 6.714,40 17.143,8.5714 0 1 1 41,40 Z" + style="color:#000000;display:block;opacity:0.6;fill:url(#radialGradient872);fill-rule:nonzero" + id="path854" /> + </g> + <path + inkscape:connector-curvature="0" + stroke-miterlimit="4" + d="m 53.5,31 a 21.5,21.5 0 0 1 -43,0 21.5,21.5 0 1 1 43,0 z" + style="fill:url(#linearGradient874);fill-rule:nonzero;stroke:#204a87;stroke-width:0.99999976;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none" + id="path858" /> + <path + inkscape:connector-curvature="0" + stroke-miterlimit="4" + d="m 52.539,31 a 20.539,20.539 0 0 1 -41.077,0 20.539,20.539 0 1 1 41.077,0 z" + style="opacity:0.45;fill-opacity:0;stroke:#eeeeec;stroke-width:0.99999887;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none" + id="path860" /> + <g + transform="translate(7.9999996,7.9995145)" + id="g864"> + <path + inkscape:connector-curvature="0" + style="fill:url(#linearGradient876);fill-rule:nonzero" + d="m 43.429,21.8 c 0,10.863 -10.385,-6.2851 -18.731,0.38754 -8.1507,6.517 -20.659,12.227 -20.659,1.364 0,-11.117 8.7214,-21.431 19.584,-21.431 10.8626,0 19.805,8.8164 19.805,19.679 z" + id="path862" /> + </g> + <g + style="font-style:normal;font-weight:normal;font-size:40px;font-family:'Bitstream Vera Sans';fill:#eeeeec" + font-weight="normal" + font-style="normal" + transform="translate(7.9999996,7.9995145)" + font-size="40px" + id="g868"> + <path + inkscape:connector-curvature="0" + d="m 26.05,10.202 c -1.08,0 -1.944,0.864 -1.944,1.944 0,1.116 0.864,1.944 1.944,1.944 1.044,0 1.944,-0.864 1.944,-1.944 0,-1.044 -0.9,-1.944 -1.944,-1.944 m -0.72,7.992 -5.328,1.152 v 0.936 l 2.916,0.54 -2.124,10.728 c -0.144,0.792 -0.216,1.44 -0.216,1.872 0,1.584 0.756,2.376 2.304,2.376 1.368,0 3.096,-0.432 5.076,-1.26 v -1.116 c -1.116,0.36 -1.98,0.54 -2.664,0.54 -1.116,0 -1.728,-0.468 -1.728,-1.404 0,-0.216 0.036,-0.504 0.108,-0.9 L 26.266,18.194 H 25.33" + style="text-align:center;fill:#eeeeec" + id="path866" /> + </g> + </g> +</svg> diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index fe80339568b..cfcd3994f99 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -1069,6 +1069,9 @@ IDI_SHELL_RESTRICTED2 ICON resources/restricted.ico /* @makedep: resources/internet.ico */ IDI_SHELL_WEB_BROWSER ICON resources/internet.ico +/* @makedep: resources/info.ico */ +IDI_SHELL_INFO ICON resources/info.ico + /* @makedep: resources/idb_sort_incr.bmp */ IDB_SORT_INCR BITMAP resources/idb_sort_incr.bmp diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index deabe568022..dfa7c7ffbfd 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -375,6 +375,8 @@ #define IDI_SHELL_RESTRICTED2 338 /* 339 - 511 not used on Windows */ #define IDI_SHELL_WEB_BROWSER 512 +/* 512 - 1000 not used on Windows */ +#define IDI_SHELL_INFO 1001 /* AVI resources, windows shell32 has 14 of them: 150-152 and 160-170 -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/10950
From: Stefan Dösinger <stefan@codeweavers.com> --- dlls/shell32/iconcache.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/iconcache.c b/dlls/shell32/iconcache.c index 9433361440c..873f1a12a12 100644 --- a/dlls/shell32/iconcache.c +++ b/dlls/shell32/iconcache.c @@ -1037,7 +1037,7 @@ static INT stock_icon_id_to_resource_id(SHSTOCKICONID id) MISSING_ICON(SIID_FOLDERFRONT); case SIID_SHIELD: return IDI_SHELL_SHIELD; MISSING_ICON(SIID_WARNING); - MISSING_ICON(SIID_INFO); + case SIID_INFO: return IDI_SHELL_INFO; case SIID_ERROR: return IDI_SHELL_RESTRICTED; MISSING_ICON(SIID_KEY); MISSING_ICON(SIID_SOFTWARE); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/10950
participants (2)
-
Stefan Dösinger -
Stefan Dösinger (＠stefan)