March 2020 - Wine-commits - list.winehq.org

Giovanni Mascellani : d2d1: Implement ellipse and rounded rectangle filling with arcs.
by Alexandre Julliard 04 Mar '20

04 Mar '20

Module: wine Branch: master Commit: a6bf2c429eb726aef9cb01da49f51d952d31ce4c URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6bf2c429eb726aef9cb01da… Author: Giovanni Mascellani <gio(a)debian.org> Date: Tue Mar 3 18:59:46 2020 +0100 d2d1: Implement ellipse and rounded rectangle filling with arcs. Signed-off-by: Giovanni Mascellani <gio(a)debian.org> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/brush.c | 3 +- dlls/d2d1/d2d1_private.h | 15 ++++--- dlls/d2d1/device.c | 111 ++++++++++++++++++++++++++++++++--------------- dlls/d2d1/geometry.c | 30 ++++++------- dlls/d2d1/tests/d2d1.c | 14 +++--- 5 files changed, 110 insertions(+), 63 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a6bf2c429eb726aef9cb…

1 0

Giovanni Mascellani : d2d1: Implement ellipse and rounded rectangle stroking with arcs.
by Alexandre Julliard 04 Mar '20

04 Mar '20

Module: wine Branch: master Commit: 873e3d0691d8a5fb2012d541369ae7ed3e39cfc0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=873e3d0691d8a5fb2012d541… Author: Giovanni Mascellani <gio(a)debian.org> Date: Tue Mar 3 18:59:47 2020 +0100 d2d1: Implement ellipse and rounded rectangle stroking with arcs. Signed-off-by: Giovanni Mascellani <gio(a)debian.org> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/d2d1_private.h | 13 +- dlls/d2d1/device.c | 313 ++++++++++++++++++++++++++++++++++++++++------- dlls/d2d1/geometry.c | 82 ++++++++++--- 3 files changed, 345 insertions(+), 63 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=873e3d0691d8a5fb2012…

1 0

Zebediah Figura : wined3d: Stop setting the device state in wined3d_stateblock_apply().
by Alexandre Julliard 04 Mar '20

04 Mar '20

Module: wine Branch: master Commit: 70b3a2624ae188ff4f015d7d526aa0b04cbfbc60 URL: https://source.winehq.org/git/wine.git/?a=commit;h=70b3a2624ae188ff4f015d7d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 3 17:50:02 2020 -0600 wined3d: Stop setting the device state in wined3d_stateblock_apply(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/stateblock.c | 215 ++++++++++------------------------------------ 1 file changed, 45 insertions(+), 170 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=70b3a2624ae188ff4f01…

1 0

Zebediah Figura : wined3d: Remove no longer used device state functions.
by Alexandre Julliard 04 Mar '20

04 Mar '20

Module: wine Branch: master Commit: 027e2b01fa871c5347d4f1ab95d78820669b20e6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=027e2b01fa871c5347d4f1ab… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 3 17:50:03 2020 -0600 wined3d: Remove no longer used device state functions. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 250 ---------------------------------------------- dlls/wined3d/wined3d.spec | 16 --- include/wine/wined3d.h | 28 ------ 3 files changed, 294 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=027e2b01fa871c5347d4…

1 0

Sven Baars : d3dx9: Implement ID3DXFont_PreloadText.
by Alexandre Julliard 04 Mar '20

04 Mar '20

Module: wine Branch: master Commit: cc03400e322edea97f0e425c04cd9069f77b4c9f URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc03400e322edea97f0e425c… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Tue Mar 3 09:38:27 2020 +0100 d3dx9: Implement ID3DXFont_PreloadText. Based on a patch by Tony Wasserka. Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/font.c | 56 ++++++++++++++++++++++++++++++++++++++++++---- dlls/d3dx9_36/tests/core.c | 2 -- 2 files changed, 52 insertions(+), 6 deletions(-) diff --git a/dlls/d3dx9_36/font.c b/dlls/d3dx9_36/font.c index 9196295637..81ba1e4fa0 100644 --- a/dlls/d3dx9_36/font.c +++ b/dlls/d3dx9_36/font.c @@ -420,14 +420,62 @@ static HRESULT WINAPI ID3DXFontImpl_PreloadGlyphs(ID3DXFont *iface, UINT first, static HRESULT WINAPI ID3DXFontImpl_PreloadTextA(ID3DXFont *iface, const char *string, INT count) { - FIXME("iface %p, string %s, count %d stub!\n", iface, debugstr_a(string), count); - return E_NOTIMPL; + WCHAR *wstr; + HRESULT hr; + int countW; + + TRACE("iface %p, string %s, count %d.\n", iface, debugstr_an(string, count), count); + + if (!string && !count) + return D3D_OK; + + if (!string) + return D3DERR_INVALIDCALL; + + countW = MultiByteToWideChar(CP_ACP, 0, string, count < 0 ? -1 : count, NULL, 0); + + wstr = heap_alloc(countW * sizeof(*wstr)); + if (!wstr) + return E_OUTOFMEMORY; + + MultiByteToWideChar(CP_ACP, 0, string, count < 0 ? -1 : count, wstr, countW); + + hr = ID3DXFont_PreloadTextW(iface, wstr, count < 0 ? countW - 1 : countW); + + heap_free(wstr); + + return hr; } static HRESULT WINAPI ID3DXFontImpl_PreloadTextW(ID3DXFont *iface, const WCHAR *string, INT count) { - FIXME("iface %p, string %s, count %d stub!\n", iface, debugstr_w(string), count); - return E_NOTIMPL; + struct d3dx_font *font = impl_from_ID3DXFont(iface); + WORD *indices; + int i; + + TRACE("iface %p, string %s, count %d.\n", iface, debugstr_wn(string, count), count); + + if (!string && !count) + return D3D_OK; + + if (!string) + return D3DERR_INVALIDCALL; + + if (count < 0) + count = lstrlenW(string); + + indices = heap_alloc(count * sizeof(*indices)); + if (!indices) + return E_OUTOFMEMORY; + + GetGlyphIndicesW(font->hdc, string, count, indices, 0); + + for (i = 0; i < count; ++i) + ID3DXFont_PreloadGlyphs(iface, indices[i], indices[i]); + + heap_free(indices); + + return D3D_OK; } static INT WINAPI ID3DXFontImpl_DrawTextA(ID3DXFont *iface, ID3DXSprite *sprite, diff --git a/dlls/d3dx9_36/tests/core.c b/dlls/d3dx9_36/tests/core.c index b8e680d1c5..662483b687 100644 --- a/dlls/d3dx9_36/tests/core.c +++ b/dlls/d3dx9_36/tests/core.c @@ -504,7 +504,6 @@ static void test_ID3DXFont(IDirect3DDevice9 *device) DEFAULT_QUALITY, DEFAULT_PITCH, "Tahoma", &font); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - todo_wine { hr = ID3DXFont_PreloadTextA(font, NULL, -1); ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); hr = ID3DXFont_PreloadTextA(font, NULL, 0); @@ -530,7 +529,6 @@ static void test_ID3DXFont(IDirect3DDevice9 *device) ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = ID3DXFont_PreloadTextW(font, L"", -1); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - } check_release((IUnknown*)font, 0);

1 0

Sven Baars : d3dx9: Add a very basic ID3DXFont_DrawText implementation.
by Alexandre Julliard 04 Mar '20

04 Mar '20

Module: wine Branch: master Commit: 316a8d0ae11ae1a9654bc731d2c9dc23febc7a2d URL: https://source.winehq.org/git/wine.git/?a=commit;h=316a8d0ae11ae1a9654bc731… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Tue Mar 3 09:38:28 2020 +0100 d3dx9: Add a very basic ID3DXFont_DrawText implementation. Based on a patch by Tony Wasserka. Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/font.c | 128 ++++++++++++++++++++++++++++++++++++++++++--- dlls/d3dx9_36/tests/core.c | 59 ++++++++++----------- 2 files changed, 149 insertions(+), 38 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=316a8d0ae11ae1a9654b…

1 0

Nikolay Sivov : include: Fix VMR9AlphaBitmap definition.
by Alexandre Julliard 04 Mar '20

04 Mar '20

Module: wine Branch: master Commit: 83db71eb13ead4b3451ffa611276ecc3d281446b URL: https://source.winehq.org/git/wine.git/?a=commit;h=83db71eb13ead4b3451ffa61… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 4 17:41:13 2020 +0300 include: Fix VMR9AlphaBitmap definition. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vmr9.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/vmr9.idl b/include/vmr9.idl index 5340273f91..98524b0e75 100644 --- a/include/vmr9.idl +++ b/include/vmr9.idl @@ -272,7 +272,7 @@ typedef struct _VMR9AlphaBitmap HDC hdc; IDirect3DSurface9 *pDDS; RECT rSrc; - VMR9NormalizedRect *rDest; + VMR9NormalizedRect rDest; FLOAT fAlpha; COLORREF clrSrcKey; DWORD dwFilterMode;

1 0

Piotr Caban : winemac: Fix leaks in macdrv_surface_destroy.
by Alexandre Julliard 04 Mar '20

04 Mar '20

Module: wine Branch: master Commit: c4becb85f17c1406ff8d05aca5ecabaa8d304b48 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c4becb85f17c1406ff8d05ac… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 4 18:22:23 2020 +0100 winemac: Fix leaks in macdrv_surface_destroy. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/surface.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/winemac.drv/surface.c b/dlls/winemac.drv/surface.c index 73daecaa81..9850c92aaa 100644 --- a/dlls/winemac.drv/surface.c +++ b/dlls/winemac.drv/surface.c @@ -208,6 +208,9 @@ static void macdrv_surface_destroy(struct window_surface *window_surface) struct macdrv_window_surface *surface = get_mac_surface(window_surface); TRACE("freeing %p bits %p\n", surface, surface->bits); + if (surface->region) DeleteObject(surface->region); + if (surface->drawn) DeleteObject(surface->drawn); + HeapFree(GetProcessHeap(), 0, surface->blit_data); HeapFree(GetProcessHeap(), 0, surface->bits); pthread_mutex_destroy(&surface->mutex); HeapFree(GetProcessHeap(), 0, surface);

1 0

Nikolay Sivov : include: Add some types used for MF pipeline objects.
by Alexandre Julliard 04 Mar '20

04 Mar '20

Module: wine Branch: master Commit: 43f608851f0991dea07f3e3756e74b095fe4616d URL: https://source.winehq.org/git/wine.git/?a=commit;h=43f608851f0991dea07f3e37… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 4 12:16:56 2020 +0300 include: Add some types used for MF pipeline objects. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mfidl.idl | 109 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 109 insertions(+) diff --git a/include/mfidl.idl b/include/mfidl.idl index e27294d488..82f69518df 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -82,6 +82,16 @@ typedef enum MFSESSION_GETFULLTOPOLOGY_FLAGS MFSESSION_GETFULLTOPOLOGY_CURRENT = 0x00000001, } MFSESSION_GETFULLTOPOLOGY_FLAGS; +typedef enum _MF_CONNECT_METHOD +{ + MF_CONNECT_DIRECT = 0x00000000, + MF_CONNECT_ALLOW_CONVERTER = 0x00000001, + MF_CONNECT_ALLOW_DECODER = 0x00000003, + MF_CONNECT_RESOLVE_INDEPENDENT_OUTPUTTYPES = 0x00000004, + MF_CONNECT_AS_OPTIONAL = 0x00010000, + MF_CONNECT_AS_OPTIONAL_BRANCH = 0x00020000, +} MF_CONNECT_METHOD; + typedef enum _MF_TOPOLOGY_RESOLUTION_STATUS_FLAGS { MF_TOPOLOGY_RESOLUTION_SUCCEEDED = 0x00000000, @@ -640,6 +650,19 @@ interface IMFMediaSource : IMFMediaEventGenerator HRESULT Shutdown(); } +[ + object, + uuid(3c9b2eb9-86d5-4514-a394-f56664f9f0d8) +] +interface IMFMediaSourceEx : IMFMediaSource +{ + HRESULT GetSourceAttributes([out] IMFAttributes **attributes); + HRESULT GetStreamAttributes( + [in] DWORD streamid, + [out] IMFAttributes **attributes); + HRESULT SetD3DManager([in] IUnknown *manager); +} + [ object, uuid(d182108f-4ec6-443f-aa42-a71106ec825f), @@ -689,6 +712,16 @@ interface IMFPresentationClock : IMFClock HRESULT Pause(); } +[ + object, + uuid(6ef2a662-47c0-4666-b13d-cbb717f2fa2c) +] +interface IMFClockConsumer : IUnknown +{ + HRESULT SetPresentationClock([in] IMFPresentationClock *clock); + HRESULT GetPresentationClock([out] IMFPresentationClock **clock); +} + cpp_quote("#define MEDIASINK_FIXED_STREAMS 0x00000001") cpp_quote("#define MEDIASINK_CANNOT_MATCH_CLOCK 0x00000002") cpp_quote("#define MEDIASINK_RATELESS 0x00000004") @@ -730,6 +763,26 @@ interface IMFFinalizableMediaSink : IMFMediaSink HRESULT EndFinalize([in] IMFAsyncResult *result); } +[ + object, + uuid(5dfd4b2a-7674-4110-a4e6-8a68fd5f3688) +] +interface IMFMediaSinkPreroll : IUnknown +{ + HRESULT NotifyPreroll([in] MFTIME start_time); +} + +[ + object, + uuid(9db7aa41-3cc5-40d4-8509-555804ad34cc) +] +interface IMFStreamingSinkConfig : IUnknown +{ + HRESULT StartStreaming( + [in] BOOL is_byte_offset, + [in] QWORD seek_offset); +} + [ object, uuid(0a97b3cf-8e7c-4a3d-8f8c-0c843dc247fb), @@ -786,6 +839,62 @@ interface IMFQualityManager : IUnknown HRESULT Shutdown(); } +typedef enum _MF_QUALITY_DROP_MODE +{ + MF_DROP_MODE_NONE, + MF_DROP_MODE_1, + MF_DROP_MODE_2, + MF_DROP_MODE_3, + MF_DROP_MODE_4, + MF_DROP_MODE_5, + MF_NUM_DROP_MODES +} MF_QUALITY_DROP_MODE; + +typedef enum _MF_QUALITY_LEVEL +{ + MF_QUALITY_NORMAL, + MF_QUALITY_NORMAL_MINUS_1, + MF_QUALITY_NORMAL_MINUS_2, + MF_QUALITY_NORMAL_MINUS_3, + MF_QUALITY_NORMAL_MINUS_4, + MF_QUALITY_NORMAL_MINUS_5, + MF_NUM_QUALITY_LEVELS +} MF_QUALITY_LEVEL; + +[ + object, + uuid(ec15e2e9-e36b-4f7c-8758-77d452ef4ce7) +] +interface IMFQualityAdvise : IUnknown +{ + HRESULT SetDropMode([in] MF_QUALITY_DROP_MODE mode); + HRESULT SetQualityLevel([in] MF_QUALITY_LEVEL level); + HRESULT GetDropMode([out] MF_QUALITY_DROP_MODE *mode); + HRESULT GetQualityLevel([out] MF_QUALITY_LEVEL *level); + HRESULT DropTime([in] LONGLONG interval); +} + +[ + object, + uuid(f3706f0d-8ea2-4886-8000-7155e9ec2eae) +] +interface IMFQualityAdvise2 : IMFQualityAdvise +{ + HRESULT NotifyQualityEvent( + [in] IMFMediaEvent *event, + [out] DWORD *flags); +} + +[ + object, + uuid(dfcd8e4d-30b5-4567-acaa-8eb5b7853dc9) +] +interface IMFQualityAdviseLimits : IUnknown +{ + HRESULT GetMaximumDropMode([out] MF_QUALITY_DROP_MODE *mode); + HRESULT GetMinimumQualityLevel([out] MF_QUALITY_LEVEL *level); +} + typedef struct _MFT_REGISTRATION_INFO { CLSID clsid;

1 0

Jacek Caban : msvcrt/tests: Use __[w]getmainargs declarations from headers.
by Alexandre Julliard 04 Mar '20

04 Mar '20

Module: wine Branch: master Commit: b3d13197e3cc789347eb27ecbb75d4cae2da12a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b3d13197e3cc789347eb27ec… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 4 17:22:20 2020 +0100 msvcrt/tests: Use __[w]getmainargs declarations from headers. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/environ.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/msvcrt/tests/environ.c b/dlls/msvcrt/tests/environ.c index 43115d86da..6829d80e95 100644 --- a/dlls/msvcrt/tests/environ.c +++ b/dlls/msvcrt/tests/environ.c @@ -20,6 +20,7 @@ #include "wine/test.h" #include <stdlib.h> +#include <process.h> static const char *a_very_long_env_string = "LIBRARY_PATH=" @@ -42,9 +43,6 @@ static const char *a_very_long_env_string = "/usr/lib/mingw32/3.4.2/;" "/usr/lib/"; -void __cdecl __getmainargs(int *, char ***, char ***, int, int *); -void __cdecl __wgetmainargs(int *, wchar_t ***, wchar_t ***, int, int *); - static char ***(__cdecl *p__p__environ)(void); static WCHAR ***(__cdecl *p__p__wenviron)(void); static void (*p_get_environ)(char ***);

1 0