August 2018 - Wine-commits - list.winehq.org

Michael Stefaniuc : dmusic: Fake success in two stub midi port methods.
by Alexandre Julliard 21 Aug '18

21 Aug '18

Module: wine Branch: master Commit: dcb438ebf8d5a9a50082dd9be836fd800d66a33a URL: https://source.winehq.org/git/wine.git/?a=commit;h=dcb438ebf8d5a9a50082dd9b… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Aug 20 23:30:17 2018 +0200 dmusic: Fake success in two stub midi port methods. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmusic/port.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dmusic/port.c b/dlls/dmusic/port.c index 9a18c88..1fa9469 100644 --- a/dlls/dmusic/port.c +++ b/dlls/dmusic/port.c @@ -977,7 +977,7 @@ static HRESULT WINAPI midi_IDirectMusicPort_SetReadNotificationHandle(IDirectMus { FIXME("(%p, %p) stub!\n", iface, event); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI midi_IDirectMusicPort_Read(IDirectMusicPort *iface, @@ -1164,7 +1164,7 @@ static HRESULT WINAPI midi_IDirectMusicThru_ThruChannel(IDirectMusicThru *iface, FIXME("(%p, %u, %u, %u, %u, %p) stub!\n", iface, src_group, src_channel, dest_group, dest_channel, dest_port); - return E_NOTIMPL; + return S_OK; } static const IDirectMusicThruVtbl midi_thru_vtbl = {

1 0

Alex Henrie : shell32: Remove alpha channel from 4-bit and 8-bit Internet icons.
by Alexandre Julliard 21 Aug '18

21 Aug '18

Module: wine Branch: master Commit: ba0007260e7861df1d6610876c71c15005beda89 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ba0007260e7861df1d661087… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Aug 20 22:33:31 2018 -0600 shell32: Remove alpha channel from 4-bit and 8-bit Internet icons. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/resources/internet.ico | Bin 78510 -> 76974 bytes dlls/shell32/resources/internet.svg | 373 ++++++++++++++++++++++++++---------- 2 files changed, 274 insertions(+), 99 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ba0007260e7861df1d66…

1 0

Alex Henrie : shell32: Remove alpha channel from 4-bit and 8-bit network icons.
by Alexandre Julliard 21 Aug '18

21 Aug '18

Module: wine Branch: master Commit: 791b057ecc879b5a21c5a1f7e9b8a02e84ec3d4d URL: https://source.winehq.org/git/wine.git/?a=commit;h=791b057ecc879b5a21c5a1f7… 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> --- 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 search icon.
by Alexandre Julliard 21 Aug '18

21 Aug '18

Module: wine Branch: master Commit: c1b264ac1833d9e99c1d33eaf6efd764951887e5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c1b264ac1833d9e99c1d33ea… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Aug 20 22:33:33 2018 -0600 shell32: Add search icon. Adapted from system-search.svg in the Tango Icon Library. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/Makefile.in | 1 + dlls/shell32/resources/search.ico | Bin 0 -> 78155 bytes dlls/shell32/resources/search.svg | 892 ++++++++++++++++++++++++++++++++++++++ dlls/shell32/shell32.rc | 3 + 4 files changed, 896 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c1b264ac1833d9e99c1d…

1 0

Alex Henrie : shell32: Add help icon.
by Alexandre Julliard 21 Aug '18

21 Aug '18

Module: wine Branch: master Commit: 84e2cf037546fcd57dcacd58b28d56d287dad8d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=84e2cf037546fcd57dcacd58… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Aug 20 22:33:34 2018 -0600 shell32: Add help icon. Adapted from help-browser in the Tango Icon Library. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/Makefile.in | 1 + dlls/shell32/resources/help.ico | Bin 0 -> 71467 bytes dlls/shell32/resources/help.svg | 647 ++++++++++++++++++++++++++++++++++++++++ dlls/shell32/shell32.rc | 3 + 4 files changed, 651 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=84e2cf037546fcd57dca…

1 0

Francois Gouget : testbot: Always recognize 'Task:' status lines in the logs.
by Alexandre Julliard 21 Aug '18

21 Aug '18

Module: tools Branch: master Commit: 2100194a5c76389c4242bce5cc1253958ee9d244 URL: https://source.winehq.org/git/tools.git/?a=commit;h=2100194a5c76389c4242bce… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Aug 21 07:56:07 2018 +0200 testbot: Always recognize 'Task:' status lines in the logs. This opens the door to standardizing the format of the status lines. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LogUtils.pm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index e6f9a27..d39c81b 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -60,16 +60,16 @@ sub ParseTaskLog($$) foreach my $Line (<$LogFile>) { chomp $Line; - if ($Line =~ /^$ResultPrefix: ok$/) + if ($Line =~ /^(?:$ResultPrefix|Task): ok$/) { $Result ||= "ok"; } - elsif ($Line =~ /^$ResultPrefix: Patch failed to apply$/) + elsif ($Line =~ /^(?:$ResultPrefix|Task): Patch failed to apply$/) { $Result = "badpatch"; last; # Should be the last and most specific message } - elsif ($Line =~ /^$ResultPrefix: /) + elsif ($Line =~ /^(?:$ResultPrefix|Task): /) { $Result = "failed"; }

1 0

Francois Gouget : testbot/WineRunWine*: Better check the step type.
by Alexandre Julliard 21 Aug '18

21 Aug '18

Module: tools Branch: master Commit: d607738c760a00556f49772a27c7d29472619be4 URL: https://source.winehq.org/git/tools.git/?a=commit;h=d607738c760a00556f49772… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Aug 21 07:56:29 2018 +0200 testbot/WineRunWine*: Better check the step type. This can help avoid errors when testing the script manually. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunBuild.pl | 6 +++++- testbot/bin/WineRunReconfig.pl | 6 +++++- testbot/bin/WineRunTask.pl | 6 +++++- testbot/bin/WineRunWineTest.pl | 6 +++++- 4 files changed, 20 insertions(+), 4 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index 47e4b3b..c681d2e 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -325,9 +325,13 @@ if (!$VM->GetDomain()->IsPoweredOn()) FatalError("The VM is not powered on\n"); } +if ($Step->Type ne "build") +{ + FatalError("Unexpected step type '". $Step->Type ."' found\n"); +} if ($Step->FileType ne "patch") { - FatalError("Unexpected file type '". $Step->FileType ."' found\n"); + FatalError("Unexpected file type '". $Step->FileType ."' found for ". $Step->Type ." step\n"); } diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 7278bcd..2301804 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -325,9 +325,13 @@ if (!$VM->GetDomain()->IsPoweredOn()) FatalError("The VM is not powered on\n"); } +if ($Step->Type ne "reconfig") +{ + FatalError("Unexpected step type '". $Step->Type ."' found\n"); +} if ($Step->FileType ne "none") { - FatalError("Unexpected file type '". $Step->FileType ."' found\n"); + FatalError("Unexpected file type '". $Step->FileType ."' found for ". $Step->Type ." step\n"); } diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 204f863..27dd8e7 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -381,9 +381,13 @@ if (!$VM->GetDomain()->IsPoweredOn()) FatalError("The VM is not powered on\n"); } +if ($Step->Type ne "single" and $Step->Type ne "suite") +{ + FatalError("Unexpected step type '". $Step->Type ."' found\n"); +} if ($Step->FileType ne "exe32" and $Step->FileType ne "exe64") { - FatalError("Unexpected file type '". $Step->FileType ."' found\n"); + FatalError("Unexpected file type '". $Step->FileType ."' found for ". $Step->Type ." step\n"); } diff --git a/testbot/bin/WineRunWineTest.pl b/testbot/bin/WineRunWineTest.pl index ee4c853..6c0c923 100755 --- a/testbot/bin/WineRunWineTest.pl +++ b/testbot/bin/WineRunWineTest.pl @@ -382,10 +382,14 @@ if (!$VM->GetDomain()->IsPoweredOn()) FatalError("The VM is not powered on\n"); } +if ($Step->Type ne "build" and $Step->Type ne "suite") +{ + FatalError("Unexpected step type '". $Step->Type ."' found\n"); +} if (($Step->Type eq "suite" and $Step->FileType ne "none") or ($Step->Type ne "suite" and $Step->FileType ne "patch")) { - FatalError("Unexpected file type '". $Step->FileType ."' found\n"); + FatalError("Unexpected file type '". $Step->FileType ."' found for ". $Step->Type ." step\n"); }

1 0

Francois Gouget : testbot/Build: There is no need to create build-native.
by Alexandre Julliard 21 Aug '18

21 Aug '18

Module: tools Branch: master Commit: 3fdc4b088ebf9cf981b14e3091a1057c35292def URL: https://source.winehq.org/git/tools.git/?a=commit;h=3fdc4b088ebf9cf981b14e3… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Aug 21 07:56:57 2018 +0200 testbot/Build: There is no need to create build-native. That directory is created by Reconfig.pl which must be run before Build.pl. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/build/Build.pl | 2 -- 1 file changed, 2 deletions(-) diff --git a/testbot/bin/build/Build.pl b/testbot/bin/build/Build.pl index b729d95..e1133aa 100755 --- a/testbot/bin/build/Build.pl +++ b/testbot/bin/build/Build.pl @@ -132,8 +132,6 @@ sub ApplyPatch($) sub BuildNative() { - mkdir "$DataDir/build-native" if (! -d "$DataDir/build-native"); - InfoMsg "\nRebuilding native tools\n"; system("cd '$DataDir/build-native' && set -x && ". "time make -j$ncpus __tooldeps__");

1 0

Francois Gouget : testbot/WineRunWineTest: Use the new WineTest command line options.
by Alexandre Julliard 21 Aug '18

21 Aug '18

Module: tools Branch: master Commit: ed6b46099fc250ff2ebd57a279902bbed9c2c6e8 URL: https://source.winehq.org/git/tools.git/?a=commit;h=ed6b46099fc250ff2ebd57a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Aug 21 07:57:11 2018 +0200 testbot/WineRunWineTest: Use the new WineTest command line options. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunWineTest.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/bin/WineRunWineTest.pl b/testbot/bin/WineRunWineTest.pl index 6c0c923..ac55946 100755 --- a/testbot/bin/WineRunWineTest.pl +++ b/testbot/bin/WineRunWineTest.pl @@ -428,7 +428,7 @@ if ($Step->Type eq "suite") my $Tag = lc($VM->Name); $Tag =~ s/^$TagPrefix//; $Tag =~ s/[^a-zA-Z0-9]/-/g; - $Script .= $Task->CmdLineArg .",submit winetest $TagPrefix-$Tag "; + $Script .= "--winetest ". $Task->CmdLineArg ." $TagPrefix-$Tag "; if (defined $WebHostName) { my $StepTask = 100 * $StepNo + $TaskNo; @@ -444,7 +444,7 @@ if ($Step->Type eq "suite") } else { - $Script .= $Task->CmdLineArg ." build patch.diff"; + $Script .= "--testpatch ". $Task->CmdLineArg ." patch.diff"; } $Script .= "\n) >Task.log 2>&1\n"; Debug(Elapsed($Start), " Sending the script: [$Script]\n");

1 0

Francois Gouget : testbot/WineRunBuild: Use the new Build command line options.
by Alexandre Julliard 21 Aug '18

21 Aug '18

Module: tools Branch: master Commit: 325227c2ef9bf7ba435b90ae284ae89b8c199dbb URL: https://source.winehq.org/git/tools.git/?a=commit;h=325227c2ef9bf7ba435b90a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Aug 21 07:57:16 2018 +0200 testbot/WineRunBuild: Use the new Build command line options. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunBuild.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index c681d2e..32369b1 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -363,7 +363,7 @@ if (!$TA->SendFile($FileName, "staging/patch.diff", 0)) } my $Script = "#!/bin/sh\n". "( set -x\n". - " ../bin/build/Build.pl patch.diff ". join(",", sort keys %Bitnesses) ."\n". + " ../bin/build/Build.pl patch.diff ". join(":", sort keys %Bitnesses) ."\n". ") >Build.log 2>&1\n"; Debug(Elapsed($Start), " Sending the script: [$Script]\n"); if (!$TA->SendFileFromString($Script, "task", $TestAgent::SENDFILE_EXE))

1 0