November 2020 - Wine-Commits

Akihiro Sagawa : gdi32: Fix font rendering issue when child font is used.
by Alexandre Julliard Nov. 6, 2020

Nov. 6, 2020

Module: wine Branch: master Commit: 308a0cf72d884f2b716b6df6954ef55e572b07cc URL: https://source.winehq.org/git/wine.git/?a=commit;h=308a0cf72d884f2b716b6df6… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Nov 6 21:16:35 2020 +0900 gdi32: Fix font rendering issue when child font is used. Otherwise, freetype_get_glyph_outline() fails at FT_Load_Glyph due to combination of base_font's ft_face and child font's glyph index. Fixes a regression introduced by 044315c0b3890676d9fd751d8191b0b7381e0b97. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 70a4b18c4f8..61397e8b542 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -3219,7 +3219,7 @@ static DWORD CDECL freetype_get_glyph_outline( struct gdi_font *font, UINT glyph const MAT2 *lpmat, BOOL tategaki ) { struct gdi_font *base_font = font->base_font ? font->base_font : font; - FT_Face ft_face = get_ft_face( base_font ); + FT_Face ft_face = get_ft_face( font ); FT_Glyph_Metrics metrics; FT_Error err; FT_BBox bbox;

1 0

Alistair Leslie-Hughes : include: Add DBPROPSTATUSENUM enum values.
by Alexandre Julliard Nov. 6, 2020

Nov. 6, 2020

Module: wine Branch: master Commit: f5831eda2ec9918e5fa794682ac8c114a7c6b672 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f5831eda2ec9918e5fa79468… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Oct 30 18:50:56 2020 +1100 include: Add DBPROPSTATUSENUM enum values. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dbs.idl | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/include/dbs.idl b/include/dbs.idl index 19f92b3c05f..cbdb89d23b2 100644 --- a/include/dbs.idl +++ b/include/dbs.idl @@ -79,6 +79,22 @@ enum DBPROPOPTIONENUM { typedef DWORD DBPROPSTATUS; +enum DBPROPSTATUSENUM { + DBPROPSTATUS_OK = 0, + DBPROPSTATUS_NOTSUPPORTED = 1, + DBPROPSTATUS_BADVALUE = 2, + DBPROPSTATUS_BADOPTION = 3, + DBPROPSTATUS_BADCOLUMN = 4, + DBPROPSTATUS_NOTALLSETTABLE = 5, + DBPROPSTATUS_NOTSETTABLE = 6, + DBPROPSTATUS_NOTSET = 7, + DBPROPSTATUS_CONFLICTING = 8 +}; + +enum DBPROPSTATUSENUM21 { + DBPROPSTATUS_NOTAVAILABLE = 9 +}; + typedef struct tagDBPROP { DBPROPID dwPropertyID; DBPROPOPTIONS dwOptions;

1 0

Rémi Bernon : gdi32: Implement GdiDllInitialize stub.
by Alexandre Julliard Nov. 6, 2020

Nov. 6, 2020

Module: wine Branch: master Commit: cb1ff768acbdfbd28311dbbc1b72f0ea83c0f325 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cb1ff768acbdfbd28311dbbc… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Nov 6 18:05:42 2020 +0100 gdi32: Implement GdiDllInitialize stub. This is required by several Call of Duty games that are calling this directly after loading gdi32.dll from disk. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48171 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/gdi32.spec | 2 +- dlls/gdi32/gdiobj.c | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index 725afebb8eb..dc63dbcbf32 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -182,7 +182,7 @@ @ stub GdiDeleteLocalObject # @ stub GdiDeleteSpoolFileHandle @ stdcall GdiDescribePixelFormat(long long long ptr) -@ stub GdiDllInitialize +@ stdcall GdiDllInitialize(ptr long ptr) @ stdcall GdiDrawStream(long long ptr) # @ stub GdiEndDocEMF # @ stub GdiEndPageEMF diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index 29e55adc4eb..2309fdac582 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -672,6 +672,19 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) return TRUE; } + +/*********************************************************************** + * GdiDllInitialize + * + * Stub entry point, some games (CoD: Black Ops 3) call it directly. + */ +BOOL WINAPI GdiDllInitialize( HINSTANCE inst, DWORD reason, LPVOID reserved ) +{ + FIXME("stub\n"); + return TRUE; +} + + static const char *gdi_obj_type( unsigned type ) { switch ( type )

1 0

Alexandre Julliard : include: Fix setjmp() support with 32-bit ucrtbase.
by Alexandre Julliard Nov. 6, 2020

Nov. 6, 2020

Module: wine Branch: master Commit: 3d72d2600fc4fc998670d5200e92f2e79e094fb8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d72d2600fc4fc998670d520… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 6 12:11:17 2020 +0100 include: Fix setjmp() support with 32-bit ucrtbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/setjmp.h | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/include/msvcrt/setjmp.h b/include/msvcrt/setjmp.h index 4b737036296..4209d6c6fd7 100644 --- a/include/msvcrt/setjmp.h +++ b/include/msvcrt/setjmp.h @@ -143,18 +143,30 @@ typedef _JBTYPE jmp_buf[_JBLEN]; extern "C" { #endif -int __cdecl _setjmp(jmp_buf); void __cdecl longjmp(jmp_buf,int); -#if defined(_WIN64) && defined(__GNUC__) +#ifdef _WIN64 # ifdef _UCRT # define _setjmpex __intrinsic_setjmpex # endif +# ifdef __GNUC__ int __cdecl __attribute__ ((__nothrow__,__returns_twice__)) _setjmpex(jmp_buf,void*); # define setjmp(buf) _setjmpex(buf,__builtin_frame_address(0)) # define setjmpex(buf) _setjmpex(buf,__builtin_frame_address(0)) -#else -# define setjmp _setjmp +# endif +#else /* _WIN64 */ +# ifdef _UCRT +# define _setjmp __intrinsic_setjmp +# endif +# ifdef __GNUC__ +int __cdecl __attribute__ ((__nothrow__,__returns_twice__)) _setjmp(jmp_buf); +# else +int __cdecl _setjmp(jmp_buf); +# endif +#endif /* _WIN64 */ + +#ifndef setjmp +#define setjmp _setjmp #endif #ifdef __cplusplus

1 0

Daniel Lehman : wine.inf: Update Pacific SA Time Zone.
by Alexandre Julliard Nov. 6, 2020

Nov. 6, 2020

Module: wine Branch: master Commit: 3bf909259042442f4b3956ee59f4024102c6a899 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3bf909259042442f4b3956ee… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Thu Nov 5 20:17:10 2020 -0800 wine.inf: Update Pacific SA Time Zone. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 2ee8f0428ff..edefbaac35e 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -3471,10 +3471,25 @@ HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time,"Dlt",,"Pacific SA D HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time,"MUI_Dlt",,"@tzres.dll,-65009" HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time,"MUI_Std",,"@tzres.dll,-65008" HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time,"Std",,"Pacific SA Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time,"TZI",1,b4,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time\Dynamic DST,"2015",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,df,07,04,00,00,00,1a,00,01,00,00,00,00,00,00,00,e0,07,01,00,05,00,01,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time\Dynamic DST,"FirstEntry",0x10001,2015 -HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time\Dynamic DST,"LastEntry",0x10001,2015 +HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time,"TZI",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,00,00,00,00,00,00,00,00,00,00,09,00,00,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time\Dynamic DST,"2005",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,02,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,02,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time\Dynamic DST,"2006",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,02,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,03,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time\Dynamic DST,"2007",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,02,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,02,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time\Dynamic DST,"2008",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,05,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,02,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time\Dynamic DST,"2009",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,03,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,02,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time\Dynamic DST,"2010",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,02,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time\Dynamic DST,"2011",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,05,00,00,00,02,00,00,00,00,00,00,00,00,00,00,00,08,00,00,00,03,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time\Dynamic DST,"2012",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,05,00,00,00,00,00,00,00,00,00,00,00,09,00,00,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time\Dynamic DST,"2013",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,05,00,00,00,00,00,00,00,00,00,00,00,09,00,00,00,02,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time\Dynamic DST,"2014",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,05,00,00,00,00,00,00,00,00,00,00,00,09,00,00,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time\Dynamic DST,"2015",1,b4,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time\Dynamic DST,"2016",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,05,00,00,00,03,00,00,00,00,00,00,00,00,00,00,00,08,00,00,00,02,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time\Dynamic DST,"2017",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,05,00,00,00,02,00,00,00,00,00,00,00,00,00,00,00,08,00,00,00,02,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time\Dynamic DST,"2018",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,05,00,00,00,02,00,00,00,00,00,00,00,00,00,00,00,08,00,00,00,02,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time\Dynamic DST,"2019",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,00,00,00,00,00,00,00,00,00,00,09,00,00,00,02,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time\Dynamic DST,"2020",1,f0,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,00,00,00,00,00,00,00,00,00,00,09,00,00,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time\Dynamic DST,"FirstEntry",0x10001,"2005" +HKLM,%CurrentVersionNT%\Time Zones\Pacific SA Standard Time\Dynamic DST,"LastEntry",0x10001,"2020" HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time,"Display",,"America/Los_Angeles" HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time,"Dlt",,"Pacific Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time,"MUI_Dlt",,"@tzres.dll,-11233"

1 0

Daniel Lehman : wine.inf: Update Azerbaijan Time Zone.
by Alexandre Julliard Nov. 6, 2020

Nov. 6, 2020

Module: wine Branch: master Commit: ec9ed7052ef1726ead868719002d21d469e79f46 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec9ed7052ef1726ead868719… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Thu Nov 5 20:04:47 2020 -0800 wine.inf: Update Azerbaijan Time Zone. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index ee816a5cdef..88fadca2342 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2834,7 +2834,11 @@ HKLM,%CurrentVersionNT%\Time Zones\Azerbaijan Standard Time,"Dlt",,"Azerbaijan D HKLM,%CurrentVersionNT%\Time Zones\Azerbaijan Standard Time,"MUI_Dlt",,"@tzres.dll,-11313" HKLM,%CurrentVersionNT%\Time Zones\Azerbaijan Standard Time,"MUI_Std",,"@tzres.dll,-11312" HKLM,%CurrentVersionNT%\Time Zones\Azerbaijan Standard Time,"Std",,"Azerbaijan Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\Azerbaijan Standard Time,"TZI",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,05,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,04,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Azerbaijan Standard Time,"TZI",1,10,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Azerbaijan Standard Time\Dynamic DST,"2015",1,10,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,05,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,04,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Azerbaijan Standard Time\Dynamic DST,"2016",1,10,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Azerbaijan Standard Time\Dynamic DST,"FirstEntry",0x10001,"2015" +HKLM,%CurrentVersionNT%\Time Zones\Azerbaijan Standard Time\Dynamic DST,"LastEntry",0x10001,"2016" HKLM,%CurrentVersionNT%\Time Zones\Azores Standard Time,"Display",,"Atlantic/Azores" HKLM,%CurrentVersionNT%\Time Zones\Azores Standard Time,"Dlt",,"Azores Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Azores Standard Time,"MUI_Dlt",,"@tzres.dll,-18833"

1 0

Nikolay Sivov : evr/sample: Use separate thread for tracking notifications.
by Alexandre Julliard Nov. 6, 2020

Nov. 6, 2020

Module: wine Branch: master Commit: 2865d4216e58f552cfa122efed6fcb4e58d89753 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2865d4216e58f552cfa122ef… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 6 18:15:26 2020 +0300 evr/sample: Use separate thread for tracking notifications. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/sample.c | 280 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 275 insertions(+), 5 deletions(-) diff --git a/dlls/evr/sample.c b/dlls/evr/sample.c index 39520cb6020..729f279fafe 100644 --- a/dlls/evr/sample.c +++ b/dlls/evr/sample.c @@ -103,6 +103,276 @@ static struct surface_buffer *impl_from_IMFGetService(IMFGetService *iface) return CONTAINING_RECORD(iface, struct surface_buffer, IMFGetService_iface); } +struct tracked_async_result +{ + MFASYNCRESULT result; + LONG refcount; + IUnknown *object; + IUnknown *state; +}; + +static struct tracked_async_result *impl_from_IMFAsyncResult(IMFAsyncResult *iface) +{ + return CONTAINING_RECORD(iface, struct tracked_async_result, result.AsyncResult); +} + +static HRESULT WINAPI tracked_async_result_QueryInterface(IMFAsyncResult *iface, REFIID riid, void **obj) +{ + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), obj); + + if (IsEqualIID(riid, &IID_IMFAsyncResult) || + IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + IMFAsyncResult_AddRef(iface); + return S_OK; + } + + *obj = NULL; + WARN("Unsupported interface %s.\n", debugstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI tracked_async_result_AddRef(IMFAsyncResult *iface) +{ + struct tracked_async_result *result = impl_from_IMFAsyncResult(iface); + ULONG refcount = InterlockedIncrement(&result->refcount); + + TRACE("%p, %u.\n", iface, refcount); + + return refcount; +} + +static ULONG WINAPI tracked_async_result_Release(IMFAsyncResult *iface) +{ + struct tracked_async_result *result = impl_from_IMFAsyncResult(iface); + ULONG refcount = InterlockedDecrement(&result->refcount); + + TRACE("%p, %u.\n", iface, refcount); + + if (!refcount) + { + if (result->result.pCallback) + IMFAsyncCallback_Release(result->result.pCallback); + if (result->object) + IUnknown_Release(result->object); + if (result->state) + IUnknown_Release(result->state); + heap_free(result); + } + + return refcount; +} + +static HRESULT WINAPI tracked_async_result_GetState(IMFAsyncResult *iface, IUnknown **state) +{ + struct tracked_async_result *result = impl_from_IMFAsyncResult(iface); + + TRACE("%p, %p.\n", iface, state); + + if (!result->state) + return E_POINTER; + + *state = result->state; + IUnknown_AddRef(*state); + + return S_OK; +} + +static HRESULT WINAPI tracked_async_result_GetStatus(IMFAsyncResult *iface) +{ + struct tracked_async_result *result = impl_from_IMFAsyncResult(iface); + + TRACE("%p.\n", iface); + + return result->result.hrStatusResult; +} + +static HRESULT WINAPI tracked_async_result_SetStatus(IMFAsyncResult *iface, HRESULT status) +{ + struct tracked_async_result *result = impl_from_IMFAsyncResult(iface); + + TRACE("%p, %#x.\n", iface, status); + + result->result.hrStatusResult = status; + + return S_OK; +} + +static HRESULT WINAPI tracked_async_result_GetObject(IMFAsyncResult *iface, IUnknown **object) +{ + struct tracked_async_result *result = impl_from_IMFAsyncResult(iface); + + TRACE("%p, %p.\n", iface, object); + + if (!result->object) + return E_POINTER; + + *object = result->object; + IUnknown_AddRef(*object); + + return S_OK; +} + +static IUnknown * WINAPI tracked_async_result_GetStateNoAddRef(IMFAsyncResult *iface) +{ + struct tracked_async_result *result = impl_from_IMFAsyncResult(iface); + + TRACE("%p.\n", iface); + + return result->state; +} + +static const IMFAsyncResultVtbl tracked_async_result_vtbl = +{ + tracked_async_result_QueryInterface, + tracked_async_result_AddRef, + tracked_async_result_Release, + tracked_async_result_GetState, + tracked_async_result_GetStatus, + tracked_async_result_SetStatus, + tracked_async_result_GetObject, + tracked_async_result_GetStateNoAddRef, +}; + +static HRESULT create_async_result(IUnknown *object, IMFAsyncCallback *callback, + IUnknown *state, IMFAsyncResult **out) +{ + struct tracked_async_result *result; + + result = heap_alloc_zero(sizeof(*result)); + if (!result) + return E_OUTOFMEMORY; + + result->result.AsyncResult.lpVtbl = &tracked_async_result_vtbl; + result->refcount = 1; + result->object = object; + if (result->object) + IUnknown_AddRef(result->object); + result->result.pCallback = callback; + if (result->result.pCallback) + IMFAsyncCallback_AddRef(result->result.pCallback); + result->state = state; + if (result->state) + IUnknown_AddRef(result->state); + + *out = &result->result.AsyncResult; + + return S_OK; +} + +struct tracking_thread +{ + HANDLE hthread; + DWORD tid; + LONG refcount; +}; +static struct tracking_thread tracking_thread; + +static CRITICAL_SECTION tracking_thread_cs = { NULL, -1, 0, 0, 0, 0 }; + +enum tracking_thread_message +{ + TRACKM_STOP = WM_USER, + TRACKM_INVOKE = WM_USER + 1, +}; + +static DWORD CALLBACK tracking_thread_proc(void *arg) +{ + HANDLE ready_event = arg; + BOOL stop_thread = FALSE; + IMFAsyncResult *result; + MFASYNCRESULT *data; + MSG msg; + + PeekMessageW(&msg, NULL, WM_USER, WM_USER, PM_NOREMOVE); + + SetEvent(ready_event); + + while (!stop_thread) + { + MsgWaitForMultipleObjects(0, NULL, FALSE, INFINITE, QS_POSTMESSAGE); + + while (PeekMessageW(&msg, NULL, 0, 0, PM_REMOVE)) + { + switch (msg.message) + { + case TRACKM_INVOKE: + result = (IMFAsyncResult *)msg.lParam; + data = (MFASYNCRESULT *)result; + if (data->pCallback) + IMFAsyncCallback_Invoke(data->pCallback, result); + IMFAsyncResult_Release(result); + break; + + case TRACKM_STOP: + stop_thread = TRUE; + break; + + default: + ; + } + } + } + + TRACE("Tracking thread exiting.\n"); + + return 0; +} + +static void video_sample_create_tracking_thread(void) +{ + EnterCriticalSection(&tracking_thread_cs); + + if (++tracking_thread.refcount == 1) + { + HANDLE ready_event; + + ready_event = CreateEventW(NULL, FALSE, FALSE, NULL); + + if (!(tracking_thread.hthread = CreateThread(NULL, 0, tracking_thread_proc, + ready_event, 0, &tracking_thread.tid))) + { + WARN("Failed to create sample tracking thread.\n"); + CloseHandle(ready_event); + return; + } + + WaitForSingleObject(ready_event, INFINITE); + CloseHandle(ready_event); + + TRACE("Create tracking thread %#x.\n", tracking_thread.tid); + } + + LeaveCriticalSection(&tracking_thread_cs); +} + +static void video_sample_stop_tracking_thread(void) +{ + EnterCriticalSection(&tracking_thread_cs); + + if (!--tracking_thread.refcount) + { + PostThreadMessageW(tracking_thread.tid, TRACKM_STOP, 0, 0); + CloseHandle(tracking_thread.hthread); + memset(&tracking_thread, 0, sizeof(tracking_thread)); + } + + LeaveCriticalSection(&tracking_thread_cs); +} + +static void video_sample_tracking_thread_invoke(IMFAsyncResult *result) +{ + if (!tracking_thread.tid) + { + WARN("Sample tracking thread is not initialized.\n"); + return; + } + + IMFAsyncResult_AddRef(result); + PostThreadMessageW(tracking_thread.tid, TRACKM_INVOKE, 0, (LPARAM)result); +} + struct sample_allocator { IMFVideoSampleAllocator IMFVideoSampleAllocator_iface; @@ -628,14 +898,11 @@ static ULONG WINAPI video_sample_Release(IMFSample *iface) { struct video_sample *sample = impl_from_IMFSample(iface); ULONG refcount; - HRESULT hr; IMFSample_LockStore(sample->sample); if (sample->tracked_result && sample->tracked_refcount == (sample->refcount - 1)) { - /* Call could fail if queue system is not initialized, it's not critical. */ - if (FAILED(hr = MFInvokeCallback(sample->tracked_result))) - WARN("Failed to invoke tracking callback, hr %#x.\n", hr); + video_sample_tracking_thread_invoke(sample->tracked_result); IMFAsyncResult_Release(sample->tracked_result); sample->tracked_result = NULL; sample->tracked_refcount = 0; @@ -648,6 +915,7 @@ static ULONG WINAPI video_sample_Release(IMFSample *iface) if (!refcount) { + video_sample_stop_tracking_thread(); if (sample->sample) IMFSample_Release(sample->sample); heap_free(sample); @@ -1132,7 +1400,7 @@ static HRESULT WINAPI tracked_video_sample_SetAllocator(IMFTrackedSample *iface, hr = MF_E_NOTACCEPTING; else { - if (SUCCEEDED(hr = MFCreateAsyncResult((IUnknown *)iface, sample_allocator, state, &sample->tracked_result))) + if (SUCCEEDED(hr = create_async_result((IUnknown *)iface, sample_allocator, state, &sample->tracked_result))) { /* Account for additional refcount brought by 'state' object. This threshold is used on Release() to invoke tracker callback. */ @@ -1428,6 +1696,8 @@ HRESULT WINAPI MFCreateVideoSampleFromSurface(IUnknown *surface, IMFSample **sam if (buffer) IMFSample_AddBuffer(object->sample, buffer); + video_sample_create_tracking_thread(); + *sample = &object->IMFSample_iface; return S_OK;

1 0

Nikolay Sivov : mfmediaengine: Implement GetVideoAspectRatio().
by Alexandre Julliard Nov. 5, 2020

Nov. 5, 2020

Module: wine Branch: master Commit: ef8bf642c716983317badb799e20eb6419be374c URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef8bf642c716983317badb79… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 5 19:04:55 2020 +0300 mfmediaengine: Implement GetVideoAspectRatio(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfmediaengine/main.c | 69 +++++++++++++++++++++++++++----- dlls/mfmediaengine/tests/mfmediaengine.c | 1 - 2 files changed, 59 insertions(+), 11 deletions(-) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index cbea4263702..27f6a26d6b7 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -74,7 +74,8 @@ enum media_engine_flags struct video_frame { LONGLONG pts; - UINT64 size; + SIZE size; + SIZE ratio; TOPOID node_id; }; @@ -252,15 +253,34 @@ static struct media_engine *impl_from_IMFSampleGrabberSinkCallback(IMFSampleGrab return CONTAINING_RECORD(iface, struct media_engine, grabber_callback); } +static unsigned int get_gcd(unsigned int a, unsigned int b) +{ + unsigned int m; + + while (b) + { + m = a % b; + a = b; + b = m; + } + + return a; +} + static void media_engine_get_frame_size(struct media_engine *engine, IMFTopology *topology) { IMFMediaTypeHandler *handler; IMFMediaType *media_type; IMFStreamDescriptor *sd; IMFTopologyNode *node; + unsigned int gcd; + UINT64 size; HRESULT hr; - engine->video_frame.size = 0; + engine->video_frame.size.cx = 0; + engine->video_frame.size.cy = 0; + engine->video_frame.ratio.cx = 1; + engine->video_frame.ratio.cy = 1; if (FAILED(IMFTopology_GetNodeByID(topology, engine->video_frame.node_id, &node))) return; @@ -284,7 +304,17 @@ static void media_engine_get_frame_size(struct media_engine *engine, IMFTopology return; } - IMFMediaType_GetUINT64(media_type, &MF_MT_FRAME_SIZE, &engine->video_frame.size); + IMFMediaType_GetUINT64(media_type, &MF_MT_FRAME_SIZE, &size); + + engine->video_frame.size.cx = size >> 32; + engine->video_frame.size.cy = size; + + if ((gcd = get_gcd(engine->video_frame.size.cx, engine->video_frame.size.cy))) + { + engine->video_frame.ratio.cx = engine->video_frame.size.cx / gcd; + engine->video_frame.ratio.cy = engine->video_frame.size.cy / gcd; + } + IMFMediaType_Release(media_type); } @@ -533,8 +563,7 @@ static HRESULT media_engine_create_topology(struct media_engine *engine, IMFMedi UINT64 duration; HRESULT hr; - engine->video_frame.node_id = 0; - engine->video_frame.size = 0; + memset(&engine->video_frame, 0, sizeof(engine->video_frame)); if (FAILED(hr = IMFMediaSource_CreatePresentationDescriptor(source, &pd))) return hr; @@ -1309,12 +1338,12 @@ static HRESULT WINAPI media_engine_GetNativeVideoSize(IMFMediaEngine *iface, DWO EnterCriticalSection(&engine->cs); - if (!engine->video_frame.size) + if (!engine->video_frame.size.cx && !engine->video_frame.size.cy) hr = E_FAIL; else { - if (cx) *cx = engine->video_frame.size >> 32; - if (cy) *cy = engine->video_frame.size; + if (cx) *cx = engine->video_frame.size.cx; + if (cy) *cy = engine->video_frame.size.cy; } LeaveCriticalSection(&engine->cs); @@ -1324,9 +1353,29 @@ static HRESULT WINAPI media_engine_GetNativeVideoSize(IMFMediaEngine *iface, DWO static HRESULT WINAPI media_engine_GetVideoAspectRatio(IMFMediaEngine *iface, DWORD *cx, DWORD *cy) { - FIXME("(%p, %p, %p): stub.\n", iface, cx, cy); + struct media_engine *engine = impl_from_IMFMediaEngine(iface); + HRESULT hr = S_OK; - return E_NOTIMPL; + TRACE("%p, %p, %p.\n", iface, cx, cy); + + if (!cx && !cy) + return E_INVALIDARG; + + EnterCriticalSection(&engine->cs); + + if (engine->flags & FLAGS_ENGINE_SHUT_DOWN) + hr = MF_E_SHUTDOWN; + else if (!engine->video_frame.size.cx && !engine->video_frame.size.cy) + hr = E_FAIL; + else + { + if (cx) *cx = engine->video_frame.ratio.cx; + if (cy) *cy = engine->video_frame.ratio.cy; + } + + LeaveCriticalSection(&engine->cs); + + return hr; } static HRESULT WINAPI media_engine_Shutdown(IMFMediaEngine *iface) diff --git a/dlls/mfmediaengine/tests/mfmediaengine.c b/dlls/mfmediaengine/tests/mfmediaengine.c index 21ead1b0afa..2f062741f60 100644 --- a/dlls/mfmediaengine/tests/mfmediaengine.c +++ b/dlls/mfmediaengine/tests/mfmediaengine.c @@ -383,7 +383,6 @@ todo_wine ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); hr = IMFMediaEngine_GetVideoAspectRatio(media_engine, &cx, &cy); -todo_wine ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); IMFMediaEngine_Release(media_engine);

1 0

Alexandre Julliard : gdi32: Build with msvcrt.
by Alexandre Julliard Nov. 5, 2020

Nov. 5, 2020

Module: wine Branch: master Commit: aa90a5969f08dfbd6219e77bf0713ce0da3f7625 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa90a5969f08dfbd6219e77b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 5 10:44:16 2020 +0100 gdi32: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/Makefile.in | 2 + dlls/gdi32/bidi.c | 2 - dlls/gdi32/bitblt.c | 4 - dlls/gdi32/brush.c | 2 - dlls/gdi32/dc.c | 8 +- dlls/gdi32/dib.c | 2 - dlls/gdi32/dibdrv/graphics.c | 7 +- dlls/gdi32/driver.c | 24 +++--- dlls/gdi32/enhmetafile.c | 3 - dlls/gdi32/enhmfdrv/graphics.c | 3 - dlls/gdi32/font.c | 190 ++++++++++++++++++++--------------------- dlls/gdi32/gdiobj.c | 2 - dlls/gdi32/icm.c | 3 - dlls/gdi32/metafile.c | 2 - dlls/gdi32/opengl.c | 3 - dlls/gdi32/painting.c | 3 - dlls/gdi32/path.c | 5 -- dlls/gdi32/pen.c | 2 - dlls/gdi32/vulkan.c | 3 - 19 files changed, 111 insertions(+), 159 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=aa90a5969f08dfbd6219…

1 0

Michael Stefaniuc : jscript: Use wide-char string literals in struct initialization.
by Alexandre Julliard Nov. 5, 2020

Nov. 5, 2020

Module: wine Branch: master Commit: a8a03eb35fa3d9d4f7efc8c9f4abca91bf093c44 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a8a03eb35fa3d9d4f7efc8c9… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Nov 3 23:34:40 2020 +0100 jscript: Use wide-char string literals in struct initialization. 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/jscript/bool.c | 7 +-- dlls/jscript/date.c | 146 +++++++++++++++------------------------------- dlls/jscript/enumerator.c | 13 ++--- dlls/jscript/error.c | 3 +- dlls/jscript/function.c | 20 +++---- dlls/jscript/global.c | 54 ++++++----------- dlls/jscript/json.c | 7 +-- dlls/jscript/jsregexp.c | 72 ++++++++--------------- dlls/jscript/math.c | 79 +++++++++---------------- dlls/jscript/number.c | 19 ++---- dlls/jscript/vbarray.c | 16 ++--- 11 files changed, 143 insertions(+), 293 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a8a03eb35fa3d9d4f7ef…

1 0