November 2018 - Wine-Commits

Alex Henrie : shell32: Remove alpha channel from 4-bit and 8-bit network icons.
by Alexandre Julliard Nov. 29, 2018

Nov. 29, 2018

Module: wine Branch: stable Commit: 9633d6bb1403f6420ad335abf5c967ddb362b4a9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9633d6bb1403f6420ad335ab… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Aug 20 22:33:32 2018 -0600 shell32: Remove alpha channel from 4-bit and 8-bit network icons. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 791b057ecc879b5a21c5a1f7e9b8a02e84ec3d4d) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/resources/network.ico | Bin 47208 -> 43624 bytes dlls/shell32/resources/network.svg | 106 +++++++++++++++++++------------------ 2 files changed, 54 insertions(+), 52 deletions(-) diff --git a/dlls/shell32/resources/network.ico b/dlls/shell32/resources/network.ico index 0d05f27..bb38612 100644 Binary files a/dlls/shell32/resources/network.ico and b/dlls/shell32/resources/network.ico differ diff --git a/dlls/shell32/resources/network.svg b/dlls/shell32/resources/network.svg index 7c5bdb2..98ab5fc 100644 --- a/dlls/shell32/resources/network.svg +++ b/dlls/shell32/resources/network.svg @@ -2623,28 +2623,24 @@ AElFTkSuQmCC height="32" preserveAspectRatio="none" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAMAAABEpIrGAAAABGdBTUEAALGPC/xhBQAAACBjSFJN -AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAABqlBMVEUAAABeXl5eXl4AAABe -Xl4AAAAAAAAAAABeXl5bW1sAAAB/f34AAAAAAAAAAABZWVkAAAAAAAB1dXR/f35/f35/f34AAAAA -AAAAAAAAAAAAAABVV1MAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABeXl6qqqnt7e3c -3Nx7e3uzs7Pl5eXz8/P19fbAwMXz8/Tw8PBgYGC3tMO3tcT19fV0jbHk5OT9/f36+vr39/fGxsbu -7u62tMO3tcOzscG1s8Hq6uvW2uFTgrnv7+/5+fn8/Pz29vbEy9i9vb3a2trZ2dnW1tbV1dXS0tL0 -9PTY2Nh1dXVlZWWxsbG2tra1tbW0tLTy8vK4uLiFhYX4+PhmZmZzc3KDg4Px8fHj4+Pe3t7b29vo -6Oji4uLf39/+/v6lpaWKioqrq6u6urq5ubl9fXy0tLNvb26IiIiysrJ+fn7Dw8N/f37IyMeqqqp8 -fHy8vLzJycnT09PU1NTLy8uBgYBpaWhdXVzX19ekpKPs7OzBwcHNzczq6uqAgH/r6+vNzc2trayd -nZxjY2Kvr6/7+/v////KwuqiAAAAJ3RSTlMAM7oBuS01QazDHyUCBQu0EA0ov/jMBBkaDCKRFAoV -HR4lISAmGAekRLUEAAAAAWJLR0SNGwzi1QAAAAlwSFlzAAALEgAACxIB0t1+/AAAAAd0SU1FB9YG -DBcnGvPr4WAAAAG6SURBVDjLvZNpV9NAFEADUpaUTUCQguwQ0kkL9lFgqmWtBmKIbCmbYK22gCxK -h0WUVUFR+NHOTJoWSj9zXz7e817OPYkgPDQ5uZJNbs6jLEJep2zTmZdtgyS7kYXikbIKXtTV3U2f -58iXEhxgkc8EH+rx+/1dvX1pwQH9GAcCL15CARWCaGBwaHhkNIRe2QK8xlilwlgQuBCijI+HUDAl -BDQLzASZCxQkpwXljT5hvFUmmeCdQmh65lYMJsyaZjg8NzvPhAVaYPFuDFhKnmAbCqV3yysZMWAp -eeI9P+GLyBkxUie8TPig69GMGBD46PF8iugxJhTxV7sbA+Kra+va540FlQqbW9uimBED4l++7iTc -0TATyC65FwPw3v66ph1oaYHF4HyzhMPvfLhwSJIxLBJc+GHwoYKTHBGnFYOyfHwiFQrFgBMGHxUI -OTXOCOExzs+3fv5yX0hCCWDtlI8KyqXx2zxSeIxYLKpHIn8koRSwOcWHbbgy/xLyT0pTJpQDvtb5 -qPC4orLqiVOorhFtnpYIIsTVGz5xEGuzfOmuOrCpc9QX3xeeNTQ2uZpbWttcbc3tHQ/+pzL+A3of -lvS0nMz0AAAAPnRFWHRDb21tZW50AENyZWF0ZWQgd2l0aCBUaGUgR0lNUAoKKGMpIDIwMDMgSmFr -dWIgJ2ppbW1hYycgU3RlaW5lcicz71gAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTctMTAtMTlUMDA6 -MTQ6MDktMDY6MDCO1Rn8AAAAJXRFWHRkYXRlOm1vZGlmeQAyMDA2LTA2LTEzVDA1OjM5OjI2LTA2 -OjAwewtT2wAAAABJRU5ErkJggg== +AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAABSlBMVEUAAABeXl5/f351dXRe +Xl6qqqnt7e3c3Nx7e3uzs7Pl5eXz8/P19fbAwMXz8/Tw8PBgYGC3tMO3tcT19fV0jbHk5OT9/f36 ++vr39/fGxsbu7u62tMO3tcOzscG1s8Hq6uvW2uFTgrnv7+/5+fn8/Pz29vbEy9i9vb3a2trZ2dnW +1tbV1dXS0tL09PTY2Nh1dXVlZWWxsbG2tra1tbW0tLTy8vK4uLiFhYX4+PhmZmZzc3KDg4Px8fHj +4+Pe3t7b29vo6Oji4uLf399bW1v+/v6lpaWKioqrq6u6urq5ubl9fXy0tLNvb26IiIiysrJ+fn7D +w8N/f37IyMeqqqp8fHy8vLzJycnT09PU1NTLy8uBgYBpaWhdXVzX19ekpKPs7OzBwcHNzczq6uqA +gH/r6+vNzc2traydnZxjY2JZWVmvr6/7+/tVV1P///+7AdJuAAAABHRSTlMAAAAAs5NmmgAAAAFi +S0dEbbsGAK0AAAAJcEhZcwAACxIAAAsSAdLdfvwAAAAHdElNRQfWBgwXJxrz6+FgAAABeElEQVQ4 +y73TSVfCMBQFYMBSUgaJqK3iiFZqraIURUQriigqDsQJRRHnkf+/NnkFCoWFK+7r8jt5Ofc0Dkev +4+SsOLsBzs034ua6At6DzAje7sCH/IEA/fpR0ALYDIAgGgiFQv7BoRaAh0VRkkZGmeDCaGx8YnJq +OoJmGgDPiqJMwVwYA4jQRKMRFG4CSTEjMsADoEG8BYR5dUFbFJYY8MUQWl5pKwNLcV1PJFbjawwk +aQPr7WXgVH0FnMBtpDdtZeBUfcUWrAgavK2M5gofA9uqmrGVgaUdr3fXULMM7MHN2svAuf2DvHJ4 +lJQpOC6cdJSBc6dn50VPJsEAuSAdZWDx8iqvKNeKBVgZkBsTlG5hAJRIvQwzRQB3GgwFLlImLrMM +mvT9AwegqMHImJCK9kgIlFGtFp6ePS8AlAqMjIVX7U0vC1BGNptRDeMdgB6DYSd86J+EfLX8ud8M +/Kgw9A59hNA72IJz8i9MDnd/CjXcSK3nz/Cf+QMmqkj4IzdXmgAAAD50RVh0Q29tbWVudABDcmVh +dGVkIHdpdGggVGhlIEdJTVAKCihjKSAyMDAzIEpha3ViICdqaW1tYWMnIFN0ZWluZXInM+9YAAAA +JXRFWHRkYXRlOmNyZWF0ZQAyMDE3LTEwLTE5VDAwOjE0OjA5LTA2OjAwjtUZ/AAAACV0RVh0ZGF0 +ZTptb2RpZnkAMjAwNi0wNi0xM1QwNTozOToyNi0wNjowMHsLU9sAAAAASUVORK5CYII= " id="icon:32-8" x="480" @@ -2654,19 +2650,24 @@ OjAwewtT2wAAAABJRU5ErkJggg== height="32" preserveAspectRatio="none" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAMAAABEpIrGAAAABGdBTUEAALGPC/xhBQAAACBjSFJN -AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAXVBMVEUAAABmZmZmZmYAAAAA -AABmZmZVVVUAAAB3d3cAAAB3d3d3d3dVVVVmZmaqqqru7u7d3d13d3e7u7u7u8x3iKr////MzMy7 -qrtViLvMzN2IiIh3d2ZVVVWIiHeZmZnD2vm6AAAADXRSTlMAM7szRKq7IiIRu8yZ1UekpQAAAAFi -S0dEFeXY+aMAAAAJcEhZcwAACxIAAAsSAdLdfvwAAAAHdElNRQfWBgwXJxrz6+FgAAABEElEQVQ4 -y72S2WKDIBBFiTZB2wyzWGhil///zA5MxWB5zsEX5XiBq849m9MAG8OpJwwBN8LQEwCJDSHoC4zL -ki/GKox/i44myKLT+L4LI1DMJHgxQT4E6bYLEA3MT1S4Kfd7I4gRd0FpBFKSWEI+BTRlQAwlIBRB -tIG1LaMukYUzAK+HMg5LIOGhjHaJ7B7KgIhUyDeXsrW2DE1Yw3ZMlk/vD2VAXIPuhkxI/K8MTeA9 -wYTtFMmEZOyC1B7EBCpDhYlXnqwMheELztZDGRGYiYI2ncvQtyURQiPIN6GsAlRJ4OYmIcjP47cC -uGQhUBkR5umV3ybnZl9xzm8/TIzg585v6q817jr2hPkhrzf/BH4Baq8mn7gF60sAAAA+dEVYdENv -bW1lbnQAQ3JlYXRlZCB3aXRoIFRoZSBHSU1QCgooYykgMjAwMyBKYWt1YiAnamltbWFjJyBTdGVp -bmVyJzPvWAAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNy0xMC0xOVQwMDoxNDowOS0wNjowMI7VGfwA -AAAldEVYdGRhdGU6bW9kaWZ5ADIwMDYtMDYtMTNUMDU6Mzk6MjYtMDY6MDB7C1PbAAAAAElFTkSu -QmCC +AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAABSlBMVEUAAABeXl5/f351dXRe +Xl6qqqnt7e3c3Nx7e3uzs7Pl5eXz8/P19fbAwMXz8/Tw8PBgYGC3tMO3tcT19fV0jbHk5OT9/f36 ++vr39/fGxsbu7u62tMO3tcOzscG1s8Hq6uvW2uFTgrnv7+/5+fn8/Pz29vbEy9i9vb3a2trZ2dnW +1tbV1dXS0tL09PTY2Nh1dXVlZWWxsbG2tra1tbW0tLTy8vK4uLiFhYX4+PhmZmZzc3KDg4Px8fHj +4+Pe3t7b29vo6Oji4uLf399bW1v+/v6lpaWKioqrq6u6urq5ubl9fXy0tLNvb26IiIiysrJ+fn7D +w8N/f37IyMeqqqp8fHy8vLzJycnT09PU1NTLy8uBgYBpaWhdXVzX19ekpKPs7OzBwcHNzczq6uqA +gH/r6+vNzc2traydnZxjY2JZWVmvr6/7+/tVV1P///+7AdJuAAAABHRSTlMAAAAAs5NmmgAAAAFi +S0dEbbsGAK0AAAAJcEhZcwAACxIAAAsSAdLdfvwAAAAHdElNRQfWBgwXJxrz6+FgAAABeElEQVQ4 +y73TSVfCMBQFYMBSUgaJqK3iiFZqraIURUQriigqDsQJRRHnkf+/NnkFCoWFK+7r8jt5Ofc0Dkev +4+SsOLsBzs034ua6At6DzAje7sCH/IEA/fpR0ALYDIAgGgiFQv7BoRaAh0VRkkZGmeDCaGx8YnJq +OoJmGgDPiqJMwVwYA4jQRKMRFG4CSTEjMsADoEG8BYR5dUFbFJYY8MUQWl5pKwNLcV1PJFbjawwk +aQPr7WXgVH0FnMBtpDdtZeBUfcUWrAgavK2M5gofA9uqmrGVgaUdr3fXULMM7MHN2svAuf2DvHJ4 +lJQpOC6cdJSBc6dn50VPJsEAuSAdZWDx8iqvKNeKBVgZkBsTlG5hAJRIvQwzRQB3GgwFLlImLrMM +mvT9AwegqMHImJCK9kgIlFGtFp6ePS8AlAqMjIVX7U0vC1BGNptRDeMdgB6DYSd86J+EfLX8ud8M +/Kgw9A59hNA72IJz8i9MDnd/CjXcSK3nz/Cf+QMmqkj4IzdXmgAAAD50RVh0Q29tbWVudABDcmVh +dGVkIHdpdGggVGhlIEdJTVAKCihjKSAyMDAzIEpha3ViICdqaW1tYWMnIFN0ZWluZXInM+9YAAAA +JXRFWHRkYXRlOmNyZWF0ZQAyMDE3LTEwLTE5VDAwOjE0OjA5LTA2OjAwjtUZ/AAAACV0RVh0ZGF0 +ZTptb2RpZnkAMjAwNi0wNi0xM1QwNTozOToyNi0wNjowMHsLU9sAAAAASUVORK5CYII= " id="icon:32-4" x="520" @@ -2694,15 +2695,15 @@ rkJggg== height="16" preserveAspectRatio="none" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAABGdBTUEAALGPC/xhBQAAACBjSFJN -AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAflBMVEUAAABeXl5eXl5eXl4V -FRReXl5eXl6Xl5ft7e2mpqbY2Nh7e3ukpKTm5ubz8/P19faamprw8PByn894d3+6urru7u7AwMXz -8/TT09P19fXq6uvR0dHr6+vAwMDZ2dnBwcG3t7e8vLxYWFjIyMjFxcXo6Oi2trbV1dXExMT///9v -zjC6AAAABnRSTlMAfVzdn5fz3KWkAAAAAWJLR0QpyreFJAAAAAlwSFlzAAALEgAACxIB0t1+/AAA -AAd0SU1FB9UMBwgdF6SsSucAAACLSURBVBjTTY7bEoIwDAVblYhGqamICHhB8fL/X2jSpI77uDOb -HOc8KN4pflkqKzNQrlHYbMFEhSGEnXUzFoQx7mtSau/gwALIOgK+kQR3TXNEEVWLmLpwiiLm8jKJ -rktCd4lgNKF+AGrT0bOIy/U23n9vwS2kKCBT5LncDY9peub90o2v/v0x8Zd8AXJ2C59ovlvvAAAA -JXRFWHRkYXRlOmNyZWF0ZQAyMDE3LTEwLTE5VDAwOjE0OjA5LTA2OjAwjtUZ/AAAACV0RVh0ZGF0 -ZTptb2RpZnkAMjAwNS0xMi0wN1QxNToyOToyMy0wNzowMCvuOY8AAAAASUVORK5CYII= +AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAdVBMVEUAAABeXl5eXl6Xl5ft +7e2mpqbY2Nh7e3ukpKTm5ubz8/P19faamprw8PByn894d3+6urru7u7AwMXz8/TT09P19fXq6uvR +0dHr6+vAwMDZ2dnBwcG3t7e8vLxYWFgVFRTIyMjFxcXo6Oi2trbV1dXExMT///+h5ed6AAAAAnRS +TlMAAHaTzTgAAAABYktHRCZaCJi1AAAACXBIWXMAAAsSAAALEgHS3X78AAAAB3RJTUUH1QwHCB0X +pKxK5wAAAIRJREFUGNNVjtsSgjAMBduIRqmpiAh4QUXw/3/RXFoZ93Fn9iTOeTC8M/yqMNbJQLFB +YbuDJEoMIeyXDghjPFRkVN7BkQVQ6gh4QwV3dX1CEWWDqF04RxVyUkXbqrC/RDCWUNcDNTp6EXG9 +3YfH7yy4J/yT3+Wuf43jOwvphqmbP1ksfAG/6QhrvelQyQAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAx +Ny0xMC0xOVQwMDoxNDowOS0wNjowMI7VGfwAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMDUtMTItMDdU +MTU6Mjk6MjMtMDc6MDAr7jmPAAAAAElFTkSuQmCC " id="icon:16-8" x="584" @@ -2712,14 +2713,15 @@ ZTptb2RpZnkAMjAwNS0xMi0wN1QxNToyOToyMy0wNzowMCvuOY8AAAAASUVORK5CYII= height="16" preserveAspectRatio="none" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAABGdBTUEAALGPC/xhBQAAACBjSFJN -AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAANlBMVEUAAABmZmZmZmZmZmYR -ERFmZmZmZmaZmZnu7u6qqqrd3d13d3d3mcy7u7u7u8zMzMxVVVX///+aULsNAAAABnRSTlMAd1Xd -mZl1hngOAAAAAWJLR0QR4rU9ugAAAAlwSFlzAAALEgAACxIB0t1+/AAAAAd0SU1FB9UMBwgdF6Ss -SucAAABsSURBVBjTTY5BEsAgCMS0rYgipf9/bUHQMQcPYTJuShmcnJxc0WlhADsZDWEJ0nON7ppi -DOLoOLs4uxDava++JoRoWsRh4rb0FL7LhOIJCs5OYROdmb/9LaTHigKLsuZqhyKy91vHLF1CHMkP -zTMHbekx1EEAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTctMTAtMTlUMDA6MTQ6MDktMDY6MDCO1Rn8 -AAAAJXRFWHRkYXRlOm1vZGlmeQAyMDA1LTEyLTA3VDE1OjI5OjIzLTA3OjAwK+45jwAAAABJRU5E -rkJggg== +AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAdVBMVEUAAABeXl5eXl6Xl5ft +7e2mpqbY2Nh7e3ukpKTm5ubz8/P19faamprw8PByn894d3+6urru7u7AwMXz8/TT09P19fXq6uvR +0dHr6+vAwMDZ2dnBwcG3t7e8vLxYWFgVFRTIyMjFxcXo6Oi2trbV1dXExMT///+h5ed6AAAAAnRS +TlMAAHaTzTgAAAABYktHRCZaCJi1AAAACXBIWXMAAAsSAAALEgHS3X78AAAAB3RJTUUH1QwHCB0X +pKxK5wAAAIRJREFUGNNVjtsSgjAMBduIRqmpiAh4QUXw/3/RXFoZ93Fn9iTOeTC8M/yqMNbJQLFB +YbuDJEoMIeyXDghjPFRkVN7BkQVQ6gh4QwV3dX1CEWWDqF04RxVyUkXbqrC/RDCWUNcDNTp6EXG9 +3YfH7yy4J/yT3+Wuf43jOwvphqmbP1ksfAG/6QhrvelQyQAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAx +Ny0xMC0xOVQwMDoxNDowOS0wNjowMI7VGfwAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMDUtMTItMDdU +MTU6Mjk6MjMtMDc6MDAr7jmPAAAAAElFTkSuQmCC " id="icon:16-4" x="608"

1 0

Alex Henrie : shell32: Add "Computers Near Me" icon.
by Alexandre Julliard Nov. 29, 2018

Nov. 29, 2018

Module: wine Branch: stable Commit: ad767594a02c04913b3020bfb843cd85a0cbda4d URL: https://source.winehq.org/git/wine.git/?a=commit;h=ad767594a02c04913b3020bf… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Aug 19 22:45:56 2018 -0600 shell32: Add "Computers Near Me" icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit f0c1f79b07675bc9eb42fc1cd8af7847db153c3f) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/shell32.rc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 6cbe81d..f09aa3a 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -417,6 +417,9 @@ IDI_SHELL_PRINTER ICON printer.ico /* @makedep: network.ico */ IDI_SHELL_MY_NETWORK_PLACES ICON network.ico +/* @makedep: network.ico */ +IDI_SHELL_COMPUTERS_NEAR_ME ICON network.ico + /* @makedep: shortcut.ico */ IDI_SHELL_SHORTCUT ICON shortcut.ico

1 0

Alex Henrie : shell32: Switch the "My Network Places" icon to the network icon.
by Alexandre Julliard Nov. 29, 2018

Nov. 29, 2018

Module: wine Branch: stable Commit: 5dfb48351b5fe059faa38d412574720bf13fe82c URL: https://source.winehq.org/git/wine.git/?a=commit;h=5dfb48351b5fe059faa38d41… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Aug 19 22:45:55 2018 -0600 shell32: Switch the "My Network Places" icon to the network icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit f094a3d198ced493faf552b5543871719d411463) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/shell32.rc | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 7fa1d41..6cbe81d 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -414,6 +414,9 @@ IDI_SHELL_MY_COMPUTER ICON mycomputer.ico /* @makedep: printer.ico */ IDI_SHELL_PRINTER ICON printer.ico +/* @makedep: network.ico */ +IDI_SHELL_MY_NETWORK_PLACES ICON network.ico + /* @makedep: shortcut.ico */ IDI_SHELL_SHORTCUT ICON shortcut.ico @@ -437,10 +440,6 @@ IDI_SHELL_MY_DOCUMENTS ICON mydocs.ico /* FIXME: Following resource is not yet added */ /* @makedep: mydocs.ico */ -IDI_SHELL_MY_NETWORK_PLACES ICON mydocs.ico - -/* FIXME: Following resource is not yet added */ -/* @makedep: mydocs.ico */ IDI_SHELL_FAVORITES ICON mydocs.ico /* @makedep: idb_tb_large.bmp */

1 0

Alex Henrie : shell32: Add Internet icon.
by Alexandre Julliard Nov. 29, 2018

Nov. 29, 2018

Module: wine Branch: stable Commit: b0cd24f3870608dec0ed87fc78acfeaac381688d URL: https://source.winehq.org/git/wine.git/?a=commit;h=b0cd24f3870608dec0ed87fc… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Aug 19 22:45:53 2018 -0600 shell32: Add Internet icon. Adapted from internet-web-browser.svg in the Tango Icon Library. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 44bb2c88307a9f538f73dbd454c08922dc4b1c3f) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/Makefile.in | 1 + dlls/shell32/internet.ico | Bin 0 -> 78510 bytes dlls/shell32/internet.svg | 2614 +++++++++++++++++++++++++++++++++++++++++++++ dlls/shell32/shell32.rc | 3 + 4 files changed, 2618 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b0cd24f3870608dec0ed…

1 0

Alex Henrie : shell32: Add network icon.
by Alexandre Julliard Nov. 29, 2018

Nov. 29, 2018

Module: wine Branch: stable Commit: 4548c25667fc7aa72b4097592f0de6a14d329d25 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4548c25667fc7aa72b409759… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Aug 19 22:45:54 2018 -0600 shell32: Add network icon. Adapted from network-workgroup.svg in the Tango Icon Library. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 891b6fda83aff5f304c49cb9886587626ab221dc) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/Makefile.in | 1 + dlls/shell32/network.ico | Bin 0 -> 47208 bytes dlls/shell32/network.svg | 2727 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/shell32/shell32.rc | 3 + 4 files changed, 2731 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4548c25667fc7aa72b40…

1 0

Alex Henrie : shell32: Rename IDI_SHELL_DOCUMENT to IDI_SHELL_FILE.
by Alexandre Julliard Nov. 29, 2018

Nov. 29, 2018

Module: wine Branch: stable Commit: f91fdd57c5d53b1104162afeac49255772b03342 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f91fdd57c5d53b1104162afe… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Aug 14 22:09:56 2018 -0600 shell32: Rename IDI_SHELL_DOCUMENT to IDI_SHELL_FILE. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 4b5d0f2f43ad1d34b1e3fb4424615c918487e68c) Conflicts: dlls/shell32/iconcache.c Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/iconcache.c | 12 ++++++------ dlls/shell32/shell32.rc | 3 ++- dlls/shell32/shresdef.h | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/shell32/iconcache.c b/dlls/shell32/iconcache.c index fc4e703..2c7f84e 100644 --- a/dlls/shell32/iconcache.c +++ b/dlls/shell32/iconcache.c @@ -467,19 +467,19 @@ static BOOL WINAPI SIC_Initialize( INIT_ONCE *once, void *param, void **context ImageList_SetBkColor(ShellBigIconList, CLR_NONE); /* Load the document icon, which is used as the default if an icon isn't found. */ - hSm = LoadImageA(shell32_hInstance, MAKEINTRESOURCEA(IDI_SHELL_DOCUMENT), + hSm = LoadImageA(shell32_hInstance, MAKEINTRESOURCEA(IDI_SHELL_FILE), IMAGE_ICON, cx_small, cy_small, LR_SHARED); - hLg = LoadImageA(shell32_hInstance, MAKEINTRESOURCEA(IDI_SHELL_DOCUMENT), + hLg = LoadImageA(shell32_hInstance, MAKEINTRESOURCEA(IDI_SHELL_FILE), IMAGE_ICON, cx_large, cy_large, LR_SHARED); if (!hSm || !hLg) { - FIXME("Failed to load IDI_SHELL_DOCUMENT icon!\n"); + FIXME("Failed to load IDI_SHELL_FILE icon!\n"); return FALSE; } - SIC_IconAppend (swShell32Name, IDI_SHELL_DOCUMENT-1, hSm, hLg, 0); - SIC_IconAppend (swShell32Name, -IDI_SHELL_DOCUMENT, hSm, hLg, 0); + SIC_IconAppend (swShell32Name, IDI_SHELL_FILE-1, hSm, hLg, 0); + SIC_IconAppend (swShell32Name, -IDI_SHELL_FILE, hSm, hLg, 0); TRACE("hIconSmall=%p hIconBig=%p\n",ShellSmallIconList, ShellBigIconList); @@ -1005,7 +1005,7 @@ HRESULT WINAPI SHGetStockIconInfo(SHSTOCKICONID id, UINT flags, SHSTOCKICONINFO GetSystemDirectoryW(sii->szPath, MAX_PATH); /* no icons defined: use default */ - sii->iIcon = -IDI_SHELL_DOCUMENT; + sii->iIcon = -IDI_SHELL_FILE; lstrcatW(sii->szPath, shell32dll); if (flags) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 6585416..463a187 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -352,8 +352,9 @@ BEGIN VK_F5, FCIDM_SHVIEW_REFRESH, VIRTKEY END +/* FIXME: Following resource is not yet added */ /* @makedep: document.ico */ -IDI_SHELL_DOCUMENT ICON document.ico +IDI_SHELL_FILE ICON document.ico /* @makedep: folder.ico */ IDI_SHELL_FOLDER ICON folder.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 183a75e..85c1684 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -165,7 +165,7 @@ #define IDD_TITLE 0x3742 #define IDD_TREEVIEW 0x3741 -#define IDI_SHELL_DOCUMENT 1 +#define IDI_SHELL_FILE 1 #define IDI_SHELL_FOLDER 4 #define IDI_SHELL_FOLDER_OPEN 5 #define IDI_SHELL_5_12_FLOPPY 6

1 0

Alex Henrie : shell32: Add document icon.
by Alexandre Julliard Nov. 29, 2018

Nov. 29, 2018

Module: wine Branch: stable Commit: 284176bdb249703addf12bf3c8446d5c58c104b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=284176bdb249703addf12bf3… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Aug 14 22:09:57 2018 -0600 shell32: Add document icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit b14d8f9f11856c1b1f192bf773eb864cba5ad78b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/shell32.rc | 3 +++ dlls/shell32/shresdef.h | 1 + 2 files changed, 4 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 463a187..88ab4ca 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -356,6 +356,9 @@ END /* @makedep: document.ico */ IDI_SHELL_FILE ICON document.ico +/* @makedep: document.ico */ +IDI_SHELL_DOCUMENT ICON document.ico + /* @makedep: folder.ico */ IDI_SHELL_FOLDER ICON folder.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 85c1684..11b940c 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -166,6 +166,7 @@ #define IDD_TREEVIEW 0x3741 #define IDI_SHELL_FILE 1 +#define IDI_SHELL_DOCUMENT 2 #define IDI_SHELL_FOLDER 4 #define IDI_SHELL_FOLDER_OPEN 5 #define IDI_SHELL_5_12_FLOPPY 6

1 0

Alex Henrie : shell32: Add window icon.
by Alexandre Julliard Nov. 29, 2018

Nov. 29, 2018

Module: wine Branch: stable Commit: 79d90550ec4ae58e60de22812d54be24f0ae1d30 URL: https://source.winehq.org/git/wine.git/?a=commit;h=79d90550ec4ae58e60de2281… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Aug 14 22:09:58 2018 -0600 shell32: Add window icon. Adapted from new-window.svg in the Tango Icon Library. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 5ee4e0027c941aa74da00166aa5f07bfd292b1b3) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/Makefile.in | 3 +- dlls/shell32/shell32.rc | 3 + dlls/shell32/shresdef.h | 1 + dlls/shell32/window.ico | Bin 0 -> 30799 bytes dlls/shell32/window.svg | 598 +++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 604 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=79d90550ec4ae58e60de…

1 0

Alex Henrie : shell32: Add 512k and 314k floppy drive icons.
by Alexandre Julliard Nov. 29, 2018

Nov. 29, 2018

Module: wine Branch: stable Commit: ef3b728fbc1c5b19f59929c560e54291961dcaca URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef3b728fbc1c5b19f59929c5… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Aug 14 22:09:59 2018 -0600 shell32: Add 512k and 314k floppy drive icons. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit d72d37008aff257fc157ebc0c321dcfc2ac87f82) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/shell32.rc | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 71db7f0..bcdbea0 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -376,6 +376,14 @@ IDI_SHELL_FOLDER_OPEN_LARGE ICON folder_open.ico /* @makedep: folder_open.ico */ IDI_SHELL_FOLDER_SMALL_XP ICON folder_open.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: floppy.ico */ +IDI_SHELL_5_12_FLOPPY ICON floppy.ico + +/* FIXME: Following resource is not yet added */ +/* @makedep: floppy.ico */ +IDI_SHELL_3_14_FLOPPY ICON floppy.ico + /* @makedep: floppy.ico */ IDI_SHELL_FLOPPY ICON floppy.ico

1 0

Alexandre Julliard : shell32: Move image resources to a resources subdirectory.
by Alexandre Julliard Nov. 29, 2018

Nov. 29, 2018

Module: wine Branch: stable Commit: 0119a9426ec92d3e6fc0398891f5b8fb3515abc7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0119a9426ec92d3e6fc03988… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 20 19:54:48 2018 +0200 shell32: Move image resources to a resources subdirectory. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 8204d04b7fd416c1b6296708937e3c06e058809b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/Makefile.in | 42 +++---- dlls/shell32/{ => resources}/cdrom.ico | Bin dlls/shell32/{ => resources}/cdrom.svg | 0 dlls/shell32/{ => resources}/control.ico | Bin dlls/shell32/{ => resources}/control.svg | 0 dlls/shell32/{ => resources}/delete.ico | Bin dlls/shell32/{ => resources}/delete.svg | 0 dlls/shell32/{ => resources}/desktop.ico | Bin dlls/shell32/{ => resources}/desktop.svg | 0 dlls/shell32/{ => resources}/document.ico | Bin dlls/shell32/{ => resources}/document.svg | 0 dlls/shell32/{ => resources}/drive.ico | Bin dlls/shell32/{ => resources}/drive.svg | 0 dlls/shell32/{ => resources}/floppy.ico | Bin dlls/shell32/{ => resources}/floppy.svg | 0 dlls/shell32/{ => resources}/folder.ico | Bin dlls/shell32/{ => resources}/folder.svg | 0 dlls/shell32/{ => resources}/folder_open.ico | Bin dlls/shell32/{ => resources}/folder_open.svg | 0 dlls/shell32/{ => resources}/idb_tb_large.bmp | Bin dlls/shell32/{ => resources}/idb_tb_small.bmp | Bin dlls/shell32/{ => resources}/internet.ico | Bin dlls/shell32/{ => resources}/internet.svg | 0 dlls/shell32/{ => resources}/mycomputer.ico | Bin dlls/shell32/{ => resources}/mycomputer.svg | 0 dlls/shell32/{ => resources}/mydocs.ico | Bin dlls/shell32/{ => resources}/mydocs.svg | 0 dlls/shell32/{ => resources}/netdrive.ico | Bin dlls/shell32/{ => resources}/netdrive.svg | 0 dlls/shell32/{ => resources}/netdrive2.ico | Bin dlls/shell32/{ => resources}/netdrive2.svg | 0 dlls/shell32/{ => resources}/network.ico | Bin dlls/shell32/{ => resources}/network.svg | 0 dlls/shell32/{ => resources}/printer.ico | Bin dlls/shell32/{ => resources}/printer.svg | 0 dlls/shell32/{ => resources}/ramdisk.ico | Bin dlls/shell32/{ => resources}/ramdisk.svg | 0 dlls/shell32/{ => resources}/recent.ico | Bin dlls/shell32/{ => resources}/recent.svg | 0 dlls/shell32/{ => resources}/searching.avi | Bin dlls/shell32/{ => resources}/shortcut.ico | Bin dlls/shell32/{ => resources}/shortcut.svg | 0 dlls/shell32/{ => resources}/trash_file.ico | Bin dlls/shell32/{ => resources}/trash_file.svg | 0 dlls/shell32/{ => resources}/window.ico | Bin dlls/shell32/{ => resources}/window.svg | 0 dlls/shell32/shell32.rc | 172 +++++++++++++------------- 47 files changed, 107 insertions(+), 107 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0119a9426ec92d3e6fc0…

1 0