wine-devel January 2021

wine-devel@winehq.org

74 participants
438 discussions

[PATCH] ws2_32: Hook up IPV6_HOPLIMIT
by Alex Henrie 15 Jan '21

15 Jan '21

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- FelgoLiveClient.exe from https://felgo.com/ sets this option. --- dlls/ws2_32/socket.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 04eb447d3bb..556fd835488 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -534,6 +534,7 @@ static inline const char *debugstr_sockopt(int level, int optname) { DEBUG_SOCKOPT(WS_IPV6_ADD_MEMBERSHIP); DEBUG_SOCKOPT(WS_IPV6_DROP_MEMBERSHIP); + DEBUG_SOCKOPT(WS_IPV6_HOPLIMIT); DEBUG_SOCKOPT(WS_IPV6_MULTICAST_IF); DEBUG_SOCKOPT(WS_IPV6_MULTICAST_HOPS); DEBUG_SOCKOPT(WS_IPV6_MULTICAST_LOOP); @@ -866,6 +867,7 @@ static const int ws_ipv6_map[][2] = #ifdef IPV6_DROP_MEMBERSHIP MAP_OPTION( IPV6_DROP_MEMBERSHIP ), #endif + MAP_OPTION( IPV6_HOPLIMIT ), MAP_OPTION( IPV6_MULTICAST_IF ), MAP_OPTION( IPV6_MULTICAST_HOPS ), MAP_OPTION( IPV6_MULTICAST_LOOP ), @@ -4184,6 +4186,7 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, #ifdef IPV6_DROP_MEMBERSHIP case WS_IPV6_DROP_MEMBERSHIP: #endif + case WS_IPV6_HOPLIMIT: case WS_IPV6_MULTICAST_IF: case WS_IPV6_MULTICAST_HOPS: case WS_IPV6_MULTICAST_LOOP: @@ -5887,6 +5890,7 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, #ifdef IPV6_DROP_MEMBERSHIP case WS_IPV6_DROP_MEMBERSHIP: #endif + case WS_IPV6_HOPLIMIT: case WS_IPV6_MULTICAST_IF: case WS_IPV6_MULTICAST_HOPS: case WS_IPV6_MULTICAST_LOOP: -- 2.30.0

1 0

[PATCH resend 1/4] ntdll: Implement RtlInitializeGenericTable
by Alex Henrie 15 Jan '21

15 Jan '21

From: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/ntdll/rtl.c | 13 ++++++++++++- include/ddk/ntddk.h | 1 + 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index cf21c980a45..6afe4d876dd 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -428,7 +428,18 @@ void WINAPI RtlInitializeGenericTable(RTL_GENERIC_TABLE *table, PRTL_GENERIC_COM PRTL_GENERIC_ALLOCATE_ROUTINE allocate, PRTL_GENERIC_FREE_ROUTINE free, void *context) { - FIXME("(%p, %p, %p, %p, %p) stub!\n", table, compare, allocate, free, context); + TRACE("(%p, %p, %p, %p, %p)\n", table, compare, allocate, free, context); + + table->TableRoot = NULL; + table->InsertOrderList.Flink = &(table->InsertOrderList); + table->InsertOrderList.Blink = &(table->InsertOrderList); + table->OrderedPointer = &(table->InsertOrderList); + table->NumberGenericTableElements = 0; + table->WhichOrderedElement = 0; + table->CompareRoutine = compare; + table->AllocateRoutine = allocate; + table->FreeRoutine = free; + table->TableContext = context; } /****************************************************************************** diff --git a/include/ddk/ntddk.h b/include/ddk/ntddk.h index 41ad3d721bd..3a1d68b1fa8 100644 --- a/include/ddk/ntddk.h +++ b/include/ddk/ntddk.h @@ -265,6 +265,7 @@ NTSTATUS WINAPI PsSetCreateProcessNotifyRoutine(PCREATE_PROCESS_NOTIFY_ROUTINE, NTSTATUS WINAPI PsSetCreateProcessNotifyRoutineEx(PCREATE_PROCESS_NOTIFY_ROUTINE_EX,BOOLEAN); NTSTATUS WINAPI PsSetCreateThreadNotifyRoutine(PCREATE_THREAD_NOTIFY_ROUTINE); NTSTATUS WINAPI PsSetLoadImageNotifyRoutine(PLOAD_IMAGE_NOTIFY_ROUTINE); +void WINAPI RtlInitializeGenericTable(PRTL_GENERIC_TABLE,PRTL_GENERIC_COMPARE_ROUTINE,PRTL_GENERIC_ALLOCATE_ROUTINE,PRTL_GENERIC_FREE_ROUTINE,void *); void WINAPI RtlInitializeGenericTableAvl(PRTL_AVL_TABLE,PRTL_AVL_COMPARE_ROUTINE,PRTL_AVL_ALLOCATE_ROUTINE, PRTL_AVL_FREE_ROUTINE,void *); void WINAPI RtlInsertElementGenericTableAvl(PRTL_AVL_TABLE,void *,ULONG,BOOL*); -- 2.30.0

1 3

Wine staging 6.0 release
by Alistair Leslie-Hughes 14 Jan '21

14 Jan '21

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary since last release * Rebased to current wine 6.0 (784 patches are applied to wine vanilla) Upstreamed (Either directly from staging or fixed with a similar patch). * None Added: * None Updated: * None Where can you help * Run Steam/Battle.net/GOG/UPlay/Epic * Test your favorite game. * Test your favorite applications. * Improve staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

1 0

[PATCH 1/5] include: Move interlocked functions to winnt.h.
by Zebediah Figura 14 Jan '21

14 Jan '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- include/winbase.h | 132 ---------------------------------------------- include/winnt.h | 132 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 132 insertions(+), 132 deletions(-) diff --git a/include/winbase.h b/include/winbase.h index dc8aa081be4..0262e50d980 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2919,138 +2919,6 @@ extern char * CDECL wine_get_unix_file_name( LPCWSTR dos ); extern WCHAR * CDECL wine_get_dos_file_name( LPCSTR str ); -/* Interlocked functions */ - -#ifdef _MSC_VER - -#pragma intrinsic(_InterlockedCompareExchange) -#pragma intrinsic(_InterlockedCompareExchange64) -#pragma intrinsic(_InterlockedExchange) -#pragma intrinsic(_InterlockedExchangeAdd) -#pragma intrinsic(_InterlockedIncrement) -#pragma intrinsic(_InterlockedDecrement) - -long _InterlockedCompareExchange(long volatile*,long,long); -long long _InterlockedCompareExchange64(long long volatile*,long long,long long); -long _InterlockedDecrement(long volatile*); -long _InterlockedExchange(long volatile*,long); -long _InterlockedExchangeAdd(long volatile*,long); -long _InterlockedIncrement(long volatile*); - -static FORCEINLINE LONG WINAPI InterlockedCompareExchange( LONG volatile *dest, LONG xchg, LONG compare ) -{ - return _InterlockedCompareExchange( (long volatile *)dest, xchg, compare ); -} - -static FORCEINLINE LONGLONG WINAPI InterlockedCompareExchange64( LONGLONG volatile *dest, LONGLONG xchg, LONGLONG compare ) -{ - return _InterlockedCompareExchange64( (long long volatile *)dest, compare, xchg ); -} - -static FORCEINLINE LONG WINAPI InterlockedExchange( LONG volatile *dest, LONG val ) -{ - return _InterlockedExchange( (long volatile *)dest, val ); -} - -static FORCEINLINE LONG WINAPI InterlockedExchangeAdd( LONG volatile *dest, LONG incr ) -{ - return _InterlockedExchangeAdd( (long volatile *)dest, incr ); -} - -static FORCEINLINE LONG WINAPI InterlockedIncrement( LONG volatile *dest ) -{ - return _InterlockedIncrement( (long volatile *)dest ); -} - -static FORCEINLINE LONG WINAPI InterlockedDecrement( LONG volatile *dest ) -{ - return _InterlockedDecrement( (long volatile *)dest ); -} - -#ifndef __i386__ - -#pragma intrinsic(_InterlockedCompareExchangePointer) -#pragma intrinsic(_InterlockedExchangePointer) - -#define InterlockedCompareExchangePointer _InterlockedCompareExchangePointer -#define InterlockedExchangePointer _InterlockedExchangePointer - -void *InterlockedCompareExchangePointer(void *volatile*,void*,void*); -void *InterlockedExchangePointer(void *volatile*,void*); - -#else - -static FORCEINLINE void *WINAPI InterlockedCompareExchangePointer( void *volatile *dest, void *xchg, void *compare ) -{ - return (void *)_InterlockedCompareExchange( (long volatile*)dest, (long)xchg, (long)compare ); -} - -static FORCEINLINE void *WINAPI InterlockedExchangePointer( void *volatile *dest, void *val ) -{ - return (void *)_InterlockedExchange( (long volatile*)dest, (long)val ); -} - -#endif - -#elif defined(__GNUC__) - -static FORCEINLINE LONG WINAPI InterlockedCompareExchange( LONG volatile *dest, LONG xchg, LONG compare ) -{ - return __sync_val_compare_and_swap( dest, compare, xchg ); -} - -static FORCEINLINE PVOID WINAPI InterlockedCompareExchangePointer( PVOID volatile *dest, PVOID xchg, PVOID compare ) -{ - return __sync_val_compare_and_swap( dest, compare, xchg ); -} - -static FORCEINLINE LONGLONG WINAPI InterlockedCompareExchange64( LONGLONG volatile *dest, LONGLONG xchg, LONGLONG compare ) -{ - return __sync_val_compare_and_swap( dest, compare, xchg ); -} - -static FORCEINLINE LONG WINAPI InterlockedExchange( LONG volatile *dest, LONG val ) -{ - LONG ret; -#if defined(__i386__) || defined(__x86_64__) - __asm__ __volatile__( "lock; xchgl %0,(%1)" - : "=r" (ret) :"r" (dest), "0" (val) : "memory" ); -#else - do ret = *dest; while (!__sync_bool_compare_and_swap( dest, ret, val )); -#endif - return ret; -} - -static FORCEINLINE LONG WINAPI InterlockedExchangeAdd( LONG volatile *dest, LONG incr ) -{ - return __sync_fetch_and_add( dest, incr ); -} - -static FORCEINLINE LONG WINAPI InterlockedIncrement( LONG volatile *dest ) -{ - return __sync_add_and_fetch( dest, 1 ); -} - -static FORCEINLINE LONG WINAPI InterlockedDecrement( LONG volatile *dest ) -{ - return __sync_add_and_fetch( dest, -1 ); -} - -static FORCEINLINE PVOID WINAPI InterlockedExchangePointer( PVOID volatile *dest, PVOID val ) -{ - PVOID ret; -#ifdef __x86_64__ - __asm__ __volatile__( "lock; xchgq %0,(%1)" : "=r" (ret) :"r" (dest), "0" (val) : "memory" ); -#elif defined(__i386__) - __asm__ __volatile__( "lock; xchgl %0,(%1)" : "=r" (ret) :"r" (dest), "0" (val) : "memory" ); -#else - do ret = *dest; while (!__sync_bool_compare_and_swap( dest, ret, val )); -#endif - return ret; -} - -#endif /* __GNUC__ */ - #ifdef __WINESRC__ static FORCEINLINE HANDLE WINAPI GetCurrentProcess(void) diff --git a/include/winnt.h b/include/winnt.h index 83fcc67c85d..7bbe0185139 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -6892,6 +6892,138 @@ static inline BOOLEAN BitScanReverse(DWORD *index, DWORD mask) #endif +/* Interlocked functions */ + +#ifdef _MSC_VER + +#pragma intrinsic(_InterlockedCompareExchange) +#pragma intrinsic(_InterlockedCompareExchange64) +#pragma intrinsic(_InterlockedExchange) +#pragma intrinsic(_InterlockedExchangeAdd) +#pragma intrinsic(_InterlockedIncrement) +#pragma intrinsic(_InterlockedDecrement) + +long _InterlockedCompareExchange(long volatile*,long,long); +long long _InterlockedCompareExchange64(long long volatile*,long long,long long); +long _InterlockedDecrement(long volatile*); +long _InterlockedExchange(long volatile*,long); +long _InterlockedExchangeAdd(long volatile*,long); +long _InterlockedIncrement(long volatile*); + +static FORCEINLINE LONG WINAPI InterlockedCompareExchange( LONG volatile *dest, LONG xchg, LONG compare ) +{ + return _InterlockedCompareExchange( (long volatile *)dest, xchg, compare ); +} + +static FORCEINLINE LONGLONG WINAPI InterlockedCompareExchange64( LONGLONG volatile *dest, LONGLONG xchg, LONGLONG compare ) +{ + return _InterlockedCompareExchange64( (long long volatile *)dest, compare, xchg ); +} + +static FORCEINLINE LONG WINAPI InterlockedExchange( LONG volatile *dest, LONG val ) +{ + return _InterlockedExchange( (long volatile *)dest, val ); +} + +static FORCEINLINE LONG WINAPI InterlockedExchangeAdd( LONG volatile *dest, LONG incr ) +{ + return _InterlockedExchangeAdd( (long volatile *)dest, incr ); +} + +static FORCEINLINE LONG WINAPI InterlockedIncrement( LONG volatile *dest ) +{ + return _InterlockedIncrement( (long volatile *)dest ); +} + +static FORCEINLINE LONG WINAPI InterlockedDecrement( LONG volatile *dest ) +{ + return _InterlockedDecrement( (long volatile *)dest ); +} + +#ifndef __i386__ + +#pragma intrinsic(_InterlockedCompareExchangePointer) +#pragma intrinsic(_InterlockedExchangePointer) + +#define InterlockedCompareExchangePointer _InterlockedCompareExchangePointer +#define InterlockedExchangePointer _InterlockedExchangePointer + +void *InterlockedCompareExchangePointer(void *volatile*,void*,void*); +void *InterlockedExchangePointer(void *volatile*,void*); + +#else + +static FORCEINLINE void * WINAPI InterlockedCompareExchangePointer( void *volatile *dest, void *xchg, void *compare ) +{ + return (void *)_InterlockedCompareExchange( (long volatile*)dest, (long)xchg, (long)compare ); +} + +static FORCEINLINE void * WINAPI InterlockedExchangePointer( void *volatile *dest, void *val ) +{ + return (void *)_InterlockedExchange( (long volatile*)dest, (long)val ); +} + +#endif + +#elif defined(__GNUC__) + +static FORCEINLINE LONG WINAPI InterlockedCompareExchange( LONG volatile *dest, LONG xchg, LONG compare ) +{ + return __sync_val_compare_and_swap( dest, compare, xchg ); +} + +static FORCEINLINE void * WINAPI InterlockedCompareExchangePointer( void *volatile *dest, void *xchg, void *compare ) +{ + return __sync_val_compare_and_swap( dest, compare, xchg ); +} + +static FORCEINLINE LONGLONG WINAPI InterlockedCompareExchange64( LONGLONG volatile *dest, LONGLONG xchg, LONGLONG compare ) +{ + return __sync_val_compare_and_swap( dest, compare, xchg ); +} + +static FORCEINLINE LONG WINAPI InterlockedExchange( LONG volatile *dest, LONG val ) +{ + LONG ret; +#if defined(__i386__) || defined(__x86_64__) + __asm__ __volatile__( "lock; xchgl %0,(%1)" + : "=r" (ret) :"r" (dest), "0" (val) : "memory" ); +#else + do ret = *dest; while (!__sync_bool_compare_and_swap( dest, ret, val )); +#endif + return ret; +} + +static FORCEINLINE LONG WINAPI InterlockedExchangeAdd( LONG volatile *dest, LONG incr ) +{ + return __sync_fetch_and_add( dest, incr ); +} + +static FORCEINLINE LONG WINAPI InterlockedIncrement( LONG volatile *dest ) +{ + return __sync_add_and_fetch( dest, 1 ); +} + +static FORCEINLINE LONG WINAPI InterlockedDecrement( LONG volatile *dest ) +{ + return __sync_add_and_fetch( dest, -1 ); +} + +static FORCEINLINE void * WINAPI InterlockedExchangePointer( void *volatile *dest, void *val ) +{ + void *ret; +#ifdef __x86_64__ + __asm__ __volatile__( "lock; xchgq %0,(%1)" : "=r" (ret) :"r" (dest), "0" (val) : "memory" ); +#elif defined(__i386__) + __asm__ __volatile__( "lock; xchgl %0,(%1)" : "=r" (ret) :"r" (dest), "0" (val) : "memory" ); +#else + do ret = *dest; while (!__sync_bool_compare_and_swap( dest, ret, val )); +#endif + return ret; +} + +#endif /* __GNUC__ */ + #ifdef _WIN64 #if defined(_MSC_VER) -- 2.29.2

2 6

[PATCH 1/2] dcomp: Add DCompositionCreateDevice2().
by Nikolay Sivov 14 Jan '21

14 Jan '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50357 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dcomp/Makefile.in | 1 + dlls/dcomp/dcomp.spec | 2 +- dlls/dcomp/device.c | 32 ++++++++++++++++++++++++++++++++ 3 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 dlls/dcomp/device.c diff --git a/dlls/dcomp/Makefile.in b/dlls/dcomp/Makefile.in index 6d75a87980f..436b88993ab 100644 --- a/dlls/dcomp/Makefile.in +++ b/dlls/dcomp/Makefile.in @@ -3,6 +3,7 @@ MODULE = dcomp.dll EXTRADLLFLAGS = -mno-cygwin C_SRCS = \ + device.c \ main.c RC_SRCS = version.rc diff --git a/dlls/dcomp/dcomp.spec b/dlls/dcomp/dcomp.spec index 03801ebba6f..10e9f49a412 100644 --- a/dlls/dcomp/dcomp.spec +++ b/dlls/dcomp/dcomp.spec @@ -13,7 +13,7 @@ @ stub CreateEffectDescription @ stub DCompositionAttachMouseDragToHwnd @ stub DCompositionAttachMouseWheelToHwnd -@ stub DCompositionCreateDevice2 +@ stdcall DCompositionCreateDevice2(ptr ptr ptr) @ stub DCompositionCreateDevice3 @ stub DCompositionCreateDevice @ stub DCompositionCreateSurfaceHandle diff --git a/dlls/dcomp/device.c b/dlls/dcomp/device.c new file mode 100644 index 00000000000..efc6bacdb08 --- /dev/null +++ b/dlls/dcomp/device.c @@ -0,0 +1,32 @@ +/* + * Copyright 2020 Nikolay Sivov for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "objidl.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dcomp); + +HRESULT WINAPI DCompositionCreateDevice2(IUnknown *rendering_device, REFIID iid, void **device) +{ + FIXME("%p, %s, %p.\n", rendering_device, debugstr_guid(iid), device); + + return E_NOTIMPL; +} -- 2.29.2

1 1

[PATCH] mf: Add a helper to get associated topology node object.
by Nikolay Sivov 14 Jan '21

14 Jan '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/copier.c | 4 +-- dlls/mf/mf_private.h | 3 ++- dlls/mf/session.c | 55 +++++++++++++-------------------------- dlls/mf/topology.c | 62 +++++++++++++++++++++----------------------- 4 files changed, 52 insertions(+), 72 deletions(-) diff --git a/dlls/mf/copier.c b/dlls/mf/copier.c index cbdac97292b..1a07d6abefd 100644 --- a/dlls/mf/copier.c +++ b/dlls/mf/copier.c @@ -561,9 +561,9 @@ static const IMFTransformVtbl sample_copier_transform_vtbl = sample_copier_transform_ProcessOutput, }; -BOOL mf_is_sample_copier_transform(IUnknown *transform) +BOOL mf_is_sample_copier_transform(IMFTransform *transform) { - return transform->lpVtbl == (IUnknownVtbl *)&sample_copier_transform_vtbl; + return transform->lpVtbl == &sample_copier_transform_vtbl; } /*********************************************************************** diff --git a/dlls/mf/mf_private.h b/dlls/mf/mf_private.h index 0c4dde0c4fc..cc270a8cf57 100644 --- a/dlls/mf/mf_private.h +++ b/dlls/mf/mf_private.h @@ -80,4 +80,5 @@ static inline const char *debugstr_time(LONGLONG time) return wine_dbg_sprintf("%s", rev); } -extern BOOL mf_is_sample_copier_transform(IUnknown *transform) DECLSPEC_HIDDEN; +extern BOOL mf_is_sample_copier_transform(IMFTransform *transform) DECLSPEC_HIDDEN; +extern HRESULT topology_node_get_object(IMFTopologyNode *node, REFIID riid, void **obj) DECLSPEC_HIDDEN; diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 1a7439a13c3..af0407f6a0b 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -792,7 +792,6 @@ static void session_shutdown_current_topology(struct media_session *session) IMFTopologyNode *node; IMFActivate *activate; IMFMediaSink *sink; - IUnknown *object; WORD idx = 0; HRESULT hr; @@ -818,20 +817,15 @@ static void session_shutdown_current_topology(struct media_session *session) WARN("Failed to shut down activation object for the sink, hr %#x.\n", hr); IMFActivate_Release(activate); } - else if (SUCCEEDED(IMFTopologyNode_GetObject(node, &object))) + else if (SUCCEEDED(topology_node_get_object(node, &IID_IMFStreamSink, (void **)&stream_sink))) { - if (SUCCEEDED(IUnknown_QueryInterface(object, &IID_IMFStreamSink, (void **)&stream_sink))) + if (SUCCEEDED(IMFStreamSink_GetMediaSink(stream_sink, &sink))) { - if (SUCCEEDED(IMFStreamSink_GetMediaSink(stream_sink, &sink))) - { - IMFMediaSink_Shutdown(sink); - IMFMediaSink_Release(sink); - } - - IMFStreamSink_Release(stream_sink); + IMFMediaSink_Shutdown(sink); + IMFMediaSink_Release(sink); } - IUnknown_Release(object); + IMFStreamSink_Release(stream_sink); } } } @@ -1358,7 +1352,6 @@ static HRESULT session_append_node(struct media_session *session, IMFTopologyNod IMFMediaType *media_type; IMFStreamDescriptor *sd; HRESULT hr = S_OK; - IUnknown *object; if (!(topo_node = heap_alloc_zero(sizeof(*topo_node)))) return E_OUTOFMEMORY; @@ -1374,15 +1367,11 @@ static HRESULT session_append_node(struct media_session *session, IMFTopologyNod case MF_TOPOLOGY_OUTPUT_NODE: topo_node->u.sink.notify_cb.lpVtbl = &node_sample_allocator_cb_vtbl; - if (FAILED(hr = IMFTopologyNode_GetObject(node, &object))) + if (FAILED(hr = topology_node_get_object(node, &IID_IMFStreamSink, (void **)&topo_node->object.object))) { - WARN("Node %s does not have associated object.\n", wine_dbgstr_longlong(topo_node->node_id)); + WARN("Failed to get stream sink interface, hr %#x.\n", hr); break; } - hr = IUnknown_QueryInterface(object, &IID_IMFStreamSink, (void **)&topo_node->object.object); - IUnknown_Release(object); - if (FAILED(hr)) - break; if (FAILED(hr = IMFStreamSink_GetMediaSink(topo_node->object.sink_stream, &media_sink))) break; @@ -1433,14 +1422,11 @@ static HRESULT session_append_node(struct media_session *session, IMFTopologyNod break; case MF_TOPOLOGY_TRANSFORM_NODE: - if (SUCCEEDED(hr = IMFTopologyNode_GetObject(node, &object))) - { - hr = IUnknown_QueryInterface(object, &IID_IMFTransform, (void **)&topo_node->object.transform); - IUnknown_Release(object); - } - if (SUCCEEDED(hr)) + if (SUCCEEDED(hr = topology_node_get_object(node, &IID_IMFTransform, (void **)&topo_node->object.transform))) + { hr = session_set_transform_stream_info(topo_node); + } else WARN("Failed to get IMFTransform for MFT node, hr %#x.\n", hr); @@ -2017,10 +2003,10 @@ static HRESULT WINAPI session_get_service_GetService(IMFGetService *iface, REFGU { IMFStreamSink *stream_sink; IMFTopologyNode *node; - IUnknown *vr, *object; IMFCollection *nodes; IMFMediaSink *sink; unsigned int i = 0; + IUnknown *vr; HRESULT hr; EnterCriticalSection(&session->cs); @@ -2033,23 +2019,18 @@ static HRESULT WINAPI session_get_service_GetService(IMFGetService *iface, REFGU { while (IMFCollection_GetElement(nodes, i++, (IUnknown **)&node) == S_OK) { - if (SUCCEEDED(IMFTopologyNode_GetObject(node, &object))) + if (SUCCEEDED(topology_node_get_object(node, &IID_IMFStreamSink, (void **)&stream_sink))) { - if (SUCCEEDED(IUnknown_QueryInterface(object, &IID_IMFStreamSink, (void **)&stream_sink))) + if (SUCCEEDED(IMFStreamSink_GetMediaSink(stream_sink, &sink))) { - if (SUCCEEDED(IMFStreamSink_GetMediaSink(stream_sink, &sink))) + if (SUCCEEDED(IMFMediaSink_QueryInterface(sink, &IID_IMFVideoRenderer, (void **)&vr))) { - if (SUCCEEDED(IMFMediaSink_QueryInterface(sink, &IID_IMFVideoRenderer, (void **)&vr))) - { - if (FAILED(hr = MFGetService(vr, service, riid, obj))) - WARN("Failed to get service from video renderer %#x.\n", hr); - IUnknown_Release(vr); - } + if (FAILED(hr = MFGetService(vr, service, riid, obj))) + WARN("Failed to get service from video renderer %#x.\n", hr); + IUnknown_Release(vr); } - IMFStreamSink_Release(stream_sink); } - - IUnknown_Release(object); + IMFStreamSink_Release(stream_sink); } IMFTopologyNode_Release(node); diff --git a/dlls/mf/topology.c b/dlls/mf/topology.c index e33dbc2efc7..af28de0819d 100644 --- a/dlls/mf/topology.c +++ b/dlls/mf/topology.c @@ -1786,6 +1786,22 @@ static HRESULT create_topology_node(MF_TOPOLOGY_TYPE node_type, struct topology_ return S_OK; } +HRESULT topology_node_get_object(IMFTopologyNode *node, REFIID riid, void **obj) +{ + IUnknown *unk; + HRESULT hr; + + *obj = NULL; + + if (SUCCEEDED(hr = IMFTopologyNode_GetObject(node, &unk))) + { + hr = IUnknown_QueryInterface(unk, riid, obj); + IUnknown_Release(unk); + } + + return hr; +} + /*********************************************************************** * MFCreateTopologyNode (mf.@) */ @@ -1817,7 +1833,6 @@ HRESULT WINAPI MFGetTopoNodeCurrentType(IMFTopologyNode *node, DWORD stream, BOO IMFStreamDescriptor *sd; IMFTransform *transform; UINT32 primary_output; - IUnknown *object; HRESULT hr; TRACE("%p, %u, %d, %p.\n", node, stream, output, type); @@ -1828,12 +1843,7 @@ HRESULT WINAPI MFGetTopoNodeCurrentType(IMFTopologyNode *node, DWORD stream, BOO switch (node_type) { case MF_TOPOLOGY_OUTPUT_NODE: - if (FAILED(hr = IMFTopologyNode_GetObject(node, &object))) - return hr; - - hr = IUnknown_QueryInterface(object, &IID_IMFStreamSink, (void **)&stream_sink); - IUnknown_Release(object); - if (SUCCEEDED(hr)) + if (SUCCEEDED(topology_node_get_object(node, &IID_IMFStreamSink, (void **)&stream_sink))) { hr = IMFStreamSink_GetMediaTypeHandler(stream_sink, &type_handler); IMFStreamSink_Release(stream_sink); @@ -1861,12 +1871,7 @@ HRESULT WINAPI MFGetTopoNodeCurrentType(IMFTopologyNode *node, DWORD stream, BOO } break; case MF_TOPOLOGY_TRANSFORM_NODE: - if (FAILED(hr = IMFTopologyNode_GetObject(node, &object))) - return hr; - - hr = IUnknown_QueryInterface(object, &IID_IMFTransform, (void **)&transform); - IUnknown_Release(object); - if (SUCCEEDED(hr)) + if (SUCCEEDED(hr = topology_node_get_object(node, &IID_IMFTransform, (void **)&transform))) { if (output) hr = IMFTransform_GetOutputCurrentType(transform, stream, type); @@ -2163,7 +2168,6 @@ static HRESULT topology_loader_get_node_type_handler(IMFTopologyNode *node, IMFM MF_TOPOLOGY_TYPE node_type; IMFStreamSink *stream_sink; IMFStreamDescriptor *sd; - IUnknown *object; HRESULT hr; if (FAILED(hr = IMFTopologyNode_GetNodeType(node, &node_type))) @@ -2172,14 +2176,10 @@ static HRESULT topology_loader_get_node_type_handler(IMFTopologyNode *node, IMFM switch (node_type) { case MF_TOPOLOGY_OUTPUT_NODE: - if (SUCCEEDED(hr = IMFTopologyNode_GetObject(node, (IUnknown **)&object))) + if (SUCCEEDED(hr = topology_node_get_object(node, &IID_IMFStreamSink, (void **)&stream_sink))) { - if (SUCCEEDED(hr = IUnknown_QueryInterface(object, &IID_IMFStreamSink, (void **)&stream_sink))) - { - hr = IMFStreamSink_GetMediaTypeHandler(stream_sink, handler); - IMFStreamSink_Release(stream_sink); - } - IUnknown_Release(object); + hr = IMFStreamSink_GetMediaTypeHandler(stream_sink, handler); + IMFStreamSink_Release(stream_sink); } break; case MF_TOPOLOGY_SOURCESTREAM_NODE: @@ -2368,22 +2368,20 @@ static BOOL topology_loader_is_node_d3d_aware(IMFTopologyNode *node) { IMFAttributes *attributes; unsigned int d3d_aware = 0; - IUnknown *object = NULL; + IMFTransform *transform; - if (FAILED(IMFTopologyNode_GetObject(node, &object))) + if (FAILED(topology_node_get_object(node, &IID_IMFAttributes, (void **)&attributes))) return FALSE; - if (SUCCEEDED(IUnknown_QueryInterface(object, &IID_IMFAttributes, (void **)&attributes))) + IMFAttributes_GetUINT32(attributes, &MF_SA_D3D_AWARE, &d3d_aware); + IMFAttributes_Release(attributes); + + if (!d3d_aware && SUCCEEDED(topology_node_get_object(node, &IID_IMFTransform, (void **)&transform))) { - IMFAttributes_GetUINT32(attributes, &MF_SA_D3D_AWARE, &d3d_aware); - IMFAttributes_Release(attributes); + d3d_aware = mf_is_sample_copier_transform(transform); + IMFTransform_Release(transform); } - if (!d3d_aware) - d3d_aware = mf_is_sample_copier_transform(object); - - IUnknown_Release(object); - return !!d3d_aware; } @@ -2454,7 +2452,7 @@ static HRESULT topology_loader_connect_d3d_aware_input(struct topoloader_context IMFTransform *copier = NULL; HRESULT hr = S_OK; - IMFTopologyNode_GetObject(node, (IUnknown **)&stream_sink); + topology_node_get_object(node, &IID_IMFStreamSink, (void **)&stream_sink); if (topology_loader_is_node_d3d_aware(node)) { -- 2.29.2

1 0

[PATCH 1/4] winegstreamer: Get rid of the unknown_type() callback.
by Zebediah Figura 14 Jan '21

14 Jan '21

This information is already printed by GStreamer via GST_MESSAGE_ERROR. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/winegstreamer/gst_cbs.c | 12 ------------ dlls/winegstreamer/gst_cbs.h | 8 -------- dlls/winegstreamer/gstdemux.c | 14 -------------- 3 files changed, 34 deletions(-) diff --git a/dlls/winegstreamer/gst_cbs.c b/dlls/winegstreamer/gst_cbs.c index 51aaefa911d..e6b9a30d466 100644 --- a/dlls/winegstreamer/gst_cbs.c +++ b/dlls/winegstreamer/gst_cbs.c @@ -279,18 +279,6 @@ GstAutoplugSelectResult autoplug_blacklist_wrapper(GstElement *bin, GstPad *pad, return cbdata.u.autoplug_blacklist_data.ret; } -void unknown_type_wrapper(GstElement *bin, GstPad *pad, GstCaps *caps, gpointer user) -{ - struct cb_data cbdata = { UNKNOWN_TYPE }; - - cbdata.u.unknown_type_data.bin = bin; - cbdata.u.unknown_type_data.pad = pad; - cbdata.u.unknown_type_data.caps = caps; - cbdata.u.unknown_type_data.user = user; - - call_cb(&cbdata); -} - gboolean query_sink_wrapper(GstPad *pad, GstObject *parent, GstQuery *query) { struct cb_data cbdata = { QUERY_SINK }; diff --git a/dlls/winegstreamer/gst_cbs.h b/dlls/winegstreamer/gst_cbs.h index a48999bbf71..546443bb4c6 100644 --- a/dlls/winegstreamer/gst_cbs.h +++ b/dlls/winegstreamer/gst_cbs.h @@ -41,7 +41,6 @@ enum CB_TYPE { GOT_DATA_SINK, REMOVED_DECODED_PAD, AUTOPLUG_BLACKLIST, - UNKNOWN_TYPE, QUERY_SINK, GSTDEMUX_MAX, BYTESTREAM_WRAPPER_PULL, @@ -125,12 +124,6 @@ struct cb_data { gpointer user; GstAutoplugSelectResult ret; } autoplug_blacklist_data; - struct unknown_type_data { - GstElement *bin; - GstPad *pad; - GstCaps *caps; - gpointer user; - } unknown_type_data; struct query_sink_data { GstPad *pad; GstObject *parent; @@ -161,7 +154,6 @@ GstFlowReturn got_data_sink_wrapper(GstPad *pad, GstObject *parent, GstBuffer *b GstFlowReturn got_data_wrapper(GstPad *pad, GstObject *parent, GstBuffer *buf) DECLSPEC_HIDDEN; void removed_decoded_pad_wrapper(GstElement *bin, GstPad *pad, gpointer user) DECLSPEC_HIDDEN; GstAutoplugSelectResult autoplug_blacklist_wrapper(GstElement *bin, GstPad *pad, GstCaps *caps, GstElementFactory *fact, gpointer user) DECLSPEC_HIDDEN; -void unknown_type_wrapper(GstElement *bin, GstPad *pad, GstCaps *caps, gpointer user) DECLSPEC_HIDDEN; void Gstreamer_transform_pad_added_wrapper(GstElement *filter, GstPad *pad, gpointer user) DECLSPEC_HIDDEN; gboolean query_sink_wrapper(GstPad *pad, GstObject *parent, GstQuery *query) DECLSPEC_HIDDEN; GstFlowReturn bytestream_wrapper_pull_wrapper(GstPad *pad, GstObject *parent, guint64 ofs, guint len, GstBuffer **buf) DECLSPEC_HIDDEN; diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 1e91c9f8e7e..992cdf01755 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1352,13 +1352,6 @@ static GstBusSyncReply watch_bus(GstBus *bus, GstMessage *msg, gpointer data) return GST_BUS_DROP; } -static void unknown_type(GstElement *bin, GstPad *pad, GstCaps *caps, gpointer user) -{ - gchar *strcaps = gst_caps_to_string(caps); - ERR("Could not find a filter for caps: %s\n", debugstr_a(strcaps)); - g_free(strcaps); -} - static HRESULT GST_Connect(struct gstdemux *This, IPin *pConnectPin) { LONGLONG avail; @@ -1691,7 +1684,6 @@ static BOOL gstdecoder_init_gst(struct gstdemux *filter) g_signal_connect(element, "pad-added", G_CALLBACK(existing_new_pad_wrapper), filter); g_signal_connect(element, "pad-removed", G_CALLBACK(removed_decoded_pad_wrapper), filter); g_signal_connect(element, "autoplug-select", G_CALLBACK(autoplug_blacklist_wrapper), filter); - g_signal_connect(element, "unknown-type", G_CALLBACK(unknown_type_wrapper), filter); g_signal_connect(element, "no-more-pads", G_CALLBACK(no_more_pads_wrapper), filter); filter->their_sink = gst_element_get_static_pad(element, "sink"); @@ -2339,12 +2331,6 @@ void perform_cb_gstdemux(struct cb_data *cbdata) data->pad, data->caps, data->fact, data->user); break; } - case UNKNOWN_TYPE: - { - struct unknown_type_data *data = &cbdata->u.unknown_type_data; - unknown_type(data->bin, data->pad, data->caps, data->user); - break; - } case QUERY_SINK: { struct query_sink_data *data = &cbdata->u.query_sink_data; -- 2.30.0

1 3

[PATCH vkd3d 1/5] vkd3d-shader: Implement macro body expansion.
by Zebediah Figura 14 Jan '21

14 Jan '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- Makefile.am | 1 - libs/vkd3d-shader/preproc.h | 18 ++++++++ libs/vkd3d-shader/preproc.l | 83 +++++++++++++++++++++++++++++++------ libs/vkd3d-shader/preproc.y | 24 +++++++++-- tests/hlsl_d3d12.c | 9 ++-- 5 files changed, 113 insertions(+), 22 deletions(-) diff --git a/Makefile.am b/Makefile.am index bf1d7bfa..514f0506 100644 --- a/Makefile.am +++ b/Makefile.am @@ -243,7 +243,6 @@ XFAIL_TESTS = \ tests/hlsl-vector-indexing.shader_test \ tests/hlsl-vector-indexing-uniform.shader_test \ tests/math.shader_test \ - tests/preproc-if.shader_test \ tests/preproc-ifdef.shader_test \ tests/preproc-if-expr.shader_test \ tests/preproc-invalid.shader_test \ diff --git a/libs/vkd3d-shader/preproc.h b/libs/vkd3d-shader/preproc.h index 16b579e0..7d6bda2a 100644 --- a/libs/vkd3d-shader/preproc.h +++ b/libs/vkd3d-shader/preproc.h @@ -50,10 +50,24 @@ struct preproc_file size_t if_count, if_stack_size; }; +struct preproc_text +{ + struct vkd3d_string_buffer text; + struct vkd3d_shader_location location; +}; + +struct preproc_expansion +{ + struct preproc_buffer buffer; + const struct preproc_text *text; +}; + struct preproc_macro { struct rb_entry entry; char *name; + + struct preproc_text body; }; struct preproc_ctx @@ -67,6 +81,9 @@ struct preproc_ctx struct preproc_file *file_stack; size_t file_count, file_stack_size; + struct preproc_expansion *expansion_stack; + size_t expansion_count, expansion_stack_size; + struct rb_tree macros; int current_directive; @@ -78,6 +95,7 @@ struct preproc_ctx }; void preproc_close_include(struct preproc_ctx *ctx, const struct vkd3d_shader_code *code) DECLSPEC_HIDDEN; +struct preproc_macro *preproc_find_macro(struct preproc_ctx *ctx, const char *name) DECLSPEC_HIDDEN; void preproc_free_macro(struct preproc_macro *macro) DECLSPEC_HIDDEN; bool preproc_push_include(struct preproc_ctx *ctx, char *filename, const struct vkd3d_shader_code *code) DECLSPEC_HIDDEN; void preproc_warning(struct preproc_ctx *ctx, const struct vkd3d_shader_location *loc, diff --git a/libs/vkd3d-shader/preproc.l b/libs/vkd3d-shader/preproc.l index 476c1e59..86ca4733 100644 --- a/libs/vkd3d-shader/preproc.l +++ b/libs/vkd3d-shader/preproc.l @@ -169,27 +169,41 @@ static void update_location(struct preproc_ctx *ctx) static void preproc_pop_buffer(struct preproc_ctx *ctx) { - struct preproc_file *file = preproc_get_top_file(ctx); + if (ctx->expansion_count) + { + struct preproc_expansion *exp = &ctx->expansion_stack[ctx->expansion_count - 1]; - if (ctx->file_count > 1) - preproc_close_include(ctx, &file->code); + yy_delete_buffer(exp->buffer.lexer_buffer, ctx->scanner); - if (file->if_count) + --ctx->expansion_count; + TRACE("Expansion stack size is now %zu.\n", ctx->expansion_count); + } + else { - const struct vkd3d_shader_location loc = {.source_name = file->filename}; + struct preproc_file *file = preproc_get_top_file(ctx); - preproc_warning(ctx, &loc, VKD3D_SHADER_WARNING_PP_UNTERMINATED_IF, "Unterminated #if block."); - } - vkd3d_free(file->if_stack); + if (ctx->file_count > 1) + preproc_close_include(ctx, &file->code); + + if (file->if_count) + { + const struct vkd3d_shader_location loc = {.source_name = file->filename}; - vkd3d_free(file->filename); + preproc_warning(ctx, &loc, VKD3D_SHADER_WARNING_PP_UNTERMINATED_IF, "Unterminated #if block."); + } + vkd3d_free(file->if_stack); - yy_delete_buffer(file->buffer.lexer_buffer, ctx->scanner); + vkd3d_free(file->filename); - --ctx->file_count; - TRACE("File stack size is now %zu.\n", ctx->file_count); + yy_delete_buffer(file->buffer.lexer_buffer, ctx->scanner); - if (ctx->file_count) + --ctx->file_count; + TRACE("File stack size is now %zu.\n", ctx->file_count); + } + + if (ctx->expansion_count) + yy_switch_to_buffer(ctx->expansion_stack[ctx->expansion_count - 1].buffer.lexer_buffer, ctx->scanner); + else if (ctx->file_count) yy_switch_to_buffer(ctx->file_stack[ctx->file_count - 1].buffer.lexer_buffer, ctx->scanner); } @@ -218,6 +232,21 @@ static int return_token(int token, YYSTYPE *lval, const char *text) return token; } +static bool preproc_push_expansion(struct preproc_ctx *ctx, const struct preproc_text *text) +{ + struct preproc_expansion *exp; + + if (!vkd3d_array_reserve((void **)&ctx->expansion_stack, &ctx->expansion_stack_size, + ctx->expansion_count + 1, sizeof(*ctx->expansion_stack))) + return false; + exp = &ctx->expansion_stack[ctx->expansion_count++]; + exp->text = text; + exp->buffer.lexer_buffer = yy_scan_bytes(text->text.buffer, text->text.content_size, ctx->scanner); + exp->buffer.location = text->location; + TRACE("Expansion stack size is now %zu.\n", ctx->expansion_count); + return true; +} + int yylex(YYSTYPE *lval, YYLTYPE *lloc, yyscan_t scanner) { struct preproc_ctx *ctx = yyget_extra(scanner); @@ -239,6 +268,10 @@ int yylex(YYSTYPE *lval, YYLTYPE *lloc, yyscan_t scanner) if (!(token = preproc_lexer_lex(lval, lloc, scanner))) { ctx->last_was_eof = true; + + /* If we have reached the end of an included file, inject a newline. */ + if (ctx->expansion_count) + continue; token = T_NEWLINE; text = "\n"; } @@ -288,6 +321,29 @@ int yylex(YYSTYPE *lval, YYLTYPE *lloc, yyscan_t scanner) continue; } + if (token == T_IDENTIFIER) + { + struct preproc_macro *macro; + + switch (ctx->current_directive) + { + case T_DEFINE: + case T_IFDEF: + case T_IFNDEF: + case T_UNDEF: + /* Return identifiers verbatim. */ + return return_token(token, lval, text); + } + + /* Otherwise, expand a macro if there is one. */ + + if ((macro = preproc_find_macro(ctx, text))) + { + preproc_push_expansion(ctx, &macro->body); + continue; + } + } + if (ctx->current_directive) return return_token(token, lval, text); @@ -365,6 +421,7 @@ int preproc_lexer_parse(const struct vkd3d_shader_compile_info *compile_info, rb_destroy(&ctx.macros, preproc_macro_rb_free, NULL); vkd3d_free(ctx.file_stack); + vkd3d_free(ctx.expansion_stack); if (ctx.error) { diff --git a/libs/vkd3d-shader/preproc.y b/libs/vkd3d-shader/preproc.y index 53ce3e57..17bc6499 100644 --- a/libs/vkd3d-shader/preproc.y +++ b/libs/vkd3d-shader/preproc.y @@ -68,7 +68,7 @@ static void yyerror(const YYLTYPE *loc, void *scanner, struct preproc_ctx *ctx, preproc_error(ctx, loc, VKD3D_SHADER_ERROR_PP_INVALID_SYNTAX, "%s", string); } -static struct preproc_macro *preproc_find_macro(struct preproc_ctx *ctx, const char *name) +struct preproc_macro *preproc_find_macro(struct preproc_ctx *ctx, const char *name) { struct rb_entry *entry; @@ -77,7 +77,8 @@ static struct preproc_macro *preproc_find_macro(struct preproc_ctx *ctx, const c return NULL; } -static bool preproc_add_macro(struct preproc_ctx *ctx, const struct vkd3d_shader_location *loc, char *name) +static bool preproc_add_macro(struct preproc_ctx *ctx, const struct vkd3d_shader_location *loc, char *name, + const struct vkd3d_shader_location *body_loc, struct vkd3d_string_buffer *body) { struct preproc_macro *macro; int ret; @@ -94,6 +95,8 @@ static bool preproc_add_macro(struct preproc_ctx *ctx, const struct vkd3d_shader if (!(macro = vkd3d_malloc(sizeof(*macro)))) return false; macro->name = name; + macro->body.text = *body; + macro->body.location = *body_loc; ret = rb_put(&ctx->macros, name, &macro->entry); assert(!ret); return true; @@ -102,6 +105,7 @@ static bool preproc_add_macro(struct preproc_ctx *ctx, const struct vkd3d_shader void preproc_free_macro(struct preproc_macro *macro) { vkd3d_free(macro->name); + vkd3d_string_buffer_cleanup(&macro->body.text); vkd3d_free(macro); } @@ -265,6 +269,7 @@ static const void *get_parent_data(struct preproc_ctx *ctx) { char *string; uint32_t integer; + struct vkd3d_string_buffer string_buffer; } %token <string> T_IDENTIFIER @@ -286,6 +291,7 @@ static const void *get_parent_data(struct preproc_ctx *ctx) %type <integer> expr %type <string> body_token +%type <string_buffer> body_text %% @@ -298,8 +304,16 @@ shader_text body_text : %empty + { + vkd3d_string_buffer_init(&$$); + } | body_text body_token { + if (vkd3d_string_buffer_printf(&$$, "%s ", $2) < 0) + { + vkd3d_free($2); + YYABORT; + } vkd3d_free($2); } @@ -311,8 +325,12 @@ body_token directive : T_DEFINE T_IDENTIFIER body_text T_NEWLINE { - if (!preproc_add_macro(ctx, &@$, $2)) + if (!preproc_add_macro(ctx, &@$, $2, &@3, &$3)) + { + vkd3d_free($2); + vkd3d_string_buffer_cleanup(&$3); YYABORT; + } } | T_UNDEF T_IDENTIFIER T_NEWLINE { diff --git a/tests/hlsl_d3d12.c b/tests/hlsl_d3d12.c index 54ab94de..ac616c23 100644 --- a/tests/hlsl_d3d12.c +++ b/tests/hlsl_d3d12.c @@ -349,10 +349,10 @@ static void test_preprocess(void) for (i = 0; i < ARRAY_SIZE(tests); ++i) { - if (i == 6 || i == 10 || i == 11) + if (i == 10 || i == 11) continue; vkd3d_test_set_context("Source \"%s\"", tests[i].source); - todo_if (i <= 4 || (i >= 9 && i <= 14)) + todo_if (i <= 4 || (i >= 9 && i <= 14) || i == 43) check_preprocess(tests[i].source, NULL, NULL, tests[i].present, tests[i].absent); } vkd3d_test_set_context(NULL); @@ -400,12 +400,11 @@ static void test_preprocess(void) macros[1].Definition = "KEY2"; todo check_preprocess("KEY", macros, NULL, "value", NULL); - if (0) - todo check_preprocess(test_include_top, NULL, &test_include, "pass", "fail"); + check_preprocess(test_include_top, NULL, &test_include, "pass", "fail"); ok(!refcount_file1, "Got %d references to file1.\n", refcount_file1); ok(!refcount_file2, "Got %d references to file1.\n", refcount_file2); ok(!refcount_file3, "Got %d references to file1.\n", refcount_file3); - todo ok(include_count_file2 == 2, "file2 was included %u times.\n", include_count_file2); + ok(include_count_file2 == 2, "file2 was included %u times.\n", include_count_file2); /* Macro invocation spread across multiple files. */ if (0) -- 2.30.0

5 16

[PATCH vkd3d v2 1/5] vkd3d-shader: Partially implement #define.
by Zebediah Figura 14 Jan '21

14 Jan '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- Makefile.am | 1 + libs/vkd3d-shader/preproc.h | 10 ++++ libs/vkd3d-shader/preproc.l | 35 ++++++++++++-- libs/vkd3d-shader/preproc.y | 59 +++++++++++++++++++++++- libs/vkd3d-shader/vkd3d_shader_private.h | 1 + tests/hlsl_d3d12.c | 2 +- 6 files changed, 103 insertions(+), 5 deletions(-) diff --git a/Makefile.am b/Makefile.am index 514f0506..bf1d7bfa 100644 --- a/Makefile.am +++ b/Makefile.am @@ -243,6 +243,7 @@ XFAIL_TESTS = \ tests/hlsl-vector-indexing.shader_test \ tests/hlsl-vector-indexing-uniform.shader_test \ tests/math.shader_test \ + tests/preproc-if.shader_test \ tests/preproc-ifdef.shader_test \ tests/preproc-if-expr.shader_test \ tests/preproc-invalid.shader_test \ diff --git a/libs/vkd3d-shader/preproc.h b/libs/vkd3d-shader/preproc.h index effcd995..7f77d278 100644 --- a/libs/vkd3d-shader/preproc.h +++ b/libs/vkd3d-shader/preproc.h @@ -22,6 +22,7 @@ #define __VKD3D_SHADER_PREPROC_H #include "vkd3d_shader_private.h" +#include "rbtree.h" struct preproc_if_state { @@ -33,6 +34,12 @@ struct preproc_if_state bool seen_else; }; +struct preproc_macro +{ + struct rb_entry entry; + char *name; +}; + struct preproc_ctx { void *scanner; @@ -44,6 +51,8 @@ struct preproc_ctx struct preproc_if_state *if_stack; size_t if_count, if_stack_size; + struct rb_tree macros; + int current_directive; bool last_was_newline; @@ -52,6 +61,7 @@ struct preproc_ctx bool error; }; +void preproc_free_macro(struct preproc_macro *macro) DECLSPEC_HIDDEN; void preproc_warning(struct preproc_ctx *ctx, const struct vkd3d_shader_location *loc, enum vkd3d_shader_error error, const char *format, ...) VKD3D_PRINTF_FUNC(4, 5) DECLSPEC_HIDDEN; diff --git a/libs/vkd3d-shader/preproc.l b/libs/vkd3d-shader/preproc.l index 47ad1f13..89c205f1 100644 --- a/libs/vkd3d-shader/preproc.l +++ b/libs/vkd3d-shader/preproc.l @@ -67,7 +67,7 @@ IDENTIFIER [A-Za-z_][A-Za-z0-9_]* <C_COMMENT,CXX_COMMENT><<EOF>> {yy_pop_state(yyscanner);} <C_COMMENT,CXX_COMMENT>. {} -<INITIAL>{IDENTIFIER} {return T_TEXT;} +<INITIAL>{IDENTIFIER} {return T_IDENTIFIER;} /* We have no use for floats, but shouldn't parse them as integers. */ @@ -100,6 +100,8 @@ IDENTIFIER [A-Za-z_][A-Za-z0-9_]* for (p = yytext + 1; strchr(" \t", *p); ++p) ; + if (!strcmp(p, "define")) + return T_DEFINE; if (!strcmp(p, "elif")) return T_ELIF; if (!strcmp(p, "else")) @@ -154,6 +156,7 @@ static int return_token(int token, YYSTYPE *lval, const char *text) { switch (token) { + case T_IDENTIFIER: case T_INTEGER: case T_TEXT: if (!(lval->string = vkd3d_strdup(text))) @@ -191,6 +194,7 @@ int yylex(YYSTYPE *lval, YYLTYPE *lloc, yyscan_t scanner) { switch (token) { + case T_DEFINE: case T_ELIF: case T_ELSE: case T_ENDIF: @@ -208,8 +212,18 @@ int yylex(YYSTYPE *lval, YYLTYPE *lloc, yyscan_t scanner) TRACE("Parsing token %d, line %d, in directive %d, string %s.\n", token, lloc->line, ctx->current_directive, debugstr_a(text)); - if (!ctx->current_directive && !preproc_is_writing(ctx)) - continue; + switch (ctx->current_directive) + { + case T_ELIF: + case T_ELSE: + case T_ENDIF: + case T_IF: + break; + + default: + if (!preproc_is_writing(ctx)) + continue; + } if (ctx->current_directive) return return_token(token, lval, text); @@ -218,6 +232,19 @@ int yylex(YYSTYPE *lval, YYLTYPE *lloc, yyscan_t scanner) } } +static int preproc_macro_compare(const void *key, const struct rb_entry *entry) +{ + const struct preproc_macro *macro = RB_ENTRY_VALUE(entry, struct preproc_macro, entry); + const char *name = key; + + return strcmp(name, macro->name); +} + +static void preproc_macro_rb_free(struct rb_entry *entry, void *ctx) +{ + preproc_free_macro(RB_ENTRY_VALUE(entry, struct preproc_macro, entry)); +} + int preproc_lexer_parse(const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *out, struct vkd3d_shader_message_context *message_context) { @@ -226,6 +253,7 @@ int preproc_lexer_parse(const struct vkd3d_shader_compile_info *compile_info, void *output_code; vkd3d_string_buffer_init(&ctx.buffer); + rb_init(&ctx.macros, preproc_macro_compare); ctx.message_context = message_context; ctx.location.source_name = compile_info->source_name; ctx.location.line = 1; @@ -248,6 +276,7 @@ int preproc_lexer_parse(const struct vkd3d_shader_compile_info *compile_info, } vkd3d_free(ctx.if_stack); + rb_destroy(&ctx.macros, preproc_macro_rb_free, NULL); if (ctx.error) { diff --git a/libs/vkd3d-shader/preproc.y b/libs/vkd3d-shader/preproc.y index 647bb45d..45cad443 100644 --- a/libs/vkd3d-shader/preproc.y +++ b/libs/vkd3d-shader/preproc.y @@ -66,6 +66,43 @@ static void yyerror(const YYLTYPE *loc, void *scanner, struct preproc_ctx *ctx, preproc_error(ctx, loc, VKD3D_SHADER_ERROR_PP_INVALID_SYNTAX, "%s", string); } +static struct preproc_macro *preproc_find_macro(struct preproc_ctx *ctx, const char *name) +{ + struct rb_entry *entry; + + if ((entry = rb_get(&ctx->macros, name))) + return RB_ENTRY_VALUE(entry, struct preproc_macro, entry); + return NULL; +} + +static bool preproc_add_macro(struct preproc_ctx *ctx, const struct vkd3d_shader_location *loc, char *name) +{ + struct preproc_macro *macro; + int ret; + + if ((macro = preproc_find_macro(ctx, name))) + { + preproc_warning(ctx, loc, VKD3D_SHADER_WARNING_PP_ALREADY_DEFINED, "Redefinition of %s.", name); + rb_remove(&ctx->macros, &macro->entry); + preproc_free_macro(macro); + } + + TRACE("Defining new macro %s.\n", debugstr_a(name)); + + if (!(macro = vkd3d_malloc(sizeof(*macro)))) + return false; + macro->name = name; + ret = rb_put(&ctx->macros, name, &macro->entry); + assert(!ret); + return true; +} + +void preproc_free_macro(struct preproc_macro *macro) +{ + vkd3d_free(macro->name); + vkd3d_free(macro); +} + static bool preproc_was_writing(struct preproc_ctx *ctx) { if (ctx->if_count < 2) @@ -135,17 +172,20 @@ static uint32_t preproc_parse_integer(const char *s) uint32_t integer; } +%token <string> T_IDENTIFIER %token <string> T_INTEGER %token <string> T_TEXT %token T_NEWLINE +%token T_DEFINE "#define" %token T_ELIF "#elif" %token T_ELSE "#else" %token T_ENDIF "#endif" %token T_IF "#if" %type <integer> expr +%type <string> body_token %% @@ -156,8 +196,25 @@ shader_text vkd3d_string_buffer_printf(&ctx->buffer, "\n"); } +body_text + : %empty + | body_text body_token + { + vkd3d_free($2); + } + +body_token + : T_IDENTIFIER + | T_INTEGER + | T_TEXT + directive - : T_IF expr T_NEWLINE + : T_DEFINE T_IDENTIFIER body_text T_NEWLINE + { + if (!preproc_add_macro(ctx, &@$, $2)) + YYABORT; + } + | T_IF expr T_NEWLINE { if (!preproc_push_if(ctx, !!$2)) YYABORT; diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index b89d20e2..1011be27 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -82,6 +82,7 @@ enum vkd3d_shader_error VKD3D_SHADER_ERROR_PP_INVALID_SYNTAX = 4000, + VKD3D_SHADER_WARNING_PP_ALREADY_DEFINED = 4300, VKD3D_SHADER_WARNING_PP_INVALID_DIRECTIVE = 4301, VKD3D_SHADER_WARNING_PP_UNKNOWN_DIRECTIVE = 4303, VKD3D_SHADER_WARNING_PP_UNTERMINATED_IF = 4305, diff --git a/tests/hlsl_d3d12.c b/tests/hlsl_d3d12.c index 77a7ea1a..38c1ab2c 100644 --- a/tests/hlsl_d3d12.c +++ b/tests/hlsl_d3d12.c @@ -349,7 +349,7 @@ static void test_preprocess(void) for (i = 0; i < ARRAY_SIZE(tests); ++i) { - if (i == 43) + if (i == 6) continue; vkd3d_test_set_context("Source \"%s\"", tests[i].source); todo_if (i <= 4 || (i >= 9 && i <= 14)) -- 2.30.0

5 16

[PATCH v2] d2d1: Fix the size and position of the text.
by Haoyang Chen 13 Jan '21

13 Jan '21

2 2

← Newer
1
...
33
34
35
36
37
38
39
...
44
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-devel January 2021