wine-commits August 2018

wine-commits@winehq.org

2 participants
618 discussions

Alex Henrie : shell32: Scale SVG properly to create 48x48 shutdown icons.
by Alexandre Julliard 24 Aug '18

24 Aug '18

Module: wine Branch: master Commit: c49c12b2cdcfffc9b825c0b2190e9a7425cec949 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c49c12b2cdcfffc9b825c0b2… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Aug 23 23:16:46 2018 -0600 shell32: Scale SVG properly to create 48x48 shutdown icons. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/resources/shut_down.ico | Bin 38405 -> 38405 bytes dlls/shell32/resources/shut_down.svg | 94 ++++++++++++++++++----------------- 2 files changed, 48 insertions(+), 46 deletions(-) diff --git a/dlls/shell32/resources/shut_down.ico b/dlls/shell32/resources/shut_down.ico index cb6aa9c..c8b9f43 100644 Binary files a/dlls/shell32/resources/shut_down.ico and b/dlls/shell32/resources/shut_down.ico differ diff --git a/dlls/shell32/resources/shut_down.svg b/dlls/shell32/resources/shut_down.svg index e637059..c1c2fd3 100644 --- a/dlls/shell32/resources/shut_down.svg +++ b/dlls/shell32/resources/shut_down.svg @@ -634,29 +634,30 @@ height="48" preserveAspectRatio="none" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAQAAAD9CzEMAAAABGdBTUEAALGPC/xhBQAAACBjSFJN -AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAAmJLR0QA/4ePzL8AAAAHdElN -RQfWBgwXJxrz6+FgAAAEVElEQVRYw7XYsXIb1xUG4O8udgGCICRxRIkaZTJxkYwbN36PPEHqVC7y -OH4C165ce8aF+jQplELJyB7F4kgWOaRIEMDe62IXi7sgSJGhfTkEMbtnz3/Of/5z7l3yO68AX+PM -voEgidI93BWCJJlZqnwl8I0LI3/2TyXcC4BCQPLe331rrwE4VXnriYGQGoD/FyK0ADHMXBp7oGTP -kS/NjdMzU0OJewAE0blf0lGoLOwpObHvpYdp6rlDE4N7EERy6VgwS8swc6IkqXHouUOFk7YGoYvp -dm5Xfwulh/5k5HU6D0lJFBVp4qng0qUoKA0N7uA8SeYWoqBWeCD6URSbDKKosueDSwSVsV3lrQBW -7qNLFxZqS+cemWjkUq5VU3TU7JhIFncsdYVaRGy9tRloAdbxDpTm6jsBBIOM1NB9K/NChvZG0FTm -djVYURU3wswA+pH0+b0LRMoi3wqQ327MIZqphR5ckASFStV74mqYVwBCZ5zaa7Uz/3OsUmS2c6U/ -OOg5uANFsYMIorkXfvDEKGuod6b+5lE2WMJdKMozSJJjbwxNxO7+W8dmrdUaVkvlNRStIFL7E7qH -RqYOTDsAPrQqW/O+DumGDFafeWRNEw6N7WYAI5fqjV5JXYBbAUJGUsxUBEU7PurOcmSxsW8ksaPo -ExmkrAZNPAM7ph5kAGOzje01b7QbaxA2VJQklakDjzuA5KGzzumKynTF/TUyvZrByL7nnrQARAeO -W/A+wC1kuspAD+CRpw4t2ytL+/YUG3Z5P9xIUWKjgKWxsd0OYGbXRNFTTOTTGehGha4PkqQ0NFS1 -FtFcZafdQfoZ3Kiivvu8BoVS2RkHAyPjjTzX328s8no3yCNqtpNBN51GHphKllmRYyaST1DUV1Hj -vlIpW4DCjsdOFJbqbsamtgZ9LW2hKLTx54+VSjWG7dXKnqlCbdkdDtYE5RkUtq5VFVIbRan23oWh -oaGRkYVTJWbilpxvSdGKz9KFH+06MWnhl15657HC3E4b5bYuuIai/ggISmf+a+lV17NzR0a+VFh2 -dOaNdqOKNhMuFLjwU2ec8NGBUlB3eovbXF0HELOiRXyuNGs7IigUarv2pFYSa2JvCdDv0NpffO7U -HAOFwkBQm1kYILZD4xadvFqbh655F3ctKtQCSgOhffHKx/UVgM299Oru2ozpQSeC5rfILOJW993R -sd/ghaJXhXUL9V9O8nkVhXYYrlewUDbuil6Ll3ZcZHMm9WCuXmmCGtvNTuip9Vo2ugiWPqoES0mh -uiFpbCi/cTpsB0mhsvRRtPAPJUu1EE7TW4fdSTPYyU4Z630iXIHIh/uqcsGxt8790tTglTO7+Ch6 -ZpKVblv8/cG2Lau5D/7jlX+F7xv7p45MfeWP6TP7dtx3LZ36yb+9CD/kQe77qy9MUnnP92Sic6/D -d964lDXaB68NlaG+88tT7r6ZW3NHfm5fKLv1xb3+Q7FtPfmN/V2zfgWOuPbnoaRocgAAACV0RVh0 -ZGF0ZTpjcmVhdGUAMjAxNy0xMC0xOVQwMDoxNDowOS0wNjowMI7VGfwAAAAldEVYdGRhdGU6bW9k -aWZ5ADIwMDYtMDYtMTNUMDU6Mzk6MjYtMDY6MDB7C1PbAAAAAElFTkSuQmCC +AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAAmJLR0QAAKqNIzIAAAAJcEhZ +cwAAJYAAACWAAWxVCAcAAAAHdElNRQfiCBcQFjk1XaphAAADiUlEQVRYw+2Wz47cRBDGf932ZP5l +dzYTohDllgMIoaBIwAvkmnMk7kg8AxdeIC+AhAK5I/EGOSDlhBAi5IYEm6AIAVKyu5Mlkx2P3cVh +2u0uj+2d2XBMtzyablfXV1995bLhzThlmHjxLcckIshruLMszGfNAN9g5Brvcx57ZoCcI37kOWI+ +9TtpeeseTm5ylRnPPYOYnGl0J2v/LUNu8ZBHIsZoAOQ6V/mbInLXBSENKwEy5tzgT+5qBsI93uOI +wjsypEw51xJ56ay8CjJmOH9nyUs+5L6sDnuAr+gxZIYJsV5CONkw84aUXY4wgGBYMAkMPUCPBIOE ++HsYso2lFQxpcA9CEvhUGgTnK7HYqlgFg8V59/FI40UFYdj2aSiTKxilXNpsxpYM8OUhKg8NDMRD +aAaOA/5dcznkojpeBdbKoIrfqPifcJ8f1gCucZt3lArlFQPUukIcfzy/YJ9MzcfcYUEeLJw/aWrP +TkuKUCky5HzEOXXwCj9R4EKEEjQ4YxWNawBL71YCQBxiCwAqfg0wor8G4EABNPWw1ipyGwDkCqBK +kWkr04rBepObMlDrDMgjO0cS3HdoIEGBOoO3Gan1K2yNAVGhdmhQxq8Bhkx5S1k+Y0ymHkbTzaCM +vLmKduixpw7O2GkRuaNMKwZSM5yQkSjLBROKWpkaVUstGpQMXI3BYg1AM3Cqn26ggajdMScNAPWX +/hYMdKtIGDGsxTJljGMZWoWL2uQp74NSYomMRkxqDC6wy4BDpooBp7WKimCsQY89ztcAdpgw4AUX +AkDc6DteOE29KCVnTs4wyviCJX3mITUu8tDBoOqnGuAvHnDMbtjJ+Jl9+hTM/RMukfsODSoIp4yE +fXJl9xShT8HCAziaemkDQCVZ3Ab6PONA3Rcy9pixjD4bm5LUALBepsJdfuGQBIvFAoY+VyhIMeQk +tH+DtDDQVZRRcJ1DZlgSLAZLgiOnR+JfmxuK3JwiyMnpMyb37lcQfQxg16w3YlA07I1abLsAbJl3 +p7aTLb/rHFZ1sKqmPMDn5GT0QjyWHgWCw1HUZt4wF0xUWo7rDP7hFb8zjGp4wtjXTFk7q7lSIK51 +wXIxAAgJAx7y1NQ0+M4M5TJ7nPjsW3aJ27f+FBB1lb8GQ8qA33jMnbrI33PZiHzMu4rHtkOY84Bf ++dq8pFQ3Gh/wiVw6s/OVO8cffGkOXsvLm/H/jv8AeTNp0HBGM0YAAAAUdEVYdEF1dGhvcgBKYWt1 +YiBTdGVpbmVy5vv3LwAAAFh0RVh0Q29weXJpZ2h0AENDMCBQdWJsaWMgRG9tYWluIERlZGljYXRp +b24gaHR0cDovL2NyZWF0aXZlY29tbW9ucy5vcmcvcHVibGljZG9tYWluL3plcm8vMS4wL8bjvfkA +AAAldEVYdGRhdGU6Y3JlYXRlADIwMTgtMDgtMjNUMjI6MjI6NTctMDY6MDCUsdROAAAAJXRFWHRk +YXRlOm1vZGlmeQAyMDE4LTA4LTIzVDIyOjIyOjU3LTA2OjAw5exs8gAAABl0RVh0U29mdHdhcmUA +d3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAAhdEVYdFNvdXJjZQBodHRwOi8vamltbWFjLm11c2ljaGFs +bC5jemlm414AAAAVdEVYdFRpdGxlAFN5c3RlbSBTaHV0ZG93bt6238UAAAAASUVORK5CYII= " id="icon:48-8" x="328" @@ -666,29 +667,30 @@ aWZ5ADIwMDYtMDYtMTNUMDU6Mzk6MjYtMDY6MDB7C1PbAAAAAElFTkSuQmCC height="48" preserveAspectRatio="none" xlink:href="data:image/png;base64,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 +TkuKUCky5HzEOXXwCj9R4EKEEjQ4YxWNawBL71YCQBxiCwAqfg0wor8G4EABNPWw1ipyGwDkCqBK +kWkr04rBepObMlDrDMgjO0cS3HdoIEGBOoO3Gan1K2yNAVGhdmhQxq8Bhkx5S1k+Y0ymHkbTzaCM +vLmKduixpw7O2GkRuaNMKwZSM5yQkSjLBROKWpkaVUstGpQMXI3BYg1AM3Cqn26ggajdMScNAPWX +/hYMdKtIGDGsxTJljGMZWoWL2uQp74NSYomMRkxqDC6wy4BDpooBp7WKimCsQY89ztcAdpgw4AUX +AkDc6DteOE29KCVnTs4wyviCJX3mITUu8tDBoOqnGuAvHnDMbtjJ+Jl9+hTM/RMukfsODSoIp4yE +fXJl9xShT8HCAziaemkDQCVZ3Ab6PONA3Rcy9pixjD4bm5LUALBepsJdfuGQBIvFAoY+VyhIMeQk +tH+DtDDQVZRRcJ1DZlgSLAZLgiOnR+JfmxuK3JwiyMnpMyb37lcQfQxg16w3YlA07I1abLsAbJl3 +p7aTLb/rHFZ1sKqmPMDn5GT0QjyWHgWCw1HUZt4wF0xUWo7rDP7hFb8zjGp4wtjXTFk7q7lSIK51 +wXIxAAgJAx7y1NQ0+M4M5TJ7nPjsW3aJ27f+FBB1lb8GQ8qA33jMnbrI33PZiHzMu4rHtkOY84Bf ++dq8pFQ3Gh/wiVw6s/OVO8cffGkOXsvLm/H/jv8AeTNp0HBGM0YAAAAUdEVYdEF1dGhvcgBKYWt1 +YiBTdGVpbmVy5vv3LwAAAFh0RVh0Q29weXJpZ2h0AENDMCBQdWJsaWMgRG9tYWluIERlZGljYXRp +b24gaHR0cDovL2NyZWF0aXZlY29tbW9ucy5vcmcvcHVibGljZG9tYWluL3plcm8vMS4wL8bjvfkA +AAAldEVYdGRhdGU6Y3JlYXRlADIwMTgtMDgtMjNUMjI6MjI6NTctMDY6MDCUsdROAAAAJXRFWHRk +YXRlOm1vZGlmeQAyMDE4LTA4LTIzVDIyOjIyOjU3LTA2OjAw5exs8gAAABl0RVh0U29mdHdhcmUA +d3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAAhdEVYdFNvdXJjZQBodHRwOi8vamltbWFjLm11c2ljaGFs +bC5jemlm414AAAAVdEVYdFRpdGxlAFN5c3RlbSBTaHV0ZG93bt6238UAAAAASUVORK5CYII= " id="icon:48-4" x="384"

1 0

Alex Henrie : shell32: Scale SVG properly to create 48x48 sleep icons.
by Alexandre Julliard 24 Aug '18

24 Aug '18

Module: wine Branch: master Commit: 13d2264e731a7e63e7b9e8fa2b03b1a02027f923 URL: https://source.winehq.org/git/wine.git/?a=commit;h=13d2264e731a7e63e7b9e8fa… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Aug 23 23:16:45 2018 -0600 shell32: Scale SVG properly to create 48x48 sleep icons. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/resources/sleep.ico | Bin 65140 -> 65140 bytes dlls/shell32/resources/sleep.svg | 244 ++++++++++++++++++--------------------- 2 files changed, 112 insertions(+), 132 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=13d2264e731a7e63e7b9…

1 0

Dmitry Timoshkov : oleaut32: Use common helper for masked bitmaps to render an icon.
by Alexandre Julliard 24 Aug '18

24 Aug '18

Module: wine Branch: master Commit: 3dcd048175914e7b5c372b5dc201c517028f0f64 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3dcd048175914e7b5c372b5d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Aug 24 16:04:09 2018 +0800 oleaut32: Use common helper for masked bitmaps to render an icon. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/olepicture.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index aa82b05..0ef0ecf 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -711,9 +711,18 @@ static HRESULT WINAPI OLEPictureImpl_Render(IPicture *iface, HDC hdc, } case PICTYPE_ICON: - FIXME("Not quite correct implementation of rendering icons...\n"); - DrawIconEx(hdc, x, y, This->desc.u.icon.hicon, cx, cy, 0, NULL, DI_NORMAL); + { + ICONINFO info; + + if (!GetIconInfo(This->desc.u.icon.hicon, &info)) + return E_FAIL; + + render_masked_bitmap(This, hdc, x, y, cx, cy, xSrc, ySrc, cxSrc, cySrc, info.hbmMask, info.hbmColor); + + DeleteObject(info.hbmMask); + if (info.hbmColor) DeleteObject(info.hbmColor); break; + } case PICTYPE_METAFILE: {

1 0

Dmitry Timoshkov : oleaut32: Move rendering a bitmap to a separate helper.
by Alexandre Julliard 24 Aug '18

24 Aug '18

Module: wine Branch: master Commit: 293a6790767d158ab36ac339fa5a45bd04e440ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=293a6790767d158ab36ac339… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Aug 24 16:04:06 2018 +0800 oleaut32: Move rendering a bitmap to a separate helper. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/olepicture.c | 103 ++++++++++++++++++++++++++++----------------- 1 file changed, 64 insertions(+), 39 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index a2a54bd..aa82b05 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -610,6 +610,55 @@ static HRESULT WINAPI OLEPictureImpl_get_Height(IPicture *iface, return S_OK; } +static void render_masked_bitmap(OLEPictureImpl *This, HDC hdc, + LONG x, LONG y, LONG cx, LONG cy, OLE_XPOS_HIMETRIC xSrc, OLE_YPOS_HIMETRIC ySrc, + OLE_XSIZE_HIMETRIC cxSrc, OLE_YSIZE_HIMETRIC cySrc, HBITMAP hbmMask, HBITMAP hbmXor) +{ + HBITMAP hbmpOld; + HDC hdcBmp; + + /* Set a mapping mode that maps bitmap pixels into HIMETRIC units. + * NB y-axis gets flipped + */ + + hdcBmp = CreateCompatibleDC(0); + SetMapMode(hdcBmp, MM_ANISOTROPIC); + SetWindowOrgEx(hdcBmp, 0, 0, NULL); + SetWindowExtEx(hdcBmp, This->himetricWidth, This->himetricHeight, NULL); + SetViewportOrgEx(hdcBmp, 0, This->origHeight, NULL); + SetViewportExtEx(hdcBmp, This->origWidth, -This->origHeight, NULL); + + if (hbmMask) + { + HDC hdcMask = CreateCompatibleDC(0); + HBITMAP hOldbm = SelectObject(hdcMask, hbmMask); + + hbmpOld = SelectObject(hdcBmp, hbmXor); + + SetMapMode(hdcMask, MM_ANISOTROPIC); + SetWindowOrgEx(hdcMask, 0, 0, NULL); + SetWindowExtEx(hdcMask, This->himetricWidth, This->himetricHeight, NULL); + SetViewportOrgEx(hdcMask, 0, This->origHeight, NULL); + SetViewportExtEx(hdcMask, This->origWidth, -This->origHeight, NULL); + + SetBkColor(hdc, RGB(255, 255, 255)); + SetTextColor(hdc, RGB(0, 0, 0)); + StretchBlt(hdc, x, y, cx, cy, hdcMask, xSrc, ySrc, cxSrc, cySrc, SRCAND); + StretchBlt(hdc, x, y, cx, cy, hdcBmp, xSrc, ySrc, cxSrc, cySrc, SRCPAINT); + + SelectObject(hdcMask, hOldbm); + DeleteDC(hdcMask); + } + else + { + hbmpOld = SelectObject(hdcBmp, hbmXor); + StretchBlt(hdc, x, y, cx, cy, hdcBmp, xSrc, ySrc, cxSrc, cySrc, SRCCOPY); + } + + SelectObject(hdcBmp, hbmpOld); + DeleteDC(hdcBmp); +} + /************************************************************************ * OLEPictureImpl_Render */ @@ -643,48 +692,24 @@ static HRESULT WINAPI OLEPictureImpl_Render(IPicture *iface, HDC hdc, /* nothing to do */ return S_OK; case PICTYPE_BITMAP: - { - HBITMAP hbmpOld; - HDC hdcBmp; - - /* Set a mapping mode that maps bitmap pixels into HIMETRIC units. - NB y-axis gets flipped */ - - hdcBmp = CreateCompatibleDC(0); - SetMapMode(hdcBmp, MM_ANISOTROPIC); - SetWindowOrgEx(hdcBmp, 0, 0, NULL); - SetWindowExtEx(hdcBmp, This->himetricWidth, This->himetricHeight, NULL); - SetViewportOrgEx(hdcBmp, 0, This->origHeight, NULL); - SetViewportExtEx(hdcBmp, This->origWidth, -This->origHeight, NULL); - - if (This->hbmMask) { - HDC hdcMask = CreateCompatibleDC(0); - HBITMAP hOldbm = SelectObject(hdcMask, This->hbmMask); - - hbmpOld = SelectObject(hdcBmp, This->hbmXor); - - SetMapMode(hdcMask, MM_ANISOTROPIC); - SetWindowOrgEx(hdcMask, 0, 0, NULL); - SetWindowExtEx(hdcMask, This->himetricWidth, This->himetricHeight, NULL); - SetViewportOrgEx(hdcMask, 0, This->origHeight, NULL); - SetViewportExtEx(hdcMask, This->origWidth, -This->origHeight, NULL); - - SetBkColor(hdc, RGB(255, 255, 255)); - SetTextColor(hdc, RGB(0, 0, 0)); - StretchBlt(hdc, x, y, cx, cy, hdcMask, xSrc, ySrc, cxSrc, cySrc, SRCAND); - StretchBlt(hdc, x, y, cx, cy, hdcBmp, xSrc, ySrc, cxSrc, cySrc, SRCPAINT); - - SelectObject(hdcMask, hOldbm); - DeleteDC(hdcMask); - } else { - hbmpOld = SelectObject(hdcBmp, This->desc.u.bmp.hbitmap); - StretchBlt(hdc, x, y, cx, cy, hdcBmp, xSrc, ySrc, cxSrc, cySrc, SRCCOPY); - } + { + HBITMAP hbmMask, hbmXor; - SelectObject(hdcBmp, hbmpOld); - DeleteDC(hdcBmp); + if (This->hbmMask) + { + hbmMask = This->hbmMask; + hbmXor = This->hbmXor; + } + else + { + hbmMask = 0; + hbmXor = This->desc.u.bmp.hbitmap; } + + render_masked_bitmap(This, hdc, x, y, cx, cy, xSrc, ySrc, cxSrc, cySrc, hbmMask, hbmXor); break; + } + case PICTYPE_ICON: FIXME("Not quite correct implementation of rendering icons...\n"); DrawIconEx(hdc, x, y, This->desc.u.icon.hicon, cx, cy, 0, NULL, DI_NORMAL);

1 0

Dmitry Timoshkov : oleaut32/tests: Fix the IPicture::Render() usage.
by Alexandre Julliard 24 Aug '18

24 Aug '18

Module: wine Branch: master Commit: 4b525aa0a4eb8bd60e0f9a2f9eb5f4598aa87a4e URL: https://source.winehq.org/git/wine.git/?a=commit;h=4b525aa0a4eb8bd60e0f9a2f… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Aug 24 16:04:02 2018 +0800 oleaut32/tests: Fix the IPicture::Render() usage. When one specifies the target rectangle (0, 0, width, -height) IPicture::Render() places the origin at 0,0 and flips the image vertically. This means that in order to paint an icon on the DC it's necessary to specify the rectangle (0, height, width, -height), i.e. place the origin at 0,height. I've written a test app that verifies this behaviour, ufortunately I don't see a way to add a Wine test case for this. The test currently works by chance under Windows because in case of (0, 0, width, -height) IPicture::Render() draws black rectangle instead of an icon at (0, 0, width, height). If Wine intends to replicate this behaviour it should be fixed by a separate patch. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/olepicture.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/oleaut32/tests/olepicture.c b/dlls/oleaut32/tests/olepicture.c index c06cec1..6a5f7ee 100644 --- a/dlls/oleaut32/tests/olepicture.c +++ b/dlls/oleaut32/tests/olepicture.c @@ -864,7 +864,7 @@ static void test_Render(void) SetPixelV(hdc, 10, 10, 0x00223344); expected = GetPixel(hdc, 0, 0); - hres = picture_render(pic, hdc, 1, 1, 9, 9, 0, 0, pWidth, -pHeight, NULL); + hres = picture_render(pic, hdc, 1, 1, 9, 9, 0, pHeight, pWidth, -pHeight, NULL); ole_expect(hres, S_OK); if(hres != S_OK) goto done;

1 0

Gabriel Ivăncescu : ntdll: Properly set the current directory for UNC paths.
by Alexandre Julliard 24 Aug '18

24 Aug '18

Module: wine Branch: master Commit: 3acc0b0968fc2fd92220708f6a6629d2dfd28815 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3acc0b0968fc2fd92220708f… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Aug 23 17:14:18 2018 +0300 ntdll: Properly set the current directory for UNC paths. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=37834 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/path.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/ntdll/path.c b/dlls/ntdll/path.c index 9794b67..11483fa 100644 --- a/dlls/ntdll/path.c +++ b/dlls/ntdll/path.c @@ -1048,6 +1048,14 @@ NTSTATUS WINAPI RtlSetCurrentDirectory_U(const UNICODE_STRING* dir) size -= 4; if (size && ptr[size - 1] != '\\') ptr[size++] = '\\'; + /* convert \??\UNC\ path to \\ prefix */ + if (size >= 4 && !strncmpiW(ptr, UncPfxW, 4)) + { + ptr += 2; + size -= 2; + *ptr = '\\'; + } + memcpy( curdir->DosPath.Buffer, ptr, size * sizeof(WCHAR)); curdir->DosPath.Buffer[size] = 0; curdir->DosPath.Length = size * sizeof(WCHAR);

1 0

Zebediah Figura : quartz: Return E_NOTIMPL from IBasicAudio methods if no filter supporting IBasicAudio is attached.
by Alexandre Julliard 24 Aug '18

24 Aug '18

Module: wine Branch: master Commit: 702e4a4ca11bd5918d650bb13833da14d1f64379 URL: https://source.winehq.org/git/wine.git/?a=commit;h=702e4a4ca11bd5918d650bb1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Aug 23 12:43:14 2018 -0500 quartz: Return E_NOTIMPL from IBasicAudio methods if no filter supporting IBasicAudio is attached. Based on a patch by Alistair Leslie-Hughes. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45366 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 4 ++-- dlls/quartz/tests/filtergraph.c | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 0113674..aa4b0c9 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -2963,7 +2963,7 @@ static const IObjectWithSiteVtbl IObjectWithSite_VTable = static HRESULT GetTargetInterface(IFilterGraphImpl* pGraph, REFIID riid, LPVOID* ppvObj) { - HRESULT hr = E_NOINTERFACE; + HRESULT hr; int i; int entry; @@ -3003,7 +3003,7 @@ static HRESULT GetTargetInterface(IFilterGraphImpl* pGraph, REFIID riid, LPVOID* return hr; } - return hr; + return IsEqualGUID(riid, &IID_IBasicAudio) ? E_NOTIMPL : E_NOINTERFACE; } static inline IFilterGraphImpl *impl_from_IBasicAudio(IBasicAudio *iface) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index de7b904..6a8afb3 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -2304,7 +2304,6 @@ static void test_control_delegation(void) hr = IFilterGraph2_QueryInterface(graph, &IID_IBasicAudio, (void **)&audio); ok(hr == S_OK, "got %#x\n", hr); -todo_wine { hr = IBasicAudio_put_Volume(audio, -10); ok(hr == E_NOTIMPL, "got %#x\n", hr); hr = IBasicAudio_get_Volume(audio, &val); @@ -2313,7 +2312,6 @@ todo_wine { ok(hr == E_NOTIMPL, "got %#x\n", hr); hr = IBasicAudio_get_Balance(audio, &val); ok(hr == E_NOTIMPL, "got %#x\n", hr); -} hr = CoCreateInstance(&CLSID_DSoundRender, NULL, CLSCTX_INPROC_SERVER, &IID_IBaseFilter, (void **)&renderer); if (hr != VFW_E_NO_AUDIO_HARDWARE) @@ -2349,7 +2347,6 @@ todo_wine { IBasicAudio_Release(filter_audio); } -todo_wine { hr = IBasicAudio_put_Volume(audio, -10); ok(hr == E_NOTIMPL, "got %#x\n", hr); hr = IBasicAudio_get_Volume(audio, &val); @@ -2358,7 +2355,6 @@ todo_wine { ok(hr == E_NOTIMPL, "got %#x\n", hr); hr = IBasicAudio_get_Balance(audio, &val); ok(hr == E_NOTIMPL, "got %#x\n", hr); -} IBasicAudio_Release(audio);

1 0

Zebediah Figura : quartz/tests: Add some tests for interfaces delegated by the filter graph.
by Alexandre Julliard 24 Aug '18

24 Aug '18

Module: wine Branch: master Commit: 0649ba662980187660d18d4d0b0f442379ca092b URL: https://source.winehq.org/git/wine.git/?a=commit;h=0649ba662980187660d18d4d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Aug 23 12:43:13 2018 -0500 quartz/tests: Add some tests for interfaces delegated by the filter graph. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filtergraph.c | 115 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 115 insertions(+) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 85079d9..de7b904 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -2287,6 +2287,119 @@ static void test_aggregate_filter_graph(void) IUnknown_Release(pgraph); } +/* Test how methods from "control" interfaces (IBasicAudio, IBasicVideo, + * IVideoWindow) are delegated to filters exposing those interfaces. */ +static void test_control_delegation(void) +{ + IFilterGraph2 *graph = create_graph(); + IBasicAudio *audio, *filter_audio; + IBaseFilter *renderer; + IVideoWindow *window; + IBasicVideo *video; + HRESULT hr; + LONG val; + + /* IBasicAudio */ + + hr = IFilterGraph2_QueryInterface(graph, &IID_IBasicAudio, (void **)&audio); + ok(hr == S_OK, "got %#x\n", hr); + +todo_wine { + hr = IBasicAudio_put_Volume(audio, -10); + ok(hr == E_NOTIMPL, "got %#x\n", hr); + hr = IBasicAudio_get_Volume(audio, &val); + ok(hr == E_NOTIMPL, "got %#x\n", hr); + hr = IBasicAudio_put_Balance(audio, 10); + ok(hr == E_NOTIMPL, "got %#x\n", hr); + hr = IBasicAudio_get_Balance(audio, &val); + ok(hr == E_NOTIMPL, "got %#x\n", hr); +} + + hr = CoCreateInstance(&CLSID_DSoundRender, NULL, CLSCTX_INPROC_SERVER, &IID_IBaseFilter, (void **)&renderer); + if (hr != VFW_E_NO_AUDIO_HARDWARE) + { + ok(hr == S_OK, "got %#x\n", hr); + + hr = IFilterGraph2_AddFilter(graph, renderer, NULL); + ok(hr == S_OK, "got %#x\n", hr); + + hr = IBasicAudio_put_Volume(audio, -10); + ok(hr == S_OK, "got %#x\n", hr); + hr = IBasicAudio_get_Volume(audio, &val); + ok(hr == S_OK, "got %#x\n", hr); + ok(val == -10, "got %d\n", val); + hr = IBasicAudio_put_Balance(audio, 10); + ok(hr == S_OK || hr == VFW_E_MONO_AUDIO_HW, "got %#x\n", hr); + hr = IBasicAudio_get_Balance(audio, &val); + ok(hr == S_OK || hr == VFW_E_MONO_AUDIO_HW, "got %#x\n", hr); + if (hr == S_OK) + ok(val == 10, "got balance %d\n", val); + + hr = IBaseFilter_QueryInterface(renderer, &IID_IBasicAudio, (void **)&filter_audio); + ok(hr == S_OK, "got %#x\n", hr); + + hr = IBasicAudio_get_Volume(filter_audio, &val); + ok(hr == S_OK, "got %#x\n", hr); + ok(val == -10, "got volume %d\n", val); + + hr = IFilterGraph2_RemoveFilter(graph, renderer); + ok(hr == S_OK, "got %#x\n", hr); + + IBaseFilter_Release(renderer); + IBasicAudio_Release(filter_audio); + } + +todo_wine { + hr = IBasicAudio_put_Volume(audio, -10); + ok(hr == E_NOTIMPL, "got %#x\n", hr); + hr = IBasicAudio_get_Volume(audio, &val); + ok(hr == E_NOTIMPL, "got %#x\n", hr); + hr = IBasicAudio_put_Balance(audio, 10); + ok(hr == E_NOTIMPL, "got %#x\n", hr); + hr = IBasicAudio_get_Balance(audio, &val); + ok(hr == E_NOTIMPL, "got %#x\n", hr); +} + + IBasicAudio_Release(audio); + + /* IBasicVideo and IVideoWindow */ + + hr = IFilterGraph2_QueryInterface(graph, &IID_IBasicVideo, (void **)&video); + ok(hr == S_OK, "got %#x\n", hr); + hr = IFilterGraph2_QueryInterface(graph, &IID_IVideoWindow, (void **)&window); + ok(hr == S_OK, "got %#x\n", hr); + + /* Unlike IBasicAudio, these return E_NOINTERFACE. */ + hr = IBasicVideo_get_BitRate(video, &val); + ok(hr == E_NOINTERFACE, "got %#x\n", hr); + hr = IVideoWindow_SetWindowForeground(window, OAFALSE); + ok(hr == E_NOINTERFACE, "got %#x\n", hr); + + hr = CoCreateInstance(&CLSID_VideoRenderer, NULL, CLSCTX_INPROC_SERVER, &IID_IBaseFilter, (void **)&renderer); + ok(hr == S_OK, "got %#x\n", hr); + + hr = IFilterGraph2_AddFilter(graph, renderer, NULL); + ok(hr == S_OK, "got %#x\n", hr); + + hr = IBasicVideo_get_BitRate(video, &val); + ok(hr == VFW_E_NOT_CONNECTED, "got %#x\n", hr); + hr = IVideoWindow_SetWindowForeground(window, OAFALSE); + ok(hr == VFW_E_NOT_CONNECTED, "got %#x\n", hr); + + hr = IFilterGraph2_RemoveFilter(graph, renderer); + ok(hr == S_OK, "got %#x\n", hr); + + hr = IBasicVideo_get_BitRate(video, &val); + ok(hr == E_NOINTERFACE, "got %#x\n", hr); + hr = IVideoWindow_SetWindowForeground(window, OAFALSE); + ok(hr == E_NOINTERFACE, "got %#x\n", hr); + + IBaseFilter_Release(renderer); + IBasicVideo_Release(video); + IVideoWindow_Release(window); + IFilterGraph2_Release(graph); +} + START_TEST(filtergraph) { CoInitializeEx(NULL, COINIT_MULTITHREADED); @@ -2296,6 +2409,8 @@ START_TEST(filtergraph) test_graph_builder(); test_render_filter_priority(); test_aggregate_filter_graph(); + test_control_delegation(); + CoUninitialize(); test_render_with_multithread(); }

1 0

Michael Stefaniuc : mshtml: Use the ARRAY_SIZE() macro.
by Alexandre Julliard 24 Aug '18

24 Aug '18

Module: wine Branch: master Commit: 12b85004aaf6cc2b9ebc8e8f4c5074c93908c3b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=12b85004aaf6cc2b9ebc8e8f… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Aug 23 23:31:15 2018 +0200 mshtml: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Jacek Caban<jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/dispex.c | 6 +++--- dlls/mshtml/htmlbody.c | 2 +- dlls/mshtml/htmldoc.c | 2 +- dlls/mshtml/htmlelem.c | 2 +- dlls/mshtml/htmlevent.c | 8 ++++---- dlls/mshtml/htmlimg.c | 2 +- dlls/mshtml/htmllocation.c | 2 +- dlls/mshtml/htmlstyle.c | 18 +++++++++--------- dlls/mshtml/htmlwindow.c | 9 +++------ dlls/mshtml/main.c | 8 ++++---- dlls/mshtml/mutation.c | 6 +++--- dlls/mshtml/navigate.c | 4 ++-- dlls/mshtml/nsembed.c | 8 ++++---- dlls/mshtml/nsio.c | 21 ++++++++++----------- dlls/mshtml/olecmd.c | 11 ++++------- dlls/mshtml/pluginhost.c | 4 ++-- dlls/mshtml/protocol.c | 26 +++++++++++++------------- dlls/mshtml/script.c | 4 ++-- dlls/mshtml/view.c | 6 ++---- 19 files changed, 70 insertions(+), 79 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=12b85004aaf6cc2b9ebc…

1 0

Francois Gouget : dmusic: Make midi_port_create() static.
by Alexandre Julliard 24 Aug '18

24 Aug '18

Module: wine Branch: master Commit: 737440d24bc0582efc048c8218e563a0b4a4b0bb URL: https://source.winehq.org/git/wine.git/?a=commit;h=737440d24bc0582efc048c82… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Aug 24 00:17:58 2018 +0200 dmusic: Make midi_port_create() static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> 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 1fa9469..91913a7 100644 --- a/dlls/dmusic/port.c +++ b/dlls/dmusic/port.c @@ -1174,8 +1174,8 @@ static const IDirectMusicThruVtbl midi_thru_vtbl = { midi_IDirectMusicThru_ThruChannel, }; -HRESULT midi_port_create(IDirectMusic8Impl *parent, DMUS_PORTPARAMS *params, DMUS_PORTCAPS *caps, - IDirectMusicPort **port) +static HRESULT midi_port_create(IDirectMusic8Impl *parent, DMUS_PORTPARAMS *params, + DMUS_PORTCAPS *caps, IDirectMusicPort **port) { struct midi_port *obj; HRESULT hr;

1 0

← Newer
1
...
22
23
24
25
26
27
28
...
62
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2018