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

Piotr Caban : msvcp90: Add support for more creation flags in _Mtx class.
by Alexandre Julliard 26 Mar '19

26 Mar '19

Module: wine Branch: master Commit: 8a82912b28aa0c0c3ac4fc309fa8079e4415111d URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a82912b28aa0c0c3ac4fc30… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 26 18:12:13 2019 +0100 msvcp90: Add support for more creation flags in _Mtx class. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46908 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp120/tests/msvcp120.c | 44 ++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/misc.c | 13 +++++++++---- 2 files changed, 53 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index c1c7002..a35d1f6 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -323,6 +323,10 @@ typedef struct void *tail; } critical_section; +#define MTX_PLAIN 0x1 +#define MTX_TRY 0x2 +#define MTX_TIMED 0x4 +#define MTX_RECURSIVE 0x100 typedef struct { DWORD flags; @@ -335,6 +339,7 @@ static int (__cdecl *p__Mtx_init)(_Mtx_t*, int); static void (__cdecl *p__Mtx_destroy)(_Mtx_t*); static int (__cdecl *p__Mtx_lock)(_Mtx_t*); static int (__cdecl *p__Mtx_unlock)(_Mtx_t*); +static int (__cdecl *p__Mtx_trylock)(_Mtx_t*); /* cnd */ typedef void *_Cnd_t; @@ -801,6 +806,8 @@ static BOOL init(void) "_Mtx_lock"); SET(p__Mtx_unlock, "_Mtx_unlock"); + SET(p__Mtx_trylock, + "_Mtx_trylock"); SET(p__Cnd_init, "_Cnd_init"); @@ -2438,6 +2445,42 @@ static void test__Pad(void) CloseHandle(_Pad__Launch_returned); } +static void test__Mtx(void) +{ +# + static int flags[] = + { + 0, MTX_PLAIN, MTX_TRY, MTX_TIMED, MTX_RECURSIVE, + MTX_PLAIN|MTX_TRY, MTX_PLAIN|MTX_RECURSIVE, MTX_PLAIN|0xbeef + }; + _Mtx_t mtx; + int i, r, expect; + + for (i=0; i<ARRAY_SIZE(flags); i++) + { + if (flags[i] == MTX_PLAIN || flags[i] & MTX_RECURSIVE) + expect = 0; + else + expect = 3; + + r = p__Mtx_init(&mtx, flags[i]); + ok(!r, "failed to init mtx (flags %x)\n", flags[i]); + + r = p__Mtx_trylock(&mtx); + ok(!r, "_Mtx_trylock returned %x (flags %x)\n", r, flags[i]); + r = p__Mtx_trylock(&mtx); + ok(r == expect, "_Mtx_trylock returned %x (flags %x)\n", r, flags[i]); + if(!r) p__Mtx_unlock(&mtx); + + r = p__Mtx_lock(&mtx); + ok(r == expect, "_Mtx_lock returned %x (flags %x)\n", r, flags[i]); + if(!r) p__Mtx_unlock(&mtx); + + p__Mtx_unlock(&mtx); + p__Mtx_destroy(&mtx); + } +} + static void test_threads__Mtx(void) { void *mtx = NULL; @@ -3341,6 +3384,7 @@ START_TEST(msvcp120) test_thrd(); test_cnd(); test__Pad(); + test__Mtx(); test_threads__Mtx(); test_vector_base_v4__Segment_index_of(); diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index 0e81b8d..dac6a96 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -681,7 +681,10 @@ __ASM_GLOBAL_FUNC(call_thiscall_func, #endif /* __i386__ */ -#define MTX_MULTI_LOCK 0x100 +#define MTX_PLAIN 0x1 +#define MTX_TRY 0x2 +#define MTX_TIMED 0x4 +#define MTX_RECURSIVE 0x100 #define MTX_LOCKED 3 typedef struct { @@ -703,7 +706,7 @@ typedef _Mtx_t *_Mtx_arg_t; void __cdecl _Mtx_init_in_situ(_Mtx_t mtx, int flags) { - if(flags & ~MTX_MULTI_LOCK) + if(flags & ~(MTX_PLAIN | MTX_TRY | MTX_TIMED | MTX_RECURSIVE)) FIXME("unknown flags ignored: %x\n", flags); mtx->flags = flags; @@ -740,7 +743,8 @@ int __cdecl _Mtx_lock(_Mtx_arg_t mtx) if(MTX_T_FROM_ARG(mtx)->thread_id != GetCurrentThreadId()) { call_func1(critical_section_lock, &MTX_T_FROM_ARG(mtx)->cs); MTX_T_FROM_ARG(mtx)->thread_id = GetCurrentThreadId(); - }else if(!(MTX_T_FROM_ARG(mtx)->flags & MTX_MULTI_LOCK)) { + }else if(!(MTX_T_FROM_ARG(mtx)->flags & MTX_RECURSIVE) + && MTX_T_FROM_ARG(mtx)->flags != MTX_PLAIN) { return MTX_LOCKED; } @@ -764,7 +768,8 @@ int __cdecl _Mtx_trylock(_Mtx_arg_t mtx) if(!call_func1(critical_section_trylock, &MTX_T_FROM_ARG(mtx)->cs)) return MTX_LOCKED; MTX_T_FROM_ARG(mtx)->thread_id = GetCurrentThreadId(); - }else if(!(MTX_T_FROM_ARG(mtx)->flags & MTX_MULTI_LOCK)) { + }else if(!(MTX_T_FROM_ARG(mtx)->flags & MTX_RECURSIVE) + && MTX_T_FROM_ARG(mtx)->flags != MTX_PLAIN) { return MTX_LOCKED; }

1 0

Józef Kucia : include/d3d12: Get rid of duplicated prototype.
by Alexandre Julliard 26 Mar '19

26 Mar '19

Module: wine Branch: master Commit: fdfbed3ff3f478b4223643f4be5c6f86a6071952 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fdfbed3ff3f478b4223643f4… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 26 18:29:43 2019 +0100 include/d3d12: Get rid of duplicated prototype. Spotted by Stefan Dösinger. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d3d12.idl | 4 ---- 1 file changed, 4 deletions(-) diff --git a/include/d3d12.idl b/include/d3d12.idl index 3a5a914..307a4fd 100644 --- a/include/d3d12.idl +++ b/include/d3d12.idl @@ -2171,10 +2171,6 @@ interface ID3D12RootSignatureDeserializer : IUnknown const D3D12_VERSIONED_ROOT_SIGNATURE_DESC *root_signature_desc, ID3DBlob **blob, ID3DBlob **error_blob); -[local] HRESULT __stdcall D3D12SerializeVersionedRootSignature( - const D3D12_VERSIONED_ROOT_SIGNATURE_DESC *desc, - ID3DBlob **blob, ID3DBlob **error_blob); - typedef HRESULT (__stdcall *PFN_D3D12_CREATE_DEVICE)(IUnknown *adapter, D3D_FEATURE_LEVEL minimum_feature_level, REFIID iid, void **device);

1 0

Józef Kucia : wined3d: Unset WINED3DFMT_FLAG_TEXTURE for unsupported shadow textures.
by Alexandre Julliard 26 Mar '19

26 Mar '19

Module: wine Branch: master Commit: 35d6f4c7f0d1cbc0608c7bca834dd79805799dce URL: https://source.winehq.org/git/wine.git/?a=commit;h=35d6f4c7f0d1cbc0608c7bca… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 26 18:29:44 2019 +0100 wined3d: Unset WINED3DFMT_FLAG_TEXTURE for unsupported shadow textures. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index a800527..872b0f7 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3197,6 +3197,9 @@ static BOOL init_format_texture_info(struct wined3d_adapter *adapter, struct win format_clear_flag(&format->f, WINED3DFMT_FLAG_SRGB_READ | WINED3DFMT_FLAG_SRGB_WRITE); } + if (!gl_info->supported[ARB_SHADOW] && (format->f.flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_SHADOW)) + format_clear_flag(&format->f, WINED3DFMT_FLAG_TEXTURE); + query_internal_format(adapter, format, &format_texture_info[i], gl_info, srgb_write, FALSE); /* Texture conversion stuff */

1 0

Isira Seneviratne : po: Update Sinhala translation.
by Alexandre Julliard 26 Mar '19

26 Mar '19

Module: wine Branch: master Commit: 59e6cc1645cefeee725fae8ab7dc8390f9358d8e URL: https://source.winehq.org/git/wine.git/?a=commit;h=59e6cc1645cefeee725fae8a… Author: Isira Seneviratne <isirasen96(a)gmail.com> Date: Fri Mar 22 12:07:42 2019 +0530 po: Update Sinhala translation. Signed-off-by: Isira Seneviratne <isirasen96(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/si.po | 324 ++++++++++++++++++++++++++++++++++++--------------------------- 1 file changed, 186 insertions(+), 138 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=59e6cc1645cefeee725f…

1 0

Alexandre Julliard : msvcrt: Export the onexit functions from the import library.
by Alexandre Julliard 26 Mar '19

26 Mar '19

Module: wine Branch: master Commit: 0673ddf3a55eb524f8284be3b2fc9ab62a2acf52 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0673ddf3a55eb524f8284be3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 26 20:21:14 2019 +0100 msvcrt: Export the onexit functions from the import library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr100/Makefile.in | 1 + dlls/msvcr110/Makefile.in | 1 + dlls/msvcr120/Makefile.in | 1 + dlls/msvcr70/Makefile.in | 1 + dlls/msvcr71/Makefile.in | 1 + dlls/msvcr80/Makefile.in | 1 + dlls/msvcr90/Makefile.in | 1 + dlls/msvcrt/Makefile.in | 1 + dlls/msvcrt/exit.c | 138 +++----------------------------------------- dlls/msvcrt/msvcrt.h | 7 +++ dlls/msvcrt/msvcrt.spec | 3 - dlls/msvcrt/onexit.c | 119 ++++++++++++++++++++++++++++++++++++++ dlls/ucrtbase/Makefile.in | 1 + dlls/ucrtbase/ucrtbase.spec | 12 ++-- 14 files changed, 148 insertions(+), 140 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0673ddf3a55eb524f828…

1 0

Alexandre Julliard : msvcrt: Export the __acrt_iob_func function from the import library.
by Alexandre Julliard 26 Mar '19

26 Mar '19

Module: wine Branch: master Commit: ca50117418d6b8a6146dcecd5e78819b28da2e40 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca50117418d6b8a6146dcecd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 26 20:22:43 2019 +0100 msvcrt: Export the __acrt_iob_func function from the import library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr100/Makefile.in | 1 + dlls/msvcr100/msvcr100.spec | 4 ++-- dlls/msvcr110/Makefile.in | 1 + dlls/msvcr110/msvcr110.spec | 4 ++-- dlls/msvcr120/Makefile.in | 1 + dlls/msvcr120/msvcr120.spec | 4 ++-- dlls/msvcr70/Makefile.in | 1 + dlls/msvcr70/msvcr70.spec | 4 ++-- dlls/msvcr71/Makefile.in | 1 + dlls/msvcr71/msvcr71.spec | 4 ++-- dlls/msvcr80/Makefile.in | 1 + dlls/msvcr80/msvcr80.spec | 4 ++-- dlls/msvcr90/Makefile.in | 1 + dlls/msvcr90/msvcr90.spec | 4 ++-- dlls/msvcrt/Makefile.in | 1 + dlls/msvcrt/file.c | 12 ++---------- dlls/msvcrt/iob.c | 36 ++++++++++++++++++++++++++++++++++++ dlls/msvcrt/msvcrt.spec | 5 ++--- dlls/ucrtbase/Makefile.in | 1 + dlls/ucrtbase/ucrtbase.spec | 4 ++-- 20 files changed, 65 insertions(+), 29 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ca50117418d6b8a6146d…

1 0

Michael Stefaniuc : wineoss.drv: Remove useless cast to self.
by Alexandre Julliard 26 Mar '19

26 Mar '19

Module: wine Branch: master Commit: 78aaffb55d52dcbdcfd14380bd4dead79522bdb0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=78aaffb55d52dcbdcfd14380… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Mar 24 14:26:45 2019 +0100 wineoss.drv: Remove useless cast to self. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineoss.drv/mmdevdrv.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index fa3f885..afa018a 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -605,8 +605,7 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, if(!This) return E_OUTOFMEMORY; - hr = CoCreateFreeThreadedMarshaler((IUnknown *)&This->IAudioClient_iface, - (IUnknown **)&This->pUnkFTMarshal); + hr = CoCreateFreeThreadedMarshaler((IUnknown *)&This->IAudioClient_iface, &This->pUnkFTMarshal); if (FAILED(hr)) { HeapFree(GetProcessHeap(), 0, This); return hr;

1 0

Michael Stefaniuc : winealsa.drv: Remove useless cast to self.
by Alexandre Julliard 26 Mar '19

26 Mar '19

Module: wine Branch: master Commit: edf2df3679dada489ed345570020ef7338e52351 URL: https://source.winehq.org/git/wine.git/?a=commit;h=edf2df3679dada489ed34557… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Mar 24 14:26:46 2019 +0100 winealsa.drv: Remove useless cast to self. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winealsa.drv/mmdevdrv.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index de89fd0..2bf4d73 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -803,8 +803,7 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient return E_UNEXPECTED; } - hr = CoCreateFreeThreadedMarshaler((IUnknown *)&This->IAudioClient_iface, - (IUnknown **)&This->pUnkFTMarshal); + hr = CoCreateFreeThreadedMarshaler((IUnknown *)&This->IAudioClient_iface, &This->pUnkFTMarshal); if (FAILED(hr)) { HeapFree(GetProcessHeap(), 0, This); return hr;

1 0

Andrew Eikum : winecoreaudio.drv: Remove useless cast to self.
by Alexandre Julliard 26 Mar '19

26 Mar '19

Module: wine Branch: master Commit: be0c18b2b10a3a524674ae1481d83d294a761668 URL: https://source.winehq.org/git/wine.git/?a=commit;h=be0c18b2b10a3a524674ae14… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Mar 26 08:34:55 2019 -0500 winecoreaudio.drv: Remove useless cast to self. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecoreaudio.drv/mmdevdrv.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index c362a51..28ada43 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -695,8 +695,7 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient This->lock = 0; - hr = CoCreateFreeThreadedMarshaler((IUnknown *)&This->IAudioClient_iface, - (IUnknown **)&This->pUnkFTMarshal); + hr = CoCreateFreeThreadedMarshaler((IUnknown *)&This->IAudioClient_iface, &This->pUnkFTMarshal); if (FAILED(hr)) { HeapFree(GetProcessHeap(), 0, This); return hr;

1 0

Andrew Eikum : wineandroid.drv: Remove useless cast to self.
by Alexandre Julliard 26 Mar '19

26 Mar '19

Module: wine Branch: master Commit: b51064a3d5186277e2e377f4faf0f17e816689df URL: https://source.winehq.org/git/wine.git/?a=commit;h=b51064a3d5186277e2e377f4… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Mar 26 08:36:16 2019 -0500 wineandroid.drv: Remove useless cast to self. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/mmdevdrv.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/wineandroid.drv/mmdevdrv.c b/dlls/wineandroid.drv/mmdevdrv.c index 3968536..1dafe02 100644 --- a/dlls/wineandroid.drv/mmdevdrv.c +++ b/dlls/wineandroid.drv/mmdevdrv.c @@ -379,8 +379,7 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, if(!This) return E_OUTOFMEMORY; - hr = CoCreateFreeThreadedMarshaler((IUnknown *)&This->IAudioClient_iface, - (IUnknown **)&This->pUnkFTMarshal); + hr = CoCreateFreeThreadedMarshaler((IUnknown *)&This->IAudioClient_iface, &This->pUnkFTMarshal); if (FAILED(hr)) { HeapFree(GetProcessHeap(), 0, This); return hr;

1 0