July 2020 - Wine-Devel - list.winehq.org

[PATCH 3/7] kernelbase: Reimplement GetNumberOfConsoleInputEvents using IOCTL_CONDRV_GET_INPUT_INFO.
by Jacek Caban July 6, 2020

July 6, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernelbase/console.c | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-)

1 0

[PATCH 2/7] server: Introduce IOCTL_CONDRV_GET_INPUT_INFO ioctl.
by Jacek Caban July 6, 2020

July 6, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/wine/condrv.h | 35 +++++++++++++++++++++++++++++++++++ server/console.c | 28 +++++++++++++++++++++++++++- 2 files changed, 62 insertions(+), 1 deletion(-) create mode 100644 include/wine/condrv.h

1 0

[PATCH 1/7] server: Always create fd for console_input object.
by Jacek Caban July 6, 2020

July 6, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- server/console.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-)

1 0

[PATCH] ntdll: Correct a comment referring to fd_cache_section.
by Zebediah Figura July 6, 2020

July 6, 2020

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/ntdll/unix/server.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index d3145a84e21..813c926cf46 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -893,7 +893,7 @@ static inline unsigned int handle_to_index( HANDLE handle, unsigned int *entry ) /*********************************************************************** * add_fd_to_cache * - * Caller must hold fd_cache_section. + * Caller must hold fd_cache_mutex. */ static BOOL add_fd_to_cache( HANDLE handle, int fd, enum server_fd_type type, unsigned int access, unsigned int options ) -- 2.27.0

1 0

[PATCH 1/5] mfplat: Implement sample tracking.
by Nikolay Sivov July 6, 2020

July 6, 2020

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/buffer.c | 131 ++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 122 insertions(+), 9 deletions(-) diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index 67c60663b33..a3311bc10f1 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -19,6 +19,7 @@ #define COBJMACROS #include "mfplat_private.h" +#include "rtworkq.h" #include "wine/debug.h" @@ -71,6 +72,10 @@ struct sample DWORD prop_flags; LONGLONG duration; LONGLONG timestamp; + + /* Tracked sample functionality. */ + IRtwqAsyncResult *tracked_result; + LONG tracked_refcount; }; static inline struct memory_buffer *impl_from_IMFMediaBuffer(IMFMediaBuffer *iface) @@ -752,22 +757,53 @@ static ULONG WINAPI sample_AddRef(IMFSample *iface) return refcount; } +static void release_sample_object(struct sample *sample) +{ + size_t i; + + for (i = 0; i < sample->buffer_count; ++i) + IMFMediaBuffer_Release(sample->buffers[i]); + clear_attributes_object(&sample->attributes); + heap_free(sample->buffers); + heap_free(sample); +} + static ULONG WINAPI sample_Release(IMFSample *iface) { struct sample *sample = impl_from_IMFSample(iface); ULONG refcount = InterlockedDecrement(&sample->attributes.ref); - size_t i; TRACE("%p, refcount %u.\n", iface, refcount); if (!refcount) + release_sample_object(sample); + + return refcount; +} + +static ULONG WINAPI sample_tracked_Release(IMFSample *iface) +{ + struct sample *sample = impl_from_IMFSample(iface); + ULONG refcount; + HRESULT hr; + + EnterCriticalSection(&sample->attributes.cs); + refcount = InterlockedDecrement(&sample->attributes.ref); + if (sample->tracked_result && sample->tracked_refcount == refcount) { - for (i = 0; i < sample->buffer_count; ++i) - IMFMediaBuffer_Release(sample->buffers[i]); - clear_attributes_object(&sample->attributes); - heap_free(sample->buffers); - heap_free(sample); + /* Call could fail if queue system is not initialized, it's not critical. */ + if (FAILED(hr = RtwqInvokeCallback(sample->tracked_result))) + WARN("Failed to invoke tracking callback, hr %#x.\n", hr); + IRtwqAsyncResult_Release(sample->tracked_result); + sample->tracked_result = NULL; + sample->tracked_refcount = 0; } + LeaveCriticalSection(&sample->attributes.cs); + + TRACE("%p, refcount %u.\n", iface, refcount); + + if (!refcount) + release_sample_object(sample); return refcount; } @@ -1484,9 +1520,34 @@ static ULONG WINAPI tracked_sample_Release(IMFTrackedSample *iface) static HRESULT WINAPI tracked_sample_SetAllocator(IMFTrackedSample *iface, IMFAsyncCallback *sample_allocator, IUnknown *state) { - FIXME("%p, %p, %p.\n", iface, sample_allocator, state); + struct sample *sample = impl_from_IMFTrackedSample(iface); + HRESULT hr = S_OK; - return E_NOTIMPL; + TRACE("%p, %p, %p.\n", iface, sample_allocator, state); + + EnterCriticalSection(&sample->attributes.cs); + + if (sample->tracked_result) + hr = MF_E_NOTACCEPTING; + else + { + if (SUCCEEDED(hr = RtwqCreateAsyncResult((IUnknown *)iface, (IRtwqAsyncCallback *)sample_allocator, + state, &sample->tracked_result))) + { + /* Account for additional refcount brought by 'state' object. This threshold is used + on Release() to invoke tracker callback. */ + sample->tracked_refcount = 1; + if (state == (IUnknown *)&sample->IMFTrackedSample_iface || + state == (IUnknown *)&sample->IMFSample_iface) + { + ++sample->tracked_refcount; + } + } + } + + LeaveCriticalSection(&sample->attributes.cs); + + return hr; } static const IMFTrackedSampleVtbl tracked_sample_vtbl = @@ -1497,6 +1558,58 @@ static const IMFTrackedSampleVtbl tracked_sample_vtbl = tracked_sample_SetAllocator, }; +static const IMFSampleVtbl sample_tracked_vtbl = +{ + sample_QueryInterface, + sample_AddRef, + sample_tracked_Release, + sample_GetItem, + sample_GetItemType, + sample_CompareItem, + sample_Compare, + sample_GetUINT32, + sample_GetUINT64, + sample_GetDouble, + sample_GetGUID, + sample_GetStringLength, + sample_GetString, + sample_GetAllocatedString, + sample_GetBlobSize, + sample_GetBlob, + sample_GetAllocatedBlob, + sample_GetUnknown, + sample_SetItem, + sample_DeleteItem, + sample_DeleteAllItems, + sample_SetUINT32, + sample_SetUINT64, + sample_SetDouble, + sample_SetGUID, + sample_SetString, + sample_SetBlob, + sample_SetUnknown, + sample_LockStore, + sample_UnlockStore, + sample_GetCount, + sample_GetItemByIndex, + sample_CopyAllItems, + sample_GetSampleFlags, + sample_SetSampleFlags, + sample_GetSampleTime, + sample_SetSampleTime, + sample_GetSampleDuration, + sample_SetSampleDuration, + sample_GetBufferCount, + sample_GetBufferByIndex, + sample_ConvertToContiguousBuffer, + sample_AddBuffer, + sample_RemoveBufferByIndex, + sample_RemoveAllBuffers, + sample_GetTotalLength, + sample_CopyToBuffer, +}; + + /*********************************************************************** * MFCreateSample (mfplat.@) */ @@ -1546,7 +1659,7 @@ HRESULT WINAPI MFCreateTrackedSample(IMFTrackedSample **sample) return hr; } - object->IMFSample_iface.lpVtbl = &samplevtbl; + object->IMFSample_iface.lpVtbl = &sample_tracked_vtbl; object->IMFTrackedSample_iface.lpVtbl = &tracked_sample_vtbl; *sample = &object->IMFTrackedSample_iface; -- 2.27.0

2 5

[PATCH 1/2] amstream: Increment/decrement IMediaStreamFilter refcount twice in multimedia_stream_create/release().
by Gijs Vermeulen July 6, 2020

July 6, 2020

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/amstream/multimedia.c | 7 ++++++- dlls/amstream/tests/amstream.c | 8 ++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/amstream/multimedia.c b/dlls/amstream/multimedia.c index e058e639dd..56512d19da 100644 --- a/dlls/amstream/multimedia.c +++ b/dlls/amstream/multimedia.c @@ -91,7 +91,11 @@ static ULONG WINAPI multimedia_stream_Release(IAMMultiMediaStream *iface) { if (This->ipin) IPin_Release(This->ipin); - IMediaStreamFilter_Release(This->filter); + if (This->filter) + { + IMediaStreamFilter_Release(This->filter); + IMediaStreamFilter_Release(This->filter); + } if (This->media_seeking) IMediaSeeking_Release(This->media_seeking); if (This->media_control) @@ -519,6 +523,7 @@ HRESULT multimedia_stream_create(IUnknown *outer, void **out) } TRACE("Created multimedia stream %p.\n", object); + IMediaStreamFilter_AddRef(object->filter); *out = &object->IAMMultiMediaStream_iface; return S_OK; diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 3fb77f277a..7ebd54f6da 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -1140,7 +1140,7 @@ static void test_enum_pins(void) ok(hr == S_OK, "Got hr %#x.\n", hr); ref = get_refcount(filter); - todo_wine ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ok(ref == 3, "Got unexpected refcount %d.\n", ref); hr = IMediaStreamFilter_EnumPins(filter, NULL); ok(hr == E_POINTER, "Got hr %#x.\n", hr); @@ -1148,7 +1148,7 @@ static void test_enum_pins(void) hr = IMediaStreamFilter_EnumPins(filter, &enum1); ok(hr == S_OK, "Got hr %#x.\n", hr); ref = get_refcount(filter); - todo_wine ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ok(ref == 3, "Got unexpected refcount %d.\n", ref); ref = get_refcount(enum1); ok(ref == 1, "Got unexpected refcount %d.\n", ref); @@ -1186,7 +1186,7 @@ static void test_enum_pins(void) ok(hr == S_OK, "Got hr %#x.\n", hr); ref = get_refcount(filter); - todo_wine ok(ref == 4, "Got unexpected refcount %d.\n", ref); + ok(ref == 4, "Got unexpected refcount %d.\n", ref); ref = get_refcount(enum1); ok(ref == 1, "Got unexpected refcount %d.\n", ref); ref = get_refcount(pin); @@ -1196,7 +1196,7 @@ static void test_enum_pins(void) ok(hr == S_OK, "Got hr %#x.\n", hr); ok(pins[0] == pin, "Expected pin %p, got %p.\n", pin, pins[0]); ref = get_refcount(filter); - todo_wine ok(ref == 4, "Got unexpected refcount %d.\n", ref); + ok(ref == 4, "Got unexpected refcount %d.\n", ref); ref = get_refcount(enum1); ok(ref == 1, "Got unexpected refcount %d.\n", ref); ref = get_refcount(pin); -- 2.27.0

2 2

[PATCH] *.spec: Fix ldiv() return type.
by Serge Gautherie July 6, 2020

July 6, 2020

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- dlls/api-ms-win-crt-utility-l1-1-0/api-ms-win-crt-utility-l1-1-0.spec | 2 +- dlls/crtdll/crtdll.spec | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcr70/msvcr70.spec | 2 +- dlls/msvcr71/msvcr71.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt20/msvcrt20.spec | 2 +- dlls/msvcrt40/msvcrt40.spec | 2 +- dlls/msvcrtd/msvcrtd.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/api-ms-win-crt-utility-l1-1-0/api-ms-win-crt-utility-l1-1-0.spec b/dlls/api-ms-win-crt-utility-l1-1-0/api-ms-win-crt-utility-l1-1-0.spec index fe3d04d..b34147b 100644 --- a/dlls/api-ms-win-crt-utility-l1-1-0/api-ms-win-crt-utility-l1-1-0.spec +++ b/dlls/api-ms-win-crt-utility-l1-1-0/api-ms-win-crt-utility-l1-1-0.spec @@ -20,7 +20,7 @@ @ stub imaxabs @ stub imaxdiv @ cdecl labs(long) ucrtbase.labs -@ cdecl ldiv(long long) ucrtbase.ldiv +@ cdecl -ret64 ldiv(long long) ucrtbase.ldiv @ cdecl -ret64 llabs(int64) ucrtbase.llabs @ cdecl lldiv(int64 int64) ucrtbase.lldiv @ cdecl qsort(ptr long long ptr) ucrtbase.qsort diff --git a/dlls/crtdll/crtdll.spec b/dlls/crtdll/crtdll.spec index 9c88c2a..3acd20e 100644 --- a/dlls/crtdll/crtdll.spec +++ b/dlls/crtdll/crtdll.spec @@ -422,7 +422,7 @@ @ cdecl isxdigit(long) MSVCRT_isxdigit @ cdecl labs(long) MSVCRT_labs @ cdecl ldexp(double long) MSVCRT_ldexp -@ cdecl ldiv(long long) MSVCRT_ldiv +@ cdecl -ret64 ldiv(long long) MSVCRT_ldiv @ cdecl localeconv() MSVCRT_localeconv @ cdecl localtime(ptr) MSVCRT_localtime @ cdecl log(double) MSVCRT_log diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index a7c77ef..534889b 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1731,7 +1731,7 @@ @ cdecl isxdigit(long) MSVCRT_isxdigit @ cdecl labs(long) MSVCRT_labs @ cdecl ldexp(double long) MSVCRT_ldexp -@ cdecl ldiv(long long) MSVCRT_ldiv +@ cdecl -ret64 ldiv(long long) MSVCRT_ldiv @ cdecl -ret64 llabs(int64) MSVCRT_llabs @ cdecl lldiv(int64 int64) MSVCRT_lldiv @ cdecl localeconv() MSVCRT_localeconv diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 54ef82b..820fb97 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -2089,7 +2089,7 @@ @ cdecl isxdigit(long) MSVCRT_isxdigit @ cdecl labs(long) MSVCRT_labs @ cdecl ldexp(double long) MSVCRT_ldexp -@ cdecl ldiv(long long) MSVCRT_ldiv +@ cdecl -ret64 ldiv(long long) MSVCRT_ldiv @ cdecl -ret64 llabs(int64) MSVCRT_llabs @ cdecl lldiv(int64 int64) MSVCRT_lldiv @ cdecl localeconv() MSVCRT_localeconv diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index a55a845..1d9662a 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2242,7 +2242,7 @@ @ cdecl isxdigit(long) MSVCRT_isxdigit @ cdecl labs(long) MSVCRT_labs @ cdecl ldexp(double long) MSVCRT_ldexp -@ cdecl ldiv(long long) MSVCRT_ldiv +@ cdecl -ret64 ldiv(long long) MSVCRT_ldiv @ cdecl lgamma(double) MSVCR120_lgamma @ cdecl lgammaf(float) MSVCR120_lgammaf @ cdecl lgammal(double) MSVCR120_lgammal diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 63a4ccf..af3d1b5 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1905,7 +1905,7 @@ @ cdecl isxdigit(long) msvcr120.isxdigit @ cdecl labs(long) msvcr120.labs @ cdecl ldexp(double long) msvcr120.ldexp -@ cdecl ldiv(long long) msvcr120.ldiv +@ cdecl -ret64 ldiv(long long) msvcr120.ldiv @ cdecl lgamma(double) msvcr120.lgamma @ cdecl lgammaf(float) msvcr120.lgammaf @ cdecl lgammal(double) msvcr120.lgammal diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index 79f0d65..2649034 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -766,7 +766,7 @@ @ cdecl isxdigit(long) MSVCRT_isxdigit @ cdecl labs(long) MSVCRT_labs @ cdecl ldexp(double long) MSVCRT_ldexp -@ cdecl ldiv(long long) MSVCRT_ldiv +@ cdecl -ret64 ldiv(long long) MSVCRT_ldiv @ cdecl localeconv() MSVCRT_localeconv @ cdecl localtime(ptr) MSVCRT_localtime @ cdecl log(double) MSVCRT_log diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index 317fc0d..9d3e2b2 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -762,7 +762,7 @@ @ cdecl isxdigit(long) MSVCRT_isxdigit @ cdecl labs(long) MSVCRT_labs @ cdecl ldexp(double long) MSVCRT_ldexp -@ cdecl ldiv(long long) MSVCRT_ldiv +@ cdecl -ret64 ldiv(long long) MSVCRT_ldiv @ cdecl localeconv() MSVCRT_localeconv @ cdecl localtime(ptr) MSVCRT_localtime @ cdecl log(double) MSVCRT_log diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 49df8c8..0d805c8 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1413,7 +1413,7 @@ @ cdecl isxdigit(long) MSVCRT_isxdigit @ cdecl labs(long) MSVCRT_labs @ cdecl ldexp(double long) MSVCRT_ldexp -@ cdecl ldiv(long long) MSVCRT_ldiv +@ cdecl -ret64 ldiv(long long) MSVCRT_ldiv @ cdecl localeconv() MSVCRT_localeconv @ cdecl log(double) MSVCRT_log @ cdecl -arch=!i386 logf(float) MSVCRT_logf diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index ce0897c..460ae6c 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1386,7 +1386,7 @@ @ cdecl isxdigit(long) MSVCRT_isxdigit @ cdecl labs(long) MSVCRT_labs @ cdecl ldexp(double long) MSVCRT_ldexp -@ cdecl ldiv(long long) MSVCRT_ldiv +@ cdecl -ret64 ldiv(long long) MSVCRT_ldiv @ cdecl localeconv() MSVCRT_localeconv @ cdecl log(double) MSVCRT_log @ cdecl log10(double) MSVCRT_log10 diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index bf096f2..cc2f257 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1352,7 +1352,7 @@ @ cdecl isxdigit(long) MSVCRT_isxdigit @ cdecl labs(long) MSVCRT_labs @ cdecl ldexp(double long) MSVCRT_ldexp -@ cdecl ldiv(long long) MSVCRT_ldiv +@ cdecl -ret64 ldiv(long long) MSVCRT_ldiv @ cdecl localeconv() MSVCRT_localeconv @ cdecl localtime(ptr) MSVCRT_localtime @ cdecl log(double) MSVCRT_log diff --git a/dlls/msvcrt20/msvcrt20.spec b/dlls/msvcrt20/msvcrt20.spec index 5384c0d..69c6775 100644 --- a/dlls/msvcrt20/msvcrt20.spec +++ b/dlls/msvcrt20/msvcrt20.spec @@ -1354,7 +1354,7 @@ @ cdecl isxdigit(long) msvcrt.isxdigit @ cdecl labs(long) msvcrt.labs @ cdecl ldexp(double long) msvcrt.ldexp -@ cdecl ldiv(long long) msvcrt.ldiv +@ cdecl -ret64 ldiv(long long) msvcrt.ldiv @ cdecl localeconv() msvcrt.localeconv @ cdecl localtime(ptr) msvcrt.localtime @ cdecl log(double) msvcrt.log diff --git a/dlls/msvcrt40/msvcrt40.spec b/dlls/msvcrt40/msvcrt40.spec index c2cee6c..f1e73bc 100644 --- a/dlls/msvcrt40/msvcrt40.spec +++ b/dlls/msvcrt40/msvcrt40.spec @@ -1422,7 +1422,7 @@ @ cdecl isxdigit(long) msvcrt.isxdigit @ cdecl labs(long) msvcrt.labs @ cdecl ldexp(double long) msvcrt.ldexp -@ cdecl ldiv(long long) msvcrt.ldiv +@ cdecl -ret64 ldiv(long long) msvcrt.ldiv @ cdecl localeconv() msvcrt.localeconv @ cdecl localtime(ptr) msvcrt.localtime @ cdecl log(double) msvcrt.log diff --git a/dlls/msvcrtd/msvcrtd.spec b/dlls/msvcrtd/msvcrtd.spec index b502ed7..45f5888 100644 --- a/dlls/msvcrtd/msvcrtd.spec +++ b/dlls/msvcrtd/msvcrtd.spec @@ -718,7 +718,7 @@ @ cdecl isxdigit(long) MSVCRT_isxdigit @ cdecl labs(long) MSVCRT_labs @ cdecl ldexp(double long) MSVCRT_ldexp -@ cdecl ldiv(long long) MSVCRT_ldiv +@ cdecl -ret64 ldiv(long long) MSVCRT_ldiv @ cdecl localeconv() MSVCRT_localeconv @ cdecl localtime(ptr) MSVCRT_localtime @ cdecl log(double) MSVCRT_log diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index a968cda..6a919a8 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2376,7 +2376,7 @@ @ cdecl isxdigit(long) MSVCRT_isxdigit @ cdecl labs(long) MSVCRT_labs @ cdecl ldexp(double long) MSVCRT_ldexp -@ cdecl ldiv(long long) MSVCRT_ldiv +@ cdecl -ret64 ldiv(long long) MSVCRT_ldiv @ cdecl lgamma(double) MSVCR120_lgamma @ cdecl lgammaf(float) MSVCR120_lgammaf @ cdecl lgammal(double) MSVCR120_lgammal -- 2.10.0.windows.1

2 1

[PATCH] ntdll: Fix 64-bit values printing in relay.
by Piotr Caban July 6, 2020

July 6, 2020

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/ntdll/relay.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)

1 0

[PATCH] wined3d: Restore the Topmost state upon exiting fullscreen, when used from DXGI.
by Gabriel Ivăncescu July 6, 2020

July 6, 2020

DXGI, unlike D3D9 and below, restores the topmost state when exiting fullscreen. Unreal Engine 4 games (e.g. Deep Rock Galactic) depend on this because they don't unset it manually, so the window remains topmost on Wine. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- In fact, we already have tests for this in DXGI, but they've been marked todo_wine, which this patch fixes. dlls/dxgi/swapchain.c | 2 ++ dlls/dxgi/tests/dxgi.c | 2 -- dlls/wined3d/swapchain.c | 8 +++++++- include/wine/wined3d.h | 1 + 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index f37aee9..2895e0e 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -416,6 +416,7 @@ static HRESULT STDMETHODCALLTYPE DECLSPEC_HOTPATCH d3d11_swapchain_SetFullscreen wined3d_swapchain_get_desc(swapchain->wined3d_swapchain, &swapchain_desc); swapchain_desc.output = dxgi_output->wined3d_output; swapchain_desc.windowed = !fullscreen; + swapchain_desc.flags |= WINED3D_SWAPCHAIN_TOPMOST_RESTORE; hr = wined3d_swapchain_state_set_fullscreen(state, &swapchain_desc, NULL); wined3d_mutex_unlock(); if (FAILED(hr)) @@ -2243,6 +2244,7 @@ static HRESULT STDMETHODCALLTYPE DECLSPEC_HOTPATCH d3d12_swapchain_SetFullscreen goto fail; wined3d_mutex_lock(); wined3d_desc.windowed = !fullscreen; + wined3d_desc.flags |= WINED3D_SWAPCHAIN_TOPMOST_RESTORE; hr = wined3d_swapchain_state_set_fullscreen(swapchain->state, &wined3d_desc, NULL); wined3d_mutex_unlock(); if (FAILED(hr)) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 8f52e1d..8d243e2 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -5859,7 +5859,6 @@ static void test_swapchain_window_styles(void) todo_wine_if(!(tests[i].expected_style & WS_VISIBLE)) ok(style == tests[i].expected_style, "Test %u: Got style %#x, expected %#x.\n", i, style, tests[i].expected_style); - todo_wine_if(!(tests[i].expected_exstyle & WS_EX_TOPMOST)) ok(exstyle == tests[i].expected_exstyle, "Test %u: Got exstyle %#x, expected %#x.\n", i, exstyle, tests[i].expected_exstyle); @@ -5871,7 +5870,6 @@ static void test_swapchain_window_styles(void) todo_wine_if(!(tests[i].expected_style & WS_VISIBLE)) ok(style == tests[i].expected_style, "Test %u: Got style %#x, expected %#x.\n", i, style, tests[i].expected_style); - todo_wine_if(!(tests[i].expected_exstyle & WS_EX_TOPMOST)) ok(exstyle == tests[i].expected_exstyle, "Test %u: Got exstyle %#x, expected %#x.\n", i, exstyle, tests[i].expected_exstyle); diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index e9d6272..84aba06 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -2114,6 +2114,10 @@ void wined3d_swapchain_state_restore_from_fullscreen(struct wined3d_swapchain_st if (!state->style && !state->exstyle) return; + /* DXGI restores WS_EX_TOPMOST, unlike Direct3D 9 and below */ + if ((state->desc.flags & WINED3D_SWAPCHAIN_TOPMOST_RESTORE) && !(state->exstyle & WS_EX_TOPMOST)) + window_pos_flags &= ~SWP_NOZORDER; + style = GetWindowLongW(window, GWL_STYLE); exstyle = GetWindowLongW(window, GWL_EXSTYLE); @@ -2145,7 +2149,7 @@ void wined3d_swapchain_state_restore_from_fullscreen(struct wined3d_swapchain_st rect = *window_rect; else window_pos_flags |= (SWP_NOMOVE | SWP_NOSIZE); - SetWindowPos(window, 0, rect.left, rect.top, + SetWindowPos(window, HWND_NOTOPMOST, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, window_pos_flags); wined3d_filter_messages(window, filter); @@ -2243,6 +2247,8 @@ HRESULT CDECL wined3d_swapchain_state_set_fullscreen(struct wined3d_swapchain_st RECT *window_rect = NULL; if (state->desc.flags & WINED3D_SWAPCHAIN_RESTORE_WINDOW_RECT) window_rect = &state->original_window_rect; + if (swapchain_desc->flags & WINED3D_SWAPCHAIN_TOPMOST_RESTORE) + state->desc.flags |= WINED3D_SWAPCHAIN_TOPMOST_RESTORE; wined3d_swapchain_state_restore_from_fullscreen(state, state->device_window, window_rect); } diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 346d1d0..cee46d3 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -905,6 +905,7 @@ enum wined3d_shader_type #define WINED3D_SWAPCHAIN_GDI_COMPATIBLE 0x00008000u #define WINED3D_SWAPCHAIN_IMPLICIT 0x00010000u #define WINED3D_SWAPCHAIN_HOOK 0x00020000u +#define WINED3D_SWAPCHAIN_TOPMOST_RESTORE 0x00040000u #define WINED3DDP_MAXTEXCOORD 8 -- 2.21.0

4 12

[PATCH 3/3] wined3d: Get adapter LUID from Vulkan if it is available.
by Zhiyi Zhang July 6, 2020

July 6, 2020

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/wined3d/adapter_vk.c | 2 ++ dlls/wined3d/directx.c | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index f648dd196f7..b122982bc13 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -2198,6 +2198,8 @@ static BOOL wined3d_adapter_vk_init(struct wined3d_adapter_vk *adapter_vk, memcpy(&adapter->driver_uuid, id_properties.driverUUID, sizeof(adapter->driver_uuid)); memcpy(&adapter->device_uuid, id_properties.deviceUUID, sizeof(adapter->device_uuid)); + if (id_properties.deviceLUIDValid) + memcpy(&adapter->luid, id_properties.deviceLUID, sizeof(adapter->luid)); if (!wined3d_adapter_vk_init_format_info(adapter_vk, vk_info)) goto fail; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index a9a5a3aac36..fd618303e1e 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2965,6 +2965,10 @@ static BOOL wined3d_adapter_init_luid(struct wined3d_adapter *adapter) D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME open_adapter_param; D3DKMT_CLOSEADAPTER close_adapter_param; + /* Already initialised */ + if (adapter->luid.LowPart || adapter->luid.HighPart) + return TRUE; + if (!get_primary_display(open_adapter_param.DeviceName)) return FALSE; -- 2.25.1

2 1